diff --git a/.gitignore b/.gitignore
index fd81b92bc..89dd521c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,12 @@ install_manifest.txt
 log/
 logs/
 vcpkg/
+perl/
 
 .idea/*
-*cbp
\ No newline at end of file
+*cbp
+
+submodules/*
+cmake-build-debug/
+
+.nfs.*
\ No newline at end of file
diff --git a/BUILD.md b/BUILD.md
new file mode 100644
index 000000000..1cc3cd99b
--- /dev/null
+++ b/BUILD.md
@@ -0,0 +1,64 @@
+# Guide To Building From Source Without Installer
+
+This guide is far from exhaustive, you should expect to have some experience with building C++ code before considering compiling the code from scratch.  You should instead consider using the installer scripts if you don't want to hack on the code directly.
+
+### CMake
+
+EQEmu uses CMake as the build system on all platforms.  You will need CMake 3.2 or higher to build from source.
+
+### Dependencies
+
+The following libraries are required to build from source:
+- [boost](https://www.boost.org/ "boost")
+- [zlib](https://www.zlib.net/ "zlib") (If not included the source will build [zlib-ng](https://github.com/zlib-ng/zlib-ng "zlib-ng") instead)
+- [libmysql](https://dev.mysql.com/downloads/connector/c/ "libmysql") or [libmariadb](https://github.com/MariaDB/mariadb-connector-c "libmariadb")
+
+The following libraries are not strictly required but in many cased recommended.
+- [OpenSSL](https://www.openssl.org/ "OpenSSL") or [mbedTLS](https://tls.mbed.org/ "mbedTLS") (Required for the loginserver and headless client)
+- [libsodium](https://github.com/jedisct1/libsodium "libsodium") (Required for strong password hashing on the loginserver)
+- [Lua 5.1](https://www.lua.org/ "Lua 5.1") or [LuaJit](http://luajit.org/ "LuaJit") (Required for Lua Quest Scripting)
+- [Perl](https://www.perl.org/ "Perl") (Required for Perl Quest Scripting)
+
+##### Windows
+For windows it is suggested you make use of [vcpkg](https://github.com/microsoft/vcpkg "vcpkg") if you wish to build your own dependencies.
+
+If you wish to use Perl then you should use whichever version of Perl you have installed on the target system.
+
+You can also download a vcpkg export from our releases section for Visual Studio [x86](https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x86.zip "x86") or [x64](https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x64.zip "x64") that includes a toolchain file you can pass to CMake.
+
+##### Linux
+For Linux you simply can install the dependencies from your package manager, below is an example of doing it on Ubuntu using apt-get.
+
+    sudo apt-get install libmysqlclient-dev libperl-dev libboost-dev liblua5.1-0-dev zlib1g-dev uuid-dev libssl-dev
+
+### Running CMake
+
+##### Windows
+The following is a modified command our automated build server uses to run CMake via the release vcpkg export and its toolchain file. 
+
+Assuming it is starting in c:/projects/eqemu and the x64 dependencies were extracted to c:/projects/eqemu/vcpkg.
+
+	mkdir build
+	cd build
+	cmake -G "Visual Studio 15 2017 Win64" -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_ZLIB=ON -DEQEMU_ENABLE_BOTS=ON -DCMAKE_TOOLCHAIN_FILE="c:/projects/eqemu/vcpkg/vcpkg-export-20180828-145455/scripts/buildsystems/vcpkg.cmake" ..
+
+##### Linux
+Similarly to Windows running CMake on Linux is simple it just omits the toolchain file and uses a different generator.
+
+	mkdir build
+	cd build
+	cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LOGIN=ON ..
+
+### Building
+
+##### Windows
+Inside the build directory a file EQEmu.sln should be produced by a successful run of the CMake command.  You can either open this with Visual Studio or build it directly with MSBuild via the command line.
+
+	msbuild EQEmu.sln /p:Configuration=Release
+
+##### Linux
+From the build directory you can simply call make to build.  
+
+For example.
+
+	make -j4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be92c7d0d..2b12e2ee1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,122 +1,28 @@
-#EQEmu CMake
-#Variables used:
-#EQEMU_DISABLE_CRT_SECURE_WARNINGS
-#EQEMU_FAST_FLOATINGPOINT
-#EQEMU_ENABLE_CRASH_LOGGING
-#EQEMU_DISABLE_SAFESEH
-#EQEMU_BUILD_MSVC_MP
-#EQEMU_DEBUG_LEVEL
-#EQEMU_LOG_LEVEL_STATUS
-#EQEMU_LOG_LEVEL_NORMAL
-#EQEMU_LOG_LEVEL_ERROR
-#EQEMU_LOG_LEVEL_DEBUG
-#EQEMU_LOG_LEVEL_QUEST
-#EQEMU_LOG_LEVEL_COMMANDS
-#EQEMU_LOG_LEVEL_CRASH
-#EQEMU_DEPOP_INVALIDATES_CACHE
-#EQEMU_ENABLE_BOTS
-#EQEMU_DISABLE_LOGSYS
-#EQEMU_COMMANDS_LOGGING
-#EQEMU_BUILD_SERVER
-#EQEMU_BUILD_LOGIN
-#EQEMU_BUILD_TESTS
-#EQEMU_BUILD_PERL
-#EQEMU_BUILD_LUA
-#EQEMU_SANITIZE_LUA_LIBS
-#EQEMU_BUILD_CLIENT_FILES
-#EQEMU_USE_MAP_MMFS
-#EQEMU_MAP_DIR
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-IF(POLICY CMP0074)
-	cmake_policy(SET CMP0074 NEW)
-ENDIF()
-
-#FindMySQL is located here so lets make it so CMake can find it
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/" ${CMAKE_MODULE_PATH})
 
-#Our project name is EQEmu
+IF(POLICY CMP0074)
+	CMAKE_POLICY(SET CMP0074 NEW)
+ENDIF()
+
 PROJECT(EQEmu)
 
-#Default build type is set to RelWithDebInfo for generators that honor that like makefiles
 IF(NOT CMAKE_BUILD_TYPE)
 	SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/dependencies" "${CMAKE_PREFIX_PATH}")
-
-#Add our various windows definitions
-IF(MSVC OR MINGW)
-	ADD_DEFINITIONS(-D_WINDOWS)
-	IF(CMAKE_CL_64)
-		ADD_DEFINITIONS(-DWIN64)
-	ELSE(CMAKE_CL_64)
-		ADD_DEFINITIONS(-DWIN32)
-	ENDIF(CMAKE_CL_64)
-ENDIF(MSVC OR MINGW)
+SET(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+SET(CMAKE_CXX_EXTENSIONS OFF)
 
 IF(MSVC)
-	IF(CMAKE_CL_64)
-		SET(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/zlib_x64")
-		SET(MYSQL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mysql_x64")
-		SET(LUA_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/luaj_x64")
-		SET(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/openssl_x64")
-		SET(SODIUM_INCLUDE_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/include")
-		IF(MSVC_VERSION GREATER 1800)
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/x64/Release/v140/dynamic")
-		ELSEIF(MSVC_VERSION EQUAL 1800)
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/x64/Release/v120/dynamic")
-		ELSE()
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/x64/Release/v110/dynamic")
-		ENDIF()
-	ELSE(CMAKE_CL_64)
-		SET(ZLIB_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/zlib_x86")
-		SET(MYSQL_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/mysql_x86")
-		SET(LUA_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/luaj_x86")
-		SET(SODIUM_INCLUDE_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/include")
-		SET(OPENSSL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/openssl_x86")
-		IF(MSVC_VERSION GREATER 1800)
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/Win32/Release/v140/dynamic")
-		ELSEIF(MSVC_VERSION EQUAL 1800)
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/Win32/Release/v120/dynamic")
-		ELSE()
-			SET(SODIUM_LIBRARY_HINTS "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/libsodium/Win32/Release/v110/dynamic")
-		ENDIF()
-	ENDIF(CMAKE_CL_64)
-
-	#disable CRT warnings on windows cause they're annoying as shit and we use C functions everywhere
-	OPTION(EQEMU_DISABLE_CRT_SECURE_WARNINGS "Disable Secure CRT Warnings" ON)
-	IF(EQEMU_DISABLE_CRT_SECURE_WARNINGS)
-		ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
-	ENDIF(EQEMU_DISABLE_CRT_SECURE_WARNINGS)
-
-	#fast FP if you'd like it
-	OPTION(EQEMU_FAST_FLOATINGPOINT "Use MSVC /fp:fast option" ON)
-	IF(EQEMU_FAST_FLOATINGPOINT)
-		ADD_DEFINITIONS(/fp:fast)
-	ENDIF(EQEMU_FAST_FLOATINGPOINT)
-
-	#crash logging currently only works on windows x86/x64
-	OPTION(EQEMU_ENABLE_CRASH_LOGGING "Enable crash logging" ON)
-	IF(EQEMU_ENABLE_CRASH_LOGGING)
-		ADD_DEFINITIONS(-DCRASH_LOGGING)
-	ENDIF(EQEMU_ENABLE_CRASH_LOGGING)
-
-	OPTION(EQEMU_BUILD_MSVC_MP "Enable build with multiple processes." ON)
-	IF(EQEMU_BUILD_MSVC_MP)
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
-	ENDIF(EQEMU_BUILD_MSVC_MP)
-
-	#We want to compile /MT not /MD so we change that
-	FOREACH(flag_var CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO)
-		IF(${flag_var} MATCHES "/MD")
-			STRING(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-		ENDIF(${flag_var} MATCHES "/MD")
-	ENDFOREACH(flag_var)
-
+	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
+	ADD_DEFINITIONS(-DCRASH_LOGGING)
+	
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 ELSE(MSVC)
-	#Normally set by perl but we don't use the perl flags anymore so we set it.
 	ADD_DEFINITIONS(-DHAS_UNION_SEMUN)
 ENDIF(MSVC)
 
@@ -133,195 +39,284 @@ IF(UNIX)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Darwin")
 ENDIF(UNIX)
 
-#debug level, 5 is default. Most people wont ever change this but it's there if you want to
-SET(EQEMU_DEBUG_LEVEL 5 CACHE STRING "EQEmu debug level:
-	0 - Quiet mode Errors to file Status and Normal ignored
-	1 - Status and Normal to console, Errors to logfile
-	2 - Status, Normal, and Error to console and logfile
-	3 - Light debug release errors and status
-	4 - Moderate debug release errors and status
-	5 - Maximum debug release errors and status
-	10 - More errors than you ever wanted to see"
-)
+ADD_DEFINITIONS(-DGLM_FORCE_RADIANS)
+ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
+ADD_DEFINITIONS(-DGLM_ENABLE_EXPERIMENTAL)
 
-SET(EQEMU_LOG_LEVEL_STATUS 2 CACHE STRING "EQEmu logging level for [Status]:
-	0 - Disabled
-	1 - Ouput to File Enabled
-	2 - Output to stdout Enabled
-	3 - Output to File and stdout Enabled
-	8 - Output to stderr Enabled
-	9 - Output to File and stderr Enabled
-	11 - Output to File, stdout and stderr Enabled"
-)
+#MSVC can fetch dependencies automatically.
+IF(MSVC)
+	INCLUDE("${CMAKE_SOURCE_DIR}/cmake/DependencyHelperMSVC.cmake")
+ENDIF()
 
-SET(EQEMU_LOG_LEVEL_NORMAL 3 CACHE STRING "EQEmu logging level for [Normal]:
-	0 - Disabled
-	1 - Ouput to File Enabled
-	2 - Output to stdout Enabled
-	3 - Output to File and stdout Enabled
-	8 - Output to stderr Enabled
-	9 - Output to File and stderr Enabled
-	11 - Output to File, stdout and stderr Enabled"
-)
+#Find everything we need
+FIND_PACKAGE(Boost REQUIRED)
+FIND_PACKAGE(MySQL)
+FIND_PACKAGE(MariaDB)
+FIND_PACKAGE(ZLIB)
+FIND_PACKAGE(OpenSSL)
+FIND_PACKAGE(Lua51)
+FIND_PACKAGE(PerlLibs)
+FIND_PACKAGE(Sodium)
+FIND_PACKAGE(mbedTLS)
 
-SET(EQEMU_LOG_LEVEL_ERROR 2 CACHE STRING "EQEmu logging level for [Error]:
-	0 - Disabled
-	1 - Ouput to File Enabled
-	2 - Output to stdout Enabled
-	3 - Output to File and stdout Enabled
-	8 - Output to stderr Enabled
-	9 - Output to File and stderr Enabled
-	11 - Output to File, stdout and stderr Enabled"
-)
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Library Detection                              *")
+MESSAGE(STATUS "**************************************************")
 
-SET(EQEMU_LOG_LEVEL_DEBUG 3 CACHE STRING "EQEmu logging level for [Debug]:
-	0 - Disabled
-	1 - Ouput to File Enabled
-	2 - Output to stdout Enabled
-	3 - Output to File and stdout Enabled
-	8 - Output to stderr Enabled
-	9 - Output to File and stderr Enabled
-	11 - Output to File, stdout and stderr Enabled"
-)
+IF(MYSQL_FOUND)
+	MESSAGE(STATUS "* MySQL:                                   FOUND *")
+ELSE()
+	MESSAGE(STATUS "* MySQL:                                 MISSING *")
+ENDIF()
 
-SET(EQEMU_LOG_LEVEL_QUEST 2 CACHE STRING "EQEmu logging level for [Quest]:
-	0 - Disabled
-	1 - Ouput to File Enabled
-	2 - Output to stdout Enabled
-	3 - Output to File and stdout Enabled
-	8 - Output to stderr Enabled
-	9 - Output to File and stderr Enabled
-	11 - Output to File, stdout and stderr Enabled"
-)
+IF(MARIADB_FOUND)
+	MESSAGE(STATUS "* MariaDB:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* MariaDB:                               MISSING *")
+ENDIF()
 
-SET(EQEMU_LOG_LEVEL_COMMANDS 1 CACHE STRING "EQEmu logging level for [Commands]:
-	0 - Disabled
-	1 - Ouput to File Enabled
-	2 - Output to stdout Enabled
-	3 - Output to File and stdout Enabled
-	8 - Output to stderr Enabled
-	9 - Output to File and stderr Enabled
-	11 - Output to File, stdout and stderr Enabled"
-)
+IF(ZLIB_FOUND)
+	MESSAGE(STATUS "* ZLIB:                                    FOUND *")
+ELSE()
+	MESSAGE(STATUS "* ZLIB:                                  MISSING *")
+ENDIF()
 
-SET(EQEMU_LOG_LEVEL_CRASH 3 CACHE STRING "EQEmu logging level for [Crash]:
-	0 - Disabled
-	1 - Ouput to File Enabled
-	2 - Output to stdout Enabled
-	3 - Output to File and stdout Enabled
-	8 - Output to stderr Enabled
-	9 - Output to File and stderr Enabled
-	11 - Output to File, stdout and stderr Enabled"
-)
+IF(Lua51_FOUND)
+	MESSAGE(STATUS "* Lua:                                     FOUND *")
+ELSE()
+	MESSAGE(STATUS "* Lua:                                   MISSING *")
+ENDIF()
 
-MARK_AS_ADVANCED(EQEMU_LOG_LEVEL_STATUS EQEMU_LOG_LEVEL_NORMAL EQEMU_LOG_LEVEL_ERROR EQEMU_LOG_LEVEL_DEBUG EQEMU_LOG_LEVEL_QUEST EQEMU_LOG_LEVEL_COMMANDS EQEMU_LOG_LEVEL_CRASH)
+IF(PerlLibs_FOUND)
+	MESSAGE(STATUS "* Perl:                                    FOUND *")
+ELSE()
+	MESSAGE(STATUS "* Perl:                                  MISSING *")
+ENDIF()
 
-#NPC Types Cache Behavior
+IF(SODIUM_FOUND)
+	MESSAGE(STATUS "* libsodium:                               FOUND *")
+ELSE()
+	MESSAGE(STATUS "* libsodium:                             MISSING *")
+ENDIF()
+
+IF(OpenSSL_FOUND)
+	MESSAGE(STATUS "* OpenSSL:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* OpenSSL:                               MISSING *")
+ENDIF()
+
+IF(MBEDTLS_FOUND)
+	MESSAGE(STATUS "* mbedTLS:                                 FOUND *")
+ELSE()
+	MESSAGE(STATUS "* mbedTLS:                               MISSING *")
+ENDIF()
+
+MESSAGE(STATUS "**************************************************")
+
+#options
 OPTION(EQEMU_DEPOP_INVALIDATES_CACHE "#repop invalidates the npc_types cache (will cause a larger database hit on #repop but is more convienent)." ON)
-
-#Bots are a compile time option so on/off
 OPTION(EQEMU_ENABLE_BOTS "Enable Bots" OFF)
-
-#Disable entire _mlog system (excludes trade/command logs)
-OPTION(EQEMU_DISABLE_LOGSYS "Disable Logging INI System" ON)
-
-#Enable GM Command log system
 OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON)
+OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
+OPTION(EQEMU_BUILD_LOGIN "Build the login server." ON)
+OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
+OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
+OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
 
 IF(EQEMU_COMMANDS_LOGGING)
 	ADD_DEFINITIONS(-DCOMMANDS_LOGGING)
 ENDIF(EQEMU_COMMANDS_LOGGING)
 
-IF(EQEMU_DISABLE_LOGSYS)
-	ADD_DEFINITIONS(-DDISABLE_LOGSYS)
-ENDIF(EQEMU_DISABLE_LOGSYS)
-
 IF(EQEMU_ENABLE_BOTS)
 	ADD_DEFINITIONS(-DBOTS)
 ENDIF(EQEMU_ENABLE_BOTS)
 
-#What to build
-OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
-OPTION(EQEMU_BUILD_LOGIN "Build the login server." OFF)
-OPTION(EQEMU_BUILD_HC "Build the headless client." OFF)
-OPTION(EQEMU_BUILD_TESTS "Build utility tests." OFF)
-OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
-OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
-OPTION(EQEMU_BUILD_CLIENT_FILES "Build Client Import/Export Data Programs." ON)
-
-#C++11 stuff
-IF(NOT MSVC)
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-	IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-reserved-user-defined-literal")
+#database
+IF(MySQL_FOUND AND MariaDB_FOUND)
+	SET(DATABASE_LIBRARY_SELECTION MySQL CACHE STRING "Database library to use:
+			MySQL
+			MariaDB"
+	)
+	
+	IF(DATABASE_LIBRARY_SELECTION STREQUAL "MySQL")
+		SET(DATABASE_LIBRARY_TYPE "  MySQL")
+		SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
+		SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
+	ELSEIF(DATABASE_LIBRARY_SELECTION STREQUAL "MariaDB")
+		SET(DATABASE_LIBRARY_TYPE "MariaDB")
+		SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
+		SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
+	ELSE()
+		MESSAGE(FATAL_ERROR "Unknown database library set, should be one of: MySQL, MariaDB")
 	ENDIF()
-ENDIF(NOT MSVC)
+ELSEIF(MariaDB_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "MariaDB")
+	SET(DATABASE_LIBRARY_LIBS ${MariaDB_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MariaDB_INCLUDE_DIR})
+ELSEIF(MySQL_FOUND)
+	SET(DATABASE_LIBRARY_TYPE "  MySQL")
+	SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
+	SET(DATABASE_LIBRARY_INCLUDE ${MySQL_INCLUDE_DIR})
+ELSE()
+	MESSAGE(FATAL_ERROR "One of MySQL or MariaDB is a required dependency.")
+ENDIF()
 
-#Various definitions
-IF(EQEMU_BUILD_PERL)
-	ADD_DEFINITIONS(-DEMBPERL)
-	ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
-ENDIF(EQEMU_BUILD_PERL)
-IF(EQEMU_BUILD_LUA)
-	ADD_DEFINITIONS(-DLUA_EQEMU)
-ENDIF(EQEMU_BUILD_LUA)
+#security
+#prefer openssl to mbedtls (arbitrary)
+IF(OpenSSL_FOUND AND MBEDTLS_FOUND)
+	SET(TLS_LIBRARY_SELECTION OpenSSL CACHE STRING "TLS library to use:
+			OpenSSL
+			mbedTLS"
+	)
+	
+	IF(TLS_LIBRARY_SELECTION STREQUAL "OpenSSL")
+		SET(TLS_LIBRARY_TYPE " OpenSSL")
+		SET(TLS_LIBRARY_ENABLED ON)
+		SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
+		SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
+		ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
+	ELSEIF(TLS_LIBRARY_SELECTION STREQUAL "mbedTLS")
+		SET(TLS_LIBRARY_TYPE " mbedTLS")
+		SET(TLS_LIBRARY_ENABLED ON)
+		SET(TLS_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
+		SET(TLS_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
+		ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
+	ELSE()
+		MESSAGE(FATAL_ERROR "Unknown TLS library set, should be one of: OpenSSL, mbedTLS")
+	ENDIF()
+ELSEIF(OpenSSL_FOUND)
+	SET(TLS_LIBRARY_TYPE " OpenSSL")
+	SET(TLS_LIBRARY_ENABLED ON)
+	SET(TLS_LIBRARY_LIBS ${OPENSSL_LIBRARIES})
+	SET(TLS_LIBRARY_INCLUDE ${OPENSSL_INCLUDE_DIR})
+	ADD_DEFINITIONS(-DEQEMU_USE_OPENSSL)
+ELSEIF(MBEDTLS_FOUND)
+	SET(TLS_LIBRARY_TYPE " mbedTLS")
+	SET(TLS_LIBRARY_ENABLED ON)
+	SET(TLS_LIBRARY_LIBS ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
+	SET(TLS_LIBRARY_INCLUDE ${MBEDTLS_INCLUDE_DIR})
+	ADD_DEFINITIONS(-DEQEMU_USE_MBEDTLS)
+ELSE()
+	SET(TLS_LIBRARY_TYPE "Disabled")
+	SET(TLS_LIBRARY_ENABLED OFF)
+ENDIF()
 
-#Disabled until reevaluation performed
-#OPTION(EQEMU_USE_MAP_MMFS "Create and use Zone Map MMF files." OFF)
-#IF(EQEMU_USE_MAP_MMFS)
-#	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
-#ENDIF(EQEMU_USE_MAP_MMFS)
-
-SET(EQEMU_MAP_DIR "./Maps" CACHE STRING "The dir that maps, water maps, and paths are located in.")
-
-ADD_DEFINITIONS(-DEQDEBUG=${EQEMU_DEBUG_LEVEL})
-ADD_DEFINITIONS(-DINVERSEXY)
-ADD_DEFINITIONS(-DFIELD_ITEMS)
-ADD_DEFINITIONS(-DMAP_DIR="${EQEMU_MAP_DIR}")
-ADD_DEFINITIONS(-DLOG_LEVEL_STATUS=${EQEMU_LOG_LEVEL_STATUS})
-ADD_DEFINITIONS(-DLOG_LEVEL_NORMAL=${EQEMU_LOG_LEVEL_NORMAL})
-ADD_DEFINITIONS(-DLOG_LEVEL_ERROR=${EQEMU_LOG_LEVEL_ERROR})
-ADD_DEFINITIONS(-DLOG_LEVEL_DEBUG=${EQEMU_LOG_LEVEL_DEBUG})
-ADD_DEFINITIONS(-DLOG_LEVEL_QUEST=${EQEMU_LOG_LEVEL_QUEST})
-ADD_DEFINITIONS(-DLOG_LEVEL_COMMANDS=${EQEMU_LOG_LEVEL_COMMANDS})
-ADD_DEFINITIONS(-DLOG_LEVEL_CRASH=${EQEMU_LOG_LEVEL_CRASH})
-ADD_DEFINITIONS(-DGLM_FORCE_RADIANS)
-ADD_DEFINITIONS(-DGLM_FORCE_CTOR_INIT)
-ADD_DEFINITIONS(-DGLM_ENABLE_EXPERIMENTAL)
-
-#Find everything we need
-FIND_PACKAGE(ZLIB)
-FIND_PACKAGE(MySQL REQUIRED)
-IF(EQEMU_BUILD_PERL)
-	FIND_PACKAGE(PerlLibs REQUIRED)
-	INCLUDE_DIRECTORIES(SYSTEM "${PERL_INCLUDE_PATH}")
-ENDIF(EQEMU_BUILD_PERL)
-
-SET(SERVER_LIBS common debug ${MySQL_LIBRARY_DEBUG} optimized ${MySQL_LIBRARY_RELEASE} uv_a fmt RecastNavigation::Detour)
-
-FIND_PACKAGE(Sodium REQUIRED)
 IF(SODIUM_FOUND)
-	OPTION(EQEMU_ENABLE_SECURITY "Use Encryption For TCP Connections" ON)
-	IF(EQEMU_ENABLE_SECURITY)
-		INCLUDE_DIRECTORIES(SYSTEM "${SODIUM_INCLUDE_DIRS}")
-		ADD_DEFINITIONS(-DENABLE_SECURITY)
-		SET(SERVER_LIBS ${SERVER_LIBS} ${SODIUM_LIBRARIES})
+	SET(SODIUM_LIBRARY_TYPE "Libsodium")
+	SET(SODIUM_LIBRARY_ENABLED ON)
+	SET(SODIUM_LIBRARY_LIBS ${SODIUM_LIBRARIES})
+	SET(SODIUM_LIBRARY_INCLUDE ${SODIUM_INCLUDE_DIRS})
+	ADD_DEFINITIONS(-DENABLE_SECURITY)
+ELSE()
+	SET(SODIUM_LIBRARY_TYPE " Disabled")
+	SET(SODIUM_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(Lua51_FOUND)
+	SET(LUA_LIBRARY_TYPE " Lua 5.1")
+	SET(LUA_LIBRARY_ENABLED ON)
+	SET(LUA_LIBRARY_LIBS ${LUA_LIBRARY} luabind)
+	SET(LUA_LIBRARY_INCLUDE ${LUA_INCLUDE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
+ELSE()
+	SET(LUA_LIBRARY_TYPE "Disabled")
+	SET(LUA_LIBRARY_ENABLED OFF)
+ENDIF()
+
+IF(PerlLibs_FOUND)
+	SET(PERL_LIBRARY_TYPE "    Perl")
+	SET(PERL_LIBRARY_ENABLED ON)
+	SET(PERL_LIBRARY_LIBS ${PERL_LIBRARY})
+	SET(PERL_LIBRARY_INCLUDE ${PERL_INCLUDE_PATH})
+ELSE()
+	SET(PERL_LIBRARY_TYPE "Disabled")
+	SET(PERL_LIBRARY_ENABLED OFF)
+ENDIF()
+
+#use zlib if exists
+IF(ZLIB_FOUND)
+	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." ON)
+	IF(EQEMU_BUILD_ZLIB)
+		SET(ZLIB_LIBRARY_TYPE "zlib-ng")
+		SET(ZLIB_LIBRARY_LIBS "zlibstatic")
+		SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
+	ELSE()
+		SET(ZLIB_LIBRARY_TYPE "   zlib")
+		SET(ZLIB_LIBRARY_LIBS ${ZLIB_LIBRARY})
+		SET(ZLIB_LIBRARY_INCLUDE ${ZLIB_INCLUDE_DIRS})
+	ENDIF()
+ELSE()
+	SET(ZLIB_LIBRARY_TYPE "zlib-ng")
+	SET(ZLIB_LIBRARY_LIBS "zlibstatic")
+	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
+ENDIF()
+
+MESSAGE(STATUS "")
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Library Usage                                  *")
+MESSAGE(STATUS "**************************************************")
+MESSAGE(STATUS "* Database:                              ${DATABASE_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* TLS:                                  ${TLS_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Sodium:                              ${SODIUM_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Lua:                                  ${LUA_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* Perl:                                 ${PERL_LIBRARY_TYPE} *")
+MESSAGE(STATUS "* zlib:                                  ${ZLIB_LIBRARY_TYPE} *")
+MESSAGE(STATUS "**************************************************")
+
+#setup server libs and headers
+SET(SERVER_LIBS common ${DATABASE_LIBRARY_LIBS} ${ZLIB_LIBRARY_LIBS} ${Boost_LIBRARIES} uv_a fmt RecastNavigation::Detour)
+
+INCLUDE_DIRECTORIES(SYSTEM "${DATABASE_LIBRARY_INCLUDE}")
+INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_LIBRARY_INCLUDE}")
+INCLUDE_DIRECTORIES(SYSTEM "${Boost_INCLUDE_DIRS}")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/glm")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/cereal/include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/fmt/include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libuv/include" )
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DebugUtils/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Detour/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourCrowd/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourTileCache/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
+INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
+
+OPTION(EQEMU_BUILD_LOGGING "Build Logging (To speed up compilation)" ON)
+IF(EQEMU_BUILD_LOGGING)
+	ADD_DEFINITIONS(-DBUILD_LOGGING)
+ENDIF()
+
+IF(TLS_LIBRARY_ENABLED)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${TLS_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${TLS_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(SODIUM_LIBRARY_ENABLED)
+	SET(SERVER_LIBS ${SERVER_LIBS} ${SODIUM_LIBRARY_LIBS})
+	INCLUDE_DIRECTORIES(SYSTEM "${SODIUM_LIBRARY_INCLUDE}")
+ENDIF()
+
+IF(LUA_LIBRARY_ENABLED)
+	OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
+	
+	IF(EQEMU_BUILD_LUA)
+		ADD_DEFINITIONS(-DLUA_EQEMU)
+		SET(SERVER_LIBS ${SERVER_LIBS} ${LUA_LIBRARY_LIBS})
+		INCLUDE_DIRECTORIES(SYSTEM "${LUA_LIBRARY_INCLUDE}")
+		
+		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
+		IF(EQEMU_SANITIZE_LUA_LIBS)
+			ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
+		ENDIF()
 	ENDIF()
 ENDIF()
 
-IF(ZLIB_FOUND)
-	OPTION(EQEMU_BUILD_ZLIB "Build internal version of zlib." OFF)
-	
-	IF(EQEMU_BUILD_ZLIB)
-		INCLUDE_DIRECTORIES(BEFORE SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng" "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
-		SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic")
-	ELSE()
-		INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_INCLUDE_DIRS}")
-		SET(SERVER_LIBS ${SERVER_LIBS} ${ZLIB_LIBRARY})
+IF(PERL_LIBRARY_ENABLED)
+	OPTION(EQEMU_BUILD_PERL "Build Perl parser." ON)
+	IF(EQEMU_BUILD_PERL)
+		SET(SERVER_LIBS ${SERVER_LIBS} ${PERL_LIBRARY_LIBS})
+		INCLUDE_DIRECTORIES(SYSTEM "${PERL_LIBRARY_INCLUDE}")
+		ADD_DEFINITIONS(-DEMBPERL)
+		ADD_DEFINITIONS(-DEMBPERL_PLUGIN)
 	ENDIF()
-ELSE()
-	INCLUDE_DIRECTORIES(BEFORE SYSTEM "${CMAKE_CURRENT_BINARY_DIR}/libs/zlibng" "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
-	SET(SERVER_LIBS ${SERVER_LIBS} "zlibstatic")
 ENDIF()
 
 IF(WIN32)
@@ -336,52 +331,32 @@ IF(UNIX)
 	SET(SERVER_LIBS ${SERVER_LIBS} "uuid")
 ENDIF()
 
-IF(EQEMU_BUILD_LUA)
-	FIND_PACKAGE(EQLua51 REQUIRED)
-	SET(Boost_USE_STATIC_LIBS OFF)
-	SET(Boost_USE_MULTITHREADED ON)
-	SET(Boost_USE_STATIC_RUNTIME OFF)
-	SET(BOOST_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/dependencies/boost")
+IF(EQEMU_BUILD_LOGIN AND NOT TLS_LIBRARY_ENABLED)
+	MESSAGE(FATAL_ERROR "Login server requires a TLS Library to build.")
+ENDIF()
 
-	FIND_PACKAGE(Boost REQUIRED)
-	INCLUDE_DIRECTORIES(SYSTEM "${LUA_INCLUDE_DIR}" "${Boost_INCLUDE_DIRS}")
-	INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/libs/luabind")
-
-	OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
-	IF(EQEMU_SANITIZE_LUA_LIBS)
-		ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
-	ENDIF(EQEMU_SANITIZE_LUA_LIBS)
-ENDIF(EQEMU_BUILD_LUA)
-
-INCLUDE_DIRECTORIES(SYSTEM "${MySQL_INCLUDE_DIR}")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/glm")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/cereal/include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/fmt/include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/libuv/include" )
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DebugUtils/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Detour/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourCrowd/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/DetourTileCache/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/recastnavigation/Recast/Include")
-INCLUDE_DIRECTORIES(SYSTEM "${CMAKE_CURRENT_SOURCE_DIR}/submodules/websocketpp")
+IF(EQEMU_BUILD_HC AND NOT TLS_LIBRARY_ENABLED)
+	MESSAGE(FATAL_ERROR "Headless client requires a TLS Library to build.")
+ENDIF()
 
 IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
 	ADD_SUBDIRECTORY(common)
 	ADD_SUBDIRECTORY(libs)
 	ADD_SUBDIRECTORY(submodules/fmt)
 	ADD_SUBDIRECTORY(submodules/libuv)
-
-	SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
-	SET(RECASTNAVIGATION_TESTS OFF CACHE BOOL "Build tests")
-	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")
-	ADD_SUBDIRECTORY(submodules/recastnavigation)
 	
 	IF(EQEMU_BUILD_ZLIB)
 		SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API")
 		SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries")
 		ADD_SUBDIRECTORY(libs/zlibng)
 	ENDIF()
+	
+	SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
+	SET(RECASTNAVIGATION_TESTS OFF CACHE BOOL "Build tests")
+	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")
+	ADD_SUBDIRECTORY(submodules/recastnavigation)
 ENDIF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_HC)
+
 IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(shared_memory)
 	ADD_SUBDIRECTORY(world)
@@ -390,6 +365,7 @@ IF(EQEMU_BUILD_SERVER)
 	ADD_SUBDIRECTORY(queryserv)
 	ADD_SUBDIRECTORY(eqlaunch)
 ENDIF(EQEMU_BUILD_SERVER)
+
 IF(EQEMU_BUILD_LOGIN)
 	ADD_SUBDIRECTORY(loginserver)
 ENDIF(EQEMU_BUILD_LOGIN)
diff --git a/README.md b/README.md
index e1126241c..5e4f919fe 100644
--- a/README.md
+++ b/README.md
@@ -70,3 +70,9 @@ forum, although pull requests will be much quicker and easier on all parties.
   * GPL Perl - GPL / ActiveState (under the assumption that this is a free project)
   * CPPUnit - GLP StringUtilities - Apache
   * LUA - MIT
+
+## Contributors
+
+<a href="https://github.com/EQEmu/server/graphs/contributors">
+  <img src="https://contributors-img.firebaseapp.com/image?repo=EQEmu/server" />
+</a>
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..0a653b06f
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,3 @@
+# Security Policy - Reporting Vulnerabilities
+
+When reporting active hacks, exploits and other vulnerabilities, please describe how to reproduce said report and if you can provide context into a possible solution
diff --git a/changelog.txt b/changelog.txt
index dc9d0f16c..955a0a2e8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,37 @@
+############################################
+# Deprecated
+############################################
+#
+# New changelog can be found here
+# https://eqemu.gitbook.io/changelog/
+#
+############################################
+# Deprecated
+############################################
+
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 8/16/2019 ==
+Akkadius: Simplified the use of roamboxes and improved the AI for roambox pathing https://i.imgur.com/z33u7y9.gif
+Akkadius: Implemented command #roambox set <box_size> [move_delay]
+Akkadius: Implemented command #roambox remove
+Akkadius: Implemented LUA NPC:SetSimpleRoamBox(box_size, [move_distance], [move_delay]);
+Akkadius: Implemented Perl $npc->SetSimpleRoamBox(box_size, [move_distance], [move_delay]);
+Akkadius: Spawngroup data now hot reloads on #repop
+Akkadius: Command #npceditmass now lists column options when one isn't properly specified
+Akkadius: Implemented command #spawneditmass <search> <option> <value> with options [respawn_time] currently implemented
+
+== 8/11/2019 ==
+Akkadius: Added bulk edit command #npceditmass <column-to-search> <column-search-value> <change-column> <change-value>
+Akkadius: Modified #findzone to include clickable saylinks to both regular zone (if able) and private gmzone instances
+Akkadius: Added #findzone expansion <expansion-number> to show zones via expansion
+
+== 8/6/2019 ==
+Akkadius: Optimizations to movement updates to eliminate ghosting possibilities in larger zones
+
+== 7/22/2019 ==
+Uleat: Added script 'vcxproj_dependencies.py' - a script to help determine conflicting project dependencies (alpha-stage)
+
 == 7/10/2019 ==
 
 Akkadius: Add #npcedit flymode [0 = ground, 1 = flying, 2 = levitate, 3 = water, 4 = floating]
@@ -52,48 +84,48 @@ Uleat: Reworked BotDatabase into a functional add-on for ZoneDatabase
 == 3/1/2019 ==
 Noudess: Major faction conversion to use client data.
 
-	Pull request #802 New min/max personal faction per faction. Use of actual 
+	Pull request #802 New min/max personal faction per faction. Use of actual
 	client mods for race/class/deity.
 
 	This PR involves major changes to your database and your quests.
 
-	The clients recently exposed raw data included 
+	The clients recently exposed raw data included
 
 	- the min/max personal faction for each faction
 	- the actual faction id the client uses for each faction
-	- the actual mods that come into play when a PC cons an opponent that 
+	- the actual mods that come into play when a PC cons an opponent that
 	  determine your overall con to that faction.
 
 
-	The approach I took resulted in minimal change to the code base.  I did 
-	alter the code to enforce the new validated min/max from the client.  This 
-	min/max applies to personally earned faction.  So if a faction has a min 
-	of 0 and a max of 2000, that means your personally earned value can never 
-	go below 0 or over 2000.  The actual con, will, however often do so because 
-	of class/race/deity modifications.  I also changed the con ranges, per 
+	The approach I took resulted in minimal change to the code base.  I did
+	alter the code to enforce the new validated min/max from the client.  This
+	min/max applies to personally earned faction.  So if a faction has a min
+	of 0 and a max of 2000, that means your personally earned value can never
+	go below 0 or over 2000.  The actual con, will, however often do so because
+	of class/race/deity modifications.  I also changed the con ranges, per
 	Mackal's data that was proven to be accurate:
 
-	Ally = 1100+ 
-	Warmly = 750 to 1099 
-	Kindly = 500 to 749 
-	Amiable = 100 to 499 
-	Indifferent = 0 to 99 
-	Apprehensive = -1 to -100 
-	Dubious = -101 to -500 
-	Threateningly = -501 to -750 
-	Ready to Attack = -751 
+	Ally = 1100+
+	Warmly = 750 to 1099
+	Kindly = 500 to 749
+	Amiable = 100 to 499
+	Indifferent = 0 to 99
+	Apprehensive = -1 to -100
+	Dubious = -101 to -500
+	Threateningly = -501 to -750
+	Ready to Attack = -751
 
-	The above means that dubious is a much smaller range now.  For that reason 
-	the scripts modify any custom faction base values to put them in the same 
+	The above means that dubious is a much smaller range now.  For that reason
+	the scripts modify any custom faction base values to put them in the same
 	range, hopefully as the creators of the custom factions intended.
 
-	Also to be noted as characters that have a faction between -501 and -700 
-	wont be dubious anymore, they will be threateningly.  This is expected with 
-	the new ranges, but might take players by suprise as the old ranges we used 
+	Also to be noted as characters that have a faction between -501 and -700
+	wont be dubious anymore, they will be threateningly.  This is expected with
+	the new ranges, but might take players by suprise as the old ranges we used
 	were more liberal but were incorrect.
 
-	The database is changed extensively, but really only content.  We're 
-	translating faction_list to use the clients ids.  As such every place a 
+	The database is changed extensively, but really only content.  We're
+	translating faction_list to use the clients ids.  As such every place a
 	faction_is is used, namely (see below) are being converted.
 
 	- faction_list
@@ -102,41 +134,41 @@ Noudess: Major faction conversion to use client data.
 	- npc_faction_entries (faction_id field only)
 	- faction_values
 
-	Quests will also automatically be adjusted.  This MUST be done after the 
-	PR sql and before starting the server.  This is automated by 
+	Quests will also automatically be adjusted.  This MUST be done after the
+	PR sql and before starting the server.  This is automated by
 	eqemu_server.pl (or starting world)
 
-	Be assured, custom factions that you may have created, or obsolete or 
-	duplicate factions in our original faction_list, that you may have used, 
-	will be preserved.  Anything that does not map directly is being moved to 
-	the 5000 range in faction_list and any references are corrected to point 
+	Be assured, custom factions that you may have created, or obsolete or
+	duplicate factions in our original faction_list, that you may have used,
+	will be preserved.  Anything that does not map directly is being moved to
+	the 5000 range in faction_list and any references are corrected to point
 	there.
 
-	A great example of this is Ebon Mask and Hall of the Ebon Mask.  Many peqdb 
-	style servers have both of these.  Some have used one, some the other.  We 
-	map Ebon Mask to the clients Ebon mask and the Hall of the Ebon Mask gets 
-	moved to the 5000 range, and all its references are preserved.  However, 
-	if you would like to make proper use of client mobs to Ebon mask, or other 
-	factions that have duplicitous entries, I recommend you manually move to 
-	using the correct one.  In that way all of the new raw data mapped in from 
-	the client into faction_list_mod will get used instead of what your db had 
+	A great example of this is Ebon Mask and Hall of the Ebon Mask.  Many peqdb
+	style servers have both of these.  Some have used one, some the other.  We
+	map Ebon Mask to the clients Ebon mask and the Hall of the Ebon Mask gets
+	moved to the 5000 range, and all its references are preserved.  However,
+	if you would like to make proper use of client mobs to Ebon mask, or other
+	factions that have duplicitous entries, I recommend you manually move to
+	using the correct one.  In that way all of the new raw data mapped in from
+	the client into faction_list_mod will get used instead of what your db had
 	before these values were known.
 
-	In my experience converting 4 different server's data, there are only 
+	In my experience converting 4 different server's data, there are only
 	about 20 factions moved into the 5000 range.
 
-	This PR has only 1 new, permanent table faction_base_data, which is taken 
-	right from the client.  The base field is left in case you want to mod your 
-	server, but we are very sure that the client doesn't use a base.  It uses 
-	global mods to race or class for this as you'll see in the 
+	This PR has only 1 new, permanent table faction_base_data, which is taken
+	right from the client.  The base field is left in case you want to mod your
+	server, but we are very sure that the client doesn't use a base.  It uses
+	global mods to race or class for this as you'll see in the
 	new faction_list_mod.
 
 	The PR makes many backup tables, and two mapping tables that are used during
-	the conversion process to fix quests.  This table was hand created by 
-	analysis.  This table serves no purpose after conversion except an audit 
+	the conversion process to fix quests.  This table was hand created by
+	analysis.  This table serves no purpose after conversion except an audit
 	trail if we see any issues.
 
-	I will release a new PR that will clean up all these backups and temporary 
+	I will release a new PR that will clean up all these backups and temporary
 	tables in about a month.
 
 == 2/7/2019 ==
@@ -306,7 +338,7 @@ Kinglykrab: Added multiple new instance related quest functions.
 
 	Added spell buckets, similar to spell globals.
 		- Uses a new spell_buckets table and the Spells:EnableSpellBuckets rule.
-	
+
 	Added max level by data bucket.
 		- Uses data bucket char_id-CharMaxLevel and Character:PerCharacterBucketMaxLevel rule.
 
@@ -316,7 +348,7 @@ Uleat: Added bot owner options
 	- options are saved in the database and therefore, persistent
 	- Implemented option 'deathmarquee'
 	-- toggles client owner flag to show marquee message when a bot dies (default: disabled)
-	
+
 == 10/07/2018 ==
 Uleat: Fixed a few bot issues..
 	- Fix for bot item trades not attuning
@@ -332,27 +364,27 @@ Uleat: Fixed a few bot issues..
 Uleat: Notes for manual conversion of quest script inventory slot values
 	- You should use reference/lookup values provided by the lua and perl apis to avoid skirting safety checks
 		and to ensure that the values used are the correct ones for your needs
-	
+
 	[perl api examples]
 		old:
 			1) my $charmitem = $client->GetItemIDAt(0);
 			2) for($for_x = 22; $for_x < 30; $for_x++) {...}
 			3) for($slot1 = 0; $slot1 <= 30; $slot1++) {...}
-		
+
 		new:
 			1) my $charmitem = $client->GetItemIDAt(quest::getinventoryslotid("charm"));
 			2) for($for_x = quest::getinventoryslotid("general.begin"); $for_x <= quest::getinventoryslotid("general.end"); $for_x++) {...} ** notice change of conditional
 			3) for($slot1 = quest::getinventoryslotid("possessions.begin"); $slot1 <= quest::getinventoryslotid("possessions.end"); $slot1++) {...}
-	
+
 	[lua api examples]
 		old:
 			1) if(e.self:GetItemIDAt(30) == 31599) then ...
 			2) for i = 0, 30, 1 do ...
-			
+
 		new:
 			1) if(e.self:GetItemIDAt(Slot.Cursor) == 31599) then ...
 			2) for i = Slot.PossessionsBegin, Slot.PossessionsEnd, 1 do ...
-	
+
 	- If you need to manually assign bag slot ranges to individual 'general' slots, use this assignment for now:
 		-- General1  (23) = 251 .. 260
 		-- General2  (24) = 261 .. 270
@@ -365,13 +397,13 @@ Uleat: Notes for manual conversion of quest script inventory slot values
 		-- General9  (31) = 331 .. 340
 		-- General10 (32) = 341 .. 350
 		-- Cursor    (33) = 351 .. 360
-	
+
 	- If you need to manually assign ammo or powersource slots, use these values:
 		-- PowerSource = 21
 		-- Ammo = 22
-	
+
 	- All slot values not addressed above remain the same
-	
+
 	- Additional information can be found at:
 		-- https://github.com/EQEmu/Server/wiki/Inventory-Slots
 		-- https://github.com/EQEmu/Server/wiki/Perl-API
@@ -404,11 +436,11 @@ Uleat: Activation of RoF+ clients' two additional general slots and integration
 	- Database will have existing inventory slot values modified to the new standard and table `items` entries will
 		also be updated to the 'correct' equipable slot bitmask
 	- Script (quest) updates are required with this change
-	
+
 Note: The proper way to reference inventory slots is to use either instrinsic lookups (c/c++ & perl) or to use valid
 	const ref declarations (c/c++ & lua). Any other method is not guaranteed to be accurate and may result in item loss
 	and/or unexpected/undefined behavior.
-	
+
 
 == 07/10/2018 ==
 Akkadius: Adjusted DataBuckets to use other acceptable time formats
@@ -512,7 +544,7 @@ Uleat: Re-work of Bot::AI_Process(). Overall behavior is much improved.
 	- Added combat 'jitter' movement to complement the existing rogue movement
 	- Attack can now be aborted if target contains no leash owner nor bot hate and leash owner turns off auto-attack
 	- Please report any issues with the bot AI code
-	
+
 Added a work-around for heal rotations crashing the server - under certain conditions.
 
 == 01/28/2018 ==
@@ -555,7 +587,7 @@ Values stored in the database are 0-6000, previously we capped it at 6000 but pr
 == 7/14/2017 ==
 Akkadius: HP Update tuning - HP Updates are now forced when a client is targeted
 Akkadius: Client position updates should be smoother (granted the client has a good connection)
-	- Clients should also no longer randomly disappear 
+	- Clients should also no longer randomly disappear
 
 == 7/11/2017 ==
 Akkadius: Raid/Group/XTarget HP/Mana/Endurance updates now only send when percentage changes
@@ -592,7 +624,7 @@ Akkadius: Fixed issues with Z correctness when NPCs are engaged with players fol
 Akkadius: NPC corpses should fall into the ground far less
 
 == 6/25/2017 ==
-Akkadius: New rules made by developers are now automatically created when world boots up, this keeps 
+Akkadius: New rules made by developers are now automatically created when world boots up, this keeps
 	from having to issue schema SQL updates every time rules are added.
 	- Whenever a rule isn't present in the database, it will be automatically created
 Akkadius: Sped up saylink retrieval x1000 helpful for dialogues, plugins with many saylinks
@@ -609,11 +641,11 @@ KLS: Merge eqstream branch
 			- Because of changes to the TCP stack, lsreconnect and echo have been disabled.
 	- The server tic rate has been changed to be approx 30 fps from 500+ fps.
 		- Changed how missiles and movement were calculated slightly to account for this (Missiles in particular are not perfect but close enough).
-	
+
 	- Breaking changes:
 		- Users who use the cmake install feature should be aware that the install directory is now %cmake_install_dir%/bin instead of just %cmake_install_dir%/
 		- To support new features such as encryption the underlying protocol had to change... however some servers such as the public login server will be slow to change so we've included a compatibility layer for legacy login connections:
-			- You should add <legacy>1</legacy> to the login section of your configuration file when connecting to a server that is using the old protocol.  
+			- You should add <legacy>1</legacy> to the login section of your configuration file when connecting to a server that is using the old protocol.
 			- The central eqemu login server uses the old protocol and probably will for the forseeable future so if your server is connecting to it be sure to add that tag to your configuration file in that section.
 			- Telnet no longer uses the same port as the Server to Server connection and because of this the tcp tag no longer has any effect on telnet connections.
 				- To enable telnet you need to add a telnet tag in the world section of configuration such as:
@@ -625,11 +657,11 @@ Akkadius: [Performance] Reworked how all log calls are made in the source
 	- Before we used Log.Out, we will now use a macro Log(
 		- Before: Log.Out(Logs::General, Logs::Status, "Importing Spells...");
 		- After: Log(Logs::General, Logs::Status, "Importing Spells...");
-	- The difference is 
+	- The difference is
 		1) It's 200-300x faster especially when log statements are inside very hot code paths. We already
-			had most hot paths checked before we logged them, but this blankets all existing logging calls now and not just the 
+			had most hot paths checked before we logged them, but this blankets all existing logging calls now and not just the
 			select few we had picked out in the source.
-		2) Strings don't get copied to the stack, popped and pushed constantly even when we hit a log statement that 
+		2) Strings don't get copied to the stack, popped and pushed constantly even when we hit a log statement that
 			actually isn't going to log anything.
 				- We do an 'if (LogSys.log_settings[log_category].is_category_enabled == 1)' before we call a log function
 					in the log macro so the log function doesn't get called at all if we're not logging the category
@@ -639,16 +671,16 @@ Akkadius: [Performance] Reworked how all log calls are made in the source
 
 == 03/30/2017 ==
 Akkadius: [Performance] Fixed an overhead issue where many hot paths would trigger quest subroutines and beneath that the code would
-	try to see if a quest existed perpetually (checking if file exists) even though it should have determined the quest 
+	try to see if a quest existed perpetually (checking if file exists) even though it should have determined the quest
 	didn't exist the first time.
 	- This caused a lot of overhead in an instance where an entire zone of NPC's is pathing, triggering EVENT_WAYPOINT_ARRIVE
-	and EVENT_WAYPOINT_DEPART when there is no global_npc.pl/lua, or all NPC's pathing don't have a quest assigned, similar 
+	and EVENT_WAYPOINT_DEPART when there is no global_npc.pl/lua, or all NPC's pathing don't have a quest assigned, similar
 	behavior would occur. This goes for any other type of quests: spells, items, encounters etc.
 
 == 03/28/2017 ==
 Akkadius: [Performance] Fixed a large overhead issue where every single NPC in a zone was checking to depop themselves
 	as a swarm pet every 3ms regardless of being a swarm pet or not. Swarm pets now check to depop only when their timer is up
-Akkadius: [Performance] Removed a timer where clients would constantly calculate light amount on equipment every 600ms, instead 
+Akkadius: [Performance] Removed a timer where clients would constantly calculate light amount on equipment every 600ms, instead
 	clients will update light when changing equipment or entering a zone
 Akkadius: [Performance] Disabled enraged timer checks for NPC's that do not actually have enrage as a special attack
 Akkadius: [Performance] Don't process ProjectileAttack checks for NPC's that are not engaged in any combat
@@ -659,7 +691,7 @@ Akkadius: [Performance] Reworked how client to NPC aggro checks are made
 		check an entire entity list with distance calcs and other checks for aggro, with many clients in a zone and many NPC's this would
 		add a lot of unecessary overhead. A temporary adjustment on 3/25 was made and upped the check to 6 seconds.
 	- Now, there is a new methodology to scanning. The client will build a cache list of NPC's within close range as defined in new rule:
-		RULE_INT(Range, ClientNPCScan, 300) and will also get any NPC that has an aggro range beyond that defined range to use in 
+		RULE_INT(Range, ClientNPCScan, 300) and will also get any NPC that has an aggro range beyond that defined range to use in
 		the frequent checks for aggro, the result is far less overhead
 	- Client scanning changes when moving versus not moving, the client will scan aggro every 500 milliseconds while moving, and
 		3000 millseconds aggro check when not moving, with a 6000ms re-fetch for close NPC's
@@ -668,7 +700,7 @@ Akkadius: [Performance] Reworked how client to NPC aggro checks are made
 
 == 03/25/2017 ==
 Akkadius: [Performance] Reduced CPU footprint in non-combat zones doing constant checks for combat related activities
-Akkadius: [Performance] Reduced CPU footprint in cases where a client is checking for aggro excessively every 750 millseconds. This has 
+Akkadius: [Performance] Reduced CPU footprint in cases where a client is checking for aggro excessively every 750 millseconds. This has
 	been adjusted to 6 seconds per new rule RULE_INT(Aggro, ClientAggroCheckInterval)
 	- When zones have many players, with many NPC's, this adds up quickly
 
@@ -685,7 +717,7 @@ Akkadius: [Performance]
 	RULE_INT ( Range, SongMessages, 75)
 	RULE_INT ( Range, MobPositionUpdates, 600)
 	RULE_INT ( Range, CriticalDamage, 80)
-	
+
  - (Readability) Also cleaned up some formatting in messaging and packets so it is easier to understand what is going on with the code
 
 == 03/09/2017 ==
@@ -7707,13 +7739,13 @@ Trevius: Food and Drink will now actually give stats.
 
 Required SQL: utils/sql/svn/229_spells_table.sql
 
-==11/22/2008
+==11/22/2008==
 Trevius/AndMetal: Corrected the output of #showstats to provide accurate Attack Rating calculations.
 Derision: Initialise animation to zero in the Mob constructor to prevent players sometimes appearing to run off when they first spawn.
 Derision: /buyer /barter fix.
 Trevius: Added Account Limiting to allow limiting how many characters can be logged in per account at once - See Optional SQL.
 
-==11/20/2008
+==11/20/2008==
 Derision: Implemented /buyer (cash compensation only) and /barter. Update your patch_Titanium.conf from the utils directory.
 
 REQUIRED SQL:
@@ -7732,19 +7764,19 @@ CREATE TABLE `buyer` (
 ALTER TABLE `trader_audit` ADD `trantype` TINYINT NOT NULL DEFAULT '0';
 
 
-==11/20/2008
+==11/20/2008==
 cavedude00: (aza77) Added quest::collectitems.
 cavedude00: (Rocker8956) Zones with IDs higher than 255 can now be instanced.
 
-==11/19/2008
+==11/19/2008==
 seveianrex: (Varkalas) WAR Sturdiness AA Fix
 AndMetal: zone-*.log files on Linux will allow read access to group members. You may need to erase any existing logs to see the change.
 AndMetal: Added some logging for spell crits (SPELLS__CRITS)
 
-==11/18/2008
+==11/18/2008==
 Derision: Bazaar: Added support for changing prices without ending Trader mode.
 
-==11/16/2008
+==11/16/2008==
 Derision: Added command 'undyeme' to restore all a player's armor slots to their natural undyed state.
 Trevius: (Denivia) Changed Expansive Mind AA so that it raises the Worn Mana Regen Cap (as it should) instead of just increasing mana regen.
 Derision: Bazaar bug fix relating to items with -1 max charges.
@@ -7753,7 +7785,7 @@ Optional SQL:
 
 INSERT INTO commands (command, access, description) VALUES ('undyeme', 0, 'Remove dye from all of your armor slots');
 
-==11/15/2008
+==11/15/2008==
 seveianrex: Implemented AA use of SE_Accuracy (Ranger GoD AA "Precision of the Pathfinder" will have an effect now)
 seveianrex: Implemented Enchanter GoD AA "Mesmerization Mastery"
 seveianrex: Adjusted Monk Kick Mastery damage modifiers slightly.
@@ -7763,7 +7795,7 @@ Derision: Added Rule World:TutorialZoneID, default 189 (tutorialb).
 Derision: MinPrice/MaxPrice in the Bazaar search window are now interpreted correctly as values in Platinum.
 Derision: Bazaar bug fix.
 
-==11/14/2008
+==11/14/2008==
 seveianrex: Adjusted Coat of Thistles AA modifier.
 seveianrex: Implemented Pet Crits for NEC/MAG/BST (Deaths Fury, Elemental Fury, Warders Fury GoD era AAs)
 Derision: Bazaar Trader mode (not Barter). Please test it well.
@@ -7794,20 +7826,20 @@ CREATE TABLE `trader_audit` (
 
 UPDATE doors set opentype=155 where opentype=154 and zone='bazaar';
 
-==11/12/2008
+==11/12/2008==
 Congdar: Bots: add command #bot lore - Casts Identify on the item on your mouse pointer
 seveianrex: Tweaked the Slay Undead damage to once again. Damage should be in-line with live numbers now.
 Angelox: (Kobaz): Fix for 'PIC register bx clobbered in asm' error
 Angelox: Improved filtering on [bot track rare] option for Ranger
 Angelox: Added option [bot track near] for Ranger
 
-==11/11/2008
+==11/11/2008==
 Congdar: Bots: fix ghosting when runnning up to targets
 
-==11/10/2008
+==11/10/2008==
 Trevius/Derision: Fix for GM Training Point exploit when de-leveling and leveling up again
 
-==11/10/2008
+==11/10/2008==
 Derision: Implemented Looking For Group/Looking For Players Window. patch_Titanium_conf has been updated.
 Derision: Visual Studio users should add world/lfplist.h and world/lfplist.cpp to their project.
 
@@ -7816,7 +7848,7 @@ REQUIRED SQL:
 ALTER TABLE `character_` ADD `lfp` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0';
 ALTER TABLE `character_` ADD `lfg` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0';
 
-==11/08/2008
+==11/08/2008==
 Congdar: Bots: add command #bot resurrectme
 Congdar: Bots: modify heal ai, more mana calcs
 Congdar: Added Rule to allow melee to bind anywhere casters can bind, default is false
@@ -7825,7 +7857,7 @@ optional sql:
 seveianrex: Figured out what was crashing ranged procs. Is fixed and fully implemented now. Rangers rejoice..
 seveianrex: Modified the way #melody works to improve the delay between songs being casted. Bards rejoice..
 
-==11/07/2008
+==11/07/2008==
 seveianrex: GoD Rogue AA's: Seized Opportunity, Triple Backstab implemented
 seveianrex: (LeftRoad) Provide a damage message to client when mob is killed by a spell
 Congdar: Bots: reduce spam, fix crash when fighting Dain, change mana/hp from npc to client like calcs
@@ -7836,16 +7868,16 @@ INSERT INTO commands (command, access, description) VALUES ('melody', 0, 'A supp
 
 seveianrex: Added support for defensive and ranged spell-effect based procs. Having some zone-crash issues with the ranged proc code for some reason, so it's commented out until I can fix it.
 
-==11/05/2008
+==11/05/2008==
 Derision: Dyed armor color should now show up correctly to other players.
 Derision: Implemented the Potion Belt.
 
-==11/03/2008
+==11/03/2008==
 seveianrex: Added some scaling to the way NPC hitboxes are calculated. This corrects some of the issues with mobs like Wurms/Dragons who you could hit from miles away.
 seveianrex: NPCs who are 5% HP or lower, are fleeing, and have a decent snare on will no longer cover so much distance.
 seveianrex: Implemented Mob::GetSnaredAmount() function, utilized in the above. Returns the ABS() value of the snare.
 
-==11/01/2008
+==11/01/2008==
 seveianrex: GoD AA Implementations: [CLR] Touch of the Divine, [BRD] Internal Metronome, [SHD] Improved Consumption of the Soul
 Derision: Allow backtick through the CleanName filter.
 Derision: Pickpocket should no longer occasionally bug the UI.
@@ -7853,23 +7885,23 @@ Derision: Pickpocketing money should no longer show twice the amount taken in th
 Derision: Looting stackable PVPItem now works.
 Derision: Client now updates correctly when a charge on an item with a right click effect is used. Update your patch_Titanium.conf
 
-==10/31/2008
+==10/31/2008==
 seveianrex: Monk updates: Strikethrough AA, Mend Worsen Frequency Tweak, Kick Mastery AA Fix
 seveianrex: Implemented Pet Flurries for MAG/BST/NEC
 Derision: Extended quest::popup to take optional PopupID and buttontype (OK or YES/NO) fields.
 
-==10/30/2008
+==10/30/2008==
 KLS: Spell crits should work reasonably well once again.
 Derision: Fixed inability to jump introduced in Rev161.
 
-==10/29/2008
+==10/29/2008==
 Derision: Mobs in water should no longer sink to the bottom.
 cavedude00: Added rule to enable DeathExpLossMultiplier, or to use server code default.
 
 Optional SQL:
 Insert into rule_values values (0, 'Character:UseDeathExpLossMult', 'true');
 
-==10/27/2008
+==10/27/2008==
 seveianrex: Added server-side code for WAR sturdiness AA
 Angelox: (Cbodmer) Experience loss based on cbodmers formula with added rule to regulate loss amount
 Trevius: (Denivia) Added Critical Spell Damage for Lifetaps with the proper AAs
@@ -7877,7 +7909,7 @@ Trevius: (Denivia) Added Critical Spell Damage for Lifetaps with the proper AAs
 Optional SQL (options are 0-10, defaults to 3):
 Insert into rule_values values (0, 'Character:DeathExpLossMultiplier', 3);
 
-==10/26/2008
+==10/26/2008==
 Derision: Implemented Bandolier. Test thoroughly before trusting it with your Epic.
 Derision: Minor change to enable the spell Tiny Companion to work.
 
@@ -7885,7 +7917,7 @@ Derision: Minor change to enable the spell Tiny Companion to work.
 seveianrex: Slay Undead tweak + message gender fix, Tradeskill message gender fix
 Trevius: Updated SQL file for R142 to correct some altadv_vars AA table issues with AA requirements
 
-==10/24/2008
+==10/24/2008==
 seveianrex: Implemented various GoD AAs: Coat of Thistles, Rapid Strikes, Elemental Durability, Subtlety2, Strengthened Strike, Vicious Smash
 seveianrex: Implemented GoD Monk AA "Kick Mastery"
 Trevius: Adjusted the new Frenzy AAs code to fix a crash
@@ -7898,7 +7930,7 @@ Derision: 'Killing' LDoN chest type objects(e.g. Vermin Nests) will now update k
 KLS: Revert Lag fixes that were causing movement and facing abnormalities.
 KLS: Fix to a few problems with quest::creategroundobject that was causing it to not work in some situations.
 
-==10/23/2008
+==10/23/2008==
 Congdar: Clone NoDrop removal code to NoRent, Lore, NoTrade.  Optionally enabled in the db Variables table DisasbleNoDrop=1 DisableNoRent=true DisableLore=1 DisableNoTrade=1
 Congdar: Bot code cleanup, method call reduction
 Congdar: Bot DoubleAttack method is more like clients
@@ -7925,7 +7957,7 @@ Required SQL:
 
 ALTER TABLE `tasks` ADD `repeatable` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '1';
 
-==10/22/2008
+==10/22/2008==
 AndMetal: Fix for item links to prevent occasional zone crashes
 AndMetal: Critical DOTs should now work correctly
 AndMetal: Fixed sql/svn/125_aggrozone.sql to work with current command table schema
@@ -7937,7 +7969,7 @@ AndMetal: Support for +Stat Cap (Wunshi's Focusing, etc)
 AndMetal: New rules for tweaking spell crits: Spells:BaseCritChance(0), Spells:BaseCritRatio(0), Spells:WizCritLevel(12), Spells:WizCritChance(7), Spells:WizCritRatio(15)
 AndMetal: Loot messages will now have item links instead of just the item name
 
-==10/21/2008
+==10/21/2008==
 KLS: Some changes to make compiling with profiler enabled more error free.
 KLS: Added player quest event EVENT_TASK_STAGE_COMPLETE exports $task_id and $activity_id.
 KLS: Added player quest event EVENT_PICK_UP exports $picked_up_id for when a player picks up a ground spawn or dropped item.
@@ -7945,7 +7977,7 @@ KLS: Added quest::CreateGroundObject(itemid, x, y, z, heading) which lets the qu
 KLS: Objects should decay after they're loaded back into the world. Might want to backup your objects table till I can confirm this works 100%.
 KLS: Lowered ground object decay time from 30 min to 5 min.
 
-==10/20/2008
+==10/20/2008==
 AndMetal: (erde) Moved SVN SQL updates to utils/sql/svn. File name will start with the revision they were introduced & optional updates have optional somewhere at the beginning of the name
 Derision/Trevius: Implemented sub EVENT_AGGRO_SAY
 AndMetal: Implemented Reverse Damage Shield
@@ -7953,7 +7985,7 @@ AndMetal: Fixed +Damage Shield on items so that it doesn't work without having a
 AndMetal: (seveianrex) Hate w[h]iped on CoH
 AndMetal: (via Yeahlight) New command: #aggrozone. Requires 100 status by default
 
-==10/19/2008
+==10/19/2008==
 Angelox: Added a start to Bot tracking - Thanks Derision for all the help and know-how.
 Derision: Altered damage shield message processing to be more like (the same?) as live.
 Derision: If it exists, damage shield types are read from a new table (damageshieldtypes)
@@ -7961,7 +7993,7 @@ Derision: If no entry exists in the table, a default based on resist type is use
 
 Optional SQL: See utils/sql/damageshieldtypes.sql
 
-==10/18/2008
+==10/18/2008==
 KLS: Reworked classic style traps.
 KLS: Debuff style traps should function perfectly, the level field in the DB gives what level the caster is for resists in this case.
 KLS: Added respawn and respawn variance to traps.
@@ -7983,12 +8015,12 @@ ALTER TABLE `traps` ADD `respawn_time` INT(11) UNSIGNED DEFAULT '60' NOT NULL AF
 ALTER TABLE `traps` ADD `level` MEDIUMINT(4) UNSIGNED DEFAULT '1' NOT NULL AFTER `skill`;
 ALTER TABLE `traps` ADD `respawn_var` INT(11) UNSIGNED DEFAULT '0' NOT NULL AFTER `respawn_time`;
 
-==10/17/2008
+==10/17/2008==
 KLS: Tweaks to /pet attack
 KLS: Renamed WhipeHateList to WipeHateList so I never have to view that spelling monster ever again.
 cavedude00: (Rocker8956) Added shutdowndelay to zone query.
 
-==10/16/2008
+==10/16/2008==
 Derision: Cosmetic change to foraging to correctly identify food/drink items.
 cavedude00: Added rules to determine if /ooc and /auction should be server wide (true) or zone wide (false - Live Like).
 cavedude00: #peqzone can no longer be used if invulnerable.
@@ -8000,14 +8032,14 @@ Optional SQL:
 insert into rule_values values (0, 'Chat:ServerWideOOC', 'true');
 insert into rule_values values (0, 'Chat:ServerWideAuction', 'true');
 
-==10/15/2008
+==10/15/2008==
 Derision: Added OP_LevelAppearance to utils/patch_Titanium.conf and it is now sent to nearby clients (eye candy when you level)
 Derision: (seveianrex) Alcohol Drinking / Skillup Fix
 KLS: Change to proc code to correct some oddities with % chance to proc.
 KLS: Changed how avoidance bonuses are calculated to be like other melee bonuses.
 KLS: (seveianrex) Basic Pet Focus Implementation.
 
-==10/14/2008
+==10/14/2008==
 Trevius: Charm Spells set to max level of 0 now have unlimited max level as they should
 Derision: Player pets should no longer be fearable if npcspecialattks contains 'D'.
 cavedude00: (Rocker8956) Changes to quest::getlevel and quest::setinstflag/setinstflagmanually to reduce DB access
@@ -8015,21 +8047,21 @@ cavedude00: (Rocker8956) Added quest::getinstflag
 KLS: Fixed crash in shutdown delay, please test things for crashes before adding them, this was pretty obvious.
 Derision: Removed requirement to be grouped for Translocate spells.
 
-==10/13/2008
+==10/13/2008==
 Derision: Looting your corpse while liched/wolf form etc should now auto-equip items
 
-==10/12/2008
+==10/12/2008==
 Derision: No more binding wounds while feigning death.
 Derision: (Rocker8956) Movegrp quest command fix.
 Derision: (LeftRoad) TEMPORARY(NORENT) items in a character inventory will be retained if you log back into that character within 30 minutes.
 KLS: Implemented Raid::TeleportGroup() and Raid::TeleportRaid(), untested but should work.
 KLS: (seveianrex) Critical DoT and Sinister Strikes AA.
 
-==10/11/2008
+==10/11/2008==
 Derision: Resurrection fix.
 KLS: Rebalanced skill ups.
 
-==10/10/2008
+==10/10/2008==
 AndMetal: Added functions to calculate AA bonuses just like item & spell bonuses (not turned on yet)
 Condgar: Fix for Bots wont Attack
 Congdar: Fix low level bots hitting too hard
@@ -8037,7 +8069,7 @@ Derision: Prevent two instances of possible zone crashes due to null pointers.
 Trevius: (Striat) Added quest commands for zone and world emotes - quest::ze() & quest::we()
 Derision: Recalculate Pet bonuses on zoning before setting current HP/Mana.
 
-==10/09/2008
+==10/09/2008==
 Congdar: Replace Client IsEngaged() checks in Bot Source with bot aggro check
 Trevius: (AndMetal) Added quest Object SetOOCRegen() to adjust NPC Out of Combat Regen on the fly.
 Trevius: Relocated the Empty Corpse check code so that the Decay Time rule for it will now work.
@@ -8048,18 +8080,18 @@ Derision: Reworked code to stop mobs fleeing if they have buddies to account for
 Optional SQL:
 Insert into rule_values values (0, 'Character:MaxExpLevel', 0);
 
-==10/08/2008
+==10/08/2008==
 Congdar: Fix orphaned bots when camping/zoning
 Congdar: Link bot assist with client auto attack
 Derision: Added #titlesuffix command to add a title after a player's name.
 
-==10/07/2008
+==10/07/2008==
 Congdar: Allow bot pets to be the main tank in a bot raid
 Congdar: Remove old Sense Heading skill check
 AndMetal: Web interface will now list open petitions.
 Derision: #title should now prefix the target player's name, e.g. #title Lord_Protector (underscores are replaced with spaces, max 31 chars)
 
-==10/06/2008
+==10/06/2008==
 Angelox: Fix Bot names in group window (now is 'Mybot' instead of 'Mybot000')
 cavedude00: (erde) Fix for world and zone crashing when compiled on VS 2008 in release mode.
 cavedude00: (Rocker8956) Zone shutdown timer rule.
@@ -8073,7 +8105,7 @@ INSERT INTO rule_values VALUES (1,'Zone:AutoShutdownDelay', 5000);
 Derision: Total time playing <character> in /played now maintained across sessions.
 Derision: Corrected OP_DuelResponse/OP_DuelResponse2/OP_Shielding opcodes in utils/patch_Titanium.conf
 
-==10/04/2008
+==10/04/2008==
 Congdar: Double Attack redo, tested working
 Congdar: Fix Bot follow bug when a bot gets killed
 Derision: Added minlevel and maxlevel fields to tasks table and new quest function istaskappropriate(task).
@@ -8086,7 +8118,7 @@ Required SQL:
 ALTER TABLE `tasks` ADD `minlevel` TINYINT UNSIGNED NOT NULL DEFAULT '0',
 ADD `maxlevel` TINYINT UNSIGNED NOT NULL DEFAULT '0';
 
-==10/03/2008
+==10/03/2008==
 Congdar: Add EQOffline Bot Source
 Derision: Removed 'stepped' column from task table. See http://eqemulator.net/forums/showthread.php?p=157613
 Derision: Added display of Task Description to #task show to aid in debugging a reported problem.
@@ -8098,25 +8130,25 @@ KLS: Fix to crash in monk special attack function.
 
 Required SQL: ALTER TABLE `tasks` DROP `stepped` ;
 
-==10/02/2008
+==10/02/2008==
 KLS: (Congdar) Update to Tech. of Master Wu AA.
 KLS: Revert of double attack change, people reporting non warriors were no longer double attacking properly.
 KLS: Compile Warning in Database::GetZoneName()
 KLS: Change to IsPlayerIllusionSpell() to make it more consistant, illusion spells can be more than 49 so we work off behavior and effect now.
 KLS: Added AA__Message logs to project illusion code to try to track down an error.
 
-==10/01/2008
+==10/01/2008==
 Derision: (erde) VS2008 Compile Fix (#if (_MSC_VER < 1500) #define vsnprintf _vsnprintf #endif
 Derision: Fix to stop zone crashing when looting PVPItem and PVPReward is set to 3.
 cavedude00: Group members will no longer recieve a split when a player corpse is looted.
 
-==9/30/2008
+==9/30/2008==
 Derision: Task activities with an activitytype of <= 0 in the activities table will be sent with an activitytype of 9 to the client.
 Derision: The reward field in the task table will now be displayed even if rewardid=0
 cavedude00: (Rocker8956) Added quest function to get average group/raid level.
 cavedude00: (Rocker8956) Changes to setinstflagmanually to allow deletion of instance flags and to allow manual flagging of raids, groups, and individuals.
 
-==9/29/2008
+==9/29/2008==
 cavedude00: Added rule World:ClearTempMerchantlist to control whether world clears temp merchant items when started or not.
 AndMetal: (Congdar) New Double Attack logic
 Angelox: Keyring code fix, so clicky portals that require keys will work too.
@@ -8126,11 +8158,11 @@ AndMetal: Ayonae's Tutelage should now calculate bonus for Singing
 Optional SQL:
 insert into rule_values values (0,'World:ClearTempMerchantlist','true');
 
-==9/28/2008
+==9/28/2008==
 AndMetal: Fixed exploit for pets ignoring Fear by using /pet commands
 AndMetal: #wp add will now use the highest value in the grid_entries table + 1 if you don't use a Waypoint # or use 0
 
-==09/26/2008
+==09/26/2008==
 cavedude00: (AndMetal) Deathblow AA
 cavedude00: (AndMetal) Swift Journey AA
 cavedude00: (AndMetal) Convalescence and Healthy Aura AAs
@@ -8145,7 +8177,7 @@ Optional SQL:
 Insert into rule_values values (0, 'World:AddMaxClientsPerIP', -1 );
 Insert into rule_values values (0, 'World:AddMaxClientsStatus', -1 );
 
-==09/25/2008
+==09/25/2008==
 cavedude00: (trevius) IP Limiting Minor Fix
 cavedude00: (trevius) New Quest Command quest::clearspawntimers()
 cavedude00: (trevius) New Quest Command quest::traindiscs()
@@ -8174,7 +8206,7 @@ cavedude00: Several minor forage/fishing fixes
 Required SQL is in utils/sql/09252008.sql
 Make sure you update your .conf files, also found in utils!
 
-==09/01/2008
+==09/01/2008==
 KLS: (derision) Crash Fix.
 KLS: (haecz) Non-Melee damage filter.
 KLS: (LordKahel) Lore Slotted Augment.
@@ -8204,12 +8236,12 @@ CREATE TABLE `blocked_spells` (
   PRIMARY KEY  (`id`)
 )
 
-==08/15/2008
+==08/15/2008==
 KLS: Fix for groups clearing on new group create.
 KLS: Fix for null row access in Database::GetLeaderName()
 KLS: CountDispellableBuffs now will validate buffs spells.
 
-==08/14/2008
+==08/14/2008==
 KLS: Very basic work on raids.
 KLS: Moved group id calls to their own database as to not be blocked by long character_ selects and such.
 
@@ -8222,7 +8254,7 @@ CREATE TABLE `group_id` (
 )
 ENGINE = InnoDB;
 
-==08/13/2008
+==08/13/2008==
 KLS: Added dispel field for npc spells as 512.
 KLS: NPCs should be smarter about when they choose to cast certain spells; namely dots, lifetaps and dispels.
 KLS: NPCs should continue to cast nuke spells for a longer period of time.
@@ -8242,7 +8274,7 @@ UPDATE npc_spells_entries SET type='512' WHERE spellid='49';
 UPDATE npc_spells_entries SET type='512' WHERE spellid='1526';
 UPDATE npc_spells_entries SET type='512' WHERE spellid='1697';
 
-==08/11/2008
+==08/11/2008==
 KLS: Group leader info should transfer to a new zone when the leader transfers to that zone.
 KLS: Will now force a group update to players not in zone, text not correct.
 KLS: Added #refreshgroup command - will refresh group visually from DB
@@ -8261,15 +8293,15 @@ CREATE TABLE `group_leaders` (
 )
 ENGINE = InnoDB;
 
-==08/09/2008
+==08/09/2008==
 KLS: Minor tweaks to heal aggro.
 
-==08/07/2008
+==08/07/2008==
 KLS: Bald char fix revert, will try something else.
 KLS: Wake The Dead initial implementation.
 KLS: Hopefully better bald character fix base on kraeger's findings.
 
-==08/04/2008
+==08/04/2008==
 KLS: (Derision) Pet Buff Window Implemented.
 KLS: Charmed pets should now function with the pet window, as well as appear correctly in group.
 KLS: Added rule Character:SkillUpModifier (100) to govern how fasts skill ups happen on a server.  100% = normal chance, 200% = double normal chance.
@@ -8290,26 +8322,26 @@ KLS: Roughly implemented Skill Attack spell effect.
 Required:
 patch_6.2.conf and patch_Titanium.conf files have changed be sure to update them.
 
-==07/21/2008
+==07/21/2008==
 KLS: (irv0) Fix for out of order ack not being sent in some situations.
 KLS: (Derision) Pet bar OOC update fix.
 KLS: Should have made client pets unable to give experience, untested but should work.
 KLS: Healing aggro should function better for people not on the hate list.
 KLS: Some work on public tradeskill objects saving their content between uses.
 
-==06/22/2008
+==06/22/2008==
 KLS: Changed world/clientlist.cpp's line endings back to unix style line endings
 KLS: Fixed up ipban based on updated code from TheLieka.
 
-==06/21/2008
+==06/21/2008==
 KLS: Belated updates to azone including (derision)EQG fixes and some changes to make it easier to compile under windows.
 KLS: Fixed inconsistant line endings in ruletypes.h; there are probably more line ending changes I didn't catch, please try to keep your line endings consistant with what's in the repo.
 
-==06/19/2008
+==06/19/2008==
 Scorpious2k (Knightly): Correction of divine intervention text
 Scorpious2k (LordKahel): Support for defensive Instinct and Reflexive Mastery AA
 
-==06/18/2008
+==06/18/2008==
 Scorpious2k (Derision): Fix for flee runspeed - linear flee speed reduction as HP drops
 Scorpious2k (Derision): Rule to prevent mobs from fleeing if they are being helped by other NPCs
 Scorpious2k (haecz): Distance check for corpse dragging
@@ -8319,7 +8351,7 @@ Scorpious2k (greggg230): Faction will now show on /con for agnostic players
 Scorpious2k (BatCountry): Correction of a zone crash caused by reloading rules
 Scorpious2k (Congdar): Eliminated array index error/zone crash in spells
 
-==06/17/2008
+==06/17/2008==
 Scorpious2k (TheLieka): Ban by IP
 Scorpious2k (cavedude/TheLieka): Ability to limit melee guys from being bound in certain zones. This changes the canbind
             column of the zone table. Value 0 means noone can bind, value 1 means only casters can bind, value 2 means
@@ -8336,7 +8368,7 @@ Optional SQL:
 Insert into rule_values values (0, 'World:UseBannedIPsTable', 0);
 Update zone set canbind = 2 where zoneidnumber in (1,2,3,8,9,10,19,23,24,29,40,41,42,45,49,52,54,55,60,61,62,67,75,82,83,106,155);
 
-==06/14/2008
+==06/14/2008==
 Scorpious2k(Trevius): Door names can now go beyond the 16 char limit to allow doors and other objects from later expansions
                        to be used. The new max is 32 characters.
 Scorpious2k(Derision): New fear adjustment to cause mobs to flee at the correct rates instead of running very fast at certain
@@ -8353,7 +8385,7 @@ Scorpious2k(Striat): Quest Commands for Temp Race, Texture, Size and Gender Chan
 Required sql:
 ALTER TABLE `doors` MODIFY COLUMN `name` VARCHAR(32) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;
 
-==05/30/2008
+==05/30/2008==
 Scorpious2k: (Derision/Wiz) Added code to implement fear.
 KLS: (Leika) Implemented detection of various MQ activities.
 KLS: EVENT_CAST_ON should now export $spell_id properly.
@@ -8372,7 +8404,7 @@ CREATE TABLE `hackers` (
   PRIMARY KEY  (`id`)
 ) AUTO_INCREMENT=8;
 
-==04/26/2008
+==04/26/2008==
 KLS: Should have fixed discipline and combat ability timer overlap.
 KLS: Added a rule for partial hits on fear, seperate from normal resist partial hits.
 KLS: Fixed some quirks in the aggro system.
@@ -8387,10 +8419,10 @@ Required SQL:
 alter table `zone` add column `canlevitate` tinyint (4) DEFAULT '1' NOT NULL  after `cancombat`
 alter table `zone` add column `castoutdoor` tinyint (4) DEFAULT '1' NOT NULL  after `canlevitate`;
 
-==04/22/2008
+==04/22/2008==
 Rogean: Server-side check for removing detrimental spells.
 
-==04/13/2008
+==04/13/2008==
 Rogean: Fixed a hack to sell no-drop items to merchants. (Reported by KingMort)
 Rogean: Fixed #hideme, it won't show you zone in and then disappear anymore. (Reported by KingMort)
 Rogean: Fixed /summon.
@@ -8399,7 +8431,7 @@ Rogean: Changes to /who all and GM's:
 	You will not show up to players of lower status if your /anon and #gm on, if your #gm off and /anon you will show up as
 	a normal player, regardless of statuses.
 
-==04/09/2008
+==04/09/2008==
 KLS: (AiliaMorisato)Fixed death packet bindzoneid and attack_skill fields being switched.
 KLS: Added rule based caps for all PoP item abilities.
 KLS: Agility will now affect a defenders chance to be missed slightly.
@@ -8426,20 +8458,20 @@ Required SQL:
 ALTER TABLE npc_types ADD ATK MEDIUMINT NOT NULL DEFAULT '0';
 ALTER TABLE npc_types ADD Accuracy MEDIUMINT NOT NULL DEFAULT '0';
 
-==04/01/2008
+==04/01/2008==
 Rogean: Fixed a merchant purchase packet exploit.
 
-==02/28/2008
+==02/28/2008==
 WildcardX: Tweaked the code for the Divine Intervention spell line code and the Unfailing Divinity AA ability.
 
-==02/27/2008
+==02/27/2008==
 WildcardX: Implemented HeadShot AA Ability.
 WildcardX: Archery and throwing attacks will not cause you to suffer injury from your target's damage shield.
 WildcardX: Implemented Spell: Death Pact.
 WildcardX: Implemented Spell: Divine Intervention.
 WildcardX: Implemented Unfailing Divinity AA Ability.
 
-==02/25/2008
+==02/25/2008==
 WildcardX: Enchanters can now control their pets if they purchased the Animation Empathy AA.
 WildcardX: Mobs now have a chance to resist fear spell line each tic.
 WildcardX: Mobs now have a chance to resist charm spell line each tic.
@@ -8447,21 +8479,21 @@ WildcardX: Implemented Total Domination AA.
 WildcardX: Reworked new charisma test. This test now evaluates factors like MR, CHA, mob and caster levels. It yields better live-like results.
 WildcardX: Enchanter pets now get the /pet report and /pet health commands by default.
 
-==02/23/2008
+==02/23/2008==
 WildcardX: Only characters with Pet Affinity AA can have group buffs casted on their pets.
 WildcardX: Fixed a bug that would not allow a rune buff to be used in some situations.
 
-==02/22/2008
+==02/22/2008==
 WildcardX: Characters can now have only one caster specialization skill above 50. If more than one specialization skill is detected above 50, then all specialization skills are reset to 1.
 WildcardX: Reworked mana reduction calculations.
 WildcardX: Implemented spell casting specilization checks.
 
-==02/21/2008
+==02/21/2008==
 WildcardX: Removed the possible fix for the Call of Hero spell as it didnt actually fix the issue after extensive testing.
 WildcardX: Added new command #scribespell. This will scribe a specified spell into the target's spell book.
 WildcardX: Added new command #unscribespell. This will unscribe a specified spell from the target's spell book.
 
-==02/20/2008
+==02/20/2008==
 KLS: Zone crash fix caused by calling the TryWeaponProc() method when dead.
 WildcardX: Changed the quest function depopzone() to accept a parameter to specify if the spawn timers should resume or become disabled. 0 = Disable, 1 = Enable.
 WildcardX: Added the quest function repopzone(). This function will cause a zone to repop it's spawns normally.
@@ -8469,28 +8501,28 @@ WildcardX: Possible fix for a zoning bug caused by the Call Of Hero spell.
 WildcardX: Harmony/Pacify line of spells will now cause aggro when resisted.
 WildcardX: Added a check against CHA to avoid aggro from a resisted Harmony/Pacify spell.
 
-==02/19/2008
+==02/19/2008==
 WildcardX: Found a small efficiency for the code that determines if an item is equipable.
 WildcardX: Re-worked the rune spell buff code to make it more efficient and reduce CPU utilization.
 WildcardX: Added the quest function depopall(int npctype_id). This will remove all mobs from the zone with the specified npctype_id.
 WildcardX: Added the quest function depopzone(). This will remove all mobs from the zone and NOT cause a repop.
 
-==02/10/2008
+==02/10/2008==
 WildcardX: Mesmerize line of spells will now cause aggro when casted on a mesmerize immune mob.
 WildcardX: Fixed enchanter spell Theft of Thought. This spell will now work as described.
 WildcardX: The pacify/harmony line of spells will no longer require a line of sight check to complete a cast.
 
-==01/28/2008
+==01/28/2008==
 WildcardX: Regenerated perl_mob.cpp due to deprecating the following methods: GetFamiliar(), SetFamiliar(), GetRune(), SetRune(), GetMagicRune(), SetMagicRune().
 WildcardX: Enchanters, this is your patch! Characters will now benefit from all rune and spell rune spell effects all spell buffs will provide, consistent with spell rules.
 WildcardX: Rune and spell rune spell buffs will now persist zoning and camping.
 WildcardX: Fixed a zone crash caused by TryWeaponProc() method.
 
-==01/27/2008
+==01/27/2008==
 WildcardX: Subtle changes to zoning code to allow both the 6.2 and Titanium client to perform all zoning operations similiar to live.
 WildcardX: Fixed #zone and #goto commands for both the 6.2 and Titanium client.
 
-==01/25/2008
+==01/25/2008==
 WildcardX: Regenerated perl_client.cpp and perl_groups.cpp due to parameter changes for Group::TeleportGroup and Client::MovePC methods. Changes to some quest files may be necessary.
 WildcardX: void	MovePC(int32 zoneID, float x, float y, float z, float heading)
 WildcardX: void	TeleportGroup(Mob* sender, int32 zoneID, float x, float y, float z, float heading)
@@ -8512,7 +8544,7 @@ EVENT_ENTERZONE with no special var
 EVENT_LEVEL_UP with no special var
 
 
-==01/24/2008
+==01/24/2008==
 WildcardX: Removed a 64 character cap length on merchant names sent during a merchant greeting.
 WildcardX: Fixed a bug that allowed players looting their corpse at just the right time, to duplicate their items.
 WildcardX: Fixed a bug I caused in group portals when I corrected the Succor/Evac line.
@@ -8525,7 +8557,7 @@ WildcardX: (cavedude) Created Character:DeathItemLossLevel rule to define when a
 Required SQL:
 insert into rule_values values(0, 'Character:DeathItemLossLevel', 10);
 
-==01/22/2008
+==01/22/2008==
 KLS: Clients will be immune to proximity aggro until they are finished loading now.
 KLS: Slightly reduced the melee accuracy of clients.
 KLS: Melee mitigation should now properly enforce minimum damage.
@@ -8538,7 +8570,7 @@ KLS: Figured in a work around for corpses between the server and client becoming
 KLS: AA Consumption of the soul should now function correctly.
 KLS: AA Soul Abrasion should now function correctly
 
-==01/19/2008
+==01/19/2008==
 KLS: Slightly reduced the effectivness of the Flurry AA
 KLS: Speed of the Knight AA implemented
 KLS: Evade will now reduce hate by a static amount, the static amount of hate increased slightly.
@@ -8575,11 +8607,11 @@ Changed Spells:SpellAggroModifier to Aggro:SpellAggroMod ( 100 )
 Changed Spells:BardSpellAggroMod to Aggro:SongAggroMod ( 33 )
 Changed Spells:PetSpellAggroMod to Aggro:PetSpellAggroMod ( 10 )
 
-==01/16/2008
+==01/16/2008==
 KLS: Updated AA_Data.sql with various small fixes.
 KLS: Changed HasPet() to check for the existance of the pet as mob as well as the petid, should sync up with GetPet() nicely now.
 
-==01/15/2008
+==01/15/2008==
 KLS: LDoN /open will only check for class now, client does not enforce bodytype so neither will the server.
 KLS: Numhits in disciplines should work correctly now
 KLS: Changed many instances where HasPet() was being checked to verify that we have a valid pet pointer from GetPet(), GetPet() will be used instead, (it is possible to have a valid pet ID and an invalid GetPet() pointer)
@@ -8589,10 +8621,10 @@ KLS: PickPocket should now correctly skill up on it's own through normal use.
 KLS: GetMinLevel(int16 spell_id) will now return 0 if the level for the class was 255 instead of 255, many buff formulas do not work well with 255 which can cause some issues when a class can use a clicky item with a spell they cannot scribe normally.
 KLS: GetProcID() should no longer have hard coded values.. whatever these represented are no longer valid in the current spell data.
 
-==01/14/2008
+==01/14/2008==
 WildcardX: Replaced the corpse consent system with one that allows cross zone player consents.
 
-==01/13/2008
+==01/13/2008==
 FatherNitwit: (Derision) Added tool (awater) to extract BSP tree with region type info from .s3d files into .wtr files.
 FatherNitwit: (Derision) Added support for zone to load .wtr files.
 FatherNitwit: (Derision) Employ water file to prevent under water mobs from sinking.
@@ -8606,10 +8638,10 @@ Watermap:CheckForWaterWhenFishing (Default: false)
 Watermap:FishingRodLength (Default: 30)
 Watermap:FishingLineLength (Default: 40)
 
-==01/12/2008
+==01/12/2008==
 WildcardX: (cavedude) Fixed beastlord pet sizes.
 
-==01/09/2008
+==01/09/2008==
 KLS: Starting items will now be saved if they are placed in slots other than the primary 8, this includes inside bags and on the character's inventory and bank slots
 KLS: Kick at level 55 or higher now has a chance to act as a spell interrupt as bash does.
 KLS: (TheLieka) Stun Immunity for Frontal Stuns on Ogres
@@ -8627,24 +8659,24 @@ Combat:PetAttackMagicLevel (Default: 30)
 NPC:SayPauseTimeInSec (Default: 5)
 NPC:OOCRegen (Default: 0)
 
-==12/06/2007
+==12/06/2007==
 KLS: Fixed logic on duration 7 formula.. again.
 
-==12/02/2007
+==12/02/2007==
 KLS: Reworked buff duration formula 7 calculations.
 KLS: (Cripp)Added (Missing?) pathing z rules.
 
-==11/30/2007
+==11/30/2007==
 FatherNitwit: Reworked pathing z code to be rules based instead of built time options.
 
-==11/29/2007
+==11/29/2007==
 FatherNitwit: (Derision) Fix BestZ pathing cleanup code top stop hopping.
 FatherNitwit: (Derision) New fix-z-on-load feature.
 
-==11/28/2007
+==11/28/2007==
 Rogean: Fixed another no-drop trade hack.
 
-==11/26/2007
+==11/26/2007==
 KLS: Dynamic zones will now not attempt to boot up more than one instance of the zone if two or more clients request it in quick succession.
 KLS: Fixed: qglobals will now not be exported for npcs that do not have the qglobal flag set in the perl parser.
 KLS: Added a new npc special attack 'H' for immune to aggro, mobs with this set should not aggro no matter what a person does to them.
@@ -8655,32 +8687,32 @@ KLS: Players will now be able to target themselves for group spells if they are
 KLS: Fixed some buff duration oddities.
 KLS: Level should have somewhat less of an impact for players in the resist code.
 
-==11/14/2007
+==11/14/2007==
 KLS: Swarm pets should be forced to correctly depop after their owner disappears.
 KLS: NPCs should be able to use swarm pets correctly now.
 KLS: #traindisc should no longer learn disciplines over already known disciplines.
 KLS: Added a few more known spell effects to spdat.h, not implemented any yet
 KLS: Rez experience should now only goto regular experience, not AA experience.
 
-==11/07/2007
+==11/07/2007==
 KLS: Reworked swarm pets a bit
 KLS: Swarm pets should no longer crash zones(I hope)
 KLS: Swarm pets will now gain all their information from the normal pet tables and the spell data, as a result the aa_swarmpets table is now obsolete.
 
-==11/06/2007
+==11/06/2007==
 KLS: Reverted client timeouts.
 KLS: Fixed NPC HP and Mana Regen not loading from DB for NPCs
 
-==11/05/2007
+==11/05/2007==
 WildcardX: Fixed a bug that prevented player corpse summoning spells from working on Linux platforms.
 
-==11/04/2007
+==11/04/2007==
 WildcardX: The spell "Reanimation" will no longer restore any player experience. This is a 0% experience resurrection.
 WildcardX: Corpses moved by a consented player will now remember where it was moved to, even after a zone restart.
 WildcardX: Necromancers and Shadowknights can now summon corpses belonging to other players.
 WildcardX: Corrected a bug that would have allowed Necromancers and Shadownights to summon corpses belonging to non-grouped party members.
 
-==11/03/2007
+==11/03/2007==
 WildcardX: (Cavedude) Implemented perl wrappers for new quest methods supporting the Shadowrest zone implementation.
 WildcardX: Fixed a bug that prevented a player from experiencing resurrection effects in designated no combat zones.
 WildcardX: Fixed a bug in graveyard system that could leave a player corpse in the database, but without a location.
@@ -8696,7 +8728,7 @@ alter table player_corpses add column IsBurried TINYINT(3) NOT NULL default 0;
 alter table player_corpses add column WasAtGraveyard TINYINT(3) NOT NULL default 0;
 insert into rule_values values(0, 'Zone:EnableShadowrest', 0);
 
-==11/01/2007
+==11/01/2007==
 WildcardX: (TheLieka) Bug fix to discontinue player invisibility when the player loots.
 WildcardX: (TheLieka) Bug fix to remove a type from the #npcedit loottable command.
 WildcardX: Implemented corpse graveyard support for all zones. Once a zone is configured for a graveyard, a zone restart is necessary.
@@ -8721,7 +8753,7 @@ CREATE TABLE `graveyard` (
 
 insert into rule_values values(0, 'Zone:GraveyardTimeMS', 1200000);
 
-==10/19/2007
+==10/19/2007==
 WildcardX: (Bleh) Enhancement to avoid a zone crash by avoiding a null pointer.
 WildcardX: (UrbeIT) Bug fix to allow pet spells to effect players in PVP.
 WildcardX: (UrbeIT) Bug fix to allow players to remain invisible while in PVP.
@@ -8732,26 +8764,26 @@ WildcardX: (zydria) Bug fix to allow players to meditate while mounted.
 WildcardX: (Cavedude) Enhancement to allow berserkers and rangers the chance to triple attack.
 WildcardX: (Cavedude) Enhancement to quest::movepc method to accept a heading value.
 
-==10/17/2007
+==10/17/2007==
 KLS: Quick fix to quest::movegrp
 
-==10/11/2007
+==10/11/2007==
 KLS: Familiars should fall under the pet system instead of their own system now, familiars should act in a much more behaved fashion when it comes to functionality shared with normal pets.
 KLS: Added a network timeout for clients in zone, clients should linkdead from zone when their connection is suddenly severed.
 KLS: (AiliaMorisato) Added some checks for item bonuses, bonuses should not calculate if the item is not equipable.
 KLS: NPCs should now accept signals while engaged in combat.
 
-==10/10/2007
+==10/10/2007==
 FatherNitwit: Quick fix for Divine Aura on pets exploit (KingMort)
 
-==10/09/2007
+==10/09/2007==
 KLS: Tweaked my AC system a bit, should get less default defense and the system should be much more lienent overall,
 goal is to allow people to see more of a benefit from having AC.
 
-==09/24/2007
+==09/24/2007==
 FatherNitwit: (sfisque) Quick adjustment to item fishing probability.
 
-==09/07/2007
+==09/07/2007==
 KLS: Fixed melee mitigation and tweaks and a small fix to AC.
 KLS: Small changes to the order in the getweapondamage code to make it a little more efficient
 KLS: Added a field that allows you to override a factions innate desire to assist their own faction in battle to the npc_faction table
@@ -8766,7 +8798,7 @@ KLS: Lockpicking should work once again
 KLS: Should hopefully no longer be possible to use teleport doors when they are in the closed position.
 KLS: Added basic AC mitigation, not on by default uncomment #define USE_INT_AC in features.h to use it.
 
-==08/31/2007
+==08/31/2007==
 KLS: (gernblan) Added spawn group info to #npcstats
 KLS: (TheLieka) Fix for zone exp modifiers not being used
 KLS: (inkubus) Lull and harmony spells should land on enemy targets and not cause any aggro, still some work to be done on the AE portion.
@@ -8775,7 +8807,7 @@ KLS: (cbodmer) Support for LDoN style boxes (class 62 + body type 33) implemente
 KLS: The error in acmod() should no longer complain as much.
 Required: Opcode files have changed, be sure to update to the latest .conf files.
 
-==08/30/2007
+==08/30/2007==
 KLS: Reworked Mob::GetWeaponDamage(), it will now return damage done by any item and NULL and will return a
 value zero or less if we can't hit a mob with said item
 KLS: Applied new GetWeaponDamage() to Attack and Special Attack code
@@ -8789,58 +8821,58 @@ KLS: Changed NPC_DW_CHANCE in features.h to 100% as default as opposed to the pr
 KLS: Archery will be affected by various crit AA effects and spell bonuses
 KLS: Applied haste and slow modifiers to basic NPC special attacks such as kick and bash.
 
-==08/26/2007
+==08/26/2007==
 KLS: Fixed a misplaced field in the titanium spawn structure that was causing some spawn display issues on titanium.
 
-==08/16/2007
+==08/16/2007==
 KLS: Some cleaning up on autofire code
 KLS: Reintroduction of item animation for archery
 
-==08/15/2007
+==08/15/2007==
 KLS: Fixed an /autofire crash
 KLS: Added some conditions to RangedAttack() for now. Should keep from using ranged attacks when we shouldn't be allowed to attack.
 
-==08/14/2007
+==08/14/2007==
 KLS: Added /autofire
 KLS: Fixed up SetAttackTimer() calculations a bit, especially when it comes to ranged attacks. Hopefully fewer instances where ranged attacks will be wasted because of the attack timer.
 KLS: Ranged attack crits will now work no matter your chance to hit, also changed the appearances a tiny bit and added a min range check for /autofire.
 KLS: Removed ReadBook packet size checking for now.. it was checking a wrong size and canceling out legitimate book requests
 Make sure to update your .conf files to get /autoattack to work.
 
-==08/12/2007
+==08/12/2007==
 KLS: A little bit more tinkering with how potions and stacks work.
 
-==08/11/2007
+==08/11/2007==
 KLS: Fixed stackable potions in the item packet, they should now appear to have 1 charge instead of 0.
 KLS: Added support for stackable items above 20.
 KLS: Fixed forage, it will no longer overwrite slot 30 to create it's item, instead it will push the item onto the cursor like it should.
 
-==08/10/2007
+==08/10/2007==
 KLS: Fixed a stacking issue and made res effects not count to normal stacking rules.
 KLS: Implemented a few more passive AA effects.
 KLS: Added CanThisClassBlock() for the avoid code
 KLS: Addressed some inconsistancies in the CanThisClass line of functions, GM classes should be able to do everything their base class can now.
 
-==08/01/2007
+==08/01/2007==
 FatherNitwit: (cavedude) Fix Iksar BL pet appearance.
 
-==07/30/2007
+==07/30/2007==
 Rogean: Fixed an item dupe exploit.
 
-==07/28/2007
+==07/28/2007==
 Rogean: Put in checks for No Drop Trading Hacks
 
-==07/26/2007
+==07/26/2007==
 KLS: Updated AA_Data.sql, still work to be done but should now be more complete than older AA sources.
 
-==07/22/2007
+==07/22/2007==
 FatherNitwit: Fixed another memory leak in world and zone.
 KLS: Fixed up some message types so they match the client correctly.
 
-==07/21/2007
+==07/21/2007==
 Rogean: Fixed LDoN Merchant Item Inspect
 
-==07/20/2007
+==07/20/2007==
 FatherNitwit: (Striat) Fix for typos in perlparser.cpp to fix quest::me and quest::echo.
 FatherNitwit: (Striat) Fix argument type in quest::setguild.
 FatherNitwit: Fixed quest::settime
@@ -8853,28 +8885,28 @@ Changes to opcode files:
 patch_Titanium.conf: OP_TargetHoTT=0x6a12
 patch_6.2.conf: OP_TargetHoTT=0x3ef6
 
-==07/16/2007
+==07/16/2007==
 FatherNitwit: (Glather) Fix for mobs showing weapons
 FatherNitwit: (Cbodmer) Notify owner when buffs wear off pets.
 
-==6/06/2007
+==6/06/2007==
 KLS: (Darkonig) Change to the way tradeskill containers are handled.
 KLS: (Darkonig) Change to item->isStackable() implementation, should let certain items that the client lets stack also stack server-side.
 
-==6/01/2007
+==6/01/2007==
 KLS: Addressed a memory leak in spell code and a memory leak in NPC destruction code.
 
-==4/13/2007
+==4/13/2007==
 KLS: Fixed an issue with buff duration inc. that was causing buffs to lose their effects (I hope)
 
-==4/08/2007
+==4/08/2007==
 KLS: Added support for the skill Frenzy.
 KLS: Various tweaks and changes to some passive AA abilities.
 KLS: Added #traindisc to train disciplines on the target player, #scribespells should no longer memorize disciplines to the spellbook.
 KLS: Fixed an issue with spells that require components that use item ids higher than 32k
 KLS: Fixed an issue with AAs and focus effects that increase buff duration not appearing correctly for clients until they zone.
 
-==4/02/2007
+==4/02/2007==
 KLS: Implemented number6 inspired item cooldown timers.
 KLS: Added rules: NPC:MinorNPCCorpseDecayTimeMS & NPC:MajorNPCCorpseDecayTimeMS to set the decay time in millisecond of mobs below 55 and greater or equal to 55 respectively
 KLS: Addressed an issue that caused some beneficial spells to generate incorrect aggro amounts.
@@ -8888,14 +8920,14 @@ KLS: Made mend skill checks more lienent, shouldn't ever fail after 200 skill, s
 KLS: Initial implementation of hp balance spell effect.
 KLS: Focus effects that limit max level should now correctly reduce the effect by a percentage if the spell is over the level cap
 
-==3/26/2007
+==3/26/2007==
 FatherNitwit: Optimized the merchantlist_temp query on boot.
 
-==3/14/2007
+==3/14/2007==
 KLS: Put in FNW's requested changes to tradeskill combines from the other day that I almost forgot about
 KLS: Tradeskill combines should check for container type now.
 
-==3/11/2007
+==3/11/2007==
 KLS: Attack() will not set our target unless we have no target now.
 KLS: Tweaked some invis and hide stuff to hopefully catch more situations where it should break correctly.
 KLS: Fixed the spell critical hit ratio to be accurate.
@@ -8904,13 +8936,13 @@ KLS: NPCs will no longer be restricted by the number of targets on their AE spel
 KLS: Spells base_1 will load as a 32 bit signed int instead of a 16 bit signed int, should correct some oddities with certain spells. For example certain summon spells using large item ids.
 KLS: Fixed a tradeskill exploit with tradeskill containers and experimentation.
 
-==3/10/2007
+==3/10/2007==
 Rogean: Fixed #si and minstatus
 
-==3/3/2007
+==3/3/2007==
 FatherNitwit: Finally rewrote 'make depend' to properly track dependencies in linux builds
 
-==2/22/2007
+==2/22/2007==
 KLS: Some more changes to AA system:
 KLS: altadv_vars.cost_inc will now be unsigned to allow your skills to cost less per level
 KLS: Client side aa effects are now loaded from the database once again
@@ -8935,7 +8967,7 @@ CREATE TABLE aa_effects (
 Optional SQL:
 Resource AA_Data.sql
 
-==2/18/2007
+==2/18/2007==
 WildcardX: Player casted area of effect detrimental spells will not longer have an affect on players not engaged in PvP.
 WildcardX: Fixed spawnlimit setting to control the maximum times a given npc_type can spawn in the same zone.
 WildcardX: (Bleh) Fixed player emote animations.
@@ -8943,7 +8975,7 @@ WildcardX: Implemented a server-side check of a Client object's target to avoid
 WildcardX: Fixed a zone crash that could occurr during a monk special attack or a rogue's backstab attack.
 WildcardX: Area of effect beneficial spells will no longer affect non-player characters.
 
-==2/16/2007
+==2/16/2007==
 KLS: Updating Changelog AA work to be more clear as well as the required SQL.
 
 Required SQL:
@@ -8952,7 +8984,7 @@ alter table altadv_vars add column cost_inc tinyint(4) not null default 0;
 Optionally:
 Source in AA_data.sql
 
-==2/15/2007
+==2/15/2007==
 WildcardX: Commented out the code supporting the deprecated OP_CloseContainer opcode.
 WildcardX: Fixed world containers so when one player has closed a world container, another player can open it without the need for the first player to leave the zone.
 KLS: Initial release of ongoing AA work
@@ -8976,7 +9008,7 @@ KLS: Fixed a int to float conversion issue in CalcRecommendedLevelBonus() (as pe
 KLS: Fixed a crash issue related to resists, should help those crashing after zoning with a spell that has a heartbeat resist such as root.
 KLS: Removed an unused spell function that didn't make much sense.
 
-==2/14/2007
+==2/14/2007==
 WildcardX: Implemented a cap of 4 mobs affected by targeted area of effect spells. This is consistent with EQ live.
 WildcardX: Implemented the succor line of spells.
 WildcardX: Specific mobs can now be toggled as findable or not findable by the track skill. Mobs which are not findable will not appear on any track lists.
@@ -8984,10 +9016,10 @@ WildcardX: Specific mobs can now be toggled as findable or not findable by the t
 Required SQL:
 alter table npc_types add column trackable tinyint(4) not null default 1;
 
-==2/13/2007
+==2/13/2007==
 WildcardX: Fixed bug that broke #zone command.
 
-==2/11/2007
+==2/11/2007==
 WildcardX: Further enhancements to zone weather system to reduce the amount of work necessary to perform weather and to make it more logical.
 WildcardX: Added a new opcode for both 6.2 and Titanium clients, OP_ZonePlayerToBind=0x385e. Please be sure to update your .conf files.
 WildcardX: Implemented the beginnings of what will become a new "system" to deal with zoning.
@@ -9001,21 +9033,21 @@ WildcardX: (Cavedude) Implemented yet another container type to perform even mor
 WildcardX: Added additional logging to zone "debug" and "error" to support zoning and intra-zone movement.
 WildcardX: Group members disbanding in another zone will still fail to appear as removed from group from other group members, but disbanding this group member when he/she rejoins group in zone will no longer crash the zone and you will be able to re-add this former group member without having to destroy the whole group.
 
-==2/10/2007
+==2/10/2007==
 FatherNitwit: Reworked NPC Idle spell casting to avoid extra LOS checks (based on KLS's observations)
 FatherNitwit: Reworked NPC spell casting timers to be more consistent.
 
-==2/9/2007
+==2/9/2007==
 Doodman: Fixed AdventurePoints_Update_Struct to be the correct struct.  Same structure for both 6.2 and Ti.  Changed core structure.
 
-==2/1/2007
+==2/1/2007==
 WildcardX: (Bleh) Fixed quest globals.
 WildcardX: Fixed the common error message MakeNameUnique() has been recording in logs about being unable to make a unique name for mobs greater than 100 in a zone.
 
 Required SQL:
 ALTER TABLE quest_globals CHANGE expdate expdate INT;
 
-==1/29/2007
+==1/29/2007==
 WildcardX: Cleaned up zone weather code for better efficiency. Weather checks will be more frequent when their is snow or rain and less frequent when the sun is out.
 WildcardX: Made weather log messages more consistent and informative.
 WildcardX: Druids are now replace bards has the second best tracker in the game. This is consistent with live.
@@ -9024,11 +9056,11 @@ WildcardX: Clients will now see their coins update from quests or player trades.
 WildcardX: The server is now using the OP_MoneyUpdate opcode, instead of OP_MoneyOnCorpse opcode for coin updates.
 WildcardX: Clients entering a zone will now receive a weather packet. This will ensure all clients in the same zone will experience the same weather.
 
-==1/23/2007
+==1/23/2007==
 KLS: Fixed the change log so the current entries are correct
 KLS: Fixed a small but significant crash.
 
-==1/15/2007
+==1/15/2007==
 KLS: Fixed an issue with storing timers.
 KLS: Added in hide and basic support of hide improving AAs later
 KLS: Some more changes to how procs work, perma procs will not be influenced by mob stats, should make them easier to balance.
@@ -9045,7 +9077,7 @@ Optional SQL:
 UPDATE `npc_types` SET `see_hide` = 1 WHERE see_invis = '1';
 UPDATE `npc_types` SET `see_hide` = 1 WHERE see_invis_undead = '1';
 
-==1/07/2007
+==1/07/2007==
 KLS: action_struct unknown06 renamed to instrument_mod to reflect it's behavior
 KLS: WildCardX inspired weapon proc rate changes, proc rates should now load as a signed int instead of an unsigned int and should correctly calculate.
 KLS: Some changes to the expired function of ptimers, it should return if the timer is expired whether or not the timer is enabled. This avoids certain situations where timers are disabled and then run down without ever being reenabled and essentially being locked down forever unless the database admin resets it manually.
@@ -9063,7 +9095,7 @@ KLS: Spin effects are now correctly capped at a max of level 55, all targets abo
 KLS: SE_LimitEffect should now correctly deal with any effect type the spell has and not just the ones hard coded into the server.
 KLS: (Cripp)Fix for zone heading
 
-==12/24/2006
+==12/24/2006==
 KLS: (WildcardX) Fix for generic tradeskill container combines
 KLS: (WildcardX) Fix for quest::depop and multipul mobs in the same zone that share a NPCType ID
 KLS: (WildcardX) Zones can now be flagged to disallow offensive actions.
@@ -9081,7 +9113,7 @@ UPDATE `zone` SET `cancombat` = 0 WHERE short_name = 'nexus';
 UPDATE `zone` SET `cancombat` = 0 WHERE short_name = 'poknowledge';
 UPDATE `zone` SET `cancombat` = 0 WHERE short_name = 'potranquility';
 
-==12/19/2006
+==12/19/2006==
 KLS: Fixed up Illusions a bit
 KLS: Fixed a bug where the base2[0] field of a spell was not getting loaded correctly
 KLS: Implemented Sacrifice Spells
@@ -9096,38 +9128,38 @@ KLS: If a player is at max level the experience he has will cap at the max exper
 KLS: The max level you can group with and gain experience is now YourLevel*1.5 instead of YourLevel+8.
 KLS: You'll only get an experience loss message if you actually lose exp now, no more You lost experience messages when you take a 0% rez.
 
-==12/15/2006
+==12/15/2006==
 FatherNitwit: Fix for possible crash when NPCs are immune to damage.
 KLS: Small fix for newly created player corpses, hopefully they will no longer act like they are npc corpses.
 KLS: Changed how recourse works a bit, it is now done after the resist check.
 KLS: Group spells should be able to land on the caster's pet now.
 KLS: Fixed crazy Bash/Kick damage.
 
-==12/09/2006
+==12/09/2006==
 KLS: Stun immune should apply to spin effects such as those found in One Hundred Blows.
 KLS: Some cleanups in special attack and resist code.
 KLS: Added a define SKILL_MAX_LEVEL in features.h that lets you define how high level you can get skills from the database, defaults to 75.
 KLS: Damage shields wont proc on yourself any longer to avoid some wierdness. They only ever procced on yourself under special conditions so it shouldn't be noticable.
 
-==12/03/2006
+==12/03/2006==
 FatherNitwit: Fixed a few issues related to quest global expiration.
 
-==12/01/2006
+==12/01/2006==
 KLS: NPC ghosting fix with rule support.
 FatherNitwit: Fixing up spell set loading crash.
 KLS: More skill fixes
 KLS: Moved the old class_skills system over to the new skills system.
 
-==11/28/2006
+==11/28/2006==
 FatherNitwit: (bleh) Added #hatelist command.
 FatherNitwit: (bleh) Work on windows build issues.
 FatherNitwit: Optimized merchant list query during zone boot.
 FatherNitwit: Fix a few race related issues in eqbuilder.
 
-==11/26/2006
+==11/26/2006==
 FatherNitwit: Fixed berserker skill cap issue that KLS found.
 
-==11/25/2006
+==11/25/2006==
 KLS: The way resists are calculate have been changed and are now somewhat tweakable with rules, and partial hits should work correctly.
 KLS: Ripostes have been seperated from the attack code and will now apply to all attacks.
 KLS: Skills and Spells that directly modify melee damage should now work and be applied to all attacks.
@@ -9140,16 +9172,16 @@ KLS: Stun Immunity will now only apply to the stun portion of the spell instead
 KLS: Instrument Mods should send correctly on the reapplication of bard pulses.
 KLS: Spells should no longer check instant heals/damage portions of the spell for stacking purposes, several spells that should have stacked before but didn't now should properly.
 
-=11/24/2006
+=11/24/2006==
 FatherNitwit: (number6) Fix for loading saved spell sets.
 FatherNitwit: Added #giveitem as inspired from the forums.
 FatherNitwit: Changed default status required for #summonitem to 200.
 
-==11/20/2006
+==11/20/2006==
 KLS: Skill system tweaks and bug fixes.
 KLS: Bard songs will now skill up while they are being sung instead of just when first cast.
 
-=11/19/2006
+=11/19/2006==
 FatherNitwit: Completely redid skills in the code to support >252
 FatherNitwit: Skill caps are now database driven (shared mem)
 Create this table, and source in SkillCaps.sql
@@ -9161,7 +9193,7 @@ CREATE TABLE skill_caps (
  PRIMARY KEY(skillID,class,level)
 );
 
-==11/07/2006
+==11/07/2006==
 KLS: Changed how critical hits work, as a result things that could not crit before like special attacks, now can.
 KLS: Cleave like effects should be fixed to do an increase of your already standing chance to critical instead of a flat increase.
 KLS: Reworked much of the special attack code.
@@ -9170,19 +9202,19 @@ KLS: Monk skill damage will be more random but the max damage they can do has no
 KLS: Skills should be avoided less often, they were being avoided twice in the code instead of once.
 KLS: Implemented basic strikethrough.
 
-==11/06/2006
+==11/06/2006==
 FatherNitwit: (Cripp) periodic auto save.
 FatherNitwit: LostZaphod's possible win32 azone fix. (untested)
 FatherNitwit: (cbodmer) Regen multiplier rules.
 
-==11/04/2006
+==11/04/2006==
 Rogean: Haste Fixes: Fixed Haste/Slow as well as Bard Songs (Including Overcap).
 
-==11/03/2006
+==11/03/2006==
 KLS: Added Magoth's stun opcodes for both Titanium and 0.6.2 clients
 KLS: Changed Object Clear opcode for Titanium
 
-==10/30/2006
+==10/30/2006==
 FatherNitwit: (KLS) Fixes for max endurance calc on zone in
 FatherNitwit: (KLS) Fix for rulesystem category issue.
 FatherNitwit: Added rule support to world (no runtime manipulation yet)
@@ -9197,17 +9229,17 @@ KLS: GroupInvite2 opcodes found for both Titanium and 0.6.2, make sure to get th
 KLS: Glow messages should only go off for instant spells.
 KLS: How haste calculations have been calculated has been reworked somewhat, haste shouldn't break any more, nor should all hastes stack.
 
-==10/28/2006
+==10/28/2006==
 FatherNitwit: Fix for NPC weapon appearance due to loot items.
 aza77: Fixed SendAppearancePacket
 aza77: Fixed a PvP bug that caused the zone to crash on death
 
-==10/26/2006
+==10/26/2006==
 FatherNitwit: WildcardX's name cleanup.
 FatherNitwit: Tweak for 64 bit pointer support in the item code of the struct strategy.
 FatherNitwit: More const cleanup in npc.h
 
-==10/22/2006
+==10/22/2006==
 FatherNitwit: added EVENT_COMBAT triggered when an NPC engages any form of
 FatherNitwit: 	combat and when combat is over. $combat_state signals which.
 FatherNitwit: Hopefully fixed d_meele_texture
@@ -9217,14 +9249,14 @@ FatherNitwit: Reworked special attacks a bit (monk, kick, backstab):
 FatherNitwit:   they now use the standard combat hit chance forumals based on offense/defense instead of always hitting
 FatherNitwit:   they are now subject to damage avoidance (parry, riposte, etc.) like normal attacks
 
-==10/21/2006
+==10/21/2006==
 FatherNitwit: Hopefully fixed spawn timer variance.
 
-==10/18/2006
+==10/18/2006==
 FatherNitwit: Maybe fixed issue with losing items when zoning in mysql 5.
 FatherNitwit: Fixed issue with color saving properly.
 
-==10/15/2006
+==10/15/2006==
 FatherNitwit: (KLS) Implemented Endurance
 FatherNitwit: (KLS) Implemented support for seperate discipline timers
 FatherNitwit: (KLS) Fix for haste & slow issue on NPCs
@@ -9245,66 +9277,66 @@ FatherNitwit: (KLS) let dots of the same resist type stack so long as they aren'
 FatherNitwit: cleanup windows logging a bit
 FatherNitwit: (eq4me) GCC 4+ build fixes
 
-==10/05/2006
+==10/05/2006==
 FatherNitwit: (KLS) Fix for explicit spell stacking rule problem.
 
-==10/02/2006
+==10/02/2006==
 FatherNitwit: (InsaneWallaby) Tradeskill skill gain fix.
 FatherNitwit: (WildcardX) Improved spawnstatus command.
 FatherNitwit: (number6) Work around for lay hands/harm touch recovery time hang.
 FatherNitwit: Possible fix for faction sticking at min/max.
 
-==09/21/2006
+==09/21/2006==
 FatherNitwit: Revert part of bard mod fix, and fix it right.
 
-==09/20/2006
+==09/20/2006==
 FatherNitwit: Prevent stats from going negative.
 FatherNitwit: Try to prevent skills from wrapping above 252 (still no support for higher)
 FatherNitwit: Minor shop close tweak.
 FatherNitwit: (Zuesrooster) Potential bard modifier fixes.
 
-=09/07/2006
+=09/07/2006==
 FatherNitwit: (eq4me) Reworked tradeskill success and gain rates
 FatherNitwit: Potentially addressed trade coin display issue.
 FatherNitwit: Undid clickie spell component change until dicussion finishes
 
-=09/07/2006
+=09/07/2006==
 FatherNitwit: (Aramid) Fixed ability to bind.
 FatherNitwit: (Somebody, forget who) Fixed issue with reagents being consumed by clickies.
 FatherNitwit: (eq4me) Fixed tradeskill stat bonus calculation for success rate.
 FatherNitwit: Maybe fixed up zone solution file to only build perl versions, for debug and release.
 
-==08/20/2006
+==08/20/2006==
 FatherNitwit: Zero out buff counters when we occupy a new slot.
 
-==08/16/2006
+==08/16/2006==
 FatherNitwit: Glorandwarf's updated AA.h
 
-==08/14/2006
+==08/14/2006==
 FatherNitwit: More work on titanium AAs by Glorandwarf.
 FatherNitwit: (Zuesrooster) Fix for pet self buffing.
 
-==08/10/2006
+==08/10/2006==
 FatherNitwit: Changed logic in quest parser to potentially avoid windows crash (Zuesrooster)
 FatherNitwit: (Zuesrooster) fixed aggro quest related crash.
 FatherNitwit: Untested update of OP_AugmentItem (John Adams)
 FatherNitwit: A little bit further on AAs (Glorandwarf)
 
-==07/27/2006
+==07/27/2006==
 FatherNitwit: Added door info dump on click (DOORS__INFO)
 
-==07/23/2006
+==07/23/2006==
 FatherNitwit: Enforce some zone requirements on zone in too.
 FatherNitwit: Fixed minor tradeskill crash.
 
-==07/23/2006
+==07/23/2006==
 FatherNitwit: (EverHood) Archery/self PvP mitigation changes
 FatherNitwit: (EverHood) Regen tweaks
 FatherNitwit: (EverHood) Fix DoT damage and messages
 FatherNitwit: Killed erronious double-effects on regen/HoT buffs
 FatherNitwit: Fixed replace-container client side appearance issue.
 
-==07/17/2006
+==07/17/2006==
 FatherNitwit: Added new rules subsystem to allow game rules to be changed
                 at runtime. more about this will come as time goes on.
 FatherNitwit: Added #rules command to manage rules data from in game.
@@ -9331,27 +9363,27 @@ CREATE TABLE rule_values (
   PRIMARY KEY(ruleset_id,rule_name)
 );
 
-==07/16/2006
+==07/16/2006==
 FatherNitwit: (EverHood) Implemented Eye of Zomm and Bind Sight
 FatherNitwit: Reworked Eye of Zomm code
 
-==07/16/2006
+==07/16/2006==
 aza77: Fixed the lift issue + keyitems at doors
 aza77: Fixed + modified traps and added a new type of trap
 ALTER TABLE `traps` ADD `message` VARCHAR( 200 ) NOT NULL AFTER `effectvalue2` ;
 
-==07/13/2006
+==07/13/2006==
 FatherNitwit: Fixed zone crash when removing a guild member.
 aza77: Added in game guild creation variables.GuildCreation + commands #guildcreate #guildapprove #guildlist
 FatherNitwit: Fixed feign aggro crash.
 
-==07/12/2006
+==07/12/2006==
 aza77: Added triggered only doors.
 
-==07/10/2006
+==07/10/2006==
 FatherNitwit: Adding EverHood's lull fixes.
 
-==07/09/2006
+==07/09/2006==
 FatherNitwit: Wizardanim has dicovered the opcode to partiall fix AAs for Ti!!
 FatherNitwit: EverHood's Mob ghost running on (feign)death fix.
 FatherNitwit: Redid walkspeed code to be caclualted from runspeed (EverHood inspired)
@@ -9360,24 +9392,24 @@ FatherNitwit: Added EVENT_NPC_SLAY when NPCs kill another NPC. (fanman55 inspire
 FatherNitwit: Fixed up a long running memory issue in quest::ChooseRandom
 ALTER TABLE `npc_types` DROP walkspeed;
 
-==07/05/2006
+==07/05/2006==
 aza77: Added variables.Rules + commands #rules #acceptrules
 ALTER TABLE `account` ADD `rulesflag` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0';
 
-==07/04/2006
+==07/04/2006==
 FatherNitwit: Maybe fixing feign memory.
 FatherNitwit: EverHood's temp pets and group recourse fixes.
 FatherNitwit: EverHood's NoLongerEngaged AI fix.
 FatherNitwit: bufgix in log.ini reading.
 
-==06/29/2006
+==06/29/2006==
 aza77: Get the SQL right:
 ALTER TABLE `npc_types` CHANGE `hp_regen_rate` `hp_regen_rate` INT( 11 ) NOT
 NULL DEFAULT '0';
 ALTER TABLE `npc_types` CHANGE `mana_regen_rate` `mana_regen_rate` INT( 11 ) NOT
 NULL DEFAULT '0';
 
-==06/28/2006
+==06/28/2006==
 FatherNitwit: Added EverHood's feign memory fixes
 FatherNitwit: Reverted regen of 0 to mean "auto config", and negative to mean "no regen"
 aza77: Changed hp_regen + mana_regen such that negative values indicate no regen
@@ -9388,18 +9420,18 @@ NULL DEFAULT '0';
 UPDATE `npc_types` SET `hp_regen_rate` = '0' WHERE `hp_regen_rate` = '-1';
 UPDATE `npc_types` SET `mana_regen_rate` = '0' WHERE `mana_regen_rate` = '-1';
 
-==06/27/2006
+==06/27/2006==
 aza77: Added quest::setnextinchpevent + $inchpevent
 aza77: Added quest::sethp
 
-==06/25/2006
+==06/25/2006==
 aza77: Fixed PVP appearance issues
 FatherNitwit: Fixed the #logsql command
 
-==06/20/2006
+==06/20/2006==
 FatherNitwit: tweaked some ability timers and fixed up ranger crit damage
 
-==06/18/2006
+==06/18/2006==
 FatherNitwit: necro DOT feign death fix (unicorn97211)
 FatherNitwit: Disable kill-pet-on-feigndeath by default (features.h FEIGN_KILLS_PET)
 MySQL 5 compatibility increases (WildcardX):
@@ -9409,19 +9441,19 @@ alter table player_corpses change data data blob NULL;
 alter table player_corpses_backup change data data blob NULL;
 
 
-==06/15/2006
+==06/15/2006==
 aza: Added MySQL5 support (FOR CUSTOM COMPILE ONLY)
 ALTER TABLE spawn2 CHANGE `condition` `_condition` MEDIUMINT(8) UNSIGNED NOT
 NULL DEFAULT '0';
 
-==06/07/2006
+==06/07/2006==
 FatherNitwit: Fixed SetAATitle (#title), and experted it to perl.
 FatherNitwit: Fixed quest money reward printing. (WildcardX)
 
-==06/03/2006
+==06/03/2006==
 FatherNitwit: Fixed a client-side inventory appearance issue, may help with trade bugs.
 
-==05/31/2006
+==05/31/2006==
 FatherNitwit: (aza) Added quest::unscribespells
 FatherNitwit: fixed ranger critical hit chance.
 FatherNitwit: Implemented conditions on windows.
@@ -9434,7 +9466,7 @@ ALTER TABLE spawnentry DROP spawn_limit;
 ALTER TABLE spawngroup ADD spawn_limit tinyint(4) NOT NULL default '0';
 ALTER TABLE altadv_vars ADD class_type int unsigned NOT NULL DEFAULT 0;
 
-==05/06/2006
+==05/06/2006==
 FatherNitwit: (aza) Enabled newer froglok classes.
 FatherNitwit: (aza) Enabled several berserker combat skills.
 FatherNitwit: Fixed possibly infinite recursion in map code.
@@ -9442,53 +9474,53 @@ FatherNitwit: Holding EQStreams open until they send all their data.
 FatherNitwit: Trying to fix death disconnect (and failing)
 FatherNitwit: Maybe fixed tinkering searching.
 
-==04/24/2006
+==04/24/2006==
 FatherNitwit: Added new HTTP functionality for moving chars between accounts.
 
-==04/21/2006
+==04/21/2006==
 FatherNitwit: Fixed bane damage loading problem.
 
-==04/20/2006
+==04/20/2006==
 FatherNitwit: Hopefully fixed the unidentified stream crash and some memory leaks.
 FatherNitwit: Fixed weapon affinity huge proc bonuses
 FatherNitwit: Fixed spell-granted procs not getting removed.
 FatherNitwit: Implemented the 'procrate' field on items.
 
-==04/13/2006
+==04/13/2006==
 FatherNitwit: Fixed the issue of charmed mobs getting assists from their old friends.
 FatherNitwit: Changed version number to 0.7.0
 
-==04/13/2006
+==04/13/2006==
 FatherNitwit: fixed a crash related to client destructors and tradeskills
 FatherNitwit: Adding the incstats canges from aza on the forums.
 
-==04/01/2006
+==04/01/2006==
 FatherNitwit: FINALLY found and fixed the netcod crash I introduced a while back.
 FatherNitwit: Fixed bard group buff tics.
 FatherNitwit: Fixed the global guild chat going to everybody problem.
 
-==03/27/2006
+==03/27/2006==
 Doodman: Added queuing for future packets, fixing lag reported by Richardo
 
-==03/25/2006
+==03/25/2006==
 FatherNitwit: Fixed character deletion to remove guild member entries. (Aeris1)
 
-==03/24/2006
+==03/24/2006==
 Doodman: Added live struct strategy.  Can get to char select
 
-==03/22/2006
+==03/22/2006==
 Doodman: Fixed Ti items
 Doodman: Added some field name mappings to load_13thfloor_items script.
 UPDATE items SET stackable=1 WHERE itemtype IN (14, 15, 17, 18, 19, 27, 37, 38, 55, 56);
 
-==03/22/2006
+==03/22/2006==
 FatherNitwit: Refactored the netcode to move the opcode manager back into the stream.
 
-==03/21/2006
+==03/21/2006==
 Doodman: Merge up from Source branch
 Doodman: Fixed CreateItem
 
-==03/20/2006
+==03/20/2006==
 FatherNitwit: Fixed invisibility vs. undead to only apply to undead mobs.
 FatherNitwit: Added `slot` column to starting items to support much more robust configurations.
 FatherNitwit: Updated char backups. (noted by typhoon)
@@ -9500,11 +9532,11 @@ ALTER TABLE character_backup DROP guild;
 ALTER TABLE character_backup DROP guildrank;
 ALTER TABLE character_backup DROP publicnote;
 
-==03/19/2006
+==03/19/2006==
 FatherNitwit: A bunch of minor changes, should help some bugs in 0.6.6.
 FatherNitwit: Wrote basic guild management pages, much more needed.
 
-==03/18/2006
+==03/18/2006==
 FatherNitwit: Queue fix in netcode, should help crashing problem.
 Doodman: Redid world port allocation not start looking for a port at the begining each time
 Doodman: Made zone send it's port to world on connect, in case it is reconnecting to a restarted world
@@ -9582,10 +9614,10 @@ ALTER TABLE character_ DROP guildrank;
 ALTER TABLE character_ DROP publicnote;
 
 
-==03/11/2006
+==03/11/2006==
 FatherNitwit: Redid netcode outbound queue to properly handle sequence wrapping.
 
-==03/10/2006
+==03/10/2006==
 Doodman: Worked up serialization for Ti and Live (/snicker)
 Doodman: Converted the item table to match live (13th-floor) changes below (apply both)
 Doodman: Worked items to be compatible for both (kept loreflag and loregroup)
@@ -9616,37 +9648,37 @@ ALTER TABLE items ADD UNK134 varchar(255) not null AFTER UNK133;
 ALTER TABLE items CHANGE UNK130 potionbeltslots int not null;
 ALTER TABLE items CHANGE UNK133 stackable int not null;
 
-==03/08/2006
+==03/08/2006==
 FatherNitwit: (BatCountry) Fixed throwing item crash.
 FatherNitwit: (Hvitrev) Implemented Primsatic and Chromatic resists.
 
-==03/07/2006
+==03/07/2006==
 FatherNitwit: Fixed up adding a launcher to not falsely report an error.
 Doodman: Fixed sending old style info from world->ls (fixing minilogin)
 Doodman: Fixed TCPConnection cleanup on socket closed by the remote
 
-==03/06/2006
+==03/06/2006==
 Doodman: Fixed deadlock when zones are shutting down.
 Doodman: Fixed MakeUpperString and MakeLowerString to function correctly on a NULL string
 Doodman: Made HTTPSocket inherit from TCPConnection instead of using
 Doodman: Fixed HTTP POST processing (needs a good workout still)
 
-==03/05/2006
+==03/05/2006==
 FatherNitwit: Developed stream proxy, stream identifier, and struct strategy to support dynamic structures.
 FatherNitwit: Developed initial patch support for 0.6.2 and Titanium.
 
-==03/04/2006
+==03/04/2006==
 FatherNitwit: Fixed some broken logging in world.
 FatherNitwit: Fixed the potential crash when zone connects to world.
 
-==03/04/2006
+==03/04/2006==
 FatherNitwit: Significantly refactored the old TCPConnection/TCPServer code.
 FatherNitwit: Rewrote almost the entire web server to get rid of most of the socket lib.
 FatherNitwit: Removed everything but the HTTP framework from the socket lib.
 FatherNitwit: Rewrite better have fixed the windows crash.
 
 
-==02/28/2006
+==02/28/2006==
 Changed version number to 0.6.5-DR1
 Doodman: Put in new XML configuration object and made zone/world use them
 Doodman: Added auto ip configuration to world/LS
@@ -9689,7 +9721,7 @@ CREATE TABLE commands (
 );
 
 
-==01/20/06
+==01/20/2006==
 FatherNitwit: Reworked melee and ranged attack code significantly.
 FatherNitwit: Properly support recomended level on weapon DMG now.
 FatherNitwit: Re-implemented racial/body bane damage and elemental damage.
@@ -9699,17 +9731,17 @@ FatherNitwit: Added canbind flag to zone table to completely prevent binding in
 Required SQL:
 ALTER TABLE zone ADD canbind TINYINT NOT NULL DEFAULT '1';
 
-==01/14/06
+==01/14/2006==
 FatherNitwit: Fixed ranged misses not generating hate.
 FatherNitwit: Find is as working as good as it ever was (straight line)
 
-==01/13/06
+==01/13/2006==
 FatherNitwit: Made some changes to buff stacking rules reguarding DoTs and beneficial overwrite.
 
-==01/12/06
+==01/12/2006==
 FatherNitwit: Fixed the "Buffs do not apply effects in client after zoning" issue.
 
-==01/09/06
+==01/09/2006==
 FatherNitwit: Made NPCs actually load: resists, attack_speed, findable
 FatherNitwit: npc_types cleanup day (they dont work or are not used):
 ALTER TABLE npc_types ADD attack_speed float NOT NULL default '0';
@@ -9717,16 +9749,16 @@ ALTER TABLE npc_types DROP ipc;
 ALTER TABLE npc_types DROP banish;
 ALTER TABLE npc_types DROP social;
 
-==01/08/06
+==01/08/2006==
 FatherNitwit: Fixed more windows compile errors on .net 2003+...
 
-==01/07/06
+==01/07/2006==
 FatherNitwit: Fixed VS.net projects and compiling. (.net 2002)
 
-==01/04/06
+==01/04/2006==
 FatherNitwit: Fixed the quad special attack to not require triple in order to work.
 
-==01/03/06
+==01/03/2006==
 FatherNitwit: Added new debug logging facility. Will be implemented further in the time to come
 FatherNitwit: Added command #mlog to manipulate the new logging facility.
 FatherNitwit: Load log settings from log.ini if present.
@@ -9745,7 +9777,7 @@ FatherNitwit: Fixed NPC buffing faction checks.
 FatherNitwit: Added LOS checks for detrimental AOE spells.
 FatherNitwit: Changed version number to 0.6.4DR1
 
-==12/30/05
+==12/30/2005==
 FatherNitwit: Fixed event_waypoint in quests
 FatherNitwit: Refactored a lot of NPC pathing code (no functional changes)
 FatherNitwit: Added zone flagging concepts/enforcement
@@ -9760,7 +9792,7 @@ CREATE TABLE zone_flags (
 );
 ALTER TABLE zone ADD flag_needed VARCHAR(128) NOT NULL DEFAULT '';
 
-==12/23/05
+==12/23/2005==
 FatherNitwit: Added #reloadstatic to reload doors, objects, zone points, etc... (zone in/out required)
 FatherNitwit: Fixed mobs to buff their friends, not their enemies.
 FatherNitwit: Allow support for quests on charmed NPCs.
@@ -9768,14 +9800,14 @@ FatherNitwit: Changed quest timers to be tied to the specific NPC, instead of th
 FatherNitwit: Fixed quest global expiration times... durations should be accurate now.
 FatherNitwit: Re-enabled Y (year) expiration times, and added a 'F' time to say it dosent expire.
 
-==12/18/05
+==12/18/2005==
 FatherNitwit: Removed doors from shared memory.
 FatherNitwit: Hopefully fixed pottery firing in kilns.
 
-==12/15/05
+==12/15/2005==
 FatherNitwit: Fixed Levitate.
 
-==12/11/05
+==12/11/2005==
 FatherNitwit: Removed some worthless fields.
 FatherNitwit: Rewrote all the pet creation code to be based on npc_types
 FatherNitwit: Completely changed the pets table.
@@ -9785,68 +9817,68 @@ You must load up the SQL in Sql-Files/pets.sql
 the new pets sql assumes NPC IDs 500-700 are free, so edit them as needed.
 ALTER TABLE npc_types DROP fixedz;
 
-==12/09/2005
+==12/09/2005==
 FatherNitwit: Fixed the issue where maxed out factions cannot be raised/lowered
 FatherNitwit: Changed faction hits to properly ignore illusions.
 FatherNitwit: Fixed an issue with converted chars and corrupt AAs. (not fully resolved)
 FatherNitwit: Fixed the issue with mobs not pathing after respawning.
 
-==12/01/2005
+==12/01/2005==
 FatherNitwit: added USE_RACE_CLASS_XP_MODS (disabled by default) to features.h
 FatherNitwit: These fields are not used:
 ALTER TABLE zone_points DROP keep_x;
 ALTER TABLE zone_points DROP keep_y;
 
-==11/28/2005 (LiveCompat)
+==11/28/2005==
 Doodman: Found additional world opcodes
 Doodman: Updated char select struct
 
-==11/24/2005
+==11/24/2005==
 FatherNitwit: just some SQL updates you should run to make the recent aggro changes less annoying.
 UPDATE npc_types SET _INT=80 WHERE _INT=75;
 UPDATE npc_types SET _INT=60 WHERE _INT=80 AND ( bodytype=3 OR bodytype=8);
 ALTER TABLE npc_types CHANGE _INT _INT mediumint(8) unsigned NOT NULL default '80';
 
-==11/17/2005
+==11/17/2005==
 FatherNitwit: Fixed a crash in the map code
 FatherNitwit: Tweaked mob usage of d_meele_texture*
 
-==11/11/2005
+==11/11/2005==
 FatherNitwit: Changed most double prescision operations to single prescision.
 
-==11/10/2005
+==11/10/2005==
 FatherNitwit: Fixed waypoint ID limit (was 65535).
 FatherNitwit: Implemented the #wpinfo command
 
-==11/05/2005
+==11/05/2005==
 FatherNitwit: Fixed the broken server side filters (reworked entirely).
 FatherNitwit: Refactored damage code to be more consistent between PCs and NPCs.
 FatherNitwit: Changed spell damage mechanism slightly to better utilize runes.
 FatherNitwit: Tweaked a bit of illusion code to be more versitile.
 
-==11/03/2005
+==11/03/2005==
 FatherNitwit: Fixed AA storage in the player profile.
 
-==10/28/2005
+==10/28/2005==
 FatherNitwit: Fixed a lot of GCC 4.0 and 64 bit problems. Should build under both better now.
 
-==10/24/2005
+==10/24/2005==
 FatherNitwit: Fixed mob int loading.
 
-==10/23/2005
+==10/23/2005==
 FatherNitwit: Fixed Client->NPC->Client riposte.
 
-==09/28/2005
+==09/28/2005==
 FatherNitwit: added quest::attacknpc and quest::attacknpctype
 FatherNitwit: Cleaned up usage of Appearance in the code
 FatherNitwit: Fixed faction ally checking for npc->npc faction
 FatherNitwit: Removed some stupid rules reguarding npc aggro
 FatherNitwit: Fixed some faction issues with aggro, guards should work reliably now.
 
-==09/25/2005
+==09/25/2005==
 FatherNitwit: Fixed incorrect usage of EXPMod variable.
 
-==09/24/2005
+==09/24/2005==
 FatherNitwit: Hopefully fixed bard instruments.
 FatherNitwit: Fixed crash when loading DoD+ spells_us.txt file
 FatherNitwit: Rewrote a ton of the perl parser internals to suck less.
@@ -9861,7 +9893,7 @@ ALTER TABLE npc_types ADD _INT MEDIUMINT UNSIGNED NOT NULL DEFAULT '75';
 ALTER TABLE npc_types ADD WIS MEDIUMINT UNSIGNED NOT NULL DEFAULT '75';
 ALTER TABLE npc_types ADD CHA MEDIUMINT UNSIGNED NOT NULL DEFAULT '75';
 
-==09/23/2005
+==09/23/2005==
 FatherNitwit: Inverted XY coordinates on in zone objects and ground spawns.
 FatherNitwit: Maybe fixed quests setting a waypoint in EVENT_WAYPOINT
 ALTER TABLE ground_spawns ADD temp_x float NOT NULL;
@@ -9879,40 +9911,40 @@ UPDATE object SET ypos=temp_x;
 ALTER TABLE object DROP temp_x;
 
 
-==09/22/2005
+==09/22/2005==
 FatherNitwit: Reworked quest signaling implementation to be less dumb. Also exported SignalNPC to perl.
 FatherNitwit: Implemented a missing bard AE DOT spell type.
 
-==09/21/2005
+==09/21/2005==
 FatherNitwit: Fixing a few issues with windows compiles and corpses.
 
-==09/19/2005
+==09/19/2005==
 FatherNitwit: Added missing packet for player death to create a corpse.
 
-==09/16/2005
+==09/16/2005==
 FatherNitwit: Fixed loot error case client hang, reported by Yablargo
 
-==09/15/2005
+==09/15/2005==
 FatherNitwit: Fixed coin trading bug reported by Windcatcher
 
-==09/12/2005
+==09/12/2005==
 FatherNitwit: Fixed adventure merchants
 
-==09/11/2005
+==09/11/2005==
 FatherNitwit: Made temp merchant lists clear on world boot.
 FatherNitwit: Fixed some shared memory issues on windows.
 FatherNitwit: exported some more mob methods to perl.
 
-==08/26/2005
+==08/26/2005==
 Doodman: Found most of the missing guild opcodes, except the manage ones.
 Doodman: Moved guildlist to shared mem (ick) since zone now sends it too.
 Doodman: Need to implement a way to recover the functionality of dynamicly
 	  adding/removing guilds with the shared mem solution
 
-==08/23/2005
+==08/23/2005==
 FatherNitwit: Added range check for all combat abilities (reported by LoOsEr)
 
-==08/21/2005
+==08/21/2005==
 FatherNitwit: Fixed gaining AA exp (buying still broken)
 FatherNitwit: Fixed weapon procs
 FatherNitwit: Added looting messages (links to come later)
@@ -9920,28 +9952,28 @@ FatherNitwit: Fixed instant spells acting like DoTs
 
 --- Version Changed to 0.6.2DR1 ---
 
-==08/05/2005
+==08/05/2005==
 FatherNitwit: Adding database support for both eye colors and beard type.
 Required SQL:
 ALTER TABLE npc_types ADD luclin_eyecolor2 int(10) unsigned NOT NULL default '1' AFTER luclin_eyecolor;
 ALTER TABLE npc_types ADD luclin_beard int(10) unsigned NOT NULL default '0' AFTER luclin_beardcolor;
 
-==08/03/2005
+==08/03/2005==
 FatherNitwit: Work on eqextractor to support the newest patch.
 FatherNitwit: Worked on spawn struct to identify the remaining missing fields.
 
-==08/02/2005
+==08/02/2005==
 FatherNitwit: Added initial fix for the shared bank dupe.
 
-==07/28/2005
+==07/28/2005==
 FatherNitwit: Fixed $wp in EVENT_WAYPOINT
 FatherNitwit: added #aggro to query aggro checking info for mobs.
 FatherNitwit: fixed a couple strange things in the aggro code.
 
-==07/07/2005
+==07/07/2005==
 FatherNitwit: Untested fix for zone point wildcards in GetClosestZone*
 
-==05/09/2005
+==05/09/2005==
 FatherNitwit: Fix some stuff related to zoning process.
 update zone set min_status=0 where min_status is null;
 update zone set min_level=0 where min_level is null;
@@ -9949,12 +9981,12 @@ alter table zone change min_status min_status tinyint(3) unsigned default 0 NOT
 alter table zone change min_level min_level tinyint(3) unsigned default 0 NOT NULL;
 alter table zone change long_name long_name text NOT NULL DEFAULT '';
 
-==05/05/2005
+==05/05/2005==
 FatherNitwit: Theoretically fixed a no-drop trading bug.
 
 ... Lots of work on 5/12/05 patch ...
 
-==05/05/2005
+==05/05/2005==
 FatherNitwit: A bunch of work on ranged attacks and attack timers.
 FatherNitwit: Fixed issue with the first time a new char gains exp.
 FatherNitwit: Fixed delete character at char select.
@@ -9962,22 +9994,22 @@ FatherNitwit: Fixed fizzle messages.
 FatherNitwit: Fixed /goto and other cross-zone player teleporting.
 FatherNitwit: Initial work on making arrows show up when shot.
 
-==04/23/2005
+==04/23/2005==
 LethalEncounter: Fixed compile errors on Windows
 LethalEncounter: Fixed guild crash bug while logging in
 LethalEncounter: Fixed most of the guild commands
 
-==04/13/2005
+==04/13/2005==
 Cofruben: Fixed possible crashes using #npscpawn command.
 Cofruben: Added a few more cheat locators.
 
-==04/10/2005
+==04/10/2005==
 FatherNitwit: Reworked zone in code to make it more closely match live's ordering.
 FatherNitwit: Fixed up stream factory problem with dynamic zones.
 FatherNitwit: Added detailed connecting debugging.
 FatherNitwit: Work on custom titles.
 
-==04/08/2005
+==04/08/2005==
 FatherNitwit: Completely rewrote zoning code to make sense.
 FatherNitwit: Fixed some discipline related effects
 FatherNitwit: Fixed archery hit chance cap (was 47%)
@@ -9997,14 +10029,14 @@ FatherNitwit: Finally fixed no drop items in tradeskill containers for real this
 Required SQL (added to upgrade.sql):
 ALTER TABLE account ADD hideme TINYINT NOT NULL DEFAULT 0;
 
-==04/04/2005
+==04/04/2005==
 FatherNitwit: Fixed guild member list struct, identified more fields of it (showeq)
 FatherNitwit: (bUri) Fixed attack code with non-weapons and h2h weapons.
 FatherNitwit: Split zone fog types into seperate DB fields.
 FatherNitwit: Differentiated between guild and player tributes.
 Required SQL: utils/0.6.1-upgrade.sql  (will be updated until release)
 
-==01/15/2005
+==01/15/2005==
 Doodman: Fixed charges/quantity
 Doodman: Fixed IsStackable()
 Doodman: Fixed some empty Handle() functons.
@@ -10012,7 +10044,7 @@ Doodman: Added instance level nodrop.
 Required SQL:
 alter table inventory add instnodrop tinyint(1) unsigned default 0 not null;
 
-==01/13/2005
+==01/13/2005==
 Doodman: Merged source (FNW changes) in to LiveCompat
 Doodman: SendItemPacket's are now sent deflated (speeds up merchants)
 Doodman: Combining is now turned on in makefile.perl for zone
@@ -10025,7 +10057,7 @@ Doodman: New item structure is in:
 		eqitems.13th-floor.org
 	Item table convert script: utils/items-0.6.0-DR2-0.6.1-DR1-convert.sql
 
-==01/10/2005
+==01/10/2005==
 FatherNitwit: Disable sleep() in perl, it is bad news.
 FatherNitwit: Fixed guild MOTD at login (hopefully).
 FatherNitwit: Fixed minor security problem in SQL logging.
@@ -10033,7 +10065,7 @@ FatherNitwit: Added error reporting to waypoint editing commands.
 FatherNitwit: Reworked client packet handling to use opcode dispatch
   routines, which is paving the way for dynamic opcodes.
 
-==01/07/2005
+==01/07/2005==
 FatherNitwit: Fixed rogue-like skill training (sneak, etc..)
 FatherNitwit: Added spawn_limit field to spawnentry and npc_types
    which represent the maximum number of that npc_type which can spawn
@@ -10053,13 +10085,13 @@ Required Queries:
 ALTER TABLE spawnentry ADD spawn_limit TINYINT NOT NULL DEFAULT '0';
 ALTER TABLE npc_types  ADD spawn_limit TINYINT NOT NULL DEFAULT '0';
 
-==01/04/2004
+==01/04/2004==
 Doodman: opcode/struct changes to allw zoning in on live.
 
-==12/29/2204
+==12/29/2004==
 Doodman: Fixed leak in Separator
 
-==12/21/2004
+==12/21/2004==
 FatherNitwit: fixed item handing to non-quest NPCs
 FatherNitwit: delete nodrop or norent items left in world containers
 FatherNitwit: changed quest::spawn commands to return the NPC ID of the spawned mob (in XS)
@@ -10088,27 +10120,27 @@ FatherNitwit: Cleaned up eq_packet_structs.h a bit
 FatherNitwit: Required DB update:
 ALTER TABLE character_ ADD extprofile BLOB NOT NULL;
 
-==11/20/2004
+==11/20/2004==
 Doodman: Fixed merchant selling bug on merchant slot
 
-==11/18/2004
+==11/18/2004==
 Doodman: Fixed the initialization of augs on NPC loot that was causing a zone crash when looting NPC's
 
-==11/16/2004
+==11/16/2004==
 Doodman: Implemented Augmentation inserting, removal and distilling.
 Doodman: Augment saves in inventory, shared bank, player_corpse and object_contents.
 Doodman: Fixed world to detect and cleanup a zone disconnect immediately instead of when it tries to write to it.
 Doodman: Reimplmented cursor queue using an actually queue.  Should be unlimited depth now.
 Doodman: Updated items for new fields and new names.
 
-==11/10/2004
+==11/10/2004==
 LethalEncounter: Fixed a couple of corpse related bugs.
 LethalEncounter: Added in various functions for the new login system.
 
-==11/09/2004
+==11/09/2004==
 FatherNitwit: Fixed minor crash with new grid delay thing.
 
-==11/08/2004
+==11/08/2004==
 LethalEncounter: Fixed loot bug with stacked items.
 LethalEncounter: Added a 10 second timer to grid assignments to speed up zone in time.
 FatherNitwit: Fixed invalid bind zone crash.
@@ -10130,22 +10162,22 @@ FatherNitwit: Rewrote NPC spell casting code to be a ton more effecient
 FatherNitwit: Run this query (value of 1 == NPC might aggro other NPCs):
 ALTER TABLE npc_types ADD npc_aggro TINYINT NOT NULL DEFAULT '0';
 
-==11/07/2004
+==11/07/2004==
 LethalEncounter: Added in three variables per feature request.
 
-==11/06/2004
+==11/06/2004==
 LethalEncounter: Fixed Merchant bug that wouldnt let you buy anything.
 LethalEncounter: Fixed stack bug that wouldnt automatically stack any items you bought.
 
-==11/05/2004
+==11/05/2004==
 LethalEncounter: Client Freeze/Black Screen of Death bugs have been eliminated.
 LethalEncounter: Added a simple count to our linked list so we can process a few things faster and more efficiently.
 LethalEncounter: Fixed a small compile bug in regards to corpses.
 
-==11/04/2004
+==11/04/2004==
 FatherNitwit: Fixed exploit with split that kathgar found.
 
-==11/01/2004
+==11/01/2004==
 LethalEncounter: Inventory items on zone in are now sent in one packet like live instead of individual packets.  This will save on bandwidth and processing time.
 Cofruben: Added support for /makeleader command.
 FatherNitwit: Increased max buffs from 15 to 20
@@ -10168,28 +10200,28 @@ FatherNitwit: Fixed NPC -> NPC aggro, need to run these queries onan older DB:
 ALTER TABLE npc_faction_entries ADD npc_value TINYINT UNSIGNED DEFAULT '0' NOT NULL;
 UPDATE npc_faction_entries SET npc_value=1 WHERE value<0;
 
-==10/31/2004
+==10/31/2004==
 LethalEncounter: Aside from a few tweeks, merchants are finished.  They will now keep your items after you sell them like live.
 LethalEncounter: Fixed bug that caused falling damage to be calculated twice.
 LethalEncounter: Changed Sense Heading to start at 200 for new characters.
 LethalEncounter: Black screen bug should be fixed now.
 LethalEncounter: Fixed bash/slam.
 
-==10/30/2004
+==10/30/2004==
 LethalEncounter: Fixed a few issues with item charges.
 LethalEncounter: Fixed illusions.
 LethalEncounter: Rewrote the merchant code.  Its now much more efficient and instead of 81 database queries per shop request, a typical request doesnt pull anything from the db.  It loads the information at load time.
 LethalEncounter: Added in the beginning parts of temporary merchant items. (you can sell items to merchants and purchase them back) Download the merchantlist_temp table from: http://www.eqemulator.net/sql/merchantlist_temp.sql
 
-==10/27/2004
+==10/27/2004==
 Cofruben: Added LDoN adventure system.Please,source the new sql file(thanks to skorch for testing).
 LethalEncounter: Mob deaths should be sent to all players now.
 LethalEncounter: ServerType 1 will make you pvp on zone in now.  Still trying figure out why the client doesnt send any pvp special combat abilities unless your dueling.
 
-==10/26/2004
+==10/26/2004==
 Scorpious2k: Fixed guild doors
 
-==10/25/2004
+==10/25/2004==
 FatherNitwit: Fixed zone crash related to character_ query.
 FatherNitwit: Fixed book reading to give proper book window.
 FatherNitwit: At least partialy fixed pet dual weild/double attack problem.
@@ -10198,11 +10230,11 @@ FatherNitwit: Fixed archery ammo issue.
 LethalEncounter: Added ability to /consent (and /deny) other players so they can drag your corpse.
 LethalEncounter: Fixed bug where other people were able to loot your corpse.
 
-==10/24/2004
+==10/24/2004==
 LethalEncounter: Fixed bug where you lost air supply on zoning in underwater.
 LethalEncounter: Fixed GM damage bug.
 
-==10/23/2004
+==10/23/2004==
 FatherNitwit: Enable named quests by default (in features.h)
 FatherNitwit: Fixed decaying world containers problem
 FatherNitwit: Fixed undead nuke spells
@@ -10216,16 +10248,16 @@ LethalEncounter: Fixed Bazaar trader bug.
 LethalEncounter: Zones now display the proper fog when you update your zone table with the latest.
 LethalEncounter: Fixed zone crash and merchant item charge bug.
 
-==10/22/2004
+==10/22/2004==
 LethalEncounter: Fixed item deletion bug not updating client.
 
-==10/21/2004
+==10/21/2004==
 LethalEncounter: Fixed various AA related bugs.
 
-==10/20/2004
+==10/20/2004==
 LethalEncounter: Reworked zoning in, solved a couple of issues and should speed the process up a tad.
 
-==10/19/2004
+==10/19/2004==
 FatherNitwit: Fixed Disciplines and Abilities (lay hands & harm touch)
 FatherNitwit: Added new server variable: DisableNoDrop (set to 1 takes nodrop off items when loaded)
 FatherNitwit: Fixed NPC buffing through walls
@@ -10234,28 +10266,28 @@ LethalEncounter: Fixed equip bug when using two handed weapons.
 LethalEncounter: Fixed resurrect bug that let you regain xp more than once.
 LethalEncounter: Fixed bug that was making players corpses disappear on death when they shouldnt have.
 
-==10/18/2004
+==10/18/2004==
 LethalEncounter: Fixed pet only spells.
 LethalEncounter: Fixed bug that wouldnt let you loot a corpse if someone got an error looting it. (such as a dupe lore error)
 LethalEncounter: Fixed mana regen bug.
 
 
-==10/17/2004
+==10/17/2004==
 LethalEncounter: Added some debug code to make it easier for people that cant get minilogin working.
 LethalEncounter: You will now eat/drink like eqlive if you arent a GM.
 LethalEncounter: Fixed infinite recursion bug I made a few days ago :/
 
-==10/16/2004
+==10/16/2004==
 LethalEncounter: Fixed mana bug that was causing people not to regen their full mana.
 LethalEncounter: HP Adjustments, will now send your hp update every tic and only the mob you have targeted (not including group hp updates) to reduce bandwidth.
 LethalEncounter: Fixed a crash bug on character creation.  Thanks to blahblah for the help :P
 LethalEncounter: Fixed item charge bug, need to update your database.
 
-==10/15/2004
+==10/15/2004==
 LethalEncounter: Changes necessary for the new MiniLogin :)
 LethalEncounter: Z loc fix, it was placing you ten times the z loc it was supposed to :P
 
-==10/14/2004
+==10/14/2004==
 Rogean: omg we are so teh 0.6.0DR1 now~
 
 FatherNitWit:
@@ -10372,11 +10404,11 @@ FatherNitwit Improvements:
 - If a player logs/zones in to a Z below the world, they are placed at a valid Z if possible.
 - labeled new item field as attuneable, updated DB code for it
 
-==10/10/2004
+==10/10/2004==
 LethalEncounter: Fixed some issues with hp and mana.
 LethalEncounter: Fixed bug with zoning z coord.
 
-==10/09/2004
+==10/09/2004==
 LethalEncounter: Fixed spell scribing and meming.
 LethalEncounter: Merged in Xabob's expansion fixes (except regen which FNW is working on).
 LethalEncounter: Merged in RangerDown's fixed version of #spawnfix.
@@ -10384,259 +10416,259 @@ LethalEncounter: Fix for #zcolor that was brought up by rmanders on the bug foru
 LethalEncounter: Character conversions from 5.7 to 5.9 should be fixed now.
 LethalEncounter: Implicit length fix and mana struct fixed.
 
-==10/05/2004
+==10/05/2004==
 FatherNitwit: Fix name generator opcode
 FatherNitwit: Added loot table drop chance fix
 FatherNitwit: Cleaned up some map code and other thing
 
-==10/02/2004
+==10/02/2004==
 LethalEncounter: Updated AAs so they are sent based on class now.
 
-==10/02/2004
+==10/02/2004==
 LethalEncounter: Updated to version 5.9-DR2 (EQLive Compatible).
 
-==10/02/2004
+==10/02/2004==
 LethalEncounter: Updated all the structs/opcodes necessary to login using the latest client.
 
-==10/02/2004
+==10/02/2004==
 LethalEncounter: Misc AA fixes.
 
-==09/29/2004
+==09/29/2004==
 LethalEncounter: Fixed AAs, you can now buy them correctly.  Big thanks to Xabob for PacketCollecting the information for me!!
 
-==09/26/2004
+==09/26/2004==
 LethalEncounter: Fixed the displaying of AAs, moving them into two tables. Be SURE to source aa.sql for these updates.
 		 (Will fix the buying aspect soon)
 
-==09/25/2004
+==09/25/2004==
 Doodman: Fixed linux kernel 2.6.x shared memory bug.  IPC_NOWAIT is not allowd on shared memory segment operations.
 
-==09/20/2004
+==09/20/2004==
 Scorpious2k: Allow multiple Perl plug-ins
 
-==09/17/2004
+==09/17/2004==
 Doodman: (un)fixed world to hand the LS->world hand off like it did in the past
 
-==/09/12/2004
+==/09/12/2004==
 FatherNitwit: Added my LOS code and map converter. Thanks to wiz for help with testing.
 
-==/09/09/2004
+==/09/09/2004==
 FatherNitwit: Adding basics of spell specialization.
 
-==/09/07/2004
+==/09/07/2004==
 FatherNitwit: Fixed #heal on pets.
 
-==/09/05/2004
+==/09/05/2004==
 FatherNitwit: Fixed minor flaw in player profile with skills.
 FatherNitwit: Merged My Tradeskill Rewrite
 LethalEncounter: Moved zone configurations from the old flat file method to the database.
 BE SURE TO SOURCE ZONECFG.SQL!!!
 
-==/09/04/2004
+==/09/04/2004==
 FatherNitwit: Merged in ProjectEQ's 2grid system
 FatherNitwit: Fixed new style hate/regen/mana regen on items
 FatherNitwit: Collected PoP item features from equiped, not used yet
 LethalEncounter: Fixed /bug
 LethalEncounter: Fixed merchant messages/issues
 
-==/09/03/2004
+==/09/03/2004==
 FatherNitwit: Fixed almost ALL compile warnings on UNIX
 FatherNitwit: Added my named quest files patch as optional #ifdef
 FatherNitwit: Added persistent timers (client->p_timers)
 FatherNitwit: Added 508->588 byte .cfg file converter
 
-==/08/31/2004
+==/08/31/2004==
 FatherNitwit: Fixed MOB point-blank AE spells to cast (from PEQ folks)
 FatherNitwit: Fixed Spawned MOB's being permarooted.
 
-==/08/29/2004
+==/08/29/2004==
 LethalEncounter/Cofruben: LOY Guild Management tool updated.
 Cofruben: Added new perl function: quest::addloot(itemid,charges).
 
-==/08/28/2004
+==/08/28/2004==
 Cofruben: Implemented inspect code.
 
-==/08/26/2004
+==/08/26/2004==
 Wiz: Fixed a bug that was displaying unknown spells on login.
 Wiz: Fixed a bug that was causing hp to go wonky when you join a group.
 Wiz: Fixed a bug that was preventing you from attacking when invulnerable.
 Wiz: Fixed a bug that would cause invulnerability spells to stop working if you zoned.
 
-==/08/25/2004
+==/08/25/2004==
 FatherNitwit: Redid split, implemented autosplit.
 
-==/08/23/2004
+==/08/23/2004==
 Draupner: Fixed spell haste focuses
 
-==08/21/2004
+==08/21/2004==
 LethalEncounter: Finished updating few structs, can now login with latest client.  Merchants, combat, loot, etc work fine.
 
-==08/20/2004
+==08/20/2004==
 LethalEncounter: Fixed player profile.
 
-==08/12/2004
+==08/12/2004==
 Cofruben:Added basics of begging.
 Cofruben:Added group splitting.
 
-==08/10/2004
+==08/10/2004==
 Wiz: Severely cleaned up position update code and made it more efficent. Should drastically reduce update packets generated by other clients.
 Wiz: Improved the LOS calculation. It should use less CPU and work better now.
 
-==08/02/2004
+==08/02/2004==
 Scorpious2k: Changed Quest command settimer to reuse timers with same name instead of creating new
 
-==07/26/2004
+==07/26/2004==
 Cofruben: Added some perl functions,including: ding,addldonpoint,surname,permaclass/race/gender,scribespells.
 
-==07/20/2004
+==07/20/2004==
 Draupner: Added #npcedit
 
-==07/19/2004
+==07/19/2004==
 Doodman(WizeOne): Added beacon.o and embxs.o to makefile.perl
 Doodman: Fixed #serverinfo for linux.
 
-==07/12/2004
+==07/12/2004==
 Doodman(RangerDown): Added "You cannot attack while invulnerable" message.
 
-==07/10/2004
+==07/10/2004==
 Scorpious2k: Fixed AA related exploit
 Scorpious2k: Fixed AA problem where % remained if player lost levels to below 51
 
-==06/27/2004
+==06/27/2004==
 Scorpious2k: Added quest command spawn2 - same as spawn except also requires heading
 Scorpious2k: Modified Quest Globals. It now always creates a unique var if char specific (not ALL players)
 Scorpious2k: Enabled traders
 Sandy: Changed mobs so they must have SPECATK_SUMMON to summon players
 
-==06/23/2004
+==06/23/2004==
 Rogean: Mobs no longer Dual Wield with Shields
 
-==06/22/2004
+==06/22/2004==
 Sandy: Event Aggro added
 Sandy: Permaroot added
 Sandy: x,y,z variables for quests corrected
 
-==06/17/2004
+==06/17/2004==
 Dspirit: More patch 6/16 opcodes corrected
 
-==06/16/2004
+==06/16/2004==
 Dspirit: Patch 6/16 opcodes corrected
 
-==06/14/2004
+==06/14/2004==
 Dspirit: More opcodes corrected
 
-==06/13/2004
+==06/13/2004==
 Dspirit: Multiple opcodes corrected
 
-==06/12/2004
+==06/12/2004==
 LethalEncounter: #zone fixed.
 Rogean: Fixed inspecting items in adventure window.
 Rogean/Scorpious2k: AA Fixes Implimented
 
-==06/11/2004
+==06/11/2004==
 Doodman: Fixed OP_HPUpdate and SendHPUpate.  Client now gets proper HP updates.
 
-==06/11/2004
+==06/11/2004==
 Scorpious2k/Image: #reloadqst now works for perl (Reloads the entire zones quest files).
 
-==05/29/2004
+==05/29/2004==
 Scorpious2k: Changed opcode to fix trade windows >> THANKS Dspirit
 
-==05/29/2004
+==05/29/2004==
 Scorpious2k: Merged in Sandy's EVENT_HP code
 Scorpious2k: Merged in Bleh's Perl/XS enhancement
 Scorpious2k: Added quest commands for mob movement stop(),start(),pause(),resume() and moveto()
 
-==05/28/2004
+==05/28/2004==
 Doodman/Bleh: Move NPCTypes out of shared mem in to zone specific STL maps.
 Doodman/Bleh: Removed NPCTypes.o from makefile in EMuShareMem
 Doodman/Bleh: Fixed null pointer dereference in selling
 
-==5/15/2004
+==5/15/2004==
 Doodman: Upped MMF_MAX_NPCTYPE_ID to 400k to support tcsmyworlds db
 Doodman: Fixed EQNetwork.cpp to be C++ standard compliant, -not- MS compliant
 
-==5/11/2004
+==5/11/2004==
 Image: Better netcode, rawr.
 Scorpious2k: Added AC to mobs - be sure to check MobACupdate.sql
 Scorpious2k: Changed AC so it can now be controlled with serverOp variables ACreduction, ACrandom & ACfail
 Scorpious2k: Added check so items with req level can't be auto equipped if player not >= req level
 Scorpious2k: Added generic (theme = 0) LDoN point processing
 
-==5/6/2004
+==5/6/2004==
 Image: Fixed tradeskill places like smiths
 
-==4/28/2004
+==4/28/2004==
 Image: EQNetwork changes to get packets to send in order
 Image: Fixed zones getting bugged (unable to attack, see others, etc.)
 
-==4/23/2004
+==4/23/2004==
 LethalEncounter: Emu works with the latest patch now.  Sony did some crazy crap and added 4608 bytes to player profile :/
 
-==4/20/2004
+==4/20/2004==
 Image: Lifetap now works on PVP
 Image: Fixed the stacks of snare/root/speed, snare breaks speed spells (SOW,JBoots,etc.), root breaks snare, root breaks speed spells also.
 
-==4/17/2004
+==4/17/2004==
 LethalEncounter:  Fixed merchants that were broken in the last patch.
 Image:  Inventory item combining added to decrease the traffic sent on zoning.
 
-==4/16/2004
+==4/16/2004==
 LethalEncounter:  Fixed item struct that was changed in the last patch, items now work again.
 
-==4/15/2004
+==4/15/2004==
 LethalEncounter:  Fixed Player Profile that was changed in the last patch, you can now login correctly.
 
-==4/08/2004
+==4/08/2004==
 Scorpious2k & Tark: Fixed incompatability problem with Perl and combined packets
 
-==4/02/2004
+==4/02/2004==
 Image: Improvements made on the combination code.
 
-==3/29/2004
+==3/29/2004==
 Image: Combined packets now work to full extent.  Set app priority to 6 if you don't want it combined, all packets should no longer be deflated,encrypted unless priority 6.
 Scorpious2k: Fixed mob movement
 
-==3/28/2004
+==3/28/2004==
 Scorpious2k: Added quest command signal() and EVENT_SIGNAL
 Scorpious2k: Made mobs face player for EVENT_SAY and EVENT_ITEM
 Scorpious2k: Added smogo's $hasitem for perl quests
 Scorpious2k: Added selfcast() command to perl quests
 
-==3/23/2004
+==3/23/2004==
 Scorpious2k: Added AC. Probably needs major adjusting of values to match live, but its a start.
 
-==3/22/2004
+==3/22/2004==
 image: Group inviting is fixed.
 
-==3/21/2004
+==3/21/2004==
 solar: corrected an issue with channeling skill/regaining concentration
 solar: changed spell resist so that only detrimental spells are resist checked.
 	will have to flag beneficial flags that need resist checking later.
 
-==3/20/2004
+==3/20/2004==
 solar: spell resists implemented
 solar: added/fixed up some spell effects.  notable ones are the stackable
 	hastes like melody of ervaj
 solar: added new version of Wiz's CheckLos routine
 solar: fixed a problem with detrimental buffs (root, mez) not working in pvp
 
-==3/15/2004
+==3/15/2004==
 solar: door updates, find sql file in release dir - doorupdate-03-15-04.sql
 
-==3/13/2004
+==3/13/2004==
 solar: fixed zone to zone movement occasionally not working
 
-==3/10/2004
+==3/10/2004==
 solar: spells that are group only should only work on the group now.
 
-==3/07/2004
+==3/07/2004==
 solar: moving coin around should work properly now
 
-==3/06/2004
+==3/06/2004==
 solar: looted stackable items should distribute properly now.
 
-==3/05/2004
+==3/05/2004==
 solar: player armor will appear the proper color now
 solar: LoY Dye works.  You need a vial of prismatic dye for each slot you
 	want to change the color of.
@@ -10645,40 +10677,40 @@ solar: looting differentiates between left and right clicks.  left clicking
 	auto equip it.
 solar: containers can now be auto equip looted
 
-==3/02/2004
+==3/02/2004==
 solar: implemented AE location spells. ex: rain of lava, sentinel.  small
 	issue with this still; the caster continues to execute the casting
 	animation for the duration of the spell.
 
-==3/01/2004
+==3/01/2004==
 solar: started implementing AE rain type spells, still some work left to do.
 	There are 2 new files for a Beacon class that you have to add to
 	the build.
 
-==2/29/2004
+==2/29/2004==
 solar: revised and corrected a ton of spell effect stuff
 solar: corrected an hp regen issue, but need to get the proper calculations
 	for regen rates.  until corrected, clients will see their hp regen
 	and then immediately change to what the server thinks it should be
 solar: probably broke something
 
-==2/28/2004
+==2/28/2004==
 solar: spells will now consume reagents properly
 solar: lifts work again
 solar: corrected a mistake that caused spells to not finish scribing properly
 solar: fixed some memory leak issues regarding hp updates
 
-==2/25/2004
+==2/25/2004==
 Scorpious2k: Added vesuvias changes for 5.5 - luclin appearence should work now
 
-==2/22/2004
+==2/22/2004==
 solar: spells should be in working order again, more work to be done on this.
 
-==2/20/2004
+==2/20/2004==
 solar: merged vesuvias' appearance (face, beard etc) and zone change
 	 changes from the old code.
 
-==2/19/2004
+==2/19/2004==
 kathgar:  Fixed, SE_Fear, SE_SpinStun, SE_Charm for fixed duration spells and not double checking breaking
 	  Range check on Archery
 	  Skill checks on Hide and Sneak
@@ -10688,44 +10720,44 @@ kathgar:  Fixed, SE_Fear, SE_SpinStun, SE_Charm for fixed duration spells and no
 	  No EQLive fixes in this change
 solar: fixed a bug that was causing people to be set as gm when they shouldn't
 
-==2/15/2004
+==2/15/2004==
 solar: characters being created are checked for validity now.  thanks to
 	kathgar for the tables.
 
-==2/14/2004
+==2/14/2004==
 Zaphod: Added Door ZonePoint information.
 
-==2/13/2004
+==2/13/2004==
 solar: Doors should work now
 solar: adventure merchant stuff fully working (check me)
 solar: petition interface stuff believed to be working but not fully tested
 LethalEncounter: (entered by solar) fixed item opcode, items fully working
 
-==2/12/2004
+==2/12/2004==
 solar: Opcodes updated from Zaphod's list, also a few others.  All the ops
 	that are tabbed in are unconfirmed, and I marked unused ones also.
 
-==2/10/2004
+==2/10/2004==
 Image: NewSource directory created for 0.5.5 (EQLive Compatability Developement)
 Image: Few opcodes updated, also implicitlen updated.
 
-==2/8/2004
+==2/8/2004==
 solar: fixed a world crash regarding deleting an empty character slot
 
-==2/7/2004
+==2/7/2004==
 solar: AE spells working properly now
 solar: wrote all new buff duration formulas
 solar: buffs being applied will properly displace multiple buffs if needed
 solar: bard spells should keep casting while sitting now
 solar: mobs should now have a proper casting animation when they cast
 
-==2/6/2004
+==2/6/2004==
 solar: some buff stacking changes, misc spell stuff
 
-==2/5/2004
+==2/5/2004==
 solar: more spell work, bards should be in a working state, but not done.
 
-==2/3/2004
+==2/3/2004==
 Image: Divine Aura now works cross zone.
 Image: Invisibility now works cross zone.
 Image: Added a zone(""); command to quest (Zones them to the specified short zone name)
@@ -10734,43 +10766,43 @@ Image: Tons of my personal GW stuff changed, you can't see bwuhahahhah
 Image: Fixed platinum duping
 Image: Levitate now works cross zone (others see you levitate and not warping)
 
-==2/2/2004
+==2/2/2004==
 Scorpious2k: added quest global variables (requires DB change see quest_globals.txt in EQEmu Release))
 Scorpious2k: fixed faction command in parser
 
-==2/2/2004
+==2/2/2004==
 solar: worked on buff stacking and some misc spell stuff.
 
-==2/1/2004
+==2/1/2004==
 solar: group spell fixes
 solar: implemented /targetgroupbuff
 
-==1/31/2004
+==1/31/2004==
 solar: revised the StringID based messaging.
 
-==1/30/2004
+==1/30/2004==
 solar: Merged in Wiz's CheckLos() mob method
 solar: Spell casting fixes.
 solar: Channeling skill should work very similar to live now.  If you end
 	your casting where you started you have a chance to finish casting.
 solar: Line of sight is checked for spells.
 
-==1/29/2004
+==1/29/2004==
 LethalEncounter: Fixed an issue with HT and LoH not repopping, apparently fatigue in player profile was moved into the timer hours slot.
 solar: Updated death.  You shouldn't receive an extra message about being
 	punched when you die to a spell anymore.
 
-==1/28/2004
+==1/28/2004==
 solar: fixed an item dupe bug.
 
-==1/26/2004
+==1/26/2004==
 solar: various fixes to spells, more coming.
 
-==1/25/2004
+==1/25/2004==
 LethalEncounter: Fixed some issues with the guilds.
 LethalEncounter: No Rent items will now be deleted if your offline for more than 30 minutes.
 
-==1/24/2004
+==1/24/2004==
 LethalEncounter: The guild management tool has been updated and works again.
 LethalEncounter: Guilds will now work almost 100% like live, only a few of the #guild commands are left over, mainly for gm management.
 kathgar: Added #revoke and #oocmute
@@ -10785,28 +10817,28 @@ solar: /surname command corrects capitalization and rejects non alpha now.
 solar: #name fixed - renames player target
 solar: made some fixes to kathgar's revoke patch - it now works as intended.
 
-==1/23/2004
+==1/23/2004==
 solar: LD clients should now be kicked when the LD timer is up, even if engaged.
 solar: Buffs should be working correctly after zoning now.
 solar: #gassign fixes
 
-==1/22/2004
+==1/22/2004==
 solar: Corpses are now sent to clients zoning in.
 
-==1/21/2004
+==1/21/2004==
 Trumpcard: Merged in mongrels fix for undead/invis. Use update sql provided in release to update.
 solar: Buff fading should work for slots besides the first one now.  This will
 	fix the 'mez bug' that was due to the icon not being stripped.
 
-==1/20/2004=
+==1/20/2004==
 solar: sense heading skill will now improve as you move around
 
-==1/19/2004=
+==1/19/2004==
 Scorpious2k: fixed faction command for quests
 LethalEncounter: Fixed a problem with queued cursor items.
 solar: fixes to #gassign
 
-==1/18/2004=
+==1/18/2004==
 LethalEncounter: Added item and spell bonuses to the mana regen formulas, they will now help.
 LethalEncounter: Fixed a bug that was killing players even when they had hitpoints remaining.
 LethalEncounter: Added server side filters
@@ -10856,7 +10888,7 @@ LethalEncounter: You will now get hit for max damage when you are sitting and an
 LethalEncounter: Fixed loot messages.
 LethalEncounter: Fixed loot so right click autoequips correctly now.
 
-==1/4/04==
+==1/4/2004==
 MYRA: changed to new opcode for follow
 MYRA: changed to new opcode for taunt
 MYRA: use new (5.x) Status labels in who for telnet connection
@@ -10877,14 +10909,14 @@ MYRA: fixed comma bug for shout command
 MYRA: added itemlink(ItemNumber) command
 
 
-==1/2/04==
+==1/2/2004==
 LethalEncounter: Added further support for eqstr_us.txt, this should cut down on lag.
 Image: Fixed client lockup related to spells. aka 'spell sticking'.
 
-==1/1/04==
+==1/1/2004==
 LethalEncounter: Updated spell structure to new spells_us.txt format. NOTE: You must have the latest eqlive spells_us.txt in your EQEmu directory.
 
-==12/21/03 through 1/1/04==
+==12/21/03
 Image/LethalEncounter/kathgar/devn00b/Shawn319:
 
 Updated/added several opcodes to match eqlive.
@@ -10912,100 +10944,102 @@ Server no longer counts item stats in the ammo slot (as it should).
 Fixed bug with eventlog that would cause certain entries to return a MySQL syntax error.
 
 
-==12/21/03==
+==12/21/2003==
 LethalEncounter: Ive been busy the last few days updating all the opcodes and structs for the recent patch.  Nearly everything works again please post any remaining unknown opcodes to the development forum.
 
-==12/16/03==
+==12/16/2003==
 Image: Fixed #zsave and added #zunderworld so you can set the zcoord for underworld.
-==12/15/03==
+
+==12/15/2003==
 Image: Took out an HP update in NPC::Damage() reduces HP updates big time and kills network traffic.
 Image: All HP Updates are done only to targets now, TODO: Queue group clients with HP updates (once they work again)
-==12/14/03==
+
+==12/14/2003==
 LethalEncounter: Fixed a bug in tradeskills that was clearing the container before it was telling the client to.
 LethalEncounter: Fixed the opcode for mend.
 LethalEncounter: Fixed the guild trainer messages.
 LethalEncounter: Fixed char create so it creates the character with a new aa struct.
 LethalEncounter: Important fix for mob movement via waypoints and such.  Mobs now move nearly exactly like live and it uses 20 times less bandwidth than before.
 
-==12/13/03==
+==12/13/2003==
 LethalEncounter: Fixed Environmental Damage
 LethalEncounter: Added support for a new database variable called startzone.
 	To use this, add a record called startzone to the variables table and make the value the zone shortname you want players to start in. This will force all players to start in that zone.
 LethalEncounter: Fixed a bug that Shawn found where /zone wouldnt work correctly in zones with similiar names.
 
-==12/12/03==
+==12/12/2003==
 Shawn319: (Bud9weiser) Fixed start_zones bug. Players should now start in correct location as long as db is up to date.
 LethalEncounter: Item tint fix.
 LethalEncounter: Tradeskill items being deleted without correct recipe fix.
 LethalEncounter: Problem with the ' character inserting into the bug table fixed.
 
-==12/11/03==
+==12/11/2003==
 LethalEncounter: Added Archery in for pvp.
 LethalEncounter: Fixed a throw bug.
 LethalEncounter: Fixed char select colors not matching your colors in game.
 
-==12/10/03==
+==12/10/2003==
 LethalEncounter: Fixed the weapon delay bug.  Special thanks to haecz for bring this to our attention.
 LethalEncounter: Fixed dup money bug.  Special thanks to afrospy also for bring this to our attention.
 LethalEncounter: Fixed Bazaar Traders, they should work correctly.
 
-==12/09/03==
+==12/09/2003==
 LethalEncounter: Fixes for item tints and dyes.
 LethalEncounter: Fixed NPC textures finally.
 
-==12/08/03==
+==12/08/2003==
 LethalEncounter: Fixed Horses/Drogmors.
 
-==12/07/03==
+==12/07/2003==
 LethalEncounter: Fixed a bug with pets causing lag.
 LethalEncounter: Fixed a crash bug/1017 bug related to login in, people on slow/lagged connections should be able to login fairly
 consistently now.
 
-==12/02/03==
+==12/02/2003==
 LethalEncounter: Trumpcard and I completely rewrote the linked lists to improve lag, they are about 4 times more efficient now.
 LethalEncounter: Fixed a small bug with zone points. BE SURE YOUR USING THE MOST UP-TO-DATE TABLE!!
 
-==11/30/03==
+==11/30/2003==
 LethalEncounter: Fixed various loot bugs, including the duplicate lore item, blah blah blah bug..
 LethalEncounter: Fixed #zonestatus and /servers to be on multiple lines
 LethalEncounter: Fixed /who all guild tags to display the right guild
 LethalEncounter: Added the ability to send multi-lined emotes with the <BR> newline.
 LethalEncounter: Fixed the bug that gave the message: "Multiplier == 0 in Client::CalcBaseHP"
 
-==11/29/03==
+==11/29/2003==
 Image: Fixed last names for clients (When a new client zoned in, didn't send lastname).
 
-==11/28/03==
+==11/28/2003==
 LethalEncounter: Added a default instance for pets that arent created via legit spells.
 LethalEncounter: Fixed the spell scribe issues.
 
-==11/25/03==
+==11/25/2003==
 LethalEncounter: Added a new table called ground_spawns.  This will allow you to spawn items randomly throughout the zone. Use this for only random locations, use the object table for static ones.
 LethalEncounter: Added Timers for ground spawns so they will respawn based on the time you set.
 
-==11/24/03==
+==11/24/2003==
 Image: Fixed zoning and deaths so you no longer drop from the server.
 Image: Properly enabled LDoN on EQEmu.
 Image: Basic Adventure Merchant code implemented, throwing it to the STL guys to properly optimize.
 LethalEncounter: Fixed Tradeskill objects.  If the objects show up as bags, thats a db issue
 
-==11/23/03==
+==11/23/2003==
 Trumpcard:  Several zone performance enhancements, as well as changes to decrease combat lag.
 LethalEncounter: Reworked pets, they should now work properly.
 
-==11/21/03==
+==11/21/2003==
 LethalEncounter: Merchants wont trade with people while they are fighting now.
 LethalEncounter: Players can no longer attack while invulnerable.
 LethalEncounter: Fixed an AA bug that gave the player 199 aa points.
 
-==11/18/03==
+==11/18/2003==
 LethalEncounter: Lotsa cool fixes like crash fixes and guild fixes and cool stuff like that
 
-==11/17/03==
+==11/17/2003==
 LethalEncounter: Finally got /who all done and *hopefully* free of bugs.
 LethalEncounter: Fixed a crash bug with guilds and added some of the Guildmanagement features.
 
-==11/16/03==
+==11/16/2003==
 Trumpcard: Several deallocate and mem leak errors corrected.
 solar: Fixed bug with mobs assisting entities they shouldn't.  Often this
 	show itself with other mobs helping the player when the player
@@ -11013,16 +11047,16 @@ solar: Fixed bug with mobs assisting entities they shouldn't.  Often this
 LethalEncounter: Added in the GuildManagement tool. You will need 2 new columns in your character_ table for this.
 LethalEncounter: Fixed a couple crash bugs with guilds and spells.
 
-==11/15/03==
+==11/15/2003==
 solar: Fixed a bug in commands where if you didn't define an accesslevel for a command
 	in the addon.ini it would default to accesslevel 0 instead of the hardcoded default.
 solar: Modified #help command to search for a partial command specified as argument.
 solar: HP wasn't being updated to client properly and would fall out of sync
 
-==11/14/03==
+==11/14/2003==
 LethalEncounter: Fixed a bug in doors that would cause triggered doors to go into an endless loop and crash.
 
-==11/13/03==
+==11/13/2003==
 kathgar: Fixed a crash when calling ZSList::FindByZoneID() when sending an invalid zone number.
          Stack was corrupt in the backtrace, so I am not sure what called it in this way.
 LethalEncounter: Fixed animation bug with attack.
@@ -11031,44 +11065,44 @@ LethalEncounter: Character Select will now show your equipment (Existing charact
 LethalEncounter: NPCs will now equip weapons and items from the db.
 LethalEncounter: You can now give weapons and items to NPCs to equip.
 
-==11/12/03==
+==11/12/2003==
 LethalEncounter: Fixed skills, we had the struct one int32 off.
 LethalEncounter: Fixed GM Trainers, they should now work as intended.
 
-==11/11/03==
+==11/11/2003==
 Doodman: Fixed zone crash in CheckCloseArrgo() during assist checking based on
 flawed if logic.
 
-==11/11/03==
+==11/11/2003==
 LethalEncounter: Fixed Stamina issues.
 
-==11/10/03==
+==11/10/2003==
 LethalEncounter: Fixed Quests.
 LethalEncounter: A quest fix that makes them use far less memory, up to 25 MB per computer
 
-==11/09/03==
+==11/09/2003==
 LethalEncounter: Fixed zoning, zone_points should now work correctly, but make sure you have the latest ones in zone_points!
 LethalEncounter: Fixed problem with spells not scribing.
 LethalEncounter: Fixed zoning bug where you zoned back into the same zone, but it looked like you were in the new zone.
 
-==11/06/03==
+==11/06/2003==
 Image: Guildwars code and fixed a bug in MobAI for NPCs assisting clients, clients do not use
 IsEngaged(), so it always returned false, now it uses AutoAttackEnabled() in its place for clients.
 Image: Reversed the AICheckCloseSpells if statements, now sanity checks before distance check, uses less CPU usage.
 
-==11/05/03==
+==11/05/2003==
 LethalEncounter: Updated all of the opcodes that were changed in the patch today.
 LethalEncounter: Refined AA's some, added table to hold the timers for AA's so users can exploit them. Look in db.sql for the table.
 
 
-==11/04/03==
+==11/04/2003==
 LethalEncounter: Added in the basic structure for AA's and got some of them working.
 
-==11/03/03==
+==11/03/2003==
 LethalEncounter: Fixed factions.
 LethalEncounter: Fixed issues with mobs of different factions or no faction assisting.
 
-==10/29/03 to 11/02/03==
+==10/29/2003==
 LethalEncounter: Fixed X, Y coords.
 LethalEncounter: Added in groups.
 LethalEncounter: Added in trades.
@@ -11084,16 +11118,16 @@ LethalEncounter: Fixed lifts.
 LethalEncounter: Fixed automatic weather changes.  Change the default in the zone table to suit your needs. 1: normal 2: Rainy most of the time 3: Snowing most of the time
 LethalEncounter: Fixed lotsa other important stuff that I cant remember :)
 
-==10/29/03==
+==10/29/2003==
 devn00b: Yet again removed Faulty pet code. LEAVE THEM ALONE
 
-==10/17/03==
+==10/17/2003==
 Image: Zone points code put in, need some testing done on it please!
 
-==10/15/03==
+==10/15/2003==
 Image: More optimization to the aggro code and an infinite for loop fixed.
 
-==10/14/03==
+==10/14/2003==
 kathgar:  Removed deprecated guildwars code
           Added #ifdefs for IPC code, no more IsInteractive checks wasting cycles
           Fixed a memleak in NPC with attacked_timer
@@ -11103,33 +11137,31 @@ merth: Updated zone objects:
 	* Fully supports imported data from packet collector
 	* Objects dropped to ground persist zone sessions
 
-==10/13/03==
+==10/13/2003==
 Image: Optimizations to Aggro code, ~10% more efficient according to Trumpcard.
 
-==10/11/03==
+==10/11/2003==
 Trumpcard: Lots of performance improvements to combat code/AI code.  Streamlined several calls,  and found and removed unneeded calls
 	   in MobAI that were causing serious bottlenecks.  Went through and caught a few memory leaks, and converted
 	   many deletes to safe deletes.
 
-==10/10/03==
+==10/10/2003==
 LethalEncounter: Somewhere around this date I added in bazaar traders and cool features like that.
 
-==10/8/03==
+==10/8/2003==
 Trumpcard:  Starting items are now in.  LE also fixed the combat damage struct and mob hp bar updates.
 
-==10/8/03==
+==10/8/2003==
 scruffy:  Inverted the XY coordinates system to work like the EQLive system. Run invertxy.sql to update existing databases.
 
-==10/6/03==
+==10/6/2003==
 kathgar:  Added opcodes for things such as the LFG tool from SEQ, replaced some instances of static opcode use
 
-==10/5/03==
+==10/5/2003==
 devn00b: Removed Faulty pet code, replaced with working code.
 
-==09/24/03==
+==09/24/2003==
 Image: Added the functions for the GuildWars point system.
 
-==8/10/03==
+==8/10/2003==
 devn00b: Moved pets from hardcoded to DB based. need to source pets.sql
-
-============
diff --git a/client_files/CMakeLists.txt b/client_files/CMakeLists.txt
index 93d748dc6..fe377ec9f 100644
--- a/client_files/CMakeLists.txt
+++ b/client_files/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 add_subdirectory(import)
 add_subdirectory(export)
diff --git a/client_files/export/CMakeLists.txt b/client_files/export/CMakeLists.txt
index c24a01865..08cbbc822 100644
--- a/client_files/export/CMakeLists.txt
+++ b/client_files/export/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(export_sources
 	main.cpp
diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp
index db424846d..ebe91353c 100644
--- a/client_files/export/main.cpp
+++ b/client_files/export/main.cpp
@@ -39,20 +39,19 @@ int main(int argc, char **argv) {
 	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	Log(Logs::General, Logs::Status, "Client Files Export Utility");
+	LogInfo("Client Files Export Utility");
 	if(!EQEmuConfig::LoadConfig()) {
-		Log(Logs::General, Logs::Error, "Unable to load configuration file.");
+		LogError("Unable to load configuration file");
 		return 1;
 	}
 
 	auto Config = EQEmuConfig::get();
 
 	SharedDatabase database;
-	Log(Logs::General, Logs::Status, "Connecting to database...");
+	LogInfo("Connecting to database");
 	if(!database.Connect(Config->DatabaseHost.c_str(), Config->DatabaseUsername.c_str(),
 		Config->DatabasePassword.c_str(), Config->DatabaseDB.c_str(), Config->DatabasePort)) {
-		Log(Logs::General, Logs::Error, "Unable to connect to the database, cannot continue without a "
-			"database connection");
+		LogError("Unable to connect to the database, cannot continue without a database connection");
 		return 1;
 	}
 
@@ -94,11 +93,11 @@ int main(int argc, char **argv) {
 }
 
 void ExportSpells(SharedDatabase *db) {
-	Log(Logs::General, Logs::Status, "Exporting Spells...");
+	LogInfo("Exporting Spells");
 
 	FILE *f = fopen("export/spells_us.txt", "w");
 	if(!f) {
-		Log(Logs::General, Logs::Error, "Unable to open export/spells_us.txt to write, skipping.");
+		LogError("Unable to open export/spells_us.txt to write, skipping.");
 		return;
 	}
 
@@ -165,11 +164,11 @@ int GetSkill(SharedDatabase *db, int skill_id, int class_id, int level) {
 }
 
 void ExportSkillCaps(SharedDatabase *db) {
-	Log(Logs::General, Logs::Status, "Exporting Skill Caps...");
+	LogInfo("Exporting Skill Caps");
 
 	FILE *f = fopen("export/SkillCaps.txt", "w");
 	if(!f) {
-		Log(Logs::General, Logs::Error, "Unable to open export/SkillCaps.txt to write, skipping.");
+		LogError("Unable to open export/SkillCaps.txt to write, skipping.");
 		return;
 	}
 
@@ -194,11 +193,11 @@ void ExportSkillCaps(SharedDatabase *db) {
 }
 
 void ExportBaseData(SharedDatabase *db) {
-	Log(Logs::General, Logs::Status, "Exporting Base Data...");
+	LogInfo("Exporting Base Data");
 
 	FILE *f = fopen("export/BaseData.txt", "w");
 	if(!f) {
-		Log(Logs::General, Logs::Error, "Unable to open export/BaseData.txt to write, skipping.");
+		LogError("Unable to open export/BaseData.txt to write, skipping.");
 		return;
 	}
 
@@ -225,11 +224,11 @@ void ExportBaseData(SharedDatabase *db) {
 }
 
 void ExportDBStrings(SharedDatabase *db) {
-	Log(Logs::General, Logs::Status, "Exporting DB Strings...");
+	LogInfo("Exporting DB Strings");
 
 	FILE *f = fopen("export/dbstr_us.txt", "w");
 	if(!f) {
-		Log(Logs::General, Logs::Error, "Unable to open export/dbstr_us.txt to write, skipping.");
+		LogError("Unable to open export/dbstr_us.txt to write, skipping.");
 		return;
 	}
 
diff --git a/client_files/import/CMakeLists.txt b/client_files/import/CMakeLists.txt
index 0f779497c..a76bab416 100644
--- a/client_files/import/CMakeLists.txt
+++ b/client_files/import/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(import_sources
 	main.cpp
diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp
index a8e2ad0fe..109ff4859 100644
--- a/client_files/import/main.cpp
+++ b/client_files/import/main.cpp
@@ -37,19 +37,19 @@ int main(int argc, char **argv) {
 	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	Log(Logs::General, Logs::Status, "Client Files Import Utility");
+	LogInfo("Client Files Import Utility");
 	if(!EQEmuConfig::LoadConfig()) {
-		Log(Logs::General, Logs::Error, "Unable to load configuration file.");
+		LogError("Unable to load configuration file.");
 		return 1;
 	}
 
 	auto Config = EQEmuConfig::get();
 
 	SharedDatabase database;
-	Log(Logs::General, Logs::Status, "Connecting to database...");
+	LogInfo("Connecting to database");
 	if(!database.Connect(Config->DatabaseHost.c_str(), Config->DatabaseUsername.c_str(),
 		Config->DatabasePassword.c_str(), Config->DatabaseDB.c_str(), Config->DatabasePort)) {
-		Log(Logs::General, Logs::Error, "Unable to connect to the database, cannot continue without a "
+		LogError("Unable to connect to the database, cannot continue without a "
 			"database connection");
 		return 1;
 	}
@@ -97,10 +97,10 @@ bool IsStringField(int i) {
 }
 
 void ImportSpells(SharedDatabase *db) {
-	Log(Logs::General, Logs::Status, "Importing Spells...");
+	LogInfo("Importing Spells");
 	FILE *f = fopen("import/spells_us.txt", "r");
 	if(!f) {
-		Log(Logs::General, Logs::Error, "Unable to open import/spells_us.txt to read, skipping.");
+		LogError("Unable to open import/spells_us.txt to read, skipping.");
 		return;
 	}
 
@@ -173,23 +173,23 @@ void ImportSpells(SharedDatabase *db) {
 
 		spells_imported++;
 		if(spells_imported % 1000 == 0) {
-			Log(Logs::General, Logs::Status, "%d spells imported.", spells_imported);
+			LogInfo("[{}] spells imported", spells_imported);
 		}
 	}
 
 	if(spells_imported % 1000 != 0) {
-		Log(Logs::General, Logs::Status, "%d spells imported.", spells_imported);
+		LogInfo("[{}] spells imported", spells_imported);
 	}
 
 	fclose(f);
 }
 
 void ImportSkillCaps(SharedDatabase *db) {
-	Log(Logs::General, Logs::Status, "Importing Skill Caps...");
+	LogInfo("Importing Skill Caps");
 
 	FILE *f = fopen("import/SkillCaps.txt", "r");
 	if(!f) {
-		Log(Logs::General, Logs::Error, "Unable to open import/SkillCaps.txt to read, skipping.");
+		LogError("Unable to open import/SkillCaps.txt to read, skipping.");
 		return;
 	}
 
@@ -220,11 +220,11 @@ void ImportSkillCaps(SharedDatabase *db) {
 }
 
 void ImportBaseData(SharedDatabase *db) {
-	Log(Logs::General, Logs::Status, "Importing Base Data...");
+	LogInfo("Importing Base Data");
 
 	FILE *f = fopen("import/BaseData.txt", "r");
 	if(!f) {
-		Log(Logs::General, Logs::Error, "Unable to open import/BaseData.txt to read, skipping.");
+		LogError("Unable to open import/BaseData.txt to read, skipping.");
 		return;
 	}
 
@@ -265,11 +265,11 @@ void ImportBaseData(SharedDatabase *db) {
 }
 
 void ImportDBStrings(SharedDatabase *db) {
-	Log(Logs::General, Logs::Status, "Importing DB Strings...");
+	LogInfo("Importing DB Strings");
 
 	FILE *f = fopen("import/dbstr_us.txt", "r");
 	if(!f) {
-		Log(Logs::General, Logs::Error, "Unable to open import/dbstr_us.txt to read, skipping.");
+		LogError("Unable to open import/dbstr_us.txt to read, skipping.");
 		return;
 	}
 
diff --git a/cmake/DependencyHelperMSVC.cmake b/cmake/DependencyHelperMSVC.cmake
new file mode 100644
index 000000000..33f92e41b
--- /dev/null
+++ b/cmake/DependencyHelperMSVC.cmake
@@ -0,0 +1,94 @@
+OPTION(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG "Automatically fetch vcpkg dependencies for MSCV" ON)
+OPTION(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL "Automatically fetch perl dependencies for MSCV" ON)
+
+MARK_AS_ADVANCED(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG)
+MARK_AS_ADVANCED(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL)
+
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86 "https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x86.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64 "https://github.com/EQEmu/Server/releases/download/v1.2/vcpkg-export-x64.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86 "http://strawberryperl.com/download/5.24.4.1/strawberry-perl-5.24.4.1-32bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64 "http://strawberryperl.com/download/5.24.4.1/strawberry-perl-5.24.4.1-64bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_ZIP "vcpkg-export-x86.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_ZIP "vcpkg-export-x64.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_DIR "vcpkg-export-x86")
+SET(EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_DIR "vcpkg-export-x64")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86_ZIP "strawberry-perl-5.24.4.1-32bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64_ZIP "strawberry-perl-5.24.4.1-64bit-portable.zip")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X86_DIR "x86")
+SET(EQEMU_MSVC_DEPENDENCIES_PERL_X64_DIR "x64")
+
+IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	SET(EQEMU_VCPKG_URL ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64})
+	SET(EQEMU_PERL_URL ${EQEMU_MSVC_DEPENDENCIES_PERL_X64})
+	SET(EQEMU_VCPKG_ZIP ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_ZIP})
+	SET(EQEMU_VCPKG_DIR ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X64_DIR})
+	SET(EQEMU_PERL_ZIP ${EQEMU_MSVC_DEPENDENCIES_PERL_X64_ZIP})
+	SET(EQEMU_PERL_DIR ${EQEMU_MSVC_DEPENDENCIES_PERL_X64_DIR})
+ELSE()
+	SET(EQEMU_VCPKG_URL ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86})
+	SET(EQEMU_PERL_URL ${EQEMU_MSVC_DEPENDENCIES_PERL_X86})
+	SET(EQEMU_VCPKG_ZIP ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_ZIP})
+	SET(EQEMU_VCPKG_DIR ${EQEMU_MSVC_DEPENDENCIES_VCPKG_X86_DIR})
+	SET(EQEMU_PERL_ZIP ${EQEMU_MSVC_DEPENDENCIES_PERL_X86_ZIP})
+	SET(EQEMU_PERL_DIR ${EQEMU_MSVC_DEPENDENCIES_PERL_X86_DIR})
+ENDIF()
+
+IF(EQEMU_FETCH_MSVC_DEPENDENCIES_VCPKG)
+	MESSAGE(STATUS "Resolving vcpkg dependencies...")
+	
+	IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP})
+		EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/vcpkg)
+		
+		MESSAGE(STATUS "Downloading existing vcpkg dependencies from releases...")
+		FILE(DOWNLOAD ${EQEMU_VCPKG_URL} ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP} 
+			SHOW_PROGRESS
+			STATUS DOWNLOAD_STATUS)
+			
+		LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE)
+		IF(NOT STATUS_CODE EQUAL 0)
+			MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_VCPKG_URL}")
+		ENDIF()
+		
+		MESSAGE(STATUS "Extracting files...")
+		EXECUTE_PROCESS(
+			COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_ZIP}
+			WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vcpkg
+		)
+	ENDIF()
+	
+	INCLUDE(${PROJECT_SOURCE_DIR}/vcpkg/${EQEMU_VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake)
+ENDIF()
+
+IF(EQEMU_FETCH_MSVC_DEPENDENCIES_PERL)
+	#Try to find perl first, (so you can use your active install first)
+	FIND_PACKAGE(PerlLibs)
+	
+	IF(NOT PerlLibs_FOUND)
+		MESSAGE(STATUS "Resolving perl dependencies...")
+		
+		IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP})
+			EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl)
+			EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR})
+			
+			MESSAGE(STATUS "Downloading portable perl...")
+			FILE(DOWNLOAD ${EQEMU_PERL_URL} ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP} 
+				SHOW_PROGRESS
+				STATUS DOWNLOAD_STATUS)
+				
+			LIST(GET DOWNLOAD_STATUS 0 STATUS_CODE)
+			IF(NOT STATUS_CODE EQUAL 0)
+				MESSAGE(FATAL_ERROR "Was unable to download dependencies from ${EQEMU_PERL_URL}")
+			ENDIF()
+			
+			MESSAGE(STATUS "Extracting files...")
+			EXECUTE_PROCESS(
+				COMMAND ${CMAKE_COMMAND} -E tar xzf ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_ZIP}
+				WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}
+			)
+		ENDIF()
+		
+		SET(PERL_EXECUTABLE ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/bin/perl.exe CACHE FILEPATH "Path to perl program" FORCE)
+		SET(PERL_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE CACHE PATH "Path to perl include files" FORCE)
+		SET(PERL_LIBRARY ${PROJECT_SOURCE_DIR}/perl/${EQEMU_PERL_DIR}/perl/lib/CORE/libperl524.a CACHE FILEPATH "Path to perl library" FORCE)
+	ENDIF()
+ENDIF()
\ No newline at end of file
diff --git a/cmake/FindEQLua51.cmake b/cmake/FindEQLua51.cmake
deleted file mode 100644
index 9f6663d56..000000000
--- a/cmake/FindEQLua51.cmake
+++ /dev/null
@@ -1,124 +0,0 @@
-#CMake - Cross Platform Makefile Generator
-#Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
-#All rights reserved.
-#
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions
-#are met:
-#
-#* Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#* Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#* Neither the names of Kitware, Inc., the Insight Software Consortium,
-#  nor the names of their contributors may be used to endorse or promote
-#  products derived from this software without specific prior written
-#  permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# This module defines
-#  LUA51_FOUND, if false, do not try to link to Lua
-#  LUA_LIBRARIES
-#  LUA_INCLUDE_DIR, where to find lua.h
-#  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
-
-IF(LUA_ROOT)
-	FIND_PATH(LUA_INCLUDE_DIR
-		NAMES lua.h
-		HINTS
-			ENV LUA_DIR
-		PATHS
-		${LUA_ROOT}
-		~/Library/Frameworks
-		/Library/Frameworks
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-		PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include src
-	)
-	
-	FIND_LIBRARY(LUA_LIBRARY
-		NAMES lua51 lua5.1 lua-5.1 lua
-		HINTS
-			ENV LUA_DIR
-		PATHS
-		${LUA_ROOT}
-		~/Library/Frameworks
-		/Library/Frameworks
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-		PATH_SUFFIXES lib bin
-	)
-ELSE(LUA_ROOT)
-	FIND_PATH(LUA_INCLUDE_DIR
-		NAMES lua.h
-		HINTS
-			ENV LUA_DIR
-		PATHS
-		~/Library/Frameworks
-		/Library/Frameworks
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-		PATH_SUFFIXES include/lua51 include/lua5.1 include/lua include
-	)
-	
-	FIND_LIBRARY(LUA_LIBRARY
-		NAMES lua51 lua5.1 lua-5.1 lua
-		HINTS
-			ENV LUA_DIR
-		PATHS
-		~/Library/Frameworks
-		/Library/Frameworks
-		/sw
-		/opt/local
-		/opt/csw
-		/opt
-		PATH_SUFFIXES lib bin
-	)
-ENDIF(LUA_ROOT)
-
-IF(LUA_LIBRARY)
-	# include the math library for Unix
-	IF(UNIX AND NOT APPLE)
-		FIND_LIBRARY(LUA_MATH_LIBRARY m)
-	SET(LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
-	# For Windows and Mac, don't need to explicitly include the math library
-	ELSE()
-		SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
-	ENDIF()
-ENDIF()
-
-IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-	FILE(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
-
-	STRING(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
-	UNSET(lua_version_str)
-ENDIF()
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua51
-                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
-                                  VERSION_VAR LUA_VERSION_STRING)
-
-MARK_AS_ADVANCED(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
-
-
diff --git a/cmake/FindLua51.cmake b/cmake/FindLua51.cmake
new file mode 100644
index 000000000..47fa0aaae
--- /dev/null
+++ b/cmake/FindLua51.cmake
@@ -0,0 +1,91 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+# Modified from the FindLua51 that comes with CMake
+
+#[=======================================================================[.rst:
+FindLua51
+---------
+
+
+
+Locate Lua51 library This module defines
+
+::
+
+  LUA51_FOUND, if false, do not try to link to Lua
+  LUA_LIBRARIES
+  LUA_INCLUDE_DIR, where to find lua.h
+  LUA_VERSION_STRING, the version of Lua found (since CMake 2.8.8)
+
+
+
+Note that the expected include convention is
+
+::
+
+  #include "lua.h"
+
+and not
+
+::
+
+  #include <lua/lua.h>
+
+This is because, the lua location is not standardized and may exist in
+locations other than lua/
+#]=======================================================================]
+
+find_path(LUA_INCLUDE_DIR lua.h
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include/luajit include
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+  /opt
+)
+
+find_library(LUA_LIBRARY
+  NAMES lua51 lua5.1 lua-5.1 lua luajit
+  HINTS
+    ENV LUA_DIR
+  PATH_SUFFIXES lib
+  PATHS
+  ~/Library/Frameworks
+  /Library/Frameworks
+  /sw
+  /opt/local
+  /opt/csw
+  /opt
+)
+
+if(LUA_LIBRARY)
+  # include the math library for Unix
+  if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU)
+    find_library(LUA_MATH_LIBRARY m)
+    set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries")
+  # For Windows and Mac, don't need to explicitly include the math library
+  else()
+    set( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries")
+  endif()
+endif()
+
+if(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
+  file(STRINGS "${LUA_INCLUDE_DIR}/lua.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua .+\"")
+
+  string(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"Lua ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
+  unset(lua_version_str)
+endif()
+
+include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
+# handle the QUIETLY and REQUIRED arguments and set LUA51_FOUND to TRUE if
+# all listed variables are TRUE
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Lua51
+                                  REQUIRED_VARS LUA_LIBRARIES LUA_INCLUDE_DIR
+                                  VERSION_VAR LUA_VERSION_STRING)
+
+mark_as_advanced(LUA_INCLUDE_DIR LUA_LIBRARIES LUA_LIBRARY LUA_MATH_LIBRARY)
+
diff --git a/cmake/FindMariaDB.cmake b/cmake/FindMariaDB.cmake
new file mode 100644
index 000000000..14f54734d
--- /dev/null
+++ b/cmake/FindMariaDB.cmake
@@ -0,0 +1,87 @@
+# - Find mariadbclient
+#
+# -*- cmake -*-
+#
+# Find the native MariaDB includes and library
+#
+#	MariaDB_INCLUDE_DIR	- where to find mysql.h, etc.
+#	MariaDB_LIBRARIES		- List of libraries when using MariaDB.
+#	MariaDB_FOUND			- True if MariaDB found.
+#	The following can be used as a hint as to where to search:
+#	MARIADB_ROOT
+
+IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
+	# Already in cache, be silent
+	SET(MariaDB_FIND_QUIETLY TRUE)
+ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARIES)
+
+# Include dir
+IF(MARIADB_ROOT)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATHS ${MARIADB_ROOT}/include
+		PATH_SUFFIXES mysql mariadb
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATH_SUFFIXES mysql mariadb
+	)
+ELSE(MARIADB_ROOT)
+	FIND_PATH(MariaDB_INCLUDE_DIR
+		NAMES mariadb_version.h
+		PATH_SUFFIXES mysql mariadb
+	)
+ENDIF(MARIADB_ROOT)
+
+# Library
+SET(MariaDB_NAMES libmariadb)
+IF(MARIADB_ROOT)
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES}
+		PATHS ${MARIADB_ROOT}/lib
+		PATH_SUFFIXES mysql mariadb
+		NO_DEFAULT_PATH
+		NO_SYSTEM_ENVIRONMENT_PATH
+	)
+	
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES}
+		PATH_SUFFIXES mysql mariadb
+	)
+ELSE(MARIADB_ROOT)
+	FIND_LIBRARY(MariaDB_LIBRARY
+		NAMES ${MariaDB_NAMES} mariadbclient_r mariadbclient
+		PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
+		PATH_SUFFIXES mysql mariadb
+	)
+ENDIF(MARIADB_ROOT)
+
+IF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+	SET(MariaDB_FOUND TRUE)
+	SET(MariaDB_LIBRARIES ${MariaDB_LIBRARY})
+ELSE (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+	SET(MariaDB_FOUND FALSE)
+	SET(MariaDB_LIBRARIES)
+ENDIF (MariaDB_INCLUDE_DIR AND MariaDB_LIBRARY)
+
+
+# handle the QUIETLY and REQUIRED arguments and set MariaDB_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MariaDB DEFAULT_MSG MariaDB_LIBRARY MariaDB_INCLUDE_DIR)
+
+IF(MariaDB_FOUND)
+	SET( MariaDB_LIBRARY_RELEASE ${MariaDB_LIBRARY} )
+	SET( MariaDB_LIBRARY_DEBUG ${MariaDB_LIBRARY} )
+	SET( MariaDB_LIBRARIES ${MariaDB_LIBRARY_RELEASE} ${MariaDB_LIBRARY_DEBUG} )
+ELSE(MariaDB_FOUND)
+	SET( MariaDB_LIBRARIES )
+ENDIF(MariaDB_FOUND)
+
+MARK_AS_ADVANCED(
+	MariaDB_LIBRARY_DEBUG
+	MariaDB_LIBRARY_RELEASE
+	MariaDB_INCLUDE_DIR
+	)
diff --git a/cmake/FindmbedTLS.cmake b/cmake/FindmbedTLS.cmake
new file mode 100644
index 000000000..d2a3ce3b9
--- /dev/null
+++ b/cmake/FindmbedTLS.cmake
@@ -0,0 +1,93 @@
+# - Try to find mbedTLS
+# Once done this will define
+#
+# Read-Only variables
+#  MBEDTLS_FOUND - system has mbedTLS
+#  MBEDTLS_INCLUDE_DIR - the mbedTLS include directory
+#  MBEDTLS_LIBRARY_DIR - the mbedTLS library directory
+#  MBEDTLS_LIBRARIES - Link these to use mbedTLS
+#  MBEDTLS_LIBRARY - path to mbedTLS library
+#  MBEDX509_LIBRARY - path to mbedTLS X.509 library
+#  MBEDCRYPTO_LIBRARY - path to mbedTLS Crypto library
+#
+# Hint
+#  MBEDTLS_ROOT_DIR can be pointed to a local mbedTLS installation.
+
+SET(_MBEDTLS_ROOT_HINTS
+    ${MBEDTLS_ROOT_DIR}
+    ENV MBEDTLS_ROOT_DIR
+)
+
+SET(_MBEDTLS_ROOT_HINTS_AND_PATHS
+    HINTS ${_MBEDTLS_ROOT_HINTS}
+    PATHS ${_MBEDTLS_ROOT_PATHS}
+)
+
+FIND_PATH(MBEDTLS_INCLUDE_DIR
+    NAMES mbedtls/version.h
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES include
+)
+
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARIES)
+    # Already in cache, be silent
+    SET(MBEDTLS_FIND_QUIETLY TRUE)
+ENDIF()
+
+FIND_LIBRARY(MBEDTLS_LIBRARY
+    NAMES mbedtls libmbedtls
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+FIND_LIBRARY(MBEDX509_LIBRARY
+    NAMES mbedx509 libmbedx509
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+FIND_LIBRARY(MBEDCRYPTO_LIBRARY
+    NAMES mbedcrypto libmbedcrypto
+    ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
+    PATH_SUFFIXES library
+)
+
+IF(MBEDTLS_INCLUDE_DIR AND MBEDTLS_LIBRARY AND MBEDX509_LIBRARY AND MBEDCRYPTO_LIBRARY)
+     SET(MBEDTLS_FOUND TRUE)
+ENDIF()
+
+IF(MBEDTLS_FOUND)
+    # split mbedTLS into -L and -l linker options, so we can set them for pkg-config
+    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_DIR ${MBEDTLS_LIBRARY} PATH)
+    GET_FILENAME_COMPONENT(MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY} NAME_WE)
+    GET_FILENAME_COMPONENT(MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY} NAME_WE)
+    GET_FILENAME_COMPONENT(MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY} NAME_WE)
+    STRING(REGEX REPLACE "^lib" "" MBEDTLS_LIBRARY_FILE ${MBEDTLS_LIBRARY_FILE})
+    STRING(REGEX REPLACE "^lib" "" MBEDX509_LIBRARY_FILE ${MBEDX509_LIBRARY_FILE})
+    STRING(REGEX REPLACE "^lib" "" MBEDCRYPTO_LIBRARY_FILE ${MBEDCRYPTO_LIBRARY_FILE})
+    SET(MBEDTLS_LIBRARIES "-L${MBEDTLS_LIBRARY_DIR} -l${MBEDTLS_LIBRARY_FILE} -l${MBEDX509_LIBRARY_FILE} -l${MBEDCRYPTO_LIBRARY_FILE}")
+
+    IF(NOT MBEDTLS_FIND_QUIETLY)
+        MESSAGE(STATUS "Found mbedTLS:")
+        FILE(READ ${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h MBEDTLSCONTENT)
+        STRING(REGEX MATCH "MBEDTLS_VERSION_STRING +\"[0-9|.]+\"" MBEDTLSMATCH ${MBEDTLSCONTENT})
+        IF (MBEDTLSMATCH)
+            STRING(REGEX REPLACE "MBEDTLS_VERSION_STRING +\"([0-9|.]+)\"" "\\1" MBEDTLS_VERSION ${MBEDTLSMATCH})
+            MESSAGE(STATUS "  version ${MBEDTLS_VERSION}")
+        ENDIF(MBEDTLSMATCH)
+        MESSAGE(STATUS "  TLS: ${MBEDTLS_LIBRARY}")
+        MESSAGE(STATUS "  X509: ${MBEDX509_LIBRARY}")
+        MESSAGE(STATUS "  Crypto: ${MBEDCRYPTO_LIBRARY}")
+    ENDIF(NOT MBEDTLS_FIND_QUIETLY)
+ELSE(MBEDTLS_FOUND)
+    IF(MBEDTLS_FIND_REQUIRED)
+        MESSAGE(FATAL_ERROR "Could not find mbedTLS")
+    ENDIF(MBEDTLS_FIND_REQUIRED)
+ENDIF(MBEDTLS_FOUND)
+
+MARK_AS_ADVANCED(
+    MBEDTLS_INCLUDE_DIR
+    MBEDTLS_LIBRARY_DIR
+    MBEDTLS_LIBRARIES
+    MBEDTLS_LIBRARY
+    MBEDX509_LIBRARY
+    MBEDCRYPTO_LIBRARY
+)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 2c94d618a..a959d9093 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -1,8 +1,9 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(common_sources
 	base_packet.cpp
 	classes.cpp
+	cli/eqemu_command_handler.cpp
 	compression.cpp
 	condition.cpp
 	crash.cpp
@@ -35,6 +36,7 @@ SET(common_sources
 	inventory_profile.cpp
 	inventory_slot.cpp
 	ipc_mutex.cpp
+	ip_util.cpp
 	item_data.cpp
 	item_instance.cpp
 	json_config.cpp
@@ -71,7 +73,6 @@ SET(common_sources
 	textures.cpp
 	timer.cpp
 	unix.cpp
-	xml_parser.cpp
 	platform.cpp
 	json/jsoncpp.cpp
 	net/console_server.cpp
@@ -102,13 +103,8 @@ SET(common_sources
 	patches/uf.cpp
 	patches/uf_limits.cpp
 	StackWalker/StackWalker.cpp
-	tinyxml/tinystr.cpp
-	tinyxml/tinyxml.cpp
-	tinyxml/tinyxmlerror.cpp
-	tinyxml/tinyxmlparser.cpp
 	util/directory.cpp
-	util/uuid.cpp
-)
+	util/uuid.cpp)
 
 SET(common_headers
 	any.h
@@ -121,8 +117,12 @@ SET(common_headers
 	crash.h
 	crc16.h
 	crc32.h
+	cli/argh.h
+	cli/eqemu_command_handler.h
+	cli/terminal_color.hpp
 	data_verification.h
 	database.h
+	database_schema.h
 	dbcore.h
 	deity.h
 	emu_constants.h
@@ -138,7 +138,7 @@ SET(common_headers
 	eqemu_config.h
 	eqemu_config_elements.h
 	eqemu_logsys.h
-	eqemu_logsys_fmt.h
+	eqemu_logsys_log_aliases.h
 	eq_limits.h
 	eq_packet.h
 	eq_stream_ident.h
@@ -156,9 +156,11 @@ SET(common_headers
 	global_define.h
 	guild_base.h
 	guilds.h
+	http/httplib.h
 	inventory_profile.h
 	inventory_slot.h
 	ipc_mutex.h
+	ip_util.h
 	item_data.h
 	item_fieldlist.h
 	item_instance.h
@@ -209,7 +211,6 @@ SET(common_headers
 	unix.h
 	useperl.h
 	version.h
-	xml_parser.h
 	zone_numbers.h
 	event/event_loop.h
 	event/task.h
@@ -263,12 +264,9 @@ SET(common_headers
 	patches/uf_ops.h
 	patches/uf_structs.h
 	StackWalker/StackWalker.h
-	tinyxml/tinystr.h
-	tinyxml/tinyxml.h
 	util/memory_stream.h
 	util/directory.h
-	util/uuid.h
-)
+	util/uuid.h)
 
 SOURCE_GROUP(Event FILES
 	event/event_loop.h
@@ -368,15 +366,6 @@ SOURCE_GROUP(StackWalker FILES
 	StackWalker/StackWalker.cpp
 )
 
-SOURCE_GROUP(TinyXML FILES
-	tinyxml/tinystr.h
-	tinyxml/tinyxml.h
-	tinyxml/tinystr.cpp
-	tinyxml/tinyxml.cpp
-	tinyxml/tinyxmlerror.cpp
-	tinyxml/tinyxmlparser.cpp
-)
-
 SOURCE_GROUP(Util FILES
 	util/memory_stream.h
 	util/directory.cpp
@@ -385,7 +374,7 @@ SOURCE_GROUP(Util FILES
 	util/uuid.h
 )
 
-INCLUDE_DIRECTORIES(Patches SocketLib StackWalker TinyXML)
+INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
 
 ADD_LIBRARY(common ${common_sources} ${common_headers})
 
diff --git a/common/base_packet.h b/common/base_packet.h
index 4f47c919a..3b92e3e90 100644
--- a/common/base_packet.h
+++ b/common/base_packet.h
@@ -75,6 +75,7 @@ public:
 	uint32 ReadUInt32() { uint32 value = *(uint32 *)(pBuffer + _rpos); _rpos += sizeof(uint32); return value; }
 	uint32 ReadUInt32(uint32 Offset) const { uint32 value = *(uint32 *)(pBuffer + Offset); return value; }
 	void ReadString(char *str) { uint32 len = static_cast<uint32>(strlen((char *)(pBuffer + _rpos))) + 1; memcpy(str, pBuffer + _rpos, len); _rpos += len; }
+	void ReadString(std::string &str) { str = reinterpret_cast<char *>(pBuffer + _rpos); _rpos += str.length() + 1; }
 	void ReadString(char *str, uint32 Offset, uint32 MaxLength) const;
 
 	uint32 GetWritePosition() { return _wpos; }
diff --git a/common/classes.cpp b/common/classes.cpp
index be683fbd1..3aaeeded3 100644
--- a/common/classes.cpp
+++ b/common/classes.cpp
@@ -573,6 +573,20 @@ bool IsNonSpellFighterClass(uint8 class_id)
 	}
 }
 
+bool IsHybridClass(uint8 class_id)
+{
+	switch (class_id) {
+	case PALADIN:
+	case RANGER:
+	case SHADOWKNIGHT:
+	case BARD:
+	case BEASTLORD:
+		return true;
+	default:
+		return false;
+	}
+}
+
 bool IsCasterClass(uint8 class_id)
 {
 	switch (class_id) {
diff --git a/common/classes.h b/common/classes.h
index 2ca9a3c4d..f63758937 100644
--- a/common/classes.h
+++ b/common/classes.h
@@ -135,6 +135,7 @@ uint8 GetClassIDFromPlayerClassBit(uint32 player_class_bit);
 bool IsFighterClass(uint8 class_id);
 bool IsSpellFighterClass(uint8 class_id);
 bool IsNonSpellFighterClass(uint8 class_id);
+bool IsHybridClass(uint8 class_id);
 bool IsCasterClass(uint8 class_id);
 bool IsINTCasterClass(uint8 class_id);
 bool IsWISCasterClass(uint8 class_id);
diff --git a/common/cli/argh.h b/common/cli/argh.h
new file mode 100644
index 000000000..047fa190f
--- /dev/null
+++ b/common/cli/argh.h
@@ -0,0 +1,434 @@
+#pragma once
+
+#include <algorithm>
+#include <sstream>
+#include <limits>
+#include <string>
+#include <vector>
+#include <set>
+#include <map>
+#include <cassert>
+
+namespace argh
+{
+	// Terminology:
+	// A command line is composed of 2 types of args:
+	// 1. Positional args, i.e. free standing values
+	// 2. Options: args beginning with '-'. We identify two kinds:
+	//    2.1: Flags: boolean options =>  (exist ? true : false)
+	//    2.2: Parameters: a name followed by a non-option value
+
+#if !defined(__GNUC__) || (__GNUC__ >= 5)
+	using string_stream = std::istringstream;
+#else
+	// Until GCC 5, istringstream did not have a move constructor.
+	// stringstream_proxy is used instead, as a workaround.
+	class stringstream_proxy
+	{
+	public:
+		stringstream_proxy() = default;
+
+		// Construct with a value.
+		stringstream_proxy(std::string const& value) :
+			stream_(value)
+		{}
+
+		// Copy constructor.
+		stringstream_proxy(const stringstream_proxy& other) :
+			stream_(other.stream_.str())
+		{
+			stream_.setstate(other.stream_.rdstate());
+		}
+
+		void setstate(std::ios_base::iostate state) { stream_.setstate(state); }
+
+		// Stream out the value of the parameter.
+		// If the conversion was not possible, the stream will enter the fail state,
+		// and operator bool will return false.
+		template<typename T>
+		stringstream_proxy& operator >> (T& thing)
+		{
+			stream_ >> thing;
+			return *this;
+		}
+
+
+		// Get the string value.
+		std::string str() const { return stream_.str(); }
+
+		std::stringbuf* rdbuf() const { return stream_.rdbuf(); }
+
+		// Check the state of the stream.
+		// False when the most recent stream operation failed
+		operator bool() const { return !!stream_; }
+
+		~stringstream_proxy() = default;
+	private:
+		std::istringstream stream_;
+	};
+	using string_stream = stringstream_proxy;
+#endif
+
+	class parser
+	{
+	public:
+		enum Mode { PREFER_FLAG_FOR_UNREG_OPTION = 1 << 0,
+					PREFER_PARAM_FOR_UNREG_OPTION = 1 << 1,
+					NO_SPLIT_ON_EQUALSIGN = 1 << 2,
+					SINGLE_DASH_IS_MULTIFLAG = 1 << 3,
+		};
+
+		parser() = default;
+
+		parser(std::initializer_list<char const* const> pre_reg_names)
+		{  add_params(pre_reg_names); }
+
+		parser(const char* const argv[], int mode = PREFER_FLAG_FOR_UNREG_OPTION)
+		{  parse(argv, mode); }
+
+		parser(int argc, const char* const argv[], int mode = PREFER_FLAG_FOR_UNREG_OPTION)
+		{  parse(argc, argv, mode); }
+
+		void add_param(std::string const& name);
+		void add_params(std::initializer_list<char const* const> init_list);
+
+		void parse(const char* const argv[], int mode = PREFER_FLAG_FOR_UNREG_OPTION);
+		void parse(int argc, const char* const argv[], int mode = PREFER_FLAG_FOR_UNREG_OPTION);
+
+		std::multiset<std::string>          const& flags()    const { return flags_;    }
+		std::map<std::string, std::string>  const& params()   const { return params_;   }
+		std::vector<std::string>            const& pos_args() const { return pos_args_; }
+
+		// begin() and end() for using range-for over positional args.
+		std::vector<std::string>::const_iterator begin() const { return pos_args_.cbegin(); }
+		std::vector<std::string>::const_iterator end()   const { return pos_args_.cend();   }
+		size_t size()                                    const { return pos_args_.size();   }
+
+		//////////////////////////////////////////////////////////////////////////
+		// Accessors
+
+		// flag (boolean) accessors: return true if the flag appeared, otherwise false.
+		bool operator[](std::string const& name) const;
+
+		// multiple flag (boolean) accessors: return true if at least one of the flag appeared, otherwise false.
+		bool operator[](std::initializer_list<char const* const> init_list) const;
+
+		// returns positional arg string by order. Like argv[] but without the options
+		std::string const& operator[](size_t ind) const;
+
+		// returns a std::istream that can be used to convert a positional arg to a typed value.
+		string_stream operator()(size_t ind) const;
+
+		// same as above, but with a default value in case the arg is missing (index out of range).
+		template<typename T>
+		string_stream operator()(size_t ind, T&& def_val) const;
+
+		// parameter accessors, give a name get an std::istream that can be used to convert to a typed value.
+		// call .str() on result to get as string
+		string_stream operator()(std::string const& name) const;
+
+		// accessor for a parameter with multiple names, give a list of names, get an std::istream that can be used to convert to a typed value.
+		// call .str() on result to get as string
+		// returns the first value in the list to be found.
+		string_stream operator()(std::initializer_list<char const* const> init_list) const;
+
+		// same as above, but with a default value in case the param was missing.
+		// Non-string def_val types must have an operator<<() (output stream operator)
+		// If T only has an input stream operator, pass the string version of the type as in "3" instead of 3.
+		template<typename T>
+		string_stream operator()(std::string const& name, T&& def_val) const;
+
+		// same as above but for a list of names. returns the first value to be found.
+		template<typename T>
+		string_stream operator()(std::initializer_list<char const* const> init_list, T&& def_val) const;
+
+	private:
+		string_stream bad_stream() const;
+		std::string trim_leading_dashes(std::string const& name) const;
+		bool is_number(std::string const& arg) const;
+		bool is_option(std::string const& arg) const;
+		bool got_flag(std::string const& name) const;
+		bool is_param(std::string const& name) const;
+
+	private:
+		std::vector<std::string> args_;
+		std::map<std::string, std::string> params_;
+		std::vector<std::string> pos_args_;
+		std::multiset<std::string> flags_;
+		std::set<std::string> registeredParams_;
+		std::string empty_;
+	};
+
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline void parser::parse(const char * const argv[], int mode)
+	{
+		int argc = 0;
+		for (auto argvp = argv; *argvp; ++argc, ++argvp);
+		parse(argc, argv, mode);
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline void parser::parse(int argc, const char* const argv[], int mode /*= PREFER_FLAG_FOR_UNREG_OPTION*/)
+	{
+		// convert to strings
+		args_.resize(argc);
+		std::transform(argv, argv + argc, args_.begin(), [](const char* const arg) { return arg;  });
+
+		// parse line
+		for (auto i = 0u; i < args_.size(); ++i)
+		{
+			if (!is_option(args_[i]))
+			{
+				pos_args_.emplace_back(args_[i]);
+				continue;
+			}
+
+			auto name = trim_leading_dashes(args_[i]);
+
+			if (!(mode & NO_SPLIT_ON_EQUALSIGN))
+			{
+				auto equalPos = name.find('=');
+				if (equalPos != std::string::npos)
+				{
+					params_.insert({ name.substr(0, equalPos), name.substr(equalPos + 1) });
+					continue;
+				}
+			}
+
+			// if the option is unregistered and should be a multi-flag
+			if (1 == (args_[i].size() - name.size()) &&         // single dash
+				argh::parser::SINGLE_DASH_IS_MULTIFLAG & mode && // multi-flag mode
+				!is_param(name))                                  // unregistered
+			{
+				std::string keep_param;
+
+				if (!name.empty() && is_param(std::string(1ul, name.back()))) // last char is param
+				{
+					keep_param += name.back();
+					name.resize(name.size() - 1);
+				}
+
+				for (auto const& c : name)
+				{
+					flags_.emplace(std::string{ c });
+				}
+
+				if (!keep_param.empty())
+				{
+					name = keep_param;
+				}
+				else
+				{
+					continue; // do not consider other options for this arg
+				}
+			}
+
+			// any potential option will get as its value the next arg, unless that arg is an option too
+			// in that case it will be determined a flag.
+			if (i == args_.size() - 1 || is_option(args_[i + 1]))
+			{
+				flags_.emplace(name);
+				continue;
+			}
+
+			// if 'name' is a pre-registered option, then the next arg cannot be a free parameter to it is skipped
+			// otherwise we have 2 modes:
+			// PREFER_FLAG_FOR_UNREG_OPTION: a non-registered 'name' is determined a flag.
+			//                               The following value (the next arg) will be a free parameter.
+			//
+			// PREFER_PARAM_FOR_UNREG_OPTION: a non-registered 'name' is determined a parameter, the next arg
+			//                                will be the value of that option.
+
+			assert(!(mode & argh::parser::PREFER_FLAG_FOR_UNREG_OPTION)
+				   || !(mode & argh::parser::PREFER_PARAM_FOR_UNREG_OPTION));
+
+			bool preferParam = mode & argh::parser::PREFER_PARAM_FOR_UNREG_OPTION;
+
+			if (is_param(name) || preferParam)
+			{
+				params_.insert({ name, args_[i + 1] });
+				++i; // skip next value, it is not a free parameter
+				continue;
+			}
+			else
+			{
+				flags_.emplace(name);
+			}
+		};
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline string_stream parser::bad_stream() const
+	{
+		string_stream bad;
+		bad.setstate(std::ios_base::failbit);
+		return bad;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline bool parser::is_number(std::string const& arg) const
+	{
+		// inefficient but simple way to determine if a string is a number (which can start with a '-')
+		std::istringstream istr(arg);
+		double number;
+		istr >> number;
+		return !(istr.fail() || istr.bad());
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline bool parser::is_option(std::string const& arg) const
+	{
+		assert(0 != arg.size());
+		if (is_number(arg))
+			return false;
+		return '-' == arg[0];
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline std::string parser::trim_leading_dashes(std::string const& name) const
+	{
+		auto pos = name.find_first_not_of('-');
+		return std::string::npos != pos ? name.substr(pos) : name;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline bool argh::parser::got_flag(std::string const& name) const
+	{
+		return flags_.end() != flags_.find(trim_leading_dashes(name));
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline bool argh::parser::is_param(std::string const& name) const
+	{
+		return registeredParams_.count(name);
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline bool parser::operator[](std::string const& name) const
+	{
+		return got_flag(name);
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline bool parser::operator[](std::initializer_list<char const* const> init_list) const
+	{
+		return std::any_of(init_list.begin(), init_list.end(), [&](char const* const name) { return got_flag(name); });
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline std::string const& parser::operator[](size_t ind) const
+	{
+		if (ind < pos_args_.size())
+			return pos_args_[ind];
+		return empty_;
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline string_stream parser::operator()(std::string const& name) const
+	{
+		auto optIt = params_.find(trim_leading_dashes(name));
+		if (params_.end() != optIt)
+			return string_stream(optIt->second);
+		return bad_stream();
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline string_stream parser::operator()(std::initializer_list<char const* const> init_list) const
+	{
+		for (auto& name : init_list)
+		{
+			auto optIt = params_.find(trim_leading_dashes(name));
+			if (params_.end() != optIt)
+				return string_stream(optIt->second);
+		}
+		return bad_stream();
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	template<typename T>
+	string_stream parser::operator()(std::string const& name, T&& def_val) const
+	{
+		auto optIt = params_.find(trim_leading_dashes(name));
+		if (params_.end() != optIt)
+			return string_stream(optIt->second);
+
+		std::ostringstream ostr;
+		ostr.precision(std::numeric_limits<long double>::max_digits10);
+		ostr << def_val;
+		return string_stream(ostr.str()); // use default
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	// same as above but for a list of names. returns the first value to be found.
+	template<typename T>
+	string_stream parser::operator()(std::initializer_list<char const* const> init_list, T&& def_val) const
+	{
+		for (auto& name : init_list)
+		{
+			auto optIt = params_.find(trim_leading_dashes(name));
+			if (params_.end() != optIt)
+				return string_stream(optIt->second);
+		}
+		std::ostringstream ostr;
+		ostr.precision(std::numeric_limits<long double>::max_digits10);
+		ostr << def_val;
+		return string_stream(ostr.str()); // use default
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline string_stream parser::operator()(size_t ind) const
+	{
+		if (pos_args_.size() <= ind)
+			return bad_stream();
+
+		return string_stream(pos_args_[ind]);
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	template<typename T>
+	string_stream parser::operator()(size_t ind, T&& def_val) const
+	{
+		if (pos_args_.size() <= ind)
+		{
+			std::ostringstream ostr;
+			ostr.precision(std::numeric_limits<long double>::max_digits10);
+			ostr << def_val;
+			return string_stream(ostr.str());
+		}
+
+		return string_stream(pos_args_[ind]);
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline void parser::add_param(std::string const& name)
+	{
+		registeredParams_.insert(trim_leading_dashes(name));
+	}
+
+	//////////////////////////////////////////////////////////////////////////
+
+	inline void parser::add_params(std::initializer_list<char const* const> init_list)
+	{
+		for (auto& name : init_list)
+			registeredParams_.insert(trim_leading_dashes(name));
+	}
+}
\ No newline at end of file
diff --git a/common/cli/eqemu_command_handler.cpp b/common/cli/eqemu_command_handler.cpp
new file mode 100644
index 000000000..bbcdb4612
--- /dev/null
+++ b/common/cli/eqemu_command_handler.cpp
@@ -0,0 +1,194 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <fmt/format.h>
+#include "eqemu_command_handler.h"
+#include "terminal_color.hpp"
+#include "../platform.h"
+
+namespace EQEmuCommand {
+
+	std::map<std::string, void (*)(
+		int argc,
+		char **argv,
+		argh::parser &cmd,
+		std::string &description
+	)> function_map;
+
+	/**
+	 * @param cmd
+	 */
+	void DisplayDebug(argh::parser &cmd)
+	{
+		if (cmd[{"-d", "--debug"}]) {
+			std::cout << "Positional args:\n";
+			for (auto &pos_arg : cmd.pos_args())
+				std::cout << '\t' << pos_arg << std::endl;
+
+			std::cout << "\nFlags:\n";
+			for (auto &flag : cmd.flags())
+				std::cout << '\t' << flag << std::endl;
+
+			std::cout << "\nParameters:\n";
+			for (auto &param : cmd.params())
+				std::cout << '\t' << param.first << " : " << param.second << std::endl;
+		}
+	}
+
+	/**
+	 * @param arguments
+	 * @param options
+	 * @param cmd
+	 * @param argc
+	 * @param argv
+	 */
+	void ValidateCmdInput(
+		std::vector<std::string> &arguments,
+		std::vector<std::string> &options,
+		argh::parser &cmd,
+		int argc,
+		char **argv
+	)
+	{
+		bool arguments_filled = true;
+
+		int index = 2;
+		for (auto &arg : arguments) {
+			if (cmd(arg).str().empty() && cmd(index).str().empty()) {
+				arguments_filled = false;
+			}
+			index++;
+		}
+
+		if (!arguments_filled || argc == 2) {
+			std::string arguments_string;
+			for (auto &arg : arguments) {
+				arguments_string += " " + arg;
+			}
+
+			std::string options_string;
+			for (auto   &opt : options) {
+				options_string += "  " + opt + "\n";
+			}
+
+			std::stringstream command_string;
+
+			command_string <<
+						   termcolor::colorize <<
+						   termcolor::yellow <<
+						   "\nCommand" <<
+						   termcolor::reset << "\n\n" <<
+						   termcolor::green << argv[1] << arguments_string << termcolor::reset << "\n" <<
+						   termcolor::yellow << (!options_string.empty() ? "\nOptions\n" : "") <<
+						   termcolor::reset << termcolor::cyan << options_string << termcolor::reset;
+
+			std::cout << command_string.str() << std::endl;
+
+			exit(1);
+		}
+	}
+
+	/**
+	 * @param in_function_map
+	 * @param cmd
+	 * @param argc
+	 * @param argv
+	 */
+	void HandleMenu(
+		std::map<std::string, void (*)(
+			int argc,
+			char **argv,
+			argh::parser &cmd,
+			std::string &description
+		)> &in_function_map,
+		argh::parser &cmd,
+		int argc,
+		char **argv
+	)
+	{
+		std::string description;
+		bool        ran_command = false;
+		for (auto   &it: in_function_map) {
+			if (it.first == argv[1]) {
+				(it.second)(argc, argv, cmd, description);
+				ran_command = true;
+			}
+		}
+
+		if (cmd[{"-h", "--help"}]) {
+			std::cout << std::endl;
+			std::cout <<
+					  "> " <<
+					  termcolor::yellow <<
+					  "EQEmulator [" + GetPlatformName() + "] CLI Menu" <<
+					  termcolor::reset
+					  << std::endl
+					  << std::endl;
+
+			/**
+			 * Get max command length for padding length
+			 */
+			int max_command_length = 0;
+
+			for (auto &it: in_function_map) {
+				std::stringstream command;
+				command << termcolor::colorize << termcolor::yellow << it.first << termcolor::reset;
+				if (command.str().length() > max_command_length) {
+					max_command_length = command.str().length() + 1;
+				}
+			}
+
+			/**
+			 * Display command menu
+			 */
+			std::string command_section;
+			for (auto   &it: in_function_map) {
+				description = "";
+
+				(it.second)(argc, argv, cmd, description);
+
+				/**
+				 * Print section header
+				 */
+				std::string command_prefix = it.first.substr(0, it.first.find(":"));
+				if (command_section != command_prefix) {
+					command_section = command_prefix;
+					std::cout << termcolor::reset << command_prefix << std::endl;
+				}
+
+				/**
+				 * Print commands
+				 */
+				std::stringstream command;
+				command << termcolor::colorize << termcolor::yellow << it.first << termcolor::reset;
+				printf("  %-*s %s\n", max_command_length, command.str().c_str(), description.c_str());
+			}
+
+			std::cout << std::endl;
+
+			std::exit(1);
+		}
+
+		if (ran_command) {
+			std::exit(1);
+		}
+	}
+
+}
diff --git a/common/cli/eqemu_command_handler.h b/common/cli/eqemu_command_handler.h
new file mode 100644
index 000000000..d0b0b5b5e
--- /dev/null
+++ b/common/cli/eqemu_command_handler.h
@@ -0,0 +1,75 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef EQEMU_EQEMU_COMMAND_HANDLER_H
+#define EQEMU_EQEMU_COMMAND_HANDLER_H
+
+#include "argh.h"
+
+namespace EQEmuCommand {
+
+	extern std::map<std::string, void (*)(
+		int argc,
+		char **argv,
+		argh::parser &cmd,
+		std::string &description
+	)> function_map;
+
+	/**
+	 * @param arguments
+	 * @param options
+	 * @param cmd
+	 * @param argc
+	 * @param argv
+	 */
+	void ValidateCmdInput(
+		std::vector<std::string> &arguments,
+		std::vector<std::string> &options,
+		argh::parser &cmd,
+		int argc,
+		char **argv
+	);
+
+	/**
+	 * @param cmd
+	 */
+	void DisplayDebug(argh::parser &cmd);
+
+	/**
+	 * @param in_function_map
+	 * @param cmd
+	 * @param argc
+	 * @param argv
+	 */
+	void HandleMenu(
+		std::map<std::string, void (*)(
+			int argc,
+			char **argv,
+			argh::parser &cmd,
+			std::string &description
+		)> &in_function_map,
+		argh::parser &cmd,
+		int argc,
+		char **argv
+	);
+};
+
+
+#endif //EQEMU_EQEMU_COMMAND_HANDLER_H
diff --git a/common/cli/terminal_color.hpp b/common/cli/terminal_color.hpp
new file mode 100644
index 000000000..a98f2483b
--- /dev/null
+++ b/common/cli/terminal_color.hpp
@@ -0,0 +1,557 @@
+//!
+//! termcolor
+//! ~~~~~~~~~
+//!
+//! termcolor is a header-only c++ library for printing colored messages
+//! to the terminal. Written just for fun with a help of the Force.
+//!
+//! :copyright: (c) 2013 by Ihor Kalnytskyi
+//! :license: BSD, see LICENSE for details
+//!
+
+#ifndef TERMCOLOR_HPP_
+#define TERMCOLOR_HPP_
+
+// the following snippet of code detects the current OS and
+// defines the appropriate macro that is used to wrap some
+// platform specific things
+#if defined(_WIN32) || defined(_WIN64)
+#   define TERMCOLOR_OS_WINDOWS
+#elif defined(__APPLE__)
+#   define TERMCOLOR_OS_MACOS
+#elif defined(__unix__) || defined(__unix)
+#   define TERMCOLOR_OS_LINUX
+#else
+#   error unsupported platform
+#endif
+
+
+// This headers provides the `isatty()`/`fileno()` functions,
+// which are used for testing whether a standart stream refers
+// to the terminal. As for Windows, we also need WinApi funcs
+// for changing colors attributes of the terminal.
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+#   include <unistd.h>
+#elif defined(TERMCOLOR_OS_WINDOWS)
+#   include <io.h>
+#   include <windows.h>
+#endif
+
+
+#include <iostream>
+#include <cstdio>
+
+
+
+namespace termcolor
+{
+	// Forward declaration of the `_internal` namespace.
+	// All comments are below.
+	namespace _internal
+	{
+		// An index to be used to access a private storage of I/O streams. See
+		// colorize / nocolorize I/O manipulators for details.
+		static int colorize_index = std::ios_base::xalloc();
+
+		inline FILE* get_standard_stream(const std::ostream& stream);
+		inline bool is_colorized(std::ostream& stream);
+		inline bool is_atty(const std::ostream& stream);
+
+#if defined(TERMCOLOR_OS_WINDOWS)
+		inline void win_change_attributes(std::ostream& stream, int foreground, int background=-1);
+#endif
+	}
+
+	inline
+	std::ostream& colorize(std::ostream& stream)
+	{
+		stream.iword(_internal::colorize_index) = 1L;
+		return stream;
+	}
+
+	inline
+	std::ostream& nocolorize(std::ostream& stream)
+	{
+		stream.iword(_internal::colorize_index) = 0L;
+		return stream;
+	}
+
+	inline
+	std::ostream& reset(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;00m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1, -1);
+#endif
+		}
+		return stream;
+	}
+
+
+	inline
+	std::ostream& bold(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;1m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+#endif
+		}
+		return stream;
+	}
+
+
+	inline
+	std::ostream& dark(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;2m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+#endif
+		}
+		return stream;
+	}
+
+
+	inline
+	std::ostream& underline(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;4m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+#endif
+		}
+		return stream;
+	}
+
+
+	inline
+	std::ostream& blink(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;5m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+#endif
+		}
+		return stream;
+	}
+
+
+	inline
+	std::ostream& reverse(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;7m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+#endif
+		}
+		return stream;
+	}
+
+
+	inline
+	std::ostream& concealed(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;8m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+#endif
+		}
+		return stream;
+	}
+
+
+	inline
+	std::ostream& grey(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;30m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream,
+                0   // grey (black)
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& red(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;31m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream,
+                FOREGROUND_RED
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& green(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;32m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream,
+                FOREGROUND_GREEN
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& yellow(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;33m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream,
+                FOREGROUND_GREEN | FOREGROUND_RED
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& blue(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;34m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream,
+                FOREGROUND_BLUE
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& magenta(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;35m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream,
+                FOREGROUND_BLUE | FOREGROUND_RED
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& cyan(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;36m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream,
+                FOREGROUND_BLUE | FOREGROUND_GREEN
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& white(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;37m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream,
+                FOREGROUND_BLUE | FOREGROUND_GREEN | FOREGROUND_RED
+            );
+#endif
+		}
+		return stream;
+	}
+
+
+
+	inline
+	std::ostream& on_grey(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;40m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1,
+                0   // grey (black)
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& on_red(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;41m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1,
+                BACKGROUND_RED
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& on_green(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;42m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1,
+                BACKGROUND_GREEN
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& on_yellow(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;43m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1,
+                BACKGROUND_GREEN | BACKGROUND_RED
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& on_blue(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;44m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1,
+                BACKGROUND_BLUE
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& on_magenta(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;45m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1,
+                BACKGROUND_BLUE | BACKGROUND_RED
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& on_cyan(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;46m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1,
+                BACKGROUND_GREEN | BACKGROUND_BLUE
+            );
+#endif
+		}
+		return stream;
+	}
+
+	inline
+	std::ostream& on_white(std::ostream& stream)
+	{
+		if (_internal::is_colorized(stream))
+		{
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			stream << "\e[1;47m";
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			_internal::win_change_attributes(stream, -1,
+                BACKGROUND_GREEN | BACKGROUND_BLUE | BACKGROUND_RED
+            );
+#endif
+		}
+
+		return stream;
+	}
+
+
+
+	//! Since C++ hasn't a way to hide something in the header from
+	//! the outer access, I have to introduce this namespace which
+	//! is used for internal purpose and should't be access from
+	//! the user code.
+	namespace _internal
+	{
+		//! Since C++ hasn't a true way to extract stream handler
+		//! from the a given `std::ostream` object, I have to write
+		//! this kind of hack.
+		inline
+		FILE* get_standard_stream(const std::ostream& stream)
+		{
+			if (&stream == &std::cout)
+				return stdout;
+			else if ((&stream == &std::cerr) || (&stream == &std::clog))
+				return stderr;
+
+			return 0;
+		}
+
+		// Say whether a given stream should be colorized or not. It's always
+		// true for ATTY streams and may be true for streams marked with
+		// colorize flag.
+		inline
+		bool is_colorized(std::ostream& stream)
+		{
+			return is_atty(stream) || static_cast<bool>(stream.iword(colorize_index));
+		}
+
+		//! Test whether a given `std::ostream` object refers to
+		//! a terminal.
+		inline
+		bool is_atty(const std::ostream& stream)
+		{
+			FILE* std_stream = get_standard_stream(stream);
+
+			// Unfortunately, fileno() ends with segmentation fault
+			// if invalid file descriptor is passed. So we need to
+			// handle this case gracefully and assume it's not a tty
+			// if standard stream is not detected, and 0 is returned.
+			if (!std_stream)
+				return false;
+
+#if defined(TERMCOLOR_OS_MACOS) || defined(TERMCOLOR_OS_LINUX)
+			return ::isatty(fileno(std_stream));
+#elif defined(TERMCOLOR_OS_WINDOWS)
+			return ::_isatty(_fileno(std_stream));
+#endif
+		}
+
+#if defined(TERMCOLOR_OS_WINDOWS)
+		//! Change Windows Terminal colors attribute. If some
+        //! parameter is `-1` then attribute won't changed.
+        inline void win_change_attributes(std::ostream& stream, int foreground, int background)
+        {
+            // yeah, i know.. it's ugly, it's windows.
+            static WORD defaultAttributes = 0;
+
+            // Windows doesn't have ANSI escape sequences and so we use special
+            // API to change Terminal output color. That means we can't
+            // manipulate colors by means of "std::stringstream" and hence
+            // should do nothing in this case.
+            if (!_internal::is_atty(stream))
+                return;
+
+            // get terminal handle
+            HANDLE hTerminal = INVALID_HANDLE_VALUE;
+            if (&stream == &std::cout)
+                hTerminal = GetStdHandle(STD_OUTPUT_HANDLE);
+            else if (&stream == &std::cerr)
+                hTerminal = GetStdHandle(STD_ERROR_HANDLE);
+
+            // save default terminal attributes if it unsaved
+            if (!defaultAttributes)
+            {
+                CONSOLE_SCREEN_BUFFER_INFO info;
+                if (!GetConsoleScreenBufferInfo(hTerminal, &info))
+                    return;
+                defaultAttributes = info.wAttributes;
+            }
+
+            // restore all default settings
+            if (foreground == -1 && background == -1)
+            {
+                SetConsoleTextAttribute(hTerminal, defaultAttributes);
+                return;
+            }
+
+            // get current settings
+            CONSOLE_SCREEN_BUFFER_INFO info;
+            if (!GetConsoleScreenBufferInfo(hTerminal, &info))
+                return;
+
+            if (foreground != -1)
+            {
+                info.wAttributes &= ~(info.wAttributes & 0x0F);
+                info.wAttributes |= static_cast<WORD>(foreground);
+            }
+
+            if (background != -1)
+            {
+                info.wAttributes &= ~(info.wAttributes & 0xF0);
+                info.wAttributes |= static_cast<WORD>(background);
+            }
+
+            SetConsoleTextAttribute(hTerminal, info.wAttributes);
+        }
+#endif // TERMCOLOR_OS_WINDOWS
+
+	} // namespace _internal
+
+} // namespace termcolor
+
+
+#undef TERMCOLOR_OS_WINDOWS
+#undef TERMCOLOR_OS_MACOS
+#undef TERMCOLOR_OS_LINUX
+
+#endif // TERMCOLOR_HPP_
diff --git a/common/crash.cpp b/common/crash.cpp
index 522d5f171..155bfcf2a 100644
--- a/common/crash.cpp
+++ b/common/crash.cpp
@@ -111,7 +111,60 @@ void set_exception_handler() {
 	SetUnhandledExceptionFilter(windows_exception_handler);
 }
 #else
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <sys/fcntl.h>
+
+void print_trace()
+{
+	auto uid = geteuid();
+
+	std::string temp_output_file = "/tmp/dump-output";
+
+	char pid_buf[30];
+	sprintf(pid_buf, "%d", getpid());
+	char name_buf[512];
+	name_buf[readlink("/proc/self/exe", name_buf, 511)] = 0;
+	int child_pid = fork();
+	if (!child_pid) {
+		int fd = open(temp_output_file.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
+
+		dup2(fd, 1); // redirect output to stderr
+		fprintf(stdout, "stack trace for %s pid=%s\n", name_buf, pid_buf);
+		if (uid == 0) {
+			execlp("gdb", "gdb", "--batch", "-n", "-ex", "thread", "-ex", "bt", name_buf, pid_buf, NULL);
+		}
+		else {
+			execlp("sudo", "gdb", "gdb", "--batch", "-n", "-ex", "thread", "-ex", "bt", name_buf, pid_buf, NULL);
+		}
+
+		close(fd);
+
+		abort(); /* If gdb failed to start */
+	}
+	else {
+		waitpid(child_pid, NULL, 0);
+	}
+
+	std::ifstream    input(temp_output_file);
+	for (std::string line; getline(input, line);) {
+		LogCrash("{}", line);
+	}
+
+	std::remove(temp_output_file.c_str());
+
+	exit(1);
+}
+
 // crash is off or an unhandled platform
-void set_exception_handler() {
+void set_exception_handler()
+{
+	signal(SIGABRT, reinterpret_cast<void (*)(int)>(print_trace));
+	signal(SIGFPE, reinterpret_cast<void (*)(int)>(print_trace));
+	signal(SIGFPE, reinterpret_cast<void (*)(int)>(print_trace));
+	signal(SIGSEGV, reinterpret_cast<void (*)(int)>(print_trace));
 }
 #endif
diff --git a/common/data_verification.h b/common/data_verification.h
index 27ad017a9..c56f3ce04 100644
--- a/common/data_verification.h
+++ b/common/data_verification.h
@@ -1,53 +1,57 @@
-/*	EQEMu: Everquest Server Emulator
-
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
 #pragma once
 
 #include <algorithm>
 #include <cmath>
 
-namespace EQEmu
-{
-	template <typename T>
-	T Clamp(const T& value, const T& lower, const T& upper) {
+namespace EQEmu {
+	template<typename T>
+	T Clamp(const T &value, const T &lower, const T &upper)
+	{
 		return std::max(lower, std::min(value, upper));
 	}
 
-	template <typename T>
-	T ClampLower(const T& value, const T& lower) {
+	template<typename T>
+	T ClampLower(const T &value, const T &lower)
+	{
 		return std::max(lower, value);
 	}
 
-	template <typename T>
-	T ClampUpper(const T& value, const T& upper) {
+	template<typename T>
+	T ClampUpper(const T &value, const T &upper)
+	{
 		return std::min(value, upper);
 	}
 
-	template <typename T>
-	bool ValueWithin(const T& value, const T& lower, const T& upper) {
+	template<typename T>
+	bool ValueWithin(const T &value, const T &lower, const T &upper)
+	{
 		return value >= lower && value <= upper;
 	}
 
-	template <typename T1, typename T2, typename T3>
-	bool ValueWithin(const T1& value, const T2& lower, const T3& upper) {
-		return value >= (T1)lower && value <= (T1)upper;
+	template<typename T1, typename T2, typename T3>
+	bool ValueWithin(const T1 &value, const T2 &lower, const T3 &upper)
+	{
+		return value >= (T1) lower && value <= (T1) upper;
 	}
-
 } /*EQEmu*/
 
diff --git a/common/database.cpp b/common/database.cpp
index 2c234aa64..f6adc3659 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -64,11 +64,11 @@ bool Database::Connect(const char* host, const char* user, const char* passwd, c
 	uint32 errnum= 0;
 	char errbuf[MYSQL_ERRMSG_SIZE];
 	if (!Open(host, user, passwd, database, port, &errnum, errbuf)) {
-		Log(Logs::General, Logs::Error, "Failed to connect to database: Error: %s", errbuf); 
-		return false; 
+		LogError("Failed to connect to database: Error: {}", errbuf);
+		return false;
 	}
 	else {
-		Log(Logs::General, Logs::Status, "Using database '%s' at %s:%d", database, host,port);
+		LogInfo("Using database [{}] at [{}]:[{}]", database, host,port);
 		return true;
 	}
 }
@@ -86,7 +86,7 @@ Database::~Database()
 	Return the account id or zero if no account matches.
 	Zero will also be returned if there is a database error.
 */
-uint32 Database::CheckLogin(const char* name, const char* password, int16* oStatus) {
+uint32 Database::CheckLogin(const char* name, const char* password, const char *loginserver, int16* oStatus) {
 
 	if(strlen(name) >= 50 || strlen(password) >= 50)
 		return(0);
@@ -97,9 +97,10 @@ uint32 Database::CheckLogin(const char* name, const char* password, int16* oStat
 	DoEscapeString(tmpUN, name, strlen(name));
 	DoEscapeString(tmpPW, password, strlen(password));
 
-	std::string query = StringFormat("SELECT id, status FROM account WHERE name='%s' AND password is not null "
+	std::string query = StringFormat("SELECT id, status FROM account WHERE `name`='%s' AND ls_id='%s' AND password is not null "
 		"and length(password) > 0 and (password='%s' or password=MD5('%s'))",
-		tmpUN, tmpPW, tmpPW);
+		tmpUN, EscapeString(loginserver).c_str(), tmpPW, tmpPW);
+
 	auto results = QueryDatabase(query);
 
 	if (!results.Success())
@@ -123,7 +124,7 @@ uint32 Database::CheckLogin(const char* name, const char* password, int16* oStat
 //Get Banned IP Address List - Only return false if the incoming connection's IP address is not present in the banned_ips table.
 bool Database::CheckBannedIPs(const char* loginIP)
 {
-	std::string query = StringFormat("SELECT ip_address FROM Banned_IPs WHERE ip_address='%s'", loginIP);
+	std::string query = StringFormat("SELECT ip_address FROM banned_ips WHERE ip_address='%s'", loginIP);
 
 	auto results = QueryDatabase(query);
 
@@ -139,16 +140,16 @@ bool Database::CheckBannedIPs(const char* loginIP)
 }
 
 bool Database::AddBannedIP(char* bannedIP, const char* notes) {
-	std::string query = StringFormat("INSERT into Banned_IPs SET ip_address='%s', notes='%s'", bannedIP, notes); 
-	auto results = QueryDatabase(query); 
+	std::string query = StringFormat("INSERT into banned_ips SET ip_address='%s', notes='%s'", bannedIP, notes);
+	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
-	} 
+	}
 	return true;
 }
 
  bool Database::CheckGMIPs(const char* ip_address, uint32 account_id) {
-	std::string query = StringFormat("SELECT * FROM `gm_ips` WHERE `ip_address` = '%s' AND `account_id` = %i", ip_address, account_id); 
+	std::string query = StringFormat("SELECT * FROM `gm_ips` WHERE `ip_address` = '%s' AND `account_id` = %i", ip_address, account_id);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success())
@@ -161,14 +162,14 @@ bool Database::AddBannedIP(char* bannedIP, const char* notes) {
 }
 
 bool Database::AddGMIP(char* ip_address, char* name) {
-	std::string query = StringFormat("INSERT into `gm_ips` SET `ip_address` = '%s', `name` = '%s'", ip_address, name); 
-	auto results = QueryDatabase(query); 
+	std::string query = StringFormat("INSERT into `gm_ips` SET `ip_address` = '%s', `name` = '%s'", ip_address, name);
+	auto results = QueryDatabase(query);
 	return results.Success();
 }
 
 void Database::LoginIP(uint32 AccountID, const char* LoginIP) {
-	std::string query = StringFormat("INSERT INTO account_ip SET accid=%i, ip='%s' ON DUPLICATE KEY UPDATE count=count+1, lastused=now()", AccountID, LoginIP); 
-	QueryDatabase(query); 
+	std::string query = StringFormat("INSERT INTO account_ip SET accid=%i, ip='%s' ON DUPLICATE KEY UPDATE count=count+1, lastused=now()", AccountID, LoginIP);
+	QueryDatabase(query);
 }
 
 int16 Database::CheckStatus(uint32 account_id)
@@ -197,34 +198,63 @@ int16 Database::CheckStatus(uint32 account_id)
 	return status;
 }
 
-uint32 Database::CreateAccount(const char* name, const char* password, int16 status, uint32 lsaccount_id) {
+/**
+ * @param name
+ * @param password
+ * @param status
+ * @param loginserver
+ * @param lsaccount_id
+ * @return
+ */
+uint32 Database::CreateAccount(
+	const char *name,
+	const char *password,
+	int16 status,
+	const char *loginserver,
+	uint32 lsaccount_id
+)
+{
 	std::string query;
 
-	if (password)
-		query = StringFormat("INSERT INTO account SET name='%s', password='%s', status=%i, lsaccount_id=%i, time_creation=UNIX_TIMESTAMP();",name,password,status, lsaccount_id);
-	else
-		query = StringFormat("INSERT INTO account SET name='%s', status=%i, lsaccount_id=%i, time_creation=UNIX_TIMESTAMP();",name, status, lsaccount_id);
+	if (password) {
+		query = StringFormat(
+			"INSERT INTO account SET name='%s', password='%s', status=%i, ls_id='%s', lsaccount_id=%i, time_creation=UNIX_TIMESTAMP();",
+			name,
+			password,
+			status,
+			loginserver,
+			lsaccount_id
+		);
+	}
+	else {
+		query = StringFormat(
+			"INSERT INTO account SET name='%s', status=%i, ls_id='%s', lsaccount_id=%i, time_creation=UNIX_TIMESTAMP();",
+			name,
+			status,
+			loginserver,
+			lsaccount_id
+		);
+	}
 
-	Log(Logs::General, Logs::World_Server, "Account Attempting to be created: '%s' status: %i", name, status);
+	LogInfo("Account Attempting to be created: [{0}:{1}] status: {2}", loginserver, name, status);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()) {
 		return 0;
 	}
 
-	if (results.LastInsertedID() == 0)
-	{
+	if (results.LastInsertedID() == 0) {
 		return 0;
 	}
 
 	return results.LastInsertedID();
 }
 
-bool Database::DeleteAccount(const char* name) {
-	std::string query = StringFormat("DELETE FROM account WHERE name='%s';",name); 
-	Log(Logs::General, Logs::World_Server, "Account Attempting to be deleted:'%s'", name);
+bool Database::DeleteAccount(const char* name, const char *loginserver) {
+	std::string query = StringFormat("DELETE FROM account WHERE `name`='%s' AND ls_id='%s'", name, loginserver);
+	LogInfo("Account Attempting to be deleted:'[{}]:[{}]'", loginserver, name);
 
-	auto results = QueryDatabase(query); 
+	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
 	}
@@ -257,7 +287,38 @@ bool Database::SetAccountStatus(const char* name, int16 status) {
 	if (results.RowsAffected() == 0)
 	{
 		std::cout << "Account: " << name << " does not exist, therefore it cannot be flagged\n";
-		return false; 
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * @param account_name
+ * @param status
+ * @return
+ */
+bool Database::SetAccountStatus(const std::string& account_name, int16 status)
+{
+	LogInfo("Account [{}] is attempting to be set to status [{}]", account_name, status);
+
+	std::string query = fmt::format(
+		SQL(
+			UPDATE account SET status = {} WHERE name = '{}'
+		),
+		status,
+		account_name
+	);
+
+	auto results = QueryDatabase(query);
+
+	if (!results.Success()) {
+		return false;
+	}
+
+	if (results.RowsAffected() == 0) {
+		LogWarning("Account [{}] does not exist!", account_name);
+		return false;
 	}
 
 	return true;
@@ -269,79 +330,102 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 	auto results = QueryDatabase(query);
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		if (row[0] && atoi(row[0]) > 0){
-			Log(Logs::General, Logs::World_Server, "Account: %i tried to request name: %s, but it is already taken...", account_id, name);
+			LogInfo("Account: [{}] tried to request name: [{}], but it is already taken", account_id, name);
 			return false;
 		}
 	}
 
-	query = StringFormat("INSERT INTO `character_data` SET `account_id` = %i, `name` = '%s'", account_id, name); 
+	query = StringFormat("INSERT INTO `character_data` SET `account_id` = %i, `name` = '%s'", account_id, name);
 	results = QueryDatabase(query);
-	if (!results.Success() || results.ErrorMessage() != ""){ return false; } 
+	if (!results.Success() || results.ErrorMessage() != ""){ return false; }
 	return true;
 }
 
-/*
-	Delete the character with the name "name"
-	returns false on failure, true otherwise
-*/
-bool Database::DeleteCharacter(char *name) {
-	uint32 charid = 0;
-	if(!name ||	!strlen(name)) {
-		Log(Logs::General, Logs::World_Server, "DeleteCharacter: request to delete without a name (empty char slot)");
+/**
+ * @param character_name
+ * @return
+ */
+bool Database::DeleteCharacter(char *character_name) {
+	uint32 character_id = 0;
+	if(!character_name || !strlen(character_name)) {
+		LogInfo("DeleteCharacter: request to delete without a name (empty char slot)");
 		return false;
 	}
-	Log(Logs::General, Logs::World_Server, "Database::DeleteCharacter name : '%s'", name);
 
-	/* Get id from character_data before deleting record so we can clean up the rest of the tables */
-	std::string query = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", name);
-	auto results = QueryDatabase(query);
-	for (auto row = results.begin(); row != results.end(); ++row) { charid = atoi(row[0]); }
-	if (charid <= 0){ 
-		Log(Logs::General, Logs::Error, "Database::DeleteCharacter :: Character (%s) not found, stopping delete...", name);
-		return false; 
+	std::string query   = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", character_name);
+	auto        results = QueryDatabase(query);
+	for (auto   row     = results.begin(); row != results.end(); ++row) {
+		character_id = atoi(row[0]);
 	}
 
-	query = StringFormat("DELETE FROM `quest_globals` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_activities` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_enabledtasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_tasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `completed_tasks` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `friends` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `mail` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `timers` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `inventory` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `char_recipe_list` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `adventure_stats` WHERE `player_id` ='%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `zone_flags` WHERE `charID` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `titles` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `player_titlesets` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `keyring` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `faction_values` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `instance_list_player` WHERE `charid` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_data` WHERE `id` = '%d'", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_skills` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_languages` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_bind` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_alternate_abilities` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_currency` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_data` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_spells` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_memmed_spells` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_disciplines` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_material` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_tribute` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_bandolier` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_potionbelt` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_inspect_messages` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_leadership_abilities` WHERE `id` = %u", charid); QueryDatabase(query);
-	query = StringFormat("DELETE FROM `character_alt_currency` WHERE `char_id` = '%d'", charid); QueryDatabase(query);
+	if (character_id <= 0) {
+		LogError("DeleteCharacter | Invalid Character ID [{}]", character_name);
+		return false;
+	}
+
+	std::string delete_type = "hard-deleted";
+	if (RuleB(Character, SoftDeletes)) {
+		delete_type       = "soft-deleted";
+		std::string query = fmt::format(
+			SQL(
+				UPDATE
+				character_data
+				SET
+				deleted_at = NOW()
+				WHERE
+				id = '{}'
+			),
+			character_id
+		);
+
+		QueryDatabase(query);
+
+		return true;
+	}
+
+	LogInfo("DeleteCharacter | Character [{}] ({}) is being [{}]", character_name, character_id, delete_type);
+
+	query = StringFormat("DELETE FROM `quest_globals` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_activities` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_enabledtasks` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_tasks` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `completed_tasks` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `friends` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `mail` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `timers` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `inventory` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `char_recipe_list` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `adventure_stats` WHERE `player_id` ='%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `zone_flags` WHERE `charID` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `titles` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `player_titlesets` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `keyring` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `faction_values` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `instance_list_player` WHERE `charid` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_data` WHERE `id` = '%d'", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_skills` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_languages` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_bind` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_alternate_abilities` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_currency` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_data` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_spells` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_memmed_spells` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_disciplines` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_material` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_tribute` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_bandolier` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_potionbelt` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_inspect_messages` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_leadership_abilities` WHERE `id` = %u", character_id); QueryDatabase(query);
+	query = StringFormat("DELETE FROM `character_alt_currency` WHERE `char_id` = '%d'", character_id); QueryDatabase(query);
 #ifdef BOTS
-	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d' AND GetMobTypeById(%i) = 'C'", charid); // note: only use of GetMobTypeById()
+	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d' AND GetMobTypeById(%i) = 'C'", character_id); // note: only use of GetMobTypeById()
 #else
-	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d'", charid);
+	query = StringFormat("DELETE FROM `guild_members` WHERE `char_id` = '%d'", character_id);
 #endif
 	QueryDatabase(query);
-	
+
 	return true;
 }
 
@@ -622,6 +706,7 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		pp->RestTimer					  // " RestTimer)                 "
 	);
 	auto results = QueryDatabase(query);
+
 	/* Save Bind Points */
 	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 		" VALUES (%u, %u, %u, %f, %f, %f, %f, %i), "
@@ -656,7 +741,7 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 			}
 		}
 	}
-	results = QueryDatabase(query); 
+	results = QueryDatabase(query);
 
 	/* Save Language */
 	firstquery = 0;
@@ -671,20 +756,20 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 			}
 		}
 	}
-	results = QueryDatabase(query); 
+	results = QueryDatabase(query);
 
 	return true;
 }
 
 /* This only for new Character creation storing */
 bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu::InventoryProfile* inv) {
-	uint32 charid = 0; 
-	char zone[50]; 
-	float x, y, z; 
+	uint32 charid = 0;
+	char zone[50];
+	float x, y, z;
 	charid = GetCharacterID(pp->name);
 
 	if(!charid) {
-		Log(Logs::General, Logs::Error, "StoreCharacter: no character id");
+		LogError("StoreCharacter: no character id");
 		return false;
 	}
 
@@ -701,7 +786,7 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu
 	z = pp->z;
 
 	/* Saves Player Profile Data */
-	SaveCharacterCreate(charid, account_id, pp); 
+	SaveCharacterCreate(charid, account_id, pp);
 
 	/* Insert starting inventory... */
 	std::string invquery;
@@ -709,23 +794,23 @@ bool Database::StoreCharacter(uint32 account_id, PlayerProfile_Struct* pp, EQEmu
 		const EQEmu::ItemInstance* newinv = inv->GetItem(i);
 		if (newinv) {
 			invquery = StringFormat("INSERT INTO `inventory` (charid, slotid, itemid, charges, color) VALUES (%u, %i, %u, %i, %u)",
-				charid, i, newinv->GetItem()->ID, newinv->GetCharges(), newinv->GetColor()); 
-			
-			auto results = QueryDatabase(invquery); 
+				charid, i, newinv->GetItem()->ID, newinv->GetCharges(), newinv->GetColor());
+
+			auto results = QueryDatabase(invquery);
 		}
 
 		if (i == EQEmu::invslot::slotCursor) {
-			i = EQEmu::invbag::GENERAL_BAGS_BEGIN; 
+			i = EQEmu::invbag::GENERAL_BAGS_BEGIN;
 			continue;
 		}
-		else if (i == EQEmu::invbag::CURSOR_BAG_END) { 
-			i = EQEmu::invslot::BANK_BEGIN; 
-			continue; 
+		else if (i == EQEmu::invbag::CURSOR_BAG_END) {
+			i = EQEmu::invslot::BANK_BEGIN;
+			continue;
+		}
+		else if (i == EQEmu::invslot::BANK_END) {
+			i = EQEmu::invbag::BANK_BAGS_BEGIN;
+			continue;
 		}
-		else if (i == EQEmu::invslot::BANK_END) { 
-			i = EQEmu::invbag::BANK_BAGS_BEGIN; 
-			continue; 
-		} 
 		i++;
 	}
 	return true;
@@ -739,7 +824,7 @@ uint32 Database::GetCharacterID(const char *name) {
 	{
 		return atoi(row[0]);
 	}
-	return 0; 
+	return 0;
 }
 
 /*
@@ -758,7 +843,7 @@ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {
 	}
 
 	if (results.RowCount() != 1)
-		return 0; 
+		return 0;
 
 	auto row = results.begin();
 
@@ -772,8 +857,8 @@ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {
 
 // Retrieve account_id for a given char_id
 uint32 Database::GetAccountIDByChar(uint32 char_id) {
-	std::string query = StringFormat("SELECT `account_id` FROM `character_data` WHERE `id` = %i LIMIT 1", char_id); 
-	auto results = QueryDatabase(query); 
+	std::string query = StringFormat("SELECT `account_id` FROM `character_data` WHERE `id` = %i LIMIT 1", char_id);
+	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return 0;
 	}
@@ -781,15 +866,16 @@ uint32 Database::GetAccountIDByChar(uint32 char_id) {
 	if (results.RowCount() != 1)
 		return 0;
 
-	auto row = results.begin(); 
+	auto row = results.begin();
 	return atoi(row[0]);
 }
 
-uint32 Database::GetAccountIDByName(const char* accname, int16* status, uint32* lsid) {
+uint32 Database::GetAccountIDByName(const char* accname, const char *loginserver, int16* status, uint32* lsid) {
 	if (!isAlphaNumeric(accname))
 		return 0;
 
-	std::string query = StringFormat("SELECT `id`, `status`, `lsaccount_id` FROM `account` WHERE `name` = '%s' LIMIT 1", accname);
+	std::string query = StringFormat("SELECT `id`, `status`, `lsaccount_id` FROM `account` WHERE `name` = '%s' AND `ls_id`='%s' LIMIT 1",
+		EscapeString(accname).c_str(), EscapeString(loginserver).c_str());
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()) {
@@ -817,7 +903,7 @@ uint32 Database::GetAccountIDByName(const char* accname, int16* status, uint32*
 }
 
 void Database::GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID) {
-	std::string query = StringFormat("SELECT `name`, `lsaccount_id` FROM `account` WHERE `id` = '%i'", accountid); 
+	std::string query = StringFormat("SELECT `name`, `lsaccount_id` FROM `account` WHERE `id` = '%i'", accountid);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()) {
@@ -841,7 +927,7 @@ void Database::GetCharName(uint32 char_id, char* name) {
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()) {
-		return; 
+		return;
 	}
 
 	auto row = results.begin();
@@ -918,21 +1004,9 @@ bool Database::SetVariable(const std::string varname, const std::string &varvalu
 	return true;
 }
 
-uint32 Database::GetMiniLoginAccount(char* ip)
-{
-	std::string query = StringFormat("SELECT `id` FROM `account` WHERE `minilogin_ip` = '%s'", ip);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success())
-		return 0;
-
-	auto row = results.begin(); 
-	return atoi(row[0]);
-}
-
 // Get zone starting points from DB
 bool Database::GetSafePoints(const char* short_name, uint32 version, float* safe_x, float* safe_y, float* safe_z, int16* minstatus, uint8* minlevel, char *flag_needed) {
-	
+
 	std::string query = StringFormat("SELECT safe_x, safe_y, safe_z, min_status, min_level, flag_needed FROM zone "
 		" WHERE short_name='%s' AND (version=%i OR version=0) ORDER BY version DESC", short_name, version);
 	auto results = QueryDatabase(query);
@@ -962,7 +1036,7 @@ bool Database::GetSafePoints(const char* short_name, uint32 version, float* safe
 }
 
 bool Database::GetZoneLongName(const char* short_name, char** long_name, char* file_name, float* safe_x, float* safe_y, float* safe_z, uint32* graveyard_id, uint32* maxclients) {
-	
+
 	std::string query = StringFormat("SELECT long_name, file_name, safe_x, safe_y, safe_z, graveyard_id, maxclients FROM zone WHERE short_name='%s' AND version=0", short_name);
 	auto results = QueryDatabase(query);
 
@@ -1015,7 +1089,7 @@ uint32 Database::GetZoneGraveyardID(uint32 zone_id, uint32 version) {
 }
 
 bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid, float* graveyard_x, float* graveyard_y, float* graveyard_z, float* graveyard_heading) {
-	
+
 	std::string query = StringFormat("SELECT zone_id, x, y, z, heading FROM graveyard WHERE id=%i", graveyard_id);
 	auto results = QueryDatabase(query);
 
@@ -1087,7 +1161,7 @@ const char* Database::GetZoneName(uint32 zoneID, bool ErrorUnknown) {
 }
 
 uint8 Database::GetPEQZone(uint32 zoneID, uint32 version){
-	
+
 	std::string query = StringFormat("SELECT peqzone from zone where zoneidnumber='%i' AND (version=%i OR version=0) ORDER BY version DESC", zoneID, version);
 	auto results = QueryDatabase(query);
 
@@ -1151,7 +1225,7 @@ bool Database::CheckNameFilter(const char* name, bool surname)
 		}
 	}
 
-	
+
 	std::string query("SELECT name FROM name_filter");
 	auto results = QueryDatabase(query);
 
@@ -1176,7 +1250,7 @@ bool Database::CheckNameFilter(const char* name, bool surname)
 }
 
 bool Database::AddToNameFilter(const char* name) {
-	
+
 	std::string query = StringFormat("INSERT INTO name_filter (name) values ('%s')", name);
 	auto results = QueryDatabase(query);
 
@@ -1191,33 +1265,54 @@ bool Database::AddToNameFilter(const char* name) {
 	return true;
 }
 
-uint32 Database::GetAccountIDFromLSID(uint32 iLSID, char* oAccountName, int16* oStatus) {
+/**
+ * @param in_loginserver_id
+ * @param in_loginserver_account_id
+ * @param in_account_name
+ * @param in_status
+ * @return
+ */
+uint32 Database::GetAccountIDFromLSID(
+	const std::string &in_loginserver_id,
+	uint32 in_loginserver_account_id,
+	char *in_account_name,
+	int16 *in_status
+)
+{
 	uint32 account_id = 0;
-	std::string query = StringFormat("SELECT id, name, status FROM account WHERE lsaccount_id=%i", iLSID);
+	auto query = fmt::format(
+		"SELECT id, `name`, status FROM account WHERE lsaccount_id = {0} AND ls_id = '{1}'",
+		in_loginserver_account_id,
+		in_loginserver_id
+	);
+
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()) {
 		return 0;
 	}
 
-	if (results.RowCount() != 1)
+	if (results.RowCount() != 1) {
 		return 0;
+	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		account_id = atoi(row[0]);
+		account_id = std::stoi(row[0]);
 
-		if (oAccountName)
-			strcpy(oAccountName, row[1]);
-		if (oStatus)
-			*oStatus = atoi(row[2]);
+		if (in_account_name) {
+			strcpy(in_account_name, row[1]);
+		}
+		if (in_status) {
+			*in_status = std::stoi(row[2]);
+		}
 	}
 
 	return account_id;
 }
 
 void Database::GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus) {
-	
-	std::string query = StringFormat("SELECT name, status FROM account WHERE id=%i", id);
+
+	std::string query = StringFormat("SELECT `name`, status FROM account WHERE id=%i", id);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()){
@@ -1239,8 +1334,8 @@ void Database::ClearMerchantTemp(){
 	QueryDatabase("DELETE FROM merchantlist_temp");
 }
 
-bool Database::UpdateName(const char* oldname, const char* newname) { 
-	std::cout << "Renaming " << oldname << " to " << newname << "..." << std::endl; 
+bool Database::UpdateName(const char* oldname, const char* newname) {
+	std::cout << "Renaming " << oldname << " to " << newname << "..." << std::endl;
 	std::string query = StringFormat("UPDATE `character_data` SET `name` = '%s' WHERE `name` = '%s';", newname, oldname);
 	auto results = QueryDatabase(query);
 
@@ -1256,7 +1351,7 @@ bool Database::UpdateName(const char* oldname, const char* newname) {
 // If the name is used or an error occurs, it returns false, otherwise it returns true
 bool Database::CheckUsedName(const char* name) {
 	std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name` = '%s'", name);
-	auto results = QueryDatabase(query); 
+	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
 	}
@@ -1269,7 +1364,7 @@ bool Database::CheckUsedName(const char* name) {
 
 uint8 Database::GetServerType() {
 	std::string query("SELECT `value` FROM `variables` WHERE `varname` = 'ServerType' LIMIT 1");
-	auto results = QueryDatabase(query); 
+	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return 0;
 	}
@@ -1302,7 +1397,7 @@ bool Database::MoveCharacterToZone(const char* charname, const char* zonename) {
 	return MoveCharacterToZone(charname, zonename, GetZoneID(zonename));
 }
 
-bool Database::MoveCharacterToZone(uint32 iCharID, const char* iZonename) { 
+bool Database::MoveCharacterToZone(uint32 iCharID, const char* iZonename) {
 	std::string query = StringFormat("UPDATE `character_data` SET `zone_id` = %i, `x` = -1, `y` = -1, `z` = -1 WHERE `id` = %i", GetZoneID(iZonename), iCharID);
 	auto results = QueryDatabase(query);
 
@@ -1313,7 +1408,7 @@ bool Database::MoveCharacterToZone(uint32 iCharID, const char* iZonename) {
 	return results.RowsAffected() != 0;
 }
 
-bool Database::SetHackerFlag(const char* accountname, const char* charactername, const char* hacked) { 
+bool Database::SetHackerFlag(const char* accountname, const char* charactername, const char* hacked) {
 	std::string query = StringFormat("INSERT INTO `hackers` (account, name, hacked) values('%s','%s','%s')", accountname, charactername, hacked);
 	auto results = QueryDatabase(query);
 
@@ -1324,7 +1419,7 @@ bool Database::SetHackerFlag(const char* accountname, const char* charactername,
 	return results.RowsAffected() != 0;
 }
 
-bool Database::SetMQDetectionFlag(const char* accountname, const char* charactername, const char* hacked, const char* zone) { 
+bool Database::SetMQDetectionFlag(const char* accountname, const char* charactername, const char* hacked, const char* zone) {
 	//Utilize the "hacker" table, but also give zone information.
 	std::string query = StringFormat("INSERT INTO hackers(account,name,hacked,zone) values('%s','%s','%s','%s')", accountname, charactername, hacked, zone);
 	auto results = QueryDatabase(query);
@@ -1340,7 +1435,7 @@ bool Database::SetMQDetectionFlag(const char* accountname, const char* character
 uint8 Database::GetRaceSkill(uint8 skillid, uint8 in_race)
 {
 	uint16 race_cap = 0;
-	
+
 	//Check for a racial cap!
 	std::string query = StringFormat("SELECT skillcap from race_skillcaps where skill = %i && race = %i", skillid, in_race);
 	auto results = QueryDatabase(query);
@@ -1359,7 +1454,7 @@ uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16
 {
 	uint8 skill_level = 0, skill_formula = 0;
 	uint16 base_cap = 0, skill_cap = 0, skill_cap2 = 0, skill_cap3 = 0;
-	
+
 
 	//Fetch the data from DB.
 	std::string query = StringFormat("SELECT level, formula, pre50cap, post50cap, post60cap from skillcaps where skill = %i && class = %i", skillid, in_class);
@@ -1442,9 +1537,9 @@ uint32 Database::GetCharacterInfo(
 	return charid;
 }
 
-bool Database::UpdateLiveChar(char* charname,uint32 lsaccount_id) {
+bool Database::UpdateLiveChar(char* charname, uint32 account_id) {
 
-	std::string query = StringFormat("UPDATE account SET charname='%s' WHERE id=%i;",charname, lsaccount_id);
+	std::string query = StringFormat("UPDATE account SET charname='%s' WHERE id=%i;", charname, account_id);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()){
@@ -1473,24 +1568,24 @@ bool Database::GetLiveChar(uint32 account_id, char* cname) {
 	return true;
 }
 
-void Database::SetLFP(uint32 CharID, bool LFP) { 
+void Database::SetLFP(uint32 CharID, bool LFP) {
 	std::string query = StringFormat("UPDATE `character_data` SET `lfp` = %i WHERE `id` = %i",LFP, CharID);
-	QueryDatabase(query); 
+	QueryDatabase(query);
 }
 
-void Database::SetLoginFlags(uint32 CharID, bool LFP, bool LFG, uint8 firstlogon) { 
+void Database::SetLoginFlags(uint32 CharID, bool LFP, bool LFG, uint8 firstlogon) {
 	std::string query = StringFormat("update `character_data` SET `lfp` = %i, `lfg` = %i, `firstlogon` = %i WHERE `id` = %i",LFP, LFG, firstlogon, CharID);
-	QueryDatabase(query); 
+	QueryDatabase(query);
 }
 
-void Database::SetLFG(uint32 CharID, bool LFG) { 
+void Database::SetLFG(uint32 CharID, bool LFG) {
 	std::string query = StringFormat("update `character_data` SET `lfg` = %i WHERE `id` = %i",LFG, CharID);
-	QueryDatabase(query); 
+	QueryDatabase(query);
 }
 
-void Database::SetFirstLogon(uint32 CharID, uint8 firstlogon) { 
+void Database::SetFirstLogon(uint32 CharID, uint8 firstlogon) {
 	std::string query = StringFormat( "UPDATE `character_data` SET `firstlogon` = %i WHERE `id` = %i",firstlogon, CharID);
-	QueryDatabase(query); 
+	QueryDatabase(query);
 }
 
 void Database::AddReport(std::string who, std::string against, std::string lines)
@@ -1511,7 +1606,7 @@ void Database::SetGroupID(const char* name, uint32 id, uint32 charid, uint32 ism
 		auto results = QueryDatabase(query);
 
 		if (!results.Success())
-			Log(Logs::General, Logs::Error, "Error deleting character from group id: %s", results.ErrorMessage().c_str());
+			LogError("Error deleting character from group id: {}", results.ErrorMessage().c_str());
 
 		return;
 	}
@@ -1530,7 +1625,7 @@ void Database::ClearAllGroups(void)
 
 void Database::ClearGroup(uint32 gid) {
 	ClearGroupLeader(gid);
-	
+
 	if(gid == 0)
 	{
 		//clear all groups
@@ -1543,7 +1638,7 @@ void Database::ClearGroup(uint32 gid) {
 	QueryDatabase(query);
 }
 
-uint32 Database::GetGroupID(const char* name){ 
+uint32 Database::GetGroupID(const char* name){
 	std::string query = StringFormat("SELECT groupid from group_id where name='%s'", name);
 	auto results = QueryDatabase(query);
 
@@ -1554,7 +1649,7 @@ uint32 Database::GetGroupID(const char* name){
 	if (results.RowCount() == 0)
 	{
 		// Commenting this out until logging levels can prevent this from going to console
-		//Log(Logs::General, Logs::None,, "Character not in a group: %s", name);
+		//LogDebug(, "Character not in a group: [{}]", name);
 		return 0;
 	}
 
@@ -1588,7 +1683,7 @@ char* Database::GetGroupLeaderForLogin(const char* name, char* leaderbuf) {
 	return leaderbuf;
 }
 
-void Database::SetGroupLeaderName(uint32 gid, const char* name) { 
+void Database::SetGroupLeaderName(uint32 gid, const char* name) {
 	std::string query = StringFormat("UPDATE group_leaders SET leadername = '%s' WHERE gid = %u", EscapeString(name).c_str(), gid);
 	auto result = QueryDatabase(query);
 
@@ -1601,7 +1696,7 @@ void Database::SetGroupLeaderName(uint32 gid, const char* name) {
 	result = QueryDatabase(query);
 
 	if(!result.Success()) {
-		Log(Logs::General, Logs::None, "Error in Database::SetGroupLeaderName: %s", result.ErrorMessage().c_str());
+		LogDebug("Error in Database::SetGroupLeaderName: [{}]", result.ErrorMessage().c_str());
 	}
 }
 
@@ -1676,7 +1771,7 @@ void Database::ClearAllGroupLeaders(void) {
 }
 
 void Database::ClearGroupLeader(uint32 gid) {
-	
+
 	if(gid == 0)
 	{
 		ClearAllGroupLeaders();
@@ -1747,7 +1842,7 @@ void Database::ClearAllRaidDetails(void)
 }
 
 void Database::ClearRaidDetails(uint32 rid) {
-	
+
 	if(rid == 0)
 	{
 		//clear all raids
@@ -1775,7 +1870,7 @@ void Database::PurgeAllDeletedDataBuckets() {
 // returns 0 on error or no raid for that character, or
 // the raid id that the character is a member of.
 uint32 Database::GetRaidID(const char* name)
-{ 
+{
 	std::string query = StringFormat("SELECT `raidid` FROM `raid_members` WHERE `name` = '%s'", name);
 	auto results = QueryDatabase(query);
 
@@ -1783,7 +1878,7 @@ uint32 Database::GetRaidID(const char* name)
 		return 0;
 	}
 
-	auto row = results.begin(); 
+	auto row = results.begin();
 	if (row == results.end()) {
 		return 0;
 	}
@@ -1802,12 +1897,12 @@ const char* Database::GetRaidLeaderName(uint32 raid_id)
 	// variable). C++0x standard states this should be thread safe
 	// but may not be fully supported in some compilers.
 	static char name[128];
-	
+
 	std::string query = StringFormat("SELECT `name` FROM `raid_members` WHERE `raidid` = %u AND `israidleader` = 1", raid_id);
 	auto results = QueryDatabase(query);
 
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Debug, "Unable to get Raid Leader Name for Raid ID: %u", raid_id);
+		LogDebug("Unable to get Raid Leader Name for Raid ID: [{}]", raid_id);
 		return "UNKNOWN";
 	}
 
@@ -2030,7 +2125,7 @@ bool Database::GetAdventureStats(uint32 char_id, AdventureStats_Struct *as)
 		"FROM "
 		"`adventure_stats` "
 		"WHERE "
-		"player_id = %u ", 
+		"player_id = %u ",
 		char_id
 	);
 	auto results = QueryDatabase(query);
@@ -2059,7 +2154,7 @@ bool Database::GetAdventureStats(uint32 char_id, AdventureStats_Struct *as)
 	return true;
 }
 
-uint32 Database::GetGuildIDByCharID(uint32 character_id) 
+uint32 Database::GetGuildIDByCharID(uint32 character_id)
 {
 	std::string query = StringFormat("SELECT guild_id FROM guild_members WHERE char_id='%i'", character_id);
 	auto results = QueryDatabase(query);
@@ -2074,9 +2169,11 @@ uint32 Database::GetGuildIDByCharID(uint32 character_id)
 	return atoi(row[0]);
 }
 
-void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings) {
-	// log_settings previously initialized to '0' by EQEmuLogSys::LoadLogSettingsDefaults()
-
+/**
+ * @param log_settings
+ */
+void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
+{
 	std::string query =
 					"SELECT "
 					"log_category_id, "
@@ -2088,11 +2185,10 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings) {
 					"logsys_categories "
 					"ORDER BY log_category_id";
 
-	auto results = QueryDatabase(query);
+	auto results         = QueryDatabase(query);
+	int  log_category_id = 0;
 
-	int log_category_id = 0;
-
-	int categories_in_database[1000] = {};
+	int *categories_in_database = new int[1000];
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		log_category_id = atoi(row[0]);
@@ -2132,15 +2228,14 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings) {
 	 * Auto inject categories that don't exist in the database...
 	 */
 	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
-		if (!categories_in_database[log_index]) {
+		if (categories_in_database[log_index] != 1) {
 
-			Log(Logs::General,
-				Logs::Status,
-				"New Log Category '%s' doesn't exist... Automatically adding to `logsys_categories` table...",
+			LogInfo(
+				"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
 				Logs::LogCategoryName[log_index]
 			);
 
-			std::string inject_query = StringFormat(
+			auto inject_query = fmt::format(
 				"INSERT INTO logsys_categories "
 				"(log_category_id, "
 				"log_category_description, "
@@ -2148,17 +2243,19 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings) {
 				"log_to_file, "
 				"log_to_gmsay) "
 				"VALUES "
-				"(%i, '%s', %i, %i, %i)",
+				"({0}, '{1}', {2}, {3}, {4})",
 				log_index,
-				EscapeString(Logs::LogCategoryName[log_index]).c_str(),
-				log_settings[log_category_id].log_to_console,
-				log_settings[log_category_id].log_to_file,
-				log_settings[log_category_id].log_to_gmsay
+				EscapeString(Logs::LogCategoryName[log_index]),
+				std::to_string(log_settings[log_index].log_to_console),
+				std::to_string(log_settings[log_index].log_to_file),
+				std::to_string(log_settings[log_index].log_to_gmsay)
 			);
 
 			QueryDatabase(inject_query);
 		}
 	}
+
+	delete[] categories_in_database;
 }
 
 int Database::CountInvSnapshots() {
@@ -2195,7 +2292,7 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
 	auto results = QueryDatabase(query);
 
 	if (!results.Success() || results.RowCount() == 0){
-		Log(Logs::Detail, Logs::World_Server, "Loading EQ time of day failed. Using defaults.");
+		LogInfo("Loading EQ time of day failed. Using defaults");
 		eqTime.minute = 0;
 		eqTime.hour = 9;
 		eqTime.day = 1;
@@ -2229,12 +2326,12 @@ bool Database::SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year
 int Database::GetIPExemption(std::string account_ip) {
 	std::string query = StringFormat("SELECT `exemption_amount` FROM `ip_exemptions` WHERE `exemption_ip` = '%s'", account_ip.c_str());
 	auto results = QueryDatabase(query);
-	
+
 	if (results.Success() && results.RowCount() > 0) {
 		auto row = results.begin();
 		return atoi(row[0]);
 	}
-	
+
 	return RuleI(World, MaxClientsPerIP);
 }
 
diff --git a/common/database.h b/common/database.h
index 307390edf..f569da20b 100644
--- a/common/database.h
+++ b/common/database.h
@@ -94,6 +94,8 @@ class PTimerList;
 #	define _ISNAN_(a) std::isnan(a)
 #endif
 
+#define SQL(...) #__VA_ARGS__
+
 class Database : public DBcore {
 public:
 	Database();
@@ -105,7 +107,7 @@ public:
 
 	bool	AddToNameFilter(const char* name);
 	bool	CreateCharacter(uint32 account_id, char* name, uint16 gender, uint16 race, uint16 class_, uint8 str, uint8 sta, uint8 cha, uint8 dex, uint8 int_, uint8 agi, uint8 wis, uint8 face);
-	bool	DeleteCharacter(char* name);
+	bool	DeleteCharacter(char* character_name);
 	bool	MoveCharacterToZone(const char* charname, const char* zonename);
 	bool	MoveCharacterToZone(const char* charname, const char* zonename,uint32 zoneid);
 	bool	MoveCharacterToZone(uint32 iCharID, const char* iZonename);
@@ -118,7 +120,7 @@ public:
 
 	/* General Information Queries */
 
-	bool	AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the Banned_IPs table.
+	bool	AddBannedIP(char* bannedIP, const char* notes); //Add IP address to the banned_ips table.
 	bool	AddGMIP(char* ip_address, char* name);
 	bool	CheckBannedIPs(const char* loginIP); //Check incoming connection against banned IP table.
 	bool	CheckGMIPs(const char* loginIP, uint32 account_id);
@@ -127,7 +129,7 @@ public:
 
 	uint32	GetAccountIDByChar(const char* charname, uint32* oCharID = 0);
 	uint32	GetAccountIDByChar(uint32 char_id);
-	uint32	GetAccountIDByName(const char* accname, int16* status = 0, uint32* lsid = 0);
+	uint32	GetAccountIDByName(const char* accname, const char *loginserver, int16* status = 0, uint32* lsid = 0);
 	uint32	GetCharacterID(const char *name);
 	uint32	GetCharacterInfo(const char* iName, uint32* oAccID = 0, uint32* oZoneID = 0, uint32* oInstanceID = 0, float* oX = 0, float* oY = 0, float* oZ = 0);
 	uint32	GetGuildIDByCharID(uint32 char_id);
@@ -174,18 +176,18 @@ public:
 
 	/* Account Related */
 
-	bool	DeleteAccount(const char* name);
+	bool	DeleteAccount(const char *name, const char* loginserver);
 	bool	GetLiveChar(uint32 account_id, char* cname);
 	bool	SetAccountStatus(const char* name, int16 status);
+	bool	SetAccountStatus(const std::string& account_name, int16 status);
 	bool	SetLocalPassword(uint32 accid, const char* password);
-	bool	UpdateLiveChar(char* charname, uint32 lsaccount_id);
+	bool	UpdateLiveChar(char* charname, uint32 account_id);
 
 	int16	CheckStatus(uint32 account_id);
 
-	uint32	CheckLogin(const char* name, const char* password, int16* oStatus = 0);
-	uint32	CreateAccount(const char* name, const char* password, int16 status, uint32 lsaccount_id = 0);
-	uint32	GetAccountIDFromLSID(uint32 iLSID, char* oAccountName = 0, int16* oStatus = 0);
-	uint32	GetMiniLoginAccount(char* ip);
+	uint32	CheckLogin(const char* name, const char* password, const char *loginserver, int16* oStatus = 0);
+	uint32	CreateAccount(const char* name, const char* password, int16 status, const char* loginserver, uint32 lsaccount_id);
+	uint32	GetAccountIDFromLSID(const std::string& in_loginserver_id, uint32 in_loginserver_account_id, char* in_account_name = 0, int16* in_status = 0);
 	uint8	GetAgreementFlag(uint32 acctid);
 
 	void	GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus);
diff --git a/common/database_conversions.cpp b/common/database_conversions.cpp
index 9850dfac1..ec973d9af 100644
--- a/common/database_conversions.cpp
+++ b/common/database_conversions.cpp
@@ -476,7 +476,7 @@ bool Database::CheckDatabaseConversions() {
 	CheckDatabaseConvertCorpseDeblob();
 
 	/* Run EQEmu Server script (Checks for database updates) */
-	system("perl eqemu_server.pl ran_from_world");
+	if(system("perl eqemu_server.pl ran_from_world"));
 
 	return true;
 }
diff --git a/common/database_schema.h b/common/database_schema.h
new file mode 100644
index 000000000..73637c877
--- /dev/null
+++ b/common/database_schema.h
@@ -0,0 +1,295 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef EQEMU_DATABASE_SCHEMA_H
+#define EQEMU_DATABASE_SCHEMA_H
+
+#include <vector>
+
+namespace DatabaseSchema {
+
+	/**
+	 * Gets player tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetPlayerTables()
+	{
+		std::vector<std::string> tables = {
+			"account",
+			"account_ip",
+			"account_flags",
+			"account_rewards",
+			"adventure_details",
+			"adventure_stats",
+			"buyer",
+			"char_recipe_list",
+			"character_activities",
+			"character_alt_currency",
+			"character_alternate_abilities",
+			"character_auras",
+			"character_bandolier",
+			"character_bind",
+			"character_buffs",
+			"character_corpse_items",
+			"character_corpses",
+			"character_currency",
+			"character_data",
+			"character_disciplines",
+			"character_enabledtasks",
+			"character_inspect_messages",
+			"character_item_recast",
+			"character_languages",
+			"character_leadership_abilities",
+			"character_material",
+			"character_memmed_spells",
+			"character_pet_buffs",
+			"character_pet_info",
+			"character_pet_inventory",
+			"character_potionbelt",
+			"character_skills",
+			"character_spells",
+			"character_tasks",
+			"character_tribute",
+			"completed_tasks",
+			"data_buckets",
+			"faction_values",
+			"friends",
+			"guild_bank",
+			"guild_members",
+			"guild_ranks",
+			"guild_relations",
+			"guilds",
+			"instance_list_player",
+			"inventory",
+			"inventory_snapshots",
+			"keyring",
+			"mail",
+			"player_titlesets",
+			"quest_globals",
+			"sharedbank",
+			"timers",
+			"titles",
+			"trader",
+			"trader_audit",
+			"zone_flags"
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets content tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetContentTables()
+	{
+		std::vector<std::string> tables = {
+			"aa_ability",
+			"aa_actions",
+			"aa_effects",
+			"aa_rank_effects",
+			"aa_rank_prereqs",
+			"aa_ranks",
+			"aa_required_level_cost",
+			"adventure_template",
+			"adventure_template_entry",
+			"adventure_template_entry_flavor",
+			"altadv_vars",
+			"alternate_currency",
+			"auras",
+			"base_data",
+			"blocked_spells",
+			"books",
+			"char_create_combinations",
+			"char_create_point_allocations",
+			"class_skill",
+			"damageshieldtypes",
+			"doors",
+			"faction_base_data",
+			"faction_list",
+			"faction_list_mod",
+			"fear_hints",
+			"fishing",
+			"forage",
+			"global_loot",
+			"goallists",
+			"graveyard",
+			"grid",
+			"grid_entries",
+			"ground_spawns",
+			"horses",
+			"instance_list",
+			"items",
+			"ldon_trap_entries",
+			"ldon_trap_templates",
+			"lootdrop",
+			"lootdrop_entries",
+			"loottable",
+			"loottable_entries",
+			"merchantlist",
+			"npc_emotes",
+			"npc_faction",
+			"npc_faction_entries",
+			"npc_scale_global_base",
+			"npc_spells",
+			"npc_spells_effects",
+			"npc_spells_effects_entries",
+			"npc_spells_entries",
+			"npc_types",
+			"npc_types_metadata",
+			"npc_types_tint",
+			"object",
+			"pets",
+			"pets_equipmentset",
+			"pets_equipmentset_entries",
+			"proximities",
+			"races",
+			"skill_caps",
+			"spawn2",
+			"spawn_condition_values",
+			"spawn_conditions",
+			"spawn_events",
+			"spawnentry",
+			"spawngroup",
+			"spells_new",
+			"start_zones",
+			"starting_items",
+			"task_activities",
+			"tasks",
+			"tasksets",
+			"titles",
+			"tradeskill_recipe",
+			"tradeskill_recipe_entries",
+			"traps",
+			"tribute_levels",
+			"tributes",
+			"veteran_reward_templates",
+			"zone",
+			"zone_points",
+			"zone_server",
+			"zoneserver_auth",
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets server tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetServerTables()
+	{
+		std::vector<std::string> tables = {
+			"banned_ips",
+			"bugs",
+			"bug_reports",
+			"command_settings",
+			"db_str",
+			"discovered_items",
+			"eqtime",
+			"eventlog",
+			"gm_ips",
+			"hackers",
+			"ip_exemptions",
+			"launcher",
+			"launcher_zones",
+			"level_exp_mods",
+			"logsys_categories",
+			"name_filter",
+			"perl_event_export_settings",
+			"petitions",
+			"profanity_list",
+			"reports",
+			"rule_sets",
+			"rule_values",
+			"saylink",
+			"variables",
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets state tables
+	 * Tables that keep track of server state
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetStateTables()
+	{
+		std::vector<std::string> tables = {
+			"adventure_members",
+			"chatchannels",
+			"group_id",
+			"group_leaders",
+			"item_tick",
+			"lfguild",
+			"merchantlist_temp",
+			"object_contents",
+			"raid_details",
+			"raid_leaders",
+			"raid_members",
+			"respawn_times",
+			"spell_buckets",
+			"spell_globals",
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets login tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetLoginTables()
+	{
+		std::vector<std::string> tables = {
+			"login_accounts",
+			"login_api_tokens",
+			"login_server_admins",
+			"login_server_list_types",
+			"login_world_servers",
+		};
+
+		return tables;
+	}
+
+	/**
+	 * Gets login tables
+	 *
+	 * @return
+	 */
+	static std::vector<std::string> GetVersionTables()
+	{
+		std::vector<std::string> tables = {
+			"db_version",
+			"inventory_versions",
+		};
+
+		return tables;
+	}
+
+}
+
+#endif //EQEMU_DATABASE_SCHEMA_H
diff --git a/common/dbcore.cpp b/common/dbcore.cpp
index 0468bdc77..46c7fbe12 100644
--- a/common/dbcore.cpp
+++ b/common/dbcore.cpp
@@ -2,8 +2,9 @@
 #include <winsock2.h>
 #endif
 
-#include "../common/misc_functions.h"
-#include "../common/eqemu_logsys.h"
+#include "misc_functions.h"
+#include "eqemu_logsys.h"
+#include "timer.h"
 
 #include "dbcore.h"
 
@@ -14,33 +15,37 @@
 #include <string.h>
 
 #ifdef _WINDOWS
-	#define snprintf	_snprintf
-	#define strncasecmp	_strnicmp
-	#define strcasecmp	_stricmp
-	#include <process.h>
+#define snprintf	_snprintf
+#define strncasecmp	_strnicmp
+#define strcasecmp	_stricmp
+#include <process.h>
 #else
-	#include "unix.h"
-	#include <pthread.h>
+
+#include "unix.h"
+#include <pthread.h>
+
 #endif
 
 #ifdef _EQDEBUG
-	#define DEBUG_MYSQL_QUERIES 0
+#define DEBUG_MYSQL_QUERIES 0
 #else
-	#define DEBUG_MYSQL_QUERIES 0
+#define DEBUG_MYSQL_QUERIES 0
 #endif
 
-DBcore::DBcore() {
+DBcore::DBcore()
+{
 	mysql_init(&mysql);
-	pHost = 0;
-	pUser = 0;
+	pHost     = 0;
+	pUser     = 0;
 	pPassword = 0;
 	pDatabase = 0;
 	pCompress = false;
-	pSSL = false;
-	pStatus = Closed;
+	pSSL      = false;
+	pStatus   = Closed;
 }
 
-DBcore::~DBcore() {
+DBcore::~DBcore()
+{
 	mysql_close(&mysql);
 	safe_delete_array(pHost);
 	safe_delete_array(pUser);
@@ -49,7 +54,8 @@ DBcore::~DBcore() {
 }
 
 // Sends the MySQL server a keepalive
-void DBcore::ping() {
+void DBcore::ping()
+{
 	if (!MDatabase.trylock()) {
 		// well, if's it's locked, someone's using it. If someone's using it, it doesnt need a keepalive
 		return;
@@ -63,34 +69,35 @@ MySQLRequestResult DBcore::QueryDatabase(std::string query, bool retryOnFailureO
 	return QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
 }
 
-MySQLRequestResult DBcore::QueryDatabase(const char* query, uint32 querylen, bool retryOnFailureOnce)
+MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, bool retryOnFailureOnce)
 {
+	BenchTimer timer;
+	timer.reset();
+
 	LockMutex lock(&MDatabase);
 
 	// Reconnect if we are not connected before hand.
-	if (pStatus != Connected)
+	if (pStatus != Connected) {
 		Open();
+	}
 
 	// request query. != 0 indicates some kind of error.
-	if (mysql_real_query(&mysql, query, querylen) != 0)
-	{
+	if (mysql_real_query(&mysql, query, querylen) != 0) {
 		unsigned int errorNumber = mysql_errno(&mysql);
 
-		if (errorNumber == CR_SERVER_GONE_ERROR)
+		if (errorNumber == CR_SERVER_GONE_ERROR) {
 			pStatus = Error;
+		}
 
 		// error appears to be a disconnect error, may need to try again.
-		if (errorNumber == CR_SERVER_LOST || errorNumber == CR_SERVER_GONE_ERROR)
-		{
+		if (errorNumber == CR_SERVER_LOST || errorNumber == CR_SERVER_GONE_ERROR) {
 
-			if (retryOnFailureOnce)
-			{
-				std::cout << "Database Error: Lost connection, attempting to recover...." << std::endl;
+			if (retryOnFailureOnce) {
+				LogInfo("Database Error: Lost connection, attempting to recover");
 				MySQLRequestResult requestResult = QueryDatabase(query, querylen, false);
 
-				if (requestResult.Success())
-				{
-					std::cout << "Reconnection to database successful." << std::endl;
+				if (requestResult.Success()) {
+					LogInfo("Reconnection to database successful");
 					return requestResult;
 				}
 
@@ -102,109 +109,154 @@ MySQLRequestResult DBcore::QueryDatabase(const char* query, uint32 querylen, boo
 
 			snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));
 
-			return MySQLRequestResult(nullptr, 0, 0, 0, 0, (uint32)mysql_errno(&mysql), errorBuffer);
+			return MySQLRequestResult(nullptr, 0, 0, 0, 0, (uint32) mysql_errno(&mysql), errorBuffer);
 		}
 
 		auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];
 		snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));
 
 		/* Implement Logging at the Root */
-		if (mysql_errno(&mysql) > 0 && strlen(query) > 0){
+		if (mysql_errno(&mysql) > 0 && strlen(query) > 0) {
 			if (LogSys.log_settings[Logs::MySQLError].is_category_enabled == 1)
 				Log(Logs::General, Logs::MySQLError, "%i: %s \n %s", mysql_errno(&mysql), mysql_error(&mysql), query);
 		}
 
-		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(&mysql),errorBuffer);
+		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(&mysql), errorBuffer);
 
 	}
 
 	// successful query. get results.
-	MYSQL_RES* res = mysql_store_result(&mysql);
-	uint32 rowCount = 0;
+	MYSQL_RES *res     = mysql_store_result(&mysql);
+	uint32    rowCount = 0;
 
-	if (res != nullptr)
-        rowCount = (uint32)mysql_num_rows(res);
+	if (res != nullptr) {
+		rowCount = (uint32) mysql_num_rows(res);
+	}
 
-	MySQLRequestResult requestResult(res, (uint32)mysql_affected_rows(&mysql), rowCount, (uint32)mysql_field_count(&mysql), (uint32)mysql_insert_id(&mysql));
-	
-	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1)
-	{
+	MySQLRequestResult requestResult(
+		res,
+		(uint32) mysql_affected_rows(&mysql),
+		rowCount,
+		(uint32) mysql_field_count(&mysql),
+		(uint32) mysql_insert_id(&mysql)
+	);
+
+	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
 		if ((strncasecmp(query, "select", 6) == 0)) {
-			Log(Logs::General, Logs::MySQLQuery, "%s (%u row%s returned)", query, requestResult.RowCount(), requestResult.RowCount() == 1 ? "" : "s");
+			LogF(
+				Logs::General,
+				Logs::MySQLQuery,
+				"{0} ({1} row{2} returned) ({3}s)",
+				query,
+				requestResult.RowCount(),
+				requestResult.RowCount() == 1 ? "" : "s",
+				std::to_string(timer.elapsed())
+			);
 		}
 		else {
-			Log(Logs::General, Logs::MySQLQuery, "%s (%u row%s affected)", query, requestResult.RowsAffected(), requestResult.RowsAffected() == 1 ? "" : "s");
+			LogF(
+				Logs::General,
+				Logs::MySQLQuery,
+				"{0} ({1} row{2} affected) ({3}s)",
+				query,
+				requestResult.RowsAffected(),
+				requestResult.RowsAffected() == 1 ? "" : "s",
+				std::to_string(timer.elapsed())
+			);
 		}
 	}
 
 	return requestResult;
 }
 
-void DBcore::TransactionBegin() {
+void DBcore::TransactionBegin()
+{
 	QueryDatabase("START TRANSACTION");
 }
 
-void DBcore::TransactionCommit() {
+void DBcore::TransactionCommit()
+{
 	QueryDatabase("COMMIT");
 }
 
-void DBcore::TransactionRollback() {
+void DBcore::TransactionRollback()
+{
 	QueryDatabase("ROLLBACK");
 }
 
-uint32 DBcore::DoEscapeString(char* tobuf, const char* frombuf, uint32 fromlen) {
+uint32 DBcore::DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen)
+{
 //	No good reason to lock the DB, we only need it in the first place to check char encoding.
 //	LockMutex lock(&MDatabase);
 	return mysql_real_escape_string(&mysql, tobuf, frombuf, fromlen);
 }
 
-bool DBcore::Open(const char* iHost, const char* iUser, const char* iPassword, const char* iDatabase,uint32 iPort, uint32* errnum, char* errbuf, bool iCompress, bool iSSL) {
+bool DBcore::Open(
+	const char *iHost,
+	const char *iUser,
+	const char *iPassword,
+	const char *iDatabase,
+	uint32 iPort,
+	uint32 *errnum,
+	char *errbuf,
+	bool iCompress,
+	bool iSSL
+)
+{
 	LockMutex lock(&MDatabase);
 	safe_delete(pHost);
 	safe_delete(pUser);
 	safe_delete(pPassword);
 	safe_delete(pDatabase);
-	pHost = strcpy(new char[strlen(iHost) + 1], iHost);
-	pUser = strcpy(new char[strlen(iUser) + 1], iUser);
+	pHost     = strcpy(new char[strlen(iHost) + 1], iHost);
+	pUser     = strcpy(new char[strlen(iUser) + 1], iUser);
 	pPassword = strcpy(new char[strlen(iPassword) + 1], iPassword);
 	pDatabase = strcpy(new char[strlen(iDatabase) + 1], iDatabase);
 	pCompress = iCompress;
-	pPort = iPort;
-	pSSL = iSSL;
+	pPort     = iPort;
+	pSSL      = iSSL;
 	return Open(errnum, errbuf);
 }
 
-bool DBcore::Open(uint32* errnum, char* errbuf) {
-	if (errbuf)
+bool DBcore::Open(uint32 *errnum, char *errbuf)
+{
+	if (errbuf) {
 		errbuf[0] = 0;
+	}
 	LockMutex lock(&MDatabase);
-	if (GetStatus() == Connected)
+	if (GetStatus() == Connected) {
 		return true;
+	}
 	if (GetStatus() == Error) {
 		mysql_close(&mysql);
-		mysql_init(&mysql);		// Initialize structure again
+		mysql_init(&mysql);        // Initialize structure again
 	}
-	if (!pHost)
+	if (!pHost) {
 		return false;
+	}
 	/*
 	Added CLIENT_FOUND_ROWS flag to the connect
 	otherwise DB update calls would say 0 rows affected when the value already equalled
 	what the function was tring to set it to, therefore the function would think it failed
 	*/
 	uint32 flags = CLIENT_FOUND_ROWS;
-	if (pCompress)
+	if (pCompress) {
 		flags |= CLIENT_COMPRESS;
-	if (pSSL)
+	}
+	if (pSSL) {
 		flags |= CLIENT_SSL;
+	}
 	if (mysql_real_connect(&mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
 		pStatus = Connected;
 		return true;
 	}
 	else {
-		if (errnum)
+		if (errnum) {
 			*errnum = mysql_errno(&mysql);
-		if (errbuf)
+		}
+		if (errbuf) {
 			snprintf(errbuf, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));
+		}
 		pStatus = Error;
 		return false;
 	}
diff --git a/common/emu_constants.h b/common/emu_constants.h
index 384aa3768..c6491b3b3 100644
--- a/common/emu_constants.h
+++ b/common/emu_constants.h
@@ -77,6 +77,10 @@ namespace EQEmu
 
 	} // namespace invtype
 
+	namespace DevTools {
+		const int32 GM_ACCOUNT_STATUS_LEVEL = 150;
+	}
+
 	namespace popupresponse {
 		const int32 SERVER_INTERNAL_USE_BASE = 2000000000;
 		const int32 MOB_INFO_DISMISS         = 2000000001;
diff --git a/common/eq_constants.h b/common/eq_constants.h
index faa0ab247..4cc61c0b4 100644
--- a/common/eq_constants.h
+++ b/common/eq_constants.h
@@ -71,7 +71,7 @@
 //#define AT_Trader 300		// Bazaar Trader Mode (not present in SoF or RoF2)
 
 // animations for AT_Anim
-#define ANIM_FREEZE	102
+#define ANIM_FREEZE	    102
 #define	ANIM_STAND		0x64
 #define	ANIM_SIT		0x6e
 #define	ANIM_CROUCH		0x6f
@@ -87,199 +87,114 @@ typedef enum {
 	_eaMaxAppearance
 } EmuAppearance;
 
-// msg_type's for custom usercolors
-#define MT_Say					256
-#define MT_Tell					257
-#define MT_Group				258
-#define MT_Guild				259
-#define MT_OOC					260
-#define MT_Auction				261
-#define MT_Shout				262
-#define MT_Emote				263
-#define MT_Spells				264
-#define MT_YouHitOther			265
-#define MT_OtherHitsYou			266
-#define MT_YouMissOther			267
-#define MT_OtherMissesYou		268
-#define MT_Broadcasts			269
-#define MT_Skills				270
-#define MT_Disciplines			271
-#define	MT_Unused1				272
-#define MT_DefaultText			273
-#define MT_Unused2				274
-#define MT_MerchantOffer		275
-#define MT_MerchantBuySell		276
-#define	MT_YourDeath			277
-#define MT_OtherDeath			278
-#define MT_OtherHits			279
-#define MT_OtherMisses			280
-#define	MT_Who					281
-#define MT_YellForHelp			282
-#define MT_NonMelee				283
-#define MT_WornOff				284
-#define MT_MoneySplit			285
-#define MT_LootMessages			286
-#define MT_DiceRoll				287
-#define MT_OtherSpells			288
-#define MT_SpellFailure			289
-#define MT_Chat					290
-#define MT_Channel1				291
-#define MT_Channel2				292
-#define MT_Channel3				293
-#define MT_Channel4				294
-#define MT_Channel5				295
-#define MT_Channel6				296
-#define MT_Channel7				297
-#define MT_Channel8				298
-#define MT_Channel9				299
-#define MT_Channel10			300
-#define MT_CritMelee			301
-#define MT_SpellCrits			302
-#define MT_TooFarAway			303
-#define MT_NPCRampage			304
-#define MT_NPCFlurry			305
-#define MT_NPCEnrage			306
-#define MT_SayEcho				307
-#define MT_TellEcho				308
-#define MT_GroupEcho			309
-#define MT_GuildEcho			310
-#define MT_OOCEcho				311
-#define MT_AuctionEcho			312
-#define MT_ShoutECho			313
-#define MT_EmoteEcho			314
-#define MT_Chat1Echo			315
-#define MT_Chat2Echo			316
-#define MT_Chat3Echo			317
-#define MT_Chat4Echo			318
-#define MT_Chat5Echo			319
-#define MT_Chat6Echo			320
-#define MT_Chat7Echo			321
-#define MT_Chat8Echo			322
-#define MT_Chat9Echo			323
-#define MT_Chat10Echo			324
-#define MT_DoTDamage			325
-#define MT_ItemLink				326
-#define MT_RaidSay				327
-#define MT_MyPet				328
-#define MT_DS					329
-#define MT_Leadership			330
-#define MT_PetFlurry			331
-#define MT_PetCrit				332
-#define MT_FocusEffect			333
-#define MT_Experience			334
-#define MT_System				335
-#define MT_PetSpell				336
-#define MT_PetResponse			337
-#define MT_ItemSpeech			338
-#define MT_StrikeThrough		339
-#define MT_Stun					340
+namespace Chat {
+	const uint16 White       = 0;
+	const uint16 DimGray     = 1;
+	const uint16 Default     = 1;
+	const uint16 Green       = 2;
+	const uint16 BrightBlue  = 3;
+	const uint16 LightBlue   = 4;
+	const uint16 Magenta     = 5;
+	const uint16 Gray        = 6;
+	const uint16 LightGray   = 7;
+	const uint16 NPCQuestSay = 10;
+	const uint16 DarkGray    = 12;
+	const uint16 Red         = 13;
+	const uint16 Lime        = 14;
+	const uint16 Yellow      = 15;
+	const uint16 Blue        = 16;
+	const uint16 LightNavy   = 17;
+	const uint16 Cyan        = 18;
+	const uint16 Black       = 20;
 
-// TODO: Really should combine above and below into one
-
-//from showeq
-enum ChatColor
-{
-	/*
-	CC_Default					= 0,
-	CC_DarkGrey					= 1,
-	CC_DarkGreen				= 2,
-	CC_DarkBlue					= 3,
-	CC_Purple					= 5,
-	CC_LightGrey				= 6,
-	*/
-
-	CC_WhiteSmoke				= 0,	// FF|F0F0F0
-	CC_Green					= 2,	// FF|008000
-	CC_BrightBlue				= 3,	// FF|0040FF
-	CC_Magenta					= 5,	// FF|F000F0
-	CC_Gray						= 6,	// FF|808080
-	CC_LightGray				= 7,	// FF|E0E0E0
-	//CC_WhiteSmoke2				= 10,	// FF|F0F0F0
-	CC_DarkGray					= 12,	// FF|A0A0A0
-	CC_Red						= 13,	// FF|F00000
-	CC_Lime						= 14,	// FF|00F000
-	CC_Yellow					= 15,	// FF|F0F000
-	CC_Blue						= 16,	// FF|0000F0
-	CC_LightNavy				= 17,	// FF|0000AF
-	CC_Cyan						= 18,	// FF|00F0F0
-	CC_Black					= 20,	// FF|000000
-	
-	// any index <= 255 that is not defined above
-	CC_DimGray					= 1,	// FF|606060
-	CC_Default					= 1,
-
-	CC_User_Say					= 256,
-	CC_User_Tell				= 257,
-	CC_User_Group				= 258,
-	CC_User_Guild				= 259,
-	CC_User_OOC					= 260,
-	CC_User_Auction				= 261,
-	CC_User_Shout				= 262,
-	CC_User_Emote				= 263,
-	CC_User_Spells				= 264,
-	CC_User_YouHitOther			= 265,
-	CC_User_OtherHitYou			= 266,
-	CC_User_YouMissOther		= 267,
-	CC_User_OtherMissYou		= 268,
-	CC_User_Duels				= 269,
-	CC_User_Skills				= 270,
-	CC_User_Disciplines			= 271,
-	CC_User_Default				= 273,
-	CC_User_MerchantOffer		= 275,
-	CC_User_MerchantExchange	= 276,
-	CC_User_YourDeath			= 277,
-	CC_User_OtherDeath			= 278,
-	CC_User_OtherHitOther		= 279,
-	CC_User_OtherMissOther		= 280,
-	CC_User_Who					= 281,
-	CC_User_Yell				= 282,
-	CC_User_NonMelee			= 283,
-	CC_User_SpellWornOff		= 284,
-	CC_User_MoneySplit			= 285,
-	CC_User_Loot				= 286,
-	CC_User_Random				= 287,
-	CC_User_OtherSpells			= 288,
-	CC_User_SpellFailure		= 289,
-	CC_User_ChatChannel			= 290,
-	CC_User_Chat1				= 291,
-	CC_User_Chat2				= 292,
-	CC_User_Chat3				= 293,
-	CC_User_Chat4				= 294,
-	CC_User_Chat5				= 295,
-	CC_User_Chat6				= 296,
-	CC_User_Chat7				= 297,
-	CC_User_Chat8				= 298,
-	CC_User_Chat9				= 299,
-	CC_User_Chat10				= 300,
-	CC_User_MeleeCrit			= 301,
-	CC_User_SpellCrit			= 302,
-	CC_User_TooFarAway			= 303,
-	CC_User_NPCRampage			= 304,
-	CC_User_NPCFurry			= 305,
-	CC_User_NPCEnrage			= 306,
-	CC_User_EchoSay				= 307,
-	CC_User_EchoTell			= 308,
-	CC_User_EchoGroup			= 309,
-	CC_User_EchoGuild			= 310,
-	CC_User_EchoOOC				= 311,
-	CC_User_EchoAuction			= 312,
-	CC_User_EchoShout			= 313,
-	CC_User_EchoEmote			= 314,
-	CC_User_EchoChat1			= 315,
-	CC_User_EchoChat2			= 316,
-	CC_User_EchoChat3			= 317,
-	CC_User_EchoChat4			= 318,
-	CC_User_EchoChat5			= 319,
-	CC_User_EchoChat6			= 320,
-	CC_User_EchoChat7			= 321,
-	CC_User_EchoChat8			= 322,
-	CC_User_EchoChat9			= 323,
-	CC_User_EchoChat10			= 324,
-	CC_User_UnusedAtThisTime	= 325,
-	CC_User_ItemTags			= 326,
-	CC_User_RaidSay				= 327,
-	CC_User_MyPet				= 328,
-	CC_User_DamageShield		= 329,
+	/**
+	 * User colors
+	 */
+	const uint16 Say              = 256;
+	const uint16 Tell             = 257;
+	const uint16 Group            = 258;
+	const uint16 Guild            = 259;
+	const uint16 OOC              = 260;
+	const uint16 Auction          = 261;
+	const uint16 Shout            = 262;
+	const uint16 Emote            = 263;
+	const uint16 Spells           = 264;
+	const uint16 YouHitOther      = 265;
+	const uint16 OtherHitYou      = 266;
+	const uint16 YouMissOther     = 267;
+	const uint16 OtherMissYou     = 268;
+	const uint16 Broadcasts       = 269;
+	const uint16 Skills           = 270;
+	const uint16 Disciplines      = 271;
+	const uint16 Unused1          = 272;
+	const uint16 DefaultText      = 273;
+	const uint16 Unused2          = 274;
+	const uint16 MerchantOffer    = 275;
+	const uint16 MerchantExchange = 276;
+	const uint16 YourDeath        = 277;
+	const uint16 OtherDeath       = 278;
+	const uint16 OtherHitOther    = 279;
+	const uint16 OtherMissOther   = 280;
+	const uint16 Who              = 281;
+	const uint16 YellForHelp      = 282;
+	const uint16 NonMelee         = 283;
+	const uint16 SpellWornOff     = 284;
+	const uint16 MoneySplit       = 285;
+	const uint16 Loot             = 286;
+	const uint16 DiceRoll         = 287;
+	const uint16 OtherSpells      = 288;
+	const uint16 SpellFailure     = 289;
+	const uint16 ChatChannel      = 290;
+	const uint16 Chat1            = 291;
+	const uint16 Chat2            = 292;
+	const uint16 Chat3            = 293;
+	const uint16 Chat4            = 294;
+	const uint16 Chat5            = 295;
+	const uint16 Chat6            = 296;
+	const uint16 Chat7            = 297;
+	const uint16 Chat8            = 298;
+	const uint16 Chat9            = 299;
+	const uint16 Chat10           = 300;
+	const uint16 MeleeCrit        = 301;
+	const uint16 SpellCrit        = 302;
+	const uint16 TooFarAway       = 303;
+	const uint16 NPCRampage       = 304;
+	const uint16 NPCFlurry        = 305;
+	const uint16 NPCEnrage        = 306;
+	const uint16 EchoSay          = 307;
+	const uint16 EchoTell         = 308;
+	const uint16 EchoGroup        = 309;
+	const uint16 EchoGuild        = 310;
+	const uint16 EchoOOC          = 311;
+	const uint16 EchoAuction      = 312;
+	const uint16 EchoShout        = 313;
+	const uint16 EchoEmote        = 314;
+	const uint16 EchoChat1        = 315;
+	const uint16 EchoChat2        = 316;
+	const uint16 EchoChat3        = 317;
+	const uint16 EchoChat4        = 318;
+	const uint16 EchoChat5        = 319;
+	const uint16 EchoChat6        = 320;
+	const uint16 EchoChat7        = 321;
+	const uint16 EchoChat8        = 322;
+	const uint16 EchoChat9        = 323;
+	const uint16 EchoChat10       = 324;
+	const uint16 DotDamage        = 325;
+	const uint16 ItemLink         = 326;
+	const uint16 RaidSay          = 327;
+	const uint16 MyPet            = 328;
+	const uint16 DamageShield     = 329;
+	const uint16 LeaderShip       = 330;
+	const uint16 PetFlurry        = 331;
+	const uint16 PetCritical      = 332;
+	const uint16 FocusEffect      = 333;
+	const uint16 Experience       = 334;
+	const uint16 System           = 335;
+	const uint16 PetSpell         = 336;
+	const uint16 PetResponse      = 337;
+	const uint16 ItemSpeech       = 338;
+	const uint16 StrikeThrough    = 339;
+	const uint16 Stun             = 340;
 };
 
 //ZoneChange_Struct->success values
@@ -544,4 +459,9 @@ enum ChatChannelNames : uint16
 	ChatChannel_Emotes = 22
 };
 
+namespace ZoneBlockedSpellTypes {
+	const uint8 ZoneWide = 1;
+	const uint8 Region   = 2;
+};
+
 #endif /*COMMON_EQ_CONSTANTS_H*/
diff --git a/common/eq_packet_structs.h b/common/eq_packet_structs.h
index c80fdcc02..53d7021ba 100644
--- a/common/eq_packet_structs.h
+++ b/common/eq_packet_structs.h
@@ -1188,6 +1188,20 @@ struct SpecialMesg_Struct
 /*24*/	char	message[1];				// What is being said?
 };
 
+struct SpecialMesgHeader_Struct
+{
+/*00*/	char	SpeakMode;				// 2 shouts, 4 %1 %2, 3 %2, 5 tells group, 0 copy, default says
+/*01*/	char	JournalMode;			// 1 and 2 go to journal
+/*02*/	char	language;
+/*03*/	uint32	msg_type;				// Color of text (see MT_*** below)
+/*07*/	uint32	target_spawn_id;		// Who is it being said to?
+/*11*/ // speaker's name
+/*xx*/ // unknown, location, client doesn't care
+/*xx*/ // unknown
+/*xx*/ // unknown
+/*xx*/ // message
+};
+
 /*
 ** When somebody changes what they're wearing or give a pet a weapon (model changes)
 ** Length: 19 Bytes
@@ -1344,21 +1358,24 @@ struct BecomeCorpse_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16		spawn_id;
-/*0002*/ int32		delta_heading:10,	// change in heading
-					x_pos:19,			// x coord
-					padding0002:3;		// ***Placeholder
-/*0006*/ int32		y_pos:19,			// y coord
-					animation:10,		// animation
-					padding0006:3;		// ***Placeholder
-/*0010*/ int32		z_pos:19,			// z coord
-					delta_y:13;			// change in y
-/*0014*/ int32		delta_x:13,			// change in x
-					heading:12,			// heading
-					padding0014:7;		// ***Placeholder
-/*0018*/ int32		delta_z:13,			// change in z
-					padding0018:19;		// ***Placeholder
-/*0022*/
+/*0000*/	uint16		spawn_id;
+/*0002*/	uint16		vehicle_id;
+/*0004*/	signed		padding0004 : 12;
+			signed		y_pos : 19;			// y coord
+			unsigned	padding : 1;
+/*0008*/	signed		delta_z : 13;		// change in z
+			signed		delta_x : 13;		// change in x
+			signed		padding0008 : 6;
+/*0012*/	signed		x_pos : 19;			// x coord
+			unsigned	heading : 12;		// heading
+			signed		padding0016 : 1;
+/*0016*/	signed		delta_heading : 10;	// change in heading
+			signed		z_pos : 19;			// z coord
+			signed		padding0020 : 3;
+/*0020*/	signed		animation : 10;		// animation
+			signed		delta_y : 13;		// change in y
+			signed		padding0024 : 9;
+/*0024*/
 };
 
 /*
@@ -1369,21 +1386,23 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16	spawn_id;
-/*0002*/ uint16	sequence;			//increments one each packet
-/*0004*/ float	y_pos;				// y coord
-/*0008*/ float	delta_z;			// Change in z
-/*0012*/ float	delta_x;			// Change in x
-/*0016*/ float	delta_y;			// Change in y
-/*0020*/ int32	animation:10,		// animation
-				delta_heading:10,	// change in heading
-				padding0020:12;		// ***Placeholder (mostly 1)
-/*0024*/ float	x_pos;				// x coord
-/*0028*/ float	z_pos;				// z coord
-/*0032*/ uint16	heading:12,			// Directional heading
-				padding0004:4;		// ***Placeholder
-/*0034*/ uint8	unknown0006[2];		// ***Placeholder
-/*0036*/
+/*0000*/	uint16		sequence;			// increments one each packet - Verified
+/*0002*/	uint16		spawn_id;			// Player's spawn id
+/*0004*/	uint16		vehicle_id;			// Player's vehicle spawn id
+/*0006*/	uint8		unknown0004[4];		// ***Placeholder
+/*0010*/	float		delta_x;			// Change in x
+/*0014*/	unsigned	heading : 12;		// Directional heading
+			unsigned	padding0040 : 20;	// ***Placeholder
+/*0018*/	float		x_pos;				// x coord (2nd loc value)
+/*0022*/	float		delta_z;			// Change in z
+/*0026*/	float		z_pos;				// z coord (3rd loc value)
+/*0030*/	float		y_pos;				// y coord (1st loc value)
+/*0034*/	unsigned	animation : 10;		// ***Placeholder
+			unsigned	padding0024 : 22;	// animation
+/*0038*/	float		delta_y;			// Change in y
+/*0042*/	signed		delta_heading : 10;	// change in heading
+			unsigned	padding0041 : 22;	// ***Placeholder
+/*0046*/
 };
 
 struct SpawnPositionUpdate_Struct
diff --git a/common/eq_stream.cpp b/common/eq_stream.cpp
index 96b816b1f..61162580a 100644
--- a/common/eq_stream.cpp
+++ b/common/eq_stream.cpp
@@ -84,14 +84,14 @@ void EQStream::init(bool resetSession) {
 
 	OpMgr = nullptr;
 	if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-		Log(Logs::Detail, Logs::Netcode, _L "init Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
+		LogNetcode(_L "init Invalid Sequenced queue: BS [{}] + SQ [{}] != NOS [{}]" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 	}
 }
 
 EQRawApplicationPacket *EQStream::MakeApplicationPacket(EQProtocolPacket *p)
 {
 	EQRawApplicationPacket *ap=nullptr;
-	Log(Logs::Detail, Logs::Netcode, _L "Creating new application packet, length %d" __L, p->size);
+	LogNetcode(_L "Creating new application packet, length [{}]" __L, p->size);
 	// _raw(NET__APP_CREATE_HEX, 0xFFFF, p);
 	ap = p->MakeAppPacket();
 	return ap;
@@ -100,7 +100,7 @@ EQRawApplicationPacket *EQStream::MakeApplicationPacket(EQProtocolPacket *p)
 EQRawApplicationPacket *EQStream::MakeApplicationPacket(const unsigned char *buf, uint32 len)
 {
 	EQRawApplicationPacket *ap=nullptr;
-	Log(Logs::Detail, Logs::Netcode, _L "Creating new application packet, length %d" __L, len);
+	LogNetcode(_L "Creating new application packet, length [{}]" __L, len);
 	ap = new EQRawApplicationPacket(buf, len);
 	return ap;
 }
@@ -130,7 +130,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 	}
 
 	if (!Session && p->opcode!=OP_SessionRequest && p->opcode!=OP_SessionResponse) {
-		Log(Logs::Detail, Logs::Netcode, _L "Session not initialized, packet ignored" __L);
+		LogNetcode(_L "Session not initialized, packet ignored" __L);
 		// _raw(NET__DEBUG, 0xFFFF, p);
 		return;
 	}
@@ -141,7 +141,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			while(processed < p->size) {
 				subpacket_length=*(p->pBuffer+processed);
 				EQProtocolPacket *subp=MakeProtocolPacket(p->pBuffer+processed+1,subpacket_length);
-				Log(Logs::Detail, Logs::Netcode, _L "Extracting combined packet of length %d" __L, subpacket_length);
+				LogNetcode(_L "Extracting combined packet of length [{}]" __L, subpacket_length);
 				// _raw(NET__NET_CREATE_HEX, 0xFFFF, subp);
 				subp->copyInfo(p);
 				ProcessPacket(subp);
@@ -156,12 +156,12 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			while(processed<p->size) {
 				EQRawApplicationPacket *ap=nullptr;
 				if ((subpacket_length=(unsigned char)*(p->pBuffer+processed))!=0xff) {
-					Log(Logs::Detail, Logs::Netcode, _L "Extracting combined app packet of length %d, short len" __L, subpacket_length);
+					LogNetcode(_L "Extracting combined app packet of length [{}], short len" __L, subpacket_length);
 					ap=MakeApplicationPacket(p->pBuffer+processed+1,subpacket_length);
 					processed+=subpacket_length+1;
 				} else {
 					subpacket_length=ntohs(*(uint16 *)(p->pBuffer+processed+1));
-					Log(Logs::Detail, Logs::Netcode, _L "Extracting combined app packet of length %d, short len" __L, subpacket_length);
+					LogNetcode(_L "Extracting combined app packet of length [{}], short len" __L, subpacket_length);
 					ap=MakeApplicationPacket(p->pBuffer+processed+3,subpacket_length);
 					processed+=subpacket_length+3;
 				}
@@ -176,29 +176,29 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 		case OP_Packet: {
 			if(!p->pBuffer || (p->Size() < 4))
 			{
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_Packet that was of malformed size" __L);
+				LogNetcode(_L "Received OP_Packet that was of malformed size" __L);
 				break;
 			}
 			uint16 seq=ntohs(*(uint16 *)(p->pBuffer));
 			SeqOrder check=CompareSequence(NextInSeq,seq);
 			if (check == SeqFuture) {
-					Log(Logs::Detail, Logs::Netcode, _L "Future OP_Packet: Expecting Seq=%d, but got Seq=%d" __L, NextInSeq, seq);
+					LogNetcode(_L "Future OP_Packet: Expecting Seq=[{}], but got Seq=[{}]" __L, NextInSeq, seq);
 					// _raw(NET__DEBUG, seq, p);
 
 					PacketQueue[seq]=p->Copy();
-					Log(Logs::Detail, Logs::Netcode, _L "OP_Packet Queue size=%d" __L, PacketQueue.size());
+					LogNetcode(_L "OP_Packet Queue size=[{}]" __L, PacketQueue.size());
 
 				//SendOutOfOrderAck(seq);
 
 			} else if (check == SeqPast) {
-				Log(Logs::Detail, Logs::Netcode, _L "Duplicate OP_Packet: Expecting Seq=%d, but got Seq=%d" __L, NextInSeq, seq);
+				LogNetcode(_L "Duplicate OP_Packet: Expecting Seq=[{}], but got Seq=[{}]" __L, NextInSeq, seq);
 				// _raw(NET__DEBUG, seq, p);
 				SendOutOfOrderAck(seq); //we already got this packet but it was out of order
 			} else {
 				// In case we did queue one before as well.
 				EQProtocolPacket *qp=RemoveQueue(seq);
 				if (qp) {
-					Log(Logs::General, Logs::Netcode, "[NET_TRACE] OP_Packet: Removing older queued packet with sequence %d", seq);
+					LogNetcode("[NET_TRACE] OP_Packet: Removing older queued packet with sequence [{}]", seq);
 					delete qp;
 				}
 
@@ -207,7 +207,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				// Check for an embedded OP_AppCombinded (protocol level 0x19)
 				if (*(p->pBuffer+2)==0x00 && *(p->pBuffer+3)==0x19) {
 					EQProtocolPacket *subp=MakeProtocolPacket(p->pBuffer+2,p->size-2);
-					Log(Logs::Detail, Logs::Netcode, _L "seq %d, Extracting combined packet of length %d" __L, seq, subp->size);
+					LogNetcode(_L "seq [{}], Extracting combined packet of length [{}]" __L, seq, subp->size);
 					// _raw(NET__NET_CREATE_HEX, seq, subp);
 					subp->copyInfo(p);
 					ProcessPacket(subp);
@@ -226,29 +226,29 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 		case OP_Fragment: {
 			if(!p->pBuffer || (p->Size() < 4))
 			{
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_Fragment that was of malformed size" __L);
+				LogNetcode(_L "Received OP_Fragment that was of malformed size" __L);
 				break;
 			}
 			uint16 seq=ntohs(*(uint16 *)(p->pBuffer));
 			SeqOrder check=CompareSequence(NextInSeq,seq);
 			if (check == SeqFuture) {
-				Log(Logs::Detail, Logs::Netcode, _L "Future OP_Fragment: Expecting Seq=%d, but got Seq=%d" __L, NextInSeq, seq);
+				LogNetcode(_L "Future OP_Fragment: Expecting Seq=[{}], but got Seq=[{}]" __L, NextInSeq, seq);
 				// _raw(NET__DEBUG, seq, p);
 
 				PacketQueue[seq]=p->Copy();
-				Log(Logs::Detail, Logs::Netcode, _L "OP_Fragment Queue size=%d" __L, PacketQueue.size());
+				LogNetcode(_L "OP_Fragment Queue size=[{}]" __L, PacketQueue.size());
 
 				//SendOutOfOrderAck(seq);
 
 			} else if (check == SeqPast) {
-				Log(Logs::Detail, Logs::Netcode, _L "Duplicate OP_Fragment: Expecting Seq=%d, but got Seq=%d" __L, NextInSeq, seq);
+				LogNetcode(_L "Duplicate OP_Fragment: Expecting Seq=[{}], but got Seq=[{}]" __L, NextInSeq, seq);
 				// _raw(NET__DEBUG, seq, p);
 				SendOutOfOrderAck(seq);
 			} else {
 				// In case we did queue one before as well.
 				EQProtocolPacket *qp=RemoveQueue(seq);
 				if (qp) {
-					Log(Logs::General, Logs::Netcode, "[NET_TRACE] OP_Fragment: Removing older queued packet with sequence %d", seq);
+					LogNetcode("[NET_TRACE] OP_Fragment: Removing older queued packet with sequence [{}]", seq);
 					delete qp;
 				}
 				SetNextAckToSend(seq);
@@ -256,18 +256,18 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				if (oversize_buffer) {
 					memcpy(oversize_buffer+oversize_offset,p->pBuffer+2,p->size-2);
 					oversize_offset+=p->size-2;
-					Log(Logs::Detail, Logs::Netcode, _L "Fragment of oversized of length %d, seq %d: now at %d/%d" __L, p->size-2, seq, oversize_offset, oversize_length);
+					LogNetcode(_L "Fragment of oversized of length [{}], seq [{}]: now at [{}]/[{}]" __L, p->size-2, seq, oversize_offset, oversize_length);
 					if (oversize_offset==oversize_length) {
 						if (*(p->pBuffer+2)==0x00 && *(p->pBuffer+3)==0x19) {
 							EQProtocolPacket *subp=MakeProtocolPacket(oversize_buffer,oversize_offset);
-							Log(Logs::Detail, Logs::Netcode, _L "seq %d, Extracting combined oversize packet of length %d" __L, seq, subp->size);
+							LogNetcode(_L "seq [{}], Extracting combined oversize packet of length [{}]" __L, seq, subp->size);
 							//// _raw(NET__NET_CREATE_HEX, subp);
 							subp->copyInfo(p);
 							ProcessPacket(subp);
 							delete subp;
 						} else {
 							EQRawApplicationPacket *ap=MakeApplicationPacket(oversize_buffer,oversize_offset);
-							Log(Logs::Detail, Logs::Netcode, _L "seq %d, completed combined oversize packet of length %d" __L, seq, ap->size);
+							LogNetcode(_L "seq [{}], completed combined oversize packet of length [{}]" __L, seq, ap->size);
 							if (ap) {
 								ap->copyInfo(p);
 								InboundQueuePush(ap);
@@ -282,20 +282,20 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 					oversize_buffer=new unsigned char[oversize_length];
 					memcpy(oversize_buffer,p->pBuffer+6,p->size-6);
 					oversize_offset=p->size-6;
-					Log(Logs::Detail, Logs::Netcode, _L "First fragment of oversized of seq %d: now at %d/%d" __L, seq, oversize_offset, oversize_length);
+					LogNetcode(_L "First fragment of oversized of seq [{}]: now at [{}]/[{}]" __L, seq, oversize_offset, oversize_length);
 				}
 			}
 		}
 		break;
 		case OP_KeepAlive: {
 			NonSequencedPush(new EQProtocolPacket(p->opcode,p->pBuffer,p->size));
-			Log(Logs::Detail, Logs::Netcode, _L "Received and queued reply to keep alive" __L);
+			LogNetcode(_L "Received and queued reply to keep alive" __L);
 		}
 		break;
 		case OP_Ack: {
 			if(!p->pBuffer || (p->Size() < 4))
 			{
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_Ack that was of malformed size" __L);
+				LogNetcode(_L "Received OP_Ack that was of malformed size" __L);
 				break;
 			}
 			uint16 seq=ntohs(*(uint16 *)(p->pBuffer));
@@ -309,11 +309,11 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 		case OP_SessionRequest: {
 			if(p->Size() < sizeof(SessionRequest))
 			{
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_SessionRequest that was of malformed size" __L);
+				LogNetcode(_L "Received OP_SessionRequest that was of malformed size" __L);
 				break;
 			}
 			if (GetState()==ESTABLISHED) {
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_SessionRequest in ESTABLISHED state (%d) streamactive (%i) attempt (%i)" __L, GetState(),streamactive,sessionAttempts);
+				LogNetcode(_L "Received OP_SessionRequest in ESTABLISHED state ([{}]) streamactive ([{}]) attempt ([{}])" __L, GetState(),streamactive,sessionAttempts);
 
 				// client seems to try a max of 30 times (initial+3 retries) then gives up, giving it a few more attempts just in case
 				// streamactive means we identified the opcode for the stream, we cannot re-establish this connection
@@ -331,7 +331,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			SessionRequest *Request=(SessionRequest *)p->pBuffer;
 			Session=ntohl(Request->Session);
 			SetMaxLen(ntohl(Request->MaxLength));
-			Log(Logs::Detail, Logs::Netcode, _L "Received OP_SessionRequest: session %lu, maxlen %d" __L, (unsigned long)Session, MaxLen);
+			LogNetcode(_L "Received OP_SessionRequest: session [{}], maxlen [{}]" __L, (unsigned long)Session, MaxLen);
 			SetState(ESTABLISHED);
 			Key=0x11223344;
 			SendSessionResponse();
@@ -340,7 +340,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 		case OP_SessionResponse: {
 			if(p->Size() < sizeof(SessionResponse))
 			{
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_SessionResponse that was of malformed size" __L);
+				LogNetcode(_L "Received OP_SessionResponse that was of malformed size" __L);
 				break;
 			}
 
@@ -356,7 +356,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			compressed=(Response->Format&FLAG_COMPRESSED);
 			encoded=(Response->Format&FLAG_ENCODED);
 
-			Log(Logs::Detail, Logs::Netcode, _L "Received OP_SessionResponse: session %lu, maxlen %d, key %lu, compressed? %s, encoded? %s" __L, (unsigned long)Session, MaxLen, (unsigned long)Key, compressed?"yes":"no", encoded?"yes":"no");
+			LogNetcode(_L "Received OP_SessionResponse: session [{}], maxlen [{}], key [{}], compressed? [{}], encoded? [{}]" __L, (unsigned long)Session, MaxLen, (unsigned long)Key, compressed?"yes":"no", encoded?"yes":"no");
 
 			// Kinda kludgy, but trie for now
 			if (StreamType==UnknownStream) {
@@ -379,17 +379,17 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			EQStreamState state = GetState();
 			if(state == ESTABLISHED) {
 				//client initiated disconnect?
-				Log(Logs::Detail, Logs::Netcode, _L "Received unsolicited OP_SessionDisconnect. Treating like a client-initiated disconnect." __L);
+				LogNetcode(_L "Received unsolicited OP_SessionDisconnect. Treating like a client-initiated disconnect" __L);
 				_SendDisconnect();
 				SetState(CLOSED);
 			} else if(state == CLOSING) {
 				//we were waiting for this anyways, ignore pending messages, send the reply and be closed.
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_SessionDisconnect when we have a pending close, they beat us to it. Were happy though." __L);
+				LogNetcode(_L "Received OP_SessionDisconnect when we have a pending close, they beat us to it. Were happy though" __L);
 				_SendDisconnect();
 				SetState(CLOSED);
 			} else {
 				//we are expecting this (or have already gotten it, but dont care either way)
-				Log(Logs::Detail, Logs::Netcode, _L "Received expected OP_SessionDisconnect. Moving to closed state." __L);
+				LogNetcode(_L "Received expected OP_SessionDisconnect. Moving to closed state" __L);
 				SetState(CLOSED);
 			}
 		}
@@ -397,14 +397,14 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 		case OP_OutOfOrderAck: {
 			if(!p->pBuffer || (p->Size() < 4))
 			{
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfOrderAck that was of malformed size" __L);
+				LogNetcode(_L "Received OP_OutOfOrderAck that was of malformed size" __L);
 				break;
 			}
 			uint16 seq=ntohs(*(uint16 *)(p->pBuffer));
 			MOutboundQueue.lock();
 
 			if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-				Log(Logs::Detail, Logs::Netcode, _L "Pre-OOA Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
+				LogNetcode(_L "Pre-OOA Invalid Sequenced queue: BS [{}] + SQ [{}] != NOS [{}]" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 			}
 			
 			//if the packet they got out of order is between our last acked packet and the last sent packet, then its valid.
@@ -414,7 +414,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 
 				uint16 sqsize = SequencedQueue.size();
 				uint16 index = seq - SequencedBase;
-				Log(Logs::Detail, Logs::Netcode, _L "OP_OutOfOrderAck marking packet acked in queue (queue index = %d, queue size = %d)." __L, index, sqsize);
+				LogNetcode(_L "OP_OutOfOrderAck marking packet acked in queue (queue index = [{}], queue size = [{}])" __L, index, sqsize);
 				if (index < sqsize) {
 					SequencedQueue[index]->acked = true;
 					// flag packets for a resend
@@ -423,7 +423,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 					for (auto sitr = SequencedQueue.begin(); sitr != SequencedQueue.end() && count < index; ++sitr, ++count) {
 						if (!(*sitr)->acked && (*sitr)->sent_time > 0 && (((*sitr)->sent_time + timeout) < Timer::GetCurrentTime())) {
 							(*sitr)->sent_time = 0;
-							Log(Logs::Detail, Logs::Netcode, _L "OP_OutOfOrderAck Flagging packet %d for retransmission" __L, SequencedBase + count);
+							LogNetcode(_L "OP_OutOfOrderAck Flagging packet [{}] for retransmission" __L, SequencedBase + count);
 						}
 					}
 				}
@@ -432,11 +432,11 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 					retransmittimer = Timer::GetCurrentTime();
 				}
 			} else {
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfOrderAck for out-of-window %d. Window (%d->%d)." __L, seq, SequencedBase, NextOutSeq);
+				LogNetcode(_L "Received OP_OutOfOrderAck for out-of-window [{}]. Window ([{}]->[{}])" __L, seq, SequencedBase, NextOutSeq);
 			}
 
 			if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-				Log(Logs::Detail, Logs::Netcode, _L "Post-OOA Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
+				LogNetcode(_L "Post-OOA Invalid Sequenced queue: BS [{}] + SQ [{}] != NOS [{}]" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 			}
 
 			MOutboundQueue.unlock();
@@ -445,7 +445,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 		case OP_SessionStatRequest: {
 			if(p->Size() < sizeof(ClientSessionStats))
 			{
-				Log(Logs::Detail, Logs::Netcode, _L "Received OP_SessionStatRequest that was of malformed size" __L);
+				LogNetcode(_L "Received OP_SessionStatRequest that was of malformed size" __L);
 				break;
 			}
 			ClientSessionStats *ClientStats=(ClientSessionStats *)p->pBuffer;
@@ -468,7 +468,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 					retransmittimeout += 300;
 					if(retransmittimeout > RETRANSMIT_TIMEOUT_MAX)
 						retransmittimeout = RETRANSMIT_TIMEOUT_MAX;
-					Log(Logs::Detail, Logs::Netcode, _L "Retransmit timeout recalculated to %dms" __L, retransmittimeout);
+					LogNetcode(_L "Retransmit timeout recalculated to [{}]ms" __L, retransmittimeout);
 				}
 			}
 
@@ -485,11 +485,11 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 		}
 		break;
 		case OP_SessionStatResponse: {
-			Log(Logs::Detail, Logs::Netcode, _L "Received OP_SessionStatResponse. Ignoring." __L);
+			LogNetcode(_L "Received OP_SessionStatResponse. Ignoring" __L);
 		}
 		break;
 		case OP_OutOfSession: {
-			Log(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfSession. Ignoring." __L);
+			LogNetcode(_L "Received OP_OutOfSession. Ignoring" __L);
 		}
 		break;
 		default:
@@ -520,7 +520,7 @@ void EQStream::FastQueuePacket(EQApplicationPacket **p, bool ack_req)
 		return;
 
 	if(OpMgr == nullptr || *OpMgr == nullptr) {
-		Log(Logs::Detail, Logs::Netcode, _L "Packet enqueued into a stream with no opcode manager, dropping." __L);
+		LogNetcode(_L "Packet enqueued into a stream with no opcode manager, dropping" __L);
 		delete pack;
 		return;
 	}
@@ -559,18 +559,18 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
 
 	// Convert the EQApplicationPacket to 1 or more EQProtocolPackets
 	if (p->size>(MaxLen-8)) { // proto-op(2), seq(2), app-op(2) ... data ... crc(2)
-		Log(Logs::Detail, Logs::Netcode, _L "Making oversized packet, len %d" __L, p->Size());
+		LogNetcode(_L "Making oversized packet, len [{}]" __L, p->Size());
 
 		auto tmpbuff = new unsigned char[p->size + 3];
 		length=p->serialize(opcode, tmpbuff);
 		if (length != p->Size())
-			Log(Logs::Detail, Logs::Netcode, _L "Packet adjustment, len %d to %d" __L, p->Size(), length);
+			LogNetcode(_L "Packet adjustment, len [{}] to [{}]" __L, p->Size(), length);
 
 		auto out = new EQProtocolPacket(OP_Fragment, nullptr, MaxLen - 4);
 		*(uint32 *)(out->pBuffer+2)=htonl(length);
 		used=MaxLen-10;
 		memcpy(out->pBuffer+6,tmpbuff,used);
-		Log(Logs::Detail, Logs::Netcode, _L "First fragment: used %d/%d. Payload size %d in the packet" __L, used, length, p->size);
+		LogNetcode(_L "First fragment: used [{}]/[{}]. Payload size [{}] in the packet" __L, used, length, p->size);
 		SequencedPush(out);
 
 
@@ -581,7 +581,7 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
 			out->size=chunksize+2;
 			SequencedPush(out);
 			used+=chunksize;
-			Log(Logs::Detail, Logs::Netcode, _L "Subsequent fragment: len %d, used %d/%d." __L, chunksize, used, length);
+			LogNetcode(_L "Subsequent fragment: len [{}], used [{}]/[{}]" __L, chunksize, used, length);
 		}
 		delete p;
 		delete[] tmpbuff;
@@ -623,7 +623,7 @@ void EQStream::SequencedPush(EQProtocolPacket *p)
 void EQStream::NonSequencedPush(EQProtocolPacket *p)
 {
 	MOutboundQueue.lock();
-	Log(Logs::Detail, Logs::Netcode, _L "Pushing non-sequenced packet of length %d" __L, p->size);
+	LogNetcode(_L "Pushing non-sequenced packet of length [{}]" __L, p->size);
 	NonSequencedQueue.push(p);
 	MOutboundQueue.unlock();
 }
@@ -631,14 +631,14 @@ void EQStream::NonSequencedPush(EQProtocolPacket *p)
 void EQStream::SendAck(uint16 seq)
 {
 uint16 Seq=htons(seq);
-	Log(Logs::Detail, Logs::Netcode, _L "Sending ack with sequence %d" __L, seq);
+	LogNetcode(_L "Sending ack with sequence [{}]" __L, seq);
 	SetLastAckSent(seq);
 	NonSequencedPush(new EQProtocolPacket(OP_Ack,(unsigned char *)&Seq,sizeof(uint16)));
 }
 
 void EQStream::SendOutOfOrderAck(uint16 seq)
 {
-	Log(Logs::Detail, Logs::Netcode, _L "Sending out of order ack with sequence %d" __L, seq);
+	LogNetcode(_L "Sending out of order ack with sequence [{}]" __L, seq);
 uint16 Seq=htons(seq);
 	NonSequencedPush(new EQProtocolPacket(OP_OutOfOrderAck,(unsigned char *)&Seq,sizeof(uint16)));
 }
@@ -688,24 +688,24 @@ void EQStream::Write(int eq_fd)
 				// If we don't have a packet to try to combine into, use this one as the base
 				// And remove it form the queue
 				p = NonSequencedQueue.front();
-				Log(Logs::Detail, Logs::Netcode, _L "Starting combined packet with non-seq packet of len %d" __L, p->size);
+				LogNetcode(_L "Starting combined packet with non-seq packet of len [{}]" __L, p->size);
 				NonSequencedQueue.pop();
 			} else if (!p->combine(NonSequencedQueue.front())) {
 				// Trying to combine this packet with the base didn't work (too big maybe)
 				// So just send the base packet (we'll try this packet again later)
-				Log(Logs::Detail, Logs::Netcode, _L "Combined packet full at len %d, next non-seq packet is len %d" __L, p->size, (NonSequencedQueue.front())->size);
+				LogNetcode(_L "Combined packet full at len [{}], next non-seq packet is len [{}]" __L, p->size, (NonSequencedQueue.front())->size);
 				ReadyToSend.push(p);
 				BytesWritten+=p->size;
 				p=nullptr;
 
 				if (BytesWritten > threshold) {
 					// Sent enough this round, lets stop to be fair
-					Log(Logs::Detail, Logs::Netcode, _L "Exceeded write threshold in nonseq (%d > %d)" __L, BytesWritten, threshold);
+					LogNetcode(_L "Exceeded write threshold in nonseq ([{}] > [{}])" __L, BytesWritten, threshold);
 					break;
 				}
 			} else {
 				// Combine worked, so just remove this packet and it's spot in the queue
-				Log(Logs::Detail, Logs::Netcode, _L "Combined non-seq packet of len %d, yeilding %d combined." __L, (NonSequencedQueue.front())->size, p->size);
+				LogNetcode(_L "Combined non-seq packet of len [{}], yeilding [{}] combined" __L, (NonSequencedQueue.front())->size, p->size);
 				delete NonSequencedQueue.front();
 				NonSequencedQueue.pop();
 			}
@@ -718,7 +718,7 @@ void EQStream::Write(int eq_fd)
 			uint16 seq_send = SequencedBase + count;	//just for logging...
 
 			if(SequencedQueue.empty()) {
-				Log(Logs::Detail, Logs::Netcode, _L "Tried to write a packet with an empty queue (%d is past next out %d)" __L, seq_send, NextOutSeq);
+				LogNetcode(_L "Tried to write a packet with an empty queue ([{}] is past next out [{}])" __L, seq_send, NextOutSeq);
 				SeqEmpty=true;
 				continue;
 			}
@@ -728,35 +728,35 @@ void EQStream::Write(int eq_fd)
 					++sitr;
 					++count;
 					if (p) {
-						Log(Logs::Detail, Logs::Netcode, _L "Final combined packet not full, len %d" __L, p->size);
+						LogNetcode(_L "Final combined packet not full, len [{}]" __L, p->size);
 						ReadyToSend.push(p);
 						BytesWritten += p->size;
 						p = nullptr;
 					}
-					Log(Logs::Detail, Logs::Netcode, _L "Not retransmitting seq packet %d because already marked as acked" __L, seq_send);
+					LogNetcode(_L "Not retransmitting seq packet [{}] because already marked as acked" __L, seq_send);
 				} else if (!p) {
 					// If we don't have a packet to try to combine into, use this one as the base
 					// Copy it first as it will still live until it is acked
 					p=(*sitr)->Copy();
-					Log(Logs::Detail, Logs::Netcode, _L "Starting combined packet with seq packet %d of len %d" __L, seq_send, p->size);
+					LogNetcode(_L "Starting combined packet with seq packet [{}] of len [{}]" __L, seq_send, p->size);
 					(*sitr)->sent_time = Timer::GetCurrentTime();
 					++sitr;
 					++count;
 				} else if (!p->combine(*sitr)) {
 					// Trying to combine this packet with the base didn't work (too big maybe)
 					// So just send the base packet (we'll try this packet again later)
-					Log(Logs::Detail, Logs::Netcode, _L "Combined packet full at len %d, next seq packet %d is len %d" __L, p->size, seq_send + 1, (*sitr)->size);
+					LogNetcode(_L "Combined packet full at len [{}], next seq packet [{}] is len [{}]" __L, p->size, seq_send + 1, (*sitr)->size);
 					ReadyToSend.push(p);
 					BytesWritten+=p->size;
 					p=nullptr;
 					if ((*sitr)->opcode != OP_Fragment && BytesWritten > threshold) {
 						// Sent enough this round, lets stop to be fair
-						Log(Logs::Detail, Logs::Netcode, _L "Exceeded write threshold in seq (%d > %d)" __L, BytesWritten, threshold);
+						LogNetcode(_L "Exceeded write threshold in seq ([{}] > [{}])" __L, BytesWritten, threshold);
 						break;
 					}
 				} else {
 					// Combine worked
-					Log(Logs::Detail, Logs::Netcode, _L "Combined seq packet %d of len %d, yeilding %d combined." __L, seq_send, (*sitr)->size, p->size);
+					LogNetcode(_L "Combined seq packet [{}] of len [{}], yeilding [{}] combined" __L, seq_send, (*sitr)->size, p->size);
 					(*sitr)->sent_time = Timer::GetCurrentTime();
 					++sitr;
 					++count;
@@ -766,7 +766,7 @@ void EQStream::Write(int eq_fd)
 					++sitr;
 					++count;
 					if (p) {
-						Log(Logs::Detail, Logs::Netcode, _L "Final combined packet not full, len %d" __L, p->size);
+						LogNetcode(_L "Final combined packet not full, len [{}]" __L, p->size);
 						ReadyToSend.push(p);
 						BytesWritten += p->size;
 						p = nullptr;
@@ -776,25 +776,25 @@ void EQStream::Write(int eq_fd)
 					// Copy it first as it will still live until it is acked
 					p=(*sitr)->Copy();
 					(*sitr)->sent_time = Timer::GetCurrentTime();
-					Log(Logs::Detail, Logs::Netcode, _L "Starting combined packet with seq packet %d of len %d" __L, seq_send, p->size);
+					LogNetcode(_L "Starting combined packet with seq packet [{}] of len [{}]" __L, seq_send, p->size);
 					++sitr;
 					++count;
 				} else if (!p->combine(*sitr)) {
 					// Trying to combine this packet with the base didn't work (too big maybe)
 					// So just send the base packet (we'll try this packet again later)
-					Log(Logs::Detail, Logs::Netcode, _L "Combined packet full at len %d, next seq packet %d is len %d" __L, p->size, seq_send, (*sitr)->size);
+					LogNetcode(_L "Combined packet full at len [{}], next seq packet [{}] is len [{}]" __L, p->size, seq_send, (*sitr)->size);
 					ReadyToSend.push(p);
 					BytesWritten+=p->size;
 					p=nullptr;
 
 					if (BytesWritten > threshold) {
 						// Sent enough this round, lets stop to be fair
-						Log(Logs::Detail, Logs::Netcode, _L "Exceeded write threshold in seq (%d > %d)" __L, BytesWritten, threshold);
+						LogNetcode(_L "Exceeded write threshold in seq ([{}] > [{}])" __L, BytesWritten, threshold);
 						break;
 					}
 				} else {
 					// Combine worked
-					Log(Logs::Detail, Logs::Netcode, _L "Combined seq packet %d of len %d, yielding %d combined." __L, seq_send, (*sitr)->size, p->size);
+					LogNetcode(_L "Combined seq packet [{}] of len [{}], yielding [{}] combined" __L, seq_send, (*sitr)->size, p->size);
 					(*sitr)->sent_time = Timer::GetCurrentTime();
 					++sitr;
 					++count;
@@ -802,7 +802,7 @@ void EQStream::Write(int eq_fd)
 			}
 
 			if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-				Log(Logs::Detail, Logs::Netcode, _L "Post send Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
+				LogNetcode(_L "Post send Invalid Sequenced queue: BS [{}] + SQ [{}] != NOS [{}]" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 			}
 		} else {
 			// No more sequenced packets
@@ -814,7 +814,7 @@ void EQStream::Write(int eq_fd)
 
 	// We have a packet still, must have run out of both seq and non-seq, so send it
 	if (p) {
-		Log(Logs::Detail, Logs::Netcode, _L "Final combined packet not full, len %d" __L, p->size);
+		LogNetcode(_L "Final combined packet not full, len [{}]" __L, p->size);
 		ReadyToSend.push(p);
 		BytesWritten+=p->size;
 	}
@@ -831,7 +831,7 @@ void EQStream::Write(int eq_fd)
 	if(SeqEmpty && NonSeqEmpty) {
 		//no more data to send
 		if(CheckState(CLOSING)) {
-			Log(Logs::Detail, Logs::Netcode, _L "All outgoing data flushed, closing stream." __L );
+			LogNetcode(_L "All outgoing data flushed, closing stream" __L );
 			//we are waiting for the queues to empty, now we can do our disconnect.
 			//this packet will not actually go out until the next call to Write().
 			_SendDisconnect();
@@ -910,7 +910,7 @@ void EQStream::SendSessionRequest()
 	Request->Session=htonl(time(nullptr));
 	Request->MaxLength=htonl(512);
 
-	Log(Logs::Detail, Logs::Netcode, _L "Sending OP_SessionRequest: session %lu, maxlen=%d" __L, (unsigned long)ntohl(Request->Session), ntohl(Request->MaxLength));
+	LogNetcode(_L "Sending OP_SessionRequest: session [{}], maxlen=[{}]" __L, (unsigned long)ntohl(Request->Session), ntohl(Request->MaxLength));
 
 	NonSequencedPush(out);
 }
@@ -924,7 +924,7 @@ void EQStream::_SendDisconnect()
 	*(uint32 *)out->pBuffer=htonl(Session);
 	NonSequencedPush(out);
 
-	Log(Logs::Detail, Logs::Netcode, _L "Sending OP_SessionDisconnect: session %lu" __L, (unsigned long)Session);
+	LogNetcode(_L "Sending OP_SessionDisconnect: session [{}]" __L, (unsigned long)Session);
 }
 
 void EQStream::InboundQueuePush(EQRawApplicationPacket *p)
@@ -976,7 +976,7 @@ EQRawApplicationPacket *p=nullptr;
 		if(OpMgr != nullptr && *OpMgr != nullptr) {
 			EmuOpcode emu_op = (*OpMgr)->EQToEmu(p->opcode);
 			if(emu_op == OP_Unknown) {
-				Log(Logs::General, Logs::Netcode, "Unable to convert EQ opcode 0x%.4x to an Application opcode.", p->opcode);
+				LogNetcode("Unable to convert EQ opcode {:#04x} to an Application opcode", p->opcode);
 			}
 
 			p->SetOpcode(emu_op);
@@ -1004,7 +1004,7 @@ void EQStream::InboundQueueClear()
 {
 EQApplicationPacket *p=nullptr;
 
-	Log(Logs::Detail, Logs::Netcode, _L "Clearing inbound queue" __L);
+	LogNetcode(_L "Clearing inbound queue" __L);
 
 	MInboundQueue.lock();
 	if (!InboundQueue.empty()) {
@@ -1047,7 +1047,7 @@ void EQStream::OutboundQueueClear()
 {
 EQProtocolPacket *p=nullptr;
 
-	Log(Logs::Detail, Logs::Netcode, _L "Clearing outbound queue" __L);
+	LogNetcode(_L "Clearing outbound queue" __L);
 
 	MOutboundQueue.lock();
 	while(!NonSequencedQueue.empty()) {
@@ -1069,7 +1069,7 @@ void EQStream::PacketQueueClear()
 {
 EQProtocolPacket *p=nullptr;
 
-	Log(Logs::Detail, Logs::Netcode, _L "Clearing future packet queue" __L);
+	LogNetcode(_L "Clearing future packet queue" __L);
 
 	if(!PacketQueue.empty()) {
 		std::map<unsigned short,EQProtocolPacket *>::iterator itr;
@@ -1101,7 +1101,7 @@ void EQStream::Process(const unsigned char *buffer, const uint32 length)
 		delete p;
 		ProcessQueue();
 	} else {
-		Log(Logs::Detail, Logs::Netcode, _L "Incoming packet failed checksum" __L);
+		LogNetcode(_L "Incoming packet failed checksum" __L);
 	}
 }
 
@@ -1132,23 +1132,23 @@ std::deque<EQProtocolPacket *>::iterator itr, tmp;
 	SeqOrder ord = CompareSequence(SequencedBase, seq);
 	if(ord == SeqInOrder) {
 		//they are not acking anything new...
-		Log(Logs::Detail, Logs::Netcode, _L "Received an ack with no window advancement (seq %d)." __L, seq);
+		LogNetcode(_L "Received an ack with no window advancement (seq [{}])" __L, seq);
 	} else if(ord == SeqPast) {
 		//they are nacking blocks going back before our buffer, wtf?
-		Log(Logs::Detail, Logs::Netcode, _L "Received an ack with backward window advancement (they gave %d, our window starts at %d). This is bad." __L, seq, SequencedBase);
+		LogNetcode(_L "Received an ack with backward window advancement (they gave [{}], our window starts at [{}]). This is bad" __L, seq, SequencedBase);
 	} else {
-		Log(Logs::Detail, Logs::Netcode, _L "Received an ack up through sequence %d. Our base is %d." __L, seq, SequencedBase);
+		LogNetcode(_L "Received an ack up through sequence [{}]. Our base is [{}]" __L, seq, SequencedBase);
 
 
 		//this is a good ack, we get to ack some blocks.
 		seq++;	//we stop at the block right after their ack, counting on the wrap of both numbers.
 		while(SequencedBase != seq) {
 			if(SequencedQueue.empty()) {
-				Log(Logs::Detail, Logs::Netcode, _L "OUT OF PACKETS acked packet with sequence %lu. Next send is %d before this." __L, (unsigned long)SequencedBase, SequencedQueue.size());
+				LogNetcode(_L "OUT OF PACKETS acked packet with sequence [{}]. Next send is [{}] before this" __L, (unsigned long)SequencedBase, SequencedQueue.size());
 				SequencedBase = NextOutSeq;
 				break;
 			}
-			Log(Logs::Detail, Logs::Netcode, _L "Removing acked packet with sequence %lu." __L, (unsigned long)SequencedBase);
+			LogNetcode(_L "Removing acked packet with sequence [{}]" __L, (unsigned long)SequencedBase);
 			//clean out the acked packet
 			delete SequencedQueue.front();
 			SequencedQueue.pop_front();
@@ -1156,7 +1156,7 @@ std::deque<EQProtocolPacket *>::iterator itr, tmp;
 			SequencedBase++;
 		}
 		if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
-			Log(Logs::Detail, Logs::Netcode, _L "Post-Ack on %d Invalid Sequenced queue: BS %d + SQ %d != NOS %d" __L, seq, SequencedBase, SequencedQueue.size(), NextOutSeq);
+			LogNetcode(_L "Post-Ack on [{}] Invalid Sequenced queue: BS [{}] + SQ [{}] != NOS [{}]" __L, seq, SequencedBase, SequencedQueue.size(), NextOutSeq);
 		}
 	}
 
@@ -1166,7 +1166,7 @@ std::deque<EQProtocolPacket *>::iterator itr, tmp;
 void EQStream::SetNextAckToSend(uint32 seq)
 {
 	MAcks.lock();
-	Log(Logs::Detail, Logs::Netcode, _L "Set Next Ack To Send to %lu" __L, (unsigned long)seq);
+	LogNetcode(_L "Set Next Ack To Send to [{}]" __L, (unsigned long)seq);
 	NextAckToSend=seq;
 	MAcks.unlock();
 }
@@ -1174,7 +1174,7 @@ void EQStream::SetNextAckToSend(uint32 seq)
 void EQStream::SetLastAckSent(uint32 seq)
 {
 	MAcks.lock();
-	Log(Logs::Detail, Logs::Netcode, _L "Set Last Ack Sent to %lu" __L, (unsigned long)seq);
+	LogNetcode(_L "Set Last Ack Sent to [{}]" __L, (unsigned long)seq);
 	LastAckSent=seq;
 	MAcks.unlock();
 }
@@ -1187,10 +1187,10 @@ void EQStream::ProcessQueue()
 
 	EQProtocolPacket *qp=nullptr;
 	while((qp=RemoveQueue(NextInSeq))!=nullptr) {
-		Log(Logs::Detail, Logs::Netcode, _L "Processing Queued Packet: Seq=%d" __L, NextInSeq);
+		LogNetcode(_L "Processing Queued Packet: Seq=[{}]" __L, NextInSeq);
 		ProcessPacket(qp);
 		delete qp;
-		Log(Logs::Detail, Logs::Netcode, _L "OP_Packet Queue size=%d" __L, PacketQueue.size());
+		LogNetcode(_L "OP_Packet Queue size=[{}]" __L, PacketQueue.size());
 	}
 }
 
@@ -1201,21 +1201,21 @@ EQProtocolPacket *qp=nullptr;
 	if ((itr=PacketQueue.find(seq))!=PacketQueue.end()) {
 		qp=itr->second;
 		PacketQueue.erase(itr);
-		Log(Logs::Detail, Logs::Netcode, _L "OP_Packet Queue size=%d" __L, PacketQueue.size());
+		LogNetcode(_L "OP_Packet Queue size=[{}]" __L, PacketQueue.size());
 	}
 	return qp;
 }
 
 void EQStream::SetStreamType(EQStreamType type)
 {
-	Log(Logs::Detail, Logs::Netcode, _L "Changing stream type from %s to %s" __L, StreamTypeString(StreamType), StreamTypeString(type));
+	LogNetcode(_L "Changing stream type from [{}] to [{}]" __L, StreamTypeString(StreamType), StreamTypeString(type));
 	StreamType=type;
 	switch (StreamType) {
 		case LoginStream:
 			app_opcode_size=1;
 			compressed=false;
 			encoded=false;
-			Log(Logs::Detail, Logs::Netcode, _L "Login stream has app opcode size %d, is not compressed or encoded." __L, app_opcode_size);
+			LogNetcode(_L "Login stream has app opcode size [{}], is not compressed or encoded" __L, app_opcode_size);
 			break;
 		case ChatOrMailStream:
 		case ChatStream:
@@ -1223,7 +1223,7 @@ void EQStream::SetStreamType(EQStreamType type)
 			app_opcode_size=1;
 			compressed=false;
 			encoded=true;
-			Log(Logs::Detail, Logs::Netcode, _L "Chat/Mail stream has app opcode size %d, is not compressed, and is encoded." __L, app_opcode_size);
+			LogNetcode(_L "Chat/Mail stream has app opcode size [{}], is not compressed, and is encoded" __L, app_opcode_size);
 			break;
 		case ZoneStream:
 		case WorldStream:
@@ -1231,7 +1231,7 @@ void EQStream::SetStreamType(EQStreamType type)
 			app_opcode_size=2;
 			compressed=true;
 			encoded=false;
-			Log(Logs::Detail, Logs::Netcode, _L "World/Zone stream has app opcode size %d, is compressed, and is not encoded." __L, app_opcode_size);
+			LogNetcode(_L "World/Zone stream has app opcode size [{}], is compressed, and is not encoded" __L, app_opcode_size);
 			break;
 	}
 }
@@ -1281,7 +1281,7 @@ EQStream::SeqOrder EQStream::CompareSequence(uint16 expected_seq , uint16 seq)
 
 void EQStream::SetState(EQStreamState state) {
 	MState.lock();
-	Log(Logs::Detail, Logs::Netcode, _L "Changing state from %d to %d" __L, State, state);
+	LogNetcode(_L "Changing state from [{}] to [{}]" __L, State, state);
 	State=state;
 	MState.unlock();
 }
@@ -1293,29 +1293,29 @@ void EQStream::CheckTimeout(uint32 now, uint32 timeout) {
 
 	EQStreamState orig_state = GetState();
 	if (orig_state == CLOSING && !outgoing_data) {
-		Log(Logs::Detail, Logs::Netcode, _L "Out of data in closing state, disconnecting." __L);
+		LogNetcode(_L "Out of data in closing state, disconnecting" __L);
 		_SendDisconnect();
 		SetState(DISCONNECTING);
 	} else if (LastPacket && (now-LastPacket) > timeout) {
 		switch(orig_state) {
 		case CLOSING:
 			//if we time out in the closing state, they are not acking us, just give up
-			Log(Logs::Detail, Logs::Netcode, _L "Timeout expired in closing state. Moving to closed state." __L);
+			LogNetcode(_L "Timeout expired in closing state. Moving to closed state" __L);
 			_SendDisconnect();
 			SetState(CLOSED);
 			break;
 		case DISCONNECTING:
 			//we timed out waiting for them to send us the disconnect reply, just give up.
-			Log(Logs::Detail, Logs::Netcode, _L "Timeout expired in disconnecting state. Moving to closed state." __L);
+			LogNetcode(_L "Timeout expired in disconnecting state. Moving to closed state" __L);
 			SetState(CLOSED);
 			break;
 		case CLOSED:
-			Log(Logs::Detail, Logs::Netcode, _L "Timeout expired in closed state??" __L);
+			LogNetcode(_L "Timeout expired in closed state??" __L);
 			break;
 		case ESTABLISHED:
 			//we timed out during normal operation. Try to be nice about it.
 			//we will almost certainly time out again waiting for the disconnect reply, but oh well.
-			Log(Logs::Detail, Logs::Netcode, _L "Timeout expired in established state. Closing connection." __L);
+			LogNetcode(_L "Timeout expired in established state. Closing connection" __L);
 			_SendDisconnect();
 			SetState(DISCONNECTING);
 			break;
@@ -1342,7 +1342,7 @@ void EQStream::Decay()
 		for (auto sitr = SequencedQueue.begin(); sitr != SequencedQueue.end(); ++sitr, count++) {
 			if (!(*sitr)->acked && (*sitr)->sent_time > 0 && ((*sitr)->sent_time + retransmittimeout) < Timer::GetCurrentTime()) {
 				(*sitr)->sent_time = 0;
-				Log(Logs::Detail, Logs::Netcode, _L "Timeout exceeded for seq %d.  Flagging packet for retransmission" __L, SequencedBase + count);
+				LogNetcode(_L "Timeout exceeded for seq [{}].  Flagging packet for retransmission" __L, SequencedBase + count);
 			}
 		}
 		MOutboundQueue.unlock();
@@ -1384,12 +1384,12 @@ void EQStream::AdjustRates(uint32 average_delta)
 void EQStream::Close() {
 	if(HasOutgoingData()) {
 		//there is pending data, wait for it to go out.
-		Log(Logs::Detail, Logs::Netcode, _L "Stream requested to Close(), but there is pending data, waiting for it." __L);
+		LogNetcode(_L "Stream requested to Close(), but there is pending data, waiting for it" __L);
 		SetState(CLOSING);
 	} else {
 		//otherwise, we are done, we can drop immediately.
 		_SendDisconnect();
-		Log(Logs::Detail, Logs::Netcode, _L "Stream closing immediate due to Close()" __L);
+		LogNetcode(_L "Stream closing immediate due to Close()" __L);
 		SetState(DISCONNECTING);
 	}
 }
@@ -1417,19 +1417,19 @@ EQStream::MatchState EQStream::CheckSignature(const Signature *sig) {
 		} else if(p->opcode == sig->first_eq_opcode) {
 			//opcode matches, check length..
 			if(p->size == sig->first_length) {
-				Log(Logs::General, Logs::Netcode, "[IDENT_TRACE] %s:%d: First opcode matched 0x%x and length matched %d", long2ip(GetRemoteIP()).c_str(), ntohs(GetRemotePort()), sig->first_eq_opcode, p->size);
+				LogNetcode("[StreamIdentify] [{}]:[{}]: First opcode matched {:#04x} and length matched [{}]", long2ip(GetRemoteIP()).c_str(), ntohs(GetRemotePort()), sig->first_eq_opcode, p->size);
 				res = MatchSuccessful;
 			} else if(sig->first_length == 0) {
-				Log(Logs::General, Logs::Netcode, "[IDENT_TRACE] %s:%d: First opcode matched 0x%x and length (%d) is ignored", long2ip(GetRemoteIP()).c_str(), ntohs(GetRemotePort()), sig->first_eq_opcode, p->size);
+				LogNetcode("[StreamIdentify] [{}]:[{}]: First opcode matched {:#04x} and length ([{}]) is ignored", long2ip(GetRemoteIP()).c_str(), ntohs(GetRemotePort()), sig->first_eq_opcode, p->size);
 				res = MatchSuccessful;
 			} else {
 				//opcode matched but length did not.
-				Log(Logs::General, Logs::Netcode, "[IDENT_TRACE] %s:%d: First opcode matched 0x%x, but length %d did not match expected %d", long2ip(GetRemoteIP()).c_str(), ntohs(GetRemotePort()), sig->first_eq_opcode, p->size, sig->first_length);
+				LogNetcode("[StreamIdentify] [{}]:[{}]: First opcode matched {:#04x}, but length [{}] did not match expected [{}]", long2ip(GetRemoteIP()).c_str(), ntohs(GetRemotePort()), sig->first_eq_opcode, p->size, sig->first_length);
 				res = MatchFailed;
 			}
 		} else {
 			//first opcode did not match..
-			Log(Logs::General, Logs::Netcode, "[IDENT_TRACE] %s:%d: First opcode 0x%x did not match expected 0x%x", long2ip(GetRemoteIP()).c_str(), ntohs(GetRemotePort()), p->opcode, sig->first_eq_opcode);
+			LogNetcode("[StreamIdentify] [{}]:[{}]: First opcode {:#04x} did not match expected {:#04x}", long2ip(GetRemoteIP()).c_str(), ntohs(GetRemotePort()), p->opcode, sig->first_eq_opcode);
 			res = MatchFailed;
 		}
 	}
diff --git a/common/eq_stream_ident.cpp b/common/eq_stream_ident.cpp
index 5706bbced..8222e471a 100644
--- a/common/eq_stream_ident.cpp
+++ b/common/eq_stream_ident.cpp
@@ -46,7 +46,7 @@ void EQStreamIdentifier::Process() {
 
 		//first see if this stream has expired
 		if(r.expire.Check(false)) {
-			Log(Logs::General, Logs::Netcode, "[IDENTIFY] Unable to identify stream from %s:%d before timeout.", r.stream->GetRemoteAddr().c_str(), ntohs(r.stream->GetRemotePort()));
+			LogNetcode("[StreamIdentify] Unable to identify stream from [{}:{}] before timeout", r.stream->GetRemoteAddr().c_str(), ntohs(r.stream->GetRemotePort()));
 			r.stream->Close();
 
 			cur = m_streams.erase(cur);
@@ -62,23 +62,23 @@ void EQStreamIdentifier::Process() {
 		}
 		if(r.stream->GetState() != ESTABLISHED) {
 			//the stream closed before it was identified.
-			Log(Logs::General, Logs::Netcode, "[IDENTIFY] Unable to identify stream from %s:%d before it closed.", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()));
+			LogNetcode("[StreamIdentify] Unable to identify stream from [{}:{}] before it closed", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()));
 			switch(r.stream->GetState())
 			{
 			case ESTABLISHED:
-				Log(Logs::General, Logs::Netcode, "[IDENTIFY] Stream state was Established");
+				LogNetcode("[StreamIdentify] Stream state was Established");
 				break;
 			case CLOSING:
-				Log(Logs::General, Logs::Netcode, "[IDENTIFY] Stream state was Closing");
+				LogNetcode("[StreamIdentify] Stream state was Closing");
 				break;
 			case DISCONNECTING:
-				Log(Logs::General, Logs::Netcode, "[IDENTIFY] Stream state was Disconnecting");
+				LogNetcode("[StreamIdentify] Stream state was Disconnecting");
 				break;
 			case CLOSED:
-				Log(Logs::General, Logs::Netcode, "[IDENTIFY] Stream state was Closed");
+				LogNetcode("[StreamIdentify] Stream state was Closed");
 				break;
 			default:
-				Log(Logs::General, Logs::Netcode, "[IDENTIFY] Stream state was Unestablished or unknown");
+				LogNetcode("[StreamIdentify] Stream state was Unestablished or unknown");
 				break;
 			}
 			r.stream->ReleaseFromUse();
@@ -102,13 +102,13 @@ void EQStreamIdentifier::Process() {
 			switch(res) {
 			case EQStreamInterface::MatchNotReady:
 				//the stream has not received enough packets to compare with this signature
-//				Log.LogDebugType(Logs::General, Logs::Netcode, "[IDENT_TRACE] %s:%d: Tried patch %s, but stream is not ready for it.", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()), p->name.c_str());
+//				Log.LogDebugType(Logs::General, Logs::Netcode, "[StreamIdentify] %s:%d: Tried patch %s, but stream is not ready for it.", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()), p->name.c_str());
 				all_ready = false;
 				break;
 			case EQStreamInterface::MatchSuccessful: {
 				//yay, a match.
 
-				Log(Logs::General, Logs::Netcode, "[IDENTIFY] Identified stream %s:%d with signature %s", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()), p->name.c_str());
+				LogNetcode("[StreamIdentify] Identified stream [{}:{}] with signature [{}]", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()), p->name.c_str());
 
 				// before we assign the eqstream to an interface, let the stream recognize it is in use and the session should not be reset any further
 				r.stream->SetActive(true);
@@ -122,7 +122,7 @@ void EQStreamIdentifier::Process() {
 			}
 			case EQStreamInterface::MatchFailed:
 				//do nothing...
-				Log(Logs::General, Logs::Netcode, "[IDENT_TRACE] %s:%d: Tried patch %s, and it did not match.", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()), p->name.c_str());
+				LogNetcode("[StreamIdentify] [{}:{}] Tried patch [{}] and it did not match", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()), p->name.c_str());
 				break;
 			}
 		}
@@ -130,7 +130,7 @@ void EQStreamIdentifier::Process() {
 		//if we checked all patches and did not find a match.
 		if(all_ready && !found_one) {
 			//the stream cannot be identified.
-			Log(Logs::General, Logs::Netcode, "[IDENTIFY] Unable to identify stream from %s:%d, no match found.", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()));
+			LogNetcode("[StreamIdentify] Unable to identify stream from [{}:{}], no match found", long2ip(r.stream->GetRemoteIP()).c_str(), ntohs(r.stream->GetRemotePort()));
 			r.stream->ReleaseFromUse();
 		}
 
diff --git a/common/eq_stream_proxy.cpp b/common/eq_stream_proxy.cpp
index 402deaa34..587e55b64 100644
--- a/common/eq_stream_proxy.cpp
+++ b/common/eq_stream_proxy.cpp
@@ -42,8 +42,8 @@ void EQStreamProxy::QueuePacket(const EQApplicationPacket *p, bool ack_req) {
 		return;
 
 	if (p->GetOpcode() != OP_SpecialMesg) {
-		Log(Logs::General, Logs::Server_Client_Packet, "[%s - 0x%04x] [Size: %u]", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size());
-		Log(Logs::General, Logs::Server_Client_Packet_With_Dump, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size(), DumpPacketToString(p).c_str());
+		Log(Logs::General, Logs::PacketServerClient, "[%s - 0x%04x] [Size: %u]", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size());
+		Log(Logs::General, Logs::PacketServerClientWithDump, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->GetOpcode(), p->Size(), DumpPacketToString(p).c_str());
 	}
 
 	EQApplicationPacket *newp = p->Copy();
diff --git a/common/eqemu_config.h b/common/eqemu_config.h
index e75737d76..a4fb7797f 100644
--- a/common/eqemu_config.h
+++ b/common/eqemu_config.h
@@ -165,7 +165,7 @@ class EQEmuConfig
 				fconfig >> _config->_root;
 				_config->parse_config();
 			}
-			catch (std::exception) {
+			catch (std::exception &) {
 				return false;
 			}			
 			return true;
diff --git a/common/eqemu_logsys.cpp b/common/eqemu_logsys.cpp
index d614415ea..f5d58a5fd 100644
--- a/common/eqemu_logsys.cpp
+++ b/common/eqemu_logsys.cpp
@@ -19,6 +19,7 @@
 */
 
 #include "eqemu_logsys.h"
+#include "rulesys.h"
 #include "platform.h"
 #include "string_util.h"
 #include "database.h"
@@ -81,31 +82,19 @@ namespace Console {
 	};
 }
 
-enum GameChatColor {
-	yellow       = 15,
-	red          = 13,
-	light_green  = 14,
-	light_cyan   = 258,
-	light_purple = 5
-};
-
 /**
  * EQEmuLogSys Constructor
  */
 EQEmuLogSys::EQEmuLogSys()
 {
-	on_log_gmsay_hook      = [](uint16 log_type, const std::string &) {};
-	on_log_console_hook    = [](uint16 debug_level, uint16 log_type, const std::string &) {};
-	bool file_logs_enabled = false;
-	int  log_platform      = 0;
+	on_log_gmsay_hook   = [](uint16 log_type, const std::string &) {};
+	on_log_console_hook = [](uint16 debug_level, uint16 log_type, const std::string &) {};
 }
 
 /**
  * EQEmuLogSys Deconstructor
  */
-EQEmuLogSys::~EQEmuLogSys()
-{
-}
+EQEmuLogSys::~EQEmuLogSys() = default;
 
 void EQEmuLogSys::LoadLogSettingsDefaults()
 {
@@ -113,7 +102,7 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 	 * Get Executable platform currently running this code (Zone/World/etc)
 	 */
 	log_platform = GetExecutablePlatformInt();
-	
+
 	for (int log_category_id = Logs::AA; log_category_id != Logs::MaxCategoryID; log_category_id++) {
 		log_settings[log_category_id].log_to_console      = 0;
 		log_settings[log_category_id].log_to_file         = 0;
@@ -126,15 +115,26 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * Set Defaults
 	 */
-	log_settings[Logs::World_Server].log_to_console    = Logs::General;
-	log_settings[Logs::Zone_Server].log_to_console     = Logs::General;
-	log_settings[Logs::QS_Server].log_to_console       = Logs::General;
-	log_settings[Logs::UCS_Server].log_to_console      = Logs::General;
-	log_settings[Logs::Crash].log_to_console           = Logs::General;
-	log_settings[Logs::MySQLError].log_to_console      = Logs::General;
-	log_settings[Logs::Login_Server].log_to_console    = Logs::General;
-	log_settings[Logs::Headless_Client].log_to_console = Logs::General;
-	log_settings[Logs::NPCScaling].log_to_gmsay        = Logs::General;
+	log_settings[Logs::WorldServer].log_to_console    = static_cast<uint8>(Logs::General);
+	log_settings[Logs::ZoneServer].log_to_console     = static_cast<uint8>(Logs::General);
+	log_settings[Logs::QSServer].log_to_console       = static_cast<uint8>(Logs::General);
+	log_settings[Logs::UCSServer].log_to_console      = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Crash].log_to_console          = static_cast<uint8>(Logs::General);
+	log_settings[Logs::MySQLError].log_to_console     = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Loginserver].log_to_console    = static_cast<uint8>(Logs::General);
+	log_settings[Logs::HeadlessClient].log_to_console = static_cast<uint8>(Logs::General);
+	log_settings[Logs::NPCScaling].log_to_gmsay       = static_cast<uint8>(Logs::General);
+
+	/**
+	 * RFC 5424
+	 */
+	log_settings[Logs::Emergency].log_to_console = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Alert].log_to_console     = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Critical].log_to_console  = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Error].log_to_console     = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Warning].log_to_console   = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Notice].log_to_console    = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Info].log_to_console      = static_cast<uint8>(Logs::General);
 
 	/**
 	 * Set Category enabled status on defaults
@@ -175,20 +175,41 @@ void EQEmuLogSys::LoadLogSettingsDefaults()
 	}
 }
 
+/**
+ * @param log_category
+ * @return
+ */
+bool EQEmuLogSys::IsRfc5424LogCategory(uint16 log_category)
+{
+	return (
+		log_category == Logs::Emergency ||
+		log_category == Logs::Alert ||
+		log_category == Logs::Critical ||
+		log_category == Logs::Error ||
+		log_category == Logs::Warning ||
+		log_category == Logs::Notice ||
+		log_category == Logs::Info ||
+		log_category == Logs::Debug
+	);
+}
+
 /**
  * @param log_category
  * @param in_message
  * @return
  */
-std::string EQEmuLogSys::FormatOutMessageString(uint16 log_category, const std::string &in_message)
+std::string EQEmuLogSys::FormatOutMessageString(
+	uint16 log_category,
+	const std::string &in_message
+)
 {
-	std::string ret;
-	ret.push_back('[');
-	ret.append(Logs::LogCategoryName[log_category]);
-	ret.push_back(']');
-	ret.push_back(' ');
-	ret.append(in_message);
-	return ret;
+	std::string return_string;
+
+	if (IsRfc5424LogCategory(log_category)) {
+		return_string = "[" + GetPlatformName() + "] ";
+	}
+
+	return return_string + "[" + Logs::LogCategoryName[log_category] + "] " + in_message;
 }
 
 /**
@@ -196,7 +217,11 @@ std::string EQEmuLogSys::FormatOutMessageString(uint16 log_category, const std::
  * @param log_category
  * @param message
  */
-void EQEmuLogSys::ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message)
+void EQEmuLogSys::ProcessGMSay(
+	uint16 debug_level,
+	uint16 log_category,
+	const std::string &message
+)
 {
 	/**
 	 * Enabling Netcode based GMSay output creates a feedback loop that ultimately ends in a crash
@@ -218,7 +243,11 @@ void EQEmuLogSys::ProcessGMSay(uint16 debug_level, uint16 log_category, const st
  * @param log_category
  * @param message
  */
-void EQEmuLogSys::ProcessLogWrite(uint16 debug_level, uint16 log_category, const std::string &message)
+void EQEmuLogSys::ProcessLogWrite(
+	uint16 debug_level,
+	uint16 log_category,
+	const std::string &message
+)
 {
 	if (log_category == Logs::Crash) {
 		char time_stamp[80];
@@ -280,6 +309,8 @@ std::string EQEmuLogSys::GetLinuxConsoleColorFromCategory(uint16 log_category)
 		case Logs::Normal:
 			return LC_YELLOW;
 		case Logs::MySQLError:
+		case Logs::Warning:
+		case Logs::Critical:
 		case Logs::Error:
 			return LC_RED;
 		case Logs::MySQLQuery:
@@ -306,22 +337,22 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 	switch (log_category) {
 		case Logs::Status:
 		case Logs::Normal:
-			return GameChatColor::yellow;
+			return Chat::Yellow;
 		case Logs::MySQLError:
 		case Logs::Error:
-			return GameChatColor::red;
+			return Chat::Red;
 		case Logs::MySQLQuery:
 		case Logs::Debug:
-			return GameChatColor::light_green;
+			return Chat::Lime;
 		case Logs::Quests:
-			return GameChatColor::light_cyan;
+			return Chat::Group;
 		case Logs::Commands:
 		case Logs::Mercenaries:
-			return GameChatColor::light_purple;
+			return Chat::Magenta;
 		case Logs::Crash:
-			return GameChatColor::red;
+			return Chat::Red;
 		default:
-			return GameChatColor::yellow;
+			return Chat::Yellow;
 	}
 }
 
@@ -351,6 +382,42 @@ void EQEmuLogSys::ProcessConsoleMessage(uint16 debug_level, uint16 log_category,
 	on_log_console_hook(debug_level, log_category, message);
 }
 
+/**
+ * @param str
+ * @return
+ */
+constexpr const char *str_end(const char *str)
+{
+	return *str ? str_end(str + 1) : str;
+}
+
+/**
+ * @param str
+ * @return
+ */
+constexpr bool str_slant(const char *str)
+{
+	return *str == '/' ? true : (*str ? str_slant(str + 1) : false);
+}
+
+/**
+ * @param str
+ * @return
+ */
+constexpr const char *r_slant(const char *str)
+{
+	return *str == '/' ? (str + 1) : r_slant(str - 1);
+}
+
+/**
+ * @param str
+ * @return
+ */
+constexpr const char *base_file_name(const char *str)
+{
+	return str_slant(str) ? r_slant(str_end(str)) : str;
+}
+
 /**
  * Core logging function
  *
@@ -359,7 +426,15 @@ void EQEmuLogSys::ProcessConsoleMessage(uint16 debug_level, uint16 log_category,
  * @param message
  * @param ...
  */
-void EQEmuLogSys::Out(Logs::DebugLevel debug_level, uint16 log_category, std::string message, ...)
+void EQEmuLogSys::Out(
+	Logs::DebugLevel debug_level,
+	uint16 log_category,
+	const char *file,
+	const char *func,
+	int line,
+	const char *message,
+	...
+)
 {
 	bool log_to_console = true;
 	if (log_settings[log_category].log_to_console < debug_level) {
@@ -381,12 +456,18 @@ void EQEmuLogSys::Out(Logs::DebugLevel debug_level, uint16 log_category, std::st
 		return;
 	}
 
+	std::string prefix;
+
+	if (RuleB(Logging, PrintFileFunctionAndLine)) {
+		prefix = fmt::format("[{0}::{1}:{2}] ", base_file_name(file), func, line);
+	}
+
 	va_list args;
 	va_start(args, message);
-	std::string output_message = vStringFormat(message.c_str(), args);
+	std::string output_message = vStringFormat(message, args);
 	va_end(args);
 
-	std::string output_debug_message = EQEmuLogSys::FormatOutMessageString(log_category, output_message);
+	std::string output_debug_message = EQEmuLogSys::FormatOutMessageString(log_category, prefix + output_message);
 
 	if (log_to_console) {
 		EQEmuLogSys::ProcessConsoleMessage(debug_level, log_category, output_debug_message);
@@ -422,7 +503,7 @@ void EQEmuLogSys::MakeDirectory(const std::string &directory_name)
 		return;
 	_mkdir(directory_name.c_str());
 #else
-	struct stat st;
+	struct stat st{};
 	if (stat(directory_name.c_str(), &st) == 0) { // exists
 		return;
 	}
@@ -463,12 +544,7 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 			return;
 		}
 
-		EQEmuLogSys::Out(
-			Logs::General,
-			Logs::Status,
-			"Starting File Log 'logs/%s_%i.log'",
-			platform_file_name.c_str(),
-			getpid());
+		LogInfo("Starting File Log [logs/{}_{}.log]", platform_file_name.c_str(), getpid());
 
 		/**
 		 * Make directory if not exists
@@ -488,17 +564,11 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 		/**
 		 * All other processes
 		 */
-
 		if (platform_file_name.empty()) {
 			return;
 		}
 
-		EQEmuLogSys::Out(
-			Logs::General,
-			Logs::Status,
-			"Starting File Log 'logs/%s_%i.log'",
-			platform_file_name.c_str(),
-			getpid());
+		LogInfo("Starting File Log [logs/{}_{}.log]", platform_file_name.c_str(), getpid());
 
 		/**
 		 * Open file pointer
@@ -509,3 +579,25 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 		);
 	}
 }
+
+/**
+ * Silence console logging
+ */
+void EQEmuLogSys::SilenceConsoleLogging()
+{
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		log_settings[log_index].log_to_console      = 0;
+		log_settings[log_index].is_category_enabled = 0;
+	}
+}
+
+/**
+ * Enables console logging
+ */
+void EQEmuLogSys::EnableConsoleLogging()
+{
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		log_settings[log_index].log_to_console      = Logs::General;
+		log_settings[log_index].is_category_enabled = 1;
+	}
+}
diff --git a/common/eqemu_logsys.h b/common/eqemu_logsys.h
index 05f4a5fee..9fa164d98 100644
--- a/common/eqemu_logsys.h
+++ b/common/eqemu_logsys.h
@@ -25,6 +25,14 @@
 #include <fstream>
 #include <stdio.h>
 #include <functional>
+
+#ifdef _WIN32
+#ifdef utf16_to_utf8
+#undef utf16_to_utf8
+#endif
+#endif
+
+#include <fmt/format.h>
 #include "types.h"
 
 namespace Logs {
@@ -45,7 +53,7 @@ namespace Logs {
 		AI,
 		Aggro,
 		Attack,
-		Client_Server_Packet,
+		PacketClientServer,
 		Combat,
 		Commands,
 		Crash,
@@ -59,40 +67,53 @@ namespace Logs {
 		Normal,
 		Object,
 		Pathing,
-		QS_Server,
+		QSServer,
 		Quests,
 		Rules,
 		Skills,
 		Spawns,
 		Spells,
 		Status,
-		TCP_Connection,
+		TCPConnection,
 		Tasks,
 		Tradeskills,
 		Trading,
 		Tribute,
-		UCS_Server,
-		WebInterface_Server,
-		World_Server,
-		Zone_Server,
+		UCSServer,
+		WebInterfaceServer,
+		WorldServer,
+		ZoneServer,
 		MySQLError,
 		MySQLQuery,
 		Mercenaries,
 		QuestDebug,
-		Server_Client_Packet,
-		Client_Server_Packet_Unhandled,
-		Server_Client_Packet_With_Dump,
-		Client_Server_Packet_With_Dump,
-		Login_Server,
-		Client_Login,
-		Headless_Client,
-		HP_Update,
+		PacketServerClient,
+		PacketClientServerUnhandled,
+		PacketServerClientWithDump,
+		PacketClientServerWithDump,
+		Loginserver,
+		ClientLogin,
+		HeadlessClient,
+		HPUpdate,
 		FixZ,
 		Food,
 		Traps,
 		NPCRoamBox,
 		NPCScaling,
 		MobAppearance,
+		Info,
+		Warning,
+		Critical,
+		Emergency,
+		Alert,
+		Notice,
+		AIScanClose,
+		AIYellForHelp,
+		AICastBeneficialClose,
+		AoeCast,
+		EntityManagement,
+		Flee,
+		Aura,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -152,19 +173,24 @@ namespace Logs {
 		"Traps",
 		"NPC Roam Box",
 		"NPC Scaling",
-		"Mob Appearance"
+		"Mob Appearance",
+		"Info",
+		"Warning",
+		"Critical",
+		"Emergency",
+		"Alert",
+		"Notice",
+		"AI Scan Close",
+		"AI Yell For Help",
+		"AI Cast Beneficial Close",
+		"AOE Cast",
+		"Entity Management",
+		"Flee",
+		"Aura",
 	};
 }
 
-#define Log(debug_level, log_category, message, ...) do {\
-    if (LogSys.log_settings[log_category].is_category_enabled == 1)\
-        LogSys.Out(debug_level, log_category, message, ##__VA_ARGS__);\
-} while (0)
-
-#define LogF(debug_level, log_category, message, ...) do {\
-    if (LogSys.log_settings[log_category].is_category_enabled == 1)\
-        OutF(LogSys, debug_level, log_category, message, ##__VA_ARGS__);\
-} while (0)
+#include "eqemu_logsys_log_aliases.h"
 
 class EQEmuLogSys {
 public:
@@ -177,6 +203,10 @@ public:
 	 */
 	void CloseFileLogs();
 	void LoadLogSettingsDefaults();
+
+	/**
+	 * @param directory_name
+	 */
 	void MakeDirectory(const std::string &directory_name);
 
 	/**
@@ -188,12 +218,25 @@ public:
 	 *		- This would pipe the same category and debug level to all output formats, but the internal memory reference of log_settings would
 	 *			be checked against to see if that piped output is set to actually process it for the category and debug level
 	*/
-	void Out(Logs::DebugLevel debug_level, uint16 log_category, std::string message, ...);
+	void Out(
+		Logs::DebugLevel debug_level,
+		uint16 log_category,
+		const char *file,
+		const char *func,
+		int line,
+		const char *message,
+		...
+	);
 
 	/**
 	 * Used in file logs to prepend a timestamp entry for logs
+	 * @param time_stamp
 	 */
 	void SetCurrentTimeStamp(char* time_stamp);
+
+	/**
+	 * @param log_name
+	 */
 	void StartFileLogs(const std::string &log_name = "");
 
 	/**
@@ -218,14 +261,14 @@ public:
 	 * These are loaded via DB and have defaults loaded in LoadLogSettingsDefaults
 	 * Database loaded via Database::LoadLogSettings(log_settings)
 	*/
-	LogSettings log_settings[Logs::LogCategory::MaxCategoryID];
+	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};
 
-	bool file_logs_enabled;
+	bool file_logs_enabled = false;
 
 	/**
 	 * Sets Executable platform (Zone/World/UCS) etc.
 	 */
-	int log_platform;
+	int log_platform = 0;
 
 	/**
 	 * File name used in writing logs
@@ -240,9 +283,26 @@ public:
 	 */
 	uint16 GetGMSayColorFromCategory(uint16 log_category);
 
+	/**
+	 * @param f
+	 */
 	void SetGMSayHandler(std::function<void(uint16 log_type, const std::string&)> f) { on_log_gmsay_hook = f; }
+
+	/**
+	 * @param f
+	 */
 	void SetConsoleHandler(std::function<void(uint16 debug_level, uint16 log_type, const std::string&)> f) { on_log_console_hook = f; }
 
+	/**
+	 * Silence console logging
+	 */
+	void SilenceConsoleLogging();
+
+	/**
+	 * Turn on all console logging
+	 */
+	void EnableConsoleLogging();
+
 private:
 
 	/**
@@ -258,6 +318,7 @@ private:
 
 	/**
 	 * Linux console color messages mapped by category
+	 *
 	 * @param log_category
 	 * @return
 	 */
@@ -268,11 +329,57 @@ private:
 	 */
 	uint16 GetWindowsConsoleColorFromCategory(uint16 log_category);
 
+	/**
+	 * @param debug_level
+	 * @param log_category
+	 * @param message
+	 */
 	void ProcessConsoleMessage(uint16 debug_level, uint16 log_category, const std::string &message);
+
+	/**
+	 * @param debug_level
+	 * @param log_category
+	 * @param message
+	 */
 	void ProcessGMSay(uint16 debug_level, uint16 log_category, const std::string &message);
+
+	/**
+	 * @param debug_level
+	 * @param log_category
+	 * @param message
+	 */
 	void ProcessLogWrite(uint16 debug_level, uint16 log_category, const std::string &message);
+
+	/**
+	 * @param log_category
+	 * @return
+	 */
+	bool IsRfc5424LogCategory(uint16 log_category);
 };
 
 extern EQEmuLogSys LogSys;
 
+/**
+template<typename... Args>
+void OutF(
+	EQEmuLogSys &ls,
+	Logs::DebugLevel debug_level,
+	uint16 log_category,
+	const char *file,
+	const char *func,
+	int line,
+	const char *fmt,
+	const Args &... args
+)
+{
+	std::string log_str = fmt::format(fmt, args...);
+	ls.Out(debug_level, log_category, file, func, line, log_str.c_str());
+}
+ **/
+
+#define OutF(ls, debug_level, log_category, file, func, line, formatStr, ...) \
+do { \
+    ls.Out(debug_level, log_category, file, func, line, fmt::format(formatStr, ##__VA_ARGS__).c_str()); \
+} while(0)
+
 #endif
diff --git a/common/eqemu_logsys_log_aliases.h b/common/eqemu_logsys_log_aliases.h
new file mode 100644
index 000000000..ccfc54f3a
--- /dev/null
+++ b/common/eqemu_logsys_log_aliases.h
@@ -0,0 +1,904 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+*/
+
+#ifndef EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
+#define EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
+
+#ifdef BUILD_LOGGING
+
+/**
+ * RFC 5424
+ */
+
+#define LogEmergency(message, ...) do {\
+    if (LogSys.log_settings[Logs::Emergency].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Emergency, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAlert(message, ...) do {\
+    if (LogSys.log_settings[Logs::Alert].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Alert, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCritical(message, ...) do {\
+    if (LogSys.log_settings[Logs::Critical].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Critical, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogError(message, ...) do {\
+    if (LogSys.log_settings[Logs::Error].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Error, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogWarning(message, ...) do {\
+    if (LogSys.log_settings[Logs::Warning].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Warning, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNotice(message, ...) do {\
+    if (LogSys.log_settings[Logs::Notice].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Notice, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogInfo(message, ...) do {\
+    if (LogSys.log_settings[Logs::Info].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Info, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogDebug(message, ...) do {\
+    if (LogSys.log_settings[Logs::Debug].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Debug, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+/**
+ * Category
+ */
+
+#define LogAA(message, ...) do {\
+    if (LogSys.log_settings[Logs::AA].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::AA, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAADetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::AA].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::AA, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAI(message, ...) do {\
+    if (LogSys.log_settings[Logs::AI].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::AI, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAIDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::AI].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::AI, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAggro(message, ...) do {\
+    if (LogSys.log_settings[Logs::Aggro].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Aggro, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAggroDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Aggro].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Aggro, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAttack(message, ...) do {\
+    if (LogSys.log_settings[Logs::Attack].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Attack, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAttackDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Attack].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Attack, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogPacketClientServer(message, ...) do {\
+    if (LogSys.log_settings[Logs::PacketClientServer].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::PacketClientServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogPacketClientServerDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::PacketClientServer].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::PacketClientServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCombat(message, ...) do {\
+    if (LogSys.log_settings[Logs::Combat].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Combat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCombatDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Combat].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Combat, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCommands(message, ...) do {\
+    if (LogSys.log_settings[Logs::Commands].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Commands, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCommandsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Commands].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Commands, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCrash(message, ...) do {\
+    if (LogSys.log_settings[Logs::Crash].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Crash, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogCrashDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Crash].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Crash, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogDoors(message, ...) do {\
+    if (LogSys.log_settings[Logs::Doors].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Doors, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogDoorsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Doors].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Doors, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogGuilds(message, ...) do {\
+    if (LogSys.log_settings[Logs::Guilds].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Guilds, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogGuildsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Guilds].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Guilds, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogInventory(message, ...) do {\
+    if (LogSys.log_settings[Logs::Inventory].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Inventory, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogInventoryDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Inventory].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Inventory, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogLauncher(message, ...) do {\
+    if (LogSys.log_settings[Logs::Launcher].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Launcher, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogLauncherDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Launcher].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Launcher, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNetcode(message, ...) do {\
+    if (LogSys.log_settings[Logs::Netcode].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Netcode, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNetcodeDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Netcode].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Netcode, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNormal(message, ...) do {\
+    if (LogSys.log_settings[Logs::Normal].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Normal, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNormalDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Normal].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Normal, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogObject(message, ...) do {\
+    if (LogSys.log_settings[Logs::Object].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Object, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogObjectDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Object].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Object, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogPathing(message, ...) do {\
+    if (LogSys.log_settings[Logs::Pathing].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Pathing, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogPathingDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Pathing].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Pathing, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogQSServer(message, ...) do {\
+    if (LogSys.log_settings[Logs::QSServer].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::QSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogQSServerDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::QSServer].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::QSServer, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogQuests(message, ...) do {\
+    if (LogSys.log_settings[Logs::Quests].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Quests, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogQuestsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Quests].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Quests, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogRules(message, ...) do {\
+    if (LogSys.log_settings[Logs::Rules].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Rules, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogRulesDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Rules].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Rules, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSkills(message, ...) do {\
+    if (LogSys.log_settings[Logs::Skills].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Skills, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSkillsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Skills].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Skills, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSpawns(message, ...) do {\
+    if (LogSys.log_settings[Logs::Spawns].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Spawns, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSpawnsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Spawns].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Spawns, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSpells(message, ...) do {\
+    if (LogSys.log_settings[Logs::Spells].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Spells, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogSpellsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Spells].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Spells, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTCPConnection(message, ...) do {\
+    if (LogSys.log_settings[Logs::TCPConnection].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::TCPConnection, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTCPConnectionDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::TCPConnection].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::TCPConnection, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTasks(message, ...) do {\
+    if (LogSys.log_settings[Logs::Tasks].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Tasks, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTasksDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Tasks].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Tasks, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTradeskills(message, ...) do {\
+    if (LogSys.log_settings[Logs::Tradeskills].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Tradeskills, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTradeskillsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Tradeskills].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Tradeskills, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTrading(message, ...) do {\
+    if (LogSys.log_settings[Logs::Trading].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Trading, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTradingDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Trading].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Trading, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTribute(message, ...) do {\
+    if (LogSys.log_settings[Logs::Tribute].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Tribute, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTributeDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Tribute].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Tribute, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogMySQLError(message, ...) do {\
+    if (LogSys.log_settings[Logs::MySQLError].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::MySQLError, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogMySQLErrorDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::MySQLError].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::MySQLError, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogMySQLQuery(message, ...) do {\
+    if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::MySQLQuery, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogMySQLQueryDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::MySQLQuery, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogMercenaries(message, ...) do {\
+    if (LogSys.log_settings[Logs::Mercenaries].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Mercenaries, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogMercenariesDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Mercenaries].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Mercenaries, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogQuestDebug(message, ...) do {\
+    if (LogSys.log_settings[Logs::QuestDebug].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::QuestDebug, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogQuestDebugDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::QuestDebug].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::QuestDebug, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogLoginserver(message, ...) do {\
+    if (LogSys.log_settings[Logs::Loginserver].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Loginserver, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogLoginserverDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Loginserver].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Loginserver, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogClientLogin(message, ...) do {\
+    if (LogSys.log_settings[Logs::ClientLogin].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::ClientLogin, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogClientLoginDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::ClientLogin].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::ClientLogin, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogHeadlessClient(message, ...) do {\
+    if (LogSys.log_settings[Logs::HeadlessClient].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::HeadlessClient, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogHeadlessClientDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::HeadlessClient].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::HeadlessClient, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogHPUpdate(message, ...) do {\
+    if (LogSys.log_settings[Logs::HPUpdate].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::HPUpdate, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogHPUpdateDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::HPUpdate].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::HPUpdate, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogFixZ(message, ...) do {\
+    if (LogSys.log_settings[Logs::FixZ].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::FixZ, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogFixZDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::FixZ].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::FixZ, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogFood(message, ...) do {\
+    if (LogSys.log_settings[Logs::Food].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Food, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogFoodDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Food].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Food, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTraps(message, ...) do {\
+    if (LogSys.log_settings[Logs::Traps].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Traps, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogTrapsDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Traps].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Traps, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNPCRoamBox(message, ...) do {\
+    if (LogSys.log_settings[Logs::NPCRoamBox].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::NPCRoamBox, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNPCRoamBoxDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::NPCRoamBox].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::NPCRoamBox, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNPCScaling(message, ...) do {\
+    if (LogSys.log_settings[Logs::NPCScaling].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::NPCScaling, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogNPCScalingDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::NPCScaling].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::NPCScaling, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogMobAppearance(message, ...) do {\
+    if (LogSys.log_settings[Logs::MobAppearance].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::MobAppearance, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogMobAppearanceDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::MobAppearance].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::MobAppearance, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogStatus(message, ...) do {\
+    if (LogSys.log_settings[Logs::Status].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Status, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogStatusDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Status].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Status, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAIScanClose(message, ...) do {\
+    if (LogSys.log_settings[Logs::AIScanClose].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAIScanCloseDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::AIScanClose].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::AIScanClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAIYellForHelp(message, ...) do {\
+    if (LogSys.log_settings[Logs::AIYellForHelp].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::AIYellForHelp, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAIYellForHelpDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::AIYellForHelp].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::AIYellForHelp, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAICastBeneficialClose(message, ...) do {\
+    if (LogSys.log_settings[Logs::AICastBeneficialClose].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::AICastBeneficialClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAICastBeneficialCloseDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::AICastBeneficialClose].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::AICastBeneficialClose, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAoeCast(message, ...) do {\
+    if (LogSys.log_settings[Logs::AoeCast].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::AoeCast, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAoeCastDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::AoeCast].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::AoeCast, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogEntityManagement(message, ...) do {\
+    if (LogSys.log_settings[Logs::EntityManagement].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::EntityManagement, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogEntityManagementDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::EntityManagement].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::EntityManagement, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogFlee(message, ...) do {\
+    if (LogSys.log_settings[Logs::Flee].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Flee, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogFleeDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Flee].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Flee, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAura(message, ...) do {\
+    if (LogSys.log_settings[Logs::Aura].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Aura, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogAuraDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Aura].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Aura, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define Log(debug_level, log_category, message, ...) do {\
+    if (LogSys.log_settings[log_category].is_category_enabled == 1)\
+        LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogF(debug_level, log_category, message, ...) do {\
+    if (LogSys.log_settings[log_category].is_category_enabled == 1)\
+        OutF(LogSys, debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#else
+#define LogEmergency(message, ...) do {\
+} while (0)
+
+#define LogAlert(message, ...) do {\
+} while (0)
+
+#define LogCritical(message, ...) do {\
+} while (0)
+
+#define LogError(message, ...) do {\
+} while (0)
+
+#define LogWarning(message, ...) do {\
+} while (0)
+
+#define LogNotice(message, ...) do {\
+} while (0)
+
+#define LogInfo(message, ...) do {\
+} while (0)
+
+#define LogDebug(message, ...) do {\
+} while (0)
+
+/**
+ * Category
+ */
+
+#define LogAA(message, ...) do {\
+} while (0)
+
+#define LogAADetail(message, ...) do {\
+} while (0)
+
+#define LogAI(message, ...) do {\
+} while (0)
+
+#define LogAIDetail(message, ...) do {\
+} while (0)
+
+#define LogAggro(message, ...) do {\
+} while (0)
+
+#define LogAggroDetail(message, ...) do {\
+} while (0)
+
+#define LogAttack(message, ...) do {\
+} while (0)
+
+#define LogAttackDetail(message, ...) do {\
+} while (0)
+
+#define LogPacketClientServer(message, ...) do {\
+} while (0)
+
+#define LogPacketClientServerDetail(message, ...) do {\
+} while (0)
+
+#define LogCombat(message, ...) do {\
+} while (0)
+
+#define LogCombatDetail(message, ...) do {\
+} while (0)
+
+#define LogCommands(message, ...) do {\
+} while (0)
+
+#define LogCommandsDetail(message, ...) do {\
+} while (0)
+
+#define LogCrash(message, ...) do {\
+} while (0)
+
+#define LogCrashDetail(message, ...) do {\
+} while (0)
+
+#define LogDoors(message, ...) do {\
+} while (0)
+
+#define LogDoorsDetail(message, ...) do {\
+} while (0)
+
+#define LogGuilds(message, ...) do {\
+} while (0)
+
+#define LogGuildsDetail(message, ...) do {\
+} while (0)
+
+#define LogInventory(message, ...) do {\
+} while (0)
+
+#define LogInventoryDetail(message, ...) do {\
+} while (0)
+
+#define LogLauncher(message, ...) do {\
+} while (0)
+
+#define LogLauncherDetail(message, ...) do {\
+} while (0)
+
+#define LogNetcode(message, ...) do {\
+} while (0)
+
+#define LogNetcodeDetail(message, ...) do {\
+} while (0)
+
+#define LogNormal(message, ...) do {\
+} while (0)
+
+#define LogNormalDetail(message, ...) do {\
+} while (0)
+
+#define LogObject(message, ...) do {\
+} while (0)
+
+#define LogObjectDetail(message, ...) do {\
+} while (0)
+
+#define LogPathing(message, ...) do {\
+} while (0)
+
+#define LogPathingDetail(message, ...) do {\
+} while (0)
+
+#define LogQSServer(message, ...) do {\
+} while (0)
+
+#define LogQSServerDetail(message, ...) do {\
+} while (0)
+
+#define LogQuests(message, ...) do {\
+} while (0)
+
+#define LogQuestsDetail(message, ...) do {\
+} while (0)
+
+#define LogRules(message, ...) do {\
+} while (0)
+
+#define LogRulesDetail(message, ...) do {\
+} while (0)
+
+#define LogSkills(message, ...) do {\
+} while (0)
+
+#define LogSkillsDetail(message, ...) do {\
+} while (0)
+
+#define LogSpawns(message, ...) do {\
+} while (0)
+
+#define LogSpawnsDetail(message, ...) do {\
+} while (0)
+
+#define LogSpells(message, ...) do {\
+} while (0)
+
+#define LogSpellsDetail(message, ...) do {\
+} while (0)
+
+#define LogTCPConnection(message, ...) do {\
+} while (0)
+
+#define LogTCPConnectionDetail(message, ...) do {\
+} while (0)
+
+#define LogTasks(message, ...) do {\
+} while (0)
+
+#define LogTasksDetail(message, ...) do {\
+} while (0)
+
+#define LogTradeskills(message, ...) do {\
+} while (0)
+
+#define LogTradeskillsDetail(message, ...) do {\
+} while (0)
+
+#define LogTrading(message, ...) do {\
+} while (0)
+
+#define LogTradingDetail(message, ...) do {\
+} while (0)
+
+#define LogTribute(message, ...) do {\
+} while (0)
+
+#define LogTributeDetail(message, ...) do {\
+} while (0)
+
+#define LogMySQLError(message, ...) do {\
+} while (0)
+
+#define LogMySQLErrorDetail(message, ...) do {\
+} while (0)
+
+#define LogMySQLQuery(message, ...) do {\
+} while (0)
+
+#define LogMySQLQueryDetail(message, ...) do {\
+} while (0)
+
+#define LogMercenaries(message, ...) do {\
+} while (0)
+
+#define LogMercenariesDetail(message, ...) do {\
+} while (0)
+
+#define LogQuestDebug(message, ...) do {\
+} while (0)
+
+#define LogQuestDebugDetail(message, ...) do {\
+} while (0)
+
+#define LogLoginserver(message, ...) do {\
+} while (0)
+
+#define LogLoginserverDetail(message, ...) do {\
+} while (0)
+
+#define LogClientLogin(message, ...) do {\
+} while (0)
+
+#define LogClientLoginDetail(message, ...) do {\
+} while (0)
+
+#define LogHeadlessClient(message, ...) do {\
+} while (0)
+
+#define LogHeadlessClientDetail(message, ...) do {\
+} while (0)
+
+#define LogHPUpdate(message, ...) do {\
+} while (0)
+
+#define LogHPUpdateDetail(message, ...) do {\
+} while (0)
+
+#define LogFixZ(message, ...) do {\
+} while (0)
+
+#define LogFixZDetail(message, ...) do {\
+} while (0)
+
+#define LogFood(message, ...) do {\
+} while (0)
+
+#define LogFoodDetail(message, ...) do {\
+} while (0)
+
+#define LogTraps(message, ...) do {\
+} while (0)
+
+#define LogTrapsDetail(message, ...) do {\
+} while (0)
+
+#define LogNPCRoamBox(message, ...) do {\
+} while (0)
+
+#define LogNPCRoamBoxDetail(message, ...) do {\
+} while (0)
+
+#define LogNPCScaling(message, ...) do {\
+} while (0)
+
+#define LogNPCScalingDetail(message, ...) do {\
+} while (0)
+
+#define LogMobAppearance(message, ...) do {\
+} while (0)
+
+#define LogMobAppearanceDetail(message, ...) do {\
+} while (0)
+
+#define LogStatus(message, ...) do {\
+} while (0)
+
+#define LogStatusDetail(message, ...) do {\
+} while (0)
+
+#define LogAIScanClose(message, ...) do {\
+} while (0)
+
+#define LogAIScanCloseDetail(message, ...) do {\
+} while (0)
+
+#define LogAIYellForHelp(message, ...) do {\
+} while (0)
+
+#define LogAIYellForHelpDetail(message, ...) do {\
+} while (0)
+
+#define LogAICastBeneficialClose(message, ...) do {\
+} while (0)
+
+#define LogAICastBeneficialCloseDetail(message, ...) do {\
+} while (0)
+
+#define LogAoeCast(message, ...) do {\
+} while (0)
+
+#define LogAoeCastDetail(message, ...) do {\
+} while (0)
+
+#define LogEntityManagement(message, ...) do {\
+} while (0)
+
+#define LogEntityManagementDetail(message, ...) do {\
+} while (0)
+
+#define LogFlee(message, ...) do {\
+} while (0)
+
+#define LogFleeDetail(message, ...) do {\
+} while (0)
+
+#define LogAura(message, ...) do {\
+} while (0)
+
+#define LogAuraDetail(message, ...) do {\
+} while (0)
+
+#define Log(debug_level, log_category, message, ...) do {\
+} while (0)
+
+#define LogF(debug_level, log_category, message, ...) do {\
+} while (0)
+#endif
+
+#endif //EQEMU_EQEMU_LOGSYS_LOG_ALIASES_H
\ No newline at end of file
diff --git a/common/event/event_loop.h b/common/event/event_loop.h
index 268f78c4d..295c0532d 100644
--- a/common/event/event_loop.h
+++ b/common/event/event_loop.h
@@ -21,6 +21,10 @@ namespace EQ
 			uv_run(&m_loop, UV_RUN_NOWAIT);
 		}
 
+		void Run() {
+			uv_run(&m_loop, UV_RUN_DEFAULT);
+		}
+
 		uv_loop_t* Handle() { return &m_loop; }
 
 	private:
diff --git a/common/event/task_scheduler.h b/common/event/task_scheduler.h
new file mode 100644
index 000000000..6cfe15f00
--- /dev/null
+++ b/common/event/task_scheduler.h
@@ -0,0 +1,114 @@
+#pragma once
+#include <vector>
+#include <thread>
+#include <mutex>
+#include <condition_variable>
+#include <functional>
+#include <queue>
+#include <future>
+
+namespace EQ
+{
+	namespace Event
+	{
+		class TaskScheduler
+		{
+		public:
+			static const int DefaultThreadCount = 4;
+		
+			TaskScheduler() : _running(false)
+			{
+				Start(DefaultThreadCount);
+			}
+
+			TaskScheduler(size_t threads) : _running(false)
+			{
+				Start(threads);
+			}
+			
+			~TaskScheduler() {
+				Stop();
+			}
+
+			void Start(size_t threads) {
+				if (true == _running) {
+					return;
+				}
+
+				_running = true;
+
+				for (size_t i = 0; i < threads; ++i) {
+					_threads.push_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
+				}
+			}
+			
+			void Stop() {
+				if (false == _running) {
+					return;
+				}
+
+				{
+					std::unique_lock<std::mutex> lock(_lock);
+					_running = false;
+				}
+
+				_cv.notify_all();
+
+				for (auto &t : _threads) {
+					t.join();
+				}
+			}
+			
+			template<typename Fn, typename... Args>
+			auto Enqueue(Fn&& fn, Args&&... args) -> std::future<typename std::result_of<Fn(Args...)>::type> {
+				using return_type = typename std::result_of<Fn(Args...)>::type;
+			
+				auto task = std::make_shared<std::packaged_task<return_type()>>(
+					std::bind(std::forward<Fn>(fn), std::forward<Args>(args)...)
+					);
+			
+				std::future<return_type> res = task->get_future();
+				{
+					std::unique_lock<std::mutex> lock(_lock);
+			
+					if (false == _running) {
+						throw std::runtime_error("Enqueue on stopped scheduler.");
+					}
+			
+					_tasks.emplace([task]() { (*task)(); });
+				}
+			
+				_cv.notify_one();
+				return res;
+			}
+			
+			private:
+			void ProcessWork() {
+				for (;;) {
+					std::function<void()> work;
+
+					{
+						std::unique_lock<std::mutex> lock(_lock);
+						_cv.wait(lock, [this] { return !_running || !_tasks.empty(); });
+
+						if (false == _running) {
+							return;
+						}
+
+						work = std::move(_tasks.front());
+						_tasks.pop();
+					}
+
+					work();
+				}
+				
+			}
+
+			bool _running = true;
+			std::vector<std::thread> _threads;
+			std::mutex _lock;
+			std::condition_variable _cv;
+			std::queue<std::function<void()>> _tasks;
+		};
+	}
+}
diff --git a/common/guild_base.cpp b/common/guild_base.cpp
index 8cf1b0fa8..642db7cbc 100644
--- a/common/guild_base.cpp
+++ b/common/guild_base.cpp
@@ -46,7 +46,7 @@ bool BaseGuildManager::LoadGuilds() {
 	ClearGuilds();
 
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to load guilds when we have no database object.");
+		LogGuilds("Requested to load guilds when we have no database object");
 		return(false);
 	}
 
@@ -77,13 +77,13 @@ bool BaseGuildManager::LoadGuilds() {
 		uint8 rankn = atoi(row[1]);
 
 		if(rankn > GUILD_MAX_RANK) {
-			Log(Logs::Detail, Logs::Guilds, "Found invalid (too high) rank %d for guild %d, skipping.", rankn, guild_id);
+			LogGuilds("Found invalid (too high) rank [{}] for guild [{}], skipping", rankn, guild_id);
 			continue;
 		}
 
 		res = m_guilds.find(guild_id);
 		if(res == m_guilds.end()) {
-			Log(Logs::Detail, Logs::Guilds, "Found rank %d for non-existent guild %d, skipping.", rankn, guild_id);
+			LogGuilds("Found rank [{}] for non-existent guild [{}], skipping", rankn, guild_id);
 			continue;
 		}
 
@@ -105,7 +105,7 @@ bool BaseGuildManager::LoadGuilds() {
 
 bool BaseGuildManager::RefreshGuild(uint32 guild_id) {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to refresh guild %d when we have no database object.", guild_id);
+		LogGuilds("Requested to refresh guild [{}] when we have no database object", guild_id);
 		return(false);
 	}
 
@@ -123,7 +123,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {
 
 	if (results.RowCount() == 0)
 	{
-		Log(Logs::Detail, Logs::Guilds, "Unable to find guild %d in the database.", guild_id);
+		LogGuilds("Unable to find guild [{}] in the database", guild_id);
 		return false;
 	}
 
@@ -145,7 +145,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {
 		uint8 rankn = atoi(row[1]);
 
 		if(rankn > GUILD_MAX_RANK) {
-			Log(Logs::Detail, Logs::Guilds, "Found invalid (too high) rank %d for guild %d, skipping.", rankn, guild_id);
+			LogGuilds("Found invalid (too high) rank [{}] for guild [{}], skipping", rankn, guild_id);
 			continue;
 		}
 
@@ -162,7 +162,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {
 		rank.permissions[GUILD_WARPEACE] = (row[10][0] == '1') ? true: false;
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Successfully refreshed guild %d from the database.", guild_id);
+	LogGuilds("Successfully refreshed guild [{}] from the database", guild_id);
 
 	return true;
 }
@@ -214,14 +214,14 @@ BaseGuildManager::GuildInfo *BaseGuildManager::_CreateGuild(uint32 guild_id, con
 
 bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to store guild %d when we have no database object.", guild_id);
+		LogGuilds("Requested to store guild [{}] when we have no database object", guild_id);
 		return(false);
 	}
 
 	std::map<uint32, GuildInfo *>::const_iterator res;
 	res = m_guilds.find(guild_id);
 	if(res == m_guilds.end()) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to store non-existent guild %d", guild_id);
+		LogGuilds("Requested to store non-existent guild [{}]", guild_id);
 		return(false);
 	}
 	GuildInfo *info = res->second;
@@ -289,14 +289,14 @@ bool BaseGuildManager::_StoreGuildDB(uint32 guild_id) {
 		safe_delete_array(title_esc);
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Stored guild %d in the database", guild_id);
+	LogGuilds("Stored guild [{}] in the database", guild_id);
 
 	return true;
 }
 
 uint32 BaseGuildManager::_GetFreeGuildID() {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested find a free guild ID when we have no database object.");
+		LogGuilds("Requested find a free guild ID when we have no database object");
 		return(GUILD_NONE);
 	}
 
@@ -330,12 +330,12 @@ uint32 BaseGuildManager::_GetFreeGuildID() {
 
 		if (results.RowCount() == 0)
 		{
-			Log(Logs::Detail, Logs::Guilds, "Located free guild ID %d in the database", index);
+			LogGuilds("Located free guild ID [{}] in the database", index);
 			return index;
 		}
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Unable to find a free guild ID when requested.");
+	LogGuilds("Unable to find a free guild ID when requested");
 	return GUILD_NONE;
 }
 
@@ -505,11 +505,11 @@ uint32 BaseGuildManager::DBCreateGuild(const char* name, uint32 leader) {
 
 	//now store the resulting guild setup into the DB.
 	if(!_StoreGuildDB(new_id)) {
-		Log(Logs::Detail, Logs::Guilds, "Error storing new guild. It may have been partially created which may need manual removal.");
+		LogGuilds("Error storing new guild. It may have been partially created which may need manual removal");
 		return(GUILD_NONE);
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Created guild %d in the database.", new_id);
+	LogGuilds("Created guild [{}] in the database", new_id);
 
 	return(new_id);
 }
@@ -525,7 +525,7 @@ bool BaseGuildManager::DBDeleteGuild(uint32 guild_id) {
 	}
 
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to delete guild %d when we have no database object.", guild_id);
+		LogGuilds("Requested to delete guild [{}] when we have no database object", guild_id);
 		return(false);
 	}
 
@@ -545,14 +545,14 @@ bool BaseGuildManager::DBDeleteGuild(uint32 guild_id) {
 	query = StringFormat("DELETE FROM guild_bank WHERE guildid=%lu", (unsigned long)guild_id);
 	QueryWithLogging(query, "deleting guild bank");
 
-	Log(Logs::Detail, Logs::Guilds, "Deleted guild %d from the database.", guild_id);
+	LogGuilds("Deleted guild [{}] from the database", guild_id);
 
 	return(true);
 }
 
 bool BaseGuildManager::DBRenameGuild(uint32 guild_id, const char* name) {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to rename guild %d when we have no database object.", guild_id);
+		LogGuilds("Requested to rename guild [{}] when we have no database object", guild_id);
 		return false;
 	}
 
@@ -573,13 +573,13 @@ bool BaseGuildManager::DBRenameGuild(uint32 guild_id, const char* name) {
 
 	if (!results.Success())
 	{
-		Log(Logs::Detail, Logs::Guilds, "Error renaming guild %d '%s': %s", guild_id, query.c_str(), results.Success());
+		LogGuilds("Error renaming guild [{}] [{}]: [{}]", guild_id, query.c_str(), results.Success());
 		safe_delete_array(esc);
 		return false;
 	}
 	safe_delete_array(esc);
 
-	Log(Logs::Detail, Logs::Guilds, "Renamed guild %s (%d) to %s in database.", info->name.c_str(), guild_id, name);
+	LogGuilds("Renamed guild [{}] ([{}]) to [{}] in database", info->name.c_str(), guild_id, name);
 
 	info->name = name;	//update our local record.
 
@@ -588,7 +588,7 @@ bool BaseGuildManager::DBRenameGuild(uint32 guild_id, const char* name) {
 
 bool BaseGuildManager::DBSetGuildLeader(uint32 guild_id, uint32 leader) {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to set the leader for guild %d when we have no database object.", guild_id);
+		LogGuilds("Requested to set the leader for guild [{}] when we have no database object", guild_id);
 		return false;
 	}
 
@@ -614,7 +614,7 @@ bool BaseGuildManager::DBSetGuildLeader(uint32 guild_id, uint32 leader) {
 	if(!DBSetGuildRank(leader, GUILD_LEADER))
 		return false;
 
-	Log(Logs::Detail, Logs::Guilds, "Set guild leader for guild %d to %d in the database", guild_id, leader);
+	LogGuilds("Set guild leader for guild [{}] to [{}] in the database", guild_id, leader);
 
 	info->leader_char_id = leader;	//update our local record.
 
@@ -623,7 +623,7 @@ bool BaseGuildManager::DBSetGuildLeader(uint32 guild_id, uint32 leader) {
 
 bool BaseGuildManager::DBSetGuildMOTD(uint32 guild_id, const char* motd, const char *setter) {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to set the MOTD for guild %d when we have no database object.", guild_id);
+		LogGuilds("Requested to set the MOTD for guild [{}] when we have no database object", guild_id);
 		return(false);
 	}
 
@@ -654,7 +654,7 @@ bool BaseGuildManager::DBSetGuildMOTD(uint32 guild_id, const char* motd, const c
 	safe_delete_array(esc);
 	safe_delete_array(esc_set);
 
-	Log(Logs::Detail, Logs::Guilds, "Set MOTD for guild %d in the database", guild_id);
+	LogGuilds("Set MOTD for guild [{}] in the database", guild_id);
 
 	info->motd = motd;	//update our local record.
 	info->motd_setter = setter;	//update our local record.
@@ -688,7 +688,7 @@ bool BaseGuildManager::DBSetGuildURL(uint32 GuildID, const char* URL)
 	}
 	safe_delete_array(esc);
 
-	Log(Logs::Detail, Logs::Guilds, "Set URL for guild %d in the database", GuildID);
+	LogGuilds("Set URL for guild [{}] in the database", GuildID);
 
 	info->url = URL;	//update our local record.
 
@@ -722,7 +722,7 @@ bool BaseGuildManager::DBSetGuildChannel(uint32 GuildID, const char* Channel)
 	}
 	safe_delete_array(esc);
 
-	Log(Logs::Detail, Logs::Guilds, "Set Channel for guild %d in the database", GuildID);
+	LogGuilds("Set Channel for guild [{}] in the database", GuildID);
 
 	info->channel = Channel;	//update our local record.
 
@@ -731,7 +731,7 @@ bool BaseGuildManager::DBSetGuildChannel(uint32 GuildID, const char* Channel)
 
 bool BaseGuildManager::DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank) {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested to set char to guild %d when we have no database object.", guild_id);
+		LogGuilds("Requested to set char to guild [{}] when we have no database object", guild_id);
 		return(false);
 	}
 
@@ -753,7 +753,7 @@ bool BaseGuildManager::DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank) {
 			return false;
 		}
     }
-	Log(Logs::Detail, Logs::Guilds, "Set char %d to guild %d and rank %d in the database.", charid, guild_id, rank);
+	LogGuilds("Set char [{}] to guild [{}] and rank [{}] in the database", charid, guild_id, rank);
 	return true;
 }
 
@@ -845,7 +845,7 @@ bool BaseGuildManager::DBSetPublicNote(uint32 charid, const char* note) {
 		return false;
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Set public not for char %d", charid);
+	LogGuilds("Set public not for char [{}]", charid);
 
 	return true;
 }
@@ -924,14 +924,14 @@ bool BaseGuildManager::GetEntireGuild(uint32 guild_id, std::vector<CharGuildInfo
 		members.push_back(ci);
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Retreived entire guild member list for guild %d from the database", guild_id);
+	LogGuilds("Retreived entire guild member list for guild [{}] from the database", guild_id);
 
 	return true;
 }
 
 bool BaseGuildManager::GetCharInfo(const char *char_name, CharGuildInfo &into) {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested char info on %s when we have no database object.", char_name);
+		LogGuilds("Requested char info on [{}] when we have no database object", char_name);
 		return(false);
 	}
 
@@ -953,7 +953,7 @@ bool BaseGuildManager::GetCharInfo(const char *char_name, CharGuildInfo &into) {
 
     auto row = results.begin();
     ProcessGuildMember(row, into);
-    Log(Logs::Detail, Logs::Guilds, "Retreived guild member info for char %s from the database", char_name);
+    LogGuilds("Retreived guild member info for char [{}] from the database", char_name);
 
 	return true;
 
@@ -962,7 +962,7 @@ bool BaseGuildManager::GetCharInfo(const char *char_name, CharGuildInfo &into) {
 
 bool BaseGuildManager::GetCharInfo(uint32 char_id, CharGuildInfo &into) {
 	if(m_db == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Requested char info on %d when we have no database object.", char_id);
+		LogGuilds("Requested char info on [{}] when we have no database object", char_id);
 		return false;
 	}
 
@@ -983,7 +983,7 @@ bool BaseGuildManager::GetCharInfo(uint32 char_id, CharGuildInfo &into) {
 
     auto row = results.begin();
     ProcessGuildMember(row, into);
-    Log(Logs::Detail, Logs::Guilds, "Retreived guild member info for char %d", char_id);
+    LogGuilds("Retreived guild member info for char [{}]", char_id);
 
 	return true;
 
@@ -1098,16 +1098,16 @@ bool BaseGuildManager::GuildExists(uint32 guild_id) const {
 
 bool BaseGuildManager::IsGuildLeader(uint32 guild_id, uint32 char_id) const {
 	if(guild_id == GUILD_NONE) {
-		Log(Logs::Detail, Logs::Guilds, "Check leader for char %d: not a guild.", char_id);
+		LogGuilds("Check leader for char [{}]: not a guild", char_id);
 		return(false);
 	}
 	std::map<uint32, GuildInfo *>::const_iterator res;
 	res = m_guilds.find(guild_id);
 	if(res == m_guilds.end()) {
-		Log(Logs::Detail, Logs::Guilds, "Check leader for char %d: invalid guild.", char_id);
+		LogGuilds("Check leader for char [{}]: invalid guild", char_id);
 		return(false);	//invalid guild
 	}
-	Log(Logs::Detail, Logs::Guilds, "Check leader for guild %d, char %d: leader id=%d", guild_id, char_id, res->second->leader_char_id);
+	LogGuilds("Check leader for guild [{}], char [{}]: leader id=[{}]", guild_id, char_id, res->second->leader_char_id);
 	return(char_id == res->second->leader_char_id);
 }
 
@@ -1137,20 +1137,20 @@ uint8 BaseGuildManager::GetDisplayedRank(uint32 guild_id, uint8 rank, uint32 cha
 
 bool BaseGuildManager::CheckGMStatus(uint32 guild_id, uint8 status) const {
 	if(status >= 250) {
-		Log(Logs::Detail, Logs::Guilds, "Check permission on guild %d with user status %d > 250, granted.", guild_id, status);
+		LogGuilds("Check permission on guild [{}] with user status [{}] > 250, granted", guild_id, status);
 		return(true);	//250+ as allowed anything
 	}
 
 	std::map<uint32, GuildInfo *>::const_iterator res;
 	res = m_guilds.find(guild_id);
 	if(res == m_guilds.end()) {
-		Log(Logs::Detail, Logs::Guilds, "Check permission on guild %d with user status %d, no such guild, denied.", guild_id, status);
+		LogGuilds("Check permission on guild [{}] with user status [{}], no such guild, denied", guild_id, status);
 		return(false);	//invalid guild
 	}
 
 	bool granted = (res->second->minstatus <= status);
 
-	Log(Logs::Detail, Logs::Guilds, "Check permission on guild %s (%d) with user status %d. Min status %d: %s",
+	LogGuilds("Check permission on guild [{}] ([{}]) with user status [{}]. Min status [{}]: [{}]",
 		res->second->name.c_str(), guild_id, status, res->second->minstatus, granted?"granted":"denied");
 
 	return(granted);
@@ -1158,21 +1158,21 @@ bool BaseGuildManager::CheckGMStatus(uint32 guild_id, uint8 status) const {
 
 bool BaseGuildManager::CheckPermission(uint32 guild_id, uint8 rank, GuildAction act) const {
 	if(rank > GUILD_MAX_RANK) {
-		Log(Logs::Detail, Logs::Guilds, "Check permission on guild %d and rank %d for action %s (%d): Invalid rank, denied.",
+		LogGuilds("Check permission on guild [{}] and rank [{}] for action [{}] ([{}]): Invalid rank, denied",
 			guild_id, rank, GuildActionNames[act], act);
 		return(false);	//invalid rank
 	}
 	std::map<uint32, GuildInfo *>::const_iterator res;
 	res = m_guilds.find(guild_id);
 	if(res == m_guilds.end()) {
-		Log(Logs::Detail, Logs::Guilds, "Check permission on guild %d and rank %d for action %s (%d): Invalid guild, denied.",
+		LogGuilds("Check permission on guild [{}] and rank [{}] for action [{}] ([{}]): Invalid guild, denied",
 			guild_id, rank, GuildActionNames[act], act);
 		return(false);	//invalid guild
 	}
 
 	bool granted = res->second->ranks[rank].permissions[act];
 
-	Log(Logs::Detail, Logs::Guilds, "Check permission on guild %s (%d) and rank %s (%d) for action %s (%d): %s",
+	LogGuilds("Check permission on guild [{}] ([{}]) and rank [{}] ([{}]) for action [{}] ([{}]): [{}]",
 		res->second->name.c_str(), guild_id,
 		res->second->ranks[rank].name.c_str(), rank,
 		GuildActionNames[act], act,
diff --git a/common/http/httplib.h b/common/http/httplib.h
new file mode 100644
index 000000000..827d5f1e0
--- /dev/null
+++ b/common/http/httplib.h
@@ -0,0 +1,2694 @@
+//
+//  httplib.h
+//
+//  Copyright (c) 2019 Yuji Hirose. All rights reserved.
+//  MIT License
+//
+
+#ifndef CPPHTTPLIB_HTTPLIB_H
+#define CPPHTTPLIB_HTTPLIB_H
+
+#ifdef _WIN32
+#ifndef _CRT_SECURE_NO_WARNINGS
+#define _CRT_SECURE_NO_WARNINGS
+#endif //_CRT_SECURE_NO_WARNINGS
+
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif //_CRT_NONSTDC_NO_DEPRECATE
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf_s
+#endif // _MSC_VER
+
+#ifndef S_ISREG
+#define S_ISREG(m) (((m)&S_IFREG) == S_IFREG)
+#endif // S_ISREG
+
+#ifndef S_ISDIR
+#define S_ISDIR(m) (((m)&S_IFDIR) == S_IFDIR)
+#endif // S_ISDIR
+
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif // NOMINMAX
+
+#include <io.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+
+#pragma comment(lib, "ws2_32.lib")
+
+#ifndef strcasecmp
+#define strcasecmp _stricmp
+#endif // strcasecmp
+
+typedef SOCKET socket_t;
+#else
+#include <arpa/inet.h>
+#include <cstring>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <pthread.h>
+#include <signal.h>
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+typedef int socket_t;
+#define INVALID_SOCKET (-1)
+#endif //_WIN32
+
+#include <assert.h>
+#include <fcntl.h>
+#include <fstream>
+#include <functional>
+#include <map>
+#include <memory>
+#include <mutex>
+#include <regex>
+#include <string>
+#include <sys/stat.h>
+#include <thread>
+#include <atomic>
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+#include <openssl/err.h>
+#include <openssl/ssl.h>
+#include <openssl/x509v3.h>
+
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) {
+  return M_ASN1_STRING_data(asn1);
+}
+#endif
+#endif
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+#include <zlib.h>
+#endif
+
+/*
+ * Configuration
+ */
+#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5
+#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND 0
+#define CPPHTTPLIB_KEEPALIVE_MAX_COUNT 5
+#define CPPHTTPLIB_READ_TIMEOUT_SECOND 5
+#define CPPHTTPLIB_READ_TIMEOUT_USECOND 0
+#define CPPHTTPLIB_REQUEST_URI_MAX_LENGTH 8192
+#define CPPHTTPLIB_PAYLOAD_MAX_LENGTH (std::numeric_limits<size_t>::max)()
+#define CPPHTTPLIB_RECV_BUFSIZ 4096
+
+namespace httplib {
+
+	namespace detail {
+
+		struct ci {
+			bool operator()(const std::string &s1, const std::string &s2) const {
+				return std::lexicographical_compare(
+					s1.begin(), s1.end(), s2.begin(), s2.end(),
+					[](char c1, char c2) { return ::tolower(c1) < ::tolower(c2); });
+			}
+		};
+
+	} // namespace detail
+
+	enum class HttpVersion { v1_0 = 0, v1_1 };
+
+	typedef std::multimap<std::string, std::string, detail::ci> Headers;
+
+	template <typename uint64_t, typename... Args>
+	std::pair<std::string, std::string> make_range_header(uint64_t value,
+														  Args... args);
+
+	typedef std::multimap<std::string, std::string> Params;
+	typedef std::smatch Match;
+	typedef std::function<bool(uint64_t current, uint64_t total)> Progress;
+
+	struct MultipartFile {
+		std::string filename;
+		std::string content_type;
+		size_t offset = 0;
+		size_t length = 0;
+	};
+	typedef std::multimap<std::string, MultipartFile> MultipartFiles;
+
+	struct Request {
+		std::string version;
+		std::string method;
+		std::string target;
+		std::string path;
+		Headers headers;
+		std::string body;
+		Params params;
+		MultipartFiles files;
+		Match matches;
+
+		Progress progress;
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+		const SSL *ssl;
+#endif
+
+		bool has_header(const char *key) const;
+		std::string get_header_value(const char *key, size_t id = 0) const;
+		size_t get_header_value_count(const char *key) const;
+		void set_header(const char *key, const char *val);
+
+		bool has_param(const char *key) const;
+		std::string get_param_value(const char *key, size_t id = 0) const;
+		size_t get_param_value_count(const char *key) const;
+
+		bool has_file(const char *key) const;
+		MultipartFile get_file_value(const char *key) const;
+	};
+
+	struct Response {
+		std::string version;
+		int status;
+		Headers headers;
+		std::string body;
+		std::function<std::string(uint64_t offset)> streamcb;
+
+		bool has_header(const char *key) const;
+		std::string get_header_value(const char *key, size_t id = 0) const;
+		size_t get_header_value_count(const char *key) const;
+		void set_header(const char *key, const char *val);
+
+		void set_redirect(const char *uri);
+		void set_content(const char *s, size_t n, const char *content_type);
+		void set_content(const std::string &s, const char *content_type);
+
+		Response() : status(-1) {}
+	};
+
+	class Stream {
+	public:
+		virtual ~Stream() {}
+		virtual int read(char *ptr, size_t size) = 0;
+		virtual int write(const char *ptr, size_t size1) = 0;
+		virtual int write(const char *ptr) = 0;
+		virtual std::string get_remote_addr() const = 0;
+
+		template <typename... Args>
+		void write_format(const char *fmt, const Args &... args);
+	};
+
+	class SocketStream : public Stream {
+	public:
+		SocketStream(socket_t sock);
+		virtual ~SocketStream();
+
+		virtual int read(char *ptr, size_t size);
+		virtual int write(const char *ptr, size_t size);
+		virtual int write(const char *ptr);
+		virtual std::string get_remote_addr() const;
+
+	private:
+		socket_t sock_;
+	};
+
+	class BufferStream : public Stream {
+	public:
+		BufferStream() {}
+		virtual ~BufferStream() {}
+
+		virtual int read(char *ptr, size_t size);
+		virtual int write(const char *ptr, size_t size);
+		virtual int write(const char *ptr);
+		virtual std::string get_remote_addr() const;
+
+		const std::string &get_buffer() const;
+
+	private:
+		std::string buffer;
+	};
+
+	class Server {
+	public:
+		typedef std::function<void(const Request &, Response &)> Handler;
+		typedef std::function<void(const Request &, const Response &)> Logger;
+
+		Server();
+
+		virtual ~Server();
+
+		virtual bool is_valid() const;
+
+		Server &Get(const char *pattern, Handler handler);
+		Server &Post(const char *pattern, Handler handler);
+
+		Server &Put(const char *pattern, Handler handler);
+		Server &Patch(const char *pattern, Handler handler);
+		Server &Delete(const char *pattern, Handler handler);
+		Server &Options(const char *pattern, Handler handler);
+
+		bool set_base_dir(const char *path);
+
+		void set_error_handler(Handler handler);
+		void set_logger(Logger logger);
+
+		void set_keep_alive_max_count(size_t count);
+		void set_payload_max_length(uint64_t length);
+
+		int bind_to_any_port(const char *host, int socket_flags = 0);
+
+		bool bind(const char *host, int port, int socket_flags = 0)
+		{
+			if (bind_internal(host, port, socket_flags) < 0) return false;
+
+			return true;
+		}
+
+		bool poll();
+
+		bool listen_after_bind();
+
+		bool listen(const char *host, int port, int socket_flags = 0);
+
+		bool is_running() const;
+		void stop();
+
+	protected:
+		bool process_request(Stream &strm, bool last_connection,
+							 bool &connection_close,
+							 std::function<void(Request &)> setup_request = nullptr);
+
+		size_t keep_alive_max_count_;
+		size_t payload_max_length_;
+
+	private:
+		typedef std::vector<std::pair<std::regex, Handler>> Handlers;
+
+		socket_t create_server_socket(const char *host, int port,
+									  int socket_flags) const;
+		int bind_internal(const char *host, int port, int socket_flags);
+		bool listen_internal();
+
+		bool routing(Request &req, Response &res);
+		bool handle_file_request(Request &req, Response &res);
+		bool dispatch_request(Request &req, Response &res, Handlers &handlers);
+
+		bool parse_request_line(const char *s, Request &req);
+		void write_response(Stream &strm, bool last_connection, const Request &req,
+							Response &res);
+
+		virtual bool read_and_close_socket(socket_t sock);
+
+		std::atomic<bool> is_running_;
+		std::atomic<socket_t> svr_sock_;
+		std::string base_dir_;
+		Handlers get_handlers_;
+		Handlers post_handlers_;
+		Handlers put_handlers_;
+		Handlers patch_handlers_;
+		Handlers delete_handlers_;
+		Handlers options_handlers_;
+		Handler error_handler_;
+		Logger logger_;
+
+		// TODO: Use thread pool...
+		std::mutex running_threads_mutex_;
+		int running_threads_;
+	};
+
+	class Client {
+	public:
+		Client(const char *host, int port = 80, time_t timeout_sec = 300);
+
+		virtual ~Client();
+
+		virtual bool is_valid() const;
+
+		std::shared_ptr<Response> Get(const char *path, Progress progress = nullptr);
+		std::shared_ptr<Response> Get(const char *path, const Headers &headers,
+									  Progress progress = nullptr);
+
+		std::shared_ptr<Response> Head(const char *path);
+		std::shared_ptr<Response> Head(const char *path, const Headers &headers);
+
+		std::shared_ptr<Response> Post(const char *path, const std::string &body,
+									   const char *content_type);
+		std::shared_ptr<Response> Post(const char *path, const Headers &headers,
+									   const std::string &body,
+									   const char *content_type);
+
+		std::shared_ptr<Response> Post(const char *path, const Params &params);
+		std::shared_ptr<Response> Post(const char *path, const Headers &headers,
+									   const Params &params);
+
+		std::shared_ptr<Response> Put(const char *path, const std::string &body,
+									  const char *content_type);
+		std::shared_ptr<Response> Put(const char *path, const Headers &headers,
+									  const std::string &body,
+									  const char *content_type);
+
+		std::shared_ptr<Response> Patch(const char *path, const std::string &body,
+										const char *content_type);
+		std::shared_ptr<Response> Patch(const char *path, const Headers &headers,
+										const std::string &body,
+										const char *content_type);
+
+		std::shared_ptr<Response> Delete(const char *path,
+										 const std::string &body = std::string(),
+										 const char *content_type = nullptr);
+		std::shared_ptr<Response> Delete(const char *path, const Headers &headers,
+										 const std::string &body = std::string(),
+										 const char *content_type = nullptr);
+
+		std::shared_ptr<Response> Options(const char *path);
+		std::shared_ptr<Response> Options(const char *path, const Headers &headers);
+
+		bool send(Request &req, Response &res);
+
+	protected:
+		bool process_request(Stream &strm, Request &req, Response &res,
+							 bool &connection_close);
+
+		const std::string host_;
+		const int port_;
+		time_t timeout_sec_;
+		const std::string host_and_port_;
+
+	private:
+		socket_t create_client_socket() const;
+		bool read_response_line(Stream &strm, Response &res);
+		void write_request(Stream &strm, Request &req);
+
+		virtual bool read_and_close_socket(socket_t sock, Request &req,
+										   Response &res);
+		virtual bool is_ssl() const;
+	};
+
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+	class SSLSocketStream : public Stream {
+public:
+  SSLSocketStream(socket_t sock, SSL *ssl);
+  virtual ~SSLSocketStream();
+
+  virtual int read(char *ptr, size_t size);
+  virtual int write(const char *ptr, size_t size);
+  virtual int write(const char *ptr);
+  virtual std::string get_remote_addr() const;
+
+private:
+  socket_t sock_;
+  SSL *ssl_;
+};
+
+class SSLServer : public Server {
+public:
+  SSLServer(const char *cert_path, const char *private_key_path,
+            const char *client_ca_cert_file_path = nullptr,
+            const char *client_ca_cert_dir_path = nullptr);
+
+  virtual ~SSLServer();
+
+  virtual bool is_valid() const;
+
+private:
+  virtual bool read_and_close_socket(socket_t sock);
+
+  SSL_CTX *ctx_;
+  std::mutex ctx_mutex_;
+};
+
+class SSLClient : public Client {
+public:
+  SSLClient(const char *host, int port = 443, time_t timeout_sec = 300,
+            const char *client_cert_path = nullptr,
+            const char *client_key_path = nullptr);
+
+  virtual ~SSLClient();
+
+  virtual bool is_valid() const;
+
+  void set_ca_cert_path(const char *ca_ceert_file_path,
+                        const char *ca_cert_dir_path = nullptr);
+  void enable_server_certificate_verification(bool enabled);
+
+  long get_openssl_verify_result() const;
+
+private:
+  virtual bool read_and_close_socket(socket_t sock, Request &req,
+                                     Response &res);
+  virtual bool is_ssl() const;
+
+  bool verify_host(X509 *server_cert) const;
+  bool verify_host_with_subject_alt_name(X509 *server_cert) const;
+  bool verify_host_with_common_name(X509 *server_cert) const;
+  bool check_host_name(const char *pattern, size_t pattern_len) const;
+
+  SSL_CTX *ctx_;
+  std::mutex ctx_mutex_;
+  std::vector<std::string> host_components_;
+  std::string ca_cert_file_path_;
+  std::string ca_cert_dir_path_;
+  bool server_certificate_verification_ = false;
+  long verify_result_ = 0;
+};
+#endif
+
+/*
+ * Implementation
+ */
+	namespace detail {
+
+		template <class Fn> void split(const char *b, const char *e, char d, Fn fn) {
+			int i = 0;
+			int beg = 0;
+
+			while (e ? (b + i != e) : (b[i] != '\0')) {
+				if (b[i] == d) {
+					fn(&b[beg], &b[i]);
+					beg = i + 1;
+				}
+				i++;
+			}
+
+			if (i) { fn(&b[beg], &b[i]); }
+		}
+
+// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer`
+// to store data. The call can set memory on stack for performance.
+		class stream_line_reader {
+		public:
+			stream_line_reader(Stream &strm, char *fixed_buffer, size_t fixed_buffer_size)
+				: strm_(strm), fixed_buffer_(fixed_buffer),
+				  fixed_buffer_size_(fixed_buffer_size) {}
+
+			const char *ptr() const {
+				if (glowable_buffer_.empty()) {
+					return fixed_buffer_;
+				} else {
+					return glowable_buffer_.data();
+				}
+			}
+
+			size_t size() const {
+				if (glowable_buffer_.empty()) {
+					return fixed_buffer_used_size_;
+				} else {
+					return glowable_buffer_.size();
+				}
+			}
+
+			bool getline() {
+				fixed_buffer_used_size_ = 0;
+				glowable_buffer_.clear();
+
+				for (size_t i = 0;; i++) {
+					char byte;
+					auto n = strm_.read(&byte, 1);
+
+					if (n < 0) {
+						return false;
+					} else if (n == 0) {
+						if (i == 0) {
+							return false;
+						} else {
+							break;
+						}
+					}
+
+					append(byte);
+
+					if (byte == '\n') { break; }
+				}
+
+				return true;
+			}
+
+		private:
+			void append(char c) {
+				if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) {
+					fixed_buffer_[fixed_buffer_used_size_++] = c;
+					fixed_buffer_[fixed_buffer_used_size_] = '\0';
+				} else {
+					if (glowable_buffer_.empty()) {
+						assert(fixed_buffer_[fixed_buffer_used_size_] == '\0');
+						glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_);
+					}
+					glowable_buffer_ += c;
+				}
+			}
+
+			Stream &strm_;
+			char *fixed_buffer_;
+			const size_t fixed_buffer_size_;
+			size_t fixed_buffer_used_size_;
+			std::string glowable_buffer_;
+		};
+
+		inline int close_socket(socket_t sock) {
+#ifdef _WIN32
+			return closesocket(sock);
+#else
+			return close(sock);
+#endif
+		}
+
+		inline int select_read(socket_t sock, time_t sec, time_t usec) {
+			fd_set fds;
+			FD_ZERO(&fds);
+			FD_SET(sock, &fds);
+
+			timeval tv;
+			tv.tv_sec = static_cast<long>(sec);
+			tv.tv_usec = static_cast<long>(usec);
+
+			return select(static_cast<int>(sock + 1), &fds, nullptr, nullptr, &tv);
+		}
+
+		inline bool wait_until_socket_is_ready(socket_t sock, time_t sec, time_t usec) {
+			fd_set fdsr;
+			FD_ZERO(&fdsr);
+			FD_SET(sock, &fdsr);
+
+			auto fdsw = fdsr;
+			auto fdse = fdsr;
+
+			timeval tv;
+			tv.tv_sec = static_cast<long>(sec);
+			tv.tv_usec = static_cast<long>(usec);
+
+			if (select(static_cast<int>(sock + 1), &fdsr, &fdsw, &fdse, &tv) < 0) {
+				return false;
+			} else if (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw)) {
+				int error = 0;
+				socklen_t len = sizeof(error);
+				if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (char *)&error, &len) < 0 ||
+					error) {
+					return false;
+				}
+			} else {
+				return false;
+			}
+
+			return true;
+		}
+
+		template <typename T>
+		inline bool read_and_close_socket(socket_t sock, size_t keep_alive_max_count,
+										  T callback) {
+			bool ret = false;
+
+			if (keep_alive_max_count > 0) {
+				auto count = keep_alive_max_count;
+				while (count > 0 &&
+					   detail::select_read(sock, CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND,
+										   CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND) > 0) {
+					SocketStream strm(sock);
+					auto last_connection = count == 1;
+					auto connection_close = false;
+
+					ret = callback(strm, last_connection, connection_close);
+					if (!ret || connection_close) { break; }
+
+					count--;
+				}
+			} else {
+				SocketStream strm(sock);
+				auto dummy_connection_close = false;
+				ret = callback(strm, true, dummy_connection_close);
+			}
+
+			close_socket(sock);
+			return ret;
+		}
+
+		inline int shutdown_socket(socket_t sock) {
+#ifdef _WIN32
+			return shutdown(sock, SD_BOTH);
+#else
+			return shutdown(sock, SHUT_RDWR);
+#endif
+		}
+
+		template <typename Fn>
+		socket_t create_socket(const char *host, int port, Fn fn,
+							   int socket_flags = 0) {
+#ifdef _WIN32
+			#define SO_SYNCHRONOUS_NONALERT 0x20
+#define SO_OPENTYPE 0x7008
+
+  int opt = SO_SYNCHRONOUS_NONALERT;
+  setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char *)&opt,
+             sizeof(opt));
+#endif
+
+			// Get address info
+			struct addrinfo hints;
+			struct addrinfo *result;
+
+			memset(&hints, 0, sizeof(struct addrinfo));
+			hints.ai_family = AF_UNSPEC;
+			hints.ai_socktype = SOCK_STREAM;
+			hints.ai_flags = socket_flags;
+			hints.ai_protocol = 0;
+
+			auto service = std::to_string(port);
+
+			if (getaddrinfo(host, service.c_str(), &hints, &result)) {
+				return INVALID_SOCKET;
+			}
+
+			for (auto rp = result; rp; rp = rp->ai_next) {
+				// Create a socket
+#ifdef _WIN32
+				auto sock = WSASocketW(rp->ai_family, rp->ai_socktype, rp->ai_protocol,
+                           nullptr, 0, WSA_FLAG_NO_HANDLE_INHERIT);
+#else
+				auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+#endif
+				if (sock == INVALID_SOCKET) { continue; }
+
+#ifndef _WIN32
+				if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) { continue; }
+#endif
+
+				// Make 'reuse address' option available
+				int yes = 1;
+				setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&yes, sizeof(yes));
+#ifdef SO_REUSEPORT
+				setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, (char *)&yes, sizeof(yes));
+#endif
+
+				// bind or connect
+				if (fn(sock, *rp)) {
+					freeaddrinfo(result);
+					return sock;
+				}
+
+				close_socket(sock);
+			}
+
+			freeaddrinfo(result);
+			return INVALID_SOCKET;
+		}
+
+		inline void set_nonblocking(socket_t sock, bool nonblocking) {
+#ifdef _WIN32
+			auto flags = nonblocking ? 1UL : 0UL;
+  ioctlsocket(sock, FIONBIO, &flags);
+#else
+			auto flags = fcntl(sock, F_GETFL, 0);
+			fcntl(sock, F_SETFL,
+				  nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK)));
+#endif
+		}
+
+		inline bool is_connection_error() {
+#ifdef _WIN32
+			return WSAGetLastError() != WSAEWOULDBLOCK;
+#else
+			return errno != EINPROGRESS;
+#endif
+		}
+
+		inline std::string get_remote_addr(socket_t sock) {
+			struct sockaddr_storage addr;
+			socklen_t len = sizeof(addr);
+
+			if (!getpeername(sock, (struct sockaddr *)&addr, &len)) {
+				char ipstr[NI_MAXHOST];
+
+				if (!getnameinfo((struct sockaddr *)&addr, len, ipstr, sizeof(ipstr),
+								 nullptr, 0, NI_NUMERICHOST)) {
+					return ipstr;
+				}
+			}
+
+			return std::string();
+		}
+
+		inline bool is_file(const std::string &path) {
+			struct stat st;
+			return stat(path.c_str(), &st) >= 0 && S_ISREG(st.st_mode);
+		}
+
+		inline bool is_dir(const std::string &path) {
+			struct stat st;
+			return stat(path.c_str(), &st) >= 0 && S_ISDIR(st.st_mode);
+		}
+
+		inline bool is_valid_path(const std::string &path) {
+			size_t level = 0;
+			size_t i = 0;
+
+			// Skip slash
+			while (i < path.size() && path[i] == '/') {
+				i++;
+			}
+
+			while (i < path.size()) {
+				// Read component
+				auto beg = i;
+				while (i < path.size() && path[i] != '/') {
+					i++;
+				}
+
+				auto len = i - beg;
+				assert(len > 0);
+
+				if (!path.compare(beg, len, ".")) {
+					;
+				} else if (!path.compare(beg, len, "..")) {
+					if (level == 0) { return false; }
+					level--;
+				} else {
+					level++;
+				}
+
+				// Skip slash
+				while (i < path.size() && path[i] == '/') {
+					i++;
+				}
+			}
+
+			return true;
+		}
+
+		inline void read_file(const std::string &path, std::string &out) {
+			std::ifstream fs(path, std::ios_base::binary);
+			fs.seekg(0, std::ios_base::end);
+			auto size = fs.tellg();
+			fs.seekg(0);
+			out.resize(static_cast<size_t>(size));
+			fs.read(&out[0], size);
+		}
+
+		inline std::string file_extension(const std::string &path) {
+			std::smatch m;
+			auto pat = std::regex("\\.([a-zA-Z0-9]+)$");
+			if (std::regex_search(path, m, pat)) { return m[1].str(); }
+			return std::string();
+		}
+
+		inline const char *find_content_type(const std::string &path) {
+			auto ext = file_extension(path);
+			if (ext == "txt") {
+				return "text/plain";
+			} else if (ext == "html") {
+				return "text/html";
+			} else if (ext == "css") {
+				return "text/css";
+			} else if (ext == "jpeg" || ext == "jpg") {
+				return "image/jpg";
+			} else if (ext == "png") {
+				return "image/png";
+			} else if (ext == "gif") {
+				return "image/gif";
+			} else if (ext == "svg") {
+				return "image/svg+xml";
+			} else if (ext == "ico") {
+				return "image/x-icon";
+			} else if (ext == "json") {
+				return "application/json";
+			} else if (ext == "pdf") {
+				return "application/pdf";
+			} else if (ext == "js") {
+				return "application/javascript";
+			} else if (ext == "xml") {
+				return "application/xml";
+			} else if (ext == "xhtml") {
+				return "application/xhtml+xml";
+			}
+			return nullptr;
+		}
+
+		inline const char *status_message(int status) {
+			switch (status) {
+				case 200: return "OK";
+				case 301: return "Moved Permanently";
+				case 302: return "Found";
+				case 303: return "See Other";
+				case 304: return "Not Modified";
+				case 400: return "Bad Request";
+				case 403: return "Forbidden";
+				case 404: return "Not Found";
+				case 413: return "Payload Too Large";
+				case 414: return "Request-URI Too Long";
+				case 415: return "Unsupported Media Type";
+				default:
+				case 500: return "Internal Server Error";
+			}
+		}
+
+		inline bool has_header(const Headers &headers, const char *key) {
+			return headers.find(key) != headers.end();
+		}
+
+		inline const char *get_header_value(const Headers &headers, const char *key,
+											size_t id = 0, const char *def = nullptr) {
+			auto it = headers.find(key);
+			std::advance(it, id);
+			if (it != headers.end()) { return it->second.c_str(); }
+			return def;
+		}
+
+		inline uint64_t get_header_value_uint64(const Headers &headers, const char *key,
+												int def = 0) {
+			auto it = headers.find(key);
+			if (it != headers.end()) {
+				return std::strtoull(it->second.data(), nullptr, 10);
+			}
+			return def;
+		}
+
+		inline bool read_headers(Stream &strm, Headers &headers) {
+			static std::regex re(R"((.+?):\s*(.+?)\s*\r\n)");
+
+			const auto bufsiz = 2048;
+			char buf[bufsiz];
+
+			stream_line_reader reader(strm, buf, bufsiz);
+
+			for (;;) {
+				if (!reader.getline()) { return false; }
+				if (!strcmp(reader.ptr(), "\r\n")) { break; }
+				std::cmatch m;
+				if (std::regex_match(reader.ptr(), m, re)) {
+					auto key = std::string(m[1]);
+					auto val = std::string(m[2]);
+					headers.emplace(key, val);
+				}
+			}
+
+			return true;
+		}
+
+		inline bool read_content_with_length(Stream &strm, std::string &out, size_t len,
+											 Progress progress) {
+			out.assign(len, 0);
+			size_t r = 0;
+			while (r < len) {
+				auto n = strm.read(&out[r], len - r);
+				if (n <= 0) { return false; }
+
+				r += n;
+
+				if (progress) {
+					if (!progress(r, len)) { return false; }
+				}
+			}
+
+			return true;
+		}
+
+		inline void skip_content_with_length(Stream &strm, size_t len) {
+			char buf[CPPHTTPLIB_RECV_BUFSIZ];
+			size_t r = 0;
+			while (r < len) {
+				auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
+				if (n <= 0) { return; }
+				r += n;
+			}
+		}
+
+		inline bool read_content_without_length(Stream &strm, std::string &out) {
+			char buf[CPPHTTPLIB_RECV_BUFSIZ];
+			for (;;) {
+				auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ);
+				if (n < 0) {
+					return false;
+				} else if (n == 0) {
+					return true;
+				}
+				out.append(buf, n);
+			}
+
+			return true;
+		}
+
+		inline bool read_content_chunked(Stream &strm, std::string &out) {
+			const auto bufsiz = 16;
+			char buf[bufsiz];
+
+			stream_line_reader reader(strm, buf, bufsiz);
+
+			if (!reader.getline()) { return false; }
+
+			auto chunk_len = std::stoi(reader.ptr(), 0, 16);
+
+			while (chunk_len > 0) {
+				std::string chunk;
+				if (!read_content_with_length(strm, chunk, chunk_len, nullptr)) {
+					return false;
+				}
+
+				if (!reader.getline()) { return false; }
+
+				if (strcmp(reader.ptr(), "\r\n")) { break; }
+
+				out += chunk;
+
+				if (!reader.getline()) { return false; }
+
+				chunk_len = std::stoi(reader.ptr(), 0, 16);
+			}
+
+			if (chunk_len == 0) {
+				// Reader terminator after chunks
+				if (!reader.getline() || strcmp(reader.ptr(), "\r\n")) return false;
+			}
+
+			return true;
+		}
+
+		template <typename T>
+		bool read_content(Stream &strm, T &x, uint64_t payload_max_length,
+						  bool &exceed_payload_max_length,
+						  Progress progress = Progress()) {
+			if (has_header(x.headers, "Content-Length")) {
+				auto len = get_header_value_uint64(x.headers, "Content-Length", 0);
+				if (len == 0) {
+					const auto &encoding =
+								   get_header_value(x.headers, "Transfer-Encoding", 0, "");
+					if (!strcasecmp(encoding, "chunked")) {
+						return read_content_chunked(strm, x.body);
+					}
+				}
+
+				if ((len > payload_max_length) ||
+					// For 32-bit platform
+					(sizeof(size_t) < sizeof(uint64_t) &&
+					 len > std::numeric_limits<size_t>::max())) {
+					exceed_payload_max_length = true;
+					skip_content_with_length(strm, len);
+					return false;
+				}
+
+				return read_content_with_length(strm, x.body, len, progress);
+			} else {
+				const auto &encoding =
+							   get_header_value(x.headers, "Transfer-Encoding", 0, "");
+				if (!strcasecmp(encoding, "chunked")) {
+					return read_content_chunked(strm, x.body);
+				}
+				return read_content_without_length(strm, x.body);
+			}
+			return true;
+		}
+
+		template <typename T> inline void write_headers(Stream &strm, const T &info) {
+			for (const auto &x : info.headers) {
+				strm.write_format("%s: %s\r\n", x.first.c_str(), x.second.c_str());
+			}
+			strm.write("\r\n");
+		}
+
+		inline std::string encode_url(const std::string &s) {
+			std::string result;
+
+			for (auto i = 0; s[i]; i++) {
+				switch (s[i]) {
+					case ' ': result += "%20"; break;
+					case '+': result += "%2B"; break;
+					case '\r': result += "%0D"; break;
+					case '\n': result += "%0A"; break;
+					case '\'': result += "%27"; break;
+					case ',': result += "%2C"; break;
+					case ':': result += "%3A"; break;
+					case ';': result += "%3B"; break;
+					default:
+						auto c = static_cast<uint8_t>(s[i]);
+						if (c >= 0x80) {
+							result += '%';
+							char hex[4];
+							size_t len = snprintf(hex, sizeof(hex) - 1, "%02X", c);
+							assert(len == 2);
+							result.append(hex, len);
+						} else {
+							result += s[i];
+						}
+						break;
+				}
+			}
+
+			return result;
+		}
+
+		inline bool is_hex(char c, int &v) {
+			if (0x20 <= c && isdigit(c)) {
+				v = c - '0';
+				return true;
+			} else if ('A' <= c && c <= 'F') {
+				v = c - 'A' + 10;
+				return true;
+			} else if ('a' <= c && c <= 'f') {
+				v = c - 'a' + 10;
+				return true;
+			}
+			return false;
+		}
+
+		inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt,
+								  int &val) {
+			if (i >= s.size()) { return false; }
+
+			val = 0;
+			for (; cnt; i++, cnt--) {
+				if (!s[i]) { return false; }
+				int v = 0;
+				if (is_hex(s[i], v)) {
+					val = val * 16 + v;
+				} else {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		inline std::string from_i_to_hex(uint64_t n) {
+			const char *charset = "0123456789abcdef";
+			std::string ret;
+			do {
+				ret = charset[n & 15] + ret;
+				n >>= 4;
+			} while (n > 0);
+			return ret;
+		}
+
+		inline size_t to_utf8(int code, char *buff) {
+			if (code < 0x0080) {
+				buff[0] = (code & 0x7F);
+				return 1;
+			} else if (code < 0x0800) {
+				buff[0] = (0xC0 | ((code >> 6) & 0x1F));
+				buff[1] = (0x80 | (code & 0x3F));
+				return 2;
+			} else if (code < 0xD800) {
+				buff[0] = (0xE0 | ((code >> 12) & 0xF));
+				buff[1] = (0x80 | ((code >> 6) & 0x3F));
+				buff[2] = (0x80 | (code & 0x3F));
+				return 3;
+			} else if (code < 0xE000) { // D800 - DFFF is invalid...
+				return 0;
+			} else if (code < 0x10000) {
+				buff[0] = (0xE0 | ((code >> 12) & 0xF));
+				buff[1] = (0x80 | ((code >> 6) & 0x3F));
+				buff[2] = (0x80 | (code & 0x3F));
+				return 3;
+			} else if (code < 0x110000) {
+				buff[0] = (0xF0 | ((code >> 18) & 0x7));
+				buff[1] = (0x80 | ((code >> 12) & 0x3F));
+				buff[2] = (0x80 | ((code >> 6) & 0x3F));
+				buff[3] = (0x80 | (code & 0x3F));
+				return 4;
+			}
+
+			// NOTREACHED
+			return 0;
+		}
+
+		inline std::string decode_url(const std::string &s) {
+			std::string result;
+
+			for (size_t i = 0; i < s.size(); i++) {
+				if (s[i] == '%' && i + 1 < s.size()) {
+					if (s[i + 1] == 'u') {
+						int val = 0;
+						if (from_hex_to_i(s, i + 2, 4, val)) {
+							// 4 digits Unicode codes
+							char buff[4];
+							size_t len = to_utf8(val, buff);
+							if (len > 0) { result.append(buff, len); }
+							i += 5; // 'u0000'
+						} else {
+							result += s[i];
+						}
+					} else {
+						int val = 0;
+						if (from_hex_to_i(s, i + 1, 2, val)) {
+							// 2 digits hex codes
+							result += val;
+							i += 2; // '00'
+						} else {
+							result += s[i];
+						}
+					}
+				} else if (s[i] == '+') {
+					result += ' ';
+				} else {
+					result += s[i];
+				}
+			}
+
+			return result;
+		}
+
+		inline void parse_query_text(const std::string &s, Params &params) {
+			split(&s[0], &s[s.size()], '&', [&](const char *b, const char *e) {
+				std::string key;
+				std::string val;
+				split(b, e, '=', [&](const char *b, const char *e) {
+					if (key.empty()) {
+						key.assign(b, e);
+					} else {
+						val.assign(b, e);
+					}
+				});
+				params.emplace(key, decode_url(val));
+			});
+		}
+
+		inline bool parse_multipart_boundary(const std::string &content_type,
+											 std::string &boundary) {
+			auto pos = content_type.find("boundary=");
+			if (pos == std::string::npos) { return false; }
+
+			boundary = content_type.substr(pos + 9);
+			return true;
+		}
+
+		inline bool parse_multipart_formdata(const std::string &boundary,
+											 const std::string &body,
+											 MultipartFiles &files) {
+			static std::string dash = "--";
+			static std::string crlf = "\r\n";
+
+			static std::regex re_content_type("Content-Type: (.*?)",
+											  std::regex_constants::icase);
+
+			static std::regex re_content_disposition(
+				"Content-Disposition: form-data; name=\"(.*?)\"(?:; filename=\"(.*?)\")?",
+				std::regex_constants::icase);
+
+			auto dash_boundary = dash + boundary;
+
+			auto pos = body.find(dash_boundary);
+			if (pos != 0) { return false; }
+
+			pos += dash_boundary.size();
+
+			auto next_pos = body.find(crlf, pos);
+			if (next_pos == std::string::npos) { return false; }
+
+			pos = next_pos + crlf.size();
+
+			while (pos < body.size()) {
+				next_pos = body.find(crlf, pos);
+				if (next_pos == std::string::npos) { return false; }
+
+				std::string name;
+				MultipartFile file;
+
+				auto header = body.substr(pos, (next_pos - pos));
+
+				while (pos != next_pos) {
+					std::smatch m;
+					if (std::regex_match(header, m, re_content_type)) {
+						file.content_type = m[1];
+					} else if (std::regex_match(header, m, re_content_disposition)) {
+						name = m[1];
+						file.filename = m[2];
+					}
+
+					pos = next_pos + crlf.size();
+
+					next_pos = body.find(crlf, pos);
+					if (next_pos == std::string::npos) { return false; }
+
+					header = body.substr(pos, (next_pos - pos));
+				}
+
+				pos = next_pos + crlf.size();
+
+				next_pos = body.find(crlf + dash_boundary, pos);
+
+				if (next_pos == std::string::npos) { return false; }
+
+				file.offset = pos;
+				file.length = next_pos - pos;
+
+				pos = next_pos + crlf.size() + dash_boundary.size();
+
+				next_pos = body.find(crlf, pos);
+				if (next_pos == std::string::npos) { return false; }
+
+				files.emplace(name, file);
+
+				pos = next_pos + crlf.size();
+			}
+
+			return true;
+		}
+
+		inline std::string to_lower(const char *beg, const char *end) {
+			std::string out;
+			auto it = beg;
+			while (it != end) {
+				out += ::tolower(*it);
+				it++;
+			}
+			return out;
+		}
+
+		inline void make_range_header_core(std::string &) {}
+
+		template <typename uint64_t>
+		inline void make_range_header_core(std::string &field, uint64_t value) {
+			if (!field.empty()) { field += ", "; }
+			field += std::to_string(value) + "-";
+		}
+
+		template <typename uint64_t, typename... Args>
+		inline void make_range_header_core(std::string &field, uint64_t value1,
+										   uint64_t value2, Args... args) {
+			if (!field.empty()) { field += ", "; }
+			field += std::to_string(value1) + "-" + std::to_string(value2);
+			make_range_header_core(field, args...);
+		}
+
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+		inline bool can_compress(const std::string &content_type) {
+  return !content_type.find("text/") || content_type == "image/svg+xml" ||
+         content_type == "application/javascript" ||
+         content_type == "application/json" ||
+         content_type == "application/xml" ||
+         content_type == "application/xhtml+xml";
+}
+
+inline void compress(std::string &content) {
+  z_stream strm;
+  strm.zalloc = Z_NULL;
+  strm.zfree = Z_NULL;
+  strm.opaque = Z_NULL;
+
+  auto ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8,
+                          Z_DEFAULT_STRATEGY);
+  if (ret != Z_OK) { return; }
+
+  strm.avail_in = content.size();
+  strm.next_in = (Bytef *)content.data();
+
+  std::string compressed;
+
+  const auto bufsiz = 16384;
+  char buff[bufsiz];
+  do {
+    strm.avail_out = bufsiz;
+    strm.next_out = (Bytef *)buff;
+    deflate(&strm, Z_FINISH);
+    compressed.append(buff, bufsiz - strm.avail_out);
+  } while (strm.avail_out == 0);
+
+  content.swap(compressed);
+
+  deflateEnd(&strm);
+}
+
+inline void decompress(std::string &content) {
+  z_stream strm;
+  strm.zalloc = Z_NULL;
+  strm.zfree = Z_NULL;
+  strm.opaque = Z_NULL;
+
+  // 15 is the value of wbits, which should be at the maximum possible value to
+  // ensure that any gzip stream can be decoded. The offset of 16 specifies that
+  // the stream to decompress will be formatted with a gzip wrapper.
+  auto ret = inflateInit2(&strm, 16 + 15);
+  if (ret != Z_OK) { return; }
+
+  strm.avail_in = content.size();
+  strm.next_in = (Bytef *)content.data();
+
+  std::string decompressed;
+
+  const auto bufsiz = 16384;
+  char buff[bufsiz];
+  do {
+    strm.avail_out = bufsiz;
+    strm.next_out = (Bytef *)buff;
+    inflate(&strm, Z_NO_FLUSH);
+    decompressed.append(buff, bufsiz - strm.avail_out);
+  } while (strm.avail_out == 0);
+
+  content.swap(decompressed);
+
+  inflateEnd(&strm);
+}
+#endif
+
+#ifdef _WIN32
+		class WSInit {
+public:
+  WSInit() {
+    WSADATA wsaData;
+    WSAStartup(0x0002, &wsaData);
+  }
+
+  ~WSInit() { WSACleanup(); }
+};
+
+static WSInit wsinit_;
+#endif
+
+	} // namespace detail
+
+// Header utilities
+	template <typename uint64_t, typename... Args>
+	inline std::pair<std::string, std::string> make_range_header(uint64_t value,
+																 Args... args) {
+		std::string field;
+		detail::make_range_header_core(field, value, args...);
+		field.insert(0, "bytes=");
+		return std::make_pair("Range", field);
+	}
+
+// Request implementation
+	inline bool Request::has_header(const char *key) const {
+		return detail::has_header(headers, key);
+	}
+
+	inline std::string Request::get_header_value(const char *key, size_t id) const {
+		return detail::get_header_value(headers, key, id, "");
+	}
+
+	inline size_t Request::get_header_value_count(const char *key) const {
+		auto r = headers.equal_range(key);
+		return std::distance(r.first, r.second);
+	}
+
+	inline void Request::set_header(const char *key, const char *val) {
+		headers.emplace(key, val);
+	}
+
+	inline bool Request::has_param(const char *key) const {
+		return params.find(key) != params.end();
+	}
+
+	inline std::string Request::get_param_value(const char *key, size_t id) const {
+		auto it = params.find(key);
+		std::advance(it, id);
+		if (it != params.end()) { return it->second; }
+		return std::string();
+	}
+
+	inline size_t Request::get_param_value_count(const char *key) const {
+		auto r = params.equal_range(key);
+		return std::distance(r.first, r.second);
+	}
+
+	inline bool Request::has_file(const char *key) const {
+		return files.find(key) != files.end();
+	}
+
+	inline MultipartFile Request::get_file_value(const char *key) const {
+		auto it = files.find(key);
+		if (it != files.end()) { return it->second; }
+		return MultipartFile();
+	}
+
+// Response implementation
+	inline bool Response::has_header(const char *key) const {
+		return headers.find(key) != headers.end();
+	}
+
+	inline std::string Response::get_header_value(const char *key,
+												  size_t id) const {
+		return detail::get_header_value(headers, key, id, "");
+	}
+
+	inline size_t Response::get_header_value_count(const char *key) const {
+		auto r = headers.equal_range(key);
+		return std::distance(r.first, r.second);
+	}
+
+	inline void Response::set_header(const char *key, const char *val) {
+		headers.emplace(key, val);
+	}
+
+	inline void Response::set_redirect(const char *url) {
+		set_header("Location", url);
+		status = 302;
+	}
+
+	inline void Response::set_content(const char *s, size_t n,
+									  const char *content_type) {
+		body.assign(s, n);
+		set_header("Content-Type", content_type);
+	}
+
+	inline void Response::set_content(const std::string &s,
+									  const char *content_type) {
+		body = s;
+		set_header("Content-Type", content_type);
+	}
+
+// Rstream implementation
+	template <typename... Args>
+	inline void Stream::write_format(const char *fmt, const Args &... args) {
+		const auto bufsiz = 2048;
+		char buf[bufsiz];
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+		auto n = _snprintf_s(buf, bufsiz, bufsiz - 1, fmt, args...);
+#else
+		auto n = snprintf(buf, bufsiz - 1, fmt, args...);
+#endif
+		if (n > 0) {
+			if (n >= bufsiz - 1) {
+				std::vector<char> glowable_buf(bufsiz);
+
+				while (n >= static_cast<int>(glowable_buf.size() - 1)) {
+					glowable_buf.resize(glowable_buf.size() * 2);
+#if defined(_MSC_VER) && _MSC_VER < 1900
+					n = _snprintf_s(&glowable_buf[0], glowable_buf.size(),
+                        glowable_buf.size() - 1, fmt, args...);
+#else
+					n = snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...);
+#endif
+				}
+				write(&glowable_buf[0], n);
+			} else {
+				write(buf, n);
+			}
+		}
+	}
+
+// Socket stream implementation
+	inline SocketStream::SocketStream(socket_t sock) : sock_(sock) {}
+
+	inline SocketStream::~SocketStream() {}
+
+	inline int SocketStream::read(char *ptr, size_t size) {
+		if (detail::select_read(sock_, CPPHTTPLIB_READ_TIMEOUT_SECOND,
+								CPPHTTPLIB_READ_TIMEOUT_USECOND) > 0) {
+			return recv(sock_, ptr, static_cast<int>(size), 0);
+		}
+		return -1;
+	}
+
+	inline int SocketStream::write(const char *ptr, size_t size) {
+		return send(sock_, ptr, static_cast<int>(size), 0);
+	}
+
+	inline int SocketStream::write(const char *ptr) {
+		return write(ptr, strlen(ptr));
+	}
+
+	inline std::string SocketStream::get_remote_addr() const {
+		return detail::get_remote_addr(sock_);
+	}
+
+// Buffer stream implementation
+	inline int BufferStream::read(char *ptr, size_t size) {
+#if defined(_MSC_VER) && _MSC_VER < 1900
+		return static_cast<int>(buffer._Copy_s(ptr, size, size));
+#else
+		return static_cast<int>(buffer.copy(ptr, size));
+#endif
+	}
+
+	inline int BufferStream::write(const char *ptr, size_t size) {
+		buffer.append(ptr, size);
+		return static_cast<int>(size);
+	}
+
+	inline int BufferStream::write(const char *ptr) {
+		size_t size = strlen(ptr);
+		buffer.append(ptr, size);
+		return static_cast<int>(size);
+	}
+
+	inline std::string BufferStream::get_remote_addr() const { return ""; }
+
+	inline const std::string &BufferStream::get_buffer() const { return buffer; }
+
+// HTTP server implementation
+	inline Server::Server()
+		: keep_alive_max_count_(CPPHTTPLIB_KEEPALIVE_MAX_COUNT),
+		  payload_max_length_(CPPHTTPLIB_PAYLOAD_MAX_LENGTH), is_running_(false),
+		  svr_sock_(INVALID_SOCKET), running_threads_(0) {
+#ifndef _WIN32
+		signal(SIGPIPE, SIG_IGN);
+#endif
+	}
+
+	inline Server::~Server() {}
+
+	inline Server &Server::Get(const char *pattern, Handler handler) {
+		get_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
+		return *this;
+	}
+
+	inline Server &Server::Post(const char *pattern, Handler handler) {
+		post_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
+		return *this;
+	}
+
+	inline Server &Server::Put(const char *pattern, Handler handler) {
+		put_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
+		return *this;
+	}
+
+	inline Server &Server::Patch(const char *pattern, Handler handler) {
+		patch_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
+		return *this;
+	}
+
+	inline Server &Server::Delete(const char *pattern, Handler handler) {
+		delete_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
+		return *this;
+	}
+
+	inline Server &Server::Options(const char *pattern, Handler handler) {
+		options_handlers_.push_back(std::make_pair(std::regex(pattern), handler));
+		return *this;
+	}
+
+	inline bool Server::set_base_dir(const char *path) {
+		if (detail::is_dir(path)) {
+			base_dir_ = path;
+			return true;
+		}
+		return false;
+	}
+
+	inline void Server::set_error_handler(Handler handler) {
+		error_handler_ = handler;
+	}
+
+	inline void Server::set_logger(Logger logger) { logger_ = logger; }
+
+	inline void Server::set_keep_alive_max_count(size_t count) {
+		keep_alive_max_count_ = count;
+	}
+
+	inline void Server::set_payload_max_length(uint64_t length) {
+		payload_max_length_ = length;
+	}
+
+	inline int Server::bind_to_any_port(const char *host, int socket_flags) {
+		return bind_internal(host, 0, socket_flags);
+	}
+
+	inline bool Server::listen_after_bind() { return listen_internal(); }
+
+	inline bool Server::listen(const char *host, int port, int socket_flags) {
+		if (bind_internal(host, port, socket_flags) < 0) return false;
+		return listen_internal();
+	}
+
+	inline bool Server::is_running() const { return is_running_; }
+
+	inline void Server::stop() {
+		if (is_running_) {
+			assert(svr_sock_ != INVALID_SOCKET);
+			std::atomic<socket_t> sock (svr_sock_.exchange(INVALID_SOCKET));
+			detail::shutdown_socket(sock);
+			detail::close_socket(sock);
+		}
+	}
+
+	inline bool Server::parse_request_line(const char *s, Request &req) {
+		static std::regex re("(GET|HEAD|POST|PUT|PATCH|DELETE|OPTIONS) "
+							 "(([^?]+)(?:\\?(.+?))?) (HTTP/1\\.[01])\r\n");
+
+		std::cmatch m;
+		if (std::regex_match(s, m, re)) {
+			req.version = std::string(m[5]);
+			req.method = std::string(m[1]);
+			req.target = std::string(m[2]);
+			req.path = detail::decode_url(m[3]);
+
+			// Parse query text
+			auto len = std::distance(m[4].first, m[4].second);
+			if (len > 0) { detail::parse_query_text(m[4], req.params); }
+
+			return true;
+		}
+
+		return false;
+	}
+
+	inline void Server::write_response(Stream &strm, bool last_connection,
+									   const Request &req, Response &res) {
+		assert(res.status != -1);
+
+		if (400 <= res.status && error_handler_) { error_handler_(req, res); }
+
+		// Response line
+		strm.write_format("HTTP/1.1 %d %s\r\n", res.status,
+						  detail::status_message(res.status));
+
+		// Headers
+		if (last_connection || req.get_header_value("Connection") == "close") {
+			res.set_header("Connection", "close");
+		}
+
+		if (!last_connection && req.get_header_value("Connection") == "Keep-Alive") {
+			res.set_header("Connection", "Keep-Alive");
+		}
+
+		if (res.body.empty()) {
+			if (!res.has_header("Content-Length")) {
+				if (res.streamcb) {
+					// Streamed response
+					res.set_header("Transfer-Encoding", "chunked");
+				} else {
+					res.set_header("Content-Length", "0");
+				}
+			}
+		} else {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+			// TODO: 'Accpet-Encoding' has gzip, not gzip;q=0
+    const auto &encodings = req.get_header_value("Accept-Encoding");
+    if (encodings.find("gzip") != std::string::npos &&
+        detail::can_compress(res.get_header_value("Content-Type"))) {
+      detail::compress(res.body);
+      res.set_header("Content-Encoding", "gzip");
+    }
+#endif
+
+			if (!res.has_header("Content-Type")) {
+				res.set_header("Content-Type", "text/plain");
+			}
+
+			auto length = std::to_string(res.body.size());
+			res.set_header("Content-Length", length.c_str());
+		}
+
+		detail::write_headers(strm, res);
+
+		// Body
+		if (req.method != "HEAD") {
+			if (!res.body.empty()) {
+				strm.write(res.body.c_str(), res.body.size());
+			} else if (res.streamcb) {
+				bool chunked_response = !res.has_header("Content-Length");
+				uint64_t offset = 0;
+				bool data_available = true;
+				while (data_available) {
+					std::string chunk = res.streamcb(offset);
+					offset += chunk.size();
+					data_available = !chunk.empty();
+					// Emit chunked response header and footer for each chunk
+					if (chunked_response)
+						chunk = detail::from_i_to_hex(chunk.size()) + "\r\n" + chunk + "\r\n";
+					if (strm.write(chunk.c_str(), chunk.size()) < 0) break; // Stop on error
+				}
+			}
+		}
+
+		// Log
+		if (logger_) { logger_(req, res); }
+	}
+
+	inline bool Server::handle_file_request(Request &req, Response &res) {
+		if (!base_dir_.empty() && detail::is_valid_path(req.path)) {
+			std::string path = base_dir_ + req.path;
+
+			if (!path.empty() && path.back() == '/') { path += "index.html"; }
+
+			if (detail::is_file(path)) {
+				detail::read_file(path, res.body);
+				auto type = detail::find_content_type(path);
+				if (type) { res.set_header("Content-Type", type); }
+				res.status = 200;
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	inline socket_t Server::create_server_socket(const char *host, int port,
+												 int socket_flags) const {
+		return detail::create_socket(
+			host, port,
+			[](socket_t sock, struct addrinfo &ai) -> bool {
+				if (::bind(sock, ai.ai_addr, static_cast<int>(ai.ai_addrlen))) {
+					return false;
+				}
+				if (::listen(sock, 5)) { // Listen through 5 channels
+					return false;
+				}
+				return true;
+			},
+			socket_flags);
+	}
+
+	inline int Server::bind_internal(const char *host, int port, int socket_flags) {
+		if (!is_valid()) { return -1; }
+
+		svr_sock_ = create_server_socket(host, port, socket_flags);
+		if (svr_sock_ == INVALID_SOCKET) { return -1; }
+
+		if (port == 0) {
+			struct sockaddr_storage address;
+			socklen_t len = sizeof(address);
+			if (getsockname(svr_sock_, reinterpret_cast<struct sockaddr *>(&address),
+							&len) == -1) {
+				return -1;
+			}
+			if (address.ss_family == AF_INET) {
+				return ntohs(reinterpret_cast<struct sockaddr_in *>(&address)->sin_port);
+			} else if (address.ss_family == AF_INET6) {
+				return ntohs(
+					reinterpret_cast<struct sockaddr_in6 *>(&address)->sin6_port);
+			} else {
+				return -1;
+			}
+		} else {
+			return port;
+		}
+	}
+
+	inline bool Server::poll() {
+		auto ret = true;
+
+		is_running_ = true;
+
+		if (svr_sock_ == INVALID_SOCKET) {
+			// The server socket was closed by 'stop' method.
+			return false;
+		}
+
+		auto val = detail::select_read(svr_sock_, 0, 1000);
+
+		if (val == 0) { // Timeout
+			return false;
+		}
+
+		socket_t sock = accept(svr_sock_, nullptr, nullptr);
+
+		if (sock == INVALID_SOCKET) {
+			if (svr_sock_ != INVALID_SOCKET) {
+				detail::close_socket(svr_sock_);
+				ret = false;
+			} else {
+				; // The server socket was closed by user.
+			}
+			return false;
+		}
+
+		read_and_close_socket(sock);
+
+		is_running_ = false;
+
+		return ret;
+	}
+
+	inline bool Server::listen_internal() {
+		auto ret = true;
+
+		is_running_ = true;
+
+		for (;;) {
+			if (svr_sock_ == INVALID_SOCKET) {
+				// The server socket was closed by 'stop' method.
+				break;
+			}
+
+			auto val = detail::select_read(svr_sock_, 0, 100000);
+
+			if (val == 0) { // Timeout
+				continue;
+			}
+
+			socket_t sock = accept(svr_sock_, nullptr, nullptr);
+
+			if (sock == INVALID_SOCKET) {
+				if (svr_sock_ != INVALID_SOCKET) {
+					detail::close_socket(svr_sock_);
+					ret = false;
+				} else {
+					; // The server socket was closed by user.
+				}
+				break;
+			}
+
+			// TODO: Use thread pool...
+			std::thread([=]() {
+				{
+					std::lock_guard<std::mutex> guard(running_threads_mutex_);
+					running_threads_++;
+				}
+
+				read_and_close_socket(sock);
+
+				{
+					std::lock_guard<std::mutex> guard(running_threads_mutex_);
+					running_threads_--;
+				}
+			}).detach();
+		}
+
+		// TODO: Use thread pool...
+		for (;;) {
+			std::this_thread::sleep_for(std::chrono::milliseconds(10));
+			std::lock_guard<std::mutex> guard(running_threads_mutex_);
+			if (!running_threads_) { break; }
+		}
+
+		is_running_ = false;
+
+		return ret;
+	}
+
+	inline bool Server::routing(Request &req, Response &res) {
+		if (req.method == "GET" && handle_file_request(req, res)) { return true; }
+
+		if (req.method == "GET" || req.method == "HEAD") {
+			return dispatch_request(req, res, get_handlers_);
+		} else if (req.method == "POST") {
+			return dispatch_request(req, res, post_handlers_);
+		} else if (req.method == "PUT") {
+			return dispatch_request(req, res, put_handlers_);
+		} else if (req.method == "PATCH") {
+			return dispatch_request(req, res, patch_handlers_);
+		} else if (req.method == "DELETE") {
+			return dispatch_request(req, res, delete_handlers_);
+		} else if (req.method == "OPTIONS") {
+			return dispatch_request(req, res, options_handlers_);
+		}
+		return false;
+	}
+
+	inline bool Server::dispatch_request(Request &req, Response &res,
+										 Handlers &handlers) {
+		for (const auto &x : handlers) {
+			const auto &pattern = x.first;
+			const auto &handler = x.second;
+
+			if (std::regex_match(req.path, req.matches, pattern)) {
+				handler(req, res);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	inline bool
+	Server::process_request(Stream &strm, bool last_connection,
+							bool &connection_close,
+							std::function<void(Request &)> setup_request) {
+		const auto bufsiz = 2048;
+		char buf[bufsiz];
+
+		detail::stream_line_reader reader(strm, buf, bufsiz);
+
+		// Connection has been closed on client
+		if (!reader.getline()) { return false; }
+
+		Request req;
+		Response res;
+
+		res.version = "HTTP/1.1";
+
+		// Check if the request URI doesn't exceed the limit
+		if (reader.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) {
+			res.status = 414;
+			write_response(strm, last_connection, req, res);
+			return true;
+		}
+
+		// Request line and headers
+		if (!parse_request_line(reader.ptr(), req) ||
+			!detail::read_headers(strm, req.headers)) {
+			res.status = 400;
+			write_response(strm, last_connection, req, res);
+			return true;
+		}
+
+		if (req.get_header_value("Connection") == "close") {
+			connection_close = true;
+		}
+
+		req.set_header("REMOTE_ADDR", strm.get_remote_addr().c_str());
+
+		// Body
+		if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH") {
+			bool exceed_payload_max_length = false;
+			if (!detail::read_content(strm, req, payload_max_length_,
+									  exceed_payload_max_length)) {
+				res.status = exceed_payload_max_length ? 413 : 400;
+				write_response(strm, last_connection, req, res);
+				return !exceed_payload_max_length;
+			}
+
+			const auto &content_type = req.get_header_value("Content-Type");
+
+			if (req.get_header_value("Content-Encoding") == "gzip") {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+				detail::decompress(req.body);
+#else
+				res.status = 415;
+				write_response(strm, last_connection, req, res);
+				return true;
+#endif
+			}
+
+			if (!content_type.find("application/x-www-form-urlencoded")) {
+				detail::parse_query_text(req.body, req.params);
+			} else if (!content_type.find("multipart/form-data")) {
+				std::string boundary;
+				if (!detail::parse_multipart_boundary(content_type, boundary) ||
+					!detail::parse_multipart_formdata(boundary, req.body, req.files)) {
+					res.status = 400;
+					write_response(strm, last_connection, req, res);
+					return true;
+				}
+			}
+		}
+
+		// TODO: Add additional request info
+		if (setup_request) { setup_request(req); }
+
+		if (routing(req, res)) {
+			if (res.status == -1) { res.status = 200; }
+		} else {
+			res.status = 404;
+		}
+
+		write_response(strm, last_connection, req, res);
+		return true;
+	}
+
+	inline bool Server::is_valid() const { return true; }
+
+	inline bool Server::read_and_close_socket(socket_t sock) {
+		return detail::read_and_close_socket(
+			sock, keep_alive_max_count_,
+			[this](Stream &strm, bool last_connection, bool &connection_close) {
+				return process_request(strm, last_connection, connection_close);
+			});
+	}
+
+// HTTP client implementation
+	inline Client::Client(const char *host, int port, time_t timeout_sec)
+		: host_(host), port_(port), timeout_sec_(timeout_sec),
+		  host_and_port_(host_ + ":" + std::to_string(port_)) {}
+
+	inline Client::~Client() {}
+
+	inline bool Client::is_valid() const { return true; }
+
+	inline socket_t Client::create_client_socket() const {
+		return detail::create_socket(
+			host_.c_str(), port_, [=](socket_t sock, struct addrinfo &ai) -> bool {
+				detail::set_nonblocking(sock, true);
+
+				auto ret = connect(sock, ai.ai_addr, static_cast<int>(ai.ai_addrlen));
+				if (ret < 0) {
+					if (detail::is_connection_error() ||
+						!detail::wait_until_socket_is_ready(sock, timeout_sec_, 0)) {
+						detail::close_socket(sock);
+						return false;
+					}
+				}
+
+				detail::set_nonblocking(sock, false);
+				return true;
+			});
+	}
+
+	inline bool Client::read_response_line(Stream &strm, Response &res) {
+		const auto bufsiz = 2048;
+		char buf[bufsiz];
+
+		detail::stream_line_reader reader(strm, buf, bufsiz);
+
+		if (!reader.getline()) { return false; }
+
+		const static std::regex re("(HTTP/1\\.[01]) (\\d+?) .*\r\n");
+
+		std::cmatch m;
+		if (std::regex_match(reader.ptr(), m, re)) {
+			res.version = std::string(m[1]);
+			res.status = std::stoi(std::string(m[2]));
+		}
+
+		return true;
+	}
+
+	inline bool Client::send(Request &req, Response &res) {
+		if (req.path.empty()) { return false; }
+
+		auto sock = create_client_socket();
+		if (sock == INVALID_SOCKET) { return false; }
+
+		return read_and_close_socket(sock, req, res);
+	}
+
+	inline void Client::write_request(Stream &strm, Request &req) {
+		BufferStream bstrm;
+
+		// Request line
+		auto path = detail::encode_url(req.path);
+
+		bstrm.write_format("%s %s HTTP/1.1\r\n", req.method.c_str(), path.c_str());
+
+		// Headers
+		if (!req.has_header("Host")) {
+			if (is_ssl()) {
+				if (port_ == 443) {
+					req.set_header("Host", host_.c_str());
+				} else {
+					req.set_header("Host", host_and_port_.c_str());
+				}
+			} else {
+				if (port_ == 80) {
+					req.set_header("Host", host_.c_str());
+				} else {
+					req.set_header("Host", host_and_port_.c_str());
+				}
+			}
+		}
+
+		if (!req.has_header("Accept")) { req.set_header("Accept", "*/*"); }
+
+		if (!req.has_header("User-Agent")) {
+			req.set_header("User-Agent", "cpp-httplib/0.2");
+		}
+
+		// TODO: Support KeepAlive connection
+		// if (!req.has_header("Connection")) {
+		req.set_header("Connection", "close");
+		// }
+
+		if (req.body.empty()) {
+			if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH") {
+				req.set_header("Content-Length", "0");
+			}
+		} else {
+			if (!req.has_header("Content-Type")) {
+				req.set_header("Content-Type", "text/plain");
+			}
+
+			if (!req.has_header("Content-Length")) {
+				auto length = std::to_string(req.body.size());
+				req.set_header("Content-Length", length.c_str());
+			}
+		}
+
+		detail::write_headers(bstrm, req);
+
+		// Body
+		if (!req.body.empty()) { bstrm.write(req.body.c_str(), req.body.size()); }
+
+		// Flush buffer
+		auto &data = bstrm.get_buffer();
+		strm.write(data.data(), data.size());
+	}
+
+	inline bool Client::process_request(Stream &strm, Request &req, Response &res,
+										bool &connection_close) {
+		// Send request
+		write_request(strm, req);
+
+		// Receive response and headers
+		if (!read_response_line(strm, res) ||
+			!detail::read_headers(strm, res.headers)) {
+			return false;
+		}
+
+		if (res.get_header_value("Connection") == "close" ||
+			res.version == "HTTP/1.0") {
+			connection_close = true;
+		}
+
+		// Body
+		if (req.method != "HEAD") {
+			bool exceed_payload_max_length = false;
+			if (!detail::read_content(strm, res, std::numeric_limits<uint64_t>::max(),
+									  exceed_payload_max_length, req.progress)) {
+				return false;
+			}
+
+			if (res.get_header_value("Content-Encoding") == "gzip") {
+#ifdef CPPHTTPLIB_ZLIB_SUPPORT
+				detail::decompress(res.body);
+#else
+				return false;
+#endif
+			}
+		}
+
+		return true;
+	}
+
+	inline bool Client::read_and_close_socket(socket_t sock, Request &req,
+											  Response &res) {
+		return detail::read_and_close_socket(
+			sock, 0,
+			[&](Stream &strm, bool /*last_connection*/, bool &connection_close) {
+				return process_request(strm, req, res, connection_close);
+			});
+	}
+
+	inline bool Client::is_ssl() const { return false; }
+
+	inline std::shared_ptr<Response> Client::Get(const char *path,
+												 Progress progress) {
+		return Get(path, Headers(), progress);
+	}
+
+	inline std::shared_ptr<Response>
+	Client::Get(const char *path, const Headers &headers, Progress progress) {
+		Request req;
+		req.method = "GET";
+		req.path = path;
+		req.headers = headers;
+		req.progress = progress;
+
+		auto res = std::make_shared<Response>();
+
+		return send(req, *res) ? res : nullptr;
+	}
+
+	inline std::shared_ptr<Response> Client::Head(const char *path) {
+		return Head(path, Headers());
+	}
+
+	inline std::shared_ptr<Response> Client::Head(const char *path,
+												  const Headers &headers) {
+		Request req;
+		req.method = "HEAD";
+		req.headers = headers;
+		req.path = path;
+
+		auto res = std::make_shared<Response>();
+
+		return send(req, *res) ? res : nullptr;
+	}
+
+	inline std::shared_ptr<Response> Client::Post(const char *path,
+												  const std::string &body,
+												  const char *content_type) {
+		return Post(path, Headers(), body, content_type);
+	}
+
+	inline std::shared_ptr<Response> Client::Post(const char *path,
+												  const Headers &headers,
+												  const std::string &body,
+												  const char *content_type) {
+		Request req;
+		req.method = "POST";
+		req.headers = headers;
+		req.path = path;
+
+		req.headers.emplace("Content-Type", content_type);
+		req.body = body;
+
+		auto res = std::make_shared<Response>();
+
+		return send(req, *res) ? res : nullptr;
+	}
+
+	inline std::shared_ptr<Response> Client::Post(const char *path,
+												  const Params &params) {
+		return Post(path, Headers(), params);
+	}
+
+	inline std::shared_ptr<Response>
+	Client::Post(const char *path, const Headers &headers, const Params &params) {
+		std::string query;
+		for (auto it = params.begin(); it != params.end(); ++it) {
+			if (it != params.begin()) { query += "&"; }
+			query += it->first;
+			query += "=";
+			query += detail::encode_url(it->second);
+		}
+
+		return Post(path, headers, query, "application/x-www-form-urlencoded");
+	}
+
+	inline std::shared_ptr<Response> Client::Put(const char *path,
+												 const std::string &body,
+												 const char *content_type) {
+		return Put(path, Headers(), body, content_type);
+	}
+
+	inline std::shared_ptr<Response> Client::Put(const char *path,
+												 const Headers &headers,
+												 const std::string &body,
+												 const char *content_type) {
+		Request req;
+		req.method = "PUT";
+		req.headers = headers;
+		req.path = path;
+
+		req.headers.emplace("Content-Type", content_type);
+		req.body = body;
+
+		auto res = std::make_shared<Response>();
+
+		return send(req, *res) ? res : nullptr;
+	}
+
+	inline std::shared_ptr<Response> Client::Patch(const char *path,
+												   const std::string &body,
+												   const char *content_type) {
+		return Patch(path, Headers(), body, content_type);
+	}
+
+	inline std::shared_ptr<Response> Client::Patch(const char *path,
+												   const Headers &headers,
+												   const std::string &body,
+												   const char *content_type) {
+		Request req;
+		req.method = "PATCH";
+		req.headers = headers;
+		req.path = path;
+
+		req.headers.emplace("Content-Type", content_type);
+		req.body = body;
+
+		auto res = std::make_shared<Response>();
+
+		return send(req, *res) ? res : nullptr;
+	}
+
+	inline std::shared_ptr<Response> Client::Delete(const char *path,
+													const std::string &body,
+													const char *content_type) {
+		return Delete(path, Headers(), body, content_type);
+	}
+
+	inline std::shared_ptr<Response> Client::Delete(const char *path,
+													const Headers &headers,
+													const std::string &body,
+													const char *content_type) {
+		Request req;
+		req.method = "DELETE";
+		req.headers = headers;
+		req.path = path;
+
+		if (content_type) { req.headers.emplace("Content-Type", content_type); }
+		req.body = body;
+
+		auto res = std::make_shared<Response>();
+
+		return send(req, *res) ? res : nullptr;
+	}
+
+	inline std::shared_ptr<Response> Client::Options(const char *path) {
+		return Options(path, Headers());
+	}
+
+	inline std::shared_ptr<Response> Client::Options(const char *path,
+													 const Headers &headers) {
+		Request req;
+		req.method = "OPTIONS";
+		req.path = path;
+		req.headers = headers;
+
+		auto res = std::make_shared<Response>();
+
+		return send(req, *res) ? res : nullptr;
+	}
+
+/*
+ * SSL Implementation
+ */
+#ifdef CPPHTTPLIB_OPENSSL_SUPPORT
+	namespace detail {
+
+template <typename U, typename V, typename T>
+inline bool
+read_and_close_socket_ssl(socket_t sock, size_t keep_alive_max_count,
+                          // TODO: OpenSSL 1.0.2 occasionally crashes...
+                          // The upcoming 1.1.0 is going to be thread safe.
+                          SSL_CTX *ctx, std::mutex &ctx_mutex,
+                          U SSL_connect_or_accept, V setup, T callback) {
+  SSL *ssl = nullptr;
+  {
+    std::lock_guard<std::mutex> guard(ctx_mutex);
+    ssl = SSL_new(ctx);
+  }
+
+  if (!ssl) {
+    close_socket(sock);
+    return false;
+  }
+
+  auto bio = BIO_new_socket(sock, BIO_NOCLOSE);
+  SSL_set_bio(ssl, bio, bio);
+
+  if (!setup(ssl)) {
+    SSL_shutdown(ssl);
+    {
+      std::lock_guard<std::mutex> guard(ctx_mutex);
+      SSL_free(ssl);
+    }
+
+    close_socket(sock);
+    return false;
+  }
+
+  bool ret = false;
+
+  if (SSL_connect_or_accept(ssl) == 1) {
+    if (keep_alive_max_count > 0) {
+      auto count = keep_alive_max_count;
+      while (count > 0 &&
+             detail::select_read(sock, CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND,
+                                 CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND) > 0) {
+        SSLSocketStream strm(sock, ssl);
+        auto last_connection = count == 1;
+        auto connection_close = false;
+
+        ret = callback(ssl, strm, last_connection, connection_close);
+        if (!ret || connection_close) { break; }
+
+        count--;
+      }
+    } else {
+      SSLSocketStream strm(sock, ssl);
+      auto dummy_connection_close = false;
+      ret = callback(ssl, strm, true, dummy_connection_close);
+    }
+  }
+
+  SSL_shutdown(ssl);
+  {
+    std::lock_guard<std::mutex> guard(ctx_mutex);
+    SSL_free(ssl);
+  }
+
+  close_socket(sock);
+
+  return ret;
+}
+
+class SSLInit {
+public:
+  SSLInit() {
+    SSL_load_error_strings();
+    SSL_library_init();
+  }
+
+  ~SSLInit() { ERR_free_strings(); }
+};
+
+static SSLInit sslinit_;
+
+} // namespace detail
+
+// SSL socket stream implementation
+inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL *ssl)
+    : sock_(sock), ssl_(ssl) {}
+
+inline SSLSocketStream::~SSLSocketStream() {}
+
+inline int SSLSocketStream::read(char *ptr, size_t size) {
+  if (SSL_pending(ssl_) > 0 ||
+      detail::select_read(sock_, CPPHTTPLIB_READ_TIMEOUT_SECOND,
+                          CPPHTTPLIB_READ_TIMEOUT_USECOND) > 0) {
+    return SSL_read(ssl_, ptr, size);
+  }
+  return -1;
+}
+
+inline int SSLSocketStream::write(const char *ptr, size_t size) {
+  return SSL_write(ssl_, ptr, size);
+}
+
+inline int SSLSocketStream::write(const char *ptr) {
+  return write(ptr, strlen(ptr));
+}
+
+inline std::string SSLSocketStream::get_remote_addr() const {
+  return detail::get_remote_addr(sock_);
+}
+
+// SSL HTTP server implementation
+inline SSLServer::SSLServer(const char *cert_path, const char *private_key_path,
+                            const char *client_ca_cert_file_path,
+                            const char *client_ca_cert_dir_path) {
+  ctx_ = SSL_CTX_new(SSLv23_server_method());
+
+  if (ctx_) {
+    SSL_CTX_set_options(ctx_,
+                        SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 |
+                            SSL_OP_NO_COMPRESSION |
+                            SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION);
+
+    // auto ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+    // SSL_CTX_set_tmp_ecdh(ctx_, ecdh);
+    // EC_KEY_free(ecdh);
+
+    if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 ||
+        SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) !=
+            1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    } else if (client_ca_cert_file_path || client_ca_cert_dir_path) {
+      // if (client_ca_cert_file_path) {
+      //   auto list = SSL_load_client_CA_file(client_ca_cert_file_path);
+      //   SSL_CTX_set_client_CA_list(ctx_, list);
+      // }
+
+      SSL_CTX_load_verify_locations(ctx_, client_ca_cert_file_path,
+                                    client_ca_cert_dir_path);
+
+      SSL_CTX_set_verify(
+          ctx_,
+          SSL_VERIFY_PEER |
+              SSL_VERIFY_FAIL_IF_NO_PEER_CERT, // SSL_VERIFY_CLIENT_ONCE,
+          nullptr);
+    }
+  }
+}
+
+inline SSLServer::~SSLServer() {
+  if (ctx_) { SSL_CTX_free(ctx_); }
+}
+
+inline bool SSLServer::is_valid() const { return ctx_; }
+
+inline bool SSLServer::read_and_close_socket(socket_t sock) {
+  return detail::read_and_close_socket_ssl(
+      sock, keep_alive_max_count_, ctx_, ctx_mutex_, SSL_accept,
+      [](SSL * /*ssl*/) { return true; },
+      [this](SSL *ssl, Stream &strm, bool last_connection,
+             bool &connection_close) {
+        return process_request(strm, last_connection, connection_close,
+                               [&](Request &req) { req.ssl = ssl; });
+      });
+}
+
+// SSL HTTP client implementation
+inline SSLClient::SSLClient(const char *host, int port, time_t timeout_sec,
+                            const char *client_cert_path,
+                            const char *client_key_path)
+    : Client(host, port, timeout_sec) {
+  ctx_ = SSL_CTX_new(SSLv23_client_method());
+
+  detail::split(&host_[0], &host_[host_.size()], '.',
+                [&](const char *b, const char *e) {
+                  host_components_.emplace_back(std::string(b, e));
+                });
+  if (client_cert_path && client_key_path) {
+    if (SSL_CTX_use_certificate_file(ctx_, client_cert_path,
+                                     SSL_FILETYPE_PEM) != 1 ||
+        SSL_CTX_use_PrivateKey_file(ctx_, client_key_path, SSL_FILETYPE_PEM) !=
+            1) {
+      SSL_CTX_free(ctx_);
+      ctx_ = nullptr;
+    }
+  }
+}
+
+inline SSLClient::~SSLClient() {
+  if (ctx_) { SSL_CTX_free(ctx_); }
+}
+
+inline bool SSLClient::is_valid() const { return ctx_; }
+
+inline void SSLClient::set_ca_cert_path(const char *ca_cert_file_path,
+                                        const char *ca_cert_dir_path) {
+  if (ca_cert_file_path) { ca_cert_file_path_ = ca_cert_file_path; }
+  if (ca_cert_dir_path) { ca_cert_dir_path_ = ca_cert_dir_path; }
+}
+
+inline void SSLClient::enable_server_certificate_verification(bool enabled) {
+  server_certificate_verification_ = enabled;
+}
+
+inline long SSLClient::get_openssl_verify_result() const {
+  return verify_result_;
+}
+
+inline bool SSLClient::read_and_close_socket(socket_t sock, Request &req,
+                                             Response &res) {
+
+  return is_valid() &&
+         detail::read_and_close_socket_ssl(
+             sock, 0, ctx_, ctx_mutex_,
+             [&](SSL *ssl) {
+               if (ca_cert_file_path_.empty()) {
+                 SSL_CTX_set_verify(ctx_, SSL_VERIFY_NONE, nullptr);
+               } else {
+                 if (!SSL_CTX_load_verify_locations(
+                         ctx_, ca_cert_file_path_.c_str(), nullptr)) {
+                   return false;
+                 }
+                 SSL_CTX_set_verify(ctx_, SSL_VERIFY_PEER, nullptr);
+               }
+
+               if (SSL_connect(ssl) != 1) { return false; }
+
+               if (server_certificate_verification_) {
+                 verify_result_ = SSL_get_verify_result(ssl);
+
+                 if (verify_result_ != X509_V_OK) { return false; }
+
+                 auto server_cert = SSL_get_peer_certificate(ssl);
+
+                 if (server_cert == nullptr) { return false; }
+
+                 if (!verify_host(server_cert)) {
+                   X509_free(server_cert);
+                   return false;
+                 }
+                 X509_free(server_cert);
+               }
+
+               return true;
+             },
+             [&](SSL *ssl) {
+               SSL_set_tlsext_host_name(ssl, host_.c_str());
+               return true;
+             },
+             [&](SSL * /*ssl*/, Stream &strm, bool /*last_connection*/,
+                 bool &connection_close) {
+               return process_request(strm, req, res, connection_close);
+             });
+}
+
+inline bool SSLClient::is_ssl() const { return true; }
+
+inline bool SSLClient::verify_host(X509 *server_cert) const {
+  /* Quote from RFC2818 section 3.1 "Server Identity"
+
+     If a subjectAltName extension of type dNSName is present, that MUST
+     be used as the identity. Otherwise, the (most specific) Common Name
+     field in the Subject field of the certificate MUST be used. Although
+     the use of the Common Name is existing practice, it is deprecated and
+     Certification Authorities are encouraged to use the dNSName instead.
+
+     Matching is performed using the matching rules specified by
+     [RFC2459].  If more than one identity of a given type is present in
+     the certificate (e.g., more than one dNSName name, a match in any one
+     of the set is considered acceptable.) Names may contain the wildcard
+     character * which is considered to match any single domain name
+     component or component fragment. E.g., *.a.com matches foo.a.com but
+     not bar.foo.a.com. f*.com matches foo.com but not bar.com.
+
+     In some cases, the URI is specified as an IP address rather than a
+     hostname. In this case, the iPAddress subjectAltName must be present
+     in the certificate and must exactly match the IP in the URI.
+
+  */
+  return verify_host_with_subject_alt_name(server_cert) ||
+         verify_host_with_common_name(server_cert);
+}
+
+inline bool
+SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const {
+  auto ret = false;
+
+  auto type = GEN_DNS;
+
+  struct in6_addr addr6;
+  struct in_addr addr;
+  size_t addr_len = 0;
+
+  if (inet_pton(AF_INET6, host_.c_str(), &addr6)) {
+    type = GEN_IPADD;
+    addr_len = sizeof(struct in6_addr);
+  } else if (inet_pton(AF_INET, host_.c_str(), &addr)) {
+    type = GEN_IPADD;
+    addr_len = sizeof(struct in_addr);
+  }
+
+  auto alt_names = static_cast<const struct stack_st_GENERAL_NAME *>(
+      X509_get_ext_d2i(server_cert, NID_subject_alt_name, nullptr, nullptr));
+
+  if (alt_names) {
+    auto dsn_matched = false;
+    auto ip_mached = false;
+
+    auto count = sk_GENERAL_NAME_num(alt_names);
+
+    for (auto i = 0; i < count && !dsn_matched; i++) {
+      auto val = sk_GENERAL_NAME_value(alt_names, i);
+      if (val->type == type) {
+        auto name = (const char *)ASN1_STRING_get0_data(val->d.ia5);
+        auto name_len = (size_t)ASN1_STRING_length(val->d.ia5);
+
+        if (strlen(name) == name_len) {
+          switch (type) {
+          case GEN_DNS: dsn_matched = check_host_name(name, name_len); break;
+
+          case GEN_IPADD:
+            if (!memcmp(&addr6, name, addr_len) ||
+                !memcmp(&addr, name, addr_len)) {
+              ip_mached = true;
+            }
+            break;
+          }
+        }
+      }
+    }
+
+    if (dsn_matched || ip_mached) { ret = true; }
+  }
+
+  GENERAL_NAMES_free((STACK_OF(GENERAL_NAME) *)alt_names);
+
+  return ret;
+}
+
+inline bool SSLClient::verify_host_with_common_name(X509 *server_cert) const {
+  const auto subject_name = X509_get_subject_name(server_cert);
+
+  if (subject_name != nullptr) {
+    char name[BUFSIZ];
+    auto name_len = X509_NAME_get_text_by_NID(subject_name, NID_commonName,
+                                              name, sizeof(name));
+
+    if (name_len != -1) { return check_host_name(name, name_len); }
+  }
+
+  return false;
+}
+
+inline bool SSLClient::check_host_name(const char *pattern,
+                                       size_t pattern_len) const {
+  if (host_.size() == pattern_len && host_ == pattern) { return true; }
+
+  // Wildcard match
+  // https://bugs.launchpad.net/ubuntu/+source/firefox-3.0/+bug/376484
+  std::vector<std::string> pattern_components;
+  detail::split(&pattern[0], &pattern[pattern_len], '.',
+                [&](const char *b, const char *e) {
+                  pattern_components.emplace_back(std::string(b, e));
+                });
+
+  if (host_components_.size() != pattern_components.size()) { return false; }
+
+  auto itr = pattern_components.begin();
+  for (const auto &h : host_components_) {
+    auto &p = *itr;
+    if (p != h && p != "*") {
+      auto partial_match = (p.size() > 0 && p[p.size() - 1] == '*' &&
+                            !p.compare(0, p.size() - 1, h));
+      if (!partial_match) { return false; }
+    }
+    ++itr;
+  }
+
+  return true;
+}
+#endif
+
+} // namespace httplib
+
+#endif // CPPHTTPLIB_HTTPLIB_H
\ No newline at end of file
diff --git a/common/inventory_profile.cpp b/common/inventory_profile.cpp
index 826c84fb4..a51b04998 100644
--- a/common/inventory_profile.cpp
+++ b/common/inventory_profile.cpp
@@ -1381,7 +1381,7 @@ int16 EQEmu::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 	}
 	
 	if (result == INVALID_INDEX) {
-		Log(Logs::General, Logs::Error, "InventoryProfile::_PutItem: Invalid slot_id specified (%i) with parent slot id (%i)", slot_id, parentSlot);
+		LogError("InventoryProfile::_PutItem: Invalid slot_id specified ({}) with parent slot id ({})", slot_id, parentSlot);
 		InventoryProfile::MarkDirty(inst); // Slot not found, clean up
 	}
 
diff --git a/common/ip_util.cpp b/common/ip_util.cpp
new file mode 100644
index 000000000..e1f5d0794
--- /dev/null
+++ b/common/ip_util.cpp
@@ -0,0 +1,72 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "ip_util.h"
+
+/**
+ * @param ip
+ * @return
+ */
+uint32_t IpUtil::IPToUInt(const std::string &ip)
+{
+	int      a, b, c, d;
+	uint32_t addr = 0;
+
+	if (sscanf(ip.c_str(), "%d.%d.%d.%d", &a, &b, &c, &d) != 4) {
+		return 0;
+	}
+
+	addr = a << 24;
+	addr |= b << 16;
+	addr |= c << 8;
+	addr |= d;
+	return addr;
+}
+
+/**
+ * @param ip
+ * @param network
+ * @param mask
+ * @return
+ */
+bool IpUtil::IsIpInRange(const std::string &ip, const std::string &network, const std::string &mask)
+{
+	uint32_t ip_addr      = IpUtil::IPToUInt(ip);
+	uint32_t network_addr = IpUtil::IPToUInt(network);
+	uint32_t mask_addr    = IpUtil::IPToUInt(mask);
+
+	uint32_t net_lower = (network_addr & mask_addr);
+	uint32_t net_upper = (net_lower | (~mask_addr));
+
+	return ip_addr >= net_lower && ip_addr <= net_upper;
+}
+
+/**
+ * @param ip
+ * @return
+ */
+bool IpUtil::IsIpInPrivateRfc1918(const std::string &ip)
+{
+	return (
+		IpUtil::IsIpInRange(ip, "10.0.0.0", "255.0.0.0") ||
+		IpUtil::IsIpInRange(ip, "172.16.0.0", "255.240.0.0") ||
+		IpUtil::IsIpInRange(ip, "192.168.0.0", "255.255.0.0")
+	);
+}
diff --git a/common/eqemu_logsys_fmt.h b/common/ip_util.h
similarity index 72%
rename from common/eqemu_logsys_fmt.h
rename to common/ip_util.h
index 3a6a9f67d..76ea33fdb 100644
--- a/common/eqemu_logsys_fmt.h
+++ b/common/ip_util.h
@@ -16,15 +16,21 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *
-*/
+ */
 
-#pragma once
+#ifndef EQEMU_IP_UTIL_H
+#define EQEMU_IP_UTIL_H
 
-#include <fmt/format.h>
+#include "types.h"
+#include "iostream"
 
-template <typename... Args>
-void OutF(EQEmuLogSys &ls, Logs::DebugLevel debug_level, uint16 log_category, const char *fmt, const Args&... args)
-{
-	std::string log_str = fmt::format(fmt, args...);
-	ls.Out(debug_level, log_category, log_str);
-}
+class IpUtil {
+public:
+
+	static uint32_t IPToUInt(const std::string &ip);
+	static bool IsIpInRange(const std::string &ip, const std::string &network, const std::string &mask);
+	static bool IsIpInPrivateRfc1918(const std::string &ip);
+
+};
+
+#endif //EQEMU_IP_UTIL_H
\ No newline at end of file
diff --git a/common/item_data.h b/common/item_data.h
index 45ca8e9e0..58bc4c889 100644
--- a/common/item_data.h
+++ b/common/item_data.h
@@ -413,7 +413,7 @@ namespace EQEmu
 		int32	SkillModMax;	// Max skill point modification
 		uint32	SkillModType;	// Type of skill for SkillModValue to apply to
 		uint32	BaneDmgRace;	// Bane Damage Race
-		int8	BaneDmgAmt;		// Bane Damage Body Amount
+		int32	BaneDmgAmt;		// Bane Damage Body Amount
 		uint32	BaneDmgBody;	// Bane Damage Body
 		bool	Magic;			// True=Magic Item, False=not
 		int32	CastTime_;
diff --git a/common/json/jsoncpp.cpp b/common/json/jsoncpp.cpp
index 00c48700d..759e68fa6 100644
--- a/common/json/jsoncpp.cpp
+++ b/common/json/jsoncpp.cpp
@@ -5277,7 +5277,7 @@ void StreamWriterBuilder::setDefaults(Json::Value* settings)
 {
   //! [StreamWriterBuilderDefaults]
   (*settings)["commentStyle"] = "All";
-  (*settings)["indentation"] = "\t";
+  (*settings)["indentation"] = "  ";
   (*settings)["enableYAMLCompatibility"] = false;
   (*settings)["dropNullPlaceholders"] = false;
   (*settings)["useSpecialFloats"] = false;
diff --git a/common/json_config.cpp b/common/json_config.cpp
index d677fc452..5f4c47b71 100644
--- a/common/json_config.cpp
+++ b/common/json_config.cpp
@@ -1,26 +1,29 @@
 #include "json_config.h"
 #include <fstream>
+#include <iostream>
 
-EQ::JsonConfigFile::JsonConfigFile()
-{
-}
+EQ::JsonConfigFile::JsonConfigFile() = default;
 
 EQ::JsonConfigFile::JsonConfigFile(const Json::Value &value)
 {
 	m_root = value;
 }
 
-EQ::JsonConfigFile::~JsonConfigFile()
-{
-}
+EQ::JsonConfigFile::~JsonConfigFile() = default;
 
-EQ::JsonConfigFile EQ::JsonConfigFile::Load(const std::string &filename)
+/**
+ * @param file_name
+ * @return
+ */
+EQ::JsonConfigFile EQ::JsonConfigFile::Load(
+	const std::string &file_name
+)
 {
 	JsonConfigFile ret;
 	ret.m_root = Json::Value();
 
 	std::ifstream ifs;
-	ifs.open(filename, std::ifstream::in);
+	ifs.open(file_name, std::ifstream::in);
 
 	if (!ifs.good()) {
 		return ret;
@@ -29,59 +32,128 @@ EQ::JsonConfigFile EQ::JsonConfigFile::Load(const std::string &filename)
 	try {
 		ifs >> ret.m_root;
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		return ret;
 	}
 
 	return ret;
 }
 
-std::string EQ::JsonConfigFile::GetVariableString(const std::string &title, const std::string &parameter, const std::string &default_value) {
+/**
+ * @param file_name
+ * @return
+ */
+void EQ::JsonConfigFile::Save(
+	const std::string &file_name
+)
+{
+	std::ofstream opened_config_file;
+	opened_config_file.open(file_name);
+
+	/**
+	 * Grab and build config contents
+	 */
+	Json::StreamWriterBuilder write_builder;
+	write_builder["indentation"] = "  ";
+	std::string document = Json::writeString(write_builder, m_root);
+
+	/**
+	 * Write current contents and close
+	 */
+	opened_config_file << document;
+	opened_config_file.close();
+}
+
+/**
+ * @param title
+ * @param parameter
+ * @param default_value
+ * @return
+ */
+std::string EQ::JsonConfigFile::GetVariableString(
+	const std::string &title,
+	const std::string &parameter,
+	const std::string &default_value
+)
+{
 	try {
 		if (m_root.isMember(title) && m_root[title].isMember(parameter)) {
 			return m_root[title][parameter].asString();
 		}
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		return default_value;
 	}
 
 	return default_value;
 }
 
-int EQ::JsonConfigFile::GetVariableInt(const std::string &title, const std::string &parameter, const int default_value) {
+/**
+ * @param title
+ * @param parameter
+ * @param default_value
+ * @return
+ */
+int EQ::JsonConfigFile::GetVariableInt(
+	const std::string &title,
+	const std::string &parameter,
+	const int default_value
+)
+{
 	try {
 		if (m_root.isMember(title) && m_root[title].isMember(parameter)) {
 			return m_root[title][parameter].asInt();
 		}
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		return default_value;
 	}
 
 	return default_value;
 }
 
-bool EQ::JsonConfigFile::GetVariableBool(const std::string &title, const std::string &parameter, const bool default_value) {
+/**
+ * @param title
+ * @param parameter
+ * @param default_value
+ * @return
+ */
+bool EQ::JsonConfigFile::GetVariableBool(
+	const std::string &title,
+	const std::string &parameter,
+	const bool default_value
+)
+{
 	try {
 		if (m_root.isMember(title) && m_root[title].isMember(parameter)) {
 			return m_root[title][parameter].asBool();
 		}
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		return default_value;
 	}
 
 	return default_value;
 }
 
-double EQ::JsonConfigFile::GetVariableDouble(const std::string &title, const std::string &parameter, const double default_value) {
+/**
+ * @param title
+ * @param parameter
+ * @param default_value
+ * @return
+ */
+double EQ::JsonConfigFile::GetVariableDouble(
+	const std::string &title,
+	const std::string &parameter,
+	const double default_value
+)
+{
 	try {
 		if (m_root.isMember(title) && m_root[title].isMember(parameter)) {
 			return m_root[title][parameter].asDouble();
 		}
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		return default_value;
 	}
 
diff --git a/common/json_config.h b/common/json_config.h
index 279fb64d9..aa4d2d8f6 100644
--- a/common/json_config.h
+++ b/common/json_config.h
@@ -7,10 +7,12 @@ namespace EQ
 	class JsonConfigFile
 	{
 	public:
+		JsonConfigFile();
 		JsonConfigFile(const Json::Value &value);
 		~JsonConfigFile();
 
-		static JsonConfigFile Load(const std::string &filename);
+		static JsonConfigFile Load(const std::string &file_name);
+		void Save(const std::string &file_name);
 
 		std::string GetVariableString(const std::string &title, const std::string &parameter, const std::string &default_value);
 		int GetVariableInt(const std::string &title, const std::string &parameter, const int default_value);
@@ -19,7 +21,6 @@ namespace EQ
 		
 		Json::Value& RawHandle() { return m_root; }
 	private:
-		JsonConfigFile();
 		Json::Value m_root;
 	};
 
diff --git a/common/linked_list.h b/common/linked_list.h
index 246677db4..8ac4b51d8 100644
--- a/common/linked_list.h
+++ b/common/linked_list.h
@@ -278,12 +278,6 @@ void LinkedListIterator<TYPE>::Replace(const TYPE& new_data)
 template<class TYPE>
 void LinkedListIterator<TYPE>::Reset()
 {
-	if (!(&list))
-	{
-		current_element=0;
-		return;
-	}
-
 	if (dir == FORWARD)
 	{
 		current_element = list.first;
diff --git a/common/misc.cpp b/common/misc.cpp
index 792dfcbab..b9dc31d28 100644
--- a/common/misc.cpp
+++ b/common/misc.cpp
@@ -19,9 +19,6 @@
 #include "types.h"
 #include <cstring>
 
-#define ENC(c) (((c) & 0x3f) + ' ')
-#define DEC(c)	(((c) - ' ') & 0x3f)
-
 std::map<int,std::string> DBFieldNames;
 
 #ifndef WIN32
@@ -333,64 +330,6 @@ void LoadItemDBFieldNames() {
 	DBFieldNames[113]="unknown115";		// ? (end quote)
 }
 
-void encode_length(unsigned long length, char *out)
-{
-char buf[4];
-	memcpy(buf,&length,sizeof(unsigned long));
-	encode_chunk(buf,3,out);
-}
-
-unsigned long encode(char *in, unsigned long length, char *out)
-{
-unsigned long used=0,len=0;
-	while(used<length) {
-		encode_chunk(in+used,length-used,out+len);
-		used+=3;
-		len+=4;
-	}
-	*(out+len)=0;
-
-	return len;
-}
-
-unsigned long decode_length(char *in)
-{
-int length;
-char buf[4];
-	decode_chunk(in,&buf[0]);
-	buf[3]=0;
-	memcpy(&length,buf,sizeof(unsigned long));
-
-	return length;
-}
-
-void decode(char *in, char *out)
-{
-char *ptr=in;
-char *outptr=out;
-	while(*ptr) {
-		decode_chunk(ptr,outptr);
-		ptr+=4;
-		outptr+=3;
-	}
-	*outptr=0;
-}
-
-void encode_chunk(char *in, int len, char *out)
-{
-	*out=ENC(in[0] >> 2);
-	*(out+1)=ENC((in[0] << 4)|(((len<2 ? 0 : in[1]) >> 4) & 0xF));
-	*(out+2)=ENC(((len<2 ? 0 : in[1]) << 2)|(((len<3 ? 0 : in[2]) >> 6) & 0x3));
-	*(out+3)=ENC((len<3 ? 0 : in[2]));
-}
-
-void decode_chunk(char *in, char *out)
-{
-	*out = DEC(*in) << 2 | DEC(in[1]) >> 4;
-	*(out+1) = DEC(in[1]) << 4 | DEC(in[2]) >> 2;
-	*(out+2) = DEC(in[2]) << 6 | DEC(in[3]);
-}
-
 void dump_message_column(unsigned char *buffer, unsigned long length, std::string leader, FILE *to)
 {
 unsigned long i,j;
diff --git a/common/misc.h b/common/misc.h
index b33f2f32d..a099ab823 100644
--- a/common/misc.h
+++ b/common/misc.h
@@ -17,13 +17,6 @@ int Tokenize(std::string s, std::map<int,std::string> & tokens, char delim='|');
 
 void LoadItemDBFieldNames();
 
-void encode_length(unsigned long length, char *out);
-unsigned long decode_length(char *in);
-unsigned long encode(char *in, unsigned long length, char *out);
-void decode(char *in, char *out);
-void encode_chunk(char *in, int len, char *out);
-void decode_chunk(char *in, char *out);
-
 #ifndef WIN32
 int print_stacktrace();
 #endif
diff --git a/common/misc_functions.h b/common/misc_functions.h
index 4f295c68a..62a6745c1 100644
--- a/common/misc_functions.h
+++ b/common/misc_functions.h
@@ -40,7 +40,7 @@
 #define VERIFY_PACKET_LENGTH(OPCode, Packet, StructName) \
 	if(Packet->size != sizeof(StructName)) \
 	{ \
-		Log(Logs::Detail, Logs::Netcode, "Size mismatch in " #OPCode " expected %i got %i", sizeof(StructName), Packet->size); \
+		LogNetcode("Size mismatch in " #OPCode " expected [{}] got [{}]", sizeof(StructName), Packet->size); \
 		DumpPacket(Packet); \
 		return; \
 	}
diff --git a/common/net/console_server_connection.cpp b/common/net/console_server_connection.cpp
index 795c73140..aab26d188 100644
--- a/common/net/console_server_connection.cpp
+++ b/common/net/console_server_connection.cpp
@@ -116,17 +116,21 @@ bool EQ::Net::ConsoleServerConnection::SendChannelMessage(const ServerChannelMes
 	}
 
 	switch (scm->chan_num) {
-		if (RuleB(Chat, ServerWideAuction)) {
-			case 4: {
+		case 4: {
+			if (RuleB(Chat, ServerWideAuction)) {
 				QueueMessage(fmt::format("{0} auctions, '{1}'", scm->from, scm->message));
 				break;
+			} else { // I think we want default action in this case?
+				return false;
 			}
 		}
 
-		if (RuleB(Chat, ServerWideOOC)) {
-			case 5: {
+		case 5: {
+			if (RuleB(Chat, ServerWideOOC)) {
 				QueueMessage(fmt::format("{0} says ooc, '{1}'", scm->from, scm->message));
 				break;
+			} else { // I think we want default action in this case?
+				return false;
 			}
 		}
 
diff --git a/common/net/daybreak_connection.cpp b/common/net/daybreak_connection.cpp
index b10203854..8448049f5 100644
--- a/common/net/daybreak_connection.cpp
+++ b/common/net/daybreak_connection.cpp
@@ -399,7 +399,7 @@ void EQ::Net::DaybreakConnection::Process()
 
 		ProcessQueue();
 	}
-	catch (std::exception ex) {
+	catch (std::exception &ex) {
 		if (m_owner->m_on_error_message) {
 			m_owner->m_on_error_message(fmt::format("Error processing connection: {0}", ex.what()));
 		}
diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h
index b4f3ca41c..883ecefac 100644
--- a/common/net/daybreak_connection.h
+++ b/common/net/daybreak_connection.h
@@ -257,7 +257,7 @@ namespace EQ
 				resend_delay_min = 150;
 				resend_delay_max = 5000;
 				connect_delay_ms = 500;
-				stale_connection_ms = 30000;
+				stale_connection_ms = 60000;
 				connect_stale_ms = 5000;
 				crc_length = 2;
 				max_packet_size = 512;
diff --git a/common/net/eqstream.cpp b/common/net/eqstream.cpp
index 378b0d919..368a23931 100644
--- a/common/net/eqstream.cpp
+++ b/common/net/eqstream.cpp
@@ -1,6 +1,5 @@
 #include "eqstream.h"
 #include "../eqemu_logsys.h"
-#include "../eqemu_logsys_fmt.h"
 
 EQ::Net::EQStreamManager::EQStreamManager(const EQStreamManagerInterfaceOptions &options) : EQStreamManagerInterface(options), m_daybreak(options.daybreak_options)
 {
@@ -185,23 +184,23 @@ EQStreamInterface::MatchState EQ::Net::EQStream::CheckSignature(const Signature
 
 		if (opcode == sig->first_eq_opcode) {
 			if (length == sig->first_length) {
-				LogF(Logs::General, Logs::Netcode, "[IDENT_TRACE] {0}:{1}: First opcode matched {2:#x} and length matched {3}",
+				LogF(Logs::General, Logs::Netcode, "[StreamIdentify] {0}:{1}: First opcode matched {2:#x} and length matched {3}",
 					m_connection->RemoteEndpoint(), m_connection->RemotePort(), sig->first_eq_opcode, length);
 				return MatchSuccessful;
 			}
 			else if (length == 0) {
-				LogF(Logs::General, Logs::Netcode, "[IDENT_TRACE] {0}:{1}: First opcode matched {2:#x} and length is ignored.",
+				LogF(Logs::General, Logs::Netcode, "[StreamIdentify] {0}:{1}: First opcode matched {2:#x} and length is ignored.",
 					m_connection->RemoteEndpoint(), m_connection->RemotePort(), sig->first_eq_opcode);
 				return MatchSuccessful;
 			}
 			else {
-				LogF(Logs::General, Logs::Netcode, "[IDENT_TRACE] {0}:{1}: First opcode matched {2:#x} but length {3} did not match expected {4}",
+				LogF(Logs::General, Logs::Netcode, "[StreamIdentify] {0}:{1}: First opcode matched {2:#x} but length {3} did not match expected {4}",
 					m_connection->RemoteEndpoint(), m_connection->RemotePort(), sig->first_eq_opcode, length, sig->first_length);
 				return MatchFailed;
 			}
 		}
 		else {
-			LogF(Logs::General, Logs::Netcode, "[IDENT_TRACE] {0}:{1}: First opcode {1:#x} did not match expected {2:#x}",
+			LogF(Logs::General, Logs::Netcode, "[StreamIdentify] {0}:{1}: First opcode {1:#x} did not match expected {2:#x}",
 				m_connection->RemoteEndpoint(), m_connection->RemotePort(), opcode, sig->first_eq_opcode);
 			return MatchFailed;
 		}
diff --git a/common/net/servertalk_client_connection.cpp b/common/net/servertalk_client_connection.cpp
index 0b77fc073..0a5dceac6 100644
--- a/common/net/servertalk_client_connection.cpp
+++ b/common/net/servertalk_client_connection.cpp
@@ -1,7 +1,6 @@
 #include "servertalk_client_connection.h"
 #include "dns.h"
 #include "../eqemu_logsys.h"
-#include "../eqemu_logsys_fmt.h"
 
 EQ::Net::ServertalkClient::ServertalkClient(const std::string &addr, int port, bool ipv6, const std::string &identifier, const std::string &credentials)
 	: m_timer(std::unique_ptr<EQ::Timer>(new EQ::Timer(100, true, std::bind(&EQ::Net::ServertalkClient::Connect, this))))
@@ -79,15 +78,15 @@ void EQ::Net::ServertalkClient::Connect()
 	m_connecting = true;
 	EQ::Net::TCPConnection::Connect(m_addr, m_port, false, [this](std::shared_ptr<EQ::Net::TCPConnection> connection) {
 		if (connection == nullptr) {
-			LogF(Logs::General, Logs::TCP_Connection, "Error connecting to {0}:{1}, attempting to reconnect...", m_addr, m_port);
+			LogF(Logs::General, Logs::TCPConnection, "Error connecting to {0}:{1}, attempting to reconnect...", m_addr, m_port);
 			m_connecting = false;
 			return;
 		}
 
-		LogF(Logs::General, Logs::TCP_Connection, "Connected to {0}:{1}", m_addr, m_port);
+		LogF(Logs::General, Logs::TCPConnection, "Connected to {0}:{1}", m_addr, m_port);
 		m_connection = connection;
 		m_connection->OnDisconnect([this](EQ::Net::TCPConnection *c) {
-			LogF(Logs::General, Logs::TCP_Connection, "Connection lost to {0}:{1}, attempting to reconnect...", m_addr, m_port);
+			LogF(Logs::General, Logs::TCPConnection, "Connection lost to {0}:{1}, attempting to reconnect...", m_addr, m_port);
 			m_encrypted = false;
 			m_connection.reset();
 		});
@@ -214,7 +213,7 @@ void EQ::Net::ServertalkClient::ProcessHello(EQ::Net::Packet &p)
 				}
 			}
 			else {
-				LogF(Logs::General, Logs::Error, "Could not process hello, size != {0}", 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES);
+				LogError("Could not process hello, size != {0}", 1 + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES);
 			}
 		}
 		else {
@@ -226,7 +225,7 @@ void EQ::Net::ServertalkClient::ProcessHello(EQ::Net::Packet &p)
 		}
 	}
 	catch (std::exception &ex) {
-		LogF(Logs::General, Logs::Error, "Error parsing hello from server: {0}", ex.what());
+		LogError("Error parsing hello from server: {0}", ex.what());
 		m_connection->Disconnect();
 
 		if (m_on_connect_cb) {
@@ -253,7 +252,7 @@ void EQ::Net::ServertalkClient::ProcessHello(EQ::Net::Packet &p)
 		}
 }
 	catch (std::exception &ex) {
-		LogF(Logs::General, Logs::Error, "Error parsing hello from server: {0}", ex.what());
+		LogError("Error parsing hello from server: {0}", ex.what());
 		m_connection->Disconnect();
 
 		if (m_on_connect_cb) {
@@ -276,7 +275,7 @@ void EQ::Net::ServertalkClient::ProcessMessage(EQ::Net::Packet &p)
 				std::unique_ptr<unsigned char[]> decrypted_text(new unsigned char[message_len]);
 				if (crypto_box_open_easy_afternm(&decrypted_text[0], (unsigned char*)&data[0], length, m_nonce_theirs, m_shared_key))
 				{
-					LogF(Logs::General, Logs::Error, "Error decrypting message from server");
+					LogError("Error decrypting message from server");
 					(*(uint64_t*)&m_nonce_theirs[0])++;
 					return;
 				}
@@ -324,7 +323,7 @@ void EQ::Net::ServertalkClient::ProcessMessage(EQ::Net::Packet &p)
 		}
 	}
 	catch (std::exception &ex) {
-		LogF(Logs::General, Logs::Error, "Error parsing message from server: {0}", ex.what());
+		LogError("Error parsing message from server: {0}", ex.what());
 	}
 }
 
diff --git a/common/net/servertalk_legacy_client_connection.cpp b/common/net/servertalk_legacy_client_connection.cpp
index 851ca3541..3cbe1c85a 100644
--- a/common/net/servertalk_legacy_client_connection.cpp
+++ b/common/net/servertalk_legacy_client_connection.cpp
@@ -1,7 +1,6 @@
 #include "servertalk_legacy_client_connection.h"
 #include "dns.h"
 #include "../eqemu_logsys.h"
-#include "../eqemu_logsys_fmt.h"
 
 EQ::Net::ServertalkLegacyClient::ServertalkLegacyClient(const std::string &addr, int port, bool ipv6)
 	: m_timer(std::unique_ptr<EQ::Timer>(new EQ::Timer(100, true, std::bind(&EQ::Net::ServertalkLegacyClient::Connect, this))))
@@ -59,15 +58,15 @@ void EQ::Net::ServertalkLegacyClient::Connect()
 	m_connecting = true;
 	EQ::Net::TCPConnection::Connect(m_addr, m_port, false, [this](std::shared_ptr<EQ::Net::TCPConnection> connection) {
 		if (connection == nullptr) {
-			LogF(Logs::General, Logs::TCP_Connection, "Error connecting to {0}:{1}, attempting to reconnect...", m_addr, m_port);
+			LogF(Logs::General, Logs::TCPConnection, "Error connecting to {0}:{1}, attempting to reconnect...", m_addr, m_port);
 			m_connecting = false;
 			return;
 		}
 
-		LogF(Logs::General, Logs::TCP_Connection, "Connected to {0}:{1}", m_addr, m_port);
+		LogF(Logs::General, Logs::TCPConnection, "Connected to {0}:{1}", m_addr, m_port);
 		m_connection = connection;
 		m_connection->OnDisconnect([this](EQ::Net::TCPConnection *c) {
-			LogF(Logs::General, Logs::TCP_Connection, "Connection lost to {0}:{1}, attempting to reconnect...", m_addr, m_port);
+			LogF(Logs::General, Logs::TCPConnection, "Connection lost to {0}:{1}, attempting to reconnect...", m_addr, m_port);
 			m_connection.reset();
 		});
 
diff --git a/common/net/servertalk_server_connection.cpp b/common/net/servertalk_server_connection.cpp
index fa52d8f9e..6bfae6ea1 100644
--- a/common/net/servertalk_server_connection.cpp
+++ b/common/net/servertalk_server_connection.cpp
@@ -1,7 +1,6 @@
 #include "servertalk_server_connection.h"
 #include "servertalk_server.h"
 #include "../eqemu_logsys.h"
-#include "../eqemu_logsys_fmt.h"
 #include "../util/uuid.h"
 
 EQ::Net::ServertalkServerConnection::ServertalkServerConnection(std::shared_ptr<EQ::Net::TCPConnection> c, EQ::Net::ServertalkServer *parent, bool encrypted, bool allow_downgrade)
@@ -202,8 +201,8 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 {
 #ifdef ENABLE_SECURITY
 	if (downgrade_security && m_allow_downgrade && m_encrypted) {
-		LogF(Logs::General, Logs::TCP_Connection, "Downgraded encrypted connection to plaintext because otherside didn't support encryption {0}:{1}", 
-			m_connection->RemoteIP(), m_connection->RemotePort());
+		LogF(Logs::General, Logs::TCPConnection, "Downgraded encrypted connection to plaintext because otherside didn't support encryption {0}:{1}",
+			 m_connection->RemoteIP(), m_connection->RemotePort());
 		m_encrypted = false;
 	}
 
@@ -221,7 +220,7 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 
 				if (crypto_box_open_easy_afternm(&decrypted_text[0], (unsigned char*)p.Data() + crypto_box_PUBLICKEYBYTES + crypto_box_NONCEBYTES, cipher_len, m_nonce_theirs, m_shared_key))
 				{
-					LogF(Logs::General, Logs::Error, "Error decrypting handshake from client, dropping connection.");
+					LogError("Error decrypting handshake from client, dropping connection.");
 					m_connection->Disconnect();
 					return;
 				}
@@ -230,7 +229,7 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 				std::string credentials = (const char*)&decrypted_text[0] + (m_identifier.length() + 1);
 
 				if (!m_parent->CheckCredentials(credentials)) {
-					LogF(Logs::General, Logs::Error, "Got incoming connection with invalid credentials during handshake, dropping connection.");
+					LogError("Got incoming connection with invalid credentials during handshake, dropping connection.");
 					m_connection->Disconnect();
 					return;
 				}
@@ -240,7 +239,7 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 			}
 		}
 		catch (std::exception &ex) {
-			LogF(Logs::General, Logs::Error, "Error parsing handshake from client: {0}", ex.what());
+			LogError("Error parsing handshake from client: {0}", ex.what());
 			m_connection->Disconnect();
 		}
 	}
@@ -250,7 +249,7 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 			auto credentials = p.GetCString(m_identifier.length() + 1);
 
 			if (!m_parent->CheckCredentials(credentials)) {
-				LogF(Logs::General, Logs::Error, "Got incoming connection with invalid credentials during handshake, dropping connection.");
+				LogError("Got incoming connection with invalid credentials during handshake, dropping connection.");
 				m_connection->Disconnect();
 				return;
 			}
@@ -258,7 +257,7 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 			m_parent->ConnectionIdentified(this);
 		}
 		catch (std::exception &ex) {
-			LogF(Logs::General, Logs::Error, "Error parsing handshake from client: {0}", ex.what());
+			LogError("Error parsing handshake from client: {0}", ex.what());
 			m_connection->Disconnect();
 		}
 	}
@@ -268,7 +267,7 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 		auto credentials = p.GetCString(m_identifier.length() + 1);
 
 		if (!m_parent->CheckCredentials(credentials)) {
-			LogF(Logs::General, Logs::Error, "Got incoming connection with invalid credentials during handshake, dropping connection.");
+			LogError("Got incoming connection with invalid credentials during handshake, dropping connection.");
 			m_connection->Disconnect();
 			return;
 		}
@@ -276,7 +275,7 @@ void EQ::Net::ServertalkServerConnection::ProcessHandshake(EQ::Net::Packet &p, b
 		m_parent->ConnectionIdentified(this);
 	}
 	catch (std::exception &ex) {
-		LogF(Logs::General, Logs::Error, "Error parsing handshake from client: {0}", ex.what());
+		LogError("Error parsing handshake from client: {0}", ex.what());
 		m_connection->Disconnect();
 	}
 #endif
@@ -296,7 +295,7 @@ void EQ::Net::ServertalkServerConnection::ProcessMessage(EQ::Net::Packet &p)
 
 				if (crypto_box_open_easy_afternm(&decrypted_text[0], (unsigned char*)&data[0], length, m_nonce_theirs, m_shared_key))
 				{
-					LogF(Logs::General, Logs::Error, "Error decrypting message from client");
+					LogError("Error decrypting message from client");
 					(*(uint64_t*)&m_nonce_theirs[0])++;
 					return;
 				}
@@ -344,6 +343,6 @@ void EQ::Net::ServertalkServerConnection::ProcessMessage(EQ::Net::Packet &p)
 		}
 	}
 	catch (std::exception &ex) {
-		LogF(Logs::General, Logs::Error, "Error parsing message from client: {0}", ex.what());
+		LogError("Error parsing message from client: {0}", ex.what());
 	}
 }
diff --git a/common/net/tcp_connection.cpp b/common/net/tcp_connection.cpp
index 03f8466de..695ac7643 100644
--- a/common/net/tcp_connection.cpp
+++ b/common/net/tcp_connection.cpp
@@ -203,6 +203,10 @@ int EQ::Net::TCPConnection::LocalPort() const
 
 std::string EQ::Net::TCPConnection::RemoteIP() const
 {
+	if (!m_socket) {
+		return "";
+	}
+
 	sockaddr_storage addr;
 	int addr_len = sizeof(addr);
 	uv_tcp_getpeername(m_socket, (sockaddr*)&addr, &addr_len);
@@ -220,6 +224,10 @@ std::string EQ::Net::TCPConnection::RemoteIP() const
 
 int EQ::Net::TCPConnection::RemotePort() const
 {
+	if (!m_socket) {
+		return 0;
+	}
+
 	sockaddr_storage addr;
 	int addr_len = sizeof(addr);
 	uv_tcp_getpeername(m_socket, (sockaddr*)&addr, &addr_len);
@@ -236,3 +244,11 @@ int EQ::Net::TCPConnection::RemotePort() const
 
 	return 0;
 }
+
+/**
+ * @return
+ */
+bool EQ::Net::TCPConnection::IsConnected() const
+{
+	return m_socket != nullptr;
+}
diff --git a/common/net/tcp_connection.h b/common/net/tcp_connection.h
index c69671da8..6bc256e85 100644
--- a/common/net/tcp_connection.h
+++ b/common/net/tcp_connection.h
@@ -24,10 +24,12 @@ namespace EQ
 			void Read(const char *data, size_t count);
 			void Write(const char *data, size_t count);
 
+			bool IsConnected() const;
 			std::string LocalIP() const;
 			int LocalPort() const;
 			std::string RemoteIP() const;
 			int RemotePort() const;
+
 		private:
 			TCPConnection();
 
diff --git a/common/net/websocket_server.cpp b/common/net/websocket_server.cpp
index de1a0cf99..b46fc7953 100644
--- a/common/net/websocket_server.cpp
+++ b/common/net/websocket_server.cpp
@@ -61,7 +61,7 @@ EQ::Net::WebsocketServer::WebsocketServer(const std::string &addr, int port)
 				auto &connection = iter->second;
 				connection->GetWebsocketConnection()->ping("keepalive");
 			}
-			catch (std::exception) {
+			catch (std::exception &) {
 				iter->second->GetTCPConnection()->Disconnect();
 			}
 
@@ -157,7 +157,7 @@ void EQ::Net::WebsocketServer::DispatchEvent(WebsocketSubscriptionEvent evt, Jso
 			}
 		}
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 	}
 }
 
@@ -190,7 +190,7 @@ Json::Value EQ::Net::WebsocketServer::Login(WebsocketServerConnection *connectio
 
 		return ret;
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		throw WebsocketException("Unable to process login request");
 	}
 }
@@ -212,7 +212,7 @@ Json::Value EQ::Net::WebsocketServer::Subscribe(WebsocketServerConnection *conne
 	catch (WebsocketException &ex) {
 		throw ex;
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		throw WebsocketException("Unable to process unsubscribe request");
 	}
 }
@@ -234,7 +234,7 @@ Json::Value EQ::Net::WebsocketServer::Unsubscribe(WebsocketServerConnection *con
 	catch (WebsocketException &ex) {
 		throw ex;
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		throw WebsocketException("Unable to process unsubscribe request");
 	}
 }
diff --git a/common/opcodemgr.cpp b/common/opcodemgr.cpp
index 2190db4a7..11d1b4811 100644
--- a/common/opcodemgr.cpp
+++ b/common/opcodemgr.cpp
@@ -32,7 +32,7 @@ OpcodeManager::OpcodeManager() {
 bool OpcodeManager::LoadOpcodesFile(const char *filename, OpcodeSetStrategy *s, bool report_errors) {
 	FILE *opf = fopen(filename, "r");
 	if(opf == nullptr) {
-		Log(Logs::General, Logs::Error, "Unable to open opcodes file '%s'", filename);
+		LogError("Unable to open opcodes file [{}]", filename);
 		return(false);
 	}
 
diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp
index d7fa21c41..fd75cb3db 100644
--- a/common/patches/rof.cpp
+++ b/common/patches/rof.cpp
@@ -85,7 +85,7 @@ namespace RoF
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
 			if (!opcodes->LoadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error loading opcodes file %s. Not registering patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error loading opcodes file [{}]. Not registering patch [{}]", opfile.c_str(), name);
 				return;
 			}
 		}
@@ -108,7 +108,7 @@ namespace RoF
 		signature.first_length = sizeof(structs::ClientZoneEntry_Struct);
 		signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry);
 		into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy);
-		Log(Logs::General, Logs::Netcode, "[IDENTIFY] Registered patch %s", name);
+		LogNetcode("[StreamIdentify] Registered patch [{}]", name);
 	}
 
 	void Reload()
@@ -125,10 +125,10 @@ namespace RoF
 			opfile += name;
 			opfile += ".conf";
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error reloading opcodes file %s for patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
 			}
-			Log(Logs::General, Logs::Netcode, "[OPCODES] Reloaded opcodes for patch %s", name);
+			LogNetcode("[OPCODES] Reloaded opcodes for patch [{}]", name);
 		}
 	}
 
@@ -350,7 +350,7 @@ namespace RoF
 
 		if (EntryCount == 0 || (in->size % sizeof(BazaarSearchResults_Struct)) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
 			delete in;
 			return;
 		}
@@ -589,7 +589,7 @@ namespace RoF
 		for (int index = 0; index < item_count; ++index, ++eq) {
 			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0, ItemPacketCharInventory);
 			if (ob.tellp() == last_pos)
-				Log(Logs::General, Logs::Netcode, "RoF::ENCODE(OP_CharInventory) Serialization failed on item slot %d during OP_CharInventory.  Item skipped.", eq->slot_id);
+				LogNetcode("RoF::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 
 			last_pos = ob.tellp();
 		}
@@ -624,6 +624,7 @@ namespace RoF
 		SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
 
 		OUT(spawn_id);
+		OUT(vehicle_id);
 		OUT(x_pos);
 		OUT(delta_x);
 		OUT(delta_y);
@@ -1521,7 +1522,7 @@ namespace RoF
 
 		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0, old_item_pkt->PacketType);
 		if (ob.tellp() == last_pos) {
-			Log(Logs::General, Logs::Netcode, "RoF::ENCODE(OP_ItemPacket) Serialization failed on item slot %d.", int_struct->slot_id);
+			LogNetcode("RoF::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
 			return;
 		}
@@ -2602,7 +2603,7 @@ namespace RoF
 
 		outapp->WriteUInt8(0);				// Unknown
 
-		Log(Logs::General, Logs::Netcode, "[STRUCTS] Player Profile Packet is %i bytes", outapp->GetWritePosition());
+		LogNetcode("[STRUCTS] Player Profile Packet is [{}] bytes", outapp->GetWritePosition());
 
 		auto NewBuffer = new unsigned char[outapp->GetWritePosition()];
 		memcpy(NewBuffer, outapp->pBuffer, outapp->GetWritePosition());
@@ -3199,43 +3200,35 @@ namespace RoF
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToRoFSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
@@ -3461,7 +3454,7 @@ namespace RoF
 
 		if (EntryCount == 0 || ((in->size % sizeof(Track_Struct))) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
 			delete in;
 			return;
 		}
@@ -3812,7 +3805,7 @@ namespace RoF
 		//determine and verify length
 		int entrycount = in->size / sizeof(Spawn_Struct);
 		if (entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) {
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
 			delete in;
 			return;
 		}
@@ -4060,7 +4053,7 @@ namespace RoF
 			Buffer += 29;
 			if (Buffer != (BufferStart + PacketSize))
 			{
-				Log(Logs::General, Logs::Netcode, "[ERROR] SPAWN ENCODE LOGIC PROBLEM: Buffer pointer is now %i from end", Buffer - (BufferStart + PacketSize));
+				LogNetcode("[ERROR] SPAWN ENCODE LOGIC PROBLEM: Buffer pointer is now [{}] from end", Buffer - (BufferStart + PacketSize));
 			}
 			//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Sending zone spawn for %s packet is %i bytes", emu->name, outapp->size);
 			//Log.Hex(Logs::Netcode, outapp->pBuffer, outapp->size);
@@ -4322,6 +4315,7 @@ namespace RoF
 		SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
 
 		IN(spawn_id);
+		IN(vehicle_id);
 		IN(sequence);
 		IN(x_pos);
 		IN(y_pos);
@@ -4629,7 +4623,7 @@ namespace RoF
 			return;
 		}
 		default:
-			Log(Logs::Detail, Logs::Netcode, "Unhandled OP_GuildBank action");
+			LogNetcode("Unhandled OP_GuildBank action");
 			__packet->SetOpcode(OP_Unknown); /* invalidate the packet */
 			return;
 		}
@@ -5686,7 +5680,7 @@ namespace RoF
 			RoFSlot = server_corpse_slot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Server Corpse Slot %i to RoF Corpse Main Slot %i", server_corpse_slot, RoFSlot);
+		LogNetcode("Convert Server Corpse Slot [{}] to RoF Corpse Main Slot [{}]", server_corpse_slot, RoFSlot);
 
 		return RoFSlot;
 	}
diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp
index 66e699e2a..36257771b 100644
--- a/common/patches/rof2.cpp
+++ b/common/patches/rof2.cpp
@@ -37,6 +37,7 @@
 #include <sstream>
 #include <numeric>
 #include <cassert>
+#include <cinttypes>
 
 
 namespace RoF2
@@ -85,7 +86,7 @@ namespace RoF2
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
 			if (!opcodes->LoadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error loading opcodes file %s. Not registering patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error loading opcodes file [{}]. Not registering patch [{}]", opfile.c_str(), name);
 				return;
 			}
 		}
@@ -111,7 +112,7 @@ namespace RoF2
 
 
 
-		Log(Logs::General, Logs::Netcode, "[IDENTIFY] Registered patch %s", name);
+		LogNetcode("[StreamIdentify] Registered patch [{}]", name);
 	}
 
 	void Reload()
@@ -128,10 +129,10 @@ namespace RoF2
 			opfile += name;
 			opfile += ".conf";
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error reloading opcodes file %s for patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
 			}
-			Log(Logs::General, Logs::Netcode, "[OPCODES] Reloaded opcodes for patch %s", name);
+			LogNetcode("[OPCODES] Reloaded opcodes for patch [{}]", name);
 		}
 	}
 
@@ -419,7 +420,7 @@ namespace RoF2
 
 		if (EntryCount == 0 || (in->size % sizeof(BazaarSearchResults_Struct)) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
 			delete in;
 			return;
 		}
@@ -657,7 +658,7 @@ namespace RoF2
 		for (int index = 0; index < item_count; ++index, ++eq) {
 			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0, ItemPacketCharInventory);
 			if (ob.tellp() == last_pos)
-				Log(Logs::General, Logs::Netcode, "RoF2::ENCODE(OP_CharInventory) Serialization failed on item slot %d during OP_CharInventory.  Item skipped.", eq->slot_id);
+				LogNetcode("RoF2::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 
 			last_pos = ob.tellp();
 		}
@@ -686,25 +687,6 @@ namespace RoF2
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_ClientUpdate)
-	{
-		ENCODE_LENGTH_EXACT(PlayerPositionUpdateServer_Struct);
-		SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
-
-		OUT(spawn_id);
-		OUT(x_pos);
-		OUT(delta_x);
-		OUT(delta_y);
-		OUT(z_pos);
-		OUT(delta_heading);
-		OUT(y_pos);
-		OUT(delta_z);
-		OUT(animation);
-		OUT(heading);
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_Consider)
 	{
 		ENCODE_LENGTH_EXACT(Consider_Struct);
@@ -1589,7 +1571,7 @@ namespace RoF2
 
 		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0, old_item_pkt->PacketType);
 		if (ob.tellp() == last_pos) {
-			Log(Logs::General, Logs::Netcode, "RoF2::ENCODE(OP_ItemPacket) Serialization failed on item slot %d.", int_struct->slot_id);
+			LogNetcode("RoF2::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
 			return;
 		}
@@ -2688,7 +2670,7 @@ namespace RoF2
 		// Think we need 1 byte of padding at the end
 		outapp->WriteUInt8(0);				// Unknown
 
-		Log(Logs::General, Logs::Netcode, "[STRUCTS] Player Profile Packet is %i bytes", outapp->GetWritePosition());
+		LogNetcode("[STRUCTS] Player Profile Packet is [{}] bytes", outapp->GetWritePosition());
 
 		auto NewBuffer = new unsigned char[outapp->GetWritePosition()];
 		memcpy(NewBuffer, outapp->pBuffer, outapp->GetWritePosition());
@@ -3266,43 +3248,35 @@ namespace RoF2
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToRoF2SayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
@@ -3528,7 +3502,7 @@ namespace RoF2
 
 		if (EntryCount == 0 || ((in->size % sizeof(Track_Struct))) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
 			delete in;
 			return;
 		}
@@ -3575,7 +3549,7 @@ namespace RoF2
 			{
 				eq->items[i].Unknown18 = 0;
 				if (i < 80) {
-					snprintf(eq->items[i].SerialNumber, sizeof(eq->items[i].SerialNumber), "%016d", emu->SerialNumber[i]);
+					snprintf(eq->items[i].SerialNumber, sizeof(eq->items[i].SerialNumber), "%016" PRId64, emu->SerialNumber[i]);
 					eq->ItemCost[i] = emu->ItemCost[i];
 				}
 				else {
@@ -3638,7 +3612,7 @@ namespace RoF2
 
 		OUT(TraderID);
 		snprintf(eq->SerialNumber, sizeof(eq->SerialNumber), "%016d", emu->ItemID);
-		Log(Logs::Detail, Logs::Trading, "ENCODE(OP_TraderDelItem): TraderID %d, SerialNumber: %d", emu->TraderID, emu->ItemID);
+		LogTrading("ENCODE(OP_TraderDelItem): TraderID [{}], SerialNumber: [{}]", emu->TraderID, emu->ItemID);
 
 		FINISH_ENCODE();
 	}
@@ -3669,7 +3643,7 @@ namespace RoF2
 			eq->Traders2 = emu->Traders;
 			eq->Items2 = emu->Items;
 
-			Log(Logs::Detail, Logs::Trading, "ENCODE(OP_TraderShop): BazaarWelcome_Struct Code %d, Traders %d, Items %d",
+			LogTrading("ENCODE(OP_TraderShop): BazaarWelcome_Struct Code [{}], Traders [{}], Items [{}]",
 				eq->Code, eq->Traders, eq->Items);
 
 			FINISH_ENCODE();
@@ -3692,14 +3666,14 @@ namespace RoF2
 			OUT(Quantity);
 			snprintf(eq->SerialNumber, sizeof(eq->SerialNumber), "%016d", emu->ItemID);
 
-			Log(Logs::Detail, Logs::Trading, "ENCODE(OP_TraderShop): Buy Action %d, Price %d, Trader %d, ItemID %d, Quantity %d, ItemName, %s",
+			LogTrading("ENCODE(OP_TraderShop): Buy Action [{}], Price [{}], Trader [{}], ItemID [{}], Quantity [{}], ItemName, [{}]",
 				eq->Action, eq->Price, eq->TraderID, eq->ItemID, eq->Quantity, emu->ItemName);
 
 			FINISH_ENCODE();
 		}
 		else
 		{
-			Log(Logs::Detail, Logs::Trading, "ENCODE(OP_TraderShop): Encode Size Unknown (%d)", psize);
+			LogTrading("ENCODE(OP_TraderShop): Encode Size Unknown ([{}])", psize);
 		}
 	}
 
@@ -3954,7 +3928,7 @@ namespace RoF2
 		//determine and verify length
 		int entrycount = in->size / sizeof(Spawn_Struct);
 		if (entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) {
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
 			delete in;
 			return;
 		}
@@ -4286,7 +4260,7 @@ namespace RoF2
 			Buffer += 29;
 			if (Buffer != (BufferStart + PacketSize))
 			{
-				Log(Logs::General, Logs::Netcode, "[ERROR] SPAWN ENCODE LOGIC PROBLEM: Buffer pointer is now %i from end", Buffer - (BufferStart + PacketSize));
+				LogNetcode("[ERROR] SPAWN ENCODE LOGIC PROBLEM: Buffer pointer is now [{}] from end", Buffer - (BufferStart + PacketSize));
 			}
 			//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Sending zone spawn for %s packet is %i bytes", emu->name, outapp->size);
 			//Log.Hex(Logs::Netcode, outapp->pBuffer, outapp->size);
@@ -4553,27 +4527,6 @@ namespace RoF2
 		FINISH_DIRECT_DECODE();
 	}
 
-	DECODE(OP_ClientUpdate)
-	{
-		// for some odd reason, there is an extra byte on the end of this on occasion..
-		DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct);
-		SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
-
-		IN(spawn_id);
-		IN(sequence);
-		IN(x_pos);
-		IN(y_pos);
-		IN(z_pos);
-		IN(heading);
-		IN(delta_x);
-		IN(delta_y);
-		IN(delta_z);
-		IN(delta_heading);
-		IN(animation);
-
-		FINISH_DIRECT_DECODE();
-	}
-
 	DECODE(OP_Consider)
 	{
 		DECODE_LENGTH_EXACT(structs::Consider_Struct);
@@ -4867,7 +4820,7 @@ namespace RoF2
 			return;
 		}
 		default:
-			Log(Logs::Detail, Logs::Netcode, "Unhandled OP_GuildBank action");
+			LogNetcode("Unhandled OP_GuildBank action");
 			__packet->SetOpcode(OP_Unknown); /* invalidate the packet */
 			return;
 		}
@@ -5020,7 +4973,7 @@ namespace RoF2
 		emu->to_slot = RoF2ToServerSlot(eq->to_slot);
 		IN(number_in_stack);
 		
-		//Log(Logs::General, Logs::Netcode, "[RoF2] MoveItem Slot from %u to %u, Number %u", emu->from_slot, emu->to_slot, emu->number_in_stack);
+		//LogNetcode("[RoF2] MoveItem Slot from [{}] to [{}], Number [{}]", emu->from_slot, emu->to_slot, emu->number_in_stack);
 
 		FINISH_DIRECT_DECODE();
 	}
@@ -5253,7 +5206,7 @@ namespace RoF2
 			IN(Code);
 			IN(TraderID);
 			IN(Approval);
-			Log(Logs::Detail, Logs::Trading, "DECODE(OP_TraderShop): TraderClick_Struct Code %d, TraderID %d, Approval %d",
+			LogTrading("DECODE(OP_TraderShop): TraderClick_Struct Code [{}], TraderID [{}], Approval [{}]",
 				eq->Code, eq->TraderID, eq->Approval);
 
 			FINISH_DIRECT_DECODE();
@@ -5267,7 +5220,7 @@ namespace RoF2
 			emu->Beginning.Action = eq->Code;
 			IN(Traders);
 			IN(Items);
-			Log(Logs::Detail, Logs::Trading, "DECODE(OP_TraderShop): BazaarWelcome_Struct Code %d, Traders %d, Items %d",
+			LogTrading("DECODE(OP_TraderShop): BazaarWelcome_Struct Code [{}], Traders [{}], Items [{}]",
 				eq->Code, eq->Traders, eq->Items);
 
 			FINISH_DIRECT_DECODE();
@@ -5284,20 +5237,20 @@ namespace RoF2
 			memcpy(emu->ItemName, eq->ItemName, sizeof(emu->ItemName));
 			IN(ItemID);
 			IN(Quantity);
-			Log(Logs::Detail, Logs::Trading, "DECODE(OP_TraderShop): TraderBuy_Struct (Unknowns) Unknown004 %d, Unknown008 %d, Unknown012 %d, Unknown076 %d, Unknown276 %d",
+			LogTrading("DECODE(OP_TraderShop): TraderBuy_Struct (Unknowns) Unknown004 [{}], Unknown008 [{}], Unknown012 [{}], Unknown076 [{}], Unknown276 [{}]",
 				eq->Unknown004, eq->Unknown008, eq->Unknown012, eq->Unknown076, eq->Unknown276);
-			Log(Logs::Detail, Logs::Trading, "DECODE(OP_TraderShop): TraderBuy_Struct Buy Action %d, Price %d, Trader %d, ItemID %d, Quantity %d, ItemName, %s",
+			LogTrading("DECODE(OP_TraderShop): TraderBuy_Struct Buy Action [{}], Price [{}], Trader [{}], ItemID [{}], Quantity [{}], ItemName, [{}]",
 				eq->Action, eq->Price, eq->TraderID, eq->ItemID, eq->Quantity, eq->ItemName);
 
 			FINISH_DIRECT_DECODE();
 		}
 		else if (psize == 4)
 		{
-			Log(Logs::Detail, Logs::Trading, "DECODE(OP_TraderShop): Forwarding packet as-is with size 4");
+			LogTrading("DECODE(OP_TraderShop): Forwarding packet as-is with size 4");
 		}
 		else
 		{
-			Log(Logs::Detail, Logs::Trading, "DECODE(OP_TraderShop): Decode Size Unknown (%d)", psize);
+			LogTrading("DECODE(OP_TraderShop): Decode Size Unknown ([{}])", psize);
 		}
 	}
 
@@ -5974,7 +5927,7 @@ namespace RoF2
 			RoF2Slot = server_corpse_slot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Server Corpse Slot %i to RoF2 Corpse Main Slot %i", server_corpse_slot, RoF2Slot);
+		LogNetcode("Convert Server Corpse Slot [{}] to RoF2 Corpse Main Slot [{}]", server_corpse_slot, RoF2Slot);
 
 		return RoF2Slot;
 	}
@@ -6157,7 +6110,7 @@ namespace RoF2
 			ServerSlot = rof2_corpse_slot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert RoF2 Corpse Main Slot %i to Server Corpse Slot %i", rof2_corpse_slot, ServerSlot);
+		LogNetcode("Convert RoF2 Corpse Main Slot [{}] to Server Corpse Slot [{}]", rof2_corpse_slot, ServerSlot);
 
 		return ServerSlot;
 	}
diff --git a/common/patches/rof2_ops.h b/common/patches/rof2_ops.h
index 7ee120c97..32798fef5 100644
--- a/common/patches/rof2_ops.h
+++ b/common/patches/rof2_ops.h
@@ -52,7 +52,6 @@ E(OP_CastSpell)
 E(OP_ChannelMessage)
 E(OP_CharInventory)
 E(OP_ClickObjectAction)
-E(OP_ClientUpdate)
 E(OP_Consider)
 E(OP_Damage)
 E(OP_DeleteCharge)
@@ -155,7 +154,6 @@ D(OP_BuffRemoveRequest)
 D(OP_CastSpell)
 D(OP_ChannelMessage)
 D(OP_CharacterCreate)
-D(OP_ClientUpdate)
 D(OP_Consider)
 D(OP_ConsiderCorpse)
 D(OP_Consume)
diff --git a/common/patches/rof2_structs.h b/common/patches/rof2_structs.h
index f36906df0..cecafb767 100644
--- a/common/patches/rof2_structs.h
+++ b/common/patches/rof2_structs.h
@@ -1620,24 +1620,24 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-	/*0000*/	uint16	spawn_id;
-	/*0002*/	uint16	spawnId2;
-	/*0004*/	signed	padding0004 : 12;
-				signed	y_pos : 19;			// y coord
-				unsigned padding : 1;
-	/*0008*/	signed	delta_z : 13;			// change in z
-				signed	delta_x : 13;			// change in x
-				signed	padding0008 : 6;
-	/*0012*/	signed	x_pos : 19;			// x coord
-				unsigned heading : 12;		// heading
-				signed	padding0016 : 1;
-	/*0016*/	signed	delta_heading : 10;	// change in heading
-				signed	z_pos : 19;			// z coord
-				signed	padding0020 : 3;
-	/*0020*/	signed	animation : 10;		// animation
-				signed	delta_y : 13;			// change in y
-				signed	padding0024 : 9;
-	/*0024*/
+/*0000*/	uint16		spawn_id;
+/*0002*/	uint16		vehicle_id;
+/*0004*/	signed		padding0004 : 12;
+			signed		y_pos : 19;			// y coord
+			unsigned	padding : 1;
+/*0008*/	signed		delta_z : 13;		// change in z
+			signed		delta_x : 13;		// change in x
+			signed		padding0008 : 6;
+/*0012*/	signed		x_pos : 19;			// x coord
+			unsigned	heading : 12;		// heading
+			signed		padding0016 : 1;
+/*0016*/	signed		delta_heading : 10;	// change in heading
+			signed		z_pos : 19;			// z coord
+			signed		padding0020 : 3;
+/*0020*/	signed		animation : 10;		// animation
+			signed		delta_y : 13;		// change in y
+			signed		padding0024 : 9;
+/*0024*/
 };
 
 /*
@@ -1648,22 +1648,23 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-	/*0000*/	uint16		sequence;			// increments one each packet - Verified
-	/*0002*/	uint16		spawn_id;			// Player's spawn id
-	/*0004*/	uint8		unknown0004[6];		// ***Placeholder
-	/*0010*/	float		delta_x;			// Change in x
-	/*0014*/	unsigned	heading : 12;			// Directional heading
-				unsigned	padding0040 : 20;		// ***Placeholder
-	/*0018*/	float		x_pos;				// x coord (2nd loc value)
-	/*0022*/	float		delta_z;			// Change in z
-	/*0026*/	float		z_pos;				// z coord (3rd loc value)
-	/*0030*/	float		y_pos;				// y coord (1st loc value)
-	/*0034*/	unsigned	animation : 10;		// ***Placeholder
-				unsigned	padding0024 : 22;		// animation
-	/*0038*/	float		delta_y;			// Change in y
-	/*0042*/	signed		delta_heading : 10;	// change in heading
-				unsigned	padding0041 : 22;		// ***Placeholder
-	/*0046*/
+/*0000*/	uint16		sequence;			// increments one each packet - Verified
+/*0002*/	uint16		spawn_id;			// Player's spawn id
+/*0004*/	uint16		vehicle_id;			// Player's vehicle spawn id
+/*0006*/	uint8		unknown0004[4];		// ***Placeholder
+/*0010*/	float		delta_x;			// Change in x
+/*0014*/	unsigned	heading : 12;		// Directional heading
+			unsigned	padding0040 : 20;	// ***Placeholder
+/*0018*/	float		x_pos;				// x coord (2nd loc value)
+/*0022*/	float		delta_z;			// Change in z
+/*0026*/	float		z_pos;				// z coord (3rd loc value)
+/*0030*/	float		y_pos;				// y coord (1st loc value)
+/*0034*/	unsigned	animation : 10;		// ***Placeholder
+			unsigned	padding0024 : 22;	// animation
+/*0038*/	float		delta_y;			// Change in y
+/*0042*/	signed		delta_heading : 10;	// change in heading
+			unsigned	padding0041 : 22;	// ***Placeholder
+/*0046*/
 };
 
 /*
diff --git a/common/patches/rof_structs.h b/common/patches/rof_structs.h
index e9122a156..7f466f09b 100644
--- a/common/patches/rof_structs.h
+++ b/common/patches/rof_structs.h
@@ -1608,22 +1608,22 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16	spawn_id;
-/*0002*/ uint16	spawnId2;
-/*0004*/ signed	padding0004:12;
-         signed	y_pos:19;           // y coord
-	 unsigned padding:1;
-/*0008*/ signed	delta_x:13;      // change in x
-         signed	delta_heading:10;// change in heading
-         signed	padding0008:9;
-/*0012*/ signed	delta_y:13;      // change in y
-         signed	z_pos:19;           // z coord
-/*0016*/ signed	x_pos:19;           // x coord
-         signed	animation:10;   // animation
-         signed	padding0016:3;
-/*0020*/ unsigned heading:12;     // heading
-         signed	delta_z:13;      // change in z
-         signed	padding0020:7;
+/*0000*/	uint16		spawn_id;
+/*0002*/	uint16		vehicle_id;
+/*0004*/	signed		padding0004 : 12;
+			signed		y_pos : 19;			// y coord
+			unsigned	padding : 1;
+/*0008*/	signed		delta_x : 13;		// change in x
+			signed		delta_heading : 10;	// change in heading
+			signed		padding0008 : 9;
+/*0012*/	signed		delta_y : 13;		// change in y
+			signed		z_pos : 19;			// z coord
+/*0016*/	signed		x_pos : 19;			// x coord
+			signed		animation : 10;		// animation
+			signed		padding0016 : 3;
+/*0020*/	unsigned	heading : 12;		// heading
+			signed		delta_z : 13;		// change in z
+			signed		padding0020 : 7;
 /*0024*/
 };
 
@@ -1636,21 +1636,22 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16		sequence;			// increments one each packet - Verified
-/*0002*/ uint16		spawn_id;			// Player's spawn id
-/*0004*/ uint8		unknown0004[6];		// ***Placeholder
-/*0010*/ float		delta_y;			// Change in y
-/*0014*/ float		x_pos;				// x coord (2nd loc value)
-/*0018*/ float		y_pos;				// y coord (1st loc value)
-/*0022*/ signed		delta_heading:10;	// change in heading
-	 unsigned	animation:10;		// ***Placeholder
-         unsigned	padding0024:12;		// animation
-/*0026*/ float		delta_z;			// Change in z
-/*0030*/ float		delta_x;			// Change in x
-/*0034*/ float		z_pos;				// z coord (3rd loc value)
-/*0038*/ unsigned	heading:12;			// Directional heading
-         unsigned	padding0040:10;		// ***Placeholder
-         unsigned	padding0041:10;		// ***Placeholder
+/*0000*/	uint16		sequence;			// increments one each packet - Verified
+/*0002*/	uint16		spawn_id;			// Player's spawn id
+/*0004*/	uint16		vehicle_id;			// Player's vehicle spawn id
+/*0006*/	uint8		unknown0004[4];		// ***Placeholder
+/*0010*/	float		delta_y;			// Change in y
+/*0014*/	float		x_pos;				// x coord (2nd loc value)
+/*0018*/	float		y_pos;				// y coord (1st loc value)
+/*0022*/	signed		delta_heading : 10;	// change in heading
+			unsigned	animation : 10;		// ***Placeholder
+			unsigned	padding0024 : 12;	// animation
+/*0026*/	float		delta_z;			// Change in z
+/*0030*/	float		delta_x;			// Change in x
+/*0034*/	float		z_pos;				// z coord (3rd loc value)
+/*0038*/	unsigned	heading : 12;		// Directional heading
+			unsigned	padding0040 : 10;	// ***Placeholder
+			unsigned	padding0041 : 10;	// ***Placeholder
 /*0042*/
 };
 
diff --git a/common/patches/sod.cpp b/common/patches/sod.cpp
index 2c9d70edf..709b07363 100644
--- a/common/patches/sod.cpp
+++ b/common/patches/sod.cpp
@@ -79,7 +79,7 @@ namespace SoD
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
 			if (!opcodes->LoadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error loading opcodes file %s. Not registering patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error loading opcodes file [{}]. Not registering patch [{}]", opfile.c_str(), name);
 				return;
 			}
 		}
@@ -105,7 +105,7 @@ namespace SoD
 
 
 
-		Log(Logs::General, Logs::Netcode, "[IDENTIFY] Registered patch %s", name);
+		LogNetcode("[StreamIdentify] Registered patch [{}]", name);
 	}
 
 	void Reload()
@@ -122,10 +122,10 @@ namespace SoD
 			opfile += name;
 			opfile += ".conf";
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error reloading opcodes file %s for patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
 			}
-			Log(Logs::General, Logs::Netcode, "[OPCODES] Reloaded opcodes for patch %s", name);
+			LogNetcode("[OPCODES] Reloaded opcodes for patch [{}]", name);
 		}
 	}
 
@@ -277,7 +277,7 @@ namespace SoD
 
 		if (EntryCount == 0 || (in->size % sizeof(BazaarSearchResults_Struct)) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
 			delete in;
 			return;
 		}
@@ -400,7 +400,7 @@ namespace SoD
 		for (int index = 0; index < item_count; ++index, ++eq) {
 			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0);
 			if (ob.tellp() == last_pos)
-				Log(Logs::General, Logs::Netcode, "SoD::ENCODE(OP_CharInventory) Serialization failed on item slot %d during OP_CharInventory.  Item skipped.", eq->slot_id);
+				LogNetcode("SoD::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 
 			last_pos = ob.tellp();
 		}
@@ -1069,7 +1069,7 @@ namespace SoD
 
 		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
 		if (ob.tellp() == last_pos) {
-			Log(Logs::General, Logs::Netcode, "SoD::ENCODE(OP_ItemPacket) Serialization failed on item slot %d.", int_struct->slot_id);
+			LogNetcode("SoD::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
 			return;
 		}
@@ -2069,43 +2069,35 @@ namespace SoD
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToSoDSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
@@ -2206,7 +2198,7 @@ namespace SoD
 
 		if (EntryCount == 0 || ((in->size % sizeof(Track_Struct))) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
 			delete in;
 			return;
 		}
@@ -2443,7 +2435,7 @@ namespace SoD
 		//determine and verify length
 		int entrycount = in->size / sizeof(Spawn_Struct);
 		if (entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) {
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
 			delete in;
 			return;
 		}
@@ -2934,6 +2926,7 @@ namespace SoD
 		IN(delta_z);
 		IN(delta_heading);
 		IN(animation);
+		emu->vehicle_id = 0;
 
 		FINISH_DIRECT_DECODE();
 	}
@@ -3856,7 +3849,7 @@ namespace SoD
 			SoDSlot = serverSlot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Server Slot %i to SoD Slot %i", serverSlot, SoDSlot);
+		LogNetcode("Convert Server Slot [{}] to SoD Slot [{}]", serverSlot, SoDSlot);
 
 		return SoDSlot;
 	}
@@ -3873,7 +3866,7 @@ namespace SoD
 			SoDSlot = server_corpse_slot - 2;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Server Corpse Slot %i to SoD Corpse Slot %i", server_corpse_slot, SoDSlot);
+		LogNetcode("Convert Server Corpse Slot [{}] to SoD Corpse Slot [{}]", server_corpse_slot, SoDSlot);
 
 		return SoDSlot;
 	}
@@ -3938,7 +3931,7 @@ namespace SoD
 			server_slot = sod_slot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert SoD Slot %i to Server Slot %i", sod_slot, server_slot);
+		LogNetcode("Convert SoD Slot [{}] to Server Slot [{}]", sod_slot, server_slot);
 
 		return server_slot;
 	}
@@ -3955,7 +3948,7 @@ namespace SoD
 			server_slot = sod_corpse_slot + 2;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert SoD Corpse Slot %i to Server Corpse Slot %i", sod_corpse_slot, server_slot);
+		LogNetcode("Convert SoD Corpse Slot [{}] to Server Corpse Slot [{}]", sod_corpse_slot, server_slot);
 
 		return server_slot;
 	}
diff --git a/common/patches/sod_structs.h b/common/patches/sod_structs.h
index 0d201e13a..0803432db 100644
--- a/common/patches/sod_structs.h
+++ b/common/patches/sod_structs.h
@@ -1372,21 +1372,21 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16		spawn_id;
-/*0002*/ signed		padding0000:12; // ***Placeholder
-         signed		delta_x:13;      // change in x
-         signed		padding0005:7;  // ***Placeholder
-/*0006*/ signed		delta_heading:10;// change in heading
-         signed		delta_y:13;      // change in y
-         signed		padding0006:9;  // ***Placeholder
-/*0010*/ signed		y_pos:19;           // y coord
-         signed		animation:10;   // animation
-         signed		padding0010:3;  // ***Placeholder
-/*0014*/ unsigned	heading:12;     // heading
-         signed		x_pos:19;           // x coord
-         signed		padding0014:1;  // ***Placeholder
-/*0018*/ signed		z_pos:19;           // z coord
-         signed		delta_z:13;      // change in z
+/*0000*/	uint16		spawn_id;
+/*0002*/	signed		padding0000 : 12;	// ***Placeholder
+			signed		delta_x : 13;		// change in x
+			signed		padding0005 : 7;	// ***Placeholder
+/*0006*/	signed		delta_heading : 10;	// change in heading
+			signed		delta_y : 13;		// change in y
+			signed		padding0006 : 9;	// ***Placeholder
+/*0010*/	signed		y_pos : 19;			// y coord
+			signed		animation : 10;		// animation
+			signed		padding0010 : 3;	// ***Placeholder
+/*0014*/	unsigned	heading : 12;		// heading
+			signed		x_pos : 19;			// x coord
+			signed		padding0014 : 1;	// ***Placeholder
+/*0018*/	signed		z_pos : 19;			// z coord
+			signed		delta_z : 13;		// change in z
 /*0022*/
 };
 
@@ -1399,21 +1399,21 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16		spawn_id;			// Player's spawn id
-/*0002*/ uint16		sequence;			// increments one each packet - Verified
-/*0004*/ uint8		unknown0004[4];		// ***Placeholder
-/*0008*/ float		x_pos;				// x coord (2nd loc value)
-/*0012*/ float		y_pos;				// y coord (1st loc value)
-/*0016*/ signed		delta_heading:10;	// change in heading
-         unsigned	padding0036:10;		// animation
-         unsigned	padding0016:12;		// ***Placeholder
-/*0020*/ float		delta_x;			// Change in x
-/*0024*/ float		delta_y;			// Change in y
-/*0028*/ float		z_pos;				// z coord (3rd loc value)
-/*0032*/ float		delta_z;			// Change in z
-/*0036*/ unsigned	animation:10;		// ***Placeholder
-         unsigned	heading:12;			// Directional heading
-         unsigned	padding0037:10;		// ***Placeholder
+/*0000*/	uint16		spawn_id;			// Player's spawn id
+/*0002*/	uint16		sequence;			// increments one each packet - Verified
+/*0004*/	uint8		unknown0004[4];		// ***Placeholder
+/*0008*/	float		x_pos;				// x coord (2nd loc value)
+/*0012*/	float		y_pos;				// y coord (1st loc value)
+/*0016*/	signed		delta_heading : 10;	// change in heading
+			unsigned	padding0036 : 10;	// animation
+			unsigned	padding0016 : 12;	// ***Placeholder
+/*0020*/	float		delta_x;			// Change in x
+/*0024*/	float		delta_y;			// Change in y
+/*0028*/	float		z_pos;				// z coord (3rd loc value)
+/*0032*/	float		delta_z;			// Change in z
+/*0036*/	unsigned	animation : 10;		// ***Placeholder
+			unsigned	heading : 12;		// Directional heading
+			unsigned	padding0037 : 10;	// ***Placeholder
 /*0040*/
 };
 
diff --git a/common/patches/sof.cpp b/common/patches/sof.cpp
index 0b3043c70..9f5626100 100644
--- a/common/patches/sof.cpp
+++ b/common/patches/sof.cpp
@@ -79,7 +79,7 @@ namespace SoF
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
 			if (!opcodes->LoadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error loading opcodes file %s. Not registering patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error loading opcodes file [{}]. Not registering patch [{}]", opfile.c_str(), name);
 				return;
 			}
 		}
@@ -103,7 +103,7 @@ namespace SoF
 		signature.first_eq_opcode = opcodes->EmuToEQ(OP_ZoneEntry);
 		into.RegisterPatch(signature, pname.c_str(), &opcodes, &struct_strategy);
 
-		Log(Logs::General, Logs::Netcode, "[IDENTIFY] Registered patch %s", name);
+		LogNetcode("[StreamIdentify] Registered patch [{}]", name);
 	}
 
 	void Reload()
@@ -120,10 +120,10 @@ namespace SoF
 			opfile += name;
 			opfile += ".conf";
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error reloading opcodes file %s for patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
 			}
-			Log(Logs::General, Logs::Netcode, "[OPCODES] Reloaded opcodes for patch %s", name);
+			LogNetcode("[OPCODES] Reloaded opcodes for patch [{}]", name);
 		}
 	}
 
@@ -380,7 +380,7 @@ namespace SoF
 		for (int index = 0; index < item_count; ++index, ++eq) {
 			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0);
 			if (ob.tellp() == last_pos)
-				Log(Logs::General, Logs::Netcode, "SoF::ENCODE(OP_CharInventory) Serialization failed on item slot %d during OP_CharInventory.  Item skipped.", eq->slot_id);
+				LogNetcode("SoF::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 
 			last_pos = ob.tellp();
 		}
@@ -864,7 +864,7 @@ namespace SoF
 
 		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
 		if (ob.tellp() == last_pos) {
-			Log(Logs::General, Logs::Netcode, "SoF::ENCODE(OP_ItemPacket) Serialization failed on item slot %d.", int_struct->slot_id);
+			LogNetcode("SoF::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
 			return;
 		}
@@ -1116,7 +1116,10 @@ namespace SoF
 		}
 		OUT(deity);
 		OUT(intoxication);
+
 		OUT_array(spellSlotRefresh, spells::SPELL_GEM_COUNT);
+		eq->spellSlotRefresh[9] = 0; // 10th slot is not valid in this release
+
 		OUT(abilitySlotRefresh);
 		OUT(points); // Relocation Test
 		//	OUT(unknown0166[4]);
@@ -1177,7 +1180,10 @@ namespace SoF
 		}
 
 		//	OUT(unknown4184[128]);
+
 		OUT_array(mem_spells, spells::SPELL_GEM_COUNT);
+		eq->mem_spells[9] = 0xFFFFFFFFU; // 10th slot is not valid in this release
+
 		//	OUT(unknown04396[32]);
 		OUT(platinum);
 		OUT(gold);
@@ -1720,43 +1726,35 @@ namespace SoF
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name);
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToSoFSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
@@ -1829,7 +1827,7 @@ namespace SoF
 
 		if (EntryCount == 0 || ((in->size % sizeof(Track_Struct))) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
 			delete in;
 			return;
 		}
@@ -1991,7 +1989,7 @@ namespace SoF
 		//determine and verify length
 		int entrycount = in->size / sizeof(Spawn_Struct);
 		if (entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) {
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
 			delete in;
 			return;
 		}
@@ -2389,6 +2387,7 @@ namespace SoF
 		IN(delta_z);
 		IN(delta_heading);
 		IN(animation);
+		emu->vehicle_id = 0;
 
 		FINISH_DIRECT_DECODE();
 	}
@@ -3246,7 +3245,7 @@ namespace SoF
 			sof_slot = server_slot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Server Slot %i to SoF Slot %i", server_slot, sof_slot);
+		LogNetcode("Convert Server Slot [{}] to SoF Slot [{}]", server_slot, sof_slot);
 
 		return sof_slot;
 	}
@@ -3332,7 +3331,7 @@ namespace SoF
 			server_slot = sof_slot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert SoF Slot %i to Server Slot %i", sof_slot, server_slot);
+		LogNetcode("Convert SoF Slot [{}] to Server Slot [{}]", sof_slot, server_slot);
 
 		return server_slot;
 	}
diff --git a/common/patches/sof_limits.h b/common/patches/sof_limits.h
index 399ff8c1a..a03676f2d 100644
--- a/common/patches/sof_limits.h
+++ b/common/patches/sof_limits.h
@@ -328,7 +328,11 @@ namespace SoF
 
 		const int SPELL_ID_MAX = 15999;
 		const int SPELLBOOK_SIZE = 480;
+		// Be careful not to confuse these two..SoF disc release has a special requirement...
+		// - The number of available spell gems HAS NOT increased from 9 at this point
+		// - The profile allocation HAS increased to 10 at this point
 		const int SPELL_GEM_COUNT = static_cast<uint32>(CastingSlot::MaxGems);
+		const int SPELL_GEM_PROFILE_SIZE = 10; // special case declaration
 		
 		const int LONG_BUFFS = 25;
 		const int SHORT_BUFFS = 15;
diff --git a/common/patches/sof_structs.h b/common/patches/sof_structs.h
index 93b185e23..0b175b643 100644
--- a/common/patches/sof_structs.h
+++ b/common/patches/sof_structs.h
@@ -885,7 +885,7 @@ struct PlayerProfile_Struct //23576 Octets
 /*00060*/ BindStruct binds[5];			// Bind points (primary is first)
 /*00160*/ uint32  deity;				// deity
 /*00164*/ uint32  intoxication;			// Alcohol level (in ticks till sober?)
-/*00168*/ uint32  spellSlotRefresh[spells::SPELL_GEM_COUNT]; // Refresh time (millis) - 4 Octets Each
+/*00168*/ uint32  spellSlotRefresh[spells::SPELL_GEM_PROFILE_SIZE]; // Refresh time (millis) - 4 Octets Each
 /*00208*/ uint32  abilitySlotRefresh;
 /*00212*/ uint8   haircolor;			// Player hair color
 /*00213*/ uint8   beardcolor;			// Player beard color
@@ -912,7 +912,7 @@ struct PlayerProfile_Struct //23576 Octets
 /*04173*/ uint8 unknown02264[147];		// was [139]
 /*04312*/ uint32   spell_book[spells::SPELLBOOK_SIZE];	// List of the Spells in spellbook 480 = 60 pages
 /*06232*/ uint8   unknown4184[128];		// was [136]
-/*06396*/ uint32   mem_spells[spells::SPELL_GEM_COUNT]; // List of spells memorized
+/*06396*/ uint32   mem_spells[spells::SPELL_GEM_PROFILE_SIZE]; // List of spells memorized
 /*06436*/ uint8 unknown04396[28];		//#### uint8 unknown04396[32]; in Titanium ####[28]
 /*06464*/ uint32  platinum;				// Platinum Pieces on player
 /*06468*/ uint32  gold;					// Gold Pieces on player
@@ -1373,21 +1373,21 @@ struct RespawnWindow_Struct {
 
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16   spawn_id;			// Entity ID of the Spawn/Player
-/*0002*/ signed   padding0000:12;	// ***Placeholder
-		 signed   x_pos:19;			// x coord
-		 signed   padding0290:1;	// ***Placeholder
-/*0006*/ signed   delta_x:13;		// change in x
-		 signed   delta_y:13;		// change in y
-		 signed   padding0294:6;	// ***Placeholder
-/*0010*/ signed   z_pos:19;			// z coord
-		 signed   delta_heading:10;	// change in heading
-		 signed   padding0298:3;	// ***Placeholder
-/*0014*/ signed   y_pos:19;			// y coord
-		 signed   delta_z:13;		// change in z
-/*0022*/ signed   animation:10;		// animation
-		 unsigned heading:12;		// heading
-		 signed   padding0302:10;	// ***Placeholder
+/*0000*/	uint16		spawn_id;			// Entity ID of the Spawn/Player
+/*0002*/	signed		padding0000 : 12;	// ***Placeholder
+			signed		x_pos : 19;			// x coord
+			signed		padding0290 : 1;	// ***Placeholder
+/*0006*/	signed		delta_x : 13;		// change in x
+			signed		delta_y : 13;		// change in y
+			signed		padding0294 : 6;	// ***Placeholder
+/*0010*/	signed		z_pos : 19;			// z coord
+			signed		delta_heading : 10;	// change in heading
+			signed		padding0298 : 3;	// ***Placeholder
+/*0014*/	signed		y_pos : 19;			// y coord
+			signed		delta_z : 13;		// change in z
+/*0022*/	signed		animation : 10;		// animation
+			unsigned	heading : 12;		// heading
+			signed		padding0302 : 10;	// ***Placeholder
 /*0026*/
 };
 
@@ -1399,20 +1399,20 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16 spawn_id;			// Player's Entity ID - Verified
-/*0002*/ uint16	sequence;			//increments one each packet - Verified
-/*0004*/ uint8 unknown0004[4];		// ***Placeholder
-/*0008*/ float delta_z;				// Change in z
-/*0012*/ float x_pos;				// x coord - Verified
-/*0016*/ signed delta_heading:10;	// Change in heading
-		 signed animation:10;		// Animation
-         unsigned padding0028:12;	// Seems to always be 0
-/*0020*/ float y_pos;				// y coord - Verified
-/*0024*/ float delta_x;				// Change in x
-/*0028*/ unsigned heading:12;		// Directional heading - Verified
-         unsigned padding0032:20;	// ***Placeholder - Some Static Number
-/*0032*/ float delta_y;				// Change in y
-/*0036*/ float z_pos;				// z coord - Verified
+/*0000*/	uint16		spawn_id;			// Player's Entity ID - Verified
+/*0002*/	uint16		sequence;			//increments one each packet - Verified
+/*0004*/	uint8		unknown0004[4];		// ***Placeholder
+/*0008*/	float		delta_z;			// Change in z
+/*0012*/	float		x_pos;				// x coord - Verified
+/*0016*/	signed		delta_heading : 10;	// Change in heading
+			signed		animation : 10;		// Animation
+			unsigned	padding0028 : 12;	// Seems to always be 0
+/*0020*/	float		y_pos;				// y coord - Verified
+/*0024*/	float		delta_x;			// Change in x
+/*0028*/	unsigned	heading : 12;		// Directional heading - Verified
+			unsigned	padding0032 : 20;	// ***Placeholder - Some Static Number
+/*0032*/	float		delta_y;			// Change in y
+/*0036*/	float		z_pos;				// z coord - Verified
 /*0040*/
 };
 
@@ -3768,7 +3768,7 @@ struct AnnoyingZoneUnknown_Struct {
 };
 
 struct LoadSpellSet_Struct {
-	uint32 spell[spells::SPELL_GEM_COUNT];
+	uint32 spell[spells::SPELL_GEM_PROFILE_SIZE];
 	uint32 unknown;
 };
 
diff --git a/common/patches/ss_define.h b/common/patches/ss_define.h
index bd5c065c5..57bf6b1b4 100644
--- a/common/patches/ss_define.h
+++ b/common/patches/ss_define.h
@@ -87,14 +87,14 @@
 //check length of packet before decoding. Call before setup.
 #define ENCODE_LENGTH_EXACT(struct_) \
 	if((*p)->size != sizeof(struct_)) { \
-		Log(Logs::Detail, Logs::Netcode, "Wrong size on outbound %s (" #struct_ "): Got %d, expected %d", opcodes->EmuToName((*p)->GetOpcode()), (*p)->size, sizeof(struct_)); \
+		LogNetcode("Wrong size on outbound [{}] (" #struct_ "): Got [{}], expected [{}]", opcodes->EmuToName((*p)->GetOpcode()), (*p)->size, sizeof(struct_)); \
 		delete *p; \
 		*p = nullptr; \
 		return; \
 	}
 #define ENCODE_LENGTH_ATLEAST(struct_) \
 	if((*p)->size < sizeof(struct_)) { \
-		Log(Logs::Detail, Logs::Netcode, "Wrong size on outbound %s (" #struct_ "): Got %d, expected at least %d", opcodes->EmuToName((*p)->GetOpcode()), (*p)->size, sizeof(struct_)); \
+		LogNetcode("Wrong size on outbound [{}] (" #struct_ "): Got [{}], expected at least [{}]", opcodes->EmuToName((*p)->GetOpcode()), (*p)->size, sizeof(struct_)); \
 		delete *p; \
 		*p = nullptr; \
 		return; \
@@ -153,13 +153,13 @@
 //check length of packet before decoding. Call before setup.
 #define DECODE_LENGTH_EXACT(struct_) \
 	if(__packet->size != sizeof(struct_)) { \
-		Log(Logs::Detail, Logs::Netcode, "Wrong size on incoming %s (" #struct_ "): Got %d, expected %d", opcodes->EmuToName(__packet->GetOpcode()), __packet->size, sizeof(struct_)); \
+		LogNetcode("Wrong size on incoming [{}] (" #struct_ "): Got [{}], expected [{}]", opcodes->EmuToName(__packet->GetOpcode()), __packet->size, sizeof(struct_)); \
 		__packet->SetOpcode(OP_Unknown); /* invalidate the packet */ \
 		return; \
 	}
 #define DECODE_LENGTH_ATLEAST(struct_) \
 	if(__packet->size < sizeof(struct_)) { \
-		Log(Logs::Detail, Logs::Netcode, "Wrong size on incoming %s (" #struct_ "): Got %d, expected at least %d", opcodes->EmuToName(__packet->GetOpcode()), __packet->size, sizeof(struct_)); \
+		LogNetcode("Wrong size on incoming [{}] (" #struct_ "): Got [{}], expected at least [{}]", opcodes->EmuToName(__packet->GetOpcode()), __packet->size, sizeof(struct_)); \
 		__packet->SetOpcode(OP_Unknown); /* invalidate the packet */ \
 		return; \
 	}
diff --git a/common/patches/titanium.cpp b/common/patches/titanium.cpp
index c4bef5bea..b612b9173 100644
--- a/common/patches/titanium.cpp
+++ b/common/patches/titanium.cpp
@@ -78,7 +78,7 @@ namespace Titanium
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
 			if (!opcodes->LoadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error loading opcodes file %s. Not registering patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error loading opcodes file [{}]. Not registering patch [{}]", opfile.c_str(), name);
 				return;
 			}
 		}
@@ -104,7 +104,7 @@ namespace Titanium
 
 
 
-		Log(Logs::General, Logs::Netcode, "[IDENTIFY] Registered patch %s", name);
+		LogNetcode("[StreamIdentify] Registered patch [{}]", name);
 	}
 
 	void Reload()
@@ -121,10 +121,10 @@ namespace Titanium
 			opfile += name;
 			opfile += ".conf";
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error reloading opcodes file %s for patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
 			}
-			Log(Logs::General, Logs::Netcode, "[OPCODES] Reloaded opcodes for patch %s", name);
+			LogNetcode("[OPCODES] Reloaded opcodes for patch [{}]", name);
 		}
 	}
 
@@ -337,7 +337,7 @@ namespace Titanium
 		for (int r = 0; r < itemcount; r++, eq++) {
 			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, ServerToTitaniumSlot(eq->slot_id), 0);
 			if (ob.tellp() == last_pos)
-				Log(Logs::General, Logs::Netcode, "Titanium::ENCODE(OP_CharInventory) Serialization failed on item slot %d during OP_CharInventory.  Item skipped.", eq->slot_id);
+				LogNetcode("Titanium::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 			
 			last_pos = ob.tellp();
 		}
@@ -350,6 +350,25 @@ namespace Titanium
 		dest->FastQueuePacket(&in, ack_req);
 	}
 
+	ENCODE(OP_ClientUpdate)
+	{
+		ENCODE_LENGTH_EXACT(PlayerPositionUpdateServer_Struct);
+		SETUP_DIRECT_ENCODE(PlayerPositionUpdateServer_Struct, structs::PlayerPositionUpdateServer_Struct);
+
+		OUT(spawn_id);
+		OUT(x_pos);
+		OUT(delta_x);
+		OUT(delta_y);
+		OUT(z_pos);
+		OUT(delta_heading);
+		OUT(y_pos);
+		OUT(delta_z);
+		OUT(animation);
+		OUT(heading);
+
+		FINISH_ENCODE();
+	}
+
 	ENCODE(OP_Damage)
 	{
 		ENCODE_LENGTH_EXACT(CombatDamage_Struct);
@@ -822,7 +841,7 @@ namespace Titanium
 
 		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, ServerToTitaniumSlot(int_struct->slot_id), 0);
 		if (ob.tellp() == last_pos) {
-			Log(Logs::General, Logs::Netcode, "Titanium::ENCODE(OP_ItemPacket) Serialization failed on item slot %d.", int_struct->slot_id);
+			LogNetcode("Titanium::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
 			return;
 		}
@@ -1420,43 +1439,35 @@ namespace Titanium
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToTitaniumSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_TaskDescription)
@@ -1518,7 +1529,7 @@ namespace Titanium
 
 		if (EntryCount == 0 || ((in->size % sizeof(Track_Struct))) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
 			delete in;
 			return;
 		}
@@ -1636,7 +1647,7 @@ namespace Titanium
 		//determine and verify length
 		int entrycount = in->size / sizeof(Spawn_Struct);
 		if (entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) {
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
 			delete in;
 			return;
 		}
@@ -1886,6 +1897,28 @@ namespace Titanium
 		FINISH_DIRECT_DECODE();
 	}
 
+	DECODE(OP_ClientUpdate)
+	{
+		// for some odd reason, there is an extra byte on the end of this on occasion.. (copied from SoF..not sure if applies to Ti - TODO: check)
+		DECODE_LENGTH_ATLEAST(structs::PlayerPositionUpdateClient_Struct);
+		SETUP_DIRECT_DECODE(PlayerPositionUpdateClient_Struct, structs::PlayerPositionUpdateClient_Struct);
+
+		IN(spawn_id);
+		IN(sequence);
+		IN(x_pos);
+		IN(y_pos);
+		IN(z_pos);
+		IN(heading);
+		IN(delta_x);
+		IN(delta_y);
+		IN(delta_z);
+		IN(delta_heading);
+		IN(animation);
+		emu->vehicle_id = 0;
+
+		FINISH_DIRECT_DECODE();
+	}
+
 	DECODE(OP_Consume)
 	{
 		DECODE_LENGTH_EXACT(structs::Consume_Struct);
@@ -2311,7 +2344,10 @@ namespace Titanium
 		ob << '|' << itoa(item->SkillModType);
 
 		ob << '|' << itoa(item->BaneDmgRace);
-		ob << '|' << itoa(item->BaneDmgAmt);
+		if (item->BaneDmgAmt > 255)
+			ob << '|' << "255";
+		else
+			ob << '|' << itoa(item->BaneDmgAmt);
 		ob << '|' << itoa(item->BaneDmgBody);
 
 		ob << '|' << itoa(item->Magic);
@@ -2545,7 +2581,7 @@ namespace Titanium
 			titanium_slot = server_slot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Server Slot %i to Titanium Slot %i", server_slot, titanium_slot);
+		LogNetcode("Convert Server Slot [{}] to Titanium Slot [{}]", server_slot, titanium_slot);
 
 		return titanium_slot;
 	}
@@ -2632,7 +2668,7 @@ namespace Titanium
 			server_slot = titanium_slot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Titanium Slot %i to Server Slot %i", titanium_slot, server_slot);
+		LogNetcode("Convert Titanium Slot [{}] to Server Slot [{}]", titanium_slot, server_slot);
 
 		return server_slot;
 	}
@@ -2653,7 +2689,7 @@ namespace Titanium
 			server_slot = titanium_corpse_slot + 4;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Titanium Corpse Slot %i to Server Corpse Slot %i", titanium_corpse_slot, server_slot);
+		LogNetcode("Convert Titanium Corpse Slot [{}] to Server Corpse Slot [{}]", titanium_corpse_slot, server_slot);
 
 		return server_slot;
 	}
diff --git a/common/patches/titanium_ops.h b/common/patches/titanium_ops.h
index dafb8b903..d3c8c1dde 100644
--- a/common/patches/titanium_ops.h
+++ b/common/patches/titanium_ops.h
@@ -27,6 +27,7 @@ E(OP_BecomeTrader)
 E(OP_Buff)
 E(OP_ChannelMessage)
 E(OP_CharInventory)
+E(OP_ClientUpdate)
 E(OP_Damage)
 E(OP_DeleteCharge)
 E(OP_DeleteItem)
@@ -82,6 +83,7 @@ D(OP_Bug)
 D(OP_CastSpell)
 D(OP_ChannelMessage)
 D(OP_CharacterCreate)
+D(OP_ClientUpdate)
 D(OP_Consume)
 D(OP_DeleteItem)
 D(OP_Emote)
diff --git a/common/patches/titanium_structs.h b/common/patches/titanium_structs.h
index 6ffee7ddf..de350db0b 100644
--- a/common/patches/titanium_structs.h
+++ b/common/patches/titanium_structs.h
@@ -1197,20 +1197,20 @@ struct BecomeCorpse_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16		spawn_id;
-/*0002*/ int32		delta_heading:10,  // change in heading
-         			x_pos:19,             // x coord
-         			padding0002:3;    // ***Placeholder
-/*0006*/ int32		y_pos:19,             // y coord
-         			animation:10,     // animation
-         			padding0006:3;    // ***Placeholder
-/*0010*/ int32		z_pos:19,             // z coord
-         			delta_y:13;        // change in y
-/*0014*/ int32		delta_x:13,        // change in x
-        			heading:12,       // heading
-         			padding0014:7;    // ***Placeholder
-/*0018*/ int32		delta_z:13,        // change in z
-         			padding0018:19;   // ***Placeholder
+/*0000*/	uint16	spawn_id;
+/*0002*/	int32	delta_heading : 10,	// change in heading
+					x_pos : 19,			// x coord
+					padding0002 : 3;	// ***Placeholder
+/*0006*/	int32	y_pos : 19,			// y coord
+					animation : 10,		// animation
+					padding0006 : 3;	// ***Placeholder
+/*0010*/	int32	z_pos : 19,			// z coord
+					delta_y : 13;		// change in y
+/*0014*/	int32	delta_x : 13,		// change in x
+					heading : 12,		// heading
+					padding0014 : 7;	// ***Placeholder
+/*0018*/	int32	delta_z : 13,		// change in z
+					padding0018 : 19;	// ***Placeholder
 /*0022*/
 };
 
@@ -1222,20 +1222,20 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16	spawn_id;
-/*0022*/ uint16	sequence;	//increments one each packet
-/*0004*/ float y_pos;                 // y coord
-/*0008*/ float delta_z;            // Change in z
-/*0016*/ float delta_x;            // Change in x
-/*0012*/ float delta_y;            // Change in y
-/*0020*/ int32 animation:10,     // animation
-         		delta_heading:10,  // change in heading
-         		padding0020:12;   // ***Placeholder (mostly 1)
-/*0024*/ float x_pos;                 // x coord
-/*0028*/ float z_pos;                 // z coord
-/*0034*/ uint16 heading:12,     // Directional heading
-         		padding0004:4;  // ***Placeholder
-/*0032*/ uint8 unknown0006[2];  // ***Placeholder
+/*0000*/	uint16	spawn_id;
+/*0022*/	uint16	sequence;			// increments one each packet
+/*0004*/	float	y_pos;				// y coord
+/*0008*/	float	delta_z;			// Change in z
+/*0016*/	float	delta_x;			// Change in x
+/*0012*/	float	delta_y;			// Change in y
+/*0020*/	int32	animation : 10,		// animation
+					delta_heading : 10,	// change in heading
+					padding0020 : 12;	// ***Placeholder (mostly 1)
+/*0024*/	float	x_pos;				// x coord
+/*0028*/	float	z_pos;				// z coord
+/*0034*/	uint16	heading : 12,		// Directional heading
+					padding0004 : 4;	// ***Placeholder
+/*0032*/	uint8	unknown0006[2];		// ***Placeholder
 /*0036*/
 };
 
diff --git a/common/patches/uf.cpp b/common/patches/uf.cpp
index 7db0cfb92..ef28e8e33 100644
--- a/common/patches/uf.cpp
+++ b/common/patches/uf.cpp
@@ -79,7 +79,7 @@ namespace UF
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
 			if (!opcodes->LoadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error loading opcodes file %s. Not registering patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error loading opcodes file [{}]. Not registering patch [{}]", opfile.c_str(), name);
 				return;
 			}
 		}
@@ -105,7 +105,7 @@ namespace UF
 
 
 
-		Log(Logs::General, Logs::Netcode, "[IDENTIFY] Registered patch %s", name);
+		LogNetcode("[StreamIdentify] Registered patch [{}]", name);
 	}
 
 	void Reload()
@@ -122,10 +122,10 @@ namespace UF
 			opfile += name;
 			opfile += ".conf";
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
-				Log(Logs::General, Logs::Netcode, "[OPCODES] Error reloading opcodes file %s for patch %s.", opfile.c_str(), name);
+				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
 			}
-			Log(Logs::General, Logs::Netcode, "[OPCODES] Reloaded opcodes for patch %s", name);
+			LogNetcode("[OPCODES] Reloaded opcodes for patch [{}]", name);
 		}
 	}
 
@@ -330,7 +330,7 @@ namespace UF
 
 		if (EntryCount == 0 || (in->size % sizeof(BazaarSearchResults_Struct)) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(BazaarSearchResults_Struct));
 			delete in;
 			return;
 		}
@@ -520,7 +520,7 @@ namespace UF
 		for (int index = 0; index < item_count; ++index, ++eq) {
 			SerializeItem(ob, (const EQEmu::ItemInstance*)eq->inst, eq->slot_id, 0);
 			if (ob.tellp() == last_pos)
-				Log(Logs::General, Logs::Netcode, "UF::ENCODE(OP_CharInventory) Serialization failed on item slot %d during OP_CharInventory.  Item skipped.", eq->slot_id);
+				LogNetcode("UF::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
 
 			last_pos = ob.tellp();
 		}
@@ -1277,7 +1277,7 @@ namespace UF
 
 		SerializeItem(ob, (const EQEmu::ItemInstance*)int_struct->inst, int_struct->slot_id, 0);
 		if (ob.tellp() == last_pos) {
-			Log(Logs::General, Logs::Netcode, "UF::ENCODE(OP_ItemPacket) Serialization failed on item slot %d.", int_struct->slot_id);
+			LogNetcode("UF::ENCODE(OP_ItemPacket) Serialization failed on item slot [{}]", int_struct->slot_id);
 			delete in;
 			return;
 		}
@@ -2369,43 +2369,35 @@ namespace UF
 		EQApplicationPacket *in = *p;
 		*p = nullptr;
 
-		SpecialMesg_Struct *emu = (SpecialMesg_Struct *)in->pBuffer;
+		SerializeBuffer buf(in->size);
+		buf.WriteInt8(in->ReadUInt8()); // speak mode
+		buf.WriteInt8(in->ReadUInt8()); // journal mode
+		buf.WriteInt8(in->ReadUInt8()); // language
+		buf.WriteInt32(in->ReadUInt32()); // message type
+		buf.WriteInt32(in->ReadUInt32()); // target spawn id
 
-		unsigned char *__emu_buffer = in->pBuffer;
-		// break strlen optimizations!
-		char *message = emu->sayer;
-		auto sayer_length = std::char_traits<char>::length(message);
-		message += sayer_length + 1 + 12; // skip over sayer name, null term, and 3 floats
+		std::string name;
+		in->ReadString(name); // NPC names max out at 63 chars
 
-		std::string old_message = message;
+		buf.WriteString(name);
+
+		buf.WriteInt32(in->ReadUInt32()); // loc
+		buf.WriteInt32(in->ReadUInt32());
+		buf.WriteInt32(in->ReadUInt32());
+
+		std::string old_message;
 		std::string new_message;
 
+		in->ReadString(old_message);
+
 		ServerToUFSayLink(new_message, old_message);
 
-		//in->size = 3 + 4 + 4 + strlen(emu->sayer) + 1 + 12 + new_message.length() + 1;
-		in->size = sayer_length + new_message.length() + 25;
-		in->pBuffer = new unsigned char[in->size];
+		buf.WriteString(new_message);
 
-		char *OutBuffer = (char *)in->pBuffer;
+		auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
 
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[0]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[1]);
-		VARSTRUCT_ENCODE_TYPE(uint8, OutBuffer, emu->header[2]);
-
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->msg_type);
-		VARSTRUCT_ENCODE_TYPE(uint32, OutBuffer, emu->target_spawn_id);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, emu->sayer);
-
-		// TODO: figure this shit out
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-		VARSTRUCT_ENCODE_TYPE(float, OutBuffer, 0.0f);
-
-		VARSTRUCT_ENCODE_STRING(OutBuffer, new_message.c_str());
-
-		delete[] __emu_buffer;
-		dest->FastQueuePacket(&in, ack_req);
+		dest->FastQueuePacket(&outapp, ack_req);
+		delete in;
 	}
 
 	ENCODE(OP_Stun)
@@ -2480,7 +2472,7 @@ namespace UF
 
 		if (EntryCount == 0 || ((in->size % sizeof(Track_Struct))) != 0)
 		{
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Track_Struct));
 			delete in;
 			return;
 		}
@@ -2712,7 +2704,7 @@ namespace UF
 		//determine and verify length
 		int entrycount = in->size / sizeof(Spawn_Struct);
 		if (entrycount == 0 || (in->size % sizeof(Spawn_Struct)) != 0) {
-			Log(Logs::General, Logs::Netcode, "[STRUCTS] Wrong size on outbound %s: Got %d, expected multiple of %d", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
+			LogNetcode("[STRUCTS] Wrong size on outbound [{}]: Got [{}], expected multiple of [{}]", opcodes->EmuToName(in->GetOpcode()), in->size, sizeof(Spawn_Struct));
 			delete in;
 			return;
 		}
@@ -3260,6 +3252,7 @@ namespace UF
 		IN(delta_z);
 		IN(delta_heading);
 		IN(animation);
+		emu->vehicle_id = 0;
 
 		FINISH_DIRECT_DECODE();
 	}
@@ -4214,7 +4207,7 @@ namespace UF
 			UFSlot = serverSlot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Server Slot %i to UF Slot %i", serverSlot, UFSlot);
+		LogNetcode("Convert Server Slot [{}] to UF Slot [{}]", serverSlot, UFSlot);
 
 		return UFSlot;
 	}
@@ -4231,7 +4224,7 @@ namespace UF
 			UFSlot = serverCorpseSlot - 2;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert Server Corpse Slot %i to UF Corpse Slot %i", serverCorpseSlot, UFSlot);
+		LogNetcode("Convert Server Corpse Slot [{}] to UF Corpse Slot [{}]", serverCorpseSlot, UFSlot);
 
 		return UFSlot;
 	}
@@ -4296,7 +4289,7 @@ namespace UF
 			ServerSlot = ufSlot;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert UF Slot %i to Server Slot %i", ufSlot, ServerSlot);
+		LogNetcode("Convert UF Slot [{}] to Server Slot [{}]", ufSlot, ServerSlot);
 
 		return ServerSlot;
 	}
@@ -4313,7 +4306,7 @@ namespace UF
 			ServerSlot = ufCorpseSlot + 2;
 		}
 
-		Log(Logs::Detail, Logs::Netcode, "Convert UF Corpse Slot %i to Server Corpse Slot %i", ufCorpseSlot, ServerSlot);
+		LogNetcode("Convert UF Corpse Slot [{}] to Server Corpse Slot [{}]", ufCorpseSlot, ServerSlot);
 
 		return ServerSlot;
 	}
diff --git a/common/patches/uf_structs.h b/common/patches/uf_structs.h
index 8e3309734..e165da794 100644
--- a/common/patches/uf_structs.h
+++ b/common/patches/uf_structs.h
@@ -1413,21 +1413,21 @@ struct RespawnWindow_Struct {
 */
 struct PlayerPositionUpdateServer_Struct
 {
-/*0000*/ uint16		spawn_id;
-/*0002*/ signed		padding0000:12; // ***Placeholder
-         signed		delta_x:13;      // change in x
-         signed		padding0005:7;  // ***Placeholder
-/*0006*/ signed		delta_heading:10;// change in heading
-         signed		delta_y:13;      // change in y
-         signed		padding0006:9;  // ***Placeholder
-/*0010*/ signed		y_pos:19;           // y coord
-         signed		animation:10;   // animation
-         signed		padding0010:3;  // ***Placeholder
-/*0014*/ unsigned	heading:12;     // heading
-         signed		x_pos:19;           // x coord
-         signed		padding0014:1;  // ***Placeholder
-/*0018*/ signed		z_pos:19;           // z coord
-         signed		delta_z:13;      // change in z
+/*0000*/	uint16		spawn_id;
+/*0002*/	signed		padding0000 : 12;	// ***Placeholder
+			signed		delta_x : 13;		// change in x
+			signed		padding0005 : 7;	// ***Placeholder
+/*0006*/	signed		delta_heading : 10;	// change in heading
+			signed		delta_y : 13;		// change in y
+			signed		padding0006 : 9;	// ***Placeholder
+/*0010*/	signed		y_pos : 19;			// y coord
+			signed		animation : 10;		// animation
+			signed		padding0010 : 3;	// ***Placeholder
+/*0014*/	unsigned	heading : 12;		// heading
+			signed		x_pos : 19;			// x coord
+			signed		padding0014 : 1;	// ***Placeholder
+/*0018*/	signed		z_pos : 19;			// z coord
+			signed		delta_z : 13;		// change in z
 /*0022*/
 };
 
@@ -1440,21 +1440,21 @@ struct PlayerPositionUpdateServer_Struct
 */
 struct PlayerPositionUpdateClient_Struct
 {
-/*0000*/ uint16		spawn_id;			// Player's spawn id
-/*0002*/ uint16		sequence;			// increments one each packet - Verified
-/*0004*/ uint8		unknown0004[4];		// ***Placeholder
-/*0008*/ float		x_pos;				// x coord (2nd loc value)
-/*0012*/ float		y_pos;				// y coord (1st loc value)
-/*0016*/ signed		delta_heading:10;	// change in heading
-         unsigned	padding0036:10;		// animation
-         unsigned	padding0016:12;		// ***Placeholder
-/*0020*/ float		delta_x;			// Change in x
-/*0024*/ float		delta_y;			// Change in y
-/*0028*/ float		z_pos;				// z coord (3rd loc value)
-/*0032*/ float		delta_z;			// Change in z
-/*0036*/ unsigned	animation:10;		// ***Placeholder
-         unsigned	heading:12;			// Directional heading
-         unsigned	padding0037:10;		// ***Placeholder
+/*0000*/	uint16		spawn_id;			// Player's spawn id
+/*0002*/	uint16		sequence;			// increments one each packet - Verified
+/*0004*/	uint8		unknown0004[4];		// ***Placeholder
+/*0008*/	float		x_pos;				// x coord (2nd loc value)
+/*0012*/	float		y_pos;				// y coord (1st loc value)
+/*0016*/	signed		delta_heading : 10;	// change in heading
+			unsigned	padding0036 : 10;	// animation
+			unsigned	padding0016 : 12;	// ***Placeholder
+/*0020*/	float		delta_x;			// Change in x
+/*0024*/	float		delta_y;			// Change in y
+/*0028*/	float		z_pos;				// z coord (3rd loc value)
+/*0032*/	float		delta_z;			// Change in z
+/*0036*/	unsigned	animation : 10;		// ***Placeholder
+			unsigned	heading : 12;		// Directional heading
+			unsigned	padding0037 : 10;	// ***Placeholder
 /*0040*/
 };
 
diff --git a/common/platform.cpp b/common/platform.cpp
index 4955d6639..b67267155 100644
--- a/common/platform.cpp
+++ b/common/platform.cpp
@@ -1,3 +1,23 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
 #include "platform.h"
 
 EQEmuExePlatform exe_platform = ExePlatformNone;
@@ -10,6 +30,44 @@ const EQEmuExePlatform& GetExecutablePlatform() {
 	return exe_platform;
 }
 
+/**
+ * @return
+ */
 int GetExecutablePlatformInt(){
 	return exe_platform;
+}
+
+/**
+ * Returns platform name by string
+ *
+ * @return
+ */
+std::string GetPlatformName()
+{
+	switch (GetExecutablePlatformInt()) {
+		case EQEmuExePlatform::ExePlatformWorld:
+			return "WorldServer";
+		case EQEmuExePlatform::ExePlatformQueryServ:
+			return "QueryServer";
+		case EQEmuExePlatform::ExePlatformZone:
+			return "ZoneServer";
+		case EQEmuExePlatform::ExePlatformUCS:
+			return "UCS";
+		case EQEmuExePlatform::ExePlatformLogin:
+			return "LoginServer";
+		case EQEmuExePlatform::ExePlatformSocket_Server:
+			return "SocketServer";
+		case EQEmuExePlatform::ExePlatformSharedMemory:
+			return "SharedMemory";
+		case EQEmuExePlatform::ExePlatformClientImport:
+			return "ClientImport";
+		case EQEmuExePlatform::ExePlatformClientExport:
+			return "ClientExport";
+		case EQEmuExePlatform::ExePlatformLaunch:
+			return "Launch";
+		case EQEmuExePlatform::ExePlatformHC:
+			return "HC";
+		default:
+			return "";
+	}
 }
\ No newline at end of file
diff --git a/common/platform.h b/common/platform.h
index 8eb765257..bd24a1493 100644
--- a/common/platform.h
+++ b/common/platform.h
@@ -1,6 +1,28 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
 #ifndef EQEMU_PLATFORM_H
 #define EQEMU_PLATFORM_H
 
+#include "iostream"
+
 enum EQEmuExePlatform
 {
 	ExePlatformNone = 0,
@@ -20,5 +42,6 @@ enum EQEmuExePlatform
 void RegisterExecutablePlatform(EQEmuExePlatform p);
 const EQEmuExePlatform& GetExecutablePlatform();
 int GetExecutablePlatformInt();
+std::string GetPlatformName();
 
 #endif
diff --git a/common/ptimer.cpp b/common/ptimer.cpp
index 5a3d9617f..e6338bdf9 100644
--- a/common/ptimer.cpp
+++ b/common/ptimer.cpp
@@ -134,7 +134,6 @@ bool PersistentTimer::Load(Database *db) {
                                     (unsigned long)_char_id, _type);
     auto results = db->QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error in PersistentTimer::Load, error: %s", results.ErrorMessage().c_str());
 		return false;
 	}
 
@@ -165,9 +164,6 @@ bool PersistentTimer::Store(Database *db) {
 #endif
     auto results = db->QueryDatabase(query);
 	if (!results.Success()) {
-#if EQDEBUG > 5
-		Log(Logs::General, Logs::Error, "Error in PersistentTimer::Store, error: %s", results.ErrorMessage().c_str());
-#endif
 		return false;
 	}
 
@@ -185,9 +181,6 @@ bool PersistentTimer::Clear(Database *db) {
 
     auto results = db->QueryDatabase(query);
 	if (!results.Success()) {
-#if EQDEBUG > 5
-		Log(Logs::General, Logs::Error, "Error in PersistentTimer::Clear, error: %s", results.ErrorMessage().c_str());
-#endif
 		return false;
 	}
 
@@ -197,10 +190,6 @@ bool PersistentTimer::Clear(Database *db) {
 
 /* This function checks if the timer triggered */
 bool PersistentTimer::Expired(Database *db, bool iReset) {
-	if (this == nullptr) {
-		Log(Logs::General, Logs::Error, "Null timer during ->Check()!?\n");
-		return(true);
-	}
 	uint32 current_time = get_current_time();
 	if (current_time-start_time >= timer_time) {
 		if (enabled && iReset) {
@@ -289,9 +278,6 @@ bool PTimerList::Load(Database *db) {
                                     (unsigned long)_char_id);
     auto results = db->QueryDatabase(query);
 	if (!results.Success()) {
-#if EQDEBUG > 5
-		Log(Logs::General, Logs::Error, "Error in PersistentTimer::Load, error: %s", results.ErrorMessage().c_str());
-#endif
 		return false;
 	}
 
@@ -348,9 +334,6 @@ bool PTimerList::Clear(Database *db) {
 #endif
     auto results = db->QueryDatabase(query);
 	if (!results.Success()) {
-#if EQDEBUG > 5
-		Log(Logs::General, Logs::Error, "Error in PersistentTimer::Clear, error: %s", results.ErrorMessage().c_str());
-#endif
 		return false;
 	}
 
@@ -440,9 +423,6 @@ bool PTimerList::ClearOffline(Database *db, uint32 char_id, pTimerType type) {
 #endif
     auto results = db->QueryDatabase(query);
 	if (!results.Success()) {
-#if EQDEBUG > 5
-		Log(Logs::General, Logs::Error, "Error in PTimerList::ClearOffline, error: %s", results.ErrorMessage().c_str());
-#endif
 		return false;
 	}
 
diff --git a/common/rulesys.cpp b/common/rulesys.cpp
index d4ff3d4d9..fed83d097 100644
--- a/common/rulesys.cpp
+++ b/common/rulesys.cpp
@@ -21,6 +21,7 @@
 #include "string_util.h"
 #include <cstdlib>
 #include <cstring>
+#include <fmt/format.h>
 
 /*
 	Commands:
@@ -45,14 +46,14 @@ const char *RuleManager::s_categoryNames[_CatCount+1] = {
 
 const RuleManager::RuleInfo RuleManager::s_RuleInfo[_IntRuleCount+_RealRuleCount+_BoolRuleCount+1] = {
 	/* this is done in three steps so we can reliably get to them by index*/
-	#define RULE_INT(cat, rule, default_value) \
-		{ #cat ":" #rule, Category__##cat, IntRule, Int__##rule },
+	#define RULE_INT(cat, rule, default_value, notes) \
+		{ #cat ":" #rule, Category__##cat, IntRule, Int__##rule, notes },
 	#include "ruletypes.h"
-	#define RULE_REAL(cat, rule, default_value) \
-		{ #cat ":" #rule, Category__##cat, RealRule, Real__##rule },
+	#define RULE_REAL(cat, rule, default_value, notes) \
+		{ #cat ":" #rule, Category__##cat, RealRule, Real__##rule, notes },
 	#include "ruletypes.h"
-	#define RULE_BOOL(cat, rule, default_value) \
-		{ #cat ":" #rule, Category__##cat, BoolRule, Bool__##rule },
+	#define RULE_BOOL(cat, rule, default_value, notes) \
+		{ #cat ":" #rule, Category__##cat, BoolRule, Bool__##rule, notes },
 	#include "ruletypes.h"
 	{ "Invalid Rule", _CatCount, IntRule }
 };
@@ -145,11 +146,11 @@ bool RuleManager::SetRule(const char *rule_name, const char *rule_value, Databas
 	switch(type) {
 		case IntRule:
 			m_RuleIntValues[index] = atoi(rule_value);
-			Log(Logs::Detail, Logs::Rules, "Set rule %s to value %d", rule_name, m_RuleIntValues[index]);
+			LogRules("Set rule [{}] to value [{}]", rule_name, m_RuleIntValues[index]);
 			break;
 		case RealRule:
 			m_RuleRealValues[index] = atof(rule_value);
-			Log(Logs::Detail, Logs::Rules, "Set rule %s to value %.13f", rule_name, m_RuleRealValues[index]);
+			LogRules("Set rule [{}] to value [{}]", rule_name, m_RuleRealValues[index]);
 			break;
 		case BoolRule:
 			uint32 val = 0;
@@ -157,7 +158,7 @@ bool RuleManager::SetRule(const char *rule_name, const char *rule_value, Databas
 				val = 1;
 
 			m_RuleBoolValues[index] = val;
-			Log(Logs::Detail, Logs::Rules, "Set rule %s to value %s", rule_name, m_RuleBoolValues[index] == 1 ? "true" : "false");
+			LogRules("Set rule [{}] to value [{}]", rule_name, m_RuleBoolValues[index] == 1 ? "true" : "false");
 			break;
 	}
 
@@ -178,11 +179,11 @@ void RuleManager::ResetRules(bool reload) {
 	}
 
 	Log(Logs::Detail, Logs::Rules, "Resetting running rules to default values");
-	#define RULE_INT(cat, rule, default_value) \
+	#define RULE_INT(cat, rule, default_value, notes) \
 		m_RuleIntValues[ Int__##rule ] = default_value;
-	#define RULE_REAL(cat, rule, default_value) \
+	#define RULE_REAL(cat, rule, default_value, notes) \
 		m_RuleRealValues[ Real__##rule ] = default_value;
-	#define RULE_BOOL(cat, rule, default_value) \
+	#define RULE_BOOL(cat, rule, default_value, notes) \
 		m_RuleBoolValues[ Bool__##rule ] = default_value;
 	#include "ruletypes.h"
 
@@ -214,19 +215,101 @@ bool RuleManager::_FindRule(const char *rule_name, RuleType &type_into, uint16 &
 //assumes index is valid!
 const char *RuleManager::_GetRuleName(RuleType type, uint16 index) {
 	switch (type) {
-		case IntRule:
-			return(s_RuleInfo[index].name);
-		case RealRule:
-			return(s_RuleInfo[index + _IntRuleCount].name);
-		case BoolRule:
-			return(s_RuleInfo[index + _IntRuleCount + _RealRuleCount].name);
+	case IntRule:
+		return(s_RuleInfo[index].name);
+	case RealRule:
+		return(s_RuleInfo[index+_IntRuleCount].name);
+	case BoolRule:
+		return(s_RuleInfo[index+_IntRuleCount+_RealRuleCount].name);
+	default:
+		break;
 	}
 	//should never happen
-	return("InvalidRule??");
+	return(s_RuleInfo[_IntRuleCount+_RealRuleCount+_BoolRuleCount].name); // no need to create a string when one already exists...
+}
+
+//assumes index is valid!
+const std::string &RuleManager::_GetRuleNotes(RuleType type, uint16 index) {
+	switch (type) {
+	case IntRule:
+		return(s_RuleInfo[index].notes);
+	case RealRule:
+		return(s_RuleInfo[index+_IntRuleCount].notes);
+	case BoolRule:
+		return(s_RuleInfo[index+_IntRuleCount+_RealRuleCount].notes);
+	default:
+		break;
+	}
+	//should never happen
+	return(s_RuleInfo[_IntRuleCount+_RealRuleCount+_BoolRuleCount].notes);
+}
+
+bool RuleManager::LoadRules(Database *database, const char *ruleset_name, bool reload) {
+
+	int ruleset_id = this->GetRulesetID(database, ruleset_name);
+	if (ruleset_id < 0) {
+		Log(Logs::Detail, Logs::Rules, "Failed to find ruleset '%s' for load operation. Canceling.", ruleset_name);
+		return (false);
+	}
+
+	m_activeRuleset = ruleset_id;
+	m_activeName = ruleset_name;
+
+	/* Load default ruleset values first if we're loading something other than default */
+	if (strcasecmp(ruleset_name, "default") != 0) {
+
+		std::string default_ruleset_name = "default";
+		int         default_ruleset_id = GetRulesetID(database, default_ruleset_name.c_str());
+
+		if (default_ruleset_id < 0) {
+			Log(Logs::Detail,
+				Logs::Rules,
+				"Failed to find default ruleset '%s' for load operation. Canceling.",
+				default_ruleset_name.c_str()
+			);
+
+			return (false);
+		}
+
+		Log(Logs::Detail, Logs::Rules, "Processing rule set '%s' (%d) load...", default_ruleset_name.c_str(), default_ruleset_id);
+
+		std::string query = StringFormat(
+			"SELECT `rule_name`, `rule_value` FROM `rule_values` WHERE `ruleset_id` = '%d'",
+			default_ruleset_id
+		);
+
+		auto results = database->QueryDatabase(query);
+		if (!results.Success()) {
+			return false;
+		}
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			if (!SetRule(row[0], row[1], nullptr, false, reload)) {
+				Log(Logs::Detail, Logs::Rules, "Unable to interpret rule record for '%s'", row[0]);
+			}
+		}
+	}
+
+	Log(Logs::Detail, Logs::Rules, "Processing rule set '%s' (%d) load...", ruleset_name, ruleset_id);
+
+	std::string query = StringFormat("SELECT `rule_name`, `rule_value` FROM `rule_values` WHERE `ruleset_id` = '%d'", ruleset_id);
+
+	auto results = database->QueryDatabase(query);
+	if (!results.Success()) {
+		return false;
+	}
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		if (!SetRule(row[0], row[1], nullptr, false, reload)) {
+			Log(Logs::Detail, Logs::Rules, "Unable to interpret rule record for '%s'", row[0]);
+		}
+	}
+
+	return true;
 }
 
 void RuleManager::SaveRules(Database *database, const char *ruleset_name) {
-
+	
 	if (ruleset_name != nullptr) {
 		//saving to a specific name
 		if (m_activeName != ruleset_name) {
@@ -257,56 +340,6 @@ void RuleManager::SaveRules(Database *database, const char *ruleset_name) {
 	}
 }
 
-bool RuleManager::LoadRules(Database *database, const char *ruleset_name, bool reload) {
-
-	int ruleset_id = this->GetRulesetID(database, ruleset_name);
-	if (ruleset_id < 0) {
-		Log(Logs::Detail, Logs::Rules, "Failed to find ruleset '%s' for load operation. Canceling.", ruleset_name);
-		return (false);
-	}
-
-	Log(Logs::Detail, Logs::Rules, "Loading rule set '%s' (%d)", ruleset_name, ruleset_id);
-
-	m_activeRuleset = ruleset_id;
-	m_activeName    = ruleset_name;
-
-	/* Load default ruleset values first if we're loading something other than default */
-	if (strcasecmp(ruleset_name, "default") != 0) {
-		std::string default_ruleset_name = "default";
-		int         default_ruleset_id   = GetRulesetID(database, default_ruleset_name.c_str());
-		if (default_ruleset_id < 0) {
-			Log(Logs::Detail, Logs::Rules, "Failed to find default ruleset '%s' for load operation. Canceling.",
-			    default_ruleset_name.c_str());
-			return (false);
-		}
-		Log(Logs::Detail, Logs::Rules, "Loading rule set '%s' (%d)", default_ruleset_name.c_str(), default_ruleset_id);
-
-		std::string query = StringFormat(
-				"SELECT rule_name, rule_value FROM rule_values WHERE ruleset_id = %d",
-				default_ruleset_id
-		);
-
-		auto results = database->QueryDatabase(query);
-		if (!results.Success())
-			return false;
-
-		for (auto row = results.begin(); row != results.end(); ++row)
-			if (!SetRule(row[0], row[1], nullptr, false, reload))
-				Log(Logs::Detail, Logs::Rules, "Unable to interpret rule record for %s", row[0]);
-	}
-
-	std::string query   = StringFormat("SELECT rule_name, rule_value FROM rule_values WHERE ruleset_id=%d", ruleset_id);
-	auto        results = database->QueryDatabase(query);
-	if (!results.Success())
-		return false;
-
-	for (auto row = results.begin(); row != results.end(); ++row)
-		if (!SetRule(row[0], row[1], nullptr, false, reload))
-			Log(Logs::Detail, Logs::Rules, "Unable to interpret rule record for %s", row[0]);
-
-	return true;
-}
-
 void RuleManager::_SaveRule(Database *database, RuleType type, uint16 index) {
 	char value_string[100];
 
@@ -328,17 +361,241 @@ void RuleManager::_SaveRule(Database *database, RuleType type, uint16 index) {
 	}
 
 	std::string query = StringFormat(
-			"REPLACE INTO rule_values "
-			"(ruleset_id, rule_name, rule_value) "
-			" VALUES(%d, '%s', '%s')",
+			"REPLACE INTO `rule_values`"
+			"(`ruleset_id`, `rule_name`, `rule_value`, `notes`)"
+			" VALUES('%d', '%s', '%s', '%s')",
 			m_activeRuleset,
 			_GetRuleName(type, index),
-			value_string
+			value_string,
+			EscapeString(_GetRuleNotes(type, index)).c_str()
 	);
 
 	database->QueryDatabase(query);
 }
 
+bool RuleManager::UpdateInjectedRules(Database *db, const char *ruleset_name, bool quiet_update)
+{
+	std::vector<std::string> database_data;
+	std::map<std::string, std::pair<std::string, const std::string *>> rule_data;
+	std::vector<std::tuple<int, std::string, std::string, std::string>> injected_rule_entries;
+
+	if (ruleset_name == nullptr) {
+		return false;
+	}
+
+	int ruleset_id = GetRulesetID(db, ruleset_name);
+	if (ruleset_id < 0) {
+		return false;
+	}
+
+	// load database rule names
+	std::string query(StringFormat("SELECT `rule_name` FROM `rule_values` WHERE `ruleset_id` = '%i'", ruleset_id));
+
+	auto results = db->QueryDatabase(query);
+	if (!results.Success()) {
+		return false;
+	}
+
+	// build database data entries
+	for (auto row : results) {
+		database_data.push_back(std::string(row[0]));
+	}
+
+	// build rule data entries
+	for (const auto &ri_iter : s_RuleInfo) {
+		if (strcasecmp(ri_iter.name, "Invalid Rule") == 0) {
+			continue;
+		}
+
+		char buffer[100];
+
+		switch (ri_iter.type) {
+		case IntRule:
+			sprintf(buffer, "%d", m_RuleIntValues[ri_iter.rule_index]);
+			rule_data[ri_iter.name].first = buffer;
+			rule_data[ri_iter.name].second = &ri_iter.notes;
+			break;
+		case RealRule:
+			sprintf(buffer, "%.13f", m_RuleRealValues[ri_iter.rule_index]);
+			rule_data[ri_iter.name].first = buffer;
+			rule_data[ri_iter.name].second = &ri_iter.notes;
+			break;
+		case BoolRule:
+			sprintf(buffer, "%s", (m_RuleBoolValues[ri_iter.rule_index] ? "true" : "false"));
+			rule_data[ri_iter.name].first = buffer;
+			rule_data[ri_iter.name].second = &ri_iter.notes;
+			break;
+		default:
+			break;
+		}
+	}
+
+	// build injected entries
+	for (const auto &rd_iter : rule_data) {
+		
+		const auto &dd_iter = std::find(database_data.begin(), database_data.end(), rd_iter.first);
+		if (dd_iter == database_data.end()) {
+
+			injected_rule_entries.push_back(
+				std::tuple<int, std::string, std::string, std::string>(
+					ruleset_id,								// `ruleset_id`
+					rd_iter.first,							// `rule_name`
+					rd_iter.second.first,					// `rule_value`	
+					EscapeString(*rd_iter.second.second)	// `notes`
+				)
+			);
+
+			if (!quiet_update) {
+				LogInfo(
+					"Adding new rule [{}] ruleset [{}] ({}) value [{}]",
+					rd_iter.first.c_str(),
+					ruleset_name,
+					ruleset_id,
+					rd_iter.second.first.c_str()
+				);
+			}
+		}
+	}
+
+	if (injected_rule_entries.size()) {
+
+		std::string query(
+			fmt::format(
+				"REPLACE INTO `rule_values`(`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES {}",
+				implode(
+					",",
+					std::pair<char, char>('(', ')'),
+					join_tuple(",", std::pair<char, char>('\'', '\''), injected_rule_entries)
+				)
+			)
+		);
+
+		if (!db->QueryDatabase(query).Success()) {
+			return false;
+		}
+
+		LogInfo(
+			"[{}] New rule(s) added to ruleset [{}] [{}]",
+			injected_rule_entries.size(),
+			ruleset_name,
+			ruleset_id
+		);
+	}
+	
+	return true;
+}
+
+bool RuleManager::UpdateOrphanedRules(Database *db, bool quiet_update)
+{
+	std::vector<std::string> rule_data;
+	std::vector<std::string> orphaned_rule_entries;
+
+	// load database rule names
+	std::string query("SELECT `rule_name` FROM `rule_values` GROUP BY `rule_name`");
+
+	auto results = db->QueryDatabase(query);
+	if (!results.Success()) {
+		return false;
+	}
+
+	// build rule data entries
+	for (const auto &ri_iter : s_RuleInfo) {
+		if (strcasecmp(ri_iter.name, "Invalid Rule") == 0) {
+			continue;
+		}
+
+		rule_data.push_back(ri_iter.name);
+	}
+
+	// build orphaned entries
+	for (auto row : results) {
+		
+		const auto &rd_iter = std::find(rule_data.begin(), rule_data.end(), row[0]);
+		if (rd_iter == rule_data.end()) {
+
+			orphaned_rule_entries.push_back(std::string(row[0]));
+
+			if (!quiet_update) {
+				LogInfo(
+					"Rule [{}] no longer exists... Deleting orphaned entry from `rule_values` table...",
+					row[0]
+				);
+			}
+		}
+	}
+
+	if (orphaned_rule_entries.size()) {
+
+		std::string query (
+			fmt::format(
+				"DELETE FROM `rule_values` WHERE `rule_name` IN ({})",
+				implode(",", std::pair<char, char>('\'', '\''), orphaned_rule_entries)
+			)
+		);
+
+		if (!db->QueryDatabase(query).Success()) {
+			return false;
+		}
+
+		LogInfo("[{}] Orphaned Rule(s) Deleted from [All Rulesets] (-1)", orphaned_rule_entries.size());
+	}
+	
+	return true;
+}
+
+bool RuleManager::RestoreRuleNotes(Database *db)
+{
+	std::string query("SELECT `ruleset_id`, `rule_name`, `notes` FROM `rule_values`");
+
+	auto results = db->QueryDatabase(query);
+	if (!results.Success()) {
+		return false;
+	}
+
+	int update_count = 0;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+
+		auto rule = [](const char *rule_name) {
+
+			for (auto rule_iter : s_RuleInfo) {
+				if (strcasecmp(rule_iter.name, rule_name) == 0) {
+					return rule_iter;
+				}
+			}
+
+			return s_RuleInfo[_IntRuleCount+_RealRuleCount+_BoolRuleCount];
+		}(row[1]);
+
+		if (strcasecmp(rule.name, row[1]) != 0) {
+			continue;
+		}
+
+		if (row[2] != nullptr && rule.notes.compare(row[2]) == 0) {
+			continue;
+		}
+
+		std::string query(
+			fmt::format(
+				"UPDATE `rule_values` SET `notes` = '{}' WHERE `ruleset_id` = '{}' AND `rule_name` = '{}'",
+				EscapeString(rule.notes),
+				row[0],
+				row[1]
+			)
+		);
+
+		if (!db->QueryDatabase(query).Success()) {
+			continue;
+		}
+		
+		++update_count;
+	}
+
+	if (update_count > 0) {
+		LogInfo("[{}] Rule Note [{}] Restored", update_count, (update_count == 1 ? "" : "s"));
+	}
+
+	return true;
+}
 
 int RuleManager::GetRulesetID(Database *database, const char *ruleset_name) {
 
diff --git a/common/rulesys.h b/common/rulesys.h
index 710c6d612..e9d3365fe 100644
--- a/common/rulesys.h
+++ b/common/rulesys.h
@@ -49,21 +49,21 @@ class RuleManager {
 public:
 	//generate our rule enums:
 	typedef enum {
-	#define RULE_INT(cat, rule, default_value) \
+	#define RULE_INT(cat, rule, default_value, notes) \
 		Int__##rule,
 	#include "ruletypes.h"
 		_IntRuleCount
 	} IntType;
 
 	typedef enum {
-	#define RULE_REAL(cat, rule, default_value) \
+	#define RULE_REAL(cat, rule, default_value, notes) \
 		Real__##rule,
 	#include "ruletypes.h"
 		_RealRuleCount
 	} RealType;
 
 	typedef enum {
-	#define RULE_BOOL(cat, rule, default_value) \
+	#define RULE_BOOL(cat, rule, default_value, notes) \
 		Bool__##rule,
 	#include "ruletypes.h"
 		_BoolRuleCount
@@ -97,6 +97,9 @@ public:
 	static const char *GetRuleName(IntType t) { return(s_RuleInfo[t].name); }
 	static const char *GetRuleName(RealType t) { return(s_RuleInfo[t+_IntRuleCount].name); }
 	static const char *GetRuleName(BoolType t) { return(s_RuleInfo[t+_IntRuleCount+_RealRuleCount].name); }
+	static const std::string &GetRuleNotes(IntType t) { return(s_RuleInfo[t].notes); }
+	static const std::string &GetRuleNotes(RealType t) { return(s_RuleInfo[t+_IntRuleCount].notes); }
+	static const std::string &GetRuleNotes(BoolType t) { return(s_RuleInfo[t+_IntRuleCount+_RealRuleCount].notes); }
 	static uint32 CountRules() { return(_RulesCount); }
 	static CategoryType FindCategory(const char *catname);
 	bool ListRules(const char *catname, std::vector<const char *> &into);
@@ -113,6 +116,9 @@ public:
 	void ResetRules(bool reload = false);
 	bool LoadRules(Database *db, const char *ruleset = nullptr, bool reload = false);
 	void SaveRules(Database *db, const char *ruleset = nullptr);
+	bool UpdateInjectedRules(Database *db, const char *ruleset_name, bool quiet_update = false);
+	bool UpdateOrphanedRules(Database *db, bool quiet_update = false);
+	bool RestoreRuleNotes(Database *db);
 
 private:
 	RuleManager();
@@ -137,15 +143,17 @@ private:
 
 	static bool _FindRule(const char *rule_name, RuleType &type_into, uint16 &index_into);
 	static const char *_GetRuleName(RuleType type, uint16 index);
+	static const std::string &_GetRuleNotes(RuleType type, uint16 index);
 	static int _FindOrCreateRuleset(Database *db, const char *ruleset);
 	void _SaveRule(Database *db, RuleType type, uint16 index);
-
+	
 	static const char *s_categoryNames[];
 	typedef struct {
 		const char *name;
 		CategoryType category;
 		RuleType type;
 		uint16 rule_index;	//index into its 'type' array
+		const std::string notes;
 	} RuleInfo;
 	static const RuleInfo s_RuleInfo[];
 
diff --git a/common/ruletypes.h b/common/ruletypes.h
index 8dfa15f9e..dab1d02e1 100644
--- a/common/ruletypes.h
+++ b/common/ruletypes.h
@@ -20,13 +20,13 @@
 #define RULE_CATEGORY(name)
 #endif
 #ifndef RULE_INT
-#define RULE_INT(cat, rule, default_value)
+#define RULE_INT(cat, rule, default_value, notes)
 #endif
 #ifndef RULE_REAL
-#define RULE_REAL(cat, rule, default_value)
+#define RULE_REAL(cat, rule, default_value, notes)
 #endif
 #ifndef RULE_BOOL
-#define RULE_BOOL(cat, rule, default_value)
+#define RULE_BOOL(cat, rule, default_value, notes)
 #endif
 #ifndef RULE_CATEGORY_END
 #define RULE_CATEGORY_END()
@@ -36,714 +36,730 @@
 
 
 RULE_CATEGORY(Character)
-RULE_INT(Character, MaxLevel, 65)
-RULE_BOOL(Character, PerCharacterQglobalMaxLevel, false) // This will check for qglobal 'CharMaxLevel' character qglobal (Type 5), if player tries to level beyond that point, it will not go beyond that level
-RULE_BOOL(Character, PerCharacterBucketMaxLevel, false) // This will check for data bucket 'CharMaxLevel', if player tries to level beyond that point, it will not go beyond that level
-RULE_INT(Character, MaxExpLevel, 0) //Sets the Max Level attainable via Experience
-RULE_INT(Character, DeathExpLossLevel, 10)	// Any level greater than this will lose exp on death
-RULE_INT(Character, DeathExpLossMaxLevel, 255)	// Any level greater than this will no longer lose exp on death
-RULE_INT(Character, DeathItemLossLevel, 10)
-RULE_INT(Character, DeathExpLossMultiplier, 3) //Adjust how much exp is lost
-RULE_BOOL(Character, UseDeathExpLossMult, false) //Adjust to use the above multiplier or to use code default.
-RULE_BOOL(Character, UseOldRaceRezEffects, false) // older clients had ID 757 for races with high starting STR, but it doesn't seem used anymore
-RULE_INT(Character, CorpseDecayTimeMS, 10800000)
-RULE_INT(Character, CorpseResTimeMS, 10800000) // time before cant res corpse(3 hours)
-RULE_BOOL(Character, LeaveCorpses, true)
-RULE_BOOL(Character, LeaveNakedCorpses, false)
-RULE_INT(Character, MaxDraggedCorpses, 2)
-RULE_REAL(Character, DragCorpseDistance, 400) // If the corpse is <= this distance from the player, it won't move
-RULE_REAL(Character, ExpMultiplier, 0.5)
-RULE_REAL(Character, AAExpMultiplier, 0.5)
-RULE_REAL(Character, GroupExpMultiplier, 0.5)
-RULE_REAL(Character, RaidExpMultiplier, 0.2)
-RULE_BOOL(Character, UseXPConScaling, true)
-RULE_INT(Character, ShowExpValues, 0) //0 - normal, 1 - Show raw experience values, 2 - Show raw experience values AND percent.
-RULE_INT(Character, GreenModifier, 20)
-RULE_INT(Character, LightBlueModifier, 40)
-RULE_INT(Character, BlueModifier, 90)
-RULE_INT(Character, WhiteModifier, 100)
-RULE_INT(Character, YellowModifier, 125)
-RULE_INT(Character, RedModifier, 150)
-RULE_INT(Character, AutosaveIntervalS, 300)	//0=disabled
-RULE_INT(Character, HPRegenMultiplier, 100)
-RULE_INT(Character, ManaRegenMultiplier, 100)
-RULE_INT(Character, EnduranceRegenMultiplier, 100)
-RULE_BOOL(Character, OldMinMana, false) // this is used for servers that want to follow older skill cap formulas so they can still have some regen w/o mediate
-RULE_INT(Character, ConsumptionMultiplier, 100) //item's hunger restored = this value * item's food level, 100 = normal, 50 = people eat 2x as fast, 200 = people eat 2x as slow
-RULE_BOOL(Character, HealOnLevel, false)
-RULE_BOOL(Character, FeignKillsPet, false)
-RULE_INT(Character, ItemManaRegenCap, 15)
-RULE_INT(Character, ItemHealthRegenCap, 30)
-RULE_INT(Character, ItemDamageShieldCap, 30)
-RULE_INT(Character, ItemAccuracyCap, 150)
-RULE_INT(Character, ItemAvoidanceCap, 100)
-RULE_INT(Character, ItemCombatEffectsCap, 100)
-RULE_INT(Character, ItemShieldingCap, 35)
-RULE_INT(Character, ItemSpellShieldingCap, 35)
-RULE_INT(Character, ItemDoTShieldingCap, 35)
-RULE_INT(Character, ItemStunResistCap, 35)
-RULE_INT(Character, ItemStrikethroughCap, 35)
-RULE_INT(Character, ItemATKCap, 250)
-RULE_INT(Character, ItemHealAmtCap, 250)
-RULE_INT(Character, ItemSpellDmgCap, 250)
-RULE_INT(Character, ItemClairvoyanceCap, 250)
-RULE_INT(Character, ItemDSMitigationCap, 50)
-RULE_INT(Character, ItemEnduranceRegenCap, 15)
-RULE_INT(Character, ItemExtraDmgCap, 150) // Cap for bonuses to melee skills like Bash, Frenzy, etc
-RULE_INT(Character, HasteCap, 100) // Haste cap for non-v3(overhaste) haste.
-RULE_INT(Character, SkillUpModifier, 100) //skill ups are at 100%
-RULE_BOOL(Character, SharedBankPlat, false) //off by default to prevent duping for now
-RULE_BOOL(Character, BindAnywhere, false)
-RULE_BOOL(Character, RestRegenEnabled, true) // Enable OOC Regen
-RULE_INT(Character, RestRegenTimeToActivate, 30) // Time in seconds for rest state regen to kick in.
-RULE_INT(Character, RestRegenRaidTimeToActivate, 300) // Time in seconds for rest state regen to kick in with a raid target.
-RULE_INT(Character, KillsPerGroupLeadershipAA, 250) // Number of dark blues or above per Group Leadership AA
-RULE_INT(Character, KillsPerRaidLeadershipAA, 250) // Number of dark blues or above per Raid Leadership AA
-RULE_INT(Character, MaxFearDurationForPlayerCharacter, 4) //4 tics, each tic calculates every 6 seconds.
-RULE_INT(Character, MaxCharmDurationForPlayerCharacter, 15)
-RULE_INT(Character, BaseHPRegenBonusRaces, 4352)	//a bitmask of race(s) that receive the regen bonus. Iksar (4096) & Troll (256) = 4352. see common/races.h for the bitmask values
-RULE_BOOL(Character, SoDClientUseSoDHPManaEnd, false)	// Setting this to true will allow SoD clients to use the SoD HP/Mana/End formulas and previous clients will use the old formulas
-RULE_BOOL(Character, UseRaceClassExpBonuses, true)	// Setting this to true will enable Class and Racial experience rate bonuses
-RULE_BOOL(Character, UseOldRaceExpPenalties, false)	// Setting this to true will enable racial exp penalties for Iksar, Troll, Ogre, and Barbarian, as well as the bonus for Halflings
-RULE_BOOL(Character, UseOldClassExpPenalties, false)	// Setting this to true will enable old class exp penalties for Paladin, SK, Ranger, Bard, Monk, Wizard, Enchanter, Magician, and Necromancer, as well as the bonus for Rogues and Warriors
-RULE_BOOL(Character, RespawnFromHover, false)		// Use Respawn window, or not.
-RULE_INT(Character, RespawnFromHoverTimer, 300)	// Respawn Window countdown timer, in SECONDS
-RULE_BOOL(Character, UseNewStatsWindow, true)		// New stats window shows everything
-RULE_BOOL(Character, ItemCastsUseFocus, false) // If true, this allows item clickies to use focuses that have limited max levels on them
-RULE_INT(Character, MinStatusForNoDropExemptions, 80) // This allows status x and higher to trade no drop items.
-RULE_INT(Character, SkillCapMaxLevel, 75)	// Sets the Max Level used for Skill Caps (from skill_caps table). -1 makes it use MaxLevel rule value. It is set to 75 because PEQ only has skillcaps up to that level, and grabbing the players' skill past 75 will return 0, breaking all skills past that level. This helps servers with obsurd level caps (75+ level cap) function without any modifications.
-RULE_INT(Character, StatCap, 0)
-RULE_BOOL(Character, CheckCursorEmptyWhenLooting, true) // If true, a player cannot loot a corpse (player or NPC) with an item on their cursor
-RULE_BOOL(Character, MaintainIntoxicationAcrossZones, true) // If true, alcohol effects are maintained across zoning and logging out/in.
-RULE_BOOL(Character, EnableDiscoveredItems, true) // If enabled, it enables EVENT_DISCOVER_ITEM and also saves character names and timestamps for the first time an item is discovered.
-RULE_BOOL(Character, EnableXTargetting, true) // Enable Extended Targetting Window, for users with UF and later clients.
-RULE_BOOL(Character, EnableAggroMeter, true) // Enable Aggro Meter, for users with RoF and later clients.
-RULE_BOOL(Character, KeepLevelOverMax, false) // Don't delevel a character that has somehow gone over the level cap
-RULE_INT(Character, FoodLossPerUpdate, 32) // How much food/water you lose per stamina update
-RULE_BOOL(Character, EnableHungerPenalties, false) // being hungry/thirsty has negative effects -- it does appear normal live servers do not have penalties
-RULE_INT(Character, BaseInstrumentSoftCap, 36) // Softcap for instrument mods, 36 commonly referred to as "3.6" as well.
-RULE_BOOL(Character, UseSpellFileSongCap, true) // When they removed the AA that increased the cap they removed the above and just use the spell field
-RULE_INT(Character, BaseRunSpeedCap, 158) // Base Run Speed Cap, on live it's 158% which will give you a runspeed of 1.580 hard capped to 225.
-RULE_INT(Character, OrnamentationAugmentType, 20) //Ornamentation Augment Type
-RULE_REAL(Character, EnvironmentDamageMulipliter, 1)
-RULE_BOOL(Character, UnmemSpellsOnDeath, true)
-RULE_INT(Character, TradeskillUpAlchemy, 2) // Alchemy skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpBaking, 2) // Baking skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpBlacksmithing, 2) // Blacksmithing skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpBrewing, 3) // Brewing skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpFletching, 2) // Fletching skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpJewelcrafting, 2) // Jewelcrafting skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpMakePoison, 2) // Make Poison skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpPottery, 4) // Pottery skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpResearch, 1) // Research skillup rate adjust. Lower is faster.
-RULE_INT(Character, TradeskillUpTinkering, 2) // Tinkering skillup rate adjust. Lower is faster.
-RULE_BOOL(Character, MarqueeHPUpdates, false) // Will show Health % in center of screen < 100%
-RULE_INT(Character, IksarCommonTongue, 95) // 95 By default (live-like?)
-RULE_INT(Character, OgreCommonTongue, 95) // 95 By default (live-like?)
-RULE_INT(Character, TrollCommonTongue, 95) // 95 By default (live-like?)
-RULE_BOOL(Character, ActiveInvSnapshots, false) // Takes a periodic snapshot of inventory contents from online players
-RULE_INT(Character, InvSnapshotMinIntervalM, 180) // Minimum time (in minutes) between inventory snapshots
-RULE_INT(Character, InvSnapshotMinRetryM, 30) // Time (in minutes) to re-attempt an inventory snapshot after a failure
-RULE_INT(Character, InvSnapshotHistoryD, 30) // Time (in days) to keep snapshot entries
-RULE_BOOL(Character, RestrictSpellScribing, false) // Restricts spell scribing to allowable races/classes of spell scroll, if true
-RULE_BOOL(Character, UseStackablePickPocketing, true) // Allows stackable pickpocketed items to stack instead of only being allowed in empty inventory slots
-RULE_BOOL(Character, EnableAvoidanceCap, false)
-RULE_INT(Character, AvoidanceCap, 750) // 750 Is a pretty good value, seen people dodge all attacks beyond 1,000 Avoidance
-RULE_BOOL(Character, AllowMQTarget, false) // Disables putting players in the 'hackers' list for targeting beyond the clip plane or attempting to target something untargetable
-RULE_BOOL(Character, UseOldBindWound, false) // Uses the original bind wound behavior
-RULE_BOOL(Character, GrantHoTTOnCreate, false) // Grant Health of Target's Target leadership AA on character creation
-RULE_BOOL(Character, UseOldConSystem, false) // Grant Health of Target's Target leadership AA on character creation
-RULE_BOOL(Character, OPClientUpdateVisualDebug, false) // Shows a pulse and forward directional particle each time the client sends its position to server
-RULE_BOOL(Character, AllowCrossClassTrainers, false)
-RULE_BOOL(Character, PetsUseReagents, true) //Pets use reagent on spells
-RULE_BOOL(Character, DismountWater, true) // Dismount horses when entering water
+RULE_INT(Character, MaxLevel, 65, "")
+RULE_BOOL(Character, PerCharacterQglobalMaxLevel, false, "This will check for qglobal 'CharMaxLevel' character qglobal (Type 5, \"\"), if player tries to level beyond that point, it will not go beyond that level")
+RULE_BOOL(Character, PerCharacterBucketMaxLevel, false, "This will check for data bucket 'CharMaxLevel', if player tries to level beyond that point, it will not go beyond that level")
+RULE_INT(Character, MaxExpLevel, 0, "Sets the Max Level attainable via Experience")
+RULE_INT(Character, DeathExpLossLevel, 10, "Any level greater than this will lose exp on death")
+RULE_INT(Character, DeathExpLossMaxLevel, 255, "Any level greater than this will no longer lose exp on death")
+RULE_INT(Character, DeathItemLossLevel, 10, "")
+RULE_INT(Character, DeathExpLossMultiplier, 3, "Adjust how much exp is lost")
+RULE_BOOL(Character, UseDeathExpLossMult, false, "Adjust to use the above multiplier or to use code default")
+RULE_BOOL(Character, UseOldRaceRezEffects, false, "older clients had ID 757 for races with high starting STR, but it doesn't seem used anymore")
+RULE_INT(Character, CorpseDecayTimeMS, 10800000, "")
+RULE_INT(Character, CorpseResTimeMS, 10800000, "time before cant res corpse(3 hours)")
+RULE_BOOL(Character, LeaveCorpses, true, "")
+RULE_BOOL(Character, LeaveNakedCorpses, false, "")
+RULE_INT(Character, MaxDraggedCorpses, 2, "")
+RULE_REAL(Character, DragCorpseDistance, 400, "If the corpse is <= this distance from the player, it won't move")
+RULE_REAL(Character, ExpMultiplier, 0.5, "")
+RULE_REAL(Character, AAExpMultiplier, 0.5, "")
+RULE_REAL(Character, GroupExpMultiplier, 0.5, "")
+RULE_REAL(Character, RaidExpMultiplier, 0.2, "")
+RULE_BOOL(Character, UseXPConScaling, true, "")
+RULE_INT(Character, ShowExpValues, 0, "0 - normal, 1 - Show raw experience values, 2 - Show raw experience values AND percent")
+RULE_INT(Character, GreenModifier, 20, "")
+RULE_INT(Character, LightBlueModifier, 40, "")
+RULE_INT(Character, BlueModifier, 90, "")
+RULE_INT(Character, WhiteModifier, 100, "")
+RULE_INT(Character, YellowModifier, 125, "")
+RULE_INT(Character, RedModifier, 150, "")
+RULE_INT(Character, AutosaveIntervalS, 300, "0 = disabled")
+RULE_INT(Character, HPRegenMultiplier, 100, "")
+RULE_INT(Character, ManaRegenMultiplier, 100, "")
+RULE_INT(Character, EnduranceRegenMultiplier, 100, "")
+RULE_BOOL(Character, OldMinMana, false, "this is used for servers that want to follow older skill cap formulas so they can still have some regen w/o mediate")
+RULE_INT(Character, ConsumptionMultiplier, 100, "item's hunger restored = this value * item's food level, 100 = normal, 50 = people eat 2x as fast, 200 = people eat 2x as slow")
+RULE_BOOL(Character, HealOnLevel, false, "")
+RULE_BOOL(Character, FeignKillsPet, false, "")
+RULE_INT(Character, ItemManaRegenCap, 15, "")
+RULE_INT(Character, ItemHealthRegenCap, 30, "")
+RULE_INT(Character, ItemDamageShieldCap, 30, "")
+RULE_INT(Character, ItemAccuracyCap, 150, "")
+RULE_INT(Character, ItemAvoidanceCap, 100, "")
+RULE_INT(Character, ItemCombatEffectsCap, 100, "")
+RULE_INT(Character, ItemShieldingCap, 35, "")
+RULE_INT(Character, ItemSpellShieldingCap, 35, "")
+RULE_INT(Character, ItemDoTShieldingCap, 35, "")
+RULE_INT(Character, ItemStunResistCap, 35, "")
+RULE_INT(Character, ItemStrikethroughCap, 35, "")
+RULE_INT(Character, ItemATKCap, 250, "")
+RULE_INT(Character, ItemHealAmtCap, 250, "")
+RULE_INT(Character, ItemSpellDmgCap, 250, "")
+RULE_INT(Character, ItemClairvoyanceCap, 250, "")
+RULE_INT(Character, ItemDSMitigationCap, 50, "")
+RULE_INT(Character, ItemEnduranceRegenCap, 15, "")
+RULE_INT(Character, ItemExtraDmgCap, 150, "Cap for bonuses to melee skills like Bash, Frenzy, etc")
+RULE_INT(Character, HasteCap, 100, "Haste cap for non-v3(overhaste) haste")
+RULE_INT(Character, SkillUpModifier, 100, "skill ups are at 100%")
+RULE_BOOL(Character, SharedBankPlat, false, "off by default to prevent duping for now")
+RULE_BOOL(Character, BindAnywhere, false, "")
+RULE_BOOL(Character, RestRegenEnabled, true, "Enable OOC Regen")
+RULE_INT(Character, RestRegenTimeToActivate, 30, "Time in seconds for rest state regen to kick in")
+RULE_INT(Character, RestRegenRaidTimeToActivate, 300, "Time in seconds for rest state regen to kick in with a raid target")
+RULE_INT(Character, KillsPerGroupLeadershipAA, 250, "Number of dark blues or above per Group Leadership AA")
+RULE_INT(Character, KillsPerRaidLeadershipAA, 250, "Number of dark blues or above per Raid Leadership AA")
+RULE_INT(Character, MaxFearDurationForPlayerCharacter, 4, "4 tics, each tic calculates every 6 seconds")
+RULE_INT(Character, MaxCharmDurationForPlayerCharacter, 15, "")
+RULE_INT(Character, BaseHPRegenBonusRaces, 4352, "a bitmask of race(s) that receive the regen bonus. Iksar (4096) & Troll (256) = 4352. see common/races.h for the bitmask values")
+RULE_BOOL(Character, SoDClientUseSoDHPManaEnd, false, "Setting this to true will allow SoD clients to use the SoD HP/Mana/End formulas and previous clients will use the old formulas")
+RULE_BOOL(Character, UseRaceClassExpBonuses, true, "Setting this to true will enable Class and Racial experience rate bonuses")
+RULE_BOOL(Character, UseOldRaceExpPenalties, false, "Setting this to true will enable racial exp penalties for Iksar, Troll, Ogre, and Barbarian, as well as the bonus for Halflings")
+RULE_BOOL(Character, UseOldClassExpPenalties, false, "Setting this to true will enable old class exp penalties for Paladin, SK, Ranger, Bard, Monk, Wizard, Enchanter, Magician, and Necromancer, as well as the bonus for Rogues and Warriors")
+RULE_BOOL(Character, RespawnFromHover, false, "Use Respawn window, or not")
+RULE_INT(Character, RespawnFromHoverTimer, 300, "Respawn Window countdown timer, in SECONDS")
+RULE_BOOL(Character, UseNewStatsWindow, true, "New stats window shows everything")
+RULE_BOOL(Character, ItemCastsUseFocus, false, "If true, this allows item clickies to use focuses that have limited max levels on them")
+RULE_INT(Character, MinStatusForNoDropExemptions, 80, "This allows status x and higher to trade no drop items")
+RULE_INT(Character, SkillCapMaxLevel, 75, "Sets the Max Level used for Skill Caps (from skill_caps table). -1 makes it use MaxLevel rule value. It is set to 75 because PEQ only has skillcaps up to that level, and grabbing the players' skill past 75 will return 0, breaking all skills past that level. This helps servers with obsurd level caps (75+ level cap) function without any modifications")
+RULE_INT(Character, StatCap, 0, "")
+RULE_BOOL(Character, CheckCursorEmptyWhenLooting, true, "If true, a player cannot loot a corpse (player or NPC) with an item on their cursor")
+RULE_BOOL(Character, MaintainIntoxicationAcrossZones, true, "If true, alcohol effects are maintained across zoning and logging out/in")
+RULE_BOOL(Character, EnableDiscoveredItems, true, "If enabled, it enables EVENT_DISCOVER_ITEM and also saves character names and timestamps for the first time an item is discovered")
+RULE_BOOL(Character, EnableXTargetting, true, "Enable Extended Targetting Window, for users with UF and later clients")
+RULE_BOOL(Character, EnableAggroMeter, true, "Enable Aggro Meter, for users with RoF and later clients")
+RULE_BOOL(Character, KeepLevelOverMax, false, "Don't delevel a character that has somehow gone over the level cap")
+RULE_INT(Character, FoodLossPerUpdate, 32, "How much food/water you lose per stamina update")
+RULE_BOOL(Character, EnableHungerPenalties, false, "being hungry/thirsty has negative effects -- it does appear normal live servers do not have penalties")
+RULE_INT(Character, BaseInstrumentSoftCap, 36, "Softcap for instrument mods, 36 commonly referred to as \"3.6\" as well")
+RULE_BOOL(Character, UseSpellFileSongCap, true, "When they removed the AA that increased the cap they removed the above and just use the spell field")
+RULE_INT(Character, BaseRunSpeedCap, 158, "Base Run Speed Cap, on live it's 158% which will give you a runspeed of 1.580 hard capped to 225")
+RULE_INT(Character, OrnamentationAugmentType, 20, "Ornamentation Augment Type")
+RULE_REAL(Character, EnvironmentDamageMulipliter, 1, "")
+RULE_BOOL(Character, UnmemSpellsOnDeath, true, "")
+RULE_INT(Character, TradeskillUpAlchemy, 2, "Alchemy skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpBaking, 2, "Baking skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpBlacksmithing, 2, "Blacksmithing skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpBrewing, 3, "Brewing skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpFletching, 2, "Fletching skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpJewelcrafting, 2, "Jewelcrafting skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpMakePoison, 2, "Make Poison skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpPottery, 4, "Pottery skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpResearch, 1, "Research skillup rate adjust. Lower is faster")
+RULE_INT(Character, TradeskillUpTinkering, 2, "Tinkering skillup rate adjust. Lower is faster")
+RULE_BOOL(Character, MarqueeHPUpdates, false, "Will show Health % in center of screen < 100%")
+RULE_INT(Character, IksarCommonTongue, 95, "95 By default (live-like?)")
+RULE_INT(Character, OgreCommonTongue, 95, "95 By default (live-like?)")
+RULE_INT(Character, TrollCommonTongue, 95, "95 By default (live-like?)")
+RULE_BOOL(Character, ActiveInvSnapshots, false, "Takes a periodic snapshot of inventory contents from online players")
+RULE_INT(Character, InvSnapshotMinIntervalM, 180, "Minimum time (in minutes) between inventory snapshots")
+RULE_INT(Character, InvSnapshotMinRetryM, 30, "Time (in minutes) to re-attempt an inventory snapshot after a failure")
+RULE_INT(Character, InvSnapshotHistoryD, 30, "Time (in days) to keep snapshot entries")
+RULE_BOOL(Character, RestrictSpellScribing, false, "Restricts spell scribing to allowable races/classes of spell scroll, if true")
+RULE_BOOL(Character, UseStackablePickPocketing, true, "Allows stackable pickpocketed items to stack instead of only being allowed in empty inventory slots")
+RULE_BOOL(Character, EnableAvoidanceCap, false, "")
+RULE_INT(Character, AvoidanceCap, 750, "750 Is a pretty good value, seen people dodge all attacks beyond 1,000 Avoidance")
+RULE_BOOL(Character, AllowMQTarget, false, "Disables putting players in the 'hackers' list for targeting beyond the clip plane or attempting to target something untargetable")
+RULE_BOOL(Character, UseOldBindWound, false, "Uses the original bind wound behavior")
+RULE_BOOL(Character, GrantHoTTOnCreate, false, "Grant Health of Target's Target leadership AA on character creation")
+RULE_BOOL(Character, UseOldConSystem, false, "Grant Health of Target's Target leadership AA on character creation")
+RULE_BOOL(Character, OPClientUpdateVisualDebug, false, "Shows a pulse and forward directional particle each time the client sends its position to server")
+RULE_BOOL(Character, AllowCrossClassTrainers, false, "")
+RULE_BOOL(Character, PetsUseReagents, true, "Pets use reagent on spells")
+RULE_BOOL(Character, DismountWater, true, "Dismount horses when entering water")
+RULE_BOOL(Character, UseNoJunkFishing, false, "Disregards junk items when fishing")
+RULE_BOOL(Character, SoftDeletes, true, "When characters are deleted in character select, they are only soft deleted")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Mercs)
-RULE_INT(Mercs, SuspendIntervalMS, 10000)
-RULE_INT(Mercs, UpkeepIntervalMS, 180000)
-RULE_INT(Mercs, SuspendIntervalS, 10)
-RULE_INT(Mercs, UpkeepIntervalS, 180)
-RULE_BOOL(Mercs, AllowMercs, false)
-RULE_BOOL(Mercs, ChargeMercPurchaseCost, false)
-RULE_BOOL(Mercs, ChargeMercUpkeepCost, false)
-RULE_INT(Mercs, AggroRadius, 100)		// Determines the distance from which a merc will aggro group member's target(also used to determine the distance at which a healer merc will begin healing a group member)
-RULE_INT(Mercs, AggroRadiusPuller, 25)	// Determines the distance from which a merc will aggro group member's target, if they have the group role of puller (also used to determine the distance at which a healer merc will begin healing a group member, if they have the group role of puller)
-RULE_INT(Mercs, ResurrectRadius, 50)	// Determines the distance from which a healer merc will attempt to resurrect a group member's corpse
-RULE_INT(Mercs, ScaleRate, 100)
-RULE_BOOL(Mercs, MercsUsePathing, true) // Mercs will use node pathing when moving
-RULE_BOOL(Mercs, AllowMercSuspendInCombat, true)
+RULE_INT(Mercs, SuspendIntervalMS, 10000, "")
+RULE_INT(Mercs, UpkeepIntervalMS, 180000, "")
+RULE_INT(Mercs, SuspendIntervalS, 10, "")
+RULE_INT(Mercs, UpkeepIntervalS, 180, "")
+RULE_BOOL(Mercs, AllowMercs, false, "")
+RULE_BOOL(Mercs, ChargeMercPurchaseCost, false, "")
+RULE_BOOL(Mercs, ChargeMercUpkeepCost, false, "")
+RULE_INT(Mercs, AggroRadius, 100, "Determines the distance from which a merc will aggro group member's target(also used to determine the distance at which a healer merc will begin healing a group member)")
+RULE_INT(Mercs, AggroRadiusPuller, 25, "Determines the distance from which a merc will aggro group member's target, if they have the group role of puller (also used to determine the distance at which a healer merc will begin healing a group member, if they have the group role of puller)")
+RULE_INT(Mercs, ResurrectRadius, 50, "Determines the distance from which a healer merc will attempt to resurrect a group member's corpse")
+RULE_INT(Mercs, ScaleRate, 100, "")
+RULE_BOOL(Mercs, MercsUsePathing, true, "Mercs will use node pathing when moving")
+RULE_BOOL(Mercs, AllowMercSuspendInCombat, true, "")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Guild)
-RULE_INT(Guild, MaxMembers, 2048)
-RULE_BOOL(Guild, PlayerCreationAllowed, false)	// Allow players to create a guild using the window in Underfoot+
-RULE_INT(Guild, PlayerCreationLimit, 1)		// Only allow use of the UF+ window if the account has < than this number of guild leaders on it
-RULE_INT(Guild, PlayerCreationRequiredStatus, 0)	// Required admin status.
-RULE_INT(Guild, PlayerCreationRequiredLevel, 0)	// Required Level of the player attempting to create the guild.
-RULE_INT(Guild, PlayerCreationRequiredTime, 0)	// Required Time Entitled On Account (in Minutes) to create the guild.
+RULE_INT(Guild, MaxMembers, 2048, "")
+RULE_BOOL(Guild, PlayerCreationAllowed, false, "Allow players to create a guild using the window in Underfoot+")
+RULE_INT(Guild, PlayerCreationLimit, 1, "Only allow use of the UF+ window if the account has < than this number of guild leaders on it")
+RULE_INT(Guild, PlayerCreationRequiredStatus, 0, "Required admin status")
+RULE_INT(Guild, PlayerCreationRequiredLevel, 0, "Required Level of the player attempting to create the guild")
+RULE_INT(Guild, PlayerCreationRequiredTime, 0, "Required Time Entitled On Account (in Minutes) to create the guild")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Skills)
-RULE_INT(Skills, MaxTrainTradeskills, 21)
-RULE_BOOL(Skills, UseLimitTradeskillSearchSkillDiff, true)
-RULE_INT(Skills, MaxTradeskillSearchSkillDiff, 50)
-RULE_INT(Skills, MaxTrainSpecializations, 50)	// Max level a GM trainer will train casting specializations
-RULE_INT(Skills, SwimmingStartValue, 100)
-RULE_BOOL(Skills, TrainSenseHeading, false)
-RULE_INT(Skills, SenseHeadingStartValue, 200)
-RULE_BOOL(Skills, SelfLanguageLearning, true)
+RULE_INT(Skills, MaxTrainTradeskills, 21, "")
+RULE_BOOL(Skills, UseLimitTradeskillSearchSkillDiff, true, "")
+RULE_INT(Skills, MaxTradeskillSearchSkillDiff, 50, "")
+RULE_INT(Skills, MaxTrainSpecializations, 50, "Max level a GM trainer will train casting specializations")
+RULE_INT(Skills, SwimmingStartValue, 100, "")
+RULE_BOOL(Skills, TrainSenseHeading, false, "")
+RULE_INT(Skills, SenseHeadingStartValue, 200, "")
+RULE_BOOL(Skills, SelfLanguageLearning, true, "")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Pets)
-RULE_REAL(Pets, AttackCommandRange, 150)
-RULE_BOOL(Pets, UnTargetableSwarmPet, false)
-RULE_REAL(Pets, PetPowerLevelCap, 10) // Max number of levels your pet can go up with pet power
-RULE_BOOL(Pets, CanTakeNoDrop, false) // Can everyone trade nodrop gear to pets
+RULE_REAL(Pets, AttackCommandRange, 150, "")
+RULE_BOOL(Pets, UnTargetableSwarmPet, false, "")
+RULE_REAL(Pets, PetPowerLevelCap, 10, "Max number of levels your pet can go up with pet power")
+RULE_BOOL(Pets, CanTakeNoDrop, false, "Can everyone trade nodrop gear to pets")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(GM)
-RULE_INT(GM, MinStatusToSummonItem, 250)
-RULE_INT(GM, MinStatusToZoneAnywhere, 250)
-RULE_INT(GM, MinStatusToLevelTarget, 100)
+RULE_INT(GM, MinStatusToSummonItem, 250, "")
+RULE_INT(GM, MinStatusToZoneAnywhere, 250, "")
+RULE_INT(GM, MinStatusToLevelTarget, 100, "")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(World)
-RULE_INT(World, ZoneAutobootTimeoutMS, 60000)
-RULE_INT(World, ClientKeepaliveTimeoutMS, 65000)
-RULE_BOOL(World, UseBannedIPsTable, false) // Toggle whether or not to check incoming client connections against the Banned_IPs table. Set this value to false to disable this feature.
-RULE_BOOL(World, EnableTutorialButton, true)
-RULE_BOOL(World, EnableReturnHomeButton, true)
-RULE_INT(World, MaxLevelForTutorial, 10)
-RULE_INT(World, TutorialZoneID, 189)
-RULE_INT(World, GuildBankZoneID, 345)
-RULE_INT(World, MinOfflineTimeToReturnHome, 21600) // 21600 seconds is 6 Hours
-RULE_INT(World, MaxClientsPerIP, -1) // Maximum number of clients allowed to connect per IP address if account status is < AddMaxClientsStatus. Default value: -1 (feature disabled)
-RULE_INT(World, ExemptMaxClientsStatus, -1) // Exempt accounts from the MaxClientsPerIP and AddMaxClientsStatus rules, if their status is >= this value. Default value: -1 (feature disabled)
-RULE_INT(World, AddMaxClientsPerIP, -1) // Maximum number of clients allowed to connect per IP address if account status is < ExemptMaxClientsStatus. Default value: -1 (feature disabled)
-RULE_INT(World, AddMaxClientsStatus, -1) // Accounts with status >= this rule will be allowed to use the amount of accounts defined in the AddMaxClientsPerIP. Default value: -1 (feature disabled)
-RULE_BOOL(World, MaxClientsSetByStatus, false) // If True, IP Limiting will be set to the status on the account as long as the status is > MaxClientsPerIP
-RULE_BOOL(World, EnableIPExemptions, false) // If True, ip_exemptions table is used, if there is no entry for the IP it will default to RuleI(World, MaxClientsPerIP)
-RULE_BOOL(World, ClearTempMerchantlist, true) // Clears temp merchant items when world boots.
-RULE_BOOL(World, DeleteStaleCorpeBackups, true) // Deletes stale corpse backups older than 2 weeks.
-RULE_BOOL(World, GMAccountIPList, false) // Check ip list against GM Accounts, AntiHack GM Accounts.
-RULE_INT(World, MinGMAntiHackStatus, 1) //Minimum GM status to check against AntiHack list
-RULE_INT(World, SoFStartZoneID, -1) //Sets the Starting Zone for SoF Clients separate from Titanium Clients (-1 is disabled)
-RULE_INT(World, TitaniumStartZoneID, -1) //Sets the Starting Zone for Titanium Clients (-1 is disabled). Replaces the old method.
-RULE_INT(World, ExpansionSettings, 16383) // Sets the expansion settings for the server, This is sent on login to world and affects client expansion settings. Defaults to all expansions enabled up to TSS.
-RULE_BOOL(World, UseClientBasedExpansionSettings, true) // if true it will overrule World, ExpansionSettings and set someone's expansion based on the client they're using
-RULE_INT(World, PVPSettings, 0) // Sets the PVP settings for the server, 1 = Rallos Zek RuleSet, 2 = Tallon/Vallon Zek Ruleset, 4 = Sullon Zek Ruleset, 6 = Discord Ruleset, anything above 6 is the Discord Ruleset without the no-drop restrictions removed. TODO: Edit IsAttackAllowed in Zone to accomodate for these rules.
-RULE_INT(World, PVPMinLevel, 0) // minimum level to pvp
-RULE_BOOL (World, IsGMPetitionWindowEnabled, false)
-RULE_INT (World, FVNoDropFlag, 0) // Sets the Firiona Vie settings on the client. If set to 2, the flag will be set for GMs only, allowing trading of no-drop items.
-RULE_BOOL (World, IPLimitDisconnectAll, false)
-RULE_BOOL(World, MaxClientsSimplifiedLogic, false) // New logic that only uses ExemptMaxClientsStatus and MaxClientsPerIP. Done on the loginserver. This mimics the P99-style special IP rules.
-RULE_INT (World, TellQueueSize, 20)
-RULE_BOOL(World, StartZoneSameAsBindOnCreation, true) //Should the start zone ALWAYS be the same location as your bind?
-RULE_BOOL(World, DisallowDuplicateAccountLogins, true)
+RULE_INT(World, ZoneAutobootTimeoutMS, 60000, "")
+RULE_INT(World, ClientKeepaliveTimeoutMS, 65000, "")
+RULE_BOOL(World, UseBannedIPsTable, false, "Toggle whether or not to check incoming client connections against the banned_ips table. Set this value to false to disable this feature")
+RULE_BOOL(World, EnableTutorialButton, true, "")
+RULE_BOOL(World, EnableReturnHomeButton, true, "")
+RULE_INT(World, MaxLevelForTutorial, 10, "")
+RULE_INT(World, TutorialZoneID, 189, "")
+RULE_INT(World, GuildBankZoneID, 345, "")
+RULE_INT(World, MinOfflineTimeToReturnHome, 21600, "21600 seconds is 6 Hours")
+RULE_INT(World, MaxClientsPerIP, -1, "Maximum number of clients allowed to connect per IP address if account status is < AddMaxClientsStatus. Default value: -1 (feature disabled)")
+RULE_INT(World, ExemptMaxClientsStatus, -1, "Exempt accounts from the MaxClientsPerIP and AddMaxClientsStatus rules, if their status is >= this value. Default value: -1 (feature disabled)")
+RULE_INT(World, AddMaxClientsPerIP, -1, "Maximum number of clients allowed to connect per IP address if account status is < ExemptMaxClientsStatus. Default value: -1 (feature disabled)")
+RULE_INT(World, AddMaxClientsStatus, -1, "Accounts with status >= this rule will be allowed to use the amount of accounts defined in the AddMaxClientsPerIP. Default value: -1 (feature disabled)")
+RULE_BOOL(World, MaxClientsSetByStatus, false, "If True, IP Limiting will be set to the status on the account as long as the status is > MaxClientsPerIP")
+RULE_BOOL(World, EnableIPExemptions, false, "If True, ip_exemptions table is used, if there is no entry for the IP it will default to RuleI(World, MaxClientsPerIP)")
+RULE_BOOL(World, ClearTempMerchantlist, true, "Clears temp merchant items when world boots")
+RULE_BOOL(World, DeleteStaleCorpeBackups, true, "Deletes stale corpse backups older than 2 weeks")
+RULE_BOOL(World, GMAccountIPList, false, "Check ip list against GM Accounts, AntiHack GM Accounts")
+RULE_INT(World, MinGMAntiHackStatus, 1, "Minimum GM status to check against AntiHack list")
+RULE_INT(World, SoFStartZoneID, -1, "Sets the Starting Zone for SoF Clients separate from Titanium Clients (-1 is disabled)")
+RULE_INT(World, TitaniumStartZoneID, -1, "Sets the Starting Zone for Titanium Clients (-1 is disabled). Replaces the old method")
+RULE_INT(World, ExpansionSettings, 16383, "Sets the expansion settings for the server, This is sent on login to world and affects client expansion settings. Defaults to all expansions enabled up to TSS")
+RULE_BOOL(World, UseClientBasedExpansionSettings, true, "if true it will overrule World, ExpansionSettings and set someone's expansion based on the client they're using")
+RULE_INT(World, PVPSettings, 0, "Sets the PVP settings for the server, 1 = Rallos Zek RuleSet, 2 = Tallon/Vallon Zek Ruleset, 4 = Sullon Zek Ruleset, 6 = Discord Ruleset, anything above 6 is the Discord Ruleset without the no-drop restrictions removed. TODO: Edit IsAttackAllowed in Zone to accomodate for these rules")
+RULE_INT(World, PVPMinLevel, 0, "minimum level to pvp")
+RULE_BOOL (World, IsGMPetitionWindowEnabled, false, "")
+RULE_INT (World, FVNoDropFlag, 0, "Sets the Firiona Vie settings on the client. If set to 2, the flag will be set for GMs only, allowing trading of no-drop items")
+RULE_BOOL (World, IPLimitDisconnectAll, false, "")
+RULE_BOOL(World, MaxClientsSimplifiedLogic, false, "New logic that only uses ExemptMaxClientsStatus and MaxClientsPerIP. Done on the loginserver. This mimics the P99-style special IP rules")
+RULE_INT (World, TellQueueSize, 20, "")
+RULE_BOOL(World, StartZoneSameAsBindOnCreation, true, "Should the start zone ALWAYS be the same location as your bind?")
+RULE_BOOL(World, EnforceCharacterLimitAtLogin, false, "")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Zone)
-RULE_INT(Zone, ClientLinkdeadMS, 90000) //the time a client remains link dead on the server after a sudden disconnection
-RULE_INT(Zone, GraveyardTimeMS, 1200000) //ms time until a player corpse is moved to a zone's graveyard, if one is specified for the zone
-RULE_BOOL(Zone, EnableShadowrest, 1) // enables or disables the shadowrest zone feature for player corpses. Default is turned on.
-RULE_BOOL(Zone, UsePlayerCorpseBackups, true) // Keeps backups of player corpses.
-RULE_INT(Zone, MQWarpExemptStatus, -1) // Required status level to exempt the MQWarpDetector. Set to -1 to disable this feature.
-RULE_INT(Zone, MQZoneExemptStatus, -1) // Required status level to exempt the MQZoneDetector. Set to -1 to disable this feature.
-RULE_INT(Zone, MQGateExemptStatus, -1) // Required status level to exempt the MQGateDetector. Set to -1 to disable this feature.
-RULE_INT(Zone, MQGhostExemptStatus, -1) // Required status level to exempt the MGhostDetector. Set to -1 to disable this feature.
-RULE_BOOL(Zone, EnableMQWarpDetector, true) // Enable the MQWarp Detector. Set to False to disable this feature.
-RULE_BOOL(Zone, EnableMQZoneDetector, true) // Enable the MQZone Detector. Set to False to disable this feature.
-RULE_BOOL(Zone, EnableMQGateDetector, true) // Enable the MQGate Detector. Set to False to disable this feature.
-RULE_BOOL(Zone, EnableMQGhostDetector, true) // Enable the MQGhost Detector. Set to False to disable this feature.
-RULE_REAL(Zone, MQWarpDetectionDistanceFactor, 9.0) //clients move at 4.4 about if in a straight line but with movement and to acct for lag we raise it a bit
-RULE_BOOL(Zone, MarkMQWarpLT, false)
-RULE_INT(Zone, AutoShutdownDelay, 5000) //How long a dynamic zone stays loaded while empty
-RULE_INT(Zone, PEQZoneReuseTime, 900)	//How long, in seconds, until you can reuse the #peqzone command.
-RULE_INT(Zone, PEQZoneDebuff1, 4454)		//First debuff casted by #peqzone Default is Cursed Keeper's Blight.
-RULE_INT(Zone, PEQZoneDebuff2, 2209)		//Second debuff casted by #peqzone Default is Tendrils of Apathy.
-RULE_BOOL(Zone, UsePEQZoneDebuffs, true)	//Will determine if #peqzone will debuff players or not when used.
-RULE_REAL(Zone, HotZoneBonus, 0.75)
-RULE_INT(Zone, ReservedInstances, 30) //Will reserve this many instance ids for globals... probably not a good idea to change this while a server is running.
-RULE_INT(Zone, EbonCrystalItemID, 40902)
-RULE_INT(Zone, RadiantCrystalItemID, 40903)
-RULE_BOOL(Zone, LevelBasedEXPMods, false) // Allows you to use the level_exp_mods table in consideration to your players EXP hits
-RULE_INT(Zone, WeatherTimer, 600) // Weather timer when no duration is available
-RULE_BOOL(Zone, EnableLoggedOffReplenishments, true)
-RULE_INT(Zone, MinOfflineTimeToReplenishments, 21600) // 21600 seconds is 6 Hours
-RULE_BOOL(Zone, UseZoneController, true) // Enables the ability to use persistent quest based zone controllers (zone_controller.pl/lua)
-RULE_BOOL(Zone, EnableZoneControllerGlobals, false) // Enables the ability to use quest globals with the zone controller NPC
-RULE_INT(Zone, GlobalLootMultiplier, 1) // Sets Global Loot drop multiplier for database based drops, useful for double, triple loot etc.
+RULE_INT(Zone, ClientLinkdeadMS, 90000, "the time a client remains link dead on the server after a sudden disconnection")
+RULE_INT(Zone, GraveyardTimeMS, 1200000, "ms time until a player corpse is moved to a zone's graveyard, if one is specified for the zone")
+RULE_BOOL(Zone, EnableShadowrest, 1, "enables or disables the shadowrest zone feature for player corpses. Default is turned on")
+RULE_BOOL(Zone, UsePlayerCorpseBackups, true, "Keeps backups of player corpses")
+RULE_INT(Zone, MQWarpExemptStatus, -1, "Required status level to exempt the MQWarpDetector. Set to -1 to disable this feature")
+RULE_INT(Zone, MQZoneExemptStatus, -1, "Required status level to exempt the MQZoneDetector. Set to -1 to disable this feature")
+RULE_INT(Zone, MQGateExemptStatus, -1, "Required status level to exempt the MQGateDetector. Set to -1 to disable this feature")
+RULE_INT(Zone, MQGhostExemptStatus, -1, "Required status level to exempt the MGhostDetector. Set to -1 to disable this feature")
+RULE_BOOL(Zone, EnableMQWarpDetector, true, "Enable the MQWarp Detector. Set to False to disable this feature")
+RULE_BOOL(Zone, EnableMQZoneDetector, true, "Enable the MQZone Detector. Set to False to disable this feature")
+RULE_BOOL(Zone, EnableMQGateDetector, true, "Enable the MQGate Detector. Set to False to disable this feature")
+RULE_BOOL(Zone, EnableMQGhostDetector, true, "Enable the MQGhost Detector. Set to False to disable this feature")
+RULE_REAL(Zone, MQWarpDetectionDistanceFactor, 9.0, "clients move at 4.4 about if in a straight line but with movement and to acct for lag we raise it a bit")
+RULE_BOOL(Zone, MarkMQWarpLT, false, "")
+RULE_INT(Zone, AutoShutdownDelay, 5000, "How long a dynamic zone stays loaded while empty")
+RULE_INT(Zone, PEQZoneReuseTime, 900, "How long, in seconds, until you can reuse the #peqzone command")
+RULE_INT(Zone, PEQZoneDebuff1, 4454, "First debuff casted by #peqzone Default is Cursed Keeper's Blight")
+RULE_INT(Zone, PEQZoneDebuff2, 2209, "Second debuff casted by #peqzone Default is Tendrils of Apathy")
+RULE_BOOL(Zone, UsePEQZoneDebuffs, true, "Will determine if #peqzone will debuff players or not when used")
+RULE_REAL(Zone, HotZoneBonus, 0.75, "")
+RULE_INT(Zone, ReservedInstances, 30, "Will reserve this many instance ids for globals... probably not a good idea to change this while a server is running")
+RULE_INT(Zone, EbonCrystalItemID, 40902, "")
+RULE_INT(Zone, RadiantCrystalItemID, 40903, "")
+RULE_BOOL(Zone, LevelBasedEXPMods, false, "Allows you to use the level_exp_mods table in consideration to your players EXP hits")
+RULE_INT(Zone, WeatherTimer, 600, "Weather timer when no duration is available")
+RULE_BOOL(Zone, EnableLoggedOffReplenishments, true, "")
+RULE_INT(Zone, MinOfflineTimeToReplenishments, 21600, "21600 seconds is 6 Hours")
+RULE_BOOL(Zone, UseZoneController, true, "Enables the ability to use persistent quest based zone controllers (zone_controller.pl/lua)")
+RULE_BOOL(Zone, EnableZoneControllerGlobals, false, "Enables the ability to use quest globals with the zone controller NPC")
+RULE_INT(Zone, GlobalLootMultiplier, 1, "Sets Global Loot drop multiplier for database based drops, useful for double, triple loot etc")
+RULE_BOOL(Zone, KillProcessOnDynamicShutdown, true, "When process has booted a zone and has hit its zone shut down timer, it will hard kill the process to free memory back to the OS")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Map)
-RULE_BOOL(Map, FixPathingZOnSendTo, false)		//try to repair Z coords in the SendTo routine as well.
-RULE_BOOL(Map, FixZWhenPathing, true)		// Automatically fix NPC Z coordinates when moving/pathing/engaged (Far less CPU intensive than its predecessor)
-RULE_REAL(Map, DistanceCanTravelBeforeAdjustment, 10.0) // distance a mob can path before FixZ is called, depends on FixZWhenPathing
-RULE_BOOL(Map, MobZVisualDebug, false)		// Displays spell effects determining whether or not NPC is hitting Best Z calcs (blue for hit, red for miss)
-RULE_REAL(Map, FixPathingZMaxDeltaSendTo, 20)	//at runtime in SendTo: max change in Z to allow the BestZ code to apply.
-RULE_INT(Map, FindBestZHeightAdjust, 1)		// Adds this to the current Z before seeking the best Z position
+RULE_BOOL(Map, FixPathingZOnSendTo, false, "try to repair Z coords in the SendTo routine as well")
+RULE_BOOL(Map, FixZWhenPathing, true, "Automatically fix NPC Z coordinates when moving/pathing/engaged (Far less CPU intensive than its predecessor)")
+RULE_REAL(Map, DistanceCanTravelBeforeAdjustment, 10.0, "distance a mob can path before FixZ is called, depends on FixZWhenPathing")
+RULE_BOOL(Map, MobZVisualDebug, false, "Displays spell effects determining whether or not NPC is hitting Best Z calcs (blue for hit, red for miss)")
+RULE_REAL(Map, FixPathingZMaxDeltaSendTo, 20, "at runtime in SendTo: max change in Z to allow the BestZ code to apply")
+RULE_INT(Map, FindBestZHeightAdjust, 1, "Adds this to the current Z before seeking the best Z position")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Pathing)
-RULE_BOOL(Pathing, Guard, true)		// Enable pathing for mobs moving to their guard point.
-RULE_BOOL(Pathing, Find, true)		// Enable pathing for FindPerson requests from the client.
-RULE_BOOL(Pathing, Fear, true)		// Enable pathing for fear
-RULE_REAL(Pathing, NavmeshStepSize, 100.0f)
-RULE_REAL(Pathing, ShortMovementUpdateRange, 130.0f)
+RULE_BOOL(Pathing, Guard, true, "Enable pathing for mobs moving to their guard point")
+RULE_BOOL(Pathing, Find, true, "Enable pathing for FindPerson requests from the client")
+RULE_BOOL(Pathing, Fear, true, "Enable pathing for fear")
+RULE_REAL(Pathing, NavmeshStepSize, 100.0f, "")
+RULE_REAL(Pathing, ShortMovementUpdateRange, 130.0f, "")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Watermap)
 // enable these to use the water detection code. Requires Water Maps generated by awater utility
-RULE_BOOL(Watermap, CheckWaypointsInWaterWhenLoading, false) // Does not apply BestZ as waypoints are loaded if they are in water
-RULE_BOOL(Watermap, CheckForWaterAtWaypoints, false)		// Check if a mob has moved into/out of water when at waypoints and sets flymode
-RULE_BOOL(Watermap, CheckForWaterWhenMoving, false)		// Checks if a mob has moved into/out of water each time it's loc is recalculated
-RULE_BOOL(Watermap, CheckForWaterOnSendTo, false)		// Checks if a mob has moved into/out of water on SendTo
-RULE_BOOL(Watermap, CheckForWaterWhenFishing, false)		// Only lets a player fish near water (if a water map exists for the zone)
-RULE_REAL(Watermap, FishingRodLength, 30)			// How far in front of player water must be for fishing to work
-RULE_REAL(Watermap, FishingLineLength, 100)		// If water is more than this far below the player, it is considered too far to fish
-RULE_REAL(Watermap, FishingLineStepSize, 1)		// Basic step size for fishing calc, too small and it will eat cpu, too large and it will miss potential water
+RULE_BOOL(Watermap, CheckWaypointsInWaterWhenLoading, false, "Does not apply BestZ as waypoints are loaded if they are in water")
+RULE_BOOL(Watermap, CheckForWaterAtWaypoints, false, "Check if a mob has moved into/out of water when at waypoints and sets flymode")
+RULE_BOOL(Watermap, CheckForWaterWhenMoving, false, "Checks if a mob has moved into/out of water each time it's loc is recalculated")
+RULE_BOOL(Watermap, CheckForWaterOnSendTo, false, "Checks if a mob has moved into/out of water on SendTo")
+RULE_BOOL(Watermap, CheckForWaterWhenFishing, false, "Only lets a player fish near water (if a water map exists for the zone)")
+RULE_REAL(Watermap, FishingRodLength, 30, "How far in front of player water must be for fishing to work")
+RULE_REAL(Watermap, FishingLineLength, 100, "If water is more than this far below the player, it is considered too far to fish")
+RULE_REAL(Watermap, FishingLineStepSize, 1, "Basic step size for fishing calc, too small and it will eat cpu, too large and it will miss potential water")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Spells)
-RULE_INT(Spells, AutoResistDiff, 15)
-RULE_REAL(Spells, ResistChance, 2.0) //chance to resist given no resists and same level
-RULE_REAL(Spells, ResistMod, 0.40) //multiplier, chance to resist = this * ResistAmount
-RULE_REAL(Spells, PartialHitChance, 0.7) //The chance when a spell is resisted that it will partial hit.
-RULE_REAL(Spells, PartialHitChanceFear, 0.25) //The chance when a fear spell is resisted that it will partial hit.
-RULE_INT(Spells, BaseCritChance, 0) //base % chance that everyone has to crit a spell
-RULE_INT(Spells, BaseCritRatio, 100) //base % bonus to damage on a successful spell crit. 100 = 2x damage
-RULE_INT(Spells, WizCritLevel, 12) //level wizards first get spell crits
-RULE_INT(Spells, WizCritChance, 7) //wiz's crit chance, on top of BaseCritChance
-RULE_INT(Spells, WizCritRatio, 0) //wiz's crit bonus, on top of BaseCritRatio (should be 0 for Live-like)
-RULE_INT(Spells, ResistPerLevelDiff, 85) //8.5 resist per level difference.
-RULE_INT(Spells, TranslocateTimeLimit, 0) // If not zero, time in seconds to accept a Translocate.
-RULE_INT(Spells, SacrificeMinLevel, 46)	//first level Sacrifice will work on
-RULE_INT(Spells, SacrificeMaxLevel, 69)	//last level Sacrifice will work on
-RULE_INT(Spells, SacrificeItemID, 9963)	//Item ID of the item Sacrifice will return (defaults to an EE)
-RULE_BOOL(Spells, EnableSpellGlobals, false)	// If Enabled, spells check the spell_globals table and compare character data from their quest globals before allowing the spell to scribe with scribespells/traindiscs
-RULE_BOOL(Spells, EnableSpellBuckets, false)    // If Enabled, spells check the spell_buckets table and compare character data from their data buckets before allowing the spell to scribe with scribespells/traindiscs
-RULE_INT(Spells, MaxBuffSlotsNPC, 60)	// default to Tit's limit
-RULE_INT(Spells, MaxSongSlotsNPC, 0)	// NPCs don't have songs ...
-RULE_INT(Spells, MaxDiscSlotsNPC, 0)	// NPCs don't have discs ...
-RULE_INT(Spells, MaxTotalSlotsNPC, 60)	// default to Tit's limit
-RULE_INT(Spells, MaxTotalSlotsPET, 30)	// default to Tit's limit
-RULE_BOOL (Spells, EnableBlockedBuffs, true)
-RULE_INT(Spells, ReflectType, 3) //0 = disabled, 1 = single target player spells only, 2 = all player spells, 3 = all single target spells, 4 = all spells
-RULE_BOOL(Spells, ReflectMessagesClose, true) // Live functionality is for Reflect messages to show to players within close proximity, false shows just player reflecting
-RULE_INT(Spells, VirusSpreadDistance, 30) // The distance a viral spell will jump to its next victim
-RULE_BOOL(Spells, LiveLikeFocusEffects, true) // Determines whether specific healing, dmg and mana reduction focuses are randomized
-RULE_INT(Spells, BaseImmunityLevel, 55) // The level that targets start to be immune to stun, fear and mez spells with a max level of 0.
-RULE_BOOL(Spells, NPCIgnoreBaseImmunity, true) // Whether or not NPCs get to ignore the BaseImmunityLevel for their spells.
-RULE_REAL(Spells, AvgSpellProcsPerMinute, 6.0) //Adjust rate for sympathetic spell procs
-RULE_INT(Spells, ResistFalloff, 67) //Max that level that will adjust our resist chance based on level modifiers
-RULE_INT(Spells, CharismaEffectiveness, 10) // Deterimes how much resist modification charisma applies to charm/pacify checks. Default 10 CHA = -1 resist mod.
-RULE_INT(Spells, CharismaEffectivenessCap, 255) // Deterimes how much resist modification charisma applies to charm/pacify checks. Default 10 CHA = -1 resist mod.
-RULE_BOOL(Spells, CharismaCharmDuration, false) // Allow CHA resist mod to extend charm duration.
-RULE_INT(Spells, CharmBreakCheckChance, 25) //Determines chance for a charm break check to occur each buff tick.
-RULE_INT(Spells, MaxCastTimeReduction, 50) //Max percent your spell cast time can be reduced by spell haste
-RULE_INT(Spells, RootBreakFromSpells, 55) //Chance for root to break when cast on.
-RULE_INT(Spells, DeathSaveCharismaMod, 3) //Determines how much charisma effects chance of death save firing.
-RULE_INT(Spells, DivineInterventionHeal, 8000) //Divine intervention heal amount.
-RULE_INT(Spells, AdditiveBonusWornType, 0) //Calc worn bonuses to add together (instead of taking highest) if set to THIS worn type. (2=Will covert live items automatically)
-RULE_BOOL(Spells, UseCHAScribeHack, false) //ScribeSpells and TrainDiscs quest functions will ignore entries where field 12 is CHA.  What's the best way to do this?
-RULE_BOOL(Spells, BuffLevelRestrictions, true) //Buffs will not land on low level toons like live
-RULE_INT(Spells, RootBreakCheckChance, 70) //Determines chance for a root break check to occur each buff tick.
-RULE_INT(Spells, FearBreakCheckChance, 70) //Determines chance for a fear break check to occur each buff tick.
-RULE_INT(Spells, SuccorFailChance, 2) //Determines chance for a succor spell not to teleport an invidual player
-RULE_INT(Spells, FRProjectileItem_Titanium, 1113) // Item id for Titanium clients for Fire 'spell projectile'.
-RULE_INT(Spells, FRProjectileItem_SOF, 80684) // Item id for SOF clients for Fire 'spell projectile'.
-RULE_INT(Spells, FRProjectileItem_NPC, 80684) // Item id for NPC Fire 'spell projectile'.
-RULE_BOOL(Spells, UseLiveSpellProjectileGFX, false) // Use spell projectile graphics set in the spells_new table (player_1). Server must be using UF+ spell file.
-RULE_BOOL(Spells, FocusCombatProcs, false) //Allow all combat procs to receive focus effects.
-RULE_BOOL(Spells, PreNerfBardAEDoT, false) //Allow bard AOE dots to damage targets when moving.
-RULE_INT(Spells, AI_SpellCastFinishedFailRecast, 800) // AI spell recast time(MS) when an spell is cast but fails (ie stunned).
-RULE_INT(Spells, AI_EngagedNoSpellMinRecast, 500) // AI spell recast time(MS) check when no spell is cast while engaged. (min time in random)
-RULE_INT(Spells, AI_EngagedNoSpellMaxRecast, 1000) // AI spell recast time(MS) check when no spell is cast engaged.(max time in random)
-RULE_INT(Spells, AI_EngagedBeneficialSelfChance, 100) // Chance during first AI Cast check to do a beneficial spell on self.
-RULE_INT(Spells, AI_EngagedBeneficialOtherChance, 25) // Chance during second AI Cast check to do a beneficial spell on others.
-RULE_INT(Spells, AI_EngagedDetrimentalChance, 20) // Chance during third AI Cast check to do a determental spell on others.
-RULE_INT(Spells, AI_PursueNoSpellMinRecast, 500) // AI spell recast time(MS) check when no spell is cast while chasing target. (min time in random)
-RULE_INT(Spells, AI_PursueNoSpellMaxRecast, 2000) // AI spell recast time(MS) check when no spell is cast while chasing target. (max time in random)
-RULE_INT(Spells, AI_PursueDetrimentalChance, 90) // Chance while chasing target to cast a detrimental spell.
-RULE_INT(Spells, AI_IdleNoSpellMinRecast, 6000) // AI spell recast time(MS) check when no spell is cast while idle. (min time in random)
-RULE_INT(Spells, AI_IdleNoSpellMaxRecast, 60000) // AI spell recast time(MS) check when no spell is cast while chasing target. (max time in random)
-RULE_INT(Spells, AI_IdleBeneficialChance, 100) // Chance while idle to do a beneficial spell on self or others.
-RULE_INT(Spells, AI_HealHPPct, 50) // HP Pct NPCs will start heals at (in and out of combat) if spell's max_hp is not set
-RULE_BOOL(Spells, SHDProcIDOffByOne, true) // pre June 2009 SHD spell procs were off by 1, they stopped doing this in June 2009 (so UF+ spell files need this false)
-RULE_BOOL(Spells, Jun182014HundredHandsRevamp, false) // this should be true for if you import a spell file newer than June 18, 2014
-RULE_BOOL(Spells, SwarmPetTargetLock, false) // Use old method of swarm pets target locking till target dies then despawning.
-RULE_BOOL(Spells, NPC_UseFocusFromSpells, true) // Allow npcs to use most spell derived focus effects.
-RULE_BOOL(Spells, NPC_UseFocusFromItems, false) // Allow npcs to use most item derived focus effects.
-RULE_BOOL(Spells, UseAdditiveFocusFromWornSlot, false) // Allows an additive focus effect to be calculated from worn slot.
-RULE_BOOL(Spells, AlwaysSendTargetsBuffs, false) // ignore LAA level if true
-RULE_BOOL(Spells, FlatItemExtraSpellAmt, false) // allow SpellDmg stat to affect all spells, regardless of cast time/cooldown/etc
-RULE_BOOL(Spells, IgnoreSpellDmgLvlRestriction, false) // ignore the 5 level spread on applying SpellDmg
-RULE_BOOL(Spells, AllowItemTGB, false) // TGB doesn't work with items on live, custom servers want it though
-RULE_BOOL(Spells, NPCInnateProcOverride, true) //  NPC innate procs override the target type to single target.
-RULE_BOOL(Spells, OldRainTargets, false) // use old incorrectly implemented max targets for rains
-RULE_BOOL(Spells, NPCSpellPush, false) // enable spell push on NPCs
+RULE_INT(Spells, AutoResistDiff, 15, "")
+RULE_REAL(Spells, ResistChance, 2.0, "chance to resist given no resists and same level")
+RULE_REAL(Spells, ResistMod, 0.40, "multiplier, chance to resist = this * ResistAmount")
+RULE_REAL(Spells, PartialHitChance, 0.7, "The chance when a spell is resisted that it will partial hit")
+RULE_REAL(Spells, PartialHitChanceFear, 0.25, "The chance when a fear spell is resisted that it will partial hit")
+RULE_INT(Spells, BaseCritChance, 0, "base % chance that everyone has to crit a spell")
+RULE_INT(Spells, BaseCritRatio, 100, "base % bonus to damage on a successful spell crit. 100 = 2x damage")
+RULE_INT(Spells, WizCritLevel, 12, "level wizards first get spell crits")
+RULE_INT(Spells, WizCritChance, 7, "wiz's crit chance, on top of BaseCritChance")
+RULE_INT(Spells, WizCritRatio, 0, "wiz's crit bonus, on top of BaseCritRatio (should be 0 for Live-like)")
+RULE_INT(Spells, ResistPerLevelDiff, 85, "8.5 resist per level difference")
+RULE_INT(Spells, TranslocateTimeLimit, 0, "If not zero, time in seconds to accept a Translocate")
+RULE_INT(Spells, SacrificeMinLevel, 46, "first level Sacrifice will work on")
+RULE_INT(Spells, SacrificeMaxLevel, 69, "last level Sacrifice will work on")
+RULE_INT(Spells, SacrificeItemID, 9963, "Item ID of the item Sacrifice will return (defaults to an EE)")
+RULE_BOOL(Spells, EnableSpellGlobals, false, "If Enabled, spells check the spell_globals table and compare character data from their quest globals before allowing the spell to scribe with scribespells/traindiscs")
+RULE_BOOL(Spells, EnableSpellBuckets, false, "If Enabled, spells check the spell_buckets table and compare character data from their data buckets before allowing the spell to scribe with scribespells/traindiscs")
+RULE_INT(Spells, MaxBuffSlotsNPC, 60, "default to Tit's limit")
+RULE_INT(Spells, MaxSongSlotsNPC, 0, "NPCs don't have songs ...")
+RULE_INT(Spells, MaxDiscSlotsNPC, 0, "NPCs don't have discs ...")
+RULE_INT(Spells, MaxTotalSlotsNPC, 60, "default to Tit's limit")
+RULE_INT(Spells, MaxTotalSlotsPET, 30, "default to Tit's limit")
+RULE_BOOL (Spells, EnableBlockedBuffs, true, "")
+RULE_INT(Spells, ReflectType, 3, "0 = disabled, 1 = single target player spells only, 2 = all player spells, 3 = all single target spells, 4 = all spells")
+RULE_BOOL(Spells, ReflectMessagesClose, true, "Live functionality is for Reflect messages to show to players within close proximity, false shows just player reflecting")
+RULE_INT(Spells, VirusSpreadDistance, 30, "The distance a viral spell will jump to its next victim")
+RULE_BOOL(Spells, LiveLikeFocusEffects, true, "Determines whether specific healing, dmg and mana reduction focuses are randomized")
+RULE_INT(Spells, BaseImmunityLevel, 55, "The level that targets start to be immune to stun, fear and mez spells with a max level of 0")
+RULE_BOOL(Spells, NPCIgnoreBaseImmunity, true, "Whether or not NPCs get to ignore the BaseImmunityLevel for their spells")
+RULE_REAL(Spells, AvgSpellProcsPerMinute, 6.0, "Adjust rate for sympathetic spell procs")
+RULE_INT(Spells, ResistFalloff, 67, "Max that level that will adjust our resist chance based on level modifiers")
+RULE_INT(Spells, CharismaEffectiveness, 10, "Deterimes how much resist modification charisma applies to charm/pacify checks. Default 10 CHA = -1 resist mod")
+RULE_INT(Spells, CharismaEffectivenessCap, 255, "Deterimes how much resist modification charisma applies to charm/pacify checks. Default 10 CHA = -1 resist mod")
+RULE_BOOL(Spells, CharismaCharmDuration, false, "Allow CHA resist mod to extend charm duration")
+RULE_INT(Spells, CharmBreakCheckChance, 25, "Determines chance for a charm break check to occur each buff tick")
+RULE_BOOL(Spells, CharmDisablesSpecialAbilities, false, "When charm is cast on an NPC, strip their special abilities")
+RULE_INT(Spells, MaxCastTimeReduction, 50, "Max percent your spell cast time can be reduced by spell haste")
+RULE_INT(Spells, RootBreakFromSpells, 55, "Chance for root to break when cast on")
+RULE_INT(Spells, DeathSaveCharismaMod, 3, "Determines how much charisma effects chance of death save firing")
+RULE_INT(Spells, DivineInterventionHeal, 8000, "Divine intervention heal amount")
+RULE_INT(Spells, AdditiveBonusWornType, 0, "Calc worn bonuses to add together (instead of taking highest) if set to THIS worn type. (2=Will covert live items automatically)")
+RULE_BOOL(Spells, UseCHAScribeHack, false, "ScribeSpells and TrainDiscs quest functions will ignore entries where field 12 is CHA.  What's the best way to do this?")
+RULE_BOOL(Spells, BuffLevelRestrictions, true, "Buffs will not land on low level toons like live")
+RULE_INT(Spells, RootBreakCheckChance, 70, "Determines chance for a root break check to occur each buff tick")
+RULE_INT(Spells, FearBreakCheckChance, 70, "Determines chance for a fear break check to occur each buff tick")
+RULE_INT(Spells, SuccorFailChance, 2, "Determines chance for a succor spell not to teleport an invidual player")
+RULE_INT(Spells, FRProjectileItem_Titanium, 1113, "Item id for Titanium clients for Fire 'spell projectile'")
+RULE_INT(Spells, FRProjectileItem_SOF, 80684, "Item id for SOF clients for Fire 'spell projectile'")
+RULE_INT(Spells, FRProjectileItem_NPC, 80684, "Item id for NPC Fire 'spell projectile'")
+RULE_BOOL(Spells, UseLiveSpellProjectileGFX, false, "Use spell projectile graphics set in the spells_new table (player_1). Server must be using UF+ spell file")
+RULE_BOOL(Spells, FocusCombatProcs, false, "Allow all combat procs to receive focus effects")
+RULE_BOOL(Spells, PreNerfBardAEDoT, false, "Allow bard AOE dots to damage targets when moving")
+RULE_INT(Spells, AI_SpellCastFinishedFailRecast, 800, "AI spell recast time(MS) when an spell is cast but fails (ie stunned)")
+RULE_INT(Spells, AI_EngagedNoSpellMinRecast, 500, "AI spell recast time(MS) check when no spell is cast while engaged. (min time in random)")
+RULE_INT(Spells, AI_EngagedNoSpellMaxRecast, 1000, "AI spell recast time(MS) check when no spell is cast engaged.(max time in random)")
+RULE_INT(Spells, AI_EngagedBeneficialSelfChance, 100, "Chance during first AI Cast check to do a beneficial spell on self")
+RULE_INT(Spells, AI_EngagedBeneficialOtherChance, 25, "Chance during second AI Cast check to do a beneficial spell on others")
+RULE_INT(Spells, AI_EngagedDetrimentalChance, 20, "Chance during third AI Cast check to do a determental spell on others")
+RULE_INT(Spells, AI_PursueNoSpellMinRecast, 500, "AI spell recast time(MS) check when no spell is cast while chasing target. (min time in random)")
+RULE_INT(Spells, AI_PursueNoSpellMaxRecast, 2000, "AI spell recast time(MS) check when no spell is cast while chasing target. (max time in random)")
+RULE_INT(Spells, AI_PursueDetrimentalChance, 90, "Chance while chasing target to cast a detrimental spell")
+RULE_INT(Spells, AI_IdleNoSpellMinRecast, 6000, "AI spell recast time(MS) check when no spell is cast while idle. (min time in random)")
+RULE_INT(Spells, AI_IdleNoSpellMaxRecast, 60000, "AI spell recast time(MS) check when no spell is cast while chasing target. (max time in random)")
+RULE_INT(Spells, AI_IdleBeneficialChance, 100, "Chance while idle to do a beneficial spell on self or others")
+RULE_INT(Spells, AI_HealHPPct, 50, "HP Pct NPCs will start heals at (in and out of combat) if spell's max_hp is not set")
+RULE_BOOL(Spells, SHDProcIDOffByOne, true, "pre June 2009 SHD spell procs were off by 1, they stopped doing this in June 2009 (so UF+ spell files need this false)")
+RULE_BOOL(Spells, Jun182014HundredHandsRevamp, false, "this should be true for if you import a spell file newer than June 18, 2014")
+RULE_BOOL(Spells, SwarmPetTargetLock, false, "Use old method of swarm pets target locking till target dies then despawning")
+RULE_BOOL(Spells, NPC_UseFocusFromSpells, true, "Allow npcs to use most spell derived focus effects")
+RULE_BOOL(Spells, NPC_UseFocusFromItems, false, "Allow npcs to use most item derived focus effects")
+RULE_BOOL(Spells, UseAdditiveFocusFromWornSlot, false, "Allows an additive focus effect to be calculated from worn slot")
+RULE_BOOL(Spells, AlwaysSendTargetsBuffs, false, "ignore LAA level if true")
+RULE_BOOL(Spells, FlatItemExtraSpellAmt, false, "allow SpellDmg stat to affect all spells, regardless of cast time/cooldown/etc")
+RULE_BOOL(Spells, IgnoreSpellDmgLvlRestriction, false, "ignore the 5 level spread on applying SpellDmg")
+RULE_BOOL(Spells, AllowItemTGB, false, "TGB doesn't work with items on live, custom servers want it though")
+RULE_BOOL(Spells, NPCInnateProcOverride, true, "NPC innate procs override the target type to single target")
+RULE_BOOL(Spells, OldRainTargets, false, "use old incorrectly implemented max targets for rains")
+RULE_BOOL(Spells, NPCSpellPush, false, "enable spell push on NPCs")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Combat)
-RULE_INT(Combat, PetBaseCritChance, 0) // Pet Base crit chance
-RULE_INT(Combat, NPCBashKickLevel, 6) //The level that npcs can KICK/BASH
-RULE_INT(Combat, NPCBashKickStunChance, 15) //Percent chance that a bash/kick will stun
-RULE_INT(Combat, MeleeCritDifficulty, 8900) // lower is easier
-RULE_INT(Combat, ArcheryCritDifficulty, 3400) // lower is easier
-RULE_INT(Combat, ThrowingCritDifficulty, 1100) // lower is easier
-RULE_BOOL(Combat, NPCCanCrit, false) // true allows non PC pet NPCs to crit
-RULE_BOOL(Combat, UseIntervalAC, true)
-RULE_INT(Combat, PetAttackMagicLevel, 30)
-RULE_BOOL(Combat, EnableFearPathing, true)
-RULE_REAL(Combat, FleeMultiplier, 2.0) // Determines how quickly a NPC will slow down while fleeing. Decrease multiplier to slow NPC down quicker.
-RULE_BOOL(Combat, FleeGray, true) // If true FleeGrayHPRatio will be used.
-RULE_INT(Combat, FleeGrayHPRatio, 50) //HP % when a Gray NPC begins to flee.
-RULE_INT(Combat, FleeGrayMaxLevel, 18) // NPC's above this level won't do gray/green con flee
-RULE_INT(Combat, FleeHPRatio, 25) //HP % when a NPC begins to flee.
-RULE_BOOL(Combat, FleeIfNotAlone, false) // If false, mobs won't flee if other mobs are in combat with it.
-RULE_BOOL(Combat, AdjustProcPerMinute, true)
-RULE_REAL(Combat, AvgProcsPerMinute, 2.0)
-RULE_REAL(Combat, ProcPerMinDexContrib, 0.075)
-RULE_REAL(Combat, BaseProcChance, 0.035)
-RULE_REAL(Combat, ProcDexDivideBy, 11000)
-RULE_BOOL(Combat, AdjustSpecialProcPerMinute, true)  //Set PPM for special abilities like HeadShot (Live does this as of 4-14)
-RULE_REAL(Combat, AvgSpecialProcsPerMinute, 2.0) //Unclear what best value is atm.
-RULE_REAL(Combat, BaseHitChance, 69.0)
-RULE_REAL(Combat, NPCBonusHitChance, 26.0)
-RULE_REAL(Combat, HitFalloffMinor, 5.0) //hit will fall off up to 5% over the initial level range
-RULE_REAL(Combat, HitFalloffModerate, 7.0) //hit will fall off up to 7% over the three levels after the initial level range
-RULE_REAL(Combat, HitFalloffMajor, 50.0) //hit will fall off sharply if we're outside the minor and moderate range
-RULE_REAL(Combat, HitBonusPerLevel, 1.2) //You gain this % of hit for every level you are above your target
-RULE_REAL(Combat, WeaponSkillFalloff, 0.33) //For every weapon skill point that's not maxed you lose this % of hit
-RULE_REAL(Combat, ArcheryHitPenalty, 0.25) //Archery has a hit penalty to try to help balance it with the plethora of long term +hit modifiers for it
-RULE_REAL(Combat, AgiHitFactor, 0.01)
-RULE_REAL(Combat, MinChancetoHit, 5.0) //Minimum % chance to hit with regular melee/ranged
-RULE_REAL(Combat, MaxChancetoHit, 95.0) //Maximum % chance to hit with regular melee/ranged
-RULE_INT(Combat, MinRangedAttackDist, 25) //Minimum Distance to use Ranged Attacks
-RULE_BOOL(Combat, ArcheryBonusRequiresStationary, true) //does the 2x archery bonus chance require a stationary npc
-RULE_REAL(Combat, ArcheryBaseDamageBonus, 1) // % Modifier to Base Archery Damage (.5 = 50% base damage, 1 = 100%, 2 = 200%)
-RULE_REAL(Combat, ArcheryNPCMultiplier, 1.0) // this is multiplied by the regular dmg to get the archery dmg
-RULE_BOOL(Combat, AssistNoTargetSelf, true) //when assisting a target that does not have a target: true = target self, false = leave target as was before assist (false = live like)
-RULE_INT(Combat, MaxRampageTargets, 3) //max number of people hit with rampage
-RULE_INT(Combat, DefaultRampageTargets, 1) // default number of people to hit with rampage
-RULE_BOOL(Combat, RampageHitsTarget, false) // rampage will hit the target if it still has targets left
-RULE_INT(Combat, MaxFlurryHits, 2) //max number of extra hits from flurry
-RULE_INT(Combat, MonkDamageTableBonus, 5) //% bonus monks get to their damage table calcs
-RULE_INT(Combat, FlyingKickBonus, 25) //% Modifier that this skill gets to str and skill bonuses
-RULE_INT(Combat, DragonPunchBonus, 20) //% Modifier that this skill gets to str and skill bonuses
-RULE_INT(Combat, EagleStrikeBonus, 15) //% Modifier that this skill gets to str and skill bonuses
-RULE_INT(Combat, TigerClawBonus, 10) //% Modifier that this skill gets to str and skill bonuses
-RULE_INT(Combat, RoundKickBonus, 5) //% Modifier that this skill gets to str and skill bonuses
-RULE_INT(Combat, FrenzyBonus, 0) //% Modifier to damage
-RULE_INT(Combat, BackstabBonus, 0) //% Modifier to damage
-RULE_BOOL(Combat, ProcTargetOnly, true) //true = procs will only affect our target, false = procs will affect all of our targets
-RULE_REAL(Combat, NPCACFactor, 2.25)
-RULE_INT(Combat, ClothACSoftcap, 75)
-RULE_INT(Combat, LeatherACSoftcap, 100)
-RULE_INT(Combat, MonkACSoftcap, 120)
-RULE_INT(Combat, ChainACSoftcap, 200)
-RULE_INT(Combat, PlateACSoftcap, 300)
-RULE_REAL(Combat, AAMitigationACFactor, 3.0)
-RULE_REAL(Combat, WarriorACSoftcapReturn, 0.45)
-RULE_REAL(Combat, KnightACSoftcapReturn, 0.33)
-RULE_REAL(Combat, LowPlateChainACSoftcapReturn, 0.23)
-RULE_REAL(Combat, LowChainLeatherACSoftcapReturn, 0.17)
-RULE_REAL(Combat, CasterACSoftcapReturn, 0.06)
-RULE_REAL(Combat, MiscACSoftcapReturn, 0.3)
-RULE_BOOL(Combat, OldACSoftcapRules, false) // use old softcaps
-RULE_BOOL(Combat, UseOldDamageIntervalRules, false) // use old damage formulas for everything
-RULE_REAL(Combat, WarACSoftcapReturn, 0.3448) // new AC returns
-RULE_REAL(Combat, ClrRngMnkBrdACSoftcapReturn, 0.3030)
-RULE_REAL(Combat, PalShdACSoftcapReturn, 0.3226)
-RULE_REAL(Combat, DruNecWizEncMagACSoftcapReturn, 0.2000)
-RULE_REAL(Combat, RogShmBstBerACSoftcapReturn, 0.2500)
-RULE_REAL(Combat, SoftcapFactor, 1.88)
-RULE_REAL(Combat, ACthac0Factor, 0.55)
-RULE_REAL(Combat, ACthac20Factor, 0.55)
-RULE_INT(Combat, HitCapPre20, 40) // live has it capped at 40 for whatever dumb reason... this is mainly for custom servers
-RULE_INT(Combat, HitCapPre10, 20) // live has it capped at 20, see above :p
-RULE_INT(Combat, MinHastedDelay, 400) // how fast we can get with haste.
-RULE_REAL(Combat, AvgDefProcsPerMinute, 2.0)
-RULE_REAL(Combat, DefProcPerMinAgiContrib, 0.075) //How much agility contributes to defensive proc rate
-RULE_INT(Combat, SpecialAttackACBonus, 15) //Percent amount of damage per AC gained for certain special attacks (damage = AC*SpecialAttackACBonus/100).
-RULE_INT(Combat, NPCFlurryChance, 20) // Chance for NPC to flurry.
-RULE_BOOL (Combat,TauntOverLevel, 1) //Allows you to taunt NPC's over warriors level.
-RULE_REAL (Combat,TauntSkillFalloff, 0.33)//For every taunt skill point that's not maxed you lose this % chance to taunt.
-RULE_BOOL (Combat,EXPFromDmgShield, false) //Determine if damage from a damage shield counts for EXP gain.
-RULE_INT(Combat, MonkACBonusWeight, 15)
-RULE_INT(Combat, ClientStunLevel, 55) //This is the level where client kicks and bashes can stun the target
-RULE_INT(Combat, QuiverHasteCap, 1000) //Quiver haste cap 1000 on live for a while, currently 700 on live
-RULE_BOOL(Combat, UseArcheryBonusRoll, false) //Make the 51+ archery bonus require an actual roll
-RULE_INT(Combat, ArcheryBonusChance, 50)
-RULE_INT(Combat, BerserkerFrenzyStart, 35)
-RULE_INT(Combat, BerserkerFrenzyEnd, 45)
-RULE_BOOL(Combat, OneProcPerWeapon, true) //If enabled, One proc per weapon per round
-RULE_BOOL(Combat, ProjectileDmgOnImpact, true) //If enabled, projectiles (ie arrows) will hit on impact, instead of instantly.
-RULE_BOOL(Combat, MeleePush, true) // enable melee push
-RULE_INT(Combat, MeleePushChance, 50) // (NPCs) chance the target will be pushed. Made up, 100 actually isn't that bad
-RULE_BOOL(Combat, UseLiveCombatRounds, true) // turn this false if you don't want to worry about fixing up combat rounds for NPCs
-RULE_INT(Combat, NPCAssistCap, 5) // Maxiumium number of NPCs that will assist another NPC at once
-RULE_INT(Combat, NPCAssistCapTimer, 6000) // Time in milliseconds a NPC will take to clear assist aggro cap space
-RULE_BOOL(Combat, UseRevampHandToHand, false) // use h2h revamped dmg/delays I believe this was implemented during SoF
-RULE_BOOL(Combat, ClassicMasterWu, false) // classic master wu uses a random special, modern doesn't
-RULE_INT(Combat, LevelToStopDamageCaps, 0) // 1 will effectively disable them, 20 should give basically same results as old incorrect system
-RULE_BOOL(Combat, ClassicNPCBackstab, false) // true disables npc facestab - npcs get normal attack if not behind
-RULE_BOOL(Combat, UseNPCDamageClassLevelMods, true) // Uses GetClassLevelDamageMod calc in npc_scale_manager
+RULE_INT(Combat, PetBaseCritChance, 0, "Pet Base crit chance")
+RULE_INT(Combat, NPCBashKickLevel, 6, "The level that npcs can KICK/BASH")
+RULE_INT(Combat, NPCBashKickStunChance, 15, "Percent chance that a bash/kick will stun")
+RULE_INT(Combat, MeleeCritDifficulty, 8900, "lower is easier")
+RULE_INT(Combat, ArcheryCritDifficulty, 3400, "lower is easier")
+RULE_INT(Combat, ThrowingCritDifficulty, 1100, "lower is easier")
+RULE_BOOL(Combat, NPCCanCrit, false, "true allows non PC pet NPCs to crit")
+RULE_BOOL(Combat, UseIntervalAC, true, "")
+RULE_INT(Combat, PetAttackMagicLevel, 30, "")
+RULE_BOOL(Combat, EnableFearPathing, true, "")
+RULE_REAL(Combat, FleeMultiplier, 2.0, "Determines how quickly a NPC will slow down while fleeing. Decrease multiplier to slow NPC down quicker")
+RULE_BOOL(Combat, FleeGray, true, "If true FleeGrayHPRatio will be used")
+RULE_INT(Combat, FleeGrayHPRatio, 50, "HP % when a Gray NPC begins to flee")
+RULE_INT(Combat, FleeGrayMaxLevel, 18, "NPC's above this level won't do gray/green con flee")
+RULE_INT(Combat, FleeHPRatio, 25, "HP % when a NPC begins to flee")
+RULE_BOOL(Combat, FleeIfNotAlone, false, "If false, mobs won't flee if other mobs are in combat with it")
+RULE_BOOL(Combat, AdjustProcPerMinute, true, "")
+RULE_REAL(Combat, AvgProcsPerMinute, 2.0, "")
+RULE_REAL(Combat, ProcPerMinDexContrib, 0.075, "")
+RULE_REAL(Combat, BaseProcChance, 0.035, "")
+RULE_REAL(Combat, ProcDexDivideBy, 11000, "")
+RULE_BOOL(Combat, AdjustSpecialProcPerMinute, true, "Set PPM for special abilities like HeadShot (Live does this as of 4-14)")
+RULE_REAL(Combat, AvgSpecialProcsPerMinute, 2.0, "Unclear what best value is atm")
+RULE_REAL(Combat, BaseHitChance, 69.0, "")
+RULE_REAL(Combat, NPCBonusHitChance, 26.0, "")
+RULE_REAL(Combat, HitFalloffMinor, 5.0, "hit will fall off up to 5% over the initial level range")
+RULE_REAL(Combat, HitFalloffModerate, 7.0, "hit will fall off up to 7% over the three levels after the initial level range")
+RULE_REAL(Combat, HitFalloffMajor, 50.0, "hit will fall off sharply if we're outside the minor and moderate range")
+RULE_REAL(Combat, HitBonusPerLevel, 1.2, "You gain this % of hit for every level you are above your target")
+RULE_REAL(Combat, WeaponSkillFalloff, 0.33, "For every weapon skill point that's not maxed you lose this % of hit")
+RULE_REAL(Combat, ArcheryHitPenalty, 0.25, "Archery has a hit penalty to try to help balance it with the plethora of long term +hit modifiers for it")
+RULE_REAL(Combat, AgiHitFactor, 0.01, "")
+RULE_REAL(Combat, MinChancetoHit, 5.0, "Minimum % chance to hit with regular melee/ranged")
+RULE_REAL(Combat, MaxChancetoHit, 95.0, "Maximum % chance to hit with regular melee/ranged")
+RULE_INT(Combat, MinRangedAttackDist, 25, "Minimum Distance to use Ranged Attacks")
+RULE_BOOL(Combat, ArcheryBonusRequiresStationary, true, "does the 2x archery bonus chance require a stationary npc")
+RULE_REAL(Combat, ArcheryBaseDamageBonus, 1, "% Modifier to Base Archery Damage (.5 = 50% base damage, 1 = 100%, 2 = 200%)")
+RULE_REAL(Combat, ArcheryNPCMultiplier, 1.0, "this is multiplied by the regular dmg to get the archery dmg")
+RULE_BOOL(Combat, AssistNoTargetSelf, true, "when assisting a target that does not have a target: true = target self, false = leave target as was before assist (false = live like)")
+RULE_INT(Combat, MaxRampageTargets, 3, "max number of people hit with rampage")
+RULE_INT(Combat, DefaultRampageTargets, 1, "default number of people to hit with rampage")
+RULE_BOOL(Combat, RampageHitsTarget, false, "rampage will hit the target if it still has targets left")
+RULE_INT(Combat, MaxFlurryHits, 2, "max number of extra hits from flurry")
+RULE_INT(Combat, MonkDamageTableBonus, 5, "% bonus monks get to their damage table calcs")
+RULE_INT(Combat, FlyingKickBonus, 25, "% Modifier that this skill gets to str and skill bonuses")
+RULE_INT(Combat, DragonPunchBonus, 20, "% Modifier that this skill gets to str and skill bonuses")
+RULE_INT(Combat, EagleStrikeBonus, 15, "% Modifier that this skill gets to str and skill bonuses")
+RULE_INT(Combat, TigerClawBonus, 10, "% Modifier that this skill gets to str and skill bonuses")
+RULE_INT(Combat, RoundKickBonus, 5, "% Modifier that this skill gets to str and skill bonuses")
+RULE_INT(Combat, FrenzyBonus, 0, "% Modifier to damage")
+RULE_INT(Combat, BackstabBonus, 0, "% Modifier to damage")
+RULE_BOOL(Combat, ProcTargetOnly, true, "true = procs will only affect our target, false = procs will affect all of our targets")
+RULE_REAL(Combat, NPCACFactor, 2.25, "")
+RULE_INT(Combat, ClothACSoftcap, 75, "")
+RULE_INT(Combat, LeatherACSoftcap, 100, "")
+RULE_INT(Combat, MonkACSoftcap, 120, "")
+RULE_INT(Combat, ChainACSoftcap, 200, "")
+RULE_INT(Combat, PlateACSoftcap, 300, "")
+RULE_REAL(Combat, AAMitigationACFactor, 3.0, "")
+RULE_REAL(Combat, WarriorACSoftcapReturn, 0.45, "")
+RULE_REAL(Combat, KnightACSoftcapReturn, 0.33, "")
+RULE_REAL(Combat, LowPlateChainACSoftcapReturn, 0.23, "")
+RULE_REAL(Combat, LowChainLeatherACSoftcapReturn, 0.17, "")
+RULE_REAL(Combat, CasterACSoftcapReturn, 0.06, "")
+RULE_REAL(Combat, MiscACSoftcapReturn, 0.3, "")
+RULE_BOOL(Combat, OldACSoftcapRules, false, "use old softcaps")
+RULE_BOOL(Combat, UseOldDamageIntervalRules, false, "use old damage formulas for everything")
+RULE_REAL(Combat, WarACSoftcapReturn, 0.3448, "new AC returns")
+RULE_REAL(Combat, ClrRngMnkBrdACSoftcapReturn, 0.3030, "")
+RULE_REAL(Combat, PalShdACSoftcapReturn, 0.3226, "")
+RULE_REAL(Combat, DruNecWizEncMagACSoftcapReturn, 0.2000, "")
+RULE_REAL(Combat, RogShmBstBerACSoftcapReturn, 0.2500, "")
+RULE_REAL(Combat, SoftcapFactor, 1.88, "")
+RULE_REAL(Combat, ACthac0Factor, 0.55, "")
+RULE_REAL(Combat, ACthac20Factor, 0.55, "")
+RULE_INT(Combat, HitCapPre20, 40, "live has it capped at 40 for whatever dumb reason... this is mainly for custom servers")
+RULE_INT(Combat, HitCapPre10, 20, "live has it capped at 20, see above")
+RULE_INT(Combat, MinHastedDelay, 400, "how fast we can get with haste")
+RULE_REAL(Combat, AvgDefProcsPerMinute, 2.0, "")
+RULE_REAL(Combat, DefProcPerMinAgiContrib, 0.075, "How much agility contributes to defensive proc rate")
+RULE_INT(Combat, SpecialAttackACBonus, 15, "Percent amount of damage per AC gained for certain special attacks (damage = AC*SpecialAttackACBonus/100)")
+RULE_INT(Combat, NPCFlurryChance, 20, "Chance for NPC to flurry")
+RULE_BOOL (Combat,TauntOverLevel, 1, "Allows you to taunt NPC's over warriors level")
+RULE_REAL (Combat,TauntSkillFalloff, 0.33, "For every taunt skill point that's not maxed you lose this % chance to taunt")
+RULE_BOOL (Combat,EXPFromDmgShield, false, "Determine if damage from a damage shield counts for EXP gain")
+RULE_INT(Combat, MonkACBonusWeight, 15, "")
+RULE_INT(Combat, ClientStunLevel, 55, "This is the level where client kicks and bashes can stun the target")
+RULE_INT(Combat, QuiverHasteCap, 1000, "Quiver haste cap 1000 on live for a while, currently 700 on live")
+RULE_BOOL(Combat, UseArcheryBonusRoll, false, "Make the 51+ archery bonus require an actual roll")
+RULE_INT(Combat, ArcheryBonusChance, 50, "")
+RULE_INT(Combat, BerserkerFrenzyStart, 35, "")
+RULE_INT(Combat, BerserkerFrenzyEnd, 45, "")
+RULE_BOOL(Combat, OneProcPerWeapon, true, "If enabled, One proc per weapon per round")
+RULE_BOOL(Combat, ProjectileDmgOnImpact, true, "If enabled, projectiles (ie arrows) will hit on impact, instead of instantly")
+RULE_BOOL(Combat, MeleePush, true, "enable melee push")
+RULE_INT(Combat, MeleePushChance, 50, "(NPCs) chance the target will be pushed. Made up, 100 actually isn't that bad")
+RULE_BOOL(Combat, UseLiveCombatRounds, true, "turn this false if you don't want to worry about fixing up combat rounds for NPCs")
+RULE_INT(Combat, NPCAssistCap, 5, "Maxiumium number of NPCs that will assist another NPC at once")
+RULE_INT(Combat, NPCAssistCapTimer, 6000, "Time in milliseconds a NPC will take to clear assist aggro cap space")
+RULE_BOOL(Combat, UseRevampHandToHand, false, "use h2h revamped dmg/delays I believe this was implemented during SoF")
+RULE_BOOL(Combat, ClassicMasterWu, false, "classic master wu uses a random special, modern doesn't")
+RULE_INT(Combat, LevelToStopDamageCaps, 0, "1 will effectively disable them, 20 should give basically same results as old incorrect system")
+RULE_BOOL(Combat, ClassicNPCBackstab, false, "true disables npc facestab - npcs get normal attack if not behind")
+RULE_BOOL(Combat, UseNPCDamageClassLevelMods, true, "Uses GetClassLevelDamageMod calc in npc_scale_manager")
+RULE_BOOL(Combat, UseExtendedPoisonProcs, false, "Allow old school poisons to last until characrer zones, at a lower proc rate")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(NPC)
-RULE_INT(NPC, MinorNPCCorpseDecayTimeMS, 450000) //level<55
-RULE_INT(NPC, MajorNPCCorpseDecayTimeMS, 1500000) //level>=55
-RULE_INT(NPC, CorpseUnlockTimer, 150000)
-RULE_INT(NPC, EmptyNPCCorpseDecayTimeMS, 0)
-RULE_BOOL(NPC, UseItemBonusesForNonPets, true)
-RULE_BOOL(NPC, UseBaneDamage, false)
-RULE_INT(NPC, SayPauseTimeInSec, 5)
-RULE_INT(NPC, OOCRegen, 0)
-RULE_BOOL(NPC, BuffFriends, false)
-RULE_BOOL(NPC, EnableNPCQuestJournal, false)
-RULE_INT(NPC, LastFightingDelayMovingMin, 10000)
-RULE_INT(NPC, LastFightingDelayMovingMax, 20000)
-RULE_BOOL(NPC, SmartLastFightingDelayMoving, true)
-RULE_BOOL(NPC, ReturnNonQuestNoDropItems, false)	// Returns NO DROP items on NPCs that don't have an EVENT_TRADE sub in their script
-RULE_INT(NPC, StartEnrageValue, 9) // % HP that an NPC will begin to enrage
-RULE_BOOL(NPC, LiveLikeEnrage, false) // If set to true then only player controlled pets will enrage
-RULE_BOOL(NPC, EnableMeritBasedFaction, false) // If set to true, faction will given in the same way as experience (solo/group/raid)
-RULE_INT(NPC, NPCToNPCAggroTimerMin, 500)
-RULE_INT(NPC, NPCToNPCAggroTimerMax, 6000)
-RULE_BOOL(NPC, UseClassAsLastName, true) // Uses class archetype as LastName for npcs with none
-RULE_BOOL(NPC, NewLevelScaling, true) // Better level scaling, use old if new formulas would break your server
-RULE_INT(NPC, NPCGatePercent, 5) // % at which the NPC Will attempt to gate at.
-RULE_BOOL(NPC, NPCGateNearBind, false) // Will NPC attempt to gate when near bind location?
-RULE_INT(NPC, NPCGateDistanceBind, 75) // Distance from bind before NPC will attempt to gate
-RULE_BOOL(NPC, NPCHealOnGate, true) // Will the NPC Heal on Gate.
-RULE_REAL(NPC, NPCHealOnGateAmount, 25) // How much the npc will heal on gate if enabled.
+RULE_INT(NPC, MinorNPCCorpseDecayTimeMS, 450000, "level < 55")
+RULE_INT(NPC, MajorNPCCorpseDecayTimeMS, 1500000, "level >= 55")
+RULE_INT(NPC, CorpseUnlockTimer, 150000, "")
+RULE_INT(NPC, EmptyNPCCorpseDecayTimeMS, 0, "")
+RULE_BOOL(NPC, UseItemBonusesForNonPets, true, "")
+RULE_BOOL(NPC, UseBaneDamage, false, "")
+RULE_INT(NPC, SayPauseTimeInSec, 5, "")
+RULE_INT(NPC, OOCRegen, 0, "")
+RULE_BOOL(NPC, BuffFriends, false, "")
+RULE_BOOL(NPC, EnableNPCQuestJournal, false, "")
+RULE_INT(NPC, LastFightingDelayMovingMin, 10000, "")
+RULE_INT(NPC, LastFightingDelayMovingMax, 20000, "")
+RULE_BOOL(NPC, SmartLastFightingDelayMoving, true, "")
+RULE_BOOL(NPC, ReturnNonQuestNoDropItems, false, "Returns NO DROP items on NPCs that don't have an EVENT_TRADE sub in their script")
+RULE_INT(NPC, StartEnrageValue, 9, "% HP that an NPC will begin to enrage")
+RULE_BOOL(NPC, LiveLikeEnrage, false, "If set to true then only player controlled pets will enrage")
+RULE_BOOL(NPC, EnableMeritBasedFaction, false, "If set to true, faction will given in the same way as experience (solo/group/raid)")
+RULE_INT(NPC, NPCToNPCAggroTimerMin, 500, "")
+RULE_INT(NPC, NPCToNPCAggroTimerMax, 6000, "")
+RULE_BOOL(NPC, UseClassAsLastName, true, "Uses class archetype as LastName for npcs with none")
+RULE_BOOL(NPC, NewLevelScaling, true, "Better level scaling, use old if new formulas would break your server")
+RULE_INT(NPC, NPCGatePercent, 20, "% at which the NPC Will attempt to gate at")
+RULE_BOOL(NPC, NPCGateNearBind, false, "Will NPC attempt to gate when near bind location?")
+RULE_INT(NPC, NPCGateDistanceBind, 75, "Distance from bind before NPC will attempt to gate")
+RULE_BOOL(NPC, NPCHealOnGate, true, "Will the NPC Heal on Gate")
+RULE_REAL(NPC, NPCHealOnGateAmount, 25, "How much the npc will heal on gate if enabled")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Aggro)
-RULE_BOOL(Aggro, SmartAggroList, true)
-RULE_INT(Aggro, SittingAggroMod, 35) //35%
-RULE_INT(Aggro, MeleeRangeAggroMod, 10) //10%
-RULE_INT(Aggro, CurrentTargetAggroMod, 0) //0% -- will prefer our current target to any other; makes it harder for our npcs to switch targets.
-RULE_INT(Aggro, CriticallyWoundedAggroMod, 100) //100%
-RULE_INT(Aggro, SpellAggroMod, 100)
-RULE_INT(Aggro, SongAggroMod, 33)
-RULE_INT(Aggro, PetSpellAggroMod, 10)
-RULE_REAL(Aggro, TunnelVisionAggroMod, 0.75) //people not currently the top hate generate this much hate on a Tunnel Vision mob
-RULE_INT(Aggro, MaxScalingProcAggro, 400) // Set to -1 for no limit. Maxmimum amount of aggro that HP scaling SPA effect in a proc will add.
-RULE_INT(Aggro, IntAggroThreshold, 75) // Int <= this will aggro regardless of level difference.
-RULE_BOOL(Aggro, AllowTickPulling, false) // tick pulling is an exploit in an NPC's call for help fixed sometime in 2006 on live
-RULE_INT(Aggro, MinAggroLevel, 18) // For use with UseLevelAggro
-RULE_BOOL(Aggro, UseLevelAggro, true) // MinAggroLevel rule value+ and Undead will aggro regardless of level difference. (this will disabled Rule:IntAggroThreshold if set to true)
-RULE_INT(Aggro, ClientAggroCheckInterval, 6) // Interval in which clients actually check for aggro - in seconds
-RULE_REAL(Aggro, PetAttackRange, 40000.0) // max squared range /pet attack works at default is 200
-RULE_BOOL(Aggro, NPCAggroMaxDistanceEnabled, true) /* If enabled, NPC's will drop aggro beyond 600 units or what is defined at the zone level */
+RULE_BOOL(Aggro, SmartAggroList, true, "")
+RULE_INT(Aggro, SittingAggroMod, 35, "35%")
+RULE_INT(Aggro, MeleeRangeAggroMod, 10, "10%")
+RULE_INT(Aggro, CurrentTargetAggroMod, 0, "0% -- will prefer our current target to any other; makes it harder for our npcs to switch targets")
+RULE_INT(Aggro, CriticallyWoundedAggroMod, 100, "100%")
+RULE_INT(Aggro, SpellAggroMod, 100, "")
+RULE_INT(Aggro, SongAggroMod, 33, "")
+RULE_INT(Aggro, PetSpellAggroMod, 10, "")
+RULE_REAL(Aggro, TunnelVisionAggroMod, 0.75, "people not currently the top hate generate this much hate on a Tunnel Vision mob")
+RULE_INT(Aggro, MaxScalingProcAggro, 400, "Set to -1 for no limit. Maxmimum amount of aggro that HP scaling SPA effect in a proc will add")
+RULE_INT(Aggro, IntAggroThreshold, 75, "Int <= this will aggro regardless of level difference")
+RULE_BOOL(Aggro, AllowTickPulling, false, "tick pulling is an exploit in an NPC's call for help fixed sometime in 2006 on live")
+RULE_INT(Aggro, MinAggroLevel, 18, "For use with UseLevelAggro")
+RULE_BOOL(Aggro, UseLevelAggro, true, "MinAggroLevel rule value+ and Undead will aggro regardless of level difference. (this will disabled Rule:IntAggroThreshold if set to true)")
+RULE_INT(Aggro, ClientAggroCheckInterval, 6, "Interval in which clients actually check for aggro - in seconds")
+RULE_REAL(Aggro, PetAttackRange, 40000.0, "max squared range /pet attack works at default is 200")
+RULE_BOOL(Aggro, NPCAggroMaxDistanceEnabled, true, "If enabled, NPC's will drop aggro beyond 600 units or what is defined at the zone level")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(TaskSystem)
-RULE_BOOL(TaskSystem, EnableTaskSystem, true) // Globally enable or disable the Task system
-RULE_INT(TaskSystem, PeriodicCheckTimer, 5) // Seconds between checks for failed tasks. Also used by the 'Touch' activity
-RULE_BOOL(TaskSystem, RecordCompletedTasks, true)
-RULE_BOOL(TaskSystem, RecordCompletedOptionalActivities, false)
-RULE_BOOL(TaskSystem, KeepOneRecordPerCompletedTask, true)
-RULE_BOOL(TaskSystem, EnableTaskProximity, true)
+RULE_BOOL(TaskSystem, EnableTaskSystem, true, "Globally enable or disable the Task system")
+RULE_INT(TaskSystem, PeriodicCheckTimer, 5, "Seconds between checks for failed tasks. Also used by the 'Touch' activity")
+RULE_BOOL(TaskSystem, RecordCompletedTasks, true, "")
+RULE_BOOL(TaskSystem, RecordCompletedOptionalActivities, false, "")
+RULE_BOOL(TaskSystem, KeepOneRecordPerCompletedTask, true, "")
+RULE_BOOL(TaskSystem, EnableTaskProximity, true, "")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Range)
-RULE_INT(Range, Say, 15)
-RULE_INT(Range, Emote, 135)
-RULE_INT(Range, BeginCast, 200)
-RULE_INT(Range, Anims, 135)
-RULE_INT(Range, SpellParticles, 135)
-RULE_INT(Range, DamageMessages, 50)
-RULE_INT(Range, SpellMessages, 75)
-RULE_INT(Range, SongMessages, 75)
-RULE_INT(Range, MobPositionUpdates, 600)
-RULE_INT(Range, ClientPositionUpdates, 300)
-RULE_INT(Range, ClientForceSpawnUpdateRange, 1000)
-RULE_INT(Range, CriticalDamage, 80)
-RULE_INT(Range, ClientNPCScan, 300)
+RULE_INT(Range, Say, 15, "")
+RULE_INT(Range, Emote, 135, "")
+RULE_INT(Range, BeginCast, 200, "")
+RULE_INT(Range, Anims, 135, "")
+RULE_INT(Range, SpellParticles, 135, "")
+RULE_INT(Range, DamageMessages, 50, "")
+RULE_INT(Range, SpellMessages, 75, "")
+RULE_INT(Range, SongMessages, 75, "")
+RULE_INT(Range, MobPositionUpdates, 600, "")
+RULE_INT(Range, ClientPositionUpdates, 300, "")
+RULE_INT(Range, ClientForceSpawnUpdateRange, 1000, "")
+RULE_INT(Range, CriticalDamage, 80, "")
+RULE_INT(Range, MobCloseScanDistance, 600, "")
 RULE_CATEGORY_END()
 
 
 #ifdef BOTS
 RULE_CATEGORY(Bots)
-RULE_INT(Bots, AAExpansion, 8) // Bots get AAs through this expansion
-RULE_BOOL(Bots, AllowCamelCaseNames, false) // Allows the use of 'MyBot' type names
-RULE_INT(Bots, CommandSpellRank, 1) // Filters bot command spells by rank (1, 2 and 3 are valid filters - any other number allows all ranks)
-RULE_INT(Bots, CreationLimit, 150) // Number of bots that each account can create
-RULE_BOOL(Bots, FinishBuffing, false) // Allow for buffs to complete even if the bot caster is out of mana. Only affects buffing out of combat.
-RULE_BOOL(Bots, GroupBuffing, false) // Bots will cast single target buffs as group buffs, default is false for single. Does not make single target buffs work for MGB.
-RULE_INT(Bots, HealRotationMaxMembers, 24) // Maximum number of heal rotation members
-RULE_INT(Bots, HealRotationMaxTargets, 12) // Maximum number of heal rotation targets
-RULE_REAL(Bots, ManaRegen, 2.0) // Adjust mana regen for bots, 1 is fast and higher numbers slow it down 3 is about the same as players.
-RULE_BOOL(Bots, PreferNoManaCommandSpells, true) // Give sorting priority to newer no-mana spells (i.e., 'Bind Affinity')
-RULE_BOOL(Bots, QuestableSpawnLimit, false) // Optional quest method to manage bot spawn limits using the quest_globals name bot_spawn_limit, see: /bazaar/Aediles_Thrall.pl
-RULE_BOOL(Bots, QuestableSpells, false) // Anita Thrall's (Anita_Thrall.pl) Bot Spell Scriber quests.
-RULE_INT(Bots, SpawnLimit, 71) // Number of bots a character can have spawned at one time, You + 71 bots is a 12 group pseudo-raid (bots are not raidable at this time)
-RULE_BOOL(Bots, UpdatePositionWithTimer, false) // Sends a position update with every positive movement timer check
-RULE_BOOL(Bots, UsePathing, true) // Bots will use node pathing when moving
-RULE_BOOL(Bots, BotGroupXP, false) // Determines whether client gets xp for bots outside their group.
-RULE_BOOL(Bots, BotBardUseOutOfCombatSongs, true) // Determines whether bard bots use additional out of combat songs (optional script)
-RULE_BOOL(Bots, BotLevelsWithOwner, false) // Auto-updates spawned bots as owner levels/de-levels (false is original behavior)
-RULE_BOOL(Bots, BotCharacterLevelEnabled, false) // Enables required level to spawn bots
-RULE_INT(Bots, BotCharacterLevel, 0) // 0 as default (if level > this value you can spawn bots if BotCharacterLevelEnabled is true)
-RULE_INT(Bots, CasterStopMeleeLevel, 13) // Level at which caster bots stop melee attacks
-RULE_INT(Bots, AllowedClasses, 0xFFFFFFFF) // Bitmask of allowed bot classes
-RULE_INT(Bots, AllowedRaces, 0xFFFFFFFF) // Bitmask of allowed bot races
-RULE_INT(Bots, AllowedGenders, 0x3) // Bitmask of allowed bot genders
+RULE_INT(Bots, BotExpansionSettings, 16383, "Sets the expansion settings for bot use. Defaults to all expansions enabled up to TSS")
+RULE_BOOL(Bots, AllowCamelCaseNames, false, "Allows the use of 'MyBot' type names")
+RULE_INT(Bots, CommandSpellRank, 1, "Filters bot command spells by rank (1, 2 and 3 are valid filters - any other number allows all ranks)")
+RULE_INT(Bots, CreationLimit, 150, "Number of bots that each account can create")
+RULE_BOOL(Bots, FinishBuffing, false, "Allow for buffs to complete even if the bot caster is out of mana. Only affects buffing out of combat")
+RULE_BOOL(Bots, GroupBuffing, false, "Bots will cast single target buffs as group buffs, default is false for single. Does not make single target buffs work for MGB")
+RULE_INT(Bots, HealRotationMaxMembers, 24, "Maximum number of heal rotation members")
+RULE_INT(Bots, HealRotationMaxTargets, 12, "Maximum number of heal rotation targets")
+RULE_REAL(Bots, ManaRegen, 2.0, "Adjust mana regen for bots, 1 is fast and higher numbers slow it down 3 is about the same as players")
+RULE_BOOL(Bots, PreferNoManaCommandSpells, true, "Give sorting priority to newer no-mana spells (i.e., 'Bind Affinity')")
+RULE_BOOL(Bots, QuestableSpawnLimit, false, "Optional quest method to manage bot spawn limits using the quest_globals name bot_spawn_limit, see: /bazaar/Aediles_Thrall.pl")
+RULE_BOOL(Bots, QuestableSpells, false, "Anita Thrall's (Anita_Thrall.pl) Bot Spell Scriber quests")
+RULE_INT(Bots, SpawnLimit, 71, "Number of bots a character can have spawned at one time, You + 71 bots is a 12 group pseudo-raid (bots are not raidable at this time)")
+RULE_BOOL(Bots, UpdatePositionWithTimer, false, "Sends a position update with every positive movement timer check")
+RULE_BOOL(Bots, UsePathing, true, "Bots will use node pathing when moving")
+RULE_BOOL(Bots, BotGroupXP, false, "Determines whether client gets xp for bots outside their group")
+RULE_BOOL(Bots, BotBardUseOutOfCombatSongs, true, "Determines whether bard bots use additional out of combat songs (optional script)")
+RULE_BOOL(Bots, BotLevelsWithOwner, false, "Auto-updates spawned bots as owner levels/de-levels (false is original behavior)")
+RULE_BOOL(Bots, BotCharacterLevelEnabled, false, "Enables required level to spawn bots")
+RULE_INT(Bots, BotCharacterLevel, 0, "0 as default (if level > this value you can spawn bots if BotCharacterLevelEnabled is true)")
+RULE_INT(Bots, CasterStopMeleeLevel, 13, "Level at which caster bots stop melee attacks")
+RULE_INT(Bots, AllowedClasses, 0xFFFFFFFF, "Bitmask of allowed bot classes")
+RULE_INT(Bots, AllowedRaces, 0xFFFFFFFF, "Bitmask of allowed bot races")
+RULE_INT(Bots, AllowedGenders, 0x3, "Bitmask of allowed bot genders")
+RULE_BOOL(Bots, AllowOwnerOptionAltCombat, true, "When option is enabled, bots will use an auto-/shared-aggro combat model")
+RULE_BOOL(Bots, AllowOwnerOptionAutoDefend, true, "When option is enabled, bots will defend their owner on enemy aggro")
+RULE_REAL(Bots, LeashDistance, 562500.0f, "Distance a bot is allowed to travel from leash owner before being pulled back (squared value)")
+RULE_BOOL(Bots, AllowApplyPoisonCommand, true, "Allows the use of the bot command 'applypoison'")
+RULE_BOOL(Bots, AllowApplyPotionCommand, true, "Allows the use of the bot command 'applypotion'")
+RULE_BOOL(Bots, RestrictApplyPotionToRogue, true, "Restricts the bot command 'applypotion' to rogue-usable potions (i.e., poisons)")
 RULE_CATEGORY_END()
 #endif
 
 RULE_CATEGORY(Chat)
-RULE_BOOL(Chat, ServerWideOOC, true)
-RULE_BOOL(Chat, ServerWideAuction, true)
-RULE_BOOL(Chat, EnableVoiceMacros, true)
-RULE_BOOL(Chat, EnableMailKeyIPVerification, true)
-RULE_BOOL(Chat, EnableAntiSpam, true)
-RULE_BOOL(Chat, SuppressCommandErrors, false) // Do not suppress by default
-RULE_INT(Chat, MinStatusToBypassAntiSpam, 100)
-RULE_INT(Chat, MinimumMessagesPerInterval, 4)
-RULE_INT(Chat, MaximumMessagesPerInterval, 12)
-RULE_INT(Chat, MaxMessagesBeforeKick, 20)
-RULE_INT(Chat, IntervalDurationMS, 60000)
-RULE_INT(Chat, KarmaUpdateIntervalMS, 1200000)
-RULE_INT(Chat, KarmaGlobalChatLimit, 72) //amount of karma you need to be able to talk in ooc/auction/chat below the level limit
-RULE_INT(Chat, GlobalChatLevelLimit, 8) //level limit you need to of reached to talk in ooc/auction/chat if your karma is too low.
+RULE_BOOL(Chat, ServerWideOOC, true, "")
+RULE_BOOL(Chat, ServerWideAuction, true, "")
+RULE_BOOL(Chat, EnableVoiceMacros, true, "")
+RULE_BOOL(Chat, EnableMailKeyIPVerification, true, "")
+RULE_BOOL(Chat, EnableAntiSpam, true, "")
+RULE_BOOL(Chat, SuppressCommandErrors, false, "Do not suppress by default")
+RULE_INT(Chat, MinStatusToBypassAntiSpam, 100, "")
+RULE_INT(Chat, MinimumMessagesPerInterval, 4, "")
+RULE_INT(Chat, MaximumMessagesPerInterval, 12, "")
+RULE_INT(Chat, MaxMessagesBeforeKick, 20, "")
+RULE_INT(Chat, IntervalDurationMS, 60000, "")
+RULE_INT(Chat, KarmaUpdateIntervalMS, 1200000, "")
+RULE_INT(Chat, KarmaGlobalChatLimit, 72, "amount of karma you need to be able to talk in ooc/auction/chat below the level limit")
+RULE_INT(Chat, GlobalChatLevelLimit, 8, "level limit you need to of reached to talk in ooc/auction/chat if your karma is too low")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Merchant)
-RULE_BOOL(Merchant, UsePriceMod, true) // Use faction/charisma price modifiers.
-RULE_REAL(Merchant, SellCostMod, 1.05) // Modifier for NPC sell price.
-RULE_REAL(Merchant, BuyCostMod, 0.95) // Modifier for NPC buy price.
-RULE_INT(Merchant, PriceBonusPct, 4) // Determines maximum price bonus from having good faction/CHA. Value is a percent.
-RULE_INT(Merchant, PricePenaltyPct, 4) // Determines maximum price penalty from having bad faction/CHA. Value is a percent.
-RULE_REAL(Merchant, ChaBonusMod, 3.45) // Determines CHA cap, from 104 CHA. 3.45 is 132 CHA at apprehensive. 0.34 is 400 CHA at apprehensive.
-RULE_REAL(Merchant, ChaPenaltyMod, 1.52) // Determines CHA bottom, up to 102 CHA. 1.52 is 37 CHA at apprehensive. 0.98 is 0 CHA at apprehensive.
-RULE_BOOL(Merchant, EnableAltCurrencySell, true) // Enables the ability to resell items to alternate currency merchants
+RULE_BOOL(Merchant, UsePriceMod, true, "Use faction/charisma price modifiers")
+RULE_REAL(Merchant, SellCostMod, 1.05, "Modifier for NPC sell price")
+RULE_REAL(Merchant, BuyCostMod, 0.95, "Modifier for NPC buy price")
+RULE_INT(Merchant, PriceBonusPct, 4, "Determines maximum price bonus from having good faction/CHA. Value is a percent")
+RULE_INT(Merchant, PricePenaltyPct, 4, "Determines maximum price penalty from having bad faction/CHA. Value is a percent")
+RULE_REAL(Merchant, ChaBonusMod, 3.45, "Determines CHA cap, from 104 CHA. 3.45 is 132 CHA at apprehensive. 0.34 is 400 CHA at apprehensive")
+RULE_REAL(Merchant, ChaPenaltyMod, 1.52, "Determines CHA bottom, up to 102 CHA. 1.52 is 37 CHA at apprehensive. 0.98 is 0 CHA at apprehensive")
+RULE_BOOL(Merchant, EnableAltCurrencySell, true, "Enables the ability to resell items to alternate currency merchants")
+RULE_BOOL(Merchant, AllowCorpse, false, "Can merchants generate a corpse")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Bazaar)
-RULE_BOOL(Bazaar, AuditTrail, false)
-RULE_INT(Bazaar, MaxSearchResults, 50)
-RULE_BOOL(Bazaar, EnableWarpToTrader, true)
-RULE_INT(Bazaar, MaxBarterSearchResults, 200) // The max results returned in the /barter search
+RULE_BOOL(Bazaar, AuditTrail, false, "")
+RULE_INT(Bazaar, MaxSearchResults, 50, "")
+RULE_BOOL(Bazaar, EnableWarpToTrader, true, "")
+RULE_INT(Bazaar, MaxBarterSearchResults, 200, "The max results returned in the /barter search")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Mail)
-RULE_BOOL(Mail, EnableMailSystem, true) // If false, client won't bring up the Mail window.
-RULE_INT(Mail, ExpireTrash, 0) // Time in seconds. 0 will delete all messages in the trash when the mailserver starts
-RULE_INT(Mail, ExpireRead, 31536000) // 1 Year. Set to -1 for never
-RULE_INT(Mail, ExpireUnread, 31536000) // 1 Year. Set to -1 for never
+RULE_BOOL(Mail, EnableMailSystem, true, "If false, client won't bring up the Mail window")
+RULE_INT(Mail, ExpireTrash, 0, "Time in seconds. 0 will delete all messages in the trash when the mailserver starts")
+RULE_INT(Mail, ExpireRead, 31536000, "1 Year. Set to -1 for never")
+RULE_INT(Mail, ExpireUnread, 31536000, "1 Year. Set to -1 for never")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Channels)
-RULE_INT(Channels, RequiredStatusAdmin, 251) // Required status to administer chat channels
-RULE_INT(Channels, RequiredStatusListAll, 251) // Required status to list all chat channels
-RULE_INT(Channels, DeleteTimer, 1440) // Empty password protected channels will be deleted after this many minutes
+RULE_INT(Channels, RequiredStatusAdmin, 251, "Required status to administer chat channels")
+RULE_INT(Channels, RequiredStatusListAll, 251, "Required status to list all chat channels")
+RULE_INT(Channels, DeleteTimer, 1440, "Empty password protected channels will be deleted after this many minutes")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(EventLog)
-RULE_BOOL(EventLog, RecordSellToMerchant, false) // Record sales from a player to an NPC merchant in eventlog table
-RULE_BOOL(EventLog, RecordBuyFromMerchant, false) // Record purchases by a player from an NPC merchant in eventlog table
+RULE_BOOL(EventLog, RecordSellToMerchant, false, "Record sales from a player to an NPC merchant in eventlog table")
+RULE_BOOL(EventLog, RecordBuyFromMerchant, false, "Record purchases by a player from an NPC merchant in eventlog table")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Adventure)
-RULE_INT(Adventure, MinNumberForGroup, 2)
-RULE_INT(Adventure, MaxNumberForGroup, 6)
-RULE_INT(Adventure, MinNumberForRaid, 18)
-RULE_INT(Adventure, MaxNumberForRaid, 36)
-RULE_INT(Adventure, MaxLevelRange, 9)
-RULE_INT(Adventure, NumberKillsForBossSpawn, 45)
-RULE_REAL(Adventure, DistanceForRescueAccept, 10000.0)
-RULE_REAL(Adventure, DistanceForRescueComplete, 2500.0)
-RULE_INT(Adventure, ItemIDToEnablePorts, 41000) //0 to disable, otherwise using a LDoN portal will require the user to have this item.
-RULE_INT(Adventure, LDoNTrapDistanceUse, 625)
-RULE_REAL(Adventure, LDoNBaseTrapDifficulty, 15.0)
-RULE_REAL(Adventure, LDoNCriticalFailTrapThreshold, 10.0)
-RULE_INT(Adventure, LDoNAdventureExpireTime, 1800) //30 minutes to expire
+RULE_INT(Adventure, MinNumberForGroup, 2, "")
+RULE_INT(Adventure, MaxNumberForGroup, 6, "")
+RULE_INT(Adventure, MinNumberForRaid, 18, "")
+RULE_INT(Adventure, MaxNumberForRaid, 36, "")
+RULE_INT(Adventure, MaxLevelRange, 9, "")
+RULE_INT(Adventure, NumberKillsForBossSpawn, 45, "")
+RULE_REAL(Adventure, DistanceForRescueAccept, 10000.0, "")
+RULE_REAL(Adventure, DistanceForRescueComplete, 2500.0, "")
+RULE_INT(Adventure, ItemIDToEnablePorts, 41000, "0 to disable, otherwise using a LDoN portal will require the user to have this item")
+RULE_INT(Adventure, LDoNTrapDistanceUse, 625, "")
+RULE_REAL(Adventure, LDoNBaseTrapDifficulty, 15.0, "")
+RULE_REAL(Adventure, LDoNCriticalFailTrapThreshold, 10.0, "")
+RULE_INT(Adventure, LDoNAdventureExpireTime, 1800, "30 minutes to expire")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(AA)
-RULE_INT(AA, ExpPerPoint, 23976503)	//Amount of exp per AA. Is the same as the amount of exp to go from level 51 to level 52.
-RULE_BOOL(AA, Stacking, true) //Allow AA that belong to the same group to stack on SOF+ clients.
-RULE_BOOL(AA, NormalizedAAEnabled, false) // TSS+ change to AA that normalizes AA XP to a fixed # of white con kills independent of level.
-RULE_INT(AA, NormalizedAANumberOfWhiteConPerAA, 25) // The number of white con kills per AA point.
-RULE_BOOL(AA, ModernAAScalingEnabled, false) // Are we linearly scaling AA XP based on total # of earned AA?
-RULE_REAL(AA, ModernAAScalingStartPercent, 1000) // 1000% or 10x AA XP at the start of the scaling range
-RULE_INT(AA, ModernAAScalingAAMinimum, 0) // The minimum number of earned AA before AA XP scaling begins.
-RULE_INT(AA, ModernAAScalingAALimit, 4000) // The number of earned AA when AA XP scaling ends
+RULE_INT(AA, ExpPerPoint, 23976503, "Amount of exp per AA. Is the same as the amount of exp to go from level 51 to level 52")
+RULE_BOOL(AA, Stacking, true, "Allow AA that belong to the same group to stack on SOF+ clients")
+RULE_BOOL(AA, NormalizedAAEnabled, false, "TSS+ change to AA that normalizes AA XP to a fixed # of white con kills independent of level")
+RULE_INT(AA, NormalizedAANumberOfWhiteConPerAA, 25, "The number of white con kills per AA point")
+RULE_BOOL(AA, ModernAAScalingEnabled, false, "Are we linearly scaling AA XP based on total # of earned AA?")
+RULE_REAL(AA, ModernAAScalingStartPercent, 1000, "1000% or 10x AA XP at the start of the scaling range")
+RULE_INT(AA, ModernAAScalingAAMinimum, 0, "The minimum number of earned AA before AA XP scaling begins")
+RULE_INT(AA, ModernAAScalingAALimit, 4000, "The number of earned AA when AA XP scaling ends")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Console)
-RULE_INT(Console, SessionTimeOut, 600000)	// Amount of time in ms for the console session to time out
+RULE_INT(Console, SessionTimeOut, 600000, "Amount of time in ms for the console session to time out")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Network)
-RULE_INT(Network, ResendDelayBaseMS, 100)
-RULE_REAL(Network, ResendDelayFactor, 1.5)
-RULE_INT(Network, ResendDelayMinMS, 300)
-RULE_INT(Network, ResendDelayMaxMS, 5000)
-RULE_REAL(Network, ClientDataRate, 0.0) // KB / sec, 0.0 disabled
-RULE_BOOL(Network, CompressZoneStream, true)
+RULE_INT(Network, ResendDelayBaseMS, 100, "")
+RULE_REAL(Network, ResendDelayFactor, 1.5, "")
+RULE_INT(Network, ResendDelayMinMS, 300, "")
+RULE_INT(Network, ResendDelayMaxMS, 5000, "")
+RULE_REAL(Network, ClientDataRate, 0.0, "KB / sec, 0.0 disabled")
+RULE_BOOL(Network, CompressZoneStream, true, "")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(QueryServ)
-RULE_BOOL(QueryServ, PlayerLogChat, false) // Logs Player Chat
-RULE_BOOL(QueryServ, PlayerLogTrades, false) // Logs Player Trades
-RULE_BOOL(QueryServ, PlayerDropItems, false) // Logs Player dropping items
-RULE_BOOL(QueryServ, PlayerLogHandins, false) // Logs Player Handins
-RULE_BOOL(QueryServ, PlayerLogNPCKills, false) // Logs Player NPC Kills
-RULE_BOOL(QueryServ, PlayerLogDeletes, false) // Logs Player Deletes
-RULE_BOOL(QueryServ, PlayerLogMoves, false) // Logs Player Moves
-RULE_BOOL(QueryServ, PlayerLogMerchantTransactions, false) // Logs Merchant Transactions
-RULE_BOOL(QueryServ, PlayerLogPCCoordinates, false) // Logs Player Coordinates with certain events
-RULE_BOOL(QueryServ, PlayerLogDropItem, false) // Logs Player Drop Item
-RULE_BOOL(QueryServ, PlayerLogZone, false) // Logs Player Zone Events
-RULE_BOOL(QueryServ, PlayerLogDeaths, false) // Logs Player Deaths
-RULE_BOOL(QueryServ, PlayerLogConnectDisconnect, false) // Logs Player Connect Disconnect State
-RULE_BOOL(QueryServ, PlayerLogLevels, false) // Logs Player Leveling/Deleveling
-RULE_BOOL(QueryServ, PlayerLogAARate, false) // Logs Player AA Experience Rates
-RULE_BOOL(QueryServ, PlayerLogQGlobalUpdate, false) // Logs Player QGlobal Updates
-RULE_BOOL(QueryServ, PlayerLogTaskUpdates, false) // Logs Player Task Updates
-RULE_BOOL(QueryServ, PlayerLogKeyringAddition, false) // Log PLayer Keyring additions
-RULE_BOOL(QueryServ, PlayerLogAAPurchases, false) // Log Player AA Purchases
-RULE_BOOL(QueryServ, PlayerLogTradeSkillEvents, false) // Log Player Tradeskill Transactions
-RULE_BOOL(QueryServ, PlayerLogIssuedCommandes, false) // Log Player Issued Commands
-RULE_BOOL(QueryServ, PlayerLogMoneyTransactions, false) // Log Player Money Transaction/Splits
-RULE_BOOL(QueryServ, PlayerLogAlternateCurrencyTransactions, false) // Log Ploayer Alternate Currency Transactions
+RULE_BOOL(QueryServ, PlayerLogChat, false, "Logs Player Chat")
+RULE_BOOL(QueryServ, PlayerLogTrades, false, "Logs Player Trades")
+RULE_BOOL(QueryServ, PlayerDropItems, false, "Logs Player dropping items")
+RULE_BOOL(QueryServ, PlayerLogHandins, false, "Logs Player Handins")
+RULE_BOOL(QueryServ, PlayerLogNPCKills, false, "Logs Player NPC Kills")
+RULE_BOOL(QueryServ, PlayerLogDeletes, false, "Logs Player Deletes")
+RULE_BOOL(QueryServ, PlayerLogMoves, false, "Logs Player Moves")
+RULE_BOOL(QueryServ, PlayerLogMerchantTransactions, false, "Logs Merchant Transactions")
+RULE_BOOL(QueryServ, PlayerLogPCCoordinates, false, "Logs Player Coordinates with certain events")
+RULE_BOOL(QueryServ, PlayerLogDropItem, false, "Logs Player Drop Item")
+RULE_BOOL(QueryServ, PlayerLogZone, false, "Logs Player Zone Events")
+RULE_BOOL(QueryServ, PlayerLogDeaths, false, "Logs Player Deaths")
+RULE_BOOL(QueryServ, PlayerLogConnectDisconnect, false, "Logs Player Connect Disconnect State")
+RULE_BOOL(QueryServ, PlayerLogLevels, false, "Logs Player Leveling/Deleveling")
+RULE_BOOL(QueryServ, PlayerLogAARate, false, "Logs Player AA Experience Rates")
+RULE_BOOL(QueryServ, PlayerLogQGlobalUpdate, false, "Logs Player QGlobal Updates")
+RULE_BOOL(QueryServ, PlayerLogTaskUpdates, false, "Logs Player Task Updates")
+RULE_BOOL(QueryServ, PlayerLogKeyringAddition, false, "Log PLayer Keyring additions")
+RULE_BOOL(QueryServ, PlayerLogAAPurchases, false, "Log Player AA Purchases")
+RULE_BOOL(QueryServ, PlayerLogTradeSkillEvents, false, "Log Player Tradeskill Transactions")
+RULE_BOOL(QueryServ, PlayerLogIssuedCommandes, false, "Log Player Issued Commands")
+RULE_BOOL(QueryServ, PlayerLogMoneyTransactions, false, "Log Player Money Transaction/Splits")
+RULE_BOOL(QueryServ, PlayerLogAlternateCurrencyTransactions, false, "Log Player Alternate Currency Transactions")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Inventory)
-RULE_BOOL(Inventory, EnforceAugmentRestriction, true) // Forces augment slot restrictions
-RULE_BOOL(Inventory, EnforceAugmentUsability, true) // Forces augmented item usability
-RULE_BOOL(Inventory, EnforceAugmentWear, true) // Forces augment wear slot validation
-RULE_BOOL(Inventory, DeleteTransformationMold, true) //False if you want mold to last forever
-RULE_BOOL(Inventory, AllowAnyWeaponTransformation, false) //Weapons can use any weapon transformation
-RULE_BOOL(Inventory, TransformSummonedBags, false) //Transforms summoned bags into disenchanted ones instead of deleting
+RULE_BOOL(Inventory, EnforceAugmentRestriction, true, "Forces augment slot restrictions")
+RULE_BOOL(Inventory, EnforceAugmentUsability, true, "Forces augmented item usability")
+RULE_BOOL(Inventory, EnforceAugmentWear, true, "Forces augment wear slot validation")
+RULE_BOOL(Inventory, DeleteTransformationMold, true, "False if you want mold to last forever")
+RULE_BOOL(Inventory, AllowAnyWeaponTransformation, false, "Weapons can use any weapon transformation")
+RULE_BOOL(Inventory, TransformSummonedBags, false, "Transforms summoned bags into disenchanted ones instead of deleting")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Client)
-RULE_BOOL(Client, UseLiveFactionMessage, false) // Allows players to see faction adjustments like Live
-RULE_BOOL(Client, UseLiveBlockedMessage, false) // Allows players to see faction adjustments like Live
+RULE_BOOL(Client, UseLiveFactionMessage, false, "Allows players to see faction adjustments like Live")
+RULE_BOOL(Client, UseLiveBlockedMessage, false, "Allows players to see faction adjustments like Live")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Bugs)
-RULE_BOOL(Bugs, ReportingSystemActive, true) // Activates bug reporting
-RULE_BOOL(Bugs, UseOldReportingMethod, true) // Forces the use of the old bug reporting system
-RULE_BOOL(Bugs, DumpTargetEntity, false) // Dumps the target entity, if one is provided
+RULE_BOOL(Bugs, ReportingSystemActive, true, "Activates bug reporting")
+RULE_BOOL(Bugs, UseOldReportingMethod, true, "Forces the use of the old bug reporting system")
+RULE_BOOL(Bugs, DumpTargetEntity, false, "Dumps the target entity, if one is provided")
 RULE_CATEGORY_END()
 
 RULE_CATEGORY(Faction)
-RULE_INT(Faction, AllyFactionMinimum, 1100)
-RULE_INT(Faction, WarmlyFactionMinimum, 750)
-RULE_INT(Faction, KindlyFactionMinimum, 500)
-RULE_INT(Faction, AmiablyFactionMinimum, 100)
-RULE_INT(Faction, IndifferentlyFactionMinimum, 0)
-RULE_INT(Faction, ApprehensivelyFactionMinimum, -100)
-RULE_INT(Faction, DubiouslyFactionMinimum, -500)
-RULE_INT(Faction, ThreateninglyFactionMinimum, -750)
+RULE_INT(Faction, AllyFactionMinimum, 1100, "")
+RULE_INT(Faction, WarmlyFactionMinimum, 750, "")
+RULE_INT(Faction, KindlyFactionMinimum, 500, "")
+RULE_INT(Faction, AmiablyFactionMinimum, 100, "")
+RULE_INT(Faction, IndifferentlyFactionMinimum, 0, "")
+RULE_INT(Faction, ApprehensivelyFactionMinimum, -100, "")
+RULE_INT(Faction, DubiouslyFactionMinimum, -500, "")
+RULE_INT(Faction, ThreateninglyFactionMinimum, -750, "")
+RULE_CATEGORY_END()
+
+RULE_CATEGORY(Logging)
+RULE_BOOL(Logging, PrintFileFunctionAndLine, false, "Ex: [World Server] [net.cpp::main:309] Loading variables...")
 RULE_CATEGORY_END()
 
 #undef RULE_CATEGORY
diff --git a/common/say_link.cpp b/common/say_link.cpp
index 4b8ddc009..f4937fe88 100644
--- a/common/say_link.cpp
+++ b/common/say_link.cpp
@@ -100,8 +100,8 @@ const std::string &EQEmu::SayLinkEngine::GenerateLink()
 	if ((m_Link.length() == 0) || (m_Link.length() > (EQEmu::constants::SAY_LINK_MAXIMUM_SIZE))) {
 		m_Error = true;
 		m_Link  = "<LINKER ERROR>";
-		Log(Logs::General, Logs::Error, "SayLinkEngine::GenerateLink() failed to generate a useable say link");
-		Log(Logs::General, Logs::Error, ">> LinkType: %i, Lengths: {link: %u(%u), body: %u(%u), text: %u(%u)}",
+		LogError("SayLinkEngine::GenerateLink() failed to generate a useable say link");
+		LogError(">> LinkType: {}, Lengths: {link: {}({}), body: {}({}), text: {}({})}",
 			m_LinkType,
 			m_Link.length(),
 			EQEmu::constants::SAY_LINK_MAXIMUM_SIZE,
@@ -110,8 +110,8 @@ const std::string &EQEmu::SayLinkEngine::GenerateLink()
 			m_LinkText.length(),
 			EQEmu::constants::SAY_LINK_TEXT_SIZE
 		);
-		Log(Logs::General, Logs::Error, ">> LinkBody: %s", m_LinkBody.c_str());
-		Log(Logs::General, Logs::Error, ">> LinkText: %s", m_LinkText.c_str());
+		LogError(">> LinkBody: {}", m_LinkBody.c_str());
+		LogError(">> LinkText: {}", m_LinkText.c_str());
 	}
 
 	return m_Link;
@@ -316,7 +316,7 @@ std::string EQEmu::SayLinkEngine::GenerateQuestSaylink(std::string saylink_text,
 
 			results = database.QueryDatabase(insert_query);
 			if (!results.Success()) {
-				Log(Logs::General, Logs::Error, "Error in saylink phrase queries %s", results.ErrorMessage().c_str());
+				LogError("Error in saylink phrase queries {}", results.ErrorMessage().c_str());
 			}
 			else {
 				saylink_id = results.LastInsertedID();
diff --git a/common/servertalk.h b/common/servertalk.h
index 94eece8ca..b9cb6202e 100644
--- a/common/servertalk.h
+++ b/common/servertalk.h
@@ -80,6 +80,7 @@
 #define ServerOP_GroupJoin			0x003e //for joining ooz folks
 #define ServerOP_UpdateSpawn		0x003f
 #define ServerOP_SpawnStatusChange	0x0040
+#define ServerOP_DropClient         0x0041	// DropClient
 #define ServerOP_ReloadTasks		0x0060
 #define ServerOP_DepopAllPlayersCorpses	0x0061
 #define ServerOP_ReloadTitles		0x0062
@@ -142,14 +143,15 @@
 #define ServerOP_ClientVersionSummary 0x0215
 #define ServerOP_LSInfo				0x1000
 #define ServerOP_LSStatus			0x1001
-#define ServerOP_LSClientAuth		0x1002
+#define ServerOP_LSClientAuthLeg	0x1002
 #define ServerOP_LSFatalError		0x1003
 #define ServerOP_SystemwideMessage	0x1005
 #define ServerOP_ListWorlds			0x1006
 #define ServerOP_PeerConnect		0x1007
 #define ServerOP_NewLSInfo			0x1008
 #define ServerOP_LSRemoteAddr		0x1009
-#define ServerOP_LSAccountUpdate		0x100A
+#define ServerOP_LSAccountUpdate	0x100A
+#define ServerOP_LSClientAuth		0x100B
 
 #define ServerOP_EncapPacket		0x2007	// Packet within a packet
 #define ServerOP_WorldListUpdate	0x2008
@@ -170,8 +172,10 @@
 #define ServerOP_LSPlayerJoinWorld	0x3007
 #define ServerOP_LSPlayerZoneChange	0x3008
 
-#define	ServerOP_UsertoWorldReq		0xAB00
-#define	ServerOP_UsertoWorldResp	0xAB01
+#define	ServerOP_UsertoWorldReqLeg	0xAB00
+#define	ServerOP_UsertoWorldRespLeg	0xAB01
+#define	ServerOP_UsertoWorldReq		0xAB02
+#define	ServerOP_UsertoWorldResp	0xAB03
 
 #define ServerOP_LauncherConnectInfo	0x3000
 #define ServerOP_LauncherZoneRequest	0x3001
@@ -258,9 +262,6 @@ public:
 	}
 
 	ServerPacket* Copy() {
-		if (this == 0) {
-			return 0;
-		}
 		ServerPacket* ret = new ServerPacket(this->opcode, this->size);
 		if (this->size)
 			memcpy(ret->pBuffer, this->pBuffer, this->size);
@@ -317,11 +318,17 @@ struct ServerZoneIncomingClient_Struct {
 	uint32	accid;
 	int16	admin;
 	uint32	charid;
+	uint32  lsid;
 	bool	tellsoff;
 	char	charname[64];
 	char	lskey[30];
 };
 
+struct ServerZoneDropClient_Struct
+{
+	uint32 lsid;
+};
+
 struct ServerChangeWID_Struct {
 	uint32	charid;
 	uint32	newwid;
@@ -462,15 +469,15 @@ struct ServerLSInfo_Struct {
 };
 
 struct ServerNewLSInfo_Struct {
-	char	name[201];				// name the worldserver wants
-	char	shortname[50];				// shortname the worldserver wants
-	char	remote_address[125];			// DNS address of the server
-	char	local_address[125];			// DNS address of the server
-	char	account[31];			// account name for the worldserver
-	char	password[31];			// password for the name
-	char	protocolversion[25];	// Major protocol version number
-	char	serverversion[64];		// minor server software version number
-	uint8	servertype;				// 0=world, 1=chat, 2=login, 3=MeshLogin
+	char	server_long_name[201];				// name the worldserver wants
+	char	server_short_name[50];				// shortname the worldserver wants
+	char	remote_ip_address[125];			// DNS address of the server
+	char	local_ip_address[125];			// DNS address of the server
+	char	account_name[31];			// account name for the worldserver
+	char	account_password[31];			// password for the name
+	char	protocol_version[25];	// Major protocol version number
+	char	server_version[64];		// minor server software version number
+	uint8	server_process_type;				// 0=world, 1=chat, 2=login, 3=MeshLogin
 };
 
 struct ServerLSAccountUpdate_Struct {			// for updating info on login server
@@ -479,7 +486,7 @@ struct ServerLSAccountUpdate_Struct {			// for updating info on login server
 	uint32	useraccountid;				// player account ID
 	char	useraccount[31];			// player account name
 	char	userpassword[51];			// player account password
-	char	useremail[101];				// player account email address
+	char	user_email[101];				// player account email address
 };
 
 struct ServerLSStatus_Struct {
@@ -526,18 +533,35 @@ struct ServerLSPlayerZoneChange_Struct {
 };
 
 struct ClientAuth_Struct {
-	uint32 lsaccount_id; // ID# in login server's db
-	char name[30]; // username in login server's db
+	uint32 loginserver_account_id; // ID# in login server's db
+	char loginserver_name[64];
+	char account_name[30]; // username in login server's db
 	char key[30]; // the Key the client will present
 	uint8 lsadmin; // login server admin level
-	int16 worldadmin; // login's suggested worldadmin level setting for this user, up to the world if they want to obey it
+	int16 is_world_admin; // login's suggested worldadmin level setting for this user, up to the world if they want to obey it
 	uint32 ip;
-	uint8 local; // 1 if the client is from the local network
+	uint8 is_client_from_local_network; // 1 if the client is from the local network
 
 	template <class Archive>
 	void serialize(Archive &ar)
 	{
-		ar(lsaccount_id, name, key, lsadmin, worldadmin, ip, local);
+		ar(loginserver_account_id, loginserver_name, account_name, key, lsadmin, is_world_admin, ip, is_client_from_local_network);
+	}
+};
+
+struct ClientAuthLegacy_Struct {
+	uint32 loginserver_account_id; // ID# in login server's db
+	char loginserver_account_name[30]; // username in login server's db
+	char key[30]; // the Key the client will present
+	uint8 loginserver_admin_level; // login server admin level
+	int16 is_world_admin; // login's suggested worldadmin level setting for this user, up to the world if they want to obey it
+	uint32 ip;
+	uint8 is_client_from_local_network; // 1 if the client is from the local network
+
+	template <class Archive>
+	void serialize(Archive &ar)
+	{
+		ar(loginserver_account_id, loginserver_account_name, key, loginserver_admin_level, is_world_admin, ip, is_client_from_local_network);
 	}
 };
 
@@ -665,7 +689,7 @@ struct ServerSyncWorldList_Struct {
 	bool	placeholder;
 };
 
-struct UsertoWorldRequest_Struct {
+struct UsertoWorldRequestLegacy_Struct {
 	uint32	lsaccountid;
 	uint32	worldid;
 	uint32	FromID;
@@ -673,12 +697,30 @@ struct UsertoWorldRequest_Struct {
 	char	IPAddr[64];
 };
 
-struct UsertoWorldResponse_Struct {
+struct UsertoWorldRequest_Struct {
 	uint32	lsaccountid;
 	uint32	worldid;
-	int8	response; // -3) World Full, -2) Banned, -1) Suspended, 0) Denied, 1) Allowed
 	uint32	FromID;
 	uint32	ToID;
+	char	IPAddr[64];
+	char	login[64];
+};
+
+struct UsertoWorldResponseLegacy_Struct {
+	uint32 lsaccountid;
+	uint32 worldid;
+	int8   response; // -3) World Full, -2) Banned, -1) Suspended, 0) Denied, 1) Allowed
+	uint32 FromID;
+	uint32 ToID;
+};
+
+struct UsertoWorldResponse_Struct {
+	uint32 lsaccountid;
+	uint32 worldid;
+	int8   response; // -3) World Full, -2) Banned, -1) Suspended, 0) Denied, 1) Allowed
+	uint32 FromID;
+	uint32 ToID;
+	char   login[64];
 };
 
 // generic struct to be used for alot of simple zone->world questions
diff --git a/common/shareddb.cpp b/common/shareddb.cpp
index 46e3a7512..48cc1309d 100644
--- a/common/shareddb.cpp
+++ b/common/shareddb.cpp
@@ -18,6 +18,7 @@
 
 #include <iostream>
 #include <cstring>
+#include <fmt/format.h>
 
 #if defined(_MSC_VER) && _MSC_VER >= 1800
 	#include <algorithm>
@@ -123,7 +124,7 @@ void SharedDatabase::SetMailKey(int CharID, int IPAddress, int MailKey)
 		MailKeyString, CharID);
 	auto results = QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "SharedDatabase::SetMailKey(%i, %s) : %s", CharID, MailKeyString, results.ErrorMessage().c_str());
+		LogError("SharedDatabase::SetMailKey({}, {}) : {}", CharID, MailKeyString, results.ErrorMessage().c_str());
 
 }
 
@@ -131,18 +132,36 @@ std::string SharedDatabase::GetMailKey(int CharID, bool key_only)
 {
 	std::string query = StringFormat("SELECT `mailkey` FROM `character_data` WHERE `id`='%i' LIMIT 1", CharID);
 	auto results = QueryDatabase(query);
+
 	if (!results.Success()) {
+
 		Log(Logs::Detail, Logs::MySQLError, "Error retrieving mailkey from database: %s", results.ErrorMessage().c_str());
 		return std::string();
 	}
 
-	auto row = results.begin();
-	std::string mail_key = row[0];
+	if (!results.RowCount()) {
 
-	if (mail_key.length() > 8 && key_only)
-		return mail_key.substr(8);
-	else
-		return mail_key;
+		Log(Logs::General, Logs::ClientLogin, "Error: Mailkey for character id [%i] does not exist or could not be found", CharID);
+		return std::string();
+	}
+
+	auto row = results.begin();
+	if (row != results.end()) {
+
+		std::string mail_key = row[0];
+
+		if (mail_key.length() > 8 && key_only) {
+			return mail_key.substr(8);
+		}
+		else {
+			return mail_key;
+		}
+	}
+	else {
+
+		Log(Logs::General, Logs::MySQLError, "Internal MySQL error in SharedDatabase::GetMailKey(int, bool)");
+		return std::string();
+	}
 }
 
 bool SharedDatabase::SaveCursor(uint32 char_id, std::list<EQEmu::ItemInstance*>::const_iterator &start, std::list<EQEmu::ItemInstance*>::const_iterator &end)
@@ -466,8 +485,6 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQEmu::InventoryProfile *inv, bool
 				     id);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Database::GetSharedBank(uint32 account_id): %s",
-			results.ErrorMessage().c_str());
 		return false;
 	}
 
@@ -487,8 +504,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQEmu::InventoryProfile *inv, bool
 		const EQEmu::ItemData *item = GetItem(item_id);
 
 		if (!item) {
-			Log(Logs::General, Logs::Error,
-				"Warning: %s %i has an invalid item_id %i in inventory slot %i",
+			LogError("Warning: [{}] [{}] has an invalid item_id [{}] in inventory slot [{}]",
 				((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id);
 			continue;
 		}
@@ -536,8 +552,7 @@ bool SharedDatabase::GetSharedBank(uint32 id, EQEmu::InventoryProfile *inv, bool
 		if (put_slot_id != INVALID_INDEX)
 			continue;
 
-		Log(Logs::General, Logs::Error,
-			"Warning: Invalid slot_id for item in shared bank inventory: %s=%i, item_id=%i, slot_id=%i",
+		LogError("Warning: Invalid slot_id for item in shared bank inventory: [{}]=[{}], item_id=[{}], slot_id=[{}]",
 			((is_charid == true) ? "charid" : "acctid"), id, item_id, slot_id);
 
 		if (is_charid)
@@ -561,7 +576,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv)
 			 char_id);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "If you got an error related to the 'instnodrop' field, run the "
+		LogError("If you got an error related to the 'instnodrop' field, run the "
 						    "following SQL Queries:\nalter table inventory add instnodrop "
 						    "tinyint(1) unsigned default 0 not null;\n");
 		return false;
@@ -625,8 +640,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv)
 		const EQEmu::ItemData *item = GetItem(item_id);
 
 		if (!item) {
-			Log(Logs::General, Logs::Error,
-				"Warning: charid %i has an invalid item_id %i in inventory slot %i", char_id, item_id,
+			LogError("Warning: charid [{}] has an invalid item_id [{}] in inventory slot [{}]", char_id, item_id,
 				slot_id);
 			continue;
 		}
@@ -699,8 +713,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv)
 			put_slot_id = inv->PushCursor(*inst);
 		} else if (slot_id >= 3111 && slot_id <= 3179) {
 			// Admins: please report any occurrences of this error
-			Log(Logs::General, Logs::Error, "Warning: Defunct location for item in inventory: "
-							    "charid=%i, item_id=%i, slot_id=%i .. pushing to cursor...",
+			LogError("Warning: Defunct location for item in inventory: charid={}, item_id={}, slot_id={} .. pushing to cursor...",
 				char_id, item_id, slot_id);
 			put_slot_id = inv->PushCursor(*inst);
 		} else {
@@ -711,8 +724,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv)
 
 		// Save ptr to item in inventory
 		if (put_slot_id == INVALID_INDEX) {
-			Log(Logs::General, Logs::Error,
-				"Warning: Invalid slot_id for item in inventory: charid=%i, item_id=%i, slot_id=%i",
+			LogError("Warning: Invalid slot_id for item in inventory: charid=[{}], item_id=[{}], slot_id=[{}]",
 				char_id, item_id, slot_id);
 		}
 	}
@@ -720,8 +732,7 @@ bool SharedDatabase::GetInventory(uint32 char_id, EQEmu::InventoryProfile *inv)
 	if (cv_conflict) {
 		char char_name[64] = "";
 		GetCharName(char_id, char_name);
-		Log(Logs::General, Logs::Error,
-			"ClientVersion/Expansion conflict during inventory load at zone entry for '%s' (charid: %u, inver: %s, gmi: %s)",
+		LogError("ClientVersion/Expansion conflict during inventory load at zone entry for [{}] (charid: [{}], inver: [{}], gmi: [{}])",
 			char_name,
 			char_id,
 			EQEmu::versions::MobVersionName(inv->InventoryVersion()),
@@ -746,7 +757,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQEmu::Inventor
 			 name, account_id);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "If you got an error related to the 'instnodrop' field, run the "
+		LogError("If you got an error related to the 'instnodrop' field, run the "
 						    "following SQL Queries:\nalter table inventory add instnodrop "
 						    "tinyint(1) unsigned default 0 not null;\n");
 		return false;
@@ -834,8 +845,7 @@ bool SharedDatabase::GetInventory(uint32 account_id, char *name, EQEmu::Inventor
 
 		// Save ptr to item in inventory
 		if (put_slot_id == INVALID_INDEX)
-			Log(Logs::General, Logs::Error, "Warning: Invalid slot_id for item in inventory: name=%s, "
-							    "acctid=%i, item_id=%i, slot_id=%i",
+			LogError("Warning: Invalid slot_id for item in inventory: name={}, acctid={}, item_id={}, slot_id={}",
 				name, account_id, item_id, slot_id);
 	}
 
@@ -911,7 +921,7 @@ bool SharedDatabase::LoadItems(const std::string &prefix) {
 		items_hash = std::unique_ptr<EQEmu::FixedMemoryHashSet<EQEmu::ItemData>>(new EQEmu::FixedMemoryHashSet<EQEmu::ItemData>(reinterpret_cast<uint8*>(items_mmf->Get()), items_mmf->Size()));
 		mutex.Unlock();
 	} catch(std::exception& ex) {
-		Log(Logs::General, Logs::Error, "Error Loading Items: %s", ex.what());
+		LogError("Error Loading Items: {}", ex.what());
 		return false;
 	}
 
@@ -998,7 +1008,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
 		item.SkillModMax = (int32)atoul(row[ItemField::skillmodmax]);
 		item.SkillModType = (uint32)atoul(row[ItemField::skillmodtype]);
 		item.BaneDmgRace = (uint32)atoul(row[ItemField::banedmgrace]);
-		item.BaneDmgAmt = (int8)atoi(row[ItemField::banedmgamt]);
+		item.BaneDmgAmt = (int32)atoul(row[ItemField::banedmgamt]);
 		item.BaneDmgBody = (uint32)atoul(row[ItemField::banedmgbody]);
 		item.Magic = (atoi(row[ItemField::magic]) == 0) ? false : true;
 		item.CastTime_ = (int32)atoul(row[ItemField::casttime_]);
@@ -1172,7 +1182,7 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
 		try {
 			hash.insert(item.ID, item);
 		} catch (std::exception &ex) {
-			Log(Logs::General, Logs::Error, "Database::LoadItems: %s", ex.what());
+			LogError("Database::LoadItems: {}", ex.what());
 			break;
 		}
 	}
@@ -1229,7 +1239,7 @@ std::string SharedDatabase::GetBook(const char *txtfile, int16 *language)
 	}
 
     if (results.RowCount() == 0) {
-        Log(Logs::General, Logs::Error, "No book to send, (%s)", txtfile);
+        LogError("No book to send, ({})", txtfile);
         txtout.assign(" ",1);
         return txtout;
     }
@@ -1334,7 +1344,7 @@ bool SharedDatabase::LoadNPCFactionLists(const std::string &prefix) {
 		faction_hash = std::unique_ptr<EQEmu::FixedMemoryHashSet<NPCFactionList>>(new EQEmu::FixedMemoryHashSet<NPCFactionList>(reinterpret_cast<uint8*>(faction_mmf->Get()), faction_mmf->Size()));
 		mutex.Unlock();
 	} catch(std::exception& ex) {
-		Log(Logs::General, Logs::Error, "Error Loading npc factions: %s", ex.what());
+		LogError("Error Loading npc factions: {}", ex.what());
 		return false;
 	}
 
@@ -1352,8 +1362,8 @@ EQEmu::ItemInstance* SharedDatabase::CreateItem(uint32 item_id, int16 charges, u
 		inst = CreateBaseItem(item, charges);
 
 		if (inst == nullptr) {
-			Log(Logs::General, Logs::Error, "Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateItem()");
-			Log(Logs::General, Logs::Error, "Item Data = ID: %u, Name: %s, Charges: %i", item->ID, item->Name, charges);
+			LogError("Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateItem()");
+			LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges);
 			return nullptr;
 		}
 
@@ -1378,8 +1388,8 @@ EQEmu::ItemInstance* SharedDatabase::CreateItem(const EQEmu::ItemData* item, int
 		inst = CreateBaseItem(item, charges);
 
 		if (inst == nullptr) {
-			Log(Logs::General, Logs::Error, "Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateItem()");
-			Log(Logs::General, Logs::Error, "Item Data = ID: %u, Name: %s, Charges: %i", item->ID, item->Name, charges);
+			LogError("Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateItem()");
+			LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges);
 			return nullptr;
 		}
 
@@ -1409,8 +1419,8 @@ EQEmu::ItemInstance* SharedDatabase::CreateBaseItem(const EQEmu::ItemData* item,
 		inst = new EQEmu::ItemInstance(item, charges);
 
 		if (inst == nullptr) {
-			Log(Logs::General, Logs::Error, "Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateBaseItem()");
-			Log(Logs::General, Logs::Error, "Item Data = ID: %u, Name: %s, Charges: %i", item->ID, item->Name, charges);
+			LogError("Error: valid item data returned a null reference for EQEmu::ItemInstance creation in SharedDatabase::CreateBaseItem()");
+			LogError("Item Data = ID: {}, Name: {}, Charges: {}", item->ID, item->Name, charges);
 			return nullptr;
 		}
 
@@ -1469,6 +1479,55 @@ bool SharedDatabase::GetCommandSettings(std::map<std::string, std::pair<uint8, s
     return true;
 }
 
+bool SharedDatabase::UpdateInjectedCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected)
+{
+	if (injected.size()) {
+
+		std::string query = fmt::format(
+			"REPLACE INTO `command_settings`(`command`, `access`) VALUES {}",
+			implode(
+				",",
+				std::pair<char, char>('(', ')'),
+				join_pair(",", std::pair<char, char>('\'', '\''), injected)
+			)
+		);
+
+		if (!QueryDatabase(query).Success()) {
+			return false;
+		}
+
+		LogInfo(
+			"[{0}] New Command(s) Added",
+			injected.size()
+		);
+	}
+
+	return true;
+}
+
+bool SharedDatabase::UpdateOrphanedCommandSettings(const std::vector<std::string> &orphaned)
+{
+	if (orphaned.size()) {
+
+		std::string query = fmt::format(
+			"DELETE FROM `command_settings` WHERE `command` IN ({})",
+			implode(",", std::pair<char, char>('\'', '\''), orphaned)
+		);
+
+		if (!QueryDatabase(query).Success()) {
+			return false;
+		}
+
+		LogInfo(
+			"{} Orphaned Command{} Deleted",
+			orphaned.size(),
+			(orphaned.size() == 1 ? "" : "s")
+		);
+	}
+
+	return true;
+}
+
 bool SharedDatabase::LoadSkillCaps(const std::string &prefix) {
 	skill_caps_mmf.reset(nullptr);
 
@@ -1485,7 +1544,7 @@ bool SharedDatabase::LoadSkillCaps(const std::string &prefix) {
 		skill_caps_mmf = std::unique_ptr<EQEmu::MemoryMappedFile>(new EQEmu::MemoryMappedFile(file_name));
 		mutex.Unlock();
 	} catch(std::exception &ex) {
-		Log(Logs::General, Logs::Error, "Error loading skill caps: %s", ex.what());
+		LogError("Error loading skill caps: {}", ex.what());
 		return false;
 	}
 
@@ -1501,7 +1560,7 @@ void SharedDatabase::LoadSkillCaps(void *data) {
 	const std::string query = "SELECT skillID, class, level, cap FROM skill_caps ORDER BY skillID, class, level";
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "Error loading skill caps from database: %s", results.ErrorMessage().c_str());
+        LogError("Error loading skill caps from database: {}", results.ErrorMessage().c_str());
         return;
 	}
 
@@ -1645,7 +1704,7 @@ bool SharedDatabase::LoadSpells(const std::string &prefix, int32 *records, const
 		mutex.Unlock();
 	}
 	catch(std::exception& ex) {
-		Log(Logs::General, Logs::Error, "Error Loading Spells: %s", ex.what());
+		LogError("Error Loading Spells: {}", ex.what());
 		return false;
 	}
 	return true;
@@ -1662,7 +1721,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
     }
 
     if(results.ColumnCount() <= SPELL_LOAD_FIELD_COUNT) {
-		Log(Logs::Detail, Logs::Spells, "Fatal error loading spells: Spell field count < SPELL_LOAD_FIELD_COUNT(%u)", SPELL_LOAD_FIELD_COUNT);
+		LogSpells("Fatal error loading spells: Spell field count < SPELL_LOAD_FIELD_COUNT([{}])", SPELL_LOAD_FIELD_COUNT);
 		return;
     }
 
@@ -1672,7 +1731,7 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
     for (auto row = results.begin(); row != results.end(); ++row) {
         tempid = atoi(row[0]);
         if(tempid >= max_spells) {
-            Log(Logs::Detail, Logs::Spells, "Non fatal error: spell.id >= max_spells, ignoring.");
+      LogSpells("Non fatal error: spell.id >= max_spells, ignoring");
             continue;
         }
 
@@ -1849,7 +1908,7 @@ bool SharedDatabase::LoadBaseData(const std::string &prefix) {
 		base_data_mmf = std::unique_ptr<EQEmu::MemoryMappedFile>(new EQEmu::MemoryMappedFile(file_name));
 		mutex.Unlock();
 	} catch(std::exception& ex) {
-		Log(Logs::General, Logs::Error, "Error Loading Base Data: %s", ex.what());
+		LogError("Error Loading Base Data: {}", ex.what());
 		return false;
 	}
 
@@ -1873,22 +1932,22 @@ void SharedDatabase::LoadBaseData(void *data, int max_level) {
         cl = atoi(row[1]);
 
         if(lvl <= 0) {
-            Log(Logs::General, Logs::Error, "Non fatal error: base_data.level <= 0, ignoring.");
+            LogError("Non fatal error: base_data.level <= 0, ignoring.");
             continue;
         }
 
         if(lvl >= max_level) {
-            Log(Logs::General, Logs::Error, "Non fatal error: base_data.level >= max_level, ignoring.");
+            LogError("Non fatal error: base_data.level >= max_level, ignoring.");
             continue;
         }
 
         if(cl <= 0) {
-            Log(Logs::General, Logs::Error, "Non fatal error: base_data.cl <= 0, ignoring.");
+            LogError("Non fatal error: base_data.cl <= 0, ignoring.");
             continue;
         }
 
         if(cl > 16) {
-            Log(Logs::General, Logs::Error, "Non fatal error: base_data.class > 16, ignoring.");
+            LogError("Non fatal error: base_data.class > 16, ignoring.");
             continue;
         }
 
@@ -2096,7 +2155,7 @@ bool SharedDatabase::LoadLoot(const std::string &prefix) {
 			loot_drop_mmf->Size()));
 		mutex.Unlock();
 	} catch(std::exception &ex) {
-		Log(Logs::General, Logs::Error, "Error loading loot: %s", ex.what());
+		LogError("Error loading loot: {}", ex.what());
 		return false;
 	}
 
@@ -2112,7 +2171,7 @@ const LootTable_Struct* SharedDatabase::GetLootTable(uint32 loottable_id) {
 			return &loot_table_hash->at(loottable_id);
 		}
 	} catch(std::exception &ex) {
-		Log(Logs::General, Logs::Error, "Could not get loot table: %s", ex.what());
+		LogError("Could not get loot table: {}", ex.what());
 	}
 	return nullptr;
 }
@@ -2126,7 +2185,7 @@ const LootDrop_Struct* SharedDatabase::GetLootDrop(uint32 lootdrop_id) {
 			return &loot_drop_hash->at(lootdrop_id);
 		}
 	} catch(std::exception &ex) {
-		Log(Logs::General, Logs::Error, "Could not get loot drop: %s", ex.what());
+		LogError("Could not get loot drop: {}", ex.what());
 	}
 	return nullptr;
 }
diff --git a/common/shareddb.h b/common/shareddb.h
index f6b1879df..8deb65126 100644
--- a/common/shareddb.h
+++ b/common/shareddb.h
@@ -71,6 +71,8 @@ class SharedDatabase : public Database
 		void	LoadCharacterInspectMessage(uint32 character_id, InspectMessage_Struct* message);
 		void	SaveCharacterInspectMessage(uint32 character_id, const InspectMessage_Struct* message);
 		bool	GetCommandSettings(std::map<std::string, std::pair<uint8, std::vector<std::string>>> &command_settings);
+		bool	UpdateInjectedCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected);
+		bool	UpdateOrphanedCommandSettings(const std::vector<std::string> &orphaned);
 		uint32	GetTotalTimeEntitledOnAccount(uint32 AccountID);
 		void	SetMailKey(int CharID, int IPAddress, int MailKey);
 		std::string	GetMailKey(int CharID, bool key_only = false);
diff --git a/common/spdat.cpp b/common/spdat.cpp
index 8006e377d..3f0ae6e41 100644
--- a/common/spdat.cpp
+++ b/common/spdat.cpp
@@ -87,8 +87,9 @@
 
 bool IsTargetableAESpell(uint16 spell_id)
 {
-	if (IsValidSpell(spell_id) && spells[spell_id].targettype == ST_AETarget)
+	if (IsValidSpell(spell_id) && spells[spell_id].targettype == ST_AETarget) {
 		return true;
+	}
 
 	return false;
 }
@@ -850,7 +851,7 @@ DmgShieldType GetDamageShieldType(uint16 spell_id, int32 DSType)
 	// If we have a DamageShieldType for this spell from the damageshieldtypes table, return that,
 	// else, make a guess, based on the resist type. Default return value is DS_THORNS
 	if (IsValidSpell(spell_id)) {
-		Log(Logs::Detail, Logs::Spells, "DamageShieldType for spell %i (%s) is %X\n", spell_id,
+		LogSpells("DamageShieldType for spell [{}] ([{}]) is [{}]", spell_id,
 			spells[spell_id].name, spells[spell_id].DamageShieldType);
 
 		if (spells[spell_id].DamageShieldType)
diff --git a/common/spdat.h b/common/spdat.h
index 2616ba717..c7c6027c6 100644
--- a/common/spdat.h
+++ b/common/spdat.h
@@ -22,6 +22,7 @@
 #include "skills.h"
 
 #define SPELL_UNKNOWN 0xFFFF
+#define POISON_PROC 0xFFFE
 #define SPELLBOOK_UNKNOWN 0xFFFFFFFF		//player profile spells are 32 bit
 
 //some spell IDs which will prolly change, but are needed
@@ -606,7 +607,7 @@ typedef enum {
 #define SE_LimitSpellGroup				385	// implemented - Limits to spell group(ie type 3 reuse reduction augs that are class specific and thus all share s SG)
 #define SE_CastOnCurer					386 // implemented - Casts a spell on the person curing
 #define SE_CastOnCure					387 // implemented - Casts a spell on the cured person
-//#define SE_SummonCorpseZone			388 // *not implemented - summons a corpse from any zone(nec AA)
+#define SE_SummonCorpseZone				388 // implemented - summons a corpse from any zone(nec AA)
 #define SE_FcTimerRefresh				389 // implemented - Refresh spell icons
 //#define SE_FcTimerLockout				390 // *not implemented - Sets recast timers to specific value, focus limited.
 #define SE_LimitManaMax					391	// implemented
diff --git a/common/string_util.cpp b/common/string_util.cpp
index 508304ce1..df3790def 100644
--- a/common/string_util.cpp
+++ b/common/string_util.cpp
@@ -27,6 +27,8 @@
 #else
 	#include <stdlib.h>
 	#include <stdio.h>
+#include <iostream>
+
 #endif
 
 #ifndef va_copy
@@ -119,10 +121,29 @@ std::vector<std::string> SplitString(const std::string &str, char delim) {
     while(std::getline(ss, item, delim)) {
         ret.push_back(item);
     }
-	
+
 	return ret;
 }
 
+std::string implode(std::string glue, std::vector<std::string> src)
+{
+	if (src.empty()) {
+		return {};
+	}
+
+	std::ostringstream                 output;
+	std::vector<std::string>::iterator src_iter;
+
+	for (src_iter = src.begin(); src_iter != src.end(); src_iter++) {
+		output << *src_iter << glue;
+	}
+
+	std::string final_output = output.str();
+	final_output.resize (output.str().size () - glue.size());
+
+	return final_output;
+}
+
 std::string EscapeString(const std::string &s) {
 	std::string ret;
 
@@ -201,7 +222,7 @@ bool StringIsNumber(const std::string &s) {
 		auto r = stod(s);
 		return true;
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		return false;
 	}
 }
@@ -241,6 +262,18 @@ void find_replace(std::string &string_subject, const std::string &search_string,
 
 }
 
+void ParseAccountString(const std::string &s, std::string &account, std::string &loginserver)
+{
+	auto split = SplitString(s, ':');
+	if (split.size() == 2) {
+		loginserver = split[0];
+		account = split[1];
+	}
+	else if(split.size() == 1) {
+		account = split[0];
+	}
+}
+
 //Const char based
 
 // normal strncpy doesnt put a null term on copied strings, this one does
@@ -493,4 +526,4 @@ bool isAlphaNumeric(const char *text)
 	}
 
 	return true;
-}
\ No newline at end of file
+}
diff --git a/common/string_util.h b/common/string_util.h
index 03848813c..037d6a2d8 100644
--- a/common/string_util.h
+++ b/common/string_util.h
@@ -20,6 +20,18 @@
 #include <string.h>
 #include <vector>
 #include <cstdarg>
+#include <tuple>
+
+#ifndef _WIN32
+// this doesn't appear to affect linux-based systems..need feedback for _WIN64
+#include <fmt/format.h>
+#endif
+
+#ifdef _WINDOWS
+#include <ctype.h>
+#include <functional>
+#include <algorithm>
+#endif
 
 #include "types.h"
 
@@ -30,6 +42,126 @@ const std::string ucfirst(std::string s);
 std::vector<std::string> split(std::string str_to_split, char delimiter);
 const std::string StringFormat(const char* format, ...);
 const std::string vStringFormat(const char* format, va_list args);
+std::string implode(std::string glue, std::vector<std::string> src);
+
+/**
+ * @param str
+ * @param chars
+ * @return
+ */
+inline std::string &ltrim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
+{
+	str.erase(0, str.find_first_not_of(chars));
+	return str;
+}
+
+/**
+ * @param str
+ * @param chars
+ * @return
+ */
+inline std::string &rtrim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
+{
+	str.erase(str.find_last_not_of(chars) + 1);
+	return str;
+}
+
+/**
+ * @param str
+ * @param chars
+ * @return
+ */
+inline std::string &trim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
+{
+	return ltrim(rtrim(str, chars), chars);
+}
+
+template <typename T>
+std::string implode(const std::string &glue, const std::pair<char, char> &encapsulation, const std::vector<T> &src)
+{
+	if (src.empty()) {
+		return {};
+	}
+
+	std::ostringstream oss;
+	
+	for (const T &src_iter : src) {
+		oss << encapsulation.first << src_iter << encapsulation.second << glue;
+	}
+
+	std::string output(oss.str());
+	output.resize(output.size() - glue.size());
+	
+	return output;
+}
+
+// _WIN32 builds require that #include<fmt/format.h> be included in whatever code file the invocation is made from (no header files)
+template <typename T1, typename T2>
+std::vector<std::string> join_pair(const std::string &glue, const std::pair<char, char> &encapsulation, const std::vector<std::pair<T1, T2>> &src)
+{
+	if (src.empty()) {
+		return {};
+	}
+
+	std::vector<std::string> output;
+
+	for (const std::pair<T1, T2> &src_iter : src) {
+		output.push_back(
+			
+			fmt::format(
+				"{}{}{}{}{}{}{}",
+				encapsulation.first,
+				src_iter.first,
+				encapsulation.second,
+				glue,
+				encapsulation.first,
+				src_iter.second,
+				encapsulation.second
+			)
+		);
+	}
+
+	return output;
+}
+
+// _WIN32 builds require that #include<fmt/format.h> be included in whatever code file the invocation is made from (no header files)
+template <typename T1, typename T2, typename T3, typename T4>
+std::vector<std::string> join_tuple(const std::string &glue, const std::pair<char, char> &encapsulation, const std::vector<std::tuple<T1, T2, T3, T4>> &src)
+{
+	if (src.empty()) {
+		return {};
+	}
+
+	std::vector<std::string> output;
+
+	for (const std::tuple<T1, T2, T3, T4> &src_iter : src) {
+
+		output.push_back(
+			
+			fmt::format(
+				"{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
+				encapsulation.first,
+				std::get<0>(src_iter),
+				encapsulation.second,
+				glue,
+				encapsulation.first,
+				std::get<1>(src_iter),
+				encapsulation.second,
+				glue,
+				encapsulation.first,
+				std::get<2>(src_iter),
+				encapsulation.second,
+				glue,
+				encapsulation.first,
+				std::get<3>(src_iter),
+				encapsulation.second
+			)
+		);
+	}
+
+	return output;
+}
+
 std::vector<std::string> SplitString(const std::string &s, char delim);
 std::string EscapeString(const char *src, size_t sz);
 std::string EscapeString(const std::string &s);
@@ -38,6 +170,7 @@ void ToLowerString(std::string &s);
 void ToUpperString(std::string &s);
 std::string JoinString(const std::vector<std::string>& ar, const std::string &delim);
 void find_replace(std::string& string_subject, const std::string& search_string, const std::string& replace_string);
+void ParseAccountString(const std::string &s, std::string &account, std::string &loginserver);
 
 //const char based
 
diff --git a/common/struct_strategy.cpp b/common/struct_strategy.cpp
index 58a7f9e76..52df20410 100644
--- a/common/struct_strategy.cpp
+++ b/common/struct_strategy.cpp
@@ -41,13 +41,13 @@ void StructStrategy::ErrorEncoder(EQApplicationPacket **in_p, std::shared_ptr<EQ
 	EQApplicationPacket *p = *in_p;
 	*in_p = nullptr;
 
-	Log(Logs::General, Logs::Netcode, "[STRUCTS] Error encoding opcode %s: no encoder provided. Dropping.", OpcodeManager::EmuToName(p->GetOpcode()));
+	LogNetcode("[STRUCTS] Error encoding opcode [{}]: no encoder provided. Dropping", OpcodeManager::EmuToName(p->GetOpcode()));
 
 	delete p;
 }
 
 void StructStrategy::ErrorDecoder(EQApplicationPacket *p) {
-	Log(Logs::General, Logs::Netcode, "[STRUCTS] Error decoding opcode %s: no decoder provided. Invalidating.", OpcodeManager::EmuToName(p->GetOpcode()));
+	LogNetcode("[STRUCTS] Error decoding opcode [{}]: no decoder provided. Invalidating", OpcodeManager::EmuToName(p->GetOpcode()));
 	p->SetOpcode(OP_Unknown);
 }
 
diff --git a/common/tcp_server.cpp b/common/tcp_server.cpp
index d036e7626..0009475fd 100644
--- a/common/tcp_server.cpp
+++ b/common/tcp_server.cpp
@@ -68,7 +68,7 @@ ThreadReturnType BaseTCPServer::TCPServerLoop(void* tmp) {
 	BaseTCPServer* tcps = (BaseTCPServer*) tmp;
 
 #ifndef WIN32
-	Log(Logs::Detail, Logs::None,  "Starting TCPServerLoop with thread ID %d", pthread_self());
+	LogDebug( "Starting TCPServerLoop with thread ID [{}]", pthread_self());
 #endif
 
 	tcps->MLoopRunning.lock();
@@ -79,7 +79,7 @@ ThreadReturnType BaseTCPServer::TCPServerLoop(void* tmp) {
 	tcps->MLoopRunning.unlock();
 
 #ifndef WIN32
-	Log(Logs::Detail, Logs::None,  "Ending TCPServerLoop with thread ID %d", pthread_self());
+	LogDebug( "Ending TCPServerLoop with thread ID [{}]", pthread_self());
 #endif
 
 	THREAD_RETURN(nullptr);
diff --git a/common/timeoutmgr.cpp b/common/timeoutmgr.cpp
index 71e639f31..f8ee62869 100644
--- a/common/timeoutmgr.cpp
+++ b/common/timeoutmgr.cpp
@@ -42,9 +42,6 @@ void TimeoutManager::CheckTimeouts() {
 	for(; cur != end; ++cur) {
 		Timeoutable *it = *cur;
 		if(it->next_check.Check()) {
-#ifdef TIMEOUT_DEBUG
-			Log(Logs::General, Logs::None,, "Checking timeout on 0x%x\n", it);
-#endif
 			it->CheckTimeout();
 		}
 	}
@@ -57,15 +54,9 @@ void TimeoutManager::AddMember(Timeoutable *who) {
 
 	DeleteMember(who);	//just in case... prolly not needed.
 	members.push_back(who);
-#ifdef TIMEOUT_DEBUG
-	Log(Logs::General, Logs::None,, "Adding timeoutable 0x%x\n", who);
-#endif
 }
 
 void TimeoutManager::DeleteMember(Timeoutable *who) {
-#ifdef TIMEOUT_DEBUG
-	Log(Logs::General, Logs::None,, "Removing timeoutable 0x%x\n", who);
-#endif
 	std::vector<Timeoutable *>::iterator cur,end;
 	cur = members.begin();
 	end = members.end();
diff --git a/common/tinyxml/tinystr.cpp b/common/tinyxml/tinystr.cpp
deleted file mode 100644
index 57aa56792..000000000
--- a/common/tinyxml/tinystr.cpp
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original file by Yves Berquin.
-
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must 
-not claim that you wrote the original software. If you use this 
-software in a product, an acknowledgment in the product documentation 
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source 
-distribution.
-*/
-
-#include "tinyxml.h"
-
-#ifndef TIXML_USE_STL
-
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include "tinystr.h"
-
-// TiXmlString constructor, based on a C string
-TiXmlString::TiXmlString (const char* instring)
-{
-    size_t newlen;
-    char * newstring;
-
-    if (!instring)
-    {
-        allocated = 0;
-        cstring = nullptr;
-        current_length = 0;
-        return;
-    }
-    newlen = strlen (instring) + 1;
-    newstring = new char [newlen];
-    memcpy (newstring, instring, newlen);
-    // strcpy (newstring, instring);
-    allocated = newlen;
-    cstring = newstring;
-    current_length = newlen - 1;
-}
-
-// TiXmlString copy constructor
-TiXmlString::TiXmlString (const TiXmlString& copy)
-{
-    size_t newlen;
-    char * newstring;
-
-	// Prevent copy to self!
-	if ( &copy == this )
-		return;
-
-    if (! copy . allocated)
-    {
-        allocated = 0;
-        cstring = nullptr;
-        current_length = 0;
-        return;
-    }
-    newlen = copy . length () + 1;
-    newstring = new char [newlen];
-    // strcpy (newstring, copy . cstring);
-    memcpy (newstring, copy . cstring, newlen);
-    allocated = newlen;
-    cstring = newstring;
-    current_length = newlen - 1;
-}
-
-// TiXmlString = operator. Safe when assign own content
-void TiXmlString ::operator = (const char * content)
-{
-    size_t newlen;
-    char * newstring;
-
-    if (! content)
-    {
-        empty_it ();
-        return;
-    }
-    newlen = strlen (content) + 1;
-    newstring = new char [newlen];
-    // strcpy (newstring, content);
-    memcpy (newstring, content, newlen);
-    empty_it ();
-    allocated = newlen;
-    cstring = newstring;
-    current_length = newlen - 1;
-}
-
-// = operator. Safe when assign own content
-void TiXmlString ::operator = (const TiXmlString & copy)
-{
-    size_t newlen;
-    char * newstring;
-
-    if (! copy . length ())
-    {
-        empty_it ();
-        return;
-    }
-    newlen = copy . length () + 1;
-    newstring = new char [newlen];
-    // strcpy (newstring, copy . c_str ());
-    memcpy (newstring, copy . c_str (), newlen);
-    empty_it ();
-    allocated = newlen;
-    cstring = newstring;
-    current_length = newlen - 1;
-}
-
-
-// append a const char * to an existing TiXmlString
-void TiXmlString::append( const char* str, size_t len )
-{
-    char * new_string;
-    size_t new_alloc, new_size, size_suffix;
-	
-	// don't use strlen - it can overrun the len passed in!
-	const char* p = str;
-	size_suffix = 0;
-
-	while ( *p && size_suffix < (unsigned)len )
-	{
-		++p;
-		++size_suffix;
-	}
-    if ( !size_suffix)
-        return;
-
-    new_size = length () + size_suffix + 1;
-    // check if we need to expand
-    if (new_size > allocated)
-    {
-        // compute new size
-        new_alloc = assign_new_size (new_size);
-
-        // allocate new buffer
-        new_string = new char [new_alloc];        
-        new_string [0] = 0;
-
-        // copy the previous allocated buffer into this one
-        if (allocated && cstring)
-            // strcpy (new_string, cstring);
-            memcpy (new_string, cstring, length ());
-
-        // append the suffix. It does exist, otherwize we wouldn't be expanding 
-        // strncat (new_string, str, len);
-        memcpy (new_string + length (), 
-                str,
-                size_suffix);
-
-        // return previsously allocated buffer if any
-        if (allocated && cstring)
-            delete [] cstring;
-
-        // update member variables
-        cstring = new_string;
-        allocated = new_alloc;
-    }
-    else
-    {
-        // we know we can safely append the new string
-        // strncat (cstring, str, len);
-        memcpy (cstring + length (), 
-                str,
-                size_suffix);
-    }
-    current_length = new_size - 1;
-    cstring [current_length] = 0;
-}
-
-
-// append a const char * to an existing TiXmlString
-void TiXmlString::append( const char * suffix )
-{
-    char * new_string;
-    size_t new_alloc, new_size;
-
-    new_size = length () + strlen (suffix) + 1;
-    // check if we need to expand
-    if (new_size > allocated)
-    {
-        // compute new size
-        new_alloc = assign_new_size (new_size);
-
-        // allocate new buffer
-        new_string = new char [new_alloc];        
-        new_string [0] = 0;
-
-        // copy the previous allocated buffer into this one
-        if (allocated && cstring)
-            memcpy (new_string, cstring, 1 + length ());
-            // strcpy (new_string, cstring);
-
-        // append the suffix. It does exist, otherwize we wouldn't be expanding 
-        // strcat (new_string, suffix);
-        memcpy (new_string + length (), 
-                suffix,
-                strlen (suffix) + 1);
-
-        // return previsously allocated buffer if any
-        if (allocated && cstring)
-            delete [] cstring;
-
-        // update member variables
-        cstring = new_string;
-        allocated = new_alloc;
-    }
-    else
-    {
-        // we know we can safely append the new string
-        // strcat (cstring, suffix);
-        memcpy (cstring + length (), 
-                suffix, 
-                strlen (suffix) + 1);
-    }
-    current_length = new_size - 1;
-}
-
-// Check for TiXmlString equuivalence
-//bool TiXmlString::operator == (const TiXmlString & compare) const
-//{
-//    return (! strcmp (c_str (), compare . c_str ()));
-//}
-
-//unsigned TiXmlString::length () const
-//{
-//    if (allocated)
-//        // return strlen (cstring);
-//        return current_length;
-//    return 0;
-//}
-
-
-unsigned TiXmlString::find (char tofind, unsigned offset) const
-{
-    char * lookup;
-
-    if (offset >= length ())
-        return (unsigned) notfound;
-    for (lookup = cstring + offset; * lookup; lookup++)
-        if (* lookup == tofind)
-            return (unsigned)(lookup - cstring);
-    return (unsigned) notfound;
-}
-
-
-bool TiXmlString::operator == (const TiXmlString & compare) const
-{
-	if ( allocated && compare.allocated )
-	{
-		assert( cstring );
-		assert( compare.cstring );
-		return ( strcmp( cstring, compare.cstring ) == 0 );
- 	}
-	else if ( length() == 0 && compare.length() == 0 )
-	{
-		return true;
-	}
-	return false;
-}
-
-
-bool TiXmlString::operator == (const char* compare) const
-{
-	if ( allocated && compare && *compare )
-	{
-		assert( cstring );
-		return ( strcmp( cstring, compare ) == 0 );
- 	}
-	else if ( length() == 0 && (!compare || !*compare ) )	// this is a little dubious, but try to duplicate behavior in other operator==
-	{
-		return true;
-	}
-	return false;	
-}
-
-
-bool TiXmlString::operator < (const TiXmlString & compare) const
-{
-	if ( allocated && compare.allocated )
-	{
-		assert( cstring );
-		assert( compare.cstring );
-		return ( strcmp( cstring, compare.cstring ) > 0 );
- 	}
-	return false;
-}
-
-
-bool TiXmlString::operator > (const TiXmlString & compare) const
-{
-	if ( allocated && compare.allocated )
-	{
-		assert( cstring );
-		assert( compare.cstring );
-		return ( strcmp( cstring, compare.cstring ) < 0 );
- 	}
-	return false;
-}
-
-
-#endif	// TIXML_USE_STL
diff --git a/common/tinyxml/tinystr.h b/common/tinyxml/tinystr.h
deleted file mode 100644
index 6f1edca9b..000000000
--- a/common/tinyxml/tinystr.h
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original file by Yves Berquin.
-
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must 
-not claim that you wrote the original software. If you use this 
-software in a product, an acknowledgment in the product documentation 
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source 
-distribution.
-*/
-
-#include "tinyxml.h"
-
-
-#ifndef TIXML_USE_STL
-
-#ifndef TIXML_STRING_INCLUDED
-#define TIXML_STRING_INCLUDED
-
-#ifdef _MSC_VER
-#pragma warning( disable : 4530 )
-#pragma warning( disable : 4786 )
-#endif
-
-#include <assert.h>
-
-/*
-   TiXmlString is an emulation of the std::string template.
-   Its purpose is to allow compiling TinyXML on compilers with no or poor STL support.
-   Only the member functions relevant to the TinyXML project have been implemented.
-   The buffer allocation is made by a simplistic power of 2 like mechanism : if we increase
-   a string and there's no more room, we allocate a buffer twice as big as we need.
-*/
-class TiXmlString
-{
-  public :
-    // TiXmlString constructor, based on a string, mark explicit to force
-	// us to find unnecessary casting.
-    explicit TiXmlString (const char * instring);
-
-    // TiXmlString empty constructor
-    TiXmlString ()
-    {
-        allocated = 0;
-        cstring = nullptr;
-        current_length = 0;
-    }
-
-    // TiXmlString copy constructor
-    explicit TiXmlString (const TiXmlString& copy);
-
-    // TiXmlString destructor
-    ~ TiXmlString ()
-    {
-        empty_it ();
-    }
-
-    // Convert a TiXmlString into a classical char *
-    const char * c_str () const
-    {
-        if (allocated)
-            return cstring;
-        return "";
-    }
-
-    // Return the length of a TiXmlString
-    size_t length () const
-	{
-		return ( allocated ) ? current_length : 0;
-	}
-
-    // TiXmlString = operator
-    void operator = (const char * content);
-
-    // = operator
-    void operator = (const TiXmlString & copy);
-
-    // += operator. Maps to append
-    TiXmlString& operator += (const char * suffix)
-    {
-        append (suffix);
-		return *this;
-    }
-
-    // += operator. Maps to append
-    TiXmlString& operator += (char single)
-    {
-        append (single);
-		return *this;
-    }
-
-    // += operator. Maps to append
-    TiXmlString& operator += (TiXmlString & suffix)
-    {
-        append (suffix);
-		return *this;
-    }
-    bool operator == (const TiXmlString & compare) const;
-    bool operator == (const char* compare) const;
-    bool operator < (const TiXmlString & compare) const;
-    bool operator > (const TiXmlString & compare) const;
-
-    // Checks if a TiXmlString is empty
-    bool empty () const
-    {
-        return length () ? false : true;
-    }
-
-    // single char extraction
-    const char& at (unsigned index) const
-    {
-        assert( index < length ());
-        return cstring [index];
-    }
-
-    // find a char in a string. Return TiXmlString::notfound if not found
-    unsigned find (char lookup) const
-    {
-        return find (lookup, 0);
-    }
-
-    // find a char in a string from an offset. Return TiXmlString::notfound if not found
-    unsigned find (char tofind, unsigned offset) const;
-
-    /*	Function to reserve a big amount of data when we know we'll need it. Be aware that this
-		function clears the content of the TiXmlString if any exists.
-    */
-    void reserve (unsigned size)
-    {
-        empty_it ();
-        if (size)
-        {
-            allocated = size;
-            cstring = new char [size];
-            cstring [0] = 0;
-            current_length = 0;
-        }
-    }
-
-    // [] operator 
-    char& operator [] (unsigned index) const
-    {
-        assert( index < length ());
-        return cstring [index];
-    }
-
-    // Error value for find primitive 
-    enum {	notfound = 0xffffffff,
-            npos = notfound };
-
-    void append (const char *str, size_t len );
-
-  protected :
-
-    // The base string
-    char * cstring;
-    // Number of chars allocated
-    size_t allocated;
-    // Current string size
-    size_t current_length;
-
-    // New size computation. It is simplistic right now : it returns twice the amount
-    // we need
-    size_t assign_new_size (size_t minimum_to_allocate)
-    {
-        return minimum_to_allocate * 2;
-    }
-
-    // Internal function that clears the content of a TiXmlString
-    void empty_it ()
-    {
-        if (cstring)
-            delete [] cstring;
-        cstring = nullptr;
-        allocated = 0;
-        current_length = 0;
-    }
-
-    void append (const char *suffix );
-
-    // append function for another TiXmlString
-    void append (const TiXmlString & suffix)
-    {
-        append (suffix . c_str ());
-    }
-
-    // append for a single char.
-    void append (char single)
-    {
-        if ( cstring && current_length < (allocated-1) )
-		{
-			cstring[ current_length ] = single;
-			++current_length;
-			cstring[ current_length ] = 0;
-		}
-		else
-		{
-			char smallstr [2];
-			smallstr [0] = single;
-			smallstr [1] = 0;
-			append (smallstr);
-		}
-    }
-
-} ;
-
-/* 
-   TiXmlOutStream is an emulation of std::ostream. It is based on TiXmlString.
-   Only the operators that we need for TinyXML have been developped.
-*/
-class TiXmlOutStream : public TiXmlString
-{
-public :
-    TiXmlOutStream () : TiXmlString () {}
-
-    // TiXmlOutStream << operator. Maps to TiXmlString::append
-    TiXmlOutStream & operator << (const char * in)
-    {
-        append (in);
-        return (* this);
-    }
-
-    // TiXmlOutStream << operator. Maps to TiXmlString::append
-    TiXmlOutStream & operator << (const TiXmlString & in)
-    {
-        append (in . c_str ());
-        return (* this);
-    }
-} ;
-
-#ifdef _MSC_VER
-#pragma warning( default : 4530 )
-#pragma warning( default : 4786 )
-#endif
-
-#endif	// TIXML_STRING_INCLUDED
-#endif	// TIXML_USE_STL
diff --git a/common/tinyxml/tinyxml.cpp b/common/tinyxml/tinyxml.cpp
deleted file mode 100644
index c652cc1c9..000000000
--- a/common/tinyxml/tinyxml.cpp
+++ /dev/null
@@ -1,1592 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code (2.0 and earlier )copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#include <ctype.h>
-#include "tinyxml.h"
-
-#ifdef TIXML_USE_STL
-#include <sstream>
-#endif
-
-
-bool TiXmlBase::condenseWhiteSpace = true;
-
-void TiXmlBase::PutString( const TIXML_STRING& str, TIXML_OSTREAM* stream )
-{
-	TIXML_STRING buffer;
-	PutString( str, &buffer );
-	(*stream) << buffer;
-}
-
-void TiXmlBase::PutString( const TIXML_STRING& str, TIXML_STRING* outString )
-{
-	int i=0;
-
-	while( i<(int)str.length() )
-	{
-		unsigned char c = (unsigned char) str[i];
-
-		if (    c == '&' 
-		     && i < ( (int)str.length() - 2 )
-			 && str[i+1] == '#'
-			 && str[i+2] == 'x' )
-		{
-			// Hexadecimal character reference.
-			// Pass through unchanged.
-			// &#xA9;	-- copyright symbol, for example.
-			//
-			// The -1 is a bug fix from Rob Laveaux. It keeps
-			// an overflow from happening if there is no ';'.
-			// There are actually 2 ways to exit this loop -
-			// while fails (error case) and break (semicolon found).
-			// However, there is no mechanism (currently) for
-			// this function to return an error.
-			while ( i<(int)str.length()-1 )
-			{
-				outString->append( str.c_str() + i, 1 );
-				++i;
-				if ( str[i] == ';' )
-					break;
-			}
-		}
-		else if ( c == '&' )
-		{
-			outString->append( entity[0].str, entity[0].strLength );
-			++i;
-		}
-		else if ( c == '<' )
-		{
-			outString->append( entity[1].str, entity[1].strLength );
-			++i;
-		}
-		else if ( c == '>' )
-		{
-			outString->append( entity[2].str, entity[2].strLength );
-			++i;
-		}
-		else if ( c == '\"' )
-		{
-			outString->append( entity[3].str, entity[3].strLength );
-			++i;
-		}
-		else if ( c == '\'' )
-		{
-			outString->append( entity[4].str, entity[4].strLength );
-			++i;
-		}
-		else if ( c < 32 )
-		{
-			// Easy pass at non-alpha/numeric/symbol
-			// Below 32 is symbolic.
-			char buf[ 32 ];
-			sprintf( buf, "&#x%02X;", (unsigned) ( c & 0xff ) );
-			//*ME:	warning C4267: convert 'size_t' to 'int'
-			//*ME:	Int-Cast to make compiler happy ...
-			outString->append( buf, (int)strlen( buf ) );
-			++i;
-		}
-		else
-		{
-			//char realc = (char) c;
-			//outString->append( &realc, 1 );
-			*outString += (char) c;	// somewhat more efficient function call.
-			++i;
-		}
-	}
-}
-
-
-// <-- Strange class for a bug fix. Search for STL_STRING_BUG
-TiXmlBase::StringToBuffer::StringToBuffer( const TIXML_STRING& str )
-{
-	buffer = new char[ str.length()+1 ];
-	if ( buffer )
-	{
-		strcpy( buffer, str.c_str() );
-	}
-}
-
-
-TiXmlBase::StringToBuffer::~StringToBuffer()
-{
-	delete [] buffer;
-}
-// End strange bug fix. -->
-
-
-TiXmlNode::TiXmlNode( NodeType _type ) : TiXmlBase()
-{
-	parent = 0;
-	type = _type;
-	firstChild = 0;
-	lastChild = 0;
-	prev = 0;
-	next = 0;
-}
-
-
-TiXmlNode::~TiXmlNode()
-{
-	TiXmlNode* node = firstChild;
-	TiXmlNode* temp = 0;
-
-	while ( node )
-	{
-		temp = node;
-		node = node->next;
-		delete temp;
-	}	
-}
-
-
-void TiXmlNode::CopyTo( TiXmlNode* target ) const
-{
-	target->SetValue (value.c_str() );
-	target->userData = userData; 
-}
-
-
-void TiXmlNode::Clear()
-{
-	TiXmlNode* node = firstChild;
-	TiXmlNode* temp = 0;
-
-	while ( node )
-	{
-		temp = node;
-		node = node->next;
-		delete temp;
-	}	
-
-	firstChild = 0;
-	lastChild = 0;
-}
-
-
-TiXmlNode* TiXmlNode::LinkEndChild( TiXmlNode* node )
-{
-	node->parent = this;
-
-	node->prev = lastChild;
-	node->next = 0;
-
-	if ( lastChild )
-		lastChild->next = node;
-	else
-		firstChild = node;			// it was an empty list.
-
-	lastChild = node;
-	return node;
-}
-
-
-TiXmlNode* TiXmlNode::InsertEndChild( const TiXmlNode& addThis )
-{
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
-
-	return LinkEndChild( node );
-}
-
-
-TiXmlNode* TiXmlNode::InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis )
-{	
-	if ( !beforeThis || beforeThis->parent != this )
-		return 0;
-
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
-	node->parent = this;
-
-	node->next = beforeThis;
-	node->prev = beforeThis->prev;
-	if ( beforeThis->prev )
-	{
-		beforeThis->prev->next = node;
-	}
-	else
-	{
-		assert( firstChild == beforeThis );
-		firstChild = node;
-	}
-	beforeThis->prev = node;
-	return node;
-}
-
-
-TiXmlNode* TiXmlNode::InsertAfterChild( TiXmlNode* afterThis, const TiXmlNode& addThis )
-{
-	if ( !afterThis || afterThis->parent != this )
-		return 0;
-
-	TiXmlNode* node = addThis.Clone();
-	if ( !node )
-		return 0;
-	node->parent = this;
-
-	node->prev = afterThis;
-	node->next = afterThis->next;
-	if ( afterThis->next )
-	{
-		afterThis->next->prev = node;
-	}
-	else
-	{
-		assert( lastChild == afterThis );
-		lastChild = node;
-	}
-	afterThis->next = node;
-	return node;
-}
-
-
-TiXmlNode* TiXmlNode::ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis )
-{
-	if ( replaceThis->parent != this )
-		return 0;
-
-	TiXmlNode* node = withThis.Clone();
-	if ( !node )
-		return 0;
-
-	node->next = replaceThis->next;
-	node->prev = replaceThis->prev;
-
-	if ( replaceThis->next )
-		replaceThis->next->prev = node;
-	else
-		lastChild = node;
-
-	if ( replaceThis->prev )
-		replaceThis->prev->next = node;
-	else
-		firstChild = node;
-
-	delete replaceThis;
-	node->parent = this;
-	return node;
-}
-
-
-bool TiXmlNode::RemoveChild( TiXmlNode* removeThis )
-{
-	if ( removeThis->parent != this )
-	{	
-		assert( 0 );
-		return false;
-	}
-
-	if ( removeThis->next )
-		removeThis->next->prev = removeThis->prev;
-	else
-		lastChild = removeThis->prev;
-
-	if ( removeThis->prev )
-		removeThis->prev->next = removeThis->next;
-	else
-		firstChild = removeThis->next;
-
-	delete removeThis;
-	return true;
-}
-
-const TiXmlNode* TiXmlNode::FirstChild( const char * _value ) const
-{
-	const TiXmlNode* node;
-	for ( node = firstChild; node; node = node->next )
-	{
-		if ( node->SValue() == _value )
-			return node;
-	}
-	return 0;
-}
-
-
-TiXmlNode* TiXmlNode::FirstChild( const char * _value )
-{
-	TiXmlNode* node;
-	for ( node = firstChild; node; node = node->next )
-	{
-		if ( node->SValue() == _value )
-			return node;
-	}
-	return 0;
-}
-
-
-const TiXmlNode* TiXmlNode::LastChild( const char * _value ) const
-{
-	const TiXmlNode* node;
-	for ( node = lastChild; node; node = node->prev )
-	{
-		if ( node->SValue() == _value )
-			return node;
-	}
-	return 0;
-}
-
-TiXmlNode* TiXmlNode::LastChild( const char * _value )
-{
-	TiXmlNode* node;
-	for ( node = lastChild; node; node = node->prev )
-	{
-		if ( node->SValue() == _value )
-			return node;
-	}
-	return 0;
-}
-
-const TiXmlNode* TiXmlNode::IterateChildren( const TiXmlNode* previous ) const
-{
-	if ( !previous )
-	{
-		return FirstChild();
-	}
-	else
-	{
-		assert( previous->parent == this );
-		return previous->NextSibling();
-	}
-}
-
-TiXmlNode* TiXmlNode::IterateChildren( TiXmlNode* previous )
-{
-	if ( !previous )
-	{
-		return FirstChild();
-	}
-	else
-	{
-		assert( previous->parent == this );
-		return previous->NextSibling();
-	}
-}
-
-const TiXmlNode* TiXmlNode::IterateChildren( const char * val, const TiXmlNode* previous ) const
-{
-	if ( !previous )
-	{
-		return FirstChild( val );
-	}
-	else
-	{
-		assert( previous->parent == this );
-		return previous->NextSibling( val );
-	}
-}
-
-TiXmlNode* TiXmlNode::IterateChildren( const char * val, TiXmlNode* previous )
-{
-	if ( !previous )
-	{
-		return FirstChild( val );
-	}
-	else
-	{
-		assert( previous->parent == this );
-		return previous->NextSibling( val );
-	}
-}
-
-const TiXmlNode* TiXmlNode::NextSibling( const char * _value ) const 
-{
-	const TiXmlNode* node;
-	for ( node = next; node; node = node->next )
-	{
-		if ( node->SValue() == _value )
-			return node;
-	}
-	return 0;
-}
-
-TiXmlNode* TiXmlNode::NextSibling( const char * _value )
-{
-	TiXmlNode* node;
-	for ( node = next; node; node = node->next )
-	{
-		if ( node->SValue() == _value )
-			return node;
-	}
-	return 0;
-}
-
-const TiXmlNode* TiXmlNode::PreviousSibling( const char * _value ) const
-{
-	const TiXmlNode* node;
-	for ( node = prev; node; node = node->prev )
-	{
-		if ( node->SValue() == _value )
-			return node;
-	}
-	return 0;
-}
-
-TiXmlNode* TiXmlNode::PreviousSibling( const char * _value )
-{
-	TiXmlNode* node;
-	for ( node = prev; node; node = node->prev )
-	{
-		if ( node->SValue() == _value )
-			return node;
-	}
-	return 0;
-}
-
-void TiXmlElement::RemoveAttribute( const char * name )
-{
-	TiXmlAttribute* node = attributeSet.Find( name );
-	if ( node )
-	{
-		attributeSet.Remove( node );
-		delete node;
-	}
-}
-
-const TiXmlElement* TiXmlNode::FirstChildElement() const
-{
-	const TiXmlNode* node;
-
-	for (	node = FirstChild();
-			node;
-			node = node->NextSibling() )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-TiXmlElement* TiXmlNode::FirstChildElement()
-{
-	TiXmlNode* node;
-
-	for (	node = FirstChild();
-			node;
-			node = node->NextSibling() )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-const TiXmlElement* TiXmlNode::FirstChildElement( const char * _value ) const
-{
-	const TiXmlNode* node;
-
-	for (	node = FirstChild( _value );
-			node;
-			node = node->NextSibling( _value ) )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-TiXmlElement* TiXmlNode::FirstChildElement( const char * _value )
-{
-	TiXmlNode* node;
-
-	for (	node = FirstChild( _value );
-			node;
-			node = node->NextSibling( _value ) )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-const TiXmlElement* TiXmlNode::NextSiblingElement() const
-{
-	const TiXmlNode* node;
-
-	for (	node = NextSibling();
-	node;
-	node = node->NextSibling() )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-TiXmlElement* TiXmlNode::NextSiblingElement()
-{
-	TiXmlNode* node;
-
-	for (	node = NextSibling();
-	node;
-	node = node->NextSibling() )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-const TiXmlElement* TiXmlNode::NextSiblingElement( const char * _value ) const
-{
-	const TiXmlNode* node;
-
-	for (	node = NextSibling( _value );
-	node;
-	node = node->NextSibling( _value ) )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-TiXmlElement* TiXmlNode::NextSiblingElement( const char * _value )
-{
-	TiXmlNode* node;
-
-	for (	node = NextSibling( _value );
-	node;
-	node = node->NextSibling( _value ) )
-	{
-		if ( node->ToElement() )
-			return node->ToElement();
-	}
-	return 0;
-}
-
-
-const TiXmlDocument* TiXmlNode::GetDocument() const
-{
-	const TiXmlNode* node;
-
-	for( node = this; node; node = node->parent )
-	{
-		if ( node->ToDocument() )
-			return node->ToDocument();
-	}
-	return 0;
-}
-
-TiXmlDocument* TiXmlNode::GetDocument()
-{
-	TiXmlNode* node;
-
-	for( node = this; node; node = node->parent )
-	{
-		if ( node->ToDocument() )
-			return node->ToDocument();
-	}
-	return 0;
-}
-
-TiXmlElement::TiXmlElement (const char * _value)
-	: TiXmlNode( TiXmlNode::ELEMENT )
-{
-	firstChild = lastChild = 0;
-	value = _value;
-}
-
-
-#ifdef TIXML_USE_STL
-TiXmlElement::TiXmlElement( const std::string& _value ) 
-	: TiXmlNode( TiXmlNode::ELEMENT )
-{
-	firstChild = lastChild = 0;
-	value = _value;
-}
-#endif
-
-
-TiXmlElement::TiXmlElement( const TiXmlElement& copy)
-	: TiXmlNode( TiXmlNode::ELEMENT )
-{
-	firstChild = lastChild = 0;
-	copy.CopyTo( this );	
-}
-
-
-void TiXmlElement::operator=( const TiXmlElement& base )
-{
-	ClearThis();
-	base.CopyTo( this );
-}
-
-
-TiXmlElement::~TiXmlElement()
-{
-	ClearThis();
-}
-
-
-void TiXmlElement::ClearThis()
-{
-	Clear();
-	while( attributeSet.First() )
-	{
-		TiXmlAttribute* node = attributeSet.First();
-		attributeSet.Remove( node );
-		delete node;
-	}
-}
-
-
-const char * TiXmlElement::Attribute( const char * name ) const
-{
-	const TiXmlAttribute* node = attributeSet.Find( name );
-
-	if ( node )
-		return node->Value();
-
-	return 0;
-}
-
-
-const char * TiXmlElement::Attribute( const char * name, int* i ) const
-{
-	const char * s = Attribute( name );
-	if ( i )
-	{
-		if ( s )
-			*i = atoi( s );
-		else
-			*i = 0;
-	}
-	return s;
-}
-
-
-const char * TiXmlElement::Attribute( const char * name, double* d ) const
-{
-	const char * s = Attribute( name );
-	if ( d )
-	{
-		if ( s )
-			*d = atof( s );
-		else
-			*d = 0;
-	}
-	return s;
-}
-
-
-int TiXmlElement::QueryIntAttribute( const char* name, int* ival ) const
-{
-	const TiXmlAttribute* node = attributeSet.Find( name );
-	if ( !node )
-		return TIXML_NO_ATTRIBUTE;
-
-	return node->QueryIntValue( ival );
-}
-
-
-int TiXmlElement::QueryDoubleAttribute( const char* name, double* dval ) const
-{
-	const TiXmlAttribute* node = attributeSet.Find( name );
-	if ( !node )
-		return TIXML_NO_ATTRIBUTE;
-
-	return node->QueryDoubleValue( dval );
-}
-
-
-void TiXmlElement::SetAttribute( const char * name, int val )
-{	
-	char buf[64];
-	sprintf( buf, "%d", val );
-	SetAttribute( name, buf );
-}
-
-
-void TiXmlElement::SetDoubleAttribute( const char * name, double val )
-{	
-	char buf[256];
-	sprintf( buf, "%f", val );
-	SetAttribute( name, buf );
-}
-
-
-void TiXmlElement::SetAttribute( const char * name, const char * _value )
-{
-	TiXmlAttribute* node = attributeSet.Find( name );
-	if ( node )
-	{
-		node->SetValue( _value );
-		return;
-	}
-
-	TiXmlAttribute* attrib = new TiXmlAttribute( name, _value );
-	if ( attrib )
-	{
-		attributeSet.Add( attrib );
-	}
-	else
-	{
-		TiXmlDocument* document = GetDocument();
-		if ( document ) document->SetError( TIXML_ERROR_OUT_OF_MEMORY, 0, 0, TIXML_ENCODING_UNKNOWN );
-	}
-}
-
-void TiXmlElement::Print( FILE* cfile, int depth ) const
-{
-	int i;
-	for ( i=0; i<depth; i++ )
-	{
-		fprintf( cfile, "    " );
-	}
-
-	fprintf( cfile, "<%s", value.c_str() );
-
-	const TiXmlAttribute* attrib;
-	for ( attrib = attributeSet.First(); attrib; attrib = attrib->Next() )
-	{
-		fprintf( cfile, " " );
-		attrib->Print( cfile, depth );
-	}
-
-	// There are 3 different formatting approaches:
-	// 1) An element without children is printed as a <foo /> node
-	// 2) An element with only a text child is printed as <foo> text </foo>
-	// 3) An element with children is printed on multiple lines.
-	TiXmlNode* node;
-	if ( !firstChild )
-	{
-		fprintf( cfile, " />" );
-	}
-	else if ( firstChild == lastChild && firstChild->ToText() )
-	{
-		fprintf( cfile, ">" );
-		firstChild->Print( cfile, depth + 1 );
-		fprintf( cfile, "</%s>", value.c_str() );
-	}
-	else
-	{
-		fprintf( cfile, ">" );
-
-		for ( node = firstChild; node; node=node->NextSibling() )
-		{
-			if ( !node->ToText() )
-			{
-				fprintf( cfile, "\n" );
-			}
-			node->Print( cfile, depth+1 );
-		}
-		fprintf( cfile, "\n" );
-		for( i=0; i<depth; ++i )
-		fprintf( cfile, "    " );
-		fprintf( cfile, "</%s>", value.c_str() );
-	}
-}
-
-void TiXmlElement::StreamOut( TIXML_OSTREAM * stream ) const
-{
-	(*stream) << "<" << value;
-
-	const TiXmlAttribute* attrib;
-	for ( attrib = attributeSet.First(); attrib; attrib = attrib->Next() )
-	{	
-		(*stream) << " ";
-		attrib->StreamOut( stream );
-	}
-
-	// If this node has children, give it a closing tag. Else
-	// make it an empty tag.
-	TiXmlNode* node;
-	if ( firstChild )
-	{ 		
-		(*stream) << ">";
-
-		for ( node = firstChild; node; node=node->NextSibling() )
-		{
-			node->StreamOut( stream );
-		}
-		(*stream) << "</" << value << ">";
-	}
-	else
-	{
-		(*stream) << " />";
-	}
-}
-
-
-void TiXmlElement::CopyTo( TiXmlElement* target ) const
-{
-	// superclass:
-	TiXmlNode::CopyTo( target );
-
-	// Element class: 
-	// Clone the attributes, then clone the children.
-	const TiXmlAttribute* attribute = 0;
-	for(	attribute = attributeSet.First();
-	attribute;
-	attribute = attribute->Next() )
-	{
-		target->SetAttribute( attribute->Name(), attribute->Value() );
-	}
-
-	TiXmlNode* node = 0;
-	for ( node = firstChild; node; node = node->NextSibling() )
-	{
-		target->LinkEndChild( node->Clone() );
-	}
-}
-
-
-TiXmlNode* TiXmlElement::Clone() const
-{
-	TiXmlElement* clone = new TiXmlElement( Value() );
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-TiXmlDocument::TiXmlDocument() : TiXmlNode( TiXmlNode::DOCUMENT )
-{
-	tabsize = 4;
-	ClearError();
-}
-
-TiXmlDocument::TiXmlDocument( const char * documentName ) : TiXmlNode( TiXmlNode::DOCUMENT )
-{
-	tabsize = 4;
-	value = documentName;
-	ClearError();
-}
-
-
-#ifdef TIXML_USE_STL
-TiXmlDocument::TiXmlDocument( const std::string& documentName ) : TiXmlNode( TiXmlNode::DOCUMENT )
-{
-	tabsize = 4;
-    value = documentName;
-	ClearError();
-}
-#endif
-
-
-TiXmlDocument::TiXmlDocument( const TiXmlDocument& copy ) : TiXmlNode( TiXmlNode::DOCUMENT )
-{
-	copy.CopyTo( this );
-}
-
-
-void TiXmlDocument::operator=( const TiXmlDocument& copy )
-{
-	Clear();
-	copy.CopyTo( this );
-}
-
-
-bool TiXmlDocument::LoadFile( TiXmlEncoding encoding )
-{
-	// See STL_STRING_BUG below.
-	StringToBuffer buf( value );
-
-	if ( buf.buffer && LoadFile( buf.buffer, encoding ) )
-		return true;
-
-	return false;
-}
-
-
-bool TiXmlDocument::SaveFile() const
-{
-	// See STL_STRING_BUG below.
-	StringToBuffer buf( value );
-
-	if ( buf.buffer && SaveFile( buf.buffer ) )
-		return true;
-
-	return false;
-}
-
-bool TiXmlDocument::LoadFile( const char* filename, TiXmlEncoding encoding )
-{
-	// Delete the existing data:
-	Clear();
-	location.Clear();
-
-	// There was a really terrifying little bug here. The code:
-	//		value = filename
-	// in the STL case, cause the assignment method of the std::string to
-	// be called. What is strange, is that the std::string had the same
-	// address as it's c_str() method, and so bad things happen. Looks
-	// like a bug in the Microsoft STL implementation.
-	// See STL_STRING_BUG above.
-	// Fixed with the StringToBuffer class.
-	value = filename;
-
-	FILE* file = fopen( value.c_str (), "r" );
-
-	if ( file )
-	{
-		// Get the file size, so we can pre-allocate the string. HUGE speed impact.
-		long length = 0;
-		fseek( file, 0, SEEK_END );
-		length = ftell( file );
-		fseek( file, 0, SEEK_SET );
-
-		// Strange case, but good to handle up front.
-		if ( length == 0 )
-		{
-			fclose( file );
-			return false;
-		}
-
-		// If we have a file, assume it is all one big XML file, and read it in.
-		// The document parser may decide the document ends sooner than the entire file, however.
-		TIXML_STRING data;
-		data.reserve( length );
-
-		const int BUF_SIZE = 2048;
-		char buf[BUF_SIZE];
-
-		while( fgets( buf, BUF_SIZE, file ) )
-		{
-			data += buf;
-		}
-		fclose( file );
-
-		Parse( data.c_str(), 0, encoding );
-
-		if (  Error() )
-            return false;
-        else
-			return true;
-	}
-	SetError( TIXML_ERROR_OPENING_FILE, 0, 0, TIXML_ENCODING_UNKNOWN );
-	return false;
-}
-
-bool TiXmlDocument::SaveFile( const char * filename ) const
-{
-	// The old c stuff lives on...
-	FILE* fp = fopen( filename, "w" );
-	if ( fp )
-	{
-		Print( fp, 0 );
-		fclose( fp );
-		return true;
-	}
-	return false;
-}
-
-
-void TiXmlDocument::CopyTo( TiXmlDocument* target ) const
-{
-	TiXmlNode::CopyTo( target );
-
-	target->error = error;
-	target->errorDesc = errorDesc.c_str ();
-
-	TiXmlNode* node = 0;
-	for ( node = firstChild; node; node = node->NextSibling() )
-	{
-		target->LinkEndChild( node->Clone() );
-	}	
-}
-
-
-TiXmlNode* TiXmlDocument::Clone() const
-{
-	TiXmlDocument* clone = new TiXmlDocument();
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-void TiXmlDocument::Print( FILE* cfile, int depth ) const
-{
-	const TiXmlNode* node;
-	for ( node=FirstChild(); node; node=node->NextSibling() )
-	{
-		node->Print( cfile, depth );
-		fprintf( cfile, "\n" );
-	}
-}
-
-void TiXmlDocument::StreamOut( TIXML_OSTREAM * out ) const
-{
-	const TiXmlNode* node;
-	for ( node=FirstChild(); node; node=node->NextSibling() )
-	{
-		node->StreamOut( out );
-
-		// Special rule for streams: stop after the root element.
-		// The stream in code will only read one element, so don't
-		// write more than one.
-		if ( node->ToElement() )
-			break;
-	}
-}
-
-
-const TiXmlAttribute* TiXmlAttribute::Next() const
-{
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( next->value.empty() && next->name.empty() )
-		return 0;
-	return next;
-}
-
-TiXmlAttribute* TiXmlAttribute::Next()
-{
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( next->value.empty() && next->name.empty() )
-		return 0;
-	return next;
-}
-
-const TiXmlAttribute* TiXmlAttribute::Previous() const
-{
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( prev->value.empty() && prev->name.empty() )
-		return 0;
-	return prev;
-}
-
-TiXmlAttribute* TiXmlAttribute::Previous()
-{
-	// We are using knowledge of the sentinel. The sentinel
-	// have a value or name.
-	if ( prev->value.empty() && prev->name.empty() )
-		return 0;
-	return prev;
-}
-
-void TiXmlAttribute::Print( FILE* cfile, int /*depth*/ ) const
-{
-	TIXML_STRING n, v;
-
-	PutString( name, &n );
-	PutString( value, &v );
-
-	if (value.find ('\"') == TIXML_STRING::npos)
-		fprintf (cfile, "%s=\"%s\"", n.c_str(), v.c_str() );
-	else
-		fprintf (cfile, "%s='%s'", n.c_str(), v.c_str() );
-}
-
-
-void TiXmlAttribute::StreamOut( TIXML_OSTREAM * stream ) const
-{
-	if (value.find( '\"' ) != TIXML_STRING::npos)
-	{
-		PutString( name, stream );
-		(*stream) << "=" << "'";
-		PutString( value, stream );
-		(*stream) << "'";
-	}
-	else
-	{
-		PutString( name, stream );
-		(*stream) << "=" << "\"";
-		PutString( value, stream );
-		(*stream) << "\"";
-	}
-}
-
-int TiXmlAttribute::QueryIntValue( int* ival ) const
-{
-	if ( sscanf( value.c_str(), "%d", ival ) == 1 )
-		return TIXML_SUCCESS;
-	return TIXML_WRONG_TYPE;
-}
-
-int TiXmlAttribute::QueryDoubleValue( double* dval ) const
-{
-	if ( sscanf( value.c_str(), "%lf", dval ) == 1 )
-		return TIXML_SUCCESS;
-	return TIXML_WRONG_TYPE;
-}
-
-void TiXmlAttribute::SetIntValue( int _value )
-{
-	char buf [64];
-	sprintf (buf, "%d", _value);
-	SetValue (buf);
-}
-
-void TiXmlAttribute::SetDoubleValue( double _value )
-{
-	char buf [256];
-	sprintf (buf, "%lf", _value);
-	SetValue (buf);
-}
-
-const int TiXmlAttribute::IntValue() const
-{
-	return atoi (value.c_str ());
-}
-
-const double  TiXmlAttribute::DoubleValue() const
-{
-	return atof (value.c_str ());
-}
-
-
-TiXmlComment::TiXmlComment( const TiXmlComment& copy ) : TiXmlNode( TiXmlNode::COMMENT )
-{
-	copy.CopyTo( this );
-}
-
-
-void TiXmlComment::operator=( const TiXmlComment& base )
-{
-	Clear();
-	base.CopyTo( this );
-}
-
-
-void TiXmlComment::Print( FILE* cfile, int depth ) const
-{
-	for ( int i=0; i<depth; i++ )
-	{
-		fputs( "    ", cfile );
-	}
-	fprintf( cfile, "<!--%s-->", value.c_str() );
-}
-
-void TiXmlComment::StreamOut( TIXML_OSTREAM * stream ) const
-{
-	(*stream) << "<!--";
-	//PutString( value, stream );
-	(*stream) << value;
-	(*stream) << "-->";
-}
-
-
-void TiXmlComment::CopyTo( TiXmlComment* target ) const
-{
-	TiXmlNode::CopyTo( target );
-}
-
-
-TiXmlNode* TiXmlComment::Clone() const
-{
-	TiXmlComment* clone = new TiXmlComment();
-
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-void TiXmlText::Print( FILE* cfile, int /*depth*/ ) const
-{
-	TIXML_STRING buffer;
-	PutString( value, &buffer );
-	fprintf( cfile, "%s", buffer.c_str() );
-}
-
-
-void TiXmlText::StreamOut( TIXML_OSTREAM * stream ) const
-{
-	PutString( value, stream );
-}
-
-
-void TiXmlText::CopyTo( TiXmlText* target ) const
-{
-	TiXmlNode::CopyTo( target );
-}
-
-
-TiXmlNode* TiXmlText::Clone() const
-{	
-	TiXmlText* clone = 0;
-	clone = new TiXmlText( "" );
-
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-TiXmlDeclaration::TiXmlDeclaration( const char * _version,
-									const char * _encoding,
-									const char * _standalone )
-	: TiXmlNode( TiXmlNode::DECLARATION )
-{
-	version = _version;
-	encoding = _encoding;
-	standalone = _standalone;
-}
-
-
-#ifdef TIXML_USE_STL
-TiXmlDeclaration::TiXmlDeclaration(	const std::string& _version,
-									const std::string& _encoding,
-									const std::string& _standalone )
-	: TiXmlNode( TiXmlNode::DECLARATION )
-{
-	version = _version;
-	encoding = _encoding;
-	standalone = _standalone;
-}
-#endif
-
-
-TiXmlDeclaration::TiXmlDeclaration( const TiXmlDeclaration& copy )
-	: TiXmlNode( TiXmlNode::DECLARATION )
-{
-	copy.CopyTo( this );	
-}
-
-
-void TiXmlDeclaration::operator=( const TiXmlDeclaration& copy )
-{
-	Clear();
-	copy.CopyTo( this );
-}
-
-
-void TiXmlDeclaration::Print( FILE* cfile, int /*depth*/ ) const
-{
-	fprintf (cfile, "<?xml ");
-
-	if ( !version.empty() )
-		fprintf (cfile, "version=\"%s\" ", version.c_str ());
-	if ( !encoding.empty() )
-		fprintf (cfile, "encoding=\"%s\" ", encoding.c_str ());
-	if ( !standalone.empty() )
-		fprintf (cfile, "standalone=\"%s\" ", standalone.c_str ());
-	fprintf (cfile, "?>");
-}
-
-void TiXmlDeclaration::StreamOut( TIXML_OSTREAM * stream ) const
-{
-	(*stream) << "<?xml ";
-
-	if ( !version.empty() )
-	{
-		(*stream) << "version=\"";
-		PutString( version, stream );
-		(*stream) << "\" ";
-	}
-	if ( !encoding.empty() )
-	{
-		(*stream) << "encoding=\"";
-		PutString( encoding, stream );
-		(*stream ) << "\" ";
-	}
-	if ( !standalone.empty() )
-	{
-		(*stream) << "standalone=\"";
-		PutString( standalone, stream );
-		(*stream) << "\" ";
-	}
-	(*stream) << "?>";
-}
-
-
-void TiXmlDeclaration::CopyTo( TiXmlDeclaration* target ) const
-{
-	TiXmlNode::CopyTo( target );
-
-	target->version = version;
-	target->encoding = encoding;
-	target->standalone = standalone;
-}
-
-
-TiXmlNode* TiXmlDeclaration::Clone() const
-{	
-	TiXmlDeclaration* clone = new TiXmlDeclaration();
-
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-void TiXmlUnknown::Print( FILE* cfile, int depth ) const
-{
-	for ( int i=0; i<depth; i++ )
-		fprintf( cfile, "    " );
-	fprintf( cfile, "<%s>", value.c_str() );
-}
-
-
-void TiXmlUnknown::StreamOut( TIXML_OSTREAM * stream ) const
-{
-	(*stream) << "<" << value << ">";		// Don't use entities here! It is unknown.
-}
-
-
-void TiXmlUnknown::CopyTo( TiXmlUnknown* target ) const
-{
-	TiXmlNode::CopyTo( target );
-}
-
-
-TiXmlNode* TiXmlUnknown::Clone() const
-{
-	TiXmlUnknown* clone = new TiXmlUnknown();
-
-	if ( !clone )
-		return 0;
-
-	CopyTo( clone );
-	return clone;
-}
-
-
-TiXmlAttributeSet::TiXmlAttributeSet()
-{
-	sentinel.next = &sentinel;
-	sentinel.prev = &sentinel;
-}
-
-
-TiXmlAttributeSet::~TiXmlAttributeSet()
-{
-	assert( sentinel.next == &sentinel );
-	assert( sentinel.prev == &sentinel );
-}
-
-
-void TiXmlAttributeSet::Add( TiXmlAttribute* addMe )
-{
-	assert( !Find( addMe->Name() ) );	// Shouldn't be multiply adding to the set.
-
-	addMe->next = &sentinel;
-	addMe->prev = sentinel.prev;
-
-	sentinel.prev->next = addMe;
-	sentinel.prev      = addMe;
-}
-
-void TiXmlAttributeSet::Remove( TiXmlAttribute* removeMe )
-{
-	TiXmlAttribute* node;
-
-	for( node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( node == removeMe )
-		{
-			node->prev->next = node->next;
-			node->next->prev = node->prev;
-			node->next = 0;
-			node->prev = 0;
-			return;
-		}
-	}
-	assert( 0 );		// we tried to remove a non-linked attribute.
-}
-
-const TiXmlAttribute* TiXmlAttributeSet::Find( const char * name ) const
-{
-	const TiXmlAttribute* node;
-
-	for( node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( node->name == name )
-			return node;
-	}
-	return 0;
-}
-
-TiXmlAttribute*	TiXmlAttributeSet::Find( const char * name )
-{
-	TiXmlAttribute* node;
-
-	for( node = sentinel.next; node != &sentinel; node = node->next )
-	{
-		if ( node->name == name )
-			return node;
-	}
-	return 0;
-}
-
-#ifdef TIXML_USE_STL	
-TIXML_ISTREAM & operator >> (TIXML_ISTREAM & in, TiXmlNode & base)
-{
-	TIXML_STRING tag;
-	tag.reserve( 8 * 1000 );
-	base.StreamIn( &in, &tag );
-
-	base.Parse( tag.c_str(), 0, TIXML_DEFAULT_ENCODING );
-	return in;
-}
-#endif
-
-
-TIXML_OSTREAM & operator<< (TIXML_OSTREAM & out, const TiXmlNode & base)
-{
-	base.StreamOut (& out);
-	return out;
-}
-
-
-#ifdef TIXML_USE_STL	
-std::string & operator<< (std::string& out, const TiXmlNode& base )
-{
-   std::ostringstream os_stream( std::ostringstream::out );
-   base.StreamOut( &os_stream );
-   
-   out.append( os_stream.str() );
-   return out;
-}
-#endif
-
-
-TiXmlHandle TiXmlHandle::FirstChild() const
-{
-	if ( node )
-	{
-		TiXmlNode* child = node->FirstChild();
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::FirstChild( const char * value ) const
-{
-	if ( node )
-	{
-		TiXmlNode* child = node->FirstChild( value );
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::FirstChildElement() const
-{
-	if ( node )
-	{
-		TiXmlElement* child = node->FirstChildElement();
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::FirstChildElement( const char * value ) const
-{
-	if ( node )
-	{
-		TiXmlElement* child = node->FirstChildElement( value );
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::Child( int count ) const
-{
-	if ( node )
-	{
-		int i;
-		TiXmlNode* child = node->FirstChild();
-		for (	i=0;
-				child && i<count;
-				child = child->NextSibling(), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::Child( const char* value, int count ) const
-{
-	if ( node )
-	{
-		int i;
-		TiXmlNode* child = node->FirstChild( value );
-		for (	i=0;
-				child && i<count;
-				child = child->NextSibling( value ), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::ChildElement( int count ) const
-{
-	if ( node )
-	{
-		int i;
-		TiXmlElement* child = node->FirstChildElement();
-		for (	i=0;
-				child && i<count;
-				child = child->NextSiblingElement(), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
-
-
-TiXmlHandle TiXmlHandle::ChildElement( const char* value, int count ) const
-{
-	if ( node )
-	{
-		int i;
-		TiXmlElement* child = node->FirstChildElement( value );
-		for (	i=0;
-				child && i<count;
-				child = child->NextSiblingElement( value ), ++i )
-		{
-			// nothing
-		}
-		if ( child )
-			return TiXmlHandle( child );
-	}
-	return TiXmlHandle( 0 );
-}
diff --git a/common/tinyxml/tinyxml.h b/common/tinyxml/tinyxml.h
deleted file mode 100644
index cea3bebfd..000000000
--- a/common/tinyxml/tinyxml.h
+++ /dev/null
@@ -1,1426 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code (2.0 and earlier )copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any
-purpose, including commercial applications, and to alter it and
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-
-#ifndef TINYXML_INCLUDED
-#define TINYXML_INCLUDED
-
-#ifdef _MSC_VER
-#pragma warning( disable : 4530 )
-#pragma warning( disable : 4786 )
-#endif
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-// Help out windows:
-#if defined( _DEBUG ) && !defined( DEBUG )
-#define DEBUG
-#endif
-
-#if defined( DEBUG ) && defined( _MSC_VER )
-#include <windows.h>
-#define TIXML_LOG OutputDebugString
-#else
-#define TIXML_LOG printf
-#endif
-
-#ifdef TIXML_USE_STL
-	#include <string>
- 	#include <iostream>
-	#define TIXML_STRING	std::string
-	#define TIXML_ISTREAM	std::istream
-	#define TIXML_OSTREAM	std::ostream
-#else
-	#include "tinystr.h"
-	#define TIXML_STRING	TiXmlString
-	#define TIXML_OSTREAM	TiXmlOutStream
-#endif
-
-class TiXmlDocument;
-class TiXmlElement;
-class TiXmlComment;
-class TiXmlUnknown;
-class TiXmlAttribute;
-class TiXmlText;
-class TiXmlDeclaration;
-class TiXmlParsingData;
-
-const int TIXML_MAJOR_VERSION = 2;
-const int TIXML_MINOR_VERSION = 3;
-const int TIXML_PATCH_VERSION = 4;
-
-/*	Internal structure for tracking location of items 
-	in the XML file.
-*/
-struct TiXmlCursor
-{
-	TiXmlCursor()		{ Clear(); }
-	void Clear()		{ row = col = -1; }
-
-	int row;	// 0 based.
-	int col;	// 0 based.
-};
-
-
-// Only used by Attribute::Query functions
-enum 
-{ 
-	TIXML_SUCCESS,
-	TIXML_NO_ATTRIBUTE,
-	TIXML_WRONG_TYPE
-};
-
-
-// Used by the parsing routines.
-enum TiXmlEncoding
-{
-	TIXML_ENCODING_UNKNOWN,
-	TIXML_ENCODING_UTF8,
-	TIXML_ENCODING_LEGACY
-};
-
-const TiXmlEncoding TIXML_DEFAULT_ENCODING = TIXML_ENCODING_UNKNOWN;
-
-/** TiXmlBase is a base class for every class in TinyXml.
-	It does little except to establish that TinyXml classes
-	can be printed and provide some utility functions.
-
-	In XML, the document and elements can contain
-	other elements and other types of nodes.
-
-	@verbatim
-	A Document can contain:	Element	(container or leaf)
-							Comment (leaf)
-							Unknown (leaf)
-							Declaration( leaf )
-
-	An Element can contain:	Element (container or leaf)
-							Text	(leaf)
-							Attributes (not on tree)
-							Comment (leaf)
-							Unknown (leaf)
-
-	A Decleration contains: Attributes (not on tree)
-	@endverbatim
-*/
-class TiXmlBase
-{
-	friend class TiXmlNode;
-	friend class TiXmlElement;
-	friend class TiXmlDocument;
-
-public:
-	TiXmlBase()	:	userData(0) {}
-	virtual ~TiXmlBase()					{}
-
-	/**	All TinyXml classes can print themselves to a filestream.
-		This is a formatted print, and will insert tabs and newlines.
-		
-		(For an unformatted stream, use the << operator.)
-	*/
-	virtual void Print( FILE* cfile, int depth ) const = 0;
-
-	/**	The world does not agree on whether white space should be kept or
-		not. In order to make everyone happy, these global, static functions
-		are provided to set whether or not TinyXml will condense all white space
-		into a single space or not. The default is to condense. Note changing this
-		values is not thread safe.
-	*/
-	static void SetCondenseWhiteSpace( bool condense )		{ condenseWhiteSpace = condense; }
-
-	/// Return the current white space setting.
-	static bool IsWhiteSpaceCondensed()						{ return condenseWhiteSpace; }
-
-	/** Return the position, in the original source file, of this node or attribute.
-		The row and column are 1-based. (That is the first row and first column is
-		1,1). If the returns values are 0 or less, then the parser does not have
-		a row and column value.
-
-		Generally, the row and column value will be set when the TiXmlDocument::Load(),
-		TiXmlDocument::LoadFile(), or any TiXmlNode::Parse() is called. It will NOT be set
-		when the DOM was created from operator>>.
-
-		The values reflect the initial load. Once the DOM is modified programmatically
-		(by adding or changing nodes and attributes) the new values will NOT update to
-		reflect changes in the document.
-
-		There is a minor performance cost to computing the row and column. Computation
-		can be disabled if TiXmlDocument::SetTabSize() is called with 0 as the value.
-
-		@sa TiXmlDocument::SetTabSize()
-	*/
-	int Row() const			{ return location.row + 1; }
-	int Column() const		{ return location.col + 1; }	///< See Row()
-
-	void  SetUserData( void* user )			{ userData = user; }
-	void* GetUserData()						{ return userData; }
-
-	// Table that returs, for a given lead byte, the total number of bytes
-	// in the UTF-8 sequence.
-	static const int utf8ByteTable[256];
-
-	virtual const char* Parse(	const char* p, 
-								TiXmlParsingData* data, 
-								TiXmlEncoding encoding /*= TIXML_ENCODING_UNKNOWN */ ) = 0;
-
-	enum
-	{
-		TIXML_NO_ERROR = 0,
-		TIXML_ERROR,
-		TIXML_ERROR_OPENING_FILE,
-		TIXML_ERROR_OUT_OF_MEMORY,
-		TIXML_ERROR_PARSING_ELEMENT,
-		TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME,
-		TIXML_ERROR_READING_ELEMENT_VALUE,
-		TIXML_ERROR_READING_ATTRIBUTES,
-		TIXML_ERROR_PARSING_EMPTY,
-		TIXML_ERROR_READING_END_TAG,
-		TIXML_ERROR_PARSING_UNKNOWN,
-		TIXML_ERROR_PARSING_COMMENT,
-		TIXML_ERROR_PARSING_DECLARATION,
-		TIXML_ERROR_DOCUMENT_EMPTY,
-		TIXML_ERROR_EMBEDDED_NULL,
-
-		TIXML_ERROR_STRING_COUNT
-	};
-
-protected:
-
-	// See STL_STRING_BUG
-	// Utility class to overcome a bug.
-	class StringToBuffer
-	{
-	  public:
-		StringToBuffer( const TIXML_STRING& str );
-		~StringToBuffer();
-		char* buffer;
-	};
-
-	static const char*	SkipWhiteSpace( const char*, TiXmlEncoding encoding );
-	inline static bool	IsWhiteSpace( char c )		
-	{ 
-		return ( isspace( (unsigned char) c ) || c == '\n' || c == '\r' ); 
-	}
-
-	virtual void StreamOut (TIXML_OSTREAM *) const = 0;
-
-	#ifdef TIXML_USE_STL
-	    static bool	StreamWhiteSpace( TIXML_ISTREAM * in, TIXML_STRING * tag );
-	    static bool StreamTo( TIXML_ISTREAM * in, int character, TIXML_STRING * tag );
-	#endif
-
-	/*	Reads an XML name into the string provided. Returns
-		a pointer just past the last character of the name,
-		or 0 if the function has an error.
-	*/
-	static const char* ReadName( const char* p, TIXML_STRING* name, TiXmlEncoding encoding );
-
-	/*	Reads text. Returns a pointer past the given end tag.
-		Wickedly complex options, but it keeps the (sensitive) code in one place.
-	*/
-	static const char* ReadText(	const char* in,				// where to start
-									TIXML_STRING* text,			// the string read
-									bool ignoreWhiteSpace,		// whether to keep the white space
-									const char* endTag,			// what ends this text
-									bool ignoreCase,			// whether to ignore case in the end tag
-									TiXmlEncoding encoding );	// the current encoding
-
-	// If an entity has been found, transform it into a character.
-	static const char* GetEntity( const char* in, char* value, int* length, TiXmlEncoding encoding );
-
-	// Get a character, while interpreting entities.
-	// The length can be from 0 to 4 bytes.
-	inline static const char* GetChar( const char* p, char* _value, int* length, TiXmlEncoding encoding )
-	{
-		assert( p );
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			*length = utf8ByteTable[ *((const unsigned char*)p) ];
-			assert( *length >= 0 && *length < 5 );
-		}
-		else
-		{
-			*length = 1;
-		}
-
-		if ( *length == 1 )
-		{
-			if ( *p == '&' )
-				return GetEntity( p, _value, length, encoding );
-			*_value = *p;
-			return p+1;
-		}
-		else if ( *length )
-		{
-			strncpy( _value, p, *length );
-			return p + (*length);
-		}
-		else
-		{
-			// Not valid text.
-			return 0;
-		}
-	}
-
-	// Puts a string to a stream, expanding entities as it goes.
-	// Note this should not contian the '<', '>', etc, or they will be transformed into entities!
-	static void PutString( const TIXML_STRING& str, TIXML_OSTREAM* out );
-
-	static void PutString( const TIXML_STRING& str, TIXML_STRING* out );
-
-	// Return true if the next characters in the stream are any of the endTag sequences.
-	// Ignore case only works for english, and should only be relied on when comparing
-	// to Engilish words: StringEqual( p, "version", true ) is fine.
-	static bool StringEqual(	const char* p,
-								const char* endTag,
-								bool ignoreCase,
-								TiXmlEncoding encoding );
-
-	static const char* errorString[ TIXML_ERROR_STRING_COUNT ];
-
-	TiXmlCursor location;
-
-    /// Field containing a generic user pointer
-	void*			userData;
-	
-	// None of these methods are reliable for any language except English.
-	// Good for approximation, not great for accuracy.
-	static int IsAlpha( unsigned char anyByte, TiXmlEncoding encoding );
-	static int IsAlphaNum( unsigned char anyByte, TiXmlEncoding encoding );
-	inline static int ToLower( int v, TiXmlEncoding encoding )
-	{
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			if ( v < 128 ) return tolower( v );
-			return v;
-		}
-		else
-		{
-			return tolower( v );
-		}
-	}
-	static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length );
-
-private:
-	TiXmlBase( const TiXmlBase& );				// not implemented.
-	void operator=( const TiXmlBase& base );	// not allowed.
-
-	struct Entity
-	{
-		const char*     str;
-		unsigned int	strLength;
-		char		    chr;
-	};
-	enum
-	{
-		NUM_ENTITY = 5,
-		MAX_ENTITY_LENGTH = 6
-
-	};
-	static Entity entity[ NUM_ENTITY ];
-	static bool condenseWhiteSpace;
-};
-
-
-/** The parent class for everything in the Document Object Model.
-	(Except for attributes).
-	Nodes have siblings, a parent, and children. A node can be
-	in a document, or stand on its own. The type of a TiXmlNode
-	can be queried, and it can be cast to its more defined type.
-*/
-class TiXmlNode : public TiXmlBase
-{
-	friend class TiXmlDocument;
-	friend class TiXmlElement;
-
-public:
-	#ifdef TIXML_USE_STL	
-
-	    /** An input stream operator, for every class. Tolerant of newlines and
-		    formatting, but doesn't expect them.
-	    */
-	    friend std::istream& operator >> (std::istream& in, TiXmlNode& base);
-
-	    /** An output stream operator, for every class. Note that this outputs
-		    without any newlines or formatting, as opposed to Print(), which
-		    includes tabs and new lines.
-
-		    The operator<< and operator>> are not completely symmetric. Writing
-		    a node to a stream is very well defined. You'll get a nice stream
-		    of output, without any extra whitespace or newlines.
-		    
-		    But reading is not as well defined. (As it always is.) If you create
-		    a TiXmlElement (for example) and read that from an input stream,
-		    the text needs to define an element or junk will result. This is
-		    true of all input streams, but it's worth keeping in mind.
-
-		    A TiXmlDocument will read nodes until it reads a root element, and
-			all the children of that root element.
-	    */	
-	    friend std::ostream& operator<< (std::ostream& out, const TiXmlNode& base);
-
-		/// Appends the XML node or attribute to a std::string.
-		friend std::string& operator<< (std::string& out, const TiXmlNode& base );
-
-	#else
-	    // Used internally, not part of the public API.
-	    friend TIXML_OSTREAM& operator<< (TIXML_OSTREAM& out, const TiXmlNode& base);
-	#endif
-
-	/** The types of XML nodes supported by TinyXml. (All the
-			unsupported types are picked up by UNKNOWN.)
-	*/
-	enum NodeType
-	{
-		DOCUMENT,
-		ELEMENT,
-		COMMENT,
-		UNKNOWN,
-		TEXT,
-		DECLARATION,
-		TYPECOUNT
-	};
-
-	virtual ~TiXmlNode();
-
-	/** The meaning of 'value' changes for the specific type of
-		TiXmlNode.
-		@verbatim
-		Document:	filename of the xml file
-		Element:	name of the element
-		Comment:	the comment text
-		Unknown:	the tag contents
-		Text:		the text string
-		@endverbatim
-
-		The subclasses will wrap this function.
-	*/
-	const char * Value() const { return value.c_str (); }
-
-	/** Changes the value of the node. Defined as:
-		@verbatim
-		Document:	filename of the xml file
-		Element:	name of the element
-		Comment:	the comment text
-		Unknown:	the tag contents
-		Text:		the text string
-		@endverbatim
-	*/
-	void SetValue(const char * _value) { value = _value;}
-
-    #ifdef TIXML_USE_STL
-	/// STL std::string form.
-	void SetValue( const std::string& _value )    
-	{	  
-		StringToBuffer buf( _value );
-		SetValue( buf.buffer ? buf.buffer : "" );    	
-	}	
-	#endif
-
-	/// Delete all the children of this node. Does not affect 'this'.
-	void Clear();
-
-	/// One step up the DOM.
-	TiXmlNode* Parent()							{ return parent; }
-	const TiXmlNode* Parent() const				{ return parent; }
-
-	const TiXmlNode* FirstChild()	const	{ return firstChild; }		///< The first child of this node. Will be null if there are no children.
-	TiXmlNode* FirstChild()					{ return firstChild; }
-	const TiXmlNode* FirstChild( const char * value ) const;			///< The first child of this node with the matching 'value'. Will be null if none found.
-	TiXmlNode* FirstChild( const char * value );						///< The first child of this node with the matching 'value'. Will be null if none found.
-
-	const TiXmlNode* LastChild() const	{ return lastChild; }		/// The last child of this node. Will be null if there are no children.
-	TiXmlNode* LastChild()	{ return lastChild; }
-	const TiXmlNode* LastChild( const char * value ) const;			/// The last child of this node matching 'value'. Will be null if there are no children.
-	TiXmlNode* LastChild( const char * value );	
-
-    #ifdef TIXML_USE_STL
-	const TiXmlNode* FirstChild( const std::string& _value ) const	{	return FirstChild (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* FirstChild( const std::string& _value )				{	return FirstChild (_value.c_str ());	}	///< STL std::string form.
-	const TiXmlNode* LastChild( const std::string& _value ) const	{	return LastChild (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* LastChild( const std::string& _value )				{	return LastChild (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/** An alternate way to walk the children of a node.
-		One way to iterate over nodes is:
-		@verbatim
-			for( child = parent->FirstChild(); child; child = child->NextSibling() )
-		@endverbatim
-
-		IterateChildren does the same thing with the syntax:
-		@verbatim
-			child = 0;
-			while( child = parent->IterateChildren( child ) )
-		@endverbatim
-
-		IterateChildren takes the previous child as input and finds
-		the next one. If the previous child is null, it returns the
-		first. IterateChildren will return null when done.
-	*/
-	const TiXmlNode* IterateChildren( const TiXmlNode* previous ) const;
-	TiXmlNode* IterateChildren( TiXmlNode* previous );
-
-	/// This flavor of IterateChildren searches for children with a particular 'value'
-	const TiXmlNode* IterateChildren( const char * value, const TiXmlNode* previous ) const;
-	TiXmlNode* IterateChildren( const char * value, TiXmlNode* previous );
-
-    #ifdef TIXML_USE_STL
-	const TiXmlNode* IterateChildren( const std::string& _value, const TiXmlNode* previous ) const	{	return IterateChildren (_value.c_str (), previous);	}	///< STL std::string form.
-	TiXmlNode* IterateChildren( const std::string& _value, TiXmlNode* previous ) {	return IterateChildren (_value.c_str (), previous);	}	///< STL std::string form.
-	#endif
-
-	/** Add a new node related to this. Adds a child past the LastChild.
-		Returns a pointer to the new object or nullptr if an error occured.
-	*/
-	TiXmlNode* InsertEndChild( const TiXmlNode& addThis );
-
-
-	/** Add a new node related to this. Adds a child past the LastChild.
-
-		NOTE: the node to be added is passed by pointer, and will be
-		henceforth owned (and deleted) by tinyXml. This method is efficient
-		and avoids an extra copy, but should be used with care as it
-		uses a different memory model than the other insert functions.
-
-		@sa InsertEndChild
-	*/
-	TiXmlNode* LinkEndChild( TiXmlNode* addThis );
-
-	/** Add a new node related to this. Adds a child before the specified child.
-		Returns a pointer to the new object or nullptr if an error occured.
-	*/
-	TiXmlNode* InsertBeforeChild( TiXmlNode* beforeThis, const TiXmlNode& addThis );
-
-	/** Add a new node related to this. Adds a child after the specified child.
-		Returns a pointer to the new object or nullptr if an error occured.
-	*/
-	TiXmlNode* InsertAfterChild(  TiXmlNode* afterThis, const TiXmlNode& addThis );
-
-	/** Replace a child of this node.
-		Returns a pointer to the new object or nullptr if an error occured.
-	*/
-	TiXmlNode* ReplaceChild( TiXmlNode* replaceThis, const TiXmlNode& withThis );
-
-	/// Delete a child of this node.
-	bool RemoveChild( TiXmlNode* removeThis );
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* PreviousSibling() const			{ return prev; }
-	TiXmlNode* PreviousSibling()						{ return prev; }
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* PreviousSibling( const char * ) const;
-	TiXmlNode* PreviousSibling( const char * );
-
-    #ifdef TIXML_USE_STL
-	const TiXmlNode* PreviousSibling( const std::string& _value ) const	{	return PreviousSibling (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* PreviousSibling( const std::string& _value ) 			{	return PreviousSibling (_value.c_str ());	}	///< STL std::string form.
-	const TiXmlNode* NextSibling( const std::string& _value) const		{	return NextSibling (_value.c_str ());	}	///< STL std::string form.
-	TiXmlNode* NextSibling( const std::string& _value) 					{	return NextSibling (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/// Navigate to a sibling node.
-	const TiXmlNode* NextSibling() const				{ return next; }
-	TiXmlNode* NextSibling()							{ return next; }
-
-	/// Navigate to a sibling node with the given 'value'.
-	const TiXmlNode* NextSibling( const char * ) const;
-	TiXmlNode* NextSibling( const char * );
-
-	/** Convenience function to get through elements.
-		Calls NextSibling and ToElement. Will skip all non-Element
-		nodes. Returns 0 if there is not another element.
-	*/
-	const TiXmlElement* NextSiblingElement() const;
-	TiXmlElement* NextSiblingElement();
-
-	/** Convenience function to get through elements.
-		Calls NextSibling and ToElement. Will skip all non-Element
-		nodes. Returns 0 if there is not another element.
-	*/
-	const TiXmlElement* NextSiblingElement( const char * ) const;
-	TiXmlElement* NextSiblingElement( const char * );
-
-    #ifdef TIXML_USE_STL
-	const TiXmlElement* NextSiblingElement( const std::string& _value) const	{	return NextSiblingElement (_value.c_str ());	}	///< STL std::string form.
-	TiXmlElement* NextSiblingElement( const std::string& _value)				{	return NextSiblingElement (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/// Convenience function to get through elements.
-	const TiXmlElement* FirstChildElement()	const;
-	TiXmlElement* FirstChildElement();
-
-	/// Convenience function to get through elements.
-	const TiXmlElement* FirstChildElement( const char * value ) const;
-	TiXmlElement* FirstChildElement( const char * value );
-
-    #ifdef TIXML_USE_STL
-	const TiXmlElement* FirstChildElement( const std::string& _value ) const	{	return FirstChildElement (_value.c_str ());	}	///< STL std::string form.
-	TiXmlElement* FirstChildElement( const std::string& _value )				{	return FirstChildElement (_value.c_str ());	}	///< STL std::string form.
-	#endif
-
-	/** Query the type (as an enumerated value, above) of this node.
-		The possible types are: DOCUMENT, ELEMENT, COMMENT,
-								UNKNOWN, TEXT, and DECLARATION.
-	*/
-	virtual int Type() const	{ return type; }
-
-	/** Return a pointer to the Document this node lives in.
-		Returns null if not in a document.
-	*/
-	const TiXmlDocument* GetDocument() const;
-	TiXmlDocument* GetDocument();
-
-	/// Returns true if this node has no children.
-	bool NoChildren() const						{ return !firstChild; }
-
-	const TiXmlDocument* ToDocument()	const		{ return ( this && type == DOCUMENT ) ? (const TiXmlDocument*) this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	const TiXmlElement*  ToElement() const			{ return ( this && type == ELEMENT  ) ? (const TiXmlElement*)  this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	const TiXmlComment*  ToComment() const			{ return ( this && type == COMMENT  ) ? (const TiXmlComment*)  this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	const TiXmlUnknown*  ToUnknown() const			{ return ( this && type == UNKNOWN  ) ? (const TiXmlUnknown*)  this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	const TiXmlText*	   ToText()    const		{ return ( this && type == TEXT     ) ? (const TiXmlText*)     this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	const TiXmlDeclaration* ToDeclaration() const	{ return ( this && type == DECLARATION ) ? (const TiXmlDeclaration*) this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	TiXmlDocument* ToDocument()			{ return ( this && type == DOCUMENT ) ? (TiXmlDocument*) this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	TiXmlElement*  ToElement()			{ return ( this && type == ELEMENT  ) ? (TiXmlElement*)  this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	TiXmlComment*  ToComment()			{ return ( this && type == COMMENT  ) ? (TiXmlComment*)  this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	TiXmlUnknown*  ToUnknown()			{ return ( this && type == UNKNOWN  ) ? (TiXmlUnknown*)  this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	TiXmlText*	   ToText()   			{ return ( this && type == TEXT     ) ? (TiXmlText*)     this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-	TiXmlDeclaration* ToDeclaration()	{ return ( this && type == DECLARATION ) ? (TiXmlDeclaration*) this : 0; } ///< Cast to a more defined type. Will return null not of the requested type.
-
-	/** Create an exact duplicate of this node and return it. The memory must be deleted
-		by the caller. 
-	*/
-	virtual TiXmlNode* Clone() const = 0;
-
-protected:
-	TiXmlNode( NodeType _type );
-
-	// Copy to the allocated object. Shared functionality between Clone, Copy constructor,
-	// and the assignment operator.
-	void CopyTo( TiXmlNode* target ) const;
-
-	#ifdef TIXML_USE_STL
-	    // The real work of the input operator.
-	    virtual void StreamIn( TIXML_ISTREAM* in, TIXML_STRING* tag ) = 0;
-	#endif
-
-	// Figure out what is at *p, and parse it. Returns null if it is not an xml node.
-	TiXmlNode* Identify( const char* start, TiXmlEncoding encoding );
-
-	// Internal Value function returning a TIXML_STRING
-	const TIXML_STRING& SValue() const	{ return value ; }
-
-	TiXmlNode*		parent;
-	NodeType		type;
-
-	TiXmlNode*		firstChild;
-	TiXmlNode*		lastChild;
-
-	TIXML_STRING	value;
-
-	TiXmlNode*		prev;
-	TiXmlNode*		next;
-
-private:
-	TiXmlNode( const TiXmlNode& );				// not implemented.
-	void operator=( const TiXmlNode& base );	// not allowed.
-};
-
-
-/** An attribute is a name-value pair. Elements have an arbitrary
-	number of attributes, each with a unique name.
-
-	@note The attributes are not TiXmlNodes, since they are not
-		  part of the tinyXML document object model. There are other
-		  suggested ways to look at this problem.
-*/
-class TiXmlAttribute : public TiXmlBase
-{
-	friend class TiXmlAttributeSet;
-
-public:
-	/// Construct an empty attribute.
-	TiXmlAttribute() : TiXmlBase()
-	{
-		document = 0;
-		prev = next = 0;
-	}
-
-	#ifdef TIXML_USE_STL
-	/// std::string constructor.
-	TiXmlAttribute( const std::string& _name, const std::string& _value )
-	{
-		name = _name;
-		value = _value;
-		document = 0;
-		prev = next = 0;
-	}
-	#endif
-
-	/// Construct an attribute with a name and value.
-	TiXmlAttribute( const char * _name, const char * _value )
-	{
-		name = _name;
-		value = _value;
-		document = 0;
-		prev = next = 0;
-	}
-
-	const char*		Name()  const		{ return name.c_str (); }		///< Return the name of this attribute.
-	const char*		Value() const		{ return value.c_str (); }		///< Return the value of this attribute.
-	const int       IntValue() const;									///< Return the value of this attribute, converted to an integer.
-	const double	DoubleValue() const;								///< Return the value of this attribute, converted to a double.
-
-	/** QueryIntValue examines the value string. It is an alternative to the
-		IntValue() method with richer error checking.
-		If the value is an integer, it is stored in 'value' and 
-		the call returns TIXML_SUCCESS. If it is not
-		an integer, it returns TIXML_WRONG_TYPE.
-
-		A specialized but useful call. Note that for success it returns 0,
-		which is the opposite of almost all other TinyXml calls.
-	*/
-	int QueryIntValue( int* value ) const;
-	/// QueryDoubleValue examines the value string. See QueryIntValue().
-	int QueryDoubleValue( double* value ) const;
-
-	void SetName( const char* _name )	{ name = _name; }				///< Set the name of this attribute.
-	void SetValue( const char* _value )	{ value = _value; }				///< Set the value.
-
-	void SetIntValue( int value );										///< Set the value from an integer.
-	void SetDoubleValue( double value );								///< Set the value from a double.
-
-    #ifdef TIXML_USE_STL
-	/// STL std::string form.
-	void SetName( const std::string& _name )	
-	{	
-		StringToBuffer buf( _name );
-		SetName ( buf.buffer ? buf.buffer : "error" );	
-	}
-	/// STL std::string form.	
-	void SetValue( const std::string& _value )	
-	{	
-		StringToBuffer buf( _value );
-		SetValue( buf.buffer ? buf.buffer : "error" );	
-	}
-	#endif
-
-	/// Get the next sibling attribute in the DOM. Returns null at end.
-	const TiXmlAttribute* Next() const;
-	TiXmlAttribute* Next();
-	/// Get the previous sibling attribute in the DOM. Returns null at beginning.
-	const TiXmlAttribute* Previous() const;
-	TiXmlAttribute* Previous();
-
-	bool operator==( const TiXmlAttribute& rhs ) const { return rhs.name == name; }
-	bool operator<( const TiXmlAttribute& rhs )	 const { return name < rhs.name; }
-	bool operator>( const TiXmlAttribute& rhs )  const { return name > rhs.name; }
-
-	/*	Attribute parsing starts: first letter of the name
-						 returns: the next char after the value end quote
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-	// Prints this Attribute to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	virtual void StreamOut( TIXML_OSTREAM * out ) const;
-	// [internal use]
-	// Set the document pointer so the attribute can report errors.
-	void SetDocument( TiXmlDocument* doc )	{ document = doc; }
-
-private:
-	TiXmlAttribute( const TiXmlAttribute& );				// not implemented.
-	void operator=( const TiXmlAttribute& base );	// not allowed.
-
-	TiXmlDocument*	document;	// A pointer back to a document, for error reporting.
-	TIXML_STRING name;
-	TIXML_STRING value;
-	TiXmlAttribute*	prev;
-	TiXmlAttribute*	next;
-};
-
-
-/*	A class used to manage a group of attributes.
-	It is only used internally, both by the ELEMENT and the DECLARATION.
-	
-	The set can be changed transparent to the Element and Declaration
-	classes that use it, but NOT transparent to the Attribute
-	which has to implement a next() and previous() method. Which makes
-	it a bit problematic and prevents the use of STL.
-
-	This version is implemented with circular lists because:
-		- I like circular lists
-		- it demonstrates some independence from the (typical) doubly linked list.
-*/
-class TiXmlAttributeSet
-{
-public:
-	TiXmlAttributeSet();
-	~TiXmlAttributeSet();
-
-	void Add( TiXmlAttribute* attribute );
-	void Remove( TiXmlAttribute* attribute );
-
-	const TiXmlAttribute* First()	const	{ return ( sentinel.next == &sentinel ) ? 0 : sentinel.next; }
-	TiXmlAttribute* First()					{ return ( sentinel.next == &sentinel ) ? 0 : sentinel.next; }
-	const TiXmlAttribute* Last() const		{ return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev; }
-	TiXmlAttribute* Last()					{ return ( sentinel.prev == &sentinel ) ? 0 : sentinel.prev; }
-
-	const TiXmlAttribute*	Find( const char * name ) const;
-	TiXmlAttribute*	Find( const char * name );
-
-private:
-	//*ME:	Because of hidden/disabled copy-construktor in TiXmlAttribute (sentinel-element),
-	//*ME:	this class must be also use a hidden/disabled copy-constructor !!!
-	TiXmlAttributeSet( const TiXmlAttributeSet& );	// not allowed
-	void operator=( const TiXmlAttributeSet& );	// not allowed (as TiXmlAttribute)
-
-	TiXmlAttribute sentinel;
-};
-
-
-/** The element is a container class. It has a value, the element name,
-	and can contain other elements, text, comments, and unknowns.
-	Elements also contain an arbitrary number of attributes.
-*/
-class TiXmlElement : public TiXmlNode
-{
-public:
-	/// Construct an element.
-	TiXmlElement (const char * in_value);
-
-	#ifdef TIXML_USE_STL
-	/// std::string constructor.
-	TiXmlElement( const std::string& _value );
-	#endif
-
-	TiXmlElement( const TiXmlElement& );
-
-	void operator=( const TiXmlElement& base );
-
-	virtual ~TiXmlElement();
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-	*/
-	const char* Attribute( const char* name ) const;
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-		If the attribute exists and can be converted to an integer,
-		the integer value will be put in the return 'i', if 'i'
-		is non-null.
-	*/
-	const char* Attribute( const char* name, int* i ) const;
-
-	/** Given an attribute name, Attribute() returns the value
-		for the attribute of that name, or null if none exists.
-		If the attribute exists and can be converted to an double,
-		the double value will be put in the return 'd', if 'd'
-		is non-null.
-	*/
-	const char* Attribute( const char* name, double* d ) const;
-
-	/** QueryIntAttribute examines the attribute - it is an alternative to the
-		Attribute() method with richer error checking.
-		If the attribute is an integer, it is stored in 'value' and 
-		the call returns TIXML_SUCCESS. If it is not
-		an integer, it returns TIXML_WRONG_TYPE. If the attribute
-		does not exist, then TIXML_NO_ATTRIBUTE is returned.
-	*/	
-	int QueryIntAttribute( const char* name, int* value ) const;
-	/// QueryDoubleAttribute examines the attribute - see QueryIntAttribute().
-	int QueryDoubleAttribute( const char* name, double* value ) const;
-	/// QueryFloatAttribute examines the attribute - see QueryIntAttribute().
-	int QueryDoubleAttribute( const char* name, float* value ) const {
-		double d;
-		int result = QueryDoubleAttribute( name, &d );
-		*value = (float)d;
-		return result;
-	}
-
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetAttribute( const char* name, const char * value );
-
-    #ifdef TIXML_USE_STL
-	const char* Attribute( const std::string& name ) const				{ return Attribute( name.c_str() ); }
-	const char* Attribute( const std::string& name, int* i ) const		{ return Attribute( name.c_str(), i ); }
-	const char* Attribute( const std::string& name, double* d ) const	{ return Attribute( name.c_str(), d ); }
-	int QueryIntAttribute( const std::string& name, int* value ) const	{ return QueryIntAttribute( name.c_str(), value ); }
-	int QueryDoubleAttribute( const std::string& name, double* value ) const { return QueryDoubleAttribute( name.c_str(), value ); }
-
-	/// STL std::string form.
-	void SetAttribute( const std::string& name, const std::string& _value )	
-	{	
-		StringToBuffer n( name );
-		StringToBuffer v( _value );
-		if ( n.buffer && v.buffer )
-			SetAttribute (n.buffer, v.buffer );	
-	}	
-	///< STL std::string form.
-	void SetAttribute( const std::string& name, int _value )	
-	{	
-		StringToBuffer n( name );
-		if ( n.buffer )
-			SetAttribute (n.buffer, _value);	
-	}	
-	#endif
-
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetAttribute( const char * name, int value );
-
-	/** Sets an attribute of name to a given value. The attribute
-		will be created if it does not exist, or changed if it does.
-	*/
-	void SetDoubleAttribute( const char * name, double value );
-
-	/** Deletes an attribute with the given name.
-	*/
-	void RemoveAttribute( const char * name );
-    #ifdef TIXML_USE_STL
-	void RemoveAttribute( const std::string& name )	{	RemoveAttribute (name.c_str ());	}	///< STL std::string form.
-	#endif
-
-	const TiXmlAttribute* FirstAttribute() const	{ return attributeSet.First(); }		///< Access the first attribute in this element.
-	TiXmlAttribute* FirstAttribute() 				{ return attributeSet.First(); }
-	const TiXmlAttribute* LastAttribute()	const 	{ return attributeSet.Last(); }		///< Access the last attribute in this element.
-	TiXmlAttribute* LastAttribute()					{ return attributeSet.Last(); }
-
-	/// Creates a new Element and returns it - the returned element is a copy.
-	virtual TiXmlNode* Clone() const;
-	// Print the Element to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	/*	Attribtue parsing starts: next char past '<'
-						 returns: next char past '>'
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-protected:
-
-	void CopyTo( TiXmlElement* target ) const;
-	void ClearThis();	// like clear, but initializes 'this' object as well
-
-	// Used to be public [internal use]
-	#ifdef TIXML_USE_STL
-	    virtual void StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag );
-	#endif
-	virtual void StreamOut( TIXML_OSTREAM * out ) const;
-
-	/*	[internal use]
-		Reads the "value" of the element -- another element, or text.
-		This should terminate with the current end tag.
-	*/
-	const char* ReadValue( const char* in, TiXmlParsingData* prevData, TiXmlEncoding encoding );
-
-private:
-
-	TiXmlAttributeSet attributeSet;
-};
-
-
-/**	An XML comment.
-*/
-class TiXmlComment : public TiXmlNode
-{
-public:
-	/// Constructs an empty comment.
-	TiXmlComment() : TiXmlNode( TiXmlNode::COMMENT ) {}
-	TiXmlComment( const TiXmlComment& );
-	void operator=( const TiXmlComment& base );
-
-	virtual ~TiXmlComment()	{}
-
-	/// Returns a copy of this Comment.
-	virtual TiXmlNode* Clone() const;
-	/// Write this Comment to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	/*	Attribtue parsing starts: at the ! of the !--
-						 returns: next char past '>'
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-protected:
-	void CopyTo( TiXmlComment* target ) const;
-
-	// used to be public
-	#ifdef TIXML_USE_STL
-	    virtual void StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag );
-	#endif
-	virtual void StreamOut( TIXML_OSTREAM * out ) const;
-
-private:
-
-};
-
-
-/** XML text. Contained in an element.
-*/
-class TiXmlText : public TiXmlNode
-{
-	friend class TiXmlElement;
-public:
-	/// Constructor.
-	TiXmlText (const char * initValue) : TiXmlNode (TiXmlNode::TEXT)
-	{
-		SetValue( initValue );
-	}
-	virtual ~TiXmlText() {}
-
-	#ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlText( const std::string& initValue ) : TiXmlNode (TiXmlNode::TEXT)
-	{
-		SetValue( initValue );
-	}
-	#endif
-
-	TiXmlText( const TiXmlText& copy ) : TiXmlNode( TiXmlNode::TEXT )	{ copy.CopyTo( this ); }
-	void operator=( const TiXmlText& base )							 	{ base.CopyTo( this ); }
-
-	/// Write this text object to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-protected :
-	///  [internal use] Creates a new Element and returns it.
-	virtual TiXmlNode* Clone() const;
-	void CopyTo( TiXmlText* target ) const;
-
-	virtual void StreamOut ( TIXML_OSTREAM * out ) const;
-	bool Blank() const;	// returns true if all white space and new lines
-	// [internal use]
-	#ifdef TIXML_USE_STL
-	    virtual void StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag );
-	#endif
-
-private:
-};
-
-
-/** In correct XML the declaration is the first entry in the file.
-	@verbatim
-		<?xml version="1.0" standalone="yes"?>
-	@endverbatim
-
-	TinyXml will happily read or write files without a declaration,
-	however. There are 3 possible attributes to the declaration:
-	version, encoding, and standalone.
-
-	Note: In this version of the code, the attributes are
-	handled as special cases, not generic attributes, simply
-	because there can only be at most 3 and they are always the same.
-*/
-class TiXmlDeclaration : public TiXmlNode
-{
-public:
-	/// Construct an empty declaration.
-	TiXmlDeclaration()   : TiXmlNode( TiXmlNode::DECLARATION ) {}
-
-#ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlDeclaration(	const std::string& _version,
-						const std::string& _encoding,
-						const std::string& _standalone );
-#endif
-
-	/// Construct.
-	TiXmlDeclaration(	const char* _version,
-						const char* _encoding,
-						const char* _standalone );
-
-	TiXmlDeclaration( const TiXmlDeclaration& copy );
-	void operator=( const TiXmlDeclaration& copy );
-
-	virtual ~TiXmlDeclaration()	{}
-
-	/// Version. Will return an empty string if none was found.
-	const char *Version() const			{ return version.c_str (); }
-	/// Encoding. Will return an empty string if none was found.
-	const char *Encoding() const		{ return encoding.c_str (); }
-	/// Is this a standalone document?
-	const char *Standalone() const		{ return standalone.c_str (); }
-
-	/// Creates a copy of this Declaration and returns it.
-	virtual TiXmlNode* Clone() const;
-	/// Print this declaration to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-protected:
-	void CopyTo( TiXmlDeclaration* target ) const;
-	// used to be public
-	#ifdef TIXML_USE_STL
-	    virtual void StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag );
-	#endif
-	virtual void StreamOut ( TIXML_OSTREAM * out) const;
-
-private:
-
-	TIXML_STRING version;
-	TIXML_STRING encoding;
-	TIXML_STRING standalone;
-};
-
-
-/** Any tag that tinyXml doesn't recognize is saved as an
-	unknown. It is a tag of text, but should not be modified.
-	It will be written back to the XML, unchanged, when the file
-	is saved.
-
-	DTD tags get thrown into TiXmlUnknowns.
-*/
-class TiXmlUnknown : public TiXmlNode
-{
-public:
-	TiXmlUnknown() : TiXmlNode( TiXmlNode::UNKNOWN )	{}
-	virtual ~TiXmlUnknown() {}
-
-	TiXmlUnknown( const TiXmlUnknown& copy ) : TiXmlNode( TiXmlNode::UNKNOWN )		{ copy.CopyTo( this ); }
-	void operator=( const TiXmlUnknown& copy )										{ copy.CopyTo( this ); }
-
-	/// Creates a copy of this Unknown and returns it.
-	virtual TiXmlNode* Clone() const;
-	/// Print this Unknown to a FILE stream.
-	virtual void Print( FILE* cfile, int depth ) const;
-
-	virtual const char* Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding );
-
-protected:
-	void CopyTo( TiXmlUnknown* target ) const;
-
-	#ifdef TIXML_USE_STL
-	    virtual void StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag );
-	#endif
-	virtual void StreamOut ( TIXML_OSTREAM * out ) const;
-
-private:
-
-};
-
-
-/** Always the top level node. A document binds together all the
-	XML pieces. It can be saved, loaded, and printed to the screen.
-	The 'value' of a document node is the xml file name.
-*/
-class TiXmlDocument : public TiXmlNode
-{
-public:
-	/// Create an empty document, that has no name.
-	TiXmlDocument();
-	/// Create a document with a name. The name of the document is also the filename of the xml.
-	TiXmlDocument( const char * documentName );
-
-	#ifdef TIXML_USE_STL
-	/// Constructor.
-	TiXmlDocument( const std::string& documentName );
-	#endif
-
-	TiXmlDocument( const TiXmlDocument& copy );
-	void operator=( const TiXmlDocument& copy );
-
-	virtual ~TiXmlDocument() {}
-
-	/** Load a file using the current document value.
-		Returns true if successful. Will delete any existing
-		document data before loading.
-	*/
-	bool LoadFile( TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-	/// Save a file using the current document value. Returns true if successful.
-	bool SaveFile() const;
-	/// Load a file using the given filename. Returns true if successful.
-	bool LoadFile( const char * filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-	/// Save a file using the given filename. Returns true if successful.
-	bool SaveFile( const char * filename ) const;
-
-	#ifdef TIXML_USE_STL
-	bool LoadFile( const std::string& filename, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING )			///< STL std::string version.
-	{
-		StringToBuffer f( filename );
-		return ( f.buffer && LoadFile( f.buffer, encoding ));
-	}
-	bool SaveFile( const std::string& filename ) const		///< STL std::string version.
-	{
-		StringToBuffer f( filename );
-		return ( f.buffer && SaveFile( f.buffer ));
-	}
-	#endif
-
-	/** Parse the given null terminated block of xml data. Passing in an encoding to this
-		method (either TIXML_ENCODING_LEGACY or TIXML_ENCODING_UTF8 will force TinyXml
-		to use that encoding, regardless of what TinyXml might otherwise try to detect.
-	*/
-	virtual const char* Parse( const char* p, TiXmlParsingData* data = 0, TiXmlEncoding encoding = TIXML_DEFAULT_ENCODING );
-
-	/** Get the root element -- the only top level element -- of the document.
-		In well formed XML, there should only be one. TinyXml is tolerant of
-		multiple elements at the document level.
-	*/
-	const TiXmlElement* RootElement() const		{ return FirstChildElement(); }
-	TiXmlElement* RootElement()					{ return FirstChildElement(); }
-
-	/** If an error occurs, Error will be set to true. Also,
-		- The ErrorId() will contain the integer identifier of the error (not generally useful)
-		- The ErrorDesc() method will return the name of the error. (very useful)
-		- The ErrorRow() and ErrorCol() will return the location of the error (if known)
-	*/	
-	bool Error() const						{ return error; }
-
-	/// Contains a textual (english) description of the error if one occurs.
-	const char * ErrorDesc() const	{ return errorDesc.c_str (); }
-
-	/** Generally, you probably want the error string ( ErrorDesc() ). But if you
-		prefer the ErrorId, this function will fetch it.
-	*/
-	const int ErrorId()	const				{ return errorId; }
-
-	/** Returns the location (if known) of the error. The first column is column 1, 
-		and the first row is row 1. A value of 0 means the row and column wasn't applicable
-		(memory errors, for example, have no row/column) or the parser lost the error. (An
-		error in the error reporting, in that case.)
-
-		@sa SetTabSize, Row, Column
-	*/
-	int ErrorRow()	{ return errorLocation.row+1; }
-	int ErrorCol()	{ return errorLocation.col+1; }	///< The column where the error occured. See ErrorRow()
-
-	/** By calling this method, with a tab size
-		greater than 0, the row and column of each node and attribute is stored
-		when the file is loaded. Very useful for tracking the DOM back in to
-		the source file.
-
-		The tab size is required for calculating the location of nodes. If not
-		set, the default of 4 is used. The tabsize is set per document. Setting
-		the tabsize to 0 disables row/column tracking.
-
-		Note that row and column tracking is not supported when using operator>>.
-
-		The tab size needs to be enabled before the parse or load. Correct usage:
-		@verbatim
-		TiXmlDocument doc;
-		doc.SetTabSize( 8 );
-		doc.Load( "myfile.xml" );
-		@endverbatim
-
-		@sa Row, Column
-	*/
-	void SetTabSize( int _tabsize )		{ tabsize = _tabsize; }
-
-	int TabSize() const	{ return tabsize; }
-
-	/** If you have handled the error, it can be reset with this call. The error
-		state is automatically cleared if you Parse a new XML block.
-	*/
-	void ClearError()						{	error = false; 
-												errorId = 0; 
-												errorDesc = ""; 
-												errorLocation.row = errorLocation.col = 0; 
-												//errorLocation.last = 0; 
-											}
-
-	/** Dump the document to standard out. */
-	void Print() const						{ Print( stdout, 0 ); }
-
-	/// Print this Document to a FILE stream.
-	virtual void Print( FILE* cfile, int depth = 0 ) const;
-	// [internal use]
-	void SetError( int err, const char* errorLocation, TiXmlParsingData* prevData, TiXmlEncoding encoding );
-
-protected :
-	virtual void StreamOut ( TIXML_OSTREAM * out) const;
-	// [internal use]
-	virtual TiXmlNode* Clone() const;
-	#ifdef TIXML_USE_STL
-	    virtual void StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag );
-	#endif
-
-private:
-	void CopyTo( TiXmlDocument* target ) const;
-
-	bool error;
-	int  errorId;
-	TIXML_STRING errorDesc;
-	int tabsize;
-	TiXmlCursor errorLocation;
-};
-
-
-/**
-	A TiXmlHandle is a class that wraps a node pointer with null checks; this is
-	an incredibly useful thing. Note that TiXmlHandle is not part of the TinyXml
-	DOM structure. It is a separate utility class.
-
-	Take an example:
-	@verbatim
-	<Document>
-		<Element attributeA = "valueA">
-			<Child attributeB = "value1" />
-			<Child attributeB = "value2" />
-		</Element>
-	<Document>
-	@endverbatim
-
-	Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very 
-	easy to write a *lot* of code that looks like:
-
-	@verbatim
-	TiXmlElement* root = document.FirstChildElement( "Document" );
-	if ( root )
-	{
-		TiXmlElement* element = root->FirstChildElement( "Element" );
-		if ( element )
-		{
-			TiXmlElement* child = element->FirstChildElement( "Child" );
-			if ( child )
-			{
-				TiXmlElement* child2 = child->NextSiblingElement( "Child" );
-				if ( child2 )
-				{
-					// Finally do something useful.
-	@endverbatim
-
-	And that doesn't even cover "else" cases. TiXmlHandle addresses the verbosity
-	of such code. A TiXmlHandle checks for null	pointers so it is perfectly safe 
-	and correct to use:
-
-	@verbatim
-	TiXmlHandle docHandle( &document );
-	TiXmlElement* child2 = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).Child( "Child", 1 ).Element();
-	if ( child2 )
-	{
-		// do something useful
-	@endverbatim
-
-	Which is MUCH more concise and useful.
-
-	It is also safe to copy handles - internally they are nothing more than node pointers.
-	@verbatim
-	TiXmlHandle handleCopy = handle;
-	@endverbatim
-
-	What they should not be used for is iteration:
-
-	@verbatim
-	int i=0; 
-	while ( true )
-	{
-		TiXmlElement* child = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).Child( "Child", i ).Element();
-		if ( !child )
-			break;
-		// do something
-		++i;
-	}
-	@endverbatim
-
-	It seems reasonable, but it is in fact two embedded while loops. The Child method is 
-	a linear walk to find the element, so this code would iterate much more than it needs 
-	to. Instead, prefer:
-
-	@verbatim
-	TiXmlElement* child = docHandle.FirstChild( "Document" ).FirstChild( "Element" ).FirstChild( "Child" ).Element();
-
-	for( child; child; child=child->NextSiblingElement() )
-	{
-		// do something
-	}
-	@endverbatim
-*/
-class TiXmlHandle
-{
-public:
-	/// Create a handle from any node (at any depth of the tree.) This can be a null pointer.
-	TiXmlHandle( TiXmlNode* node )					{ this->node = node; }
-	/// Copy constructor
-	TiXmlHandle( const TiXmlHandle& ref )			{ this->node = ref.node; }
-	TiXmlHandle operator=( const TiXmlHandle& ref ) { this->node = ref.node; return *this; }
-
-	/// Return a handle to the first child node.
-	TiXmlHandle FirstChild() const;
-	/// Return a handle to the first child node with the given name.
-	TiXmlHandle FirstChild( const char * value ) const;
-	/// Return a handle to the first child element.
-	TiXmlHandle FirstChildElement() const;
-	/// Return a handle to the first child element with the given name.
-	TiXmlHandle FirstChildElement( const char * value ) const;
-
-	/** Return a handle to the "index" child with the given name. 
-		The first child is 0, the second 1, etc.
-	*/
-	TiXmlHandle Child( const char* value, int index ) const;
-	/** Return a handle to the "index" child. 
-		The first child is 0, the second 1, etc.
-	*/
-	TiXmlHandle Child( int index ) const;
-	/** Return a handle to the "index" child element with the given name. 
-		The first child element is 0, the second 1, etc. Note that only TiXmlElements
-		are indexed: other types are not counted.
-	*/
-	TiXmlHandle ChildElement( const char* value, int index ) const;
-	/** Return a handle to the "index" child element. 
-		The first child element is 0, the second 1, etc. Note that only TiXmlElements
-		are indexed: other types are not counted.
-	*/
-	TiXmlHandle ChildElement( int index ) const;
-
-	#ifdef TIXML_USE_STL
-	TiXmlHandle FirstChild( const std::string& _value ) const				{ return FirstChild( _value.c_str() ); }
-	TiXmlHandle FirstChildElement( const std::string& _value ) const		{ return FirstChildElement( _value.c_str() ); }
-
-	TiXmlHandle Child( const std::string& _value, int index ) const			{ return Child( _value.c_str(), index ); }
-	TiXmlHandle ChildElement( const std::string& _value, int index ) const	{ return ChildElement( _value.c_str(), index ); }
-	#endif
-
-	/// Return the handle as a TiXmlNode. This may return null.
-	TiXmlNode* Node() const			{ return node; } 
-	/// Return the handle as a TiXmlElement. This may return null.
-	TiXmlElement* Element() const	{ return ( ( node && node->ToElement() ) ? node->ToElement() : 0 ); }
-	/// Return the handle as a TiXmlText. This may return null.
-	TiXmlText* Text() const			{ return ( ( node && node->ToText() ) ? node->ToText() : 0 ); }
-	/// Return the handle as a TiXmlUnknown. This may return null;
-	TiXmlUnknown* Unknown() const			{ return ( ( node && node->ToUnknown() ) ? node->ToUnknown() : 0 ); }
-
-private:
-	TiXmlNode* node;
-};
-
-#ifdef _MSC_VER
-#pragma warning( default : 4530 )
-#pragma warning( default : 4786 )
-#endif
-
-#endif
-
diff --git a/common/tinyxml/tinyxmlerror.cpp b/common/tinyxml/tinyxmlerror.cpp
deleted file mode 100644
index b04add7f9..000000000
--- a/common/tinyxml/tinyxmlerror.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code (2.0 and earlier )copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source
-distribution.
-*/
-
-#include "tinyxml.h"
-
-// The goal of the seperate error file is to make the first
-// step towards localization. tinyxml (currently) only supports
-// latin-1, but at least the error messages could now be translated.
-//
-// It also cleans up the code a bit.
-//
-
-const char* TiXmlBase::errorString[ TIXML_ERROR_STRING_COUNT ] =
-{
-	"No error",
-	"Error",
-	"Failed to open file",
-	"Memory allocation failed.",
-	"Error parsing Element.",
-	"Failed to read Element name",
-	"Error reading Element value.",
-	"Error reading Attributes.",
-	"Error: empty tag.",
-	"Error reading end tag.",
-	"Error parsing Unknown.",
-	"Error parsing Comment.",
-	"Error parsing Declaration.",
-	"Error document empty.",
-	"Error null (0) or unexpected EOF found in input stream.",
-};
diff --git a/common/tinyxml/tinyxmlparser.cpp b/common/tinyxml/tinyxmlparser.cpp
deleted file mode 100644
index 3e6b174f7..000000000
--- a/common/tinyxml/tinyxmlparser.cpp
+++ /dev/null
@@ -1,1508 +0,0 @@
-/*
-www.sourceforge.net/projects/tinyxml
-Original code (2.0 and earlier )copyright (c) 2000-2002 Lee Thomason (www.grinninglizard.com)
-
-This software is provided 'as-is', without any express or implied 
-warranty. In no event will the authors be held liable for any 
-damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any 
-purpose, including commercial applications, and to alter it and 
-redistribute it freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must 
-not claim that you wrote the original software. If you use this
-software in a product, an acknowledgment in the product documentation
-would be appreciated but is not required.
-
-2. Altered source versions must be plainly marked as such, and 
-must not be misrepresented as being the original software.
-
-3. This notice may not be removed or altered from any source 
-distribution.
-*/
-
-#include "tinyxml.h"
-#include <ctype.h>
-#include <stddef.h>
-
-//#define DEBUG_PARSER
-
-// Note tha "PutString" hardcodes the same list. This
-// is less flexible than it appears. Changing the entries
-// or order will break putstring.	
-TiXmlBase::Entity TiXmlBase::entity[ NUM_ENTITY ] = 
-{
-	{ "&amp;",  5, '&' },
-	{ "&lt;",   4, '<' },
-	{ "&gt;",   4, '>' },
-	{ "&quot;", 6, '\"' },
-	{ "&apos;", 6, '\'' }
-};
-
-// Bunch of unicode info at:
-//		http://www.unicode.org/faq/utf_bom.html
-// Including the basic of this table, which determines the #bytes in the
-// sequence from the lead byte. 1 placed for invalid sequences --
-// although the result will be junk, pass it through as much as possible.
-// Beware of the non-characters in UTF-8:	
-//				ef bb bf (Microsoft "lead bytes")
-//				ef bf be
-//				ef bf bf 
-
-const unsigned char TIXML_UTF_LEAD_0 = 0xefU;
-const unsigned char TIXML_UTF_LEAD_1 = 0xbbU;
-const unsigned char TIXML_UTF_LEAD_2 = 0xbfU;
-
-const int TiXmlBase::utf8ByteTable[256] = 
-{
-	//	0	1	2	3	4	5	6	7	8	9	a	b	c	d	e	f
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x00
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x10
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x20
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x30
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x40
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x50
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x60
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x70	End of ASCII range
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x80 0x80 to 0xc1 invalid
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0x90 
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xa0 
-		1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	// 0xb0 
-		1,	1,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xc0 0xc2 to 0xdf 2 byte
-		2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	2,	// 0xd0
-		3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	3,	// 0xe0 0xe0 to 0xef 3 byte
-		4,	4,	4,	4,	4,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1,	1	// 0xf0 0xf0 to 0xf4 4 byte, 0xf5 and higher invalid
-};
-
-
-void TiXmlBase::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length )
-{
-	const unsigned long BYTE_MASK = 0xBF;
-	const unsigned long BYTE_MARK = 0x80;
-	const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-
-	if (input < 0x80) 
-		*length = 1;
-	else if ( input < 0x800 )
-		*length = 2;
-	else if ( input < 0x10000 )
-		*length = 3;
-	else if ( input < 0x200000 )
-		*length = 4;
-	else
-		{ *length = 0; return; }	// This code won't covert this correctly anyway.
-
-	output += *length;
-
-	// Scary scary fall throughs.
-	switch (*length) 
-	{
-		case 4:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 3:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 2:
-			--output; 
-			*output = (char)((input | BYTE_MARK) & BYTE_MASK); 
-			input >>= 6;
-		case 1:
-			--output; 
-			*output = (char)(input | FIRST_BYTE_MARK[*length]);
-	}
-}
-
-
-/*static*/ int TiXmlBase::IsAlpha( unsigned char anyByte, TiXmlEncoding /*encoding*/ )
-{
-	// This will only work for low-ascii, everything else is assumed to be a valid
-	// letter. I'm not sure this is the best approach, but it is quite tricky trying
-	// to figure out alhabetical vs. not across encoding. So take a very 
-	// conservative approach.
-
-//	if ( encoding == TIXML_ENCODING_UTF8 )
-//	{
-		if ( anyByte < 127 )
-			return isalpha( anyByte );
-		else
-			return 1;	// What else to do? The unicode set is huge...get the english ones right.
-//	}
-//	else
-//	{
-//		return isalpha( anyByte );
-//	}
-}
-
-
-/*static*/ int TiXmlBase::IsAlphaNum( unsigned char anyByte, TiXmlEncoding /*encoding*/ )
-{
-	// This will only work for low-ascii, everything else is assumed to be a valid
-	// letter. I'm not sure this is the best approach, but it is quite tricky trying
-	// to figure out alhabetical vs. not across encoding. So take a very 
-	// conservative approach.
-
-//	if ( encoding == TIXML_ENCODING_UTF8 )
-//	{
-		if ( anyByte < 127 )
-			return isalnum( anyByte );
-		else
-			return 1;	// What else to do? The unicode set is huge...get the english ones right.
-//	}
-//	else
-//	{
-//		return isalnum( anyByte );
-//	}
-}
-
-
-class TiXmlParsingData
-{
-	friend class TiXmlDocument;
-  public:
-	void Stamp( const char* now, TiXmlEncoding encoding );
-
-	const TiXmlCursor& Cursor()	{ return cursor; }
-
-  private:
-	// Only used by the document!
-	TiXmlParsingData( const char* start, int _tabsize, int row, int col )
-	{
-		assert( start );
-		stamp = start;
-		tabsize = _tabsize;
-		cursor.row = row;
-		cursor.col = col;
-	}
-
-	TiXmlCursor		cursor;
-	const char*		stamp;
-	int				tabsize;
-};
-
-
-void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
-{
-	assert( now );
-
-	// Do nothing if the tabsize is 0.
-	if ( tabsize < 1 )
-	{
-		return;
-	}
-
-	// Get the current row, column.
-	int row = cursor.row;
-	int col = cursor.col;
-	const char* p = stamp;
-	assert( p );
-
-	while ( p < now )
-	{
-		// Treat p as unsigned, so we have a happy compiler.
-		const unsigned char* pU = (const unsigned char*)p;
-
-		// Code contributed by Fletcher Dunn: (modified by lee)
-		switch (*pU) {
-			case 0:
-				// We *should* never get here, but in case we do, don't
-				// advance past the terminating null character, ever
-				return;
-
-			case '\r':
-				// bump down to the next line
-				++row;
-				col = 0;				
-				// Eat the character
-				++p;
-
-				// Check for \r\n sequence, and treat this as a single character
-				if (*p == '\n') {
-					++p;
-				}
-				break;
-
-			case '\n':
-				// bump down to the next line
-				++row;
-				col = 0;
-
-				// Eat the character
-				++p;
-
-				// Check for \n\r sequence, and treat this as a single
-				// character.  (Yes, this bizarre thing does occur still
-				// on some arcane platforms...)
-				if (*p == '\r') {
-					++p;
-				}
-				break;
-
-			case '\t':
-				// Eat the character
-				++p;
-
-				// Skip to next tab stop
-				col = (col / tabsize + 1) * tabsize;
-				break;
-
-			case TIXML_UTF_LEAD_0:
-				if ( encoding == TIXML_ENCODING_UTF8 )
-				{
-					if ( *(p+1) && *(p+2) )
-					{
-						// In these cases, don't advance the column. These are
-						// 0-width spaces.
-						if ( *(pU+1)==TIXML_UTF_LEAD_1 && *(pU+2)==TIXML_UTF_LEAD_2 )
-							p += 3;	
-						else if ( *(pU+1)==0xbfU && *(pU+2)==0xbeU )
-							p += 3;	
-						else if ( *(pU+1)==0xbfU && *(pU+2)==0xbfU )
-							p += 3;	
-						else
-							{ p +=3; ++col; }	// A normal character.
-					}
-				}
-				else
-				{
-					++p;
-					++col;
-				}
-				break;
-
-			default:
-				if ( encoding == TIXML_ENCODING_UTF8 )
-				{
-					// Eat the 1 to 4 byte utf8 character.
-					int step = TiXmlBase::utf8ByteTable[*((const unsigned char*)p)];
-					if ( step == 0 )
-						step = 1;		// Error case from bad encoding, but handle gracefully.
-					p += step;
-
-					// Just advance one column, of course.
-					++col;
-				}
-				else
-				{
-					++p;
-					++col;
-				}
-				break;
-		}
-	}
-	cursor.row = row;
-	cursor.col = col;
-	assert( cursor.row >= -1 );
-	assert( cursor.col >= -1 );
-	stamp = p;
-	assert( stamp );
-}
-
-
-const char* TiXmlBase::SkipWhiteSpace( const char* p, TiXmlEncoding encoding )
-{
-	if ( !p || !*p )
-	{
-		return 0;
-	}
-	if ( encoding == TIXML_ENCODING_UTF8 )
-	{
-		while ( *p )
-		{
-			const unsigned char* pU = (const unsigned char*)p;
-			
-			// Skip the stupid Microsoft UTF-8 Byte order marks
-			if (	*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==TIXML_UTF_LEAD_1 
-				 && *(pU+2)==TIXML_UTF_LEAD_2 )
-			{
-				p += 3;
-				continue;
-			}
-			else if(*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==0xbfU
-				 && *(pU+2)==0xbeU )
-			{
-				p += 3;
-				continue;
-			}
-			else if(*(pU+0)==TIXML_UTF_LEAD_0
-				 && *(pU+1)==0xbfU
-				 && *(pU+2)==0xbfU )
-			{
-				p += 3;
-				continue;
-			}
-
-			if ( IsWhiteSpace( *p ) || *p == '\n' || *p =='\r' )		// Still using old rules for white space.
-				++p;
-			else
-				break;
-		}
-	}
-	else
-	{
-		while ( *p && IsWhiteSpace( *p ) || *p == '\n' || *p =='\r' )
-			++p;
-	}
-
-	return p;
-}
-
-#ifdef TIXML_USE_STL
-/*static*/ bool TiXmlBase::StreamWhiteSpace( TIXML_ISTREAM * in, TIXML_STRING * tag )
-{
-	for( ;; )
-	{
-		if ( !in->good() ) return false;
-
-		int c = in->peek();
-		// At this scope, we can't get to a document. So fail silently.
-		if ( !IsWhiteSpace( c ) || c <= 0 )
-			return true;
-
-		*tag += (char) in->get();
-	}
-}
-
-/*static*/ bool TiXmlBase::StreamTo( TIXML_ISTREAM * in, int character, TIXML_STRING * tag )
-{
-	//assert( character > 0 && character < 128 );	// else it won't work in utf-8
-	while ( in->good() )
-	{
-		int c = in->peek();
-		if ( c == character )
-			return true;
-		if ( c <= 0 )		// Silent failure: can't get document at this scope
-			return false;
-
-		in->get();
-		*tag += (char) c;
-	}
-	return false;
-}
-#endif
-
-const char* TiXmlBase::ReadName( const char* p, TIXML_STRING * name, TiXmlEncoding encoding )
-{
-	*name = "";
-	assert( p );
-
-	// Names start with letters or underscores.
-	// Of course, in unicode, tinyxml has no idea what a letter *is*. The
-	// algorithm is generous.
-	//
-	// After that, they can be letters, underscores, numbers,
-	// hyphens, or colons. (Colons are valid ony for namespaces,
-	// but tinyxml can't tell namespaces from names.)
-	if (    p && *p 
-		 && ( IsAlpha( (unsigned char) *p, encoding ) || *p == '_' ) )
-	{
-		while(		p && *p
-				&&	(		IsAlphaNum( (unsigned char ) *p, encoding ) 
-						 || *p == '_'
-						 || *p == '-'
-						 || *p == '.'
-						 || *p == ':' ) )
-		{
-			(*name) += *p;
-			++p;
-		}
-		return p;
-	}
-	return 0;
-}
-
-const char* TiXmlBase::GetEntity( const char* p, char* value, int* length, TiXmlEncoding encoding )
-{
-	// Presume an entity, and pull it out.
-    TIXML_STRING ent;
-	int i;
-	*length = 0;
-
-	if ( *(p+1) && *(p+1) == '#' && *(p+2) )
-	{
-		unsigned long ucs = 0;
-		ptrdiff_t delta = 0;
-		unsigned mult = 1;
-
-		if ( *(p+2) == 'x' )
-		{
-			// Hexadecimal.
-			if ( !*(p+3) ) return 0;
-
-			const char* q = p+3;
-			q = strchr( q, ';' );
-
-			if ( !q || !*q ) return 0;
-
-			delta = q-p;
-			--q;
-
-			while ( *q != 'x' )
-			{
-				if ( *q >= '0' && *q <= '9' )
-					ucs += mult * (*q - '0');
-				else if ( *q >= 'a' && *q <= 'f' )
-					ucs += mult * (*q - 'a' + 10);
-				else if ( *q >= 'A' && *q <= 'F' )
-					ucs += mult * (*q - 'A' + 10 );
-				else 
-					return 0;
-				mult *= 16;
-				--q;
-			}
-		}
-		else
-		{
-			// Decimal.
-			if ( !*(p+2) ) return 0;
-
-			const char* q = p+2;
-			q = strchr( q, ';' );
-
-			if ( !q || !*q ) return 0;
-
-			delta = q-p;
-			--q;
-
-			while ( *q != '#' )
-			{
-				if ( *q >= '0' && *q <= '9' )
-					ucs += mult * (*q - '0');
-				else 
-					return 0;
-				mult *= 10;
-				--q;
-			}
-		}
-		if ( encoding == TIXML_ENCODING_UTF8 )
-		{
-			// convert the UCS to UTF-8
-			ConvertUTF32ToUTF8( ucs, value, length );
-		}
-		else
-		{
-			*value = (char)ucs;
-			*length = 1;
-		}
-		return p + delta + 1;
-	}
-
-	// Now try to match it.
-	for( i=0; i<NUM_ENTITY; ++i )
-	{
-		if ( strncmp( entity[i].str, p, entity[i].strLength ) == 0 )
-		{
-			assert( strlen( entity[i].str ) == entity[i].strLength );
-			*value = entity[i].chr;
-			*length = 1;
-			return ( p + entity[i].strLength );
-		}
-	}
-
-	// So it wasn't an entity, its unrecognized, or something like that.
-	*value = *p;	// Don't put back the last one, since we return it!
-	return p+1;
-}
-
-
-bool TiXmlBase::StringEqual( const char* p,
-							 const char* tag,
-							 bool ignoreCase,
-							 TiXmlEncoding encoding )
-{
-	assert( p );
-	assert( tag );
-	if ( !p || !*p )
-	{
-		assert( 0 );
-		return false;
-	}
-
-	const char* q = p;
-
-	if ( ignoreCase )
-	{
-		while ( *q && *tag && ToLower( *q, encoding ) == ToLower( *tag, encoding ) )
-		{
-			++q;
-			++tag;
-		}
-
-		if ( *tag == 0 )
-			return true;
-	}
-	else
-	{
-		while ( *q && *tag && *q == *tag )
-		{
-			++q;
-			++tag;
-		}
-
-		if ( *tag == 0 )		// Have we found the end of the tag, and everything equal?
-			return true;
-	}
-	return false;
-}
-
-const char* TiXmlBase::ReadText(	const char* p, 
-									TIXML_STRING * text, 
-									bool trimWhiteSpace, 
-									const char* endTag, 
-									bool caseInsensitive,
-									TiXmlEncoding encoding )
-{
-    *text = "";
-	if (    !trimWhiteSpace			// certain tags always keep whitespace
-		 || !condenseWhiteSpace )	// if true, whitespace is always kept
-	{
-		// Keep all the white space.
-		while (	   p && *p
-				&& !StringEqual( p, endTag, caseInsensitive, encoding )
-			  )
-		{
-			int len;
-			char cArr[4] = { 0, 0, 0, 0 };
-			p = GetChar( p, cArr, &len, encoding );
-			text->append( cArr, len );
-		}
-	}
-	else
-	{
-		bool whitespace = false;
-
-		// Remove leading white space:
-		p = SkipWhiteSpace( p, encoding );
-		while (	   p && *p
-				&& !StringEqual( p, endTag, caseInsensitive, encoding ) )
-		{
-			if ( *p == '\r' || *p == '\n' )
-			{
-				whitespace = true;
-				++p;
-			}
-			else if ( IsWhiteSpace( *p ) )
-			{
-				whitespace = true;
-				++p;
-			}
-			else
-			{
-				// If we've found whitespace, add it before the
-				// new character. Any whitespace just becomes a space.
-				if ( whitespace )
-				{
-					(*text) += ' ';
-					whitespace = false;
-				}
-				int len;
-				char cArr[4] = { 0, 0, 0, 0 };
-				p = GetChar( p, cArr, &len, encoding );
-				if ( len == 1 )
-					(*text) += cArr[0];	// more efficient
-				else
-					text->append( cArr, len );
-			}
-		}
-	}
-	return p + strlen( endTag );
-}
-
-#ifdef TIXML_USE_STL
-
-void TiXmlDocument::StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag )
-{
-	// The basic issue with a document is that we don't know what we're
-	// streaming. Read something presumed to be a tag (and hope), then
-	// identify it, and call the appropriate stream method on the tag.
-	//
-	// This "pre-streaming" will never read the closing ">" so the
-	// sub-tag can orient itself.
-
-	if ( !StreamTo( in, '<', tag ) ) 
-	{
-		SetError( TIXML_ERROR_PARSING_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return;
-	}
-
-	while ( in->good() )
-	{
-		int tagIndex = (int) tag->length();
-		while ( in->good() && in->peek() != '>' )
-		{
-			int c = in->get();
-			if ( c <= 0 )
-			{
-				SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-				break;
-			}
-			(*tag) += (char) c;
-		}
-
-		if ( in->good() )
-		{
-			// We now have something we presume to be a node of 
-			// some sort. Identify it, and call the node to
-			// continue streaming.
-			TiXmlNode* node = Identify( tag->c_str() + tagIndex, TIXML_DEFAULT_ENCODING );
-
-			if ( node )
-			{
-				node->StreamIn( in, tag );
-				bool isElement = node->ToElement() != 0;
-				delete node;
-				node = 0;
-
-				// If this is the root element, we're done. Parsing will be
-				// done by the >> operator.
-				if ( isElement )
-				{
-					return;
-				}
-			}
-			else
-			{
-				SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
-				return;
-			}
-		}
-	}
-	// We should have returned sooner.
-	SetError( TIXML_ERROR, 0, 0, TIXML_ENCODING_UNKNOWN );
-}
-
-#endif
-
-const char* TiXmlDocument::Parse( const char* p, TiXmlParsingData* prevData, TiXmlEncoding encoding )
-{
-	ClearError();
-
-	// Parse away, at the document level. Since a document
-	// contains nothing but other tags, most of what happens
-	// here is skipping white space.
-	if ( !p || !*p )
-	{
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	// Note that, for a document, this needs to come
-	// before the while space skip, so that parsing
-	// starts from the pointer we are given.
-	location.Clear();
-	if ( prevData )
-	{
-		location.row = prevData->cursor.row;
-		location.col = prevData->cursor.col;
-	}
-	else
-	{
-		location.row = 0;
-		location.col = 0;
-	}
-	TiXmlParsingData data( p, TabSize(), location.row, location.col );
-	location = data.Cursor();
-
-	if ( encoding == TIXML_ENCODING_UNKNOWN )
-	{
-		// Check for the Microsoft UTF-8 lead bytes.
-		const unsigned char* pU = (const unsigned char*)p;
-		if (	*(pU+0) && *(pU+0) == TIXML_UTF_LEAD_0
-			 && *(pU+1) && *(pU+1) == TIXML_UTF_LEAD_1
-			 && *(pU+2) && *(pU+2) == TIXML_UTF_LEAD_2 )
-		{
-			encoding = TIXML_ENCODING_UTF8;
-		}
-	}
-
-    p = SkipWhiteSpace( p, encoding );
-	if ( !p )
-	{
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, TIXML_ENCODING_UNKNOWN );
-		return 0;
-	}
-
-	while ( p && *p )
-	{
-		TiXmlNode* node = Identify( p, encoding );
-		if ( node )
-		{
-			p = node->Parse( p, &data, encoding );
-			LinkEndChild( node );
-		}
-		else
-		{
-			break;
-		}
-
-		// Did we get encoding info?
-		if (    encoding == TIXML_ENCODING_UNKNOWN
-			 && node->ToDeclaration() )
-		{
-			TiXmlDeclaration* dec = node->ToDeclaration();
-			const char* enc = dec->Encoding();
-			assert( enc );
-
-			if ( *enc == 0 )
-				encoding = TIXML_ENCODING_UTF8;
-			else if ( StringEqual( enc, "UTF-8", true, TIXML_ENCODING_UNKNOWN ) )
-				encoding = TIXML_ENCODING_UTF8;
-			else if ( StringEqual( enc, "UTF8", true, TIXML_ENCODING_UNKNOWN ) )
-				encoding = TIXML_ENCODING_UTF8;	// incorrect, but be nice
-			else 
-				encoding = TIXML_ENCODING_LEGACY;
-		}
-
-		p = SkipWhiteSpace( p, encoding );
-	}
-
-	// Was this empty?
-	if ( !firstChild ) {
-		SetError( TIXML_ERROR_DOCUMENT_EMPTY, 0, 0, encoding );
-		return 0;
-	}
-
-	// All is well.
-	return p;
-}
-
-void TiXmlDocument::SetError( int err, const char* pError, TiXmlParsingData* data, TiXmlEncoding encoding )
-{	
-	// The first error in a chain is more accurate - don't set again!
-	if ( error )
-		return;
-
-	assert( err > 0 && err < TIXML_ERROR_STRING_COUNT );
-	error   = true;
-	errorId = err;
-	errorDesc = errorString[ errorId ];
-
-	errorLocation.Clear();
-	if ( pError && data )
-	{
-		//TiXmlParsingData data( pError, prevData );
-		data->Stamp( pError, encoding );
-		errorLocation = data->Cursor();
-	}
-}
-
-
-TiXmlNode* TiXmlNode::Identify( const char* p, TiXmlEncoding encoding )
-{
-	TiXmlNode* returnNode = 0;
-
-	p = SkipWhiteSpace( p, encoding );
-	if( !p || !*p || *p != '<' )
-	{
-		return 0;
-	}
-
-	TiXmlDocument* doc = GetDocument();
-	p = SkipWhiteSpace( p, encoding );
-
-	if ( !p || !*p )
-	{
-		return 0;
-	}
-
-	// What is this thing? 
-	// - Elements start with a letter or underscore, but xml is reserved.
-	// - Comments: <!--
-	// - Decleration: <?xml
-	// - Everthing else is unknown to tinyxml.
-	//
-
-	const char* xmlHeader = { "<?xml" };
-	const char* commentHeader = { "<!--" };
-	const char* dtdHeader = { "<!" };
-
-	if ( StringEqual( p, xmlHeader, true, encoding ) )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Declaration\n" );
-		#endif
-		returnNode = new TiXmlDeclaration();
-	}
-	else if ( StringEqual( p, commentHeader, false, encoding ) )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Comment\n" );
-		#endif
-		returnNode = new TiXmlComment();
-	}
-	else if ( StringEqual( p, dtdHeader, false, encoding ) )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Unknown(1)\n" );
-		#endif
-		returnNode = new TiXmlUnknown();
-	}
-	else if (    IsAlpha( *(p+1), encoding )
-			  || *(p+1) == '_' )
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Element\n" );
-		#endif
-		returnNode = new TiXmlElement( "" );
-	}
-	else
-	{
-		#ifdef DEBUG_PARSER
-			TIXML_LOG( "XML parsing Unknown(2)\n" );
-		#endif
-		returnNode = new TiXmlUnknown();
-	}
-
-	if ( returnNode )
-	{
-		// Set the parent, so it can report errors
-		returnNode->parent = this;
-	}
-	else
-	{
-		if ( doc )
-			doc->SetError( TIXML_ERROR_OUT_OF_MEMORY, 0, 0, TIXML_ENCODING_UNKNOWN );
-	}
-	return returnNode;
-}
-
-#ifdef TIXML_USE_STL
-
-void TiXmlElement::StreamIn (TIXML_ISTREAM * in, TIXML_STRING * tag)
-{
-	// We're called with some amount of pre-parsing. That is, some of "this"
-	// element is in "tag". Go ahead and stream to the closing ">"
-	while( in->good() )
-	{
-		int c = in->get();
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-		(*tag) += (char) c ;
-		
-		if ( c == '>' )
-			break;
-	}
-
-	if ( tag->length() < 3 ) return;
-
-	// Okay...if we are a "/>" tag, then we're done. We've read a complete tag.
-	// If not, identify and stream.
-
-	if (    tag->at( tag->length() - 1 ) == '>' 
-		 && tag->at( tag->length() - 2 ) == '/' )
-	{
-		// All good!
-		return;
-	}
-	else if ( tag->at( tag->length() - 1 ) == '>' )
-	{
-		// There is more. Could be:
-		//		text
-		//		closing tag
-		//		another node.
-		for ( ;; )
-		{
-			StreamWhiteSpace( in, tag );
-
-			// Do we have text?
-			if ( in->good() && in->peek() != '<' ) 
-			{
-				// Yep, text.
-				TiXmlText text( "" );
-				text.StreamIn( in, tag );
-
-				// What follows text is a closing tag or another node.
-				// Go around again and figure it out.
-				continue;
-			}
-
-			// We now have either a closing tag...or another node.
-			// We should be at a "<", regardless.
-			if ( !in->good() ) return;
-			assert( in->peek() == '<' );
-			int tagIndex = tag->length();
-
-			bool closingTag = false;
-			bool firstCharFound = false;
-
-			for( ;; )
-			{
-				if ( !in->good() )
-					return;
-
-				int c = in->peek();
-				if ( c <= 0 )
-				{
-					TiXmlDocument* document = GetDocument();
-					if ( document )
-						document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-					return;
-				}
-				
-				if ( c == '>' )
-					break;
-
-				*tag += (char) c;
-				in->get();
-
-				if ( !firstCharFound && c != '<' && !IsWhiteSpace( c ) )
-				{
-					firstCharFound = true;
-					if ( c == '/' )
-						closingTag = true;
-				}
-			}
-			// If it was a closing tag, then read in the closing '>' to clean up the input stream.
-			// If it was not, the streaming will be done by the tag.
-			if ( closingTag )
-			{
-				if ( !in->good() )
-					return;
-
-				int c = in->get();
-				if ( c <= 0 )
-				{
-					TiXmlDocument* document = GetDocument();
-					if ( document )
-						document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-					return;
-				}
-				assert( c == '>' );
-				*tag += (char) c;
-
-				// We are done, once we've found our closing tag.
-				return;
-			}
-			else
-			{
-				// If not a closing tag, id it, and stream.
-				const char* tagloc = tag->c_str() + tagIndex;
-				TiXmlNode* node = Identify( tagloc, TIXML_DEFAULT_ENCODING );
-				if ( !node )
-					return;
-				node->StreamIn( in, tag );
-				delete node;
-				node = 0;
-
-				// No return: go around from the beginning: text, closing tag, or node.
-			}
-		}
-	}
-}
-#endif
-
-const char* TiXmlElement::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
-{
-	p = SkipWhiteSpace( p, encoding );
-	TiXmlDocument* document = GetDocument();
-
-	if ( !p || !*p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, 0, 0, encoding );
-		return 0;
-	}
-
-//	TiXmlParsingData data( p, prevData );
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-
-	if ( *p != '<' )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, p, data, encoding );
-		return 0;
-	}
-
-	p = SkipWhiteSpace( p+1, encoding );
-
-	// Read the name.
-	const char* pErr = p;
-
-    p = ReadName( p, &value, encoding );
-	if ( !p || !*p )
-	{
-		if ( document )	document->SetError( TIXML_ERROR_FAILED_TO_READ_ELEMENT_NAME, pErr, data, encoding );
-		return 0;
-	}
-
-    TIXML_STRING endTag ("</");
-	endTag += value;
-	endTag += ">";
-
-	// Check for and read attributes. Also look for an empty
-	// tag or an end tag.
-	while ( p && *p )
-	{
-		pErr = p;
-		p = SkipWhiteSpace( p, encoding );
-		if ( !p || !*p )
-		{
-			if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
-			return 0;
-		}
-		if ( *p == '/' )
-		{
-			++p;
-			// Empty tag.
-			if ( *p  != '>' )
-			{
-				if ( document ) document->SetError( TIXML_ERROR_PARSING_EMPTY, p, data, encoding );		
-				return 0;
-			}
-			return (p+1);
-		}
-		else if ( *p == '>' )
-		{
-			// Done with attributes (if there were any.)
-			// Read the value -- which can include other
-			// elements -- read the end tag, and return.
-			++p;
-			p = ReadValue( p, data, encoding );		// Note this is an Element method, and will set the error if one happens.
-			if ( !p || !*p )
-				return 0;
-
-			// We should find the end tag now
-			if ( StringEqual( p, endTag.c_str(), false, encoding ) )
-			{
-				p += endTag.length();
-				return p;
-			}
-			else
-			{
-				if ( document ) document->SetError( TIXML_ERROR_READING_END_TAG, p, data, encoding );
-				return 0;
-			}
-		}
-		else
-		{
-			// Try to read an attribute:
-			TiXmlAttribute* attrib = new TiXmlAttribute();
-			if ( !attrib )
-			{
-				if ( document ) document->SetError( TIXML_ERROR_OUT_OF_MEMORY, pErr, data, encoding );
-				return 0;
-			}
-
-			attrib->SetDocument( document );
-			const char* pErr = p;
-			p = attrib->Parse( p, data, encoding );
-
-			if ( !p || !*p )
-			{
-				if ( document ) document->SetError( TIXML_ERROR_PARSING_ELEMENT, pErr, data, encoding );
-				delete attrib;
-				return 0;
-			}
-
-			// Handle the strange case of double attributes:
-			TiXmlAttribute* node = attributeSet.Find( attrib->Name() );
-			if ( node )
-			{
-				node->SetValue( attrib->Value() );
-				delete attrib;
-				return 0;
-			}
-
-			attributeSet.Add( attrib );
-		}
-	}
-	return p;
-}
-
-
-const char* TiXmlElement::ReadValue( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
-{
-	TiXmlDocument* document = GetDocument();
-
-	const char* pWithWhiteSpace = p;
-	// Read in text and elements in any order.
-	p = SkipWhiteSpace( p, encoding );
-	while ( p && *p )
-	{
-		if ( *p != '<' )
-		{
-			// Take what we have, make a text element.
-			TiXmlText* textNode = new TiXmlText( "" );
-
-			if ( !textNode )
-			{
-				if ( document ) document->SetError( TIXML_ERROR_OUT_OF_MEMORY, 0, 0, encoding );
-				    return 0;
-			}
-
-			if ( TiXmlBase::IsWhiteSpaceCondensed() )
-			{
-				p = textNode->Parse( p, data, encoding );
-			}
-			else
-			{
-				// Special case: we want to keep the white space
-				// so that leading spaces aren't removed.
-				p = textNode->Parse( pWithWhiteSpace, data, encoding );
-			}
-
-			if ( !textNode->Blank() )
-				LinkEndChild( textNode );
-			else
-				delete textNode;
-		} 
-		else 
-		{
-			// We hit a '<'
-			// Have we hit a new element or an end tag?
-			if ( StringEqual( p, "</", false, encoding ) )
-			{
-				return p;
-			}
-			else
-			{
-				TiXmlNode* node = Identify( p, encoding );
-				if ( node )
-				{
-					p = node->Parse( p, data, encoding );
-					LinkEndChild( node );
-				}				
-				else
-				{
-					return 0;
-				}
-			}
-		}
-		p = SkipWhiteSpace( p, encoding );
-	}
-
-	if ( !p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ELEMENT_VALUE, 0, 0, encoding );
-	}	
-	return p;
-}
-
-
-#ifdef TIXML_USE_STL
-void TiXmlUnknown::StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag )
-{
-	while ( in->good() )
-	{
-		int c = in->get();	
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-		(*tag) += (char) c;
-
-		if ( c == '>' )
-		{
-			// All is well.
-			return;		
-		}
-	}
-}
-#endif
-
-
-const char* TiXmlUnknown::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
-{
-	TiXmlDocument* document = GetDocument();
-	p = SkipWhiteSpace( p, encoding );
-
-//	TiXmlParsingData data( p, prevData );
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-	if ( !p || !*p || *p != '<' )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_UNKNOWN, p, data, encoding );
-		return 0;
-	}
-	++p;
-    value = "";
-
-	while ( p && *p && *p != '>' )
-	{
-		value += *p;
-		++p;
-	}
-
-	if ( !p )
-	{
-		if ( document )	document->SetError( TIXML_ERROR_PARSING_UNKNOWN, 0, 0, encoding );
-	}
-	if ( *p == '>' )
-		return p+1;
-	return p;
-}
-
-#ifdef TIXML_USE_STL
-void TiXmlComment::StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag )
-{
-	while ( in->good() )
-	{
-		int c = in->get();	
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-
-		(*tag) += (char) c;
-
-		if ( c == '>' 
-			 && tag->at( tag->length() - 2 ) == '-'
-			 && tag->at( tag->length() - 3 ) == '-' )
-		{
-			// All is well.
-			return;		
-		}
-	}
-}
-#endif
-
-
-const char* TiXmlComment::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
-{
-	TiXmlDocument* document = GetDocument();
-	value = "";
-
-	p = SkipWhiteSpace( p, encoding );
-
-//	TiXmlParsingData data( p, prevData );
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-	const char* startTag = "<!--";
-	const char* endTag   = "-->";
-
-	if ( !StringEqual( p, startTag, false, encoding ) )
-	{
-		document->SetError( TIXML_ERROR_PARSING_COMMENT, p, data, encoding );
-		return 0;
-	}
-	p += strlen( startTag );
-	p = ReadText( p, &value, false, endTag, false, encoding );
-	return p;
-}
-
-
-const char* TiXmlAttribute::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
-{
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p ) return 0;
-
-	int tabsize = 4;
-	if ( document )
-		tabsize = document->TabSize();
-
-//	TiXmlParsingData data( p, prevData );
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-	// Read the name, the '=' and the value.
-	const char* pErr = p;
-	p = ReadName( p, &name, encoding );
-	if ( !p || !*p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, pErr, data, encoding );
-		return 0;
-	}
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p || *p != '=' )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
-		return 0;
-	}
-
-	++p;	// skip '='
-	p = SkipWhiteSpace( p, encoding );
-	if ( !p || !*p )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_READING_ATTRIBUTES, p, data, encoding );
-		return 0;
-	}
-	
-	const char* end;
-
-	if ( *p == '\'' )
-	{
-		++p;
-		end = "\'";
-		p = ReadText( p, &value, false, end, false, encoding );
-	}
-	else if ( *p == '"' )
-	{
-		++p;
-		end = "\"";
-		p = ReadText( p, &value, false, end, false, encoding );
-	}
-	else
-	{
-		// All attribute values should be in single or double quotes.
-		// But this is such a common error that the parser will try
-		// its best, even without them.
-		value = "";
-		while (    p && *p										// existence
-				&& !IsWhiteSpace( *p ) && *p != '\n' && *p != '\r'	// whitespace
-				&& *p != '/' && *p != '>' )						// tag end
-		{
-			value += *p;
-			++p;
-		}
-	}
-	return p;
-}
-
-#ifdef TIXML_USE_STL
-void TiXmlText::StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag )
-{
-	while ( in->good() )
-	{
-		int c = in->peek();	
-		if ( c == '<' )
-			return;
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-
-		(*tag) += (char) c;
-		in->get();
-	}
-}
-#endif
-
-const char* TiXmlText::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding encoding )
-{
-	value = "";
-//	TiXmlParsingData data( p, prevData );
-	if ( data )
-	{
-		data->Stamp( p, encoding );
-		location = data->Cursor();
-	}
-	bool ignoreWhite = true;
-
-	const char* end = "<";
-	p = ReadText( p, &value, ignoreWhite, end, false, encoding );
-	if ( p )
-		return p-1;	// don't truncate the '<'
-	return 0;
-}
-
-#ifdef TIXML_USE_STL
-void TiXmlDeclaration::StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag )
-{
-	while ( in->good() )
-	{
-		int c = in->get();
-		if ( c <= 0 )
-		{
-			TiXmlDocument* document = GetDocument();
-			if ( document )
-				document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
-			return;
-		}
-		(*tag) += (char) c;
-
-		if ( c == '>' )
-		{
-			// All is well.
-			return;
-		}
-	}
-}
-#endif
-
-const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXmlEncoding _encoding )
-{
-	p = SkipWhiteSpace( p, _encoding );
-	// Find the beginning, find the end, and look for
-	// the stuff in-between.
-	TiXmlDocument* document = GetDocument();
-	if ( !p || !*p || !StringEqual( p, "<?xml", true, _encoding ) )
-	{
-		if ( document ) document->SetError( TIXML_ERROR_PARSING_DECLARATION, 0, 0, _encoding );
-		return 0;
-	}
-//	TiXmlParsingData data( p, prevData );
-	if ( data )
-	{
-		data->Stamp( p, _encoding );
-		location = data->Cursor();
-	}
-	p += 5;
-
-	version = "";
-	encoding = "";
-	standalone = "";
-
-	while ( p && *p )
-	{
-		if ( *p == '>' )
-		{
-			++p;
-			return p;
-		}
-
-		p = SkipWhiteSpace( p, _encoding );
-		if ( StringEqual( p, "version", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			version = attrib.Value();
-		}
-		else if ( StringEqual( p, "encoding", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			encoding = attrib.Value();
-		}
-		else if ( StringEqual( p, "standalone", true, _encoding ) )
-		{
-			TiXmlAttribute attrib;
-			p = attrib.Parse( p, data, _encoding );		
-			standalone = attrib.Value();
-		}
-		else
-		{
-			// Read over whatever it is.
-			while( p && *p && *p != '>' && !IsWhiteSpace( *p ) )
-				++p;
-		}
-	}
-	return 0;
-}
-
-bool TiXmlText::Blank() const
-{
-	for ( unsigned i=0; i<value.length(); i++ )
-		if ( !IsWhiteSpace( value[i] ) )
-			return false;
-	return true;
-}
-
diff --git a/common/useperl.h b/common/useperl.h
index a6345df5d..fb638be57 100644
--- a/common/useperl.h
+++ b/common/useperl.h
@@ -13,6 +13,10 @@
 #ifndef WIN32
 extern "C" {	//the perl headers dont do this for us...
 #endif
+#if _MSC_VER
+#define __inline__ __inline
+#define __builtin_expect 
+#endif
 #include <perl.h>
 #include <XSUB.h>
 #ifndef WIN32
diff --git a/common/version.h b/common/version.h
index f7a161dc1..0f659d57b 100644
--- a/common/version.h
+++ b/common/version.h
@@ -1,20 +1,22 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
 #ifndef _EQEMU_VERSION_H
 #define _EQEMU_VERSION_H
@@ -22,22 +24,24 @@
 #define LOGIN_VERSION "0.8.0"
 #define EQEMU_PROTOCOL_VERSION "0.3.10"
 
-#define CURRENT_VERSION "1.1.3"
-
-/*
-	Everytime a Database SQL is added to Github,
-		increment CURRENT_BINARY_DATABASE_VERSION number and make sure you update the manifest
-	Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
-*/
+#define CURRENT_VERSION "2.0"
 
 
-#define CURRENT_BINARY_DATABASE_VERSION 9141
+/**
+ * Every time a Database SQL is added to Github increment CURRENT_BINARY_DATABASE_VERSION
+ * number and make sure you update the manifest
+ *
+ * Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
+ */
+
+#define CURRENT_BINARY_DATABASE_VERSION 9146
 
 #ifdef BOTS
-	#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9024
+	#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9026
 #else
 	#define CURRENT_BINARY_BOTS_DATABASE_VERSION 0 // must be 0
 #endif
+
 #define COMPILE_DATE	__DATE__
 #define COMPILE_TIME	__TIME__
 #ifndef WIN32
diff --git a/common/worldconn.cpp b/common/worldconn.cpp
index 22a34a3ba..77bfa6162 100644
--- a/common/worldconn.cpp
+++ b/common/worldconn.cpp
@@ -44,7 +44,7 @@ bool WorldConnection::SendPacket(ServerPacket* pack) {
 
 void WorldConnection::OnConnected() {
 	const EQEmuConfig *Config=EQEmuConfig::get();
-	Log(Logs::General, Logs::Netcode, "[WORLD] Connected to World: %s:%d", Config->WorldIP.c_str(), Config->WorldTCPPort);
+	LogNetcode("[WORLD] Connected to World: [{}]:[{}]", Config->WorldIP.c_str(), Config->WorldTCPPort);
 
 	auto pack = new ServerPacket(ServerOP_ZAAuth, 16);
 	MD5::Generate((const uchar*) m_password.c_str(), m_password.length(), pack->pBuffer);
@@ -76,7 +76,7 @@ bool WorldConnection::Connect() {
 	if (tcpc.Connect(Config->WorldIP.c_str(), Config->WorldTCPPort, errbuf)) {
 		return true;
 	} else {
-		Log(Logs::General, Logs::Netcode, "[WORLD] WorldConnection connect: Connecting to the server %s:%d failed: %s", Config->WorldIP.c_str(), Config->WorldTCPPort, errbuf);
+		LogNetcode("[WORLD] WorldConnection connect: Connecting to the server [{}]:[{}] failed: [{}]", Config->WorldIP.c_str(), Config->WorldTCPPort, errbuf);
 	}
 	return false;
 }
diff --git a/common/xml_parser.cpp b/common/xml_parser.cpp
deleted file mode 100644
index f252ce177..000000000
--- a/common/xml_parser.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "global_define.h"
-#include "xml_parser.h"
-
-XMLParser::XMLParser() {
-	ParseOkay = false;
-}
-
-bool XMLParser::ParseFile(const char *file, const char *root_ele) {
-	std::map<std::string,ElementHandler>::iterator handler;
-	TiXmlDocument doc( file );
-	if(!doc.LoadFile()) {
-		printf("Unable to load '%s': %s\n", file, doc.ErrorDesc());
-		return(false);
-	}
-
-	TiXmlElement *root = doc.FirstChildElement( root_ele );
-	if(root == nullptr) {
-		printf("Unable to find root '%s' in %s\n",root_ele, file);
-		return(false);
-	}
-
-	ParseOkay=true;
-
-	TiXmlNode *main_element = nullptr;
-	while( (main_element = root->IterateChildren( main_element )) ) {
-		if(main_element->Type() != TiXmlNode::ELEMENT)
-			continue;	//skip crap we dont care about
-		TiXmlElement *ele = (TiXmlElement *) main_element;
-
-		handler=Handlers.find(ele->Value());
-		if (handler!=Handlers.end() && handler->second) {
-			ElementHandler h=handler->second;
-
-			/*
-			*
-			* This is kinda a sketchy operation here, since all of these
-			* element handler methods will be functions in child classes.
-			* This essentially causes us to do an un-checkable (and hence
-			* un-handle-properly-able) cast down to the child class. This
-			* WILL BREAK if any children classes do multiple inheritance.
-			*
-			*
-			*/
-
-			(this->*h)(ele);
-		} else {
-			//unhandled element.... do nothing for now
-		}
-
-	}
-
-	return(ParseOkay);
-}
-
-const char *XMLParser::ParseTextBlock(TiXmlNode *within, const char *name, bool optional) {
-	TiXmlElement * txt = within->FirstChildElement(name);
-	if(txt == nullptr) {
-		if(!optional) {
-			printf("Unable to find a '%s' element on %s element at line %d\n", name, within->Value(), within->Row());
-			ParseOkay=false;
-		}
-		return(nullptr);
-	}
-	TiXmlNode *contents = txt->FirstChild();
-	if(contents == nullptr || contents->Type() != TiXmlNode::TEXT) {
-		if(!optional)
-			printf("Node '%s' was expected to be a text element in %s element at line %d\n", name, txt->Value(), txt->Row());
-		return(nullptr);
-	}
-	return(contents->Value());
-}
-
-const char *XMLParser::GetText(TiXmlNode *within, bool optional) {
-	TiXmlNode *contents = within->FirstChild();
-	if(contents == nullptr || contents->Type() != TiXmlNode::TEXT) {
-		if(!optional) {
-			printf("Node was expected to be a text element in %s element at line %d\n", within->Value(), within->Row());
-			ParseOkay=false;
-		}
-		return(nullptr);
-	}
-	return(contents->Value());
-}
-
diff --git a/common/xml_parser.h b/common/xml_parser.h
deleted file mode 100644
index 38ed6d254..000000000
--- a/common/xml_parser.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2006 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef XMLParser_H
-#define XMLParser_H
-
-#include "global_define.h"
-#include "tinyxml/tinyxml.h"
-#include "../common/types.h"
-
-#include <string>
-#include <map>
-
-/*
-* See note in XMLParser::ParseFile() before inheriting this class.
-*/
-class XMLParser {
-public:
-	typedef void (XMLParser::*ElementHandler)(TiXmlElement *ele);
-
-	XMLParser();
-	virtual ~XMLParser() {}
-
-	bool ParseFile(const char *file, const char *root_ele);
-	bool ParseStatus() const { return ParseOkay; }
-
-protected:
-	const char *ParseTextBlock(TiXmlNode *within, const char *name, bool optional = false);
-	const char *GetText(TiXmlNode *within, bool optional = false);
-
-	std::map<std::string,ElementHandler> Handlers;
-
-	bool ParseOkay;
-
-};
-
-#endif
-
diff --git a/eqlaunch/CMakeLists.txt b/eqlaunch/CMakeLists.txt
index 260a2b5bc..c5e7bbd03 100644
--- a/eqlaunch/CMakeLists.txt
+++ b/eqlaunch/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(eqlaunch_sources
 	eqlaunch.cpp
diff --git a/hc/CMakeLists.txt b/hc/CMakeLists.txt
index 1aa5805d5..9f2c78298 100644
--- a/hc/CMakeLists.txt
+++ b/hc/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(hc_sources
 	eq.cpp
@@ -13,14 +13,10 @@ SET(hc_headers
 	world.h
 )
 
-FIND_PACKAGE(OpenSSL REQUIRED)
-
-INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-
 ADD_EXECUTABLE(hc ${hc_sources} ${hc_headers})
 
 INSTALL(TARGETS hc RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-TARGET_LINK_LIBRARIES(hc ${SERVER_LIBS} ${OPENSSL_LIBRARIES})
+TARGET_LINK_LIBRARIES(hc ${SERVER_LIBS})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
diff --git a/libs/luabind/CMakeLists.txt b/libs/luabind/CMakeLists.txt
index de3b60c61..d29bb4bb1 100644
--- a/libs/luabind/CMakeLists.txt
+++ b/libs/luabind/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(lb_sources
     src/class.cpp
diff --git a/loginserver/CMakeLists.txt b/loginserver/CMakeLists.txt
index df06e7572..7d60655fc 100644
--- a/loginserver/CMakeLists.txt
+++ b/loginserver/CMakeLists.txt
@@ -1,25 +1,26 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(eqlogin_sources
+	account_management.cpp
 	client.cpp
 	client_manager.cpp
-	config.cpp
-	database_mysql.cpp
-	database_postgresql.cpp
+	database.cpp
 	encryption.cpp
+	loginserver_command_handler.cpp
+	loginserver_webserver.cpp
 	main.cpp
 	server_manager.cpp
 	world_server.cpp
 )
 
 SET(eqlogin_headers
+	account_management.h
 	client.h
 	client_manager.h
-	config.h
 	database.h
-	database_mysql.h
-	database_postgresql.h
 	encryption.h
+	loginserver_command_handler.h
+	loginserver_webserver.h
 	login_server.h
 	login_structures.h
 	options.h
@@ -27,14 +28,10 @@ SET(eqlogin_headers
 	world_server.h
 )
 
-FIND_PACKAGE(OpenSSL REQUIRED)
-
-INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
-
 ADD_EXECUTABLE(loginserver ${eqlogin_sources} ${eqlogin_headers})
 
 INSTALL(TARGETS loginserver RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 
-TARGET_LINK_LIBRARIES(loginserver ${SERVER_LIBS} ${OPENSSL_LIBRARIES})
+TARGET_LINK_LIBRARIES(loginserver ${SERVER_LIBS})
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
diff --git a/loginserver/account_management.cpp b/loginserver/account_management.cpp
new file mode 100644
index 000000000..0ed766c9f
--- /dev/null
+++ b/loginserver/account_management.cpp
@@ -0,0 +1,419 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "account_management.h"
+#include "login_server.h"
+#include "../common/event/task_scheduler.h"
+#include "../common/event/event_loop.h"
+#include "../common/net/dns.h"
+
+extern LoginServer       server;
+EQ::Event::TaskScheduler task_runner;
+
+/**
+ * @param username
+ * @param password
+ * @param email
+ * @param source_loginserver
+ * @param login_account_id
+ * @return
+ */
+int32 AccountManagement::CreateLoginServerAccount(
+	std::string username,
+	std::string password,
+	std::string email,
+	const std::string &source_loginserver,
+	uint32 login_account_id
+)
+{
+	auto mode = server.options.GetEncryptionMode();
+	auto hash = eqcrypt_hash(username, password, mode);
+
+	LogInfo(
+		"Attempting to create local login account for user [{0}] encryption algorithm [{1}] ({2})",
+		username,
+		GetEncryptionByModeId(mode),
+		mode
+	);
+
+	unsigned int db_id = 0;
+	if (server.db->DoesLoginServerAccountExist(username, hash, source_loginserver, 1)) {
+		LogWarning(
+			"Attempting to create local login account for user [{0}] login [{1}] but already exists!",
+			username,
+			source_loginserver
+		);
+
+		return -1;
+	}
+
+	uint32 created_account_id = 0;
+	if (login_account_id > 0) {
+		created_account_id = server.db->CreateLoginDataWithID(username, hash, source_loginserver, login_account_id);
+	}
+	else {
+		created_account_id = server.db->CreateLoginAccount(username, hash, source_loginserver, email);
+	}
+
+	if (created_account_id > 0) {
+		LogInfo(
+			"Account creation success for user [{0}] encryption algorithm [{1}] ({2}) id: [{3}]",
+			username,
+			GetEncryptionByModeId(mode),
+			mode,
+			created_account_id
+		);
+
+		return (int32) created_account_id;
+	}
+
+	LogError("Failed to create local login account for user [{0}]!", username);
+
+	return 0;
+}
+
+/**
+ * @param username
+ * @param password
+ * @param email
+ * @return
+ */
+bool AccountManagement::CreateLoginserverWorldAdminAccount(
+	const std::string &username,
+	const std::string &password,
+	const std::string &email,
+	const std::string &first_name,
+	const std::string &last_name,
+	const std::string &ip_address
+)
+{
+	auto mode = server.options.GetEncryptionMode();
+	auto hash = eqcrypt_hash(username, password, mode);
+
+	LogInfo(
+		"Attempting to create world admin account | username [{0}] encryption algorithm [{1}] ({2})",
+		username,
+		GetEncryptionByModeId(mode),
+		mode
+	);
+
+	if (server.db->DoesLoginserverWorldAdminAccountExist(username)) {
+		LogWarning(
+			"Attempting to create world admin account for user [{0}] but already exists!",
+			username
+		);
+
+		return false;
+	}
+
+	uint32 created_world_admin_id = server.db->CreateLoginserverWorldAdminAccount(
+		username,
+		hash,
+		first_name,
+		last_name,
+		email,
+		ip_address
+	);
+
+	if (created_world_admin_id > 0) {
+		LogInfo(
+			"Account creation success for user [{0}] encryption algorithm [{1}] ({2}) new admin id [{3}]",
+			username,
+			GetEncryptionByModeId(mode),
+			mode,
+			created_world_admin_id
+		);
+		return true;
+	}
+
+	LogError("Failed to create world admin account account for user [{0}]!", username);
+
+	return false;
+}
+
+/**
+ * @param in_account_username
+ * @param in_account_password
+ * @return
+ */
+uint32 AccountManagement::CheckLoginserverUserCredentials(
+	const std::string &in_account_username,
+	const std::string &in_account_password,
+	const std::string &source_loginserver
+)
+{
+	auto mode = server.options.GetEncryptionMode();
+
+	Database::DbLoginServerAccount
+		login_server_admin = server.db->GetLoginServerAccountByAccountName(
+		in_account_username,
+		source_loginserver
+	);
+
+	if (!login_server_admin.loaded) {
+		LogError(
+			"CheckLoginUserCredentials account [{0}] source_loginserver [{1}] not found!",
+			in_account_username,
+			source_loginserver
+		);
+
+		return false;
+	}
+
+	bool validated_credentials = eqcrypt_verify_hash(
+		in_account_username,
+		in_account_password,
+		login_server_admin.account_password,
+		mode
+	);
+
+	if (!validated_credentials) {
+		LogError(
+			"CheckLoginUserCredentials account [{0}] source_loginserver [{1}] invalid credentials!",
+			in_account_username,
+			source_loginserver
+		);
+
+		return 0;
+	}
+
+	LogInfo(
+		"CheckLoginUserCredentials account [{0}] source_loginserver [{1}] credentials validated success!",
+		in_account_username,
+		source_loginserver
+	);
+
+	return login_server_admin.id;
+}
+
+
+/**
+ * @param in_account_username
+ * @param in_account_password
+ * @return
+ */
+bool AccountManagement::UpdateLoginserverUserCredentials(
+	const std::string &in_account_username,
+	const std::string &in_account_password,
+	const std::string &source_loginserver
+)
+{
+	auto mode = server.options.GetEncryptionMode();
+
+	Database::DbLoginServerAccount
+		login_server_account = server.db->GetLoginServerAccountByAccountName(
+		in_account_username,
+		source_loginserver
+	);
+
+	if (!login_server_account.loaded) {
+		LogError(
+			"ChangeLoginserverUserCredentials account [{0}] source_loginserver [{1}] not found!",
+			in_account_username,
+			source_loginserver
+		);
+
+		return false;
+	}
+
+	server.db->UpdateLoginserverAccountPasswordHash(
+		in_account_username,
+		source_loginserver,
+		eqcrypt_hash(
+			in_account_username,
+			in_account_password,
+			mode
+		)
+	);
+
+	LogInfo(
+		"ChangeLoginserverUserCredentials account [{0}] source_loginserver [{1}] credentials updated!",
+		in_account_username,
+		source_loginserver
+	);
+
+	return true;
+}
+
+/**
+ * @param in_account_username
+ * @param in_account_password
+ */
+bool AccountManagement::UpdateLoginserverWorldAdminAccountPasswordByName(
+	const std::string &in_account_username,
+	const std::string &in_account_password
+)
+{
+	auto mode = server.options.GetEncryptionMode();
+	auto hash = eqcrypt_hash(in_account_username, in_account_password, mode);
+
+	bool updated_account = server.db->UpdateLoginWorldAdminAccountPasswordByUsername(
+		in_account_username,
+		hash
+	);
+
+	LogInfo(
+		"[{}] account_name [{}] status [{}]",
+		__func__,
+		in_account_username,
+		(updated_account ? "success" : "failed")
+	);
+
+	return updated_account;
+}
+
+/**
+ * @param in_account_id
+ * @param in_account_password_hash
+ */
+bool AccountManagement::UpdateLoginserverWorldAdminAccountPasswordById(
+	uint32 in_account_id,
+	const std::string &in_account_password_hash
+)
+{
+	bool updated_account = server.db->UpdateLoginWorldAdminAccountPassword(in_account_id, in_account_password_hash);
+
+	LogInfo(
+		"[{}] account_name [{}] status [{}]",
+		__func__,
+		in_account_id,
+		(updated_account ? "success" : "failed")
+	);
+
+	return updated_account;
+}
+
+/**
+ * @param in_account_username
+ * @param in_account_password
+ * @return
+ */
+uint32 AccountManagement::CheckExternalLoginserverUserCredentials(
+	const std::string &in_account_username,
+	const std::string &in_account_password
+)
+{
+	auto res = task_runner.Enqueue(
+		[&]() -> uint32 {
+			bool   running = true;
+			uint32 ret     = 0;
+
+			EQ::Net::DaybreakConnectionManager           mgr;
+			std::shared_ptr<EQ::Net::DaybreakConnection> c;
+
+			mgr.OnNewConnection(
+				[&](std::shared_ptr<EQ::Net::DaybreakConnection> connection) {
+					c = connection;
+				}
+			);
+
+			mgr.OnConnectionStateChange(
+				[&](
+					std::shared_ptr<EQ::Net::DaybreakConnection> conn,
+					EQ::Net::DbProtocolStatus from,
+					EQ::Net::DbProtocolStatus to
+				) {
+					if (EQ::Net::StatusConnected == to) {
+						EQ::Net::DynamicPacket p;
+						p.PutUInt16(0, 1); //OP_SessionReady
+						p.PutUInt32(2, 2);
+						c->QueuePacket(p);
+					}
+					else if (EQ::Net::StatusDisconnected == to) {
+						running = false;
+					}
+				}
+			);
+
+			mgr.OnPacketRecv(
+				[&](std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p) {
+					auto opcode = p.GetUInt16(0);
+					switch (opcode) {
+						case 0x0017: //OP_ChatMessage
+						{
+							size_t buffer_len =
+									   in_account_username.length() + in_account_password.length() + 2;
+
+							std::unique_ptr<char[]> buffer(new char[buffer_len]);
+
+							strcpy(&buffer[0], in_account_username.c_str());
+							strcpy(&buffer[in_account_username.length() + 1], in_account_password.c_str());
+
+							size_t encrypted_len = buffer_len;
+
+							if (encrypted_len % 8 > 0) {
+								encrypted_len = ((encrypted_len / 8) + 1) * 8;
+							}
+
+							EQ::Net::DynamicPacket p;
+							p.Resize(12 + encrypted_len);
+							p.PutUInt16(0, 2); //OP_Login
+							p.PutUInt32(2, 3);
+
+							eqcrypt_block(&buffer[0], buffer_len, (char *) p.Data() + 12, true);
+							c->QueuePacket(p);
+							break;
+						}
+						case 0x0018: {
+							auto encrypt_size                    = p.Length() - 12;
+							if (encrypt_size % 8 > 0) {
+								encrypt_size = (encrypt_size / 8) * 8;
+							}
+
+							std::unique_ptr<char[]> decrypted(new char[encrypt_size]);
+
+							eqcrypt_block((char *) p.Data() + 12, encrypt_size, &decrypted[0], false);
+
+							EQ::Net::StaticPacket sp(&decrypted[0], encrypt_size);
+							auto                  response_error = sp.GetUInt16(1);
+							auto                  m_dbid         = sp.GetUInt32(8);
+
+							{
+								ret     = (response_error <= 101 ? m_dbid : 0);
+								running = false;
+							}
+							break;
+						}
+					}
+				}
+			);
+
+			EQ::Net::DNSLookup(
+				"login.eqemulator.net", 5999, false, [&](const std::string &addr) {
+					if (addr.empty()) {
+						ret     = 0;
+						running = false;
+					}
+
+					mgr.Connect(addr, 5999);
+				}
+			);
+
+			auto &loop = EQ::EventLoop::Get();
+			while (running) {
+				loop.Process();
+			}
+
+			return ret;
+		}
+	);
+
+	return res.get();
+}
\ No newline at end of file
diff --git a/loginserver/account_management.h b/loginserver/account_management.h
new file mode 100644
index 000000000..052f2619f
--- /dev/null
+++ b/loginserver/account_management.h
@@ -0,0 +1,114 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+#ifndef EQEMU_ACCOUNT_MANAGEMENT_H
+#define EQEMU_ACCOUNT_MANAGEMENT_H
+
+#include "iostream"
+#include "../common/types.h"
+
+class AccountManagement {
+public:
+
+	/**
+	 * @param username
+	 * @param password
+	 * @param email
+	 * @param source_loginserver
+	 * @param login_account_id
+	 * @return
+	 */
+	static int32 CreateLoginServerAccount(
+		std::string username,
+		std::string password,
+		std::string email = "",
+		const std::string &source_loginserver = "local",
+		uint32 login_account_id = 0
+	);
+
+	/**
+	 * @param username
+	 * @param password
+	 * @param email
+	 * @return
+	 */
+	static bool CreateLoginserverWorldAdminAccount(
+		const std::string &username,
+		const std::string &password,
+		const std::string &email,
+		const std::string &first_name = "",
+		const std::string &last_name = "",
+		const std::string &ip_address = ""
+	);
+
+	/**
+	 * @param in_account_username
+	 * @param in_account_password
+	 * @return
+	 */
+	static uint32 CheckLoginserverUserCredentials(
+		const std::string &in_account_username,
+		const std::string &in_account_password,
+		const std::string &source_loginserver = "local"
+	);
+
+	/**
+	 * @param in_account_username
+	 * @param in_account_password
+	 * @return
+	 */
+	static bool UpdateLoginserverUserCredentials(
+		const std::string &in_account_username,
+		const std::string &in_account_password,
+		const std::string &source_loginserver = "local"
+	);
+
+	/**
+	 * @param in_account_username
+	 * @param in_account_password
+	 * @return
+	 */
+	static uint32 CheckExternalLoginserverUserCredentials(
+		const std::string &in_account_username,
+		const std::string &in_account_password
+	);
+
+	/**
+	 * @param in_account_username
+	 * @param in_account_password
+	 * @return
+	 */
+	static bool UpdateLoginserverWorldAdminAccountPasswordByName(
+		const std::string &in_account_username,
+		const std::string &in_account_password
+	);
+
+	/**
+	 * @param in_account_id
+	 * @param in_account_password_hash
+	 * @return
+	 */
+	static bool UpdateLoginserverWorldAdminAccountPasswordById(
+		uint32 in_account_id,
+		const std::string &in_account_password_hash
+	);
+};
+
+
+#endif //EQEMU_ACCOUNT_MANAGEMENT_H
diff --git a/loginserver/client.cpp b/loginserver/client.cpp
index 6ca13a4c1..4b116fc1c 100644
--- a/loginserver/client.cpp
+++ b/loginserver/client.cpp
@@ -1,51 +1,55 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #include "client.h"
 #include "login_server.h"
-#include "login_structures.h"
 #include "../common/misc_functions.h"
 #include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
+#include "../common/string_util.h"
+#include "encryption.h"
 
 extern LoginServer server;
 
+/**
+ * @param c
+ * @param v
+ */
 Client::Client(std::shared_ptr<EQStreamInterface> c, LSClientVersion v)
 {
-	connection = c;
-	version = v;
-	status = cs_not_sent_session_ready;
-	account_id = 0;
-	play_server_id = 0;
+	connection       = c;
+	version          = v;
+	status           = cs_not_sent_session_ready;
+	account_id       = 0;
+	play_server_id   = 0;
 	play_sequence_id = 0;
 }
 
 bool Client::Process()
 {
 	EQApplicationPacket *app = connection->PopPacket();
-	while (app)
-	{
-		if (server.options.IsTraceOn())
-		{
-			Log(Logs::General, Logs::Login_Server, "Application packet received from client (size %u)", app->Size());
+	while (app) {
+		if (server.options.IsTraceOn()) {
+			LogDebug("Application packet received from client (size {0})", app->Size());
 		}
 
-		if (server.options.IsDumpInPacketsOn())
-		{
+		if (server.options.IsDumpInPacketsOn()) {
 			DumpPacket(app);
 		}
 
@@ -55,67 +59,56 @@ bool Client::Process()
 			continue;
 		}
 
-		switch (app->GetOpcode())
-		{
-		case OP_SessionReady:
-		{
-			if (server.options.IsTraceOn())
-			{
-				Log(Logs::General, Logs::Login_Server, "Session ready received from client.");
-			}
-			Handle_SessionReady((const char*)app->pBuffer, app->Size());
-			break;
-		}
-		case OP_Login:
-		{
-			if (app->Size() < 20)
-			{
-				Log(Logs::General, Logs::Error, "Login received but it is too small, discarding.");
+		switch (app->GetOpcode()) {
+			case OP_SessionReady: {
+				if (server.options.IsTraceOn()) {
+					LogInfo("Session ready received from client");
+				}
+				Handle_SessionReady((const char *) app->pBuffer, app->Size());
 				break;
 			}
+			case OP_Login: {
+				if (app->Size() < 20) {
+					LogError("Login received but it is too small, discarding");
+					break;
+				}
 
-			if (server.options.IsTraceOn())
-			{
-				Log(Logs::General, Logs::Login_Server, "Login received from client.");
-			}
+				if (server.options.IsTraceOn()) {
+					LogInfo("Login received from client");
+				}
 
-			Handle_Login((const char*)app->pBuffer, app->Size());
-			break;
-		}
-		case OP_ServerListRequest:
-		{
-			if (app->Size() < 4) {
-				Log(Logs::General, Logs::Error, "Server List Request received but it is too small, discarding.");
+				Handle_Login((const char *) app->pBuffer, app->Size());
 				break;
 			}
+			case OP_ServerListRequest: {
+				if (app->Size() < 4) {
+					LogError("Server List Request received but it is too small, discarding");
+					break;
+				}
 
-			if (server.options.IsTraceOn())
-			{
-				Log(Logs::General, Logs::Login_Server, "Server list request received from client.");
-			}
+				if (server.options.IsTraceOn()) {
+					LogDebug("Server list request received from client");
+				}
 
-			SendServerListPacket(*(uint32_t*)app->pBuffer);
-			break;
-		}
-		case OP_PlayEverquestRequest:
-		{
-			if (app->Size() < sizeof(PlayEverquestRequest_Struct))
-			{
-				Log(Logs::General, Logs::Error, "Play received but it is too small, discarding.");
+				SendServerListPacket(*(uint32_t *) app->pBuffer);
 				break;
 			}
+			case OP_PlayEverquestRequest: {
+				if (app->Size() < sizeof(PlayEverquestRequest_Struct)) {
+					LogError("Play received but it is too small, discarding");
+					break;
+				}
 
-			Handle_Play((const char*)app->pBuffer);
-			break;
-		}
-		default:
-		{
-			if (LogSys.log_settings[Logs::Client_Server_Packet_Unhandled].is_category_enabled == 1) {
-				char dump[64];
-				app->build_header_dump(dump);
-				Log(Logs::General, Logs::Error, "Recieved unhandled application packet from the client: %s.", dump);
+				Handle_Play((const char *) app->pBuffer);
+				break;
+			}
+			default: {
+				if (LogSys.log_settings[Logs::PacketClientServerUnhandled].is_category_enabled == 1) {
+					char dump[64];
+					app->build_header_dump(dump);
+					LogError("Recieved unhandled application packet from the client: [{}]", dump);
+				}
 			}
-		}
 		}
 
 		delete app;
@@ -125,51 +118,51 @@ bool Client::Process()
 	return true;
 }
 
-void Client::Handle_SessionReady(const char* data, unsigned int size)
+/**
+ * Sends our reply to session ready packet
+ *
+ * @param data
+ * @param size
+ */
+void Client::Handle_SessionReady(const char *data, unsigned int size)
 {
-	if (status != cs_not_sent_session_ready)
-	{
-		Log(Logs::General, Logs::Error, "Session ready received again after already being received.");
+	if (status != cs_not_sent_session_ready) {
+		LogError("Session ready received again after already being received");
 		return;
 	}
 
-	if (size < sizeof(unsigned int))
-	{
-		Log(Logs::General, Logs::Error, "Session ready was too small.");
+	if (size < sizeof(unsigned int)) {
+		LogError("Session ready was too small");
 		return;
 	}
 
 	status = cs_waiting_for_login;
 
 	/**
-	* The packets are mostly the same but slightly different between the two versions.
-	*/
-	if (version == cv_sod)
-	{
-		EQApplicationPacket *outapp = new EQApplicationPacket(OP_ChatMessage, 17);
-		outapp->pBuffer[0] = 0x02;
+	 * The packets are mostly the same but slightly different between the two versions
+	 */
+	if (version == cv_sod) {
+		auto *outapp = new EQApplicationPacket(OP_ChatMessage, 17);
+		outapp->pBuffer[0]  = 0x02;
 		outapp->pBuffer[10] = 0x01;
 		outapp->pBuffer[11] = 0x65;
 
-		if (server.options.IsDumpOutPacketsOn())
-		{
+		if (server.options.IsDumpOutPacketsOn()) {
 			DumpPacket(outapp);
 		}
 
 		connection->QueuePacket(outapp);
 		delete outapp;
 	}
-	else
-	{
-		const char *msg = "ChatMessage";
-		EQApplicationPacket *outapp = new EQApplicationPacket(OP_ChatMessage, 16 + strlen(msg));
-		outapp->pBuffer[0] = 0x02;
+	else {
+		const char *msg    = "ChatMessage";
+		auto       *outapp = new EQApplicationPacket(OP_ChatMessage, 16 + strlen(msg));
+		outapp->pBuffer[0]  = 0x02;
 		outapp->pBuffer[10] = 0x01;
 		outapp->pBuffer[11] = 0x65;
-		strcpy((char*)(outapp->pBuffer + 15), msg);
+		strcpy((char *) (outapp->pBuffer + 15), msg);
 
-		if (server.options.IsDumpOutPacketsOn())
-		{
+		if (server.options.IsDumpOutPacketsOn()) {
 			DumpPacket(outapp);
 		}
 
@@ -178,35 +171,52 @@ void Client::Handle_SessionReady(const char* data, unsigned int size)
 	}
 }
 
-void Client::Handle_Login(const char* data, unsigned int size)
+/**
+ * Verifies login and send a reply
+ *
+ * @param data
+ * @param size
+ */
+void Client::Handle_Login(const char *data, unsigned int size)
 {
-	auto mode = server.options.GetEncryptionMode();
-
 	if (status != cs_waiting_for_login) {
-		Log(Logs::General, Logs::Error, "Login received after already having logged in.");
+		LogError("Login received after already having logged in");
 		return;
 	}
 
 	if ((size - 12) % 8 != 0) {
-		Log(Logs::General, Logs::Error, "Login received packet of size: %u, this would cause a block corruption, discarding.", size);
+		LogError("Login received packet of size: {0}, this would cause a block corruption, discarding", size);
+
+		return;
+	}
+
+	if (size < sizeof(LoginLoginRequest_Struct)) {
+		LogError("Login received packet of size: {0}, this would cause a buffer overflow, discarding", size);
+
 		return;
 	}
 
 	char *login_packet_buffer = nullptr;
 
 	unsigned int db_account_id = 0;
+
+	std::string db_loginserver = "local";
+	if (server.options.CanAutoLinkAccounts()) {
+		db_loginserver = "eqemu";
+	}
+
 	std::string db_account_password_hash;
 
 	std::string outbuffer;
 	outbuffer.resize(size - 12);
 	if (outbuffer.length() == 0) {
-		LogF(Logs::General, Logs::Debug, "Corrupt buffer sent to server, no length.");
+		LogError("Corrupt buffer sent to server, no length");
 		return;
 	}
 
 	auto r = eqcrypt_block(data + 10, size - 12, &outbuffer[0], 0);
 	if (r == nullptr) {
-		LogF(Logs::General, Logs::Debug, "Failed to decrypt eqcrypt block");
+		LogError("Failed to decrypt eqcrypt block");
 		return;
 	}
 
@@ -214,159 +224,119 @@ void Client::Handle_Login(const char* data, unsigned int size)
 
 	std::string user(&outbuffer[0]);
 	if (user.length() >= outbuffer.length()) {
-		LogF(Logs::General, Logs::Debug, "Corrupt buffer sent to server, preventing buffer overflow.");
+		LogError("Corrupt buffer sent to server, preventing buffer overflow");
 		return;
 	}
 
+	memcpy(&llrs, data, sizeof(LoginLoginRequest_Struct));
+
 	bool result = false;
 	if (outbuffer[0] == 0 && outbuffer[1] == 0) {
 		if (server.options.IsTokenLoginAllowed()) {
-			cred = (&outbuffer[2 + user.length()]);
-			result = server.db->GetLoginTokenDataFromToken(cred, connection->GetRemoteAddr(), db_account_id, user);
+			cred   = (&outbuffer[2 + user.length()]);
+			result = server.db->GetLoginTokenDataFromToken(
+				cred,
+				connection->GetRemoteAddr(),
+				db_account_id,
+				db_loginserver,
+				user
+			);
 		}
 	}
 	else {
 		if (server.options.IsPasswordLoginAllowed()) {
-			cred = (&outbuffer[1 + user.length()]);
-			if (server.db->GetLoginDataFromAccountName(user, db_account_password_hash, db_account_id) == false) {
-				/* If we have auto_create_accounts enabled in the login.ini, we will process the creation of an account on our own*/
-				if (
-					server.options.CanAutoCreateAccounts() &&
-					server.db->CreateLoginData(user, eqcrypt_hash(user, cred, mode), db_account_id) == true
-					) {
-					LogF(Logs::General, Logs::Error, "User {0} does not exist in the database, so we created it...", user);
-					result = true;
-				}
-				else {
-					LogF(Logs::General, Logs::Error, "Error logging in, user {0} does not exist in the database.", user);
-					result = false;
-				}
+			cred            = (&outbuffer[1 + user.length()]);
+			auto components = SplitString(user, ':');
+			if (components.size() == 2) {
+				db_loginserver = components[0];
+				user           = components[1];
+			}
+
+			LogInfo(
+				"Attempting password based login [{0}] login [{1}] user [{2}]",
+				user,
+				db_loginserver,
+				user
+			);
+
+			ParseAccountString(user, user, db_loginserver);
+
+			if (server.db->GetLoginDataFromAccountInfo(user, db_loginserver, db_account_password_hash, db_account_id)) {
+				result = VerifyLoginHash(user, db_loginserver, cred, db_account_password_hash);
+
+				LogDebug("[VerifyLoginHash] Success [{0}]", (result ? "true" : "false"));
 			}
 			else {
-				if (eqcrypt_verify_hash(user, cred, db_account_password_hash, mode)) {
-					result = true;
-				}
-				else {
-					result = false;
-				}
+				status = cs_creating_account;
+				AttemptLoginAccountCreation(user, cred, db_loginserver);
+
+				return;
 			}
 		}
 	}
 
-	/* Login Accepted */
+	/**
+	 * Login accepted
+	 */
 	if (result) {
+		LogInfo(
+			"login [{0}] user [{1}] Login succeeded",
+			db_loginserver,
+			user
+		);
 
-		server.client_manager->RemoveExistingClient(db_account_id);
-
-		in_addr in;
-		in.s_addr = connection->GetRemoteIP();
-
-		server.db->UpdateLSAccountData(db_account_id, std::string(inet_ntoa(in)));
-		GenerateKey();
-
-		account_id = db_account_id;
-		account_name = user;
-
-		EQApplicationPacket *outapp = new EQApplicationPacket(OP_LoginAccepted, 10 + 80);
-		const LoginLoginRequest_Struct* llrs = (const LoginLoginRequest_Struct *)data;
-		LoginAccepted_Struct* login_accepted = (LoginAccepted_Struct *)outapp->pBuffer;
-		login_accepted->unknown1 = llrs->unknown1;
-		login_accepted->unknown2 = llrs->unknown2;
-		login_accepted->unknown3 = llrs->unknown3;
-		login_accepted->unknown4 = llrs->unknown4;
-		login_accepted->unknown5 = llrs->unknown5;
-
-		LoginFailedAttempts_Struct * login_failed_attempts = new LoginFailedAttempts_Struct;
-		memset(login_failed_attempts, 0, sizeof(LoginFailedAttempts_Struct));
-
-		login_failed_attempts->failed_attempts = 0;
-		login_failed_attempts->message = 0x01;
-		login_failed_attempts->lsid = db_account_id;
-		login_failed_attempts->unknown3[3] = 0x03;
-		login_failed_attempts->unknown4[3] = 0x02;
-		login_failed_attempts->unknown5[0] = 0xe7;
-		login_failed_attempts->unknown5[1] = 0x03;
-		login_failed_attempts->unknown6[0] = 0xff;
-		login_failed_attempts->unknown6[1] = 0xff;
-		login_failed_attempts->unknown6[2] = 0xff;
-		login_failed_attempts->unknown6[3] = 0xff;
-		login_failed_attempts->unknown7[0] = 0xa0;
-		login_failed_attempts->unknown7[1] = 0x05;
-		login_failed_attempts->unknown8[3] = 0x02;
-		login_failed_attempts->unknown9[0] = 0xff;
-		login_failed_attempts->unknown9[1] = 0x03;
-		login_failed_attempts->unknown11[0] = 0x63;
-		login_failed_attempts->unknown12[0] = 0x01;
-		memcpy(login_failed_attempts->key, key.c_str(), key.size());
-
-		char encrypted_buffer[80] = { 0 };
-		auto rc = eqcrypt_block((const char*)login_failed_attempts, 75, encrypted_buffer, 1);
-		if (rc == nullptr) {
-			LogF(Logs::General, Logs::Debug, "Failed to encrypt eqcrypt block");
-		}
-
-		memcpy(login_accepted->encrypt, encrypted_buffer, 80);
-
-		if (server.options.IsDumpOutPacketsOn()) {
-			DumpPacket(outapp);
-		}
-
-		connection->QueuePacket(outapp);
-		delete outapp;
-
-		status = cs_logged_in;
+		DoSuccessfulLogin(user, db_account_id, db_loginserver);
 	}
 	else {
-		EQApplicationPacket *outapp = new EQApplicationPacket(OP_LoginAccepted, sizeof(LoginLoginFailed_Struct));
-		const LoginLoginRequest_Struct* llrs = (const LoginLoginRequest_Struct *)data;
-		LoginLoginFailed_Struct* llas = (LoginLoginFailed_Struct *)outapp->pBuffer;
-		llas->unknown1 = llrs->unknown1;
-		llas->unknown2 = llrs->unknown2;
-		llas->unknown3 = llrs->unknown3;
-		llas->unknown4 = llrs->unknown4;
-		llas->unknown5 = llrs->unknown5;
-		memcpy(llas->unknown6, FailedLoginResponseData, sizeof(FailedLoginResponseData));
+		LogInfo(
+			"login [{0}] user [{1}] Login failed",
+			db_loginserver,
+			user
+		);
 
-		if (server.options.IsDumpOutPacketsOn()) {
-			DumpPacket(outapp);
-		}
-
-		connection->QueuePacket(outapp);
-		delete outapp;
-
-		status = cs_failed_to_login;
+		DoFailedLogin();
 	}
 }
 
-void Client::Handle_Play(const char* data)
+/**
+ * Sends a packet to the requested server to see if the client is allowed or not
+ *
+ * @param data
+ */
+void Client::Handle_Play(const char *data)
 {
-	if (status != cs_logged_in)
-	{
-		Log(Logs::General, Logs::Error, "Client sent a play request when they were not logged in, discarding.");
+	if (status != cs_logged_in) {
+		LogError("Client sent a play request when they were not logged in, discarding");
 		return;
 	}
 
-	const PlayEverquestRequest_Struct *play = (const PlayEverquestRequest_Struct*)data;
-	unsigned int server_id_in = (unsigned int)play->ServerNumber;
-	unsigned int sequence_in = (unsigned int)play->Sequence;
+	const auto *play        = (const PlayEverquestRequest_Struct *) data;
+	auto       server_id_in = (unsigned int) play->ServerNumber;
+	auto       sequence_in  = (unsigned int) play->Sequence;
 
-	if (server.options.IsTraceOn())
-	{
-		Log(Logs::General, Logs::Login_Server, "Play received from client, server number %u sequence %u.", server_id_in, sequence_in);
+	if (server.options.IsTraceOn()) {
+		LogInfo(
+			"Play received from client [{0}] server number {1} sequence {2}",
+			GetAccountName(),
+			server_id_in,
+			sequence_in
+		);
 	}
 
-	this->play_server_id = (unsigned int)play->ServerNumber;
+	this->play_server_id = (unsigned int) play->ServerNumber;
 	play_sequence_id = sequence_in;
-	play_server_id = server_id_in;
-	server.server_manager->SendUserToWorldRequest(server_id_in, account_id);
+	play_server_id   = server_id_in;
+	server.server_manager->SendUserToWorldRequest(server_id_in, account_id, loginserver_name);
 }
 
+/**
+ * @param seq
+ */
 void Client::SendServerListPacket(uint32 seq)
 {
 	EQApplicationPacket *outapp = server.server_manager->CreateServerListPacket(this, seq);
 
-	if (server.options.IsDumpOutPacketsOn())
-	{
+	if (server.options.IsDumpOutPacketsOn()) {
 		DumpPacket(outapp);
 	}
 
@@ -376,9 +346,8 @@ void Client::SendServerListPacket(uint32 seq)
 
 void Client::SendPlayResponse(EQApplicationPacket *outapp)
 {
-	if (server.options.IsTraceOn())
-	{
-		Log(Logs::General, Logs::Netcode, "Sending play response for %s.", GetAccountName().c_str());
+	if (server.options.IsTraceOn()) {
+		LogDebug("Sending play response for {0}", GetAccountName());
 		// server_log->LogPacket(log_network_trace, (const char*)outapp->pBuffer, outapp->size);
 	}
 	connection->QueuePacket(outapp);
@@ -388,18 +357,470 @@ void Client::GenerateKey()
 {
 	key.clear();
 	int count = 0;
-	while (count < 10)
-	{
+	while (count < 10) {
 		static const char key_selection[] =
-		{
-			'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-			'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-			'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
-			'Y', 'Z', '0', '1', '2', '3', '4', '5',
-			'6', '7', '8', '9'
-		};
+							  {
+								  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
+								  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+								  'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X',
+								  'Y', 'Z', '0', '1', '2', '3', '4', '5',
+								  '6', '7', '8', '9'
+							  };
 
-		key.append((const char*)&key_selection[random.Int(0, 35)], 1);
+		key.append((const char *) &key_selection[random.Int(0, 35)], 1);
 		count++;
 	}
 }
+
+/**
+ * @param user
+ * @param pass
+ * @param loginserver
+ */
+void Client::AttemptLoginAccountCreation(
+	const std::string &user,
+	const std::string &pass,
+	const std::string &loginserver
+)
+{
+#ifdef LSPX
+	if (loginserver == "eqemu") {
+		LogInfo("Attempting login account creation via '{0}'", loginserver);
+
+		if (!server.options.CanAutoLinkAccounts()) {
+			LogInfo("CanAutoLinkAccounts disabled - sending failed login");
+			DoFailedLogin();
+			return;
+		}
+
+		if (server.options.GetEQEmuLoginServerAddress().length() == 0) {
+			DoFailedLogin();
+			return;
+		}
+
+		auto addr_components = SplitString(server.options.GetEQEmuLoginServerAddress(), ':');
+		if (addr_components.size() != 2) {
+			DoFailedLogin();
+			return;
+		}
+
+		stored_user = user;
+		stored_pass = pass;
+
+		auto address = addr_components[0];
+		auto port    = std::stoi(addr_components[1]);
+		EQ::Net::DNSLookup(
+			address, port, false, [=](const std::string &addr) {
+				if (addr.empty()) {
+					DoFailedLogin();
+					return;
+				}
+
+				login_connection_manager.reset(new EQ::Net::DaybreakConnectionManager());
+				login_connection_manager->OnNewConnection(
+					std::bind(
+						&Client::LoginOnNewConnection,
+						this,
+						std::placeholders::_1
+					)
+				);
+				login_connection_manager->OnConnectionStateChange(
+					std::bind(
+						&Client::LoginOnStatusChange,
+						this,
+						std::placeholders::_1,
+						std::placeholders::_2,
+						std::placeholders::_3
+					)
+				);
+				login_connection_manager->OnPacketRecv(
+					std::bind(
+						&Client::LoginOnPacketRecv,
+						this,
+						std::placeholders::_1,
+						std::placeholders::_2
+					)
+				);
+
+				login_connection_manager->Connect(addr, port);
+			}
+		);
+
+		return;
+	}
+#endif
+
+	if (server.options.CanAutoCreateAccounts() && loginserver == "local") {
+		LogInfo("CanAutoCreateAccounts enabled, attempting to creating account [{0}]", user);
+		CreateLocalAccount(user, pass);
+		return;
+	}
+
+	DoFailedLogin();
+}
+
+void Client::DoFailedLogin()
+{
+	stored_user.clear();
+	stored_pass.clear();
+
+	EQApplicationPacket outapp(OP_LoginAccepted, sizeof(LoginLoginFailed_Struct));
+	auto                *login_failed = (LoginLoginFailed_Struct *) outapp.pBuffer;
+
+	login_failed->unknown1 = llrs.unknown1;
+	login_failed->unknown2 = llrs.unknown2;
+	login_failed->unknown3 = llrs.unknown3;
+	login_failed->unknown4 = llrs.unknown4;
+	login_failed->unknown5 = llrs.unknown5;
+
+	memcpy(login_failed->unknown6, FailedLoginResponseData, sizeof(FailedLoginResponseData));
+
+	if (server.options.IsDumpOutPacketsOn()) {
+		DumpPacket(&outapp);
+	}
+
+	connection->QueuePacket(&outapp);
+	status = cs_failed_to_login;
+}
+
+/**
+ * Verifies a login hash, will also attempt to update a login hash if needed
+ *
+ * @param account_username
+ * @param source_loginserver
+ * @param account_password
+ * @param password_hash
+ * @return
+ */
+bool Client::VerifyLoginHash(
+	const std::string &account_username,
+	const std::string &source_loginserver,
+	const std::string &account_password,
+	const std::string &password_hash
+)
+{
+	auto encryption_mode = server.options.GetEncryptionMode();
+	if (eqcrypt_verify_hash(account_username, account_password, password_hash, encryption_mode)) {
+		return true;
+	}
+	else {
+		if (server.options.IsUpdatingInsecurePasswords()) {
+			if (encryption_mode < EncryptionModeArgon2) {
+				encryption_mode = EncryptionModeArgon2;
+			}
+
+			uint32 insecure_source_encryption_mode = 0;
+			if (password_hash.length() == CryptoHash::md5_hash_length) {
+				for (int i = EncryptionModeMD5; i <= EncryptionModeMD5Triple; ++i) {
+					if (i != encryption_mode &&
+						eqcrypt_verify_hash(account_username, account_password, password_hash, i)) {
+						insecure_source_encryption_mode = i;
+					}
+				}
+			}
+			else if (password_hash.length() == CryptoHash::sha1_hash_length && insecure_source_encryption_mode == 0) {
+				for (int i = EncryptionModeSHA; i <= EncryptionModeSHATriple; ++i) {
+					if (i != encryption_mode &&
+						eqcrypt_verify_hash(account_username, account_password, password_hash, i)) {
+						insecure_source_encryption_mode = i;
+					}
+				}
+			}
+			else if (password_hash.length() == CryptoHash::sha512_hash_length && insecure_source_encryption_mode == 0) {
+				for (int i = EncryptionModeSHA512; i <= EncryptionModeSHA512Triple; ++i) {
+					if (i != encryption_mode &&
+						eqcrypt_verify_hash(account_username, account_password, password_hash, i)) {
+						insecure_source_encryption_mode = i;
+					}
+				}
+			}
+
+			if (insecure_source_encryption_mode > 0) {
+				LogInfo(
+					"[{}] Updated insecure password user [{}] loginserver [{}] from mode [{}] ({}) to mode [{}] ({})",
+					__func__,
+					account_username,
+					source_loginserver,
+					GetEncryptionByModeId(insecure_source_encryption_mode),
+					insecure_source_encryption_mode,
+					GetEncryptionByModeId(encryption_mode),
+					encryption_mode
+				);
+
+				server.db->UpdateLoginserverAccountPasswordHash(
+					account_username,
+					source_loginserver,
+					eqcrypt_hash(
+						account_username,
+						account_password,
+						encryption_mode
+					)
+				);
+
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * @param in_account_name
+ * @param db_account_id
+ * @param db_loginserver
+ */
+void Client::DoSuccessfulLogin(
+	const std::string in_account_name,
+	int db_account_id,
+	const std::string &db_loginserver
+)
+{
+	stored_user.clear();
+	stored_pass.clear();
+
+	server.client_manager->RemoveExistingClient(db_account_id, db_loginserver);
+
+	in_addr in{};
+	in.s_addr = connection->GetRemoteIP();
+
+	server.db->UpdateLSAccountData(db_account_id, std::string(inet_ntoa(in)));
+	GenerateKey();
+
+	account_id       = db_account_id;
+	account_name     = in_account_name;
+	loginserver_name = db_loginserver;
+
+	auto *outapp         = new EQApplicationPacket(OP_LoginAccepted, 10 + 80);
+	auto *login_accepted = (LoginAccepted_Struct *) outapp->pBuffer;
+	login_accepted->unknown1 = llrs.unknown1;
+	login_accepted->unknown2 = llrs.unknown2;
+	login_accepted->unknown3 = llrs.unknown3;
+	login_accepted->unknown4 = llrs.unknown4;
+	login_accepted->unknown5 = llrs.unknown5;
+
+	auto *login_failed_attempts = new LoginFailedAttempts_Struct;
+	memset(login_failed_attempts, 0, sizeof(LoginFailedAttempts_Struct));
+
+	login_failed_attempts->failed_attempts = 0;
+	login_failed_attempts->message         = 0x01;
+	login_failed_attempts->lsid            = db_account_id;
+	login_failed_attempts->unknown3[3]  = 0x03;
+	login_failed_attempts->unknown4[3]  = 0x02;
+	login_failed_attempts->unknown5[0]  = 0xe7;
+	login_failed_attempts->unknown5[1]  = 0x03;
+	login_failed_attempts->unknown6[0]  = 0xff;
+	login_failed_attempts->unknown6[1]  = 0xff;
+	login_failed_attempts->unknown6[2]  = 0xff;
+	login_failed_attempts->unknown6[3]  = 0xff;
+	login_failed_attempts->unknown7[0]  = 0xa0;
+	login_failed_attempts->unknown7[1]  = 0x05;
+	login_failed_attempts->unknown8[3]  = 0x02;
+	login_failed_attempts->unknown9[0]  = 0xff;
+	login_failed_attempts->unknown9[1]  = 0x03;
+	login_failed_attempts->unknown11[0] = 0x63;
+	login_failed_attempts->unknown12[0] = 0x01;
+	memcpy(login_failed_attempts->key, key.c_str(), key.size());
+
+	char encrypted_buffer[80] = {0};
+	auto rc                   = eqcrypt_block((const char *) login_failed_attempts, 75, encrypted_buffer, 1);
+	if (rc == nullptr) {
+		LogDebug("Failed to encrypt eqcrypt block");
+	}
+
+	memcpy(login_accepted->encrypt, encrypted_buffer, 80);
+
+	if (server.options.IsDumpOutPacketsOn()) {
+		DumpPacket(outapp);
+	}
+
+	connection->QueuePacket(outapp);
+	delete outapp;
+
+	status = cs_logged_in;
+}
+
+/**
+ * @param username
+ * @param password
+ */
+void Client::CreateLocalAccount(const std::string &username, const std::string &password)
+{
+	auto         mode  = server.options.GetEncryptionMode();
+	auto         hash  = eqcrypt_hash(username, password, mode);
+	unsigned int db_id = 0;
+	if (!server.db->CreateLoginData(username, hash, "local", db_id)) {
+		DoFailedLogin();
+	}
+	else {
+		DoSuccessfulLogin(username, db_id, "local");
+	}
+}
+
+/**
+ * @param in_account_name
+ * @param in_account_password
+ * @param loginserver_account_id
+ */
+void Client::CreateEQEmuAccount(
+	const std::string &in_account_name,
+	const std::string &in_account_password,
+	unsigned int loginserver_account_id
+)
+{
+	auto mode = server.options.GetEncryptionMode();
+	auto hash = eqcrypt_hash(in_account_name, in_account_password, mode);
+
+	if (server.db->DoesLoginServerAccountExist(in_account_name, hash, "eqemu", loginserver_account_id)) {
+		DoSuccessfulLogin(in_account_name, loginserver_account_id, "eqemu");
+		return;
+	}
+
+	if (!server.db->CreateLoginDataWithID(in_account_name, hash, "eqemu", loginserver_account_id)) {
+		DoFailedLogin();
+	}
+	else {
+		DoSuccessfulLogin(in_account_name, loginserver_account_id, "eqemu");
+	}
+}
+
+/**
+ * @param connection
+ */
+void Client::LoginOnNewConnection(std::shared_ptr<EQ::Net::DaybreakConnection> connection)
+{
+	login_connection = connection;
+}
+
+/**
+ * @param conn
+ * @param from
+ * @param to
+ */
+void Client::LoginOnStatusChange(
+	std::shared_ptr<EQ::Net::DaybreakConnection> conn,
+	EQ::Net::DbProtocolStatus from,
+	EQ::Net::DbProtocolStatus to
+)
+{
+	if (to == EQ::Net::StatusConnected) {
+		LogDebug("EQ::Net::StatusConnected");
+		LoginSendSessionReady();
+	}
+
+	if (to == EQ::Net::StatusDisconnecting || to == EQ::Net::StatusDisconnected) {
+		LogDebug("EQ::Net::StatusDisconnecting || EQ::Net::StatusDisconnected");
+
+		DoFailedLogin();
+	}
+}
+
+/**
+ * @param conn
+ * @param from
+ * @param to
+ */
+void Client::LoginOnStatusChangeIgnored(
+	std::shared_ptr<EQ::Net::DaybreakConnection> conn,
+	EQ::Net::DbProtocolStatus from,
+	EQ::Net::DbProtocolStatus to
+)
+{
+}
+
+/**
+ * @param conn
+ * @param p
+ */
+void Client::LoginOnPacketRecv(std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p)
+{
+	auto opcode = p.GetUInt16(0);
+	switch (opcode) {
+		case 0x0017: //OP_ChatMessage
+			LoginSendLogin();
+			break;
+		case 0x0018:
+			LoginProcessLoginResponse(p);
+			break;
+	}
+}
+
+void Client::LoginSendSessionReady()
+{
+	EQ::Net::DynamicPacket p;
+	p.PutUInt16(0, 1); //OP_SessionReady
+	p.PutUInt32(2, 2);
+
+	login_connection->QueuePacket(p);
+}
+
+void Client::LoginSendLogin()
+{
+	size_t                  buffer_len = stored_user.length() + stored_pass.length() + 2;
+	std::unique_ptr<char[]> buffer(new char[buffer_len]);
+
+	strcpy(&buffer[0], stored_user.c_str());
+	strcpy(&buffer[stored_user.length() + 1], stored_pass.c_str());
+
+	size_t encrypted_len = buffer_len;
+
+	if (encrypted_len % 8 > 0) {
+		encrypted_len = ((encrypted_len / 8) + 1) * 8;
+	}
+
+	EQ::Net::DynamicPacket p;
+	p.Resize(12 + encrypted_len);
+	p.PutUInt16(0, 2); //OP_Login
+	p.PutUInt32(2, 3);
+
+	eqcrypt_block(&buffer[0], buffer_len, (char *) p.Data() + 12, true);
+
+	login_connection->QueuePacket(p);
+}
+
+/**
+ * @param p
+ */
+void Client::LoginProcessLoginResponse(const EQ::Net::Packet &p)
+{
+	auto encrypt_size                    = p.Length() - 12;
+
+	if (encrypt_size % 8 > 0) {
+		encrypt_size = (encrypt_size / 8) * 8;
+	}
+
+	std::unique_ptr<char[]> decrypted(new char[encrypt_size]);
+
+	eqcrypt_block((char *) p.Data() + 12, encrypt_size, &decrypted[0], false);
+
+	EQ::Net::StaticPacket sp(&decrypted[0], encrypt_size);
+	auto                  response_error = sp.GetUInt16(1);
+
+	login_connection_manager->OnConnectionStateChange(
+		std::bind(
+			&Client::LoginOnStatusChangeIgnored,
+			this,
+			std::placeholders::_1,
+			std::placeholders::_2,
+			std::placeholders::_3
+		)
+	);
+
+	if (response_error > 101) {
+		LogDebug("response [{0}] failed login", response_error);
+		DoFailedLogin();
+		login_connection->Close();
+	}
+	else {
+		LogDebug(
+			"response [{0}] login succeeded user [{1}]",
+			response_error,
+			stored_user
+		);
+
+		auto m_dbid = sp.GetUInt32(8);
+
+		CreateEQEmuAccount(stored_user, stored_pass, m_dbid);
+		login_connection->Close();
+	}
+}
diff --git a/loginserver/client.h b/loginserver/client.h
index b9bfe0494..b8f092db3 100644
--- a/loginserver/client.h
+++ b/loginserver/client.h
@@ -1,137 +1,233 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #ifndef EQEMU_CLIENT_H
 #define EQEMU_CLIENT_H
 
 #include "../common/global_define.h"
 #include "../common/opcodemgr.h"
 #include "../common/random.h"
-
-#include <memory>
 #include "../common/eq_stream_intf.h"
+#include "../common/net/dns.h"
+#include "../common/net/daybreak_connection.h"
+#include "login_structures.h"
+#include <memory>
 
-enum LSClientVersion
-{
+enum LSClientVersion {
 	cv_titanium,
 	cv_sod
 };
 
-enum LSClientStatus
-{
+enum LSClientStatus {
 	cs_not_sent_session_ready,
 	cs_waiting_for_login,
+	cs_creating_account,
 	cs_failed_to_login,
 	cs_logged_in
 };
 
 /**
-* Client class, controls a single client and it's
-* connection to the login server.
-*/
-class Client
-{
+ * Client class, controls a single client and it's connection to the login server
+ */
+class Client {
 public:
+
 	/**
-	* Constructor, sets our connection to c and version to v
-	*/
+	 * Constructor, sets our connection to c and version to v
+	 *
+	 * @param c
+	 * @param v
+	 */
 	Client(std::shared_ptr<EQStreamInterface> c, LSClientVersion v);
 
 	/**
-	* Destructor.
-	*/
-	~Client() { }
+	 * Destructor
+	 */
+	~Client() {}
 
 	/**
-	* Processes the client's connection and does various actions.
-	*/
+	 * Processes the client's connection and does various actions
+	 *
+	 * @return
+	 */
 	bool Process();
 
 	/**
-	* Sends our reply to session ready packet.
-	*/
-	void Handle_SessionReady(const char* data, unsigned int size);
+	 * Sends our reply to session ready packet
+	 *
+	 * @param data
+	 * @param size
+	 */
+	void Handle_SessionReady(const char *data, unsigned int size);
 
 	/**
-	* Verifies login and send a reply.
-	*/
-	void Handle_Login(const char* data, unsigned int size);
+	 * Verifies login and send a reply
+	 *
+	 * @param data
+	 * @param size
+	 */
+	void Handle_Login(const char *data, unsigned int size);
 
 	/**
-	* Sends a packet to the requested server to see if the client is allowed or not.
-	*/
-	void Handle_Play(const char* data);
+	 * Sends a packet to the requested server to see if the client is allowed or not
+	 *
+	 * @param data
+	 */
+	void Handle_Play(const char *data);
 
 	/**
-	* Sends a server list packet to the client.
-	*/
+	 * Sends a server list packet to the client
+	 *
+	 * @param seq
+	 */
 	void SendServerListPacket(uint32 seq);
 
 	/**
-	* Sends the input packet to the client and clears our play response states.
-	*/
+	 * Sends the input packet to the client and clears our play response states
+	 *
+	 * @param outapp
+	 */
 	void SendPlayResponse(EQApplicationPacket *outapp);
 
 	/**
-	* Generates a random login key for the client during login.
-	*/
+	 * Generates a random login key for the client during login
+	 */
 	void GenerateKey();
 
 	/**
-	* Gets the account id of this client.
-	*/
+	 * Gets the account id of this client
+	 *
+	 * @return
+	 */
 	unsigned int GetAccountID() const { return account_id; }
 
 	/**
-	* Gets the account name of this client.
-	*/
+	 * Gets the loginserver name of this client
+	 *
+	 * @return
+	 */
+	std::string GetLoginServerName() const { return loginserver_name; }
+
+	/**
+	 * Gets the account name of this client
+	 *
+	 * @return
+	 */
 	std::string GetAccountName() const { return account_name; }
 
 	/**
-	* Gets the key generated at login for this client.
-	*/
+	 * Gets the key generated at login for this client
+	 *
+	 * @return
+	 */
 	std::string GetKey() const { return key; }
 
 	/**
-	* Gets the server selected to be played on for this client.
-	*/
+	 * Gets the server selected to be played on for this client
+	 *
+	 * @return
+	 */
 	unsigned int GetPlayServerID() const { return play_server_id; }
 
 	/**
-	* Gets the play sequence state for this client.
-	*/
+	 * Gets the play sequence state for this client
+	 *
+	 * @return
+	 */
 	unsigned int GetPlaySequence() const { return play_sequence_id; }
 
 	/**
-	* Gets the connection for this client.
-	*/
+	 * Gets the connection for this client
+	 *
+	 * @return
+	 */
 	std::shared_ptr<EQStreamInterface> GetConnection() { return connection; }
 
-	EQEmu::Random random;
-private:
-	std::shared_ptr<EQStreamInterface> connection;
-	LSClientVersion version;
-	LSClientStatus status;
+	/**
+	 * Attempts to create a login account
+	 *
+	 * @param user
+	 * @param pass
+	 * @param loginserver
+	 */
+	void AttemptLoginAccountCreation(const std::string &user, const std::string &pass, const std::string &loginserver);
 
-	std::string account_name;
+	/**
+	 * Does a failed login
+	 */
+	void DoFailedLogin();
+
+	/**
+	 * Verifies a login hash, will also attempt to update a login hash if needed
+	 *
+	 * @param account_username
+	 * @param source_loginserver
+	 * @param account_password
+	 * @param password_hash
+	 * @return
+	 */
+	bool VerifyLoginHash(
+		const std::string &account_username,
+		const std::string &source_loginserver,
+		const std::string &account_password,
+		const std::string &password_hash
+	);
+
+	void DoSuccessfulLogin(const std::string in_account_name, int db_account_id, const std::string &db_loginserver);
+	void CreateLocalAccount(const std::string &username, const std::string &password);
+	void CreateEQEmuAccount(const std::string &in_account_name, const std::string &in_account_password, unsigned int loginserver_account_id);
+
+private:
+	EQEmu::Random                      random;
+	std::shared_ptr<EQStreamInterface> connection;
+	LSClientVersion                    version;
+	LSClientStatus                     status;
+
+	std::string  account_name;
 	unsigned int account_id;
+	std::string  loginserver_name;
 	unsigned int play_server_id;
 	unsigned int play_sequence_id;
-	std::string key;
+	std::string  key;
+
+	std::unique_ptr<EQ::Net::DaybreakConnectionManager> login_connection_manager;
+	std::shared_ptr<EQ::Net::DaybreakConnection>        login_connection;
+	LoginLoginRequest_Struct                            llrs;
+
+	std::string stored_user;
+	std::string stored_pass;
+	void LoginOnNewConnection(std::shared_ptr<EQ::Net::DaybreakConnection> connection);
+	void LoginOnStatusChange(
+		std::shared_ptr<EQ::Net::DaybreakConnection> conn,
+		EQ::Net::DbProtocolStatus from,
+		EQ::Net::DbProtocolStatus to
+	);
+	void LoginOnStatusChangeIgnored(
+		std::shared_ptr<EQ::Net::DaybreakConnection> conn,
+		EQ::Net::DbProtocolStatus from,
+		EQ::Net::DbProtocolStatus to
+	);
+	void LoginOnPacketRecv(std::shared_ptr<EQ::Net::DaybreakConnection> conn, const EQ::Net::Packet &p);
+	void LoginSendSessionReady();
+	void LoginSendLogin();
+	void LoginProcessLoginResponse(const EQ::Net::Packet &p);
 };
 
 #endif
diff --git a/loginserver/client_manager.cpp b/loginserver/client_manager.cpp
index 4117430a7..d37ec545f 100644
--- a/loginserver/client_manager.cpp
+++ b/loginserver/client_manager.cpp
@@ -1,87 +1,119 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #include "client_manager.h"
 #include "login_server.h"
 
 extern LoginServer server;
-extern bool run_server;
+extern bool        run_server;
 
 #include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
 
 ClientManager::ClientManager()
 {
-	int titanium_port = atoi(server.config->GetVariable("Titanium", "port").c_str());
+	int titanium_port = server.config.GetVariableInt("client_configuration", "titanium_port", 5998);
+
 	EQStreamManagerInterfaceOptions titanium_opts(titanium_port, false, false);
+
 	titanium_stream = new EQ::Net::EQStreamManager(titanium_opts);
-	titanium_ops = new RegularOpcodeManager;
-	if (!titanium_ops->LoadOpcodes(server.config->GetVariable("Titanium", "opcodes").c_str()))
-	{
-		Log(Logs::General, Logs::Error, "ClientManager fatal error: couldn't load opcodes for Titanium file %s.",
-			server.config->GetVariable("Titanium", "opcodes").c_str());
+	titanium_ops    = new RegularOpcodeManager;
+	if (!titanium_ops->LoadOpcodes(
+		server.config.GetVariableString(
+			"client_configuration",
+			"titanium_opcodes",
+			"login_opcodes.conf"
+		).c_str())) {
+
+		LogError(
+			"ClientManager fatal error: couldn't load opcodes for Titanium file [{0}]",
+			server.config.GetVariableString("client_configuration", "titanium_opcodes", "login_opcodes.conf")
+		);
+
 		run_server = false;
 	}
 
-	titanium_stream->OnNewConnection([this](std::shared_ptr<EQ::Net::EQStream> stream) {
-		LogF(Logs::General, Logs::Login_Server, "New Titanium client connection from {0}:{1}", stream->GetRemoteIP(), stream->GetRemotePort());
-		stream->SetOpcodeManager(&titanium_ops);
-		Client *c = new Client(stream, cv_titanium);
-		clients.push_back(c);
-	});
+	titanium_stream->OnNewConnection(
+		[this](std::shared_ptr<EQ::Net::EQStream> stream) {
+			LogInfo(
+				"New Titanium client connection from {0}:{1}",
+				stream->GetRemoteIP(),
+				stream->GetRemotePort()
+			);
+
+			stream->SetOpcodeManager(&titanium_ops);
+			Client *c = new Client(stream, cv_titanium);
+			clients.push_back(c);
+		}
+	);
+
+	int sod_port = server.config.GetVariableInt("client_configuration", "sod_port", 5999);
 
-	int sod_port = atoi(server.config->GetVariable("SoD", "port").c_str());
 	EQStreamManagerInterfaceOptions sod_opts(sod_port, false, false);
 	sod_stream = new EQ::Net::EQStreamManager(sod_opts);
-	sod_ops = new RegularOpcodeManager;
-	if (!sod_ops->LoadOpcodes(server.config->GetVariable("SoD", "opcodes").c_str()))
-	{
-		Log(Logs::General, Logs::Error, "ClientManager fatal error: couldn't load opcodes for SoD file %s.",
-			server.config->GetVariable("SoD", "opcodes").c_str());
+	sod_ops    = new RegularOpcodeManager;
+	if (
+		!sod_ops->LoadOpcodes(
+			server.config.GetVariableString(
+				"client_configuration",
+				"sod_opcodes",
+				"login_opcodes.conf"
+			).c_str()
+		)) {
+		LogError(
+			"ClientManager fatal error: couldn't load opcodes for SoD file {0}",
+			server.config.GetVariableString("client_configuration", "sod_opcodes", "login_opcodes.conf").c_str()
+		);
+
 		run_server = false;
 	}
 
-	sod_stream->OnNewConnection([this](std::shared_ptr<EQ::Net::EQStream> stream) {
-		LogF(Logs::General, Logs::Login_Server, "New SoD client connection from {0}:{1}", stream->GetRemoteIP(), stream->GetRemotePort());
-		stream->SetOpcodeManager(&sod_ops);
-		Client *c = new Client(stream, cv_sod);
-		clients.push_back(c);
-	});
+	sod_stream->OnNewConnection(
+		[this](std::shared_ptr<EQ::Net::EQStream> stream) {
+			LogInfo(
+				"New SoD client connection from {0}:{1}",
+				stream->GetRemoteIP(),
+				stream->GetRemotePort()
+			);
+
+			stream->SetOpcodeManager(&sod_ops);
+			Client *c = new Client(stream, cv_sod);
+			clients.push_back(c);
+		}
+	);
 }
 
 ClientManager::~ClientManager()
 {
-	if (titanium_stream)
-	{
+	if (titanium_stream) {
 		delete titanium_stream;
 	}
 
-	if (titanium_ops)
-	{
+	if (titanium_ops) {
 		delete titanium_ops;
 	}
 
-	if (sod_stream)
-	{
+	if (sod_stream) {
 		delete sod_stream;
 	}
 
-	if (sod_ops)
-	{
+	if (sod_ops) {
 		delete sod_ops;
 	}
 }
@@ -91,16 +123,13 @@ void ClientManager::Process()
 	ProcessDisconnect();
 
 	auto iter = clients.begin();
-	while (iter != clients.end())
-	{
-		if ((*iter)->Process() == false)
-		{
-			Log(Logs::General, Logs::Debug, "Client had a fatal error and had to be removed from the login.");
+	while (iter != clients.end()) {
+		if ((*iter)->Process() == false) {
+			LogWarning("Client had a fatal error and had to be removed from the login");
 			delete (*iter);
 			iter = clients.erase(iter);
 		}
-		else
-		{
+		else {
 			++iter;
 		}
 	}
@@ -109,58 +138,52 @@ void ClientManager::Process()
 void ClientManager::ProcessDisconnect()
 {
 	auto iter = clients.begin();
-	while (iter != clients.end())
-	{
+	while (iter != clients.end()) {
 		std::shared_ptr<EQStreamInterface> c = (*iter)->GetConnection();
-		if (c->CheckState(CLOSED))
-		{
-			Log(Logs::General, Logs::Login_Server, "Client disconnected from the server, removing client.");
+		if (c->CheckState(CLOSED)) {
+			LogInfo("Client disconnected from the server, removing client");
 			delete (*iter);
 			iter = clients.erase(iter);
 		}
-		else
-		{
+		else {
 			++iter;
 		}
 	}
 }
 
-void ClientManager::RemoveExistingClient(unsigned int account_id)
+/**
+ * @param account_id
+ * @param loginserver
+ */
+void ClientManager::RemoveExistingClient(unsigned int account_id, const std::string &loginserver)
 {
 	auto iter = clients.begin();
-	while (iter != clients.end())
-	{
-		if ((*iter)->GetAccountID() == account_id)
-		{
-			Log(Logs::General, Logs::Login_Server, "Client attempting to log in and existing client already logged in, removing existing client.");
+	while (iter != clients.end()) {
+		if ((*iter)->GetAccountID() == account_id && (*iter)->GetLoginServerName().compare(loginserver) == 0) {
+			LogInfo("Client attempting to log in existing client already logged in, removing existing client");
 			delete (*iter);
 			iter = clients.erase(iter);
 		}
-		else
-		{
+		else {
 			++iter;
 		}
 	}
 }
 
-Client *ClientManager::GetClient(unsigned int account_id)
+/**
+ * @param account_id
+ * @param loginserver
+ * @return
+ */
+Client *ClientManager::GetClient(unsigned int account_id, const std::string &loginserver)
 {
-	Client *cur = nullptr;
-	int count = 0;
 	auto iter = clients.begin();
-	while (iter != clients.end())
-	{
-		if ((*iter)->GetAccountID() == account_id)
-		{
-			cur = (*iter);
-			count++;
+	while (iter != clients.end()) {
+		if ((*iter)->GetAccountID() == account_id && (*iter)->GetLoginServerName().compare(loginserver) == 0) {
+			return (*iter);
 		}
 		++iter;
 	}
 
-	if (count > 1)
-	{
-		Log(Logs::General, Logs::Error, "More than one client with a given account_id existed in the client list.");
-	}
-	return cur;
+	return nullptr;
 }
diff --git a/loginserver/client_manager.h b/loginserver/client_manager.h
index 7e05737a2..4de290210 100644
--- a/loginserver/client_manager.h
+++ b/loginserver/client_manager.h
@@ -1,20 +1,23 @@
-/* EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #ifndef EQEMU_CLIENTMANAGER_H
 #define EQEMU_CLIENTMANAGER_H
 
@@ -27,44 +30,50 @@
 /**
 * Client manager class, holds all the client objects and does basic processing.
 */
-class ClientManager
-{
+class ClientManager {
 public:
 	/**
-	* Constructor, sets up the stream factories and opcode managers.
-	*/
+	 * Constructor: sets up the stream factories and opcode managers
+	 */
 	ClientManager();
 
 	/**
-	* Destructor, shuts down the streams and opcode managers.
-	*/
+	 * Destructor: shuts down the streams and opcode managers
+	 */
 	~ClientManager();
 
 	/**
-	* Processes every client in the internal list, removes them if necessary.
-	*/
+	 * Processes every client in the internal list, removes them if necessary.
+	 */
 	void Process();
 
 	/**
-	* Removes a client with a certain account id.
-	*/
-	void RemoveExistingClient(unsigned int account_id);
+	 * Removes a client with a certain account id
+	 *
+	 * @param account_id
+	 * @param loginserver
+	 */
+	void RemoveExistingClient(unsigned int account_id, const std::string &loginserver);
 
 	/**
-	* Gets a client (if exists) by their account id.
-	*/
-	Client *GetClient(unsigned int account_id);
+	 * Gets a client (if exists) by their account id
+	 *
+	 * @param account_id
+	 * @param loginserver
+	 * @return
+	 */
+	Client *GetClient(unsigned int account_id, const std::string &loginserver);
 private:
 
 	/**
-	* Processes disconnected clients, removes them if necessary.
-	*/
+	 * Processes disconnected clients, removes them if necessary
+	 */
 	void ProcessDisconnect();
 
-	std::list<Client*> clients;
-	OpcodeManager *titanium_ops;
+	std::list<Client *>      clients;
+	OpcodeManager            *titanium_ops;
 	EQ::Net::EQStreamManager *titanium_stream;
-	OpcodeManager *sod_ops;
+	OpcodeManager            *sod_ops;
 	EQ::Net::EQStreamManager *sod_stream;
 };
 
diff --git a/loginserver/config.cpp b/loginserver/config.cpp
deleted file mode 100644
index 72d44efa0..000000000
--- a/loginserver/config.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "../common/global_define.h"
-#include "../common/eqemu_logsys.h"
-#include "config.h"
-
-/**
-* Retrieves the variable we want from our title or theme
-* First gets the map from the title
-* Then gets the argument from the map we got from title
-*/
-std::string Config::GetVariable(std::string title, std::string parameter)
-{
-	std::map<std::string, std::map<std::string, std::string> >::iterator iter = vars.find(title);
-	if(iter != vars.end())
-	{
-		std::map<std::string, std::string>::iterator arg_iter = iter->second.find(parameter);
-		if(arg_iter != iter->second.end())
-		{
-			return arg_iter->second;
-		}
-	}
-
-	return std::string("");
-}
-
-/**
-* Opens a file and passes it to the tokenizer
-* Then it parses the tokens returned and puts them into titles and variables.
-*/
-void Config::Parse(const char *file_name)
-{
-	if(file_name == nullptr)
-	{
-		Log(Logs::General, Logs::Error, "Config::Parse(), file_name passed was null.");
-		return;
-	}
-
-	vars.clear();
-	FILE *input = fopen(file_name, "r");
-	if(input)
-	{
-		std::list<std::string> tokens;
-		Tokenize(input, tokens);
-
-		char mode = 0;
-		std::string title, param, arg;
-		std::list<std::string>::iterator iter = tokens.begin();
-		while(iter != tokens.end())
-		{
-			if((*iter).compare("[") == 0)
-			{
-				title.clear();
-				bool first = true;
-				++iter;
-				if(iter == tokens.end())
-				{
-					Log(Logs::General, Logs::Error, "Config::Parse(), EOF before title done parsing.");
-					fclose(input);
-					vars.clear();
-					return;
-				}
-
-				while((*iter).compare("]") != 0 && iter != tokens.end())
-				{
-					if(!first)
-					{
-						title += " ";
-					}
-					else
-					{
-						first = false;
-					}
-
-					title += (*iter);
-					++iter;
-				}
-				++iter;
-			}
-
-			if(mode == 0)
-			{
-				param = (*iter);
-				mode++;
-			}
-			else if(mode == 1)
-			{
-				mode++;
-				if((*iter).compare("=") != 0)
-				{
-					Log(Logs::General, Logs::Error, "Config::Parse(), invalid parse token where = should be.");
-					fclose(input);
-					vars.clear();
-					return;
-				}
-			}
-			else
-			{
-				arg = (*iter);
-				mode = 0;
-				std::map<std::string, std::map<std::string, std::string> >::iterator map_iter = vars.find(title);
-				if(map_iter != vars.end())
-				{
-					map_iter->second[param] = arg;
-					vars[title] = map_iter->second;
-				}
-				else
-				{
-					std::map<std::string, std::string> var_map;
-					var_map[param] = arg;
-					vars[title] = var_map;
-				}
-			}
-			++iter;
-		}
-		fclose(input);
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Config::Parse(), file was unable to be opened for parsing.");
-	}
-}
-
-/**
-* Pretty basic lexical analyzer
-* Breaks up the input character stream into tokens and puts them into the list provided.
-* Ignores # as a line comment
-*/
-void Config::Tokenize(FILE *input, std::list<std::string> &tokens)
-{
-	auto c = fgetc(input);
-	std::string lexeme;
-
-	while(c != EOF)
-	{
-		if(isspace(c))
-		{
-			if(lexeme.size() > 0)
-			{
-				tokens.push_back(lexeme);
-				lexeme.clear();
-			}
-			c = fgetc(input);
-			continue;
-		}
-
-		if(isalnum(c))
-		{
-			lexeme += c;
-			c = fgetc(input);
-			continue;
-		}
-
-		switch(c)
-		{
-		case '#':
-			{
-				if(lexeme.size() > 0)
-				{
-					tokens.push_back(lexeme);
-					lexeme.clear();
-				}
-
-				while(c != '\n' && c != EOF)
-				{
-					c = fgetc(input);
-				}
-				break;
-			}
-		case '[':
-		case ']':
-		case '=':
-			{
-				if(lexeme.size() > 0)
-				{
-					tokens.push_back(lexeme);
-					lexeme.clear();
-				}
-
-				lexeme += c;
-				tokens.push_back(lexeme);
-				lexeme.clear();
-				break;
-			}
-		default:
-			{
-				lexeme += c;
-			}
-		}
-
-		c = fgetc(input);
-	}
-
-	if(lexeme.size() > 0)
-	{
-		tokens.push_back(lexeme);
-	}
-}
-
diff --git a/loginserver/config.h b/loginserver/config.h
deleted file mode 100644
index 36d1feebe..000000000
--- a/loginserver/config.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef EQEMU_CONFIG_H
-#define EQEMU_CONFIG_H
-
-#include <stdio.h>
-#include <list>
-#include <map>
-#include <string>
-
-/**
- * Keeps track of all the configuration for the application with a small parser.
- * Note: This is not a thread safe class, but only parse writes to variables in the class.
- * Thus making it mostly safe so long as you're careful with where you call Parse()
- */
-class Config
-{
-public:
-	Config() { }
-	~Config() { }
-
-	/**
-	* Parses the selected file for variables, will clear current variables if selected.
-	*/
-	virtual void Parse(const char *file_name);
-
-	/**
-	* Gets a variable if it exists.
-	*/
-	std::string GetVariable(std::string title, std::string parameter);
-
-protected:
-	std::map<std::string, std::map<std::string, std::string> > vars;
-
-private:
-	/**
-	* Breaks our input up into tokens for Parse().
-	* This is private because it's not intended to be overloaded by a derived class which
-	* may get it's input from other places than a C file pointer. (a http get request for example).
-	* The programmer of a derived class would be expected to make their own Tokenize function for their own Parse().
-	*/
-	void Tokenize(FILE* input, std::list<std::string> &tokens);
-};
-
-#endif
-
diff --git a/loginserver/database.cpp b/loginserver/database.cpp
new file mode 100644
index 000000000..35f49e0eb
--- /dev/null
+++ b/loginserver/database.cpp
@@ -0,0 +1,809 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "../common/global_define.h"
+
+#include "database.h"
+#include "login_server.h"
+#include "../common/eqemu_logsys.h"
+#include "../common/string_util.h"
+#include "../common/util/uuid.h"
+
+extern LoginServer server;
+
+/**
+ * Initial connect
+ *
+ * @param user
+ * @param pass
+ * @param host
+ * @param port
+ * @param name
+ */
+Database::Database(
+	std::string user,
+	std::string pass,
+	std::string host,
+	std::string port,
+	std::string name
+)
+{
+	this->user = user;
+	this->pass = pass;
+	this->host = host;
+	this->name = name;
+
+	uint32 errnum = 0;
+	char   errbuf[MYSQL_ERRMSG_SIZE];
+	if (!Open(
+		host.c_str(),
+		user.c_str(),
+		pass.c_str(),
+		name.c_str(),
+		std::stoi(port),
+		&errnum,
+		errbuf
+	)
+		) {
+		LogError("Failed to connect to database: Error: [{0}]", errbuf);
+		exit(1);
+	}
+	else {
+		LogStatus("Using database [{0}] at [{1}:{2}]", name, host, port);
+	}
+}
+
+/**
+ * Deconstructor
+ */
+Database::~Database()
+{
+	if (database) {
+		mysql_close(database);
+	}
+}
+
+/**
+ * @param name
+ * @param loginserver
+ * @param password
+ * @param id
+ * @return
+ */
+bool Database::GetLoginDataFromAccountInfo(
+	const std::string &name,
+	const std::string &loginserver,
+	std::string &password,
+	unsigned int &id
+)
+{
+	auto query = fmt::format(
+		"SELECT id, account_password FROM login_accounts WHERE account_name = '{0}' AND source_loginserver = '{1}' LIMIT 1",
+		EscapeString(name),
+		EscapeString(loginserver)
+	);
+
+	auto results = QueryDatabase(query);
+
+	if (results.RowCount() != 1) {
+		LogDebug(
+			"Could not find account for name [{0}] login [{1}]",
+			name,
+			loginserver
+		);
+
+		return false;
+	}
+
+	if (!results.Success()) {
+		return false;
+	}
+
+	auto row = results.begin();
+
+	id       = atoi(row[0]);
+	password = row[1];
+
+	LogDebug(
+		"Found account for name [{0}] login [{1}]",
+		name,
+		loginserver
+	);
+
+	return true;
+}
+
+/**
+ * @param token
+ * @param ip
+ * @param db_account_id
+ * @param db_loginserver
+ * @param user
+ * @return
+ */
+bool Database::GetLoginTokenDataFromToken(
+	const std::string &token,
+	const std::string &ip,
+	unsigned int &db_account_id,
+	std::string &db_loginserver,
+	std::string &user
+)
+{
+	auto query = fmt::format(
+		"SELECT tbllogintokens.Id, tbllogintokens.IpAddress, tbllogintokenclaims.Name, tbllogintokenclaims.Value FROM tbllogintokens "
+		"JOIN tbllogintokenclaims ON tbllogintokens.Id = tbllogintokenclaims.TokenId WHERE tbllogintokens.Expires > NOW() "
+		"AND tbllogintokens.Id='{0}' AND tbllogintokens.IpAddress='{1}'",
+		EscapeString(token),
+		EscapeString(ip)
+	);
+
+	auto results = QueryDatabase(query);
+	if (results.RowCount() == 0 || !results.Success()) {
+		return false;
+	}
+
+	bool      found_username          = false;
+	bool      found_login_id          = false;
+	bool      found_login_server_name = false;
+	for (auto row                     = results.begin(); row != results.end(); ++row) {
+		if (strcmp(row[2], "username") == 0) {
+			user           = row[3];
+			found_username = true;
+			continue;
+		}
+
+		if (strcmp(row[2], "login_server_id") == 0) {
+			db_account_id  = atoi(row[3]);
+			found_login_id = true;
+			continue;
+		}
+
+		if (strcmp(row[2], "login_server_name") == 0) {
+			db_loginserver          = row[3];
+			found_login_server_name = true;
+			continue;
+		}
+	}
+
+	return found_username && found_login_id && found_login_server_name;
+}
+
+/**
+ * @param loginserver
+ * @return
+ */
+unsigned int Database::GetFreeID(const std::string &loginserver)
+{
+	auto query = fmt::format(
+		"SELECT IFNULL(MAX(id), 0) + 1 FROM login_accounts WHERE source_loginserver = '{0}'",
+		EscapeString(loginserver)
+	);
+
+	auto results = QueryDatabase(query);
+	if (!results.Success() || results.RowCount() != 1) {
+		return 0;
+	}
+
+	auto row = results.begin();
+
+	return std::stoi(row[0]);
+}
+
+/**
+ * @param name
+ * @param password
+ * @param loginserver
+ * @param id
+ * @return
+ */
+bool Database::CreateLoginData(
+	const std::string &name,
+	const std::string &password,
+	const std::string &loginserver,
+	unsigned int &id
+)
+{
+	uint32 free_id = GetFreeID(loginserver);
+	id = free_id;
+
+	return CreateLoginDataWithID(name, password, loginserver, free_id);
+}
+
+/**
+ * @param name
+ * @param password
+ * @param loginserver
+ * @param email
+ * @return
+ */
+uint32 Database::CreateLoginAccount(
+	const std::string &name,
+	const std::string &password,
+	const std::string &loginserver,
+	const std::string &email
+)
+{
+	uint32 free_id = GetFreeID(loginserver);
+
+	if (free_id <= 0) {
+		return 0;
+	}
+
+	auto query = fmt::format(
+		"INSERT INTO login_accounts (id, source_loginserver, account_name, account_password, account_email, last_login_date, last_ip_address, created_at) "
+		"VALUES ({0}, '{1}', '{2}', '{3}', '{4}', NOW(), '127.0.0.1', NOW())",
+		free_id,
+		EscapeString(loginserver),
+		EscapeString(name),
+		EscapeString(password),
+		EscapeString(email)
+	);
+
+	auto results = QueryDatabase(query);
+
+	return (results.Success() ? free_id : 0);
+}
+
+/**
+ * @param in_account_name
+ * @param in_account_password
+ * @param loginserver
+ * @param id
+ * @return
+ */
+bool Database::CreateLoginDataWithID(
+	const std::string &in_account_name,
+	const std::string &in_account_password,
+	const std::string &loginserver,
+	unsigned int id
+)
+{
+	if (id == 0) {
+		return false;
+	}
+
+	auto query = fmt::format(
+		"INSERT INTO login_accounts (id, source_loginserver, account_name, account_password, account_email, last_login_date, last_ip_address, created_at) "
+		"VALUES ({0}, '{1}', '{2}', '{3}', 'local_creation', NOW(), '127.0.0.1', NOW())",
+		id,
+		EscapeString(loginserver),
+		EscapeString(in_account_name),
+		EscapeString(in_account_password)
+	);
+
+	auto results = QueryDatabase(query);
+
+	return results.Success();
+}
+
+/**
+ * @param name
+ * @param password
+ * @param loginserver
+ * @param id
+ * @return
+ */
+bool Database::DoesLoginServerAccountExist(
+	const std::string &name,
+	const std::string &password,
+	const std::string &loginserver,
+	unsigned int id
+)
+{
+	if (id == 0) {
+		return false;
+	}
+
+	auto query = fmt::format(
+		"SELECT account_name FROM login_accounts WHERE account_name = '{0}' AND source_loginserver = '{1}'",
+		EscapeString(name),
+		EscapeString(loginserver)
+	);
+
+	auto results = QueryDatabase(query);
+	if (!results.Success() || results.RowCount() != 1) {
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * @param name
+ * @param loginserver
+ * @param hash
+ */
+void Database::UpdateLoginserverAccountPasswordHash(
+	const std::string &name,
+	const std::string &loginserver,
+	const std::string &hash
+)
+{
+	LogDebug(
+		"name [{0}] loginserver [{1}] hash [{2}]",
+		name,
+		loginserver,
+		hash
+	);
+
+	auto query = fmt::format(
+		"UPDATE login_accounts SET account_password = '{0}' WHERE account_name = '{1}' AND source_loginserver = '{2}'",
+		hash,
+		EscapeString(name),
+		EscapeString(loginserver)
+	);
+
+	QueryDatabase(query);
+}
+
+/**
+ * @param short_name
+ * @param login_world_server_admin_id
+ * @return
+ */
+Database::DbWorldRegistration Database::GetWorldRegistration(
+	const std::string &short_name,
+	uint32 login_world_server_admin_id
+)
+{
+	auto query = fmt::format(
+		"SELECT\n"
+		"  WSR.id,\n"
+		"  WSR.tag_description,\n"
+		"  WSR.is_server_trusted,\n"
+		"  SLT.id,\n"
+		"  SLT.description,\n"
+		"  ifnull(WSR.login_server_admin_id, 0) AS login_server_admin_id\n"
+		"FROM\n"
+		"  login_world_servers AS WSR\n"
+		"  JOIN login_server_list_types AS SLT ON WSR.login_server_list_type_id = SLT.id\n"
+		"WHERE\n"
+		"  WSR.short_name = '{0}' AND WSR.login_server_admin_id = {1} LIMIT 1",
+		EscapeString(short_name),
+		login_world_server_admin_id
+	);
+
+	Database::DbWorldRegistration world_registration{};
+
+	auto results = QueryDatabase(query);
+	if (!results.Success() || results.RowCount() != 1) {
+		return world_registration;
+	}
+
+	auto row = results.begin();
+
+	world_registration.loaded                  = true;
+	world_registration.server_id               = std::stoi(row[0]);
+	world_registration.server_description      = row[1];
+	world_registration.server_list_type        = std::stoi(row[3]);
+	world_registration.is_server_trusted       = std::stoi(row[2]) > 0;
+	world_registration.server_list_description = row[4];
+	world_registration.server_admin_id         = std::stoi(row[5]);
+
+	if (world_registration.server_admin_id <= 0) {
+		return world_registration;
+	}
+
+	auto world_registration_query = fmt::format(
+		"SELECT account_name, account_password FROM login_server_admins WHERE id = {0} LIMIT 1",
+		world_registration.server_admin_id
+	);
+
+	auto world_registration_results = QueryDatabase(world_registration_query);
+	if (world_registration_results.Success() && world_registration_results.RowCount() == 1) {
+		auto world_registration_row = world_registration_results.begin();
+		world_registration.server_admin_account_name     = world_registration_row[0];
+		world_registration.server_admin_account_password = world_registration_row[1];
+	}
+
+	return world_registration;
+}
+
+/**
+ * @param id
+ * @param ip_address
+ */
+void Database::UpdateLSAccountData(unsigned int id, std::string ip_address)
+{
+	auto query = fmt::format(
+		"UPDATE login_accounts SET last_ip_address = '{0}', last_login_date = NOW() where id = {1}",
+		ip_address,
+		id
+	);
+
+	QueryDatabase(query);
+}
+
+/**
+ * @param id
+ * @param name
+ * @param password
+ * @param email
+ */
+void Database::UpdateLSAccountInfo(
+	unsigned int id,
+	std::string name,
+	std::string password,
+	std::string email
+)
+{
+	auto query = fmt::format(
+		"REPLACE login_accounts SET id = {0}, account_name = '{1}', account_password = sha('{2}'), "
+		"account_email = '{3}', last_ip_address = '0.0.0.0', last_login_date = now()",
+		id,
+		EscapeString(name),
+		EscapeString(password),
+		EscapeString(email)
+	);
+
+	QueryDatabase(query);
+}
+
+/**
+ * @param id
+ * @param long_name
+ * @param ip_address
+ */
+void Database::UpdateWorldRegistration(unsigned int id, std::string long_name, std::string ip_address)
+{
+	auto query = fmt::format(
+		"UPDATE login_world_servers SET last_login_date = NOW(), last_ip_address = '{0}', long_name = '{1}' WHERE id = {2}",
+		ip_address,
+		EscapeString(long_name),
+		id
+	);
+
+	QueryDatabase(query);
+}
+
+/**
+ * @param id
+ * @param admin_account_password_hash
+ */
+bool Database::UpdateLoginWorldAdminAccountPassword(
+	unsigned int id,
+	const std::string &admin_account_password_hash
+)
+{
+	auto results = QueryDatabase(
+		fmt::format(
+			"UPDATE login_server_admins SET account_password = '{}' WHERE id = {}",
+			EscapeString(admin_account_password_hash),
+			id
+		)
+	);
+
+	return results.Success();
+}
+
+/**
+ *
+ * @param admin_account_username
+ * @param admin_account_password_hash
+ */
+bool Database::UpdateLoginWorldAdminAccountPasswordByUsername(
+	const std::string &admin_account_username,
+	const std::string &admin_account_password_hash
+)
+{
+	auto results = QueryDatabase(
+		fmt::format(
+			"UPDATE login_server_admins SET account_password = '{}' WHERE account_name = '{}'",
+			EscapeString(admin_account_password_hash),
+			EscapeString(admin_account_username)
+		)
+	);
+
+	return results.Success();
+}
+
+/**
+ * @param server_long_name
+ * @param server_short_name
+ * @param id
+ * @return
+ */
+bool Database::CreateWorldRegistration(
+	std::string server_long_name,
+	std::string server_short_name,
+	std::string server_remote_ip,
+	unsigned int &id,
+	unsigned int &server_admin_id
+)
+{
+	auto results = QueryDatabase("SELECT IFNULL(max(id), 0) + 1 FROM login_world_servers");
+	if (!results.Success() || results.RowCount() != 1) {
+		return false;
+	}
+
+	auto row = results.begin();
+
+	id = std::stoi(row[0]);
+	auto insert_query = fmt::format(
+		"INSERT INTO login_world_servers SET id = {0}, long_name = '{1}', short_name = '{2}', last_ip_address = '{3}', \n"
+		"login_server_list_type_id = 3, login_server_admin_id = {4}, is_server_trusted = 0, tag_description = ''",
+		id,
+		EscapeString(server_long_name),
+		EscapeString(server_short_name),
+		server_remote_ip,
+		server_admin_id
+	);
+
+	auto insert_results = QueryDatabase(insert_query);
+	if (!insert_results.Success()) {
+		LogError(
+			"Failed to register world server {0} - {1}",
+			server_long_name,
+			server_short_name
+		);
+
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * @param long_name
+ * @param short_name
+ * @param id
+ * @return
+ */
+std::string Database::CreateLoginserverApiToken(
+	bool write_mode,
+	bool read_mode
+)
+{
+	std::string token = EQ::Util::UUID::Generate().ToString();
+	auto        query = fmt::format(
+		"INSERT INTO login_api_tokens (token, can_write, can_read, created_at) VALUES ('{0}', {1}, {2}, NOW())",
+		token,
+		(write_mode ? "1" : "0"),
+		(read_mode ? "1" : "0")
+	);
+
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
+		return "";
+	}
+
+	return token;
+}
+
+/**
+ * @param long_name
+ * @param short_name
+ * @param id
+ * @return
+ */
+MySQLRequestResult Database::GetLoginserverApiTokens()
+{
+	return QueryDatabase("SELECT token, can_write, can_read FROM login_api_tokens");
+}
+
+/**
+ * @param log_settings
+ */
+void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
+{
+	std::string query =
+					"SELECT "
+					"log_category_id, "
+					"log_category_description, "
+					"log_to_console, "
+					"log_to_file, "
+					"log_to_gmsay "
+					"FROM "
+					"logsys_categories "
+					"ORDER BY log_category_id";
+
+	auto results         = QueryDatabase(query);
+	int  log_category_id = 0;
+
+	int *categories_in_database = new int[1000];
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		log_category_id = atoi(row[0]);
+		if (log_category_id <= Logs::None || log_category_id >= Logs::MaxCategoryID) {
+			continue;
+		}
+
+		log_settings[log_category_id].log_to_console = static_cast<uint8>(atoi(row[2]));
+		log_settings[log_category_id].log_to_file    = static_cast<uint8>(atoi(row[3]));
+		log_settings[log_category_id].log_to_gmsay   = static_cast<uint8>(atoi(row[4]));
+
+		/**
+		 * Determine if any output method is enabled for the category
+		 * and set it to 1 so it can used to check if category is enabled
+		 */
+		const bool log_to_console      = log_settings[log_category_id].log_to_console > 0;
+		const bool log_to_file         = log_settings[log_category_id].log_to_file > 0;
+		const bool log_to_gmsay        = log_settings[log_category_id].log_to_gmsay > 0;
+		const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
+
+		if (is_category_enabled) {
+			log_settings[log_category_id].is_category_enabled = 1;
+		}
+
+		/**
+		 * This determines whether or not the process needs to actually file log anything.
+		 * If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
+		 */
+		if (log_settings[log_category_id].log_to_file > 0) {
+			LogSys.file_logs_enabled = true;
+		}
+
+		categories_in_database[log_category_id] = 1;
+	}
+
+	/**
+	 * Auto inject categories that don't exist in the database...
+	 */
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		if (categories_in_database[log_index] != 1) {
+
+			LogInfo(
+				"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
+				Logs::LogCategoryName[log_index]
+			);
+
+			auto inject_query = fmt::format(
+				"INSERT INTO logsys_categories "
+				"(log_category_id, "
+				"log_category_description, "
+				"log_to_console, "
+				"log_to_file, "
+				"log_to_gmsay) "
+				"VALUES "
+				"({0}, '{1}', {2}, {3}, {4})",
+				log_index,
+				EscapeString(Logs::LogCategoryName[log_index]),
+				std::to_string(log_settings[log_index].log_to_console),
+				std::to_string(log_settings[log_index].log_to_file),
+				std::to_string(log_settings[log_index].log_to_gmsay)
+			);
+
+			QueryDatabase(inject_query);
+		}
+	}
+
+	delete[] categories_in_database;
+}
+
+/**
+ * @param account_name
+ * @param account_password
+ * @param first_name
+ * @param last_name
+ * @param email
+ * @param ip_address
+ * @return
+ */
+uint32 Database::CreateLoginserverWorldAdminAccount(
+	const std::string &account_name,
+	const std::string &account_password,
+	const std::string &first_name,
+	const std::string &last_name,
+	const std::string &email,
+	const std::string &ip_address
+)
+{
+	auto query = fmt::format(
+		"INSERT INTO login_server_admins (account_name, account_password, first_name, last_name, email, registration_date, "
+		"registration_ip_address) "
+		"VALUES ('{0}', '{1}', '{2}', '{3}', '{4}', NOW(), '{5}')",
+		EscapeString(account_name),
+		EscapeString(account_password),
+		EscapeString(first_name),
+		EscapeString(last_name),
+		EscapeString(email),
+		ip_address
+	);
+
+	auto results = QueryDatabase(query);
+
+	return (results.Success() ? results.LastInsertedID() : 0);
+}
+
+/**
+ * @param account_name
+ * @return
+ */
+bool Database::DoesLoginserverWorldAdminAccountExist(
+	const std::string &account_name
+)
+{
+	auto query = fmt::format(
+		"SELECT account_name FROM login_server_admins WHERE account_name = '{0}' LIMIT 1",
+		EscapeString(account_name)
+	);
+
+	auto results = QueryDatabase(query);
+
+	return (results.RowCount() == 1);
+}
+
+/**
+ * @param account_name
+ * @return
+ */
+Database::DbLoginServerAdmin Database::GetLoginServerAdmin(const std::string &account_name)
+{
+	auto query = fmt::format(
+		"SELECT id, account_name, account_password, first_name, last_name, email, registration_date, registration_ip_address"
+		" FROM login_server_admins WHERE account_name = '{0}' LIMIT 1",
+		EscapeString(account_name)
+	);
+
+	auto results = QueryDatabase(query);
+
+	Database::DbLoginServerAdmin login_server_admin{};
+	if (results.RowCount() == 1) {
+		auto row = results.begin();
+		login_server_admin.loaded                  = true;
+		login_server_admin.id                      = std::stoi(row[0]);
+		login_server_admin.account_name            = row[1];
+		login_server_admin.account_password        = row[2];
+		login_server_admin.first_name              = row[3];
+		login_server_admin.last_name               = row[4];
+		login_server_admin.email                   = row[5];
+		login_server_admin.registration_date       = row[7];
+		login_server_admin.registration_ip_address = row[8];
+	}
+
+	return login_server_admin;
+}
+
+/**
+ * @param account_name
+ * @return
+ */
+Database::DbLoginServerAccount Database::GetLoginServerAccountByAccountName(
+	const std::string &account_name,
+	const std::string &source_loginserver
+)
+{
+	auto query = fmt::format(
+		"SELECT id, account_name, account_password, account_email, source_loginserver, last_ip_address, last_login_date, "
+		"created_at, updated_at"
+		" FROM login_accounts WHERE account_name = '{0}' and source_loginserver = '{1}' LIMIT 1",
+		EscapeString(account_name),
+		EscapeString(source_loginserver)
+	);
+
+	auto results = QueryDatabase(query);
+
+	Database::DbLoginServerAccount login_server_account{};
+	if (results.RowCount() == 1) {
+		auto row = results.begin();
+		login_server_account.loaded             = true;
+		login_server_account.id                 = std::stoi(row[0]);
+		login_server_account.account_name       = row[1];
+		login_server_account.account_password   = row[2];
+		login_server_account.account_email      = row[3];
+		login_server_account.source_loginserver = row[4];
+		login_server_account.last_ip_address    = row[5];
+		login_server_account.last_login_date    = row[6];
+		login_server_account.created_at         = row[7];
+		login_server_account.updated_at         = row[8];
+	}
+
+	return login_server_account;
+}
\ No newline at end of file
diff --git a/loginserver/database.h b/loginserver/database.h
index 5dd7f7037..8ffcb187b 100644
--- a/loginserver/database.h
+++ b/loginserver/database.h
@@ -1,82 +1,310 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+#ifndef EQEMU_DATABASEMYSQL_H
+#define EQEMU_DATABASEMYSQL_H
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef EQEMU_DATABASE_H
-#define EQEMU_DATABASE_H
+#include "../common/dbcore.h"
+#include "../common/eqemu_logsys.h"
 
 #include <string>
+#include <sstream>
+#include <stdlib.h>
+#include <mysql.h>
 
-#define EQEMU_MYSQL_ENABLED
-//#define EQEMU_POSTGRESQL_ENABLED
-
-/**
-* Base database class, intended to be extended.
-*/
-class Database
-{
+class Database : public DBcore {
 public:
-	Database() : user(""), pass(""), host(""), port(""), name("") { }
-	virtual ~Database() { }
+
+	Database() { database = nullptr; }
 
 	/**
-	* Returns true if the database successfully connected.
-	*/
-	virtual bool IsConnected() { return false; }
+	 * Constructor, tries to set our database to connect to the supplied options.
+	 *
+	 * @param user
+	 * @param pass
+	 * @param host
+	 * @param port
+	 * @param name
+	 */
+	Database(std::string user, std::string pass, std::string host, std::string port, std::string name);
 
 	/**
-	* Retrieves the login data (password hash and account id) from the account name provided
-	* Needed for client login procedure.
-	* Returns true if the record was found, false otherwise.
-	*/
-	virtual bool GetLoginDataFromAccountName(std::string name, std::string &password, unsigned int &id) { return false; }
-
-	virtual bool GetLoginTokenDataFromToken(const std::string &token, const std::string &ip, unsigned int &db_account_id, std::string &user) { return false; }
-
-	virtual bool CreateLoginData(const std::string &name, const std::string &password, unsigned int &id) { return false; }
+	 * Destructor, frees our database if needed.
+	 */
+	~Database();
+	bool IsConnected() { return (database != nullptr); }
 
 	/**
-	* Retrieves the world registration from the long and short names provided.
-	* Needed for world login procedure.
-	* Returns true if the record was found, false otherwise.
-	*/
-	virtual bool GetWorldRegistration(std::string long_name, std::string short_name, unsigned int &id, std::string &desc, unsigned int &list_id,
-		unsigned int &trusted, std::string &list_desc, std::string &account, std::string &password) { return false; }
+	 * Retrieves the login data (password hash and account id) from the account name provided needed for client login procedure.
+	 * @param name
+	 * @param loginserver
+	 * @param password
+	 * @param id
+	 * @return
+	 */
+	bool GetLoginDataFromAccountInfo(
+		const std::string &name,
+		const std::string &loginserver,
+		std::string &password,
+		unsigned int &id
+	);
 
 	/**
-	* Updates the ip address of the client with account id = id
-	*/
-	virtual void UpdateLSAccountData(unsigned int id, std::string ip_address) { }
+	 * @param token
+	 * @param ip
+	 * @param db_account_id
+	 * @param db_loginserver
+	 * @param user
+	 * @return
+	 */
+	bool GetLoginTokenDataFromToken(
+		const std::string &token,
+		const std::string &ip,
+		unsigned int &db_account_id,
+		std::string &db_loginserver,
+		std::string &user
+	);
 
 	/**
-	* Updates or creates the login server account with info from world server
-	*/
-	virtual void UpdateLSAccountInfo(unsigned int id, std::string name, std::string password, std::string email) { }
+	 * @param loginserver
+	 * @return
+	 */
+	unsigned int GetFreeID(const std::string &loginserver);
 
 	/**
-	* Updates the ip address of the world with account id = id
-	*/
-	virtual void UpdateWorldRegistration(unsigned int id, std::string long_name, std::string ip_address) { }
+	 * @param name
+	 * @param password
+	 * @param loginserver
+	 * @param id
+	 * @return
+	 */
+	bool CreateLoginData(
+		const std::string &name,
+		const std::string &password,
+		const std::string &loginserver,
+		unsigned int &id
+	);
 
 	/**
-	* Creates new world registration for unregistered servers and returns new id
-	*/
-	virtual bool CreateWorldRegistration(std::string long_name, std::string short_name, unsigned int &id) { return false; }
+	 * @param in_account_name
+	 * @param in_account_password
+	 * @param loginserver
+	 * @param id
+	 * @return
+	 */
+	bool CreateLoginDataWithID(
+		const std::string &in_account_name,
+		const std::string &in_account_password,
+		const std::string &loginserver,
+		unsigned int id
+	);
+
+	/**
+	 * @param name
+	 * @param loginserver
+	 * @param hash
+	 */
+	void UpdateLoginserverAccountPasswordHash(
+		const std::string &name,
+		const std::string &loginserver,
+		const std::string &hash);
+
+	/**
+	 * @param name
+	 * @param password
+	 * @param loginserver
+	 * @param id
+	 * @return
+	 */
+	bool DoesLoginServerAccountExist(
+		const std::string &name,
+		const std::string &password,
+		const std::string &loginserver,
+		unsigned int id
+	);
+
+	struct DbWorldRegistration {
+		bool        loaded            = false;
+		int32       server_id         = 0;
+		int8        server_list_type  = 3;
+		bool        is_server_trusted = false;
+		std::string server_description;
+		std::string server_list_description;
+		std::string server_admin_account_name;
+		std::string server_admin_account_password;
+		uint32 server_admin_id;
+	};
+
+	/**
+	 * Retrieves the world registration from the long and short names provided
+	 * Needed for world login procedure
+	 * Returns true if the record was found, false otherwise
+	 *
+	 * @param short_name
+	 * @param login_world_server_admin_id
+	 * @return
+	 */
+	Database::DbWorldRegistration GetWorldRegistration(
+		const std::string &short_name,
+		uint32 login_world_server_admin_id
+	);
+
+	/**
+	 * @param id
+	 * @param ip_address
+	 */
+	void UpdateLSAccountData(unsigned int id, std::string ip_address);
+
+	/**
+	 * @param id
+	 * @param name
+	 * @param password
+	 * @param email
+	 */
+	void UpdateLSAccountInfo(unsigned int id, std::string name, std::string password, std::string email);
+
+	/**
+	 * @param id
+	 * @param long_name
+	 * @param ip_address
+	 */
+	void UpdateWorldRegistration(unsigned int id, std::string long_name, std::string ip_address);
+
+	/**
+	 * @param server_long_name
+	 * @param server_short_name
+	 * @param id
+	 * @return
+	 */
+	bool CreateWorldRegistration(
+		std::string server_long_name,
+		std::string server_short_name,
+		std::string server_remote_ip,
+		unsigned int &id,
+		unsigned int &server_admin_id
+	);
+
+	/**
+	 * @param log_settings
+	 */
+	void LoadLogSettings(EQEmuLogSys::LogSettings *log_settings);
+
+	/**
+	 * @param write_mode
+	 * @param read_mode
+	 * @return
+	 */
+	std::string CreateLoginserverApiToken(bool write_mode, bool read_mode);
+	MySQLRequestResult GetLoginserverApiTokens();
+
+	/**
+	 * @param account_name
+	 * @param account_password
+	 * @param first_name
+	 * @param last_name
+	 * @param email
+	 * @param ip_address
+	 * @return
+	 */
+	uint32 CreateLoginserverWorldAdminAccount(
+		const std::string &account_name,
+		const std::string &account_password,
+		const std::string &first_name,
+		const std::string &last_name,
+		const std::string &email,
+		const std::string &ip_address
+	);
+
+	/**
+	 * @param account_name
+	 * @return
+	 */
+	bool DoesLoginserverWorldAdminAccountExist(const std::string &account_name);
+
+	struct DbLoginServerAdmin {
+		bool        loaded = false;
+		uint32      id;
+		std::string account_name;
+		std::string account_password;
+		std::string first_name;
+		std::string last_name;
+		std::string email;
+		std::string registration_date;
+		std::string registration_ip_address;
+	};
+
+	Database::DbLoginServerAdmin GetLoginServerAdmin(const std::string &account_name);
+
+	struct DbLoginServerAccount {
+		bool        loaded = false;
+		uint32      id;
+		std::string account_name;
+		std::string account_password;
+		std::string account_email;
+		std::string source_loginserver;
+		std::string last_login_date;
+		std::string last_ip_address;
+		std::string created_at;
+		std::string updated_at;
+	};
+
+	Database::DbLoginServerAccount GetLoginServerAccountByAccountName(
+		const std::string &account_name,
+		const std::string &source_loginserver = "local"
+	);
+
+	/**
+	 * @param id
+	 * @param admin_account_password_hash
+	 */
+	bool UpdateLoginWorldAdminAccountPassword(
+		unsigned int id,
+		const std::string& admin_account_password_hash
+	);
+
+	/**
+	 * @param admin_account_username
+	 * @param admin_account_password_hash
+	 */
+	bool UpdateLoginWorldAdminAccountPasswordByUsername(
+		const std::string &admin_account_username,
+		const std::string &admin_account_password_hash
+	);
+
+	/**
+	 * @param name
+	 * @param password
+	 * @param loginserver
+	 * @param email
+	 * @return
+	 */
+	uint32 CreateLoginAccount(
+		const std::string &name,
+		const std::string &password,
+		const std::string &loginserver = "local",
+		const std::string &email = "local_creation"
+	);
+
 protected:
 	std::string user, pass, host, port, name;
+	MYSQL       *database{};
 };
 
 #endif
diff --git a/loginserver/database_mysql.cpp b/loginserver/database_mysql.cpp
deleted file mode 100644
index af5010925..000000000
--- a/loginserver/database_mysql.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "../common/global_define.h"
-#include "database.h"
-
-#ifdef EQEMU_MYSQL_ENABLED
-#include "database_mysql.h"
-#include "login_server.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
-#include "../common/string_util.h"
-
-extern LoginServer server;
-
-DatabaseMySQL::DatabaseMySQL(std::string user, std::string pass, std::string host, std::string port, std::string name)
-{
-	this->user = user;
-	this->pass = pass;
-	this->host = host;
-	this->name = name;
-
-	database = mysql_init(nullptr);
-	if (database)
-	{
-		char r = 1;
-		mysql_options(database, MYSQL_OPT_RECONNECT, &r);
-		if (!mysql_real_connect(database, host.c_str(), user.c_str(), pass.c_str(), name.c_str(), atoi(port.c_str()), nullptr, 0))
-		{
-			mysql_close(database);
-			Log(Logs::General, Logs::Error, "Failed to connect to MySQL database. Error: %s", mysql_error(database));
-			exit(1);
-		}
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Failed to create db object in MySQL database.");
-	}
-}
-
-DatabaseMySQL::~DatabaseMySQL()
-{
-	if (database)
-	{
-		mysql_close(database);
-	}
-}
-
-bool DatabaseMySQL::GetLoginDataFromAccountName(std::string name, std::string &password, unsigned int &id)
-{
-	if (!database)
-	{
-		return false;
-	}
-
-	MYSQL_RES *res;
-	MYSQL_ROW row;
-	std::stringstream query(std::stringstream::in | std::stringstream::out);
-	query << "SELECT LoginServerID, AccountPassword FROM " << server.options.GetAccountTable() << " WHERE AccountName = '";
-	query << name;
-	query << "'";
-
-	if (mysql_query(database, query.str().c_str()) != 0)
-	{
-		LogF(Logs::General, Logs::Error, "Mysql query failed: {0}", query.str());
-		return false;
-	}
-
-	res = mysql_use_result(database);
-
-	if (res)
-	{
-		while ((row = mysql_fetch_row(res)) != nullptr)
-		{
-			id = atoi(row[0]);
-			password = row[1];
-			mysql_free_result(res);
-			return true;
-		}
-	}
-
-	Log(Logs::General, Logs::Error, "Mysql query returned no result: %s", query.str().c_str());
-	return false;
-}
-
-bool DatabaseMySQL::GetLoginTokenDataFromToken(const std::string &token, const std::string &ip, unsigned int &db_account_id, std::string &user)
-{
-	if (!database)
-	{
-		return false;
-	}
-
-	MYSQL_RES *res;
-	MYSQL_ROW row;
-	std::stringstream query(std::stringstream::in | std::stringstream::out);
-	query << "SELECT tbllogintokens.Id, tbllogintokens.IpAddress, tbllogintokenclaims.Name, tbllogintokenclaims.Value FROM tbllogintokens ";
-	query << "JOIN tbllogintokenclaims ON tbllogintokens.Id = tbllogintokenclaims.TokenId WHERE tbllogintokens.Expires > NOW() AND tbllogintokens.Id='";
-	query << EscapeString(token) << "' AND tbllogintokens.IpAddress='" << EscapeString(ip) << "'";
-
-	if (mysql_query(database, query.str().c_str()) != 0)
-	{
-		Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-		return false;
-	}
-
-	res = mysql_use_result(database);
-
-	bool found_username = false;
-	bool found_login_id = false;
-	if (res)
-	{
-		while ((row = mysql_fetch_row(res)) != nullptr)
-		{
-			if (strcmp(row[2], "username") == 0) {
-				user = row[3];
-				found_username = true;
-				continue;
-			}
-
-			if (strcmp(row[2], "login_server_id") == 0) {
-				db_account_id = atoi(row[3]);
-				found_login_id = true;
-				continue;
-			}
-		}
-
-		mysql_free_result(res);
-	}
-
-	return found_username && found_login_id;
-}
-
-bool DatabaseMySQL::CreateLoginData(const std::string &name, const std::string &password, unsigned int &id)
-{
-	if (!database) {
-		return false;
-	}
-
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	std::stringstream query(std::stringstream::in | std::stringstream::out);
-
-	query << "INSERT INTO " << server.options.GetAccountTable() << " (AccountName, AccountPassword, AccountEmail, LastLoginDate, LastIPAddress) ";
-	query << " VALUES('" << name << "', '" << password << "', 'local_creation', NOW(), '127.0.0.1'); ";
-
-	if (mysql_query(database, query.str().c_str()) != 0) {
-		Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-		return false;
-	}
-	else {
-		id = mysql_insert_id(database);
-		return true;
-	}
-
-	Log(Logs::General, Logs::Error, "Mysql query returned no result: %s", query.str().c_str());
-	return false;
-}
-
-bool DatabaseMySQL::GetWorldRegistration(std::string long_name, std::string short_name, unsigned int &id, std::string &desc, unsigned int &list_id,
-	unsigned int &trusted, std::string &list_desc, std::string &account, std::string &password)
-{
-	if (!database)
-	{
-		return false;
-	}
-
-	MYSQL_RES *res;
-	MYSQL_ROW row;
-	char escaped_short_name[101];
-	unsigned long length;
-	length = mysql_real_escape_string(database, escaped_short_name, short_name.substr(0, 100).c_str(), short_name.substr(0, 100).length());
-	escaped_short_name[length + 1] = 0;
-	std::stringstream query(std::stringstream::in | std::stringstream::out);
-	query << "SELECT ifnull(WSR.ServerID,999999) AS ServerID, WSR.ServerTagDescription, ifnull(WSR.ServerTrusted,0) AS ServerTrusted, ifnull(SLT.ServerListTypeID,3) AS ServerListTypeID, ";
-	query << "SLT.ServerListTypeDescription, ifnull(WSR.ServerAdminID,0) AS ServerAdminID FROM " << server.options.GetWorldRegistrationTable();
-	query << " AS WSR JOIN " << server.options.GetWorldServerTypeTable() << " AS SLT ON WSR.ServerListTypeID = SLT.ServerListTypeID";
-	query << " WHERE WSR.ServerShortName = '";
-	query << escaped_short_name;
-	query << "'";
-
-	if (mysql_query(database, query.str().c_str()) != 0)
-	{
-		Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-		return false;
-	}
-
-	res = mysql_use_result(database);
-	if (res)
-	{
-		if ((row = mysql_fetch_row(res)) != nullptr)
-		{
-			id = atoi(row[0]);
-			desc = row[1];
-			trusted = atoi(row[2]);
-			list_id = atoi(row[3]);
-			list_desc = row[4];
-			int db_account_id = atoi(row[5]);
-			mysql_free_result(res);
-
-			if (db_account_id > 0)
-			{
-				std::stringstream query(std::stringstream::in | std::stringstream::out);
-				query << "SELECT AccountName, AccountPassword FROM " << server.options.GetWorldAdminRegistrationTable();
-				query << " WHERE ServerAdminID = " << db_account_id;
-
-				if (mysql_query(database, query.str().c_str()) != 0)
-				{
-					Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-					return false;
-				}
-
-				res = mysql_use_result(database);
-				if (res)
-				{
-					if ((row = mysql_fetch_row(res)) != nullptr)
-					{
-						account = row[0];
-						password = row[1];
-						mysql_free_result(res);
-						return true;
-					}
-				}
-
-				Log(Logs::General, Logs::Error, "Mysql query returned no result: %s", query.str().c_str());
-				return false;
-			}
-			return true;
-		}
-	}
-
-	Log(Logs::General, Logs::Error, "Mysql query returned no result: %s", query.str().c_str());
-	return false;
-}
-
-void DatabaseMySQL::UpdateLSAccountData(unsigned int id, std::string ip_address)
-{
-	if (!database)
-	{
-		return;
-	}
-
-	std::stringstream query(std::stringstream::in | std::stringstream::out);
-	query << "UPDATE " << server.options.GetAccountTable() << " SET LastIPAddress = '";
-	query << ip_address;
-	query << "', LastLoginDate = now() where LoginServerID = ";
-	query << id;
-
-	if (mysql_query(database, query.str().c_str()) != 0)
-	{
-		Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-	}
-}
-
-void DatabaseMySQL::UpdateLSAccountInfo(unsigned int id, std::string name, std::string password, std::string email)
-{
-	if (!database)
-	{
-		return;
-	}
-
-	std::stringstream query(std::stringstream::in | std::stringstream::out);
-	query << "REPLACE " << server.options.GetAccountTable() << " SET LoginServerID = ";
-	query << id << ", AccountName = '" << name << "', AccountPassword = sha('";
-	query << password << "'), AccountCreateDate = now(), AccountEmail = '" << email;
-	query << "', LastIPAddress = '0.0.0.0', LastLoginDate = now()";
-
-	if (mysql_query(database, query.str().c_str()) != 0)
-	{
-		Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-	}
-}
-
-void DatabaseMySQL::UpdateWorldRegistration(unsigned int id, std::string long_name, std::string ip_address)
-{
-	if (!database)
-	{
-		return;
-	}
-
-	char escaped_long_name[101];
-	unsigned long length;
-	length = mysql_real_escape_string(database, escaped_long_name, long_name.substr(0, 100).c_str(), long_name.substr(0, 100).length());
-	escaped_long_name[length + 1] = 0;
-	std::stringstream query(std::stringstream::in | std::stringstream::out);
-	query << "UPDATE " << server.options.GetWorldRegistrationTable() << " SET ServerLastLoginDate = now(), ServerLastIPAddr = '";
-	query << ip_address;
-	query << "', ServerLongName = '";
-	query << escaped_long_name;
-	query << "' WHERE ServerID = ";
-	query << id;
-
-	if (mysql_query(database, query.str().c_str()) != 0)
-	{
-		Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-	}
-}
-
-bool DatabaseMySQL::CreateWorldRegistration(std::string long_name, std::string short_name, unsigned int &id)
-{
-	if (!database)
-	{
-		return false;
-	}
-
-	MYSQL_RES *res;
-	MYSQL_ROW row;
-	char escaped_long_name[201];
-	char escaped_short_name[101];
-	unsigned long length;
-	length = mysql_real_escape_string(database, escaped_long_name, long_name.substr(0, 100).c_str(), long_name.substr(0, 100).length());
-	escaped_long_name[length + 1] = 0;
-	length = mysql_real_escape_string(database, escaped_short_name, short_name.substr(0, 100).c_str(), short_name.substr(0, 100).length());
-	escaped_short_name[length + 1] = 0;
-	std::stringstream query(std::stringstream::in | std::stringstream::out);
-	query << "SELECT ifnull(max(ServerID),0) FROM " << server.options.GetWorldRegistrationTable();
-
-	if (mysql_query(database, query.str().c_str()) != 0)
-	{
-		Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-		return false;
-	}
-
-	res = mysql_use_result(database);
-	if (res)
-	{
-		if ((row = mysql_fetch_row(res)) != nullptr)
-		{
-			id = atoi(row[0]) + 1;
-			mysql_free_result(res);
-
-			std::stringstream query(std::stringstream::in | std::stringstream::out);
-			query << "INSERT INTO " << server.options.GetWorldRegistrationTable() << " SET ServerID = " << id;
-			query << ", ServerLongName = '" << escaped_long_name << "', ServerShortName = '" << escaped_short_name;
-			query << "', ServerListTypeID = 3, ServerAdminID = 0, ServerTrusted = 0, ServerTagDescription = ''";
-
-			if (mysql_query(database, query.str().c_str()) != 0)
-			{
-				Log(Logs::General, Logs::Error, "Mysql query failed: %s", query.str().c_str());
-				return false;
-			}
-			return true;
-		}
-	}
-	Log(Logs::General, Logs::Error, "World registration did not exist in the database for %s %s", long_name.c_str(), short_name.c_str());
-	return false;
-}
-
-#endif
diff --git a/loginserver/database_mysql.h b/loginserver/database_mysql.h
deleted file mode 100644
index fc791b229..000000000
--- a/loginserver/database_mysql.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef EQEMU_DATABASEMYSQL_H
-#define EQEMU_DATABASEMYSQL_H
-
-#include "database.h"
-#ifdef EQEMU_MYSQL_ENABLED
-
-#include <string>
-#include <sstream>
-#include <stdlib.h>
-#include <mysql.h>
-
-/**
-* Mysql Database class
-*/
-class DatabaseMySQL : public Database
-{
-public:
-	/**
-	* Constructor, sets our database to null.
-	*/
-	DatabaseMySQL() { database = nullptr; }
-
-	/**
-	* Constructor, tries to set our database to connect to the supplied options.
-	*/
-	DatabaseMySQL(std::string user, std::string pass, std::string host, std::string port, std::string name);
-
-	/**
-	* Destructor, frees our database if needed.
-	*/
-	virtual ~DatabaseMySQL();
-
-	/**
-	* @return Returns true if the database successfully connected.
-	*/
-	virtual bool IsConnected() { return (database != nullptr); }
-
-	/**
-	* Retrieves the login data (password hash and account id) from the account name provided
-	* Needed for client login procedure.
-	* Returns true if the record was found, false otherwise.
-	*/
-	virtual bool GetLoginDataFromAccountName(std::string name, std::string &password, unsigned int &id);
-
-	virtual bool GetLoginTokenDataFromToken(const std::string &token, const std::string &ip, unsigned int &db_account_id, std::string &user);
-
-	virtual bool CreateLoginData(const std::string &name, const std::string &password, unsigned int &id);
-
-	/**
-	* Retrieves the world registration from the long and short names provided.
-	* Needed for world login procedure.
-	* Returns true if the record was found, false otherwise.
-	*/
-	virtual bool GetWorldRegistration(std::string long_name, std::string short_name, unsigned int &id, std::string &desc, unsigned int &list_id,
-		unsigned int &trusted, std::string &list_desc, std::string &account, std::string &password);
-
-	/**
-	* Updates the ip address of the client with account id = id
-	*/
-	virtual void UpdateLSAccountData(unsigned int id, std::string ip_address);
-
-	/**
-	* Updates or creates the login server account with info from world server
-	*/
-	virtual void UpdateLSAccountInfo(unsigned int id, std::string name, std::string password, std::string email);
-
-	/**
-	* Updates the ip address of the world with account id = id
-	*/
-	virtual void UpdateWorldRegistration(unsigned int id, std::string long_name, std::string ip_address);
-
-	/**
-	* Creates new world registration for unregistered servers and returns new id
-	*/
-	virtual bool CreateWorldRegistration(std::string long_name, std::string short_name, unsigned int &id);
-protected:
-	std::string user, pass, host, port, name;
-	MYSQL *database;
-};
-
-#endif
-#endif
-
diff --git a/loginserver/database_postgresql.cpp b/loginserver/database_postgresql.cpp
deleted file mode 100644
index 4b6242e63..000000000
--- a/loginserver/database_postgresql.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "../common/global_define.h"
-#include "database.h"
-
-#ifdef EQEMU_POSTGRESQL_ENABLED
-#include "database_postgresql.h"
-#include "error_log.h"
-#include "login_server.h"
-
-
-extern LoginServer server;
-
-#pragma comment(lib, "libpq.lib")
-
-DatabasePostgreSQL::DatabasePostgreSQL(string user, string pass, string host, string port, string name)
-{
-	db = nullptr;
-	db = PQsetdbLogin(host.c_str(), port.c_str(), nullptr, nullptr, name.c_str(), user.c_str(), pass.c_str());
-	if(!db)
-	{
-		Log(Logs::General, Logs::Error, "Failed to connect to PostgreSQL Database.");
-	}
-
-	if(PQstatus(db) != CONNECTION_OK)
-	{
-		Log(Logs::General, Logs::Error, "Failed to connect to PostgreSQL Database.");
-		PQfinish(db);
-		db = nullptr;
-	}
-}
-
-DatabasePostgreSQL::~DatabasePostgreSQL()
-{
-	if(db)
-	{
-		PQfinish(db);
-	}
-}
-
-bool DatabasePostgreSQL::GetLoginDataFromAccountName(string name, string &password, unsigned int &id)
-{
-	if(!db)
-	{
-		return false;
-	}
-
-	/**
-	* PostgreSQL doesn't have automatic reconnection option like mysql
-	* but it's easy to check and reconnect
-	*/
-	if(PQstatus(db) != CONNECTION_OK)
-	{
-		PQreset(db);
-		if(PQstatus(db) != CONNECTION_OK)
-		{
-			return false;
-		}
-	}
-
-	stringstream query(stringstream::in | stringstream::out);
-	query << "SELECT LoginServerID, AccountPassword FROM " << server.options.GetAccountTable() << " WHERE AccountName = '";
-	query << name;
-	query << "'";
-
-	PGresult *res = PQexec(db, query.str().c_str());
-
-	char *error = PQresultErrorMessage(res);
-	if(strlen(error) > 0)
-	{
-		Log(Logs::General, Logs::Error, "Database error in DatabasePostgreSQL::GetLoginDataFromAccountName(): %s", error);
-		PQclear(res);
-		return false;
-	}
-
-	if(PQntuples(res) > 0)
-	{
-		id = atoi(PQgetvalue(res, 0, 0));
-		password = PQgetvalue(res, 0, 1);
-		PQclear(res);
-		return true;
-	}
-
-	PQclear(res);
-	return false;
-}
-
-bool DatabasePostgreSQL::GetWorldRegistration(string long_name, string short_name, unsigned int &id, string &desc, unsigned int &list_id,
-		unsigned int &trusted, string &list_desc, string &account, string &password)
-{
-	if(!db)
-	{
-		return false;
-	}
-
-	/**
-	* PostgreSQL doesn't have automatic reconnection option like mysql
-	* but it's easy to check and reconnect
-	*/
-	if(PQstatus(db) != CONNECTION_OK)
-	{
-		PQreset(db);
-		if(PQstatus(db) != CONNECTION_OK)
-		{
-			return false;
-		}
-	}
-
-	stringstream query(stringstream::in | stringstream::out);
-	query << "SELECT WSR.ServerID, WSR.ServerTagDescription, WSR.ServerTrusted, SLT.ServerListTypeID, ";
-	query << "SLT.ServerListTypeDescription, SAR.AccountName, SAR.AccountPassword FROM " << server.options.GetWorldRegistrationTable();
-	query << " AS WSR JOIN " << server.options.GetWorldServerTypeTable() << " AS SLT ON WSR.ServerListTypeID = SLT.ServerListTypeID JOIN ";
-	query << server.options.GetWorldAdminRegistrationTable() << " AS SAR ON WSR.ServerAdminID = SAR.ServerAdminID WHERE WSR.ServerShortName";
-	query << " = '";
-	query << short_name;
-	query << "'";
-
-	PGresult *res = PQexec(db, query.str().c_str());
-
-	char *error = PQresultErrorMessage(res);
-	if(strlen(error) > 0)
-	{
-		Log(Logs::General, Logs::Error, "Database error in DatabasePostgreSQL::GetWorldRegistration(): %s", error);
-		PQclear(res);
-		return false;
-	}
-
-	if(PQntuples(res) > 0)
-	{
-		id = atoi(PQgetvalue(res, 0, 0));
-		desc = PQgetvalue(res, 0, 1);
-		trusted = atoi(PQgetvalue(res, 0, 2));
-		list_id = atoi(PQgetvalue(res, 0, 3));
-		list_desc = PQgetvalue(res, 0, 4);
-		account = PQgetvalue(res, 0, 5);
-		password = PQgetvalue(res, 0, 6);
-
-		PQclear(res);
-		return true;
-	}
-
-	PQclear(res);
-	return false;
-}
-
-void DatabasePostgreSQL::UpdateLSAccountData(unsigned int id, string ip_address)
-{
-	if(!db)
-	{
-		return;
-	}
-
-	/**
-	* PostgreSQL doesn't have automatic reconnection option like mysql
-	* but it's easy to check and reconnect
-	*/
-	if(PQstatus(db) != CONNECTION_OK)
-	{
-		PQreset(db);
-		if(PQstatus(db) != CONNECTION_OK)
-		{
-			return;
-		}
-	}
-
-	stringstream query(stringstream::in | stringstream::out);
-	query << "UPDATE " << server.options.GetAccountTable() << " SET LastIPAddress = '";
-	query << ip_address;
-	query << "', LastLoginDate = current_date where LoginServerID = ";
-	query << id;
-	PGresult *res = PQexec(db, query.str().c_str());
-
-	char *error = PQresultErrorMessage(res);
-	if(strlen(error) > 0)
-	{
-		Log(Logs::General, Logs::Error, "Database error in DatabasePostgreSQL::GetLoginDataFromAccountName(): %s", error);
-	}
-	PQclear(res);
-}
-
-void DatabasePostgreSQL::UpdateWorldRegistration(unsigned int id, string long_name, string ip_address)
-{
-	if(!db)
-	{
-		return;
-	}
-
-	/**
-	* PostgreSQL doesn't have automatic reconnection option like mysql
-	* but it's easy to check and reconnect
-	*/
-	if(PQstatus(db) != CONNECTION_OK)
-	{
-		PQreset(db);
-		if(PQstatus(db) != CONNECTION_OK)
-		{
-			return;
-		}
-	}
-
-	stringstream query(stringstream::in | stringstream::out);
-	query << "UPDATE " << server.options.GetWorldRegistrationTable() << " SET ServerLastLoginDate = current_date, ServerLastIPAddr = '";
-	query << ip_address;
-	query << "', ServerLongName = '";
-	query << long_name;
-	query << "' where ServerID = ";
-	query << id;
-	PGresult *res = PQexec(db, query.str().c_str());
-
-	char *error = PQresultErrorMessage(res);
-	if(strlen(error) > 0)
-	{
-		Log(Logs::General, Logs::Error, "Database error in DatabasePostgreSQL::GetLoginDataFromAccountName(): %s", error);
-	}
-	PQclear(res);
-}
-
-#endif
-
diff --git a/loginserver/database_postgresql.h b/loginserver/database_postgresql.h
deleted file mode 100644
index 0cd5c3ee8..000000000
--- a/loginserver/database_postgresql.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef EQEMU_DATABASEPOSTGRESQL_H
-#define EQEMU_DATABASEPOSTGRESQL_H
-
-#include "database.h"
-#ifdef EQEMU_POSTGRESQL_ENABLED
-
-#include <string>
-#include <sstream>
-#include <stdlib.h>
-#include <libpq-fe.h>
-
-/**
- * PostgreSQL Database class
- */
-class DatabasePostgreSQL : public Database
-{
-public:
-	/**
-	* Constructor, sets our database to null.
-	*/
-	DatabasePostgreSQL() { db = nullptr; }
-
-	/**
-	* Constructor, tries to set our database to connect to the supplied options.
-	*/
-	DatabasePostgreSQL(std::string user, std::string pass, std::string host, std::string port, std::string name);
-
-	/**
-	* Destructor, frees our database if needed.
-	*/
-	virtual ~DatabasePostgreSQL();
-
-	/**
-	* Returns true if the database successfully connected.
-	*/
-	virtual bool IsConnected() { return (db != nullptr); }
-
-	/**
-	* Retrieves the login data (password hash and account id) from the account name provided
-	* Needed for client login procedure.
-	* Returns true if the record was found, false otherwise.
-	*/
-	virtual bool GetLoginDataFromAccountName(std::string name, std::string &password, unsigned int &id);
-
-	/**
-	* Retrieves the world registration from the long and short names provided.
-	* Needed for world login procedure.
-	* Returns true if the record was found, false otherwise.
-	*/
-	virtual bool GetWorldRegistration(std::string long_name, std::string short_name, unsigned int &id, std::string &desc, unsigned int &list_id,
-		unsigned int &trusted, std::string &list_desc, std::string &account, std::string &password);
-
-	/**
-	* Updates the ip address of the client with account id = id
-	*/
-	virtual void UpdateLSAccountData(unsigned int id, std::string ip_address);
-
-	/**
-	* Updates the ip address of the world with account id = id
-	*/
-	virtual void UpdateWorldRegistration(unsigned int id, std::string long_name, std::string ip_address);
-
-	/**
-	* Creates new world registration for unregistered servers and returns new id
-	*/
-	virtual bool CreateWorldRegistration(std::string long_name, std::string short_name, unsigned int &id);
-protected:
-	std::string user, pass, host, port, name;
-	PGconn *db;
-};
-
-#endif
-#endif
-
diff --git a/loginserver/encryption.cpp b/loginserver/encryption.cpp
index c8e688e5f..7080f1996 100644
--- a/loginserver/encryption.cpp
+++ b/loginserver/encryption.cpp
@@ -1,29 +1,164 @@
+#include "encryption.h"
+
+#ifdef EQEMU_USE_OPENSSL
 #include <openssl/des.h>
 #include <openssl/sha.h>
 #include <openssl/md5.h>
-#include <cstring>
-#include <string>
-#ifdef ENABLE_SECURITY
-#include <sodium.h>
+#endif
+#ifdef EQEMU_USE_MBEDTLS
+#include <mbedtls/des.h>
+#include <mbedtls/md5.h>
+#include <mbedtls/sha1.h>
+#include <mbedtls/sha512.h>
 #endif
 
-const char* eqcrypt_block(const char *buffer_in, size_t buffer_in_sz, char* buffer_out, bool enc) {
+#include <cstring>
+#include <string>
+
+#ifdef ENABLE_SECURITY
+
+#include <sodium.h>
+
+#endif
+
+/**
+ * @param mode
+ * @return
+ */
+std::string GetEncryptionByModeId(uint32 mode)
+{
+	switch (mode) {
+		case EncryptionModeMD5:
+			return "MD5";
+		case EncryptionModeMD5PassUser:
+			return "MD5PassUser";
+		case EncryptionModeMD5UserPass:
+			return "MD5UserPass";
+		case EncryptionModeMD5Triple:
+			return "MD5Triple";
+		case EncryptionModeSHA:
+			return "SHA";
+		case EncryptionModeSHAPassUser:
+			return "SHAPassUser";
+		case EncryptionModeSHAUserPass:
+			return "SHAUserPass";
+		case EncryptionModeSHATriple:
+			return "SHATriple";
+		case EncryptionModeSHA512:
+			return "SHA512";
+		case EncryptionModeSHA512PassUser:
+			return "SHA512PassUser";
+		case EncryptionModeSHA512UserPass:
+			return "SHA512UserPass";
+		case EncryptionModeSHA512Triple:
+			return "SHA512Triple";
+		case EncryptionModeArgon2:
+			return "Argon2";
+		case EncryptionModeSCrypt:
+			return "SCrypt";
+		default:
+			return "";
+	}
+}
+
+/**
+ * @param buffer_in
+ * @param buffer_in_sz
+ * @param buffer_out
+ * @param enc
+ * @return
+ */
+const char *eqcrypt_block(const char *buffer_in, size_t buffer_in_sz, char *buffer_out, bool enc)
+{
+#ifdef EQEMU_USE_MBEDTLS
+	if (enc) {
+		if (buffer_in_sz % 8 != 0) {
+			auto temp_buffer_sz = ((buffer_in_sz / 8) + 1) * 8;
+			unsigned char *temp_buffer = new unsigned char[temp_buffer_sz];
+			unsigned char *temp_buffer_in = &temp_buffer[0];
+			unsigned char *temp_buffer_out = &temp_buffer[temp_buffer_sz];
+
+			memset(temp_buffer, 0, temp_buffer_sz * 2);
+			memcpy(temp_buffer_in, buffer_in, buffer_in_sz);
+
+			unsigned char key[MBEDTLS_DES_KEY_SIZE];
+			unsigned char iv[8];
+			memset(&key, 0, MBEDTLS_DES_KEY_SIZE);
+			memset(&iv, 0, 8);
+
+			mbedtls_des_context context;
+			mbedtls_des_setkey_enc(&context, key);
+			mbedtls_des_crypt_cbc(&context, MBEDTLS_DES_ENCRYPT, temp_buffer_sz, iv, (const unsigned char*)temp_buffer_in, (unsigned char*)temp_buffer_out);
+
+			memcpy(buffer_out, temp_buffer_out, temp_buffer_sz);
+			delete[] temp_buffer;
+		}
+		else {
+			unsigned char key[MBEDTLS_DES_KEY_SIZE];
+			unsigned char iv[8];
+			memset(&key, 0, MBEDTLS_DES_KEY_SIZE);
+			memset(&iv, 0, 8);
+
+			mbedtls_des_context context;
+			mbedtls_des_setkey_enc(&context, key);
+			mbedtls_des_crypt_cbc(&context, MBEDTLS_DES_ENCRYPT, buffer_in_sz, iv, (const unsigned char*)buffer_in, (unsigned char*)buffer_out);
+		}
+	}
+	else {
+		if (buffer_in_sz && buffer_in_sz % 8 != 0) {
+			return nullptr;
+		}
+
+		unsigned char key[MBEDTLS_DES_KEY_SIZE];
+		unsigned char iv[8];
+		memset(&key, 0, MBEDTLS_DES_KEY_SIZE);
+		memset(&iv, 0, 8);
+	
+		mbedtls_des_context context;
+		mbedtls_des_setkey_dec(&context, key);
+		mbedtls_des_crypt_cbc(&context, MBEDTLS_DES_DECRYPT, buffer_in_sz, iv, (const unsigned char*)buffer_in, (unsigned char*)buffer_out);
+	}
+#endif
+
+#ifdef EQEMU_USE_OPENSSL
 	DES_key_schedule k;
 	DES_cblock v;
-
+	
 	memset(&k, 0, sizeof(DES_key_schedule));
 	memset(&v, 0, sizeof(DES_cblock));
-
+	
 	if (!enc && buffer_in_sz && buffer_in_sz % 8 != 0) {
 		return nullptr;
 	}
-
+	
 	DES_ncbc_encrypt((const unsigned char*)buffer_in, (unsigned char*)buffer_out, (long)buffer_in_sz, &k, &v, enc);
+#endif
 	return buffer_out;
 }
 
-std::string eqcrypt_md5(const std::string &msg) {
+/**
+ * @param msg
+ * @return
+ */
+std::string eqcrypt_md5(const std::string &msg)
+{
 	std::string ret;
+	ret.reserve(32);
+
+#ifdef EQEMU_USE_MBEDTLS
+	unsigned char digest[16];
+	char temp[4];
+
+	if (0 == mbedtls_md5_ret((const unsigned char*)msg.c_str(), msg.length(), digest)) {
+		for (int i = 0; i < 16; ++i) {
+			sprintf(&temp[0], "%02x", digest[i]);
+			ret.push_back(temp[0]);
+			ret.push_back(temp[1]);
+		}
+	}
+#endif
+
+#ifdef EQEMU_USE_OPENSSL
 	unsigned char md5_digest[16];
 	char tmp[4];
 
@@ -34,12 +169,34 @@ std::string eqcrypt_md5(const std::string &msg) {
 		ret.push_back(tmp[0]);
 		ret.push_back(tmp[1]);
 	}
+#endif
 
 	return ret;
 }
 
-std::string eqcrypt_sha1(const std::string &msg) {
+/**
+ * @param msg
+ * @return
+ */
+std::string eqcrypt_sha1(const std::string &msg)
+{
 	std::string ret;
+	ret.reserve(40);
+
+#ifdef EQEMU_USE_MBEDTLS
+	unsigned char digest[20];
+	char temp[4];
+
+	if (0 == mbedtls_sha1_ret((const unsigned char*)msg.c_str(), msg.length(), digest)) {
+		for (int i = 0; i < 20; ++i) {
+			sprintf(&temp[0], "%02x", digest[i]);
+			ret.push_back(temp[0]);
+			ret.push_back(temp[1]);
+		}
+	}
+#endif
+
+#ifdef EQEMU_USE_OPENSSL
 	unsigned char sha_digest[20];
 	char tmp[4];
 
@@ -50,12 +207,34 @@ std::string eqcrypt_sha1(const std::string &msg) {
 		ret.push_back(tmp[0]);
 		ret.push_back(tmp[1]);
 	}
+#endif
 
 	return ret;
 }
 
-std::string eqcrypt_sha512(const std::string &msg) {
+/**
+ * @param msg
+ * @return
+ */
+std::string eqcrypt_sha512(const std::string &msg)
+{
 	std::string ret;
+	ret.reserve(128);
+
+#ifdef EQEMU_USE_MBEDTLS
+	unsigned char digest[64];
+	char temp[4];
+
+	if (0 == mbedtls_sha512_ret((const unsigned char*)msg.c_str(), msg.length(), digest, 0)) {
+		for (int i = 0; i < 64; ++i) {
+			sprintf(&temp[0], "%02x", digest[i]);
+			ret.push_back(temp[0]);
+			ret.push_back(temp[1]);
+		}
+	}
+#endif
+
+#ifdef EQEMU_USE_OPENSSL
 	unsigned char sha_digest[64];
 	char tmp[4];
 
@@ -66,94 +245,128 @@ std::string eqcrypt_sha512(const std::string &msg) {
 		ret.push_back(tmp[0]);
 		ret.push_back(tmp[1]);
 	}
+#endif
 
 	return ret;
 }
 
 #ifdef ENABLE_SECURITY
 
+/**
+ * @param msg
+ * @return
+ */
 std::string eqcrypt_argon2(const std::string &msg)
 {
+	char        buffer[crypto_pwhash_STRBYTES] = {0};
 	std::string ret;
-	ret.resize(crypto_pwhash_STRBYTES);
 
-	if (crypto_pwhash_str(&ret[0], &msg[0], msg.length(), crypto_pwhash_OPSLIMIT_SENSITIVE, crypto_pwhash_MEMLIMIT_SENSITIVE) != 0) {
+	if (crypto_pwhash_str(
+		&buffer[0],
+		&msg[0],
+		msg.length(),
+		crypto_pwhash_OPSLIMIT_INTERACTIVE,
+		crypto_pwhash_MEMLIMIT_INTERACTIVE
+	) != 0) {
 		return "";
 	}
 
+	ret = buffer;
 	return ret;
 }
 
+/**
+ * @param msg
+ * @return
+ */
 std::string eqcrypt_scrypt(const std::string &msg)
 {
+	char        buffer[crypto_pwhash_scryptsalsa208sha256_STRBYTES] = {0};
 	std::string ret;
-	ret.resize(crypto_pwhash_scryptsalsa208sha256_STRBYTES);
 
-	if (crypto_pwhash_scryptsalsa208sha256_str(&ret[0], &msg[0], msg.length(),
-		crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_SENSITIVE, crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_SENSITIVE) != 0) {
+	if (crypto_pwhash_scryptsalsa208sha256_str(
+		&buffer[0],
+		&msg[0],
+		msg.length(),
+		crypto_pwhash_scryptsalsa208sha256_OPSLIMIT_INTERACTIVE,
+		crypto_pwhash_scryptsalsa208sha256_MEMLIMIT_INTERACTIVE
+	) != 0) {
 		return "";
 	}
 
+	ret = buffer;
 	return ret;
 }
 
 #endif
 
-std::string eqcrypt_hash(const std::string &username, const std::string &password, int mode) {
-	switch (mode)
-	{
-	case 1:
-		return eqcrypt_md5(password);
-	case 2:
-		return eqcrypt_md5(password + ":" + username);
-	case 3:
-		return eqcrypt_md5(username + ":" + password);
-	case 4:
-		return eqcrypt_md5(eqcrypt_md5(username) + eqcrypt_md5(password));
-	case 5:
-		return eqcrypt_sha1(password);
-	case 6:
-		return eqcrypt_sha1(password + ":" + username);
-	case 7:
-		return eqcrypt_sha1(username + ":" + password);
-	case 8:
-		return eqcrypt_sha1(eqcrypt_sha1(username) + eqcrypt_sha1(password));
-	case 9:
-		return eqcrypt_sha512(password);
-	case 10:
-		return eqcrypt_sha512(password + ":" + username);
-	case 11:
-		return eqcrypt_sha512(username + ":" + password);
-	case 12:
-		return eqcrypt_sha512(eqcrypt_sha512(username) + eqcrypt_sha512(password));
+/**
+ * @param username
+ * @param password
+ * @param mode
+ * @return
+ */
+std::string eqcrypt_hash(const std::string &username, const std::string &password, int mode)
+{
+	switch (mode) {
+		case EncryptionModeMD5:
+			return eqcrypt_md5(password);
+		case EncryptionModeMD5PassUser:
+			return eqcrypt_md5(password + ":" + username);
+		case EncryptionModeMD5UserPass:
+			return eqcrypt_md5(username + ":" + password);
+		case EncryptionModeMD5Triple:
+			return eqcrypt_md5(eqcrypt_md5(username) + eqcrypt_md5(password));
+		case EncryptionModeSHA:
+			return eqcrypt_sha1(password);
+		case EncryptionModeSHAPassUser:
+			return eqcrypt_sha1(password + ":" + username);
+		case EncryptionModeSHAUserPass:
+			return eqcrypt_sha1(username + ":" + password);
+		case EncryptionModeSHATriple:
+			return eqcrypt_sha1(eqcrypt_sha1(username) + eqcrypt_sha1(password));
+		case EncryptionModeSHA512:
+			return eqcrypt_sha512(password);
+		case EncryptionModeSHA512PassUser:
+			return eqcrypt_sha512(password + ":" + username);
+		case EncryptionModeSHA512UserPass:
+			return eqcrypt_sha512(username + ":" + password);
+		case EncryptionModeSHA512Triple:
+			return eqcrypt_sha512(eqcrypt_sha512(username) + eqcrypt_sha512(password));
 #ifdef ENABLE_SECURITY
-	case 13:
-		return eqcrypt_argon2(password);
-	case 14:
-		return eqcrypt_scrypt(password);
+		case EncryptionModeArgon2:
+			return eqcrypt_argon2(password);
+		case EncryptionModeSCrypt:
+			return eqcrypt_scrypt(password);
 #endif
-		//todo bcrypt? pbkdf2?
-	default:
-		return "";
-		break;
+			//todo bcrypt? pbkdf2?
+		default:
+			return "";
+			break;
 	}
 }
 
-bool eqcrypt_verify_hash(const std::string &username, const std::string &password, const std::string &pwhash, int mode) {
-	switch (mode)
-	{
+/**
+ * @param username
+ * @param password
+ * @param pwhash
+ * @param mode
+ * @return
+ */
+bool eqcrypt_verify_hash(const std::string &username, const std::string &password, const std::string &pwhash, int mode)
+{
+	switch (mode) {
 #ifdef ENABLE_SECURITY
-	case 13:
-		return crypto_pwhash_str_verify(&pwhash[0], &password[0], password.length()) == 0;
-	case 14:
-		return crypto_pwhash_scryptsalsa208sha256_str_verify(&pwhash[0], &password[0], password.length()) == 0;
+		case 13:
+			return crypto_pwhash_str_verify(&pwhash[0], &password[0], password.length()) == 0;
+		case 14:
+			return crypto_pwhash_scryptsalsa208sha256_str_verify(&pwhash[0], &password[0], password.length()) == 0;
 #endif
-	default:
-	{
-		auto hash = eqcrypt_hash(username, password, mode);
-		return hash.compare(pwhash) == 0;
-	}
+		default: {
+			auto hash = eqcrypt_hash(username, password, mode);
+			return hash.compare(pwhash) == 0;
+		}
 	}
 
 	return false;
-}
\ No newline at end of file
+}
diff --git a/loginserver/encryption.h b/loginserver/encryption.h
index fe27ce28a..7db61197e 100644
--- a/loginserver/encryption.h
+++ b/loginserver/encryption.h
@@ -1,7 +1,56 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
 #pragma once
 
 #include <string>
+#include "../common/types.h"
 
-const char* eqcrypt_block(const char *buffer_in, size_t buffer_in_sz, char* buffer_out, bool enc);
+enum EncryptionMode {
+	EncryptionModeMD5            = 1,
+	EncryptionModeMD5PassUser    = 2,
+	EncryptionModeMD5UserPass    = 3,
+	EncryptionModeMD5Triple      = 4,
+	EncryptionModeSHA            = 5,
+	EncryptionModeSHAPassUser    = 6,
+	EncryptionModeSHAUserPass    = 7,
+	EncryptionModeSHATriple      = 8,
+	EncryptionModeSHA512         = 9,
+	EncryptionModeSHA512PassUser = 10,
+	EncryptionModeSHA512UserPass = 11,
+	EncryptionModeSHA512Triple   = 12,
+	EncryptionModeArgon2         = 13,
+	EncryptionModeSCrypt         = 14
+};
+
+namespace CryptoHash {
+	const int md5_hash_length    = 32;
+	const int sha1_hash_length   = 40;
+	const int sha512_hash_length = 128;
+}
+
+/**
+ * @param mode
+ * @return
+ */
+std::string GetEncryptionByModeId(uint32 mode);
+const char *eqcrypt_block(const char *buffer_in, size_t buffer_in_sz, char *buffer_out, bool enc);
 std::string eqcrypt_hash(const std::string &username, const std::string &password, int mode);
 bool eqcrypt_verify_hash(const std::string &username, const std::string &password, const std::string &pwhash, int mode);
diff --git a/loginserver/eq_crypto_api.h b/loginserver/eq_crypto_api.h
index d722bcb53..bff7b8444 100644
--- a/loginserver/eq_crypto_api.h
+++ b/loginserver/eq_crypto_api.h
@@ -1,20 +1,23 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #ifndef EQEMUCAPI__H
 #define EQEMUCAPI__H
 
diff --git a/loginserver/login_server.h b/loginserver/login_server.h
index 7760b7efb..c130c41d2 100644
--- a/loginserver/login_server.h
+++ b/loginserver/login_server.h
@@ -1,46 +1,54 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+#include <utility>
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
 
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #ifndef EQEMU_LOGINSERVER_H
 #define EQEMU_LOGINSERVER_H
 
-#include "config.h"
+#include "../common/json_config.h"
 #include "database.h"
-#include "database_mysql.h"
-#include "database_postgresql.h"
 #include "encryption.h"
 #include "options.h"
 #include "server_manager.h"
 #include "client_manager.h"
+#include "loginserver_webserver.h"
 
 /**
-* Login server struct, contains every variable for the server that needs to exist
-* outside the scope of main().
-*/
+ * Login server struct, contains every variable for the server that needs to exist outside the scope of main()
+ */
 struct LoginServer
 {
 public:
-	LoginServer() : config(nullptr), db(nullptr), server_manager(nullptr) { }
 
-	Config *config;
-	Database *db;
-	Options options;
-	ServerManager *server_manager;
-	ClientManager *client_manager;
+	LoginServer() : db(nullptr), server_manager(nullptr) {
+
+	}
+
+	EQ::JsonConfigFile                 config;
+	Database                           *db;
+	LoginserverWebserver::TokenManager *token_manager{};
+	Options                            options;
+	ServerManager                      *server_manager;
+	ClientManager                      *client_manager{};
 };
 
 #endif
diff --git a/loginserver/login_structures.h b/loginserver/login_structures.h
index 6e3f290e9..099b4b4f0 100644
--- a/loginserver/login_structures.h
+++ b/loginserver/login_structures.h
@@ -1,32 +1,35 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #ifndef EQEMU_LOGINSTRUCTURES_H
 #define EQEMU_LOGINSTRUCTURES_H
 
 #pragma pack(1)
 
 struct LoginChatMessage_Struct {
-	short Unknown0;
+	short  Unknown0;
 	uint32 Unknown1;
 	uint32 Unknown2;
 	uint32 Unknown3;
-	uint8 Unknown4;
-	char ChatMessage[1];
+	uint8  Unknown4;
+	char   ChatMessage[1];
 };
 
 struct LoginLoginRequest_Struct {
@@ -35,7 +38,7 @@ struct LoginLoginRequest_Struct {
 	short unknown3;
 	short unknown4;
 	short unknown5;
-	char unknown6[16];
+	char  unknown6[16];
 };
 
 struct LoginAccepted_Struct {
@@ -44,28 +47,27 @@ struct LoginAccepted_Struct {
 	short unknown3;
 	short unknown4;
 	short unknown5;
-	char encrypt[80];
+	char  encrypt[80];
 };
 
-struct LoginFailedAttempts_Struct
-{
-	char message; //0x01
-	char unknown2[7]; //0x00
+struct LoginFailedAttempts_Struct {
+	char   message; //0x01
+	char   unknown2[7]; //0x00
 	uint32 lsid;
-	char key[11]; //10 char + null term;
+	char   key[11]; //10 char + null term;
 	uint32 failed_attempts;
-	char unknown3[4];	//0x00, 0x00, 0x00, 0x03
-	char unknown4[4];	//0x00, 0x00, 0x00, 0x02
-	char unknown5[4];	//0xe7, 0x03, 0x00, 0x00
-	char unknown6[4];	//0xff, 0xff, 0xff, 0xff
-	char unknown7[4];	//0xa0, 0x05, 0x00, 0x00
-	char unknown8[4];	//0x00, 0x00, 0x00, 0x02
-	char unknown9[4];	//0xff, 0x03, 0x00, 0x00
-	char unknown10[4];	//0x00, 0x00, 0x00, 0x00
-	char unknown11[4];	//0x63, 0x00, 0x00, 0x00
-	char unknown12[4];	//0x01, 0x00, 0x00, 0x00
-	char unknown13[4];	//0x00, 0x00, 0x00, 0x00
-	char unknown14[4];	//0x00, 0x00, 0x00, 0x00
+	char   unknown3[4];    //0x00, 0x00, 0x00, 0x03
+	char   unknown4[4];    //0x00, 0x00, 0x00, 0x02
+	char   unknown5[4];    //0xe7, 0x03, 0x00, 0x00
+	char   unknown6[4];    //0xff, 0xff, 0xff, 0xff
+	char   unknown7[4];    //0xa0, 0x05, 0x00, 0x00
+	char   unknown8[4];    //0x00, 0x00, 0x00, 0x02
+	char   unknown9[4];    //0xff, 0x03, 0x00, 0x00
+	char   unknown10[4];    //0x00, 0x00, 0x00, 0x00
+	char   unknown11[4];    //0x63, 0x00, 0x00, 0x00
+	char   unknown12[4];    //0x01, 0x00, 0x00, 0x00
+	char   unknown13[4];    //0x00, 0x00, 0x00, 0x00
+	char   unknown14[4];    //0x00, 0x00, 0x00, 0x00
 };
 
 struct LoginLoginFailed_Struct {
@@ -74,7 +76,7 @@ struct LoginLoginFailed_Struct {
 	short unknown3;
 	short unknown4;
 	short unknown5;
-	char unknown6[74];
+	char  unknown6[74];
 };
 
 struct ServerListHeader_Struct {
@@ -86,8 +88,7 @@ struct ServerListHeader_Struct {
 	uint32 NumberOfServers;
 };
 
-struct PlayEverquestRequest_Struct
-{
+struct PlayEverquestRequest_Struct {
 	uint16 Sequence;
 	uint32 Unknown1;
 	uint32 Unknown2;
@@ -95,18 +96,19 @@ struct PlayEverquestRequest_Struct
 };
 
 struct PlayEverquestResponse_Struct {
-	uint8 Sequence;
-	uint8 Unknown1[9];
-	uint8 Allowed;
+	uint8  Sequence;
+	uint8  Unknown1[9];
+	uint8  Allowed;
 	uint16 Message;
-	uint8 Unknown2[3];
+	uint8  Unknown2[3];
 	uint32 ServerNumber;
 };
 
 static const unsigned char FailedLoginResponseData[] = {
 	0xf6, 0x85, 0x9c, 0x23, 0x57, 0x7e, 0x3e, 0x55, 0xb3, 0x4c, 0xf8, 0xc8, 0xcb, 0x77, 0xd5, 0x16,
 	0x09, 0x7a, 0x63, 0xdc, 0x57, 0x7e, 0x3e, 0x55, 0xb3, 0x4c, 0xf8, 0xc8, 0xcb, 0x77, 0xd5, 0x16,
-	0x09, 0x7a, 0x63, 0xdc, 0x57, 0x7e, 0x3e, 0x55, 0xb3 };
+	0x09, 0x7a, 0x63, 0xdc, 0x57, 0x7e, 0x3e, 0x55, 0xb3
+};
 
 
 #pragma pack()
diff --git a/loginserver/login_util/EQEmuLoginServerDBInstall.sql b/loginserver/login_util/EQEmuLoginServerDBInstall.sql
deleted file mode 100644
index ae8f6e5e8..000000000
--- a/loginserver/login_util/EQEmuLoginServerDBInstall.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-DROP TABLE IF EXISTS tblLoginServerAccounts;
-CREATE TABLE IF NOT EXISTS tblLoginServerAccounts (
-  LoginServerID integer unsigned NOT NULL auto_increment,
-  AccountName varchar(30) NOT NULL,
-  AccountPassword varchar(50) NOT NULL,
-  AccountCreateDate timestamp default CURRENT_TIMESTAMP NOT NULL,
-  AccountEmail varchar(100) NOT NULL,
-  LastLoginDate datetime NOT NULL,
-  LastIPAddress varchar(15) NOT NULL,
-  PRIMARY KEY (LoginServerID, AccountName)
-) ENGINE=InnoDB;
-
-insert into tblLoginServerAccounts (AccountName, AccountPassword, AccountEmail, LastLoginDate, LastIPAddress) values('Admin', sha('password'), 'admin@somewhere.com', now(), '127.0.0.1');
-
-DROP TABLE IF EXISTS tblServerListType;
-CREATE TABLE IF NOT EXISTS tblServerListType (
-	ServerListTypeID integer unsigned NOT NULL,
-	ServerListTypeDescription varchar(20) NOT NULL,
-	PRIMARY KEY (ServerListTypeID)
-) ENGINE=MyISAM;
-
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (1, 'Legends');
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (2, 'Preferred');
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (3, 'Standard');
-
-DROP TABLE IF EXISTS tblServerAdminRegistration;
-CREATE TABLE IF NOT EXISTS tblServerAdminRegistration (
-	ServerAdminID integer unsigned NOT NULL auto_increment,
-	AccountName varchar(30) NOT NULL,
-	AccountPassword varchar(30) NOT NULL,
-	FirstName varchar(40) NOT NULL,
-	LastName varchar(50) NOT NULL,
-	Email varchar(100) NULL,
-	RegistrationDate datetime NOT NULL,
-	RegistrationIPAddr varchar(15) NOT NULL,
-	PRIMARY KEY (ServerAdminID, Email)
-) ENGINE=MyISAM;
-
-INSERT INTO tblServerAdminRegistration (AccountName, AccountPassword, FirstName, LastName, Email, RegistrationDate, RegistrationIPAddr) VALUES ('Admin', 'Password', 'Tom', 'Wilson', 'Tom.Wilson@gmail.com', now(), '0.0.0.0');
-
-DROP TABLE IF EXISTS tblWorldServerRegistration;
-CREATE TABLE IF NOT EXISTS tblWorldServerRegistration (
-  ServerID integer unsigned NOT NULL auto_increment,
-  ServerLongName varchar(100) NOT NULL,
-  ServerTagDescription varchar(50) NOT NULL DEFAULT '',
-  ServerShortName varchar(25) NOT NULL,
-  ServerListTypeID integer NOT NULL,
-  ServerLastLoginDate datetime NULL,
-  ServerLastIPAddr varchar(15) NULL,
-  ServerAdminID integer NOT NULL,
-  ServerTrusted integer NOT NULL,
-  Note varchar(300) NULL,
-  PRIMARY KEY (ServerID, ServerLongName)
-) ENGINE=InnoDB;
-
-
-INSERT INTO tblWorldServerRegistration (ServerLongName, ServerTagDescription, ServerShortName, ServerListTypeID, ServerLastLoginDate, ServerLastIPAddr, ServerAdminID, ServerTrusted, Note) VALUES ('My Test Server', 'A test server', 'MTST', 1, now(), '0.0.0.0', 1, 0, 'This is a note for the test server');
diff --git a/loginserver/login_util/EQEmuLoginServerPostgreDBInstall.sql b/loginserver/login_util/EQEmuLoginServerPostgreDBInstall.sql
deleted file mode 100644
index bedfbe20d..000000000
--- a/loginserver/login_util/EQEmuLoginServerPostgreDBInstall.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-DROP TABLE IF EXISTS tblLoginServerAccounts;
-CREATE TABLE tblLoginServerAccounts (
-  LoginServerID SERIAL,
-  AccountName text NOT NULL,
-  AccountPassword text NOT NULL,
-  AccountCreateDate date NOT NULL,
-  AccountEmail text NOT NULL,
-  LastLoginDate date NOT NULL,
-  LastIPAddress text NOT NULL,
-  PRIMARY KEY(LoginServerID, AccountName)
-);
-
-insert into tblLoginServerAccounts (AccountName, AccountPassword, AccountEmail, AccountCreateDate, LastLoginDate, LastIPAddress) values('Admin', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', 'admin@somewhere.com', current_date, current_date, '127.0.0.1');
-
-DROP TABLE IF EXISTS tblServerListType;
-CREATE TABLE tblServerListType (
-	ServerListTypeID integer NOT NULL,
-	CHECK (ServerListTypeID >= 0),
-	ServerListTypeDescription text NOT NULL,
-	PRIMARY KEY (ServerListTypeID)
-);
-
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (1, 'Legends');
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (2, 'Preferred');
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (3, 'Standard');
-
-DROP TABLE IF EXISTS tblServerAdminRegistration;
-CREATE TABLE tblServerAdminRegistration (
-	ServerAdminID SERIAL,
-	AccountName text NOT NULL,
-	AccountPassword text NOT NULL,
-	FirstName text NOT NULL,
-	LastName text NOT NULL,
-	Email text NOT NULL,
-	RegistrationDate date NOT NULL,
-	RegistrationIPAddr text NOT NULL,
-	PRIMARY KEY (ServerAdminID, Email)
-);
-
-INSERT INTO tblServerAdminRegistration (AccountName, AccountPassword, FirstName, LastName, Email, RegistrationDate, RegistrationIPAddr) VALUES ('Admin', 'Password', 'Tom', 'Wilson', 'Tom.Wilson@gmail.com', current_date, '0.0.0.0');
-
-DROP TABLE IF EXISTS tblWorldServerRegistration;
-CREATE TABLE tblWorldServerRegistration (
-  ServerID SERIAL,
-  ServerLongName text NOT NULL,
-  ServerTagDescription text NOT NULL,
-  ServerShortName text NOT NULL,
-  ServerListTypeID integer NOT NULL,
-  ServerLastLoginDate date NULL,
-  ServerLastIPAddr text NOT NULL,
-  ServerAdminID integer NOT NULL,
-  ServerTrusted integer NOT NULL,
-  Note text NOT NULL,
-  PRIMARY KEY (ServerID, ServerLongName)
-);
-
-INSERT INTO tblWorldServerRegistration (ServerLongName, ServerTagDescription, ServerShortName, ServerListTypeID, ServerLastLoginDate, ServerLastIPAddr, ServerAdminID, ServerTrusted, Note) VALUES ('My Test Server', 'A test server', 'MTST', 1, current_date, '0.0.0.0', 1, 0, 'This is a note for the test server');
\ No newline at end of file
diff --git a/loginserver/login_util/login.ini b/loginserver/login_util/login.ini
deleted file mode 100644
index bde7616f1..000000000
--- a/loginserver/login_util/login.ini
+++ /dev/null
@@ -1,35 +0,0 @@
-[database]
-host = localhost
-port = 3306
-db = eqemu
-user = user
-password = password
-subsystem = MySQL
-
-[options]
-unregistered_allowed = TRUE
-reject_duplicate_servers = FALSE
-trace = TRUE
-world_trace = FALSE
-dump_packets_in = FALSE
-dump_packets_out = FALSE
-listen_port = 5998
-local_network = 192.168.1.
-
-[security]
-plugin = EQEmuAuthCrypto
-mode = 5
-
-[Titanium]
-port = 5998
-opcodes = login_opcodes.conf
-
-[SoD]
-port = 5999
-opcodes = login_opcodes_sod.conf
-
-[schema]
-account_table = tblLoginServerAccounts
-world_registration_table = tblWorldServerRegistration
-world_admin_registration_table = tblServerAdminRegistration
-world_server_type_table = tblServerListType
\ No newline at end of file
diff --git a/loginserver/login_util/login.json b/loginserver/login_util/login.json
new file mode 100644
index 000000000..6fbd8f742
--- /dev/null
+++ b/loginserver/login_util/login.json
@@ -0,0 +1,37 @@
+{
+  "database": {
+    "host": "127.0.0.1",
+    "port": "3306",
+    "db": "peq",
+    "user": "root",
+    "password": "eqemu"
+  },
+  "account": {
+    "auto_create_accounts": true
+  },
+  "worldservers": {
+    "unregistered_allowed": true,
+    "reject_duplicate_servers": false
+  },
+  "web_api": {
+    "enabled": true,
+    "port": 6000
+  },
+  "security": {
+    "mode": 14,
+    "allow_password_login": true,
+    "allow_token_login": true
+  },
+  "logging": {
+    "trace": false,
+    "world_trace": false,
+    "dump_packets_in": false,
+    "dump_packets_out": false
+  },
+  "client_configuration": {
+    "titanium_port": 5998,
+    "titanium_opcodes": "login_opcodes.conf",
+    "sod_port": 5999,
+    "sod_opcodes": "login_opcodes_sod.conf"
+  }
+}
diff --git a/loginserver/login_util/login_old_to_new_schema_convert.sql b/loginserver/login_util/login_old_to_new_schema_convert.sql
new file mode 100644
index 000000000..18af32b25
--- /dev/null
+++ b/loginserver/login_util/login_old_to_new_schema_convert.sql
@@ -0,0 +1,87 @@
+-- Because the old / legacy schema was mostly inconsistent with naming and overall data structure, we have
+-- migrated to a schema that follows our modern conventions and meanwhile fixes quite a few bugs that
+-- were present as well
+
+-- Login Accounts
+
+INSERT INTO
+  login_accounts (
+    id,
+    account_name,
+    account_password,
+    account_email,
+    source_loginserver,
+    last_ip_address,
+    last_login_date,
+    created_at
+  )
+SELECT
+  LoginServerID,
+  AccountName,
+  AccountPassword,
+  AccountEmail,
+  'local',
+  LastIPAddress,
+  LastLoginDate,
+  AccountCreateDate
+FROM
+  tblLoginServerAccounts;
+
+-- Server Admins
+
+INSERT INTO
+  login_server_admins (
+    id,
+    account_name,
+    account_password,
+    first_name,
+    last_name,
+    email,
+    registration_date,
+    registration_ip_address
+  )
+SELECT
+  ServerAdminID,
+  AccountName,
+  AccountPassword,
+  FirstName,
+  LastName,
+  Email,
+  RegistrationDate,
+  RegistrationIPAddr
+FROM
+  tblServerAdminRegistration;
+
+-- World Servers
+
+INSERT INTO
+  login_world_servers (
+    id,
+    long_name,
+    short_name,
+    tag_description,
+    login_server_list_type_id,
+    last_login_date,
+    last_ip_address,
+    login_server_admin_id,
+    is_server_trusted,
+    note
+  )
+SELECT
+  `ServerID`,
+  `ServerLongName`,
+  `ServerShortName`,
+  `ServerTagDescription`,
+  `ServerListTypeID`,
+  `ServerLastLoginDate`,
+  `ServerLastIPAddr`,
+  `ServerAdminID`,
+  `ServerTrusted`,
+  `Note`
+FROM
+  tblWorldServerRegistration;
+
+DROP TABLE tblLoginServerAccounts;
+DROP TABLE tblServerAdminRegistration;
+DROP TABLE tblWorldServerRegistration;
+DROP TABLE tblServerListType;
diff --git a/loginserver/login_util/login_schema.sql b/loginserver/login_util/login_schema.sql
new file mode 100644
index 000000000..b07362830
--- /dev/null
+++ b/loginserver/login_util/login_schema.sql
@@ -0,0 +1,64 @@
+DROP TABLE IF EXISTS `login_accounts`;
+CREATE TABLE `login_accounts` (
+  `id` int(11) unsigned NOT NULL,
+  `account_name` varchar(50) NOT NULL,
+  `account_password` text NOT NULL,
+  `account_email` varchar(100) NOT NULL,
+  `source_loginserver` varchar(64) DEFAULT NULL,
+  `last_ip_address` varchar(15) NOT NULL,
+  `last_login_date` datetime NOT NULL,
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `source_loginserver_account_name` (`source_loginserver`,`account_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `login_server_admins`;
+CREATE TABLE `login_server_admins` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `account_name` varchar(30) NOT NULL,
+  `account_password` varchar(255) NOT NULL,
+  `first_name` varchar(50) NOT NULL,
+  `last_name` varchar(50) NOT NULL,
+  `email` varchar(100) NOT NULL,
+  `registration_date` datetime NOT NULL,
+  `registration_ip_address` varchar(15) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `login_server_list_types`;
+CREATE TABLE `login_server_list_types` (
+  `id` int(10) unsigned NOT NULL,
+  `description` varchar(60) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+INSERT INTO `login_server_list_types` (`id`, `description`) VALUES ('1', 'Legends'),
+('2', 'Preferred'),
+('3', 'Standard');
+
+DROP TABLE IF EXISTS `login_world_servers`;
+CREATE TABLE `login_world_servers` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `long_name` varchar(100) NOT NULL,
+  `short_name` varchar(100) NOT NULL,
+  `tag_description` varchar(50) NOT NULL DEFAULT '',
+  `login_server_list_type_id` int(11) NOT NULL,
+  `last_login_date` datetime DEFAULT NULL,
+  `last_ip_address` varchar(15) DEFAULT NULL,
+  `login_server_admin_id` int(11) NOT NULL,
+  `is_server_trusted` int(11) NOT NULL,
+  `note` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
+
+DROP TABLE IF EXISTS `login_api_tokens`;
+CREATE TABLE `login_api_tokens` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `token` varchar(200) DEFAULT NULL,
+  `can_write` int(11) DEFAULT 0,
+  `can_read` int(11) DEFAULT 0,
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT current_timestamp(),
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
\ No newline at end of file
diff --git a/loginserver/login_util/tblLoginServerAccounts.sql b/loginserver/login_util/tblLoginServerAccounts.sql
deleted file mode 100644
index 65143b38b..000000000
--- a/loginserver/login_util/tblLoginServerAccounts.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-DROP TABLE IF EXISTS tblLoginServerAccounts;
-CREATE TABLE IF NOT EXISTS tblLoginServerAccounts (
-  LoginServerID integer unsigned NOT NULL auto_increment,
-  AccountName varchar(30) NOT NULL,
-  AccountPassword varchar(50) NOT NULL,
-  AccountCreateDate timestamp default CURRENT_TIMESTAMP NOT NULL,
-  AccountEmail varchar(100) NOT NULL,
-  LastLoginDate datetime NOT NULL,
-  LastIPAddress varchar(15) NOT NULL,
-  PRIMARY KEY (LoginServerID, AccountName)
-) ENGINE=InnoDB;
diff --git a/loginserver/login_util/tblServerAdminRegistration.sql b/loginserver/login_util/tblServerAdminRegistration.sql
deleted file mode 100644
index 8e91a5a77..000000000
--- a/loginserver/login_util/tblServerAdminRegistration.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-DROP TABLE IF EXISTS tblServerAdminRegistration;
-CREATE TABLE IF NOT EXISTS tblServerAdminRegistration (
-	ServerAdminID integer unsigned NOT NULL auto_increment,
-	AccountName varchar(30) NOT NULL,
-	AccountPassword varchar(30) NOT NULL,
-	FirstName varchar(40) NOT NULL,
-	LastName varchar(50) NOT NULL,
-	Email varchar(100) NULL,
-	RegistrationDate datetime NOT NULL,
-	RegistrationIPAddr varchar(15) NOT NULL,
-	PRIMARY KEY (ServerAdminID, Email)
-) ENGINE=MyISAM;
\ No newline at end of file
diff --git a/loginserver/login_util/tblServerListType.sql b/loginserver/login_util/tblServerListType.sql
deleted file mode 100644
index fafaffe45..000000000
--- a/loginserver/login_util/tblServerListType.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-DROP TABLE IF EXISTS tblServerListType;
-CREATE TABLE IF NOT EXISTS tblServerListType (
-	ServerListTypeID integer unsigned NOT NULL,
-	ServerListTypeDescription varchar(20) NOT NULL,
-	PRIMARY KEY (ServerListTypeID)
-) ENGINE=MyISAM;
-
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (1, 'Legends');
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (2, 'Preferred');
-INSERT INTO tblServerListType (ServerListTypeID, ServerListTypeDescription) VALUES (3, 'Standard');
\ No newline at end of file
diff --git a/loginserver/login_util/tblWorldServerRegistration.sql b/loginserver/login_util/tblWorldServerRegistration.sql
deleted file mode 100644
index e0ee4dc9f..000000000
--- a/loginserver/login_util/tblWorldServerRegistration.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-DROP TABLE IF EXISTS tblWorldServerRegistration;
-CREATE TABLE IF NOT EXISTS tblWorldServerRegistration (
-  ServerID integer unsigned NOT NULL auto_increment,
-  ServerLongName varchar(100) NOT NULL,
-  ServerTagDescription varchar(50) NOT NULL DEFAULT '',
-  ServerShortName varchar(25) NOT NULL,
-  ServerListTypeID integer NOT NULL,
-  ServerLastLoginDate datetime NULL,
-  ServerLastIPAddr varchar(15) NULL,
-  ServerAdminID integer NOT NULL,
-  Note varchar(300) NULL,
-  ServerTrusted int(11),
-  PRIMARY KEY (ServerID, ServerLongName)
-) ENGINE=InnoDB;
diff --git a/loginserver/loginserver_command_handler.cpp b/loginserver/loginserver_command_handler.cpp
new file mode 100644
index 000000000..35599e299
--- /dev/null
+++ b/loginserver/loginserver_command_handler.cpp
@@ -0,0 +1,304 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include <iostream>
+#include <random>
+#include "loginserver_command_handler.h"
+#include "../common/util/uuid.h"
+#include "login_server.h"
+#include "loginserver_webserver.h"
+#include "account_management.h"
+
+extern LoginServer server;
+
+namespace LoginserverCommandHandler {
+
+	/**
+	 * @param argc
+	 * @param argv
+	 */
+	void CommandHandler(int argc, char **argv)
+	{
+		if (argc == 1) { return; }
+
+		argh::parser cmd;
+		cmd.parse(argc, argv, argh::parser::PREFER_PARAM_FOR_UNREG_OPTION);
+		EQEmuCommand::DisplayDebug(cmd);
+
+		/**
+		 * Declare command mapping
+		 */
+		auto function_map = EQEmuCommand::function_map;
+
+		/**
+		 * Register commands
+		 */
+		function_map["login-user:check-credentials"]          = &LoginserverCommandHandler::CheckLoginserverUserCredentials;
+		function_map["login-user:check-external-credentials"] = &LoginserverCommandHandler::CheckExternalLoginserverUserCredentials;
+		function_map["login-user:create"]                     = &LoginserverCommandHandler::CreateLocalLoginserverAccount;
+		function_map["login-user:update-credentials"]         = &LoginserverCommandHandler::UpdateLoginserverUserCredentials;
+		function_map["web-api-token:create"]                  = &LoginserverCommandHandler::CreateLoginserverApiToken;
+		function_map["web-api-token:list"]                    = &LoginserverCommandHandler::ListLoginserverApiTokens;
+		function_map["world-admin:create"]                    = &LoginserverCommandHandler::CreateLoginserverWorldAdminAccount;
+		function_map["world-admin:update"]                    = &LoginserverCommandHandler::UpdateLoginserverWorldAdminAccountPassword;
+
+		EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void CreateLoginserverApiToken(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Creates Loginserver API Token";
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		std::vector<std::string> arguments = {};
+		std::vector<std::string> options   = {
+			"--read",
+			"--write"
+		};
+
+		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
+		bool can_read  = cmd[{"-r", "--read"}];
+		bool can_write = cmd[{"-w", "--write"}];
+
+		if (!can_read || !can_write) {
+			LogInfo("[{0}] --read or --write must be set or both!", __func__);
+			exit(1);
+		}
+
+		std::string token = server.db->CreateLoginserverApiToken(can_write, can_read);
+		if (!token.empty()) {
+			LogInfo("[{0}] Created Loginserver API token [{1}]", __func__, token);
+		}
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void ListLoginserverApiTokens(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Lists Loginserver API Tokens";
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		server.token_manager = new LoginserverWebserver::TokenManager;
+		server.token_manager->LoadApiTokens();
+
+		for (auto &it : server.token_manager->loaded_api_tokens) {
+			LogInfo(
+				"token [{0}] can_write [{1}] can_read [{2}]",
+				it.second.token,
+				it.second.can_write,
+				it.second.can_read
+			);
+		}
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void CreateLocalLoginserverAccount(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Creates Local Loginserver Account";
+
+		std::vector<std::string> arguments = {
+			"{username}",
+			"{password}"
+		};
+		std::vector<std::string> options   = {
+			"--email=*"
+		};
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
+		AccountManagement::CreateLoginServerAccount(
+			cmd(2).str(),
+			cmd(3).str(),
+			cmd("--email").str()
+		);
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void CreateLoginserverWorldAdminAccount(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Creates Loginserver World Administrator Account";
+
+		std::vector<std::string> arguments = {
+			"{username}",
+			"{password}",
+			"{email}"
+		};
+		std::vector<std::string> options   = {};
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
+		AccountManagement::CreateLoginserverWorldAdminAccount(
+			cmd(2).str(),
+			cmd(3).str(),
+			cmd(4).str()
+		);
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void CheckLoginserverUserCredentials(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Check user login credentials";
+
+		std::vector<std::string> arguments = {
+			"{username}",
+			"{password}"
+		};
+		std::vector<std::string> options   = {};
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
+		auto res = AccountManagement::CheckLoginserverUserCredentials(
+			cmd(2).str(),
+			cmd(3).str()
+		);
+
+		LogInfo("Credentials were {0}", res != 0 ? "accepted" : "not accepted");
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void UpdateLoginserverUserCredentials(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Change user login credentials";
+
+		std::vector<std::string> arguments = {
+			"{username}",
+			"{password}"
+		};
+		std::vector<std::string> options   = {};
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
+		AccountManagement::UpdateLoginserverUserCredentials(
+			cmd(2).str(),
+			cmd(3).str()
+		);
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void CheckExternalLoginserverUserCredentials(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Check user external login credentials";
+
+		std::vector<std::string> arguments = {
+			"{username}",
+			"{password}"
+		};
+		std::vector<std::string> options   = {};
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
+		auto res = AccountManagement::CheckExternalLoginserverUserCredentials(
+			cmd(2).str(),
+			cmd(3).str()
+		);
+
+		LogInfo("Credentials were {0}", res ? "accepted" : "not accepted");
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void UpdateLoginserverWorldAdminAccountPassword(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Update world admin account password";
+
+		std::vector<std::string> arguments = {
+			"{username}",
+			"{password}"
+		};
+		std::vector<std::string> options   = {};
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
+		AccountManagement::UpdateLoginserverWorldAdminAccountPasswordByName(
+			cmd(2).str(),
+			cmd(3).str()
+		);
+	}
+}
diff --git a/loginserver/loginserver_command_handler.h b/loginserver/loginserver_command_handler.h
new file mode 100644
index 000000000..2f890f956
--- /dev/null
+++ b/loginserver/loginserver_command_handler.h
@@ -0,0 +1,40 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "iostream"
+#include "../common/cli/eqemu_command_handler.h"
+
+#ifndef EQEMU_LOGINSERVER_COMMAND_HANDLER_H
+#define EQEMU_LOGINSERVER_COMMAND_HANDLER_H
+
+namespace LoginserverCommandHandler {
+	void CommandHandler(int argc, char **argv);
+	void CreateLoginserverApiToken(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void ListLoginserverApiTokens(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void CreateLocalLoginserverAccount(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void CreateLoginserverWorldAdminAccount(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void CheckLoginserverUserCredentials(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void UpdateLoginserverUserCredentials(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void CheckExternalLoginserverUserCredentials(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void UpdateLoginserverWorldAdminAccountPassword(int argc, char **argv, argh::parser &cmd, std::string &description);
+};
+
+
+#endif //EQEMU_LOGINSERVER_COMMAND_HANDLER_H
diff --git a/loginserver/loginserver_webserver.cpp b/loginserver/loginserver_webserver.cpp
new file mode 100644
index 000000000..38a3508f6
--- /dev/null
+++ b/loginserver/loginserver_webserver.cpp
@@ -0,0 +1,533 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "loginserver_webserver.h"
+#include "server_manager.h"
+#include "login_server.h"
+#include "../common/json/json.h"
+#include "../common/string_util.h"
+#include "account_management.h"
+
+extern LoginServer server;
+
+namespace LoginserverWebserver {
+
+	constexpr static int HTTP_RESPONSE_OK           = 200;
+	constexpr static int HTTP_RESPONSE_BAD_REQUEST  = 400;
+	constexpr static int HTTP_RESPONSE_UNAUTHORIZED = 401;
+
+	/**
+	 * @param api
+	 */
+	void RegisterRoutes(httplib::Server &api)
+	{
+		server.token_manager = new LoginserverWebserver::TokenManager;
+		server.token_manager->LoadApiTokens();
+
+		api.Get(
+			"/v1/servers/list", [](const httplib::Request &request, httplib::Response &res) {
+				if (!LoginserverWebserver::TokenManager::AuthCanRead(request, res)) {
+					return;
+				}
+
+				Json::Value response;
+				auto        iter = server.server_manager->getWorldServers().begin();
+				while (iter != server.server_manager->getWorldServers().end()) {
+					Json::Value row;
+					row["server_long_name"]  = (*iter)->GetServerLongName();
+					row["server_short_name"] = (*iter)->GetServerLongName();
+					row["server_list_id"]    = (*iter)->GetServerListID();
+					row["server_status"]     = (*iter)->GetStatus();
+					row["zones_booted"]      = (*iter)->GetZonesBooted();
+					row["local_ip"]          = (*iter)->GetLocalIP();
+					row["remote_ip"]         = (*iter)->GetRemoteIP();
+					row["players_online"]    = (*iter)->GetPlayersOnline();
+					response.append(row);
+					++iter;
+				}
+
+				LoginserverWebserver::SendResponse(response, res);
+			}
+		);
+
+		api.Post(
+			"/v1/account/create", [](const httplib::Request &request, httplib::Response &res) {
+				if (!LoginserverWebserver::TokenManager::AuthCanWrite(request, res)) {
+					return;
+				}
+
+				Json::Value request_body = LoginserverWebserver::ParseRequestBody(request);
+				std::string username     = request_body.get("username", "").asString();
+				std::string password     = request_body.get("password", "").asString();
+				std::string email        = request_body.get("email", "").asString();
+
+				Json::Value response;
+				if (username.empty() || password.empty()) {
+					response["error"] = "Username or password not set";
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					LoginserverWebserver::SendResponse(response, res);
+					return;
+				}
+
+				int32 account_created_id = AccountManagement::CreateLoginServerAccount(username, password, email);
+				if (account_created_id > 0) {
+					response["message"]            = "Account created successfully!";
+					response["data"]["account_id"] = account_created_id;
+				}
+				else if (account_created_id == -1) {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Account already exists!";
+				}
+				else {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Account failed to create!";
+				}
+
+				LoginserverWebserver::SendResponse(response, res);
+			}
+		);
+
+		api.Post(
+			"/v1/account/create/external", [](const httplib::Request &request, httplib::Response &res) {
+				if (!LoginserverWebserver::TokenManager::AuthCanWrite(request, res)) {
+					return;
+				}
+
+				Json::Value request_body     = LoginserverWebserver::ParseRequestBody(request);
+				std::string username         = request_body.get("username", "").asString();
+				std::string password         = request_body.get("password", "").asString();
+				std::string email            = request_body.get("email", "").asString();
+				uint32      login_account_id = request_body.get("login_account_id", "").asInt();
+
+				Json::Value response;
+				if (username.empty() || password.empty()) {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Username or password not set";
+					LoginserverWebserver::SendResponse(response, res);
+					return;
+				}
+
+				std::string source_loginserver = "eqemu";
+				int32       account_created_id = AccountManagement::CreateLoginServerAccount(
+					username,
+					password,
+					email,
+					source_loginserver,
+					login_account_id
+				);
+
+				if (account_created_id > 0) {
+					response["message"]            = "Account created successfully!";
+					response["data"]["account_id"] = account_created_id;
+				}
+				else if (account_created_id == -1) {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Account already exists!";
+				}
+				else {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Account failed to create!";
+				}
+
+				LoginserverWebserver::SendResponse(response, res);
+			}
+		);
+
+		api.Post(
+			"/v1/account/credentials/validate/local", [](const httplib::Request &request, httplib::Response &res) {
+				if (!LoginserverWebserver::TokenManager::AuthCanRead(request, res)) {
+					return;
+				}
+
+				Json::Value request_body = LoginserverWebserver::ParseRequestBody(request);
+				std::string username     = request_body.get("username", "").asString();
+				std::string password     = request_body.get("password", "").asString();
+
+				Json::Value response;
+				if (username.empty() || password.empty()) {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Username or password not set";
+					LoginserverWebserver::SendResponse(response, res);
+					return;
+				}
+
+				uint32 login_account_id = AccountManagement::CheckLoginserverUserCredentials(
+					username,
+					password
+				);
+
+				if (login_account_id > 0) {
+					response["message"]            = "Credentials valid!";
+					response["data"]["account_id"] = login_account_id;
+				}
+				else {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Credentials invalid!";
+				}
+
+				LoginserverWebserver::SendResponse(response, res);
+			}
+		);
+
+		api.Post(
+			"/v1/account/credentials/update/local", [](const httplib::Request &request, httplib::Response &res) {
+				if (!LoginserverWebserver::TokenManager::AuthCanWrite(request, res)) {
+					return;
+				}
+
+				Json::Value request_body = LoginserverWebserver::ParseRequestBody(request);
+				std::string username     = request_body.get("username", "").asString();
+				std::string password     = request_body.get("password", "").asString();
+
+				Json::Value response;
+				if (username.empty() || password.empty()) {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Username or password not set";
+					LoginserverWebserver::SendResponse(response, res);
+					return;
+				}
+
+				Database::DbLoginServerAccount
+					login_server_account = server.db->GetLoginServerAccountByAccountName(
+					username
+				);
+
+				if (!login_server_account.loaded) {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Failed to find associated loginserver account!";
+					LoginserverWebserver::SendResponse(response, res);
+					return;
+				}
+
+				bool credentials_valid = AccountManagement::UpdateLoginserverUserCredentials(
+					username,
+					password
+				);
+
+				if (credentials_valid) {
+					response["message"] = "Loginserver account credentials updated!";
+				}
+				else {
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+					response["error"] = "Failed to update loginserver account credentials!";
+				}
+
+				LoginserverWebserver::SendResponse(response, res);
+			}
+		);
+
+
+		api.Post(
+			"/v1/account/credentials/update/external", [](const httplib::Request &request, httplib::Response &res) {
+				if (!LoginserverWebserver::TokenManager::AuthCanWrite(request, res)) {
+					return;
+				}
+
+				Json::Value request_body = LoginserverWebserver::ParseRequestBody(request);
+				std::string username     = request_body.get("username", "").asString();
+				std::string password     = request_body.get("password", "").asString();
+
+				Json::Value response;
+				if (username.empty() || password.empty()) {
+					response["error"] = "Username or password not set";
+					LoginserverWebserver::SendResponse(response, res);
+					return;
+				}
+
+				std::string source_loginserver = "eqemu";
+
+				Database::DbLoginServerAccount
+					login_server_account = server.db->GetLoginServerAccountByAccountName(
+					username,
+					source_loginserver
+				);
+
+				if (!login_server_account.loaded) {
+					response["error"] = "Failed to find associated loginserver account!";
+					LoginserverWebserver::SendResponse(response, res);
+					return;
+				}
+
+				bool credentials_valid = AccountManagement::UpdateLoginserverUserCredentials(
+					username,
+					password,
+					source_loginserver
+				);
+
+				if (credentials_valid) {
+					response["message"] = "Loginserver account credentials updated!";
+				}
+				else {
+					response["error"] = "Failed to update loginserver account credentials!";
+				}
+
+				LoginserverWebserver::SendResponse(response, res);
+			}
+		);
+
+		api.Post(
+			"/v1/account/credentials/validate/external", [](const httplib::Request &request, httplib::Response &res) {
+				if (!LoginserverWebserver::TokenManager::AuthCanRead(request, res)) {
+					return;
+				}
+
+				Json::Value request_body = LoginserverWebserver::ParseRequestBody(request);
+				std::string username     = request_body.get("username", "").asString();
+				std::string password     = request_body.get("password", "").asString();
+
+				Json::Value response;
+				if (username.empty() || password.empty()) {
+					response["error"] = "Username or password not set";
+					LoginserverWebserver::SendResponse(response, res);
+					return;
+				}
+
+				uint32 account_id = AccountManagement::CheckExternalLoginserverUserCredentials(
+					username,
+					password
+				);
+
+				if (account_id > 0) {
+					response["message"]            = "Credentials valid!";
+					response["data"]["account_id"] = account_id;
+				}
+				else {
+					response["error"] = "Credentials invalid!";
+					res.status = HTTP_RESPONSE_BAD_REQUEST;
+				}
+
+				LoginserverWebserver::SendResponse(response, res);
+			}
+		);
+	}
+
+	/**
+	 * @param payload
+	 * @param res
+	 */
+	void SendResponse(const Json::Value &payload, httplib::Response &res)
+	{
+		if (res.get_header_value("response_set") == "true") {
+			res.set_header("response_set", "");
+			return;
+		}
+
+		std::stringstream response_payload;
+
+		if (payload.empty()) {
+			Json::Value response;
+			response["message"] = "There were no results found";
+			response_payload << response;
+			res.set_content(response_payload.str(), "application/json");
+			return;
+		}
+
+		response_payload << payload;
+		res.set_content(response_payload.str(), "application/json");
+	}
+
+	/**
+	 * @param payload
+	 * @param res
+	 */
+	Json::Value ParseRequestBody(const httplib::Request &request)
+	{
+		Json::Value request_body;
+
+		try {
+			std::stringstream ss;
+			ss.str(request.body);
+			ss >> request_body;
+		}
+		catch (std::exception &) {
+			request_body["error"] = "Payload invalid";
+
+			return request_body;
+		}
+
+		return request_body;
+	}
+
+	/**
+	 * @param request
+	 * @param res
+	 */
+	bool LoginserverWebserver::TokenManager::AuthCanRead(const httplib::Request &request, httplib::Response &res)
+	{
+		LoginserverWebserver::TokenManager::token_data
+			user_token = LoginserverWebserver::TokenManager::CheckApiAuthorizationHeaders(request);
+
+		if (!user_token.can_read) {
+			Json::Value       response;
+			std::stringstream response_payload;
+			response["message"] = "Authorization token is either invalid or cannot read!";
+			response_payload << response;
+
+			res.status = HTTP_RESPONSE_UNAUTHORIZED;
+			res.set_content(response_payload.str(), "application/json");
+			res.set_header("response_set", "true");
+
+			LogWarning(
+				"AuthCanRead access failure remote_address [{0}] user_agent [{1}]",
+				user_token.remote_address,
+				user_token.user_agent
+			);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param request
+	 * @param res
+	 */
+	bool LoginserverWebserver::TokenManager::AuthCanWrite(const httplib::Request &request, httplib::Response &res)
+	{
+		LoginserverWebserver::TokenManager::token_data
+			user_token = LoginserverWebserver::TokenManager::CheckApiAuthorizationHeaders(request);
+
+		if (!user_token.can_write) {
+			Json::Value       response;
+			std::stringstream response_payload;
+			response["message"] = "Authorization token is either invalid or cannot write!";
+			response_payload << response;
+
+			res.status = HTTP_RESPONSE_UNAUTHORIZED;
+			res.set_content(response_payload.str(), "application/json");
+			res.set_header("response_set", "true");
+
+			LogWarning(
+				"AuthCanWrite access failure remote_address [{0}] user_agent [{1}]",
+				user_token.remote_address,
+				user_token.user_agent
+			);
+
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param request
+	 * @return
+	 */
+	LoginserverWebserver::TokenManager::token_data
+	LoginserverWebserver::TokenManager::CheckApiAuthorizationHeaders(
+		const httplib::Request &request
+	)
+	{
+		std::string authorization_key;
+
+		LoginserverWebserver::TokenManager::token_data user_token{};
+
+		for (const auto &header : request.headers) {
+			auto header_key   = header.first;
+			auto header_value = header.second;
+			if (header_key == "Authorization") {
+				authorization_key = header.second;
+				find_replace(authorization_key, "Bearer ", "");
+				if (LoginserverWebserver::TokenManager::TokenExists(authorization_key)) {
+					user_token = server.token_manager->GetToken(authorization_key);
+				}
+			}
+
+			if (header_key == "REMOTE_ADDR") {
+				user_token.remote_address = header.second;
+			}
+
+			if (header_key == "User-Agent") {
+				user_token.user_agent = header.second;
+			}
+		}
+
+		LogDebug(
+			"Authentication Request | remote_address [{0}] user_agent [{1}] authorization_key [{2}] request_path [{3}]",
+			user_token.remote_address,
+			user_token.user_agent,
+			authorization_key,
+			request.path
+		);
+
+		return user_token;
+	}
+
+	/**
+	 * Loads API Tokens
+	 */
+	void TokenManager::LoadApiTokens()
+	{
+		auto      results     = server.db->GetLoginserverApiTokens();
+		int       token_count = 0;
+		for (auto row         = results.begin(); row != results.end(); ++row) {
+			LoginserverWebserver::TokenManager::token_data token_data;
+			token_data.token     = row[0];
+			token_data.can_write = std::stoi(row[1]) > 0;
+			token_data.can_read  = std::stoi(row[2]) > 0;
+
+			LogDebug(
+				"Inserting api token to internal list [{0}] write {1} read {2}",
+				token_data.token,
+				token_data.can_read,
+				token_data.can_write
+			);
+
+			server.token_manager->loaded_api_tokens.insert(
+				std::make_pair(
+					token_data.token,
+					token_data
+				)
+			);
+
+			token_count++;
+		}
+
+		LogInfo("Loaded [{}] API token(s)", token_count);
+	}
+
+	/**
+	 * @param token
+	 * @return
+	 */
+	bool TokenManager::TokenExists(const std::string &token)
+	{
+		auto it = server.token_manager->loaded_api_tokens.find(token);
+
+		return !(it == server.token_manager->loaded_api_tokens.end());
+	}
+
+	/**
+	 * @param token
+	 * @return
+	 */
+	LoginserverWebserver::TokenManager::token_data TokenManager::GetToken(
+		const std::string &token
+	)
+	{
+		auto iter = server.token_manager->loaded_api_tokens.find(token);
+		if (iter != server.token_manager->loaded_api_tokens.end()) {
+			return iter->second;
+		}
+
+		return {};
+	}
+}
diff --git a/loginserver/loginserver_webserver.h b/loginserver/loginserver_webserver.h
new file mode 100644
index 000000000..b0cdb88c2
--- /dev/null
+++ b/loginserver/loginserver_webserver.h
@@ -0,0 +1,58 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#ifndef EQEMU_LOGINSERVER_WEBSERVER_H
+#define EQEMU_LOGINSERVER_WEBSERVER_H
+
+#include "../common/http/httplib.h"
+#include "../common/json/json.h"
+#include "../common/types.h"
+
+namespace LoginserverWebserver {
+
+	class TokenManager {
+
+	public:
+		TokenManager() = default;
+
+		struct token_data {
+			std::string token;
+			bool can_read;
+			bool can_write;
+			std::string user_agent;
+			std::string remote_address;
+		};
+
+		std::map<std::string, token_data> loaded_api_tokens{};
+
+		void LoadApiTokens();
+		static bool TokenExists(const std::string &token);
+		token_data GetToken(const std::string &token);
+		static token_data CheckApiAuthorizationHeaders(const httplib::Request &request);
+		static bool AuthCanRead(const httplib::Request &request, httplib::Response &res);
+		static bool AuthCanWrite(const httplib::Request &request, httplib::Response &res);
+	};
+
+	void RegisterRoutes(httplib::Server &api);
+	void SendResponse(const Json::Value &payload, httplib::Response &res);
+	static Json::Value ParseRequestBody(const httplib::Request &request);
+};
+
+#endif //EQEMU_LOGINSERVER_WEBSERVER_H
diff --git a/loginserver/main.cpp b/loginserver/main.cpp
index a77ec395f..9e6006342 100644
--- a/loginserver/main.cpp
+++ b/loginserver/main.cpp
@@ -1,20 +1,23 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #include "../common/global_define.h"
 #include "../common/types.h"
 #include "../common/opcodemgr.h"
@@ -23,7 +26,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/platform.h"
 #include "../common/crash.h"
 #include "../common/eqemu_logsys.h"
+#include "../common/http/httplib.h"
 #include "login_server.h"
+#include "loginserver_webserver.h"
+#include "loginserver_command_handler.h"
 #include <time.h>
 #include <stdlib.h>
 #include <string>
@@ -31,167 +37,236 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 LoginServer server;
 EQEmuLogSys LogSys;
-bool run_server = true;
+bool        run_server = true;
 
 void CatchSignal(int sig_num)
 {
 }
 
-int main()
+void LoadDatabaseConnection()
+{
+	LogInfo("MySQL Database Init");
+
+	server.db = new Database(
+		server.config.GetVariableString("database", "user", "root"),
+		server.config.GetVariableString("database", "password", ""),
+		server.config.GetVariableString("database", "host", "localhost"),
+		server.config.GetVariableString("database", "port", "3306"),
+		server.config.GetVariableString("database", "db", "peq")
+	);
+
+}
+
+void LoadServerConfig()
+{
+	server.config = EQ::JsonConfigFile::Load("login.json");
+	LogInfo("Config System Init");
+
+
+	/**
+	 * Logging
+	 */
+	server.options.Trace(server.config.GetVariableBool("logging", "trace", false));
+	server.options.WorldTrace(server.config.GetVariableBool("logging", "world_trace", false));
+	server.options.DumpInPackets(server.config.GetVariableBool("logging", "dump_packets_in", false));
+	server.options.DumpOutPackets(server.config.GetVariableBool("logging", "dump_packets_out", false));
+
+	/**
+	 * Worldservers
+	 */
+	server.options.RejectDuplicateServers(
+		server.config.GetVariableBool(
+			"worldservers",
+			"reject_duplicate_servers",
+			false
+		));
+	server.options.AllowUnregistered(server.config.GetVariableBool("worldservers", "unregistered_allowed", true));
+
+	/**
+	 * Account
+	 */
+	server.options.AutoCreateAccounts(server.config.GetVariableBool("account", "auto_create_accounts", true));
+	server.options.AutoLinkAccounts(server.config.GetVariableBool("account", "auto_link_accounts", false));
+
+#ifdef LSPX
+	server.options.EQEmuLoginServerAddress(
+		server.config.GetVariableString(
+			"general",
+			"eqemu_loginserver_address",
+			"login.eqemulator.net:5999"
+		)
+	);
+#endif
+
+	/**
+	 * Default Loginserver Name (Don't change)
+	 */
+	server.options.DefaultLoginServerName(
+		server.config.GetVariableString(
+			"general",
+			"default_loginserver_name",
+			"local"
+		)
+	);
+
+	/**
+	 * Security
+	 */
+
+#ifdef ENABLE_SECURITY
+	server.options.EncryptionMode(server.config.GetVariableInt("security", "mode", 13));
+#else
+	server.options.EncryptionMode(server.config.GetVariableInt("security", "mode", 6));
+#endif
+
+	server.options.AllowTokenLogin(server.config.GetVariableBool("security", "allow_token_login", false));
+	server.options.AllowPasswordLogin(server.config.GetVariableBool("security", "allow_password_login", true));
+	server.options.UpdateInsecurePasswords(
+		server.config.GetVariableBool(
+			"security",
+			"update_insecure_passwords",
+			true
+		)
+	);
+}
+
+int main(int argc, char **argv)
 {
 	RegisterExecutablePlatform(ExePlatformLogin);
 	set_exception_handler();
-	LogSys.LoadLogSettingsDefaults();
 
-	LogSys.log_settings[Logs::Error].log_to_console = Logs::General;
-	LogSys.log_settings[Logs::Error].is_category_enabled = 1;
+	LogInfo("Logging System Init");
 
-	Log(Logs::General, Logs::Login_Server, "Logging System Init.");
-
-	/* Parse out login.ini */
-	server.config = new Config();
-	Log(Logs::General, Logs::Login_Server, "Config System Init.");
-	server.config->Parse("login.ini");
-
-	if (server.config->GetVariable("options", "unregistered_allowed").compare("FALSE") == 0)
-		server.options.AllowUnregistered(false);
-
-	if (server.config->GetVariable("options", "trace").compare("TRUE") == 0)
-		server.options.Trace(true);
-
-	if (server.config->GetVariable("options", "world_trace").compare("TRUE") == 0)
-		server.options.WorldTrace(true);
-
-	if (server.config->GetVariable("options", "dump_packets_in").compare("TRUE") == 0)
-		server.options.DumpInPackets(true);
-
-	if (server.config->GetVariable("options", "dump_packets_out").compare("TRUE") == 0)
-		server.options.DumpOutPackets(true);
-
-	if (server.config->GetVariable("security", "allow_token_login").compare("TRUE") == 0)
-		server.options.AllowTokenLogin(true);
-
-	if (server.config->GetVariable("security", "allow_password_login").compare("FALSE") == 0)
-		server.options.AllowPasswordLogin(false);
-
-	if (server.config->GetVariable("options", "auto_create_accounts").compare("TRUE") == 0)
-		server.options.AutoCreateAccounts(true);
-
-	std::string mode = server.config->GetVariable("security", "mode");
-	if (mode.size() > 0)
-		server.options.EncryptionMode(atoi(mode.c_str()));
-
-	std::string local_network = server.config->GetVariable("options", "local_network");
-	if (local_network.size() > 0)
-		server.options.LocalNetwork(local_network);
-
-	if (server.config->GetVariable("options", "reject_duplicate_servers").compare("TRUE") == 0)
-		server.options.RejectDuplicateServers(true);
-
-	local_network = server.config->GetVariable("schema", "account_table");
-	if (local_network.size() > 0)
-		server.options.AccountTable(local_network);
-
-	local_network = server.config->GetVariable("schema", "world_registration_table");
-	if (local_network.size() > 0)
-		server.options.WorldRegistrationTable(local_network);
-
-	local_network = server.config->GetVariable("schema", "world_admin_registration_table");
-	if (local_network.size() > 0)
-		server.options.WorldAdminRegistrationTable(local_network);
-
-	local_network = server.config->GetVariable("schema", "world_server_type_table");
-	if (local_network.size() > 0)
-		server.options.WorldServerTypeTable(local_network);
-
-	/* Create database connection */
-	if (server.config->GetVariable("database", "subsystem").compare("MySQL") == 0) {
-#ifdef EQEMU_MYSQL_ENABLED
-		Log(Logs::General, Logs::Login_Server, "MySQL Database Init.");
-		server.db = (Database*)new DatabaseMySQL(
-			server.config->GetVariable("database", "user"),
-			server.config->GetVariable("database", "password"),
-			server.config->GetVariable("database", "host"),
-			server.config->GetVariable("database", "port"),
-			server.config->GetVariable("database", "db"));
-#endif
-	}
-	else if (server.config->GetVariable("database", "subsystem").compare("PostgreSQL") == 0) {
-#ifdef EQEMU_POSTGRESQL_ENABLED
-		Log(Logs::General, Logs::Login_Server, "PostgreSQL Database Init.");
-		server.db = (Database*)new DatabasePostgreSQL(
-			server.config->GetVariable("database", "user"),
-			server.config->GetVariable("database", "password"),
-			server.config->GetVariable("database", "host"),
-			server.config->GetVariable("database", "port"),
-			server.config->GetVariable("database", "db"));
-#endif
+	if (argc == 1) {
+		LogSys.LoadLogSettingsDefaults();
 	}
 
-	/* Make sure our database got created okay, otherwise cleanup and exit. */
+	/**
+	 * Command handler
+	 */
+	if (argc > 1) {
+		LogSys.SilenceConsoleLogging();
+
+		LoadServerConfig();
+		LoadDatabaseConnection();
+
+		LogSys.LoadLogSettingsDefaults();
+		LogSys.log_settings[Logs::Debug].log_to_console      = static_cast<uint8>(Logs::General);
+		LogSys.log_settings[Logs::Debug].is_category_enabled = 1;
+
+		LoginserverCommandHandler::CommandHandler(argc, argv);
+	}
+
+	LoadServerConfig();
+
+	/**
+	 * mysql connect
+	 */
+	LoadDatabaseConnection();
+
+	if (argc == 1) {
+		server.db->LoadLogSettings(LogSys.log_settings);
+		LogSys.StartFileLogs();
+	}
+
+	/**
+	 * make sure our database got created okay, otherwise cleanup and exit
+	 */
 	if (!server.db) {
-		Log(Logs::General, Logs::Error, "Database Initialization Failure.");
-		Log(Logs::General, Logs::Login_Server, "Config System Shutdown.");
-		delete server.config;
-		Log(Logs::General, Logs::Login_Server, "Log System Shutdown.");
+		LogError("Database Initialization Failure");
+		LogInfo("Log System Shutdown");
 		return 1;
 	}
 
-	//create our server manager.
-	Log(Logs::General, Logs::Login_Server, "Server Manager Initialize.");
+	/**
+	 * create server manager
+	 */
+	LogInfo("Server Manager Init");
 	server.server_manager = new ServerManager();
 	if (!server.server_manager) {
-		//We can't run without a server manager, cleanup and exit.
-		Log(Logs::General, Logs::Error, "Server Manager Failed to Start.");
-
-		Log(Logs::General, Logs::Login_Server, "Database System Shutdown.");
+		LogError("Server Manager Failed to Start");
+		LogInfo("Database System Shutdown");
 		delete server.db;
-		Log(Logs::General, Logs::Login_Server, "Config System Shutdown.");
-		delete server.config;
 		return 1;
 	}
 
-	//create our client manager.
-	Log(Logs::General, Logs::Login_Server, "Client Manager Initialize.");
-	server.client_manager = new ClientManager();
+	/**
+	 * create client manager
+	 */
+	LogInfo("Client Manager Init");
+	server.client_manager           = new ClientManager();
 	if (!server.client_manager) {
-		//We can't run without a client manager, cleanup and exit.
-		Log(Logs::General, Logs::Error, "Client Manager Failed to Start.");
-		Log(Logs::General, Logs::Login_Server, "Server Manager Shutdown.");
+		LogError("Client Manager Failed to Start");
+		LogInfo("Server Manager Shutdown");
 		delete server.server_manager;
 
-		Log(Logs::General, Logs::Login_Server, "Database System Shutdown.");
+		LogInfo("Database System Shutdown");
 		delete server.db;
-		Log(Logs::General, Logs::Login_Server, "Config System Shutdown.");
-		delete server.config;
 		return 1;
 	}
 
 #ifdef WIN32
 #ifdef UNICODE
-	SetConsoleTitle(L"EQEmu Login Server");
+		SetConsoleTitle(L"EQEmu Login Server");
 #else
-	SetConsoleTitle("EQEmu Login Server");
+		SetConsoleTitle("EQEmu Login Server");
 #endif
 #endif
 
-	Log(Logs::General, Logs::Login_Server, "Server Started.");
+	LogInfo("Server Started");
+	if (LogSys.log_settings[Logs::Loginserver].log_to_console == 1) {
+		LogInfo("Loginserver logging set to level [1] for more debugging, enable detail [3]");
+	}
+
+	/**
+	 * Web API
+	 */
+	httplib::Server api;
+	int             web_api_port    = server.config.GetVariableInt("web_api", "port", 6000);
+	bool            web_api_enabled = server.config.GetVariableBool("web_api", "enabled", true);
+	if (web_api_enabled) {
+		api.bind("0.0.0.0", web_api_port);
+		LogInfo("Webserver API now listening on port [{0}]", web_api_port);
+		LoginserverWebserver::RegisterRoutes(api);
+	}
+
+	LogInfo("[Config] [Logging] IsTraceOn [{0}]", server.options.IsTraceOn());
+	LogInfo("[Config] [Logging] IsWorldTraceOn [{0}]", server.options.IsWorldTraceOn());
+	LogInfo("[Config] [Logging] IsDumpInPacketsOn [{0}]", server.options.IsDumpInPacketsOn());
+	LogInfo("[Config] [Logging] IsDumpOutPacketsOn [{0}]", server.options.IsDumpOutPacketsOn());
+	LogInfo("[Config] [Account] CanAutoCreateAccounts [{0}]", server.options.CanAutoCreateAccounts());
+#ifdef LSPX
+	LogInfo("[Config] [Account] CanAutoLinkAccounts [{0}]", server.options.CanAutoLinkAccounts());
+#endif
+	LogInfo("[Config] [WorldServer] IsRejectingDuplicateServers [{0}]", server.options.IsRejectingDuplicateServers());
+	LogInfo("[Config] [WorldServer] IsUnregisteredAllowed [{0}]", server.options.IsUnregisteredAllowed());
+	LogInfo("[Config] [Security] GetEncryptionMode [{0}]", server.options.GetEncryptionMode());
+	LogInfo("[Config] [Security] IsTokenLoginAllowed [{0}]", server.options.IsTokenLoginAllowed());
+	LogInfo("[Config] [Security] IsPasswordLoginAllowed [{0}]", server.options.IsPasswordLoginAllowed());
+	LogInfo("[Config] [Security] IsUpdatingInsecurePasswords [{0}]", server.options.IsUpdatingInsecurePasswords());
+
 	while (run_server) {
 		Timer::SetCurrentTime();
 		server.client_manager->Process();
 		EQ::EventLoop::Get().Process();
+
+		if (web_api_enabled) {
+			api.poll();
+		}
+
 		Sleep(5);
 	}
 
-	Log(Logs::General, Logs::Login_Server, "Server Shutdown.");
-	Log(Logs::General, Logs::Login_Server, "Client Manager Shutdown.");
+	LogInfo("Server Shutdown");
+
+	LogInfo("Client Manager Shutdown");
 	delete server.client_manager;
-	Log(Logs::General, Logs::Login_Server, "Server Manager Shutdown.");
+
+	LogInfo("Server Manager Shutdown");
 	delete server.server_manager;
 
-	Log(Logs::General, Logs::Login_Server, "Database System Shutdown.");
+	LogInfo("Database System Shutdown");
 	delete server.db;
-	Log(Logs::General, Logs::Login_Server, "Config System Shutdown.");
-	delete server.config;
+
 	return 0;
 }
diff --git a/loginserver/options.h b/loginserver/options.h
index 5aecbad0a..b774a88a0 100644
--- a/loginserver/options.h
+++ b/loginserver/options.h
@@ -1,20 +1,23 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #ifndef EQEMU_OPTIONS_H
 #define EQEMU_OPTIONS_H
 
@@ -22,23 +25,22 @@
  * Collects options on one object, because having a bunch of global variables floating around is
  * really ugly and just a little dangerous.
  */
-class Options
-{
+class Options {
 public:
+
 	/**
-	* Constructor, sets the default options.
-	*/
+	 * Constructor: Default options
+	 */
 	Options() :
 		allow_unregistered(true),
 		trace(false),
 		dump_in_packets(false),
 		dump_out_packets(false),
 		encryption_mode(5),
-		local_network("127.0.0.1"),
 		reject_duplicate_servers(false),
 		allow_password_login(true),
 		allow_token_login(false),
-		auto_create_accounts(false) { }
+		auto_create_accounts(false) {}
 
 	/**
 	* Sets allow_unregistered.
@@ -100,56 +102,6 @@ public:
 	*/
 	inline int GetEncryptionMode() const { return encryption_mode; }
 
-	/**
-	* Sets local_network.
-	*/
-	inline void LocalNetwork(std::string n) { local_network = n; }
-
-	/**
-	* Return the value of local_network.
-	*/
-	inline std::string GetLocalNetwork() const { return local_network; }
-
-	/**
-	* Sets account table.
-	*/
-	inline void AccountTable(std::string t) { account_table = t; }
-
-	/**
-	* Return the value of world account table.
-	*/
-	inline std::string GetAccountTable() const { return account_table; }
-
-	/**
-	* Sets world registration table.
-	*/
-	inline void WorldRegistrationTable(std::string t) { world_registration_table = t; }
-
-	/**
-	* Return the value of world registration table.
-	*/
-	inline std::string GetWorldRegistrationTable() const { return world_registration_table; }
-
-	/**
-	* Sets world admin account table.
-	*/
-	inline void WorldAdminRegistrationTable(std::string t) { world_admin_registration_table = t; }
-
-	/**
-	* Return the value of world admin account table.
-	*/
-	inline std::string GetWorldAdminRegistrationTable() const { return world_admin_registration_table; }
-
-	/**
-	* Sets world server type table.
-	*/
-	inline void WorldServerTypeTable(std::string t) { world_server_type_table = t; }
-
-	/**
-	* Return the value of world server type table.
-	*/
-	inline std::string GetWorldServerTypeTable() const { return world_server_type_table; }
-
 	/**
 	* Sets whether we are rejecting duplicate servers or not.
 	*/
@@ -169,22 +121,33 @@ public:
 	inline void AutoCreateAccounts(bool b) { auto_create_accounts = b; }
 	inline bool CanAutoCreateAccounts() const { return auto_create_accounts; }
 
+	inline void AutoLinkAccounts(bool b) { auto_link_accounts = b; }
+	inline bool CanAutoLinkAccounts() const { return auto_link_accounts; }
+
+	inline void EQEmuLoginServerAddress(std::string v) { eqemu_loginserver_address = v; }
+	inline std::string GetEQEmuLoginServerAddress() const { return eqemu_loginserver_address; }
+
+	inline void DefaultLoginServerName(std::string v) { default_loginserver_name = v; }
+	inline std::string GetDefaultLoginServerName() const { return default_loginserver_name; }
+
+	inline void UpdateInsecurePasswords(bool b) { update_insecure_passwords = b; }
+	inline bool IsUpdatingInsecurePasswords() const { return update_insecure_passwords; }
+
 private:
-	bool allow_unregistered;
-	bool trace;
-	bool world_trace;
-	bool dump_in_packets;
-	bool dump_out_packets;
-	bool reject_duplicate_servers;
-	bool allow_token_login;
-	bool allow_password_login;
-	bool auto_create_accounts;
-	int encryption_mode;
-	std::string local_network;
-	std::string account_table;
-	std::string world_registration_table;
-	std::string world_admin_registration_table;
-	std::string world_server_type_table;
+	bool        allow_unregistered;
+	bool        trace;
+	bool        world_trace;
+	bool        dump_in_packets;
+	bool        dump_out_packets;
+	bool        reject_duplicate_servers;
+	bool        allow_token_login;
+	bool        allow_password_login;
+	bool        auto_create_accounts;
+	bool        auto_link_accounts;
+	bool        update_insecure_passwords;
+	int         encryption_mode;
+	std::string eqemu_loginserver_address;
+	std::string default_loginserver_name;
 };
 
 #endif
diff --git a/loginserver/server_manager.cpp b/loginserver/server_manager.cpp
index 58e351c47..5cd01a8f9 100644
--- a/loginserver/server_manager.cpp
+++ b/loginserver/server_manager.cpp
@@ -1,34 +1,37 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #include "server_manager.h"
 #include "login_server.h"
 #include "login_structures.h"
 #include <stdlib.h>
 
 #include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
+#include "../common/ip_util.h"
 
 extern LoginServer server;
-extern bool run_server;
+extern bool        run_server;
 
 ServerManager::ServerManager()
 {
-	int listen_port = atoi(server.config->GetVariable("options", "listen_port").c_str());
+	int listen_port = server.config.GetVariableInt("general", "listen_port", 5998);
 
 	server_connection.reset(new EQ::Net::ServertalkServer());
 	EQ::Net::ServertalkServerOptions opts;
@@ -36,50 +39,71 @@ ServerManager::ServerManager()
 	opts.ipv6 = false;
 	server_connection->Listen(opts);
 
-	server_connection->OnConnectionIdentified("World", [this](std::shared_ptr<EQ::Net::ServertalkServerConnection> c) {
-		LogF(Logs::General, Logs::Login_Server, "New world server connection from {0}:{1}", c->Handle()->RemoteIP(), c->Handle()->RemotePort());
+	LogInfo("Loginserver now listening on port [{0}]", listen_port);
 
-		auto iter = world_servers.begin();
-		while (iter != world_servers.end()) {
-			if ((*iter)->GetConnection()->Handle()->RemoteIP().compare(c->Handle()->RemoteIP()) == 0 &&
-				(*iter)->GetConnection()->Handle()->RemotePort() == c->Handle()->RemotePort()) {
-				LogF(Logs::General, Logs::Login_Server, "World server already existed for {0}:{1}, removing existing connection.",
-					c->Handle()->RemoteIP(), c->Handle()->RemotePort());
+	server_connection->OnConnectionIdentified(
+		"World", [this](std::shared_ptr<EQ::Net::ServertalkServerConnection> world_connection) {
+			LogInfo(
+				"New World Server connection from {0}:{1}",
+				world_connection->Handle()->RemoteIP(),
+				world_connection->Handle()->RemotePort()
+			);
 
-				world_servers.erase(iter);
-				break;
+			auto iter = world_servers.begin();
+			while (iter != world_servers.end()) {
+				if ((*iter)->GetConnection()->Handle()->RemoteIP().compare(world_connection->Handle()->RemoteIP()) ==
+					0 &&
+					(*iter)->GetConnection()->Handle()->RemotePort() == world_connection->Handle()->RemotePort()) {
+
+					LogInfo(
+						"World server already existed for {0}:{1}, removing existing connection.",
+						world_connection->Handle()->RemoteIP(),
+						world_connection->Handle()->RemotePort()
+					);
+
+					world_servers.erase(iter);
+					break;
+				}
+
+				++iter;
 			}
 
-			++iter;
+			world_servers.push_back(std::unique_ptr<WorldServer>(new WorldServer(world_connection)));
 		}
+	);
 
-		world_servers.push_back(std::unique_ptr<WorldServer>(new WorldServer(c)));
-	});
+	server_connection->OnConnectionRemoved(
+		"World", [this](std::shared_ptr<EQ::Net::ServertalkServerConnection> c) {
+			auto iter = world_servers.begin();
+			while (iter != world_servers.end()) {
+				if ((*iter)->GetConnection()->GetUUID() == c->GetUUID()) {
+					LogInfo(
+						"World server {0} has been disconnected, removing.",
+						(*iter)->GetServerLongName()
+					);
+					world_servers.erase(iter);
+					return;
+				}
 
-	server_connection->OnConnectionRemoved("World", [this](std::shared_ptr<EQ::Net::ServertalkServerConnection> c) {
-		auto iter = world_servers.begin();
-		while (iter != world_servers.end()) {
-			if ((*iter)->GetConnection()->GetUUID() == c->GetUUID()) {
-				LogF(Logs::General, Logs::World_Server, "World server {0} has been disconnected, removing.", (*iter)->GetLongName().c_str());
-				world_servers.erase(iter);
-				return;
+				++iter;
 			}
-
-			++iter;
 		}
-	});
+	);
 }
 
-ServerManager::~ServerManager()
-{
+ServerManager::~ServerManager() = default;
 
-}
-
-WorldServer* ServerManager::GetServerByAddress(const std::string &addr, int port)
+/**
+ * @param ip_address
+ * @param port
+ * @return
+ */
+WorldServer *ServerManager::GetServerByAddress(const std::string &ip_address, int port)
 {
 	auto iter = world_servers.begin();
 	while (iter != world_servers.end()) {
-		if ((*iter)->GetConnection()->Handle()->RemoteIP() == addr && (*iter)->GetConnection()->Handle()->RemotePort()) {
+		if ((*iter)->GetConnection()->Handle()->RemoteIP() == ip_address &&
+			(*iter)->GetConnection()->Handle()->RemotePort()) {
 			return (*iter).get();
 		}
 		++iter;
@@ -88,40 +112,76 @@ WorldServer* ServerManager::GetServerByAddress(const std::string &addr, int port
 	return nullptr;
 }
 
-EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c, uint32 seq)
+/**
+ * @param client
+ * @param sequence
+ * @return
+ */
+EQApplicationPacket *ServerManager::CreateServerListPacket(Client *client, uint32 sequence)
 {
-	unsigned int packet_size = sizeof(ServerListHeader_Struct);
+	unsigned int packet_size  = sizeof(ServerListHeader_Struct);
 	unsigned int server_count = 0;
-	in_addr in;
-	in.s_addr = c->GetConnection()->GetRemoteIP();
+	in_addr      in{};
+	in.s_addr = client->GetConnection()->GetRemoteIP();
 	std::string client_ip = inet_ntoa(in);
 
+	LogDebug("ServerManager::CreateServerListPacket via client address [{0}]", client_ip);
+
 	auto iter = world_servers.begin();
 	while (iter != world_servers.end()) {
-		if ((*iter)->IsAuthorized() == false) {
+		if (!(*iter)->IsAuthorized()) {
+			LogDebug(
+				"ServerManager::CreateServerListPacket | Server [{0}] via IP [{1}] is not authorized to be listed",
+				(*iter)->GetServerLongName(),
+				(*iter)->GetConnection()->Handle()->RemoteIP()
+			);
 			++iter;
 			continue;
 		}
 
 		std::string world_ip = (*iter)->GetConnection()->Handle()->RemoteIP();
+		if (world_ip == client_ip) {
+			packet_size += (*iter)->GetServerLongName().size() + (*iter)->GetLocalIP().size() + 24;
 
-		if (world_ip.compare(client_ip) == 0) {
-			packet_size += (*iter)->GetLongName().size() + (*iter)->GetLocalIP().size() + 24;
+			LogDebug(
+				"CreateServerListPacket | Building list entry | Client [{0}] IP [{1}] Server Long Name [{2}] Server IP [{3}] (Local)",
+				client->GetAccountName(),
+				client_ip,
+				(*iter)->GetServerLongName(),
+				(*iter)->GetLocalIP()
+			);
 		}
-		else if (client_ip.find(server.options.GetLocalNetwork()) != std::string::npos) {
-			packet_size += (*iter)->GetLongName().size() + (*iter)->GetLocalIP().size() + 24;
+		else if (IpUtil::IsIpInPrivateRfc1918(client_ip)) {
+			packet_size += (*iter)->GetServerLongName().size() + (*iter)->GetLocalIP().size() + 24;
+
+			LogDebug(
+				"CreateServerListPacket | Building list entry | Client [{0}] IP [{1}] Server Long Name [{2}] Server IP [{3}] (Local)",
+				client->GetAccountName(),
+				client_ip,
+				(*iter)->GetServerLongName(),
+				(*iter)->GetLocalIP()
+			);
 		}
 		else {
-			packet_size += (*iter)->GetLongName().size() + (*iter)->GetRemoteIP().size() + 24;
+			packet_size += (*iter)->GetServerLongName().size() + (*iter)->GetRemoteIP().size() + 24;
+
+			LogDebug(
+				"CreateServerListPacket | Building list entry | Client [{0}] IP [{1}] Server Long Name [{2}] Server IP [{3}] (Remote)",
+				client->GetAccountName(),
+				client_ip,
+				(*iter)->GetServerLongName(),
+				(*iter)->GetRemoteIP()
+			);
 		}
 
 		server_count++;
 		++iter;
 	}
 
-	EQApplicationPacket *outapp = new EQApplicationPacket(OP_ServerListResponse, packet_size);
-	ServerListHeader_Struct *server_list = (ServerListHeader_Struct*)outapp->pBuffer;
-	server_list->Unknown1 = seq;
+	auto *outapp      = new EQApplicationPacket(OP_ServerListResponse, packet_size);
+	auto *server_list = (ServerListHeader_Struct *) outapp->pBuffer;
+
+	server_list->Unknown1 = sequence;
 	server_list->Unknown2 = 0x00000000;
 	server_list->Unknown3 = 0x01650000;
 
@@ -129,7 +189,7 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c, uint32 seq
 	* Not sure what this is but it should be noted setting it to
 	* 0xFFFFFFFF crashes the client so: don't do that.
 	*/
-	server_list->Unknown4 = 0x00000000;
+	server_list->Unknown4        = 0x00000000;
 	server_list->NumberOfServers = server_count;
 
 	unsigned char *data_pointer = outapp->pBuffer;
@@ -137,17 +197,17 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c, uint32 seq
 
 	iter = world_servers.begin();
 	while (iter != world_servers.end()) {
-		if ((*iter)->IsAuthorized() == false) {
+		if (!(*iter)->IsAuthorized()) {
 			++iter;
 			continue;
 		}
 
 		std::string world_ip = (*iter)->GetConnection()->Handle()->RemoteIP();
-		if (world_ip.compare(client_ip) == 0) {
+		if (world_ip == client_ip) {
 			memcpy(data_pointer, (*iter)->GetLocalIP().c_str(), (*iter)->GetLocalIP().size());
 			data_pointer += ((*iter)->GetLocalIP().size() + 1);
 		}
-		else if (client_ip.find(server.options.GetLocalNetwork()) != std::string::npos) {
+		else if (IpUtil::IsIpInPrivateRfc1918(client_ip)) {
 			memcpy(data_pointer, (*iter)->GetLocalIP().c_str(), (*iter)->GetLocalIP().size());
 			data_pointer += ((*iter)->GetLocalIP().size() + 1);
 		}
@@ -157,26 +217,26 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c, uint32 seq
 		}
 
 		switch ((*iter)->GetServerListID()) {
-		case 1: {
-			*(unsigned int*)data_pointer = 0x00000030;
-			break;
-		}
-		case 2: {
-			*(unsigned int*)data_pointer = 0x00000009;
-			break;
-		}
-		default: {
-			*(unsigned int*)data_pointer = 0x00000001;
-		}
+			case 1: {
+				*(unsigned int *) data_pointer = 0x00000030;
+				break;
+			}
+			case 2: {
+				*(unsigned int *) data_pointer = 0x00000009;
+				break;
+			}
+			default: {
+				*(unsigned int *) data_pointer = 0x00000001;
+			}
 		}
 
 		data_pointer += 4;
 
-		*(unsigned int*)data_pointer = (*iter)->GetRuntimeID();
+		*(unsigned int *) data_pointer = (*iter)->GetServerId();
 		data_pointer += 4;
 
-		memcpy(data_pointer, (*iter)->GetLongName().c_str(), (*iter)->GetLongName().size());
-		data_pointer += ((*iter)->GetLongName().size() + 1);
+		memcpy(data_pointer, (*iter)->GetServerLongName().c_str(), (*iter)->GetServerLongName().size());
+		data_pointer += ((*iter)->GetServerLongName().size() + 1);
 
 		memcpy(data_pointer, "EN", 2);
 		data_pointer += 3;
@@ -187,18 +247,18 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c, uint32 seq
 		// 0 = Up, 1 = Down, 2 = Up, 3 = down, 4 = locked, 5 = locked(down)
 		if ((*iter)->GetStatus() < 0) {
 			if ((*iter)->GetZonesBooted() == 0) {
-				*(uint32*)data_pointer = 0x01;
+				*(uint32 *) data_pointer = 0x01;
 			}
 			else {
-				*(uint32*)data_pointer = 0x04;
+				*(uint32 *) data_pointer = 0x04;
 			}
 		}
 		else {
-			*(uint32*)data_pointer = 0x02;
+			*(uint32 *) data_pointer = 0x02;
 		}
 		data_pointer += 4;
 
-		*(uint32*)data_pointer = (*iter)->GetPlayersOnline();
+		*(uint32 *) data_pointer = (*iter)->GetPlayersOnline();
 		data_pointer += 4;
 
 		++iter;
@@ -207,33 +267,54 @@ EQApplicationPacket *ServerManager::CreateServerListPacket(Client *c, uint32 seq
 	return outapp;
 }
 
-void ServerManager::SendUserToWorldRequest(unsigned int server_id, unsigned int client_account_id)
+/**
+ * @param server_id
+ * @param client_account_id
+ * @param client_loginserver
+ */
+void ServerManager::SendUserToWorldRequest(
+	unsigned int server_id,
+	unsigned int client_account_id,
+	const std::string &client_loginserver
+)
 {
-	auto iter = world_servers.begin();
+	auto iter  = world_servers.begin();
 	bool found = false;
 	while (iter != world_servers.end()) {
-		if ((*iter)->GetRuntimeID() == server_id) {
+		if ((*iter)->GetServerId() == server_id) {
 			EQ::Net::DynamicPacket outapp;
 			outapp.Resize(sizeof(UsertoWorldRequest_Struct));
-			UsertoWorldRequest_Struct *utwr = (UsertoWorldRequest_Struct*)outapp.Data();
-			utwr->worldid = server_id;
-			utwr->lsaccountid = client_account_id;
+
+			auto *user_to_world_request = (UsertoWorldRequest_Struct *) outapp.Data();
+			user_to_world_request->worldid     = server_id;
+			user_to_world_request->lsaccountid = client_account_id;
+			strncpy(user_to_world_request->login, &client_loginserver[0], 64);
 			(*iter)->GetConnection()->Send(ServerOP_UsertoWorldReq, outapp);
 			found = true;
 
 			if (server.options.IsDumpInPacketsOn()) {
-				LogF(Logs::General, Logs::Login_Server, "{0}", outapp.ToString());
+				LogInfo("{0}", outapp.ToString());
 			}
 		}
 		++iter;
 	}
 
 	if (!found && server.options.IsTraceOn()) {
-		Log(Logs::General, Logs::Error, "Client requested a user to world but supplied an invalid id of %u.", server_id);
+		LogError("Client requested a user to world but supplied an invalid id of {0}", server_id);
 	}
 }
 
-bool ServerManager::ServerExists(std::string l_name, std::string s_name, WorldServer *ignore)
+/**
+ * @param server_long_name
+ * @param server_short_name
+ * @param ignore
+ * @return
+ */
+bool ServerManager::ServerExists(
+	std::string server_long_name,
+	std::string server_short_name,
+	WorldServer *ignore
+)
 {
 	auto iter = world_servers.begin();
 	while (iter != world_servers.end()) {
@@ -242,7 +323,7 @@ bool ServerManager::ServerExists(std::string l_name, std::string s_name, WorldSe
 			continue;
 		}
 
-		if ((*iter)->GetLongName().compare(l_name) == 0 && (*iter)->GetShortName().compare(s_name) == 0) {
+		if ((*iter)->GetServerLongName() == server_long_name && (*iter)->GetServerShortName() == server_short_name) {
 			return true;
 		}
 
@@ -251,7 +332,16 @@ bool ServerManager::ServerExists(std::string l_name, std::string s_name, WorldSe
 	return false;
 }
 
-void ServerManager::DestroyServerByName(std::string l_name, std::string s_name, WorldServer *ignore)
+/**
+ * @param server_long_name
+ * @param server_short_name
+ * @param ignore
+ */
+void ServerManager::DestroyServerByName(
+	std::string server_long_name,
+	std::string server_short_name,
+	WorldServer *ignore
+)
 {
 	auto iter = world_servers.begin();
 	while (iter != world_servers.end()) {
@@ -260,7 +350,8 @@ void ServerManager::DestroyServerByName(std::string l_name, std::string s_name,
 			continue;
 		}
 
-		if ((*iter)->GetLongName().compare(l_name) == 0 && (*iter)->GetShortName().compare(s_name) == 0) {
+		if ((*iter)->GetServerLongName().compare(server_long_name) == 0 &&
+			(*iter)->GetServerShortName().compare(server_short_name) == 0) {
 			(*iter)->GetConnection()->Handle()->Disconnect();
 			iter = world_servers.erase(iter);
 			continue;
@@ -269,3 +360,11 @@ void ServerManager::DestroyServerByName(std::string l_name, std::string s_name,
 		++iter;
 	}
 }
+
+/**
+ * @return
+ */
+const std::list<std::unique_ptr<WorldServer>> &ServerManager::getWorldServers() const
+{
+	return world_servers;
+}
diff --git a/loginserver/server_manager.h b/loginserver/server_manager.h
index f9a1f66e1..8babf8a56 100644
--- a/loginserver/server_manager.h
+++ b/loginserver/server_manager.h
@@ -1,20 +1,23 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #ifndef EQEMU_SERVERMANAGER_H
 #define EQEMU_SERVERMANAGER_H
 
@@ -27,14 +30,14 @@
 #include <list>
 
 /**
-* Server manager class, deals with management of the world servers.
-*/
-class ServerManager
-{
+ * Server manager class, deals with management of the world servers
+ */
+class ServerManager {
 public:
+
 	/**
-	* Constructor, sets up the TCP server and starts listening.
-	*/
+	 * Constructor, sets up the TCP server and starts listening
+	 */
 	ServerManager();
 
 	/**
@@ -43,34 +46,66 @@ public:
 	~ServerManager();
 
 	/**
-	* Sends a request to world to see if the client is banned or suspended.
-	*/
-	void SendUserToWorldRequest(unsigned int server_id, unsigned int client_account_id);
+	 * Sends a request to world to see if the client is banned or suspended
+	 *
+	 * @param server_id
+	 * @param client_account_id
+	 * @param client_loginserver
+	 */
+	void SendUserToWorldRequest(
+		unsigned int server_id,
+		unsigned int client_account_id,
+		const std::string &client_loginserver
+	);
 
 	/**
-	* Creates a server list packet for the client.
-	*/
-	EQApplicationPacket *CreateServerListPacket(Client *c, uint32 seq);
+	 * Creates a server list packet for the client
+	 *
+	 * @param client
+	 * @param sequence
+	 * @return
+	 */
+	EQApplicationPacket *CreateServerListPacket(Client *client, uint32 sequence);
 
 	/**
-	* Checks to see if there is a server exists with this name, ignoring option.
-	*/
-	bool ServerExists(std::string l_name, std::string s_name, WorldServer *ignore = nullptr);
+	 * Checks to see if there is a server exists with this name, ignoring option
+	 *
+	 * @param server_long_name
+	 * @param server_short_name
+	 * @param ignore
+	 * @return
+	 */
+	bool ServerExists(std::string server_long_name, std::string server_short_name, WorldServer *ignore = nullptr);
 
 	/**
-	* Destroys a server with this name, ignoring option.
-	*/
-	void DestroyServerByName(std::string l_name, std::string s_name, WorldServer *ignore = nullptr);
+	 * Destroys a server with this name, ignoring option
+	 *
+	 * @param server_long_name
+	 * @param server_short_name
+	 * @param ignore
+	 */
+	void DestroyServerByName(std::string server_long_name, std::string server_short_name, WorldServer *ignore = nullptr);
+
+	/**
+	 * @return
+	 */
+	const std::list<std::unique_ptr<WorldServer>> &getWorldServers() const;
 
 private:
+
 	/**
-	* Retrieves a server(if exists) by ip address
-	* Useful utility for the reconnect process.
-	*/
-	WorldServer* GetServerByAddress(const std::string &address, int port);
+	 * Retrieves a server(if exists) by ip address
+	 * Useful utility for the reconnect process
+	 *
+	 * @param ip_address
+	 * @param port
+	 * @return
+	 */
+	WorldServer *GetServerByAddress(const std::string &ip_address, int port);
 
 	std::unique_ptr<EQ::Net::ServertalkServer> server_connection;
-	std::list<std::unique_ptr<WorldServer>> world_servers;
+	std::list<std::unique_ptr<WorldServer>>    world_servers;
+
 };
 
 #endif
diff --git a/loginserver/world_server.cpp b/loginserver/world_server.cpp
index d953ccc3a..765c108da 100644
--- a/loginserver/world_server.cpp
+++ b/loginserver/world_server.cpp
@@ -1,537 +1,1320 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #include "world_server.h"
 #include "login_server.h"
 #include "login_structures.h"
-#include "config.h"
-
 #include "../common/eqemu_logsys.h"
+#include "../common/ip_util.h"
 
 extern LoginServer server;
 
-WorldServer::WorldServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> c)
+/**
+ * @param worldserver_connection
+ */
+WorldServer::WorldServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> worldserver_connection)
 {
-	connection = c;
-	zones_booted = 0;
-	players_online = 0;
-	server_status = 0;
-	runtime_id = 0;
-	server_list_id = 0;
-	server_type = 0;
+	connection           = worldserver_connection;
+	zones_booted         = 0;
+	players_online       = 0;
+	server_status        = 0;
+	server_id            = 0;
+	server_list_type_id  = 0;
+	server_process_type  = 0;
 	is_server_authorized = false;
-	is_server_trusted = false;
-	is_server_logged_in = false;
+	is_server_trusted    = false;
+	is_server_logged_in  = false;
 
-	c->OnMessage(ServerOP_NewLSInfo, std::bind(&WorldServer::ProcessNewLSInfo, this, std::placeholders::_1, std::placeholders::_2));
-	c->OnMessage(ServerOP_LSStatus, std::bind(&WorldServer::ProcessLSStatus, this, std::placeholders::_1, std::placeholders::_2));
-	c->OnMessage(ServerOP_UsertoWorldResp, std::bind(&WorldServer::ProcessUsertoWorldResp, this, std::placeholders::_1, std::placeholders::_2));
-	c->OnMessage(ServerOP_LSAccountUpdate, std::bind(&WorldServer::ProcessLSAccountUpdate, this, std::placeholders::_1, std::placeholders::_2));
+	worldserver_connection->OnMessage(
+		ServerOP_NewLSInfo,
+		std::bind(&WorldServer::ProcessNewLSInfo, this, std::placeholders::_1, std::placeholders::_2)
+	);
+
+	worldserver_connection->OnMessage(
+		ServerOP_LSStatus,
+		std::bind(&WorldServer::ProcessLSStatus, this, std::placeholders::_1, std::placeholders::_2)
+	);
+
+	worldserver_connection->OnMessage(
+		ServerOP_UsertoWorldRespLeg,
+		std::bind(
+			&WorldServer::ProcessUserToWorldResponseLegacy,
+			this,
+			std::placeholders::_1,
+			std::placeholders::_2
+		)
+	);
+
+	worldserver_connection->OnMessage(
+		ServerOP_UsertoWorldResp,
+		std::bind(&WorldServer::ProcessUserToWorldResponse, this, std::placeholders::_1, std::placeholders::_2)
+	);
+
+	worldserver_connection->OnMessage(
+		ServerOP_LSAccountUpdate,
+		std::bind(&WorldServer::ProcessLSAccountUpdate, this, std::placeholders::_1, std::placeholders::_2)
+	);
+
+	m_keepalive.reset(new EQ::Timer(5000, true, std::bind(&WorldServer::OnKeepAlive, this, std::placeholders::_1)));
 }
 
-WorldServer::~WorldServer()
-{
-
-}
+WorldServer::~WorldServer() = default;
 
 void WorldServer::Reset()
 {
-	zones_booted = 0;
-	players_online = 0;
-	server_status = 0;
-	runtime_id;
-	server_list_id = 0;
-	server_type = 0;
+	server_id;
+	zones_booted         = 0;
+	players_online       = 0;
+	server_status        = 0;
+	server_list_type_id  = 0;
+	server_process_type  = 0;
 	is_server_authorized = false;
-	is_server_logged_in = false;
+	is_server_logged_in  = false;
 }
 
-void WorldServer::ProcessNewLSInfo(uint16_t opcode, const EQ::Net::Packet &p)
+/**
+ * @param opcode
+ * @param packet
+ */
+void WorldServer::ProcessNewLSInfo(uint16_t opcode, const EQ::Net::Packet &packet)
 {
-	if (server.options.IsWorldTraceOn())
-	{
-		Log(Logs::General, Logs::Netcode, "Application packet received from server: 0x%.4X, (size %u)", opcode, p.Length());
+	if (server.options.IsWorldTraceOn()) {
+		LogDebug(
+			"Application packet received from server: [{0}], (size {1})",
+			opcode,
+			packet.Length()
+		);
 	}
 
-	if (server.options.IsDumpInPacketsOn())
-	{
-		DumpPacket(opcode, p);
+	if (server.options.IsDumpInPacketsOn()) {
+		DumpPacket(opcode, packet);
 	}
 
-	if (p.Length() < sizeof(ServerNewLSInfo_Struct))
-	{
-		Log(Logs::General, Logs::Error, "Received application packet from server that had opcode ServerOP_NewLSInfo, "
-			"but was too small. Discarded to avoid buffer overrun.");
+	if (packet.Length() < sizeof(ServerNewLSInfo_Struct)) {
+		LogError(
+			"Received application packet from server that had opcode ServerOP_NewLSInfo, "
+			"but was too small. Discarded to avoid buffer overrun"
+		);
+
 		return;
 	}
 
-	if (server.options.IsWorldTraceOn())
-	{
-		Log(Logs::General, Logs::Netcode, "New Login Info Recieved.");
-	}
 
-	ServerNewLSInfo_Struct *info = (ServerNewLSInfo_Struct*)p.Data();
+	auto *info = (ServerNewLSInfo_Struct *) packet.Data();
+
+	LogInfo(
+		"New World Server Info | name [{0}] shortname [{1}] remote_address [{2}] local_address [{3}] account [{4}] password [{5}] server_type [{6}]",
+		info->server_long_name,
+		info->server_short_name,
+		info->remote_ip_address,
+		info->local_ip_address,
+		info->account_name,
+		info->account_password,
+		info->server_process_type
+	);
+
 	Handle_NewLSInfo(info);
 }
 
-void WorldServer::ProcessLSStatus(uint16_t opcode, const EQ::Net::Packet &p)
+/**
+ * @param opcode
+ * @param packet
+ */
+void WorldServer::ProcessLSStatus(uint16_t opcode, const EQ::Net::Packet &packet)
 {
-	if (server.options.IsWorldTraceOn())
-	{
-		Log(Logs::General, Logs::Netcode, "Application packet received from server: 0x%.4X, (size %u)", opcode, p.Length());
+	Log(
+		Logs::Detail,
+		Logs::Netcode,
+		"Application packet received from server: 0x%.4X, (size %u)",
+		opcode,
+		packet.Length()
+	);
+
+	if (server.options.IsDumpInPacketsOn()) {
+		DumpPacket(opcode, packet);
 	}
 
-	if (server.options.IsDumpInPacketsOn())
-	{
-		DumpPacket(opcode, p);
-	}
+	if (packet.Length() < sizeof(ServerLSStatus_Struct)) {
+		LogError(
+			"Received application packet from server that had opcode ServerOP_LSStatus, but was too small. Discarded to avoid buffer overrun"
+		);
 
-	if (p.Length() < sizeof(ServerLSStatus_Struct))
-	{
-		Log(Logs::General, Logs::Error, "Recieved application packet from server that had opcode ServerOP_LSStatus, "
-			"but was too small. Discarded to avoid buffer overrun.");
 		return;
 	}
 
-	if (server.options.IsWorldTraceOn())
-	{
-		Log(Logs::General, Logs::Netcode, "World Server Status Recieved.");
+	auto *ls_status = (ServerLSStatus_Struct *) packet.Data();
+
+	if (server.options.IsWorldTraceOn()) {
+		LogDebug(
+			"World Server Status Update Received | Server [{0}] Status [{1}] Players [{2}] Zones [{3}]",
+			GetServerLongName(),
+			ls_status->status,
+			ls_status->num_players,
+			ls_status->num_zones
+		);
 	}
 
-	ServerLSStatus_Struct *ls_status = (ServerLSStatus_Struct*)p.Data();
 	Handle_LSStatus(ls_status);
 }
 
-void WorldServer::ProcessUsertoWorldResp(uint16_t opcode, const EQ::Net::Packet &p)
+/**
+ * @param opcode
+ * @param packet
+ */
+void WorldServer::ProcessUserToWorldResponseLegacy(uint16_t opcode, const EQ::Net::Packet &packet)
 {
-	if (server.options.IsWorldTraceOn())
-	{
-		Log(Logs::General, Logs::Netcode, "Application packet received from server: 0x%.4X, (size %u)", opcode, p.Length());
+	if (server.options.IsWorldTraceOn()) {
+		LogDebug(
+			"Application packet received from server: [{0}], (size {1})",
+			opcode,
+			packet.Length()
+		);
 	}
 
-	if (server.options.IsDumpInPacketsOn())
-	{
-		DumpPacket(opcode, p);
+	if (server.options.IsDumpInPacketsOn()) {
+		DumpPacket(opcode, packet);
 	}
 
-	if (p.Length() < sizeof(UsertoWorldResponse_Struct))
-	{
-		Log(Logs::General, Logs::Error, "Recieved application packet from server that had opcode ServerOP_UsertoWorldResp, "
-			"but was too small. Discarded to avoid buffer overrun.");
+	if (packet.Length() < sizeof(UsertoWorldResponseLegacy_Struct)) {
+		LogError(
+			"Received application packet from server that had opcode ServerOP_UsertoWorldResp, "
+			"but was too small. Discarded to avoid buffer overrun"
+		);
+
 		return;
 	}
 
 	//I don't use world trace for this and here is why:
 	//Because this is a part of the client login procedure it makes tracking client errors
 	//While keeping world server spam with multiple servers connected almost impossible.
-	if (server.options.IsTraceOn())
-	{
-		Log(Logs::General, Logs::Netcode, "User-To-World Response received.");
+	if (server.options.IsTraceOn()) {
+		LogDebug("User-To-World Response received");
 	}
 
-	UsertoWorldResponse_Struct *utwr = (UsertoWorldResponse_Struct*)p.Data();
-	Log(Logs::General, Logs::Debug, "Trying to find client with user id of %u.", utwr->lsaccountid);
-	Client *c = server.client_manager->GetClient(utwr->lsaccountid);
-	if (c)
-	{
-		Log(Logs::General, Logs::Debug, "Found client with user id of %u and account name of %s.", utwr->lsaccountid, c->GetAccountName().c_str());
-		EQApplicationPacket *outapp = new EQApplicationPacket(OP_PlayEverquestResponse, sizeof(PlayEverquestResponse_Struct));
-		PlayEverquestResponse_Struct *per = (PlayEverquestResponse_Struct*)outapp->pBuffer;
-		per->Sequence = c->GetPlaySequence();
-		per->ServerNumber = c->GetPlayServerID();
-		Log(Logs::General, Logs::Debug, "Found sequence and play of %u %u", c->GetPlaySequence(), c->GetPlayServerID());
+	auto *user_to_world_response = (UsertoWorldResponseLegacy_Struct *) packet.Data();
 
-		Log(Logs::General, Logs::Netcode, "[Size: %u] %s", outapp->size, DumpPacketToString(outapp).c_str());
+	LogDebug("Trying to find client with user id of [{0}]", user_to_world_response->lsaccountid);
+	Client *client = server.client_manager->GetClient(user_to_world_response->lsaccountid, "eqemu");
+	if (client) {
 
-		if (utwr->response > 0)
-		{
+		LogDebug(
+			"Found client with user id of [{0}] and account name of [{1}]",
+			user_to_world_response->lsaccountid,
+			client->GetAccountName()
+		);
+
+		auto *outapp = new EQApplicationPacket(
+			OP_PlayEverquestResponse,
+			sizeof(PlayEverquestResponse_Struct)
+		);
+
+		auto *per = (PlayEverquestResponse_Struct *) outapp->pBuffer;
+		per->Sequence     = client->GetPlaySequence();
+		per->ServerNumber = client->GetPlayServerID();
+
+		if (user_to_world_response->response > 0) {
 			per->Allowed = 1;
-			SendClientAuth(c->GetConnection()->GetRemoteAddr(), c->GetAccountName(), c->GetKey(), c->GetAccountID());
+			SendClientAuth(
+				client->GetConnection()->GetRemoteAddr(),
+				client->GetAccountName(),
+				client->GetKey(),
+				client->GetAccountID(),
+				client->GetLoginServerName()
+			);
 		}
 
-		switch (utwr->response)
-		{
-		case UserToWorldStatusSuccess:
-			per->Message = 101;
-			break;
-		case UserToWorldStatusWorldUnavail:
-			per->Message = 326;
-			break;
-		case UserToWorldStatusSuspended:
-			per->Message = 337;
-			break;
-		case UserToWorldStatusBanned:
-			per->Message = 338;
-			break;
-		case UserToWorldStatusWorldAtCapacity:
-			per->Message = 339;
-			break;
-		case UserToWorldStatusAlreadyOnline:
-			per->Message = 111;
-			break;
-		default:
-			per->Message = 102;
+		switch (user_to_world_response->response) {
+			case UserToWorldStatusSuccess:
+				per->Message = 101;
+				break;
+			case UserToWorldStatusWorldUnavail:
+				per->Message = 326;
+				break;
+			case UserToWorldStatusSuspended:
+				per->Message = 337;
+				break;
+			case UserToWorldStatusBanned:
+				per->Message = 338;
+				break;
+			case UserToWorldStatusWorldAtCapacity:
+				per->Message = 339;
+				break;
+			case UserToWorldStatusAlreadyOnline:
+				per->Message = 111;
+				break;
+			default:
+				per->Message = 102;
 		}
 
-		if (server.options.IsTraceOn())
-		{
-			Log(Logs::General, Logs::Netcode, "Sending play response with following data, allowed %u, sequence %u, server number %u, message %u",
-				per->Allowed, per->Sequence, per->ServerNumber, per->Message);
-			Log(Logs::General, Logs::Netcode, "[Size: %u] %s", outapp->size, DumpPacketToString(outapp).c_str());
+		if (server.options.IsWorldTraceOn()) {
+			LogDebug(
+				"Sending play response: allowed [{0}] sequence [{1}] server number [{2}] message [{3}]",
+				per->Allowed,
+				per->Sequence,
+				per->ServerNumber,
+				per->Message
+			);
+
+			LogDebug("[Size: [{0}]] {1}", outapp->size, DumpPacketToString(outapp));
 		}
 
-		if (server.options.IsDumpOutPacketsOn())
-		{
+		if (server.options.IsDumpOutPacketsOn()) {
 			DumpPacket(outapp);
 		}
 
-		c->SendPlayResponse(outapp);
+		client->SendPlayResponse(outapp);
 		delete outapp;
 	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Recieved User-To-World Response for %u but could not find the client referenced!.", utwr->lsaccountid);
+	else {
+		LogError(
+			"Received User-To-World Response for [{0}] but could not find the client referenced!",
+			user_to_world_response->lsaccountid
+		);
 	}
 }
 
-void WorldServer::ProcessLSAccountUpdate(uint16_t opcode, const EQ::Net::Packet &p)
+/**
+ * @param opcode
+ * @param packet
+ */
+void WorldServer::ProcessUserToWorldResponse(uint16_t opcode, const EQ::Net::Packet &packet)
 {
-	if (server.options.IsWorldTraceOn())
-	{
-		Log(Logs::General, Logs::Netcode, "Application packet received from server: 0x%.4X, (size %u)", opcode, p.Length());
+	if (server.options.IsWorldTraceOn()) {
+		LogDebug(
+			"Application packet received from server: 0x%.4X, (size %u)",
+			opcode,
+			packet.Length()
+		);
 	}
 
-	if (server.options.IsDumpInPacketsOn())
-	{
-		DumpPacket(opcode, p);
+	if (server.options.IsDumpInPacketsOn()) {
+		DumpPacket(opcode, packet);
 	}
 
-	if (p.Length() < sizeof(ServerLSAccountUpdate_Struct))
-	{
-		Log(Logs::General, Logs::Error, "Recieved application packet from server that had opcode ServerLSAccountUpdate_Struct, "
-			"but was too small. Discarded to avoid buffer overrun.");
+	if (packet.Length() < sizeof(UsertoWorldResponse_Struct)) {
+		LogError(
+			"Received application packet from server that had opcode ServerOP_UsertoWorldResp, "
+			"but was too small. Discarded to avoid buffer overrun"
+		);
+
 		return;
 	}
 
-	Log(Logs::General, Logs::Netcode, "ServerOP_LSAccountUpdate packet received from: %s", short_name.c_str());
-	ServerLSAccountUpdate_Struct *lsau = (ServerLSAccountUpdate_Struct*)p.Data();
-	if (is_server_trusted)
-	{
-		Log(Logs::General, Logs::Netcode, "ServerOP_LSAccountUpdate update processed for: %s", lsau->useraccount);
+	//I don't use world trace for this and here is why:
+	//Because this is a part of the client login procedure it makes tracking client errors
+	//While keeping world server spam with multiple servers connected almost impossible.
+	if (server.options.IsTraceOn()) {
+		LogDebug("User-To-World Response received");
+	}
+
+	auto user_to_world_response = (UsertoWorldResponse_Struct *) packet.Data();
+	LogDebug("Trying to find client with user id of [{0}]", user_to_world_response->lsaccountid);
+
+	Client *client = server.client_manager->GetClient(
+		user_to_world_response->lsaccountid,
+		user_to_world_response->login
+	);
+
+	if (client) {
+		LogDebug("Found client with user id of [{0}] and account name of {1}",
+				 user_to_world_response->lsaccountid,
+				 client->GetAccountName().c_str()
+		);
+
+		auto *outapp = new EQApplicationPacket(
+			OP_PlayEverquestResponse,
+			sizeof(PlayEverquestResponse_Struct)
+		);
+
+		auto *per = (PlayEverquestResponse_Struct *) outapp->pBuffer;
+		per->Sequence     = client->GetPlaySequence();
+		per->ServerNumber = client->GetPlayServerID();
+
+		LogDebug(
+			"Found sequence and play of [{0}] [{1}]",
+			client->GetPlaySequence(),
+			client->GetPlayServerID()
+		);
+
+		LogDebug("[Size: [{0}]] {1}", outapp->size, DumpPacketToString(outapp));
+
+		if (user_to_world_response->response > 0) {
+			per->Allowed = 1;
+			SendClientAuth(
+				client->GetConnection()->GetRemoteAddr(),
+				client->GetAccountName(),
+				client->GetKey(),
+				client->GetAccountID(),
+				client->GetLoginServerName()
+			);
+		}
+
+		switch (user_to_world_response->response) {
+			case UserToWorldStatusSuccess:
+				per->Message = 101;
+				break;
+			case UserToWorldStatusWorldUnavail:
+				per->Message = 326;
+				break;
+			case UserToWorldStatusSuspended:
+				per->Message = 337;
+				break;
+			case UserToWorldStatusBanned:
+				per->Message = 338;
+				break;
+			case UserToWorldStatusWorldAtCapacity:
+				per->Message = 339;
+				break;
+			case UserToWorldStatusAlreadyOnline:
+				per->Message = 111;
+				break;
+			default:
+				per->Message = 102;
+		}
+
+		if (server.options.IsTraceOn()) {
+			LogDebug(
+				"Sending play response with following data, allowed [{0}], sequence {1}, server number {2}, message {3}",
+				per->Allowed,
+				per->Sequence,
+				per->ServerNumber,
+				per->Message
+			);
+			LogDebug("[Size: [{0}]] {1}", outapp->size, DumpPacketToString(outapp));
+		}
+
+		if (server.options.IsDumpOutPacketsOn()) {
+			DumpPacket(outapp);
+		}
+
+		client->SendPlayResponse(outapp);
+		delete outapp;
+	}
+	else {
+		LogError(
+			"Received User-To-World Response for [{0}] but could not find the client referenced!.",
+			user_to_world_response->lsaccountid
+		);
+	}
+}
+
+/**
+ * @param opcode
+ * @param packet
+ */
+void WorldServer::ProcessLSAccountUpdate(uint16_t opcode, const EQ::Net::Packet &packet)
+{
+	if (server.options.IsWorldTraceOn()) {
+		LogDebug(
+			"Application packet received from server: [{0}], (size {1})",
+			opcode,
+			packet.Length()
+		);
+	}
+
+	if (server.options.IsDumpInPacketsOn()) {
+		DumpPacket(opcode, packet);
+	}
+
+	if (packet.Length() < sizeof(ServerLSAccountUpdate_Struct)) {
+		LogError(
+			"Received application packet from server that had opcode ServerLSAccountUpdate_Struct, "
+			"but was too small. Discarded to avoid buffer overrun"
+		);
+
+		return;
+	}
+
+	if (server.options.IsWorldTraceOn()) {
+		LogDebug("ServerOP_LSAccountUpdate packet received from [{0}]", short_name);
+	}
+
+	auto *loginserver_update = (ServerLSAccountUpdate_Struct *) packet.Data();
+	if (IsServerTrusted()) {
+		LogDebug("ServerOP_LSAccountUpdate update processed for: [{0}]", loginserver_update->useraccount);
 		std::string name;
 		std::string password;
 		std::string email;
-		name.assign(lsau->useraccount);
-		password.assign(lsau->userpassword);
-		email.assign(lsau->useremail);
-		server.db->UpdateLSAccountInfo(lsau->useraccountid, name, password, email);
+
+		name.assign(loginserver_update->useraccount);
+		password.assign(loginserver_update->userpassword);
+
+		if (loginserver_update->user_email) {
+			email.assign(loginserver_update->user_email);
+		}
+
+		server.db->UpdateLSAccountInfo(
+			loginserver_update->useraccountid,
+			name,
+			password,
+			email
+		);
 	}
 }
 
-void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct* i)
+/**
+ * When a worldserver first messages the loginserver telling them who they are
+ *
+ * @param new_world_server_info_packet
+ */
+void WorldServer::Handle_NewLSInfo(ServerNewLSInfo_Struct *new_world_server_info_packet)
 {
-	if (is_server_logged_in)
-	{
-		Log(Logs::General, Logs::Error, "WorldServer::Handle_NewLSInfo called but the login server was already marked as logged in, aborting.");
+	if (IsServerLoggedIn()) {
+		LogError("WorldServer::Handle_NewLSInfo called but the login server was already marked as logged in, aborting");
 		return;
 	}
 
-	if (strlen(i->account) <= 30)
-	{
-		account_name = i->account;
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, account name was too long.");
+	if (!HandleNewLoginserverInfoValidation(new_world_server_info_packet)) {
+		LogError("WorldServer::Handle_NewLSInfo failed validation rules");
 		return;
 	}
 
-	if (strlen(i->password) <= 30)
-	{
-		account_password = i->password;
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, account password was too long.");
-		return;
-	}
+	SetAccountPassword(new_world_server_info_packet->account_password)
+		->SetLongName(new_world_server_info_packet->server_long_name)
+		->SetShortName(new_world_server_info_packet->server_short_name)
+		->SetLocalIp(new_world_server_info_packet->local_ip_address)
+		->SetRemoteIp(new_world_server_info_packet->remote_ip_address)
+		->SetVersion(new_world_server_info_packet->server_version)
+		->SetProtocol(new_world_server_info_packet->protocol_version)
+		->SetServerProcessType(new_world_server_info_packet->server_process_type)
+		->SetIsServerLoggedIn(true)
+		->SetAccountName(new_world_server_info_packet->account_name);
 
-	if (strlen(i->name) <= 200)
-	{
-		long_name = i->name;
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, long name was too long.");
-		return;
-	}
-
-	if (strlen(i->shortname) <= 50)
-	{
-		short_name = i->shortname;
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, short name was too long.");
-		return;
-	}
-
-	if (strlen(i->local_address) <= 125)
-	{
-		if (strlen(i->local_address) == 0)
-		{
-			Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, local address was null, defaulting to localhost");
-			local_ip = "127.0.0.1";
-		}
-		else
-		{
-			local_ip = i->local_address;
-		}
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, local address was too long.");
-		return;
-	}
-
-	if (strlen(i->remote_address) <= 125)
-	{
-		if (strlen(i->remote_address) == 0)
-		{
-			remote_ip = GetConnection()->Handle()->RemoteIP();
-			Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, remote address was null, defaulting to stream address %s.", remote_ip.c_str());
-		}
-		else
-		{
-			remote_ip = i->remote_address;
-		}
-	}
-	else
-	{
-		remote_ip = GetConnection()->Handle()->RemoteIP();
-		Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, remote address was too long, defaulting to stream address %s.", remote_ip.c_str());
-	}
-
-	if (strlen(i->serverversion) <= 64)
-	{
-		version = i->serverversion;
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, server version was too long.");
-		return;
-	}
-
-	if (strlen(i->protocolversion) <= 25)
-	{
-		protocol = i->protocolversion;
-	}
-	else
-	{
-		Log(Logs::General, Logs::Error, "Handle_NewLSInfo error, protocol version was too long.");
-		return;
-	}
-
-	server_type = i->servertype;
-	is_server_logged_in = true;
-
-	if (server.options.IsRejectingDuplicateServers())
-	{
-		if (server.server_manager->ServerExists(long_name, short_name, this))
-		{
-			Log(Logs::General, Logs::Error, "World tried to login but there already exists a server that has that name.");
+	if (server.options.IsRejectingDuplicateServers()) {
+		if (server.server_manager->ServerExists(GetServerLongName(), GetServerShortName(), this)) {
+			LogError("World tried to login but there already exists a server that has that name");
 			return;
 		}
 	}
-	else
-	{
-		if (server.server_manager->ServerExists(long_name, short_name, this))
-		{
-			Log(Logs::General, Logs::Error, "World tried to login but there already exists a server that has that name.");
+	else {
+		if (server.server_manager->ServerExists(GetServerLongName(), GetServerShortName(), this)) {
+			LogInfo("World tried to login but there already exists a server that has that name, destroying [{}]",
+					long_name);
 			server.server_manager->DestroyServerByName(long_name, short_name, this);
 		}
 	}
 
-	if (!server.options.IsUnregisteredAllowed())
-	{
-		if (account_name.size() > 0 && account_password.size() > 0)
-		{
-			unsigned int s_id = 0;
-			unsigned int s_list_type = 0;
-			unsigned int s_trusted = 0;
-			std::string s_desc;
-			std::string s_list_desc;
-			std::string s_acct_name;
-			std::string s_acct_pass;
-			if (server.db->GetWorldRegistration(long_name, short_name, s_id, s_desc, s_list_type, s_trusted, s_list_desc, s_acct_name, s_acct_pass))
-			{
-				if (s_acct_name.size() == 0 || s_acct_pass.size() == 0)
-				{
-					Log(Logs::General, Logs::World_Server, "Server %s(%s) successfully logged into account that had no user/password requirement.",
-						long_name.c_str(), short_name.c_str());
-					is_server_authorized = true;
-					SetRuntimeID(s_id);
-					server_list_id = s_list_type;
-					desc = s_desc;
-				}
-				else if (s_acct_name.compare(account_name) == 0 && s_acct_pass.compare(account_password) == 0)
-				{
-					Log(Logs::General, Logs::World_Server, "Server %s(%s) successfully logged in.",
-						long_name.c_str(), short_name.c_str());
-					is_server_authorized = true;
-					SetRuntimeID(s_id);
-					server_list_id = s_list_type;
-					desc = s_desc;
-					if (s_trusted) {
-						Log(Logs::General, Logs::Netcode, "ServerOP_LSAccountUpdate sent to world");
-						is_server_trusted = true;
+	uint32 world_server_admin_id = 0;
 
-						EQ::Net::DynamicPacket outapp;
-						connection->Send(ServerOP_LSAccountUpdate, outapp);
-					}
-				}
-				else {
-					Log(Logs::General, Logs::World_Server, "Server %s(%s) attempted to log in but account and password did not match the entry in the database, and only"
-						" registered servers are allowed.", long_name.c_str(), short_name.c_str());
-					return;
-				}
-			}
-			else {
-				Log(Logs::General, Logs::World_Server, "Server %s(%s) attempted to log in but database couldn't find an entry and only registered servers are allowed.",
-					long_name.c_str(), short_name.c_str());
-				return;
+	/**
+	 * If our world is trying to authenticate, let's try and pull the owner first to try associating
+	 * with a world short_name
+	 */
+	if (!GetAccountName().empty() && !GetAccountPassword().empty()) {
+		Database::DbLoginServerAdmin
+			login_server_admin = server.db->GetLoginServerAdmin(GetAccountName());
+
+		if (login_server_admin.loaded) {
+			LogDebug(
+				"WorldServer::Handle_NewLSInfo | Attempting to authenticate world admin... [{0}] ({1}) against worldserver [{2}]",
+				GetAccountName(),
+				login_server_admin.id,
+				GetServerShortName()
+			);
+
+			if (WorldServer::ValidateWorldServerAdminLogin(
+				login_server_admin.id,
+				GetAccountName(),
+				GetAccountPassword(),
+				login_server_admin.account_password
+			)) {
+				LogDebug(
+					"WorldServer::Handle_NewLSInfo | Authenticating world admin... [{0}] ({1}) success! World ({2})",
+					GetAccountName(),
+					login_server_admin.id,
+					GetServerShortName()
+				);
+				world_server_admin_id = login_server_admin.id;
+
+				SetIsServerAuthorized(true);
 			}
 		}
-		else {
-			Log(Logs::General, Logs::World_Server, "Server %s(%s) did not attempt to log in but only registered servers are allowed.",
-				long_name.c_str(), short_name.c_str());
+	}
+
+	Database::DbWorldRegistration
+		world_registration = server.db->GetWorldRegistration(
+		GetServerShortName(),
+		world_server_admin_id
+	);
+
+	if (!server.options.IsUnregisteredAllowed()) {
+		if (!HandleNewLoginserverRegisteredOnly(world_registration)) {
+			LogError(
+				"WorldServer::HandleNewLoginserverRegisteredOnly checks failed with server [{0}]",
+				GetServerLongName()
+			);
 			return;
 		}
 	}
 	else {
-		unsigned int server_id = 0;
-		unsigned int server_list_type = 0;
-		unsigned int is_server_trusted = 0;
-		std::string server_description;
-		std::string server_list_description;
-		std::string server_account_name;
-		std::string server_account_password;
-
-
-		if (server.db->GetWorldRegistration(
-			long_name,
-			short_name,
-			server_id,
-			server_description,
-			server_list_type,
-			is_server_trusted,
-			server_list_description,
-			server_account_name,
-			server_account_password))
-		{
-
-			if (account_name.size() > 0 && account_password.size() > 0) {
-				if (server_account_name.compare(account_name) == 0 && server_account_password.compare(account_password) == 0) {
-					Log(Logs::General, Logs::World_Server, "Server %s(%s) successfully logged in.",
-						long_name.c_str(), short_name.c_str());
-					is_server_authorized = true;
-					SetRuntimeID(server_id);
-					server_list_id = server_list_type;
-					desc = server_description;
-
-					if (is_server_trusted) {
-						Log(Logs::General, Logs::Netcode, "ServerOP_LSAccountUpdate sent to world");
-						is_server_trusted = true;
-						EQ::Net::DynamicPacket outapp;
-						connection->Send(ServerOP_LSAccountUpdate, outapp);
-					}
-				}
-				else {
-					// this is the first of two cases where we should deny access even if unregistered is allowed
-					Log(Logs::General, Logs::World_Server, "Server %s(%s) attempted to log in but account and password did not match the entry in the database.",
-						long_name.c_str(), short_name.c_str());
-				}
-			}
-			else {
-				if (server_account_name.size() > 0 || server_account_password.size() > 0) {
-					// this is the second of two cases where we should deny access even if unregistered is allowed
-					Log(Logs::General, Logs::World_Server, "Server %s(%s) did not attempt to log in but this server requires a password.",
-						long_name.c_str(), short_name.c_str());
-				}
-				else {
-					Log(Logs::General, Logs::World_Server, "Server %s(%s) did not attempt to log in but unregistered servers are allowed.",
-						long_name.c_str(), short_name.c_str());
-					is_server_authorized = true;
-					SetRuntimeID(server_id);
-					server_list_id = 3;
-				}
-			}
-		}
-		else
-		{
-			Log(Logs::General, Logs::World_Server, "Server %s(%s) attempted to log in but database couldn't find an entry but unregistered servers are allowed.",
-				long_name.c_str(), short_name.c_str());
-			if (server.db->CreateWorldRegistration(long_name, short_name, server_id)) {
-				is_server_authorized = true;
-				SetRuntimeID(server_id);
-				server_list_id = 3;
-			}
+		if (!HandleNewLoginserverInfoUnregisteredAllowed(world_registration)) {
+			LogError(
+				"WorldServer::HandleNewLoginserverInfoUnregisteredAllowed checks failed with server [{0}]",
+				GetServerLongName()
+			);
+			return;
 		}
 	}
 
-	server.db->UpdateWorldRegistration(GetRuntimeID(), long_name, GetConnection()->Handle()->RemoteIP());
+	server.db->UpdateWorldRegistration(
+		GetServerId(),
+		GetServerLongName(),
+		GetRemoteIp()
+	);
 }
 
-void WorldServer::Handle_LSStatus(ServerLSStatus_Struct *s)
+/**
+ * @param server_login_status
+ */
+void WorldServer::Handle_LSStatus(ServerLSStatus_Struct *server_login_status)
 {
-	players_online = s->num_players;
-	zones_booted = s->num_zones;
-	server_status = s->status;
+	SetPlayersOnline(server_login_status->num_players);
+	SetZonesBooted(server_login_status->num_zones);
+	SetServerStatus(server_login_status->status);
 }
 
-void WorldServer::SendClientAuth(std::string ip, std::string account, std::string key, unsigned int account_id)
+/**
+ * @param ip
+ * @param account
+ * @param key
+ * @param account_id
+ * @param loginserver_name
+ */
+void WorldServer::SendClientAuth(
+	std::string ip,
+	std::string account,
+	std::string key,
+	unsigned int account_id,
+	const std::string &loginserver_name
+)
 {
 	EQ::Net::DynamicPacket outapp;
-	ClientAuth_Struct client_auth;
-	client_auth.lsaccount_id = account_id;
-	strncpy(client_auth.name, account.c_str(), 30);
+	ClientAuth_Struct      client_auth{};
+
+	client_auth.loginserver_account_id = account_id;
+
+	strncpy(client_auth.account_name, account.c_str(), 30);
 	strncpy(client_auth.key, key.c_str(), 30);
-	client_auth.lsadmin = 0;
-	client_auth.worldadmin = 0;
-	client_auth.ip = inet_addr(ip.c_str());
 
-	std::string client_address(ip);
-	std::string world_address(connection->Handle()->RemoteIP());
+	client_auth.lsadmin        = 0;
+	client_auth.is_world_admin = 0;
+	client_auth.ip             = inet_addr(ip.c_str());
+	strncpy(client_auth.loginserver_name, &loginserver_name[0], 64);
 
-	if (client_address.compare(world_address) == 0) {
-		client_auth.local = 1;
+	const std::string &client_address(ip);
+	std::string       world_address(connection->Handle()->RemoteIP());
+
+	if (client_address == world_address) {
+		client_auth.is_client_from_local_network = 1;
 	}
-	else if (client_address.find(server.options.GetLocalNetwork()) != std::string::npos) {
-		client_auth.local = 1;
+	else if (IpUtil::IsIpInPrivateRfc1918(client_address)) {
+		LogInfo("Client is authenticating from a local address [{0}]", client_address);
+		client_auth.is_client_from_local_network = 1;
 	}
 	else {
-		client_auth.local = 0;
+		client_auth.is_client_from_local_network = 0;
 	}
 
+	struct in_addr ip_addr{};
+	ip_addr.s_addr = client_auth.ip;
+
+	LogInfo(
+		"Client authentication response: world_address [{0}] client_address [{1}]",
+		world_address,
+		client_address
+	);
+
+	LogInfo(
+		"Sending Client Authentication Response ls_account_id [{0}] ls_name [{1}] name [{2}] key [{3}] ls_admin [{4}] "
+		"world_admin [{5}] ip [{6}] local [{7}]",
+		client_auth.loginserver_account_id,
+		client_auth.loginserver_name,
+		client_auth.account_name,
+		client_auth.key,
+		client_auth.lsadmin,
+		client_auth.is_world_admin,
+		inet_ntoa(ip_addr),
+		client_auth.is_client_from_local_network
+	);
+
 	outapp.PutSerialize(0, client_auth);
 	connection->Send(ServerOP_LSClientAuth, outapp);
 
-	if (server.options.IsDumpInPacketsOn())
-	{
+	if (server.options.IsDumpInPacketsOn()) {
 		DumpPacket(ServerOP_LSClientAuth, outapp);
 	}
 }
+
+/**
+ * @param new_world_server_info_packet
+ * @return
+ */
+bool WorldServer::HandleNewLoginserverInfoValidation(
+	ServerNewLSInfo_Struct *new_world_server_info_packet
+)
+{
+	const int max_account_name_length          = 30;
+	const int max_account_password_length      = 30;
+	const int max_server_long_name_length      = 200;
+	const int max_server_short_name_length     = 50;
+	const int max_server_local_address_length  = 125;
+	const int max_server_remote_address_length = 125;
+	const int max_server_version_length        = 64;
+	const int max_server_protocol_version      = 25;
+
+	if (strlen(new_world_server_info_packet->account_name) >= max_account_name_length) {
+		LogError("Handle_NewLSInfo error [account_name] was too long | max [{0}]", max_account_name_length);
+		return false;
+	}
+	else if (strlen(new_world_server_info_packet->account_password) >= max_account_password_length) {
+		LogError("Handle_NewLSInfo error [account_password] was too long | max [{0}]", max_account_password_length);
+		return false;
+	}
+	else if (strlen(new_world_server_info_packet->server_long_name) >= max_server_long_name_length) {
+		LogError("Handle_NewLSInfo error [server_long_name] was too long | max [{0}]", max_server_long_name_length);
+		return false;
+	}
+	else if (strlen(new_world_server_info_packet->server_short_name) >= max_server_short_name_length) {
+		LogError("Handle_NewLSInfo error [server_short_name] was too long | max [{0}]", max_server_short_name_length);
+		return false;
+	}
+	else if (strlen(new_world_server_info_packet->server_version) >= max_server_short_name_length) {
+		LogError("Handle_NewLSInfo error [server_version] was too long | max [{0}]", max_server_version_length);
+		return false;
+	}
+	else if (strlen(new_world_server_info_packet->protocol_version) >= max_server_protocol_version) {
+		LogError("Handle_NewLSInfo error [protocol_version] was too long | max [{0}]", max_server_protocol_version);
+		return false;
+	}
+
+	if (strlen(new_world_server_info_packet->local_ip_address) <= max_server_local_address_length) {
+		if (strlen(new_world_server_info_packet->local_ip_address) == 0) {
+			LogError("Handle_NewLSInfo error, local address was null, defaulting to localhost");
+			SetLocalIp("127.0.0.1");
+		}
+		else {
+			SetLocalIp(new_world_server_info_packet->local_ip_address);
+		}
+	}
+	else {
+		LogError("Handle_NewLSInfo error, local address was too long | max [{0}]", max_server_local_address_length);
+		return false;
+	}
+
+	if (strlen(new_world_server_info_packet->remote_ip_address) <= max_server_remote_address_length) {
+		if (strlen(new_world_server_info_packet->remote_ip_address) == 0) {
+			SetRemoteIp(GetConnection()->Handle()->RemoteIP());
+
+			LogWarning(
+				"Remote address was null, defaulting to stream address [{0}]",
+				remote_ip_address
+			);
+		}
+		else {
+			SetRemoteIp(new_world_server_info_packet->remote_ip_address);
+		}
+	}
+	else {
+		SetRemoteIp(GetConnection()->Handle()->RemoteIP());
+
+		LogWarning(
+			"Handle_NewLSInfo remote address was too long, defaulting to stream address [{0}]",
+			remote_ip_address
+		);
+	}
+
+	return true;
+}
+
+/**
+ * @param world_registration
+ * @return
+ */
+bool WorldServer::HandleNewLoginserverRegisteredOnly(
+	Database::DbWorldRegistration &world_registration
+)
+{
+	if (!GetAccountName().empty() && !GetAccountPassword().empty()) {
+		if (world_registration.loaded) {
+			bool does_world_server_not_require_authentication = (
+				world_registration.server_admin_account_name.empty() ||
+				world_registration.server_admin_account_password.empty()
+			);
+
+			bool does_world_server_pass_authentication_check = (
+				world_registration.server_admin_account_name == GetAccountName() &&
+				WorldServer::ValidateWorldServerAdminLogin(
+					world_registration.server_admin_id,
+					GetAccountName(),
+					GetAccountPassword(),
+					world_registration.server_admin_account_password
+				)
+			);
+
+			SetServerDescription(world_registration.server_description)
+				->SetServerId(world_registration.server_id)
+				->SetIsServerTrusted(world_registration.is_server_trusted)
+				->SetServerListTypeId(world_registration.server_list_type);
+
+			if (does_world_server_not_require_authentication) {
+
+				SetIsServerAuthorized(true);
+
+				LogInfo(
+					"Server long_name [{0}] short_name [{1}] successfully logged into account that had no user/password requirement",
+					GetServerLongName(),
+					GetServerShortName()
+				);
+			}
+			else if (does_world_server_pass_authentication_check) {
+
+				SetIsServerAuthorized(true);
+
+				LogInfo(
+					"Server long_name [{0}] short_name [{1}] successfully logged in",
+					GetServerLongName(),
+					GetServerShortName()
+				);
+
+				if (IsServerTrusted()) {
+					LogDebug("WorldServer::HandleNewLoginserverRegisteredOnly | ServerOP_LSAccountUpdate sent to world");
+					EQ::Net::DynamicPacket outapp;
+					connection->Send(ServerOP_LSAccountUpdate, outapp);
+				}
+			}
+			else {
+				LogInfo(
+					"Server long_name [{0}] short_name [{1}] attempted to log in but account and password did not "
+					"match the entry in the database, and only registered servers are allowed",
+					GetServerLongName(),
+					GetServerShortName()
+				);
+
+				return false;
+			}
+		}
+		else {
+			LogInfo(
+				"Server long_name [{0}] short_name [{1}] attempted to log in but database couldn't find an entry and only registered servers are allowed",
+				GetServerLongName(),
+				GetServerShortName()
+			);
+
+			return false;
+		}
+	}
+	else {
+		LogInfo(
+			"Server long_name [{0}] short_name [{1}] did not attempt to log in but only registered servers are allowed",
+			GetServerLongName(),
+			GetServerShortName()
+		);
+
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * @param world_registration
+ * @return
+ */
+bool WorldServer::HandleNewLoginserverInfoUnregisteredAllowed(
+	Database::DbWorldRegistration &world_registration
+)
+{
+	if (world_registration.loaded) {
+		SetServerDescription(world_registration.server_description)
+			->SetServerId(world_registration.server_id)
+			->SetIsServerTrusted(world_registration.is_server_trusted)
+			->SetServerListTypeId(world_registration.server_list_type);
+
+		bool does_world_server_pass_authentication_check = (
+			world_registration.server_admin_account_name == GetAccountName() &&
+			WorldServer::ValidateWorldServerAdminLogin(
+				world_registration.server_admin_id,
+				GetAccountName(),
+				GetAccountPassword(),
+				world_registration.server_admin_account_password
+			)
+		);
+
+		bool does_world_server_have_non_empty_credentials = (
+			!GetAccountName().empty() &&
+			!GetAccountPassword().empty()
+		);
+
+		if (does_world_server_have_non_empty_credentials) {
+			if (does_world_server_pass_authentication_check) {
+				SetIsServerAuthorized(true);
+
+				LogInfo(
+					"Server long_name [{0}] short_name [{1}] successfully logged in",
+					GetServerLongName(),
+					GetServerShortName()
+				);
+
+				if (IsServerTrusted()) {
+					LogDebug("WorldServer::HandleNewLoginserverRegisteredOnly | ServerOP_LSAccountUpdate sent to world");
+					EQ::Net::DynamicPacket outapp;
+					connection->Send(ServerOP_LSAccountUpdate, outapp);
+				}
+			}
+			else {
+
+				/**
+				 * this is the first of two cases where we should deny access even if unregistered is allowed
+				 */
+				LogInfo(
+					"Server long_name [{0}] short_name [{1}] attempted to log in but account and password did not match the entry in the database.",
+					GetServerLongName(),
+					GetServerShortName()
+				);
+			}
+		}
+		else {
+
+			/**
+			 * this is the second of two cases where we should deny access even if unregistered is allowed
+			 */
+			if (!GetAccountName().empty() || !GetAccountPassword().empty()) {
+				LogInfo(
+					"Server [{0}] [{1}] did not login but this server required a password to login",
+					GetServerLongName(),
+					GetServerShortName()
+				);
+			}
+			else {
+				SetIsServerAuthorized(true);
+				LogInfo(
+					"Server [{0}] [{1}] did not login but unregistered servers are allowed",
+					GetServerLongName(),
+					GetServerShortName()
+				);
+			}
+		}
+	}
+	else {
+		LogInfo(
+			"Server [{0}] ({1}) is not registered but unregistered servers are allowed",
+			GetServerLongName(),
+			GetServerShortName()
+		);
+
+		SetIsServerAuthorized(true);
+
+		if (world_registration.loaded) {
+			return true;
+		}
+
+		Database::DbLoginServerAdmin login_server_admin = server.db->GetLoginServerAdmin(GetAccountName());
+
+		uint32 server_admin_id = 0;
+		if (login_server_admin.loaded) {
+			if (WorldServer::ValidateWorldServerAdminLogin(
+				login_server_admin.id,
+				GetAccountName(),
+				GetAccountPassword(),
+				login_server_admin.account_password
+			)) {
+				server_admin_id = login_server_admin.id;
+			}
+		}
+
+		/**
+		 * Auto create a registration
+		 */
+		if (!server.db->CreateWorldRegistration(
+			GetServerLongName(),
+			GetServerShortName(),
+			GetRemoteIp(),
+			server_id,
+			server_admin_id
+		)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+/**
+ * @param world_admin_id
+ * @param world_admin_username
+ * @param world_admin_password
+ * @param world_admin_password_hash
+ * @return
+ */
+bool WorldServer::ValidateWorldServerAdminLogin(
+	int world_admin_id,
+	const std::string &world_admin_username,
+	const std::string &world_admin_password,
+	const std::string &world_admin_password_hash
+)
+{
+	auto encryption_mode = server.options.GetEncryptionMode();
+	if (eqcrypt_verify_hash(world_admin_username, world_admin_password, world_admin_password_hash, encryption_mode)) {
+		return true;
+	}
+	else {
+		if (server.options.IsUpdatingInsecurePasswords()) {
+			if (encryption_mode < EncryptionModeArgon2) {
+				encryption_mode = EncryptionModeArgon2;
+			}
+
+			uint32 insecure_source_encryption_mode = 0;
+			if (world_admin_password_hash.length() == CryptoHash::md5_hash_length) {
+				for (int i = EncryptionModeMD5; i <= EncryptionModeMD5Triple; ++i) {
+					if (i != encryption_mode &&
+						eqcrypt_verify_hash(world_admin_username, world_admin_password, world_admin_password_hash, i)) {
+						LogDebug("[{}] Checking for [{}] world admin", __func__, GetEncryptionByModeId(i));
+						insecure_source_encryption_mode = i;
+					}
+				}
+			}
+			else if (world_admin_password_hash.length() == CryptoHash::sha1_hash_length &&
+					 insecure_source_encryption_mode == 0) {
+				for (int i = EncryptionModeSHA; i <= EncryptionModeSHATriple; ++i) {
+					if (i != encryption_mode &&
+						eqcrypt_verify_hash(world_admin_username, world_admin_password, world_admin_password_hash, i)) {
+						LogDebug("[{}] Checking for [{}] world admin", __func__, GetEncryptionByModeId(i));
+						insecure_source_encryption_mode = i;
+					}
+				}
+			}
+			else if (world_admin_password_hash.length() == CryptoHash::sha512_hash_length &&
+					 insecure_source_encryption_mode == 0) {
+				for (int i = EncryptionModeSHA512; i <= EncryptionModeSHA512Triple; ++i) {
+					if (i != encryption_mode &&
+						eqcrypt_verify_hash(world_admin_username, world_admin_password, world_admin_password_hash, i)) {
+						LogDebug("[{}] Checking for [{}] world admin", __func__, GetEncryptionByModeId(i));
+						insecure_source_encryption_mode = i;
+					}
+				}
+			}
+
+			if (insecure_source_encryption_mode > 0) {
+				LogInfo(
+					"[{}] Updated insecure world_admin_username [{}] from mode [{}] ({}) to mode [{}] ({})",
+					__func__,
+					world_admin_username,
+					GetEncryptionByModeId(insecure_source_encryption_mode),
+					insecure_source_encryption_mode,
+					GetEncryptionByModeId(encryption_mode),
+					encryption_mode
+				);
+
+				std::string new_password_hash = eqcrypt_hash(
+					world_admin_username,
+					world_admin_password,
+					encryption_mode
+				);
+
+				server.db->UpdateLoginWorldAdminAccountPassword(world_admin_id, new_password_hash);
+
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * @param in_server_list_id
+ * @return
+ */
+WorldServer *WorldServer::SetServerListTypeId(unsigned int in_server_list_id)
+{
+	server_list_type_id = in_server_list_id;
+
+	return this;
+}
+
+/**
+ * @return
+ */
+const std::string &WorldServer::GetServerDescription() const
+{
+	return server_description;
+}
+
+/**
+ * @param in_server_description
+ */
+WorldServer *WorldServer::SetServerDescription(const std::string &in_server_description)
+{
+	WorldServer::server_description = in_server_description;
+
+	return this;
+}
+
+/**
+ * @return
+ */
+bool WorldServer::IsServerAuthorized() const
+{
+	return is_server_authorized;
+}
+
+/**
+ * @param in_is_server_authorized
+ */
+WorldServer *WorldServer::SetIsServerAuthorized(bool in_is_server_authorized)
+{
+	WorldServer::is_server_authorized = in_is_server_authorized;
+
+	return this;
+}
+
+/**
+ * @return
+ */
+bool WorldServer::IsServerLoggedIn() const
+{
+	return is_server_logged_in;
+}
+
+/**
+ * @param in_is_server_logged_in
+ */
+WorldServer *WorldServer::SetIsServerLoggedIn(bool in_is_server_logged_in)
+{
+	WorldServer::is_server_logged_in = in_is_server_logged_in;
+
+	return this;
+}
+
+/**
+ * @return
+ */
+bool WorldServer::IsServerTrusted() const
+{
+	return is_server_trusted;
+}
+
+/**
+ * @param in_is_server_trusted
+ */
+WorldServer *WorldServer::SetIsServerTrusted(bool in_is_server_trusted)
+{
+	WorldServer::is_server_trusted = in_is_server_trusted;
+
+	return this;
+}
+
+/**
+ * @param in_zones_booted
+ */
+WorldServer *WorldServer::SetZonesBooted(unsigned int in_zones_booted)
+{
+	WorldServer::zones_booted = in_zones_booted;
+
+	return this;
+}
+
+/**
+ * @param in_players_online
+ */
+WorldServer *WorldServer::SetPlayersOnline(unsigned int in_players_online)
+{
+	WorldServer::players_online = in_players_online;
+
+	return this;
+}
+
+/**
+ * @param in_server_status
+ */
+WorldServer *WorldServer::SetServerStatus(int in_server_status)
+{
+	WorldServer::server_status = in_server_status;
+
+	return this;
+}
+
+/**
+ * @param in_server_process_type
+ */
+WorldServer *WorldServer::SetServerProcessType(unsigned int in_server_process_type)
+{
+	WorldServer::server_process_type = in_server_process_type;
+
+	return this;
+}
+
+/**
+ * @param in_long_name
+ */
+WorldServer *WorldServer::SetLongName(const std::string &in_long_name)
+{
+	WorldServer::long_name = in_long_name;
+
+	return this;
+}
+
+/**
+ * @param in_short_name
+ */
+WorldServer *WorldServer::SetShortName(const std::string &in_short_name)
+{
+	WorldServer::short_name = in_short_name;
+
+	return this;
+}
+
+/**
+ * @param in_account_name
+ */
+WorldServer *WorldServer::SetAccountName(const std::string &in_account_name)
+{
+	WorldServer::account_name = in_account_name;
+
+	return this;
+}
+
+/**
+ * @param in_account_password
+ */
+WorldServer *WorldServer::SetAccountPassword(const std::string &in_account_password)
+{
+	WorldServer::account_password = in_account_password;
+
+	return this;
+}
+
+/**
+ * @param in_remote_ip
+ */
+WorldServer *WorldServer::SetRemoteIp(const std::string &in_remote_ip)
+{
+	WorldServer::remote_ip_address = in_remote_ip;
+
+	return this;
+}
+
+/**
+ * @param in_local_ip
+ */
+WorldServer *WorldServer::SetLocalIp(const std::string &in_local_ip)
+{
+	WorldServer::local_ip = in_local_ip;
+
+	return this;
+}
+
+/**
+ * @param in_protocol
+ */
+WorldServer *WorldServer::SetProtocol(const std::string &in_protocol)
+{
+	WorldServer::protocol = in_protocol;
+
+	return this;
+}
+
+/**
+ * @param in_version
+ */
+WorldServer *WorldServer::SetVersion(const std::string &in_version)
+{
+	WorldServer::version = in_version;
+
+	return this;
+}
+
+/**
+ * @return
+ */
+int WorldServer::GetServerStatus() const
+{
+	return server_status;
+}
+
+/**
+ * @return
+ */
+unsigned int WorldServer::GetServerListTypeId() const
+{
+	return server_list_type_id;
+}
+
+/**
+ * @return
+ */
+unsigned int WorldServer::GetServerProcessType() const
+{
+	return server_process_type;
+}
+
+/**
+ * @return
+ */
+const std::string &WorldServer::GetAccountName() const
+{
+	return account_name;
+}
+
+/**
+ * @return
+ */
+const std::string &WorldServer::GetAccountPassword() const
+{
+	return account_password;
+}
+
+/**
+ * @return
+ */
+const std::string &WorldServer::GetRemoteIp() const
+{
+	return remote_ip_address;
+}
+
+/**
+ * @return
+ */
+const std::string &WorldServer::GetLocalIp() const
+{
+	return local_ip;
+}
+
+/**
+ * @return
+ */
+const std::string &WorldServer::GetProtocol() const
+{
+	return protocol;
+}
+
+/**
+ * @return
+ */
+const std::string &WorldServer::GetVersion() const
+{
+	return version;
+}
+
+void WorldServer::OnKeepAlive(EQ::Timer *t)
+{
+	ServerPacket pack(ServerOP_KeepAlive, 0);
+	connection->SendPacket(&pack);
+}
\ No newline at end of file
diff --git a/loginserver/world_server.h b/loginserver/world_server.h
index bce7b27eb..04db63924 100644
--- a/loginserver/world_server.h
+++ b/loginserver/world_server.h
@@ -1,20 +1,23 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2010 EQEMu Development Team (http://eqemulator.net)
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
 #ifndef EQEMU_WORLDSERVER_H
 #define EQEMU_WORLDSERVER_H
 
@@ -22,139 +25,194 @@
 #include "../common/net/servertalk_server_connection.h"
 #include "../common/servertalk.h"
 #include "../common/packet_dump.h"
+#include "database.h"
+#include "../common/event/timer.h"
 #include <string>
 #include <memory>
 
 /**
  * World server class, controls the connected server processing.
  */
-class WorldServer
-{
+class WorldServer {
 public:
-	/**
-	* Constructor, sets our connection to c.
-	*/
-	WorldServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> c);
+	WorldServer(std::shared_ptr<EQ::Net::ServertalkServerConnection> worldserver_connection);
 
 	/**
-	* Destructor, frees our connection if it exists.
-	*/
+	 * Destructor, frees our connection if it exists
+	 */
 	~WorldServer();
 
 	/**
-	* Resets the basic stats of this server.
-	*/
+	 * Resets the basic stats of this server.
+	 */
 	void Reset();
 
 	/**
 	* Accesses connection, it is intentional that this is not const (trust me).
 	*/
 	std::shared_ptr<EQ::Net::ServertalkServerConnection> GetConnection() { return connection; }
-
-	/**
-	* Sets the connection to c.
-	*/
 	void SetConnection(std::shared_ptr<EQ::Net::ServertalkServerConnection> c) { connection = c; }
 
 	/**
-	* Gets the runtime id of this server.
-	*/
-	unsigned int GetRuntimeID() const { return runtime_id; }
+	 * @return
+	 */
+	unsigned int GetServerId() const { return server_id; }
+	WorldServer *SetServerId(unsigned int id)
+	{
+		server_id = id;
+		return this;
+	}
 
 	/**
-	* Sets the runtime id of this server.
-	*/
-	void SetRuntimeID(unsigned int id) { runtime_id = id; }
+	 * @return
+	 */
+	std::string GetServerLongName() const { return long_name; }
+	std::string GetServerShortName() const { return short_name; }
 
 	/**
-	* Gets the long name of the server.
-	*/
-	std::string GetLongName() const { return long_name; }
-
-	/**
-	* Gets the short name of the server.
-	*/
-	std::string GetShortName() const { return short_name; }
-
-	/**
-	* Gets whether the server is authorized to show up on the server list or not.
-	*/
+	 * Gets whether the server is authorized to show up on the server list or not
+	 * @return
+	 */
 	bool IsAuthorized() const { return is_server_authorized; }
-
-	/**
-	* Gets the local ip of the server.
-	*/
 	std::string GetLocalIP() const { return local_ip; }
+	std::string GetRemoteIP() const { return remote_ip_address; }
 
 	/**
-	* Gets the remote ip of the server.
-	*/
-	std::string GetRemoteIP() const { return remote_ip; }
+	 * Gets what kind of server this server is (legends, preferred, normal)
+	 *
+	 * @return
+	 */
+	unsigned int GetServerListID() const { return server_list_type_id; }
+	WorldServer *SetServerListTypeId(unsigned int in_server_list_id);
 
-	/**
-	* Gets what kind of server this server is (legends, preferred, normal)
-	*/
-	unsigned int GetServerListID() const { return server_list_id; }
-
-	/**
-	* Gets the status of the server.
-	*/
 	int GetStatus() const { return server_status; }
-
-	/**
-	* Gets the number of zones online on the server.
-	*/
 	unsigned int GetZonesBooted() const { return zones_booted; }
-
-	/**
-	* Gets the number of players on the server.
-	*/
 	unsigned int GetPlayersOnline() const { return players_online; }
 
 	/**
-	* Takes the info struct we received from world and processes it.
-	*/
-	void Handle_NewLSInfo(ServerNewLSInfo_Struct* i);
+	 * Takes the info struct we received from world and processes it
+	 *
+	 * @param new_world_server_info_packet
+	 */
+	void Handle_NewLSInfo(ServerNewLSInfo_Struct *new_world_server_info_packet);
 
 	/**
-	* Takes the status struct we received from world and processes it.
-	*/
-	void Handle_LSStatus(ServerLSStatus_Struct *s);
+	 * Takes the status struct we received from world and processes it
+	 *
+	 * @param server_login_status
+	 */
+	void Handle_LSStatus(ServerLSStatus_Struct *server_login_status);
+
+	bool HandleNewLoginserverInfoValidation(ServerNewLSInfo_Struct *new_world_server_info_packet);
 
 	/**
-	* Informs world that there is a client incoming with the following data.
-	*/
-	void SendClientAuth(std::string ip, std::string account, std::string key, unsigned int account_id);
+	 * Informs world that there is a client incoming with the following data.
+	 *
+	 * @param ip
+	 * @param account
+	 * @param key
+	 * @param account_id
+	 * @param loginserver_name
+	 */
+	void SendClientAuth(
+		std::string ip,
+		std::string account,
+		std::string key,
+		unsigned int account_id,
+		const std::string &loginserver_name
+	);
+
+	/**
+	 * @param world_admin_id
+	 * @param world_admin_username
+	 * @param world_admin_password
+	 * @param world_admin_password_hash
+	 * @return
+	 */
+	static bool ValidateWorldServerAdminLogin(
+		int world_admin_id,
+		const std::string &world_admin_username,
+		const std::string &world_admin_password,
+		const std::string &world_admin_password_hash
+	);
+
+	WorldServer *SetZonesBooted(unsigned int in_zones_booted);
+	WorldServer *SetPlayersOnline(unsigned int in_players_online);
+	WorldServer *SetServerStatus(int in_server_status);
+	WorldServer *SetServerProcessType(unsigned int in_server_process_type);
+	WorldServer *SetLongName(const std::string &in_long_name);
+	WorldServer *SetShortName(const std::string &in_short_name);
+	WorldServer *SetAccountName(const std::string &in_account_name);
+	WorldServer *SetAccountPassword(const std::string &in_account_password);
+	WorldServer *SetRemoteIp(const std::string &in_remote_ip);
+	WorldServer *SetLocalIp(const std::string &in_local_ip);
+	WorldServer *SetProtocol(const std::string &in_protocol);
+	WorldServer *SetVersion(const std::string &in_version);
+	WorldServer *SetServerDescription(const std::string &in_server_description);
+	WorldServer *SetIsServerAuthorized(bool in_is_server_authorized);
+	WorldServer *SetIsServerLoggedIn(bool in_is_server_logged_in);
+	WorldServer *SetIsServerTrusted(bool in_is_server_trusted);
+
+	bool IsServerAuthorized() const;
+	bool IsServerLoggedIn() const;
+	bool IsServerTrusted() const;
+	const std::string &GetAccountName() const;
+	const std::string &GetAccountPassword() const;
+	const std::string &GetLocalIp() const;
+	const std::string &GetProtocol() const;
+	const std::string &GetRemoteIp() const;
+	const std::string &GetServerDescription() const;
+	const std::string &GetVersion() const;
+	int GetServerStatus() const;
+	unsigned int GetServerListTypeId() const;
+	unsigned int GetServerProcessType() const;
+
+	bool HandleNewLoginserverRegisteredOnly(Database::DbWorldRegistration &world_registration);
+	bool HandleNewLoginserverInfoUnregisteredAllowed(Database::DbWorldRegistration &world_registration);
 
 private:
 
 	/**
-	* Packet processing functions:
-	*/
-	void ProcessNewLSInfo(uint16_t opcode, const EQ::Net::Packet &p);
-	void ProcessLSStatus(uint16_t opcode, const EQ::Net::Packet &p);
-	void ProcessUsertoWorldResp(uint16_t opcode, const EQ::Net::Packet &p);
-	void ProcessLSAccountUpdate(uint16_t opcode, const EQ::Net::Packet &p);
+	 * Packet processing functions
+	 *
+	 * @param opcode
+	 * @param packet
+	 */
+	void ProcessNewLSInfo(uint16_t opcode, const EQ::Net::Packet &packet);
+	void ProcessLSStatus(uint16_t opcode, const EQ::Net::Packet &packet);
+	void ProcessUserToWorldResponseLegacy(uint16_t opcode, const EQ::Net::Packet &packet);
+	void ProcessUserToWorldResponse(uint16_t opcode, const EQ::Net::Packet &packet);
+	void ProcessLSAccountUpdate(uint16_t opcode, const EQ::Net::Packet &packet);
 
 	std::shared_ptr<EQ::Net::ServertalkServerConnection> connection;
+
 	unsigned int zones_booted;
 	unsigned int players_online;
-	int server_status;
-	unsigned int runtime_id;
-	unsigned int server_list_id;
-	unsigned int server_type;
-	std::string desc;
-	std::string long_name;
-	std::string short_name;
-	std::string account_name;
-	std::string account_password;
-	std::string remote_ip;
-	std::string local_ip;
-	std::string protocol;
-	std::string version;
-	bool is_server_authorized;
-	bool is_server_logged_in;
-	bool is_server_trusted;
+	int          server_status;
+	unsigned int server_id;
+	unsigned int server_list_type_id;
+	unsigned int server_process_type;
+	std::string  server_description;
+	std::string  long_name;
+	std::string  short_name;
+	std::string  account_name;
+	std::string  account_password;
+	std::string  remote_ip_address;
+	std::string  local_ip;
+	std::string  protocol;
+	std::string  version;
+
+	bool                       is_server_authorized;
+	bool                       is_server_logged_in;
+	bool                       is_server_trusted;
+
+	/**
+	 * Keepalive
+	 * @param t
+	 */
+	void OnKeepAlive(EQ::Timer *t);
+	std::unique_ptr<EQ::Timer> m_keepalive;
+
 };
 
 #endif
diff --git a/queryserv/CMakeLists.txt b/queryserv/CMakeLists.txt
index 393747a91..15c900e53 100644
--- a/queryserv/CMakeLists.txt
+++ b/queryserv/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(qserv_sources
 	database.cpp
diff --git a/queryserv/database.cpp b/queryserv/database.cpp
index fcda884e4..20465e6b5 100644
--- a/queryserv/database.cpp
+++ b/queryserv/database.cpp
@@ -39,8 +39,10 @@
 #define strncasecmp	_strnicmp
 #define strcasecmp	_stricmp
 #else
+
 #include "../common/unix.h"
 #include <netinet/in.h>
+
 #endif
 
 #include "database.h"
@@ -48,7 +50,7 @@
 #include "../common/string_util.h"
 #include "../common/servertalk.h"
 
-Database::Database ()
+Database::Database()
 {
 	DBInitVars();
 }
@@ -57,37 +59,36 @@ Database::Database ()
 Establish a connection to a mysql database with the supplied parameters
 */
 
-Database::Database(const char* host, const char* user, const char* passwd, const char* database, uint32 port)
+Database::Database(const char *host, const char *user, const char *passwd, const char *database, uint32 port)
 {
 	DBInitVars();
 	Connect(host, user, passwd, database, port);
 }
 
-bool Database::Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port)
+bool Database::Connect(const char *host, const char *user, const char *passwd, const char *database, uint32 port)
 {
-	uint32 errnum= 0;
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	if (!Open(host, user, passwd, database, port, &errnum, errbuf))
-	{
-		Log(Logs::General, Logs::Error, "Failed to connect to database: Error: %s", errbuf);
+	uint32 errnum = 0;
+	char   errbuf[MYSQL_ERRMSG_SIZE];
+	if (!Open(host, user, passwd, database, port, &errnum, errbuf)) {
+		LogError("Failed to connect to database: Error: {}", errbuf);
 		HandleMysqlError(errnum);
 
 		return false;
 	}
-	else
-	{
-		Log(Logs::General, Logs::Status, "Using database '%s' at %s:%d",database,host,port);
+	else {
+		LogInfo("Using database [{}] at [{}]:[{}]", database, host, port);
 		return true;
 	}
 }
 
-void Database::DBInitVars() {
+void Database::DBInitVars()
+{
 
 }
 
 
-
-void Database::HandleMysqlError(uint32 errnum) {
+void Database::HandleMysqlError(uint32 errnum)
+{
 }
 
 /*
@@ -98,343 +99,438 @@ Database::~Database()
 {
 }
 
-void Database::AddSpeech(const char* from, const char* to, const char* message, uint16 minstatus, uint32 guilddbid, uint8 type) {
+void Database::AddSpeech(
+	const char *from,
+	const char *to,
+	const char *message,
+	uint16 minstatus,
+	uint32 guilddbid,
+	uint8 type
+)
+{
 
-	auto escapedFrom = new char[strlen(from) * 2 + 1];
-	auto escapedTo = new char[strlen(to) * 2 + 1];
+	auto escapedFrom    = new char[strlen(from) * 2 + 1];
+	auto escapedTo      = new char[strlen(to) * 2 + 1];
 	auto escapedMessage = new char[strlen(message) * 2 + 1];
 	DoEscapeString(escapedFrom, from, strlen(from));
 	DoEscapeString(escapedTo, to, strlen(to));
 	DoEscapeString(escapedMessage, message, strlen(message));
 
-    std::string query = StringFormat("INSERT INTO `qs_player_speech` "
-                                    "SET `from` = '%s', `to` = '%s', `message`='%s', "
-                                    "`minstatus`='%i', `guilddbid`='%i', `type`='%i'",
-                                    escapedFrom, escapedTo, escapedMessage, minstatus, guilddbid, type);
-    safe_delete_array(escapedFrom);
+	std::string query = StringFormat(
+		"INSERT INTO `qs_player_speech` "
+		"SET `from` = '%s', `to` = '%s', `message`='%s', "
+		"`minstatus`='%i', `guilddbid`='%i', `type`='%i'",
+		escapedFrom, escapedTo, escapedMessage, minstatus, guilddbid, type
+	);
+	safe_delete_array(escapedFrom);
 	safe_delete_array(escapedTo);
 	safe_delete_array(escapedMessage);
 	auto results = QueryDatabase(query);
-	if(!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed Speech Entry Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+	if (!results.Success()) {
+		LogInfo("Failed Speech Entry Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
 
 }
 
-void Database::LogPlayerDropItem(QSPlayerDropItem_Struct* QS) {
+void Database::LogPlayerDropItem(QSPlayerDropItem_Struct *QS)
+{
 
-	std::string query = StringFormat("INSERT INTO `qs_player_drop_record` SET `time` = NOW(), "
-									 "`char_id` = '%i', `pickup` = '%i', "
-									 "`zone_id` = '%i', `x` = '%i', `y` = '%i', `z` = '%i' ",
-									 QS->char_id, QS->pickup, QS->zone_id, QS->x, QS->y, QS->z);
+	std::string query = StringFormat(
+		"INSERT INTO `qs_player_drop_record` SET `time` = NOW(), "
+		"`char_id` = '%i', `pickup` = '%i', "
+		"`zone_id` = '%i', `x` = '%i', `y` = '%i', `z` = '%i' ",
+		QS->char_id, QS->pickup, QS->zone_id, QS->x, QS->y, QS->z
+	);
 
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed Drop Record Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+		LogInfo("Failed Drop Record Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
-	if (QS->_detail_count == 0)
+	if (QS->_detail_count == 0) {
 		return;
+	}
 
 	int lastIndex = results.LastInsertedID();
 
 	for (int i = 0; i < QS->_detail_count; i++) {
-		query = StringFormat("INSERT INTO `qs_player_drop_record_entries` SET `event_id` = '%i', "
-							 "`item_id` = '%i', `charges` = '%i', `aug_1` = '%i', `aug_2` = '%i', "
-							 "`aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
-							 lastIndex, QS->items[i].item_id,
-							 QS->items[i].charges, QS->items[i].aug_1, QS->items[i].aug_2,
-							 QS->items[i].aug_3, QS->items[i].aug_4, QS->items[i].aug_5);
+		query   = StringFormat(
+			"INSERT INTO `qs_player_drop_record_entries` SET `event_id` = '%i', "
+			"`item_id` = '%i', `charges` = '%i', `aug_1` = '%i', `aug_2` = '%i', "
+			"`aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
+			lastIndex, QS->items[i].item_id,
+			QS->items[i].charges, QS->items[i].aug_1, QS->items[i].aug_2,
+			QS->items[i].aug_3, QS->items[i].aug_4, QS->items[i].aug_5
+		);
 		results = QueryDatabase(query);
 		if (!results.Success()) {
-			Log(Logs::Detail, Logs::QS_Server, "Failed Drop Record Entry Insert: %s", results.ErrorMessage().c_str());
-			Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+			LogInfo("Failed Drop Record Entry Insert: [{}]", results.ErrorMessage().c_str());
+			LogInfo("[{}]", query.c_str());
 		}
 	}
 }
 
-void Database::LogPlayerTrade(QSPlayerLogTrade_Struct* QS, uint32 detailCount) {
+void Database::LogPlayerTrade(QSPlayerLogTrade_Struct *QS, uint32 detailCount)
+{
 
-	std::string query = StringFormat("INSERT INTO `qs_player_trade_record` SET `time` = NOW(), "
-                                    "`char1_id` = '%i', `char1_pp` = '%i', `char1_gp` = '%i', "
-                                    "`char1_sp` = '%i', `char1_cp` = '%i', `char1_items` = '%i', "
-                                    "`char2_id` = '%i', `char2_pp` = '%i', `char2_gp` = '%i', "
-                                    "`char2_sp` = '%i', `char2_cp` = '%i', `char2_items` = '%i'",
-                                    QS->char1_id, QS->char1_money.platinum, QS->char1_money.gold,
-                                    QS->char1_money.silver, QS->char1_money.copper, QS->char1_count,
-                                    QS->char2_id, QS->char2_money.platinum, QS->char2_money.gold,
-                                    QS->char2_money.silver, QS->char2_money.copper, QS->char2_count);
-    auto results = QueryDatabase(query);
-	if(!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed Trade Log Record Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+	std::string query   = StringFormat(
+		"INSERT INTO `qs_player_trade_record` SET `time` = NOW(), "
+		"`char1_id` = '%i', `char1_pp` = '%i', `char1_gp` = '%i', "
+		"`char1_sp` = '%i', `char1_cp` = '%i', `char1_items` = '%i', "
+		"`char2_id` = '%i', `char2_pp` = '%i', `char2_gp` = '%i', "
+		"`char2_sp` = '%i', `char2_cp` = '%i', `char2_items` = '%i'",
+		QS->char1_id, QS->char1_money.platinum, QS->char1_money.gold,
+		QS->char1_money.silver, QS->char1_money.copper, QS->char1_count,
+		QS->char2_id, QS->char2_money.platinum, QS->char2_money.gold,
+		QS->char2_money.silver, QS->char2_money.copper, QS->char2_count
+	);
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogInfo("Failed Trade Log Record Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
-	if(detailCount == 0)
-        return;
+	if (detailCount == 0) {
+		return;
+	}
 
 	int lastIndex = results.LastInsertedID();
 
-    for(int i = 0; i < detailCount; i++) {
-        query = StringFormat("INSERT INTO `qs_player_trade_record_entries` SET `event_id` = '%i', "
-                            "`from_id` = '%i', `from_slot` = '%i', `to_id` = '%i', `to_slot` = '%i', "
-                            "`item_id` = '%i', `charges` = '%i', `aug_1` = '%i', `aug_2` = '%i', "
-                            "`aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
-                            lastIndex, QS->items[i].from_id, QS->items[i].from_slot,
-                            QS->items[i].to_id, QS->items[i].to_slot, QS->items[i].item_id,
-                            QS->items[i].charges, QS->items[i].aug_1, QS->items[i].aug_2,
-                            QS->items[i].aug_3, QS->items[i].aug_4, QS->items[i].aug_5);
-        results = QueryDatabase(query);
-        if(!results.Success()) {
-            Log(Logs::Detail, Logs::QS_Server, "Failed Trade Log Record Entry Insert: %s", results.ErrorMessage().c_str());
-            Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
-        }
+	for (int i = 0; i < detailCount; i++) {
+		query   = StringFormat(
+			"INSERT INTO `qs_player_trade_record_entries` SET `event_id` = '%i', "
+			"`from_id` = '%i', `from_slot` = '%i', `to_id` = '%i', `to_slot` = '%i', "
+			"`item_id` = '%i', `charges` = '%i', `aug_1` = '%i', `aug_2` = '%i', "
+			"`aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
+			lastIndex, QS->items[i].from_id, QS->items[i].from_slot,
+			QS->items[i].to_id, QS->items[i].to_slot, QS->items[i].item_id,
+			QS->items[i].charges, QS->items[i].aug_1, QS->items[i].aug_2,
+			QS->items[i].aug_3, QS->items[i].aug_4, QS->items[i].aug_5
+		);
+		results = QueryDatabase(query);
+		if (!results.Success()) {
+			LogInfo("Failed Trade Log Record Entry Insert: [{}]", results.ErrorMessage().c_str());
+			LogInfo("[{}]", query.c_str());
+		}
 
-    }
+	}
 
 }
 
-void Database::LogPlayerHandin(QSPlayerLogHandin_Struct* QS, uint32 detailCount) {
+void Database::LogPlayerHandin(QSPlayerLogHandin_Struct *QS, uint32 detailCount)
+{
 
-    std::string query = StringFormat("INSERT INTO `qs_player_handin_record` SET `time` = NOW(), "
-                                    "`quest_id` = '%i', `char_id` = '%i', `char_pp` = '%i', "
-                                    "`char_gp` = '%i', `char_sp` = '%i', `char_cp` = '%i', "
-                                    "`char_items` = '%i', `npc_id` = '%i', `npc_pp` = '%i', "
-                                    "`npc_gp` = '%i', `npc_sp` = '%i', `npc_cp` = '%i', "
-                                    "`npc_items`='%i'",
-                                    QS->quest_id, QS->char_id, QS->char_money.platinum,
-                                    QS->char_money.gold, QS->char_money.silver, QS->char_money.copper,
-                                    QS->char_count, QS->npc_id, QS->npc_money.platinum,
-                                    QS->npc_money.gold, QS->npc_money.silver, QS->npc_money.copper,
-                                    QS->npc_count);
-    auto results = QueryDatabase(query);
-	if(!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed Handin Log Record Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+	std::string query   = StringFormat(
+		"INSERT INTO `qs_player_handin_record` SET `time` = NOW(), "
+		"`quest_id` = '%i', `char_id` = '%i', `char_pp` = '%i', "
+		"`char_gp` = '%i', `char_sp` = '%i', `char_cp` = '%i', "
+		"`char_items` = '%i', `npc_id` = '%i', `npc_pp` = '%i', "
+		"`npc_gp` = '%i', `npc_sp` = '%i', `npc_cp` = '%i', "
+		"`npc_items`='%i'",
+		QS->quest_id, QS->char_id, QS->char_money.platinum,
+		QS->char_money.gold, QS->char_money.silver, QS->char_money.copper,
+		QS->char_count, QS->npc_id, QS->npc_money.platinum,
+		QS->npc_money.gold, QS->npc_money.silver, QS->npc_money.copper,
+		QS->npc_count
+	);
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogInfo("Failed Handin Log Record Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
-	if(detailCount == 0)
-        return;
+	if (detailCount == 0) {
+		return;
+	}
 
 	int lastIndex = results.LastInsertedID();
 
-    for(int i = 0; i < detailCount; i++) {
-        query = StringFormat("INSERT INTO `qs_player_handin_record_entries` SET `event_id` = '%i', "
-                            "`action_type` = '%s', `char_slot` = '%i', `item_id` = '%i', "
-                            "`charges` = '%i', `aug_1` = '%i', `aug_2` = '%i', `aug_3` = '%i', "
-                            "`aug_4` = '%i', `aug_5` = '%i'",
-                            lastIndex, QS->items[i].action_type, QS->items[i].char_slot,
-                            QS->items[i].item_id, QS->items[i].charges, QS->items[i].aug_1,
-                            QS->items[i].aug_2, QS->items[i].aug_3, QS->items[i].aug_4,
-                            QS->items[i].aug_5);
-        if(!results.Success()) {
-            Log(Logs::Detail, Logs::QS_Server, "Failed Handin Log Record Entry Insert: %s", results.ErrorMessage().c_str());
-            Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
-        }
-    }
+	for (int i = 0; i < detailCount; i++) {
+		query = StringFormat(
+			"INSERT INTO `qs_player_handin_record_entries` SET `event_id` = '%i', "
+			"`action_type` = '%s', `char_slot` = '%i', `item_id` = '%i', "
+			"`charges` = '%i', `aug_1` = '%i', `aug_2` = '%i', `aug_3` = '%i', "
+			"`aug_4` = '%i', `aug_5` = '%i'",
+			lastIndex, QS->items[i].action_type, QS->items[i].char_slot,
+			QS->items[i].item_id, QS->items[i].charges, QS->items[i].aug_1,
+			QS->items[i].aug_2, QS->items[i].aug_3, QS->items[i].aug_4,
+			QS->items[i].aug_5
+		);
+		if (!results.Success()) {
+			LogInfo("Failed Handin Log Record Entry Insert: [{}]", results.ErrorMessage().c_str());
+			LogInfo("[{}]", query.c_str());
+		}
+	}
 
 }
 
-void Database::LogPlayerNPCKill(QSPlayerLogNPCKill_Struct* QS, uint32 members){
+void Database::LogPlayerNPCKill(QSPlayerLogNPCKill_Struct *QS, uint32 members)
+{
 
-	std::string query = StringFormat("INSERT INTO `qs_player_npc_kill_record` "
-                                    "SET `npc_id` = '%i', `type` = '%i', "
-                                    "`zone_id` = '%i', `time` = NOW()",
-                                    QS->s1.NPCID, QS->s1.Type, QS->s1.ZoneID);
-	auto results = QueryDatabase(query);
-	if(!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed NPC Kill Log Record Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+	std::string query   = StringFormat(
+		"INSERT INTO `qs_player_npc_kill_record` "
+		"SET `npc_id` = '%i', `type` = '%i', "
+		"`zone_id` = '%i', `time` = NOW()",
+		QS->s1.NPCID, QS->s1.Type, QS->s1.ZoneID
+	);
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogInfo("Failed NPC Kill Log Record Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
-	if(members == 0)
-        return;
+	if (members == 0) {
+		return;
+	}
 
 	int lastIndex = results.LastInsertedID();
 
 	for (int i = 0; i < members; i++) {
-        query = StringFormat("INSERT INTO `qs_player_npc_kill_record_entries` "
-                            "SET `event_id` = '%i', `char_id` = '%i'",
-                            lastIndex, QS->Chars[i].char_id);
+		query = StringFormat(
+			"INSERT INTO `qs_player_npc_kill_record_entries` "
+			"SET `event_id` = '%i', `char_id` = '%i'",
+			lastIndex, QS->Chars[i].char_id
+		);
 		auto results = QueryDatabase(query);
-		if(!results.Success()) {
-			Log(Logs::Detail, Logs::QS_Server, "Failed NPC Kill Log Entry Insert: %s", results.ErrorMessage().c_str());
-			Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+		if (!results.Success()) {
+			LogInfo("Failed NPC Kill Log Entry Insert: [{}]", results.ErrorMessage().c_str());
+			LogInfo("[{}]", query.c_str());
 		}
 
 	}
 
 }
 
-void Database::LogPlayerDelete(QSPlayerLogDelete_Struct* QS, uint32 items) {
+void Database::LogPlayerDelete(QSPlayerLogDelete_Struct *QS, uint32 items)
+{
 
-	std::string query = StringFormat("INSERT INTO `qs_player_delete_record` SET `time` = NOW(), "
-                                    "`char_id` = '%i', `stack_size` = '%i', `char_items` = '%i'",
-                                    QS->char_id, QS->stack_size, QS->char_count, QS->char_count);
-    auto results = QueryDatabase(query);
-	if(!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed Delete Log Record Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+	std::string query   = StringFormat(
+		"INSERT INTO `qs_player_delete_record` SET `time` = NOW(), "
+		"`char_id` = '%i', `stack_size` = '%i', `char_items` = '%i'",
+		QS->char_id, QS->stack_size, QS->char_count, QS->char_count
+	);
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogInfo("Failed Delete Log Record Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
-	if(items == 0)
-        return;
+	if (items == 0) {
+		return;
+	}
 
-    int lastIndex = results.LastInsertedID();
+	int lastIndex = results.LastInsertedID();
 
-    for(int i = 0; i < items; i++) {
-        query = StringFormat("INSERT INTO `qs_player_delete_record_entries` SET `event_id` = '%i', "
-                            "`char_slot` = '%i', `item_id` = '%i', `charges` = '%i', `aug_1` = '%i', "
-                            "`aug_2` = '%i', `aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
-                            lastIndex, QS->items[i].char_slot, QS->items[i].item_id, QS->items[i].charges,
-                            QS->items[i].aug_1, QS->items[i].aug_2, QS->items[i].aug_3, QS->items[i].aug_4,
-                            QS->items[i].aug_5);
-        results = QueryDatabase(query);
-        if(!results.Success()) {
-            Log(Logs::Detail, Logs::QS_Server, "Failed Delete Log Record Entry Insert: %s", results.ErrorMessage().c_str());
-            Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
-        }
+	for (int i = 0; i < items; i++) {
+		query   = StringFormat(
+			"INSERT INTO `qs_player_delete_record_entries` SET `event_id` = '%i', "
+			"`char_slot` = '%i', `item_id` = '%i', `charges` = '%i', `aug_1` = '%i', "
+			"`aug_2` = '%i', `aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
+			lastIndex, QS->items[i].char_slot, QS->items[i].item_id, QS->items[i].charges,
+			QS->items[i].aug_1, QS->items[i].aug_2, QS->items[i].aug_3, QS->items[i].aug_4,
+			QS->items[i].aug_5
+		);
+		results = QueryDatabase(query);
+		if (!results.Success()) {
+			LogInfo("Failed Delete Log Record Entry Insert: [{}]", results.ErrorMessage().c_str());
+			LogInfo("[{}]", query.c_str());
+		}
 
-    }
+	}
 
 }
 
-void Database::LogPlayerMove(QSPlayerLogMove_Struct* QS, uint32 items) {
+void Database::LogPlayerMove(QSPlayerLogMove_Struct *QS, uint32 items)
+{
 	/* These are item moves */
 
-	std::string query = StringFormat("INSERT INTO `qs_player_move_record` SET `time` = NOW(), "
-                                    "`char_id` = '%i', `from_slot` = '%i', `to_slot` = '%i', "
-                                    "`stack_size` = '%i', `char_items` = '%i', `postaction` = '%i'",
-                                    QS->char_id, QS->from_slot, QS->to_slot, QS->stack_size,
-                                    QS->char_count, QS->postaction);
-    auto results = QueryDatabase(query);
-	if(!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed Move Log Record Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+	std::string query   = StringFormat(
+		"INSERT INTO `qs_player_move_record` SET `time` = NOW(), "
+		"`char_id` = '%i', `from_slot` = '%i', `to_slot` = '%i', "
+		"`stack_size` = '%i', `char_items` = '%i', `postaction` = '%i'",
+		QS->char_id, QS->from_slot, QS->to_slot, QS->stack_size,
+		QS->char_count, QS->postaction
+	);
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogInfo("Failed Move Log Record Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
-	if(items == 0)
-        return;
+	if (items == 0) {
+		return;
+	}
 
-    int lastIndex = results.LastInsertedID();
-
-    for(int i = 0; i < items; i++) {
-        query = StringFormat("INSERT INTO `qs_player_move_record_entries` SET `event_id` = '%i', "
-                            "`from_slot` = '%i', `to_slot` = '%i', `item_id` = '%i', `charges` = '%i', "
-                            "`aug_1` = '%i', `aug_2` = '%i', `aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
-                            lastIndex, QS->items[i].from_slot, QS->items[i].to_slot, QS->items[i].item_id,
-                            QS->items[i].charges, QS->items[i].aug_1, QS->items[i].aug_2,
-                            QS->items[i].aug_3, QS->items[i].aug_4, QS->items[i].aug_5);
-        results = QueryDatabase(query);
-        if(!results.Success()) {
-            Log(Logs::Detail, Logs::QS_Server, "Failed Move Log Record Entry Insert: %s", results.ErrorMessage().c_str());
-            Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
-        }
-
-    }
+	int lastIndex = results.LastInsertedID();
 
+	for (int i = 0; i < items; i++) {
+		query   = StringFormat(
+			"INSERT INTO `qs_player_move_record_entries` SET `event_id` = '%i', "
+			"`from_slot` = '%i', `to_slot` = '%i', `item_id` = '%i', `charges` = '%i', "
+			"`aug_1` = '%i', `aug_2` = '%i', `aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
+			lastIndex, QS->items[i].from_slot, QS->items[i].to_slot, QS->items[i].item_id,
+			QS->items[i].charges, QS->items[i].aug_1, QS->items[i].aug_2,
+			QS->items[i].aug_3, QS->items[i].aug_4, QS->items[i].aug_5
+		);
+		results = QueryDatabase(query);
+		if (!results.Success()) {
+			LogInfo("Failed Move Log Record Entry Insert: [{}]", results.ErrorMessage().c_str());
+			LogInfo("[{}]", query.c_str());
+		}
+	}
 }
 
-void Database::LogMerchantTransaction(QSMerchantLogTransaction_Struct* QS, uint32 items) {
+void Database::LogMerchantTransaction(QSMerchantLogTransaction_Struct *QS, uint32 items)
+{
 	/* Merchant transactions are from the perspective of the merchant, not the player */
-	std::string query = StringFormat("INSERT INTO `qs_merchant_transaction_record` SET `time` = NOW(), "
-                                    "`zone_id` = '%i', `merchant_id` = '%i', `merchant_pp` = '%i', "
-                                    "`merchant_gp` = '%i', `merchant_sp` = '%i', `merchant_cp` = '%i', "
-                                    "`merchant_items` = '%i', `char_id` = '%i', `char_pp` = '%i', "
-                                    "`char_gp` = '%i', `char_sp` = '%i', `char_cp` = '%i', "
-                                    "`char_items` = '%i'",
-                                    QS->zone_id, QS->merchant_id, QS->merchant_money.platinum,
-                                    QS->merchant_money.gold, QS->merchant_money.silver,
-                                    QS->merchant_money.copper, QS->merchant_count, QS->char_id,
-                                    QS->char_money.platinum, QS->char_money.gold, QS->char_money.silver,
-                                    QS->char_money.copper, QS->char_count);
-    auto results = QueryDatabase(query);
-	if(!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed Transaction Log Record Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+	std::string query   = StringFormat(
+		"INSERT INTO `qs_merchant_transaction_record` SET `time` = NOW(), "
+		"`zone_id` = '%i', `merchant_id` = '%i', `merchant_pp` = '%i', "
+		"`merchant_gp` = '%i', `merchant_sp` = '%i', `merchant_cp` = '%i', "
+		"`merchant_items` = '%i', `char_id` = '%i', `char_pp` = '%i', "
+		"`char_gp` = '%i', `char_sp` = '%i', `char_cp` = '%i', "
+		"`char_items` = '%i'",
+		QS->zone_id, QS->merchant_id, QS->merchant_money.platinum,
+		QS->merchant_money.gold, QS->merchant_money.silver,
+		QS->merchant_money.copper, QS->merchant_count, QS->char_id,
+		QS->char_money.platinum, QS->char_money.gold, QS->char_money.silver,
+		QS->char_money.copper, QS->char_count
+	);
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogInfo("Failed Transaction Log Record Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
-	if(items == 0)
-        return;
+	if (items == 0) {
+		return;
+	}
 
-    int lastIndex = results.LastInsertedID();
+	int lastIndex = results.LastInsertedID();
 
-    for(int i = 0; i < items; i++) {
-        query = StringFormat("INSERT INTO `qs_merchant_transaction_record_entries` SET `event_id` = '%i', "
-                            "`char_slot` = '%i', `item_id` = '%i', `charges` = '%i', `aug_1` = '%i', "
-                            "`aug_2` = '%i', `aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
-                            lastIndex, QS->items[i].char_slot, QS->items[i].item_id, QS->items[i].charges,
-                            QS->items[i].aug_1, QS->items[i].aug_2, QS->items[i].aug_3, QS->items[i].aug_4,
-                            QS->items[i].aug_5);
-        results = QueryDatabase(query);
-        if(!results.Success()) {
-            Log(Logs::Detail, Logs::QS_Server, "Failed Transaction Log Record Entry Insert: %s", results.ErrorMessage().c_str());
-            Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
-        }
+	for (int i = 0; i < items; i++) {
+		query   = StringFormat(
+			"INSERT INTO `qs_merchant_transaction_record_entries` SET `event_id` = '%i', "
+			"`char_slot` = '%i', `item_id` = '%i', `charges` = '%i', `aug_1` = '%i', "
+			"`aug_2` = '%i', `aug_3` = '%i', `aug_4` = '%i', `aug_5` = '%i'",
+			lastIndex, QS->items[i].char_slot, QS->items[i].item_id, QS->items[i].charges,
+			QS->items[i].aug_1, QS->items[i].aug_2, QS->items[i].aug_3, QS->items[i].aug_4,
+			QS->items[i].aug_5
+		);
+		results = QueryDatabase(query);
+		if (!results.Success()) {
+			LogInfo("Failed Transaction Log Record Entry Insert: [{}]", results.ErrorMessage().c_str());
+			LogInfo("[{}]", query.c_str());
+		}
 
-    }
+	}
 
 }
 
-void Database::GeneralQueryReceive(ServerPacket *pack) {
+// this function does not delete the ServerPacket, so it must be handled at call site
+void Database::GeneralQueryReceive(ServerPacket *pack)
+{
 	/*
 		These are general queries passed from anywhere in zone instead of packing structures and breaking them down again and again
 	*/
-	auto queryBuffer = new char[pack->ReadUInt32() + 1];
+	auto queryBuffer    = new char[pack->ReadUInt32() + 1];
 	pack->ReadString(queryBuffer);
 
 	std::string query(queryBuffer);
-	auto results = QueryDatabase(query);
+	auto        results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::Detail, Logs::QS_Server, "Failed Delete Log Record Insert: %s", results.ErrorMessage().c_str());
-		Log(Logs::Detail, Logs::QS_Server, "%s", query.c_str());
+		LogInfo("Failed Delete Log Record Insert: [{}]", results.ErrorMessage().c_str());
+		LogInfo("[{}]", query.c_str());
 	}
 
-	safe_delete(pack);
 	safe_delete_array(queryBuffer);
 }
 
-void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){
+void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
+{
 	std::string query =
-		"SELECT "
-		"log_category_id, "
-		"log_category_description, "
-		"log_to_console, "
-		"log_to_file, "
-		"log_to_gmsay "
-		"FROM "
-		"logsys_categories "
-		"ORDER BY log_category_id";
-	auto results = QueryDatabase(query);
+					"SELECT "
+					"log_category_id, "
+					"log_category_description, "
+					"log_to_console, "
+					"log_to_file, "
+					"log_to_gmsay "
+					"FROM "
+					"logsys_categories "
+					"ORDER BY log_category_id";
 
-	int log_category = 0;
-	LogSys.file_logs_enabled = false;
+	auto results         = QueryDatabase(query);
+	int  log_category_id = 0;
+
+	int *categories_in_database = new int[1000];
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		log_category = atoi(row[0]);
-		log_settings[log_category].log_to_console = atoi(row[2]);
-		log_settings[log_category].log_to_file = atoi(row[3]);
-		log_settings[log_category].log_to_gmsay = atoi(row[4]);
+		log_category_id = atoi(row[0]);
+		if (log_category_id <= Logs::None || log_category_id >= Logs::MaxCategoryID) {
+			continue;
+		}
 
-		/* Determine if any output method is enabled for the category
-			and set it to 1 so it can used to check if category is enabled */
-		const bool log_to_console = log_settings[log_category].log_to_console > 0;
-		const bool log_to_file = log_settings[log_category].log_to_file > 0;
-		const bool log_to_gmsay = log_settings[log_category].log_to_gmsay > 0;
+		log_settings[log_category_id].log_to_console = static_cast<uint8>(atoi(row[2]));
+		log_settings[log_category_id].log_to_file    = static_cast<uint8>(atoi(row[3]));
+		log_settings[log_category_id].log_to_gmsay   = static_cast<uint8>(atoi(row[4]));
+
+		/**
+		 * Determine if any output method is enabled for the category
+		 * and set it to 1 so it can used to check if category is enabled
+		 */
+		const bool log_to_console      = log_settings[log_category_id].log_to_console > 0;
+		const bool log_to_file         = log_settings[log_category_id].log_to_file > 0;
+		const bool log_to_gmsay        = log_settings[log_category_id].log_to_gmsay > 0;
 		const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
 
-		if (is_category_enabled)
-			log_settings[log_category].is_category_enabled = 1;
+		if (is_category_enabled) {
+			log_settings[log_category_id].is_category_enabled = 1;
+		}
 
-		/*
-		This determines whether or not the process needs to actually file log anything.
-		If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
-		*/
-		if (log_settings[log_category].log_to_file > 0){
+		/**
+		 * This determines whether or not the process needs to actually file log anything.
+		 * If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
+		 */
+		if (log_settings[log_category_id].log_to_file > 0) {
 			LogSys.file_logs_enabled = true;
 		}
+
+		categories_in_database[log_category_id] = 1;
 	}
-}
+
+	/**
+	 * Auto inject categories that don't exist in the database...
+	 */
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		if (categories_in_database[log_index] != 1) {
+
+			LogInfo(
+				"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
+				Logs::LogCategoryName[log_index]
+			);
+
+			auto inject_query = fmt::format(
+				"INSERT INTO logsys_categories "
+				"(log_category_id, "
+				"log_category_description, "
+				"log_to_console, "
+				"log_to_file, "
+				"log_to_gmsay) "
+				"VALUES "
+				"({0}, '{1}', {2}, {3}, {4})",
+				log_index,
+				EscapeString(Logs::LogCategoryName[log_index]),
+				std::to_string(log_settings[log_index].log_to_console),
+				std::to_string(log_settings[log_index].log_to_file),
+				std::to_string(log_settings[log_index].log_to_gmsay)
+			);
+
+			QueryDatabase(inject_query);
+		}
+	}
+
+	delete[] categories_in_database;
+}
\ No newline at end of file
diff --git a/queryserv/queryserv.cpp b/queryserv/queryserv.cpp
index cef6e40e3..67a371a8e 100644
--- a/queryserv/queryserv.cpp
+++ b/queryserv/queryserv.cpp
@@ -52,16 +52,16 @@ int main() {
 	set_exception_handler(); 
 	Timer LFGuildExpireTimer(60000);  
 
-	Log(Logs::General, Logs::QS_Server, "Starting EQEmu QueryServ.");
+	LogInfo("Starting EQEmu QueryServ");
 	if (!queryservconfig::LoadConfig()) {
-		Log(Logs::General, Logs::QS_Server, "Loading server configuration failed.");
+		LogInfo("Loading server configuration failed");
 		return 1;
 	}
 
 	Config = queryservconfig::get(); 
 	WorldShortName = Config->ShortName; 
 
-	Log(Logs::General, Logs::QS_Server, "Connecting to MySQL...");
+	LogInfo("Connecting to MySQL");
 	
 	/* MySQL Connection */
 	if (!database.Connect(
@@ -70,7 +70,7 @@ int main() {
 		Config->QSDatabasePassword.c_str(),
 		Config->QSDatabaseDB.c_str(),
 		Config->QSDatabasePort)) {
-		Log(Logs::General, Logs::QS_Server, "Cannot continue without a database connection.");
+		LogInfo("Cannot continue without a database connection");
 		return 1;
 	}
 
@@ -79,11 +79,11 @@ int main() {
 	LogSys.StartFileLogs();
 
 	if (signal(SIGINT, CatchSignal) == SIG_ERR)	{
-		Log(Logs::General, Logs::QS_Server, "Could not set signal handler");
+		LogInfo("Could not set signal handler");
 		return 1;
 	}
 	if (signal(SIGTERM, CatchSignal) == SIG_ERR)	{
-		Log(Logs::General, Logs::QS_Server, "Could not set signal handler");
+		LogInfo("Could not set signal handler");
 		return 1;
 	}
 
diff --git a/queryserv/worldserver.cpp b/queryserv/worldserver.cpp
index a03d23b1e..ec34ce7bb 100644
--- a/queryserv/worldserver.cpp
+++ b/queryserv/worldserver.cpp
@@ -168,7 +168,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 			break;
 		}
 		default:
-			Log(Logs::Detail, Logs::QS_Server, "Received unhandled ServerOP_QueryServGeneric", Type);
+			LogInfo("Received unhandled ServerOP_QueryServGeneric", Type);
 			break;
 		}
 		break;
diff --git a/shared_memory/CMakeLists.txt b/shared_memory/CMakeLists.txt
index 1844df758..6902a8b83 100644
--- a/shared_memory/CMakeLists.txt
+++ b/shared_memory/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(shared_memory_sources
 	base_data.cpp
diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp
index 63280adc0..69b46d896 100644
--- a/shared_memory/main.cpp
+++ b/shared_memory/main.cpp
@@ -74,20 +74,19 @@ int main(int argc, char **argv) {
 	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	Log(Logs::General, Logs::Status, "Shared Memory Loader Program");
+	LogInfo("Shared Memory Loader Program");
 	if(!EQEmuConfig::LoadConfig()) {
-		Log(Logs::General, Logs::Error, "Unable to load configuration file.");
+		LogError("Unable to load configuration file");
 		return 1;
 	}
 
 	auto Config = EQEmuConfig::get();
 
 	SharedDatabase database;
-	Log(Logs::General, Logs::Status, "Connecting to database...");
+	LogInfo("Connecting to database");
 	if(!database.Connect(Config->DatabaseHost.c_str(), Config->DatabaseUsername.c_str(),
 		Config->DatabasePassword.c_str(), Config->DatabaseDB.c_str(), Config->DatabasePort)) {
-		Log(Logs::General, Logs::Error, "Unable to connect to the database, cannot continue without a "
-			"database connection");
+		LogError("Unable to connect to the database, cannot continue without a database connection");
 		return 1;
 	}
 
@@ -97,7 +96,7 @@ int main(int argc, char **argv) {
 
 	std::string shared_mem_directory = Config->SharedMemDir;
 	if (MakeDirectory(shared_mem_directory)) {
-		Log(Logs::General, Logs::Status, "Shared Memory folder doesn't exist, so we created it... '%s'", shared_mem_directory.c_str());
+		LogInfo("Shared Memory folder doesn't exist, so we created it [{}]", shared_mem_directory.c_str());
 	}
 
 	database.LoadVariables();
@@ -106,7 +105,7 @@ int main(int argc, char **argv) {
 	std::string db_hotfix_name;
 	if (database.GetVariable("hotfix_name", db_hotfix_name)) {
 		if (!db_hotfix_name.empty() && strcasecmp("hotfix_", db_hotfix_name.c_str()) == 0) {
-			Log(Logs::General, Logs::Status, "Current hotfix in variables is the default %s, clearing out variable", db_hotfix_name.c_str());
+			LogInfo("Current hotfix in variables is the default [{}], clearing out variable", db_hotfix_name.c_str());
 			std::string query = StringFormat("UPDATE `variables` SET `value`='' WHERE (`varname`='hotfix_name')");
 			database.QueryDatabase(query);
 		}
@@ -177,65 +176,65 @@ int main(int argc, char **argv) {
 	}
 
 	if(hotfix_name.length() > 0) {
-		Log(Logs::General, Logs::Status, "Writing data for hotfix '%s'", hotfix_name.c_str());
+		LogInfo("Writing data for hotfix [{}]", hotfix_name.c_str());
 	}
 	
 	if(load_all || load_items) {
-		Log(Logs::General, Logs::Status, "Loading items...");
+		LogInfo("Loading items");
 		try {
 			LoadItems(&database, hotfix_name);
 		} catch(std::exception &ex) {
-			Log(Logs::General, Logs::Error, "%s", ex.what());
+			LogError("{}", ex.what());
 			return 1;
 		}
 	}
 	
 	if(load_all || load_factions) {
-		Log(Logs::General, Logs::Status, "Loading factions...");
+		LogInfo("Loading factions");
 		try {
 			LoadFactions(&database, hotfix_name);
 		} catch(std::exception &ex) {
-			Log(Logs::General, Logs::Error, "%s", ex.what());
+			LogError("{}", ex.what());
 			return 1;
 		}
 	}
 	
 	if(load_all || load_loot) {
-		Log(Logs::General, Logs::Status, "Loading loot...");
+		LogInfo("Loading loot");
 		try {
 			LoadLoot(&database, hotfix_name);
 		} catch(std::exception &ex) {
-			Log(Logs::General, Logs::Error, "%s", ex.what());
+			LogError("{}", ex.what());
 			return 1;
 		}
 	}
 	
 	if(load_all || load_skill_caps) {
-		Log(Logs::General, Logs::Status, "Loading skill caps...");
+		LogInfo("Loading skill caps");
 		try {
 			LoadSkillCaps(&database, hotfix_name);
 		} catch(std::exception &ex) {
-			Log(Logs::General, Logs::Error, "%s", ex.what());
+			LogError("{}", ex.what());
 			return 1;
 		}
 	}
 	
 	if(load_all || load_spells) {
-		Log(Logs::General, Logs::Status, "Loading spells...");
+		LogInfo("Loading spells");
 		try {
 			LoadSpells(&database, hotfix_name);
 		} catch(std::exception &ex) {
-			Log(Logs::General, Logs::Error, "%s", ex.what());
+			LogError("{}", ex.what());
 			return 1;
 		}
 	}
 	
 	if(load_all || load_bd) {
-		Log(Logs::General, Logs::Status, "Loading base data...");
+		LogInfo("Loading base data");
 		try {
 			LoadBaseData(&database, hotfix_name);
 		} catch(std::exception &ex) {
-			Log(Logs::General, Logs::Error, "%s", ex.what());
+			LogError("{}", ex.what());
 			return 1;
 		}
 	}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b404bab99..e7b97b57f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 ADD_SUBDIRECTORY(cppunit)
 
diff --git a/tests/cppunit/CMakeLists.txt b/tests/cppunit/CMakeLists.txt
index e60e2134f..16747f785 100644
--- a/tests/cppunit/CMakeLists.txt
+++ b/tests/cppunit/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(cppunit_sources
 	collectoroutput.cpp
diff --git a/ucs/CMakeLists.txt b/ucs/CMakeLists.txt
index e09e12781..a1c0b32b4 100644
--- a/ucs/CMakeLists.txt
+++ b/ucs/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(ucs_sources
 	chatchannel.cpp
diff --git a/ucs/chatchannel.cpp b/ucs/chatchannel.cpp
index 11a000712..001f7b1e7 100644
--- a/ucs/chatchannel.cpp
+++ b/ucs/chatchannel.cpp
@@ -47,8 +47,8 @@ ChatChannel::ChatChannel(std::string inName, std::string inOwner, std::string in
 
 	Moderated = false;
 
-	Log(Logs::Detail, Logs::UCS_Server, "New ChatChannel created: Name: [%s], Owner: [%s], Password: [%s], MinStatus: %i",
-					Name.c_str(), Owner.c_str(), Password.c_str(), MinimumStatus);
+	LogInfo("New ChatChannel created: Name: [[{}]], Owner: [[{}]], Password: [[{}]], MinStatus: [{}]",
+		Name.c_str(), Owner.c_str(), Password.c_str(), MinimumStatus);
 
 }
 
@@ -154,7 +154,7 @@ void ChatChannelList::SendAllChannels(Client *c) {
 
 void ChatChannelList::RemoveChannel(ChatChannel *Channel) {
 
-	Log(Logs::Detail, Logs::UCS_Server, "RemoveChannel(%s)", Channel->GetName().c_str());
+	LogInfo("RemoveChannel([{}])", Channel->GetName().c_str());
 
 	LinkedListIterator<ChatChannel*> iterator(ChatChannels);
 
@@ -175,7 +175,7 @@ void ChatChannelList::RemoveChannel(ChatChannel *Channel) {
 
 void ChatChannelList::RemoveAllChannels() {
 
-	Log(Logs::Detail, Logs::UCS_Server, "RemoveAllChannels");
+	LogInfo("RemoveAllChannels");
 
 	LinkedListIterator<ChatChannel*> iterator(ChatChannels);
 
@@ -233,7 +233,7 @@ void ChatChannel::AddClient(Client *c) {
 
 	if(IsClientInChannel(c)) {
 
-		Log(Logs::Detail, Logs::UCS_Server, "Client %s already in channel %s", c->GetName().c_str(), GetName().c_str());
+		LogInfo("Client [{}] already in channel [{}]", c->GetName().c_str(), GetName().c_str());
 
 		return;
 	}
@@ -242,7 +242,7 @@ void ChatChannel::AddClient(Client *c) {
 
 	int AccountStatus = c->GetAccountStatus();
 
-	Log(Logs::Detail, Logs::UCS_Server, "Adding %s to channel %s", c->GetName().c_str(), Name.c_str());
+	LogInfo("Adding [{}] to channel [{}]", c->GetName().c_str(), Name.c_str());
 
 	LinkedListIterator<Client*> iterator(ClientsInChannel);
 
@@ -267,7 +267,7 @@ bool ChatChannel::RemoveClient(Client *c) {
 
 	if(!c) return false;
 
-	Log(Logs::Detail, Logs::UCS_Server, "RemoveClient %s from channel %s", c->GetName().c_str(), GetName().c_str());
+	LogInfo("RemoveClient [{}] from channel [{}]", c->GetName().c_str(), GetName().c_str());
 
 	bool HideMe = c->GetHideMe();
 
@@ -304,7 +304,7 @@ bool ChatChannel::RemoveClient(Client *c) {
 		if((Password.length() == 0) || (RuleI(Channels, DeleteTimer) == 0))
 			return false;
 
-		Log(Logs::Detail, Logs::UCS_Server, "Starting delete timer for empty password protected channel %s", Name.c_str());
+		LogInfo("Starting delete timer for empty password protected channel [{}]", Name.c_str());
 
 		DeleteTimer.Start(RuleI(Channels, DeleteTimer) * 60000);
 	}
@@ -402,8 +402,8 @@ void ChatChannel::SendMessageToChannel(std::string Message, Client* Sender) {
 
 		if(ChannelClient)
 		{
-			Log(Logs::Detail, Logs::UCS_Server, "Sending message to %s from %s",
-					ChannelClient->GetName().c_str(), Sender->GetName().c_str());
+			LogInfo("Sending message to [{}] from [{}]",
+				ChannelClient->GetName().c_str(), Sender->GetName().c_str());
 
 			if (cv_messages[static_cast<uint32>(ChannelClient->GetClientVersion())].length() == 0) {
 				switch (ChannelClient->GetClientVersion()) {
@@ -505,7 +505,7 @@ ChatChannel *ChatChannelList::AddClientToChannel(std::string ChannelName, Client
 		return nullptr;
 	}
 
-	Log(Logs::Detail, Logs::UCS_Server, "AddClient to channel [%s] with password [%s]", NormalisedName.c_str(), Password.c_str());
+	LogInfo("AddClient to channel [[{}]] with password [[{}]]", NormalisedName.c_str(), Password.c_str());
 
 	ChatChannel *RequiredChannel = FindChannel(NormalisedName);
 
@@ -581,7 +581,7 @@ void ChatChannelList::Process() {
 
 		if(CurrentChannel && CurrentChannel->ReadyToDelete()) {
 
-			Log(Logs::Detail, Logs::UCS_Server, "Empty temporary password protected channel %s being destroyed.",
+			LogInfo("Empty temporary password protected channel [{}] being destroyed",
 				CurrentChannel->GetName().c_str());
 
 			RemoveChannel(CurrentChannel);
@@ -597,7 +597,7 @@ void ChatChannel::AddInvitee(const std::string &Invitee)
 	if (!IsInvitee(Invitee)) {
 		Invitees.push_back(Invitee);
 
-		Log(Logs::Detail, Logs::UCS_Server, "Added %s as invitee to channel %s", Invitee.c_str(), Name.c_str());
+		LogInfo("Added [{}] as invitee to channel [{}]", Invitee.c_str(), Name.c_str());
 	}
 
 }
@@ -608,7 +608,7 @@ void ChatChannel::RemoveInvitee(std::string Invitee)
 
 	if(it != std::end(Invitees)) {
 		Invitees.erase(it);
-		Log(Logs::Detail, Logs::UCS_Server, "Removed %s as invitee to channel %s", Invitee.c_str(), Name.c_str());
+		LogInfo("Removed [{}] as invitee to channel [{}]", Invitee.c_str(), Name.c_str());
 	}
 }
 
@@ -622,7 +622,7 @@ void ChatChannel::AddModerator(const std::string &Moderator)
 	if (!IsModerator(Moderator)) {
 		Moderators.push_back(Moderator);
 
-		Log(Logs::Detail, Logs::UCS_Server, "Added %s as moderator to channel %s", Moderator.c_str(), Name.c_str());
+		LogInfo("Added [{}] as moderator to channel [{}]", Moderator.c_str(), Name.c_str());
 	}
 
 }
@@ -633,7 +633,7 @@ void ChatChannel::RemoveModerator(const std::string &Moderator)
 
 	if (it != std::end(Moderators)) {
 		Moderators.erase(it);
-		Log(Logs::Detail, Logs::UCS_Server, "Removed %s as moderator to channel %s", Moderator.c_str(), Name.c_str());
+		LogInfo("Removed [{}] as moderator to channel [{}]", Moderator.c_str(), Name.c_str());
 	}
 }
 
@@ -647,7 +647,7 @@ void ChatChannel::AddVoice(const std::string &inVoiced)
 	if (!HasVoice(inVoiced)) {
 		Voiced.push_back(inVoiced);
 
-		Log(Logs::Detail, Logs::UCS_Server, "Added %s as voiced to channel %s", inVoiced.c_str(), Name.c_str());
+		LogInfo("Added [{}] as voiced to channel [{}]", inVoiced.c_str(), Name.c_str());
 	}
 }
 
@@ -658,7 +658,7 @@ void ChatChannel::RemoveVoice(const std::string &inVoiced)
 	if (it != std::end(Voiced)) {
 		Voiced.erase(it);
 
-		Log(Logs::Detail, Logs::UCS_Server, "Removed %s as voiced to channel %s", inVoiced.c_str(), Name.c_str());
+		LogInfo("Removed [{}] as voiced to channel [{}]", inVoiced.c_str(), Name.c_str());
 	}
 }
 
diff --git a/ucs/clientlist.cpp b/ucs/clientlist.cpp
index a433705e6..429f28fbf 100644
--- a/ucs/clientlist.cpp
+++ b/ucs/clientlist.cpp
@@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/global_define.h"
 #include "../common/string_util.h"
 #include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
 #include "../common/misc_functions.h"
 
 #include "ucsconfig.h"
@@ -236,7 +235,7 @@ std::vector<std::string> ParseRecipients(std::string RecipientString) {
 
 static void ProcessMailTo(Client *c, std::string MailMessage) {
 
-	Log(Logs::Detail, Logs::UCS_Server, "MAILTO: From %s, %s", c->MailBoxName().c_str(), MailMessage.c_str());
+	LogInfo("MAILTO: From [{}], [{}]", c->MailBoxName().c_str(), MailMessage.c_str());
 
 	std::vector<std::string> Recipients;
 
@@ -305,7 +304,7 @@ static void ProcessMailTo(Client *c, std::string MailMessage) {
 
 		if (!database.SendMail(Recipient, c->MailBoxName(), Subject, Body, RecipientsString)) {
 
-			Log(Logs::Detail, Logs::UCS_Server, "Failed in SendMail(%s, %s, %s, %s)", Recipient.c_str(),
+			LogInfo("Failed in SendMail([{}], [{}], [{}], [{}])", Recipient.c_str(),
 				c->MailBoxName().c_str(), Subject.c_str(), RecipientsString.c_str());
 
 			int PacketLength = 10 + Recipient.length() + Subject.length();
@@ -398,7 +397,7 @@ static void ProcessSetMessageStatus(std::string SetMessageCommand) {
 
 static void ProcessCommandBuddy(Client *c, std::string Buddy) {
 
-	Log(Logs::Detail, Logs::UCS_Server, "Received buddy command with parameters %s", Buddy.c_str());
+	LogInfo("Received buddy command with parameters [{}]", Buddy.c_str());
 	c->GeneralChannelMessage("Buddy list modified");
 
 	uint8 SubAction = 1;
@@ -427,7 +426,7 @@ static void ProcessCommandBuddy(Client *c, std::string Buddy) {
 
 static void ProcessCommandIgnore(Client *c, std::string Ignoree) {
 
-	Log(Logs::Detail, Logs::UCS_Server, "Received ignore command with parameters %s", Ignoree.c_str());
+	LogInfo("Received ignore command with parameters [{}]", Ignoree.c_str());
 	c->GeneralChannelMessage("Ignore list modified");
 
 	uint8 SubAction = 0;
@@ -471,7 +470,7 @@ static void ProcessCommandIgnore(Client *c, std::string Ignoree) {
 Clientlist::Clientlist(int ChatPort) {
 	EQStreamManagerInterfaceOptions chat_opts(ChatPort, false, false);
 	chat_opts.opcode_size = 1;
-	chat_opts.daybreak_options.stale_connection_ms = 300000;
+	chat_opts.daybreak_options.stale_connection_ms = 600000;
 	chat_opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS);
 	chat_opts.daybreak_options.resend_delay_factor = RuleR(Network, ResendDelayFactor);
 	chat_opts.daybreak_options.resend_delay_min = RuleI(Network, ResendDelayMinMS);
@@ -483,12 +482,12 @@ Clientlist::Clientlist(int ChatPort) {
 
 	const ucsconfig *Config = ucsconfig::get();
 
-	Log(Logs::General, Logs::UCS_Server, "Loading '%s'", Config->MailOpCodesFile.c_str());
+	LogInfo("Loading [{}]", Config->MailOpCodesFile.c_str());
 	if (!ChatOpMgr->LoadOpcodes(Config->MailOpCodesFile.c_str()))
 		exit(1);
 
 	chatsf->OnNewConnection([this](std::shared_ptr<EQ::Net::EQStream> stream) {
-		LogF(Logs::General, Logs::Login_Server, "New Client UDP connection from {0}:{1}", stream->GetRemoteIP(), stream->GetRemotePort());
+		LogF(Logs::General, Logs::Loginserver, "New Client UDP connection from {0}:{1}", stream->GetRemoteIP(), stream->GetRemotePort());
 		stream->SetOpcodeManager(&ChatOpMgr);
 
 		auto c = new Client(stream);
@@ -568,13 +567,13 @@ void Clientlist::CheckForStaleConnections(Client *c) {
 		if (((*Iterator) != c) && ((c->GetName() == (*Iterator)->GetName())
 			&& (c->GetConnectionType() == (*Iterator)->GetConnectionType()))) {
 
-			Log(Logs::Detail, Logs::UCS_Server, "Removing old connection for %s", c->GetName().c_str());
+			LogInfo("Removing old connection for [{}]", c->GetName().c_str());
 
 			struct in_addr in;
 
 			in.s_addr = (*Iterator)->ClientStream->GetRemoteIP();
 
-			Log(Logs::Detail, Logs::UCS_Server, "Client connection from %s:%d closed.", inet_ntoa(in),
+			LogInfo("Client connection from [{}]:[{}] closed", inet_ntoa(in),
 				ntohs((*Iterator)->ClientStream->GetRemotePort()));
 
 			safe_delete((*Iterator));
@@ -593,7 +592,7 @@ void Clientlist::Process()
 			struct in_addr in;
 			in.s_addr = (*it)->ClientStream->GetRemoteIP();
 
-			Log(Logs::Detail, Logs::UCS_Server, "Client connection from %s:%d closed.", inet_ntoa(in),
+			LogInfo("Client connection from [{}]:[{}] closed", inet_ntoa(in),
 				ntohs((*it)->ClientStream->GetRemotePort()));
 
 			safe_delete((*it));
@@ -619,8 +618,7 @@ void Clientlist::Process()
 				VARSTRUCT_DECODE_STRING(MailBox, PacketBuffer);
 
 				if (strlen(PacketBuffer) != 9) {
-					Log(Logs::Detail, Logs::UCS_Server,
-						"Mail key is the wrong size. Version of world incompatible with UCS.");
+					LogInfo("Mail key is the wrong size. Version of world incompatible with UCS.");
 					KeyValid = false;
 					break;
 				}
@@ -641,12 +639,11 @@ void Clientlist::Process()
 				else
 					CharacterName = MailBoxString.substr(LastPeriod + 1);
 
-				Log(Logs::Detail, Logs::UCS_Server, "Received login for user %s with key %s",
+				LogInfo("Received login for user [{}] with key [{}]",
 					MailBox, Key);
 
 				if (!database.VerifyMailKey(CharacterName, (*it)->ClientStream->GetRemoteIP(), Key)) {
-					Log(Logs::Detail, Logs::UCS_Server,
-						"Chat Key for %s does not match, closing connection.", MailBox);
+					LogError("Chat Key for [{}] does not match, closing connection.", MailBox);
 					KeyValid = false;
 					break;
 				}
@@ -671,7 +668,7 @@ void Clientlist::Process()
 			}
 
 			default: {
-				Log(Logs::Detail, Logs::UCS_Server, "Unhandled chat opcode %8X", opcode);
+				LogInfo("Unhandled chat opcode {:#04x}", opcode);
 				break;
 			}
 			}
@@ -681,10 +678,9 @@ void Clientlist::Process()
 			struct in_addr in;
 			in.s_addr = (*it)->ClientStream->GetRemoteIP();
 
-			Log(Logs::Detail, Logs::UCS_Server,
-				"Force disconnecting client: %s:%d, KeyValid=%i, GetForceDisconnect()=%i",
-				inet_ntoa(in), ntohs((*it)->ClientStream->GetRemotePort()), KeyValid,
-				(*it)->GetForceDisconnect());
+			LogInfo("Force disconnecting client: [{}]:[{}], KeyValid=[{}], GetForceDisconnect()=[{}]",
+					inet_ntoa(in), ntohs((*it)->ClientStream->GetRemotePort()), KeyValid,
+					(*it)->GetForceDisconnect());
 
 			(*it)->ClientStream->Close();
 
@@ -824,7 +820,7 @@ void Clientlist::ProcessOPMailCommand(Client *c, std::string CommandString)
 		break;
 
 	case CommandSetMessageStatus:
-		Log(Logs::Detail, Logs::UCS_Server, "Set Message Status, Params: %s", Parameters.c_str());
+		LogInfo("Set Message Status, Params: [{}]", Parameters.c_str());
 		ProcessSetMessageStatus(Parameters);
 		break;
 
@@ -849,7 +845,7 @@ void Clientlist::ProcessOPMailCommand(Client *c, std::string CommandString)
 
 	default:
 		c->SendHelp();
-		Log(Logs::Detail, Logs::UCS_Server, "Unhandled OP_Mail command: %s", CommandString.c_str());
+		LogInfo("Unhandled OP_Mail command: [{}]", CommandString.c_str());
 	}
 }
 
@@ -860,7 +856,7 @@ void Clientlist::CloseAllConnections() {
 
 	for (Iterator = ClientChatConnections.begin(); Iterator != ClientChatConnections.end(); ++Iterator) {
 
-		Log(Logs::Detail, Logs::UCS_Server, "Removing client %s", (*Iterator)->GetName().c_str());
+		LogInfo("Removing client [{}]", (*Iterator)->GetName().c_str());
 
 		(*Iterator)->CloseConnection();
 	}
@@ -869,7 +865,7 @@ void Clientlist::CloseAllConnections() {
 void Client::AddCharacter(int CharID, const char *CharacterName, int Level) {
 
 	if (!CharacterName) return;
-	Log(Logs::Detail, Logs::UCS_Server, "Adding character %s with ID %i for %s", CharacterName, CharID, GetName().c_str());
+	LogInfo("Adding character [{}] with ID [{}] for [{}]", CharacterName, CharID, GetName().c_str());
 	CharacterEntry NewCharacter;
 	NewCharacter.CharID = CharID;
 	NewCharacter.Name = CharacterName;
@@ -934,7 +930,7 @@ void Client::AddToChannelList(ChatChannel *JoinedChannel) {
 	for (int i = 0; i < MAX_JOINED_CHANNELS; i++)
 		if (JoinedChannels[i] == nullptr) {
 			JoinedChannels[i] = JoinedChannel;
-			Log(Logs::Detail, Logs::UCS_Server, "Added Channel %s to slot %i for %s", JoinedChannel->GetName().c_str(), i + 1, GetName().c_str());
+			LogInfo("Added Channel [{}] to slot [{}] for [{}]", JoinedChannel->GetName().c_str(), i + 1, GetName().c_str());
 			return;
 		}
 }
@@ -975,7 +971,7 @@ void Client::JoinChannels(std::string ChannelNameList) {
 		}
 	}
 
-	Log(Logs::Detail, Logs::UCS_Server, "Client: %s joining channels %s", GetName().c_str(), ChannelNameList.c_str());
+	LogInfo("Client: [{}] joining channels [{}]", GetName().c_str(), ChannelNameList.c_str());
 
 	int NumberOfChannels = ChannelCount();
 
@@ -1074,7 +1070,7 @@ void Client::JoinChannels(std::string ChannelNameList) {
 
 void Client::LeaveChannels(std::string ChannelNameList) {
 
-	Log(Logs::Detail, Logs::UCS_Server, "Client: %s leaving channels %s", GetName().c_str(), ChannelNameList.c_str());
+	LogInfo("Client: [{}] leaving channels [{}]", GetName().c_str(), ChannelNameList.c_str());
 
 	std::string::size_type CurrentPos = 0;
 
@@ -1250,7 +1246,7 @@ void Client::SendChannelMessage(std::string Message)
 
 	std::string ChannelName = Message.substr(1, MessageStart - 1);
 
-	Log(Logs::Detail, Logs::UCS_Server, "%s tells %s, [%s]", GetName().c_str(), ChannelName.c_str(), Message.substr(MessageStart + 1).c_str());
+	LogInfo("[{}] tells [{}], [[{}]]", GetName().c_str(), ChannelName.c_str(), Message.substr(MessageStart + 1).c_str());
 
 	ChatChannel *RequiredChannel = ChannelList->FindChannel(ChannelName);
 
@@ -1393,7 +1389,7 @@ void Client::SendChannelMessageByNumber(std::string Message) {
 		}
 	}
 
-	Log(Logs::Detail, Logs::UCS_Server, "%s tells %s, [%s]", GetName().c_str(), RequiredChannel->GetName().c_str(),
+	LogInfo("[{}] tells [{}], [[{}]]", GetName().c_str(), RequiredChannel->GetName().c_str(),
 		Message.substr(MessageStart + 1).c_str());
 
 	if (RuleB(Chat, EnableAntiSpam))
@@ -1601,7 +1597,7 @@ void Client::SetChannelPassword(std::string ChannelPassword) {
 	else
 		Message = "Password change on channel " + ChannelName;
 
-	Log(Logs::Detail, Logs::UCS_Server, "Set password of channel [%s] to [%s] by %s", ChannelName.c_str(), Password.c_str(), GetName().c_str());
+	LogInfo("Set password of channel [[{}]] to [[{}]] by [{}]", ChannelName.c_str(), Password.c_str(), GetName().c_str());
 
 	ChatChannel *RequiredChannel = ChannelList->FindChannel(ChannelName);
 
@@ -1656,7 +1652,7 @@ void Client::SetChannelOwner(std::string CommandString) {
 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
 		ChannelName = ChannelSlotName(atoi(ChannelName.c_str()));
 
-	Log(Logs::Detail, Logs::UCS_Server, "Set owner of channel [%s] to [%s]", ChannelName.c_str(), NewOwner.c_str());
+	LogInfo("Set owner of channel [[{}]] to [[{}]]", ChannelName.c_str(), NewOwner.c_str());
 
 	ChatChannel *RequiredChannel = ChannelList->FindChannel(ChannelName);
 
@@ -1744,7 +1740,7 @@ void Client::ChannelInvite(std::string CommandString) {
 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
 		ChannelName = ChannelSlotName(atoi(ChannelName.c_str()));
 
-	Log(Logs::Detail, Logs::UCS_Server, "[%s] invites [%s] to channel [%s]", GetName().c_str(), Invitee.c_str(), ChannelName.c_str());
+	LogInfo("[[{}]] invites [[{}]] to channel [[{}]]", GetName().c_str(), Invitee.c_str(), ChannelName.c_str());
 
 	Client *RequiredClient = g_Clientlist->FindCharacter(Invitee);
 
@@ -1872,7 +1868,7 @@ void Client::ChannelGrantModerator(std::string CommandString) {
 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
 		ChannelName = ChannelSlotName(atoi(ChannelName.c_str()));
 
-	Log(Logs::Detail, Logs::UCS_Server, "[%s] gives [%s] moderator rights to channel [%s]", GetName().c_str(), Moderator.c_str(), ChannelName.c_str());
+	LogInfo("[[{}]] gives [[{}]] moderator rights to channel [[{}]]", GetName().c_str(), Moderator.c_str(), ChannelName.c_str());
 
 	Client *RequiredClient = g_Clientlist->FindCharacter(Moderator);
 
@@ -1953,7 +1949,7 @@ void Client::ChannelGrantVoice(std::string CommandString) {
 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
 		ChannelName = ChannelSlotName(atoi(ChannelName.c_str()));
 
-	Log(Logs::Detail, Logs::UCS_Server, "[%s] gives [%s] voice to channel [%s]", GetName().c_str(), Voicee.c_str(), ChannelName.c_str());
+	LogInfo("[[{}]] gives [[{}]] voice to channel [[{}]]", GetName().c_str(), Voicee.c_str(), ChannelName.c_str());
 
 	Client *RequiredClient = g_Clientlist->FindCharacter(Voicee);
 
@@ -2041,7 +2037,7 @@ void Client::ChannelKick(std::string CommandString) {
 	if ((ChannelName.length() > 0) && isdigit(ChannelName[0]))
 		ChannelName = ChannelSlotName(atoi(ChannelName.c_str()));
 
-	Log(Logs::Detail, Logs::UCS_Server, "[%s] kicks [%s] from channel [%s]", GetName().c_str(), Kickee.c_str(), ChannelName.c_str());
+	LogInfo("[[{}]] kicks [[{}]] from channel [[{}]]", GetName().c_str(), Kickee.c_str(), ChannelName.c_str());
 
 	Client *RequiredClient = g_Clientlist->FindCharacter(Kickee);
 
@@ -2151,28 +2147,28 @@ void Client::SetConnectionType(char c) {
 	{
 		TypeOfConnection = ConnectionTypeChat;
 		ClientVersion_ = EQEmu::versions::ClientVersion::Titanium;
-		Log(Logs::Detail, Logs::UCS_Server, "Connection type is Chat (Titanium)");
+		LogInfo("Connection type is Chat (Titanium)");
 		break;
 	}
 	case EQEmu::versions::ucsTitaniumMail:
 	{
 		TypeOfConnection = ConnectionTypeMail;
 		ClientVersion_ = EQEmu::versions::ClientVersion::Titanium;
-		Log(Logs::Detail, Logs::UCS_Server, "Connection type is Mail (Titanium)");
+		LogInfo("Connection type is Mail (Titanium)");
 		break;
 	}
 	case EQEmu::versions::ucsSoFCombined:
 	{
 		TypeOfConnection = ConnectionTypeCombined;
 		ClientVersion_ = EQEmu::versions::ClientVersion::SoF;
-		Log(Logs::Detail, Logs::UCS_Server, "Connection type is Combined (SoF)");
+		LogInfo("Connection type is Combined (SoF)");
 		break;
 	}
 	case EQEmu::versions::ucsSoDCombined:
 	{
 		TypeOfConnection = ConnectionTypeCombined;
 		ClientVersion_ = EQEmu::versions::ClientVersion::SoD;
-		Log(Logs::Detail, Logs::UCS_Server, "Connection type is Combined (SoD)");
+		LogInfo("Connection type is Combined (SoD)");
 		break;
 	}
 	case EQEmu::versions::ucsUFCombined:
@@ -2180,7 +2176,7 @@ void Client::SetConnectionType(char c) {
 		TypeOfConnection = ConnectionTypeCombined;
 		ClientVersion_ = EQEmu::versions::ClientVersion::UF;
 		UnderfootOrLater = true;
-		Log(Logs::Detail, Logs::UCS_Server, "Connection type is Combined (Underfoot)");
+		LogInfo("Connection type is Combined (Underfoot)");
 		break;
 	}
 	case EQEmu::versions::ucsRoFCombined:
@@ -2188,7 +2184,7 @@ void Client::SetConnectionType(char c) {
 		TypeOfConnection = ConnectionTypeCombined;
 		ClientVersion_ = EQEmu::versions::ClientVersion::RoF;
 		UnderfootOrLater = true;
-		Log(Logs::Detail, Logs::UCS_Server, "Connection type is Combined (RoF)");
+		LogInfo("Connection type is Combined (RoF)");
 		break;
 	}
 	case EQEmu::versions::ucsRoF2Combined:
@@ -2196,14 +2192,14 @@ void Client::SetConnectionType(char c) {
 		TypeOfConnection = ConnectionTypeCombined;
 		ClientVersion_ = EQEmu::versions::ClientVersion::RoF2;
 		UnderfootOrLater = true;
-		Log(Logs::Detail, Logs::UCS_Server, "Connection type is Combined (RoF2)");
+		LogInfo("Connection type is Combined (RoF2)");
 		break;
 	}
 	default:
 	{
 		TypeOfConnection = ConnectionTypeUnknown;
 		ClientVersion_ = EQEmu::versions::ClientVersion::Unknown;
-		Log(Logs::Detail, Logs::UCS_Server, "Connection type is unknown.");
+		LogInfo("Connection type is unknown");
 	}
 	}
 }
@@ -2280,12 +2276,12 @@ void Client::SendNotification(int MailBoxNumber, std::string Subject, std::strin
 
 void Client::ChangeMailBox(int NewMailBox)
 {
-	Log(Logs::Detail, Logs::UCS_Server, "%s Change to mailbox %i", MailBoxName().c_str(), NewMailBox);
+	LogInfo("[{}] Change to mailbox [{}]", MailBoxName().c_str(), NewMailBox);
 
 	SetMailBox(NewMailBox);
 	auto id = std::to_string(NewMailBox);
 
-	Log(Logs::Detail, Logs::UCS_Server, "New mailbox is %s", MailBoxName().c_str());
+	LogInfo("New mailbox is [{}]", MailBoxName().c_str());
 
 	auto outapp = new EQApplicationPacket(OP_MailboxChange, id.length() + 1);
 
@@ -2354,13 +2350,13 @@ std::string Client::MailBoxName() {
 
 	if ((Characters.empty()) || (CurrentMailBox > (Characters.size() - 1)))
 	{
-		Log(Logs::Detail, Logs::UCS_Server, "MailBoxName() called with CurrentMailBox set to %i and Characters.size() is %i",
+		LogInfo("MailBoxName() called with CurrentMailBox set to [{}] and Characters.size() is [{}]",
 			CurrentMailBox, Characters.size());
 
 		return "";
 	}
 
-	Log(Logs::Detail, Logs::UCS_Server, "MailBoxName() called with CurrentMailBox set to %i and Characters.size() is %i",
+	LogInfo("MailBoxName() called with CurrentMailBox set to [{}] and Characters.size() is [{}]",
 		CurrentMailBox, Characters.size());
 
 	return Characters[CurrentMailBox].Name;
diff --git a/ucs/database.cpp b/ucs/database.cpp
index 5104c851d..d756f1ff4 100644
--- a/ucs/database.cpp
+++ b/ucs/database.cpp
@@ -38,8 +38,10 @@
 #define strncasecmp	_strnicmp
 #define strcasecmp	_stricmp
 #else
+
 #include "../common/unix.h"
 #include <netinet/in.h>
+
 #endif
 
 #include "database.h"
@@ -48,12 +50,12 @@
 #include "../common/string_util.h"
 #include "chatchannel.h"
 
-extern Clientlist *g_Clientlist;
+extern Clientlist      *g_Clientlist;
 extern std::string GetMailPrefix();
 extern ChatChannelList *ChannelList;
-extern uint32 MailMessagesSent;
+extern uint32          MailMessagesSent;
 
-Database::Database ()
+Database::Database()
 {
 	DBInitVars();
 }
@@ -62,37 +64,36 @@ Database::Database ()
 Establish a connection to a mysql database with the supplied parameters
 */
 
-Database::Database(const char* host, const char* user, const char* passwd, const char* database, uint32 port)
+Database::Database(const char *host, const char *user, const char *passwd, const char *database, uint32 port)
 {
 	DBInitVars();
 	Connect(host, user, passwd, database, port);
 }
 
-bool Database::Connect(const char* host, const char* user, const char* passwd, const char* database, uint32 port)
+bool Database::Connect(const char *host, const char *user, const char *passwd, const char *database, uint32 port)
 {
-	uint32 errnum= 0;
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	if (!Open(host, user, passwd, database, port, &errnum, errbuf))
-	{
-		Log(Logs::General, Logs::Error, "Failed to connect to database: Error: %s", errbuf);
+	uint32 errnum = 0;
+	char   errbuf[MYSQL_ERRMSG_SIZE];
+	if (!Open(host, user, passwd, database, port, &errnum, errbuf)) {
+		LogError("Failed to connect to database: Error: {}", errbuf);
 		HandleMysqlError(errnum);
 
 		return false;
 	}
-	else
-	{
-		Log(Logs::General, Logs::Status, "Using database '%s' at %s:%d",database,host,port);
+	else {
+		LogInfo("Using database [{}] at [{}]:[{}]", database, host, port);
 		return true;
 	}
 }
 
-void Database::DBInitVars() {
+void Database::DBInitVars()
+{
 
 }
 
 
-
-void Database::HandleMysqlError(uint32 errnum) {
+void Database::HandleMysqlError(uint32 errnum)
+{
 }
 
 /*
@@ -103,22 +104,27 @@ Database::~Database()
 {
 }
 
-void Database::GetAccountStatus(Client *client) {
+void Database::GetAccountStatus(Client *client)
+{
+
+	std::string query = StringFormat(
+		"SELECT `status`, `hideme`, `karma`, `revoked` FROM `account` WHERE `id` = '%i' LIMIT 1",
+		client->GetAccountID()
+	);
+
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogInfo(
+			"Unable to get account status for character [{}], error [{}]",
+			client->GetName().c_str(),
+			results.ErrorMessage().c_str()
+		);
 
-	std::string query = StringFormat("SELECT `status`, `hideme`, `karma`, `revoked` "
-                                    "FROM `account` WHERE `id` = '%i' LIMIT 1",
-                                    client->GetAccountID());
-    auto results = QueryDatabase(query);
-    if (!results.Success()) {
-		Log(Logs::Detail, Logs::UCS_Server, "Unable to get account status for character %s, error %s", client->GetName().c_str(), results.ErrorMessage().c_str());
 		return;
 	}
 
-	Log(Logs::Detail, Logs::UCS_Server, "GetAccountStatus Query: %s", query.c_str());
-
-	if(results.RowCount() != 1)
-	{
-		Log(Logs::Detail, Logs::UCS_Server, "Error in GetAccountStatus");
+	if (results.RowCount() != 1) {
+		LogInfo("Error in GetAccountStatus");
 		return;
 	}
 
@@ -127,29 +133,34 @@ void Database::GetAccountStatus(Client *client) {
 	client->SetAccountStatus(atoi(row[0]));
 	client->SetHideMe(atoi(row[1]) != 0);
 	client->SetKarma(atoi(row[2]));
-	client->SetRevoked((atoi(row[3])==1?true:false));
-
-	Log(Logs::Detail, Logs::UCS_Server, "Set account status to %i, hideme to %i and karma to %i for %s", client->GetAccountStatus(), client->GetHideMe(), client->GetKarma(), client->GetName().c_str());
+	client->SetRevoked((atoi(row[3]) == 1 ? true : false));
 
+	LogDebug(
+		"Set account status to [{}], hideme to [{}] and karma to [{}] for [{}]",
+		client->GetAccountStatus(),
+		client->GetHideMe(),
+		client->GetKarma(),
+		client->GetName().c_str()
+	);
 }
 
-int Database::FindAccount(const char *characterName, Client *client) {
-
-	Log(Logs::Detail, Logs::UCS_Server, "FindAccount for character %s", characterName);
+int Database::FindAccount(const char *characterName, Client *client)
+{
 
+	LogInfo("FindAccount for character [{}]", characterName);
 
 	client->ClearCharacters();
-    std::string query = StringFormat("SELECT `id`, `account_id`, `level` "
-                                    "FROM `character_data` WHERE `name` = '%s' LIMIT 1",
-                                    characterName);
-    auto results = QueryDatabase(query);
+	std::string query   = StringFormat(
+		"SELECT `id`, `account_id`, `level` FROM `character_data` WHERE `name` = '%s' LIMIT 1",
+		characterName
+	);
+	auto        results = QueryDatabase(query);
+
 	if (!results.Success()) {
-		Log(Logs::Detail, Logs::UCS_Server, "FindAccount query failed: %s", query.c_str());
 		return -1;
 	}
 
 	if (results.RowCount() != 1) {
-		Log(Logs::Detail, Logs::UCS_Server, "Bad result from query");
 		return -1;
 	}
 
@@ -158,14 +169,18 @@ int Database::FindAccount(const char *characterName, Client *client) {
 
 	int accountID = atoi(row[1]);
 
-	Log(Logs::Detail, Logs::UCS_Server, "Account ID for %s is %i", characterName, accountID);
+	LogInfo("Account ID for [{}] is [{}]", characterName, accountID);
 
-    query = StringFormat("SELECT `id`, `name`, `level` FROM `character_data` "
-                        "WHERE `account_id` = %i AND `name` != '%s'",
-						accountID, characterName);
-    results = QueryDatabase(query);
-	if (!results.Success())
+	query = StringFormat(
+		"SELECT `id`, `name`, `level` FROM `character_data` "
+		"WHERE `account_id` = %i AND `name` != '%s'",
+		accountID, characterName
+	);
+
+	results = QueryDatabase(query);
+	if (!results.Success()) {
 		return accountID;
+	}
 
 	for (auto row = results.begin(); row != results.end(); ++row)
 		client->AddCharacter(atoi(row[0]), row[1], atoi(row[2]));
@@ -173,13 +188,17 @@ int Database::FindAccount(const char *characterName, Client *client) {
 	return accountID;
 }
 
-bool Database::VerifyMailKey(std::string characterName, int IPAddress, std::string MailKey) {
+bool Database::VerifyMailKey(std::string characterName, int IPAddress, std::string MailKey)
+{
 
-	std::string query = StringFormat("SELECT `mailkey` FROM `character_data` WHERE `name`='%s' LIMIT 1",
-                                    characterName.c_str());
-    auto results = QueryDatabase(query);
+	std::string query = StringFormat(
+		"SELECT `mailkey` FROM `character_data` WHERE `name`='%s' LIMIT 1",
+		characterName.c_str()
+	);
+
+	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::Detail, Logs::UCS_Server, "Error retrieving mailkey from database: %s", results.ErrorMessage().c_str());
+		LogInfo("Error retrieving mailkey from database: [{}]", results.ErrorMessage().c_str());
 		return false;
 	}
 
@@ -190,21 +209,26 @@ bool Database::VerifyMailKey(std::string characterName, int IPAddress, std::stri
 	//
 	char combinedKey[17];
 
-	if(RuleB(Chat, EnableMailKeyIPVerification) == true)
+	if (RuleB(Chat, EnableMailKeyIPVerification) == true) {
 		sprintf(combinedKey, "%08X%s", IPAddress, MailKey.c_str());
-	else
+	}
+	else {
 		sprintf(combinedKey, "%s", MailKey.c_str());
+	}
 
-	Log(Logs::Detail, Logs::UCS_Server, "DB key is [%s], Client key is [%s]", (row[0] ? row[0] : ""), combinedKey);
+	LogInfo("DB key is [[{}]], Client key is [[{}]]", (row[0] ? row[0] : ""), combinedKey);
 
 	return !strcmp(row[0], combinedKey);
 }
 
 int Database::FindCharacter(const char *characterName)
 {
-	char *safeCharName = RemoveApostrophes(characterName);
-	std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name`='%s' LIMIT 1", safeCharName);
-	auto results = QueryDatabase(query);
+	char        *safeCharName = RemoveApostrophes(characterName);
+	std::string query         = StringFormat(
+		"SELECT `id` FROM `character_data` WHERE `name`='%s' LIMIT 1",
+		safeCharName
+	);
+	auto        results       = QueryDatabase(query);
 	if (!results.Success()) {
 		safe_delete_array(safeCharName);
 		return -1;
@@ -213,8 +237,7 @@ int Database::FindCharacter(const char *characterName)
 	safe_delete_array(safeCharName);
 
 	if (results.RowCount() != 1) {
-		Log(Logs::Detail, Logs::UCS_Server, "Bad result from FindCharacter query for character %s",
-			characterName);
+		LogInfo("Bad result from FindCharacter query for character [{}]", characterName);
 		return -1;
 	}
 
@@ -225,16 +248,18 @@ int Database::FindCharacter(const char *characterName)
 	return characterID;
 }
 
-bool Database::GetVariable(const char* varname, char* varvalue, uint16 varvalue_len) {
+bool Database::GetVariable(const char *varname, char *varvalue, uint16 varvalue_len)
+{
 
-	std::string query = StringFormat("SELECT `value` FROM `variables` WHERE `varname` = '%s'", varname);
-    auto results = QueryDatabase(query);
+	std::string query   = StringFormat("SELECT `value` FROM `variables` WHERE `varname` = '%s'", varname);
+	auto        results = QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
 	}
 
-	if (results.RowCount() != 1)
+	if (results.RowCount() != 1) {
 		return false;
+	}
 
 	auto row = results.begin();
 
@@ -243,19 +268,20 @@ bool Database::GetVariable(const char* varname, char* varvalue, uint16 varvalue_
 	return true;
 }
 
-bool Database::LoadChatChannels() {
+bool Database::LoadChatChannels()
+{
 
-	Log(Logs::Detail, Logs::UCS_Server, "Loading chat channels from the database.");
+	LogInfo("Loading chat channels from the database");
 
-	const std::string query = "SELECT `name`, `owner`, `password`, `minstatus` FROM `chatchannels`";
-    auto results = QueryDatabase(query);
+	const std::string query   = "SELECT `name`, `owner`, `password`, `minstatus` FROM `chatchannels`";
+	auto              results = QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
 	}
 
-	for (auto row = results.begin();row != results.end(); ++row) {
-		std::string channelName = row[0];
-		std::string channelOwner = row[1];
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		std::string channelName     = row[0];
+		std::string channelOwner    = row[1];
 		std::string channelPassword = row[2];
 
 		ChannelList->CreateChannel(channelName, channelOwner, channelPassword, true, atoi(row[3]));
@@ -264,40 +290,50 @@ bool Database::LoadChatChannels() {
 	return true;
 }
 
-void Database::SetChannelPassword(std::string channelName, std::string password) {
+void Database::SetChannelPassword(std::string channelName, std::string password)
+{
+	LogInfo("Database::SetChannelPassword([{}], [{}])", channelName.c_str(), password.c_str());
 
-	Log(Logs::Detail, Logs::UCS_Server, "Database::SetChannelPassword(%s, %s)", channelName.c_str(), password.c_str());
-
-	std::string query = StringFormat("UPDATE `chatchannels` SET `password` = '%s' WHERE `name` = '%s'",
-                                    password.c_str(), channelName.c_str());
-    QueryDatabase(query);
+	std::string query = StringFormat(
+		"UPDATE `chatchannels` SET `password` = '%s' WHERE `name` = '%s'",
+		password.c_str(), channelName.c_str());
+	QueryDatabase(query);
 }
 
-void Database::SetChannelOwner(std::string channelName, std::string owner) {
+void Database::SetChannelOwner(std::string channelName, std::string owner)
+{
+	LogInfo("Database::SetChannelOwner([{}], [{}])", channelName.c_str(), owner.c_str());
 
-	Log(Logs::Detail, Logs::UCS_Server, "Database::SetChannelOwner(%s, %s)", channelName.c_str(), owner.c_str());
+	std::string query = StringFormat(
+		"UPDATE `chatchannels` SET `owner` = '%s' WHERE `name` = '%s'",
+		owner.c_str(),
+		channelName.c_str()
+	);
 
-	std::string query = StringFormat("UPDATE `chatchannels` SET `owner` = '%s' WHERE `name` = '%s'",
-                                    owner.c_str(), channelName.c_str());
-    QueryDatabase(query);
+	QueryDatabase(query);
 }
 
-void Database::SendHeaders(Client *client) {
+void Database::SendHeaders(Client *client)
+{
 
 	int unknownField2 = 25015275;
 	int unknownField3 = 1;
-	int characterID = FindCharacter(client->MailBoxName().c_str());
+	int characterID   = FindCharacter(client->MailBoxName().c_str());
 
-	Log(Logs::Detail, Logs::UCS_Server, "Sendheaders for %s, CharID is %i", client->MailBoxName().c_str(), characterID);
+	LogInfo("Sendheaders for [{}], CharID is [{}]", client->MailBoxName().c_str(), characterID);
 
-	if(characterID <= 0)
+	if (characterID <= 0) {
 		return;
+	}
 
-	std::string query = StringFormat("SELECT `msgid`,`timestamp`, `from`, `subject`, `status` "
-                                    "FROM `mail` WHERE `charid`=%i", characterID);
-    auto results = QueryDatabase(query);
-	if (!results.Success())
+	std::string query   = StringFormat(
+		"SELECT `msgid`,`timestamp`, `from`, `subject`, `status` "
+		"FROM `mail` WHERE `charid`=%i", characterID
+	);
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
 		return;
+	}
 
 	char buffer[100];
 
@@ -317,7 +353,7 @@ void Database::SendHeaders(Client *client) {
 
 	auto outapp = new EQApplicationPacket(OP_MailHeaderCount, headerCountPacketLength);
 
-	char *packetBuffer = (char *)outapp->pBuffer;
+	char *packetBuffer = (char *) outapp->pBuffer;
 
 	VARSTRUCT_ENCODE_INTSTRING(packetBuffer, client->GetMailBoxNumber());
 	VARSTRUCT_ENCODE_INTSTRING(packetBuffer, unknownField2);
@@ -329,8 +365,8 @@ void Database::SendHeaders(Client *client) {
 
 	safe_delete(outapp);
 
-	int rowIndex = 0;
-	for(auto row = results.begin(); row != results.end(); ++row, ++rowIndex) {
+	int       rowIndex = 0;
+	for (auto row      = results.begin(); row != results.end(); ++row, ++rowIndex) {
 		int headerPacketLength = 0;
 
 		sprintf(buffer, "%i", client->GetMailBoxNumber());
@@ -348,7 +384,7 @@ void Database::SendHeaders(Client *client) {
 
 		outapp = new EQApplicationPacket(OP_MailHeader, headerPacketLength);
 
-		packetBuffer = (char *)outapp->pBuffer;
+		packetBuffer = (char *) outapp->pBuffer;
 
 		VARSTRUCT_ENCODE_INTSTRING(packetBuffer, client->GetMailBoxNumber());
 		VARSTRUCT_ENCODE_INTSTRING(packetBuffer, unknownField2);
@@ -369,39 +405,48 @@ void Database::SendHeaders(Client *client) {
 
 }
 
-void Database::SendBody(Client *client, int messageNumber) {
+void Database::SendBody(Client *client, int messageNumber)
+{
 
 	int characterID = FindCharacter(client->MailBoxName().c_str());
 
-	Log(Logs::Detail, Logs::UCS_Server, "SendBody: MsgID %i, to %s, CharID is %i", messageNumber, client->MailBoxName().c_str(), characterID);
+	LogInfo("SendBody: MsgID [{}], to [{}], CharID is [{}]", messageNumber, client->MailBoxName().c_str(), characterID);
 
-	if(characterID <= 0)
+	if (characterID <= 0) {
 		return;
+	}
 
-	std::string query = StringFormat("SELECT `msgid`, `body`, `to` FROM `mail` "
-                                    "WHERE `charid`=%i AND `msgid`=%i", characterID, messageNumber);
-    auto results = QueryDatabase(query);
-	if (!results.Success())
+	std::string query = StringFormat(
+		"SELECT `msgid`, `body`, `to` FROM `mail` "
+		"WHERE `charid`=%i AND `msgid`=%i",
+		characterID,
+		messageNumber
+	);
+
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
 		return;
+	}
 
 
-	if (results.RowCount() != 1)
+	if (results.RowCount() != 1) {
 		return;
+	}
 
 	auto row = results.begin();
 
-	Log(Logs::Detail, Logs::UCS_Server, "Message: %i  body (%i bytes)", messageNumber, strlen(row[1]));
+	LogInfo("Message: [{}]  body ([{}] bytes)", messageNumber, strlen(row[1]));
 
 	int packetLength = 12 + strlen(row[0]) + strlen(row[1]) + strlen(row[2]);
 
 	auto outapp = new EQApplicationPacket(OP_MailSendBody, packetLength);
 
-	char *packetBuffer = (char *)outapp->pBuffer;
+	char *packetBuffer = (char *) outapp->pBuffer;
 
 	VARSTRUCT_ENCODE_INTSTRING(packetBuffer, client->GetMailBoxNumber());
-	VARSTRUCT_ENCODE_STRING(packetBuffer,row[0]);
-	VARSTRUCT_ENCODE_STRING(packetBuffer,row[1]);
-	VARSTRUCT_ENCODE_STRING(packetBuffer,"1");
+	VARSTRUCT_ENCODE_STRING(packetBuffer, row[0]);
+	VARSTRUCT_ENCODE_STRING(packetBuffer, row[1]);
+	VARSTRUCT_ENCODE_STRING(packetBuffer, "1");
 	VARSTRUCT_ENCODE_TYPE(uint8, packetBuffer, 0);
 	VARSTRUCT_ENCODE_TYPE(uint8, packetBuffer, 0x0a);
 	VARSTRUCT_ENCODE_STRING(packetBuffer, "TO:");
@@ -410,62 +455,75 @@ void Database::SendBody(Client *client, int messageNumber) {
 	packetBuffer--; // Overwrite the null terminator
 	VARSTRUCT_ENCODE_TYPE(uint8, packetBuffer, 0x0a);
 
-
 	client->QueuePacket(outapp);
 
 	safe_delete(outapp);
 }
 
-bool Database::SendMail(std::string recipient, std::string from, std::string subject, std::string body, std::string recipientsString) {
+bool Database::SendMail(
+	std::string recipient,
+	std::string from,
+	std::string subject,
+	std::string body,
+	std::string recipientsString
+)
+{
 
-	int characterID;
+	int         characterID;
 	std::string characterName;
 
 	auto lastPeriod = recipient.find_last_of(".");
 
-	if(lastPeriod == std::string::npos)
+	if (lastPeriod == std::string::npos) {
 		characterName = recipient;
-	else
-		characterName = recipient.substr(lastPeriod+1);
+	}
+	else {
+		characterName = recipient.substr(lastPeriod + 1);
+	}
 
 	characterName[0] = toupper(characterName[0]);
 
-	for(unsigned int i = 1; i < characterName.length(); i++)
+	for (unsigned int i = 1; i < characterName.length(); i++)
 		characterName[i] = tolower(characterName[i]);
 
 	characterID = FindCharacter(characterName.c_str());
 
-	Log(Logs::Detail, Logs::UCS_Server, "SendMail: CharacterID for recipient %s is %i", characterName.c_str(), characterID);
+	LogInfo("SendMail: CharacterID for recipient [{}] is [{}]", characterName.c_str(), characterID);
 
-	if(characterID <= 0)
-        return false;
+	if (characterID <= 0) {
+		return false;
+	}
 
 	auto escSubject = new char[subject.length() * 2 + 1];
-	auto escBody = new char[body.length() * 2 + 1];
+	auto escBody    = new char[body.length() * 2 + 1];
 
 	DoEscapeString(escSubject, subject.c_str(), subject.length());
 	DoEscapeString(escBody, body.c_str(), body.length());
 
 	int now = time(nullptr); // time returns a 64 bit int on Windows at least, which vsnprintf doesn't like.
 
-    std::string query = StringFormat("INSERT INTO `mail` "
-                                    "(`charid`, `timestamp`, `from`, `subject`, `body`, `to`, `status`) "
-                                    "VALUES ('%i', %i, '%s', '%s', '%s', '%s', %i)",
-                                    characterID, now, from.c_str(), escSubject, escBody,
-                                    recipientsString.c_str(), 1);
-    safe_delete_array(escSubject);
-    safe_delete_array(escBody);
-    auto results = QueryDatabase(query);
-	if(!results.Success()) {
+	std::string query = StringFormat(
+		"INSERT INTO `mail` (`charid`, `timestamp`, `from`, `subject`, `body`, `to`, `status`) VALUES ('%i', %i, '%s', '%s', '%s', '%s', %i)",
+		characterID,
+		now,
+		from.c_str(),
+		escSubject,
+		escBody,
+		recipientsString.c_str(),
+		1
+	);
+	safe_delete_array(escSubject);
+	safe_delete_array(escBody);
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
 		return false;
 	}
 
-	Log(Logs::Detail, Logs::UCS_Server, "MessageID %i generated, from %s, to %s", results.LastInsertedID(), from.c_str(), recipient.c_str());
-
+	LogInfo("MessageID [{}] generated, from [{}], to [{}]", results.LastInsertedID(), from.c_str(), recipient.c_str());
 
 	Client *client = g_Clientlist->IsCharacterOnline(characterName);
 
-	if(client) {
+	if (client) {
 		std::string FQN = GetMailPrefix() + from;
 		client->SendNotification(client->GetMailBoxNumber(characterName), subject, FQN, results.LastInsertedID());
 	}
@@ -475,91 +533,127 @@ bool Database::SendMail(std::string recipient, std::string from, std::string sub
 	return true;
 }
 
-void Database::SetMessageStatus(int messageNumber, int status) {
+void Database::SetMessageStatus(int messageNumber, int status)
+{
 
-	Log(Logs::Detail, Logs::UCS_Server, "SetMessageStatus %i %i", messageNumber, status);
+	LogInfo("SetMessageStatus [{}] [{}]", messageNumber, status);
 
-	if(status == 0) {
-        std::string query = StringFormat("DELETE FROM `mail` WHERE `msgid` = %i", messageNumber);
-		auto results = QueryDatabase(query);
-        return;
-    }
+	if (status == 0) {
+		std::string query   = StringFormat("DELETE FROM `mail` WHERE `msgid` = %i", messageNumber);
+		auto        results = QueryDatabase(query);
+		return;
+	}
 
-    std::string query = StringFormat("UPDATE `mail` SET `status` = %i WHERE `msgid`=%i", status, messageNumber);
-    QueryDatabase(query);
+	std::string query = StringFormat("UPDATE `mail` SET `status` = %i WHERE `msgid`=%i", status, messageNumber);
+	QueryDatabase(query);
 }
 
-void Database::ExpireMail() {
+void Database::ExpireMail()
+{
 
-	Log(Logs::Detail, Logs::UCS_Server, "Expiring mail...");
+	LogInfo("Expiring mail");
 
-	std::string query = "SELECT COUNT(*) FROM `mail`";
-    auto results = QueryDatabase(query);
-    if (!results.Success()) {
+	std::string query   = "SELECT COUNT(*) FROM `mail`";
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
 		return;
 	}
 
 	auto row = results.begin();
 
-	Log(Logs::Detail, Logs::UCS_Server, "There are %s messages in the database.", row[0]);
+	LogInfo("There are [{}] messages in the database", row[0]);
 
-	// Expire Trash
-	if(RuleI(Mail, ExpireTrash) >= 0) {
-        query = StringFormat("DELETE FROM `mail` WHERE `status`=4 AND `timestamp` < %i",
-                            time(nullptr) - RuleI(Mail, ExpireTrash));
-        results = QueryDatabase(query);
-		if(results.Success())
-            Log(Logs::Detail, Logs::UCS_Server, "Expired %i trash messages.", results.RowsAffected());
+	/**
+	 * Expire trash
+	 */
+	if (RuleI(Mail, ExpireTrash) >= 0) {
+		query   = StringFormat(
+			"DELETE FROM `mail` WHERE `status`=4 AND `timestamp` < %i",
+			time(nullptr) - RuleI(Mail, ExpireTrash));
+		results = QueryDatabase(query);
+		if (results.Success()) {
+			LogInfo("Expired [{}] trash messages", results.RowsAffected());
+		}
 	}
 
-	// Expire Read
-	if(RuleI(Mail, ExpireRead) >= 0) {
-        query = StringFormat("DELETE FROM `mail` WHERE `status` = 3 AND `timestamp` < %i",
-                            time(nullptr) - RuleI(Mail, ExpireRead));
-        results = QueryDatabase(query);
-		if(results.Success())
-            Log(Logs::Detail, Logs::UCS_Server, "Expired %i read messages.", results.RowsAffected());
+	/**
+	 * Expire read
+	 */
+	if (RuleI(Mail, ExpireRead) >= 0) {
+		query = StringFormat(
+			"DELETE FROM `mail` WHERE `status` = 3 AND `timestamp` < %i",
+			time(nullptr) - RuleI(Mail, ExpireRead)
+		);
+
+		results = QueryDatabase(query);
+		if (results.Success())
+			LogInfo("Expired [{}] read messages", results.RowsAffected());
 	}
 
-	// Expire Unread
-	if(RuleI(Mail, ExpireUnread) >= 0) {
-        query = StringFormat("DELETE FROM `mail` WHERE `status`=1 AND `timestamp` < %i",
-                            time(nullptr) - RuleI(Mail, ExpireUnread));
-        results = QueryDatabase(query);
-		if(results.Success())
-            Log(Logs::Detail, Logs::UCS_Server, "Expired %i unread messages.", results.RowsAffected());
+	/**
+	 * Expire unread
+	 */
+	if (RuleI(Mail, ExpireUnread) >= 0) {
+		query = StringFormat(
+			"DELETE FROM `mail` WHERE `status`=1 AND `timestamp` < %i",
+			time(nullptr) - RuleI(Mail, ExpireUnread)
+		);
+
+		results = QueryDatabase(query);
+		if (results.Success()) {
+			LogInfo("Expired [{}] unread messages", results.RowsAffected());
+		}
 	}
 }
 
-void Database::AddFriendOrIgnore(int charID, int type, std::string name) {
+void Database::AddFriendOrIgnore(int charID, int type, std::string name)
+{
+	std::string query = StringFormat(
+		"INSERT INTO `friends` (`charid`, `type`, `name`) "
+		"VALUES('%i', %i, '%s')",
+		charID,
+		type,
+		CapitaliseName(name).c_str()
+	);
 
-    std::string query = StringFormat("INSERT INTO `friends` (`charid`, `type`, `name`) "
-                                    "VALUES('%i', %i, '%s')",
-                                    charID, type, CapitaliseName(name).c_str());
-    auto results = QueryDatabase(query);
-	if(results.Success())
-		Log(Logs::Detail, Logs::UCS_Server, "Wrote Friend/Ignore entry for charid %i, type %i, name %s to database.", charID, type, name.c_str());
+	auto results = QueryDatabase(query);
 
-}
-
-void Database::RemoveFriendOrIgnore(int charID, int type, std::string name) {
-
-	std::string query = StringFormat("DELETE FROM `friends` WHERE `charid` = %i "
-                                    "AND `type` = %i AND `name` = '%s'",
-                                    charID, type, CapitaliseName(name).c_str());
-    auto results = QueryDatabase(query);
-	if (!results.Success()) {
-		Log(Logs::Detail, Logs::UCS_Server, "Error removing friend/ignore, query was %s", query.c_str());
-	}
-	else {
-		Log(Logs::Detail, Logs::UCS_Server, "Removed Friend/Ignore entry for charid %i, type %i, name %s from database.", charID, type, name.c_str());
+	if (results.Success()) {
+		LogInfo(
+			"Wrote Friend/Ignore entry for charid [{}], type [{}], name [{}] to database",
+			charID,
+			type,
+			name.c_str()
+		);
 	}
 }
 
-void Database::GetFriendsAndIgnore(int charID, std::vector<std::string> &friends, std::vector<std::string> &ignorees) {
+void Database::RemoveFriendOrIgnore(int charID, int type, std::string name)
+{
+	std::string query = StringFormat(
+		"DELETE FROM `friends` WHERE `charid` = %i AND `type` = %i AND `name` = '%s'",
+		charID,
+		type,
+		CapitaliseName(name).c_str()
+	);
 
-	std::string query = StringFormat("select `type`, `name` FROM `friends` WHERE `charid`=%i", charID);
-    auto results = QueryDatabase(query);
+	auto results = QueryDatabase(query);
+
+	if (results.Success()) {
+		LogInfo(
+			"Removed Friend/Ignore entry for charid [{}], type [{}], name [{}] from database",
+			charID,
+			type,
+			name.c_str()
+		);
+	}
+}
+
+void Database::GetFriendsAndIgnore(int charID, std::vector<std::string> &friends, std::vector<std::string> &ignorees)
+{
+
+	std::string query   = StringFormat("select `type`, `name` FROM `friends` WHERE `charid`=%i", charID);
+	auto        results = QueryDatabase(query);
 	if (!results.Success()) {
 		return;
 	}
@@ -568,57 +662,100 @@ void Database::GetFriendsAndIgnore(int charID, std::vector<std::string> &friends
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		std::string name = row[1];
 
-		if(atoi(row[0]) == 0)
-		{
+		if (atoi(row[0]) == 0) {
 			ignorees.push_back(name);
-			Log(Logs::Detail, Logs::UCS_Server, "Added Ignoree from DB %s", name.c_str());
+			LogInfo("Added Ignoree from DB [{}]", name.c_str());
 			continue;
 		}
 
-        friends.push_back(name);
-        Log(Logs::Detail, Logs::UCS_Server, "Added Friend from DB %s", name.c_str());
+		friends.push_back(name);
+		LogInfo("Added Friend from DB [{}]", name.c_str());
 	}
 
 }
 
-void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){
+void Database::LoadLogSettings(EQEmuLogSys::LogSettings *log_settings)
+{
 	std::string query =
-		"SELECT "
-		"log_category_id, "
-		"log_category_description, "
-		"log_to_console, "
-		"log_to_file, "
-		"log_to_gmsay "
-		"FROM "
-		"logsys_categories "
-		"ORDER BY log_category_id";
-	auto results = QueryDatabase(query);
+					"SELECT "
+					"log_category_id, "
+					"log_category_description, "
+					"log_to_console, "
+					"log_to_file, "
+					"log_to_gmsay "
+					"FROM "
+					"logsys_categories "
+					"ORDER BY log_category_id";
 
-	int log_category = 0;
-	LogSys.file_logs_enabled = false;
+	auto results         = QueryDatabase(query);
+	int  log_category_id = 0;
+
+	int *categories_in_database = new int[1000];
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		log_category = atoi(row[0]);
-		log_settings[log_category].log_to_console = atoi(row[2]);
-		log_settings[log_category].log_to_file = atoi(row[3]);
-		log_settings[log_category].log_to_gmsay = atoi(row[4]);
+		log_category_id = atoi(row[0]);
+		if (log_category_id <= Logs::None || log_category_id >= Logs::MaxCategoryID) {
+			continue;
+		}
 
-		/* Determine if any output method is enabled for the category
-			and set it to 1 so it can used to check if category is enabled */
-		const bool log_to_console = log_settings[log_category].log_to_console > 0;
-		const bool log_to_file = log_settings[log_category].log_to_file > 0;
-		const bool log_to_gmsay = log_settings[log_category].log_to_gmsay > 0;
+		log_settings[log_category_id].log_to_console = static_cast<uint8>(atoi(row[2]));
+		log_settings[log_category_id].log_to_file    = static_cast<uint8>(atoi(row[3]));
+		log_settings[log_category_id].log_to_gmsay   = static_cast<uint8>(atoi(row[4]));
+
+		/**
+		 * Determine if any output method is enabled for the category
+		 * and set it to 1 so it can used to check if category is enabled
+		 */
+		const bool log_to_console      = log_settings[log_category_id].log_to_console > 0;
+		const bool log_to_file         = log_settings[log_category_id].log_to_file > 0;
+		const bool log_to_gmsay        = log_settings[log_category_id].log_to_gmsay > 0;
 		const bool is_category_enabled = log_to_console || log_to_file || log_to_gmsay;
 
-		if (is_category_enabled)
-			log_settings[log_category].is_category_enabled = 1;
+		if (is_category_enabled) {
+			log_settings[log_category_id].is_category_enabled = 1;
+		}
 
-		/*
-		This determines whether or not the process needs to actually file log anything.
-		If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
-		*/
-		if (log_settings[log_category].log_to_file > 0){
+		/**
+		 * This determines whether or not the process needs to actually file log anything.
+		 * If we go through this whole loop and nothing is set to any debug level, there is no point to create a file or keep anything open
+		 */
+		if (log_settings[log_category_id].log_to_file > 0) {
 			LogSys.file_logs_enabled = true;
 		}
+
+		categories_in_database[log_category_id] = 1;
 	}
+
+	/**
+	 * Auto inject categories that don't exist in the database...
+	 */
+	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
+		if (categories_in_database[log_index] != 1) {
+
+			LogInfo(
+				"New Log Category [{0}] doesn't exist... Automatically adding to [logsys_categories] table...",
+				Logs::LogCategoryName[log_index]
+			);
+
+			auto inject_query = fmt::format(
+				"INSERT INTO logsys_categories "
+				"(log_category_id, "
+				"log_category_description, "
+				"log_to_console, "
+				"log_to_file, "
+				"log_to_gmsay) "
+				"VALUES "
+				"({0}, '{1}', {2}, {3}, {4})",
+				log_index,
+				EscapeString(Logs::LogCategoryName[log_index]),
+				std::to_string(log_settings[log_index].log_to_console),
+				std::to_string(log_settings[log_index].log_to_file),
+				std::to_string(log_settings[log_index].log_to_gmsay)
+			);
+
+			QueryDatabase(inject_query);
+		}
+	}
+
+	delete[] categories_in_database;
 }
diff --git a/ucs/ucs.cpp b/ucs/ucs.cpp
index bd36c47e6..0f396252b 100644
--- a/ucs/ucs.cpp
+++ b/ucs/ucs.cpp
@@ -73,10 +73,10 @@ int main() {
 
 	Timer InterserverTimer(INTERSERVER_TIMER); // does auto-reconnect
 
-	Log(Logs::General, Logs::UCS_Server, "Starting EQEmu Universal Chat Server.");
+	LogInfo("Starting EQEmu Universal Chat Server");
 
 	if (!ucsconfig::LoadConfig()) { 
-		Log(Logs::General, Logs::UCS_Server, "Loading server configuration failed."); 
+		LogInfo("Loading server configuration failed"); 
 		return 1;
 	}
 
@@ -84,7 +84,7 @@ int main() {
 
 	WorldShortName = Config->ShortName;
 
-	Log(Logs::General, Logs::UCS_Server, "Connecting to MySQL...");
+	LogInfo("Connecting to MySQL");
 
 	if (!database.Connect(
 		Config->DatabaseHost.c_str(),
@@ -92,7 +92,7 @@ int main() {
 		Config->DatabasePassword.c_str(),
 		Config->DatabaseDB.c_str(),
 		Config->DatabasePort)) {
-		Log(Logs::General, Logs::UCS_Server, "Cannot continue without a database connection.");
+		LogInfo("Cannot continue without a database connection");
 		return 1;
 	}
 
@@ -104,26 +104,26 @@ int main() {
 
 	// ucs has no 'reload rules' handler
 	if (database.GetVariable("RuleSet", tmp, sizeof(tmp)-1)) {
-		Log(Logs::General, Logs::UCS_Server, "Loading rule set '%s'", tmp);
+		LogInfo("Loading rule set [{}]", tmp);
 		if(!RuleManager::Instance()->LoadRules(&database, tmp, false)) {
-			Log(Logs::General, Logs::UCS_Server, "Failed to load ruleset '%s', falling back to defaults.", tmp);
+			LogInfo("Failed to load ruleset [{}], falling back to defaults", tmp);
 		}
 	} else {
 		if(!RuleManager::Instance()->LoadRules(&database, "default", false)) {
-			Log(Logs::General, Logs::UCS_Server, "No rule set configured, using default rules");
+			LogInfo("No rule set configured, using default rules");
 		} else {
-			Log(Logs::General, Logs::UCS_Server, "Loaded default rule set 'default'", tmp);
+			LogInfo("Loaded default rule set 'default'", tmp);
 		}
 	}
 
 	EQEmu::InitializeDynamicLookups();
-	Log(Logs::General, Logs::UCS_Server, "Initialized dynamic dictionary entries");
+	LogInfo("Initialized dynamic dictionary entries");
 
 	database.ExpireMail();
 
 	if(Config->ChatPort != Config->MailPort)
 	{
-		Log(Logs::General, Logs::UCS_Server, "MailPort and CharPort must be the same in eqemu_config.xml for UCS.");
+		LogInfo("MailPort and CharPort must be the same in eqemu_config.json for UCS");
 		exit(1);
 	}
 
@@ -134,11 +134,11 @@ int main() {
 	database.LoadChatChannels();
 
 	if (signal(SIGINT, CatchSignal) == SIG_ERR)	{
-		Log(Logs::General, Logs::UCS_Server, "Could not set signal handler");
+		LogInfo("Could not set signal handler");
 		return 1;
 	}
 	if (signal(SIGTERM, CatchSignal) == SIG_ERR)	{
-		Log(Logs::General, Logs::UCS_Server, "Could not set signal handler");
+		LogInfo("Could not set signal handler");
 		return 1;
 	}
 
diff --git a/ucs/worldserver.cpp b/ucs/worldserver.cpp
index b3df5d99d..72865e416 100644
--- a/ucs/worldserver.cpp
+++ b/ucs/worldserver.cpp
@@ -61,7 +61,7 @@ void WorldServer::ProcessMessage(uint16 opcode, EQ::Net::Packet &p)
 	ServerPacket tpack(opcode, p);
 	ServerPacket *pack = &tpack;
 
-	Log(Logs::Detail, Logs::UCS_Server, "Received Opcode: %4X", opcode);
+	LogInfo("Received Opcode: {:#04x}", opcode);
 
 	switch (opcode)
 	{
@@ -82,7 +82,7 @@ void WorldServer::ProcessMessage(uint16 opcode, EQ::Net::Packet &p)
 
 		std::string Message = Buffer;
 
-		Log(Logs::Detail, Logs::UCS_Server, "Player: %s, Sent Message: %s", From, Message.c_str());
+		LogInfo("Player: [{}], Sent Message: [{}]", From, Message.c_str());
 
 		Client *c = g_Clientlist->FindCharacter(From);
 
@@ -93,7 +93,7 @@ void WorldServer::ProcessMessage(uint16 opcode, EQ::Net::Packet &p)
 
 		if (!c)
 		{
-			Log(Logs::Detail, Logs::UCS_Server, "Client not found.");
+			LogInfo("Client not found");
 			break;
 		}
 
diff --git a/utils/deprecated/perlxs/mob.h b/utils/deprecated/perlxs/mob.h
index 0485e299d..7dc85b2a3 100644
--- a/utils/deprecated/perlxs/mob.h
+++ b/utils/deprecated/perlxs/mob.h
@@ -130,7 +130,7 @@
 	int32	GetFollowID();
 
 	virtual void	Message(int32 type, const char* message, ...);
-	virtual void	Message_StringID(int32 type, int32 string_id, int32 distance = 0);
+	virtual void	MessageString(int32 type, int32 string_id, int32 distance = 0);
 	void Say(const char *format, ...);
 	void Shout(const char *format, ...);
 	void Emote(const char *format, ...);
diff --git a/utils/mods/legacy_combat.lua b/utils/mods/legacy_combat.lua
index 9ab70cf4d..c04644a8d 100644
--- a/utils/mods/legacy_combat.lua
+++ b/utils/mods/legacy_combat.lua
@@ -1,110 +1,147 @@
-MonkACBonusWeight = RuleI.Get(Rule.MonkACBonusWeight);
-NPCACFactor = RuleR.Get(Rule.NPCACFactor);
-OldACSoftcapRules = RuleB.Get(Rule.OldACSoftcapRules);
-ClothACSoftcap = RuleI.Get(Rule.ClothACSoftcap);
-LeatherACSoftcap = RuleI.Get(Rule.LeatherACSoftcap);
-MonkACSoftcap = RuleI.Get(Rule.MonkACSoftcap);
-ChainACSoftcap = RuleI.Get(Rule.ChainACSoftcap);
-PlateACSoftcap = RuleI.Get(Rule.PlateACSoftcap);
+--[[
+    *
+    * The purpose of this lua file is to backport combat formulas pre-overhaul
+    * https://github.com/EQEmu/Server/commit/9e824876ba5dac262b121c0e60d022bb2ecc45bd
+    *
+    * If your server has years and years of content built on old formulas, it may be appropriate to use this
+    * instead of taking on the massive task of rescaling tons of carefully tested and layered content
+    *
+]]
 
-AAMitigationACFactor = RuleR.Get(Rule.AAMitigationACFactor);
-WarriorACSoftcapReturn = RuleR.Get(Rule.WarriorACSoftcapReturn);
-KnightACSoftcapReturn = RuleR.Get(Rule.KnightACSoftcapReturn);
-LowPlateChainACSoftcapReturn = RuleR.Get(Rule.LowPlateChainACSoftcapReturn);
+MonkACBonusWeight              = RuleI.Get(Rule.MonkACBonusWeight);
+NPCACFactor                    = RuleR.Get(Rule.NPCACFactor);
+OldACSoftcapRules              = RuleB.Get(Rule.OldACSoftcapRules);
+ClothACSoftcap                 = RuleI.Get(Rule.ClothACSoftcap);
+LeatherACSoftcap               = RuleI.Get(Rule.LeatherACSoftcap);
+MonkACSoftcap                  = RuleI.Get(Rule.MonkACSoftcap);
+ChainACSoftcap                 = RuleI.Get(Rule.ChainACSoftcap);
+PlateACSoftcap                 = RuleI.Get(Rule.PlateACSoftcap);
+AAMitigationACFactor           = RuleR.Get(Rule.AAMitigationACFactor);
+WarriorACSoftcapReturn         = RuleR.Get(Rule.WarriorACSoftcapReturn);
+KnightACSoftcapReturn          = RuleR.Get(Rule.KnightACSoftcapReturn);
+LowPlateChainACSoftcapReturn   = RuleR.Get(Rule.LowPlateChainACSoftcapReturn);
 LowChainLeatherACSoftcapReturn = RuleR.Get(Rule.LowChainLeatherACSoftcapReturn);
-CasterACSoftcapReturn = RuleR.Get(Rule.CasterACSoftcapReturn);
-MiscACSoftcapReturn = RuleR.Get(Rule.MiscACSoftcapReturn);
-WarACSoftcapReturn = RuleR.Get(Rule.WarACSoftcapReturn);
-ClrRngMnkBrdACSoftcapReturn = RuleR.Get(Rule.ClrRngMnkBrdACSoftcapReturn);
-PalShdACSoftcapReturn = RuleR.Get(Rule.PalShdACSoftcapReturn);
+CasterACSoftcapReturn          = RuleR.Get(Rule.CasterACSoftcapReturn);
+MiscACSoftcapReturn            = RuleR.Get(Rule.MiscACSoftcapReturn);
+WarACSoftcapReturn             = RuleR.Get(Rule.WarACSoftcapReturn);
+ClrRngMnkBrdACSoftcapReturn    = RuleR.Get(Rule.ClrRngMnkBrdACSoftcapReturn);
+PalShdACSoftcapReturn          = RuleR.Get(Rule.PalShdACSoftcapReturn);
 DruNecWizEncMagACSoftcapReturn = RuleR.Get(Rule.DruNecWizEncMagACSoftcapReturn);
-RogShmBstBerACSoftcapReturn = RuleR.Get(Rule.RogShmBstBerACSoftcapReturn);
-SoftcapFactor = RuleR.Get(Rule.SoftcapFactor);
-ACthac0Factor = RuleR.Get(Rule.ACthac0Factor);
-ACthac20Factor = RuleR.Get(Rule.ACthac20Factor);
+RogShmBstBerACSoftcapReturn    = RuleR.Get(Rule.RogShmBstBerACSoftcapReturn);
+SoftcapFactor                  = RuleR.Get(Rule.SoftcapFactor);
+ACthac0Factor                  = RuleR.Get(Rule.ACthac0Factor);
+ACthac20Factor                 = RuleR.Get(Rule.ACthac20Factor);
+BaseHitChance                  = RuleR.Get(Rule.BaseHitChance);
+NPCBonusHitChance              = RuleR.Get(Rule.NPCBonusHitChance);
+HitFalloffMinor                = RuleR.Get(Rule.HitFalloffMinor);
+HitFalloffModerate             = RuleR.Get(Rule.HitFalloffModerate);
+HitFalloffMajor                = RuleR.Get(Rule.HitFalloffMajor);
+HitBonusPerLevel               = RuleR.Get(Rule.HitBonusPerLevel);
+AgiHitFactor                   = RuleR.Get(Rule.AgiHitFactor);
+WeaponSkillFalloff             = RuleR.Get(Rule.WeaponSkillFalloff);
+ArcheryHitPenalty              = RuleR.Get(Rule.ArcheryHitPenalty);
+UseOldDamageIntervalRules      = RuleB.Get(Rule.UseOldDamageIntervalRules);
+CriticalMessageRange           = RuleI.Get(Rule.CriticalDamage);
 
-MeleeBaseCritChance = 0.0;
-ClientBaseCritChance = 0.0;
-BerserkBaseCritChance = 6.0;
-WarBerBaseCritChance = 3.0;
-RogueCritThrowingChance = 25;
-RogueDeadlyStrikeChance = 80;
-RogueDeadlyStrikeMod = 2;
+--[[
+    *
+    * These are rule values that were removed in the latest combat overhaul, if you are coming from
+    * older source code, you will need to reference what your rule values were for these variables
+    * to make sure that things line up correctly
+    *
+]]
 
-BaseHitChance = RuleR.Get(Rule.BaseHitChance);
-NPCBonusHitChance = RuleR.Get(Rule.NPCBonusHitChance);
-HitFalloffMinor = RuleR.Get(Rule.HitFalloffMinor);
-HitFalloffModerate = RuleR.Get(Rule.HitFalloffModerate);
-HitFalloffMajor = RuleR.Get(Rule.HitFalloffMajor);
-HitBonusPerLevel = RuleR.Get(Rule.HitBonusPerLevel);
-AgiHitFactor = RuleR.Get(Rule.AgiHitFactor);
-WeaponSkillFalloff = RuleR.Get(Rule.WeaponSkillFalloff);
-ArcheryHitPenalty = RuleR.Get(Rule.ArcheryHitPenalty);
-UseOldDamageIntervalRules = RuleB.Get(Rule.UseOldDamageIntervalRules);
-
-CriticalMessageRange = RuleI.Get(Rule.CriticalDamage);
+MeleeBaseCritChance            = 0.0;
+ClientBaseCritChance           = 0.0;
+BerserkBaseCritChance          = 6.0;
+WarBerBaseCritChance           = 3.0;
+RogueCritThrowingChance        = 25;
+RogueDeadlyStrikeChance        = 80;
+RogueDeadlyStrikeMod           = 2;
 
+-- Source Function: Mob::MeleeMitigation()
+-- Partial: Rest happens in DoMeleeMitigation
 function MeleeMitigation(e)
 	e.IgnoreDefault = true;
-	
+
 	if e.hit.damage_done < 0 or e.hit.base_damage == 0 then
 		return e;
 	end
-	
+
+	eq.log_combat(
+			string.format("[%s] [ClientAttack] Damage Table [%i] WeaponDMG [%i]",
+					e.self:GetCleanName(),
+					GetDamageTable(e.other, e.hit.skill),
+					e.hit.base_damage
+			)
+	);
+
 	e.hit.damage_done = 2 * e.hit.base_damage * GetDamageTable(e.other, e.hit.skill) / 100;
-	e.hit = DoMeleeMitigation(e.self, e.other, e.hit, e.opts);	
+
+	eq.log_combat(
+			string.format("[%s] [ClientAttack] DamageDone [%i] BaseDamage [%i] HitSkill [%i]",
+					e.self:GetCleanName(),
+					e.hit.damage_done,
+					e.hit.base_damage,
+					e.hit.skill
+			)
+	);
+
+	e.hit = DoMeleeMitigation(e.self, e.other, e.hit, e.opts);
+
 	return e;
 end
 
+-- Source Function: Mob::CheckHitChance()
 function CheckHitChance(e)
-	e.IgnoreDefault = true;
-	
-	local other = e.other;
-	local attacker = other;
-	local self = e.self;
-	local defender = self;
+	e.IgnoreDefault   = true;
+
+	local other       = e.other;
+	local attacker    = other;
+	local self        = e.self;
+	local defender    = self;
 	local chancetohit = BaseHitChance;
-    local chance_mod = 0;	
-	
-	if(e.opts ~= nil) then
+	local chance_mod  = 0;
+
+	if (e.opts ~= nil) then
 		chance_mod = e.opts.hit_chance;
 	end
-	
-	if(attacker:IsNPC() and not attacker:IsPet()) then
+
+	if (attacker:IsNPC() and not attacker:IsPet()) then
 		chancetohit = chancetohit + NPCBonusHitChance;
 	end
 
 	local pvpmode = false;
-	if(self:IsClient() and other:IsClient()) then
+	if (self:IsClient() and other:IsClient()) then
 		pvpmode = true;
 	end
-    
+
 	if (chance_mod >= 10000) then
 		e.ReturnValue = true;
 		return e;
 	end
-	  
+
 	local avoidanceBonus = 0;
-	local hitBonus = 0;
-    
+	local hitBonus       = 0;
+
 	local attacker_level = attacker:GetLevel();
-	if(attacker_level < 1) then
+	if (attacker_level < 1) then
 		attacker_level = 1;
 	end
-	
+
 	local defender_level = defender:GetLevel();
-    if(defender_level < 1) then
+	if (defender_level < 1) then
 		defender_level = 1;
 	end
 
 	local level_difference = attacker_level - defender_level;
-	local range = defender_level;
-	range = ((range / 4) + 3);
-    
-	if(level_difference < 0) then
-		if(level_difference >= -range) then
+	local range            = defender_level;
+	range                  = ((range / 4) + 3);
+
+	if (level_difference < 0) then
+		if (level_difference >= -range) then
 			chancetohit = chancetohit + ((level_difference / range) * HitFalloffMinor);
-		elseif (level_difference >= -(range+3.0)) then
+		elseif (level_difference >= -(range + 3.0)) then
 			chancetohit = chancetohit - HitFalloffMinor;
 			chancetohit = chancetohit + (((level_difference + range) / 3.0) * HitFalloffModerate);
 		else
@@ -116,85 +153,95 @@ function CheckHitChance(e)
 	end
 
 	chancetohit = chancetohit - (defender:GetAGI() * AgiHitFactor);
-	
-	if(attacker:IsClient()) then
+
+	if (attacker:IsClient()) then
 		chancetohit = chancetohit - (WeaponSkillFalloff * (attacker:CastToClient():MaxSkill(e.hit.skill) - attacker:GetSkill(e.hit.skill)));
 	end
-    
-	if(defender:IsClient()) then
+
+	if (defender:IsClient()) then
 		chancetohit = chancetohit + (WeaponSkillFalloff * (defender:CastToClient():MaxSkill(Skill.Defense) - defender:GetSkill(Skill.Defense)));
 	end
-	
+
 	local attacker_spellbonuses = attacker:GetSpellBonuses();
-	local attacker_itembonuses = attacker:GetItemBonuses();
-	local attacker_aabonuses = attacker:GetAABonuses();
+	local attacker_itembonuses  = attacker:GetItemBonuses();
+	local attacker_aabonuses    = attacker:GetAABonuses();
 	local defender_spellbonuses = defender:GetSpellBonuses();
-	local defender_itembonuses = defender:GetItemBonuses();
-	local defender_aabonuses = defender:GetAABonuses();
-	
-	if(attacker_spellbonuses:MeleeSkillCheckSkill() == e.hit.skill or attacker_spellbonuses:MeleeSkillCheckSkill() == 255) then
+	local defender_itembonuses  = defender:GetItemBonuses();
+	local defender_aabonuses    = defender:GetAABonuses();
+
+	if (attacker_spellbonuses:MeleeSkillCheckSkill() == e.hit.skill or attacker_spellbonuses:MeleeSkillCheckSkill() == 255) then
 		chancetohit = chancetohit + attacker_spellbonuses:MeleeSkillCheck();
 	end
-	
-	if(attacker_itembonuses:MeleeSkillCheckSkill() == e.hit.skill or attacker_itembonuses:MeleeSkillCheckSkill() == 255) then
-		chancetohit = chancetohit +  attacker_itembonuses:MeleeSkillCheck();
+
+	if (attacker_itembonuses:MeleeSkillCheckSkill() == e.hit.skill or attacker_itembonuses:MeleeSkillCheckSkill() == 255) then
+		chancetohit = chancetohit + attacker_itembonuses:MeleeSkillCheck();
 	end
 
 	avoidanceBonus = defender_spellbonuses:AvoidMeleeChanceEffect() +
-				defender_itembonuses:AvoidMeleeChanceEffect() +
-				defender_aabonuses:AvoidMeleeChanceEffect() +
-				(defender_itembonuses:AvoidMeleeChance() / 10.0);
-    
-	local owner = Mob();
+			defender_itembonuses:AvoidMeleeChanceEffect() +
+			defender_aabonuses:AvoidMeleeChanceEffect() +
+			(defender_itembonuses:AvoidMeleeChance() / 10.0);
+
+	local owner    = Mob();
 	if (defender:IsPet()) then
 		owner = defender:GetOwner();
 	elseif (defender:IsNPC() and defender:CastToNPC():GetSwarmOwner()) then
 		local entity_list = eq.get_entity_list();
-		owner = entity_list:GetMobID(defender:CastToNPC():GetSwarmOwner());
+		owner             = entity_list:GetMobID(defender:CastToNPC():GetSwarmOwner());
 	end
-    
+
 	if (owner.valid) then
 		avoidanceBonus = avoidanceBonus + owner:GetAABonuses():PetAvoidance() + owner:GetSpellBonuses():PetAvoidance() + owner:GetItemBonuses():PetAvoidance();
 	end
 
-	if(defender:IsNPC()) then
+	if (defender:IsNPC()) then
 		avoidanceBonus = avoidanceBonus + (defender:CastToNPC():GetAvoidanceRating() / 10.0);
 	end
 
 	hitBonus = hitBonus + attacker_itembonuses:HitChanceEffect(e.hit.skill) +
-				attacker_spellbonuses:HitChanceEffect(e.hit.skill) +
-				attacker_aabonuses:HitChanceEffect(e.hit.skill) +
-				attacker_itembonuses:HitChanceEffect(Skill.HIGHEST_SKILL + 1) +
-				attacker_spellbonuses:HitChanceEffect(Skill.HIGHEST_SKILL + 1) +
-				attacker_aabonuses:HitChanceEffect(Skill.HIGHEST_SKILL + 1);
-    
+			attacker_spellbonuses:HitChanceEffect(e.hit.skill) +
+			attacker_aabonuses:HitChanceEffect(e.hit.skill) +
+			attacker_itembonuses:HitChanceEffect(Skill.HIGHEST_SKILL + 1) +
+			attacker_spellbonuses:HitChanceEffect(Skill.HIGHEST_SKILL + 1) +
+			attacker_aabonuses:HitChanceEffect(Skill.HIGHEST_SKILL + 1);
+
 	hitBonus = hitBonus + (attacker_itembonuses:Accuracy(Skill.HIGHEST_SKILL + 1) +
-				attacker_spellbonuses:Accuracy(Skill.HIGHEST_SKILL + 1) +
-				attacker_aabonuses:Accuracy(Skill.HIGHEST_SKILL + 1) +
-				attacker_aabonuses:Accuracy(e.hit.skill) +
-				attacker_itembonuses:HitChance()) / 15.0;
-    
+			attacker_spellbonuses:Accuracy(Skill.HIGHEST_SKILL + 1) +
+			attacker_aabonuses:Accuracy(Skill.HIGHEST_SKILL + 1) +
+			attacker_aabonuses:Accuracy(e.hit.skill) +
+			attacker_itembonuses:HitChance()) / 15.0;
+
 	hitBonus = hitBonus + chance_mod;
-    
-	if(attacker:IsNPC()) then
+
+	if (attacker:IsNPC()) then
 		hitBonus = hitBonus + (attacker:CastToNPC():GetAccuracyRating() / 10.0);
 	end
-    
+
 	if (e.hit.skill == Skill.Archery) then
 		hitBonus = hitBonus - (hitBonus * ArcheryHitPenalty);
 	end
 
 	chancetohit = chancetohit + ((chancetohit * (hitBonus - avoidanceBonus)) / 100.0);
 
-	if(chancetohit > 1000 or chancetohit < -1000) then
-	elseif(chancetohit > 95) then
+	if (chancetohit > 1000 or chancetohit < -1000) then
+	elseif (chancetohit > 95) then
 		chancetohit = 95;
-	elseif(chancetohit < 5) then
+	elseif (chancetohit < 5) then
 		chancetohit = 5;
 	end
 
 	local tohit_roll = Random.Real(0, 100);
-	if(tohit_roll <= chancetohit) then
+
+	eq.log_combat(
+			string.format("[%s] [Mob::CheckHitChance] Chance [%i] ToHitRoll [%i] Hit? [%s]",
+					e.self:GetCleanName(),
+					chancetohit,
+					tohit_roll,
+					(tohit_roll <= chancetohit) and "true" or "false"
+			)
+	);
+
+	if (tohit_roll <= chancetohit) then
 		e.ReturnValue = true;
 	else
 		e.ReturnValue = false;
@@ -203,32 +250,33 @@ function CheckHitChance(e)
 	return e;
 end
 
+-- Source Function: Mob::TryCriticalHit()
 function TryCriticalHit(e)
 	e.IgnoreDefault = true;
-	
-	local self = e.self;
-	local defender = e.other;
-	
-	if(e.hit.damage_done < 1 or defender.null) then
+
+	local self      = e.self;
+	local defender  = e.other;
+
+	if (e.hit.damage_done < 1 or defender.null) then
 		return e;
 	end
-	
+
 	if ((self:IsPet() and self:GetOwner():IsClient()) or (self:IsNPC() and self:CastToNPC():GetSwarmOwner() ~= 0)) then
 		e.hit = TryPetCriticalHit(self, defender, e.hit);
 		return e;
 	end
-	
+
 	if (self:IsPet() and self:GetOwner().valid and self:GetOwner():IsBot()) then
 		e.hit = TryPetCriticalHit(self, defender, e.hit);
 		return e;
 	end
 
-	local critChance = 0.0;
+	local critChance   = 0.0;
 	local IsBerskerSPA = false;
-	local aabonuses = self:GetAABonuses();
-	local itembonuses = self:GetItemBonuses();
+	local aabonuses    = self:GetAABonuses();
+	local itembonuses  = self:GetItemBonuses();
 	local spellbonuses = self:GetSpellBonuses();
-	local entity_list = eq.get_entity_list();
+	local entity_list  = eq.get_entity_list();
 
 	if (defender:GetBodyType() == BT.Undead or defender:GetBodyType() == BT.SummonedUndead or defender:GetBodyType() == BT.Vampire) then
 		local SlayRateBonus = aabonuses:SlayUndead(0) + itembonuses:SlayUndead(0) + spellbonuses:SlayUndead(0);
@@ -236,28 +284,28 @@ function TryCriticalHit(e)
 			local slayChance = SlayRateBonus / 10000.0;
 			if (Random.RollReal(slayChance)) then
 				local SlayDmgBonus = aabonuses:SlayUndead(1) + itembonuses:SlayUndead(1) + spellbonuses:SlayUndead(1);
-				e.hit.damage_done = (e.hit.damage_done * SlayDmgBonus * 2.25) / 100;
-				
+				e.hit.damage_done  = (e.hit.damage_done * SlayDmgBonus * 2.25) / 100;
+
 				if (self:GetGender() == 1) then
 					entity_list:FilteredMessageClose(self, false, CriticalMessageRange, MT.CritMelee, Filter.MeleeCrits, string.format('%s\'s holy blade cleanses her target! (%d)', self:GetCleanName(), e.hit.damage_done));
 				else
 					entity_list:FilteredMessageClose(self, false, CriticalMessageRange, MT.CritMelee, Filter.MeleeCrits, string.format('%s\'s holy blade cleanses his target! (%d)', self:GetCleanName(), e.hit.damage_done));
 				end
-				
+
 				return e;
 			end
 		end
 	end
-    
+
 	critChance = critChance + MeleeBaseCritChance;
-    
+
 	if (self:IsClient()) then
-		critChance  = critChance + ClientBaseCritChance;
-    
+		critChance = critChance + ClientBaseCritChance;
+
 		if (spellbonuses:BerserkSPA() or itembonuses:BerserkSPA() or aabonuses:BerserkSPA()) then
 			IsBerskerSPA = true;
 		end
-    
+
 		if (((self:GetClass() == Class.WARRIOR or self:GetClass() == Class.BERSERKER) and self:GetLevel() >= 12) or IsBerskerSPA) then
 			if (self:IsBerserk() or IsBerskerSPA) then
 				critChance = critChance + BerserkBaseCritChance;
@@ -266,21 +314,21 @@ function TryCriticalHit(e)
 			end
 		end
 	end
-    
+
 	local deadlyChance = 0;
-	local deadlyMod = 0;
+	local deadlyMod    = 0;
 	if (e.hit.skill == Skill.Archery and self:GetClass() == Class.RANGER and self:GetSkill(Skill.Archery) >= 65) then
 		critChance = critChance + 6;
 	end
 
 	if (e.hit.skill == Skill.Throwing and self:GetClass() == Class.ROGUE and self:GetSkill(Skill.Throwing) >= 65) then
-		critChance = critChance + RogueCritThrowingChance;
+		critChance   = critChance + RogueCritThrowingChance;
 		deadlyChance = RogueDeadlyStrikeChance;
-		deadlyMod = RogueDeadlyStrikeMod;
+		deadlyMod    = RogueDeadlyStrikeMod;
 	end
-    
+
 	local CritChanceBonus = GetCriticalChanceBonus(self, e.hit.skill);
-    
+
 	if (CritChanceBonus > 0 or critChance > 0) then
 		if (self:GetDEX() <= 255) then
 			critChance = critChance + (self:GetDEX() / 125.0);
@@ -289,43 +337,63 @@ function TryCriticalHit(e)
 		end
 		critChance = critChance + (critChance * CritChanceBonus / 100.0);
 	end
-    
-	if(opts ~= nil) then
+
+	if (opts ~= nil) then
 		critChance = critChance * opts.crit_percent;
 		critChance = critChance + opts.crit_flat;
 	end
-    
-	if(critChance > 0) then
-    
+
+	eq.log_combat(
+			string.format("[%s] [Mob::TryCriticalHit] CritChance [%i] CritChanceBonus [%i] Dex [%i] Post-Dex-Block",
+					e.self:GetCleanName(),
+					critChance,
+					CritChanceBonus,
+					e.self:GetDEX()
+			)
+	);
+
+	if (critChance > 0) then
+
 		critChance = critChance / 100;
-    
-		if(Random.RollReal(critChance)) then
-			local critMod = 200;
-			local crip_success = false;
+
+		if (Random.RollReal(critChance)) then
+			local critMod             = 200;
+			local crip_success        = false;
 			local CripplingBlowChance = GetCrippBlowChance(self);
-    
+
 			if (CripplingBlowChance > 0 or (self:IsBerserk() or IsBerskerSPA)) then
 				if (not self:IsBerserk() and not IsBerskerSPA) then
 					critChance = critChance * (CripplingBlowChance / 100.0);
 				end
-    
+
 				if ((self:IsBerserk() or IsBerskerSPA) or Random.RollReal(critChance)) then
-					critMod = 400;
+					critMod      = 400;
 					crip_success = true;
 				end
 			end
-    
+
 			critMod = critMod + GetCritDmgMod(self, e.hit.skill) * 2;
-			e.hit.damage_done = e.hit.damage_done * critMod / 100;
-    
+
+			eq.log_combat(
+					string.format("[%s] [Mob::TryCriticalHit] CritChance [%i] CritMod [%i] GetCritDmgMod [%i] CripSuccess [%s]",
+							e.self:GetCleanName(),
+							critChance,
+							critMod,
+							GetCritDmgMod(self, e.hit.skill),
+							(crip_success) and "true" or "false"
+					)
+			);
+
+			e.hit.damage_done   = e.hit.damage_done * critMod / 100;
+
 			local deadlySuccess = false;
 			if (deadlyChance > 0 and Random.RollReal(deadlyChance / 100.0)) then
 				if (self:BehindMob(defender, self:GetX(), self:GetY())) then
 					e.hit.damage_done = e.hit.damage_done * deadlyMod;
-					deadlySuccess = true;
+					deadlySuccess     = true;
 				end
 			end
-    
+
 			if (crip_success) then
 				entity_list:FilteredMessageClose(self, false, CriticalMessageRange, MT.CritMelee, Filter.MeleeCrits, string.format('%s lands a Crippling Blow! (%d)', self:GetCleanName(), e.hit.damage_done));
 				if (defender:GetLevel() <= 55 and not defender:GetSpecialAbility(SpecialAbility.unstunable)) then
@@ -339,24 +407,25 @@ function TryCriticalHit(e)
 			end
 		end
 	end
-	
+
 	return e;
 end
 
+-- Source Function: Mob::TryPetCriticalHit()
 function TryPetCriticalHit(self, defender, hit)
-	if(hit.damage_done < 1) then
+	if (hit.damage_done < 1) then
 		return hit;
 	end
 
-	local owner = Mob();
+	local owner      = Mob();
 	local critChance = MeleeBaseCritChance;
-	local critMod = 163;
+	local critMod    = 163;
 
 	if (self:IsPet()) then
 		owner = self:GetOwner();
 	elseif (self:IsNPC() and self:CastToNPC():GetSwarmOwner()) then
 		local entity_list = eq.get_entity_list();
-		owner = entity_list:GetMobID(self:CastToNPC():GetSwarmOwner());
+		owner             = entity_list:GetMobID(self:CastToNPC():GetSwarmOwner());
 	else
 		return hit;
 	end
@@ -364,128 +433,198 @@ function TryPetCriticalHit(self, defender, hit)
 	if (owner.null) then
 		return hit;
 	end
-	
-	local CritPetChance = owner:GetAABonuses():PetCriticalHit() + owner:GetItemBonuses():PetCriticalHit() + owner:GetSpellBonuses():PetCriticalHit();
+
+	local CritPetChance   = owner:GetAABonuses():PetCriticalHit() + owner:GetItemBonuses():PetCriticalHit() + owner:GetSpellBonuses():PetCriticalHit();
 	local CritChanceBonus = GetCriticalChanceBonus(self, hit.skill);
 
+	eq.log_combat(
+			string.format("[%s] [Mob::TryPetCriticalHit] CritPetChance [%i] CritChanceBonus [%i] | Bonuses AA [%i] Item [%i] Spell [%i]",
+					self:GetCleanName(),
+					CritPetChance,
+					CritChanceBonus,
+					owner:GetAABonuses():PetCriticalHit(),
+					owner:GetItemBonuses():PetCriticalHit(),
+					owner:GetSpellBonuses():PetCriticalHit()
+			)
+	);
+
 	if (CritPetChance or critChance) then
 		critChance = critChance + CritPetChance;
 		critChance = critChance + (critChance * CritChanceBonus / 100.0);
+
+		eq.log_combat(
+				string.format("[%s] [Mob::TryPetCriticalHit] critChance [%i] PostCalcs",
+						self:GetCleanName(),
+						critChance
+				)
+		);
+
 	end
 
-	if(critChance > 0) then
+	if (critChance > 0) then
 		critChance = critChance / 100;
 
-		if(Random.RollReal(critChance)) then
+		if (Random.RollReal(critChance)) then
 			local entity_list = eq.get_entity_list();
-			critMod = critMod + GetCritDmgMod(self, hit.skill) * 2;
-			hit.damage_done = (hit.damage_done * critMod) / 100;
-			entity_list:FilteredMessageClose(this, false, CriticalMessageRange,
-					MT.CritMelee, Filter.MeleeCrits, string.format('%s scores a critical hit! (%d)',
-					self:GetCleanName(), e.hit.damage_done));
+			critMod           = critMod + GetCritDmgMod(self, hit.skill) * 2;
+			hit.damage_done   = (hit.damage_done * critMod) / 100;
+
+			eq.log_combat(
+					string.format("[%s] [Mob::TryPetCriticalHit] critMod [%i] DmgMod [%i] DamageDone [%i]",
+							self:GetCleanName(),
+							critMod,
+							GetCritDmgMod(self, hit.skill),
+							hit.damage_done
+					)
+			);
+
+			entity_list:FilteredMessageClose(
+					this,
+					false,
+					CriticalMessageRange,
+					MT.CritMelee,
+					Filter.MeleeCrits,
+					string.format('%s scores a critical hit! (%d)', self:GetCleanName(), e.hit.damage_done)
+			);
 		end
 	end
-	
+
 	return hit;
 end
 
+-- Source Function: Mob::GetCriticalChanceBonus()
 function GetCriticalChanceBonus(self, skill)
-	
+
 	local critical_chance = 0;
-	
-	local aabonuses = self:GetAABonuses();
-	local itembonuses = self:GetItemBonuses();
-	local spellbonuses = self:GetSpellBonuses();
-	
-	critical_chance = critical_chance + itembonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1);
-	critical_chance = critical_chance + spellbonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1);
-	critical_chance = critical_chance + aabonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1);
-	critical_chance = critical_chance + itembonuses:CriticalHitChance(skill);
-	critical_chance = critical_chance + spellbonuses:CriticalHitChance(skill);
-	critical_chance = critical_chance + aabonuses:CriticalHitChance(skill);
-		
+
+	local aabonuses       = self:GetAABonuses();
+	local itembonuses     = self:GetItemBonuses();
+	local spellbonuses    = self:GetSpellBonuses();
+
+	critical_chance       = critical_chance + itembonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1);
+	critical_chance       = critical_chance + spellbonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1);
+	critical_chance       = critical_chance + aabonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1);
+	critical_chance       = critical_chance + itembonuses:CriticalHitChance(skill);
+	critical_chance       = critical_chance + spellbonuses:CriticalHitChance(skill);
+	critical_chance       = critical_chance + aabonuses:CriticalHitChance(skill);
+
+	eq.log_combat(
+			string.format("[%s] [Mob::GetCriticalChanceBonus] Bonuses | Item [%i] Spell [%i] AA [%i] | 2nd Item [%i] Spell [%i] AA [%i] Final Chance [%i]",
+					self:GetCleanName(),
+					itembonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1),
+					spellbonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1),
+					aabonuses:CriticalHitChance(Skill.HIGHEST_SKILL + 1),
+					itembonuses:CriticalHitChance(skill),
+					spellbonuses:CriticalHitChance(skill),
+					aabonuses:CriticalHitChance(skill),
+					critical_chance
+			)
+	);
+
 	return critical_chance;
 end
 
+-- Source Function: Mob::GetCritDmgMob()
 function GetCritDmgMod(self, skill)
-	local critDmg_mod = 0;
-	
-	local aabonuses = self:GetAABonuses();
-	local itembonuses = self:GetItemBonuses();
+	local critDmg_mod  = 0;
+
+	local aabonuses    = self:GetAABonuses();
+	local itembonuses  = self:GetItemBonuses();
 	local spellbonuses = self:GetSpellBonuses();
-	
-	critDmg_mod = critDmg_mod + itembonuses:CritDmgMod(Skill.HIGHEST_SKILL + 1);
-	critDmg_mod = critDmg_mod + spellbonuses:CritDmgMod(Skill.HIGHEST_SKILL + 1);
-	critDmg_mod = critDmg_mod + aabonuses:CritDmgMod(Skill.HIGHEST_SKILL + 1);
-	critDmg_mod = critDmg_mod + itembonuses:CritDmgMod(skill);
-	critDmg_mod = critDmg_mod + spellbonuses:CritDmgMod(skill);
-	critDmg_mod = critDmg_mod + aabonuses:CritDmgMod(skill);
-		
+	critDmg_mod        = critDmg_mod + itembonuses:CritDmgMod(Skill.HIGHEST_SKILL + 1);
+	critDmg_mod        = critDmg_mod + spellbonuses:CritDmgMod(Skill.HIGHEST_SKILL + 1);
+	critDmg_mod        = critDmg_mod + aabonuses:CritDmgMod(Skill.HIGHEST_SKILL + 1);
+	critDmg_mod        = critDmg_mod + itembonuses:CritDmgMod(skill);
+	critDmg_mod        = critDmg_mod + spellbonuses:CritDmgMod(skill);
+	critDmg_mod        = critDmg_mod + aabonuses:CritDmgMod(skill);
+
+	if (critDmg_mod < -100) then
+		critDmg_mod = -100;
+	end
+
 	return critDmg_mod;
 end
 
+-- Source Function: Mob::GetCrippBlowChance()
 function GetCrippBlowChance(self)
-	local aabonuses = self:GetAABonuses();
-	local itembonuses = self:GetItemBonuses();
+	local aabonuses    = self:GetAABonuses();
+	local itembonuses  = self:GetItemBonuses();
 	local spellbonuses = self:GetSpellBonuses();
-	local crip_chance = itembonuses:CrippBlowChance() + spellbonuses:CrippBlowChance() + aabonuses:CrippBlowChance();
+	local crip_chance  = itembonuses:CrippBlowChance() + spellbonuses:CrippBlowChance() + aabonuses:CrippBlowChance();
 
-	if(crip_chance < 0) then
+	if (crip_chance < 0) then
 		crip_chance = 0;
 	end
 
 	return crip_chance;
 end
 
+-- Source Function: Mob::MeleeMitigation()
 function DoMeleeMitigation(defender, attacker, hit, opts)
 	if hit.damage_done <= 0 then
 		return hit;
 	end
-	
-	local aabonuses = defender:GetAABonuses();
-	local itembonuses = defender:GetItemBonuses();
-	local spellbonuses = defender:GetSpellBonuses();
-	
-	local aa_mit = (aabonuses:CombatStability() + itembonuses:CombatStability() + spellbonuses:CombatStability()) / 100.0;
-	local softcap = (defender:GetSkill(15) + defender:GetLevel()) * SoftcapFactor * (1.0 + aa_mit);
+
+	local aabonuses         = defender:GetAABonuses();
+	local itembonuses       = defender:GetItemBonuses();
+	local spellbonuses      = defender:GetSpellBonuses();
+
+	local aa_mit            = (aabonuses:CombatStability() + itembonuses:CombatStability() + spellbonuses:CombatStability()) / 100.0;
+	local softcap           = (defender:GetSkill(15) + defender:GetLevel()) * SoftcapFactor * (1.0 + aa_mit);
 	local mitigation_rating = 0.0;
-	local attack_rating = 0.0;
-	local shield_ac = 0;
-	local armor = 0;
-	local weight = 0.0;
-	local monkweight = MonkACBonusWeight;
-	
+	local attack_rating     = 0.0;
+	local shield_ac         = 0;
+	local armor             = 0;
+	local weight            = 0.0;
+	local monkweight        = MonkACBonusWeight;
+
+	eq.log_combat(
+			string.format("[%s] [Mob::MeleeMitigation] Stability Bonuses | AA [%i] Item [%i] Spell [%i]",
+					defender:GetCleanName(),
+					aabonuses:CombatStability(),
+					itembonuses:CombatStability(),
+					spellbonuses:CombatStability()
+			)
+	);
+
+	eq.log_combat(
+			string.format("[%s] [Mob::MeleeMitigation] Soft Cap [%i]",
+					defender:GetCleanName(),
+					softcap
+			)
+	);
+
 	if defender:IsClient() then
 		armor, shield_ac = GetRawACNoShield(defender);
-		weight = defender:CastToClient():CalcCurrentWeight() / 10;
+		weight           = defender:CastToClient():CalcCurrentWeight() / 10;
 	elseif defender:IsNPC() then
-		armor = defender:CastToNPC():GetRawAC();
+		armor            = defender:CastToNPC():GetRawAC();
 		local PetACBonus = 0;
-		
+
 		if not defender:IsPet() then
 			armor = armor / NPCACFactor;
 		end
-		
+
 		local owner = Mob();
 		if defender:IsPet() then
 			owner = defender:GetOwner();
 		elseif defender:CastToNPC():GetSwarmOwner() ~= 0 then
 			local entity_list = eq.get_entity_list();
-			owner = entity_list:GetMobID(defender:CastToNPC():GetSwarmOwner());
+			owner             = entity_list:GetMobID(defender:CastToNPC():GetSwarmOwner());
 		end
-		
+
 		if owner.valid then
 			PetACBonus = owner:GetAABonuses():PetMeleeMitigation() + owner:GetItemBonuses():PetMeleeMitigation() + owner:GetSpellBonuses():PetMeleeMitigation();
 		end
-		
+
 		armor = armor + defender:GetSpellBonuses():AC() + defender:GetItemBonuses():AC() + PetACBonus + 1;
 	end
-	
+
 	if (opts ~= nil) then
 		armor = armor * (1.0 - opts.armor_pen_percent);
 		armor = armor - opts.armor_pen_flat;
 	end
-	
+
 	local defender_class = defender:GetClass();
 	if OldACSoftcapRules then
 		if defender_class == Class.WIZARD or defender_class == Class.MAGICIAN or defender_class == Class.NECROMANCER or defender_class == Class.ENCHANTER then
@@ -502,12 +641,12 @@ function DoMeleeMitigation(defender, attacker, hit, opts)
 	end
 
 	softcap = softcap + shield_ac;
-	armor = armor + shield_ac;
-	
+	armor   = armor + shield_ac;
+
 	if OldACSoftcapRules then
 		softcap = softcap + (softcap * (aa_mit * AAMitigationACFactor));
 	end
-	
+
 	if armor > softcap then
 		local softcap_armor = armor - softcap;
 		if OldACSoftcapRules then
@@ -529,7 +668,7 @@ function DoMeleeMitigation(defender, attacker, hit, opts)
 				softcap_armor = softcap_armor * WarACSoftcapReturn;
 			elseif defender_class == Class.PALADIN or defender_class == Class.SHADOWKNIGHT then
 				softcap_armor = softcap_armor * PalShdACSoftcapReturn;
-			elseif defender_class == Class.CLERIC or defender_class == Class.RANGER or	defender_class == Class.MONK or defender_class == Class.BARD then
+			elseif defender_class == Class.CLERIC or defender_class == Class.RANGER or defender_class == Class.MONK or defender_class == Class.BARD then
 				softcap_armor = softcap_armor * ClrRngMnkBrdACSoftcapReturn;
 			elseif defender_class == Class.DRUID or defender_class == Class.NECROMANCER or defender_class == Class.WIZARD or defender_class == Class.ENCHANTER or defender_class == Class.MAGICIAN then
 				softcap_armor = softcap_armor * DruNecWizEncMagACSoftcapReturn;
@@ -539,35 +678,52 @@ function DoMeleeMitigation(defender, attacker, hit, opts)
 				softcap_armor = softcap_armor * MiscACSoftcapReturn;
 			end
 		end
-		
+
 		armor = softcap + softcap_armor;
 	end
-		
+
 	local mitigation_rating;
 	if defender_class == Class.WIZARD or defender_class == Class.MAGICIAN or defender_class == Class.NECROMANCER or defender_class == Class.ENCHANTER then
 		mitigation_rating = ((defender:GetSkill(Skill.Defense) + defender:GetItemBonuses():HeroicAGI() / 10) / 4.0) + armor + 1;
 	else
 		mitigation_rating = ((defender:GetSkill(Skill.Defense) + defender:GetItemBonuses():HeroicAGI() / 10) / 3.0) + (armor * 1.333333) + 1;
 	end
-	
+
 	mitigation_rating = mitigation_rating * 0.847;
-	
+
 	local attack_rating;
 	if attacker:IsClient() then
-		attack_rating = (attacker:CastToClient():CalcATK() + ((attacker:GetSTR() - 66) * 0.9) + (attacker:GetSkill(Skill.Offense)*1.345));
+		attack_rating = (attacker:CastToClient():CalcATK() + ((attacker:GetSTR() - 66) * 0.9) + (attacker:GetSkill(Skill.Offense) * 1.345));
 	else
-		attack_rating = (attacker:GetATK() + (attacker:GetSkill(Skill.Offense)*1.345) + ((attacker:GetSTR() - 66) * 0.9));
+		attack_rating = (attacker:GetATK() + (attacker:GetSkill(Skill.Offense) * 1.345) + ((attacker:GetSTR() - 66) * 0.9));
 	end
-	
+
+	eq.log_combat(
+			string.format("[%s] [Mob::MeleeMitigation] Attack Rating [%02f] Mitigation Rating [%02f] Damage [%i]",
+					defender:GetCleanName(),
+					attack_rating,
+					mitigation_rating,
+					hit.damage_done
+			)
+	);
+
 	hit.damage_done = GetMeleeMitDmg(defender, attacker, hit.damage_done, hit.min_damage, mitigation_rating, attack_rating);
 
-	if hit.damage_done < 0 then 
+	if hit.damage_done < 0 then
 		hit.damage_done = 0;
 	end
-	
+
+	eq.log_combat(
+			string.format("[%s] [Mob::MeleeMitigation] Final Damage [%i]",
+					defender:GetCleanName(),
+					hit.damage_done
+			)
+	);
+
 	return hit;
 end
 
+-- Source Function: N/A
 function GetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_rating, attack_rating)
 	if defender:IsClient() then
 		return ClientGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_rating, attack_rating);
@@ -576,28 +732,29 @@ function GetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_ratin
 	end
 end
 
+-- Source Function: Client::GetMeleeMitDmg()
 function ClientGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_rating, attack_rating)
 	if (not attacker:IsNPC() or UseOldDamageIntervalRules) then
 		return MobGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_rating, attack_rating);
 	end
-	
-	local d = 10;
-	local dmg_interval = (damage - min_damage) / 19.0;
-	local dmg_bonus = min_damage - dmg_interval;
+
+	local d             = 10;
+	local dmg_interval  = (damage - min_damage) / 19.0;
+	local dmg_bonus     = min_damage - dmg_interval;
 	local spellMeleeMit = (defender:GetSpellBonuses():MeleeMitigationEffect() + defender:GetItemBonuses():MeleeMitigationEffect() + defender:GetAABonuses():MeleeMitigationEffect()) / 100.0;
 	if (defender:GetClass() == Class.WARRIOR) then
 		spellMeleeMit = spellMeleeMit - 0.05;
 	end
-		
-	dmg_bonus = dmg_bonus - (dmg_bonus * (defender:GetItemBonuses():MeleeMitigation() / 100.0));
-	dmg_interval = dmg_interval + (dmg_interval * spellMeleeMit);
+
+	dmg_bonus      = dmg_bonus - (dmg_bonus * (defender:GetItemBonuses():MeleeMitigation() / 100.0));
+	dmg_interval   = dmg_interval + (dmg_interval * spellMeleeMit);
 
 	local mit_roll = Random.Real(0, mitigation_rating);
 	local atk_roll = Random.Real(0, attack_rating);
 
 	if (atk_roll > mit_roll) then
-		local a_diff = atk_roll - mit_roll;
-		local thac0 = attack_rating * ACthac0Factor;
+		local a_diff   = atk_roll - mit_roll;
+		local thac0    = attack_rating * ACthac0Factor;
 		local thac0cap = attacker:GetLevel() * 9 + 20;
 		if (thac0 > thac0cap) then
 			thac0 = thac0cap;
@@ -605,8 +762,8 @@ function ClientGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation
 
 		d = d + (10 * (a_diff / thac0));
 	elseif (mit_roll > atk_roll) then
-		local m_diff = mit_roll - atk_roll;
-		local thac20 = mitigation_rating * ACthac20Factor;
+		local m_diff    = mit_roll - atk_roll;
+		local thac20    = mitigation_rating * ACthac20Factor;
 		local thac20cap = defender:GetLevel() * 9 + 20;
 		if (thac20 > thac20cap) then
 			thac20 = thac20cap;
@@ -624,14 +781,23 @@ function ClientGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation
 	return math.floor(dmg_bonus + dmg_interval * d);
 end
 
-function MobGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_rating, attack_rating)	
-	local d = 10.0;
+-- Source Function: Mob::GetMeleeMitDmg()
+function MobGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_rating, attack_rating)
+	local d        = 10.0;
 	local mit_roll = Random.Real(0, mitigation_rating);
 	local atk_roll = Random.Real(0, attack_rating);
 
+	eq.log_combat(
+			string.format("[%s] [Mob::GetMeleeMitDmg] MitigationRoll [%02f] AtkRoll [%02f]",
+					defender:GetCleanName(),
+					mit_roll,
+					atk_roll
+			)
+	);
+
 	if (atk_roll > mit_roll) then
-		local a_diff = atk_roll - mit_roll;
-		local thac0 = attack_rating * ACthac0Factor;
+		local a_diff   = atk_roll - mit_roll;
+		local thac0    = attack_rating * ACthac0Factor;
 		local thac0cap = attacker:GetLevel() * 9 + 20;
 		if (thac0 > thac0cap) then
 			thac0 = thac0cap;
@@ -639,8 +805,8 @@ function MobGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_ra
 
 		d = d - (10.0 * (a_diff / thac0));
 	elseif (mit_roll > atk_roll) then
-		local m_diff = mit_roll - atk_roll;
-		local thac20 = mitigation_rating * ACthac20Factor;
+		local m_diff    = mit_roll - atk_roll;
+		local thac20    = mitigation_rating * ACthac20Factor;
 		local thac20cap = defender:GetLevel() * 9 + 20;
 		if (thac20 > thac20cap) then
 			thac20 = thac20cap;
@@ -654,26 +820,64 @@ function MobGetMeleeMitDmg(defender, attacker, damage, min_damage, mitigation_ra
 	elseif (d > 20.0) then
 		d = 20.0;
 	end
-	
+
 	local interval = (damage - min_damage) / 20.0;
-	damage = damage - (math.floor(d) * interval);	
-	damage = damage - (min_damage * defender:GetItemBonuses():MeleeMitigation() / 100);	
-	damage = damage + (damage * (defender:GetSpellBonuses():MeleeMitigationEffect() + defender:GetItemBonuses():MeleeMitigationEffect() + defender:GetAABonuses():MeleeMitigationEffect()) / 100);
-	
+
+	eq.log_combat(
+			string.format("[%s] [Mob::GetMeleeMitDmg] Interval [%02f] d [%02f]",
+					defender:GetCleanName(),
+					interval,
+					d
+			)
+	);
+
+	damage = damage - (math.floor(d) * interval);
+
+	eq.log_combat(
+			string.format("[%s] [Mob::GetMeleeMitDmg] Damage [%02f] Post Interval",
+					defender:GetCleanName(),
+					damage
+			)
+	);
+
+	damage = damage - (min_damage * defender:GetItemBonuses():MeleeMitigation() / 100);
+
+	eq.log_combat(
+			string.format("[%s] [Mob::GetMeleeMitDmg] Damage [%02f] Mitigation [%i] Post Mitigation MinDmg",
+					defender:GetCleanName(),
+					damage,
+					defender:GetItemBonuses():MeleeMitigation()
+			)
+	);
+
+	-- Changed from positive to negative per original
+	damage = damage - (damage * (defender:GetSpellBonuses():MeleeMitigationEffect() + defender:GetItemBonuses():MeleeMitigationEffect() + defender:GetAABonuses():MeleeMitigationEffect()) / 100);
+
+	eq.log_combat(
+			string.format("[%s] [Mob::GetMeleeMitDmg] Damage [%02f] SpellMit [%i] ItemMit [%i] AAMit [%i] Post All Mit Bonuses",
+					defender:GetCleanName(),
+					damage,
+					defender:GetSpellBonuses():MeleeMitigationEffect(),
+					defender:GetItemBonuses():MeleeMitigationEffect(),
+					defender:GetAABonuses():MeleeMitigationEffect()
+			)
+	);
+
 	return damage;
 end
 
+-- Source Function: Client::GetRawACNoShield()
 function GetRawACNoShield(self)
-	self = self:CastToClient();
-	
-	local ac = self:GetItemBonuses():AC() + self:GetSpellBonuses():AC() + self:GetAABonuses():AC();
+	self            = self:CastToClient();
+
+	local ac        = self:GetItemBonuses():AC() + self:GetSpellBonuses():AC() + self:GetAABonuses():AC();
 	local shield_ac = 0;
-	local inst = self:GetInventory():GetItem(Slot.Secondary);
-	
+	local inst      = self:GetInventory():GetItem(Slot.Secondary);
+
 	if inst.valid then
 		if inst:GetItem():ItemType() == 8 then
 			shield_ac = inst:GetItem():AC();
-			
+
 			for i = 1, 6 do
 				local augment = inst:GetAugment(i - 1);
 				if augment.valid then
@@ -682,33 +886,45 @@ function GetRawACNoShield(self)
 			end
 		end
 	end
-	
+
 	ac = ac - shield_ac;
+
+	eq.log_combat(
+			string.format("[%s] [Client::GetRawACNoShield] AC [%i] ItemAC [%i] SpellAC [%i] AAAC [%i]",
+					self:GetCleanName(),
+					ac,
+					self:GetItemBonuses():AC(),
+					self:GetSpellBonuses():AC(),
+					self:GetAABonuses():AC()
+			)
+	);
+
 	return ac, shield_ac;
 end
 
+-- Source Function: Mob::GetDamageTable()
 function GetDamageTable(attacker, skill)
 	if not attacker:IsClient() then
 		return 100;
 	end
-	
+
 	if attacker:GetLevel() <= 51 then
-		local ret_table = 0;
+		local ret_table   = 0;
 		local str_over_75 = 0;
 		if attacker:GetSTR() > 75 then
 			str_over_75 = attacker:GetSTR() - 75;
 		end
-		
+
 		if str_over_75 > 255 then
 			ret_table = (attacker:GetSkill(skill) + 255) / 2;
 		else
 			ret_table = (attacker:GetSkill(skill) + str_over_75) / 2;
 		end
-		
+
 		if ret_table < 100 then
 			return 100;
 		end
-		
+
 		return ret_table;
 	elseif attacker:GetLevel() >= 90 then
 		if attacker:GetClass() == 7 then
@@ -718,7 +934,7 @@ function GetDamageTable(attacker, skill)
 		end
 	else
 		local dmg_table = { 275, 275, 275, 275, 275, 280, 280, 280, 280, 285, 285, 285, 290, 290, 295, 295, 300, 300, 300, 305, 305, 305, 310, 310, 315, 315, 320, 320, 320, 325, 325, 325, 330, 330, 335, 335, 340, 340, 340 };
-		
+
 		if attacker:GetClass() == 7 then
 			local monkDamageTableBonus = 20;
 			return (dmg_table[attacker:GetLevel() - 50] * (100 + monkDamageTableBonus) / 100);
@@ -729,26 +945,56 @@ function GetDamageTable(attacker, skill)
 	return 100;
 end
 
+-- Source Function: N/A - Not used
 function ApplyDamageTable(e)
 	e.IgnoreDefault = true;
 	return e;
 end
 
+-- Source Function: Mob::CommonOutgoingHitSuccess()
 function CommonOutgoingHitSuccess(e)
 	e = ApplyMeleeDamageBonus(e);
+
+	eq.log_combat(
+			string.format("[%s] [Mob::CommonOutgoingHitSuccess] Dmg [%i] Post ApplyMeleeDamageBonus",
+					e.self:GetCleanName(),
+					e.hit.damage_done
+			)
+	);
+
 	e.hit.damage_done = e.hit.damage_done + (e.hit.damage_done * e.other:GetSkillDmgTaken(e.hit.skill) / 100) + (e.self:GetSkillDmgAmt(e.hit.skill) + e.other:GetFcDamageAmtIncoming(e.self, 0, true, e.hit.skill));
+
+	eq.log_combat(
+			string.format("[%s] [Mob::CommonOutgoingHitSuccess] Dmg [%i] SkillDmgTaken [%i] SkillDmgtAmt [%i] FcDmgAmtIncoming [%i] Post DmgCalcs",
+					e.self:GetCleanName(),
+					e.hit.damage_done,
+					e.other:GetSkillDmgTaken(e.hit.skill),
+					e.self:GetSkillDmgAmt(e.hit.skill),
+					e.other:GetFcDamageAmtIncoming(e.self, 0, true, e.hit.skill)
+			)
+	);
+
 	e = TryCriticalHit(e);
-	e.self:CheckNumHitsRemaining(5, -1, 65535);	
+	e.self:CheckNumHitsRemaining(5, -1, 65535);
 	e.IgnoreDefault = true;
 	return e;
 end
 
+-- Source Function: Mob::ApplyMeleeDamageBonus()
 function ApplyMeleeDamageBonus(e)
 	local dmgbonusmod = e.self:GetMeleeDamageMod_SE(e.hit.skill);
 	if (opts) then
 		dmgbonusmod = dmgbonusmod + e.opts.melee_damage_bonus_flat;
 	end
 
+	eq.log_combat(
+			string.format("[%s] [Mob::ApplyMeleeDamageBonus] DmgBonusMod [%i] Dmg [%i]",
+					e.self:GetCleanName(),
+					dmgbonusmod,
+					e.hit.damage_done
+			)
+	);
+
 	e.hit.damage_done = e.hit.damage_done + (e.hit.damage_done * dmgbonusmod / 100);
 	return e;
-end
+end
\ No newline at end of file
diff --git a/utils/scripts/.gitignore b/utils/scripts/.gitignore
index eba9f59cb..76f70485c 100644
--- a/utils/scripts/.gitignore
+++ b/utils/scripts/.gitignore
@@ -1 +1,2 @@
-opcode_handlers_output
\ No newline at end of file
+opcode_handlers_output
+vcxproj_dependencies_output
diff --git a/utils/scripts/eqemu_server.pl b/utils/scripts/eqemu_server.pl
old mode 100644
new mode 100755
index f05c2c266..76084f23f
--- a/utils/scripts/eqemu_server.pl
+++ b/utils/scripts/eqemu_server.pl
@@ -399,11 +399,13 @@ sub build_linux_source {
     print `git clone https://github.com/EQEmu/Server.git`;
 
     mkdir($source_dir . "/Server/build") if (!-e $source_dir . "/Server/build");
-    chdir($source_dir . "/Server/build");
+    chdir($source_dir . "/Server");
 
     print `git submodule init`;
     print `git submodule update`;
 
+    chdir($source_dir . "/Server/build");
+    
     print "Generating CMake build files...\n";
     if ($os_flavor eq "fedora_core") {
         print `cmake $cmake_options -DEQEMU_BUILD_LOGIN=ON -DEQEMU_BUILD_LUA=ON -DLUA_INCLUDE_DIR=/usr/include/lua-5.1/ -G "Unix Makefiles" ..`;
@@ -454,6 +456,7 @@ sub do_installer_routines {
         fetch_latest_windows_appveyor();
         get_remote_file($install_repository_request_url . "lua51.dll", "lua51.dll", 1);
         get_remote_file($install_repository_request_url . "zlib1.dll", "zlib1.dll", 1);
+		get_remote_file($install_repository_request_url . "zlib1.pdb", "zlib1.pdb", 1);
         get_remote_file($install_repository_request_url . "libmysql.dll", "libmysql.dll", 1);
     }
 
@@ -469,9 +472,19 @@ sub do_installer_routines {
     print `"$path" --host $host --user $user --password="$pass" -N -B -e "DROP DATABASE IF EXISTS $db_name;"`;
     print `"$path" --host $host --user $user --password="$pass" -N -B -e "CREATE DATABASE $db_name"`;
 
+    my $world_path = "world";
+    if (-e "bin/world") {
+        $world_path = "bin/world";
+    }
+
     #::: Get Binary DB version
-    if ($OS eq "Windows") { @db_version = split(': ', `world db_version`); }
-    if ($OS eq "Linux") { @db_version   = split(': ', `./world db_version`); }
+    if ($OS eq "Windows") {
+        @db_version = split(': ', `$world_path db_version`);
+    }
+    if ($OS eq "Linux") {
+        @db_version = split(': ', `./$world_path db_version`);
+    }
+
     $binary_database_version            = trim($db_version[1]);
 
     #::: Local DB Version
@@ -503,13 +516,20 @@ sub check_for_input {
 }
 
 sub check_for_world_bootup_database_update {
-    if ($OS eq "Windows") {
-        @db_version = split(': ', `world db_version`);
-    }
-    if ($OS eq "Linux") {
-        @db_version = split(': ', `./world db_version`);
+
+    my $world_path = "world";
+    if (-e "bin/world") {
+        $world_path = "bin/world";
     }
 
+    #::: Get Binary DB version
+    if ($OS eq "Windows") {
+        @db_version = split(': ', `$world_path db_version`);
+    }
+    if ($OS eq "Linux") {
+        @db_version = split(': ', `./$world_path db_version`);
+    }
+    
     $binary_database_version = trim($db_version[1]);
     $local_database_version  = trim(get_mysql_result("SELECT version FROM db_version LIMIT 1"));
 
@@ -731,6 +751,46 @@ sub do_install_config_json {
     unlink("eqemu_config_template.json");
 }
 
+sub do_install_config_login_json {
+    get_installation_variables();
+
+    #::: Fetch json template
+    get_remote_file($eqemu_repository_request_url . "loginserver/login_util/login.json", "login_template.json");
+
+    use JSON;
+    my $json = new JSON();
+
+    my $content;
+    open(my $fh, '<', "login_template.json") or die "cannot open file $filename"; {
+        local $/;
+        $content = <$fh>;
+    }
+    close($fh);
+
+    $config = $json->decode($content);
+
+    if ($installation_variables{"mysql_eqemu_db_name"}) {
+        $db_name = $installation_variables{"mysql_eqemu_db_name"};
+    }
+    else {
+        $db_name = "peq";
+    }
+
+    $config->{"database"}{"host"} = "127.0.0.1";
+    $config->{"database"}{"user"} = $installation_variables{"mysql_eqemu_user"};
+    $config->{"database"}{"password"} = $installation_variables{"mysql_eqemu_password"};
+    $config->{"database"}{"db"}       = $db_name;
+
+    $json->canonical(1);
+    $json->indent_length(5);
+
+    open(my $fh, '>', 'login.json');
+    print $fh $json->pretty->indent_length(5)->utf8->encode($config);
+    close $fh;
+
+    unlink("login_template.json");
+}
+
 sub fetch_utility_scripts {
     if ($OS eq "Windows") {
         get_remote_file($install_repository_request_url . "t_database_backup.bat", "t_database_backup.bat");
@@ -753,7 +813,7 @@ sub fetch_utility_scripts {
 
 sub setup_bots {
     if ($OS eq "Windows") {
-        fetch_latest_windows_binaries_bots();
+        fetch_latest_windows_appveyor_bots();
     }
     if ($OS eq "Linux") {
         build_linux_source("bots");
@@ -761,7 +821,7 @@ sub setup_bots {
     bots_db_management();
     run_database_check();
 
-    print "Bots should be setup, run your server and the #bot command should be available in-game\n";
+    print "Bots should be setup, run your server and the bot command should be available in-game (type '^help')\n";
 }
 
 sub show_menu_prompt {
@@ -1476,9 +1536,13 @@ sub do_windows_login_server_setup {
     print "[Install] Done... \n";
 
     print "[Install] Pulling down Loginserver database tables...\n";
-    get_remote_file($install_repository_request_url . "login_server_tables.sql", "db_update/login_server_tables.sql");
+    get_remote_file($eqemu_repository_request_url . "loginserver/login_util/login_schema.sql", "db_update/login_schema.sql");
     print "[Install] Installing Loginserver tables...\n";
-    print get_mysql_result_from_file("db_update/login_server_tables.sql");
+    print get_mysql_result_from_file("db_update/login_schema.sql");
+    print "[Install] Done...\n";
+
+    print "[Install] Pulling and initializing Loginserver configuration files...\n";
+    do_install_config_login_json();
     print "[Install] Done...\n";
 
     add_login_server_firewall_rules();
@@ -1505,45 +1569,23 @@ sub do_linux_login_server_setup {
     print "\n Done... \n";
 
     print "[Install] Pulling down Loginserver database tables...\n";
-    get_remote_file($install_repository_request_url . "login_server_tables.sql", "db_update/login_server_tables.sql");
+    get_remote_file($eqemu_repository_request_url . "loginserver/login_util/login_schema.sql", "db_update/login_schema.sql");
     print "[Install] Installing Loginserver tables...\n";
-    print get_mysql_result_from_file("db_update/login_server_tables.sql");
+    print get_mysql_result_from_file("db_update/login_schema.sql");
     print "[Install] Done...\n\n";
 
+    print "[Install] Pulling and initializing Loginserver configuration files...\n";
+    do_install_config_login_json();
+    print "[Install] Done...\n";
+
     rmtree('updates_staged');
     rmtree('db_update');
 
-    get_remote_file($install_repository_request_url . "linux/login.ini", "login_template.ini");
     get_remote_file($install_repository_request_url . "linux/login_opcodes.conf", "login_opcodes.conf");
     get_remote_file($install_repository_request_url . "linux/login_opcodes_sod.conf", "login_opcodes_sod.conf");
     get_remote_file($install_repository_request_url . "linux/server_start_with_login.sh", "server_start_with_login.sh");
     system("chmod 755 *.sh");
 
-    get_installation_variables();
-    my $db_name     = $installation_variables{"mysql_eqemu_db_name"};
-    my $db_user     = $installation_variables{"mysql_eqemu_user"};
-    my $db_password = $installation_variables{"mysql_eqemu_password"};
-
-    #::: Open new config file
-    open(NEW_CONFIG, '>', 'login.ini');
-
-    #::: Iterate through template and replace variables...
-    open(FILE_TEMPLATE, "login_template.ini");
-    while (<FILE_TEMPLATE>) {
-        chomp;
-        $o = $_;
-        #::: Find replace variables
-        if ($o =~ /db/i) { $o       = "db = " . $db_name; }
-        if ($o =~ /user/i) { $o     = "user = " . $db_user; }
-        if ($o =~ /password/i) { $o = "password = " . $db_password; }
-
-        print NEW_CONFIG $o . "\n";
-    }
-
-    close(FILE_TEMPLATE);
-    close(NEW_CONFIG);
-    unlink("login_template.ini");
-
     print "[Install] Press any key to continue...\n";
 
     <>; #Read from STDIN
@@ -1587,22 +1629,24 @@ sub add_login_server_firewall_rules {
         print "If firewall rules don't add you must run this script (eqemu_server.pl) as administrator\n";
         print "\n";
         print "[Install] Instructions \n";
-        print "[Install] In order to connect your server to the loginserver you must point your eqemu_config.xml to your local server similar to the following:\n";
+        print "[Install] In order to connect your server to the loginserver you must point your eqemu_config.json to your local server similar to the following:\n";
         print "
-	<loginserver1>
-		<host>login.eqemulator.net</host>
-		<port>5998</port>
-		<account></account>
-		<password></password>
-	</loginserver1>
-	<loginserver2>
-		<host>127.0.0.1</host>
-		<port>5998</port>
-		<account></account>
-		<password></password>
-	</loginserver2>
+	\"loginserver1\" : {
+		\"account\" : \"\",
+		\"host\" : \"login.eqemulator.net\",
+		\"password\" : \"\",
+		\"port\" : \"5998\",
+		\"legacy\": \"1\"
+	},
+	\"loginserver2\" : {
+		\"account\" : \"\",
+		\"host\" : \"192.168.197.129\",
+		\"password\" : \"\",
+		\"port\" : \"5998\"
+	},
+	\"localaddress\" : \"192.168.197.129\",
 		";
-        print "[Install] When done, make sure your EverQuest client points to your loginserver's IP (In this case it would be 127.0.0.1) in the eqhosts.txt file\n";
+        print "[Install] When done, make sure your EverQuest client points to your loginserver's IP (In this case it would be 192.168.197.129) in the eqhosts.txt file\n";
     }
 }
 
@@ -1640,15 +1684,16 @@ sub check_windows_firewall_rules {
 }
 
 sub fetch_server_dlls {
-    print "[Download] Fetching lua51.dll, zlib1.dll, libmysql.dll...\n";
+    print "[Download] Fetching lua51.dll, zlib1.dll, zlib1.pdb, libmysql.dll...\n";
     get_remote_file($install_repository_request_url . "lua51.dll", "lua51.dll", 1);
     get_remote_file($install_repository_request_url . "zlib1.dll", "zlib1.dll", 1);
+	get_remote_file($install_repository_request_url . "zlib1.pdb", "zlib1.pdb", 1);
     get_remote_file($install_repository_request_url . "libmysql.dll", "libmysql.dll", 1);
 }
 
 sub fetch_peq_db_full {
     print "[Install] Downloading latest PEQ Database... Please wait...\n";
-    get_remote_file("http://edit.peqtgc.com/weekly/peq_beta.zip", "updates_staged/peq_beta.zip", 1);
+    get_remote_file("http://edit.projecteq.net/weekly/peq_beta.zip", "updates_staged/peq_beta.zip", 1);
     print "[Install] Downloaded latest PEQ Database... Extracting...\n";
     unzip('updates_staged/peq_beta.zip', 'updates_staged/peq_db/');
     my $start_dir = "updates_staged/peq_db";
@@ -1783,6 +1828,8 @@ sub quest_files_fetch {
     if ($fc == 0) {
         print "[Update] No Quest Updates found... \n\n";
     }
+	
+    rmtree("updates_staged/");
 }
 
 sub lua_modules_fetch {
diff --git a/utils/scripts/linux_installer/install.sh b/utils/scripts/linux_installer/install.sh
index 6af4a9df3..5cef4ab8b 100644
--- a/utils/scripts/linux_installer/install.sh
+++ b/utils/scripts/linux_installer/install.sh
@@ -153,7 +153,7 @@ elif [[ "$OS" == "red_hat" ]]; then
 	yum -y install \
                 open-vm-tools \
                 vim \
-                cmake \
+                cmake3 \
                 boost-* \
                 zlib-devel \
 		mariadb \
@@ -178,6 +178,12 @@ elif [[ "$OS" == "red_hat" ]]; then
 		"Development Tools" \
 		"Basic Web Server" \
 		"Compatibility Libraries" 
+	# Deal with the cmake 3 prerequisite on RHEL/CentOS 6/7 Note: Might break with RHEL/CentOS 8 
+	alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \
+	--slave /usr/local/bin/ctest ctest /usr/bin/ctest3 \
+	--slave /usr/local/bin/cpack cpack /usr/bin/cpack3 \
+	--slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \
+	--family cmake
 
 elif [[ "$OS" == "fedora_core" ]]; then
 	# Do Fedora stuff
diff --git a/utils/scripts/schema.xml b/utils/scripts/schema.xml
deleted file mode 100644
index dcfa687be..000000000
--- a/utils/scripts/schema.xml
+++ /dev/null
@@ -1,5738 +0,0 @@
-<?xml version="1.0" standalone="yes" ?>
-<DBMODEL Version="4.0">
-<SETTINGS>
-<GLOBALSETTINGS ModelName="schema" IDModel="0" IDVersion="0" VersionStr="1.0.0.0" Comments="" UseVersionHistroy="1" AutoIncVersion="1" DatabaseType="MySQL" ZoomFac="83.00" XPos="615" YPos="906" DefaultDataType="5" DefaultTablePrefix="0" DefSaveDBConn="" DefSyncDBConn="" DefQueryDBConn="" Printer="" HPageCount="4.0" PageAspectRatio="1.440892512336408" PageOrientation="1" PageFormat="A4 (210x297 mm, 8.26x11.7 inches)" SelectedPages="" UsePositionGrid="0" PositionGridX="20" PositionGridY="20" TableNameInRefs="0" DefaultTableType="0" ActivateRefDefForNewRelations="1" FKPrefix="" FKPostfix="" CreateFKRefDefIndex="0" DBQuoteCharacter="`" CreateSQLforLinkedObjects="0" DefModelFont="Tahoma" CanvasWidth="4096" CanvasHeight="2842" />
-<DATATYPEGROUPS>
-<DATATYPEGROUP Name="Numeric Types" Icon="1" />
-<DATATYPEGROUP Name="Date and Time Types" Icon="2" />
-<DATATYPEGROUP Name="String Types" Icon="3" />
-<DATATYPEGROUP Name="Blob and Text Types" Icon="4" />
-<DATATYPEGROUP Name="User defined Types" Icon="5" />
-<DATATYPEGROUP Name="Geographic Types" Icon="6" />
-</DATATYPEGROUPS>
-<DATATYPES>
-<DATATYPE ID="1" IDGroup="0" TypeName="TINYINT" Description="A very small integer. The signed range is -128 to 127. The unsigned range is 0 to 255." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="1" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="2" IDGroup="0" TypeName="SMALLINT" Description="A small integer. The signed range is -32768 to 32767. The unsigned range is 0 to 65535." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="1" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="3" IDGroup="0" TypeName="MEDIUMINT" Description="A medium-size integer. The signed range is -8388608 to 8388607. The unsigned range is 0 to 16777215." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="1" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="4" IDGroup="0" TypeName="INT" Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="0" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="5" IDGroup="0" TypeName="INTEGER" Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="1" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="6" IDGroup="0" TypeName="BIGINT" Description="A large integer. The signed range is -9223372036854775808 to 9223372036854775807. The unsigned range is 0 to 18446744073709551615." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="0" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="7" IDGroup="0" TypeName="FLOAT" Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38." ParamCount="1" OptionCount="1" ParamRequired="1" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="precision" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="8" IDGroup="0" TypeName="FLOAT" Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="9" IDGroup="0" TypeName="DOUBLE" Description="A normal-size (double-precision) floating-point number. Cannot be unsigned. Allowable values are -1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and 2.2250738585072014E-308 to 1.7976931348623157E+308." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="10" IDGroup="0" TypeName="DOUBLE PRECISION" Description="This is a synonym for DOUBLE." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="11" IDGroup="0" TypeName="REAL" Description="This is a synonym for DOUBLE." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="12" IDGroup="0" TypeName="DECIMAL" Description="An unpacked floating-point number. Cannot be unsigned. Behaves like a CHAR column." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="3" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="13" IDGroup="0" TypeName="NUMERIC" Description="This is a synonym for DECIMAL." ParamCount="2" OptionCount="1" ParamRequired="1" EditParamsAsString="0" SynonymGroup="3" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="14" IDGroup="1" TypeName="DATE" Description="A date. The supported range is \a1000-01-01\a to \a9999-12-31\a." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="15" IDGroup="1" TypeName="DATETIME" Description="A date and time combination. The supported range is \a1000-01-01 00:00:00\a to \a9999-12-31 23:59:59\a." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="16" IDGroup="1" TypeName="TIMESTAMP" Description="A timestamp. The range is \a1970-01-01 00:00:00\a to sometime in the year 2037. The length can be 14 (or missing), 12, 10, 8, 6, 4, or 2 representing YYYYMMDDHHMMSS, ... , YYYYMMDD, ... , YY formats." ParamCount="1" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-</DATATYPE>
-<DATATYPE ID="17" IDGroup="1" TypeName="TIME" Description="A time. The range is \a-838:59:59\a to \a838:59:59\a." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="18" IDGroup="1" TypeName="YEAR" Description="A year in 2- or 4-digit format (default is 4-digit)." ParamCount="1" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-</DATATYPE>
-<DATATYPE ID="19" IDGroup="2" TypeName="CHAR" Description="A fixed-length string (1 to 255 characters) that is always right-padded with spaces to the specified length when stored. values are sorted and compared in case-insensitive fashion according to the default character set unless the BINARY keyword is given." ParamCount="1" OptionCount="1" ParamRequired="1" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="20" IDGroup="2" TypeName="VARCHAR" Description="A variable-length string (1 to 255 characters). Values are sorted and compared in case-sensitive fashion unless the BINARY keyword is given." ParamCount="1" OptionCount="1" ParamRequired="1" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="21" IDGroup="2" TypeName="BIT" Description="This is a synonym for CHAR(1)." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="22" IDGroup="2" TypeName="BOOL" Description="This is a synonym for CHAR(1)." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="23" IDGroup="3" TypeName="TINYBLOB" Description="A column maximum length of 255 (2^8 - 1) characters. Values are sorted and compared in case-sensitive fashion." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="24" IDGroup="3" TypeName="BLOB" Description="A column maximum length of 65535 (2^16 - 1) characters. Values are sorted and compared in case-sensitive fashion." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="25" IDGroup="3" TypeName="MEDIUMBLOB" Description="A column maximum length of 16777215 (2^24 - 1) characters. Values are sorted and compared in case-sensitive fashion." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="26" IDGroup="3" TypeName="LONGBLOB" Description="A column maximum length of 4294967295 (2^32 - 1) characters. Values are sorted and compared in case-sensitive fashion." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="27" IDGroup="3" TypeName="TINYTEXT" Description="A column maximum length of 255 (2^8 - 1) characters." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="28" IDGroup="3" TypeName="TEXT" Description="A column maximum length of 65535 (2^16 - 1) characters." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="29" IDGroup="3" TypeName="MEDIUMTEXT" Description="A column maximum length of 16777215 (2^24 - 1) characters." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="30" IDGroup="3" TypeName="LONGTEXT" Description="A column maximum length of 4294967295 (2^32 - 1) characters." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="31" IDGroup="3" TypeName="ENUM" Description="An enumeration. A string object that can have only one value, chosen from the list of values." ParamCount="1" OptionCount="0" ParamRequired="1" EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="values" />
-</PARAMS>
-</DATATYPE>
-<DATATYPE ID="32" IDGroup="3" TypeName="SET" Description="A set. A string object that can have zero or more values, each of which must be chosen from the list of values." ParamCount="1" OptionCount="0" ParamRequired="1" EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="values" />
-</PARAMS>
-</DATATYPE>
-<DATATYPE ID="33" IDGroup="4" TypeName="Varchar(20)" Description="" ParamCount="0" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="34" IDGroup="4" TypeName="Varchar(45)" Description="" ParamCount="0" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="35" IDGroup="4" TypeName="Varchar(255)" Description="" ParamCount="0" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="36" IDGroup="5" TypeName="GEOMETRY" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="38" IDGroup="5" TypeName="LINESTRING" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="39" IDGroup="5" TypeName="POLYGON" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="40" IDGroup="5" TypeName="MULTIPOINT" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="41" IDGroup="5" TypeName="MULTILINESTRING" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="42" IDGroup="5" TypeName="MULTIPOLYGON" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="43" IDGroup="5" TypeName="GEOMETRYCOLLECTION" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-</DATATYPES>
-<COMMON_DATATYPES>
-<COMMON_DATATYPE ID="5" />
-<COMMON_DATATYPE ID="8" />
-<COMMON_DATATYPE ID="20" />
-<COMMON_DATATYPE ID="15" />
-<COMMON_DATATYPE ID="22" />
-<COMMON_DATATYPE ID="28" />
-<COMMON_DATATYPE ID="26" />
-<COMMON_DATATYPE ID="33" />
-<COMMON_DATATYPE ID="34" />
-<COMMON_DATATYPE ID="35" />
-</COMMON_DATATYPES>
-<TABLEPREFIXES>
-<TABLEPREFIX Name="Default (no prefix)" />
-</TABLEPREFIXES>
-<REGIONCOLORS>
-<REGIONCOLOR Color="Red=#FFEEEC" />
-<REGIONCOLOR Color="Yellow=#FEFDED" />
-<REGIONCOLOR Color="Green=#EAFFE5" />
-<REGIONCOLOR Color="Cyan=#ECFDFF" />
-<REGIONCOLOR Color="Blue=#F0F1FE" />
-<REGIONCOLOR Color="Magenta=#FFEBFA" />
-</REGIONCOLORS>
-<POSITIONMARKERS>
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-</POSITIONMARKERS>
-</SETTINGS>
-<METADATA>
-<REGIONS>
-<REGION ID="6019" RegionName="Spawn_System" XPos="2267" YPos="1239" Width="681" Height="752" RegionColor="2" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="129" />
-<REGION ID="6018" RegionName="Character_Data" XPos="10" YPos="698" Width="822" Height="1181" RegionColor="1" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="128" />
-<REGION ID="6015" RegionName="Server_Admin" XPos="28" YPos="22" Width="764" Height="581" RegionColor="0" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="126" />
-<REGION ID="6024" RegionName="Loot_System" XPos="857" YPos="533" Width="640" Height="345" RegionColor="3" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="131" />
-</REGIONS>
-<TABLES>
-<TABLE ID="4531" Tablename="aa_actions" PrevTableName="" XPos="2016" YPos="71" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="2" >
-<COLUMNS>
-<COLUMN ID="4602" ColName="aaid" PrevColName="" Pos="1" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4603" ColName="rank" PrevColName="" Pos="2" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4604" ColName="reuse_time" PrevColName="" Pos="3" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4605" ColName="spell_id" PrevColName="" Pos="4" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4606" ColName="target" PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4607" ColName="nonspell_action" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4608" ColName="nonspell_mana" PrevColName="" Pos="7" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4609" ColName="nonspell_duration" PrevColName="" Pos="8" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4610" ColName="redux_aa" PrevColName="" Pos="9" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4611" ColName="redux_rate" PrevColName="" Pos="10" idDatatype="1" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="4612" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4602" LengthParam="0" />
-<INDEXCOLUMN idColumn="4603" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4532" Tablename="aa_swarmpets" PrevTableName="" XPos="870" YPos="1345" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="3" >
-<COLUMNS>
-<COLUMN ID="4613" ColName="spell_id" PrevColName="" Pos="1" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4614" ColName="count" PrevColName="" Pos="2" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4615" ColName="npc_id" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4616" ColName="duration" PrevColName="" Pos="4" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5995" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="4617" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4613" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4533" Tablename="aa_timers" PrevTableName="" XPos="27" YPos="1086" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="4" >
-<COLUMNS>
-<COLUMN ID="4618" ColName="charid" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4619" ColName="ability" PrevColName="" Pos="2" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4620" ColName="begin" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4621" ColName="end" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5992" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="4622" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4618" LengthParam="0" />
-<INDEXCOLUMN idColumn="4619" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4534" Tablename="account" PrevTableName="" XPos="566" YPos="1364" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="5" >
-<COLUMNS>
-<COLUMN ID="4623" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4624" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(30)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4625" ColName="charname" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4626" ColName="packencrypt" PrevColName="" Pos="4" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4627" ColName="sharedplat" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4628" ColName="password" PrevColName="" Pos="6" idDatatype="20" DatatypeParams="(50)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4629" ColName="status" PrevColName="" Pos="7" idDatatype="5" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4630" ColName="lsaccount_id" PrevColName="" Pos="8" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4631" ColName="gmspeed" PrevColName="" Pos="9" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4632" ColName="revoked" PrevColName="" Pos="10" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5841" />
-<RELATION_START ID="5845" />
-<RELATION_START ID="5854" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="4633" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4623" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4634" IndexName="lsaccount_id" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4630" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4635" IndexName="name" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4624" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4535" Tablename="altadv_vars" PrevTableName="" XPos="2243" YPos="73" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="6" >
-<COLUMNS>
-<COLUMN ID="4636" ColName="skill_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4637" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(128)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4638" ColName="cost" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4639" ColName="max_level" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5878" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4636" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4640" IndexName="skill_id" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4636" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4536" Tablename="books" PrevTableName="" XPos="1259" YPos="375" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="7" >
-<COLUMNS>
-<COLUMN ID="4641" ColName="name" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(30)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4642" ColName="txtfile" PrevColName="" Pos="2" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5771" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4641" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4643" IndexName="id" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4641" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4538" Tablename="character_" PrevTableName="" XPos="273" YPos="1139" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="9" >
-<COLUMNS>
-<COLUMN ID="5843" ColName="id" PrevColName="" Pos="16" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="1" NotNull="1" AutoInc="1" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4785" ColName="account_id" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4786" ColName="name" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4787" ColName="profile" PrevColName="" Pos="4" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4788" ColName="guild" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4789" ColName="guildrank" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="5" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4790" ColName="timelaston" PrevColName="" Pos="7" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4791" ColName="x" PrevColName="" Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4792" ColName="y" PrevColName="" Pos="9" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4793" ColName="z" PrevColName="" Pos="10" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4794" ColName="zonename" PrevColName="" Pos="11" idDatatype="20" DatatypeParams="(30)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4795" ColName="alt_adv" PrevColName="" Pos="12" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4796" ColName="zoneid" PrevColName="" Pos="13" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4797" ColName="pktime" PrevColName="" Pos="14" idDatatype="5" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4798" ColName="inventory" PrevColName="" Pos="15" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4799" ColName="publicnote" PrevColName="" Pos="16" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4800" ColName="groupid" PrevColName="" Pos="17" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5852" />
-<RELATION_START ID="5858" />
-<RELATION_START ID="5860" />
-<RELATION_START ID="5862" />
-<RELATION_START ID="5863" />
-<RELATION_START ID="5865" />
-<RELATION_START ID="5992" />
-</RELATIONS_START>
-<RELATIONS_END>
-<RELATION_END ID="5841" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5851" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5843" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4802" IndexName="name" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4786" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4539" Tablename="character_backup" PrevTableName="" XPos="612" YPos="984" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="10" >
-<COLUMNS>
-<COLUMN ID="4803" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4804" ColName="backupreason" PrevColName="" Pos="2" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4805" ColName="charid" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4806" ColName="account_id" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4807" ColName="name" PrevColName="" Pos="5" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4808" ColName="profile" PrevColName="" Pos="6" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4809" ColName="guild" PrevColName="" Pos="7" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4810" ColName="guildrank" PrevColName="" Pos="8" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="5" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4811" ColName="x" PrevColName="" Pos="9" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4812" ColName="y" PrevColName="" Pos="10" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4813" ColName="z" PrevColName="" Pos="11" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4814" ColName="zoneid" PrevColName="" Pos="12" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4815" ColName="alt_adv" PrevColName="" Pos="13" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4816" ColName="ts" PrevColName="" Pos="14" idDatatype="16" DatatypeParams="(14)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5852" />
-<RELATION_END ID="5854" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="4817" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4803" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4818" IndexName="name" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4807" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4819" IndexName="charid" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4805" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4541" Tablename="class_skill" PrevTableName="" XPos="2248" YPos="189" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="1" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="12" >
-<COLUMNS>
-<COLUMN ID="4824" ColName="class" PrevColName="" Pos="1" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4825" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(50)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="Enter a class name for quick reference" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4826" ColName="skill_0" PrevColName="" Pos="3" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4827" ColName="skill_1" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4828" ColName="skill_2" PrevColName="" Pos="5" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4829" ColName="skill_3" PrevColName="" Pos="6" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4830" ColName="skill_4" PrevColName="" Pos="7" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4831" ColName="skill_5" PrevColName="" Pos="8" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4832" ColName="skill_6" PrevColName="" Pos="9" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4833" ColName="skill_7" PrevColName="" Pos="10" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4834" ColName="skill_8" PrevColName="" Pos="11" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4835" ColName="skill_9" PrevColName="" Pos="12" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4836" ColName="skill_10" PrevColName="" Pos="13" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4837" ColName="skill_11" PrevColName="" Pos="14" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4838" ColName="skill_12" PrevColName="" Pos="15" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4839" ColName="skill_13" PrevColName="" Pos="16" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4840" ColName="skill_14" PrevColName="" Pos="17" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4841" ColName="skill_15" PrevColName="" Pos="18" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4842" ColName="skill_16" PrevColName="" Pos="19" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4843" ColName="skill_17" PrevColName="" Pos="20" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4844" ColName="skill_18" PrevColName="" Pos="21" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4845" ColName="skill_19" PrevColName="" Pos="22" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4846" ColName="skill_20" PrevColName="" Pos="23" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4847" ColName="skill_21" PrevColName="" Pos="24" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4848" ColName="skill_22" PrevColName="" Pos="25" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4849" ColName="skill_23" PrevColName="" Pos="26" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4850" ColName="skill_24" PrevColName="" Pos="27" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4851" ColName="skill_25" PrevColName="" Pos="28" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4852" ColName="skill_26" PrevColName="" Pos="29" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4853" ColName="skill_27" PrevColName="" Pos="30" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4854" ColName="skill_28" PrevColName="" Pos="31" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4855" ColName="skill_29" PrevColName="" Pos="32" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4856" ColName="skill_30" PrevColName="" Pos="33" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4857" ColName="skill_31" PrevColName="" Pos="34" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4858" ColName="skill_32" PrevColName="" Pos="35" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4859" ColName="skill_33" PrevColName="" Pos="36" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4860" ColName="skill_34" PrevColName="" Pos="37" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4861" ColName="skill_35" PrevColName="" Pos="38" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4862" ColName="skill_36" PrevColName="" Pos="39" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4863" ColName="skill_37" PrevColName="" Pos="40" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4864" ColName="skill_38" PrevColName="" Pos="41" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4865" ColName="skill_39" PrevColName="" Pos="42" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4866" ColName="skill_40" PrevColName="" Pos="43" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4867" ColName="skill_41" PrevColName="" Pos="44" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4868" ColName="skill_42" PrevColName="" Pos="45" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4869" ColName="skill_43" PrevColName="" Pos="46" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4870" ColName="skill_44" PrevColName="" Pos="47" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4871" ColName="skill_45" PrevColName="" Pos="48" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4872" ColName="skill_46" PrevColName="" Pos="49" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4873" ColName="skill_47" PrevColName="" Pos="50" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4874" ColName="skill_48" PrevColName="" Pos="51" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4875" ColName="skill_49" PrevColName="" Pos="52" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4876" ColName="skill_50" PrevColName="" Pos="53" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4877" ColName="skill_51" PrevColName="" Pos="54" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4878" ColName="skill_52" PrevColName="" Pos="55" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4879" ColName="skill_53" PrevColName="" Pos="56" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4880" ColName="skill_54" PrevColName="" Pos="57" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4881" ColName="skill_55" PrevColName="" Pos="58" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4882" ColName="skill_56" PrevColName="" Pos="59" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4883" ColName="skill_57" PrevColName="" Pos="60" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4884" ColName="skill_58" PrevColName="" Pos="61" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4885" ColName="skill_59" PrevColName="" Pos="62" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4886" ColName="skill_60" PrevColName="" Pos="63" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4887" ColName="skill_61" PrevColName="" Pos="64" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4888" ColName="skill_62" PrevColName="" Pos="65" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4889" ColName="skill_63" PrevColName="" Pos="66" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4890" ColName="skill_64" PrevColName="" Pos="67" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4891" ColName="skill_65" PrevColName="" Pos="68" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4892" ColName="skill_66" PrevColName="" Pos="69" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4893" ColName="skill_67" PrevColName="" Pos="70" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4894" ColName="skill_68" PrevColName="" Pos="71" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4895" ColName="skill_69" PrevColName="" Pos="72" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4896" ColName="skill_70" PrevColName="" Pos="73" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4897" ColName="skill_71" PrevColName="" Pos="74" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4898" ColName="skill_72" PrevColName="" Pos="75" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4899" ColName="skill_73" PrevColName="" Pos="76" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="66" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="4900" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4824" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4901" IndexName="class" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4824" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4543" Tablename="doors" PrevTableName="" XPos="2108" YPos="2375" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="14" >
-<COLUMNS>
-<COLUMN ID="4906" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4907" ColName="doorid" PrevColName="" Pos="2" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4908" ColName="zone" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4909" ColName="name" PrevColName="" Pos="4" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4910" ColName="pos_y" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4911" ColName="pos_x" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4912" ColName="pos_z" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4913" ColName="heading" PrevColName="" Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4914" ColName="opentype" PrevColName="" Pos="9" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4915" ColName="guild" PrevColName="" Pos="10" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4916" ColName="lockpick" PrevColName="" Pos="11" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4917" ColName="keyitem" PrevColName="" Pos="12" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4918" ColName="triggerdoor" PrevColName="" Pos="13" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4919" ColName="triggertype" PrevColName="" Pos="14" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4920" ColName="doorisopen" PrevColName="" Pos="15" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4921" ColName="liftheight" PrevColName="" Pos="16" idDatatype="5" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4922" ColName="dest_zone" PrevColName="" Pos="17" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="NONE" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4923" ColName="dest_x" PrevColName="" Pos="18" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4924" ColName="dest_y" PrevColName="" Pos="19" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4925" ColName="dest_z" PrevColName="" Pos="20" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4926" ColName="dest_heading" PrevColName="" Pos="21" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4927" ColName="invert_state" PrevColName="" Pos="22" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4928" ColName="incline" PrevColName="" Pos="23" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5997" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="4929" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4906" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4544" Tablename="eventlog" PrevTableName="" XPos="49" YPos="370" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="15" >
-<COLUMNS>
-<COLUMN ID="4930" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4931" ColName="accountname" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(30)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4932" ColName="accountid" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4933" ColName="status" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4934" ColName="charname" PrevColName="" Pos="5" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4935" ColName="target" PrevColName="" Pos="6" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="None" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4936" ColName="time" PrevColName="" Pos="7" idDatatype="16" DatatypeParams="(14)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4937" ColName="descriptiontype" PrevColName="" Pos="8" idDatatype="20" DatatypeParams="(50)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4938" ColName="description" PrevColName="" Pos="9" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="4939" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4930" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4545" Tablename="faction_list" PrevTableName="" XPos="1371" YPos="1613" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="1" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="16" >
-<COLUMNS>
-<COLUMN ID="4940" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4941" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(50)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4942" ColName="base" PrevColName="" Pos="3" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4943" ColName="mod_c1" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4944" ColName="mod_c2" PrevColName="" Pos="5" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4945" ColName="mod_c3" PrevColName="" Pos="6" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4946" ColName="mod_c4" PrevColName="" Pos="7" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4947" ColName="mod_c5" PrevColName="" Pos="8" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4948" ColName="mod_c6" PrevColName="" Pos="9" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4949" ColName="mod_c7" PrevColName="" Pos="10" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4950" ColName="mod_c8" PrevColName="" Pos="11" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4951" ColName="mod_c9" PrevColName="" Pos="12" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4952" ColName="mod_c10" PrevColName="" Pos="13" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4953" ColName="mod_c11" PrevColName="" Pos="14" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4954" ColName="mod_c12" PrevColName="" Pos="15" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4955" ColName="mod_c13" PrevColName="" Pos="16" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4956" ColName="mod_c14" PrevColName="" Pos="17" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4957" ColName="mod_c15" PrevColName="" Pos="18" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4958" ColName="mod_r1" PrevColName="" Pos="19" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4959" ColName="mod_r2" PrevColName="" Pos="20" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4960" ColName="mod_r3" PrevColName="" Pos="21" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4961" ColName="mod_r4" PrevColName="" Pos="22" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4962" ColName="mod_r5" PrevColName="" Pos="23" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4963" ColName="mod_r6" PrevColName="" Pos="24" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4964" ColName="mod_r7" PrevColName="" Pos="25" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4965" ColName="mod_r8" PrevColName="" Pos="26" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4966" ColName="mod_r9" PrevColName="" Pos="27" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4967" ColName="mod_r10" PrevColName="" Pos="28" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4968" ColName="mod_r11" PrevColName="" Pos="29" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4969" ColName="mod_r12" PrevColName="" Pos="30" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4970" ColName="mod_r14" PrevColName="" Pos="31" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4971" ColName="mod_r60" PrevColName="" Pos="32" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4972" ColName="mod_r75" PrevColName="" Pos="33" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4973" ColName="mod_r108" PrevColName="" Pos="34" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4974" ColName="mod_r120" PrevColName="" Pos="35" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4975" ColName="mod_r128" PrevColName="" Pos="36" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4976" ColName="mod_r130" PrevColName="" Pos="37" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4977" ColName="mod_r161" PrevColName="" Pos="38" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4978" ColName="mod_d140" PrevColName="" Pos="39" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4979" ColName="mod_d201" PrevColName="" Pos="40" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4980" ColName="mod_d202" PrevColName="" Pos="41" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4981" ColName="mod_d203" PrevColName="" Pos="42" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4982" ColName="mod_d204" PrevColName="" Pos="43" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4983" ColName="mod_d205" PrevColName="" Pos="44" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4984" ColName="mod_d206" PrevColName="" Pos="45" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4985" ColName="mod_d207" PrevColName="" Pos="46" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4986" ColName="mod_d208" PrevColName="" Pos="47" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4987" ColName="mod_d209" PrevColName="" Pos="48" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4988" ColName="mod_d210" PrevColName="" Pos="49" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4989" ColName="mod_d211" PrevColName="" Pos="50" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4990" ColName="mod_d212" PrevColName="" Pos="51" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4991" ColName="mod_d213" PrevColName="" Pos="52" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4992" ColName="mod_d214" PrevColName="" Pos="53" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4993" ColName="mod_d215" PrevColName="" Pos="54" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4994" ColName="mod_d216" PrevColName="" Pos="55" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="6010" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="4995" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4940" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4996" IndexName="id" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4940" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="4997" IndexName="name" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4941" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4546" Tablename="faction_values" PrevTableName="" XPos="98" YPos="911" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="17" >
-<COLUMNS>
-<COLUMN ID="4998" ColName="char_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="4999" ColName="faction_id" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5000" ColName="current_value" PrevColName="" Pos="3" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5858" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5001" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="4998" LengthParam="0" />
-<INDEXCOLUMN idColumn="4999" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4547" Tablename="fishing" PrevTableName="" XPos="1539" YPos="987" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="18" >
-<COLUMNS>
-<COLUMN ID="5003" ColName="zoneid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5004" ColName="Itemid" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5007" ColName="npc_id" PrevColName="" Pos="6" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5005" ColName="skill_level" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5006" ColName="chance" PrevColName="" Pos="5" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5008" ColName="npc_chance" PrevColName="" Pos="7" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5975" />
-<RELATION_END ID="5977" />
-<RELATION_END ID="6012" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5009" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5003" LengthParam="0" />
-<INDEXCOLUMN idColumn="5004" LengthParam="0" />
-<INDEXCOLUMN idColumn="5007" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4548" Tablename="forage" PrevTableName="" XPos="2069" YPos="965" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="19" >
-<COLUMNS>
-<COLUMN ID="5011" ColName="zoneid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5012" ColName="Itemid" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5013" ColName="level" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5014" ColName="chance" PrevColName="" Pos="5" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5965" />
-<RELATION_END ID="5967" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5015" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5011" LengthParam="0" />
-<INDEXCOLUMN idColumn="5012" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4550" Tablename="grid" PrevTableName="" XPos="2745" YPos="1260" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="21" >
-<COLUMNS>
-<COLUMN ID="5019" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5021" ColName="type" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5022" ColName="type2" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5777" />
-<RELATION_START ID="5952" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5023" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5019" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4551" Tablename="grid_entries" PrevTableName="" XPos="2293" YPos="1269" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="22" >
-<COLUMNS>
-<COLUMN ID="5024" ColName="gridid" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5025" ColName="zoneid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5026" ColName="number" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5027" ColName="x" PrevColName="" Pos="4" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5028" ColName="y" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5029" ColName="z" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5030" ColName="heading" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5031" ColName="pause" PrevColName="" Pos="8" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5777" />
-<RELATION_END ID="5933" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5032" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5024" LengthParam="0" />
-<INDEXCOLUMN idColumn="5025" LengthParam="0" />
-<INDEXCOLUMN idColumn="5026" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4552" Tablename="ground_spawns" PrevTableName="" XPos="1839" YPos="522" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="23" >
-<COLUMNS>
-<COLUMN ID="5033" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5034" ColName="zoneid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5035" ColName="max_x" PrevColName="" Pos="3" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="2000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5036" ColName="max_y" PrevColName="" Pos="4" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="2000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5037" ColName="max_z" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="10000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5038" ColName="min_x" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="-2000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5039" ColName="min_y" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="-2000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5040" ColName="heading" PrevColName="" Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5041" ColName="name" PrevColName="" Pos="9" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5042" ColName="item" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5043" ColName="max_allowed" PrevColName="" Pos="11" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5044" ColName="comment" PrevColName="" Pos="12" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5045" ColName="respawn_timer" PrevColName="" Pos="13" idDatatype="6" DatatypeParams="(20)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="300000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5949" />
-<RELATION_END ID="5956" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5046" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5033" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4553" Tablename="guild_alliances" PrevTableName="" XPos="2842" YPos="166" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="24" >
-<COLUMNS>
-<COLUMN ID="5048" ColName="guildone" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5049" ColName="guildtwo" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5980" />
-<RELATION_END ID="5983" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5050" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5048" LengthParam="0" />
-<INDEXCOLUMN idColumn="5049" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4554" Tablename="guild_controllers" PrevTableName="" XPos="2290" YPos="1008" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="25" >
-<COLUMNS>
-<COLUMN ID="5051" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5052" ColName="npc_id" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5053" ColName="owned_guild_id" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5054" ColName="zoneid" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5055" ColName="terrainarea" PrevColName="" Pos="5" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5987" />
-<RELATION_END ID="5990" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5056" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5051" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5057" IndexName="zoneid" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5054" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5058" IndexName="npc_id" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5052" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4555" Tablename="guilds" PrevTableName="" XPos="2545" YPos="48" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="26" >
-<COLUMNS>
-<COLUMN ID="5059" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5060" ColName="eqid" PrevColName="" Pos="2" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5061" ColName="name" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5062" ColName="leader" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5063" ColName="minstatus" PrevColName="" Pos="5" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5064" ColName="motd" PrevColName="" Pos="6" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5065" ColName="rank0title" PrevColName="" Pos="7" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5066" ColName="rank1title" PrevColName="" Pos="8" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5067" ColName="rank1" PrevColName="" Pos="9" idDatatype="20" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5068" ColName="rank2title" PrevColName="" Pos="10" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5069" ColName="rank2" PrevColName="" Pos="11" idDatatype="20" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5070" ColName="rank3title" PrevColName="" Pos="12" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5071" ColName="rank3" PrevColName="" Pos="13" idDatatype="20" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5072" ColName="rank4title" PrevColName="" Pos="14" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5073" ColName="rank4" PrevColName="" Pos="15" idDatatype="20" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5074" ColName="rank5title" PrevColName="" Pos="16" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5075" ColName="rank5" PrevColName="" Pos="17" idDatatype="20" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5980" />
-<RELATION_START ID="5983" />
-<RELATION_START ID="5987" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5076" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5059" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5077" IndexName="leader" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5062" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5078" IndexName="name" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5061" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5079" IndexName="eqid" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5060" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4556" Tablename="hackers" PrevTableName="" XPos="288" YPos="59" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="27" >
-<COLUMNS>
-<COLUMN ID="5080" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5081" ColName="account" PrevColName="" Pos="2" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5082" ColName="name" PrevColName="" Pos="3" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5083" ColName="hacked" PrevColName="" Pos="4" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5084" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5080" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4557" Tablename="inventory" PrevTableName="" XPos="452" YPos="834" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="28" >
-<COLUMNS>
-<COLUMN ID="5085" ColName="charid" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5086" ColName="slotid" PrevColName="" Pos="2" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5087" ColName="itemid" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5088" ColName="charges" PrevColName="" Pos="4" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5089" ColName="color" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5860" />
-<RELATION_END ID="6016" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5090" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5085" LengthParam="0" />
-<INDEXCOLUMN idColumn="5086" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4558" Tablename="items" PrevTableName="" XPos="1453" YPos="461" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="1" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="29" >
-<COLUMNS>
-<COLUMN ID="5091" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5092" ColName="minstatus" PrevColName="" Pos="2" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5093" ColName="Name" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5094" ColName="aagi" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5095" ColName="ac" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5096" ColName="accuracy" PrevColName="" Pos="6" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5097" ColName="acha" PrevColName="" Pos="7" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5098" ColName="adex" PrevColName="" Pos="8" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5099" ColName="aint" PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5100" ColName="artifactflag" PrevColName="" Pos="10" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5101" ColName="asta" PrevColName="" Pos="11" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5102" ColName="astr" PrevColName="" Pos="12" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5103" ColName="attackbonus" PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5104" ColName="augmentrestriction" PrevColName="" Pos="14" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5105" ColName="augslot1type" PrevColName="" Pos="15" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5106" ColName="augslot2type" PrevColName="" Pos="16" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5107" ColName="augslot3type" PrevColName="" Pos="17" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5108" ColName="augslot4type" PrevColName="" Pos="18" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5109" ColName="augslot5type" PrevColName="" Pos="19" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5110" ColName="augtype" PrevColName="" Pos="20" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5111" ColName="avoidance" PrevColName="" Pos="21" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5112" ColName="awis" PrevColName="" Pos="22" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5113" ColName="bagsize" PrevColName="" Pos="23" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5114" ColName="bagslots" PrevColName="" Pos="24" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5115" ColName="bagtype" PrevColName="" Pos="25" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5116" ColName="bagwr" PrevColName="" Pos="26" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5117" ColName="banedmgamt" PrevColName="" Pos="27" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5118" ColName="banedmgamt2" PrevColName="" Pos="28" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5119" ColName="banedmgbody" PrevColName="" Pos="29" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5120" ColName="banedmgrace" PrevColName="" Pos="30" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5121" ColName="bardtype" PrevColName="" Pos="31" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5122" ColName="bardvalue" PrevColName="" Pos="32" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5123" ColName="booktype" PrevColName="" Pos="33" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5124" ColName="casttime" PrevColName="" Pos="34" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5125" ColName="casttime2" PrevColName="" Pos="35" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5126" ColName="charges" PrevColName="" Pos="36" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5127" ColName="charmfile" PrevColName="" Pos="37" idDatatype="20" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5128" ColName="classes" PrevColName="" Pos="38" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5129" ColName="color" PrevColName="" Pos="39" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5130" ColName="combateffects" PrevColName="" Pos="40" idDatatype="20" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5131" ColName="combatskill" PrevColName="" Pos="41" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5132" ColName="combatskilldmg" PrevColName="" Pos="42" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5133" ColName="cost" PrevColName="" Pos="43" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5134" ColName="cr" PrevColName="" Pos="44" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5135" ColName="damage" PrevColName="" Pos="45" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5136" ColName="damageshield" PrevColName="" Pos="46" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5137" ColName="deity" PrevColName="" Pos="47" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5138" ColName="delay" PrevColName="" Pos="48" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5139" ColName="dotshielding" PrevColName="" Pos="49" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5140" ColName="dr" PrevColName="" Pos="50" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5141" ColName="effecttype" PrevColName="" Pos="51" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5142" ColName="elemdmgtype" PrevColName="" Pos="52" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5143" ColName="elemdmgamt" PrevColName="" Pos="53" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5144" ColName="endur" PrevColName="" Pos="54" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5145" ColName="factionamt1" PrevColName="" Pos="55" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5146" ColName="factionamt2" PrevColName="" Pos="56" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5147" ColName="factionamt3" PrevColName="" Pos="57" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5148" ColName="factionamt4" PrevColName="" Pos="58" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5149" ColName="factionmod1" PrevColName="" Pos="59" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5150" ColName="factionmod2" PrevColName="" Pos="60" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5151" ColName="factionmod3" PrevColName="" Pos="61" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5152" ColName="factionmod4" PrevColName="" Pos="62" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5153" ColName="filename" PrevColName="" Pos="63" idDatatype="20" DatatypeParams="(15)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5154" ColName="focusid" PrevColName="" Pos="64" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5155" ColName="fr" PrevColName="" Pos="65" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5156" ColName="gmflag" PrevColName="" Pos="66" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5157" ColName="hastepercent" PrevColName="" Pos="67" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5158" ColName="hasteproclvl" PrevColName="" Pos="68" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5159" ColName="hp" PrevColName="" Pos="69" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5160" ColName="hpregen" PrevColName="" Pos="70" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5161" ColName="icon" PrevColName="" Pos="71" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5162" ColName="idfile" PrevColName="" Pos="72" idDatatype="20" DatatypeParams="(30)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5163" ColName="itemclass" PrevColName="" Pos="73" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5164" ColName="itemtype" PrevColName="" Pos="74" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5165" ColName="ldonpointcost" PrevColName="" Pos="75" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5166" ColName="ldonpointtheme" PrevColName="" Pos="76" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5167" ColName="ldonsold" PrevColName="" Pos="77" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5168" ColName="light" PrevColName="" Pos="78" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5169" ColName="lore" PrevColName="" Pos="79" idDatatype="20" DatatypeParams="(80)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5170" ColName="loreflag" PrevColName="" Pos="80" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5171" ColName="magic" PrevColName="" Pos="81" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5172" ColName="mana" PrevColName="" Pos="82" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5173" ColName="manaregen" PrevColName="" Pos="83" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5174" ColName="material" PrevColName="" Pos="84" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5175" ColName="maxcharges" PrevColName="" Pos="85" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5176" ColName="merchantprice" PrevColName="" Pos="86" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5177" ColName="mr" PrevColName="" Pos="87" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5178" ColName="nodrop" PrevColName="" Pos="88" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5179" ColName="norent" PrevColName="" Pos="89" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5180" ColName="pendingloreflag" PrevColName="" Pos="90" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5181" ColName="pr" PrevColName="" Pos="91" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5182" ColName="proc_rate_mod" PrevColName="" Pos="92" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5183" ColName="races" PrevColName="" Pos="93" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5184" ColName="range" PrevColName="" Pos="94" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5185" ColName="reclevel" PrevColName="" Pos="95" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5186" ColName="recskill" PrevColName="" Pos="96" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5187" ColName="reqlevel" PrevColName="" Pos="97" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5188" ColName="sellrate" PrevColName="" Pos="98" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5189" ColName="shielding" PrevColName="" Pos="99" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5190" ColName="size" PrevColName="" Pos="100" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5191" ColName="skillmodtype" PrevColName="" Pos="101" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5192" ColName="skillmodvalue" PrevColName="" Pos="102" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5193" ColName="slots" PrevColName="" Pos="103" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5194" ColName="spellid" PrevColName="" Pos="104" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5195" ColName="spellshield" PrevColName="" Pos="105" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5196" ColName="strikethrough" PrevColName="" Pos="106" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5197" ColName="stunresist" PrevColName="" Pos="107" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5198" ColName="summonedflag" PrevColName="" Pos="108" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5199" ColName="tradeskills" PrevColName="" Pos="109" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5200" ColName="tribute" PrevColName="" Pos="110" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5201" ColName="weight" PrevColName="" Pos="111" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5202" ColName="unknown002" PrevColName="" Pos="112" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5203" ColName="unknown003" PrevColName="" Pos="113" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5204" ColName="unknown005" PrevColName="" Pos="114" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5205" ColName="unknown006" PrevColName="" Pos="115" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5206" ColName="unknown007" PrevColName="" Pos="116" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5207" ColName="unknown018" PrevColName="" Pos="117" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5208" ColName="unknown019" PrevColName="" Pos="118" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5209" ColName="unknown020" PrevColName="" Pos="119" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5210" ColName="unknown061" PrevColName="" Pos="120" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5211" ColName="unknown067" PrevColName="" Pos="121" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5212" ColName="unknown069" PrevColName="" Pos="122" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5213" ColName="unknown081" PrevColName="" Pos="123" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5214" ColName="unknown105" PrevColName="" Pos="124" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5215" ColName="unknown122" PrevColName="" Pos="125" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5216" ColName="unknown123" PrevColName="" Pos="126" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5217" ColName="unknown124" PrevColName="" Pos="127" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5218" ColName="unknown125" PrevColName="" Pos="128" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5219" ColName="unknown126" PrevColName="" Pos="129" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5220" ColName="unknown127" PrevColName="" Pos="130" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5221" ColName="unknown128" PrevColName="" Pos="131" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5222" ColName="unknown129" PrevColName="" Pos="132" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5223" ColName="unknown130" PrevColName="" Pos="133" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5224" ColName="unknown131" PrevColName="" Pos="134" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5225" ColName="unknown132" PrevColName="" Pos="135" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5226" ColName="unknown133" PrevColName="" Pos="136" idDatatype="20" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5227" ColName="updated" PrevColName="" Pos="137" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0000-00-00 00:00:00" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5228" ColName="comment" PrevColName="" Pos="138" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5229" ColName="unknown008" PrevColName="" Pos="139" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5835" />
-<RELATION_START ID="5947" />
-<RELATION_START ID="5956" />
-<RELATION_START ID="5960" />
-<RELATION_START ID="5965" />
-<RELATION_START ID="5975" />
-<RELATION_START ID="6001" />
-<RELATION_START ID="6016" />
-<RELATION_START ID="6021" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5773" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5091" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5230" IndexName="ID" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5091" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4560" Tablename="logs" PrevTableName="" XPos="295" YPos="201" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="31" >
-<COLUMNS>
-<COLUMN ID="5371" ColName="zone" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5372" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(128)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5373" ColName="type" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5374" IndexName="zone" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5371" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5375" IndexName="name" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5372" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4561" Tablename="lootdrop" PrevTableName="" XPos="1324" YPos="659" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="32" >
-<COLUMNS>
-<COLUMN ID="5376" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5377" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5856" />
-<RELATION_START ID="5892" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5378" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5376" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4562" Tablename="lootdrop_entries" PrevTableName="" XPos="1086" YPos="545" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="33" >
-<COLUMNS>
-<COLUMN ID="5379" ColName="lootdrop_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5380" ColName="item_id" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5840" ColName="loottable_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5381" ColName="item_charges" PrevColName="" Pos="3" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5382" ColName="equip_item" PrevColName="" Pos="4" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5383" ColName="chance" PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5835" />
-<RELATION_END ID="5839" />
-<RELATION_END ID="5856" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5384" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5379" LengthParam="0" />
-<INDEXCOLUMN idColumn="5380" LengthParam="0" />
-<INDEXCOLUMN idColumn="5840" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4563" Tablename="loottable" PrevTableName="" XPos="867" YPos="616" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="34" >
-<COLUMNS>
-<COLUMN ID="5890" ColName="id" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="1" NotNull="1" AutoInc="1" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5386" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5387" ColName="mincash" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5388" ColName="maxcash" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5389" ColName="avgcoin" PrevColName="" Pos="5" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5838" />
-<RELATION_START ID="5895" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5891" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5890" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4564" Tablename="loottable_entries" PrevTableName="" XPos="1088" YPos="755" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="35" >
-<COLUMNS>
-<COLUMN ID="5391" ColName="loottable_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5392" ColName="lootdrop_id" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5393" ColName="multiplier" PrevColName="" Pos="3" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5394" ColName="probability" PrevColName="" Pos="4" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="100" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5839" />
-</RELATIONS_START>
-<RELATIONS_END>
-<RELATION_END ID="5838" />
-<RELATION_END ID="5892" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5395" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5391" LengthParam="0" />
-<INDEXCOLUMN idColumn="5392" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4566" Tablename="merchantlist" PrevTableName="" XPos="847" YPos="1241" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="37" >
-<COLUMNS>
-<COLUMN ID="5398" ColName="merchantid" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5399" ColName="slot" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5400" ColName="item" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5899" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5401" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5398" LengthParam="0" />
-<INDEXCOLUMN idColumn="5399" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4567" Tablename="merchantsets" PrevTableName="" XPos="839" YPos="1010" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="38" >
-<COLUMNS>
-<COLUMN ID="5402" ColName="Id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5403" ColName="Name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(128)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5404" ColName="showname" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(31)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5897" />
-<RELATION_START ID="5899" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5405" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5402" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4568" Tablename="name_filter" PrevTableName="" XPos="486" YPos="198" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="39" >
-<COLUMNS>
-<COLUMN ID="5406" ColName="name" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(30)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5407" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5406" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4569" Tablename="npc_faction" PrevTableName="" XPos="1399" YPos="1160" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="40" >
-<COLUMNS>
-<COLUMN ID="5408" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5409" ColName="name" PrevColName="" Pos="2" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5410" ColName="primaryfaction" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5886" />
-<RELATION_START ID="5943" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5411" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5408" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4570" Tablename="npc_faction_entries" PrevTableName="" XPos="1386" YPos="1427" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="41" >
-<COLUMNS>
-<COLUMN ID="5412" ColName="npc_faction_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5413" ColName="faction_id" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5414" ColName="value" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5943" />
-<RELATION_END ID="6010" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5415" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5412" LengthParam="0" />
-<INDEXCOLUMN idColumn="5413" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4571" Tablename="npc_spells" PrevTableName="" XPos="984" YPos="1843" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="42" >
-<COLUMNS>
-<COLUMN ID="5416" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5417" ColName="name" PrevColName="" Pos="2" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5418" ColName="parent_list" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5419" ColName="attack_proc" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="-1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5420" ColName="proc_chance" PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="3" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5935" />
-<RELATION_START ID="5939" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5421" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5416" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4572" Tablename="npc_spells_entries" PrevTableName="" XPos="846" YPos="1528" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="43" >
-<COLUMNS>
-<COLUMN ID="5423" ColName="npc_spells_id" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5424" ColName="spellid" PrevColName="" Pos="3" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5425" ColName="type" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5426" ColName="minlevel" PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5427" ColName="maxlevel" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="255" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5428" ColName="manacost" PrevColName="" Pos="7" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="-1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5429" ColName="recast_delay" PrevColName="" Pos="8" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="-1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5430" ColName="priority" PrevColName="" Pos="9" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5939" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5884" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5423" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5432" IndexName="npc_spells_id" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5423" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4573" Tablename="npc_types" PrevTableName="" XPos="1111" YPos="1000" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="44" >
-<COLUMNS>
-<COLUMN ID="5433" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5434" ColName="name" PrevColName="" Pos="2" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5435" ColName="lastname" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5436" ColName="level" PrevColName="" Pos="4" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5437" ColName="race" PrevColName="" Pos="5" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5438" ColName="class" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5439" ColName="bodytype" PrevColName="" Pos="7" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5440" ColName="hp" PrevColName="" Pos="8" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5441" ColName="gender" PrevColName="" Pos="9" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5442" ColName="texture" PrevColName="" Pos="10" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5443" ColName="helmtexture" PrevColName="" Pos="11" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5444" ColName="size" PrevColName="" Pos="12" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5445" ColName="hp_regen_rate" PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5446" ColName="mana_regen_rate" PrevColName="" Pos="14" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5447" ColName="loottable_id" PrevColName="" Pos="15" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5448" ColName="merchant_id" PrevColName="" Pos="16" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5937" ColName="npc_spells_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5450" ColName="npc_faction_id" PrevColName="" Pos="18" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5451" ColName="mindmg" PrevColName="" Pos="19" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5452" ColName="maxdmg" PrevColName="" Pos="20" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5453" ColName="npcspecialattks" PrevColName="" Pos="21" idDatatype="20" DatatypeParams="(36)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5454" ColName="banish" PrevColName="" Pos="22" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5455" ColName="aggroradius" PrevColName="" Pos="23" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5456" ColName="social" PrevColName="" Pos="24" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5457" ColName="face" PrevColName="" Pos="25" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5458" ColName="luclin_hairstyle" PrevColName="" Pos="26" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5459" ColName="luclin_haircolor" PrevColName="" Pos="27" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5460" ColName="luclin_eyecolor" PrevColName="" Pos="28" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5461" ColName="luclin_beardcolor" PrevColName="" Pos="29" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5462" ColName="fixedz" PrevColName="" Pos="30" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5463" ColName="d_meele_texture1" PrevColName="" Pos="31" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5464" ColName="d_meele_texture2" PrevColName="" Pos="32" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5465" ColName="walkspeed" PrevColName="" Pos="33" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5466" ColName="runspeed" PrevColName="" Pos="34" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5467" ColName="MR" PrevColName="" Pos="35" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5468" ColName="CR" PrevColName="" Pos="36" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5469" ColName="DR" PrevColName="" Pos="37" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5470" ColName="FR" PrevColName="" Pos="38" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5471" ColName="PR" PrevColName="" Pos="39" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5472" ColName="ipc" PrevColName="" Pos="40" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5473" ColName="see_invis" PrevColName="" Pos="41" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5474" ColName="see_invis_undead" PrevColName="" Pos="42" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5475" ColName="qglobal" PrevColName="" Pos="43" idDatatype="5" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5476" ColName="AC" PrevColName="" Pos="44" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5995" />
-<RELATION_START ID="6012" />
-</RELATIONS_START>
-<RELATIONS_END>
-<RELATION_END ID="5886" />
-<RELATION_END ID="5895" />
-<RELATION_END ID="5897" />
-<RELATION_END ID="5935" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5477" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5433" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4574" Tablename="object" PrevTableName="" XPos="1661" YPos="1261" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="45" >
-<COLUMNS>
-<COLUMN ID="5478" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5479" ColName="zoneid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5480" ColName="xpos" PrevColName="" Pos="3" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5481" ColName="ypos" PrevColName="" Pos="4" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5482" ColName="zpos" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5483" ColName="heading" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5484" ColName="itemid" PrevColName="" Pos="7" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5485" ColName="charges" PrevColName="" Pos="8" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5486" ColName="objectname" PrevColName="" Pos="9" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5487" ColName="type" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5488" ColName="icon" PrevColName="" Pos="11" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5489" ColName="linked_list_addr_01" PrevColName="" Pos="12" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5490" ColName="linked_list_addr_02" PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5491" ColName="unknown08" PrevColName="" Pos="14" idDatatype="3" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5492" ColName="unknown10" PrevColName="" Pos="15" idDatatype="3" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5493" ColName="unknown20" PrevColName="" Pos="16" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5494" ColName="unknown24" PrevColName="" Pos="17" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5495" ColName="unknown60" PrevColName="" Pos="18" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5496" ColName="unknown64" PrevColName="" Pos="19" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5497" ColName="unknown68" PrevColName="" Pos="20" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5498" ColName="unknown72" PrevColName="" Pos="21" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5499" ColName="unknown76" PrevColName="" Pos="22" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5500" ColName="unknown84" PrevColName="" Pos="23" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5501" ColName="unknown88" PrevColName="" Pos="24" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5962" />
-</RELATIONS_START>
-<RELATIONS_END>
-<RELATION_END ID="5910" />
-<RELATION_END ID="5947" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5502" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5478" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4575" Tablename="object_contents" PrevTableName="" XPos="1767" YPos="954" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="46" >
-<COLUMNS>
-<COLUMN ID="5504" ColName="parentid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5505" ColName="bagidx" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5503" ColName="zoneid" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5506" ColName="itemid" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5507" ColName="charges" PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5508" ColName="droptime" PrevColName="" Pos="6" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0000-00-00 00:00:00" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5931" />
-<RELATION_END ID="5960" />
-<RELATION_END ID="5962" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5509" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5504" LengthParam="0" />
-<INDEXCOLUMN idColumn="5505" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4576" Tablename="petitions" PrevTableName="" XPos="47" YPos="42" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="47" >
-<COLUMNS>
-<COLUMN ID="5510" ColName="dib" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5511" ColName="petid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5512" ColName="charname" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5513" ColName="accountname" PrevColName="" Pos="4" idDatatype="20" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5514" ColName="lastgm" PrevColName="" Pos="5" idDatatype="20" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5515" ColName="petitiontext" PrevColName="" Pos="6" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5516" ColName="gmtext" PrevColName="" Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5517" ColName="zone" PrevColName="" Pos="8" idDatatype="20" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5518" ColName="urgency" PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5519" ColName="charclass" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5520" ColName="charrace" PrevColName="" Pos="11" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5521" ColName="charlevel" PrevColName="" Pos="12" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5522" ColName="checkouts" PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5523" ColName="unavailables" PrevColName="" Pos="14" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5524" ColName="ischeckedout" PrevColName="" Pos="15" idDatatype="1" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5525" ColName="senttime" PrevColName="" Pos="16" idDatatype="6" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5526" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5510" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5527" IndexName="petid" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5511" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4577" Tablename="pets" PrevTableName="" XPos="2172" YPos="281" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="48" >
-<COLUMNS>
-<COLUMN ID="5528" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5529" ColName="max_hp" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5530" ColName="cur_hp" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5531" ColName="min_dmg" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5532" ColName="max_dmg" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5533" ColName="race" PrevColName="" Pos="6" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5534" ColName="class" PrevColName="" Pos="7" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5535" ColName="level" PrevColName="" Pos="8" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5536" ColName="size" PrevColName="" Pos="9" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5537" ColName="texture" PrevColName="" Pos="10" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5538" ColName="description" PrevColName="" Pos="11" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5539" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5528" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4578" Tablename="player_corpses" PrevTableName="" XPos="20" YPos="1314" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="49" >
-<COLUMNS>
-<COLUMN ID="5867" ColName="id" PrevColName="" Pos="9" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="1" NotNull="1" AutoInc="1" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5541" ColName="charid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5542" ColName="charname" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5543" ColName="zoneid" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5544" ColName="x" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5545" ColName="y" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5546" ColName="z" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5547" ColName="heading" PrevColName="" Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5548" ColName="data" PrevColName="" Pos="9" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5549" ColName="timeofdeath" PrevColName="" Pos="10" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0000-00-00 00:00:00" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5874" />
-</RELATIONS_START>
-<RELATIONS_END>
-<RELATION_END ID="5865" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5868" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5867" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5551" IndexName="zoneid" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5543" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4579" Tablename="player_corpses_backup" PrevTableName="" XPos="128" YPos="1655" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="50" >
-<COLUMNS>
-<COLUMN ID="5871" ColName="id" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="1" NotNull="1" AutoInc="1" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5553" ColName="charid" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5554" ColName="parent_corpse_id" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5555" ColName="zoneid" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5556" ColName="x" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5557" ColName="y" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5558" ColName="z" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5559" ColName="heading" PrevColName="" Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5560" ColName="data" PrevColName="" Pos="9" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5561" ColName="timeofdeath" PrevColName="" Pos="10" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0000-00-00 00:00:00" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5562" ColName="timeofdelete" PrevColName="" Pos="11" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0000-00-00 00:00:00" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5862" />
-<RELATION_END ID="5874" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5872" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5871" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5564" IndexName="charid" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5553" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4580" Tablename="questProgress" PrevTableName="" XPos="2137" YPos="554" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="51" >
-<COLUMNS>
-<COLUMN ID="5565" ColName="ID" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5566" ColName="basicItems" PrevColName="" Pos="2" idDatatype="31" DatatypeParams="(\ay\a,\an\a)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="n" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5567" ColName="advItems" PrevColName="" Pos="3" idDatatype="31" DatatypeParams="(\ay\a,\an\a)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="n" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5568" ColName="text" PrevColName="" Pos="4" idDatatype="31" DatatypeParams="(\ay\a,\an\a)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="n" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5569" ColName="finished" PrevColName="" Pos="5" idDatatype="31" DatatypeParams="(\ay\a,\an\a)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="n" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5774" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5565" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5570" IndexName="ID" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5565" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4582" Tablename="sharedbank" PrevTableName="" XPos="469" YPos="1671" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="53" >
-<COLUMNS>
-<COLUMN ID="5575" ColName="acctid" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5576" ColName="slotid" PrevColName="" Pos="2" idDatatype="3" DatatypeParams="(7)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5577" ColName="itemid" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5578" ColName="charges" PrevColName="" Pos="4" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5845" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5832" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5575" LengthParam="0" />
-<INDEXCOLUMN idColumn="5576" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5579" IndexName="account" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5575" LengthParam="0" />
-<INDEXCOLUMN idColumn="5576" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4583" Tablename="spawn2" PrevTableName="" XPos="2740" YPos="1695" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="54" >
-<COLUMNS>
-<COLUMN ID="5580" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5581" ColName="spawngroupID" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5582" ColName="zone" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5583" ColName="x" PrevColName="" Pos="4" idDatatype="7" DatatypeParams="(14,6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0.000000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5584" ColName="y" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="(14,6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0.000000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5585" ColName="z" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="(14,6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0.000000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5586" ColName="heading" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="(14,6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="0.000000" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5587" ColName="respawntime" PrevColName="" Pos="8" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5588" ColName="variance" PrevColName="" Pos="9" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5589" ColName="pathgrid" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5590" ColName="timeleft" PrevColName="" Pos="11" idDatatype="6" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5912" />
-<RELATION_END ID="5928" />
-<RELATION_END ID="5952" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5591" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5580" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5592" IndexName="zone" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5582" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4584" Tablename="spawnarea" PrevTableName="" XPos="2363" YPos="1546" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="55" >
-<COLUMNS>
-<COLUMN ID="5926" ColName="spawngroupID" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5595" ColName="zone" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5596" ColName="x1" PrevColName="" Pos="4" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5597" ColName="y1" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5598" ColName="z1" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5599" ColName="x2" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5600" ColName="y2" PrevColName="" Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5601" ColName="z2" PrevColName="" Pos="9" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5602" ColName="maxmob" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5603" ColName="respawntime" PrevColName="" Pos="11" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5604" ColName="variance" PrevColName="" Pos="12" idDatatype="1" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5605" ColName="pause" PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5802" />
-<RELATION_END ID="5902" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5608" IndexName="zone" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5595" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4585" Tablename="spawnentry" PrevTableName="" XPos="2529" YPos="1413" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="56" >
-<COLUMNS>
-<COLUMN ID="5610" ColName="npcID" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5925" ColName="spawngroupID" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5611" ColName="chance" PrevColName="" Pos="3" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5790" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5612" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5610" LengthParam="0" />
-<INDEXCOLUMN idColumn="5925" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4586" Tablename="spawngroup" PrevTableName="" XPos="2677" YPos="1567" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="1" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="57" >
-<COLUMNS>
-<COLUMN ID="5918" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="1" NotNull="1" AutoInc="1" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5614" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(30)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5790" />
-<RELATION_START ID="5802" />
-<RELATION_START ID="5928" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5919" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5918" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5616" IndexName="name" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5614" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4587" Tablename="start_zones" PrevTableName="" XPos="1417" YPos="2188" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="58" >
-<COLUMNS>
-<COLUMN ID="5623" ColName="player_class" PrevColName="" Pos="7" idDatatype="5" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5624" ColName="player_deity" PrevColName="" Pos="8" idDatatype="5" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5625" ColName="player_race" PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5626" ColName="start_zone" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5617" ColName="x" PrevColName="" Pos="1" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5618" ColName="y" PrevColName="" Pos="2" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5619" ColName="z" PrevColName="" Pos="3" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5620" ColName="zone_id" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5621" ColName="bind_id" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5622" ColName="player_choice" PrevColName="" Pos="6" idDatatype="5" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5627" ColName="bind_x" PrevColName="" Pos="11" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5628" ColName="bind_y" PrevColName="" Pos="12" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5629" ColName="bind_z" PrevColName="" Pos="13" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5630" ColName="select_rank" PrevColName="" Pos="14" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="50" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5969" />
-<RELATION_END ID="5972" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5848" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5623" LengthParam="0" />
-<INDEXCOLUMN idColumn="5624" LengthParam="0" />
-<INDEXCOLUMN idColumn="5625" LengthParam="0" />
-<INDEXCOLUMN idColumn="5626" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4588" Tablename="starting_items" PrevTableName="" XPos="1758" YPos="225" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="59" >
-<COLUMNS>
-<COLUMN ID="5631" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5632" ColName="race" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5633" ColName="class" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5634" ColName="deityid" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5635" ColName="zoneid" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5636" ColName="itemid" PrevColName="" Pos="6" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5637" ColName="item_charges" PrevColName="" Pos="7" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5638" ColName="gm" PrevColName="" Pos="8" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="6021" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5639" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5631" LengthParam="0" />
-<INDEXCOLUMN idColumn="5632" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4589" Tablename="timers" PrevTableName="" XPos="252" YPos="736" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="60" >
-<COLUMNS>
-<COLUMN ID="5640" ColName="char_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5641" ColName="type" PrevColName="" Pos="2" idDatatype="3" DatatypeParams="(8)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5642" ColName="start" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5643" ColName="duration" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5644" ColName="enable" PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5863" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5645" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5640" LengthParam="0" />
-<INDEXCOLUMN idColumn="5641" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4590" Tablename="tradeskill_recipe" PrevTableName="" XPos="1114" YPos="140" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="61" >
-<COLUMNS>
-<COLUMN ID="5646" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="1" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5647" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(64)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5648" ColName="tradeskill" PrevColName="" Pos="3" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5649" ColName="skillneeded" PrevColName="" Pos="4" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5650" ColName="trivial" PrevColName="" Pos="5" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5651" ColName="nofail" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5652" ColName="replace_container" PrevColName="" Pos="7" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5653" ColName="notes" PrevColName="" Pos="8" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="6006" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5654" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5646" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4591" Tablename="tradeskill_recipe_entries" PrevTableName="" XPos="1434" YPos="172" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="62" >
-<COLUMNS>
-<COLUMN ID="5825" ColName="id" PrevColName="" Pos="6" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="1" NotNull="1" AutoInc="1" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="6008" ColName="recipe_id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5657" ColName="item_id" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5658" ColName="successcount" PrevColName="" Pos="4" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5659" ColName="failcount" PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5660" ColName="componentcount" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5661" ColName="iscontainer" PrevColName="" Pos="7" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="6001" />
-<RELATION_END ID="6006" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5826" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5825" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5664" IndexName="item_id" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5657" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4593" Tablename="traps" PrevTableName="" XPos="1890" YPos="2328" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="64" >
-<COLUMNS>
-<COLUMN ID="5687" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5688" ColName="zone" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5689" ColName="x" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5690" ColName="y" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5691" ColName="z" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5692" ColName="chance" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5693" ColName="maxzdiff" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5694" ColName="radius" PrevColName="" Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5695" ColName="effect" PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5696" ColName="effectvalue" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5697" ColName="effectvalue2" PrevColName="" Pos="11" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5698" ColName="skill" PrevColName="" Pos="12" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5699" ColName="spawnchance" PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5817" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5700" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5687" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4594" Tablename="variables" PrevTableName="" XPos="1835" YPos="75" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="65" >
-<COLUMNS>
-<COLUMN ID="5701" ColName="varname" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(25)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5702" ColName="value" PrevColName="" Pos="2" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5703" ColName="information" PrevColName="" Pos="3" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5704" ColName="ts" PrevColName="" Pos="4" idDatatype="16" DatatypeParams="(14)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5705" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5701" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4595" Tablename="zone" PrevTableName="" XPos="2018" YPos="1881" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="66" >
-<COLUMNS>
-<COLUMN ID="5706" ColName="short_name" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5707" ColName="file_name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5708" ColName="long_name" PrevColName="" Pos="3" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5709" ColName="safe_x" PrevColName="" Pos="4" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5710" ColName="safe_y" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5711" ColName="safe_z" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5712" ColName="minium_level" PrevColName="" Pos="7" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5713" ColName="minium_status" PrevColName="" Pos="8" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5714" ColName="zoneidnumber" PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5715" ColName="timezone" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5716" ColName="maxclients" PrevColName="" Pos="11" idDatatype="5" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5717" ColName="weather" PrevColName="" Pos="12" idDatatype="2" DatatypeParams="(6)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5718" ColName="note" PrevColName="" Pos="13" idDatatype="20" DatatypeParams="(80)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5782" />
-<RELATION_START ID="5787" />
-<RELATION_START ID="5814" />
-<RELATION_START ID="5817" />
-<RELATION_START ID="5829" />
-<RELATION_START ID="5902" />
-<RELATION_START ID="5912" />
-<RELATION_START ID="5997" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5719" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5706" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5720" IndexName="zoneidnumber" IndexKind="2" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5714" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4596" Tablename="zone_era" PrevTableName="" XPos="2442" YPos="2167" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="67" >
-<COLUMNS>
-<COLUMN ID="5723" ColName="zone_short_name" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5721" ColName="zone_name" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5722" ColName="era" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(50)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5724" ColName="category_in_era" PrevColName="" Pos="4" idDatatype="20" DatatypeParams="(50)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5725" ColName="Icon" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5782" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5785" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5723" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4597" Tablename="zone_points" PrevTableName="" XPos="1717" YPos="2101" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="68" >
-<COLUMNS>
-<COLUMN ID="5726" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5727" ColName="zone" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5728" ColName="number" PrevColName="" Pos="3" idDatatype="2" DatatypeParams="(4)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="1" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5729" ColName="y" PrevColName="" Pos="4" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5730" ColName="x" PrevColName="" Pos="5" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5731" ColName="z" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5732" ColName="heading" PrevColName="" Pos="7" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5733" ColName="target_zone" PrevColName="" Pos="8" idDatatype="19" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5734" ColName="target_y" PrevColName="" Pos="9" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5735" ColName="target_x" PrevColName="" Pos="10" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5736" ColName="target_z" PrevColName="" Pos="11" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5737" ColName="target_heading" PrevColName="" Pos="12" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5738" ColName="keep_x" PrevColName="" Pos="13" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5739" ColName="keep_y" PrevColName="" Pos="14" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5740" ColName="zoneinst" PrevColName="" Pos="15" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5829" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5741" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5726" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="5742" IndexName="NewIndex" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5728" LengthParam="0" />
-<INDEXCOLUMN idColumn="5727" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4598" Tablename="zone_server" PrevTableName="" XPos="302" YPos="418" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="69" >
-<COLUMNS>
-<COLUMN ID="5743" ColName="name" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5744" ColName="address" PrevColName="" Pos="2" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5745" ColName="port" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5746" ColName="player_count" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5747" ColName="last_alive" PrevColName="" Pos="5" idDatatype="16" DatatypeParams="(14)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5748" ColName="rain" PrevColName="" Pos="6" idDatatype="19" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5749" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5743" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4599" Tablename="zone_state_dump" PrevTableName="" XPos="2299" YPos="2341" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="70" >
-<COLUMNS>
-<COLUMN ID="5750" ColName="zonename" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5751" ColName="spawn2_count" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5752" ColName="npc_count" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5753" ColName="npcloot_count" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5754" ColName="gmspawntype_count" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5755" ColName="spawn2" PrevColName="" Pos="6" idDatatype="25" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5756" ColName="npcs" PrevColName="" Pos="7" idDatatype="25" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5757" ColName="npc_loot" PrevColName="" Pos="8" idDatatype="25" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5758" ColName="gmspawntype" PrevColName="" Pos="9" idDatatype="25" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5759" ColName="time" PrevColName="" Pos="10" idDatatype="16" DatatypeParams="(14)" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5787" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5760" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5750" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4600" Tablename="zonepoints_raw" PrevTableName="" XPos="2517" YPos="2037" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="71" >
-<COLUMNS>
-<COLUMN ID="5761" ColName="id" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5762" ColName="zone" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(16)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5763" ColName="zoneline" PrevColName="" Pos="3" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="5814" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="5764" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5761" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="4601" Tablename="zoneserver_auth" PrevTableName="" XPos="310" YPos="317" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="72" >
-<COLUMNS>
-<COLUMN ID="5765" ColName="host" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(30)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="5766" ColName="note" PrevColName="" Pos="2" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="0" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="5767" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5765" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="5906" Tablename="zone_placeholder" PrevTableName="Table_125" XPos="1920" YPos="1827" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="97" >
-<COLUMNS>
-<COLUMN ID="5908" ColName="zoneidnumber" PrevColName="" Pos="0" idDatatype="5" DatatypeParams="" Width="-1" Prec="-1" PrimaryKey="1" NotNull="1" AutoInc="1" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="5910" />
-<RELATION_START ID="5931" />
-<RELATION_START ID="5933" />
-<RELATION_START ID="5949" />
-<RELATION_START ID="5967" />
-<RELATION_START ID="5969" />
-<RELATION_START ID="5972" />
-<RELATION_START ID="5977" />
-<RELATION_START ID="5990" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="5909" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="5908" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-</TABLES>
-<RELATIONS>
-<RELATION ID="5777" RelationName="entries" Kind="1" SrcTable="4550" DestTable="4551" FKFields="id=gridid\n" FKFieldsComments="\n" relDirection="4" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="71" />
-<RELATION ID="5782" RelationName="era" Kind="0" SrcTable="4595" DestTable="4596" FKFields="short_name=zone_short_name\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="71" />
-<RELATION ID="5787" RelationName="state" Kind="0" SrcTable="4595" DestTable="4599" FKFields="short_name=zonename\n" FKFieldsComments="\n" relDirection="3" MidOffset="28" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="72" />
-<RELATION ID="5790" RelationName="entries" Kind="1" SrcTable="4586" DestTable="4585" FKFields="id=spawngroupID\n" FKFieldsComments="\n" relDirection="4" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="73" />
-<RELATION ID="5802" RelationName="Rel_06" Kind="2" SrcTable="4586" DestTable="4584" FKFields="id=spawngroupID\n" FKFieldsComments="\n" relDirection="4" MidOffset="-5" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="74" />
-<RELATION ID="5814" RelationName="Rel_09" Kind="2" SrcTable="4595" DestTable="4600" FKFields="short_name=zone\n" FKFieldsComments="\n" relDirection="2" MidOffset="71" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="75" />
-<RELATION ID="5817" RelationName="Rel_10" Kind="2" SrcTable="4595" DestTable="4593" FKFields="short_name=zone\n" FKFieldsComments="\n" relDirection="3" MidOffset="53" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="1" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="76" />
-<RELATION ID="5829" RelationName="zone" Kind="2" SrcTable="4595" DestTable="4597" FKFields="short_name=zone\n" FKFieldsComments="\n" relDirection="4" MidOffset="25" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="78" />
-<RELATION ID="5835" RelationName="Rel_14" Kind="1" SrcTable="4558" DestTable="4562" FKFields="id=item_id\n" FKFieldsComments="\n" relDirection="4" MidOffset="8" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="80" />
-<RELATION ID="5838" RelationName="Rel_15" Kind="1" SrcTable="4563" DestTable="4564" FKFields="id=loottable_id\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="81" />
-<RELATION ID="5839" RelationName="Rel_16" Kind="1" SrcTable="4564" DestTable="4562" FKFields="loottable_id=loottable_id\nlootdrop_id=lootdrop_id\n" FKFieldsComments="\n\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="82" />
-<RELATION ID="5841" RelationName="chars" Kind="2" SrcTable="4534" DestTable="4538" FKFields="id=account_id\n" FKFieldsComments="\n" relDirection="4" MidOffset="2" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="83" />
-<RELATION ID="5845" RelationName="acct" Kind="1" SrcTable="4534" DestTable="4582" FKFields="id=acctid\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="84" />
-<RELATION ID="5852" RelationName="Rel_19" Kind="2" SrcTable="4538" DestTable="4539" FKFields="id=charid\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="85" />
-<RELATION ID="5854" RelationName="Rel_20" Kind="2" SrcTable="4534" DestTable="4539" FKFields="id=account_id\n" FKFieldsComments="\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="86" />
-<RELATION ID="5856" RelationName="Rel_21" Kind="2" SrcTable="4561" DestTable="4562" FKFields="id=lootdrop_id\n" FKFieldsComments="\n" relDirection="4" MidOffset="-6" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="87" />
-<RELATION ID="5858" RelationName="Rel_22" Kind="1" SrcTable="4538" DestTable="4546" FKFields="id=char_id\n" FKFieldsComments="\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="88" />
-<RELATION ID="5860" RelationName="Rel_23" Kind="1" SrcTable="4538" DestTable="4557" FKFields="id=charid\n" FKFieldsComments="\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="89" />
-<RELATION ID="5862" RelationName="Rel_24" Kind="2" SrcTable="4538" DestTable="4579" FKFields="id=charid\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="90" />
-<RELATION ID="5863" RelationName="Rel_25" Kind="1" SrcTable="4538" DestTable="4589" FKFields="id=char_id\n" FKFieldsComments="\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="91" />
-<RELATION ID="5865" RelationName="Rel_26" Kind="2" SrcTable="4538" DestTable="4578" FKFields="id=charid\n" FKFieldsComments="\n" relDirection="4" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="92" />
-<RELATION ID="5874" RelationName="Rel_27" Kind="2" SrcTable="4578" DestTable="4579" FKFields="id=parent_corpse_id\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="93" />
-<RELATION ID="5886" RelationName="Rel_29" Kind="2" SrcTable="4569" DestTable="4573" FKFields="id=npc_faction_id\n" FKFieldsComments="\n" relDirection="4" MidOffset="5" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="92" />
-<RELATION ID="5892" RelationName="Rel_30" Kind="1" SrcTable="4561" DestTable="4564" FKFields="id=lootdrop_id\n" FKFieldsComments="\n" relDirection="4" MidOffset="2" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="92" />
-<RELATION ID="5895" RelationName="Rel_31" Kind="2" SrcTable="4563" DestTable="4573" FKFields="id=loottable_id\n" FKFieldsComments="\n" relDirection="3" MidOffset="30" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="93" />
-<RELATION ID="5897" RelationName="Rel_32" Kind="2" SrcTable="4567" DestTable="4573" FKFields="Id=merchant_id\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="94" />
-<RELATION ID="5899" RelationName="Rel_33" Kind="1" SrcTable="4567" DestTable="4566" FKFields="Id=merchantid\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="95" />
-<RELATION ID="5902" RelationName="Rel_34" Kind="2" SrcTable="4595" DestTable="4584" FKFields="short_name=zone\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="96" />
-<RELATION ID="5910" RelationName="Rel_35" Kind="2" SrcTable="5906" DestTable="4574" FKFields="zoneidnumber=zoneid\n" FKFieldsComments="\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="98" />
-<RELATION ID="5912" RelationName="Rel_36" Kind="2" SrcTable="4595" DestTable="4583" FKFields="short_name=zone\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="99" />
-<RELATION ID="5928" RelationName="Rel_37" Kind="2" SrcTable="4586" DestTable="4583" FKFields="id=spawngroupID\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="100" />
-<RELATION ID="5931" RelationName="zone" Kind="2" SrcTable="5906" DestTable="4575" FKFields="zoneidnumber=zoneid\n" FKFieldsComments="\n" relDirection="1" MidOffset="-316" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="101" />
-<RELATION ID="5933" RelationName="Rel_39" Kind="1" SrcTable="5906" DestTable="4551" FKFields="zoneidnumber=zoneid\n" FKFieldsComments="\n" relDirection="1" MidOffset="-102" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="102" />
-<RELATION ID="5935" RelationName="Rel_40" Kind="2" SrcTable="4571" DestTable="4573" FKFields="id=npc_spells_id\n" FKFieldsComments="\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="102" />
-<RELATION ID="5939" RelationName="Rel_41" Kind="1" SrcTable="4571" DestTable="4572" FKFields="id=npc_spells_id\n" FKFieldsComments="\n" relDirection="1" MidOffset="-10" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="103" />
-<RELATION ID="5943" RelationName="Rel_42" Kind="1" SrcTable="4569" DestTable="4570" FKFields="id=npc_faction_id\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="105" />
-<RELATION ID="5947" RelationName="Rel_43" Kind="2" SrcTable="4558" DestTable="4574" FKFields="id=itemid\n" FKFieldsComments="\n" relDirection="3" MidOffset="-48" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="105" />
-<RELATION ID="5949" RelationName="Rel_44" Kind="2" SrcTable="5906" DestTable="4552" FKFields="zoneidnumber=zoneid\n" FKFieldsComments="\n" relDirection="1" MidOffset="-435" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="106" />
-<RELATION ID="5952" RelationName="Rel_45" Kind="2" SrcTable="4550" DestTable="4583" FKFields="id=pathgrid\n" FKFieldsComments="\n" relDirection="3" MidOffset="-1" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="107" />
-<RELATION ID="5956" RelationName="Rel_46" Kind="2" SrcTable="4558" DestTable="4552" FKFields="id=item\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="108" />
-<RELATION ID="5960" RelationName="item" Kind="2" SrcTable="4558" DestTable="4575" FKFields="id=itemid\n" FKFieldsComments="\n" relDirection="3" MidOffset="52" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="109" />
-<RELATION ID="5962" RelationName="parent" Kind="1" SrcTable="4574" DestTable="4575" FKFields="id=parentid\n" FKFieldsComments="\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="110" />
-<RELATION ID="5965" RelationName="Rel_49" Kind="1" SrcTable="4558" DestTable="4548" FKFields="id=Itemid\n" FKFieldsComments="\n" relDirection="2" MidOffset="187" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="111" />
-<RELATION ID="5967" RelationName="Rel_50" Kind="1" SrcTable="5906" DestTable="4548" FKFields="zoneidnumber=zoneid\n" FKFieldsComments="\n" relDirection="1" MidOffset="-329" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="112" />
-<RELATION ID="5969" RelationName="bind" Kind="2" SrcTable="5906" DestTable="4587" FKFields="zoneidnumber=bind_id\n" FKFieldsComments="\n" relDirection="4" MidOffset="-94" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="113" />
-<RELATION ID="5972" RelationName="zone" Kind="2" SrcTable="5906" DestTable="4587" FKFields="zoneidnumber=zone_id\n" FKFieldsComments="\n" relDirection="4" MidOffset="-66" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="114" />
-<RELATION ID="5975" RelationName="Rel_53" Kind="1" SrcTable="4558" DestTable="4547" FKFields="id=Itemid\n" FKFieldsComments="\n" relDirection="3" MidOffset="136" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="115" />
-<RELATION ID="5977" RelationName="Rel_54" Kind="1" SrcTable="5906" DestTable="4547" FKFields="zoneidnumber=zoneid\n" FKFieldsComments="\n" relDirection="1" MidOffset="348" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="116" />
-<RELATION ID="5980" RelationName="Rel_55" Kind="1" SrcTable="4555" DestTable="4553" FKFields="id=guildone\n" FKFieldsComments="\n" relDirection="2" MidOffset="-4" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="117" />
-<RELATION ID="5983" RelationName="Rel_56" Kind="1" SrcTable="4555" DestTable="4553" FKFields="id=guildtwo\n" FKFieldsComments="\n" relDirection="2" MidOffset="4" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="118" />
-<RELATION ID="5987" RelationName="Rel_57" Kind="2" SrcTable="4555" DestTable="4554" FKFields="id=owned_guild_id\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="119" />
-<RELATION ID="5990" RelationName="Rel_58" Kind="2" SrcTable="5906" DestTable="4554" FKFields="zoneidnumber=zoneid\n" FKFieldsComments="\n" relDirection="1" MidOffset="-265" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="120" />
-<RELATION ID="5992" RelationName="Rel_59" Kind="1" SrcTable="4538" DestTable="4533" FKFields="id=charid\n" FKFieldsComments="\n" relDirection="4" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="121" />
-<RELATION ID="5995" RelationName="Rel_60" Kind="2" SrcTable="4573" DestTable="4532" FKFields="id=npc_id\n" FKFieldsComments="\n" relDirection="4" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="122" />
-<RELATION ID="5997" RelationName="Rel_61" Kind="2" SrcTable="4595" DestTable="4543" FKFields="short_name=zone\n" FKFieldsComments="\n" relDirection="3" MidOffset="70" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="122" />
-<RELATION ID="6001" RelationName="product" Kind="2" SrcTable="4558" DestTable="4591" FKFields="id=item_id\n" FKFieldsComments="\n" relDirection="1" MidOffset="-13" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="122" />
-<RELATION ID="6006" RelationName="Rel_63" Kind="2" SrcTable="4590" DestTable="4591" FKFields="id=recipe_id\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="123" />
-<RELATION ID="6010" RelationName="Rel_64" Kind="1" SrcTable="4545" DestTable="4570" FKFields="id=faction_id\n" FKFieldsComments="\n" relDirection="1" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="124" />
-<RELATION ID="6012" RelationName="Rel_65" Kind="1" SrcTable="4573" DestTable="4547" FKFields="id=npc_id\n" FKFieldsComments="\n" relDirection="2" MidOffset="-82" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="125" />
-<RELATION ID="6016" RelationName="Rel_66" Kind="2" SrcTable="4558" DestTable="4557" FKFields="id=itemid\n" FKFieldsComments="\n" relDirection="4" MidOffset="-233" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="127" />
-<RELATION ID="6021" RelationName="Rel_67" Kind="2" SrcTable="4558" DestTable="4588" FKFields="id=itemid\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="130" />
-</RELATIONS>
-<NOTES>
-<NOTE ID="5942" NoteName="Note_01" XPos="858" YPos="1777" NoteText="Something is wrong with\nthe organization of npc spells.\n" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="104" />
-</NOTES>
-<IMAGES>
-</IMAGES>
-</METADATA>
-<PLUGINDATA>
-<PLUGINDATARECORDS>
-</PLUGINDATARECORDS>
-</PLUGINDATA>
-<QUERYDATA>
-<QUERYRECORDS>
-</QUERYRECORDS>
-</QUERYDATA>
-<LINKEDMODELS>
-</LINKEDMODELS>
-</DBMODEL>
diff --git a/utils/scripts/vcxproj_dependencies.py b/utils/scripts/vcxproj_dependencies.py
new file mode 100644
index 000000000..f50c9aec4
--- /dev/null
+++ b/utils/scripts/vcxproj_dependencies.py
@@ -0,0 +1,793 @@
+#! /usr/bin/env python
+#
+
+"""
+'VCXProj-Dependencies' for EQEmulator
+
+This script locates external dependency paths and generates lists for each
+project. In addition, it will cross-check these lists to determine if any
+discrepancies exist for any dependencies globally and across all projects.
+
+"""
+
+
+import sys
+import os
+import fnmatch
+
+try:
+    import xml.etree.cElementTree as ElementTree
+except ImportError:
+    import xml.etree.ElementTree as ElementTree
+
+from time import time, ctime
+
+
+QUIET_REPORT = True
+
+include_projects = []
+exclude_projects = ['VCTargetsPath', 'CompilerIdC', 'CompilerIdCXX']  # these three should be left in by default
+
+base_path = os.getcwd()[:-14]  # '/utils/scripts'
+base_path = base_path.replace('\\', '/')
+
+file_extensions = ['vcxproj']
+project_paths = []
+master_dependencies = []
+# {[project]:{[build]:{[resource]:{[reference]:[paths]}}}}
+project_dependencies = {}
+
+out_files = {}
+
+col1 = '{0}'.format(' ' * 0)
+col2 = '{0}'.format(' ' * 2)
+col3 = '{0}'.format(' ' * 4)
+col4 = '{0}'.format(' ' * 6)
+col5 = '{0}'.format(' ' * 8)
+
+
+def main():
+    """ main """
+    
+    if not create_output_directory():
+        exit()
+    
+    if not open_output_files():
+        exit()
+    
+    print 'Locating project paths...'
+    locate_project_paths()
+    print '..project count: {0}'.format(len(project_paths))
+    print 'Parsing project files...'
+    parse_project_files()
+    print 'Building master dependencies...'
+    build_master_dependencies()
+    print '..dependency count: {0}'.format(len(master_dependencies))
+    print 'Checking for version discrepancies...'
+    check_for_version_discrepancies()
+    close_output_files()
+    print '\n__fin__'
+    
+    return
+
+
+def create_output_directory():
+    """ Check for output directory - create if does not exist """
+    
+    try:
+        output_path = '{0}/utils/scripts/vcxproj_dependencies_output'.format(base_path)
+        if not os.path.exists(output_path):
+            os.mkdir(output_path)
+        
+        return True
+    
+    except IOError:
+        print('(Exception Error: {0}) create_output_directory()'.format(sys.exc_info()[0]))
+        
+        return False
+
+
+def open_output_files():
+    """ Open all output files """
+    
+    try:
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/ProjectPaths.txt'.format(base_path)
+        out_files['ProjectPaths'] = open(file_name, 'w')
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/MasterDependencies.txt'.format(base_path)
+        out_files['MasterDependencies'] = open(file_name, 'w')
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/ProjectDependencies.txt'.format(base_path)
+        out_files['ProjectDependencies'] = open(file_name, 'w')
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/ContextTree.txt'.format(base_path)
+        out_files['ContextTree'] = open(file_name, 'w')
+        file_name = '{0}/utils/scripts/vcxproj_dependencies_output/DiscrepancyReport.txt'.format(base_path)
+        out_files['DiscrepancyReport'] = open(file_name, 'w')
+        for file in out_files:
+            out_files[file].write('>> \'VCXProj-Dependencies\' {0} file\n'.format(file))
+            out_files[file].write('>> file generated @ {0}\n\n'.format(ctime(time())))
+        
+        return True
+    
+    except IOError:
+        print('(Exception Error: {0}) open_output_files()'.format(sys.exc_info()[0]))
+        close_output_files()
+        
+        return False
+
+
+def locate_project_paths():
+    """ Locate vcxproj files in the build folder """
+    
+    for root, dirs, files in os.walk('{0}/build'.format(base_path)):
+        for name in files:
+            project = name.split('.')[0]
+            if not len(include_projects) == 0 and project not in include_projects:
+                continue
+            if not len(exclude_projects) == 0 and project in exclude_projects:
+                continue
+            for extension in file_extensions:
+                if fnmatch.fnmatch(name, '*.{0}'.format(extension)):
+                    project_paths.append(os.path.join(root, name).replace('\\', '/').lower())
+    for path in project_paths:
+        out_files['ProjectPaths'].write('{0};\n'.format(path))
+    
+    return
+
+
+def fixup_path(project_path, dependency_path):
+    """ Fix-up malformed dependency paths """
+    
+    trailing = dependency_path.replace('\\', '/')
+    if '../' in trailing:
+        if trailing[:3] == '../':  # windows
+            leading = project_path[:project_path.rfind('/')]
+            while trailing[:3] == '../':
+                leading = leading[:leading.rfind('/')]
+                trailing = trailing[3:]
+            trailing = trailing.lower()
+            trailing = '{0}/{1}'.format(leading, trailing)
+        else:  # unix
+            print '..processing unix-style path fix-up'
+            while '../' in trailing:
+                backout = trailing.find('../')
+                backdir = trailing.rfind('/', 0, backout - 1)
+                trailing = trailing.replace(trailing[backdir:backout + 2], '', 1)
+            trailing = trailing.lower()
+    else:
+        trailing = trailing.lower()
+    
+    return trailing
+
+
+def parse_project_files():
+    """ Parse each vcxproj file's xml data """
+    
+    for key1 in project_paths:
+        with open(key1, 'r') as vcxproj_file:
+            project_dependencies[key1] = {}
+            xml_tree = ElementTree.ElementTree(file=vcxproj_file)
+            for element1 in xml_tree.getroot():
+                if not element1.tag[-19:] == 'ItemDefinitionGroup':
+                    continue
+                # add '.split('|')[0]' to remove the '|Win##' attribute
+                key2 = element1.attrib['Condition'].split('==')[1][1:-1]
+                project_dependencies[key1][key2] = {}
+                for element2 in element1.getiterator():
+                    if element2.tag[-9:] == 'ClCompile':
+                        key3 = element2.tag[-9:]
+                        project_dependencies[key1][key2][key3] = {}
+                        for element3 in element2.getiterator():
+                            if element3.tag[-28:] == 'AdditionalIncludeDirectories':
+                                key4 = element3.tag[-28:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+                    elif element2.tag[-15:] == 'ResourceCompile':
+                        key3 = element2.tag[-15:]
+                        project_dependencies[key1][key2][key3] = {}
+                        for element3 in element2.getiterator():
+                            if element3.tag[-28:] == 'AdditionalIncludeDirectories':
+                                key4 = element3.tag[-28:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+                    elif element2.tag[-4:] == 'Midl':
+                        key3 = element2.tag[-4:]
+                        project_dependencies[key1][key2][key3] = {}
+                        for element3 in element2.getiterator():
+                            if element3.tag[-28:] == 'AdditionalIncludeDirectories':
+                                key4 = element3.tag[-28:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+                    elif element2.tag[-4:] == 'Link':
+                        key3 = element2.tag[-4:]
+                        project_dependencies[key1][key2][key3] = {}
+                        for element3 in element2.getiterator():
+                            if element3.tag[-22:] == 'AdditionalDependencies':
+                                key4 = element3.tag[-22:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+                            if element3.tag[-28:] == 'AdditionalLibraryDirectories':
+                                key4 = element3.tag[-28:]
+                                project_dependencies[key1][key2][key3][key4] = []
+                                paths = element3.text.split(';')
+                                for path in paths:
+                                    project_dependencies[key1][key2][key3][key4].append(fixup_path(key1, path))
+        vcxproj_file.close()
+    
+    return
+
+
+def build_master_dependencies():
+    """ Build master dependencies list """
+    
+    def write(message):
+        """ internal 'ProjectDependencies' write method - performed here so processing takes place after fix-up """
+        
+        out_files['ProjectDependencies'].write('{0}\n'.format(message))
+        
+        return
+    
+    for key1 in project_dependencies:
+        write('{0}<Project Path="{1}">'.format(col1, key1))
+        for key2 in project_dependencies[key1]:
+            write('{0}<Build Type="{1}">'.format(col2, key2))
+            for key3 in project_dependencies[key1][key2]:
+                write('{0}<Resource Type="{1}">'.format(col3, key3))
+                for key4 in project_dependencies[key1][key2][key3]:
+                    write('{0}<Reference Type="{1}">'.format(col4, key4))
+                    for path in project_dependencies[key1][key2][key3][key4]:
+                        write('{0}{1}'.format(col4, path))
+                        if path not in master_dependencies:
+                            master_dependencies.append(path)
+                    write('{0}</Reference>'.format(col4))
+                write('{0}</Resource>'.format(col3))
+            write('{0}</Build>'.format(col2))
+        write('{0}</Project>'.format(col1))
+    master_dependencies.sort()
+    for path in master_dependencies:
+        out_files['MasterDependencies'].write('{0}\n'.format(path))
+    
+    return
+
+
+def check_for_version_discrepancies():
+    """ Check for dependency version discrepancies """
+    
+    def twrite(message):
+        """ internal 'ContextTree' write method """
+        
+        out_files['ContextTree'].write('{0}\n'.format(message))
+        
+        return
+    
+    def rwrite(message):
+        """ internal 'DiscrepancyReport' write method """
+        
+        out_files['DiscrepancyReport'].write('{0}\n'.format(message))
+        
+        return
+    
+    libraries = [
+        'mysql',
+        'zlib',
+        'perl',
+        'lua',
+        'boost',
+        'sodium',
+        'openssl'
+    ]
+    references = [
+        'include',
+        'source',
+        'library'
+    ]
+    priorities = {
+        0: 'NOT FOUND',
+        1: 'install',
+        2: 'dependencies',
+        3: 'libs',
+        4: 'vcpkg',
+        5: 'static',
+        6: 'submodule'
+    }
+    # use all lowercase for path description
+    # use forward slash ('/') for directory name separators
+    # use '|' token for multiple hints ('my_file_path_1|my_file_path_2')
+    # use '!!' token for explicit argument ('/perl/core!!' will find '../perl/core' but not '../perl/core/perl512.lib')
+    # use '##' token for joined hints ('my_file_##_1')
+    # use '&&', '^' and '@' tokens for multiple argument hints ('my_file_&&path_1^path_2^path_3@')
+    # (i.e., 'my_file_path_1|my_file_##_2|my_##_##&&_3^_4!!@')
+    # {[library]:{[reference]:[[priority]:hint]}}
+    hints = {
+        # Notes:
+        'mysql': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/dependencies/mysql_##/include',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                'dependencies/mysql_##/lib',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'zlib': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/zlib_x##/include',  # 'dependencies'
+                # not sure if this should be '/libs/zlibng' or '/build/libs/zlibng' based on cmake behavior
+                '/server/build/libs/zlibng!!',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '/server/build/libs/zlibng!!',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '/server/libs/zlibng!!',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/zlib_x##/lib/zdll.lib',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/&&lib/zlib.lib!!'
+                '^debug/lib/zlibd.lib!!@',  # 'vcpkg'
+                '/server/build/libs/zlibng/&&debug/zlibstaticd.lib!!^minsizerel/zlibstatic.lib!!'
+                '^release/zlibstatic.lib!!^relwithdebinfo/zlibstatic.lib!!@',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'perl': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '/perl/lib/core!!',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '/perl/lib/core/perl51##.lib',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'lua': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/luaj_x##/src',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/luaj_x##/src',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/luaj_x##/bin/lua51.lib',  # 'dependencies'
+                '',  # 'libs'
+                # debug lua package likely incorrect..should be 'lua51d.lib' - or whatever debug version is
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/&&lib/lua51.lib!!'
+                '^debug/lib/lua51.lib!!@',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'boost': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/boost',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/boost',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/lib!!',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'sodium': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/libsodium/include',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/libsodium/##/dynamic/libsodium.lib',  # 'dependencies'
+                '',  # 'libs'
+                # debug libsodium package likely incorrect..should be 'libsodiumd.lib' - or whatever debug version is
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/&&lib/libsodium.lib!!^'
+                'debug/lib/libsodium.lib!!@',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        },
+        'openssl': {
+            'include': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/openssl_x##/include',  # 'dependencies'
+                '',  # 'libs'
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/include',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'source': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '',  # 'dependencies'
+                '',  # 'libs'
+                '',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ],
+            'library': [
+                '',  # 'NOT FOUND'
+                '',  # 'install'
+                '/server/dependencies/openssl_x##/lib/VC/&&libeay32MD.lib!!^libeay32MDd.lib!!^'
+                     'ssleay32MD.lib!!^ssleay32MDd.lib!!@',  # 'dependencies'
+                '',  # 'libs'
+                # debug openssl package likely incorrect..should be
+                # 'libeay32d.lib' and 'ssleay32d.lib' - or whatever debug versions are
+                '/server/vcpkg/vcpkg-export-##/installed/x##-windows/&&lib/libeay32.lib!!^'
+                     'lib/ssleay32.lib!!^debug/lib/libeay32.lib!!^debug/lib/ssleay32.lib!!@',  # 'vcpkg'
+                '',  # 'static'
+                ''  # 'submodule'
+            ]
+        }
+    }
+    # {[project]:{[build]:{[resource]:{[library]:{[reference]:priority}}}}}
+    context_tree = {}
+    # {[library]:priority}
+    global_priorities = {}
+    # {[build]:{[library]:priority}}
+    build_priorities = {}
+    # loop for discovering first occurence dependency sources (assumes same search precedence as compiler includes)
+    for project in project_dependencies:
+        if project not in context_tree.keys():
+            context_tree[project] = {}
+        for build in project_dependencies[project]:
+            if build not in context_tree[project].keys():
+                context_tree[project][build] = {}
+            if build not in build_priorities.keys():
+                build_priorities[build] = {}
+            for resource in project_dependencies[project][build]:
+                if resource not in context_tree[project][build].keys():
+                    context_tree[project][build][resource] = {}
+                for reference_project in project_dependencies[project][build][resource]:
+                    for path in project_dependencies[project][build][resource][reference_project]:
+                        for library in libraries:
+                            if library not in context_tree[project][build][resource].keys():
+                                context_tree[project][build][resource][library] = {}
+                            if library not in build_priorities[build].keys():
+                                build_priorities[build][library] = 0
+                            if library not in global_priorities.keys():
+                                global_priorities[library] = 0
+                            for reference in references:
+                                if reference not in context_tree[project][build][resource][library].keys():
+                                    context_tree[project][build][resource][library][reference] = 0
+                                elif not context_tree[project][build][resource][library][reference] == 0:
+                                    continue
+                                for priority in priorities:
+                                    if hints[library][reference][priority] == '':
+                                        continue
+                                    hint_found = False
+                                    for hint in hints[library][reference][priority].split('|'):
+                                        if not find_hint_in_path(hint, path) == -1:
+                                            context_tree[project][build][resource][library][reference] = priority
+                                            if context_tree[project][build][resource][library][reference] >\
+                                                    build_priorities[build][library]:
+                                                build_priorities[build][library] =\
+                                                    context_tree[project][build][resource][library][reference]
+                                            if context_tree[project][build][resource][library][reference] >\
+                                                    global_priorities[library]:
+                                                global_priorities[library] =\
+                                                    context_tree[project][build][resource][library][reference]
+                                            hint_found = True
+                                            break
+                                    if hint_found is True:
+                                        break
+    # loop for hack to fix odd behavior caused by 'FindZLIB.cmake' - ref: '../server/build/libs/zlibng/zconf.h'
+    # this does not change anything in the build files..only silences a false discrepancy due to mixing priority types
+    if global_priorities['zlib'] == 5:
+        for project in context_tree:
+            for build in context_tree[project]:
+                for resource in context_tree[project][build]:
+                    if context_tree[project][build][resource]['zlib']['source'] == 3:
+                        context_tree[project][build][resource]['zlib']['source'] = 5
+                    if context_tree[project][build][resource]['zlib']['include'] == 3:
+                        context_tree[project][build][resource]['zlib']['include'] = 5
+    # loop for dumping 'global_priorities'
+    twrite('{0}<Global>'.format(col1))
+    for library in libraries:
+        twrite('{0}<Library Name="{1}">{2}</Library>'.format(col2, library, global_priorities[library]))
+    twrite('{0}</Global>'.format(col1))
+    twrite('')
+    # loop for dumping 'build_priorities'
+    for build in build_priorities:
+        twrite('{0}<Build Type="{1}">'.format(col1, build))
+        for library in libraries:
+            twrite('{0}<Library Name="{1}">{2}</Library>'.format(col2, library, build_priorities[build][library]))
+        twrite('{0}</Build>'.format(col1))
+    twrite('')
+    # loop for dumping 'context_tree'
+    for project in context_tree:
+        twrite('{0}<Project Path="{1}">'.format(col1, project))
+        for build in context_tree[project]:
+            twrite('{0}<Built Type="{1}">'.format(col2, build))
+            for resource in context_tree[project][build]:
+                twrite('{0}<Resource Name="{1}">'.format(col3, resource))
+                for library in context_tree[project][build][resource]:
+                    twrite('{0}<Library Name="{1}">'.format(col4, library))
+                    for reference in context_tree[project][build][resource][library]:
+                        twrite(
+                            '{0}<Reference Name="{1}">{2}</Reference>'.format(
+                                col5,
+                                reference,
+                                context_tree[project][build][resource][library][reference]
+                            )
+                        )
+                    twrite('{0}</Library>'.format(col4))
+                twrite('{0}</Resource>'.format(col3))
+            twrite('{0}</Build>'.format(col2))
+        twrite('{0}</Project>'.format(col1))
+    if QUIET_REPORT is False:
+        for library in libraries:
+            rwrite(
+                '> Global Library \'{0}\' status: \'{1}\' ({2})'.format(
+                    library,
+                    priorities[global_priorities[library]],
+                    global_priorities[library]
+                )
+            )
+    # loop for identifying dependency discrepancies
+    for project in context_tree:
+        for build in context_tree[project]:
+            for resource in context_tree[project][build]:
+                for library in context_tree[project][build][resource]:
+                    if global_priorities[library] == 0:
+                        if QUIET_REPORT is False:
+                            rwrite(
+                                '> No Global Library \'{0}\' .. skipping Project:Build:Resource'
+                                ' "{1}":"{2}":"{3}"'.format(
+                                    library,
+                                    project,
+                                    build,
+                                    resource
+                                )
+                            )
+                        continue
+                    if build_priorities[build][library] == 0:
+                        if QUIET_REPORT is False:
+                            rwrite(
+                                '> No Build Library \'{0}\' .. skipping Project:Build:Resource'
+                                ' "{1}":"{2}":"{3}"'.format(
+                                    library,
+                                    project,
+                                    build,
+                                    resource
+                                )
+                            )
+                        continue
+                    for reference in context_tree[project][build][resource][library]:
+                        if context_tree[project][build][resource][library][reference] == 0:
+                            continue
+                        if not global_priorities[library] == context_tree[project][build][resource][library][reference]:
+                            rwrite(
+                                '> Global-Project Library \'{0}\' mis-match \'{1}!={2}\''
+                                ' ({3}!={4}) Project:Build:Resource "{5}":"{6}":"{7}"'.format(
+                                    library,
+                                    priorities[global_priorities[library]],
+                                    priorities[context_tree[project][build][resource][library][reference]],
+                                    global_priorities[library],
+                                    context_tree[project][build][resource][library][reference],
+                                    project,
+                                    build,
+                                    resource
+                                )
+                            )
+                        # 'builds' are allowed to have different dependencies..so, we'll start crossing at 'resource'
+                        for cross_resource in context_tree[project][build]:
+                            for cross_reference in context_tree[project][build][cross_resource][library]:
+                                if cross_resource == resource and cross_reference == reference:
+                                    continue
+                                if context_tree[project][build][cross_resource][library][cross_reference] == 0:
+                                    continue
+                                if QUIET_REPORT is False and\
+                                        not context_tree[project][build][cross_resource][library][cross_reference] ==\
+                                        context_tree[project][build][resource][library][reference]:
+                                    rwrite(
+                                        '> Project Library \'{0}\' mis-match \'{1}:{2}:{3}!={4}:{5}:{6}\''
+                                        ' ({7}!={8}) Project:Build "{9}":"{10}"'.format(
+                                            library,
+                                            resource,
+                                            reference,
+                                            priorities[context_tree[project][build][resource][library][reference]],
+                                            cross_resource,
+                                            cross_reference,
+                                            priorities[context_tree[project][build][cross_resource][library]
+                                                       [cross_reference]],
+                                            context_tree[project][build][resource][library][reference],
+                                            context_tree[project][build][cross_resource][library][cross_reference],
+                                            project,
+                                            build
+                                        )
+                                    )
+    
+    return
+
+
+def find_hint_in_path(hint, path):
+    """
+    Helper function for parsing and checking for hints in paths
+    
+    Hints strings should be split ('|') and passed as a singular hint into this function
+    
+    """
+    
+    if hint == '' or path == '':
+        return -1
+    
+    joined_index = hint.find('##')
+    pretext_index = hint.find('&&')
+    if joined_index == -1 and pretext_index == -1:
+        if '^' in hint or '@' in hint:
+            print '..malformed or improper handling of hint: \'{0}\' path: \'{1}\''.format(hint, path)
+            
+            return -1
+        
+        explicit_index = hint.find('!!')
+        if explicit_index == -1:
+            return path.find(hint)
+        
+        else:
+            explicit_hint = hint[:explicit_index]
+            found_index = path.find(explicit_hint)
+            if (len(explicit_hint) + found_index) == len(path):
+                return found_index
+        
+            else:
+                return -1
+    
+    elif (not joined_index == -1 and pretext_index == -1) or\
+            (not joined_index == -1 and not pretext_index == -1 and joined_index < pretext_index):
+        start_index = 0
+        for partial_hint in hint.split('##', 1):
+            if partial_hint == '':
+                continue
+            found_index = find_hint_in_path(partial_hint, path[start_index:])
+            if found_index == -1:
+                return found_index
+            
+            start_index = found_index + len(partial_hint)
+        
+        return start_index
+    
+    elif (joined_index == -1 and not pretext_index == -1) or\
+            (not joined_index == -1 and not pretext_index == -1 and joined_index > pretext_index):
+        pretext_hints = hint.split('&&', 1)
+        found_index = 0
+        if not pretext_hints[0] == '':
+            found_index = find_hint_in_path(pretext_hints[0], path)
+            if found_index == -1:
+                return found_index
+        
+        start_index = found_index + len(pretext_hints[0])
+        partial_hints = pretext_hints[1].split('@', 1)
+        for partial_hint in partial_hints:
+            if partial_hint == '':
+                continue
+            for alt_hint in partial_hint.split('^'):
+                if alt_hint == '':
+                    continue
+                found_index = find_hint_in_path(alt_hint, path[start_index:])
+                if found_index == 0:
+                    if not partial_hints[1] == '':
+                        print '..unhandled hint method: \'{0}\''.format(partial_hints[1])
+                    else:
+                        return found_index
+        
+        return -1
+        
+    else:
+        return -1
+
+
+def close_output_files():
+    """ Close all output files """
+    
+    while not len(out_files) == 0:
+        key = out_files.keys()[0]
+        out_files[key].close()
+        del out_files[key]
+    
+    return
+
+
+if __name__ == '__main__':
+    main()
diff --git a/utils/sql/character_table_list.txt b/utils/sql/character_table_list.txt
index 8a47abf67..ab6610dab 100644
--- a/utils/sql/character_table_list.txt
+++ b/utils/sql/character_table_list.txt
@@ -1,9 +1,15 @@
+account
+account_ip
+account_flags
+account_rewards
+adventure_details
 adventure_stats
+buyer
 char_recipe_list
-character_auras
 character_activities
 character_alt_currency
 character_alternate_abilities
+character_auras
 character_bandolier
 character_bind
 character_buffs
@@ -20,15 +26,22 @@ character_leadership_abilities
 character_material
 character_memmed_spells
 character_pet_buffs
+character_pet_info
 character_pet_inventory
 character_potionbelt
 character_skills
 character_spells
+character_tasks
 character_tribute
 completed_tasks
+data_buckets
 faction_values
 friends
+guild_bank
 guild_members
+guild_ranks
+guild_relations
+guilds
 instance_list_player
 inventory
 inventory_snapshots
@@ -36,6 +49,9 @@ keyring
 mail
 player_titlesets
 quest_globals
+sharedbank
 timers
 titles
-zone_flags
+trader
+trader_audit
+zone_flags"
\ No newline at end of file
diff --git a/utils/sql/db_update_manifest.txt b/utils/sql/db_update_manifest.txt
index 92bcfd260..aa7897e7f 100644
--- a/utils/sql/db_update_manifest.txt
+++ b/utils/sql/db_update_manifest.txt
@@ -393,8 +393,13 @@
 9137|2018_12_12_client_faction_tables.sql|SHOW TABLES LIKE 'faction_base_data'|empty|
 9138|2018_12_12_convert_to_client_functions.sql|SELECT `id` FROM `faction_list` WHERE `id` > 4999|empty|
 9139|2019_03_25_optional_npc_model.sql|SHOW COLUMNS FROM `npc_types` LIKE 'model'|empty|
-9140|2019_07_03_update_range.sql|SHOW COLUMNS FROM `npc_types` LIKE 'max_movement_update_range'|empty|
+9140|2019_07_03_update_range.sql|SHOW COLUMNS FROM `zone` LIKE 'max_movement_update_range'|empty|
 9141|2019_07_10_npc_flymode.sql|SHOW COLUMNS FROM `npc_types` LIKE 'flymode'|empty|
+9142|2019_09_02_required_spawn_filter.sql|SHOW COLUMNS FROM `spawnentry` LIKE 'condition_value_filter'|empty|
+9143|2019_09_16_account_table_changes.sql|SHOW COLUMNS FROM `account` LIKE 'ls_id'|empty|
+9144|2019_11_09_logsys_description_update.sql|SELECT * FROM db_version WHERE version >= 9143|empty|
+9145|2019_12_24_banned_ips_update.sql|SHOW TABLES LIKE 'Banned_IPs'|not_empty|
+9146|2020_01_10_character_soft_deletes.sql|SHOW COLUMNS FROM `character_data` LIKE 'deleted_at'|empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not
diff --git a/utils/sql/git/bots/bots_db_update_manifest.txt b/utils/sql/git/bots/bots_db_update_manifest.txt
index 982200f2a..1e18516b7 100644
--- a/utils/sql/git/bots/bots_db_update_manifest.txt
+++ b/utils/sql/git/bots/bots_db_update_manifest.txt
@@ -21,8 +21,10 @@
 9020|2018_08_13_bots_inventory_update.sql|SELECT * FROM `inventory_versions` WHERE `version` = 2 and `bot_step` = 0|not_empty|
 9021|2018_10_09_bots_owner_options.sql|SHOW TABLES LIKE 'bot_owner_options'|empty|
 9022|2019_02_07_bots_stance_type_update.sql|SELECT * FROM `bot_spell_casting_chances` WHERE `spell_type_index` = '255' AND `class_id` = '255' AND `stance_index` = '0'|not_empty|
-9023|2019_06_22_bots_owner_option_stats_update.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'stats_update'|empty|
+9023|2019_06_22_bots_owner_option_stats_update.sql|SELECT * FROM db_version WHERE bots_version >= 9023|empty|
 9024|2019_06_27_bots_pet_get_lost.sql|SELECT `bot_command` FROM `bot_command_settings` WHERE `bot_command` LIKE 'petgetlost'|empty|
+9025|2019_08_26_bots_owner_option_spawn_message.sql|SELECT * FROM db_version WHERE bots_version >= 9025|empty|
+9026|2019_09_09_bots_owner_options_rework.sql|SHOW COLUMNS FROM `bot_owner_options` LIKE 'option_type'|empty|
 
 # Upgrade conditions:
 # 	This won't be needed after this system is implemented, but it is used database that are not
diff --git a/utils/sql/git/bots/required/2019_08_26_bots_owner_option_spawn_message.sql b/utils/sql/git/bots/required/2019_08_26_bots_owner_option_spawn_message.sql
new file mode 100644
index 000000000..04910cd10
--- /dev/null
+++ b/utils/sql/git/bots/required/2019_08_26_bots_owner_option_spawn_message.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `bot_owner_options` ADD COLUMN `spawn_message_enabled` SMALLINT(3) UNSIGNED NULL DEFAULT '1' AFTER `stats_update`;
+ALTER TABLE `bot_owner_options` ADD COLUMN `spawn_message_type` SMALLINT(3) UNSIGNED NULL DEFAULT '1' AFTER `spawn_message_enabled`;
diff --git a/utils/sql/git/bots/required/2019_09_09_bots_owner_options_rework.sql b/utils/sql/git/bots/required/2019_09_09_bots_owner_options_rework.sql
new file mode 100644
index 000000000..6240e9366
--- /dev/null
+++ b/utils/sql/git/bots/required/2019_09_09_bots_owner_options_rework.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS `bot_owner_options`;
+
+CREATE TABLE `bot_owner_options` (
+	`owner_id` INT(11) UNSIGNED NOT NULL,
+	`option_type` SMALLINT(3) UNSIGNED NOT NULL,
+	`option_value` SMALLINT(3) UNSIGNED NULL DEFAULT '0',
+	PRIMARY KEY (`owner_id`, `option_type`)
+)
+COLLATE='latin1_swedish_ci'
+ENGINE=InnoDB;
diff --git a/utils/sql/git/optional/2017_12_25_LoginServer.sql b/utils/sql/git/optional/2017_12_25_LoginServer.sql
new file mode 100644
index 000000000..3853e5c21
--- /dev/null
+++ b/utils/sql/git/optional/2017_12_25_LoginServer.sql
@@ -0,0 +1,21 @@
+ALTER TABLE `tblloginserveraccounts`
+	ADD COLUMN `AccountLoginserver` VARCHAR(64) NULL AFTER `LastIPAddress`;
+	
+ALTER TABLE `tblloginserveraccounts`
+	CHANGE COLUMN `AccountLoginserver` `AccountLoginserver` VARCHAR(64) NOT NULL DEFAULT 'eqemu' AFTER `LoginServerID`,
+	DROP PRIMARY KEY,
+	ADD PRIMARY KEY (`LoginServerID`, `AccountLoginserver`);
+	
+ALTER TABLE `tblloginserveraccounts`
+	ADD UNIQUE INDEX `AccountLoginserver_AccountName` (`AccountLoginserver`, `AccountName`);
+	
+ALTER TABLE `tblloginserveraccounts`
+	ALTER `LoginServerID` DROP DEFAULT;
+ALTER TABLE `tblloginserveraccounts`
+	CHANGE COLUMN `LoginServerID` `LoginServerID` INT(10) UNSIGNED NOT NULL FIRST;
+	
+ALTER TABLE `tblloginserveraccounts`
+	ALTER `AccountPassword` DROP DEFAULT;
+ALTER TABLE `tblloginserveraccounts`
+	CHANGE COLUMN `AccountPassword` `AccountPassword` TEXT NOT NULL AFTER `AccountName`;
+	
\ No newline at end of file
diff --git a/utils/sql/git/required/2015_02_02_logsys_packet_logs_with_dump.sql b/utils/sql/git/required/2015_02_02_logsys_packet_logs_with_dump.sql
index 7da9af532..d0d4e78c8 100644
--- a/utils/sql/git/required/2015_02_02_logsys_packet_logs_with_dump.sql
+++ b/utils/sql/git/required/2015_02_02_logsys_packet_logs_with_dump.sql
@@ -1,2 +1,2 @@
 REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('41', 'Packet: Server -> Client With Dump'); 
-REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('42', 'Packet: Server -> Client With Dump'); 
\ No newline at end of file
+REPLACE INTO `logsys_categories` (`log_category_id`, `log_category_description`) VALUES ('42', 'Packet: Client -> Server With Dump'); 
diff --git a/utils/sql/git/required/2019_09_02_required_spawn_filter.sql b/utils/sql/git/required/2019_09_02_required_spawn_filter.sql
new file mode 100644
index 000000000..d89cdfa4a
--- /dev/null
+++ b/utils/sql/git/required/2019_09_02_required_spawn_filter.sql
@@ -0,0 +1 @@
+ALTER TABLE `spawnentry` ADD COLUMN `condition_value_filter` MEDIUMINT(9) NOT NULL DEFAULT '1' AFTER `chance`;
diff --git a/utils/sql/git/required/2019_09_16_account_table_changes.sql b/utils/sql/git/required/2019_09_16_account_table_changes.sql
new file mode 100644
index 000000000..e4393d29d
--- /dev/null
+++ b/utils/sql/git/required/2019_09_16_account_table_changes.sql
@@ -0,0 +1,11 @@
+ALTER TABLE `account`
+	DROP INDEX `name`,
+	DROP INDEX `lsaccount_id`;
+	
+ALTER TABLE `account`
+	ADD COLUMN `ls_id` VARCHAR(64) NULL DEFAULT 'eqemu' AFTER `status`;
+	
+ALTER TABLE `account`
+	ADD UNIQUE INDEX `name_ls_id` (`name`, `ls_id`),
+	ADD UNIQUE INDEX `ls_id_lsaccount_id` (`ls_id`, `lsaccount_id`);
+	
\ No newline at end of file
diff --git a/utils/sql/git/required/2019_11_09_logsys_description_update.sql b/utils/sql/git/required/2019_11_09_logsys_description_update.sql
new file mode 100644
index 000000000..df6c50ce2
--- /dev/null
+++ b/utils/sql/git/required/2019_11_09_logsys_description_update.sql
@@ -0,0 +1,11 @@
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Client -> Server' WHERE `log_category_id` = '5';
+UPDATE `logsys_categories` SET `log_category_description` = 'QS Server' WHERE `log_category_id` = '19';
+UPDATE `logsys_categories` SET `log_category_description` = 'TCP Connection' WHERE `log_category_id` = '26';
+UPDATE `logsys_categories` SET `log_category_description` = 'UCS Server' WHERE `log_category_id` = '31';
+UPDATE `logsys_categories` SET `log_category_description` = 'WebInterface Server' WHERE `log_category_id` = '32';
+UPDATE `logsys_categories` SET `log_category_description` = 'World Server' WHERE `log_category_id` = '33';
+UPDATE `logsys_categories` SET `log_category_description` = 'MySQL Query' WHERE `log_category_id` = '36';
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Server -> Client' WHERE `log_category_id` = '39';
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Client -> Server Unhandled' WHERE `log_category_id` = '40';
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Server -> Client (Dump)' WHERE `log_category_id` = '41';
+UPDATE `logsys_categories` SET `log_category_description` = 'Packet :: Client -> Server (Dump)' WHERE `log_category_id` = '42';
diff --git a/utils/sql/git/required/2019_12_24_banned_ips_update.sql b/utils/sql/git/required/2019_12_24_banned_ips_update.sql
new file mode 100644
index 000000000..b05bd682b
--- /dev/null
+++ b/utils/sql/git/required/2019_12_24_banned_ips_update.sql
@@ -0,0 +1,5 @@
+RENAME TABLE `Banned_IPs` TO `Banned_IPs_`;
+
+CREATE TABLE `banned_ips` (PRIMARY KEY (`ip_address`)) SELECT `ip_address`, `notes` FROM `Banned_IPs_`;
+
+DROP TABLE IF EXISTS `Banned_IPs_`;
diff --git a/utils/sql/git/required/2020_01_10_character_soft_deletes.sql b/utils/sql/git/required/2020_01_10_character_soft_deletes.sql
new file mode 100644
index 000000000..17496b141
--- /dev/null
+++ b/utils/sql/git/required/2020_01_10_character_soft_deletes.sql
@@ -0,0 +1 @@
+ALTER TABLE `character_data` ADD COLUMN `deleted_at` datetime NULL DEFAULT NULL;
\ No newline at end of file
diff --git a/utils/sql/user_tables.txt b/utils/sql/user_tables.txt
index 9806395e8..ee19fe472 100644
--- a/utils/sql/user_tables.txt
+++ b/utils/sql/user_tables.txt
@@ -6,7 +6,7 @@ account_rewards
 adventure_details
 adventure_members
 adventure_stats
-Banned_IPs
+banned_ips
 bugs
 buyer
 char_recipe_list
diff --git a/wi/.gitignore b/wi/.gitignore
deleted file mode 100644
index b449f1759..000000000
--- a/wi/.gitignore
+++ /dev/null
@@ -1,47 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
-# nyc test coverage
-.nyc_output
-
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
-node_modules
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
diff --git a/wi/BUILD.md b/wi/BUILD.md
deleted file mode 100644
index a3fa9a989..000000000
--- a/wi/BUILD.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Building EQEmu Web Interface Reference Implementation
-
-## Required Software
-- [NodeJS](https://nodejs.org)
-
-## Install
-
-First: Make sure you have required software installed.
-
-Install 3rd Party Libraries first with the following command:
-	npm install
-
-	
-## Run
-
-Run with either your favorite NodeJS process manager or with the following command:
-	node .
\ No newline at end of file
diff --git a/wi/core/jwt_auth.js b/wi/core/jwt_auth.js
deleted file mode 100644
index f63f22346..000000000
--- a/wi/core/jwt_auth.js
+++ /dev/null
@@ -1,27 +0,0 @@
-const jwt = require('jsonwebtoken');
-
-var Auth = function (req, res, next) {
-	var token = '';
-	try {
-		token = req.headers.authorization.substring(7);
-	} catch(ex) {
-		console.log(ex);
-		res.sendStatus(401);
-		return;
-	}
-
-	jwt.verify(token, req.key, function(err, decoded) {
-		if(err) {
-			console.log(err);
-			res.sendStatus(401);
-			return;
-		}
-		
-		req.token = decoded;
-		next();
-	});
-};
-
-module.exports = {
-	'auth': Auth
-}
diff --git a/wi/generate_pw_hash.js b/wi/generate_pw_hash.js
deleted file mode 100644
index 6648e48c3..000000000
--- a/wi/generate_pw_hash.js
+++ /dev/null
@@ -1,4 +0,0 @@
-var sodium = require('libsodium-wrappers-sumo');
-
-var hash = sodium.crypto_pwhash_str('password', 3, 32768);
-console.log(hash);
\ No newline at end of file
diff --git a/wi/http/common.js b/wi/http/common.js
deleted file mode 100644
index c049520e9..000000000
--- a/wi/http/common.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var auth = require('../core/jwt_auth.js').auth;
-
-function RegisterFunction(path, fn, app, api) {
-	app.post(path, auth, function (req, res) {
-		var params = req.body.params || [];
-	
-		api.Call(fn, params)
-			.then(function(value) {
-				res.send({ response: value });
-			})
-			.catch(function(reason) {			
-				if(reason.message) {
-					res.send({ status: reason.message });
-				}
-				else if(reason === 'Not connected to world server.') {
-					res.send({ status: 'ENCONNECTED' });
-				} else {
-					res.sendStatus(500);
-				}
-			});
-	});
-}
-
-module.exports = {
-	'Register': RegisterFunction
-}
\ No newline at end of file
diff --git a/wi/http/data/account.js b/wi/http/data/account.js
deleted file mode 100644
index 29cf1e2f8..000000000
--- a/wi/http/data/account.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var endpoint = require('./endpoint.js');
-var auth = require('../../core/jwt_auth.js').auth;
-var sql = require('./sql.js');
-
-var RegisterAPI = function(app, api) {
-	endpoint.Register(app, api, 'account', 'account', 'id');
-	
-	//Can register custom controller actions here.
-	app.post('/api/data/account/search', auth, function (req, res) {
-		sql.Search(req, res, 'account', 'id', ['id', 'name']);
-	});
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}
\ No newline at end of file
diff --git a/wi/http/data/endpoint.js b/wi/http/data/endpoint.js
deleted file mode 100644
index 574ea56ec..000000000
--- a/wi/http/data/endpoint.js
+++ /dev/null
@@ -1,20 +0,0 @@
-var auth = require('../../core/jwt_auth.js').auth;
-var sql = require('./sql.js');
-
-var RegisterEndpoint = function(app, api, endpoint_verb, table_name, pkey) {
-	app.get('/api/data/' + endpoint_verb + '/:' + pkey, auth, function (req, res) {		
-		sql.Retrieve(req, res, table_name, pkey);
-	});
-	
-	app.put('/api/data/' + endpoint_verb + '/:' + pkey, auth, function (req, res) {
-		sql.CreateUpdate(req, res, table_name, pkey);
-	});
-	
-	app.delete('/api/data/' + endpoint_verb + '/:' + pkey, auth, function (req, res) {
-		sql.Delete(req, res, table_name, pkey);
-	});
-};
-
-module.exports = {
-	'Register': RegisterEndpoint
-}
diff --git a/wi/http/data/index.js b/wi/http/data/index.js
deleted file mode 100644
index b9bd6bc0e..000000000
--- a/wi/http/data/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-var RegisterAPI = function(app, api) {
-	require('./account.js').Register(app, api);
-	require('./item.js').Register(app, api);
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}
\ No newline at end of file
diff --git a/wi/http/data/item.js b/wi/http/data/item.js
deleted file mode 100644
index f88d80bfa..000000000
--- a/wi/http/data/item.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var endpoint = require('./endpoint.js');
-var auth = require('../../core/jwt_auth.js').auth;
-var sql = require('./sql.js');
-
-var RegisterAPI = function(app, api) {
-	endpoint.Register(app, api, 'item', 'items', 'id');
-	
-	//Can register custom controller actions here.
-	app.post('/api/data/item/search', auth, function (req, res) {
-		sql.Search(req, res, 'items', 'id', ['id', 'name', 'icon']);
-	});
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}
\ No newline at end of file
diff --git a/wi/http/data/sql.js b/wi/http/data/sql.js
deleted file mode 100644
index 22416f3ba..000000000
--- a/wi/http/data/sql.js
+++ /dev/null
@@ -1,319 +0,0 @@
-var moment = require('moment');
-
-function CreateReplace(table, body, fields) {
-	try {
-		var query = 'REPLACE INTO ' + table + ' VALUES(';
-		var first = true;
-		var args = [];
-		
-		for(var idx in fields) {
-			if(first) {
-				first = false;
-			} else {
-				query += ',';
-			}
-			
-			query += '?';
-		
-			var entry = fields[idx];
-			if(entry.type === 12) {
-				try {
-					var d = new moment(body[entry.name]);
-					
-					if(d.isValid()) {
-						args.push(d.format('YYYY-MM-DD HH:mm:ss'));
-					} else {
-						args.push(null);
-					}
-				} catch(ex) {
-					args.push(null);
-				}
-			} else {
-				args.push(body[entry.name]);
-			}
-		}
-		
-		query += ')';
-		
-		return { 'query': query, 'args': args };
-	} catch(ex) {
-		return { 'query': '', 'args': [] };
-	}
-}
-
-function CreateUpdate(req, res, table, pkey) {
-	req.mysql.getConnection(function(err, connection) {
-		try {
-			if(err) {
-				console.log(err);
-				connection.release();
-				res.sendStatus(500);
-				return;
-			}
-			
-			if(req.body[pkey] !== parseInt(req.params[pkey], 10)) {
-				connection.release();
-				res.sendStatus(400);
-				return;
-			}
-			
-			connection.query('SELECT * FROM ' + table + ' WHERE ' + pkey + '=? LIMIT 1', [req.params[pkey]], function (error, results, fields) {
-				try {
-					if(error) {
-						console.log(error);
-						connection.release();
-						res.sendStatus(400);
-						return;
-					}
-					
-					var replace = CreateReplace(table, req.body, fields);
-					if(replace.query === '') {
-						connection.release();
-						res.sendStatus(400);
-						return;
-					}
-					
-					connection.query(replace.query, replace.args, function(error, results, fields) {
-						try {
-							if(error) {
-								console.log(error);
-								connection.release();
-								res.sendStatus(400);
-								return;
-							}
-							
-							connection.release();
-							res.sendStatus(200);
-						} catch(ex) {
-							console.log(ex);
-							connection.release();
-							res.sendStatus(500);
-						}
-					});
-				} catch(ex) {
-					console.log(ex);
-					connection.release();
-					res.sendStatus(500);
-				}
-			});
-		} catch(ex) {
-			console.log(ex);
-			connection.release();
-			res.sendStatus(500);
-		}
-	});
-}
-
-function Retrieve(req, res, table, pkey) {
-	req.mysql.getConnection(function(err, connection) {
-		try {
-			if(err) {
-				console.log(err);
-				connection.release();
-				res.sendStatus(500);
-				return;
-			}
-			
-			connection.query('SELECT * FROM ' + table + ' WHERE ' + pkey + '=? LIMIT 1', [req.params[pkey]], function (error, results, fields) {
-				try {
-					if(results.length == 0) {
-						connection.release();
-						res.sendStatus(404);
-						return;
-					}
-					
-					var result = results[0];
-					var ret = { };
-					
-					for(var idx in result) {
-						var value = result[idx];
-						ret[idx] = value;
-					}
-					
-					connection.release();
-					res.json(ret);
-				} catch(ex) {
-					console.log(ex);
-					connection.release();
-					res.sendStatus(500);
-				}
-			});
-		} catch(ex) {
-			console.log(ex);
-			connection.release();
-			res.sendStatus(500);
-		}
-	});
-}
-
-function Delete(req, res, table, pkey) {
-	req.mysql.getConnection(function(err, connection) {
-		try {
-			if(err) {
-				console.log(err);
-				connection.release();
-				res.sendStatus(500);
-				return;
-			}
-						
-			connection.query('DELETE FROM ' + table + ' WHERE ' + pkey + '=? LIMIT 1', [req.params[pkey]], function (error, results, fields) {
-				try {
-					if(error) {
-						console.log(error);
-						connection.release();
-						res.sendStatus(400);
-						return;
-					}
-					
-					connection.release();
-					res.sendStatus(200);
-				} catch(ex) {
-					console.log(ex);
-					connection.release();
-					res.sendStatus(500);
-				}
-			});
-		} catch(ex) {
-			console.log(ex);
-			connection.release();
-			res.sendStatus(500);
-		}
-	});
-}
-
-function getLimit(req, columns) {
-	var limit = '';
-	
-	var len = parseInt(req.body['length']);
-	if(len > 100) {
-		len = 100;
-	}
-	
-	if(req.body.hasOwnProperty('start') && len != -1) {
-		limit = 'LIMIT ' + req.body['start'] + ', ' + req.body['length'];
-	}
-	
-	return limit;
-}
-
-function getOrder(req, columns) {
-	var order = '';
-	
-	if (req.body.hasOwnProperty('order') && req.body['order'].length) {
-		var orderBy = [];
-		for(var i = 0; i < req.body['order'].length; ++i) {
-			var columnIdx = parseInt(req.body['order'][i].column);
-			var column = req.body['columns'][columnIdx];
-			var columnId = column.data;
-			var dir = req.body['order'][i].dir === 'asc' ? 'ASC' : 'DESC';			
-			orderBy.push(req.mysql.escapeId(columnId) + ' ' + dir);
-		}
-		
-		order = 'ORDER BY ' + orderBy.join(',');
-	}
-	
-	return order;
-}
-
-function filter(req, columns, args) {
-	var where = '';
-	var globalSearch = [];
-	var columnSearch = [];
-	
-	if (req.body.hasOwnProperty('search') && req.body['search'].value.length) {
-		var searchTerm = req.body['search'].value;
-		for(var i = 0; i < req.body['columns'].length; ++i) {
-			var column = req.body['columns'][i];
-			
-			if(column.searchable) {
-				globalSearch.push(req.mysql.escapeId(column.data) + ' LIKE ?');
-				args.push('%' + searchTerm + '%');
-			}
-		}
-	}
-	
-	for(var i = 0; i < req.body['columns'].length; ++i) {
-		var column = req.body['columns'][i];
-		var searchTerm = column.search.value;
-		
-		if(searchTerm !== '' && column.searchable) {
-			columnSearch.push(req.mysql.escapeId(column.data) + ' LIKE ?');
-			args.push('%' + searchTerm + '%');
-		}
-	}
-	
-	if(globalSearch.length) {
-		where = globalSearch.join(' OR ');
-	}
-	
-	if(columnSearch.length) {
-		if(where === '') {
-			where = columnSearch.join(' AND ');
-		} else {
-			where += ' AND ';
-			where += columnSearch.join(' AND ');
-		}
-	}
-	
-	if(where !== '') {
-		where = 'WHERE ' + where;
-	}
-	
-	return where;
-}
-
-function Search(req, res, table, pkey, columns) {
-	var args = [];
-	var limit = getLimit(req, columns);
-	var order = getOrder(req, columns);
-	var where = filter(req, columns, args);
-
-	var query = 'SELECT ' + columns.join(', ') + ' FROM ' + table + ' ' + where + ' ' + order + ' ' + limit;
-	
-	req.mysql.getConnection(function(err, connection) {
-		try {
-			if(err) {
-				console.log(err);
-				connection.release();
-				res.sendStatus(500);
-				return;
-			}
-			
-			connection.query(query, args, function (error, results, fields) {
-				try {
-					var ret = [];
-					
-					for(var i in results) {
-						var result = results[i];
-						
-						var obj = { };
-						for(var idx in result) {
-							var value = result[idx];
-							obj[idx] = value;
-						}
-						
-						ret.push(obj);
-					}
-					
-					connection.release();
-					res.json(ret);
-				} catch(ex) {
-					console.log(ex);
-					connection.release();
-					res.sendStatus(500);
-				}
-			});
-		} catch(ex) {
-			console.log(ex);
-			connection.release();
-			res.sendStatus(500);
-		}
-	});
-};
-
-module.exports = {
-	'CreateUpdate': CreateUpdate,
-	'Retrieve': Retrieve,
-	'Delete': Delete,
-	'Search': Search,
-}
\ No newline at end of file
diff --git a/wi/http/eqw.js b/wi/http/eqw.js
deleted file mode 100644
index 9a72e6114..000000000
--- a/wi/http/eqw.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const common = require('./common.js');
-
-var RegisterEQW = function(app, api) {
-	common.Register('/api/eqw/getconfig', 'EQW::GetConfig', app, api);
-	common.Register('/api/eqw/islocked', 'EQW::IsLocked', app, api);
-	common.Register('/api/eqw/lock', 'EQW::Lock', app, api);
-	common.Register('/api/eqw/unlock', 'EQW::Unlock', app, api);
-	common.Register('/api/eqw/getplayercount', 'EQW::GetPlayerCount', app, api);
-	common.Register('/api/eqw/getzonecount', 'EQW::GetZoneCount', app, api);
-	common.Register('/api/eqw/getlaunchercount', 'EQW::GetLauncherCount', app, api);
-	common.Register('/api/eqw/getloginservercount', 'EQW::GetLoginServerCount', app, api);
-};
-
-module.exports = {
-	'Register': RegisterEQW
-}
diff --git a/wi/http/index.js b/wi/http/index.js
deleted file mode 100644
index 46e2f6d71..000000000
--- a/wi/http/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-var RegisterAPI = function(app, api) {
-	require('./eqw.js').Register(app, api);
-	require('./token.js').Register(app);
-	require('./data').Register(app, api);
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}
\ No newline at end of file
diff --git a/wi/http/token.js b/wi/http/token.js
deleted file mode 100644
index a3815121f..000000000
--- a/wi/http/token.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const sodium = require('libsodium-wrappers-sumo');
-const jwt = require('jsonwebtoken');
-
-var RegisterToken = function(app) {
-	app.post('/api/token', function (req, res) {
-		try {
-			req.mysql.getConnection(function(err, connection) {
-				if(err) {
-					console.log(err);
-					res.sendStatus(500);
-					connection.release();
-					return;
-				}
-				
-				connection.query('SELECT password FROM account WHERE name = ? LIMIT 1', [req.body.username], function (error, results, fields) {
-					if(results.length == 0) {
-						res.sendStatus(401);
-						connection.release();
-						return;
-					}
-					
-					
-					if(sodium.crypto_pwhash_str_verify(results[0].password, req.body.password)) {
-						var expires = Math.floor(Date.now() / 1000) + (60 * 60 * 24 * 7);
-						var token = jwt.sign({ username: req.body.username, exp: expires }, req.key);
-						res.send({token: token, expires: expires});
-						connection.release();
-					} else {
-						res.sendStatus(401);
-						connection.release();
-					}
-				});
-			});
-		} catch(ex) {
-			res.sendStatus(500);
-			console.log(ex);
-		}
-	});
-};
-
-module.exports = {
-	'Register': RegisterToken
-}
\ No newline at end of file
diff --git a/wi/index.js b/wi/index.js
deleted file mode 100644
index 822592b8d..000000000
--- a/wi/index.js
+++ /dev/null
@@ -1,56 +0,0 @@
-const fs = require('fs');
-const settings = JSON.parse(fs.readFileSync('settings.json', 'utf8'));
-const key = fs.readFileSync(settings.key, 'utf8');
-
-var server;
-if(settings.https.enabled) {
-	const options = {
-		key: fs.readFileSync(settings.https.key),
-		cert: fs.readFileSync(settings.https.cert)
-	};
-
-	server = require('https').createServer();
-} else {
-	server = require('http').createServer();
-}
-
-const servertalk = require('./network/servertalk_api.js');
-const websocket_iterface = require('./ws/ws_interface.js');
-const express = require('express');
-const app = express();
-const bodyParser = require('body-parser');
-const uuid = require('node-uuid');
-const jwt = require('jsonwebtoken');
-var mysql = require('mysql').createPool(settings.db);
-
-var api = new servertalk.api();
-var wsi = new websocket_iterface.wsi(server, key, api);
-api.Init(settings.servertalk.addr, settings.servertalk.port, false, settings.servertalk.key);
-
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: true }));
-
-app.use(function(req, res, next) {
-	res.header("Access-Control-Allow-Origin", "*");
-	res.header("Access-Control-Allow-Methods", "GET,HEAD,OPTIONS,POST,PUT");
-	res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, Authorization");
-	next();
-});
-
-//make sure all routes can see our injected dependencies
-app.use(function (req, res, next) {
-	req.servertalk = api;
-	req.mysql = mysql;
-	req.key = key;
-	next();
-});
-
-app.get('/', function (req, res) {
-	res.send({ status: "online" });
-});
-
-require('./http').Register(app, api);
-require('./ws').Register(wsi, api);
-
-server.on('request', app);
-server.listen(settings.port, function () { console.log('Listening on ' + server.address().port) });
diff --git a/wi/key.pem b/wi/key.pem
deleted file mode 100644
index 1f0cbdc91..000000000
--- a/wi/key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAoijNhaW4sH2yLEQOUCNLSU0qIGnr9mxewEPXSNURKFExC1WE
-ah983xy+WTbKjakH6Rp2OwCvLxNIu6QBKRgcJ963ICWY7ysn4bU2Q2KoSJgAEel8
-UMDHWYfyyAPdr4DUwUw7YMf4LBThCGBC5DTPilZiVqQNyOf8KL5w/oKcavVMddod
-eBNE1ewoxVveHN6WUDkYQKZK2AsrpNG6TjfJc3wI3Z722tRHui4E772l/sD0SuEj
-41pBzOG0VM7DHwUpHQosnvnwx9kjefPNE/uvo14PuzP5yYG2h2PFkQ7uuXjK2/le
-iVcyap/zgheOHjlYmOJGT1cnVSodv+rY56eilwIDAQABAoIBAQAM/sAZqcI3Qpt4
-uKt8+Jcb9Lcfid2DDgQ53DXwfEK3vGn1wpCuAH/9UUxf0ehBmf4sTBaVe+SOHTmC
-8A23wVrgRxTd2qV65TZ4/BCxLcLWrney98cioZBYOHDYXpbxbZ2fMADCLMRSpAm0
-piI2L5VCPNH8p4EDTLQEf96GRulKGOWETeVNai3C7Ept6Fxv0YIiiER8j2oPsb1O
-LVCBKBPsNs0IlabJAzfDnaqdfWzuLWIT0L4w/qvzfwkdM8tVxch2zjEVosbz4ser
-rPO3tle3mobgDvXrW9jEYkIpOtEqCS7l4ybidVuEfY55KlkZ7rGBQ2N1jbLvKjb5
-AUyHUBchAoGBAOKjzzBPB/mofycF8iF1QJwripGTDUGM7aXBS0Clp4mh0ksvBsUf
-Zg+Qnzr2xZaN53lU65xQlMrebMJow4iJj71VesF9FWPPNbIhh7eMTX4pABcKZNvc
-Y0iFf5XZAl3LFdDocQSuB3j5WLNrjSFMBZuYUiZhgiRadtcdpQr+O4lbAoGBALcq
-ltbFogxXoo7/CIajbYdNUGbba96jQMOzC1D7yeim1MTtDNGs56ZhDjFZepMRMyfX
-/Z7iqxjZQQ1m1THtuiM4g+ug08EYI8G/7DYO5DqMABGFb3vKU9ilhYASqfznpKMJ
-2sl/d5j8ocS7crkKwR8Tbo3ZG8NgObQNTL+mIFR1AoGAJS66zzIoHM2IDt7q2pJi
-Bz0dfsShaB+23XrY3cJPukTSO4N7mNuN4v/XH9VclVayozVLclnGD4JuVXbanYv0
-CRv9B8F9wOI97PuTSIm8LPaNDTqnUWrW3w8H34261ah768o2wI3MrAw8gTMj9FKE
-mQJkd+eHcm9lD+XNLgCHxAECgYBiMQ2t00L89NnraKLscp4b44GPsl9QehoVD12o
-q2JhO1Ziv2WY3eVNV0hhgkNopdbTrEGFNKRebNEn2xG9c2DO0tQ9s/jw0f0RN87s
-Z+1HyZebzPmn1h4+zPUVZGwGbTPgRz8nuBKoS/541bg5pJ9FBojEuDfe9C3a7SpQ
-r0EzpQKBgBmYrKi07wTUSZ3TjHWvOK75XhJ5pOdfbuDZk+N02jzhmihzI2M/Sh7s
-l1gavtY9o9JGUAW35L/Ju4X1Xgm3t5Cg9+4n6ecOfSKP9nJpgj1EvHyWvw9t8ZSg
-V9M0Hf5EoSPWuEj+mlWrIuvV/HgkouUVqDzUm6wUuyTqdTCgUQrA
------END RSA PRIVATE KEY-----
diff --git a/wi/network/servertalk_api.js b/wi/network/servertalk_api.js
deleted file mode 100644
index be4220edf..000000000
--- a/wi/network/servertalk_api.js
+++ /dev/null
@@ -1,148 +0,0 @@
-const servertalk = require('./servertalk_client.js');
-const uuid = require('node-uuid');
-
-class ServertalkAPI
-{
-	Init(addr, port, ipv6, credentials) {
-		this.client = new servertalk.client();
-		this.client.Init(addr, port, ipv6, 'WebInterface', credentials);
-		this.pending_calls = {};
-		this.subscriptions = {};
-		var self = this;
-		
-		this.client.on('connecting', function() {
-			//console.log('Connecting...');
-		});
-		
-		this.client.on('connect', function(){
-			//console.log('Connected');
-		});
-		
-		this.client.on('close', function(){
-			//console.log('Closed');
-		});
-
-		this.client.on('error', function(err){
-		});
-
-		this.client.on('message', function(opcode, packet) {
-			if(opcode == 47) {
-				var response = Buffer.from(packet).toString('utf8');
-				try {
-					var res = JSON.parse(response);
-					
-					if(res.id) {
-						if(self.pending_calls.hasOwnProperty(res.id)) {
-							var entry = self.pending_calls[res.id];
-							
-							if(res.error) {
-								var reject = entry[1];
-								reject(res.error);
-							} else {
-								var resolve = entry[0];
-								resolve(res.response);
-							}
-							
-							delete self.pending_calls[res.id];
-						}
-					}
-				} catch(ex) {
-					console.log('Error processing response from server:\n', ex);
-				}
-			} else if(opcode == 104) {
-				var message = Buffer.from(packet).toString('utf8');
-				try {
-					var msg = JSON.parse(message);
-					
-					if(msg.event) {
-						if(self.subscriptions.hasOwnProperty(msg.event)) {
-							var subs = self.subscriptions[msg.event];
-						
-							for(var idx in subs) {
-								try {
-									var sub = subs[idx];
-									sub.emit('subscriptionMessage', msg);
-								} catch(ex) {
-									console.log('Error dispatching subscription message', ex);
-								}
-							}
-						}
-					}
-				} catch(ex) {
-					console.log('Error processing response from server:\n', ex);
-				}
-			}
-		});
-	}
-	
-	Call(method, args, timeout) {
-		if(!timeout) {
-			timeout = 15000
-		}
-		
-		var self = this;
-		return new Promise(
-			function(resolve, reject) {
-				if(!self.client.Connected()) {
-					reject('Not connected to world server.');
-					return;
-				}
-				
-				var id = uuid.v4();
-				
-				self.pending_calls[id] = [resolve, reject];
-				
-				var c = { id: id, method: method, params: args };
-				self.client.Send(47, Buffer.from(JSON.stringify(c)));
-				
-				setTimeout(function() {
-					delete self.pending_calls[id];
-					reject('Request timed out after ' + timeout + 'ms');
-				}, timeout);
-			}
-		);
-	}
-	
-	Notify(method, args) {
-		var c = { method: method, params: args };
-		client.Send(47, Buffer.from(JSON.stringify(c)));
-	}
-	
-	Subscribe(event_id, who) {
-		this.Unsubscribe(event_id, who);
-		
-		var subs = this.subscriptions[event_id];
-		if(subs) {
-			//console.log('Subscribe', who.uuid, 'to', event_id);
-			subs[who.uuid] = who;
-		} else {
-			//console.log('Subscribe', who.uuid, 'to', event_id);
-			this.subscriptions[event_id] = { };
-			this.subscriptions[event_id][who.uuid] = who;
-			//Tell our server we have a subscription for event_id
-		}
-	}
-	
-	Unsubscribe(event_id, who) {
-		var subs = this.subscriptions[event_id];
-		if(subs) {
-			//console.log('Unsubscribe', who.uuid, 'from', event_id);
-			delete subs[who.uuid];
-			
-			if(Object.keys(subs).length === 0) {
-				delete this.subscriptions[event_id];
-				//Tell our server we no longer have a subscription for event_id
-			}
-		}
-	}
-	
-	UnsubscribeAll(who) {
-		for(var sub_idx in this.subscriptions) {
-			this.Unsubscribe(sub_idx, who);
-		}
-	}
-}
-
-module.exports = {
-	'api': ServertalkAPI
-}
\ No newline at end of file
diff --git a/wi/network/servertalk_client.js b/wi/network/servertalk_client.js
deleted file mode 100644
index 4197a1aa4..000000000
--- a/wi/network/servertalk_client.js
+++ /dev/null
@@ -1,299 +0,0 @@
-var net = require('net');
-var sodium = require('libsodium-wrappers');
-const EventEmitter = require('events');
-
-var ServertalkPacketType =
-{
-	ServertalkClientHello: 1,
-	ServertalkServerHello: 2,
-	ServertalkClientHandshake: 3,
-	ServertalkClientDowngradeSecurityHandshake: 4,
-	ServertalkMessage: 5,
-};
-
-class ServertalkClient extends EventEmitter
-{
-	Init(addr, port, ipv6, identifier, credentials) {
-		this.m_addr = addr;
-		this.m_identifier = identifier;
-		this.m_credentials = credentials;
-		this.m_connecting = false;
-		this.m_port = port;
-		this.m_ipv6 = ipv6;
-		this.m_encrypted = false;
-		this.m_connection = null;
-		this.m_buffer = Buffer.alloc(0);
-		this.m_public_key_ours = null;
-		this.m_private_key_ours = null;
-		this.m_nonce_ours = null;
-		this.m_public_key_theirs = null;
-		this.m_nonce_theirs = null;
-		this.m_shared_key = null;
-		
-		var self = this;
-		setInterval(function() { self.Connect(); }, 100);		
-	}
-	
-	Send(opcode, p) {
-		try {
-			var out;
-			if(this.m_encrypted) {
-				if(p.length == 0) {
-					p = Buffer.alloc(1);
-				}
-				
-				out = Buffer.alloc(6);
-				out.writeUInt32LE(p.length + sodium.crypto_secretbox_MACBYTES, 0);
-				out.writeUInt16LE(opcode, 4);
-				
-				var cipher = sodium.crypto_box_easy_afternm(p, this.m_nonce_ours, this.m_shared_key);
-				this.IncrementUint64(this.m_nonce_ours);
-				
-				out = Buffer.concat([out, Buffer.from(cipher)], out.length + cipher.length);
-			} else {
-				out = Buffer.alloc(6);
-				out.writeUInt32LE(p.length, 0);
-				out.writeUInt16LE(opcode, 4);
-				out = Buffer.concat([out, p], out.length + p.length);
-			}
-			
-			this.InternalSend(ServertalkPacketType.ServertalkMessage, out);
-		} catch(ex) {
-			this.emit('error', new Error(ex));
-		}
-	}
-	
-	Connected() {
-		return this.m_connection && !this.m_connecting;
-	}
-	
-	Connect() {
-		if (this.m_port == 0 || this.m_connection || this.m_connecting) {
-			return;
-		}
-		
-		this.m_connecting = true;
-		
-		this.emit('connecting');
-		
-		var self = this;
-		this.m_connection = net.connect({port: this.m_port, host: this.m_addr}, function() {			
-			self.m_connection.on('close', function(had_error) {
-				self.emit('close');
-				self.m_connection = null;
-				self.m_encrypted = false;
-			});
-			
-			self.m_connection.on('data', function(buffer) {
-				self.ProcessData(buffer);
-			});
-			
-			self.SendHello();
-			self.m_connecting = false;
-		});
-		
-		this.m_connection.on('error', function() {
-			self.emit('close');
-			self.m_connection = null;
-			self.m_connecting = false;
-		});
-	}
-	
-	ProcessData(buffer) {
-		this.m_buffer = Buffer.concat([this.m_buffer, buffer], this.m_buffer.length + buffer.length);
-		this.ProcessReadBuffer();
-	}
-	
-	SendHello() {
-		var p = Buffer.alloc(0);
-		this.InternalSend(ServertalkPacketType.ServertalkClientHello, p);
-	}
-	
-	InternalSend(type, p) {
-		if(!this.m_connection) {
-			return;
-		}
-		
-		var out = Buffer.alloc(5);
-		out.writeUInt32LE(p.length, 0);
-		out.writeUInt8(type, 4);
-		
-		if (p.length > 0) {
-			out = Buffer.concat([out, p], out.length + p.length);
-		}
-		
-		this.m_connection.write(out);
-	}
-	
-	ProcessReadBuffer() {
-		var current = 0;
-		var total = this.m_buffer.length;
-		
-		while (current < total) {
-			var left = total - current;
-			
-			var length = 0;
-			var type = 0;
-			if (left < 5) {
-				break;
-			}
-			
-			length = this.m_buffer.readUInt32LE(current);
-			type = this.m_buffer.readUInt8(current + 4);
-			
-			if (current + 5 + length > total) {
-				break;
-			}
-			
-			if (length == 0) {
-				var p = Buffer.alloc(0);
-				switch (type) {
-				case ServertalkPacketType.ServertalkServerHello:
-					this.ProcessHello(p);
-					break;
-				case ServertalkPacketType.ServertalkMessage:
-					this.ProcessMessage(p);
-					break;
-				}
-			}
-			else {
-				var p = this.m_buffer.slice(current + 5, current + 5 + length);
-				switch (type) {
-				case ServertalkPacketType.ServertalkServerHello:
-					this.ProcessHello(p);
-					break;
-				case ServertalkPacketType.ServertalkMessage:
-					this.ProcessMessage(p);
-					break;
-				}
-			}
-	
-			current += length + 5;
-		}
-		
-		if (current == total) {
-			this.m_buffer = Buffer.alloc(0);
-		}
-		else {
-			this.m_buffer = this.m_buffer.slice(current);
-		}
-	}
-	
-	ProcessHello(p) {
-		this.m_encrypted = false;
-		this.m_public_key_ours = null;
-		this.m_public_key_theirs = null;
-		this.m_private_key_ours = null;
-		this.m_nonce_ours = null;
-		this.m_nonce_theirs = null;
-		this.m_shared_key = null;
-		
-		try {
-			var enc = p.readUInt8(0) == 1 ? true : false;
-			if (enc) {
-				if (p.length == (1 + sodium.crypto_box_PUBLICKEYBYTES + sodium.crypto_box_NONCEBYTES)) {
-					this.m_public_key_theirs = p.slice(1, 1 + sodium.crypto_box_PUBLICKEYBYTES);
-					this.m_nonce_theirs = p.slice(1 + sodium.crypto_box_PUBLICKEYBYTES, 1 + sodium.crypto_box_PUBLICKEYBYTES + sodium.crypto_box_NONCEBYTES);
-					this.m_encrypted = true;
-					this.SendHandshake(false);
-					
-					this.emit('connect');
-				}
-				else {
-					this.emit('error', new Error('Could not process hello, size !=', 1 + sodium.crypto_box_PUBLICKEYBYTES + sodium.crypto_box_NONCEBYTES));
-				}
-			} else {
-				this.SendHandshake(false);
-				
-				this.emit('connect');
-			}
-		} catch(ex) {
-			this.emit('error', new Error(ex));
-		}
-	}
-	
-	ProcessMessage(p) {
-		try {
-			var length = p.readUInt32LE(0);
-			var opcode = p.readUInt16LE(4);
-			if(length > 0) {
-				var data = p.slice(6);
-				
-				if(this.m_encrypted) {
-					var message_len = length - sodium.crypto_secretbox_MACBYTES;
-
-					var decrypted = sodium.crypto_box_open_easy_afternm(data, this.m_nonce_theirs, this.m_shared_key);
-
-					this.IncrementUint64(this.m_nonce_theirs);
-					
-					this.emit('message', opcode, decrypted);
-				} else {
-					this.emit('message', opcode, data);
-				}
-			} else {
-				this.emit('message', opcode, Buffer.alloc(0));
-			}
-		} catch(ex) {
-			this.emit('error', new Error(ex));
-		}
-	}
-	
-	SendHandshake() {
-		var handshake;
-		
-		if(this.m_encrypted) {
-			var keypair = sodium.crypto_box_keypair();	
-			this.m_public_key_ours = keypair.publicKey;
-			this.m_private_key_ours = keypair.privateKey;
-			this.m_nonce_ours = Buffer.from(sodium.randombytes_buf(sodium.crypto_box_NONCEBYTES));
-			this.m_shared_key = sodium.crypto_box_beforenm(this.m_public_key_theirs, this.m_private_key_ours);
-			
-			this.m_public_key_theirs = null;
-			this.m_private_key_ours = null;
-					
-			var message = Buffer.alloc(this.m_identifier.length + this.m_credentials.length + 2);
-			message.write(this.m_identifier, 0);
-			message.write(this.m_credentials, this.m_identifier.length + 1);
-			
-			var ciphertext = sodium.crypto_box_easy_afternm(message, this.m_nonce_ours, this.m_shared_key);
-			
-			handshake = Buffer.concat([Buffer.from(this.m_public_key_ours), Buffer.from(this.m_nonce_ours), Buffer.from(ciphertext)], sodium.crypto_box_PUBLICKEYBYTES + sodium.crypto_box_NONCEBYTES + ciphertext.length);		
-			this.IncrementUint64(this.m_nonce_ours);
-			
-			this.m_public_key_ours = null;
-		} else {
-			handshake = Buffer.alloc(this.m_identifier.length + this.m_credentials.length + 2);
-			handshake.write(this.m_identifier, 0);
-			handshake.write(this.m_credentials, this.m_identifier.length() + 1);
-		}
-
-		this.InternalSend(ServertalkPacketType.ServertalkClientHandshake, handshake);
-	}
-	
-	IncrementUint64(value) {	
-		var bytes = [];
-		for(var i = 0; i < 8; ++i) {
-			bytes[i] = value[i];
-		}
-				
-		bytes[0] += 1;
-		for(i = 0; i < 7; ++i) {
-			if(bytes[i] >= 0x100) {
-				bytes[0] = 0;
-				bytes[i + 1] += 1;
-			}
-		}
-		
-		if(bytes[7] >= 0x100) {
-			bytes[7] = 0;
-		}
-		
-		for(var i = 0; i < 8; ++i) {
-			value[i] = bytes[i];
-		}
-	}
-}
-
-module.exports = {
-	'client': ServertalkClient
-}
\ No newline at end of file
diff --git a/wi/package.json b/wi/package.json
deleted file mode 100644
index 43b9e9f98..000000000
--- a/wi/package.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "wi",
-  "version": "1.0.0",
-  "description": "Web interface connection for EQEmu",
-  "main": "index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "KimLS",
-  "license": "GPL-3.0",
-  "dependencies": {
-    "body-parser": "^1.15.2",
-    "express": "^4.14.0",
-    "hammerjs": "^2.0.8",
-    "jsonwebtoken": "^7.2.1",
-    "libsodium": "^0.4.8",
-    "libsodium-wrappers": "^0.4.8",
-    "libsodium-wrappers-sumo": "^0.4.8",
-    "moment": "^2.17.1",
-    "mysql": "^2.12.0",
-    "node-uuid": "^1.4.7",
-    "ws": "^1.1.1"
-  }
-}
diff --git a/wi/settings.json b/wi/settings.json
deleted file mode 100644
index de325ddde..000000000
--- a/wi/settings.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-	"db": {
-		"connectionLimit": 10,
-		"host": "localhost",
-		"user": "root",
-		"password": "blink",
-		"database": "eqdb"
-	},
-	"servertalk": {
-		"addr": "localhost",
-		"port": "9101",
-		"key": "ujwn2isnal1987scanb"
-	},
-	"https": {
-		"enabled": false,
-		"key": "key.pem",
-		"cert": "cert.pem"
-	},
-	"port": 9080,
-	"key": "key.pem"
-}
\ No newline at end of file
diff --git a/wi/test.js b/wi/test.js
deleted file mode 100644
index 0ede3b12c..000000000
--- a/wi/test.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const WebSocket = require('ws');
-const ws = new WebSocket('ws://localhost:9080');
-
-ws.on('open', function open() {
-	ws.send(JSON.stringify({authorization: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IktTcHJpdGUxIiwiZXhwIjoxNDg2MzI4MDI3LCJpYXQiOjE0ODU3MjMyMjd9.fJUeSQsxb5C13ICANox81YdE5yImkrVw-lRCP3O40-E', method: 'EQW::ZoneUpdate::Subscribe'}));
-	ws.send(JSON.stringify({authorization: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VybmFtZSI6IktTcHJpdGUxIiwiZXhwIjoxNDg2MzI4MDI3LCJpYXQiOjE0ODU3MjMyMjd9.fJUeSQsxb5C13ICANox81YdE5yImkrVw-lRCP3O40-E', method: 'EQW::ClientUpdate::Subscribe'}));
-});
-
-ws.on('message', function(data, flags) {
-	console.log(data);
-});
\ No newline at end of file
diff --git a/wi/ws/eqw.js b/wi/ws/eqw.js
deleted file mode 100644
index 81d5c22f4..000000000
--- a/wi/ws/eqw.js
+++ /dev/null
@@ -1,18 +0,0 @@
-const common = require('./wi_common.js');
-
-var RegisterEQW = function(wsi, api) {
-	common.Register('EQW::GetConfig', wsi, api);
-	common.Register('EQW::IsLocked', wsi, api);
-	common.Register('EQW::Lock', wsi, api);
-	common.Register('EQW::Unlock', wsi, api);
-	common.Register('EQW::GetPlayerCount', wsi, api);
-	common.Register('EQW::GetZoneCount', wsi, api);
-	common.Register('EQW::GetLauncherCount', wsi, api);
-	common.Register('EQW::GetLoginServerCount', wsi, api);
-	common.RegisterSubscription('EQW::ZoneUpdate', wsi, api);
-	common.RegisterSubscription('EQW::ClientUpdate', wsi, api);
-};
-
-module.exports = {
-	'Register': RegisterEQW
-}
\ No newline at end of file
diff --git a/wi/ws/index.js b/wi/ws/index.js
deleted file mode 100644
index 1d4f92a56..000000000
--- a/wi/ws/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-var RegisterAPI = function(wsi, api) {
-	require('./eqw.js').Register(wsi, api);
-};
-
-module.exports = {
-	'Register': RegisterAPI
-}
\ No newline at end of file
diff --git a/wi/ws/wi_common.js b/wi/ws/wi_common.js
deleted file mode 100644
index a2712783a..000000000
--- a/wi/ws/wi_common.js
+++ /dev/null
@@ -1,27 +0,0 @@
-function Register(name, wsi, api) {
-	wsi.Register(name, 
-		function(request) {
-			api.Call(name, request.params)
-				.then(function(value) {
-					wsi.Send(request, value);
-				})
-				.catch(function(reason) {
-					wsi.SendError(request, reason);
-				});
-		}, true);
-}
-
-function RegisterSubscription(event, wsi, api) {
-	wsi.Register(event + '::Subscribe', function(request) {
-		api.Subscribe(event, request.ws);
-	});
-	
-	wsi.Register(event + '::Unsubscribe', function(request) {
-		api.Unsubscribe(event, request.ws);
-	});
-}
-
-module.exports = {
-	'Register': Register,
-	'RegisterSubscription': RegisterSubscription
-}
diff --git a/wi/ws/ws_interface.js b/wi/ws/ws_interface.js
deleted file mode 100644
index ea60ca2fd..000000000
--- a/wi/ws/ws_interface.js
+++ /dev/null
@@ -1,118 +0,0 @@
-const WebSocketServer = require('ws').Server;
-const jwt = require('jsonwebtoken');
-const uuid = require('node-uuid');
-
-class WebSocketInterface
-{
-	constructor(server, key, api) {
-		this.wss = new WebSocketServer({ server: server });
-		this.methods = {};
-		var self = this;
-		
-		this.wss.on('connection', function connection(ws) {
-			self.ws = ws;
-			ws.uuid = uuid.v4();
-			ws.on('message', function incoming(message) {
-				try {
-					var request = JSON.parse(message);
-					request.ws = ws;
-					
-					if(request.method) {
-						var method = self.methods[request.method];
-						if(!method) {
-							self.SendError(request, 'Method not found: ' + request.method);
-							return;
-						}
-						
-						if(method.requires_auth) {
-							if(!request.authorization) {
-								self.SendError(request, 'Authorization Required');
-								return;
-							}
-							
-							jwt.verify(request.authorization, key, function(err, decoded) {
-								if(err) {
-									self.SendError(request, 'Authorization Required');
-									return;
-								}
-								
-								request.token = decoded;
-								method.fn(request);
-							});
-							
-							return;
-						}
-						
-						method.fn(request);
-						
-					} else {
-						self.SendError(request, 'No method supplied');
-					}
-					
-				} catch(ex) {
-					console.log('Error parsing message:', ex);
-					self.SendError(null, 'No method supplied');
-				}
-			});
-			
-			ws.on('close', function() {
-				api.UnsubscribeAll(ws);
-			});
-			
-			ws.on('subscriptionMessage', function(msg) {
-				self.SendRaw(msg);
-			});
-		});
-	}
-	
-	Register(method, fn, requires_auth) {
-		var entry = { fn: fn, requires_auth: requires_auth };
-		this.methods[method] = entry;
-	}
-	
-	SendError(request, msg) {
-		try {
-			if(this.ws) {
-				var error = {};
-				
-				if(request && request.id) {
-					error.id = request.id;
-				}
-				
-				error.error = msg;
-				this.ws.send(JSON.stringify(error));
-			}
-		} catch(ex) {
-			console.log(ex);
-		}
-	}
-	
-	Send(request, value) {
-		try {
-			if(this.ws) {
-				var response = {};
-				
-				if(request && request.id) {
-					response.id = response.id;
-				}
-				
-				response.response = value;
-				this.ws.send(JSON.stringify(response));
-			}
-		} catch(ex) {
-			console.log(ex);
-		}
-	}
-	
-	SendRaw(obj) {
-		try {
-			this.ws.send(JSON.stringify(obj));
-		} catch(ex) {
-			console.log(ex);
-		}
-	}
-}
-
-module.exports = {
-	'wsi': WebSocketInterface
-}
\ No newline at end of file
diff --git a/world/CMakeLists.txt b/world/CMakeLists.txt
index fa4b6ecc6..9906b0cfc 100644
--- a/world/CMakeLists.txt
+++ b/world/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(world_sources
 	adventure.cpp
@@ -14,7 +14,7 @@ SET(world_sources
 	lfplist.cpp
 	login_server.cpp
 	login_server_list.cpp
-	net.cpp
+	main.cpp
 	queryserv.cpp
 	ucs.cpp
 	web_interface.cpp
@@ -22,6 +22,7 @@ SET(world_sources
 	wguild_mgr.cpp
 	world_config.cpp
 	world_console_connection.cpp
+	world_server_command_handler.cpp
 	worlddb.cpp
 	zonelist.cpp
 	zoneserver.cpp
@@ -42,7 +43,6 @@ SET(world_headers
 	lfplist.h
 	login_server.h
 	login_server_list.h
-	net.h
 	queryserv.h
 	sof_char_create_data.h
 	ucs.h
@@ -52,6 +52,7 @@ SET(world_headers
 	world_config.h
 	world_console_connection.h
 	world_tcp_connection.h
+	world_server_command_handler.h
 	worlddb.h
 	zonelist.h
 	zoneserver.h
@@ -65,8 +66,4 @@ ADD_DEFINITIONS(-DWORLD)
 
 TARGET_LINK_LIBRARIES(world ${SERVER_LIBS})
 
-IF(EQEMU_BUILD_PERL)
-	TARGET_LINK_LIBRARIES(world ${PERL_LIBRARY})
-ENDIF()
-
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
diff --git a/world/adventure.cpp b/world/adventure.cpp
index c984fa831..3b784cd6e 100644
--- a/world/adventure.cpp
+++ b/world/adventure.cpp
@@ -122,7 +122,7 @@ bool Adventure::Process()
 		else if(status == AS_WaitingForPrimaryEndTime)
 		{
 			//Do partial failure: send a message to the clients that they can only get a certain amount of points.
-			SendAdventureMessage(13, "You failed to complete your adventure in time. Complete your adventure goal within 30 minutes to "
+			SendAdventureMessage(Chat::Red, "You failed to complete your adventure in time. Complete your adventure goal within 30 minutes to "
 				"receive a lesser reward. This adventure will end in 30 minutes and your party will be ejected from the dungeon.");
 			SetStatus(AS_WaitingForSecondaryEndTime);
 		}
@@ -287,7 +287,7 @@ void Adventure::Finished(AdventureWinStatus ws)
 		ClientListEntry *current = client_list.FindCharacter((*iter).c_str());
 		if(current)
 		{
-			if(current->Online() == CLE_Status_InZone)
+			if(current->Online() == CLE_Status::InZone)
 			{
 				//We can send our packets only.
 				auto pack =
diff --git a/world/adventure_manager.cpp b/world/adventure_manager.cpp
index 65e264a19..c3e70b7ed 100644
--- a/world/adventure_manager.cpp
+++ b/world/adventure_manager.cpp
@@ -2119,102 +2119,3 @@ void AdventureManager::Save()
 	}
 }
 
-void AdventureManager::Load()
-{
-	//disabled for now
-	return;
-
-	char *data = nullptr;
-	FILE *f = fopen("adventure_state.dat", "r");
-	if(f)
-	{
-		fseek(f, 0, SEEK_END);
-		long length = ftell(f);
-		if(length > 0)
-		{
-			data = new char[length];
-			fseek(f, 0, SEEK_SET);
-			fread(data, length, 1, f);
-		}
-		fclose(f);
-	}
-
-	if(data)
-	{
-		char *ptr = data;
-
-		int number_of_adventures = *((int*)ptr);
-		ptr += sizeof(int);
-
-		for(int i = 0; i < number_of_adventures; ++i)
-		{
-			int count = *((int*)ptr);
-			ptr += sizeof(int);
-
-			int a_count = *((int*)ptr);
-			ptr += sizeof(int);
-
-			int template_id = *((int*)ptr);
-			ptr += sizeof(int);
-
-			int status = *((int*)ptr);
-			ptr += sizeof(int);
-
-			int instance_id = *((int*)ptr);
-			ptr += sizeof(int);
-
-			int rem_time = *((int*)ptr);
-			ptr += sizeof(int);
-
-			int num_players = *((int*)ptr);
-			ptr += sizeof(int);
-
-			AdventureTemplate *t = GetAdventureTemplate(template_id);
-			if(t)
-			{
-				auto adv =
-				    new Adventure(t, count, a_count, (AdventureStatus)status, instance_id, rem_time);
-				for(int j = 0; j < num_players; ++j)
-				{
-					adv->AddPlayer((const char*)ptr, false);
-					ptr += strlen((const char*)ptr);
-					ptr += 1;
-				}
-				adventure_list.push_back(adv);
-			}
-			else
-			{
-				for(int j = 0; j < num_players; ++j)
-				{
-					ptr += strlen((const char*)ptr);
-					ptr += 1;
-				}
-			}
-		}
-
-		int number_of_finished = *((int*)ptr);
-		ptr += sizeof(int);
-
-		for(int k = 0; k < number_of_finished; ++k)
-		{
-			AdventureFinishEvent afe;
-			afe.win = *((bool*)ptr);
-			ptr += sizeof(bool);
-
-			afe.points = *((int*)ptr);
-			ptr += sizeof(int);
-
-			afe.theme = *((int*)ptr);
-			ptr += sizeof(int);
-
-			afe.name = (const char*)ptr;
-			ptr += strlen((const char*)ptr);
-			ptr += 1;
-
-			finished_list.push_back(afe);
-		}
-
-		safe_delete_array(data);
-	}
-}
-
diff --git a/world/adventure_manager.h b/world/adventure_manager.h
index 5c9a4e560..ae4bf950f 100644
--- a/world/adventure_manager.h
+++ b/world/adventure_manager.h
@@ -34,7 +34,6 @@ public:
 	void AddFinishedEvent(AdventureFinishEvent fe) { finished_list.push_back(fe); Save(); }
 	bool PopFinishedEvent(const char *name, AdventureFinishEvent &fe);
 	void Save();
-	void Load();
 
 	Adventure **GetFinishedAdventures(const char *player, int &count);
 	Adventure *GetActiveAdventure(const char *player);
diff --git a/world/client.cpp b/world/client.cpp
index bc044dae5..2d4b65e71 100644
--- a/world/client.cpp
+++ b/world/client.cpp
@@ -88,7 +88,6 @@ extern volatile bool UCSServerAvailable_;
 
 Client::Client(EQStreamInterface* ieqs)
 :	autobootup_timeout(RuleI(World, ZoneAutobootTimeoutMS)),
-	CLE_keepalive_timer(RuleI(World, ClientKeepaliveTimeoutMS)),
 	connect(1000),
 	eqs(ieqs)
 {
@@ -105,6 +104,7 @@ Client::Client(EQStreamInterface* ieqs)
 	char_name[0] = 0;
 	charid = 0;
 	zone_waiting_for_bootup = 0;
+	enter_world_triggered = false;
 	StartInTutorial = false;
 
 	m_ClientVersion = eqs->ClientVersion();
@@ -115,7 +115,7 @@ Client::Client(EQStreamInterface* ieqs)
 
 Client::~Client() {
 	if (RunLoops && cle && zone_id == 0)
-		cle->SetOnline(CLE_Status_Offline);
+		cle->SetOnline(CLE_Status::Offline);
 
 	numclients--;
 
@@ -158,7 +158,7 @@ void Client::SendEnterWorld(std::string name)
 			eqs->Close();
 			return;
 		} else {
-			Log(Logs::Detail, Logs::World_Server,"Telling client to continue session.");
+			LogInfo("Telling client to continue session");
 		}
 	}
 
@@ -185,7 +185,7 @@ void Client::SendExpansionInfo() {
 
 void Client::SendCharInfo() {
 	if (cle) {
-		cle->SetOnline(CLE_Status_CharSelect);
+		cle->SetOnline(CLE_Status::CharSelect);
 	}
 
 	if (m_ClientVersionBit & EQEmu::versions::maskRoFAndLater) {
@@ -204,7 +204,7 @@ void Client::SendCharInfo() {
 		QueuePacket(outapp);
 	}
 	else {
-		Log(Logs::General, Logs::World_Server, "[Error] Database did not return an OP_SendCharInfo packet for account %u", GetAccountID());
+		LogInfo("[Error] Database did not return an OP_SendCharInfo packet for account [{}]", GetAccountID());
 	}
 	safe_delete(outapp);
 }
@@ -394,74 +394,44 @@ void Client::SendPostEnterWorld() {
 	safe_delete(outapp);
 }
 
-bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app) {
+bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app)
+{
 	if (app->size != sizeof(LoginInfo_Struct)) {
 		return false;
 	}
 
-	LoginInfo_Struct *li=(LoginInfo_Struct *)app->pBuffer;
+	auto *login_info = (LoginInfo_Struct *) app->pBuffer;
 
 	// Quagmire - max len for name is 18, pass 15
-	char name[19] = {0};
+	char name[19]     = {0};
 	char password[16] = {0};
-	strn0cpy(name, (char*)li->login_info,18);
-	strn0cpy(password, (char*)&(li->login_info[strlen(name)+1]), 15);
+	strn0cpy(name, (char *) login_info->login_info, 18);
+	strn0cpy(password, (char *) &(login_info->login_info[strlen(name) + 1]), 15);
+
+	LogDebug("Receiving Login Info Packet from Client | name [{0}] password [{1}]", name, password);
 
 	if (strlen(password) <= 1) {
-		// TODO: Find out how to tell the client wrong username/password
-		Log(Logs::Detail, Logs::World_Server,"Login without a password");
+		LogInfo("Login without a password");
 		return false;
 	}
 
-	is_player_zoning=(li->zoning==1);
+	is_player_zoning = (login_info->zoning == 1);
 
-#ifdef IPBASED_AUTH_HACK
-	struct in_addr tmpip;
-	tmpip.s_addr = ip;
-#endif
-	uint32 id=0;
-	bool minilogin = loginserverlist.MiniLogin();
-	if(minilogin){
-		struct in_addr miniip;
-		miniip.s_addr = ip;
-		id = database.GetMiniLoginAccount(inet_ntoa(miniip));
-	}
-	else if(strncasecmp(name, "LS#", 3) == 0)
-		id=atoi(&name[3]);
-	else if(database.GetAccountIDByName(name)){
-		int16 status = 0;
-		uint32 lsid = 0;		
-		id = database.GetAccountIDByName(name, &status, &lsid);
-	}
-	else
-		id=atoi(name);
-	if (loginserverlist.Connected() == false && !is_player_zoning) {
-		Log(Logs::General, Logs::World_Server,"Error: Login server login while not connected to login server.");
+	uint32 id = std::stoi(name);
+	if (id == 0) {
+		LogWarning("Receiving Login Info Packet from Client | account_id is 0 - disconnecting");
 		return false;
 	}
-	if (((cle = client_list.CheckAuth(name, password)) || (cle = client_list.CheckAuth(id, password))))
-	{
-		if (cle->AccountID() == 0 || (!minilogin && cle->LSID()==0)) {
-			Log(Logs::General, Logs::World_Server,"ID is 0. Is this server connected to minilogin?");
-			if (!minilogin) {
-				Log(Logs::General, Logs::World_Server, "If so you forget the minilogin variable...");
-			}
-			else {
-				Log(Logs::General, Logs::World_Server, "Could not find a minilogin account, verify ip address logging into minilogin is the same that is in your account table.");
-			}
-			return false;
-		}
 
-		if(minilogin){
-			cle->SetOnline();
-			WorldConfig::DisableStats();
-			Log(Logs::General, Logs::World_Server, "MiniLogin Account #%d",cle->AccountID());
-		}
-		else if (!is_player_zoning) {
+	LogClientLogin("[HandleSendLoginInfoPacket] Checking Auth id [{}]", id);
+
+	if ((cle = client_list.CheckAuth(id, password))) {
+		LogClientLogin("[HandleSendLoginInfoPacket] Checking Auth id [{}] passed", id);
+		if (!is_player_zoning) {
 			// Track who is in and who is out of the game
 			char *inout= (char *) "";
 			
-			if (cle->GetOnline() == CLE_Status_Never){
+			if (cle->GetOnline() == CLE_Status::Never){
 				// Desktop -> Char Select
 				inout = (char *) "In";
 			}
@@ -469,24 +439,22 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app) {
 				// Game -> Char Select
 				inout=(char *) "Out";
 			}
-
+		
 			// Always at Char select at this point.
 			// Either from a fresh client launch or coming back from the game.
 			// Exiting the game entirely does not come through here.
 			// Could use a Logging Out Completely message somewhere.
-			cle->SetOnline(CLE_Status_CharSelect);
+			cle->SetOnline(CLE_Status::CharSelect);
 			
-			Log(Logs::General, Logs::World_Server, 
-				"Account (%s) Logging(%s) to character select :: LSID: %d ", 
-				cle->AccountName(), inout, cle->LSID());
+			LogInfo("Account ({}) Logging({}) to character select :: LSID [{}] ", cle->AccountName(), inout, cle->LSID());
 		}
 		else {
 			cle->SetOnline();
 		}
-
+		
 		const WorldConfig *Config=WorldConfig::get();
-
-		if(Config->UpdateStats){
+		
+		if(Config->UpdateStats) {
 			auto pack = new ServerPacket;
 			pack->opcode = ServerOP_LSPlayerJoinWorld;
 			pack->size = sizeof(ServerLSPlayerJoinWorld_Struct);
@@ -498,10 +466,10 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app) {
 			loginserverlist.SendPacket(pack);
 			safe_delete(pack);
 		}
-
+		
 		if (!is_player_zoning)
 			SendGuildList();
-
+		
 		SendLogServer();
 		SendApproveWorld();
 		SendEnterWorld(cle->name());
@@ -512,24 +480,19 @@ bool Client::HandleSendLoginInfoPacket(const EQApplicationPacket *app) {
 			database.LoginIP(cle->AccountID(), long2ip(GetIP()).c_str());
 		}
 
+		cle->SetIP(GetIP());
+		return true;
 	}
 	else {
-		// TODO: Find out how to tell the client wrong username/password
-		Log(Logs::Detail, Logs::World_Server,"Bad/Expired session key '%s'",name);
+		LogInfo("Bad/Expired session key [{}]", name);
 		return false;
 	}
-
-	if (!cle)
-		return true;
-
-	cle->SetIP(GetIP());
-	return true;
 }
 
 bool Client::HandleNameApprovalPacket(const EQApplicationPacket *app)
 {
 	if (GetAccountID() == 0) {
-		Log(Logs::Detail, Logs::World_Server,"Name approval request with no logged in account");
+		LogInfo("Name approval request with no logged in account");
 		return false;
 	}
 
@@ -537,7 +500,7 @@ bool Client::HandleNameApprovalPacket(const EQApplicationPacket *app)
 	uchar race = app->pBuffer[64];
 	uchar clas = app->pBuffer[68];
 
-	Log(Logs::Detail, Logs::World_Server, "Name approval request. Name=%s, race=%s, class=%s", char_name, GetRaceIDName(race), GetClassIDName(clas));
+	LogInfo("Name approval request. Name=[{}], race=[{}], class=[{}]", char_name, GetRaceIDName(race), GetClassIDName(clas));
 
 	EQApplicationPacket *outapp;
 	outapp = new EQApplicationPacket;
@@ -698,11 +661,11 @@ bool Client::HandleCharacterCreateRequestPacket(const EQApplicationPacket *app)
 
 bool Client::HandleCharacterCreatePacket(const EQApplicationPacket *app) {
 	if (GetAccountID() == 0) {
-		Log(Logs::Detail, Logs::World_Server,"Account ID not set; unable to create character.");
+		LogInfo("Account ID not set; unable to create character");
 		return false;
 	}
 	else if (app->size != sizeof(CharCreate_Struct)) {
-		Log(Logs::Detail, Logs::World_Server,"Wrong size on OP_CharacterCreate. Got: %d, Expected: %d",app->size,sizeof(CharCreate_Struct));
+		LogInfo("Wrong size on OP_CharacterCreate. Got: [{}], Expected: [{}]", app->size, sizeof(CharCreate_Struct));
 		DumpPacket(app);
 		// the previous behavior was essentially returning true here
 		// but that seems a bit odd to me.
@@ -729,14 +692,14 @@ bool Client::HandleCharacterCreatePacket(const EQApplicationPacket *app) {
 
 bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) { 
 	if (GetAccountID() == 0) {
-		Log(Logs::Detail, Logs::World_Server,"Enter world with no logged in account");
+		LogInfo("Enter world with no logged in account");
 		eqs->Close();
 		return true;
 	}
 
 	if(GetAdmin() < 0)
 	{
-		Log(Logs::Detail, Logs::World_Server,"Account banned or suspended.");
+		LogInfo("Account banned or suspended");
 		eqs->Close();
 		return true;
 	}
@@ -752,14 +715,14 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
 	uint32 tmpaccid = 0;
 	charid = database.GetCharacterInfo(char_name, &tmpaccid, &zone_id, &instance_id);
 	if (charid == 0 || tmpaccid != GetAccountID()) {
-		Log(Logs::Detail, Logs::World_Server,"Could not get CharInfo for '%s'",char_name);
+		LogInfo("Could not get CharInfo for [{}]", char_name);
 		eqs->Close();
 		return true;
 	}
 
 	// Make sure this account owns this character
 	if (tmpaccid != GetAccountID()) {
-		Log(Logs::Detail, Logs::World_Server,"This account does not own the character named '%s'",char_name);
+		LogInfo("This account does not own the character named [{}]", char_name);
 		eqs->Close();
 		return true;
 	}
@@ -801,7 +764,7 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
 				zone_id = database.MoveCharacterToBind(charid, 4);
 			}
 			else {
-				Log(Logs::Detail, Logs::World_Server, "'%s' is trying to go home before they're able...", char_name);
+				LogInfo("[{}] is trying to go home before they're able", char_name);
 				database.SetHackerFlag(GetAccountName(), char_name, "MQGoHome: player tried to go home before they were able.");
 				eqs->Close();
 				return true;
@@ -825,7 +788,7 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
 				database.MoveCharacterToZone(charid, database.GetZoneName(zone_id));
 			}
 			else {
-				Log(Logs::Detail, Logs::World_Server, "'%s' is trying to go to tutorial but are not allowed...", char_name);
+				LogInfo("[{}] is trying to go to tutorial but are not allowed", char_name);
 				database.SetHackerFlag(GetAccountName(), char_name, "MQTutorial: player tried to enter the tutorial without having tutorial enabled for this character.");
 				eqs->Close();
 				return true;
@@ -836,7 +799,7 @@ bool Client::HandleEnterWorldPacket(const EQApplicationPacket *app) {
 	if (zone_id == 0 || !database.GetZoneName(zone_id)) {
 		// This is to save people in an invalid zone, once it's removed from the DB
 		database.MoveCharacterToZone(charid, "arena");
-		Log(Logs::Detail, Logs::World_Server, "Zone not found in database zone_id=%i, moveing char to arena character:%s", zone_id, char_name);
+		LogInfo("Zone not found in database zone_id=[{}], moveing char to arena character:[{}]", zone_id, char_name);
 	}
 
 	if(instance_id > 0)
@@ -981,7 +944,7 @@ bool Client::HandleDeleteCharacterPacket(const EQApplicationPacket *app) {
 
 	uint32 char_acct_id = database.GetAccountIDByChar((char*)app->pBuffer);
 	if(char_acct_id == GetAccountID()) {
-		Log(Logs::Detail, Logs::World_Server,"Delete character: %s",app->pBuffer);
+		LogInfo("Delete character: [{}]", app->pBuffer);
 		database.DeleteCharacter((char *)app->pBuffer);
 		SendCharInfo();
 	}
@@ -1002,24 +965,24 @@ bool Client::HandlePacket(const EQApplicationPacket *app) {
 
 	EmuOpcode opcode = app->GetOpcode();
 
-	Log(Logs::Detail, Logs::World_Server,"Recevied EQApplicationPacket");
+	LogNetcode("Received EQApplicationPacket [{:#04x}]", opcode);
 
 	if (!eqs->CheckState(ESTABLISHED)) {
-		Log(Logs::Detail, Logs::World_Server,"Client disconnected (net inactive on send)");
+		LogInfo("Client disconnected (net inactive on send)");
 		return false;
 	}
 
 	// Voidd: Anti-GM Account hack, Checks source ip against valid GM Account IP Addresses
 	if (RuleB(World, GMAccountIPList) && this->GetAdmin() >= (RuleI(World, MinGMAntiHackStatus))) {
 		if(!database.CheckGMIPs(long2ip(this->GetIP()).c_str(), this->GetAccountID())) {
-			Log(Logs::Detail, Logs::World_Server,"GM Account not permited from source address %s and accountid %i", long2ip(this->GetIP()).c_str(), this->GetAccountID());
+			LogInfo("GM Account not permited from source address [{}] and accountid [{}]", long2ip(this->GetIP()).c_str(), this->GetAccountID());
 			eqs->Close();
 		}
 	}
 
 	if (GetAccountID() == 0 && opcode != OP_SendLoginInfo) {
 		// Got a packet other than OP_SendLoginInfo when not logged in
-		Log(Logs::Detail, Logs::World_Server,"Expecting OP_SendLoginInfo, got %s", OpcodeNames[opcode]);
+		LogInfo("Expecting OP_SendLoginInfo, got [{}]", OpcodeNames[opcode]);
 		return false;
 	}
 	else if (opcode == OP_AckPacket) {
@@ -1076,7 +1039,7 @@ bool Client::HandlePacket(const EQApplicationPacket *app) {
 		{
 			// I don't see this getting executed on logout
 			eqs->Close();
-			cle->SetOnline(CLE_Status_Offline); //allows this player to log in again without an ip restriction.
+			cle->SetOnline(CLE_Status::Offline); //allows this player to log in again without an ip restriction.
 			return false;
 		}
 		case OP_ZoneChange:
@@ -1098,7 +1061,7 @@ bool Client::HandlePacket(const EQApplicationPacket *app) {
 		}
 		default:
 		{
-			Log(Logs::Detail, Logs::World_Server,"Received unknown EQApplicationPacket");
+			LogNetcode("Received unknown EQApplicationPacket");
 			return true;
 		}
 	}
@@ -1116,18 +1079,18 @@ bool Client::Process() {
 	to.sin_addr.s_addr = ip;
 
 	if (autobootup_timeout.Check()) {
-		Log(Logs::General, Logs::World_Server, "Zone bootup timer expired, bootup failed or too slow.");
+		LogInfo("Zone bootup timer expired, bootup failed or too slow");
 		TellClientZoneUnavailable();
 	}
+
 	if(connect.Check()){
 		SendGuildList();// Send OPCode: OP_GuildsList
 		SendApproveWorld();
 		connect.Disable();
 	}
-	if (CLE_keepalive_timer.Check()) {
-		if (cle)
-			cle->KeepAlive();
-	}
+
+	if (cle)
+		cle->KeepAlive();
 
 	/************ Get all packets from packet manager out queue and process them ************/
 	EQApplicationPacket *app = 0;
@@ -1150,7 +1113,7 @@ bool Client::Process() {
 			loginserverlist.SendPacket(pack);
 			safe_delete(pack);
 		}
-		Log(Logs::Detail, Logs::World_Server,"Client disconnected (not active in process)");
+		LogInfo("Client disconnected (not active in process)");
 		return false;
 	}
 
@@ -1191,40 +1154,55 @@ void Client::EnterWorld(bool TryBootup) {
 	else
 		zone_server = zoneserver_list.FindByZoneID(zone_id);
 
-
 	const char *zone_name = database.GetZoneName(zone_id, true);
 	if (zone_server) {
-		// warn the world we're comming, so it knows not to shutdown
-		zone_server->IncomingClient(this);
+		if (false == enter_world_triggered) {
+			//Drop any clients we own in other zones.
+			zoneserver_list.DropClient(GetLSID(), zone_server);
+
+			// warn the zone we're coming
+			zone_server->IncomingClient(this);
+
+			//tell the server not to trigger this multiple times before we get a zone unavailable
+			enter_world_triggered = true;
+		}
 	}
 	else {
 		if (TryBootup) {
-			Log(Logs::General, Logs::World_Server, "Attempting autobootup of %s (%d:%d)", zone_name, zone_id, instance_id);
+			LogInfo("Attempting autobootup of [{}] ([{}]:[{}])", zone_name, zone_id, instance_id);
 			autobootup_timeout.Start();
 			zone_waiting_for_bootup = zoneserver_list.TriggerBootup(zone_id, instance_id);
 			if (zone_waiting_for_bootup == 0) {
-				Log(Logs::General, Logs::World_Server, "No zoneserver available to boot up.");
+				LogInfo("No zoneserver available to boot up");
 				TellClientZoneUnavailable();
 			}
 			return;
 		}
 		else {
-			Log(Logs::General, Logs::World_Server, "Requested zone %s is not running.", zone_name);
+			LogInfo("Requested zone [{}] is not running", zone_name);
 			TellClientZoneUnavailable();
 			return;
 		}
 	}
+
 	zone_waiting_for_bootup = 0;
 
-	if(!cle) {
+	if (GetAdmin() < 80 && zoneserver_list.IsZoneLocked(zone_id)) {
+		LogInfo("Enter world failed. Zone is locked");
+		TellClientZoneUnavailable();
+		return;
+	}
+
+	if (!cle) {
+		TellClientZoneUnavailable();
 		return;
 	}
 
 	cle->SetChar(charid, char_name);
 	database.UpdateLiveChar(char_name, GetAccountID());
 
-	Log(Logs::General, Logs::World_Server, 
-		"(%s) %s %s (Zone ID %d: Instance ID: %d) ", 
+	LogInfo(
+		"({}) [{}] [{}] (Zone ID [{}]: Instance ID: [{}]) ",
 		char_name,
 		(seen_character_select ? "Zoning from character select" : "Zoning to"), 
 		zone_name, 
@@ -1233,12 +1211,6 @@ void Client::EnterWorld(bool TryBootup) {
 	);
 
 	if (seen_character_select) {
-		if (GetAdmin() < 80 && zoneserver_list.IsZoneLocked(zone_id)) {
-			Log(Logs::General, Logs::World_Server, "Enter world failed. Zone is locked.");
-			TellClientZoneUnavailable();
-			return;
-		}
-
 		auto pack = new ServerPacket;
 		pack->opcode = ServerOP_AcceptWorldEntrance;
 		pack->size = sizeof(WorldToZone_Struct);
@@ -1272,9 +1244,9 @@ void Client::Clearance(int8 response)
 	{
 		if (zs == 0)
 		{
-			Log(Logs::Detail, Logs::World_Server,"Unable to find zoneserver in Client::Clearance!!");
+			LogInfo("Unable to find zoneserver in Client::Clearance!!");
 		} else {
-			Log(Logs::Detail, Logs::World_Server, "Invalid response %d in Client::Clearance", response);
+			LogInfo("Invalid response [{}] in Client::Clearance", response);
 		}
 
 		TellClientZoneUnavailable();
@@ -1284,20 +1256,20 @@ void Client::Clearance(int8 response)
 	EQApplicationPacket* outapp;
 
 	if (zs->GetCAddress() == nullptr) {
-		Log(Logs::Detail, Logs::World_Server, "Unable to do zs->GetCAddress() in Client::Clearance!!");
+		LogInfo("Unable to do zs->GetCAddress() in Client::Clearance!!");
 		TellClientZoneUnavailable();
 		return;
 	}
 
 	if (zone_id == 0) {
-		Log(Logs::Detail, Logs::World_Server, "zoneID is nullptr in Client::Clearance!!");
+		LogInfo("zoneID is nullptr in Client::Clearance!!");
 		TellClientZoneUnavailable();
 		return;
 	}
 
 	const char* zonename = database.GetZoneName(zone_id);
 	if (zonename == 0) {
-		Log(Logs::Detail, Logs::World_Server, "zonename is nullptr in Client::Clearance!!");
+		LogInfo("zonename is nullptr in Client::Clearance!!");
 		TellClientZoneUnavailable();
 		return;
 	}
@@ -1321,10 +1293,10 @@ void Client::Clearance(int8 response)
 
 			if(strcmp(zs_addr, "127.0.0.1") == 0)
 			{
-				Log(Logs::Detail, Logs::World_Server, "Local zone address was %s, setting local address to: %s", zs_addr, WorldConfig::get()->LocalAddress.c_str());
+				LogInfo("Local zone address was [{}], setting local address to: [{}]", zs_addr, WorldConfig::get()->LocalAddress.c_str());
 				zs_addr = WorldConfig::get()->LocalAddress.c_str();
 			} else {
-				Log(Logs::Detail, Logs::World_Server, "Local zone address %s", zs_addr);
+				LogInfo("Local zone address [{}]", zs_addr);
 			}
 		}
 
@@ -1339,12 +1311,12 @@ void Client::Clearance(int8 response)
 
 	strcpy(zsi->ip, zs_addr);
 	zsi->port =zs->GetCPort();
-	Log(Logs::Detail, Logs::World_Server,"Sending client to zone %s (%d:%d) at %s:%d",zonename,zone_id,instance_id,zsi->ip,zsi->port);
+	LogInfo("Sending client to zone [{}] ([{}]:[{}]) at [{}]:[{}]", zonename, zone_id, instance_id, zsi->ip, zsi->port);
 	QueuePacket(outapp);
 	safe_delete(outapp);
 
 	if (cle)
-		cle->SetOnline(CLE_Status_Zoning);
+		cle->SetOnline(CLE_Status::Zoning);
 }
 
 void Client::TellClientZoneUnavailable() {
@@ -1358,6 +1330,7 @@ void Client::TellClientZoneUnavailable() {
 
 	zone_id = 0;
 	zone_waiting_for_bootup = 0;
+	enter_world_triggered = false;
 	autobootup_timeout.Disable();
 }
 
@@ -1370,7 +1343,7 @@ bool Client::GenPassKey(char* key) {
 }
 
 void Client::QueuePacket(const EQApplicationPacket* app, bool ack_req) {
-	Log(Logs::Detail, Logs::World_Server, "Sending EQApplicationPacket OpCode 0x%04x",app->GetOpcode());
+	LogNetcode("Sending EQApplicationPacket OpCode {:#04x}", app->GetOpcode());
 
 	ack_req = true;	// It's broke right now, dont delete this line till fix it. =P
 	eqs->QueuePacket(app, ack_req);
@@ -1458,27 +1431,27 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc)
 
 	in.s_addr = GetIP();
 
-	Log(Logs::Detail, Logs::World_Server, "Character creation request from %s LS#%d (%s:%d) : ", GetCLE()->LSName(), GetCLE()->LSID(), inet_ntoa(in), GetPort());
-	Log(Logs::Detail, Logs::World_Server, "Name: %s", name);
-	Log(Logs::Detail, Logs::World_Server, "Race: %d  Class: %d  Gender: %d  Deity: %d  Start zone: %d  Tutorial: %s",
+	LogInfo("Character creation request from [{}] LS#[{}] ([{}]:[{}]) : ", GetCLE()->LSName(), GetCLE()->LSID(), inet_ntoa(in), GetPort());
+	LogInfo("Name: [{}]", name);
+	Log(Logs::Detail, Logs::WorldServer, "Race: %d  Class: %d  Gender: %d  Deity: %d  Start zone: %d  Tutorial: %s",
 		cc->race, cc->class_, cc->gender, cc->deity, cc->start_zone, cc->tutorial ? "true" : "false");
-	Log(Logs::Detail, Logs::World_Server, "STR  STA  AGI  DEX  WIS  INT  CHA    Total");
-	Log(Logs::Detail, Logs::World_Server, "%3d  %3d  %3d  %3d  %3d  %3d  %3d     %3d",
+	LogInfo("STR  STA  AGI  DEX  WIS  INT  CHA    Total");
+	Log(Logs::Detail, Logs::WorldServer, "%3d  %3d  %3d  %3d  %3d  %3d  %3d     %3d",
 		cc->STR, cc->STA, cc->AGI, cc->DEX, cc->WIS, cc->INT, cc->CHA,
 		stats_sum);
-	Log(Logs::Detail, Logs::World_Server, "Face: %d  Eye colors: %d %d", cc->face, cc->eyecolor1, cc->eyecolor2);
-	Log(Logs::Detail, Logs::World_Server, "Hairstyle: %d  Haircolor: %d", cc->hairstyle, cc->haircolor);
-	Log(Logs::Detail, Logs::World_Server, "Beard: %d  Beardcolor: %d", cc->beard, cc->beardcolor);
+	LogInfo("Face: [{}]  Eye colors: [{}] [{}]", cc->face, cc->eyecolor1, cc->eyecolor2);
+	LogInfo("Hairstyle: [{}]  Haircolor: [{}]", cc->hairstyle, cc->haircolor);
+	LogInfo("Beard: [{}]  Beardcolor: [{}]", cc->beard, cc->beardcolor);
 
 	/* Validate the char creation struct */
 	if (m_ClientVersionBit & EQEmu::versions::maskSoFAndLater) {
 		if (!CheckCharCreateInfoSoF(cc)) {
-			Log(Logs::Detail, Logs::World_Server,"CheckCharCreateInfo did not validate the request (bad race/class/stats)");
+			LogInfo("CheckCharCreateInfo did not validate the request (bad race/class/stats)");
 			return false;
 		}
 	} else {
 		if (!CheckCharCreateInfoTitanium(cc)) {
-			Log(Logs::Detail, Logs::World_Server,"CheckCharCreateInfo did not validate the request (bad race/class/stats)");
+			LogInfo("CheckCharCreateInfo did not validate the request (bad race/class/stats)");
 			return false;
 		}
 	}
@@ -1540,14 +1513,14 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc)
 
 	/* If it is an SoF Client and the SoF Start Zone rule is set, send new chars there */
 	if (m_ClientVersionBit & EQEmu::versions::maskSoFAndLater) {
-		Log(Logs::Detail, Logs::World_Server,"Found 'SoFStartZoneID' rule setting: %i", RuleI(World, SoFStartZoneID));
+		LogInfo("Found 'SoFStartZoneID' rule setting: [{}]", RuleI(World, SoFStartZoneID));
 		if (RuleI(World, SoFStartZoneID) > 0) {
 			pp.zone_id = RuleI(World, SoFStartZoneID);
 			cc->start_zone = pp.zone_id;
 		}
 	}
 	else {
-		Log(Logs::General, Logs::World_Server, "Found 'TitaniumStartZoneID' rule setting: %i", RuleI(World, TitaniumStartZoneID));
+		LogInfo("Found 'TitaniumStartZoneID' rule setting: [{}]", RuleI(World, TitaniumStartZoneID));
 		if (RuleI(World, TitaniumStartZoneID) > 0) { 	/* if there's a startzone variable put them in there */
 		
 			pp.zone_id = RuleI(World, TitaniumStartZoneID);
@@ -1607,12 +1580,12 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc)
 		pp.binds[0].heading = pp.heading;
 	}
 
-	Log(Logs::Detail, Logs::World_Server,"Current location: %s (%d)  %0.2f, %0.2f, %0.2f, %0.2f",
+	Log(Logs::Detail, Logs::WorldServer, "Current location: %s (%d)  %0.2f, %0.2f, %0.2f, %0.2f",
 		database.GetZoneName(pp.zone_id), pp.zone_id, pp.x, pp.y, pp.z, pp.heading);
-	Log(Logs::Detail, Logs::World_Server,"Bind location: %s (%d) %0.2f, %0.2f, %0.2f",
-		database.GetZoneName(pp.binds[0].zoneId), pp.binds[0].zoneId,  pp.binds[0].x, pp.binds[0].y, pp.binds[0].z);
-	Log(Logs::Detail, Logs::World_Server,"Home location: %s (%d) %0.2f, %0.2f, %0.2f",
-		database.GetZoneName(pp.binds[4].zoneId), pp.binds[4].zoneId,  pp.binds[4].x, pp.binds[4].y, pp.binds[4].z);
+	Log(Logs::Detail, Logs::WorldServer, "Bind location: %s (%d) %0.2f, %0.2f, %0.2f",
+		database.GetZoneName(pp.binds[0].zoneId), pp.binds[0].zoneId, pp.binds[0].x, pp.binds[0].y, pp.binds[0].z);
+	Log(Logs::Detail, Logs::WorldServer, "Home location: %s (%d) %0.2f, %0.2f, %0.2f",
+		database.GetZoneName(pp.binds[4].zoneId), pp.binds[4].zoneId, pp.binds[4].x, pp.binds[4].y, pp.binds[4].z);
 
 	/* Starting Items inventory */
 	database.SetStartingItems(&pp, &inv, pp.race, pp.class_, pp.deity, pp.zone_id, pp.name, GetAdmin());
@@ -1620,10 +1593,10 @@ bool Client::OPCharCreate(char *name, CharCreate_Struct *cc)
 	// now we give the pp and the inv we made to StoreCharacter
 	// to see if we can store it
 	if (!database.StoreCharacter(GetAccountID(), &pp, &inv)) {
-		Log(Logs::Detail, Logs::World_Server,"Character creation failed: %s", pp.name);
+		LogInfo("Character creation failed: [{}]", pp.name);
 		return false;
 	}
-	Log(Logs::Detail, Logs::World_Server,"Character creation successful: %s", pp.name);
+	LogInfo("Character creation successful: [{}]", pp.name);
 	return true;
 }
 
@@ -1633,7 +1606,7 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc)
 	if (!cc)
 		return false;
 
-	Log(Logs::Detail, Logs::World_Server, "Validating char creation info...");
+	LogInfo("Validating char creation info");
 
 	RaceClassCombos class_combo;
 	bool found = false;
@@ -1650,7 +1623,7 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc)
 	}
 
 	if (!found) {
-		Log(Logs::Detail, Logs::World_Server, "Could not find class/race/deity/start_zone combination");
+		LogInfo("Could not find class/race/deity/start_zone combination");
 		return false;
 	}
 
@@ -1667,7 +1640,7 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc)
 	}
 
 	if (!found) {
-		Log(Logs::Detail, Logs::World_Server, "Could not find starting stats for selected character combo, cannot verify stats");
+		LogInfo("Could not find starting stats for selected character combo, cannot verify stats");
 		return false;
 	}
 
@@ -1680,37 +1653,37 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc)
 		allocation.DefaultPointAllocation[6];
 
 	if (cc->STR > allocation.BaseStats[0] + max_stats || cc->STR < allocation.BaseStats[0]) {
-		Log(Logs::Detail, Logs::World_Server, "Strength out of range");
+		LogInfo("Strength out of range");
 		return false;
 	}
 
 	if (cc->DEX > allocation.BaseStats[1] + max_stats || cc->DEX < allocation.BaseStats[1]) {
-		Log(Logs::Detail, Logs::World_Server, "Dexterity out of range");
+		LogInfo("Dexterity out of range");
 		return false;
 	}
 
 	if (cc->AGI > allocation.BaseStats[2] + max_stats || cc->AGI < allocation.BaseStats[2]) {
-		Log(Logs::Detail, Logs::World_Server, "Agility out of range");
+		LogInfo("Agility out of range");
 		return false;
 	}
 
 	if (cc->STA > allocation.BaseStats[3] + max_stats || cc->STA < allocation.BaseStats[3]) {
-		Log(Logs::Detail, Logs::World_Server, "Stamina out of range");
+		LogInfo("Stamina out of range");
 		return false;
 	}
 
 	if (cc->INT > allocation.BaseStats[4] + max_stats || cc->INT < allocation.BaseStats[4]) {
-		Log(Logs::Detail, Logs::World_Server, "Intelligence out of range");
+		LogInfo("Intelligence out of range");
 		return false;
 	}
 
 	if (cc->WIS > allocation.BaseStats[5] + max_stats || cc->WIS < allocation.BaseStats[5]) {
-		Log(Logs::Detail, Logs::World_Server, "Wisdom out of range");
+		LogInfo("Wisdom out of range");
 		return false;
 	}
 
 	if (cc->CHA > allocation.BaseStats[6] + max_stats || cc->CHA < allocation.BaseStats[6]) {
-		Log(Logs::Detail, Logs::World_Server, "Charisma out of range");
+		LogInfo("Charisma out of range");
 		return false;
 	}
 
@@ -1723,7 +1696,7 @@ bool CheckCharCreateInfoSoF(CharCreate_Struct *cc)
 	current_stats += cc->WIS - allocation.BaseStats[5];
 	current_stats += cc->CHA - allocation.BaseStats[6];
 	if (current_stats > max_stats) {
-		Log(Logs::Detail, Logs::World_Server, "Current Stats > Maximum Stats");
+		LogInfo("Current Stats > Maximum Stats");
 		return false;
 	}
 
@@ -1804,7 +1777,7 @@ bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc)
 	if (!cc)
 		return false;
 
-	Log(Logs::Detail, Logs::World_Server,"Validating char creation info...");
+	LogInfo("Validating char creation info");
 
 	classtemp = cc->class_ - 1;
 	racetemp = cc->race - 1;
@@ -1817,16 +1790,16 @@ bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc)
 	// if out of range looking it up in the table would crash stuff
 	// so we return from these
 	if (classtemp >= PLAYER_CLASS_COUNT) {
-		Log(Logs::Detail, Logs::World_Server,"  class is out of range");
+		LogInfo("  class is out of range");
 		return false;
 	}
 	if (racetemp >= _TABLE_RACES) {
-		Log(Logs::Detail, Logs::World_Server,"  race is out of range");
+		LogInfo("  race is out of range");
 		return false;
 	}
 
 	if (!ClassRaceLookupTable[classtemp][racetemp]) { //Lookup table better than a bunch of ifs?
-		Log(Logs::Detail, Logs::World_Server,"  invalid race/class combination");
+		LogInfo("  invalid race/class combination");
 		// we return from this one, since if it's an invalid combination our table
 		// doesn't have meaningful values for the stats
 		return false;
@@ -1854,43 +1827,43 @@ bool CheckCharCreateInfoTitanium(CharCreate_Struct *cc)
 	// that are messed up not just the first hit
 
 	if (bTOTAL + stat_points != cTOTAL) {
-		Log(Logs::Detail, Logs::World_Server,"  stat points total doesn't match expected value: expecting %d got %d", bTOTAL + stat_points, cTOTAL);
+		LogInfo("  stat points total doesn't match expected value: expecting [{}] got [{}]", bTOTAL + stat_points, cTOTAL);
 		Charerrors++;
 	}
 
 	if (cc->STR > bSTR + stat_points || cc->STR < bSTR) {
-		Log(Logs::Detail, Logs::World_Server,"  stat STR is out of range");
+		LogInfo("  stat STR is out of range");
 		Charerrors++;
 	}
 	if (cc->STA > bSTA + stat_points || cc->STA < bSTA) {
-		Log(Logs::Detail, Logs::World_Server,"  stat STA is out of range");
+		LogInfo("  stat STA is out of range");
 		Charerrors++;
 	}
 	if (cc->AGI > bAGI + stat_points || cc->AGI < bAGI) {
-		Log(Logs::Detail, Logs::World_Server,"  stat AGI is out of range");
+		LogInfo("  stat AGI is out of range");
 		Charerrors++;
 	}
 	if (cc->DEX > bDEX + stat_points || cc->DEX < bDEX) {
-		Log(Logs::Detail, Logs::World_Server,"  stat DEX is out of range");
+		LogInfo("  stat DEX is out of range");
 		Charerrors++;
 	}
 	if (cc->WIS > bWIS + stat_points || cc->WIS < bWIS) {
-		Log(Logs::Detail, Logs::World_Server,"  stat WIS is out of range");
+		LogInfo("  stat WIS is out of range");
 		Charerrors++;
 	}
 	if (cc->INT > bINT + stat_points || cc->INT < bINT) {
-		Log(Logs::Detail, Logs::World_Server,"  stat INT is out of range");
+		LogInfo("  stat INT is out of range");
 		Charerrors++;
 	}
 	if (cc->CHA > bCHA + stat_points || cc->CHA < bCHA) {
-		Log(Logs::Detail, Logs::World_Server,"  stat CHA is out of range");
+		LogInfo("  stat CHA is out of range");
 		Charerrors++;
 	}
 
 	/*TODO: Check for deity/class/race.. it'd be nice, but probably of any real use to hack(faction, deity based items are all I can think of)
 	I am NOT writing those tables - kathgar*/
 
-	Log(Logs::Detail, Logs::World_Server,"Found %d errors in character creation request", Charerrors);
+	LogInfo("Found [{}] errors in character creation request", Charerrors);
 
 	return Charerrors == 0;
 }
diff --git a/world/client.h b/world/client.h
index d36dc692d..4dbad85c5 100644
--- a/world/client.h
+++ b/world/client.h
@@ -82,6 +82,7 @@ private:
 	bool	is_player_zoning;
 	Timer	autobootup_timeout;
 	uint32	zone_waiting_for_bootup;
+	bool	enter_world_triggered;
 
 	bool StartInTutorial;
 	EQEmu::versions::ClientVersion m_ClientVersion;
@@ -94,7 +95,6 @@ private:
 	void SetClassLanguages(PlayerProfile_Struct *pp);
 
 	ClientListEntry* cle;
-	Timer	CLE_keepalive_timer;
 	Timer	connect;
 	bool firstlogin;
 	bool seen_character_select;
diff --git a/world/cliententry.cpp b/world/cliententry.cpp
index be8916676..9aa2b9ae0 100644
--- a/world/cliententry.cpp
+++ b/world/cliententry.cpp
@@ -26,61 +26,71 @@
 #include "../common/guilds.h"
 #include "../common/string_util.h"
 
-extern uint32 numplayers;
+extern uint32          numplayers;
 extern LoginServerList loginserverlist;
-extern ClientList		client_list;
-extern volatile bool RunLoops;
+extern ClientList      client_list;
+extern volatile bool   RunLoops;
 
-ClientListEntry::ClientListEntry(uint32 in_id, uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin, uint32 ip, uint8 local)
-: id(in_id)
+/**
+ * @param in_id
+ * @param in_loginserver_id
+ * @param in_loginserver_name
+ * @param in_login_name
+ * @param in_login_key
+ * @param in_is_world_admin
+ * @param ip
+ * @param local
+ */
+ClientListEntry::ClientListEntry(
+	uint32 in_id,
+	uint32 in_loginserver_id,
+	const char *in_loginserver_name,
+	const char *in_login_name,
+	const char *in_login_key,
+	int16 in_is_world_admin,
+	uint32 ip,
+	uint8 local
+)
+	: id(in_id)
 {
 	ClearVars(true);
 
-	pIP = ip;
-	pLSID = iLSID;
-	if(iLSID > 0)
-		paccountid = database.GetAccountIDFromLSID(iLSID, paccountname, &padmin);
-	strn0cpy(plsname, iLoginName, sizeof(plsname));
-	strn0cpy(plskey, iLoginKey, sizeof(plskey));
-	pworldadmin = iWorldAdmin;
-	plocal=(local==1);
+	LogDebug(
+		"ClientListEntry in_id [{0}] in_loginserver_id [{1}] in_loginserver_name [{2}] in_login_name [{3}] in_login_key [{4}] "
+		" in_is_world_admin [{5}] ip [{6}] local [{7}]",
+		in_id,
+		in_loginserver_id,
+		in_loginserver_name,
+		in_login_name,
+		in_login_key,
+		in_is_world_admin,
+		ip,
+		local
+	);
+
+	pIP   = ip;
+	pLSID = in_loginserver_id;
+	if (in_loginserver_id > 0) {
+		paccountid = database.GetAccountIDFromLSID(in_loginserver_name, in_loginserver_id, paccountname, &padmin);
+	}
+
+	strn0cpy(loginserver_account_name, in_login_name, sizeof(loginserver_account_name));
+	strn0cpy(plskey, in_login_key, sizeof(plskey));
+	strn0cpy(source_loginserver, in_loginserver_name, sizeof(source_loginserver));
+	pworldadmin = in_is_world_admin;
+	plocal      = (local == 1);
 
-	pinstance = 0;
-	pLFGFromLevel = 0;
-	pLFGToLevel = 0;
-	pLFGMatchFilter = false;
 	memset(pLFGComments, 0, 64);
 }
 
-ClientListEntry::ClientListEntry(uint32 in_id, uint32 iAccID, const char* iAccName, MD5& iMD5Pass, int16 iAdmin)
-: id(in_id)
+ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer *iZS, ServerClientList_Struct *scl, CLE_Status iOnline)
+	: id(in_id)
 {
 	ClearVars(true);
 
-	pIP = 0;
-	pLSID = 0;
-	pworldadmin = 0;
-
-	paccountid = iAccID;
-	strn0cpy(paccountname, iAccName, sizeof(paccountname));
-	pMD5Pass = iMD5Pass;
-	padmin = iAdmin;
-
-	pinstance = 0;
-	pLFGFromLevel = 0;
-	pLFGToLevel = 0;
-	pLFGMatchFilter = false;
-	memset(pLFGComments, 0, 64);
-}
-
-ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer* iZS, ServerClientList_Struct* scl, int8 iOnline)
-: id(in_id)
-{
-	ClearVars(true);
-
-	pIP = 0;
+	pIP   = 0;
 	pLSID = scl->LSAccountID;
-	strn0cpy(plsname, scl->name, sizeof(plsname));
+	strn0cpy(loginserver_account_name, scl->name, sizeof(loginserver_account_name));
 	strn0cpy(plskey, scl->lskey, sizeof(plskey));
 	pworldadmin = 0;
 
@@ -88,19 +98,22 @@ ClientListEntry::ClientListEntry(uint32 in_id, ZoneServer* iZS, ServerClientList
 	strn0cpy(paccountname, scl->AccountName, sizeof(paccountname));
 	padmin = scl->Admin;
 
-	pinstance = 0;
-	pLFGFromLevel = 0;
-	pLFGToLevel = 0;
+	pinstance       = 0;
+	pLFGFromLevel   = 0;
+	pLFGToLevel     = 0;
 	pLFGMatchFilter = false;
 	memset(pLFGComments, 0, 64);
 
-	if (iOnline >= CLE_Status_Zoning)
+	if (iOnline >= CLE_Status::Zoning) {
 		Update(iZS, scl, iOnline);
-	else
+	}
+	else {
 		SetOnline(iOnline);
+	}
 }
 
-ClientListEntry::~ClientListEntry() {
+ClientListEntry::~ClientListEntry()
+{
 	if (RunLoops) {
 		Camp(); // updates zoneserver's numplayers
 		client_list.RemoveCLEReferances(this);
@@ -110,97 +123,118 @@ ClientListEntry::~ClientListEntry() {
 	tell_queue.clear();
 }
 
-void ClientListEntry::SetChar(uint32 iCharID, const char* iCharName) {
+void ClientListEntry::SetChar(uint32 iCharID, const char *iCharName)
+{
 	pcharid = iCharID;
 	strn0cpy(pname, iCharName, sizeof(pname));
 }
 
-void ClientListEntry::SetOnline(ZoneServer* iZS, int8 iOnline) {
-	if (iZS == this->Server())
+void ClientListEntry::SetOnline(ZoneServer *iZS, CLE_Status iOnline)
+{
+	if (iZS == this->Server()) {
 		SetOnline(iOnline);
+	}
 }
 
-void ClientListEntry::SetOnline(int8 iOnline) {
-	if (iOnline >= CLE_Status_Online && pOnline < CLE_Status_Online)
+void ClientListEntry::SetOnline(CLE_Status iOnline)
+{
+	LogClientLogin(
+		"ClientListEntry::SetOnline for [{}] ({}) = [{}] ({})",
+		AccountName(),
+		AccountID(),
+		CLEStatusString[CLE_Status::Online],
+		iOnline
+	);
+
+	if (iOnline >= CLE_Status::Online && pOnline < CLE_Status::Online) {
 		numplayers++;
-	else if (iOnline < CLE_Status_Online && pOnline >= CLE_Status_Online) {
+	}
+	else if (iOnline < CLE_Status::Online && pOnline >= CLE_Status::Online) {
 		numplayers--;
 	}
-	if (iOnline != CLE_Status_Online || pOnline < CLE_Status_Online)
+	if (iOnline != CLE_Status::Online || pOnline < CLE_Status::Online) {
 		pOnline = iOnline;
-	if (iOnline < CLE_Status_Zoning)
+	}
+	if (iOnline < CLE_Status::Zoning) {
 		Camp();
-	if (pOnline >= CLE_Status_Online)
+	}
+	if (pOnline >= CLE_Status::Online) {
 		stale = 0;
+	}
 }
-void ClientListEntry::LSUpdate(ZoneServer* iZS){
-	if(WorldConfig::get()->UpdateStats){
+
+void ClientListEntry::LSUpdate(ZoneServer *iZS)
+{
+	if (WorldConfig::get()->UpdateStats) {
 		auto pack = new ServerPacket;
-		pack->opcode = ServerOP_LSZoneInfo;
-		pack->size = sizeof(ZoneInfo_Struct);
+		pack->opcode  = ServerOP_LSZoneInfo;
+		pack->size    = sizeof(ZoneInfo_Struct);
 		pack->pBuffer = new uchar[pack->size];
-		ZoneInfo_Struct* zone =(ZoneInfo_Struct*)pack->pBuffer;
-		zone->count=iZS->NumPlayers();
-		zone->zone = iZS->GetZoneID();
+		ZoneInfo_Struct *zone = (ZoneInfo_Struct *) pack->pBuffer;
+		zone->count    = iZS->NumPlayers();
+		zone->zone     = iZS->GetZoneID();
 		zone->zone_wid = iZS->GetID();
 		loginserverlist.SendPacket(pack);
 		safe_delete(pack);
 	}
 }
-void ClientListEntry::LSZoneChange(ZoneToZone_Struct* ztz){
-	if(WorldConfig::get()->UpdateStats){
+void ClientListEntry::LSZoneChange(ZoneToZone_Struct *ztz)
+{
+	if (WorldConfig::get()->UpdateStats) {
 		auto pack = new ServerPacket;
-		pack->opcode = ServerOP_LSPlayerZoneChange;
-		pack->size = sizeof(ServerLSPlayerZoneChange_Struct);
+		pack->opcode  = ServerOP_LSPlayerZoneChange;
+		pack->size    = sizeof(ServerLSPlayerZoneChange_Struct);
 		pack->pBuffer = new uchar[pack->size];
-		ServerLSPlayerZoneChange_Struct* zonechange =(ServerLSPlayerZoneChange_Struct*)pack->pBuffer;
+		ServerLSPlayerZoneChange_Struct *zonechange = (ServerLSPlayerZoneChange_Struct *) pack->pBuffer;
 		zonechange->lsaccount_id = LSID();
-		zonechange->from = ztz->current_zone_id;
-		zonechange->to = ztz->requested_zone_id;
+		zonechange->from         = ztz->current_zone_id;
+		zonechange->to           = ztz->requested_zone_id;
 		loginserverlist.SendPacket(pack);
 		safe_delete(pack);
 	}
 }
-void ClientListEntry::Update(ZoneServer* iZS, ServerClientList_Struct* scl, int8 iOnline) {
+
+void ClientListEntry::Update(ZoneServer *iZS, ServerClientList_Struct *scl, CLE_Status iOnline)
+{
 	if (pzoneserver != iZS) {
-		if (pzoneserver){
+		if (pzoneserver) {
 			pzoneserver->RemovePlayer();
 			LSUpdate(pzoneserver);
 		}
-		if (iZS){
+		if (iZS) {
 			iZS->AddPlayer();
 			LSUpdate(iZS);
 		}
 	}
-	pzoneserver = iZS;
-	pzone = scl->zone;
-	pinstance = scl->instance_id;
-	pcharid = scl->charid;
+	pzoneserver    = iZS;
+	pzone          = scl->zone;
+	pinstance      = scl->instance_id;
+	pcharid        = scl->charid;
 
 	strcpy(pname, scl->name);
 	if (paccountid == 0) {
 		paccountid = scl->AccountID;
 		strcpy(paccountname, scl->AccountName);
-		strcpy(plsname, scl->AccountName);
-		pIP = scl->IP;
+		strcpy(loginserver_account_name, scl->AccountName);
+		pIP   = scl->IP;
 		pLSID = scl->LSAccountID;
 		strn0cpy(plskey, scl->lskey, sizeof(plskey));
 	}
-	padmin = scl->Admin;
-	plevel = scl->level;
-	pclass_ = scl->class_;
-	prace = scl->race;
-	panon = scl->anon;
-	ptellsoff = scl->tellsoff;
-	pguild_id = scl->guild_id;
-	pLFG = scl->LFG;
-	gm = scl->gm;
+	padmin         = scl->Admin;
+	plevel         = scl->level;
+	pclass_        = scl->class_;
+	prace          = scl->race;
+	panon          = scl->anon;
+	ptellsoff      = scl->tellsoff;
+	pguild_id      = scl->guild_id;
+	pLFG           = scl->LFG;
+	gm             = scl->gm;
 	pClientVersion = scl->ClientVersion;
 
 	// Fields from the LFG Window
-	if((scl->LFGFromLevel != 0) && (scl->LFGToLevel != 0)) {
-		pLFGFromLevel = scl->LFGFromLevel;
-		pLFGToLevel = scl->LFGToLevel;
+	if ((scl->LFGFromLevel != 0) && (scl->LFGToLevel != 0)) {
+		pLFGFromLevel   = scl->LFGFromLevel;
+		pLFGToLevel     = scl->LFGToLevel;
 		pLFGMatchFilter = scl->LFGMatchFilter;
 		memcpy(pLFGComments, scl->LFGComments, sizeof(pLFGComments));
 	}
@@ -208,26 +242,29 @@ void ClientListEntry::Update(ZoneServer* iZS, ServerClientList_Struct* scl, int8
 	SetOnline(iOnline);
 }
 
-void ClientListEntry::LeavingZone(ZoneServer* iZS, int8 iOnline) {
-	if (iZS != 0 && iZS != pzoneserver)
+void ClientListEntry::LeavingZone(ZoneServer *iZS, CLE_Status iOnline)
+{
+	if (iZS != 0 && iZS != pzoneserver) {
 		return;
+	}
 	SetOnline(iOnline);
 
-	if (pzoneserver){
+	if (pzoneserver) {
 		pzoneserver->RemovePlayer();
 		LSUpdate(pzoneserver);
 	}
 	pzoneserver = 0;
-	pzone = 0;
+	pzone       = 0;
 }
 
-void ClientListEntry::ClearVars(bool iAll) {
+void ClientListEntry::ClearVars(bool iAll)
+{
 	if (iAll) {
-		pOnline = CLE_Status_Never;
-		stale = 0;
+		pOnline = CLE_Status::Never;
+		stale   = 0;
 
 		pLSID = 0;
-		memset(plsname, 0, sizeof(plsname));
+		memset(loginserver_account_name, 0, sizeof(loginserver_account_name));
 		memset(plskey, 0, sizeof(plskey));
 		pworldadmin = 0;
 
@@ -236,27 +273,29 @@ void ClientListEntry::ClearVars(bool iAll) {
 		padmin = 0;
 	}
 	pzoneserver = 0;
-	pzone = 0;
-	pcharid = 0;
+	pzone       = 0;
+	pcharid     = 0;
 	memset(pname, 0, sizeof(pname));
-	plevel = 0;
-	pclass_ = 0;
-	prace = 0;
-	panon = 0;
-	ptellsoff = 0;
-	pguild_id = GUILD_NONE;
-	pLFG = 0;
-	gm = 0;
+	plevel         = 0;
+	pclass_        = 0;
+	prace          = 0;
+	panon          = 0;
+	ptellsoff      = 0;
+	pguild_id      = GUILD_NONE;
+	pLFG           = 0;
+	gm             = 0;
 	pClientVersion = 0;
 	for (auto &elem : tell_queue)
 		safe_delete_array(elem);
 	tell_queue.clear();
 }
 
-void ClientListEntry::Camp(ZoneServer* iZS) {
-	if (iZS != 0 && iZS != pzoneserver)
+void ClientListEntry::Camp(ZoneServer *iZS)
+{
+	if (iZS != 0 && iZS != pzoneserver) {
 		return;
-	if (pzoneserver){
+	}
+	if (pzoneserver) {
 		pzoneserver->RemovePlayer();
 		LSUpdate(pzoneserver);
 	}
@@ -266,48 +305,66 @@ void ClientListEntry::Camp(ZoneServer* iZS) {
 	stale = 0;
 }
 
-bool ClientListEntry::CheckStale() {
+bool ClientListEntry::CheckStale()
+{
 	stale++;
 	if (stale > 20) {
-		if (pOnline > CLE_Status_Offline)
-			SetOnline(CLE_Status_Offline);
-		else
-			return true;
+		if (pOnline > CLE_Status::Offline) {
+			SetOnline(CLE_Status::Offline);
+		}
+
+		return true;
 	}
 	return false;
 }
 
-bool ClientListEntry::CheckAuth(uint32 iLSID, const char* iKey) {
-	if (strncmp(plskey, iKey,10) == 0) {
-		if (paccountid == 0 && LSID()>0) {
-			int16 tmpStatus = WorldConfig::get()->DefaultStatus;
-			paccountid = database.CreateAccount(plsname, 0, tmpStatus, LSID());
+bool ClientListEntry::CheckAuth(uint32 loginserver_account_id, const char *key_password)
+{
+	LogDebug(
+		"ClientListEntry::CheckAuth ls_account_id [{0}] key_password [{1}] plskey [{2}]",
+		loginserver_account_id,
+		key_password,
+		plskey
+	);
+	if (pLSID == loginserver_account_id && strncmp(plskey, key_password, 10) == 0) {
+
+		LogDebug(
+			"ClientListEntry::CheckAuth ls_account_id [{0}] key_password [{1}] plskey [{2}] lsid [{3}] paccountid [{4}]",
+			loginserver_account_id,
+			key_password,
+			plskey,
+			LSID(),
+			paccountid
+		);
+
+		if (paccountid == 0 && LSID() > 0) {
+			int16 default_account_status = WorldConfig::get()->DefaultStatus;
+
+			paccountid = database.CreateAccount(
+				loginserver_account_name,
+				0,
+				default_account_status,
+				source_loginserver,
+				LSID()
+			);
+
 			if (!paccountid) {
-				Log(Logs::Detail, Logs::World_Server,"Error adding local account for LS login: '%s', duplicate name?" ,plsname);
+				LogInfo(
+					"Error adding local account for LS login: [{0}:{1}], duplicate name",
+					source_loginserver,
+					loginserver_account_name
+				);
 				return false;
 			}
-			strn0cpy(paccountname, plsname, sizeof(paccountname));
-			padmin = tmpStatus;
+			strn0cpy(paccountname, loginserver_account_name, sizeof(paccountname));
+			padmin = default_account_status;
 		}
 		std::string lsworldadmin;
-		if (database.GetVariable("honorlsworldadmin", lsworldadmin))
-			if (atoi(lsworldadmin.c_str()) == 1 && pworldadmin != 0 && (padmin < pworldadmin || padmin == 0))
+		if (database.GetVariable("honorlsworldadmin", lsworldadmin)) {
+			if (atoi(lsworldadmin.c_str()) == 1 && pworldadmin != 0 && (padmin < pworldadmin || padmin == 0)) {
 				padmin = pworldadmin;
-		return true;
-	}
-	return false;
-}
-
-bool ClientListEntry::CheckAuth(const char* iName, MD5& iMD5Password) {
-	if (LSAccountID() == 0 && strcmp(paccountname, iName) == 0 && pMD5Pass == iMD5Password)
-		return true;
-	return false;
-}
-
-bool ClientListEntry::CheckAuth(uint32 id, const char* iKey, uint32 ip) {
-	if (pIP==ip && strncmp(plskey, iKey,10) == 0){
-		paccountid = id;
-		database.GetAccountFromID(id,paccountname,&padmin);
+			}
+		}
 		return true;
 	}
 	return false;
@@ -315,13 +372,17 @@ bool ClientListEntry::CheckAuth(uint32 id, const char* iKey, uint32 ip) {
 
 void ClientListEntry::ProcessTellQueue()
 {
-	if (!Server())
+	if (!Server()) {
 		return;
+	}
 
 	ServerPacket *pack;
-	auto it = tell_queue.begin();
+	auto         it = tell_queue.begin();
 	while (it != tell_queue.end()) {
-		pack = new ServerPacket(ServerOP_ChannelMessage, sizeof(ServerChannelMessage_Struct) + strlen((*it)->message) + 1);
+		pack = new ServerPacket(
+			ServerOP_ChannelMessage,
+			sizeof(ServerChannelMessage_Struct) + strlen((*it)->message) + 1
+		);
 		memcpy(pack->pBuffer, *it, pack->size);
 		Server()->SendPacket(pack);
 		safe_delete(pack);
diff --git a/world/cliententry.h b/world/cliententry.h
index 24a837ae9..b4d449c58 100644
--- a/world/cliententry.h
+++ b/world/cliententry.h
@@ -8,49 +8,88 @@
 #include "../common/rulesys.h"
 #include <vector>
 
+typedef enum
+{
+	Never,
+	Offline,
+	Online,
+	CharSelect,
+	Zoning,
+	InZone
+} CLE_Status;
 
-#define CLE_Status_Never		-1
-#define CLE_Status_Offline		0
-#define CLE_Status_Online		1	// Will not overwrite more specific online status
-#define CLE_Status_CharSelect	2
-#define CLE_Status_Zoning		3
-#define CLE_Status_InZone		4
+static const char * CLEStatusString[] = {
+	"Never",
+	"Offline",
+	"Online",
+	"CharSelect",
+	"Zoning",
+	"InZone"
+};
 
 class ZoneServer;
 struct ServerClientList_Struct;
 
 class ClientListEntry {
 public:
-	ClientListEntry(uint32 id, uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin = 0, uint32 ip = 0, uint8 local=0);
+
+	/**
+	 * @param id
+	 * @param in_loginserver_id
+	 * @param in_loginserver_name
+	 * @param in_login_name
+	 * @param in_login_key
+	 * @param in_is_world_admin
+	 * @param ip
+	 * @param local
+	 */
+	ClientListEntry(
+		uint32 id,
+		uint32 in_loginserver_id,
+		const char *in_loginserver_name,
+		const char *in_login_name,
+		const char *in_login_key,
+		int16 in_is_world_admin = 0,
+		uint32 ip = 0,
+		uint8 local = 0
+	);
+
+	/**
+	 * @param id
+	 * @param iZS
+	 * @param scl
+	 * @param iOnline
+	 */
 	ClientListEntry(uint32 id, uint32 iAccID, const char* iAccName, MD5& iMD5Pass, int16 iAdmin = 0);
-	ClientListEntry(uint32 id, ZoneServer* iZS, ServerClientList_Struct* scl, int8 iOnline);
+	ClientListEntry(uint32 id, ZoneServer* iZS, ServerClientList_Struct* scl, CLE_Status iOnline);
 	~ClientListEntry();
 	bool	CheckStale();
-	void	Update(ZoneServer* zoneserver, ServerClientList_Struct* scl, int8 iOnline = CLE_Status_InZone);
+	void	Update(ZoneServer* zoneserver, ServerClientList_Struct* scl, CLE_Status iOnline = CLE_Status::InZone);
 	void	LSUpdate(ZoneServer* zoneserver);
 	void	LSZoneChange(ZoneToZone_Struct* ztz);
-	bool	CheckAuth(uint32 iLSID, const char* key);
+	bool	CheckAuth(uint32 loginserver_account_id, const char* key_password);
 	bool	CheckAuth(const char* iName, MD5& iMD5Password);
 	bool	CheckAuth(uint32 id, const char* key, uint32 ip);
-	void	SetOnline(ZoneServer* iZS, int8 iOnline);
-	void	SetOnline(int8 iOnline = CLE_Status_Online);
+	void	SetOnline(ZoneServer* iZS, CLE_Status iOnline);
+	void	SetOnline(CLE_Status iOnline = CLE_Status::Online);
 	void	SetChar(uint32 iCharID, const char* iCharName);
-	inline int8		Online()		{ return pOnline; }
+	inline CLE_Status Online()		{ return pOnline; }
 	inline const uint32	GetID() const	{ return id; }
 	inline const uint32	GetIP() const	{ return pIP; }
 	inline void			SetIP(const uint32& iIP) { pIP = iIP; }
 	inline void			KeepAlive()		{ stale = 0; }
 	inline uint8			GetStaleCounter() const { return stale; }
-	void	LeavingZone(ZoneServer* iZS = 0, int8 iOnline = CLE_Status_Offline);
+	void	LeavingZone(ZoneServer* iZS = 0, CLE_Status iOnline = CLE_Status::Offline);
 	void	Camp(ZoneServer* iZS = 0);
 
 	// Login Server stuff
+	inline const char*  LoginServer() const   { return source_loginserver; }
 	inline uint32		LSID()	const		{ return pLSID; }
 	inline uint32		LSAccountID() const	{ return pLSID; }
-	inline const char*	LSName() const		{ return plsname; }
+	inline const char*	LSName() const		{ return loginserver_account_name; }
 	inline int16		WorldAdmin() const	{ return pworldadmin; }
 	inline const char*	GetLSKey() const	{ return plskey; }
-	inline const int8	GetOnline() const	{ return pOnline; }
+	inline const CLE_Status	GetOnline() const	{ return pOnline; }
 
 	// Account stuff
 	inline uint32		AccountID() const		{ return paccountid; }
@@ -93,41 +132,42 @@ private:
 
 	const uint32	id;
 	uint32	pIP;
-	int8	pOnline;
+	CLE_Status pOnline;
 	uint8	stale;
 
 	// Login Server stuff
+	char	source_loginserver[64]{}; //Loginserver we came from.
 	uint32	pLSID;
-	char	plsname[32];
-	char	plskey[16];
+	char	loginserver_account_name[32]{};
+	char	plskey[16]{};
 	int16	pworldadmin;		// Login server's suggested admin status setting
 	bool	plocal;
 
 	// Account stuff
 	uint32	paccountid;
-	char	paccountname[32];
+	char	paccountname[32]{};
 	MD5		pMD5Pass;
-	int16	padmin;
+	int16	padmin{};
 
 	// Character info
-	ZoneServer* pzoneserver;
-	uint32	pzone;
-	uint16	pinstance;
-	uint32	pcharid;
-	char	pname[64];
-	uint8	plevel;
-	uint8	pclass_;
-	uint16	prace;
-	uint8	panon;
-	uint8	ptellsoff;
-	uint32	pguild_id;
-	bool	pLFG;
-	uint8	gm;
-	uint8	pClientVersion;
-	uint8	pLFGFromLevel;
-	uint8	pLFGToLevel;
-	bool	pLFGMatchFilter;
-	char	pLFGComments[64];
+	ZoneServer* pzoneserver{};
+	uint32	pzone{};
+	uint16	pinstance{};
+	uint32	pcharid{};
+	char	pname[64]{};
+	uint8	plevel{};
+	uint8	pclass_{};
+	uint16	prace{};
+	uint8	panon{};
+	uint8	ptellsoff{};
+	uint32	pguild_id{};
+	bool	pLFG{};
+	uint8	gm{};
+	uint8	pClientVersion{};
+	uint8	pLFGFromLevel{};
+	uint8	pLFGToLevel{};
+	bool	pLFGMatchFilter{};
+	char	pLFGComments[64]{};
 
 	// Tell Queue -- really a vector :D
 	std::vector<ServerChannelMessage_Struct *> tell_queue;
diff --git a/world/clientlist.cpp b/world/clientlist.cpp
index 1264957a7..92a02b6ec 100644
--- a/world/clientlist.cpp
+++ b/world/clientlist.cpp
@@ -41,7 +41,7 @@ extern ZSList			zoneserver_list;
 uint32 numplayers = 0;	//this really wants to be a member variable of ClientList...
 
 ClientList::ClientList()
-: CLStale_timer(45000)
+: CLStale_timer(10000)
 {
 	NextCLEID = 1;
 
@@ -63,9 +63,7 @@ void ClientList::Process() {
 		if (!iterator.GetData()->Process()) {
 			struct in_addr in;
 			in.s_addr = iterator.GetData()->GetIP();
-			Log(Logs::Detail, Logs::World_Server,"Removing client from %s:%d", inet_ntoa(in), iterator.GetData()->GetPort());
-//the client destructor should take care of this.
-//			iterator.GetData()->Free();
+			LogInfo("Removing client from [{}]:[{}]", inet_ntoa(in), iterator.GetData()->GetPort());
 			iterator.RemoveCurrent();
 		}
 		else
@@ -112,17 +110,17 @@ void ClientList::GetCLEIP(uint32 iIP) {
 		countCLEIPs = iterator.GetData();		
 		if ((countCLEIPs->GetIP() == iIP) && ((countCLEIPs->Admin() < (RuleI(World, ExemptMaxClientsStatus))) || (RuleI(World, ExemptMaxClientsStatus) < 0))) { // If the IP matches, and the connection admin status is below the exempt status, or exempt status is less than 0 (no-one is exempt)
 			IPInstances++; // Increment the occurences of this IP address
-			Log(Logs::General, Logs::Client_Login, "Account ID: %i Account Name: %s IP: %s.", countCLEIPs->LSID(), countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
+			LogClientLogin("Account ID: [{}] Account Name: [{}] IP: [{}]", countCLEIPs->LSID(), countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
 			if (RuleB(World, EnableIPExemptions)) {
-				Log(Logs::General, Logs::Client_Login, "Account ID: %i Account Name: %s IP: %s IP Instances: %i Max IP Instances: %i", countCLEIPs->LSID(), countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str(), IPInstances, database.GetIPExemption(long2ip(countCLEIPs->GetIP()).c_str()));
+				LogClientLogin("Account ID: [{}] Account Name: [{}] IP: [{}] IP Instances: [{}] Max IP Instances: [{}]", countCLEIPs->LSID(), countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str(), IPInstances, database.GetIPExemption(long2ip(countCLEIPs->GetIP()).c_str()));
 				if (IPInstances > database.GetIPExemption(long2ip(countCLEIPs->GetIP()).c_str())) {
 					if(RuleB(World, IPLimitDisconnectAll)) {
-						Log(Logs::General, Logs::Client_Login, "Disconnect: All accounts on IP %s", long2ip(countCLEIPs->GetIP()).c_str());
+						LogClientLogin("Disconnect: All accounts on IP [{}]", long2ip(countCLEIPs->GetIP()).c_str());
 						DisconnectByIP(iIP);
 						return;
 					} else {
-						Log(Logs::General, Logs::Client_Login, "Disconnect: Account %s on IP %s.", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
-						countCLEIPs->SetOnline(CLE_Status_Offline);
+						LogClientLogin("Disconnect: Account [{}] on IP [{}]", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
+						countCLEIPs->SetOnline(CLE_Status::Offline);
 						iterator.RemoveCurrent();
 						continue;
 					}
@@ -130,38 +128,38 @@ void ClientList::GetCLEIP(uint32 iIP) {
 			} else {
 				if (IPInstances > (RuleI(World, MaxClientsPerIP))) { // If the number of connections exceeds the lower limit
 					if (RuleB(World, MaxClientsSetByStatus)) { // If MaxClientsSetByStatus is set to True, override other IP Limit Rules
-						Log(Logs::General, Logs::Client_Login, "Account ID: %i Account Name: %s IP: %s IP Instances: %i Max IP Instances: %i", countCLEIPs->LSID(), countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str(), IPInstances, countCLEIPs->Admin());
+						LogClientLogin("Account ID: [{}] Account Name: [{}] IP: [{}] IP Instances: [{}] Max IP Instances: [{}]", countCLEIPs->LSID(), countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str(), IPInstances, countCLEIPs->Admin());
 						if (IPInstances > countCLEIPs->Admin()) { // The IP Limit is set by the status of the account if status > MaxClientsPerIP	
 							if(RuleB(World, IPLimitDisconnectAll)) {
-								Log(Logs::General, Logs::Client_Login, "Disconnect: All accounts on IP %s", long2ip(countCLEIPs->GetIP()).c_str());
+								LogClientLogin("Disconnect: All accounts on IP [{}]", long2ip(countCLEIPs->GetIP()).c_str());
 								DisconnectByIP(iIP);
 								return;
 							} else {
-								Log(Logs::General, Logs::Client_Login, "Disconnect: Account %s on IP %s.", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
-								countCLEIPs->SetOnline(CLE_Status_Offline); // Remove the connection
+								LogClientLogin("Disconnect: Account [{}] on IP [{}]", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
+								countCLEIPs->SetOnline(CLE_Status::Offline); // Remove the connection
 								iterator.RemoveCurrent();
 								continue;
 							}
 						}
 					} else if ((countCLEIPs->Admin() < RuleI(World, AddMaxClientsStatus)) || (RuleI(World, AddMaxClientsStatus) < 0)) { // Else if the Admin status of the connection is not eligible for the higher limit, or there is no higher limit (AddMaxClientStatus < 0)
 						if(RuleB(World, IPLimitDisconnectAll)) {								
-							Log(Logs::General, Logs::Client_Login, "Disconnect: All accounts on IP %s", long2ip(countCLEIPs->GetIP()).c_str());
+							LogClientLogin("Disconnect: All accounts on IP [{}]", long2ip(countCLEIPs->GetIP()).c_str());
 							DisconnectByIP(iIP);
 							return;
 						} else {
-							Log(Logs::General, Logs::Client_Login, "Disconnect: Account %s on IP %s.", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
-							countCLEIPs->SetOnline(CLE_Status_Offline); // Remove the connection
+							LogClientLogin("Disconnect: Account [{}] on IP [{}]", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
+							countCLEIPs->SetOnline(CLE_Status::Offline); // Remove the connection
 							iterator.RemoveCurrent();
 							continue;
 						}
 					} else if (IPInstances > RuleI(World, AddMaxClientsPerIP)) { // else they are eligible for the higher limit, but if they exceed that	
 						if(RuleB(World, IPLimitDisconnectAll)) {
-							Log(Logs::General, Logs::Client_Login, "Disconnect: All accounts on IP %s", long2ip(countCLEIPs->GetIP()).c_str());
+							LogClientLogin("Disconnect: All accounts on IP [{}]", long2ip(countCLEIPs->GetIP()).c_str());
 							DisconnectByIP(iIP);
 							return;
 						} else {
-							Log(Logs::General, Logs::Client_Login, "Disconnect: Account %s on IP %s.", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
-							countCLEIPs->SetOnline(CLE_Status_Offline); // Remove the connection
+							LogClientLogin("Disconnect: Account [{}] on IP [{}]", countCLEIPs->LSName(), long2ip(countCLEIPs->GetIP()).c_str());
+							countCLEIPs->SetOnline(CLE_Status::Offline); // Remove the connection
 							iterator.RemoveCurrent();
 							continue;
 						}
@@ -182,7 +180,7 @@ uint32 ClientList::GetCLEIPCount(uint32 iIP) {
 
 	while (iterator.MoreElements()) {
 		countCLEIPs = iterator.GetData();
-		if ((countCLEIPs->GetIP() == iIP) && ((countCLEIPs->Admin() < (RuleI(World, ExemptMaxClientsStatus))) || (RuleI(World, ExemptMaxClientsStatus) < 0)) && countCLEIPs->Online() >= CLE_Status_Online) { // If the IP matches, and the connection admin status is below the exempt status, or exempt status is less than 0 (no-one is exempt)
+		if ((countCLEIPs->GetIP() == iIP) && ((countCLEIPs->Admin() < (RuleI(World, ExemptMaxClientsStatus))) || (RuleI(World, ExemptMaxClientsStatus) < 0)) && countCLEIPs->Online() >= CLE_Status::Online) { // If the IP matches, and the connection admin status is below the exempt status, or exempt status is less than 0 (no-one is exempt)
 			IPInstances++; // Increment the occurences of this IP address
 		}
 		iterator.Advance();
@@ -208,7 +206,7 @@ void ClientList::DisconnectByIP(uint32 iIP) {
 				zoneserver_list.SendPacket(pack);
 				safe_delete(pack);
 			}
-			countCLEIPs->SetOnline(CLE_Status_Offline);
+			countCLEIPs->SetOnline(CLE_Status::Offline);
 			iterator.RemoveCurrent();
 		}
 		iterator.Advance();
@@ -316,8 +314,8 @@ void ClientList::SendCLEList(const int16& admin, const char* to, WorldTCPConnect
 }
 
 
-void ClientList::CLEAdd(uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin, uint32 ip, uint8 local) {
-	auto tmp = new ClientListEntry(GetNextCLEID(), iLSID, iLoginName, iLoginKey, iWorldAdmin, ip, local);
+void ClientList::CLEAdd(uint32 iLSID, const char *iLoginServerName, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin, uint32 ip, uint8 local) {
+	auto tmp = new ClientListEntry(GetNextCLEID(), iLSID, iLoginServerName, iLoginName, iLoginKey, iWorldAdmin, ip, local);
 
 	clientlist.Append(tmp);
 }
@@ -343,10 +341,10 @@ void ClientList::ClientUpdate(ZoneServer* zoneserver, ServerClientList_Struct* s
 		if (iterator.GetData()->GetID() == scl->wid) {
 			cle = iterator.GetData();
 			if (scl->remove == 2){
-				cle->LeavingZone(zoneserver, CLE_Status_Offline);
+				cle->LeavingZone(zoneserver, CLE_Status::Offline);
 			}
 			else if (scl->remove == 1)
-				cle->LeavingZone(zoneserver, CLE_Status_Zoning);
+				cle->LeavingZone(zoneserver, CLE_Status::Zoning);
 			else
 				cle->Update(zoneserver, scl);
 			return;
@@ -354,11 +352,11 @@ void ClientList::ClientUpdate(ZoneServer* zoneserver, ServerClientList_Struct* s
 		iterator.Advance();
 	}
 	if (scl->remove == 2)
-		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status_Online);
+		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::Online);
 	else if (scl->remove == 1)
-		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status_Zoning);
+		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::Zoning);
 	else
-		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status_InZone);
+		cle = new ClientListEntry(GetNextCLEID(), zoneserver, scl, CLE_Status::InZone);
 	clientlist.Insert(cle);
 	zoneserver->ChangeWID(scl->charid, cle->GetID());
 }
@@ -377,52 +375,18 @@ void ClientList::CLEKeepAlive(uint32 numupdates, uint32* wid) {
 	}
 }
 
-
-ClientListEntry* ClientList::CheckAuth(uint32 id, const char* iKey, uint32 ip ) {
-	LinkedListIterator<ClientListEntry*> iterator(clientlist);
+ClientListEntry *ClientList::CheckAuth(uint32 iLSID, const char *iKey)
+{
+	LinkedListIterator<ClientListEntry *> iterator(clientlist);
 
 	iterator.Reset();
-	while(iterator.MoreElements()) {
-		if (iterator.GetData()->CheckAuth(id, iKey, ip))
+	while (iterator.MoreElements()) {
+		if (iterator.GetData()->CheckAuth(iLSID, iKey)) {
 			return iterator.GetData();
+		}
 		iterator.Advance();
 	}
-	return 0;
-}
-ClientListEntry* ClientList::CheckAuth(uint32 iLSID, const char* iKey) {
-	LinkedListIterator<ClientListEntry*> iterator(clientlist);
 
-	iterator.Reset();
-	while(iterator.MoreElements()) {
-		if (iterator.GetData()->CheckAuth(iLSID, iKey))
-			return iterator.GetData();
-		iterator.Advance();
-	}
-	return 0;
-}
-
-ClientListEntry* ClientList::CheckAuth(const char* iName, const char* iPassword) {
-	LinkedListIterator<ClientListEntry*> iterator(clientlist);
-	MD5 tmpMD5(iPassword);
-
-	iterator.Reset();
-	while(iterator.MoreElements()) {
-		if (iterator.GetData()->CheckAuth(iName, tmpMD5))
-			return iterator.GetData();
-		iterator.Advance();
-	}
-	int16 tmpadmin;
-
-	//Log.LogDebugType(Logs::Detail, Logs::World_Server,"Login with '%s' and '%s'", iName, iPassword);
-
-	uint32 accid = database.CheckLogin(iName, iPassword, &tmpadmin);
-	if (accid) {
-		uint32 lsid = 0;
-		database.GetAccountIDByName(iName, &tmpadmin, &lsid);
-		auto tmp = new ClientListEntry(GetNextCLEID(), lsid, iName, tmpMD5, tmpadmin, 0, 0);
-		clientlist.Append(tmp);
-		return tmp;
-	}
 	return 0;
 }
 
@@ -435,7 +399,7 @@ void ClientList::SendOnlineGuildMembers(uint32 FromID, uint32 GuildID)
 
 	if(!from)
 	{
-		Log(Logs::Detail, Logs::World_Server,"Invalid client. FromID=%i GuildID=%i", FromID, GuildID);
+		LogInfo("Invalid client. FromID=[{}] GuildID=[{}]", FromID, GuildID);
 		return;
 	}
 
@@ -538,7 +502,7 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S
 		countcle = countclients.GetData();
 		const char* tmpZone = database.GetZoneName(countcle->zone());
 		if (
-	(countcle->Online() >= CLE_Status_Zoning) &&
+	(countcle->Online() >= CLE_Status::Zoning) &&
 	(!countcle->GetGM() || countcle->Anon() != 1 || admin >= countcle->Admin()) &&
 	(whom == 0 || (
 		((countcle->Admin() >= 80 && countcle->GetGM()) || whom->gmlookup == 0xFFFF) &&
@@ -618,7 +582,7 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S
 
 		const char* tmpZone = database.GetZoneName(cle->zone());
 		if (
-	(cle->Online() >= CLE_Status_Zoning) &&
+	(cle->Online() >= CLE_Status::Zoning) &&
 	(!cle->GetGM() || cle->Anon() != 1 || admin >= cle->Admin()) &&
 	(whom == 0 || (
 		((cle->Admin() >= 80 && cle->GetGM()) || whom->gmlookup == 0xFFFF) &&
@@ -760,7 +724,7 @@ void ClientList::SendWhoAll(uint32 fromid,const char* to, int16 admin, Who_All_S
 	safe_delete_array(output);
 	}
 	catch(...){
-		Log(Logs::Detail, Logs::World_Server,"Unknown error in world's SendWhoAll (probably mem error), ignoring...");
+		LogInfo("Unknown error in world's SendWhoAll (probably mem error), ignoring");
 		return;
 	}
 }
@@ -791,7 +755,7 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon
 		Friend_[Seperator - FriendsPointer] = 0;
 
 		ClientListEntry* CLE = FindCharacter(Friend_);
-		if(CLE && CLE->name() && (CLE->Online() >= CLE_Status_Zoning) && !(CLE->GetGM() && CLE->Anon())) {
+		if(CLE && CLE->name() && (CLE->Online() >= CLE_Status::Zoning) && !(CLE->GetGM() && CLE->Anon())) {
 			FriendsCLEs.push_back(CLE);
 			TotalLength += strlen(CLE->name());
 			int GuildNameLength = strlen(guild_mgr.GetGuildName(CLE->GuildID()));
@@ -903,7 +867,7 @@ void ClientList::SendFriendsWho(ServerFriendsWho_Struct *FriendsWho, WorldTCPCon
 		safe_delete(pack2);
 	}
 	catch(...){
-		Log(Logs::Detail, Logs::World_Server,"Unknown error in world's SendFriendsWho (probably mem error), ignoring...");
+		LogInfo("Unknown error in world's SendFriendsWho (probably mem error), ignoring");
 		return;
 	}
 }
@@ -1003,7 +967,7 @@ void ClientList::ConsoleSendWhoAll(const char* to, int16 admin, Who_All_Struct*
 		cle = iterator.GetData();
 		const char* tmpZone = database.GetZoneName(cle->zone());
 		if (
-			(cle->Online() >= CLE_Status_Zoning)
+			(cle->Online() >= CLE_Status::Zoning)
 			&& (whom == 0 || (
 				((cle->Admin() >= 80 && cle->GetGM()) || whom->gmlookup == 0xFFFF) &&
 				(whom->lvllow == 0xFFFF || (cle->level() >= whom->lvllow && cle->level() <= whom->lvlhigh)) &&
@@ -1139,7 +1103,6 @@ Client* ClientList::FindByAccountID(uint32 account_id) {
 
 	iterator.Reset();
 	while(iterator.MoreElements()) {
-		Log(Logs::Detail, Logs::World_Server, "ClientList[0x%08x]::FindByAccountID(%p) iterator.GetData()[%p]", this, account_id, iterator.GetData());
 		if (iterator.GetData()->GetAccountID() == account_id) {
 			Client* tmp = iterator.GetData();
 			return tmp;
@@ -1154,7 +1117,6 @@ Client* ClientList::FindByName(char* charname) {
 
 	iterator.Reset();
 	while(iterator.MoreElements()) {
-		Log(Logs::Detail, Logs::World_Server, "ClientList[0x%08x]::FindByName(\"%s\") iterator.GetData()[%p]", this, charname, iterator.GetData());
 		if (iterator.GetData()->GetCharName() == charname) {
 			Client* tmp = iterator.GetData();
 			return tmp;
@@ -1277,7 +1239,33 @@ void ClientList::UpdateClientGuild(uint32 char_id, uint32 guild_id) {
 	}
 }
 
+void ClientList::RemoveCLEByLSID(uint32 iLSID)
+{
+	LinkedListIterator<ClientListEntry *> iterator(clientlist);
 
+	iterator.Reset();
+	while (iterator.MoreElements()) {
+		if (iterator.GetData()->LSAccountID() == iLSID) {
+			iterator.RemoveCurrent();
+		}
+		else {
+			iterator.Advance();
+		}
+	}
+}
+
+bool ClientList::IsAccountInGame(uint32 iLSID) {
+	LinkedListIterator<ClientListEntry*> iterator(clientlist);
+
+	while (iterator.MoreElements()) {
+		if (iterator.GetData()->LSID() == iLSID && iterator.GetData()->Online() == CLE_Status::InZone) {
+			return true;
+		}
+		iterator.Advance();
+	}
+
+	return false;
+}
 
 int ClientList::GetClientCount() {
 	return(numplayers);
diff --git a/world/clientlist.h b/world/clientlist.h
index 5b3bad297..3386a6f14 100644
--- a/world/clientlist.h
+++ b/world/clientlist.h
@@ -52,8 +52,6 @@ public:
 	void	ClientUpdate(ZoneServer* zoneserver, ServerClientList_Struct* scl);
 	void	CLERemoveZSRef(ZoneServer* iZS);
 	ClientListEntry* CheckAuth(uint32 iLSID, const char* iKey);
-	ClientListEntry* CheckAuth(const char* iName, const char* iPassword);
-	ClientListEntry* CheckAuth(uint32 id, const char* iKey, uint32 ip);
 	ClientListEntry* FindCharacter(const char* name);
 	ClientListEntry* FindCLEByAccountID(uint32 iAccID);
 	ClientListEntry* FindCLEByCharacterID(uint32 iCharID);
@@ -64,8 +62,10 @@ public:
 	void	DisconnectByIP(uint32 iIP);
 	void	CLCheckStale();
 	void	CLEKeepAlive(uint32 numupdates, uint32* wid);
-	void	CLEAdd(uint32 iLSID, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin = 0, uint32 ip = 0, uint8 local=0);
+	void	CLEAdd(uint32 iLSID, const char* iLoginServerName, const char* iLoginName, const char* iLoginKey, int16 iWorldAdmin = 0, uint32 ip = 0, uint8 local=0);
 	void	UpdateClientGuild(uint32 char_id, uint32 guild_id);
+	void	RemoveCLEByLSID(uint32 iLSID);
+	bool    IsAccountInGame(uint32 iLSID);
 
 	int GetClientCount();
 	void GetClients(const char *zone_name, std::vector<ClientListEntry *> &into);
diff --git a/world/console.cpp b/world/console.cpp
index 981074884..90e5f7c71 100644
--- a/world/console.cpp
+++ b/world/console.cpp
@@ -44,7 +44,14 @@ extern LoginServerList loginserverlist;
 struct EQ::Net::ConsoleLoginStatus CheckLogin(const std::string &username, const std::string &password)
 {
 	struct EQ::Net::ConsoleLoginStatus ret;
-	ret.account_id = database.CheckLogin(username.c_str(), password.c_str());
+
+	std::string prefix   = "eqemu";
+	std::string raw_user = "";
+
+	ParseAccountString(username, raw_user, prefix);
+
+	ret.account_id = database.CheckLogin(raw_user.c_str(), password.c_str(), prefix.c_str());
+
 	if (ret.account_id == 0) {
 		return ret;
 	}
@@ -229,6 +236,7 @@ void ConsoleMd5(
 
 	uint8 md5[16];
 	MD5::Generate((const uchar *) args[0].c_str(), strlen(args[0].c_str()), md5);
+
 	connection->SendLine(
 		StringFormat(
 			"MD5: %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
@@ -248,7 +256,8 @@ void ConsoleMd5(
 			md5[13],
 			md5[14],
 			md5[15]
-		));
+		)
+	);
 }
 
 /**
@@ -581,7 +590,7 @@ void ConsoleZoneBootup(
 		strcpy(&tmpname[1], connection->UserName().c_str());
 
 		Log(Logs::Detail,
-			Logs::World_Server,
+			Logs::WorldServer,
 			"Console ZoneBootup: %s, %s, %s",
 			tmpname,
 			args[1].c_str(),
@@ -711,20 +720,17 @@ void ConsoleSetPass(
 		connection->SendLine("Format: setpass accountname password");
 	}
 	else {
+		std::string prefix   = "eqemu";
+		std::string raw_user = "";
+
+		ParseAccountString(args[0], raw_user, prefix);
+
 		int16  tmpstatus = 0;
-		uint32 tmpid     = database.GetAccountIDByName(args[0].c_str(), &tmpstatus);
+		uint32 tmpid     = database.GetAccountIDByName(raw_user.c_str(), prefix.c_str(), &tmpstatus);
+
 		if (!tmpid) {
 			connection->SendLine("Error: Account not found");
 		}
-		else if (tmpstatus > connection->Admin()) {
-			connection->SendLine("Cannot change password: Account's status is higher than yours");
-		}
-		else if (database.SetLocalPassword(tmpid, args[1].c_str())) {
-			connection->SendLine("Password changed.");
-		}
-		else {
-			connection->SendLine("Error changing password.");
-		}
 	}
 }
 
@@ -901,4 +907,4 @@ void RegisterConsoleFunctions(std::unique_ptr<EQ::Net::ConsoleServer>& console)
 	console->RegisterCall("zonestatus", 50, "zonestatus", std::bind(ConsoleZoneStatus, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));console->RegisterCall("ping", 50, "ping", std::bind(ConsoleNull, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 	console->RegisterCall("quit", 50, "quit", std::bind(ConsoleQuit, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
 	console->RegisterCall("exit", 50, "exit", std::bind(ConsoleQuit, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
-}
+}
\ No newline at end of file
diff --git a/world/console.old.cpp b/world/console.old.cpp
index fa5ca0ffe..185b95751 100644
--- a/world/console.old.cpp
+++ b/world/console.old.cpp
@@ -88,7 +88,7 @@ void Console::Die() {
 	state = CONSOLE_STATE_CLOSED;
 	struct in_addr in;
 	in.s_addr = GetIP();
-	Log(Logs::Detail, Logs::World_Server,"Removing console from %s:%d",inet_ntoa(in),GetPort());
+	LogInfo("Removing console from [{}]:[{}]",inet_ntoa(in),GetPort());
 	tcpc->Disconnect();
 }
 
@@ -219,7 +219,7 @@ bool Console::Process() {
 	if (!tcpc->Connected()) {
 		struct in_addr in;
 		in.s_addr = GetIP();
-		Log(Logs::Detail, Logs::World_Server,"Removing console (!tcpc->Connected) from %s:%d",inet_ntoa(in),GetPort());
+		LogInfo("Removing console (!tcpc->Connected) from [{}]:[{}]",inet_ntoa(in),GetPort());
 		return false;
 	}
 	//if we have not gotten the special markers after this timer, send login prompt
@@ -252,7 +252,7 @@ bool Console::Process() {
 		SendMessage(1, "Timeout, disconnecting...");
 		struct in_addr in;
 		in.s_addr = GetIP();
-		Log(Logs::Detail, Logs::World_Server,"TCP connection timeout from %s:%d",inet_ntoa(in),GetPort());
+		LogInfo("TCP connection timeout from [{}]:[{}]",inet_ntoa(in),GetPort());
 		return false;
 	}
 
@@ -261,29 +261,29 @@ bool Console::Process() {
 		in.s_addr = GetIP();
 		if(tcpc->GetPacketMode() == EmuTCPConnection::packetModeZone) {
 			auto zs = new ZoneServer(tcpc);
-			Log(Logs::Detail, Logs::World_Server,"New zoneserver #%d from %s:%d", zs->GetID(), inet_ntoa(in), GetPort());
+			LogInfo("New zoneserver #[{}] from [{}]:[{}]", zs->GetID(), inet_ntoa(in), GetPort());
 			zoneserver_list.Add(zs);
 			numzones++;
 			tcpc = 0;
 		} else if(tcpc->GetPacketMode() == EmuTCPConnection::packetModeLauncher) {
-			Log(Logs::Detail, Logs::World_Server,"New launcher from %s:%d", inet_ntoa(in), GetPort());
+			LogInfo("New launcher from [{}]:[{}]", inet_ntoa(in), GetPort());
 			launcher_list.Add(tcpc);
 			tcpc = 0;
 		} 
 		else if(tcpc->GetPacketMode() == EmuTCPConnection::packetModeUCS)
 		{
-			Log(Logs::Detail, Logs::World_Server,"New UCS Connection from %s:%d", inet_ntoa(in), GetPort());
+			LogInfo("New UCS Connection from [{}]:[{}]", inet_ntoa(in), GetPort());
 			UCSLink.SetConnection(tcpc);
 			tcpc = 0;
 		}
 		else if(tcpc->GetPacketMode() == EmuTCPConnection::packetModeQueryServ)
 		{
-			Log(Logs::Detail, Logs::World_Server,"New QS Connection from %s:%d", inet_ntoa(in), GetPort());
+			LogInfo("New QS Connection from [{}]:[{}]", inet_ntoa(in), GetPort());
 			QSLink.SetConnection(tcpc);
 			tcpc = 0;
 		}  
 		else {
-			Log(Logs::Detail, Logs::World_Server,"Unsupported packet mode from %s:%d", inet_ntoa(in), GetPort());
+			LogInfo("Unsupported packet mode from [{}]:[{}]", inet_ntoa(in), GetPort());
 		}
 		return false;
 	}
@@ -440,7 +440,7 @@ void Console::ProcessCommand(const char* command) {
 				state = CONSOLE_STATE_CLOSED;
 				return;
 			}
-			Log(Logs::Detail, Logs::World_Server,"TCP console authenticated: Username=%s, Admin=%d",paccountname,admin);
+			LogInfo("TCP console authenticated: Username=[{}], Admin=[{}]",paccountname,admin);
 			SendMessage(1, 0);
 			SendMessage(2, "Login accepted.");
 			state = CONSOLE_STATE_CONNECTED;
@@ -737,7 +737,7 @@ void Console::ProcessCommand(const char* command) {
 					tmpname[0] = '*';
 					strcpy(&tmpname[1], paccountname);
 
-					Log(Logs::Detail, Logs::World_Server,"Console ZoneBootup: %s, %s, %s",tmpname,sep.arg[2],sep.arg[1]);
+					LogInfo("Console ZoneBootup: [{}], [{}], [{}]",tmpname,sep.arg[2],sep.arg[1]);
 					zoneserver_list.SOPZoneBootup(tmpname, atoi(sep.arg[1]), sep.arg[2], (bool) (strcasecmp(sep.arg[3], "static") == 0));
 				}
 			}
@@ -821,7 +821,7 @@ void Console::ProcessCommand(const char* command) {
 				#endif
 				RunLoops = true;
 				SendMessage(1, "  Login Server Reconnect manually restarted by Console");
-				Log(Logs::Detail, Logs::World_Server,"Login Server Reconnect manually restarted by Console");
+				LogInfo("Login Server Reconnect manually restarted by Console");
 			}
 			else if (strcasecmp(sep.arg[0], "zonelock") == 0 && admin >= consoleZoneStatus) {
 				if (strcasecmp(sep.arg[1], "list") == 0) {
diff --git a/world/eqemu_api_world_data_service.cpp b/world/eqemu_api_world_data_service.cpp
index 8a5291824..99cbcebe1 100644
--- a/world/eqemu_api_world_data_service.cpp
+++ b/world/eqemu_api_world_data_service.cpp
@@ -32,6 +32,10 @@ void callGetZoneList(Json::Value &response)
 	for (auto &zone : zoneserver_list.getZoneServerList()) {
 		Json::Value row;
 
+		if (!zone->IsConnected()) {
+			continue;
+		}
+
 		row["booting_up"]           = zone->IsBootingUp();
 		row["client_address"]       = zone->GetCAddress();
 		row["client_local_address"] = zone->GetCLocalAddress();
diff --git a/world/eql_config.cpp b/world/eql_config.cpp
index 1a1536591..9c065acb5 100644
--- a/world/eql_config.cpp
+++ b/world/eql_config.cpp
@@ -42,7 +42,7 @@ void EQLConfig::LoadSettings() {
     std::string query = StringFormat("SELECT dynamics FROM launcher WHERE name = '%s'", namebuf);
     auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "EQLConfig::LoadSettings: %s", results.ErrorMessage().c_str());
+		LogError("EQLConfig::LoadSettings: {}", results.ErrorMessage().c_str());
 	}
     else {
         auto row = results.begin();
@@ -52,7 +52,7 @@ void EQLConfig::LoadSettings() {
 	query = StringFormat("SELECT zone, port FROM launcher_zones WHERE launcher = '%s'", namebuf);
 	results = database.QueryDatabase(query);
 	if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "EQLConfig::LoadSettings: %s", results.ErrorMessage().c_str());
+        LogError("EQLConfig::LoadSettings: {}", results.ErrorMessage().c_str());
         return;
     }
 
@@ -199,7 +199,7 @@ bool EQLConfig::ChangeStaticZone(Const_char *short_name, uint16 port) {
 	res = m_zones.find(short_name);
 	if(res == m_zones.end()) {
 		//not found.
-		Log(Logs::General, Logs::Error, "Update for unknown zone %s", short_name);
+		LogError("Update for unknown zone {}", short_name);
 		return false;
 	}
 
@@ -235,7 +235,7 @@ bool EQLConfig::DeleteStaticZone(Const_char *short_name) {
 	res = m_zones.find(short_name);
 	if(res == m_zones.end()) {
 		//not found.
-		Log(Logs::General, Logs::Error, "Update for unknown zone %s", short_name);
+		LogError("Update for unknown zone {}", short_name);
 		return false;
 	}
 
diff --git a/world/eqw_http_handler.cpp b/world/eqw_http_handler.cpp
index 9e0effb1e..5ae1b8b60 100644
--- a/world/eqw_http_handler.cpp
+++ b/world/eqw_http_handler.cpp
@@ -139,11 +139,11 @@ bool EQWHTTPHandler::CheckAuth() const {
 	int16 status = 0;
 	uint32 acctid = database.CheckLogin(m_username.c_str(), m_password.c_str(), &status);
 	if(acctid == 0) {
-		Log(Logs::Detail, Logs::World_Server, "Login autentication failed for %s with '%s'", m_username.c_str(), m_password.c_str());
+		LogInfo("Login autentication failed for [{}] with [{}]", m_username.c_str(), m_password.c_str());
 		return(false);
 	}
 	if(status < httpLoginStatus) {
-		Log(Logs::Detail, Logs::World_Server, "Login of %s failed: status too low.", m_username.c_str());
+		LogInfo("Login of [{}] failed: status too low", m_username.c_str());
 		return(false);
 	}
 
@@ -278,29 +278,29 @@ void EQWHTTPServer::CreateNewConnection(uint32 ID, SOCKET in_socket, uint32 irIP
 }
 
 void EQWHTTPServer::Stop() {
-	Log(Logs::Detail, Logs::World_Server, "Requesting that HTTP Service stop.");
+	LogInfo("Requesting that HTTP Service stop");
 	m_running = false;
 	Close();
 }
 
 bool EQWHTTPServer::Start(uint16 port, const char *mime_file) {
 	if(m_running) {
-		Log(Logs::Detail, Logs::World_Server, "HTTP Service is already running on port %d", m_port);
+		LogInfo("HTTP Service is already running on port [{}]", m_port);
 		return(false);
 	}
 
 	//load up our nice mime types
 	if(!EQWHTTPHandler::LoadMimeTypes(mime_file)) {
-		Log(Logs::Detail, Logs::World_Server, "Failed to load mime types from '%s'", mime_file);
+		LogInfo("Failed to load mime types from [{}]", mime_file);
 		return(false);
 	} else {
-		Log(Logs::Detail, Logs::World_Server, "Loaded mime types from %s", mime_file);
+		LogInfo("Loaded mime types from [{}]", mime_file);
 	}
 
 	//fire up the server thread
 	char errbuf[TCPServer_ErrorBufferSize];
 	if(!Open(port, errbuf)) {
-		Log(Logs::Detail, Logs::World_Server, "Unable to bind to port %d for HTTP service: %s", port, errbuf);
+		LogInfo("Unable to bind to port [{}] for HTTP service: [{}]", port, errbuf);
 		return(false);
 	}
 
diff --git a/world/eqw_parser.cpp b/world/eqw_parser.cpp
index b0604924e..46cc4465c 100644
--- a/world/eqw_parser.cpp
+++ b/world/eqw_parser.cpp
@@ -65,7 +65,7 @@ EQWParser::EQWParser() {
 	my_perl = perl_alloc();
 	_empty_sv = newSV(0);
 	if (!my_perl) {
-		Log(Logs::Detail, Logs::World_Server, "Error: perl_alloc failed!");
+		LogInfo("Error: perl_alloc failed!");
 	}
 	else {
 		DoInit();
@@ -184,10 +184,10 @@ void EQWParser::DoInit() {
 
 
 #ifdef EMBPERL_PLUGIN
-	Log(Logs::Detail, Logs::World_Server, "Loading worldui perl plugins.");
+	LogInfo("Loading worldui perl plugins");
 	std::string err;
 	if(!eval_file("world", "worldui.pl", err)) {
-		Log(Logs::Detail, Logs::World_Server, "Warning - world.pl: %s", err.c_str());
+		LogInfo("Warning - world.pl: [{}]", err.c_str());
 	}
 
 	eval_pv(
diff --git a/world/launcher_link.cpp b/world/launcher_link.cpp
index 83c51947b..d60933b41 100644
--- a/world/launcher_link.cpp
+++ b/world/launcher_link.cpp
@@ -79,25 +79,25 @@ void LauncherLink::ProcessMessage(uint16 opcode, EQ::Net::Packet &p)
 		break;
 	}
 	case ServerOP_ZAAuth: {
-		Log(Logs::Detail, Logs::World_Server, "Got authentication from %s when they are already authenticated.", m_name.c_str());
+		LogInfo("Got authentication from [{}] when they are already authenticated", m_name.c_str());
 		break;
 	}
 	case ServerOP_LauncherConnectInfo: {
 		const LauncherConnectInfo *it = (const LauncherConnectInfo *)pack->pBuffer;
 		if (HasName()) {
-			Log(Logs::Detail, Logs::World_Server, "Launcher '%s' received an additional connect packet with name '%s'. Ignoring.", m_name.c_str(), it->name);
+			LogInfo("Launcher [{}] received an additional connect packet with name [{}]. Ignoring", m_name.c_str(), it->name);
 			break;
 		}
 		m_name = it->name;
 
 		EQLConfig *config = launcher_list.GetConfig(m_name.c_str());
 		if (config == nullptr) {
-			Log(Logs::Detail, Logs::World_Server, "Unknown launcher '%s' connected. Disconnecting.", it->name);
+			LogInfo("Unknown launcher [{}] connected. Disconnecting", it->name);
 			Disconnect();
 			break;
 		}
 
-		Log(Logs::Detail, Logs::World_Server, "Launcher Identified itself as '%s'. Loading zone list.", it->name);
+		LogInfo("Launcher Identified itself as [{}]. Loading zone list", it->name);
 
 		std::vector<LauncherZone> result;
 		//database.GetLauncherZones(it->name, result);
@@ -111,7 +111,7 @@ void LauncherLink::ProcessMessage(uint16 opcode, EQ::Net::Packet &p)
 			zs.port = cur->port;
 			zs.up = false;
 			zs.starts = 0;
-			Log(Logs::Detail, Logs::World_Server, "%s: Loaded zone '%s' on port %d", m_name.c_str(), cur->name.c_str(), zs.port);
+			LogInfo("[{}]: Loaded zone [{}] on port [{}]", m_name.c_str(), cur->name.c_str(), zs.port);
 			m_states[cur->name] = zs;
 		}
 
@@ -127,17 +127,17 @@ void LauncherLink::ProcessMessage(uint16 opcode, EQ::Net::Packet &p)
 		std::map<std::string, ZoneState>::iterator res;
 		res = m_states.find(it->short_name);
 		if (res == m_states.end()) {
-			Log(Logs::Detail, Logs::World_Server, "%s: reported state for zone %s which it does not have.", m_name.c_str(), it->short_name);
+			LogInfo("[{}]: reported state for zone [{}] which it does not have", m_name.c_str(), it->short_name);
 			break;
 		}
-		Log(Logs::Detail, Logs::World_Server, "%s: %s reported state %s (%d starts)", m_name.c_str(), it->short_name, it->running ? "STARTED" : "STOPPED", it->start_count);
+		LogInfo("[{}]: [{}] reported state [{}] ([{}] starts)", m_name.c_str(), it->short_name, it->running ? "STARTED" : "STOPPED", it->start_count);
 		res->second.up = it->running;
 		res->second.starts = it->start_count;
 		break;
 	}
 	default:
 	{
-		Log(Logs::Detail, Logs::World_Server, "Unknown ServerOPcode from launcher 0x%04x, size %d", pack->opcode, pack->size);
+		LogInfo("Unknown ServerOPcode from launcher {:#04x}, size [{}]", pack->opcode, pack->size);
 		DumpPacket(pack->pBuffer, pack->size);
 		break;
 	}
@@ -153,7 +153,7 @@ void LauncherLink::BootZone(const char *short_name, uint16 port) {
 	zs.port = port;
 	zs.up = false;
 	zs.starts = 0;
-	Log(Logs::Detail, Logs::World_Server, "%s: Loaded zone '%s' on port %d", m_name.c_str(), short_name, zs.port);
+	LogInfo("[{}]: Loaded zone [{}] on port [{}]", m_name.c_str(), short_name, zs.port);
 	m_states[short_name] = zs;
 
 	StartZone(short_name, port);
diff --git a/world/launcher_list.cpp b/world/launcher_list.cpp
index c13276384..b38b38589 100644
--- a/world/launcher_list.cpp
+++ b/world/launcher_list.cpp
@@ -65,10 +65,10 @@ void LauncherList::Process() {
 			std::map<std::string, LauncherLink *>::iterator res;
 			res = m_launchers.find(name);
 			if (res != m_launchers.end()) {
-				Log(Logs::Detail, Logs::World_Server, "Ghosting launcher %s", name.c_str());
+				LogInfo("Ghosting launcher [{}]", name.c_str());
 				delete res->second;
 			}
-			Log(Logs::Detail, Logs::World_Server, "Removing pending launcher %d. Adding %s to active list.", l->GetID(), name.c_str());
+			LogInfo("Removing pending launcher [{}]. Adding [{}] to active list", l->GetID(), name.c_str());
 			//put the launcher in the list.
 			m_launchers[name] = l;
 		}
@@ -99,7 +99,7 @@ LauncherLink *LauncherList::FindByZone(const char *short_name) {
 
 void LauncherList::Add(std::shared_ptr<EQ::Net::ServertalkServerConnection> conn) {
 	auto it = new LauncherLink(nextID++, conn);
-	Log(Logs::Detail, Logs::World_Server, "Adding pending launcher %d", it->GetID());
+	LogInfo("Adding pending launcher [{}]", it->GetID());
 	m_pendingLaunchers.push_back(it);
 }
 
diff --git a/world/login_server.cpp b/world/login_server.cpp
index 61cc53bc2..2533a9bad 100644
--- a/world/login_server.cpp
+++ b/world/login_server.cpp
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/packet_dump.h"
 #include "../common/string_util.h"
 #include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
 #include "login_server.h"
 #include "login_server_list.h"
 #include "zoneserver.h"
@@ -38,48 +37,63 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "cliententry.h"
 #include "world_config.h"
 
-extern ZSList zoneserver_list;
-extern ClientList client_list;
-extern uint32 numzones;
-extern uint32 numplayers;
-extern volatile bool	RunLoops;
 
-LoginServer::LoginServer(const char* iAddress, uint16 iPort, const char* Account, const char* Password, bool legacy)
+extern ZSList        zoneserver_list;
+extern ClientList    client_list;
+extern uint32        numzones;
+extern uint32        numplayers;
+extern volatile bool RunLoops;
+
+LoginServer::LoginServer(const char *iAddress, uint16 iPort, const char *Account, const char *Password, bool legacy)
 {
 	strn0cpy(LoginServerAddress, iAddress, 256);
-	LoginServerPort = iPort;
-	strn0cpy(LoginAccount, Account, 31);
-	strn0cpy(LoginPassword, Password, 31);
+	LoginServerPort  = iPort;
+	LoginAccount     = Account;
+	LoginPassword    = Password;
 	CanAccountUpdate = false;
-	IsLegacy = legacy;
+	IsLegacy         = legacy;
 	Connect();
 }
 
-LoginServer::~LoginServer() {
+LoginServer::~LoginServer()
+{
 }
 
-void LoginServer::ProcessUsertoWorldReq(uint16_t opcode, EQ::Net::Packet &p) {
+void LoginServer::ProcessUsertoWorldReqLeg(uint16_t opcode, EQ::Net::Packet &p)
+{
 	const WorldConfig *Config = WorldConfig::get();
-	Log(Logs::Detail, Logs::World_Server, "Recevied ServerPacket from LS OpCode 0x04x", opcode);
+	LogNetcode("[ProcessUsertoWorldReqLeg] Received ServerPacket from LS OpCode {:#04x}", opcode);
 
-	UsertoWorldRequest_Struct* utwr = (UsertoWorldRequest_Struct*)p.Data();
-	uint32 id = database.GetAccountIDFromLSID(utwr->lsaccountid);
-	int16 status = database.CheckStatus(id);
+	UsertoWorldRequestLegacy_Struct *utwr  = (UsertoWorldRequestLegacy_Struct *) p.Data();
+	uint32                          id     = database.GetAccountIDFromLSID("eqemu", utwr->lsaccountid);
+	int16                           status = database.CheckStatus(id);
+
+	LogDebug(
+		"[ProcessUsertoWorldReqLeg] id [{}] status [{}] account_id [{}] world_id [{}] from_id [{}] to_id [{}] ip [{}]",
+		id,
+		status,
+		utwr->lsaccountid,
+		utwr->worldid,
+		utwr->FromID,
+		utwr->ToID,
+		utwr->IPAddr
+	);
 
 	ServerPacket outpack;
-	outpack.opcode = ServerOP_UsertoWorldResp;
-	outpack.size = sizeof(UsertoWorldResponse_Struct);
+	outpack.opcode  = ServerOP_UsertoWorldRespLeg;
+	outpack.size    = sizeof(UsertoWorldResponseLegacy_Struct);
 	outpack.pBuffer = new uchar[outpack.size];
 	memset(outpack.pBuffer, 0, outpack.size);
-	UsertoWorldResponse_Struct* utwrs = (UsertoWorldResponse_Struct*)outpack.pBuffer;
-	utwrs->lsaccountid = utwr->lsaccountid;
-	utwrs->ToID = utwr->FromID;
-	utwrs->worldid = utwr->worldid;
-	utwrs->response = UserToWorldStatusSuccess;
 
-	if (Config->Locked == true)
-	{
+	UsertoWorldResponseLegacy_Struct *utwrs = (UsertoWorldResponseLegacy_Struct *) outpack.pBuffer;
+	utwrs->lsaccountid = utwr->lsaccountid;
+	utwrs->ToID        = utwr->FromID;
+	utwrs->worldid     = utwr->worldid;
+	utwrs->response    = UserToWorldStatusSuccess;
+
+	if (Config->Locked) {
 		if (status < 100) {
+			LogDebug("[ProcessUsertoWorldReqLeg] Server locked and status is not high enough for account_id [{0}]", utwr->lsaccountid);
 			utwrs->response = UserToWorldStatusWorldUnavail;
 			SendPacket(&outpack);
 			return;
@@ -87,241 +101,521 @@ void LoginServer::ProcessUsertoWorldReq(uint16_t opcode, EQ::Net::Packet &p) {
 	}
 
 	int32 x = Config->MaxClients;
-	if ((int32)numplayers >= x && x != -1 && x != 255 && status < 80) {
+	if ((int32) numplayers >= x && x != -1 && x != 255 && status < 80) {
+		LogDebug("[ProcessUsertoWorldReqLeg] World at capacity account_id [{0}]", utwr->lsaccountid);
 		utwrs->response = UserToWorldStatusWorldAtCapacity;
 		SendPacket(&outpack);
 		return;
 	}
 
 	if (status == -1) {
+		LogDebug("[ProcessUsertoWorldReqLeg] User suspended account_id [{0}]", utwr->lsaccountid);
 		utwrs->response = UserToWorldStatusSuspended;
 		SendPacket(&outpack);
 		return;
 	}
 
 	if (status == -2) {
+		LogDebug("[ProcessUsertoWorldReqLeg] User banned account_id [{0}]", utwr->lsaccountid);
 		utwrs->response = UserToWorldStatusBanned;
 		SendPacket(&outpack);
 		return;
 	}
 
-	if (RuleB(World, DisallowDuplicateAccountLogins)) {
-		auto cle = client_list.FindCLEByLSID(utwr->lsaccountid);
-		if (cle != nullptr) {
-			auto status = cle->GetOnline();
-			if (CLE_Status_Never != status && CLE_Status_Offline != status) {
-				utwrs->response = UserToWorldStatusAlreadyOnline;
-				SendPacket(&outpack);
-				return;
-			}
+	if (RuleB(World, EnforceCharacterLimitAtLogin)) {
+		if (client_list.IsAccountInGame(utwr->lsaccountid)) {
+			LogDebug("[ProcessUsertoWorldReqLeg] User already online account_id [{0}]", utwr->lsaccountid);
+			utwrs->response = UserToWorldStatusAlreadyOnline;
+			SendPacket(&outpack);
+			return;
 		}
 	}
 
+	LogDebug("[ProcessUsertoWorldReqLeg] Sent response to account_id [{0}]", utwr->lsaccountid);
+
 	SendPacket(&outpack);
 }
 
-void LoginServer::ProcessLSClientAuth(uint16_t opcode, EQ::Net::Packet &p) {
+void LoginServer::ProcessUsertoWorldReq(uint16_t opcode, EQ::Net::Packet &p)
+{
 	const WorldConfig *Config = WorldConfig::get();
-	Log(Logs::Detail, Logs::World_Server, "Recevied ServerPacket from LS OpCode 0x04x", opcode);
+	LogNetcode("[ProcessUsertoWorldReq] Received ServerPacket from LS OpCode {:#04x}", opcode);
+
+	UsertoWorldRequest_Struct *utwr  = (UsertoWorldRequest_Struct *) p.Data();
+	uint32                    id     = database.GetAccountIDFromLSID(utwr->login, utwr->lsaccountid);
+	int16                     status = database.CheckStatus(id);
+
+	LogDebug(
+		"[ProcessUsertoWorldReq] id [{}] status [{}] account_id [{}] world_id [{}] from_id [{}] to_id [{}] ip [{}]",
+		id,
+		status,
+		utwr->lsaccountid,
+		utwr->worldid,
+		utwr->FromID,
+		utwr->ToID,
+		utwr->IPAddr
+	);
+
+	ServerPacket outpack;
+	outpack.opcode  = ServerOP_UsertoWorldResp;
+	outpack.size    = sizeof(UsertoWorldResponse_Struct);
+	outpack.pBuffer = new uchar[outpack.size];
+	memset(outpack.pBuffer, 0, outpack.size);
+
+	UsertoWorldResponse_Struct *utwrs = (UsertoWorldResponse_Struct *) outpack.pBuffer;
+	utwrs->lsaccountid = utwr->lsaccountid;
+	utwrs->ToID        = utwr->FromID;
+	strn0cpy(utwrs->login, utwr->login, 64);
+	utwrs->worldid  = utwr->worldid;
+	utwrs->response = UserToWorldStatusSuccess;
+
+	if (Config->Locked == true) {
+		if (status < 100) {
+			LogDebug("[ProcessUsertoWorldReq] Server locked and status is not high enough for account_id [{0}]", utwr->lsaccountid);
+			utwrs->response = UserToWorldStatusWorldUnavail;
+			SendPacket(&outpack);
+			return;
+		}
+	}
+
+	int32 x = Config->MaxClients;
+	if ((int32) numplayers >= x && x != -1 && x != 255 && status < 80) {
+		LogDebug("[ProcessUsertoWorldReq] World at capacity account_id [{0}]", utwr->lsaccountid);
+		utwrs->response = UserToWorldStatusWorldAtCapacity;
+		SendPacket(&outpack);
+		return;
+	}
+
+	if (status == -1) {
+		LogDebug("[ProcessUsertoWorldReq] User suspended account_id [{0}]", utwr->lsaccountid);
+		utwrs->response = UserToWorldStatusSuspended;
+		SendPacket(&outpack);
+		return;
+	}
+
+	if (status == -2) {
+		LogDebug("[ProcessUsertoWorldReq] User banned account_id [{0}]", utwr->lsaccountid);
+		utwrs->response = UserToWorldStatusBanned;
+		SendPacket(&outpack);
+		return;
+	}
+
+	if (RuleB(World, EnforceCharacterLimitAtLogin)) {
+		if (client_list.IsAccountInGame(utwr->lsaccountid)) {
+			LogDebug("[ProcessUsertoWorldReq] User already online account_id [{0}]", utwr->lsaccountid);
+			utwrs->response = UserToWorldStatusAlreadyOnline;
+			SendPacket(&outpack);
+			return;
+		}
+	}
+
+	LogDebug("[ProcessUsertoWorldReq] Sent response to account_id [{0}]", utwr->lsaccountid);
+
+	SendPacket(&outpack);
+}
+
+void LoginServer::ProcessLSClientAuthLegacy(uint16_t opcode, EQ::Net::Packet &p)
+{
+	const WorldConfig *Config = WorldConfig::get();
+	LogNetcode("Received ServerPacket from LS OpCode {:#04x}", opcode);
 
 	try {
-		auto slsca = p.GetSerialize<ClientAuth_Struct>(0);
-		client_list.CLEAdd(slsca.lsaccount_id, slsca.name, slsca.key, slsca.worldadmin, slsca.ip, slsca.local);
+		auto client_authentication_request = p.GetSerialize<ClientAuthLegacy_Struct>(0);
+
+		LogDebug(
+			"Processing Loginserver Auth Legacy | account_id [{0}] account_name [{1}] key [{2}] admin [{3}] ip [{4}] "
+			"local_network [{5}]",
+			client_authentication_request.loginserver_account_id,
+			client_authentication_request.loginserver_account_name,
+			client_authentication_request.key,
+			client_authentication_request.is_world_admin,
+			client_authentication_request.ip,
+			client_authentication_request.is_client_from_local_network
+		);
+
+		client_list.CLEAdd(
+			client_authentication_request.loginserver_account_id,
+			"eqemu",
+			client_authentication_request.loginserver_account_name,
+			client_authentication_request.key,
+			client_authentication_request.is_world_admin,
+			client_authentication_request.ip,
+			client_authentication_request.is_client_from_local_network
+		);
 	}
 	catch (std::exception &ex) {
-		LogF(Logs::General, Logs::Error, "Error parsing LSClientAuth packet from world.\n{0}", ex.what());
+		LogError("Error parsing ClientAuthLegacy packet from world\nReason [{0}]", ex.what());
 	}
 }
 
-void LoginServer::ProcessLSFatalError(uint16_t opcode, EQ::Net::Packet &p) {
+void LoginServer::ProcessLSClientAuth(uint16_t opcode, EQ::Net::Packet &p)
+{
 	const WorldConfig *Config = WorldConfig::get();
-	Log(Logs::Detail, Logs::World_Server, "Recevied ServerPacket from LS OpCode 0x04x", opcode);
+	LogNetcode("Received ServerPacket from LS OpCode {:#04x}", opcode);
 
-	Log(Logs::Detail, Logs::World_Server, "Login server responded with FatalError.");
+	try {
+		auto client_authentication_request = p.GetSerialize<ClientAuth_Struct>(0);
+
+		LogDebug(
+			"Processing Loginserver Auth | account_id [{0}] account_name [{1}] loginserver_name [{2}] key [{3}] "
+			"admin [{4}] ip [{5}] local_network [{6}]",
+			client_authentication_request.loginserver_account_id,
+			client_authentication_request.account_name,
+			client_authentication_request.loginserver_name,
+			client_authentication_request.key,
+			client_authentication_request.is_world_admin,
+			client_authentication_request.ip,
+			client_authentication_request.is_client_from_local_network
+		);
+
+		client_list.CLEAdd(
+			client_authentication_request.loginserver_account_id,
+			client_authentication_request.loginserver_name,
+			client_authentication_request.account_name,
+			client_authentication_request.key,
+			client_authentication_request.is_world_admin,
+			client_authentication_request.ip,
+			client_authentication_request.is_client_from_local_network
+		);
+	}
+	catch (std::exception &ex) {
+		LogError("Error parsing ClientAuth packet from world\nReason [{0}]", ex.what());
+	}
+}
+
+void LoginServer::ProcessLSFatalError(uint16_t opcode, EQ::Net::Packet &p)
+{
+	const WorldConfig *Config = WorldConfig::get();
+	LogNetcode("Received ServerPacket from LS OpCode {:#04x}", opcode);
+
+	LogInfo("Login server responded with FatalError");
 	if (p.Length() > 1) {
-		Log(Logs::Detail, Logs::World_Server, "     %s", (const char*)p.Data());
+		LogError("Error [{}]", (const char *) p.Data());
 	}
 }
 
-void LoginServer::ProcessSystemwideMessage(uint16_t opcode, EQ::Net::Packet &p) {
+void LoginServer::ProcessSystemwideMessage(uint16_t opcode, EQ::Net::Packet &p)
+{
 	const WorldConfig *Config = WorldConfig::get();
-	Log(Logs::Detail, Logs::World_Server, "Recevied ServerPacket from LS OpCode 0x04x", opcode);
+	LogNetcode("Received ServerPacket from LS OpCode {:#04x}", opcode);
 
-	ServerSystemwideMessage* swm = (ServerSystemwideMessage*)p.Data();
+	ServerSystemwideMessage *swm = (ServerSystemwideMessage *) p.Data();
 	zoneserver_list.SendEmoteMessageRaw(0, 0, 0, swm->type, swm->message);
 }
 
-void LoginServer::ProcessLSRemoteAddr(uint16_t opcode, EQ::Net::Packet &p) {
+void LoginServer::ProcessLSRemoteAddr(uint16_t opcode, EQ::Net::Packet &p)
+{
 	const WorldConfig *Config = WorldConfig::get();
-	Log(Logs::Detail, Logs::World_Server, "Recevied ServerPacket from LS OpCode 0x04x", opcode);
+	LogNetcode("Received ServerPacket from LS OpCode {:#04x}", opcode);
 
 	if (!Config->WorldAddress.length()) {
-		WorldConfig::SetWorldAddress((char *)p.Data());
-		Log(Logs::Detail, Logs::World_Server, "Loginserver provided %s as world address", (const char*)p.Data());
+		WorldConfig::SetWorldAddress((char *) p.Data());
+		LogInfo("Loginserver provided [{}] as world address", (const char *) p.Data());
 	}
 }
 
-void LoginServer::ProcessLSAccountUpdate(uint16_t opcode, EQ::Net::Packet &p) {
+void LoginServer::ProcessLSAccountUpdate(uint16_t opcode, EQ::Net::Packet &p)
+{
 	const WorldConfig *Config = WorldConfig::get();
-	Log(Logs::Detail, Logs::World_Server, "Recevied ServerPacket from LS OpCode 0x04x", opcode);
+	LogNetcode("Received ServerPacket from LS OpCode {:#04x}", opcode);
 
-	Log(Logs::Detail, Logs::World_Server, "Received ServerOP_LSAccountUpdate packet from loginserver");
+	LogNetcode("Received ServerOP_LSAccountUpdate packet from loginserver");
 	CanAccountUpdate = true;
 }
 
-bool LoginServer::Connect() {
-	std::string tmp;
-	if (database.GetVariable("loginType", tmp) && strcasecmp(tmp.c_str(), "MinILogin") == 0) {
-		minilogin = true;
-		Log(Logs::Detail, Logs::World_Server, "Setting World to MiniLogin Server type");
-	}
-	else
-		minilogin = false;
-
-	if (minilogin && WorldConfig::get()->WorldAddress.length() == 0) {
-		Log(Logs::Detail, Logs::World_Server, "**** For minilogin to work, you need to set the <address> element in the <world> section.");
-		return false;
-	}
-
+bool LoginServer::Connect()
+{
 	char errbuf[1024];
 	if ((LoginServerIP = ResolveIP(LoginServerAddress, errbuf)) == 0) {
-		Log(Logs::Detail, Logs::World_Server, "Unable to resolve '%s' to an IP.", LoginServerAddress);
+		LogInfo("Unable to resolve [{}] to an IP", LoginServerAddress);
 		return false;
 	}
 
 	if (LoginServerIP == 0 || LoginServerPort == 0) {
-		Log(Logs::Detail, Logs::World_Server, "Connect info incomplete, cannot connect: %s:%d", LoginServerAddress, LoginServerPort);
+		LogInfo(
+			"Connect info incomplete, cannot connect: [{0}:{1}]",
+			LoginServerAddress,
+			LoginServerPort
+		);
+
 		return false;
 	}
 
 	if (IsLegacy) {
 		legacy_client.reset(new EQ::Net::ServertalkLegacyClient(LoginServerAddress, LoginServerPort, false));
-		legacy_client->OnConnect([this](EQ::Net::ServertalkLegacyClient *client) {
-			if (client) {
-				Log(Logs::Detail, Logs::World_Server, "Connected to Legacy Loginserver: %s:%d", LoginServerAddress, LoginServerPort);
-				if (minilogin)
+		legacy_client->OnConnect(
+			[this](EQ::Net::ServertalkLegacyClient *client) {
+				if (client) {
+					LogInfo(
+						"Connected to Legacy Loginserver: [{0}:{1}]",
+						LoginServerAddress,
+						LoginServerPort
+					);
+
 					SendInfo();
-				else
-					SendNewInfo();
-				SendStatus();
-				zoneserver_list.SendLSZones();
-
-				statusupdate_timer.reset(new EQ::Timer(LoginServer_StatusUpdateInterval, true, [this](EQ::Timer *t) {
 					SendStatus();
-				}));
-			}
-			else {
-				Log(Logs::Detail, Logs::World_Server, "Could not connect to Legacy Loginserver: %s:%d", LoginServerAddress, LoginServerPort);
-			}
-		});
+					zoneserver_list.SendLSZones();
 
-		legacy_client->OnMessage(ServerOP_UsertoWorldReq, std::bind(&LoginServer::ProcessUsertoWorldReq, this, std::placeholders::_1, std::placeholders::_2));
-		legacy_client->OnMessage(ServerOP_LSClientAuth, std::bind(&LoginServer::ProcessLSClientAuth, this, std::placeholders::_1, std::placeholders::_2));
-		legacy_client->OnMessage(ServerOP_LSFatalError, std::bind(&LoginServer::ProcessLSFatalError, this, std::placeholders::_1, std::placeholders::_2));
-		legacy_client->OnMessage(ServerOP_SystemwideMessage, std::bind(&LoginServer::ProcessSystemwideMessage, this, std::placeholders::_1, std::placeholders::_2));
-		legacy_client->OnMessage(ServerOP_LSRemoteAddr, std::bind(&LoginServer::ProcessLSRemoteAddr, this, std::placeholders::_1, std::placeholders::_2));
-		legacy_client->OnMessage(ServerOP_LSAccountUpdate, std::bind(&LoginServer::ProcessLSAccountUpdate, this, std::placeholders::_1, std::placeholders::_2));
+					statusupdate_timer.reset(
+						new EQ::Timer(
+							LoginServer_StatusUpdateInterval, true, [this](EQ::Timer *t) {
+								SendStatus();
+							}
+						)
+					);
+				}
+				else {
+					LogInfo(
+						"Could not connect to Legacy Loginserver: [{0}:{1}]",
+						LoginServerAddress,
+						LoginServerPort
+					);
+				}
+			}
+		);
 
+		legacy_client->OnMessage(
+			ServerOP_UsertoWorldReqLeg,
+			std::bind(
+				&LoginServer::ProcessUsertoWorldReqLeg,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		legacy_client->OnMessage(
+			ServerOP_UsertoWorldReq,
+			std::bind(
+				&LoginServer::ProcessUsertoWorldReq,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		legacy_client->OnMessage(
+			ServerOP_LSClientAuthLeg,
+			std::bind(
+				&LoginServer::ProcessLSClientAuthLegacy,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		legacy_client->OnMessage(
+			ServerOP_LSClientAuth,
+			std::bind(
+				&LoginServer::ProcessLSClientAuth,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		legacy_client->OnMessage(
+			ServerOP_LSFatalError,
+			std::bind(
+				&LoginServer::ProcessLSFatalError,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		legacy_client->OnMessage(
+			ServerOP_SystemwideMessage,
+			std::bind(
+				&LoginServer::ProcessSystemwideMessage,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		legacy_client->OnMessage(
+			ServerOP_LSRemoteAddr,
+			std::bind(
+				&LoginServer::ProcessLSRemoteAddr,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		legacy_client->OnMessage(
+			ServerOP_LSAccountUpdate,
+			std::bind(
+				&LoginServer::ProcessLSAccountUpdate,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
 	}
 	else {
 		client.reset(new EQ::Net::ServertalkClient(LoginServerAddress, LoginServerPort, false, "World", ""));
-		client->OnConnect([this](EQ::Net::ServertalkClient *client) {
-			if (client) {
-				Log(Logs::Detail, Logs::World_Server, "Connected to Loginserver: %s:%d", LoginServerAddress, LoginServerPort);
-				if (minilogin)
+		client->OnConnect(
+			[this](EQ::Net::ServertalkClient *client) {
+				if (client) {
+					LogInfo(
+						"Connected to Loginserver: [{0}:{1}]",
+						LoginServerAddress,
+						LoginServerPort
+					);
 					SendInfo();
-				else
-					SendNewInfo();
-				SendStatus();
-				zoneserver_list.SendLSZones();
-
-				statusupdate_timer.reset(new EQ::Timer(LoginServer_StatusUpdateInterval, true, [this](EQ::Timer *t) {
 					SendStatus();
-				}));
-			}
-			else {
-				Log(Logs::Detail, Logs::World_Server, "Could not connect to Loginserver: %s:%d", LoginServerAddress, LoginServerPort);
-			}
-		});
+					zoneserver_list.SendLSZones();
 
-		client->OnMessage(ServerOP_UsertoWorldReq, std::bind(&LoginServer::ProcessUsertoWorldReq, this, std::placeholders::_1, std::placeholders::_2));
-		client->OnMessage(ServerOP_LSClientAuth, std::bind(&LoginServer::ProcessLSClientAuth, this, std::placeholders::_1, std::placeholders::_2));
-		client->OnMessage(ServerOP_LSFatalError, std::bind(&LoginServer::ProcessLSFatalError, this, std::placeholders::_1, std::placeholders::_2));
-		client->OnMessage(ServerOP_SystemwideMessage, std::bind(&LoginServer::ProcessSystemwideMessage, this, std::placeholders::_1, std::placeholders::_2));
-		client->OnMessage(ServerOP_LSRemoteAddr, std::bind(&LoginServer::ProcessLSRemoteAddr, this, std::placeholders::_1, std::placeholders::_2));
-		client->OnMessage(ServerOP_LSAccountUpdate, std::bind(&LoginServer::ProcessLSAccountUpdate, this, std::placeholders::_1, std::placeholders::_2));
+					statusupdate_timer.reset(
+						new EQ::Timer(
+							LoginServer_StatusUpdateInterval, true, [this](EQ::Timer *t) {
+								SendStatus();
+							}
+						));
+				}
+				else {
+					LogInfo(
+						"Could not connect to Loginserver: [{0}:{1}]",
+						LoginServerAddress,
+						LoginServerPort
+					);
+				}
+			}
+		);
+
+		client->OnMessage(
+			ServerOP_UsertoWorldReqLeg,
+			std::bind(
+				&LoginServer::ProcessUsertoWorldReqLeg,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		client->OnMessage(
+			ServerOP_UsertoWorldReq,
+			std::bind(
+				&LoginServer::ProcessUsertoWorldReq,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		client->OnMessage(
+			ServerOP_LSClientAuthLeg,
+			std::bind(
+				&LoginServer::ProcessLSClientAuthLegacy,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		client->OnMessage(
+			ServerOP_LSClientAuth,
+			std::bind(
+				&LoginServer::ProcessLSClientAuth,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		client->OnMessage(
+			ServerOP_LSFatalError,
+			std::bind(
+				&LoginServer::ProcessLSFatalError,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		client->OnMessage(
+			ServerOP_SystemwideMessage,
+			std::bind(
+				&LoginServer::ProcessSystemwideMessage,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		client->OnMessage(
+			ServerOP_LSRemoteAddr,
+			std::bind(
+				&LoginServer::ProcessLSRemoteAddr,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
+		client->OnMessage(
+			ServerOP_LSAccountUpdate,
+			std::bind(
+				&LoginServer::ProcessLSAccountUpdate,
+				this,
+				std::placeholders::_1,
+				std::placeholders::_2
+			)
+		);
 	}
 
+	m_keepalive.reset(new EQ::Timer(5000, true, std::bind(&LoginServer::OnKeepAlive, this, std::placeholders::_1)));
+
 	return true;
 }
-void LoginServer::SendInfo() {
+
+void LoginServer::SendInfo()
+{
 	const WorldConfig *Config = WorldConfig::get();
 
 	auto pack = new ServerPacket;
-	pack->opcode = ServerOP_LSInfo;
-	pack->size = sizeof(ServerLSInfo_Struct);
+	pack->opcode  = ServerOP_NewLSInfo;
+	pack->size    = sizeof(ServerNewLSInfo_Struct);
 	pack->pBuffer = new uchar[pack->size];
 	memset(pack->pBuffer, 0, pack->size);
-	ServerLSInfo_Struct* lsi = (ServerLSInfo_Struct*)pack->pBuffer;
-	strcpy(lsi->protocolversion, EQEMU_PROTOCOL_VERSION);
-	strcpy(lsi->serverversion, LOGIN_VERSION);
-	strcpy(lsi->name, Config->LongName.c_str());
-	strcpy(lsi->account, LoginAccount);
-	strcpy(lsi->password, LoginPassword);
-	strcpy(lsi->address, Config->WorldAddress.c_str());
-	SendPacket(pack);
-	delete pack;
-}
-
-void LoginServer::SendNewInfo() {
-	const WorldConfig *Config = WorldConfig::get();
-
-	auto pack = new ServerPacket;
-	pack->opcode = ServerOP_NewLSInfo;
-	pack->size = sizeof(ServerNewLSInfo_Struct);
-	pack->pBuffer = new uchar[pack->size];
-	memset(pack->pBuffer, 0, pack->size);
-	ServerNewLSInfo_Struct* lsi = (ServerNewLSInfo_Struct*)pack->pBuffer;
-	strcpy(lsi->protocolversion, EQEMU_PROTOCOL_VERSION);
-	strcpy(lsi->serverversion, LOGIN_VERSION);
-	strcpy(lsi->name, Config->LongName.c_str());
-	strcpy(lsi->shortname, Config->ShortName.c_str());
-	strcpy(lsi->account, LoginAccount);
-	strcpy(lsi->password, LoginPassword);
-	if (Config->WorldAddress.length())
-		strcpy(lsi->remote_address, Config->WorldAddress.c_str());
-	if (Config->LocalAddress.length())
-		strcpy(lsi->local_address, Config->LocalAddress.c_str());
+	ServerNewLSInfo_Struct *lsi = (ServerNewLSInfo_Struct *) pack->pBuffer;
+	strcpy(lsi->protocol_version, EQEMU_PROTOCOL_VERSION);
+	strcpy(lsi->server_version, LOGIN_VERSION);
+	strcpy(lsi->server_long_name, Config->LongName.c_str());
+	strcpy(lsi->server_short_name, Config->ShortName.c_str());
+	strn0cpy(lsi->account_name, LoginAccount.c_str(), 30);
+	strn0cpy(lsi->account_password, LoginPassword.c_str(), 30);
+	if (Config->WorldAddress.length()) {
+		strcpy(lsi->remote_ip_address, Config->WorldAddress.c_str());
+	}
+	if (Config->LocalAddress.length()) {
+		strcpy(lsi->local_ip_address, Config->LocalAddress.c_str());
+	}
 	else {
 		auto local_addr = IsLegacy ? legacy_client->Handle()->LocalIP() : client->Handle()->LocalIP();
-		strcpy(lsi->local_address, local_addr.c_str());
-		WorldConfig::SetLocalAddress(lsi->local_address);
+		strcpy(lsi->local_ip_address, local_addr.c_str());
+		WorldConfig::SetLocalAddress(lsi->local_ip_address);
 	}
 	SendPacket(pack);
 	delete pack;
 }
 
-void LoginServer::SendStatus() {
+void LoginServer::SendStatus()
+{
 	auto pack = new ServerPacket;
-	pack->opcode = ServerOP_LSStatus;
-	pack->size = sizeof(ServerLSStatus_Struct);
+	pack->opcode  = ServerOP_LSStatus;
+	pack->size    = sizeof(ServerLSStatus_Struct);
 	pack->pBuffer = new uchar[pack->size];
 	memset(pack->pBuffer, 0, pack->size);
-	ServerLSStatus_Struct* lss = (ServerLSStatus_Struct*)pack->pBuffer;
+	auto loginserver_status = (ServerLSStatus_Struct *) pack->pBuffer;
 
-	if (WorldConfig::get()->Locked)
-		lss->status = -2;
-	else if (numzones <= 0)
-		lss->status = -2;
-	else
-		lss->status = numplayers;
+	if (WorldConfig::get()->Locked) {
+		loginserver_status->status = -2;
+	}
+	else if (numzones <= 0) {
+		loginserver_status->status = -2;
+	}
+	else {
+		loginserver_status->status = numplayers;
+	}
 
-	lss->num_zones = numzones;
-	lss->num_players = numplayers;
+	loginserver_status->num_zones   = numzones;
+	loginserver_status->num_players = numplayers;
 	SendPacket(pack);
 	delete pack;
 }
 
+/**
+ * @param pack
+ */
 void LoginServer::SendPacket(ServerPacket *pack)
 {
 	if (IsLegacy) {
@@ -336,28 +630,23 @@ void LoginServer::SendPacket(ServerPacket *pack)
 	}
 }
 
-void LoginServer::SendAccountUpdate(ServerPacket* pack) {
-	ServerLSAccountUpdate_Struct* s = (ServerLSAccountUpdate_Struct *)pack->pBuffer;
+void LoginServer::SendAccountUpdate(ServerPacket *pack)
+{
+	auto *ls_account_update = (ServerLSAccountUpdate_Struct *) pack->pBuffer;
 	if (CanUpdate()) {
-		Log(Logs::Detail, Logs::World_Server, "Sending ServerOP_LSAccountUpdate packet to loginserver: %s:%d", LoginServerAddress, LoginServerPort);
-		strn0cpy(s->worldaccount, LoginAccount, 30);
-		strn0cpy(s->worldpassword, LoginPassword, 30);
+		LogInfo(
+			"Sending ServerOP_LSAccountUpdate packet to loginserver: [{0}]:[{1}]",
+			LoginServerAddress,
+			LoginServerPort
+		);
+		strn0cpy(ls_account_update->worldaccount, LoginAccount.c_str(), 30);
+		strn0cpy(ls_account_update->worldpassword, LoginPassword.c_str(), 30);
 		SendPacket(pack);
 	}
 }
 
-bool LoginServer::Connected()
+void LoginServer::OnKeepAlive(EQ::Timer *t)
 {
-	if (IsLegacy) {
-		if (legacy_client) {
-			return legacy_client->Connected();
-		}
-	}
-	else {
-		if (client) {
-			return client->Connected();
-		}
-	}
-
-	return false;
-}
+	ServerPacket pack(ServerOP_KeepAlive, 0);
+	SendPacket(&pack);
+}
\ No newline at end of file
diff --git a/world/login_server.h b/world/login_server.h
index 03f80afe0..16fde8e65 100644
--- a/world/login_server.h
+++ b/world/login_server.h
@@ -35,34 +35,49 @@ public:
 	~LoginServer();
 
 	bool Connect();
-
 	void SendInfo();
-	void SendNewInfo();
 	void SendStatus();
 
 	void SendPacket(ServerPacket* pack);
-	void SendAccountUpdate(ServerPacket* pack);
-	bool Connected();
-	bool MiniLogin() { return minilogin; }
+	void SendAccountUpdate(ServerPacket *pack);
+	bool Connected()
+	{
+		if (IsLegacy) {
+			if (legacy_client) {
+				return legacy_client->Connected();
+			}
+		}
+		else {
+			if (client) {
+				return client->Connected();
+			}
+		}
+
+		return false;
+	}
 	bool CanUpdate() { return CanAccountUpdate; }
 
 private:
+	void ProcessUsertoWorldReqLeg(uint16_t opcode, EQ::Net::Packet &p);
 	void ProcessUsertoWorldReq(uint16_t opcode, EQ::Net::Packet &p);
 	void ProcessLSClientAuth(uint16_t opcode, EQ::Net::Packet &p);
+	void ProcessLSClientAuthLegacy(uint16_t opcode, EQ::Net::Packet &p);
 	void ProcessLSFatalError(uint16_t opcode, EQ::Net::Packet &p);
 	void ProcessSystemwideMessage(uint16_t opcode, EQ::Net::Packet &p);
 	void ProcessLSRemoteAddr(uint16_t opcode, EQ::Net::Packet &p);
 	void ProcessLSAccountUpdate(uint16_t opcode, EQ::Net::Packet &p);
 
-	bool minilogin;
+	void OnKeepAlive(EQ::Timer *t);
+	std::unique_ptr<EQ::Timer> m_keepalive;
+
 	std::unique_ptr<EQ::Net::ServertalkClient> client;
 	std::unique_ptr<EQ::Net::ServertalkLegacyClient> legacy_client;
 	std::unique_ptr<EQ::Timer> statusupdate_timer;
 	char	LoginServerAddress[256];
 	uint32	LoginServerIP;
 	uint16	LoginServerPort;
-	char	LoginAccount[32];
-	char	LoginPassword[32];
+	std::string LoginAccount;
+	std::string LoginPassword;
 	bool	CanAccountUpdate;
 	bool    IsLegacy;
 };
diff --git a/world/login_server_list.cpp b/world/login_server_list.cpp
index 92d67fb82..64081a3fe 100644
--- a/world/login_server_list.cpp
+++ b/world/login_server_list.cpp
@@ -63,14 +63,6 @@ bool LoginServerList::SendInfo() {
 	return true;
 }
 
-bool LoginServerList::SendNewInfo() {
-	for (auto &iter : m_list) {
-		(*iter).SendNewInfo();
-	}
-
-	return true;
-}
-
 bool LoginServerList::SendStatus() {
 	for (auto &iter : m_list) {
 		(*iter).SendStatus();
@@ -88,7 +80,7 @@ bool LoginServerList::SendPacket(ServerPacket* pack) {
 }
 
 bool LoginServerList::SendAccountUpdate(ServerPacket* pack) {
-	Log(Logs::Detail, Logs::World_Server, "Requested to send ServerOP_LSAccountUpdate packet to all loginservers");
+	LogInfo("Requested to send ServerOP_LSAccountUpdate packet to all loginservers");
 	for (auto &iter : m_list) {
 		if ((*iter).CanUpdate()) {
 			(*iter).SendAccountUpdate(pack);
@@ -118,16 +110,6 @@ bool LoginServerList::AllConnected() {
 	return true;
 }
 
-bool LoginServerList::MiniLogin() {
-	for (auto &iter : m_list) {
-		if ((*iter).MiniLogin()) {
-			return true;
-		}
-	}
-
-	return false;
-}
-
 bool LoginServerList::CanUpdate() {
 	for (auto &iter : m_list) {
 		if ((*iter).CanUpdate()) {
diff --git a/world/login_server_list.h b/world/login_server_list.h
index 56806f704..d1b29a8cf 100644
--- a/world/login_server_list.h
+++ b/world/login_server_list.h
@@ -18,14 +18,12 @@ public:
 	void	Add(const char*, uint16, const char*, const char*, bool);
 
 	bool	SendInfo();
-	bool	SendNewInfo();
 	bool	SendStatus();
 
 	bool	SendPacket(ServerPacket *pack);
 	bool	SendAccountUpdate(ServerPacket *pack);
 	bool	Connected();
 	bool	AllConnected();
-	bool	MiniLogin();
 	bool	CanUpdate();
 	size_t GetServerCount() const { return m_list.size(); }
 
diff --git a/world/main.cpp b/world/main.cpp
new file mode 100644
index 000000000..72cc6d391
--- /dev/null
+++ b/world/main.cpp
@@ -0,0 +1,640 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "../common/global_define.h"
+
+#include <iostream>
+#include <string.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+
+#include "../common/string_util.h"
+#include "../common/eqemu_logsys.h"
+#include "../common/queue.h"
+#include "../common/timer.h"
+#include "../common/eq_packet.h"
+#include "../common/seperator.h"
+#include "../common/version.h"
+#include "../common/eqtime.h"
+#include "../common/event/event_loop.h"
+#include "../common/net/eqstream.h"
+#include "../common/opcodemgr.h"
+#include "../common/guilds.h"
+#include "../common/eq_stream_ident.h"
+#include "../common/rulesys.h"
+#include "../common/platform.h"
+#include "../common/crash.h"
+#include "client.h"
+#include "worlddb.h"
+#ifdef _WINDOWS
+#include <process.h>
+#define snprintf	_snprintf
+#define strncasecmp	_strnicmp
+#define strcasecmp	_stricmp
+#include <conio.h>
+#else
+#include <pthread.h>
+#include "../common/unix.h"
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/sem.h>
+#include <sys/shm.h>
+#if not defined (FREEBSD) && not defined (DARWIN)
+union semun {
+	int val;
+	struct semid_ds *buf;
+	ushort *array;
+	struct seminfo *__buf;
+	void *__pad;
+};
+#endif
+
+#endif
+
+#include "../common/patches/patches.h"
+#include "../common/random.h"
+#include "zoneserver.h"
+#include "login_server.h"
+#include "login_server_list.h"
+#include "world_config.h"
+#include "zoneserver.h"
+#include "zonelist.h"
+#include "clientlist.h"
+#include "launcher_list.h"
+#include "wguild_mgr.h"
+#include "lfplist.h"
+#include "adventure_manager.h"
+#include "ucs.h"
+#include "queryserv.h"
+#include "web_interface.h"
+#include "console.h"
+
+#include "../common/net/servertalk_server.h"
+#include "../zone/data_bucket.h"
+#include "world_server_command_handler.h"
+
+ClientList client_list;
+GroupLFPList LFPGroupList;
+ZSList zoneserver_list;
+LoginServerList loginserverlist;
+UCSConnection UCSLink;
+QueryServConnection QSLink;
+LauncherList launcher_list;
+AdventureManager adventure_manager;
+EQEmu::Random emu_random;
+volatile bool RunLoops = true;
+uint32 numclients = 0;
+uint32 numzones = 0;
+bool holdzones = false;
+const WorldConfig *Config;
+EQEmuLogSys LogSys;
+WebInterfaceList web_interface;
+
+void CatchSignal(int sig_num);
+void CheckForServerScript(bool force_download = false);
+
+inline void UpdateWindowTitle(std::string new_title) {
+#ifdef _WINDOWS
+	SetConsoleTitle(new_title.c_str());
+#endif
+}
+
+void LoadDatabaseConnections()
+{
+	LogInfo(
+		"Connecting to MySQL [{}]@[{}]:[{}]",
+		Config->DatabaseUsername.c_str(),
+		Config->DatabaseHost.c_str(),
+		Config->DatabasePort
+	);
+
+	if (!database.Connect(
+		Config->DatabaseHost.c_str(),
+		Config->DatabaseUsername.c_str(),
+		Config->DatabasePassword.c_str(),
+		Config->DatabaseDB.c_str(),
+		Config->DatabasePort
+	)) {
+		LogError("Cannot continue without a database connection");
+
+		std::exit(1);
+	}
+}
+
+void CheckForXMLConfigUpgrade()
+{
+	if (!std::ifstream("eqemu_config.json") && std::ifstream("eqemu_config.xml")) {
+		CheckForServerScript(true);
+		if(system("perl eqemu_server.pl convert_xml"));
+	}
+	else {
+		CheckForServerScript();
+	}
+}
+
+void LoadServerConfig()
+{
+	LogInfo("Loading server configuration");
+	if (!WorldConfig::LoadConfig()) {
+		LogError("Loading server configuration failed");
+		std::exit(1);
+	}
+}
+
+void RegisterLoginservers()
+{
+	if (Config->LoginCount == 0) {
+		if (Config->LoginHost.length()) {
+			loginserverlist.Add(
+				Config->LoginHost.c_str(),
+				Config->LoginPort,
+				Config->LoginAccount.c_str(),
+				Config->LoginPassword.c_str(),
+				Config->LoginLegacy
+			);
+			LogInfo("Added loginserver [{}]:[{}]", Config->LoginHost.c_str(), Config->LoginPort);
+		}
+	}
+	else {
+		LinkedList<LoginConfig *> loginlist = Config->loginlist;
+		LinkedListIterator<LoginConfig *> iterator(loginlist);
+		iterator.Reset();
+		while (iterator.MoreElements()) {
+			if (iterator.GetData()->LoginHost.length()) {
+				loginserverlist.Add(
+					iterator.GetData()->LoginHost.c_str(),
+					iterator.GetData()->LoginPort,
+					iterator.GetData()->LoginAccount.c_str(),
+					iterator.GetData()->LoginPassword.c_str(),
+					iterator.GetData()->LoginLegacy
+				);
+
+				LogInfo(
+					"Added loginserver [{}]:[{}]",
+					iterator.GetData()->LoginHost.c_str(),
+					iterator.GetData()->LoginPort
+				);
+			}
+			iterator.Advance();
+		}
+	}
+}
+
+/**
+ * World process entrypoint
+ * 
+ * @param argc
+ * @param argv
+ * @return
+ */
+int main(int argc, char** argv) {
+	RegisterExecutablePlatform(ExePlatformWorld);
+	LogSys.LoadLogSettingsDefaults();
+	set_exception_handler();
+
+	/**
+	 * Database version
+	 */
+	uint32 database_version      = CURRENT_BINARY_DATABASE_VERSION;
+	uint32 bots_database_version = CURRENT_BINARY_BOTS_DATABASE_VERSION;
+	if (argc >= 2) {
+		if (strcasecmp(argv[1], "db_version") == 0) {
+			std::cout << "Binary Database Version: " << database_version << " : " << bots_database_version << std::endl;
+			return 0;
+		}
+	}
+
+	/**
+	 * Command handler
+	 */
+	if (argc > 1) {
+		LogSys.SilenceConsoleLogging();
+
+		/**
+		 * Get Config
+		 */
+		WorldConfig::LoadConfig();
+		Config = WorldConfig::get();
+
+		/**
+		 * Load database
+		 */
+		LoadDatabaseConnections();
+
+		LogSys.EnableConsoleLogging();
+
+		WorldserverCommandHandler::CommandHandler(argc, argv);
+	}
+
+	CheckForXMLConfigUpgrade();
+	LoadServerConfig();
+
+	Config = WorldConfig::get();
+
+	LogInfo("CURRENT_VERSION: [{}]", CURRENT_VERSION);
+
+	if (signal(SIGINT, CatchSignal) == SIG_ERR) {
+		LogError("Could not set signal handler");
+		return 1;
+	}
+
+	if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
+		LogError("Could not set signal handler");
+		return 1;
+	}
+
+#ifndef WIN32
+	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
+		LogError("Could not set signal handler");
+		return 1;
+	}
+#endif
+
+	RegisterLoginservers();
+	LoadDatabaseConnections();
+
+	guild_mgr.SetDatabase(&database);
+
+	/**
+	 * Logging
+	 */
+	database.LoadLogSettings(LogSys.log_settings);
+	LogSys.StartFileLogs();
+
+	/**
+	 * Parse simple CLI passes
+	 */
+	bool ignore_db = false;
+	if (argc >= 2) {
+		if (strcasecmp(argv[1], "ignore_db") == 0) {
+			ignore_db = true;
+		}
+		else {
+			std::cerr << "Error, unknown command line option" << std::endl;
+			return 1;
+		}
+	}
+
+	if (!ignore_db) {
+		LogInfo("Checking Database Conversions");
+		database.CheckDatabaseConversions();
+	}
+	LogInfo("Loading variables");
+	database.LoadVariables();
+
+	std::string hotfix_name;
+	if (database.GetVariable("hotfix_name", hotfix_name)) {
+		if (!hotfix_name.empty()) {
+			LogInfo("Current hotfix in use: [{}]", hotfix_name.c_str());
+		}
+	}
+
+	LogInfo("Purging expired data buckets");
+	database.PurgeAllDeletedDataBuckets();
+
+	LogInfo("Loading zones");
+	database.LoadZoneNames();
+	LogInfo("Clearing groups");
+	database.ClearGroup();
+	LogInfo("Clearing raids");
+	database.ClearRaid();
+	database.ClearRaidDetails();
+	database.ClearRaidLeader();
+	LogInfo("Clearing inventory snapshots");
+	database.ClearInvSnapshots();
+	LogInfo("Loading items");
+	if (!database.LoadItems(hotfix_name))
+		LogError("Error: Could not load item data. But ignoring");
+	LogInfo("Loading skill caps");
+	if (!database.LoadSkillCaps(std::string(hotfix_name)))
+		LogError("Error: Could not load skill cap data. But ignoring");
+
+
+	LogInfo("Loading guilds");
+	guild_mgr.LoadGuilds();
+
+	//rules:
+	{
+		if (!RuleManager::Instance()->UpdateOrphanedRules(&database)) {
+			LogInfo("Failed to process 'Orphaned Rules' update operation.");
+		}
+
+		if (!RuleManager::Instance()->UpdateInjectedRules(&database, "default")) {
+			LogInfo("Failed to process 'Injected Rules' for ruleset 'default' update operation.");
+		}
+
+		std::string tmp;
+		if (database.GetVariable("RuleSet", tmp)) {
+			LogInfo("Loading rule set [{}]", tmp.c_str());
+
+			if (!RuleManager::Instance()->LoadRules(&database, tmp.c_str(), false)) {
+				LogInfo("Failed to load ruleset [{}], falling back to defaults", tmp.c_str());
+			}
+		}
+		else {
+
+			if (!RuleManager::Instance()->LoadRules(&database, "default", false)) {
+				LogInfo("No rule set configured, using default rules");
+			}
+			else {
+				LogInfo("Loaded default rule set [default]", tmp.c_str());
+			}
+		}
+
+		if (!RuleManager::Instance()->RestoreRuleNotes(&database)) {
+			LogInfo("Failed to process 'Restore Rule Notes' update operation.");
+		}
+	}
+
+	EQEmu::InitializeDynamicLookups();
+	LogInfo("Initialized dynamic dictionary entries");
+
+	if (RuleB(World, ClearTempMerchantlist)) {
+		LogInfo("Clearing temporary merchant lists");
+		database.ClearMerchantTemp();
+	}
+
+	LogInfo("Loading EQ time of day");
+	TimeOfDay_Struct eqTime;
+	time_t realtime;
+	eqTime = database.LoadTime(realtime);
+	zoneserver_list.worldclock.SetCurrentEQTimeOfDay(eqTime, realtime);
+	Timer EQTimeTimer(600000);
+	EQTimeTimer.Start(600000);
+
+	LogInfo("Loading launcher list");
+	launcher_list.LoadList();
+
+	LogInfo("Deleted [{}] stale player corpses from database", database.DeleteStalePlayerCorpses());
+
+	LogInfo("Loading adventures");
+	if (!adventure_manager.LoadAdventureTemplates())
+	{
+		LogInfo("Unable to load adventure templates");
+	}
+
+	if (!adventure_manager.LoadAdventureEntries())
+	{
+		LogInfo("Unable to load adventure templates");
+	}
+
+	adventure_manager.LoadLeaderboardInfo();
+
+	LogInfo("Purging expired instances");
+	database.PurgeExpiredInstances();
+
+	Timer PurgeInstanceTimer(450000);
+	PurgeInstanceTimer.Start(450000);
+
+	LogInfo("Loading char create info");
+	database.LoadCharacterCreateAllocations();
+	database.LoadCharacterCreateCombos();
+
+	std::unique_ptr<EQ::Net::ConsoleServer> console;
+	if (Config->TelnetEnabled) {
+		LogInfo("Console (TCP) listener started");
+		console.reset(new EQ::Net::ConsoleServer(Config->TelnetIP, Config->TelnetTCPPort));
+		RegisterConsoleFunctions(console);
+	}
+
+	std::unique_ptr<EQ::Net::ServertalkServer> server_connection;
+	server_connection.reset(new EQ::Net::ServertalkServer());
+
+	EQ::Net::ServertalkServerOptions server_opts;
+	server_opts.port = Config->WorldTCPPort;
+	server_opts.ipv6 = false;
+	server_opts.credentials = Config->SharedKey;
+	server_connection->Listen(server_opts);
+	LogInfo("Server (TCP) listener started");
+
+	server_connection->OnConnectionIdentified(
+		"Zone", [&console](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+			LogInfo("New Zone Server connection from [{2}] at [{0}:{1}]",
+					connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
+
+			numzones++;
+			zoneserver_list.Add(new ZoneServer(connection, console.get()));
+		}
+	);
+
+	server_connection->OnConnectionRemoved("Zone", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+		LogInfo("Removed Zone Server connection from [{0}]",
+			connection->GetUUID());
+
+		numzones--;
+		zoneserver_list.Remove(connection->GetUUID());
+	});
+
+	server_connection->OnConnectionIdentified("Launcher", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+		LogInfo("New Launcher connection from [{2}] at [{0}:{1}]",
+			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
+
+		launcher_list.Add(connection);
+	});
+
+	server_connection->OnConnectionRemoved("Launcher", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+		LogInfo("Removed Launcher connection from [{0}]",
+			connection->GetUUID());
+
+		launcher_list.Remove(connection);
+	});
+
+	server_connection->OnConnectionIdentified("QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+		LogInfo("New Query Server connection from [{2}] at [{0}:{1}]",
+			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
+
+		QSLink.AddConnection(connection);
+	});
+
+	server_connection->OnConnectionRemoved("QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+		LogInfo("Removed Query Server connection from [{0}]",
+			connection->GetUUID());
+
+		QSLink.RemoveConnection(connection);
+	});
+
+	server_connection->OnConnectionIdentified("UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+		LogInfo("New UCS Server connection from [{2}] at [{0}:{1}]",
+			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
+
+		UCSLink.SetConnection(connection);
+
+		zoneserver_list.UpdateUCSServerAvailable();
+	});
+
+	server_connection->OnConnectionRemoved("UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+			LogInfo("Removed UCS Server connection from [{0}]",
+			connection->GetUUID());
+
+		UCSLink.SetConnection(nullptr);
+
+		zoneserver_list.UpdateUCSServerAvailable(false);
+	});
+
+	server_connection->OnConnectionIdentified("WebInterface", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+		LogInfo("New WebInterface Server connection from [{2}] at [{0}:{1}]",
+			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
+
+		web_interface.AddConnection(connection);
+	});
+
+	server_connection->OnConnectionRemoved("WebInterface", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
+		LogInfo("Removed WebInterface Server connection from [{0}]",
+			connection->GetUUID());
+
+		web_interface.RemoveConnection(connection);
+	});
+
+	EQStreamManagerInterfaceOptions opts(9000, false, false);
+	opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS);
+	opts.daybreak_options.resend_delay_factor = RuleR(Network, ResendDelayFactor);
+	opts.daybreak_options.resend_delay_min = RuleI(Network, ResendDelayMinMS);
+	opts.daybreak_options.resend_delay_max = RuleI(Network, ResendDelayMaxMS);
+	opts.daybreak_options.outgoing_data_rate = RuleR(Network, ClientDataRate);
+
+	EQ::Net::EQStreamManager eqsm(opts);
+
+	//register all the patches we have avaliable with the stream identifier.
+	EQStreamIdentifier stream_identifier;
+	RegisterAllPatches(stream_identifier);
+	zoneserver_list.shutdowntimer = new Timer(60000);
+	zoneserver_list.shutdowntimer->Disable();
+	zoneserver_list.reminder = new Timer(20000);
+	zoneserver_list.reminder->Disable();
+	Timer InterserverTimer(INTERSERVER_TIMER); // does MySQL pings and auto-reconnect
+	InterserverTimer.Trigger();
+	uint8 ReconnectCounter = 100;
+	std::shared_ptr<EQStreamInterface> eqs;
+	EQStreamInterface *eqsi;
+
+	eqsm.OnNewConnection([&stream_identifier](std::shared_ptr<EQ::Net::EQStream> stream) {
+		stream_identifier.AddStream(stream);
+		LogInfo("New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
+	});
+
+	while (RunLoops) {
+		Timer::SetCurrentTime();
+		eqs = nullptr;
+
+		//give the stream identifier a chance to do its work....
+		stream_identifier.Process();
+
+		//check the stream identifier for any now-identified streams
+		while ((eqsi = stream_identifier.PopIdentified())) {
+			//now that we know what patch they are running, start up their client object
+			struct in_addr	in{};
+			in.s_addr = eqsi->GetRemoteIP();
+			if (RuleB(World, UseBannedIPsTable)) { //Lieka: Check to see if we have the responsibility for blocking IPs.
+				LogInfo("Checking inbound connection [{}] against BannedIPs table", inet_ntoa(in));
+				if (!database.CheckBannedIPs(inet_ntoa(in))) { //Lieka: Check inbound IP against banned IP table.
+					LogInfo("Connection [{}] PASSED banned IPs check. Processing connection", inet_ntoa(in));
+					auto client = new Client(eqsi);
+					// @merth: client->zoneattempt=0;
+					client_list.Add(client);
+				}
+				else {
+					LogInfo("Connection from [{}] failed banned IPs check. Closing connection", inet_ntoa(in));
+					eqsi->Close(); //Lieka: If the inbound IP is on the banned table, close the EQStream.
+				}
+			}
+			if (!RuleB(World, UseBannedIPsTable)) {
+				LogInfo("New connection from [{}]:[{}], processing connection", inet_ntoa(in), ntohs(eqsi->GetRemotePort()));
+				auto client = new Client(eqsi);
+				// @merth: client->zoneattempt=0;
+				client_list.Add(client);
+			}
+		}
+
+		client_list.Process();
+
+		if (PurgeInstanceTimer.Check()) {
+			database.PurgeExpiredInstances();
+			database.PurgeAllDeletedDataBuckets();
+		}
+
+		if (EQTimeTimer.Check()) {
+			TimeOfDay_Struct tod;
+			zoneserver_list.worldclock.GetCurrentEQTimeOfDay(time(0), &tod);
+			if (!database.SaveTime(tod.minute, tod.hour, tod.day, tod.month, tod.year))
+				LogError("Failed to save eqtime");
+			else
+				LogDebug("EQTime successfully saved");
+		}
+
+		zoneserver_list.Process();
+		launcher_list.Process();
+		LFPGroupList.Process();
+		adventure_manager.Process();
+
+		if (InterserverTimer.Check()) {
+			InterserverTimer.Start();
+			database.ping();
+
+			std::string window_title = StringFormat("World: %s Clients: %i", Config->LongName.c_str(), client_list.GetClientCount());
+			UpdateWindowTitle(window_title);
+		}
+
+		EQ::EventLoop::Get().Process();
+		Sleep(5);
+	}
+	LogInfo("World main loop completed");
+	LogInfo("Shutting down zone connections (if any)");
+	zoneserver_list.KillAll();
+	LogInfo("Zone (TCP) listener stopped");
+	LogInfo("Signaling HTTP service to stop");
+	LogSys.CloseFileLogs();
+
+	return 0;
+}
+
+void CatchSignal(int sig_num) {
+	LogInfo("Caught signal [{}]", sig_num);
+	RunLoops = false;
+}
+
+void UpdateWindowTitle(char* iNewTitle) {
+#ifdef _WINDOWS
+	char tmp[500];
+	if (iNewTitle) {
+		snprintf(tmp, sizeof(tmp), "World: %s", iNewTitle);
+	}
+	else {
+		snprintf(tmp, sizeof(tmp), "World");
+	}
+	SetConsoleTitle(tmp);
+#endif
+}
+
+void CheckForServerScript(bool force_download) {
+	/* Fetch EQEmu Server script */
+	if (!std::ifstream("eqemu_server.pl") || force_download) {
+
+		if(force_download)
+			std::remove("eqemu_server.pl"); /* Delete local before fetch */
+
+		std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl;
+#ifdef _WIN32
+		if(system("perl -MLWP::UserAgent -e \"require LWP::UserAgent;  my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\""));
+#else
+		if(system("wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl"));
+#endif
+	}
+}
diff --git a/world/net.h b/world/main.h
similarity index 100%
rename from world/net.h
rename to world/main.h
diff --git a/world/net.cpp b/world/net.cpp
deleted file mode 100644
index ce5900d30..000000000
--- a/world/net.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY except by those people which sell it, which
-are required to give you total support for your newly bought product;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "../common/global_define.h"
-
-#include <iostream>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <signal.h>
-
-#include "../common/string_util.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
-#include "../common/queue.h"
-#include "../common/timer.h"
-#include "../common/eq_packet.h"
-#include "../common/seperator.h"
-#include "../common/version.h"
-#include "../common/eqtime.h"
-#include "../common/event/event_loop.h"
-#include "../common/net/eqstream.h"
-#include "../common/opcodemgr.h"
-#include "../common/guilds.h"
-#include "../common/eq_stream_ident.h"
-#include "../common/rulesys.h"
-#include "../common/platform.h"
-#include "../common/crash.h"
-#include "client.h"
-#include "worlddb.h"
-#ifdef _WINDOWS
-#include <process.h>
-#define snprintf	_snprintf
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
-#include <conio.h>
-#else
-#include <pthread.h>
-#include "../common/unix.h"
-#include <sys/types.h>
-#include <sys/ipc.h>
-#include <sys/sem.h>
-#include <sys/shm.h>
-#if not defined (FREEBSD) && not defined (DARWIN)
-union semun {
-	int val;
-	struct semid_ds *buf;
-	ushort *array;
-	struct seminfo *__buf;
-	void *__pad;
-};
-#endif
-
-#endif
-
-#include "../common/patches/patches.h"
-#include "../common/random.h"
-#include "zoneserver.h"
-#include "login_server.h"
-#include "login_server_list.h"
-#include "world_config.h"
-#include "zoneserver.h"
-#include "zonelist.h"
-#include "clientlist.h"
-#include "launcher_list.h"
-#include "wguild_mgr.h"
-#include "lfplist.h"
-#include "adventure_manager.h"
-#include "ucs.h"
-#include "queryserv.h"
-#include "web_interface.h"
-#include "console.h"
-
-#include "../common/net/servertalk_server.h"
-#include "../zone/data_bucket.h"
-
-ClientList client_list;
-GroupLFPList LFPGroupList;
-ZSList zoneserver_list;
-LoginServerList loginserverlist;
-UCSConnection UCSLink;
-QueryServConnection QSLink;
-LauncherList launcher_list;
-AdventureManager adventure_manager;
-EQEmu::Random emu_random;
-volatile bool RunLoops = true;
-uint32 numclients = 0;
-uint32 numzones = 0;
-bool holdzones = false;
-const WorldConfig *Config;
-EQEmuLogSys LogSys;
-WebInterfaceList web_interface;
-
-void CatchSignal(int sig_num);
-void CheckForServerScript(bool force_download = false);
-
-inline void UpdateWindowTitle(std::string new_title) {
-#ifdef _WINDOWS
-	SetConsoleTitle(new_title.c_str());
-#endif
-}
-
-int main(int argc, char** argv) {
-	RegisterExecutablePlatform(ExePlatformWorld);
-	LogSys.LoadLogSettingsDefaults();
-	set_exception_handler();
-
-	/* If eqemu_config.json does not exist - create it from conversion... */
-	if (!std::ifstream("eqemu_config.json")) {
-		CheckForServerScript(true);
-		/* Run EQEmu Server script (Checks for database updates) */
-		system("perl eqemu_server.pl convert_xml");
-	}
-	else {
-		/* Download EQEmu Server Maintenance Script if doesn't exist */
-		CheckForServerScript();
-	}
-
-	/* Database Version Check */
-	uint32 Database_Version = CURRENT_BINARY_DATABASE_VERSION;
-	uint32 Bots_Database_Version = CURRENT_BINARY_BOTS_DATABASE_VERSION;
-	if (argc >= 2) {
-		if (strcasecmp(argv[1], "db_version") == 0) {
-			std::cout << "Binary Database Version: " << Database_Version << " : " << Bots_Database_Version << std::endl;
-			return 0;
-		}
-	}
-
-	// Load server configuration
-	Log(Logs::General, Logs::World_Server, "Loading server configuration..");
-	if (!WorldConfig::LoadConfig()) {
-		Log(Logs::General, Logs::World_Server, "Loading server configuration failed.");
-		return 1;
-	}
-
-	Config = WorldConfig::get();
-
-	Log(Logs::General, Logs::World_Server, "CURRENT_VERSION: %s", CURRENT_VERSION);
-
-	if (signal(SIGINT, CatchSignal) == SIG_ERR) {
-		Log(Logs::General, Logs::World_Server, "Could not set signal handler");
-		return 1;
-	}
-
-	if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
-		Log(Logs::General, Logs::World_Server, "Could not set signal handler");
-		return 1;
-	}
-
-#ifndef WIN32
-	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
-		Log(Logs::General, Logs::World_Server, "Could not set signal handler");
-		return 1;
-	}
-#endif
-
-	// add login server config to list
-	if (Config->LoginCount == 0) {
-		if (Config->LoginHost.length()) {
-			loginserverlist.Add(Config->LoginHost.c_str(), Config->LoginPort, Config->LoginAccount.c_str(), Config->LoginPassword.c_str(), Config->LoginLegacy);
-			Log(Logs::General, Logs::World_Server, "Added loginserver %s:%i", Config->LoginHost.c_str(), Config->LoginPort);
-		}
-	}
-	else {
-		LinkedList<LoginConfig*> loginlist = Config->loginlist;
-		LinkedListIterator<LoginConfig*> iterator(loginlist);
-		iterator.Reset();
-		while (iterator.MoreElements()) {
-			loginserverlist.Add(iterator.GetData()->LoginHost.c_str(), iterator.GetData()->LoginPort, iterator.GetData()->LoginAccount.c_str(), iterator.GetData()->LoginPassword.c_str(),
-				iterator.GetData()->LoginLegacy);
-			Log(Logs::General, Logs::World_Server, "Added loginserver %s:%i", iterator.GetData()->LoginHost.c_str(), iterator.GetData()->LoginPort);
-			iterator.Advance();
-		}
-	}
-
-	Log(Logs::General, Logs::World_Server, "Connecting to MySQL %s@%s:%i...", Config->DatabaseUsername.c_str(), Config->DatabaseHost.c_str(), Config->DatabasePort);
-	if (!database.Connect(
-		Config->DatabaseHost.c_str(),
-		Config->DatabaseUsername.c_str(),
-		Config->DatabasePassword.c_str(),
-		Config->DatabaseDB.c_str(),
-		Config->DatabasePort)) {
-		Log(Logs::General, Logs::World_Server, "Cannot continue without a database connection.");
-		return 1;
-	}
-	guild_mgr.SetDatabase(&database);
-
-	/* Register Log System and Settings */
-	database.LoadLogSettings(LogSys.log_settings);
-	LogSys.StartFileLogs();
-
-	bool ignore_db = false;
-	if (argc >= 2) {
-		std::string tmp;
-		if (strcasecmp(argv[1], "help") == 0 || strcasecmp(argv[1], "?") == 0 || strcasecmp(argv[1], "/?") == 0 || strcasecmp(argv[1], "-?") == 0 || strcasecmp(argv[1], "-h") == 0 || strcasecmp(argv[1], "-help") == 0) {
-			std::cout << "Worldserver command line commands:" << std::endl;
-			std::cout << "adduser username password flag    - adds a user account" << std::endl;
-			std::cout << "flag username flag    - sets GM flag on the account" << std::endl;
-			std::cout << "startzone zoneshortname    - sets the starting zone" << std::endl;
-			std::cout << "-holdzones    - reboots lost zones" << std::endl;
-			return 0;
-		}
-		else if (strcasecmp(argv[1], "-holdzones") == 0) {
-			std::cout << "Reboot Zones mode ON" << std::endl;
-			holdzones = true;
-		}
-		else if (database.GetVariable("disablecommandline", tmp)) {
-			if (tmp.length() == 1) {
-				if (tmp[0] == '1') {
-					std::cerr << "Command line disabled in database... exiting" << std::endl;
-					return 1;
-				}
-			}
-		}
-		else if (strcasecmp(argv[1], "adduser") == 0) {
-			if (argc == 5) {
-				if (Seperator::IsNumber(argv[4])) {
-					if (atoi(argv[4]) >= 0 && atoi(argv[4]) <= 255) {
-						if (database.CreateAccount(argv[2], argv[3], atoi(argv[4])) == 0) {
-							std::cerr << "database.CreateAccount failed." << std::endl;
-							return 1;
-						}
-						else {
-							std::cout << "Account created: Username='" << argv[2] << "', Password='" << argv[3] << "', status=" << argv[4] << std::endl;
-							return 0;
-						}
-					}
-				}
-			}
-			std::cout << "Usage: world adduser username password flag" << std::endl;
-			std::cout << "flag = 0, 1 or 2" << std::endl;
-			return 0;
-		}
-		else if (strcasecmp(argv[1], "flag") == 0) {
-			if (argc == 4) {
-				if (Seperator::IsNumber(argv[3])) {
-					if (atoi(argv[3]) >= 0 && atoi(argv[3]) <= 255) {
-						if (database.SetAccountStatus(argv[2], atoi(argv[3]))) {
-							std::cout << "Account flagged: Username='" << argv[2] << "', status=" << argv[3] << std::endl;
-							return 0;
-						}
-						else {
-							std::cerr << "database.SetAccountStatus failed." << std::endl;
-							return 1;
-						}
-					}
-				}
-			}
-			std::cout << "Usage: world flag username flag" << std::endl;
-			std::cout << "flag = 0-200" << std::endl;
-			return 0;
-		}
-		else if (strcasecmp(argv[1], "startzone") == 0) {
-			if (argc == 3) {
-				if (strlen(argv[2]) < 3) {
-					std::cerr << "Error: zone name too short" << std::endl;
-					return 1;
-				}
-				else if (strlen(argv[2]) > 15) {
-					std::cerr << "Error: zone name too long" << std::endl;
-					return 1;
-				}
-				else {
-					if (database.SetVariable("startzone", argv[2])) {
-						std::cout << "Starting zone changed: '" << argv[2] << "'" << std::endl;
-						return 0;
-					}
-					else {
-						std::cerr << "database.SetVariable failed." << std::endl;
-						return 1;
-					}
-				}
-			}
-			std::cout << "Usage: world startzone zoneshortname" << std::endl;
-			return 0;
-		}
-		else if (strcasecmp(argv[1], "ignore_db") == 0) {
-			ignore_db = true;
-		}
-		else {
-			std::cerr << "Error, unknown command line option" << std::endl;
-			return 1;
-		}
-	}
-
-	if (!ignore_db) {
-		Log(Logs::General, Logs::World_Server, "Checking Database Conversions..");
-		database.CheckDatabaseConversions();
-	}
-	Log(Logs::General, Logs::World_Server, "Loading variables..");
-	database.LoadVariables();
-
-	std::string hotfix_name;
-	if (database.GetVariable("hotfix_name", hotfix_name)) {
-		if (!hotfix_name.empty()) {
-			Log(Logs::General, Logs::Zone_Server, "Current hotfix in use: '%s'", hotfix_name.c_str());
-		}
-	}
-
-	Log(Logs::General, Logs::World_Server, "Purging expired data buckets...");
-	database.PurgeAllDeletedDataBuckets();
-
-	Log(Logs::General, Logs::World_Server, "Loading zones..");
-	database.LoadZoneNames();
-	Log(Logs::General, Logs::World_Server, "Clearing groups..");
-	database.ClearGroup();
-	Log(Logs::General, Logs::World_Server, "Clearing raids..");
-	database.ClearRaid();
-	database.ClearRaidDetails();
-	database.ClearRaidLeader();
-	Log(Logs::General, Logs::World_Server, "Clearing inventory snapshots..");
-	database.ClearInvSnapshots();
-	Log(Logs::General, Logs::World_Server, "Loading items..");
-	if (!database.LoadItems(hotfix_name))
-		Log(Logs::General, Logs::World_Server, "Error: Could not load item data. But ignoring");
-	Log(Logs::General, Logs::World_Server, "Loading skill caps..");
-	if (!database.LoadSkillCaps(std::string(hotfix_name)))
-		Log(Logs::General, Logs::World_Server, "Error: Could not load skill cap data. But ignoring");
-	Log(Logs::General, Logs::World_Server, "Loading guilds..");
-	guild_mgr.LoadGuilds();
-	//rules:
-	{
-		std::string tmp;
-		if (database.GetVariable("RuleSet", tmp)) {
-			Log(Logs::General, Logs::World_Server, "Loading rule set '%s'", tmp.c_str());
-			if (!RuleManager::Instance()->LoadRules(&database, tmp.c_str(), false)) {
-				Log(Logs::General, Logs::World_Server, "Failed to load ruleset '%s', falling back to defaults.", tmp.c_str());
-			}
-		}
-		else {
-			if (!RuleManager::Instance()->LoadRules(&database, "default", false)) {
-				Log(Logs::General, Logs::World_Server, "No rule set configured, using default rules");
-			}
-			else {
-				Log(Logs::General, Logs::World_Server, "Loaded default rule set 'default'", tmp.c_str());
-			}
-		}
-
-		EQEmu::InitializeDynamicLookups();
-		Log(Logs::General, Logs::World_Server, "Initialized dynamic dictionary entries");
-	}
-
-	if (RuleB(World, ClearTempMerchantlist)) {
-		Log(Logs::General, Logs::World_Server, "Clearing temporary merchant lists..");
-		database.ClearMerchantTemp();
-	}
-
-	RuleManager::Instance()->SaveRules(&database);
-
-	Log(Logs::General, Logs::World_Server, "Loading EQ time of day..");
-	TimeOfDay_Struct eqTime;
-	time_t realtime;
-	eqTime = database.LoadTime(realtime);
-	zoneserver_list.worldclock.SetCurrentEQTimeOfDay(eqTime, realtime);
-	Timer EQTimeTimer(600000);
-	EQTimeTimer.Start(600000);
-
-	Log(Logs::General, Logs::World_Server, "Loading launcher list..");
-	launcher_list.LoadList();
-
-	std::string tmp;
-	database.GetVariable("holdzones", tmp);
-	if (tmp.length() == 1 && tmp[0] == '1') {
-		holdzones = true;
-	}
-	Log(Logs::General, Logs::World_Server, "Reboot zone modes %s", holdzones ? "ON" : "OFF");
-
-	Log(Logs::General, Logs::World_Server, "Deleted %i stale player corpses from database", database.DeleteStalePlayerCorpses());
-
-	Log(Logs::General, Logs::World_Server, "Loading adventures...");
-	if (!adventure_manager.LoadAdventureTemplates())
-	{
-		Log(Logs::General, Logs::World_Server, "Unable to load adventure templates.");
-	}
-
-	if (!adventure_manager.LoadAdventureEntries())
-	{
-		Log(Logs::General, Logs::World_Server, "Unable to load adventure templates.");
-	}
-
-	adventure_manager.Load();
-	adventure_manager.LoadLeaderboardInfo();
-
-	Log(Logs::General, Logs::World_Server, "Purging expired instances");
-	database.PurgeExpiredInstances();
-
-	Timer PurgeInstanceTimer(450000);
-	PurgeInstanceTimer.Start(450000);
-
-	Log(Logs::General, Logs::World_Server, "Loading char create info...");
-	database.LoadCharacterCreateAllocations();
-	database.LoadCharacterCreateCombos();
-
-	std::unique_ptr<EQ::Net::ConsoleServer> console;
-	if (Config->TelnetEnabled) {
-		Log(Logs::General, Logs::World_Server, "Console (TCP) listener started.");
-		console.reset(new EQ::Net::ConsoleServer(Config->TelnetIP, Config->TelnetTCPPort));
-		RegisterConsoleFunctions(console);
-	}
-
-	std::unique_ptr<EQ::Net::ServertalkServer> server_connection;
-	server_connection.reset(new EQ::Net::ServertalkServer());
-
-	EQ::Net::ServertalkServerOptions server_opts;
-	server_opts.port = Config->WorldTCPPort;
-	server_opts.ipv6 = false;
-	server_opts.credentials = Config->SharedKey;
-	server_connection->Listen(server_opts);
-	Log(Logs::General, Logs::World_Server, "Server (TCP) listener started.");
-
-	server_connection->OnConnectionIdentified("Zone", [&console](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "New Zone Server connection from {2} at {0}:{1}",
-			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
-
-		numzones++;
-		zoneserver_list.Add(new ZoneServer(connection, console.get()));
-	});
-
-	server_connection->OnConnectionRemoved("Zone", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "Removed Zone Server connection from {0}",
-			connection->GetUUID());
-
-		numzones--;
-		zoneserver_list.Remove(connection->GetUUID());
-	});
-
-	server_connection->OnConnectionIdentified("Launcher", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "New Launcher connection from {2} at {0}:{1}",
-			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
-
-		launcher_list.Add(connection);
-	});
-
-	server_connection->OnConnectionRemoved("Launcher", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "Removed Launcher connection from {0}",
-			connection->GetUUID());
-
-		launcher_list.Remove(connection);
-	});
-
-	server_connection->OnConnectionIdentified("QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "New Query Server connection from {2} at {0}:{1}",
-			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
-
-		QSLink.AddConnection(connection);
-	});
-
-	server_connection->OnConnectionRemoved("QueryServ", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "Removed Query Server connection from {0}",
-			connection->GetUUID());
-
-		QSLink.RemoveConnection(connection);
-	});
-
-	server_connection->OnConnectionIdentified("UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "New UCS Server connection from {2} at {0}:{1}",
-			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
-
-		UCSLink.SetConnection(connection);
-
-		zoneserver_list.UpdateUCSServerAvailable();
-	});
-
-	server_connection->OnConnectionRemoved("UCS", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "Removed Query Server connection from {0}",
-			connection->GetUUID());
-
-		UCSLink.SetConnection(nullptr);
-
-		zoneserver_list.UpdateUCSServerAvailable(false);
-	});
-
-	server_connection->OnConnectionIdentified("WebInterface", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "New WebInterface Server connection from {2} at {0}:{1}",
-			connection->Handle()->RemoteIP(), connection->Handle()->RemotePort(), connection->GetUUID());
-
-		web_interface.AddConnection(connection);
-	});
-
-	server_connection->OnConnectionRemoved("WebInterface", [](std::shared_ptr<EQ::Net::ServertalkServerConnection> connection) {
-		LogF(Logs::General, Logs::World_Server, "Removed WebInterface Server connection from {0}",
-			connection->GetUUID());
-
-		web_interface.RemoveConnection(connection);
-	});
-
-	EQStreamManagerInterfaceOptions opts(9000, false, false);
-	opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS);
-	opts.daybreak_options.resend_delay_factor = RuleR(Network, ResendDelayFactor);
-	opts.daybreak_options.resend_delay_min = RuleI(Network, ResendDelayMinMS);
-	opts.daybreak_options.resend_delay_max = RuleI(Network, ResendDelayMaxMS);
-	opts.daybreak_options.outgoing_data_rate = RuleR(Network, ClientDataRate);
-
-	EQ::Net::EQStreamManager eqsm(opts);
-
-	//register all the patches we have avaliable with the stream identifier.
-	EQStreamIdentifier stream_identifier;
-	RegisterAllPatches(stream_identifier);
-	zoneserver_list.shutdowntimer = new Timer(60000);
-	zoneserver_list.shutdowntimer->Disable();
-	zoneserver_list.reminder = new Timer(20000);
-	zoneserver_list.reminder->Disable();
-	Timer InterserverTimer(INTERSERVER_TIMER); // does MySQL pings and auto-reconnect
-	InterserverTimer.Trigger();
-	uint8 ReconnectCounter = 100;
-	std::shared_ptr<EQStreamInterface> eqs;
-	EQStreamInterface *eqsi;
-
-	eqsm.OnNewConnection([&stream_identifier](std::shared_ptr<EQ::Net::EQStream> stream) {
-		stream_identifier.AddStream(stream);
-		LogF(Logs::Detail, Logs::World_Server, "New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
-	});
-
-	while (RunLoops) {
-		Timer::SetCurrentTime();
-		eqs = nullptr;
-
-		//give the stream identifier a chance to do its work....
-		stream_identifier.Process();
-
-		//check the stream identifier for any now-identified streams
-		while ((eqsi = stream_identifier.PopIdentified())) {
-			//now that we know what patch they are running, start up their client object
-			struct in_addr	in;
-			in.s_addr = eqsi->GetRemoteIP();
-			if (RuleB(World, UseBannedIPsTable)) { //Lieka: Check to see if we have the responsibility for blocking IPs.
-				Log(Logs::Detail, Logs::World_Server, "Checking inbound connection %s against BannedIPs table", inet_ntoa(in));
-				if (!database.CheckBannedIPs(inet_ntoa(in))) { //Lieka: Check inbound IP against banned IP table.
-					Log(Logs::Detail, Logs::World_Server, "Connection %s PASSED banned IPs check. Processing connection.", inet_ntoa(in));
-					auto client = new Client(eqsi);
-					// @merth: client->zoneattempt=0;
-					client_list.Add(client);
-				}
-				else {
-					Log(Logs::General, Logs::World_Server, "Connection from %s FAILED banned IPs check. Closing connection.", inet_ntoa(in));
-					eqsi->Close(); //Lieka: If the inbound IP is on the banned table, close the EQStream.
-				}
-			}
-			if (!RuleB(World, UseBannedIPsTable)) {
-				Log(Logs::Detail, Logs::World_Server, "New connection from %s:%d, processing connection", inet_ntoa(in), ntohs(eqsi->GetRemotePort()));
-				auto client = new Client(eqsi);
-				// @merth: client->zoneattempt=0;
-				client_list.Add(client);
-			}
-		}
-
-		client_list.Process();
-
-		if (PurgeInstanceTimer.Check()) {
-			database.PurgeExpiredInstances();
-			database.PurgeAllDeletedDataBuckets();
-		}
-
-		if (EQTimeTimer.Check()) {
-			TimeOfDay_Struct tod;
-			zoneserver_list.worldclock.GetCurrentEQTimeOfDay(time(0), &tod);
-			if (!database.SaveTime(tod.minute, tod.hour, tod.day, tod.month, tod.year))
-				Log(Logs::General, Logs::World_Server, "Failed to save eqtime.");
-			else
-				Log(Logs::Detail, Logs::World_Server, "EQTime successfully saved.");
-		}
-
-		zoneserver_list.Process();
-		launcher_list.Process();
-		LFPGroupList.Process();
-		adventure_manager.Process();
-
-		if (InterserverTimer.Check()) {
-			InterserverTimer.Start();
-			database.ping();
-
-			std::string window_title = StringFormat("World: %s Clients: %i", Config->LongName.c_str(), client_list.GetClientCount());
-			UpdateWindowTitle(window_title);
-		}
-
-		EQ::EventLoop::Get().Process();
-		Sleep(5);
-	}
-	Log(Logs::General, Logs::World_Server, "World main loop completed.");
-	Log(Logs::General, Logs::World_Server, "Shutting down zone connections (if any).");
-	zoneserver_list.KillAll();
-	Log(Logs::General, Logs::World_Server, "Zone (TCP) listener stopped.");
-	Log(Logs::General, Logs::World_Server, "Signaling HTTP service to stop...");
-	LogSys.CloseFileLogs();
-
-	return 0;
-}
-
-void CatchSignal(int sig_num) {
-	Log(Logs::General, Logs::World_Server, "Caught signal %d", sig_num);
-	RunLoops = false;
-}
-
-void UpdateWindowTitle(char* iNewTitle) {
-#ifdef _WINDOWS
-	char tmp[500];
-	if (iNewTitle) {
-		snprintf(tmp, sizeof(tmp), "World: %s", iNewTitle);
-	}
-	else {
-		snprintf(tmp, sizeof(tmp), "World");
-	}
-	SetConsoleTitle(tmp);
-#endif
-}
-
-void CheckForServerScript(bool force_download) {
-	/* Fetch EQEmu Server script */
-	if (!std::ifstream("eqemu_server.pl") || force_download) {
-
-		if(force_download)
-			std::remove("eqemu_server.pl"); /* Delete local before fetch */
-
-		std::cout << "Pulling down EQEmu Server Maintenance Script (eqemu_server.pl)..." << std::endl;
-#ifdef _WIN32
-		system("perl -MLWP::UserAgent -e \"require LWP::UserAgent;  my $ua = LWP::UserAgent->new; $ua->timeout(10); $ua->env_proxy; my $response = $ua->get('https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl'); if ($response->is_success){ open(FILE, '> eqemu_server.pl'); print FILE $response->decoded_content; close(FILE); }\"");
-#else
-		system("wget -N --no-check-certificate --quiet -O eqemu_server.pl https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/eqemu_server.pl");
-#endif
-	}
-}
diff --git a/world/ucs.cpp b/world/ucs.cpp
index b745005d4..f5910da80 100644
--- a/world/ucs.cpp
+++ b/world/ucs.cpp
@@ -16,7 +16,7 @@ void UCSConnection::SetConnection(std::shared_ptr<EQ::Net::ServertalkServerConne
 {
 	if (Stream && Stream->Handle())
 	{
-		Log(Logs::Detail, Logs::UCS_Server, "Incoming UCS Connection while we were already connected to a UCS.");
+		LogInfo("Incoming UCS Connection while we were already connected to a UCS");
 		Stream->Handle()->Disconnect();
 	}
 
@@ -46,12 +46,12 @@ void UCSConnection::ProcessPacket(uint16 opcode, EQ::Net::Packet &p)
 		}
 		case ServerOP_ZAAuth:
 		{
-			Log(Logs::Detail, Logs::UCS_Server, "Got authentication from UCS when they are already authenticated.");
+			LogInfo("Got authentication from UCS when they are already authenticated");
 			break;
 		}
 		default:
 		{
-			Log(Logs::Detail, Logs::UCS_Server, "Unknown ServerOPcode from UCS 0x%04x, size %d", opcode, pack->size);
+			LogInfo("Unknown ServerOPcode from UCS {:#04x}, size [{}]", opcode, pack->size);
 			DumpPacket(pack->pBuffer, pack->size);
 			break;
 		}
diff --git a/world/web_interface.cpp b/world/web_interface.cpp
index 191d8cca1..773e955b6 100644
--- a/world/web_interface.cpp
+++ b/world/web_interface.cpp
@@ -24,7 +24,7 @@ void WebInterface::OnCall(uint16 opcode, EQ::Net::Packet &p)
 		std::stringstream ss(json_str);
 		ss >> root;
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		SendError("Could not parse request");
 		return;
 	}
@@ -40,7 +40,7 @@ void WebInterface::OnCall(uint16 opcode, EQ::Net::Packet &p)
 			return;
 		}
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		SendError("Invalid request: method not supplied");
 		return;
 	}
@@ -49,7 +49,7 @@ void WebInterface::OnCall(uint16 opcode, EQ::Net::Packet &p)
 	try {
 		params = root["params"];
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		params = nullptr;
 	}
 	
@@ -57,7 +57,7 @@ void WebInterface::OnCall(uint16 opcode, EQ::Net::Packet &p)
 	try {
 		id = root["id"].asString();
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		id = "";
 	}
 
@@ -82,7 +82,7 @@ void WebInterface::Send(const Json::Value &value)
 		p.PutString(0, ss.str());
 		m_connection->Send(ServerOP_WebInterfaceCall, p);
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		//Log error
 	}
 }
@@ -116,7 +116,7 @@ void WebInterface::SendEvent(const Json::Value &value)
 		p.PutString(0, ss.str());
 		m_connection->Send(ServerOP_WebInterfaceEvent, p);
 	}
-	catch (std::exception) {
+	catch (std::exception &) {
 		//Log error
 	}
 }
diff --git a/world/wguild_mgr.cpp b/world/wguild_mgr.cpp
index dbc20fba6..2768a4dd8 100644
--- a/world/wguild_mgr.cpp
+++ b/world/wguild_mgr.cpp
@@ -34,7 +34,7 @@ WorldGuildManager guild_mgr;
 
 
 void WorldGuildManager::SendGuildRefresh(uint32 guild_id, bool name, bool motd, bool rank, bool relation) {
-	Log(Logs::Detail, Logs::Guilds, "Broadcasting guild refresh for %d, changes: name=%d, motd=%d, rank=d, relation=%d", guild_id, name, motd, rank, relation);
+	LogGuilds("Broadcasting guild refresh for [{}], changes: name=[{}], motd=[{}], rank=d, relation=[{}]", guild_id, name, motd, rank, relation);
 	auto pack = new ServerPacket(ServerOP_RefreshGuild, sizeof(ServerGuildRefresh_Struct));
 	ServerGuildRefresh_Struct *s = (ServerGuildRefresh_Struct *) pack->pBuffer;
 	s->guild_id = guild_id;
@@ -47,7 +47,7 @@ void WorldGuildManager::SendGuildRefresh(uint32 guild_id, bool name, bool motd,
 }
 
 void WorldGuildManager::SendCharRefresh(uint32 old_guild_id, uint32 guild_id, uint32 charid) {
-	Log(Logs::Detail, Logs::Guilds, "Broadcasting char refresh for %d from guild %d to world", charid, guild_id);
+	LogGuilds("Broadcasting char refresh for [{}] from guild [{}] to world", charid, guild_id);
 	auto pack = new ServerPacket(ServerOP_GuildCharRefresh, sizeof(ServerGuildCharRefresh_Struct));
 	ServerGuildCharRefresh_Struct *s = (ServerGuildCharRefresh_Struct *) pack->pBuffer;
 	s->guild_id = guild_id;
@@ -58,7 +58,7 @@ void WorldGuildManager::SendCharRefresh(uint32 old_guild_id, uint32 guild_id, ui
 }
 
 void WorldGuildManager::SendGuildDelete(uint32 guild_id) {
-	Log(Logs::Detail, Logs::Guilds, "Broadcasting guild delete for guild %d to world", guild_id);
+	LogGuilds("Broadcasting guild delete for guild [{}] to world", guild_id);
 	auto pack = new ServerPacket(ServerOP_DeleteGuild, sizeof(ServerGuildID_Struct));
 	ServerGuildID_Struct *s = (ServerGuildID_Struct *) pack->pBuffer;
 	s->guild_id = guild_id;
@@ -71,18 +71,18 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) {
 
 	case ServerOP_RefreshGuild: {
 		if(pack->size != sizeof(ServerGuildRefresh_Struct)) {
-			Log(Logs::Detail, Logs::Guilds, "Received ServerOP_RefreshGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildRefresh_Struct));
+			LogGuilds("Received ServerOP_RefreshGuild of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildRefresh_Struct));
 			return;
 		}
 		ServerGuildRefresh_Struct *s = (ServerGuildRefresh_Struct *) pack->pBuffer;
-		Log(Logs::Detail, Logs::Guilds, "Received and broadcasting guild refresh for %d, changes: name=%d, motd=%d, rank=d, relation=%d", s->guild_id, s->name_change, s->motd_change, s->rank_change, s->relation_change);
+		LogGuilds("Received and broadcasting guild refresh for [{}], changes: name=[{}], motd=[{}], rank=d, relation=[{}]", s->guild_id, s->name_change, s->motd_change, s->rank_change, s->relation_change);
 
 		//broadcast this packet to all zones.
 		zoneserver_list.SendPacket(pack);
 
 		//preform a local refresh.
 		if(!RefreshGuild(s->guild_id)) {
-			Log(Logs::Detail, Logs::Guilds, "Unable to preform local refresh on guild %d", s->guild_id);
+			LogGuilds("Unable to preform local refresh on guild [{}]", s->guild_id);
 			//can we do anything?
 		}
 
@@ -91,11 +91,11 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) {
 
 	case ServerOP_GuildCharRefresh: {
 		if(pack->size != sizeof(ServerGuildCharRefresh_Struct)) {
-			Log(Logs::Detail, Logs::Guilds, "Received ServerOP_RefreshGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildCharRefresh_Struct));
+			LogGuilds("Received ServerOP_RefreshGuild of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildCharRefresh_Struct));
 			return;
 		}
 		ServerGuildCharRefresh_Struct *s = (ServerGuildCharRefresh_Struct *) pack->pBuffer;
-		Log(Logs::Detail, Logs::Guilds, "Received and broadcasting guild member refresh for char %d to all zones with members of guild %d", s->char_id, s->guild_id);
+		LogGuilds("Received and broadcasting guild member refresh for char [{}] to all zones with members of guild [{}]", s->char_id, s->guild_id);
 
 		//preform the local update
 		client_list.UpdateClientGuild(s->char_id, s->guild_id);
@@ -110,18 +110,18 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) {
 
 	case ServerOP_DeleteGuild: {
 		if(pack->size != sizeof(ServerGuildID_Struct)) {
-			Log(Logs::Detail, Logs::Guilds, "Received ServerOP_DeleteGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildID_Struct));
+			LogGuilds("Received ServerOP_DeleteGuild of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildID_Struct));
 			return;
 		}
 		ServerGuildID_Struct *s = (ServerGuildID_Struct *) pack->pBuffer;
-		Log(Logs::Detail, Logs::Guilds, "Received and broadcasting guild delete for guild %d", s->guild_id);
+		LogGuilds("Received and broadcasting guild delete for guild [{}]", s->guild_id);
 
 		//broadcast this packet to all zones.
 		zoneserver_list.SendPacket(pack);
 
 		//preform a local refresh.
 		if(!LocalDeleteGuild(s->guild_id)) {
-			Log(Logs::Detail, Logs::Guilds, "Unable to preform local delete on guild %d", s->guild_id);
+			LogGuilds("Unable to preform local delete on guild [{}]", s->guild_id);
 			//can we do anything?
 		}
 
@@ -131,7 +131,7 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) {
 	case ServerOP_GuildMemberUpdate: {
 		if(pack->size != sizeof(ServerGuildMemberUpdate_Struct))
 		{
-			Log(Logs::Detail, Logs::Guilds, "Received ServerOP_GuildMemberUpdate of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildMemberUpdate_Struct));
+			LogGuilds("Received ServerOP_GuildMemberUpdate of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildMemberUpdate_Struct));
 			return;
 		}
 
@@ -141,7 +141,7 @@ void WorldGuildManager::ProcessZonePacket(ServerPacket *pack) {
 	}
 
 	default:
-		Log(Logs::Detail, Logs::Guilds, "Unknown packet 0x%x received from zone??", pack->opcode);
+		LogGuilds("Unknown packet {:#04x} received from zone??", pack->opcode);
 		break;
 	}
 }
diff --git a/world/world_server_command_handler.cpp b/world/world_server_command_handler.cpp
new file mode 100644
index 000000000..3a929d89f
--- /dev/null
+++ b/world/world_server_command_handler.cpp
@@ -0,0 +1,205 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "world_server_command_handler.h"
+#include "../common/eqemu_logsys.h"
+#include "../common/json/json.h"
+#include "../common/version.h"
+#include "worlddb.h"
+#include "../common/database_schema.h"
+
+namespace WorldserverCommandHandler {
+
+	/**
+	 * @param argc
+	 * @param argv
+	 */
+	void CommandHandler(int argc, char **argv)
+	{
+		if (argc == 1) { return; }
+
+		argh::parser cmd;
+		cmd.parse(argc, argv, argh::parser::PREFER_PARAM_FOR_UNREG_OPTION);
+		EQEmuCommand::DisplayDebug(cmd);
+
+		/**
+		 * Declare command mapping
+		 */
+		auto function_map = EQEmuCommand::function_map;
+
+		/**
+		 * Register commands
+		 */
+		function_map["world:version"]               = &WorldserverCommandHandler::Version;
+		function_map["database:version"]            = &WorldserverCommandHandler::DatabaseVersion;
+		function_map["database:set-account-status"] = &WorldserverCommandHandler::DatabaseSetAccountStatus;
+		function_map["database:schema"]             = &WorldserverCommandHandler::DatabaseGetSchema;
+
+		EQEmuCommand::HandleMenu(function_map, cmd, argc, argv);
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void DatabaseVersion(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Shows database version";
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		Json::Value database_version;
+
+		database_version["database_version"]      = CURRENT_BINARY_DATABASE_VERSION;
+		database_version["bots_database_version"] = CURRENT_BINARY_BOTS_DATABASE_VERSION;
+
+		std::stringstream payload;
+		payload << database_version;
+
+		std::cout << payload.str() << std::endl;
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void Version(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Shows server version";
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		Json::Value database_version;
+
+		database_version["bots_database_version"] = CURRENT_BINARY_BOTS_DATABASE_VERSION;
+		database_version["compile_date"]          = COMPILE_DATE;
+		database_version["compile_time"]          = COMPILE_TIME;
+		database_version["database_version"]      = CURRENT_BINARY_DATABASE_VERSION;
+		database_version["server_version"]        = CURRENT_VERSION;
+
+		std::stringstream payload;
+		payload << database_version;
+
+		std::cout << payload.str() << std::endl;
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Sets account status by account name";
+
+		std::vector<std::string> arguments = {
+			"{name}",
+			"{status}"
+		};
+
+		std::vector<std::string> options = {};
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		EQEmuCommand::ValidateCmdInput(arguments, options, cmd, argc, argv);
+
+		database.SetAccountStatus(
+			cmd(2).str(),
+			std::stoi(cmd(3).str())
+		);
+	}
+
+	/**
+	 * @param argc
+	 * @param argv
+	 * @param cmd
+	 * @param description
+	 */
+	void DatabaseGetSchema(int argc, char **argv, argh::parser &cmd, std::string &description)
+	{
+		description = "Displays server database schema";
+
+		if (cmd[{"-h", "--help"}]) {
+			return;
+		}
+
+		Json::Value              player_tables_json;
+		std::vector<std::string> player_tables  = DatabaseSchema::GetPlayerTables();
+		for (const auto          &table : player_tables) {
+			player_tables_json.append(table);
+		}
+
+		Json::Value              content_tables_json;
+		std::vector<std::string> content_tables = DatabaseSchema::GetContentTables();
+		for (const auto          &table : content_tables) {
+			content_tables_json.append(table);
+		}
+
+		Json::Value              server_tables_json;
+		std::vector<std::string> server_tables  = DatabaseSchema::GetServerTables();
+		for (const auto          &table : server_tables) {
+			server_tables_json.append(table);
+		}
+
+		Json::Value              login_tables_json;
+		std::vector<std::string> login_tables   = DatabaseSchema::GetLoginTables();
+		for (const auto          &table : login_tables) {
+			login_tables_json.append(table);
+		}
+
+		Json::Value              state_tables_json;
+		std::vector<std::string> state_tables   = DatabaseSchema::GetStateTables();
+		for (const auto          &table : state_tables) {
+			state_tables_json.append(table);
+		}
+
+		Json::Value              version_tables_json;
+		std::vector<std::string> version_tables = DatabaseSchema::GetVersionTables();
+		for (const auto          &table : version_tables) {
+			version_tables_json.append(table);
+		}
+
+		Json::Value schema;
+
+		schema["content_tables"] = content_tables_json;
+		schema["login_tables"]   = login_tables_json;
+		schema["player_tables"]  = player_tables_json;
+		schema["server_tables"]  = server_tables_json;
+		schema["state_tables"]   = state_tables_json;
+		schema["version_tables"] = version_tables_json;
+
+		std::stringstream payload;
+		payload << schema;
+
+		std::cout << payload.str() << std::endl;
+	}
+
+}
\ No newline at end of file
diff --git a/world/world_server_command_handler.h b/world/world_server_command_handler.h
new file mode 100644
index 000000000..f3d4317f2
--- /dev/null
+++ b/world/world_server_command_handler.h
@@ -0,0 +1,36 @@
+/**
+ * EQEmulator: Everquest Server Emulator
+ * Copyright (C) 2001-2019 EQEmulator Development Team (https://github.com/EQEmu/Server)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY except by those people which sell it, which
+ * are required to give you total support for your newly bought product;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "iostream"
+#include "../common/cli/eqemu_command_handler.h"
+
+#ifndef EQEMU_WORLD_SERVER_COMMAND_HANDLER_H
+#define EQEMU_WORLD_SERVER_COMMAND_HANDLER_H
+
+namespace WorldserverCommandHandler {
+	void CommandHandler(int argc, char **argv);
+	void Version(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void DatabaseVersion(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void DatabaseSetAccountStatus(int argc, char **argv, argh::parser &cmd, std::string &description);
+	void DatabaseGetSchema(int argc, char **argv, argh::parser &cmd, std::string &description);
+};
+
+
+#endif //EQEMU_WORLD_SERVER_COMMAND_HANDLER_H
diff --git a/world/worlddb.cpp b/world/worlddb.cpp
index 47354cc60..f45207273 100644
--- a/world/worlddb.cpp
+++ b/world/worlddb.cpp
@@ -31,23 +31,27 @@ extern std::vector<RaceClassAllocation> character_create_allocations;
 extern std::vector<RaceClassCombos> character_create_race_class_combos;
 
 
-// the current stuff is at the bottom of this function
-void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **outApp, uint32 clientVersionBit)
+/**
+ * @param account_id
+ * @param out_app
+ * @param client_version_bit
+ */
+void WorldDatabase::GetCharSelectInfo(uint32 account_id, EQApplicationPacket **out_app, uint32 client_version_bit)
 {
-	/* Set Character Creation Limit */
-	EQEmu::versions::ClientVersion client_version = EQEmu::versions::ConvertClientVersionBitToClientVersion(clientVersionBit);
+	EQEmu::versions::ClientVersion
+		   client_version  = EQEmu::versions::ConvertClientVersionBitToClientVersion(client_version_bit);
 	size_t character_limit = EQEmu::constants::StaticLookup(client_version)->CharacterCreationLimit;
-	
-	// Validate against absolute server max
-	if (character_limit > EQEmu::constants::CHARACTER_CREATION_LIMIT)
+
+	if (character_limit > EQEmu::constants::CHARACTER_CREATION_LIMIT) {
 		character_limit = EQEmu::constants::CHARACTER_CREATION_LIMIT;
+	}
 
 	// Force Titanium clients to use '8'
-	if (client_version == EQEmu::versions::ClientVersion::Titanium)
+	if (client_version == EQEmu::versions::ClientVersion::Titanium) {
 		character_limit = 8;
-	
-	/* Get Character Info */
-	std::string cquery = StringFormat(
+	}
+
+	std::string character_list_query = StringFormat(
 		"SELECT                     "
 		"`id`,                      "  // 0
 		"name,                      "  // 1
@@ -71,237 +75,281 @@ void WorldDatabase::GetCharSelectInfo(uint32 accountID, EQApplicationPacket **ou
 		"zone_id		            "  // 19
 		"FROM                       "
 		"character_data             "
-		"WHERE `account_id` = %i ORDER BY `name` LIMIT %u", accountID, character_limit);
-	auto results = database.QueryDatabase(cquery);
+		"WHERE `account_id` = %i AND deleted_at IS NULL ORDER BY `name` LIMIT %u",
+		account_id,
+		character_limit
+	);
+
+	auto results = database.QueryDatabase(character_list_query);
 
 	size_t character_count = results.RowCount();
 	if (character_count == 0) {
-		*outApp = new EQApplicationPacket(OP_SendCharInfo, sizeof(CharacterSelect_Struct));
-		CharacterSelect_Struct *cs = (CharacterSelect_Struct *)(*outApp)->pBuffer;
-		cs->CharCount = 0;
+		*out_app                   = new EQApplicationPacket(OP_SendCharInfo, sizeof(CharacterSelect_Struct));
+		CharacterSelect_Struct *cs = (CharacterSelect_Struct *) (*out_app)->pBuffer;
+		cs->CharCount  = 0;
 		cs->TotalChars = character_limit;
 		return;
 	}
 
 	size_t packet_size = sizeof(CharacterSelect_Struct) + (sizeof(CharacterSelectEntry_Struct) * character_count);
-	*outApp = new EQApplicationPacket(OP_SendCharInfo, packet_size);
+	*out_app = new EQApplicationPacket(OP_SendCharInfo, packet_size);
 
-	unsigned char *buff_ptr = (*outApp)->pBuffer;
-	CharacterSelect_Struct *cs = (CharacterSelect_Struct *)buff_ptr;
+	unsigned char          *buff_ptr = (*out_app)->pBuffer;
+	CharacterSelect_Struct *cs       = (CharacterSelect_Struct *) buff_ptr;
 
-	cs->CharCount = character_count;
+	cs->CharCount  = character_count;
 	cs->TotalChars = character_limit;
 
 	buff_ptr += sizeof(CharacterSelect_Struct);
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		CharacterSelectEntry_Struct *cse = (CharacterSelectEntry_Struct *)buff_ptr;
-		PlayerProfile_Struct pp;
-		EQEmu::InventoryProfile inv;
+		CharacterSelectEntry_Struct *p_character_select_entry_struct = (CharacterSelectEntry_Struct *) buff_ptr;
+		PlayerProfile_Struct        player_profile_struct;
+		EQEmu::InventoryProfile     inventory_profile;
 
-		pp.SetPlayerProfileVersion(EQEmu::versions::ConvertClientVersionToMobVersion(client_version));
-		inv.SetInventoryVersion(client_version);
-		inv.SetGMInventory(true); // charsel can not interact with items..but, no harm in setting to full expansion support
+		player_profile_struct.SetPlayerProfileVersion(EQEmu::versions::ConvertClientVersionToMobVersion(client_version));
+		inventory_profile.SetInventoryVersion(client_version);
+		inventory_profile.SetGMInventory(true); // charsel can not interact with items..but, no harm in setting to full expansion support
 
-		uint32 character_id = (uint32)atoi(row[0]);
-		uint8 has_home = 0;
-		uint8 has_bind = 0;
+		uint32 character_id = (uint32) atoi(row[0]);
+		uint8  has_home     = 0;
+		uint8  has_bind     = 0;
 
-		memset(&pp, 0, sizeof(PlayerProfile_Struct));
-		
-		/* Fill CharacterSelectEntry_Struct */
-		memset(cse->Name, 0, sizeof(cse->Name));
-		strcpy(cse->Name, row[1]);
-		cse->Class = (uint8)atoi(row[4]);
-		cse->Race = (uint32)atoi(row[3]);
-		cse->Level = (uint8)atoi(row[5]);
-		cse->ShroudClass = cse->Class;
-		cse->ShroudRace = cse->Race;
-		cse->Zone = (uint16)atoi(row[19]);
-		cse->Instance = 0;
-		cse->Gender = (uint8)atoi(row[2]);
-		cse->Face = (uint8)atoi(row[15]);
+		memset(&player_profile_struct, 0, sizeof(PlayerProfile_Struct));
 
-		for (uint32 matslot = 0; matslot < EQEmu::textures::materialCount; matslot++) {	// Processed below
-			cse->Equip[matslot].Material = 0;
-			cse->Equip[matslot].Unknown1 = 0;
-			cse->Equip[matslot].EliteModel = 0;
-			cse->Equip[matslot].HerosForgeModel = 0;
-			cse->Equip[matslot].Unknown2 = 0;
-			cse->Equip[matslot].Color = 0;
-		}						
+		memset(p_character_select_entry_struct->Name, 0, sizeof(p_character_select_entry_struct->Name));
+		strcpy(p_character_select_entry_struct->Name, row[1]);
+		p_character_select_entry_struct->Class       = (uint8) atoi(row[4]);
+		p_character_select_entry_struct->Race        = (uint32) atoi(row[3]);
+		p_character_select_entry_struct->Level       = (uint8) atoi(row[5]);
+		p_character_select_entry_struct->ShroudClass = p_character_select_entry_struct->Class;
+		p_character_select_entry_struct->ShroudRace  = p_character_select_entry_struct->Race;
+		p_character_select_entry_struct->Zone        = (uint16) atoi(row[19]);
+		p_character_select_entry_struct->Instance    = 0;
+		p_character_select_entry_struct->Gender      = (uint8) atoi(row[2]);
+		p_character_select_entry_struct->Face        = (uint8) atoi(row[15]);
 
-		cse->Unknown15 = 0xFF;
-		cse->Unknown19 = 0xFF;
-		cse->DrakkinTattoo = (uint32)atoi(row[17]);
-		cse->DrakkinDetails = (uint32)atoi(row[18]);
-		cse->Deity = (uint32)atoi(row[6]);
-		cse->PrimaryIDFile = 0;							// Processed Below
-		cse->SecondaryIDFile = 0;						// Processed Below
-		cse->HairColor = (uint8)atoi(row[9]);
-		cse->BeardColor = (uint8)atoi(row[10]);
-		cse->EyeColor1 = (uint8)atoi(row[11]);
-		cse->EyeColor2 = (uint8)atoi(row[12]);
-		cse->HairStyle = (uint8)atoi(row[13]);
-		cse->Beard = (uint8)atoi(row[14]);
-		cse->GoHome = 0;								// Processed Below
-		cse->Tutorial = 0;								// Processed Below
-		cse->DrakkinHeritage = (uint32)atoi(row[16]);
-		cse->Unknown1 = 0;
-		cse->Enabled = 1;
-		cse->LastLogin = (uint32)atoi(row[7]);			// RoF2 value: 1212696584
-		cse->Unknown2 = 0;
-		/* Fill End */
+		for (uint32 material_slot = 0; material_slot < EQEmu::textures::materialCount; material_slot++) {
+			p_character_select_entry_struct->Equip[material_slot].Material        = 0;
+			p_character_select_entry_struct->Equip[material_slot].Unknown1        = 0;
+			p_character_select_entry_struct->Equip[material_slot].EliteModel      = 0;
+			p_character_select_entry_struct->Equip[material_slot].HerosForgeModel = 0;
+			p_character_select_entry_struct->Equip[material_slot].Unknown2        = 0;
+			p_character_select_entry_struct->Equip[material_slot].Color           = 0;
+		}
+
+		p_character_select_entry_struct->Unknown15       = 0xFF;
+		p_character_select_entry_struct->Unknown19       = 0xFF;
+		p_character_select_entry_struct->DrakkinTattoo   = (uint32) atoi(row[17]);
+		p_character_select_entry_struct->DrakkinDetails  = (uint32) atoi(row[18]);
+		p_character_select_entry_struct->Deity           = (uint32) atoi(row[6]);
+		p_character_select_entry_struct->PrimaryIDFile   = 0;                            // Processed Below
+		p_character_select_entry_struct->SecondaryIDFile = 0;                        // Processed Below
+		p_character_select_entry_struct->HairColor       = (uint8) atoi(row[9]);
+		p_character_select_entry_struct->BeardColor      = (uint8) atoi(row[10]);
+		p_character_select_entry_struct->EyeColor1       = (uint8) atoi(row[11]);
+		p_character_select_entry_struct->EyeColor2       = (uint8) atoi(row[12]);
+		p_character_select_entry_struct->HairStyle       = (uint8) atoi(row[13]);
+		p_character_select_entry_struct->Beard           = (uint8) atoi(row[14]);
+		p_character_select_entry_struct->GoHome          = 0;                                // Processed Below
+		p_character_select_entry_struct->Tutorial        = 0;                                // Processed Below
+		p_character_select_entry_struct->DrakkinHeritage = (uint32) atoi(row[16]);
+		p_character_select_entry_struct->Unknown1        = 0;
+		p_character_select_entry_struct->Enabled         = 1;
+		p_character_select_entry_struct->LastLogin       = (uint32) atoi(row[7]);            // RoF2 value: 1212696584
+		p_character_select_entry_struct->Unknown2        = 0;
 
 		if (RuleB(World, EnableReturnHomeButton)) {
 			int now = time(nullptr);
-			if ((now - atoi(row[7])) >= RuleI(World, MinOfflineTimeToReturnHome))
-				cse->GoHome = 1;
+			if ((now - atoi(row[7])) >= RuleI(World, MinOfflineTimeToReturnHome)) {
+				p_character_select_entry_struct->GoHome = 1;
+			}
 		}
 
-		if (RuleB(World, EnableTutorialButton) && (cse->Level <= RuleI(World, MaxLevelForTutorial))) {
-			cse->Tutorial = 1;
+		if (RuleB(World, EnableTutorialButton) && (p_character_select_entry_struct->Level <= RuleI(World, MaxLevelForTutorial))) {
+			p_character_select_entry_struct->Tutorial = 1;
 		}
 
-		/* Set Bind Point Data for any character that may possibly be missing it for any reason */
-		cquery = StringFormat("SELECT `zone_id`, `instance_id`, `x`, `y`, `z`, `heading`, `slot` FROM `character_bind`  WHERE `id` = %i LIMIT 5", character_id);
-		auto results_bind = database.QueryDatabase(cquery);
-		auto bind_count = results_bind.RowCount();
-		for (auto row_b = results_bind.begin(); row_b != results_bind.end(); ++row_b) {
+		/**
+		 * Bind
+		 */
+		character_list_query = StringFormat(
+			"SELECT `zone_id`, `instance_id`, `x`, `y`, `z`, `heading`, `slot` FROM `character_bind`  WHERE `id` = %i LIMIT 5",
+			character_id
+		);
+		auto      results_bind = database.QueryDatabase(character_list_query);
+		auto      bind_count   = results_bind.RowCount();
+		for (auto row_b        = results_bind.begin(); row_b != results_bind.end(); ++row_b) {
 			if (row_b[6] && atoi(row_b[6]) == 4) {
 				has_home = 1;
 				// If our bind count is less than 5, we need to actually make use of this data so lets parse it
 				if (bind_count < 5) {
-					pp.binds[4].zoneId = atoi(row_b[0]);
-					pp.binds[4].instance_id = atoi(row_b[1]);
-					pp.binds[4].x = atof(row_b[2]);
-					pp.binds[4].y = atof(row_b[3]);
-					pp.binds[4].z = atof(row_b[4]);
-					pp.binds[4].heading = atof(row_b[5]);
+					player_profile_struct.binds[4].zoneId      = atoi(row_b[0]);
+					player_profile_struct.binds[4].instance_id = atoi(row_b[1]);
+					player_profile_struct.binds[4].x           = atof(row_b[2]);
+					player_profile_struct.binds[4].y           = atof(row_b[3]);
+					player_profile_struct.binds[4].z           = atof(row_b[4]);
+					player_profile_struct.binds[4].heading     = atof(row_b[5]);
 				}
 			}
-			if (row_b[6] && atoi(row_b[6]) == 0){ has_bind = 1; }
+			if (row_b[6] && atoi(row_b[6]) == 0) { has_bind = 1; }
 		}
 
 		if (has_home == 0 || has_bind == 0) {
-			cquery = StringFormat("SELECT `zone_id`, `bind_id`, `x`, `y`, `z` FROM `start_zones` WHERE `player_class` = %i AND `player_deity` = %i AND `player_race` = %i",
-				cse->Class, cse->Deity, cse->Race);
-			auto results_bind = database.QueryDatabase(cquery);
-			for (auto row_d = results_bind.begin(); row_d != results_bind.end(); ++row_d) {
+			character_list_query = StringFormat(
+				"SELECT `zone_id`, `bind_id`, `x`, `y`, `z` FROM `start_zones` WHERE `player_class` = %i AND `player_deity` = %i AND `player_race` = %i",
+				p_character_select_entry_struct->Class,
+				p_character_select_entry_struct->Deity,
+				p_character_select_entry_struct->Race
+			);
+			auto      results_bind = database.QueryDatabase(character_list_query);
+			for (auto row_d        = results_bind.begin(); row_d != results_bind.end(); ++row_d) {
 				/* If a bind_id is specified, make them start there */
 				if (atoi(row_d[1]) != 0) {
-					pp.binds[4].zoneId = (uint32)atoi(row_d[1]);
-					GetSafePoints(pp.binds[4].zoneId, 0, &pp.binds[4].x, &pp.binds[4].y, &pp.binds[4].z);
+					player_profile_struct.binds[4].zoneId = (uint32) atoi(row_d[1]);
+					GetSafePoints(player_profile_struct.binds[4].zoneId, 0, &player_profile_struct.binds[4].x, &player_profile_struct.binds[4].y, &player_profile_struct.binds[4].z);
 				}
-				/* Otherwise, use the zone and coordinates given */
+					/* Otherwise, use the zone and coordinates given */
 				else {
-					pp.binds[4].zoneId = (uint32)atoi(row_d[0]);
+					player_profile_struct.binds[4].zoneId = (uint32) atoi(row_d[0]);
 					float x = atof(row_d[2]);
 					float y = atof(row_d[3]);
 					float z = atof(row_d[4]);
-					if (x == 0 && y == 0 && z == 0){ GetSafePoints(pp.binds[4].zoneId, 0, &x, &y, &z); }
-					pp.binds[4].x = x; pp.binds[4].y = y; pp.binds[4].z = z;
+					if (x == 0 && y == 0 && z == 0) { GetSafePoints(player_profile_struct.binds[4].zoneId, 0, &x, &y, &z); }
+					player_profile_struct.binds[4].x = x;
+					player_profile_struct.binds[4].y = y;
+					player_profile_struct.binds[4].z = z;
 				}
 			}
-			pp.binds[0] = pp.binds[4];
+			player_profile_struct.binds[0] = player_profile_struct.binds[4];
 			/* If no home bind set, set it */
 			if (has_home == 0) {
-				std::string query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
+				std::string query        = StringFormat(
+					"REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 					" VALUES (%u, %u, %u, %f, %f, %f, %f, %i)",
-					character_id, pp.binds[4].zoneId, 0, pp.binds[4].x, pp.binds[4].y, pp.binds[4].z, pp.binds[4].heading, 4);
-				auto results_bset = QueryDatabase(query);
+					character_id,
+					player_profile_struct.binds[4].zoneId,
+					0,
+					player_profile_struct.binds[4].x,
+					player_profile_struct.binds[4].y,
+					player_profile_struct.binds[4].z,
+					player_profile_struct.binds[4].heading,
+					4
+				);
+				auto        results_bset = QueryDatabase(query);
 			}
 			/* If no regular bind set, set it */
 			if (has_bind == 0) {
-				std::string query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
+				std::string query        = StringFormat(
+					"REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 					" VALUES (%u, %u, %u, %f, %f, %f, %f, %i)",
-					character_id, pp.binds[0].zoneId, 0, pp.binds[0].x, pp.binds[0].y, pp.binds[0].z, pp.binds[0].heading, 0);
-				auto results_bset = QueryDatabase(query);
+					character_id,
+					player_profile_struct.binds[0].zoneId,
+					0,
+					player_profile_struct.binds[0].x,
+					player_profile_struct.binds[0].y,
+					player_profile_struct.binds[0].z,
+					player_profile_struct.binds[0].heading,
+					0
+				);
+				auto        results_bset = QueryDatabase(query);
 			}
 		}
 		/* If our bind count is less than 5, then we have null data that needs to be filled in. */
 		if (bind_count < 5) {
 			// we know that home and main bind must be valid here, so we don't check those
 			// we also use home to fill in the null data like live does.
-			for (int i = 1; i < 4;  i++) {
-				if (pp.binds[i].zoneId != 0) // we assume 0 is the only invalid one ...
+			for (int i = 1; i < 4; i++) {
+				if (player_profile_struct.binds[i].zoneId != 0) { // we assume 0 is the only invalid one ...
 					continue;
+				}
 
-				std::string query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
+				std::string query        = StringFormat(
+					"REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 					" VALUES (%u, %u, %u, %f, %f, %f, %f, %i)",
-					character_id, pp.binds[4].zoneId, 0, pp.binds[4].x, pp.binds[4].y, pp.binds[4].z, pp.binds[4].heading, i);
-				auto results_bset = QueryDatabase(query);
+					character_id,
+					player_profile_struct.binds[4].zoneId,
+					0,
+					player_profile_struct.binds[4].x,
+					player_profile_struct.binds[4].y,
+					player_profile_struct.binds[4].z,
+					player_profile_struct.binds[4].heading,
+					i
+				);
+				auto        results_bset = QueryDatabase(query);
 			}
 		}
-		/* Bind End */
 
-		/* Load Character Material Data for Char Select */
-		cquery = StringFormat("SELECT slot, red, green, blue, use_tint, color FROM `character_material` WHERE `id` = %u", character_id);
-		auto results_b = database.QueryDatabase(cquery); uint8 slot = 0;
-		for (auto row_b = results_b.begin(); row_b != results_b.end(); ++row_b) {
+		character_list_query = StringFormat(
+			"SELECT slot, red, green, blue, use_tint, color FROM `character_material` WHERE `id` = %u",
+			character_id
+		);
+		auto      results_b = database.QueryDatabase(character_list_query);
+		uint8     slot      = 0;
+		for (auto row_b     = results_b.begin(); row_b != results_b.end(); ++row_b) {
 			slot = atoi(row_b[0]);
-			pp.item_tint.Slot[slot].Red = atoi(row_b[1]);
-			pp.item_tint.Slot[slot].Green = atoi(row_b[2]);
-			pp.item_tint.Slot[slot].Blue = atoi(row_b[3]);
-			pp.item_tint.Slot[slot].UseTint = atoi(row_b[4]);
+			player_profile_struct.item_tint.Slot[slot].Red     = atoi(row_b[1]);
+			player_profile_struct.item_tint.Slot[slot].Green   = atoi(row_b[2]);
+			player_profile_struct.item_tint.Slot[slot].Blue    = atoi(row_b[3]);
+			player_profile_struct.item_tint.Slot[slot].UseTint = atoi(row_b[4]);
 		}
-		/* Character Material Data End */
 
-		/* Load Inventory */
-		// If we ensure that the material data is updated appropriately, we can do away with inventory loads
-		if (GetCharSelInventory(accountID, cse->Name, &inv)) {
-			const EQEmu::ItemData* item = nullptr;
-			const EQEmu::ItemInstance* inst = nullptr;
-			int16 invslot = 0;
+		if (GetCharSelInventory(account_id, p_character_select_entry_struct->Name, &inventory_profile)) {
+			const EQEmu::ItemData     *item          = nullptr;
+			const EQEmu::ItemInstance *inst          = nullptr;
+			int16 inventory_slot = 0;
 
 			for (uint32 matslot = EQEmu::textures::textureBegin; matslot < EQEmu::textures::materialCount; matslot++) {
-				invslot = EQEmu::InventoryProfile::CalcSlotFromMaterial(matslot);
-				if (invslot == INVALID_INDEX) { continue; }
-				inst = inv.GetItem(invslot);
-				if (inst == nullptr) { continue; }
+				inventory_slot = EQEmu::InventoryProfile::CalcSlotFromMaterial(matslot);
+				if (inventory_slot == INVALID_INDEX) { continue; }
+				inst = inventory_profile.GetItem(inventory_slot);
+				if (inst == nullptr) {
+					continue;
+				}
 				item = inst->GetItem();
-				if (item == nullptr) { continue; }
+				if (item == nullptr) {
+					continue;
+				}
 
 				if (matslot > 6) {
-					uint32 idfile = 0;
+					uint32 item_id_file = 0;
 					// Weapon Models 
 					if (inst->GetOrnamentationIDFile() != 0) {
-						idfile = inst->GetOrnamentationIDFile();
-						cse->Equip[matslot].Material = idfile;
+						item_id_file = inst->GetOrnamentationIDFile();
+						p_character_select_entry_struct->Equip[matslot].Material = item_id_file;
 					}
 					else {
 						if (strlen(item->IDFile) > 2) {
-							idfile = atoi(&item->IDFile[2]);
-							cse->Equip[matslot].Material = idfile;
+							item_id_file = atoi(&item->IDFile[2]);
+							p_character_select_entry_struct->Equip[matslot].Material = item_id_file;
 						}
 					}
 					if (matslot == EQEmu::textures::weaponPrimary) {
-						cse->PrimaryIDFile = idfile;
+						p_character_select_entry_struct->PrimaryIDFile = item_id_file;
 					}
 					else {
-						cse->SecondaryIDFile = idfile;
+						p_character_select_entry_struct->SecondaryIDFile = item_id_file;
 					}
 				}
 				else {
 					uint32 color = 0;
-					if (pp.item_tint.Slot[matslot].UseTint) {
-						color = pp.item_tint.Slot[matslot].Color;
+					if (player_profile_struct.item_tint.Slot[matslot].UseTint) {
+						color = player_profile_struct.item_tint.Slot[matslot].Color;
 					}
 					else {
 						color = inst->GetColor();
 					}
 
 					// Armor Materials/Models
-					cse->Equip[matslot].Material = item->Material;
-					cse->Equip[matslot].EliteModel = item->EliteMaterial;
-					cse->Equip[matslot].HerosForgeModel = inst->GetOrnamentHeroModel(matslot);
-					cse->Equip[matslot].Color = color;
+					p_character_select_entry_struct->Equip[matslot].Material        = item->Material;
+					p_character_select_entry_struct->Equip[matslot].EliteModel      = item->EliteMaterial;
+					p_character_select_entry_struct->Equip[matslot].HerosForgeModel = inst->GetOrnamentHeroModel(matslot);
+					p_character_select_entry_struct->Equip[matslot].Color           = color;
 				}
 			}
 		}
 		else {
-			printf("Error loading inventory for %s\n", cse->Name);
+			printf("Error loading inventory for %s\n", p_character_select_entry_struct->Name);
 		}
-		/* Load Inventory End */
 
 		buff_ptr += sizeof(CharacterSelectEntry_Struct);
 	}
@@ -366,14 +414,14 @@ bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct*
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "SoF Start zone query: %s\n", query.c_str());
+	LogInfo("SoF Start zone query: [{}]\n", query.c_str());
 
     if (results.RowCount() == 0) {
         printf("No start_zones entry in database, using defaults\n");
 		isTitanium ? SetTitaniumDefaultStartZone(in_pp, in_cc) : SetSoFDefaultStartZone(in_pp, in_cc);
     }
     else {
-		Log(Logs::General, Logs::Status, "Found starting location in start_zones");
+		LogInfo("Found starting location in start_zones");
 		auto row = results.begin();
 		in_pp->x = atof(row[0]);
 		in_pp->y = atof(row[1]);
@@ -512,7 +560,7 @@ void WorldDatabase::GetLauncherList(std::vector<std::string> &rl) {
     const std::string query = "SELECT name FROM launcher";
     auto results = QueryDatabase(query);
     if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "WorldDatabase::GetLauncherList: %s", results.ErrorMessage().c_str());
+        LogError("WorldDatabase::GetLauncherList: {}", results.ErrorMessage().c_str());
         return;
     }
 
@@ -526,7 +574,7 @@ bool WorldDatabase::GetCharacterLevel(const char *name, int &level)
 	std::string query = StringFormat("SELECT level FROM character_data WHERE name = '%s'", name);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "WorldDatabase::GetCharacterLevel: %s", results.ErrorMessage().c_str());
+        LogError("WorldDatabase::GetCharacterLevel: {}", results.ErrorMessage().c_str());
         return false;
 	}
 
diff --git a/world/worlddb.h b/world/worlddb.h
index 036c0dc40..e367803ec 100644
--- a/world/worlddb.h
+++ b/world/worlddb.h
@@ -30,7 +30,7 @@ struct CharacterSelect_Struct;
 class WorldDatabase : public SharedDatabase {
 public:
 	bool GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct* in_cc, bool isTitanium);
-	void GetCharSelectInfo(uint32 accountID, EQApplicationPacket **outApp, uint32 clientVersionBit);
+	void GetCharSelectInfo(uint32 account_id, EQApplicationPacket **out_app, uint32 client_version_bit);
 	int MoveCharacterToBind(int CharID, uint8 bindnum = 0);
 
 	void GetLauncherList(std::vector<std::string> &result);
diff --git a/world/zonelist.cpp b/world/zonelist.cpp
index 84cd87842..abb2a5f6f 100644
--- a/world/zonelist.cpp
+++ b/world/zonelist.cpp
@@ -94,7 +94,7 @@ void ZSList::KillAll() {
 void ZSList::Process() {
 
 	if (shutdowntimer && shutdowntimer->Check()) {
-		Log(Logs::Detail, Logs::World_Server, "Shutdown timer has expired. Telling all zones to shut down and exiting. (fake sigint)");
+		LogInfo("Shutdown timer has expired. Telling all zones to shut down and exiting. (fake sigint)");
 		auto pack2 = new ServerPacket;
 		pack2->opcode = ServerOP_ShutdownAll;
 		pack2->size = 0;
@@ -432,6 +432,7 @@ void ZSList::SendChannelMessageRaw(const char* from, const char* to, uint8 chan_
 	}
 
 	scm->language = language;
+	scm->lang_skill = 100;
 	scm->chan_num = chan_num;
 	strcpy(&scm->message[0], message);
 
@@ -570,7 +571,7 @@ void ZSList::RebootZone(const char* ip1, uint16 port, const char* ip2, uint32 sk
 	s->port = port;
 	s->zoneid = zoneid;
 	if (zoneid != 0)
-		Log(Logs::Detail, Logs::World_Server, "Rebooting static zone with the ID of: %i", zoneid);
+		LogInfo("Rebooting static zone with the ID of: [{}]", zoneid);
 	tmp[z]->SendPacket(pack);
 	delete pack;
 	safe_delete_array(tmp);
@@ -708,6 +709,18 @@ void ZSList::WorldShutDown(uint32 time, uint32 interval)
 	}
 }
 
+void ZSList::DropClient(uint32 lsid, ZoneServer *ignore_zoneserver) {
+	ServerPacket packet(ServerOP_DropClient, sizeof(ServerZoneDropClient_Struct));
+	auto drop = (ServerZoneDropClient_Struct*)packet.pBuffer;
+	drop->lsid = lsid;
+
+	for (auto &zs : zone_server_list) {
+		if (zs.get() != ignore_zoneserver) {
+			zs->SendPacket(&packet);
+		}
+	}
+}
+
 void ZSList::OnTick(EQ::Timer *t)
 {
 	if (!EventSubscriptionWatcher::Get()->IsSubscribed("EQW::ZoneUpdate")) {
diff --git a/world/zonelist.h b/world/zonelist.h
index 947f75a2b..8b8525f57 100644
--- a/world/zonelist.h
+++ b/world/zonelist.h
@@ -57,6 +57,7 @@ public:
 	void SOPZoneBootup(const char *adminname, uint32 ZoneServerID, const char *zonename, bool iMakeStatic = false);
 	void UpdateUCSServerAvailable(bool ucss_available = true);
 	void WorldShutDown(uint32 time, uint32 interval);
+	void DropClient(uint32 lsid, ZoneServer *ignore_zoneserver);
 
 	ZoneServer*	FindByPort(uint16 port);
 	ZoneServer* FindByID(uint32 ZoneID);
diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp
index 0d0ba2f5d..dd55fac39 100644
--- a/world/zoneserver.cpp
+++ b/world/zoneserver.cpp
@@ -90,7 +90,7 @@ bool ZoneServer::SetZone(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 	char*	longname;
 
 	if (iZoneID)
-		Log(Logs::Detail, Logs::World_Server, "Setting to '%s' (%d:%d)%s", (zn) ? zn : "", iZoneID, iInstanceID,
+		Log(Logs::Detail, Logs::WorldServer, "Setting to '%s' (%d:%d)%s", (zn) ? zn : "", iZoneID, iInstanceID,
 			iStaticZone ? " (Static)" : "");
 
 	zone_server_zone_id = iZoneID;
@@ -437,7 +437,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 			}
 
 			ClientListEntry* cle = client_list.FindCharacter(scm->deliverto);
-			if (cle == 0 || cle->Online() < CLE_Status_Zoning ||
+			if (cle == 0 || cle->Online() < CLE_Status::Zoning ||
 				(cle->TellsOff() && ((cle->Anon() == 1 && scm->fromadmin < cle->Admin()) || scm->fromadmin < 80))) {
 				if (!scm->noreply) {
 					ClientListEntry* sender = client_list.FindCharacter(scm->from);
@@ -450,7 +450,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 					sender->Server()->SendPacket(pack);
 				}
 			}
-			else if (cle->Online() == CLE_Status_Zoning) {
+			else if (cle->Online() == CLE_Status::Zoning) {
 				if (!scm->noreply) {
 					ClientListEntry* sender = client_list.FindCharacter(scm->from);
 					if (cle->TellQueueFull()) {
@@ -518,7 +518,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 
 			ClientListEntry* cle = client_list.FindCharacter(svm->To);
 
-			if (!cle || (cle->Online() < CLE_Status_Zoning) || !cle->Server()) {
+			if (!cle || (cle->Online() < CLE_Status::Zoning) || !cle->Server()) {
 
 				zoneserver_list.SendEmoteMessage(svm->From, 0, 0, 0, "'%s is not online at this time'", svm->To);
 
@@ -541,10 +541,10 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 
 		RezzPlayer_Struct* sRezz = (RezzPlayer_Struct*)pack->pBuffer;
 		if (zoneserver_list.SendPacket(pack)) {
-			Log(Logs::Detail, Logs::World_Server, "Sent Rez packet for %s", sRezz->rez.your_name);
+			LogInfo("Sent Rez packet for [{}]", sRezz->rez.your_name);
 		}
 		else {
-			Log(Logs::Detail, Logs::World_Server, "Could not send Rez packet for %s", sRezz->rez.your_name);
+			LogInfo("Could not send Rez packet for [{}]", sRezz->rez.your_name);
 		}
 		break;
 	}
@@ -589,21 +589,21 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 			ServerConnectInfo* sci = (ServerConnectInfo*)p.pBuffer;
 			sci->port = client_port;
 			SendPacket(&p);
-			Log(Logs::Detail, Logs::World_Server, "Auto zone port configuration. Telling zone to use port %d", client_port);
+			LogInfo("Auto zone port configuration. Telling zone to use port [{}]", client_port);
 		}
 		else {
 			client_port = sci->port;
-			Log(Logs::Detail, Logs::World_Server, "Zone specified port %d.", client_port);
+			LogInfo("Zone specified port [{}]", client_port);
 		}
 
 		if (sci->address[0]) {
 			strn0cpy(client_address, sci->address, 250);
-			Log(Logs::Detail, Logs::World_Server, "Zone specified address %s.", sci->address);
+			LogInfo("Zone specified address [{}]", sci->address);
 		}
 
 		if (sci->local_address[0]) {
 			strn0cpy(client_local_address, sci->local_address, 250);
-			Log(Logs::Detail, Logs::World_Server, "Zone specified local address %s.", sci->address);
+			LogInfo("Zone specified local address [{}]", sci->address);
 		}
 
 		if (sci->process_id) {
@@ -617,7 +617,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 		const LaunchName_Struct* ln = (const LaunchName_Struct*)pack->pBuffer;
 		launcher_name = ln->launcher_name;
 		launched_name = ln->zone_name;
-		Log(Logs::Detail, Logs::World_Server, "Zone started with name %s by launcher %s", launched_name.c_str(), launcher_name.c_str());
+		LogInfo("Zone started with name [{}] by launcher [{}]", launched_name.c_str(), launcher_name.c_str());
 		break;
 	}
 	case ServerOP_ShutdownAll: {
@@ -700,12 +700,11 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 		if (WorldConfig::get()->UpdateStats)
 			client = client_list.FindCharacter(ztz->name);
 
-		Log(Logs::Detail, Logs::World_Server, "ZoneToZone request for %s current zone %d req zone %d\n",
-			ztz->name, ztz->current_zone_id, ztz->requested_zone_id);
+		LogInfo("ZoneToZone request for [{}] current zone [{}] req zone [{}]", ztz->name, ztz->current_zone_id, ztz->requested_zone_id);
 
 		/* This is a request from the egress zone */
 		if (GetZoneID() == ztz->current_zone_id && GetInstanceID() == ztz->current_instance_id) {
-			Log(Logs::Detail, Logs::World_Server, "Processing ZTZ for egress from zone for client %s\n", ztz->name);
+			LogInfo("Processing ZTZ for egress from zone for client [{}]", ztz->name);
 
 			if (ztz->admin < 80 && ztz->ignorerestrictions < 2 && zoneserver_list.IsZoneLocked(ztz->requested_zone_id)) {
 				ztz->response = 0;
@@ -723,20 +722,20 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 
 			/* Zone was already running*/
 			if (ingress_server) {
-				Log(Logs::Detail, Logs::World_Server, "Found a zone already booted for %s\n", ztz->name);
+				LogInfo("Found a zone already booted for [{}]", ztz->name);
 				ztz->response = 1;
 			}
 			/* Boot the Zone*/
 			else {
 				int server_id;
 				if ((server_id = zoneserver_list.TriggerBootup(ztz->requested_zone_id, ztz->requested_instance_id))) {
-					Log(Logs::Detail, Logs::World_Server, "Successfully booted a zone for %s\n", ztz->name);
+					LogInfo("Successfully booted a zone for [{}]", ztz->name);
 					// bootup successful, ready to rock
 					ztz->response = 1;
 					ingress_server = zoneserver_list.FindByID(server_id);
 				}
 				else {
-					Log(Logs::Detail, Logs::World_Server, "FAILED to boot a zone for %s\n", ztz->name);
+					LogError("failed to boot a zone for [{}]", ztz->name);
 					// bootup failed, send back error code 0
 					ztz->response = 0;
 				}
@@ -751,7 +750,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 		/* Response from Ingress server, route back to egress */
 		else {
 
-			Log(Logs::Detail, Logs::World_Server, "Processing ZTZ for ingress to zone for client %s\n", ztz->name);
+			LogInfo("Processing ZTZ for ingress to zone for client [{}]", ztz->name);
 			ZoneServer *egress_server = nullptr;
 			if (ztz->current_instance_id > 0) {
 				egress_server = zoneserver_list.FindByInstanceID(ztz->current_instance_id);
@@ -769,7 +768,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	}
 	case ServerOP_ClientList: {
 		if (pack->size != sizeof(ServerClientList_Struct)) {
-			Log(Logs::Detail, Logs::World_Server, "Wrong size on ServerOP_ClientList. Got: %d, Expected: %d", pack->size, sizeof(ServerClientList_Struct));
+			LogInfo("Wrong size on ServerOP_ClientList. Got: [{}], Expected: [{}]", pack->size, sizeof(ServerClientList_Struct));
 			break;
 		}
 		client_list.ClientUpdate(this, (ServerClientList_Struct*)pack->pBuffer);
@@ -778,7 +777,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	case ServerOP_ClientListKA: {
 		ServerClientListKeepAlive_Struct* sclka = (ServerClientListKeepAlive_Struct*)pack->pBuffer;
 		if (pack->size < 4 || pack->size != 4 + (4 * sclka->numupdates)) {
-			Log(Logs::Detail, Logs::World_Server, "Wrong size on ServerOP_ClientListKA. Got: %d, Expected: %d", pack->size, (4 + (4 * sclka->numupdates)));
+			LogInfo("Wrong size on ServerOP_ClientListKA. Got: [{}], Expected: [{}]", pack->size, (4 + (4 * sclka->numupdates)));
 			break;
 		}
 		client_list.CLEKeepAlive(sclka->numupdates, sclka->wid);
@@ -893,7 +892,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	}
 	case ServerOP_GMGoto: {
 		if (pack->size != sizeof(ServerGMGoto_Struct)) {
-			Log(Logs::Detail, Logs::World_Server, "Wrong size on ServerOP_GMGoto. Got: %d, Expected: %d", pack->size, sizeof(ServerGMGoto_Struct));
+			LogInfo("Wrong size on ServerOP_GMGoto. Got: [{}], Expected: [{}]", pack->size, sizeof(ServerGMGoto_Struct));
 			break;
 		}
 		ServerGMGoto_Struct* gmg = (ServerGMGoto_Struct*)pack->pBuffer;
@@ -913,7 +912,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	}
 	case ServerOP_Lock: {
 		if (pack->size != sizeof(ServerLock_Struct)) {
-			Log(Logs::Detail, Logs::World_Server, "Wrong size on ServerOP_Lock. Got: %d, Expected: %d", pack->size, sizeof(ServerLock_Struct));
+			LogInfo("Wrong size on ServerOP_Lock. Got: [{}], Expected: [{}]", pack->size, sizeof(ServerLock_Struct));
 			break;
 		}
 		ServerLock_Struct* slock = (ServerLock_Struct*)pack->pBuffer;
@@ -938,7 +937,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	}
 	case ServerOP_Motd: {
 		if (pack->size != sizeof(ServerMotd_Struct)) {
-			Log(Logs::Detail, Logs::World_Server, "Wrong size on ServerOP_Motd. Got: %d, Expected: %d", pack->size, sizeof(ServerMotd_Struct));
+			LogInfo("Wrong size on ServerOP_Motd. Got: [{}], Expected: [{}]", pack->size, sizeof(ServerMotd_Struct));
 			break;
 		}
 		ServerMotd_Struct* smotd = (ServerMotd_Struct*)pack->pBuffer;
@@ -949,7 +948,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	}
 	case ServerOP_Uptime: {
 		if (pack->size != sizeof(ServerUptime_Struct)) {
-			Log(Logs::Detail, Logs::World_Server, "Wrong size on ServerOP_Uptime. Got: %d, Expected: %d", pack->size, sizeof(ServerUptime_Struct));
+			LogInfo("Wrong size on ServerOP_Uptime. Got: [{}], Expected: [{}]", pack->size, sizeof(ServerUptime_Struct));
 			break;
 		}
 		ServerUptime_Struct* sus = (ServerUptime_Struct*)pack->pBuffer;
@@ -968,7 +967,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 		break;
 	}
 	case ServerOP_GetWorldTime: {
-		Log(Logs::Detail, Logs::World_Server, "Broadcasting a world time update");
+		LogInfo("Broadcasting a world time update");
 		auto pack = new ServerPacket;
 
 		pack->opcode = ServerOP_SyncWorldTime;
@@ -987,17 +986,17 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 		break;
 	}
 	case ServerOP_SetWorldTime: {
-		Log(Logs::Detail, Logs::World_Server, "Received SetWorldTime");
+		LogNetcode("Received SetWorldTime");
 		eqTimeOfDay* newtime = (eqTimeOfDay*)pack->pBuffer;
 		zoneserver_list.worldclock.SetCurrentEQTimeOfDay(newtime->start_eqtime, newtime->start_realtime);
-		Log(Logs::Detail, Logs::World_Server, "New time = %d-%d-%d %d:%d (%d)\n", newtime->start_eqtime.year, newtime->start_eqtime.month, (int)newtime->start_eqtime.day, (int)newtime->start_eqtime.hour, (int)newtime->start_eqtime.minute, (int)newtime->start_realtime);
+		LogInfo("New time = [{}]-[{}]-[{}] [{}]:[{}] ([{}])\n", newtime->start_eqtime.year, newtime->start_eqtime.month, (int)newtime->start_eqtime.day, (int)newtime->start_eqtime.hour, (int)newtime->start_eqtime.minute, (int)newtime->start_realtime);
 		database.SaveTime((int)newtime->start_eqtime.minute, (int)newtime->start_eqtime.hour, (int)newtime->start_eqtime.day, newtime->start_eqtime.month, newtime->start_eqtime.year);
 		zoneserver_list.SendTimeSync();
 		break;
 	}
 	case ServerOP_IPLookup: {
 		if (pack->size < sizeof(ServerGenericWorldQuery_Struct)) {
-			Log(Logs::Detail, Logs::World_Server, "Wrong size on ServerOP_IPLookup. Got: %d, Expected (at least): %d", pack->size, sizeof(ServerGenericWorldQuery_Struct));
+			LogInfo("Wrong size on ServerOP_IPLookup. Got: [{}], Expected (at least): [{}]", pack->size, sizeof(ServerGenericWorldQuery_Struct));
 			break;
 		}
 		ServerGenericWorldQuery_Struct* sgwq = (ServerGenericWorldQuery_Struct*)pack->pBuffer;
@@ -1009,7 +1008,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	}
 	case ServerOP_LockZone: {
 		if (pack->size < sizeof(ServerLockZone_Struct)) {
-			Log(Logs::Detail, Logs::World_Server, "Wrong size on ServerOP_LockZone. Got: %d, Expected: %d", pack->size, sizeof(ServerLockZone_Struct));
+			LogInfo("Wrong size on ServerOP_LockZone. Got: [{}], Expected: [{}]", pack->size, sizeof(ServerLockZone_Struct));
 			break;
 		}
 		ServerLockZone_Struct* s = (ServerLockZone_Struct*)pack->pBuffer;
@@ -1087,7 +1086,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 						zs->SendPacket(pack);
 					}
 					else {
-						Log(Logs::Detail, Logs::World_Server, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent_Response operation.", s->instance_id);
+						LogInfo("Unable to locate zone record for instance id [{}] in zoneserver list for ServerOP_Consent_Response operation", s->instance_id);
 					}
 					safe_delete(pack);
 				}
@@ -1112,7 +1111,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 						zs->SendPacket(pack);
 					}
 					else {
-						Log(Logs::Detail, Logs::World_Server, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id);
+						LogInfo("Unable to locate zone record for zone id [{}] in zoneserver list for ServerOP_Consent_Response operation", s->zone_id);
 					}
 					safe_delete(pack);
 				}
@@ -1132,7 +1131,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 				zs->SendPacket(pack);
 			}
 			else {
-				Log(Logs::Detail, Logs::World_Server, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id);
+				LogInfo("Unable to locate zone record for zone id [{}] in zoneserver list for ServerOP_Consent_Response operation", s->zone_id);
 			}
 			safe_delete(pack);
 		}
@@ -1151,7 +1150,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 				zs->SendPacket(pack);
 			}
 			else {
-				Log(Logs::Detail, Logs::World_Server, "Unable to locate zone record for instance id %u in zoneserver list for ServerOP_Consent_Response operation.", s->instance_id);
+				LogInfo("Unable to locate zone record for instance id [{}] in zoneserver list for ServerOP_Consent_Response operation", s->instance_id);
 			}
 		}
 		else
@@ -1161,7 +1160,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 				zs->SendPacket(pack);
 			}
 			else {
-				Log(Logs::Detail, Logs::World_Server, "Unable to locate zone record for zone id %u in zoneserver list for ServerOP_Consent_Response operation.", s->zone_id);
+				LogInfo("Unable to locate zone record for zone id [{}] in zoneserver list for ServerOP_Consent_Response operation", s->zone_id);
 			}
 		}
 		break;
@@ -1263,7 +1262,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 
 	case ServerOP_LSAccountUpdate:
 	{
-		Log(Logs::Detail, Logs::World_Server, "Received ServerOP_LSAccountUpdate packet from zone");
+		LogNetcode("Received ServerOP_LSAccountUpdate packet from zone");
 		loginserverlist.SendAccountUpdate(pack);
 		break;
 	}
@@ -1326,14 +1325,14 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	case ServerOP_ChangeSharedMem: {
 		std::string hotfix_name = std::string((char*)pack->pBuffer);
 
-		Log(Logs::General, Logs::World_Server, "Loading items...");
+		LogInfo("Loading items");
 		if (!database.LoadItems(hotfix_name)) {
-			Log(Logs::General, Logs::World_Server, "Error: Could not load item data. But ignoring");
+			LogInfo("Error: Could not load item data. But ignoring");
 		}
 
-		Log(Logs::General, Logs::World_Server, "Loading skill caps...");
+		LogInfo("Loading skill caps");
 		if (!database.LoadSkillCaps(hotfix_name)) {
-			Log(Logs::General, Logs::World_Server, "Error: Could not load skill cap data. But ignoring");
+			LogInfo("Error: Could not load skill cap data. But ignoring");
 		}
 
 		zoneserver_list.SendPacket(pack);
@@ -1352,7 +1351,7 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) {
 	}
 	default:
 	{
-		Log(Logs::Detail, Logs::World_Server, "Unknown ServerOPcode from zone 0x%04x, size %d", pack->opcode, pack->size);
+		LogInfo("Unknown ServerOPcode from zone {:#04x}, size [{}]", pack->opcode, pack->size);
 		DumpPacket(pack->pBuffer, pack->size);
 		break;
 	}
@@ -1457,6 +1456,7 @@ void ZoneServer::IncomingClient(Client* client) {
 	s->accid = client->GetAccountID();
 	s->admin = client->GetAdmin();
 	s->charid = client->GetCharID();
+	s->lsid = client->GetLSID();
 	if (client->GetCLE())
 		s->tellsoff = client->GetCLE()->TellsOff();
 	strn0cpy(s->charname, client->GetCharName(), sizeof(s->charname));
diff --git a/world/zoneserver.h b/world/zoneserver.h
index af4641935..8bb1a6da8 100644
--- a/world/zoneserver.h
+++ b/world/zoneserver.h
@@ -57,6 +57,7 @@ public:
 	const char*			GetCompileTime() const{ return compiled; }
 	void				SetCompile(char* in_compile){ strcpy(compiled,in_compile); }
 	inline uint32		GetZoneID() const	{ return zone_server_zone_id; }
+	inline bool         IsConnected() const { return tcpc->Handle() ? tcpc->Handle()->IsConnected() : false; }
 	inline std::string	GetIP() const		{ return tcpc->Handle() ? tcpc->Handle()->RemoteIP() : ""; }
 	inline uint16		GetPort() const		{ return tcpc->Handle() ? tcpc->Handle()->RemotePort() : 0; }
 	inline const char*	GetCAddress() const	{ return client_address; }
diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index 3a897fda9..f75e963f9 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.2)
 
 SET(zone_sources
 	aa.cpp
@@ -79,6 +79,7 @@ SET(zone_sources
 	horse.cpp
 	inventory.cpp
 	loottables.cpp
+	main.cpp
 	map.cpp
 	merc.cpp
 	mob.cpp
@@ -87,7 +88,6 @@ SET(zone_sources
 	mob_movement_manager.cpp
 	mob_info.cpp
 	mod_functions.cpp
-	net.cpp
 	npc.cpp
 	npc_ai.cpp
 	npc_scale_manager.cpp
@@ -210,7 +210,6 @@ SET(zone_headers
 	merc.h
 	mob.h
 	mob_movement_manager.h
-	net.h
 	npc.h
 	npc_ai.h
 	npc_scale_manager.h
@@ -250,10 +249,6 @@ SET(zone_headers
 	zonedb.h
 	zonedump.h)
 
-IF(EQEMU_DEPOP_INVALIDATES_CACHE)
-	ADD_DEFINITIONS(-DDEPOP_INVALIDATES_NPC_TYPES_CACHE)
-ENDIF(EQEMU_DEPOP_INVALIDATES_CACHE)
-
 ADD_EXECUTABLE(zone ${zone_sources} ${zone_headers})
 
 INSTALL(TARGETS zone RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
@@ -262,12 +257,4 @@ ADD_DEFINITIONS(-DZONE)
 
 TARGET_LINK_LIBRARIES(zone ${SERVER_LIBS})
 
-IF(EQEMU_BUILD_PERL)
-	TARGET_LINK_LIBRARIES(zone ${PERL_LIBRARY})
-ENDIF()
-
-IF(EQEMU_BUILD_LUA)
-	TARGET_LINK_LIBRARIES(zone luabind ${LUA_LIBRARY})
-ENDIF(EQEMU_BUILD_LUA)
-
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
diff --git a/zone/aa.cpp b/zone/aa.cpp
index 48ee715f7..1383ad2f9 100644
--- a/zone/aa.cpp
+++ b/zone/aa.cpp
@@ -36,7 +36,7 @@ Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 extern QueryServ* QServ;
 
-void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, uint32 duration_override, bool followme, bool sticktarg) {
+void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, uint32 duration_override, bool followme, bool sticktarg, uint16 *eye_id) {
 
 	//It might not be a bad idea to put these into the database, eventually..
 
@@ -57,8 +57,8 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
 	PetRecord record;
 	if (!database.GetPoweredPetEntry(spells[spell_id].teleport_zone, act_power, &record))
 	{
-		Log(Logs::General, Logs::Error, "Unknown swarm pet spell id: %d, check pets table", spell_id);
-		Message(13, "Unable to find data for pet %s", spells[spell_id].teleport_zone);
+		LogError("Unknown swarm pet spell id: {}, check pets table", spell_id);
+		Message(Chat::Red, "Unable to find data for pet %s", spells[spell_id].teleport_zone);
 		return;
 	}
 
@@ -84,7 +84,7 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
 	const NPCType *npc_type = database.LoadNPCTypesData(pet.npc_id);
 	if (npc_type == nullptr) {
 		//log write
-		Log(Logs::General, Logs::Error, "Unknown npc type for swarm pet spell id: %d", spell_id);
+		LogError("Unknown npc type for swarm pet spell id: [{}]", spell_id);
 		Message(0, "Unable to find pet!");
 		return;
 	}
@@ -109,6 +109,8 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
 		glm::vec2(8, 8), glm::vec2(-8, 8), glm::vec2(8, -8), glm::vec2(-8, -8)
 	};
 
+	NPC* swarm_pet_npc = nullptr;
+
 	while (summon_count > 0) {
 		int pet_duration = pet.duration;
 		if (duration_override > 0)
@@ -122,7 +124,7 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
 			memcpy(npc_dup, made_npc, sizeof(NPCType));
 		}
 
-		NPC* swarm_pet_npc = new NPC(
+		swarm_pet_npc = new NPC(
 			(npc_dup != nullptr) ? npc_dup : npc_type,	//make sure we give the NPC the correct data pointer
 			0,
 			GetPosition() + glm::vec4(swarmPetLocations[summon_count], 0.0f, 0.0f),
@@ -162,6 +164,10 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
 		summon_count--;
 	}
 
+	if (swarm_pet_npc && IsClient() && eye_id != nullptr) {
+		*eye_id = swarm_pet_npc->GetID();
+	}
+
 	//the target of these swarm pets will take offense to being cast on...
 	if (targ != nullptr)
 		targ->AddToHateList(this, 1, 0);
@@ -183,7 +189,7 @@ void Mob::TypesTemporaryPets(uint32 typesid, Mob *targ, const char *name_overrid
 	const NPCType *npc_type = database.LoadNPCTypesData(typesid);
 	if(npc_type == nullptr) {
 		//log write
-		Log(Logs::General, Logs::Error, "Unknown npc type for swarm pet type id: %d", typesid);
+		LogError("Unknown npc type for swarm pet type id: [{}]", typesid);
 		Message(0,"Unable to find pet!");
 		return;
 	}
@@ -489,7 +495,7 @@ void Client::ResetAA() {
 	database.DeleteCharacterLeadershipAAs(CharacterID());
 	// undefined for these clients
 	if (ClientVersionBit() & EQEmu::versions::maskTitaniumAndEarlier)
-		Kick();
+		Kick("AA Reset on client that doesn't support it");
 }
 
 void Client::SendClearAA()
@@ -1091,7 +1097,7 @@ void Client::FinishAlternateAdvancementPurchase(AA::Rank *rank, bool ignore_cost
 	SendAlternateAdvancementStats();
 
 	if(rank->prev) {
-		Message_StringID(15, AA_IMPROVE,
+		MessageString(Chat::Yellow, AA_IMPROVE,
 						 std::to_string(rank->title_sid).c_str(),
 						 std::to_string(rank->prev->current_value).c_str(),
 						 std::to_string(cost).c_str(),
@@ -1104,7 +1110,7 @@ void Client::FinishAlternateAdvancementPurchase(AA::Rank *rank, bool ignore_cost
 		}
 	}
 	else {
-		Message_StringID(15, AA_GAIN_ABILITY,
+		MessageString(Chat::Yellow, AA_GAIN_ABILITY,
 						 std::to_string(rank->title_sid).c_str(),
 						 std::to_string(cost).c_str(),
 						 cost == 1 ? std::to_string(AA_POINT).c_str() : std::to_string(AA_POINTS).c_str());
@@ -1179,11 +1185,11 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) {
 		uint32 aaremain_sec = aaremain % 60;
 
 		if(aaremain_hr >= 1) {
-			Message(13, "You can use this ability again in %u hour(s) %u minute(s) %u seconds",
+			Message(Chat::Red, "You can use this ability again in %u hour(s) %u minute(s) %u seconds",
 			aaremain_hr, aaremain_min, aaremain_sec);
 		}
 		else {
-			Message(13, "You can use this ability again in %u minute(s) %u seconds",
+			Message(Chat::Red, "You can use this ability again in %u minute(s) %u seconds",
 			aaremain_min, aaremain_sec);
 		}
 
@@ -1200,7 +1206,7 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) {
 		CommonBreakInvisible();
 
 	if (spells[rank->spell].sneak && (!hidden || (hidden && (Timer::GetCurrentTime() - tmHidden) < 4000))) {
-		Message_StringID(MT_SpellFailure, SNEAK_RESTRICT);
+		MessageString(Chat::SpellFailure, SNEAK_RESTRICT);
 		return;
 	}
 	//
@@ -1214,7 +1220,7 @@ void Client::ActivateAlternateAdvancementAbility(int rank_id, int target_id) {
 			SetAppearance(eaStanding, false);
 
 		if (GetAppearance() != eaStanding) {
-			Message_StringID(MT_SpellFailure, STAND_TO_CAST);
+			MessageString(Chat::SpellFailure, STAND_TO_CAST);
 			return;
 		}
 	}
@@ -1461,12 +1467,20 @@ bool Mob::CanUseAlternateAdvancementRank(AA::Rank *rank) {
 		}
 	}
 
-	if(IsClient()) {
-		if(rank->expansion && !(CastToClient()->GetPP().expansions & (1 << (rank->expansion - 1)))) {
+	if (IsClient()) {
+		if (rank->expansion && !(CastToClient()->GetPP().expansions & (1 << (rank->expansion - 1)))) {
 			return false;
 		}
-	} else {
-		if(rank->expansion && !(RuleI(World, ExpansionSettings) & (1 << (rank->expansion - 1)))) {
+	}
+#ifdef BOTS
+	else if (IsBot()) {
+		if (rank->expansion && !(RuleI(Bots, BotExpansionSettings) & (1 << (rank->expansion - 1)))) {
+			return false;
+		}
+	}
+#endif
+	else {
+		if (rank->expansion && !(RuleI(World, ExpansionSettings) & (1 << (rank->expansion - 1)))) {
 			return false;
 		}
 	}
@@ -1562,17 +1576,17 @@ bool Mob::CanPurchaseAlternateAdvancementRank(AA::Rank *rank, bool check_price,
 }
 
 void Zone::LoadAlternateAdvancement() {
-	Log(Logs::General, Logs::Status, "Loading Alternate Advancement Data...");
+	LogInfo("Loading Alternate Advancement Data");
 	if(!database.LoadAlternateAdvancementAbilities(aa_abilities,
 		aa_ranks))
 	{
 		aa_abilities.clear();
 		aa_ranks.clear();
-		Log(Logs::General, Logs::Status, "Failed to load Alternate Advancement Data");
+		LogInfo("Failed to load Alternate Advancement Data");
 		return;
 	}
 
-	Log(Logs::General, Logs::Status, "Processing Alternate Advancement Data...");
+	LogInfo("Processing Alternate Advancement Data");
 	for(const auto &ability : aa_abilities) {
 		ability.second->first = GetAlternateAdvancementRank(ability.second->first_rank_id);
 
@@ -1623,13 +1637,13 @@ void Zone::LoadAlternateAdvancement() {
 		}
 	}
 
-	Log(Logs::General, Logs::Status, "Loaded Alternate Advancement Data");
+	LogInfo("Loaded Alternate Advancement Data");
 }
 
 bool ZoneDatabase::LoadAlternateAdvancementAbilities(std::unordered_map<int, std::unique_ptr<AA::Ability>> &abilities,
 													std::unordered_map<int, std::unique_ptr<AA::Rank>> &ranks)
 {
-	Log(Logs::General, Logs::Status, "Loading Alternate Advancement Abilities...");
+	LogInfo("Loading Alternate Advancement Abilities");
 	abilities.clear();
 	std::string query = "SELECT id, name, category, classes, races, deities, drakkin_heritage, status, type, charges, "
 		"grant_only, first_rank_id FROM aa_ability WHERE enabled = 1";
@@ -1655,13 +1669,13 @@ bool ZoneDatabase::LoadAlternateAdvancementAbilities(std::unordered_map<int, std
 			abilities[ability->id] = std::unique_ptr<AA::Ability>(ability);
 		}
 	} else {
-		Log(Logs::General, Logs::Error, "Failed to load Alternate Advancement Abilities");
+		LogError("Failed to load Alternate Advancement Abilities");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loaded %d Alternate Advancement Abilities", (int)abilities.size());
+	LogInfo("Loaded [{}] Alternate Advancement Abilities", (int)abilities.size());
 
-	Log(Logs::General, Logs::Status, "Loading Alternate Advancement Ability Ranks...");
+	LogInfo("Loading Alternate Advancement Ability Ranks");
 	ranks.clear();
 	query = "SELECT id, upper_hotkey_sid, lower_hotkey_sid, title_sid, desc_sid, cost, level_req, spell, spell_type, recast_time, "
 		"next_id, expansion FROM aa_ranks";
@@ -1690,13 +1704,13 @@ bool ZoneDatabase::LoadAlternateAdvancementAbilities(std::unordered_map<int, std
 			ranks[rank->id] = std::unique_ptr<AA::Rank>(rank);
 		}
 	} else {
-		Log(Logs::General, Logs::Error, "Failed to load Alternate Advancement Ability Ranks");
+		LogError("Failed to load Alternate Advancement Ability Ranks");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loaded %d Alternate Advancement Ability Ranks", (int)ranks.size());
+	LogInfo("Loaded [{}] Alternate Advancement Ability Ranks", (int)ranks.size());
 
-	Log(Logs::General, Logs::Status, "Loading Alternate Advancement Ability Rank Effects...");
+	LogInfo("Loading Alternate Advancement Ability Rank Effects");
 	query = "SELECT rank_id, slot, effect_id, base1, base2 FROM aa_rank_effects";
 	results = QueryDatabase(query);
 	if(results.Success()) {
@@ -1717,13 +1731,13 @@ bool ZoneDatabase::LoadAlternateAdvancementAbilities(std::unordered_map<int, std
 			}
 		}
 	} else {
-		Log(Logs::General, Logs::Error, "Failed to load Alternate Advancement Ability Rank Effects");
+		LogError("Failed to load Alternate Advancement Ability Rank Effects");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loaded Alternate Advancement Ability Rank Effects");
+	LogInfo("Loaded Alternate Advancement Ability Rank Effects");
 
-	Log(Logs::General, Logs::Status, "Loading Alternate Advancement Ability Rank Prereqs...");
+	LogInfo("Loading Alternate Advancement Ability Rank Prereqs");
 	query = "SELECT rank_id, aa_id, points FROM aa_rank_prereqs";
 	results = QueryDatabase(query);
 	if(results.Success()) {
@@ -1742,11 +1756,11 @@ bool ZoneDatabase::LoadAlternateAdvancementAbilities(std::unordered_map<int, std
 			}
 		}
 	} else {
-		Log(Logs::General, Logs::Error, "Failed to load Alternate Advancement Ability Rank Prereqs");
+		LogError("Failed to load Alternate Advancement Ability Rank Prereqs");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loaded Alternate Advancement Ability Rank Prereqs");
+	LogInfo("Loaded Alternate Advancement Ability Rank Prereqs");
 
 	return true;
 }
diff --git a/zone/aggro.cpp b/zone/aggro.cpp
index 8a3da1092..ff0077353 100644
--- a/zone/aggro.cpp
+++ b/zone/aggro.cpp
@@ -36,28 +36,15 @@
 extern Zone* zone;
 //#define LOSDEBUG 6
 
-//look around a client for things which might aggro the client.
-void EntityList::CheckClientAggro(Client *around)
-{
-	for (auto it = mob_list.begin(); it != mob_list.end(); ++it) {
-		Mob *mob = it->second;
-		if (mob->IsClient())	//also ensures that mob != around
-			continue;
-
-		if (mob->CheckWillAggro(around) && !mob->CheckAggro(around))
-			mob->AddToHateList(around, 25);
-	}
-}
-
 void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbose) {
 	float d2 = d*d;
 
-	towho->Message(0, "Describing aggro for %s", from_who->GetName());
+	towho->Message(Chat::White, "Describing aggro for %s", from_who->GetName());
 
 	bool engaged = from_who->IsEngaged();
 	if(engaged) {
 		Mob *top = from_who->GetHateTop();
-		towho->Message(0, ".. I am currently fighting with %s", top == nullptr?"(nullptr)":top->GetName());
+		towho->Message(Chat::White, ".. I am currently fighting with %s", top == nullptr?"(nullptr)":top->GetName());
 	}
 	bool check_npcs = from_who->WillAggroNPCs();
 
@@ -77,7 +64,7 @@ void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbo
 			if(!database.GetFactionName(my_primary, namebuf, sizeof(namebuf)))
 				strcpy(namebuf, "(Unknown)");
 		}
-		towho->Message(0, ".. I am on faction %s (%d)\n", namebuf, my_primary);
+		towho->Message(Chat::White, ".. I am on faction %s (%d)\n", namebuf, my_primary);
 	}
 
 	for (auto it = mob_list.begin(); it != mob_list.end(); ++it) {
@@ -91,11 +78,11 @@ void EntityList::DescribeAggro(Client *towho, NPC *from_who, float d, bool verbo
 		if (engaged) {
 			uint32 amm = from_who->GetHateAmount(mob);
 			if (amm == 0)
-				towho->Message(0, "... %s is not on my hate list.", mob->GetName());
+				towho->Message(Chat::White, "... %s is not on my hate list.", mob->GetName());
 			else
-				towho->Message(0, "... %s is on my hate list with value %lu", mob->GetName(), (unsigned long)amm);
+				towho->Message(Chat::White, "... %s is on my hate list with value %lu", mob->GetName(), (unsigned long)amm);
 		} else if (!check_npcs && mob->IsNPC()) {
-				towho->Message(0, "... %s is an NPC and my npc_aggro is disabled.", mob->GetName());
+				towho->Message(Chat::White, "... %s is an NPC and my npc_aggro is disabled.", mob->GetName());
 		} else {
 			from_who->DescribeAggro(towho, mob, verbose);
 		}
@@ -114,13 +101,13 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 	if(( t1 > iAggroRange)
 		|| ( t2 > iAggroRange)
 		|| ( t3 > iAggroRange) ) {
-		towho->Message(0, "...%s is out of range (fast). distances (%.3f,%.3f,%.3f), range %.3f", mob->GetName(),
+		towho->Message(Chat::White, "...%s is out of range (fast). distances (%.3f,%.3f,%.3f), range %.3f", mob->GetName(),
 		t1, t2, t3, iAggroRange);
 		return;
 	}
 
 	if(mob->IsInvisible(this)) {
-		towho->Message(0, "...%s is invisible to me. ", mob->GetName());
+		towho->Message(Chat::White, "...%s is invisible to me. ", mob->GetName());
 		return;
 	}
 	if((mob->IsClient() &&
@@ -131,13 +118,13 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 		)
 		))
 	{
-		towho->Message(0, "...%s is my owner. ", mob->GetName());
+		towho->Message(Chat::White, "...%s is my owner. ", mob->GetName());
 		return;
 	}
 
 
 	if(mob == GetOwner()) {
-		towho->Message(0, "...%s a GM or is not connected. ", mob->GetName());
+		towho->Message(Chat::White, "...%s a GM or is not connected. ", mob->GetName());
 		return;
 	}
 
@@ -145,7 +132,7 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 
 	float iAggroRange2 = iAggroRange*iAggroRange;
 	if( dist2 > iAggroRange2 ) {
-		towho->Message(0, "...%s is out of range. %.3f > %.3f ", mob->GetName(),
+		towho->Message(Chat::White, "...%s is out of range. %.3f > %.3f ", mob->GetName(),
 		dist2, iAggroRange2);
 		return;
 	}
@@ -154,14 +141,14 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 	{
 		if (GetLevel() < RuleI(Aggro, MinAggroLevel) && mob->GetLevelCon(GetLevel()) == CON_GRAY && GetBodyType() != 3)
 		{
-			towho->Message(0, "...%s is red to me (basically)", mob->GetName(),	dist2, iAggroRange2);
+			towho->Message(Chat::White, "...%s is red to me (basically)", mob->GetName(),	dist2, iAggroRange2);
 			return;
 		}
 	}
 	else
 	{
 		if(GetINT() > RuleI(Aggro, IntAggroThreshold) && mob->GetLevelCon(GetLevel()) == CON_GRAY ) {
-			towho->Message(0, "...%s is red to me (basically)", mob->GetName(),
+			towho->Message(Chat::White, "...%s is red to me (basically)", mob->GetName(),
 			dist2, iAggroRange2);
 			return;
 		}
@@ -178,9 +165,9 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 			mob_primary = own->GetPrimaryFaction();
 
 		if(mob_primary == 0) {
-			towho->Message(0, "...%s has no primary faction", mob->GetName());
+			towho->Message(Chat::White, "...%s has no primary faction", mob->GetName());
 		} else if(mob_primary < 0) {
-			towho->Message(0, "...%s is on special faction %d", mob->GetName(), mob_primary);
+			towho->Message(Chat::White, "...%s is on special faction %d", mob->GetName(), mob_primary);
 		} else {
 			char namebuf[256];
 			if(!database.GetFactionName(mob_primary, namebuf, sizeof(namebuf)))
@@ -193,22 +180,22 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 				struct NPCFaction* fac = *cur;
 				if ((int32)fac->factionID == mob_primary) {
 					if (fac->npc_value > 0) {
-						towho->Message(0, "...%s is on ALLY faction %s (%d) with %d", mob->GetName(), namebuf, mob_primary, fac->npc_value);
+						towho->Message(Chat::White, "...%s is on ALLY faction %s (%d) with %d", mob->GetName(), namebuf, mob_primary, fac->npc_value);
 						res = true;
 						break;
 					} else if (fac->npc_value < 0) {
-						towho->Message(0, "...%s is on ENEMY faction %s (%d) with %d", mob->GetName(), namebuf, mob_primary, fac->npc_value);
+						towho->Message(Chat::White, "...%s is on ENEMY faction %s (%d) with %d", mob->GetName(), namebuf, mob_primary, fac->npc_value);
 						res = true;
 						break;
 					} else {
-						towho->Message(0, "...%s is on NEUTRAL faction %s (%d) with 0", mob->GetName(), namebuf, mob_primary);
+						towho->Message(Chat::White, "...%s is on NEUTRAL faction %s (%d) with 0", mob->GetName(), namebuf, mob_primary);
 						res = true;
 						break;
 					}
 				}
 			}
 			if(!res) {
-				towho->Message(0, "...%s is on faction %s (%d), which I have no entry for.", mob->GetName(), namebuf, mob_primary);
+				towho->Message(Chat::White, "...%s is on faction %s (%d), which I have no entry for.", mob->GetName(), namebuf, mob_primary);
 			}
 		}
 	}
@@ -222,18 +209,18 @@ void NPC::DescribeAggro(Client *towho, Mob *mob, bool verbose) {
 			||
 			fv == FACTION_THREATENLY
 		)) {
-		towho->Message(0, "...%s faction not low enough. value='%s'", mob->GetName(), FactionValueToString(fv));
+		towho->Message(Chat::White, "...%s faction not low enough. value='%s'", mob->GetName(), FactionValueToString(fv));
 		return;
 	}
 	if(fv == FACTION_THREATENLY) {
-		towho->Message(0, "...%s threatening to me, so they only have a %d chance per check of attacking.", mob->GetName());
+		towho->Message(Chat::White, "...%s threatening to me, so they only have a %d chance per check of attacking.", mob->GetName());
 	}
 
 	if(!CheckLosFN(mob)) {
-		towho->Message(0, "...%s is out of sight.", mob->GetName());
+		towho->Message(Chat::White, "...%s is out of sight.", mob->GetName());
 	}
 
-	towho->Message(0, "...%s meets all conditions, I should be attacking them.", mob->GetName());
+	towho->Message(Chat::White, "...%s meets all conditions, I should be attacking them.", mob->GetName());
 }
 
 /*
@@ -294,9 +281,7 @@ bool Mob::CheckWillAggro(Mob *mob) {
 
 	// Don't aggro new clients if we are already engaged unless PROX_AGGRO is set
 	if (IsEngaged() && (!GetSpecialAbility(PROX_AGGRO) || (GetSpecialAbility(PROX_AGGRO) && !CombatRange(mob)))) {
-		Log(Logs::Moderate, Logs::Aggro,
-			"%s is in combat, and does not have prox_aggro, or does and is out of combat range with %s",
-			GetName(), mob->GetName());
+		LogAggro("[{}] is in combat, and does not have prox_aggro, or does and is out of combat range with [{}]", GetName(), mob->GetName());
 		return false;
 	}
 
@@ -356,7 +341,7 @@ bool Mob::CheckWillAggro(Mob *mob) {
 	{
 		//FatherNiwtit: make sure we can see them. last since it is very expensive
 		if(CheckLosFN(mob)) {
-			Log(Logs::Detail, Logs::Aggro, "Check aggro for %s target %s.", GetName(), mob->GetName());
+			LogAggro("Check aggro for [{}] target [{}]", GetName(), mob->GetName());
 			return( mod_will_aggro(mob, this) );
 		}
 	}
@@ -388,38 +373,22 @@ bool Mob::CheckWillAggro(Mob *mob) {
 		{
 			//FatherNiwtit: make sure we can see them. last since it is very expensive
 			if(CheckLosFN(mob)) {
-				Log(Logs::Detail, Logs::Aggro, "Check aggro for %s target %s.", GetName(), mob->GetName());
+				LogAggro("Check aggro for [{}] target [{}]", GetName(), mob->GetName());
 				return( mod_will_aggro(mob, this) );
 			}
 		}
 	}
 
-	Log(Logs::Detail, Logs::Aggro, "Is In zone?:%d\n", mob->InZone());
-	Log(Logs::Detail, Logs::Aggro, "Dist^2: %f\n", dist2);
-	Log(Logs::Detail, Logs::Aggro, "Range^2: %f\n", iAggroRange2);
-	Log(Logs::Detail, Logs::Aggro, "Faction: %d\n", fv);
-	Log(Logs::Detail, Logs::Aggro, "Int: %d\n", GetINT());
-	Log(Logs::Detail, Logs::Aggro, "Con: %d\n", GetLevelCon(mob->GetLevel()));
+	LogAggro("Is In zone?:[{}]\n", mob->InZone());
+	LogAggro("Dist^2: [{}]\n", dist2);
+	LogAggro("Range^2: [{}]\n", iAggroRange2);
+	LogAggro("Faction: [{}]\n", fv);
+	LogAggro("Int: [{}]\n", GetINT());
+	LogAggro("Con: [{}]\n", GetLevelCon(mob->GetLevel()));
 
 	return(false);
 }
 
-Mob* EntityList::AICheckNPCtoNPCAggro(Mob* sender, float iAggroRange, float iAssistRange) {
-	if (!sender || !sender->IsNPC())
-		return(nullptr);
-
-	auto it = npc_list.begin();
-	while (it != npc_list.end()) {
-		Mob *mob = it->second;
-
-		if (sender->CheckWillAggro(mob))
-			return mob;
-		++it;
-	}
-
-	return nullptr;
-}
-
 int EntityList::GetHatedCount(Mob *attacker, Mob *exclude, bool inc_gray_con)
 {
 	// Return a list of how many non-feared, non-mezzed, non-green mobs, within aggro range, hate *attacker
@@ -464,82 +433,11 @@ int EntityList::GetHatedCount(Mob *attacker, Mob *exclude, bool inc_gray_con)
 	return Count;
 }
 
-void EntityList::AIYellForHelp(Mob* sender, Mob* attacker) {
-	if(!sender || !attacker)
-		return;
-	if (sender->GetPrimaryFaction() == 0 )
-		return; // well, if we dont have a faction set, we're gonna be indiff to everybody
-
-	if (sender->HasAssistAggro())
-		return;
-
-	for (auto it = npc_list.begin(); it != npc_list.end(); ++it) {
-		NPC *mob = it->second;
-		if (!mob)
-			continue;
-
-		if (mob->CheckAggro(attacker))
-			continue;
-
-		if (sender->NPCAssistCap() >= RuleI(Combat, NPCAssistCap))
-			break;
-
-		float r = mob->GetAssistRange();
-		r = r * r;
-
-		if (
-			mob != sender
-			&& mob != attacker
-//			&& !mob->IsCorpse()
-//			&& mob->IsAIControlled()
-			&& mob->GetPrimaryFaction() != 0
-			&& DistanceSquared(mob->GetPosition(), sender->GetPosition()) <= r
-			&& !mob->IsEngaged()
-			&& ((!mob->IsPet()) || (mob->IsPet() && mob->GetOwner() && !mob->GetOwner()->IsClient()))
-				// If we're a pet we don't react to any calls for help if our owner is a client
-			)
-		{
-			//if they are in range, make sure we are not green...
-			//then jump in if they are our friend
-			if(mob->GetLevel() >= 50 || attacker->GetLevelCon(mob->GetLevel()) != CON_GRAY)
-			{
-				bool useprimfaction = false;
-				if(mob->GetPrimaryFaction() == sender->CastToNPC()->GetPrimaryFaction())
-				{
-					const NPCFactionList *cf = database.GetNPCFactionEntry(mob->GetNPCFactionID());
-					if(cf){
-						if(cf->assistprimaryfaction != 0)
-							useprimfaction = true;
-					}
-				}
-
-				if(useprimfaction || sender->GetReverseFactionCon(mob) <= FACTION_AMIABLE )
-				{
-					//attacking someone on same faction, or a friend
-					//Father Nitwit: make sure we can see them.
-					if(mob->CheckLosFN(sender)) {
-#if (EQDEBUG>=5)
-						Log(Logs::General, Logs::None, "AIYellForHelp(\"%s\",\"%s\") %s attacking %s Dist %f Z %f",
-							sender->GetName(), attacker->GetName(), mob->GetName(),
-							attacker->GetName(), DistanceSquared(mob->GetPosition(),
-							sender->GetPosition()), std::abs(sender->GetZ()+mob->GetZ()));
-#endif
-						mob->AddToHateList(attacker, 25, 0, false);
-						sender->AddAssistCap();
-					}
-				}
-			}
-		}
-	}
-}
-
-/*
-returns false if attack should not be allowed
-I try to list every type of conflict that's possible here, so it's easy
-to see how the decision is made. Yea, it could be condensed and made
-faster, but I'm doing it this way to make it readable and easy to modify
-*/
-
+/**
+ * @param target
+ * @param isSpellAttack
+ * @return
+ */
 bool Mob::IsAttackAllowed(Mob *target, bool isSpellAttack)
 {
 
@@ -750,7 +648,7 @@ type', in which case, the answer is yes.
 	}
 	while( reverse++ == 0 );
 
-	Log(Logs::General, Logs::None, "Mob::IsAttackAllowed: don't have a rule for this - %s vs %s\n", this->GetName(), target->GetName());
+	LogDebug("Mob::IsAttackAllowed: don't have a rule for this - [{}] vs [{}]\n", this->GetName(), target->GetName());
 	return false;
 }
 
@@ -890,7 +788,7 @@ bool Mob::IsBeneficialAllowed(Mob *target)
 	}
 	while( reverse++ == 0 );
 
-	Log(Logs::General, Logs::None, "Mob::IsBeneficialAllowed: don't have a rule for this - %s to %s\n", this->GetName(), target->GetName());
+	LogDebug("Mob::IsBeneficialAllowed: don't have a rule for this - [{}] to [{}]\n", this->GetName(), target->GetName());
 	return false;
 }
 
@@ -973,11 +871,13 @@ bool Mob::CombatRange(Mob* other)
 }
 
 //Father Nitwit's LOS code
-bool Mob::CheckLosFN(Mob* other) {
+bool Mob::CheckLosFN(Mob *other)
+{
 	bool Result = false;
 
-	if(other)
+	if (other) {
 		Result = CheckLosFN(other->GetX(), other->GetY(), other->GetZ(), other->GetSize());
+	}
 
 	SetLastLosState(Result);
 
@@ -1009,7 +909,7 @@ bool Mob::CheckLosFN(float posX, float posY, float posZ, float mobSize) {
 	oloc.z = posZ + (mobSize==0.0?LOS_DEFAULT_HEIGHT:mobSize)/2 * SEE_POSITION;
 
 #if LOSDEBUG>=5
-	Log(Logs::General, Logs::None, "LOS from (%.2f, %.2f, %.2f) to (%.2f, %.2f, %.2f) sizes: (%.2f, %.2f)", myloc.x, myloc.y, myloc.z, oloc.x, oloc.y, oloc.z, GetSize(), mobSize);
+	LogDebug("LOS from ([{}], [{}], [{}]) to ([{}], [{}], [{}]) sizes: ([{}], [{}])", myloc.x, myloc.y, myloc.z, oloc.x, oloc.y, oloc.z, GetSize(), mobSize);
 #endif
 	return zone->zonemap->CheckLoS(myloc, oloc);
 }
@@ -1031,7 +931,7 @@ bool Mob::CheckLosFN(glm::vec3 posWatcher, float sizeWatcher, glm::vec3 posTarge
 	posTarget.z += (sizeTarget == 0.0f ? LOS_DEFAULT_HEIGHT : sizeTarget) / 2 * SEE_POSITION;
 
 #if LOSDEBUG>=5
-	Log(Logs::General, Logs::None, "LOS from (%.2f, %.2f, %.2f) to (%.2f, %.2f, %.2f) sizes: (%.2f, %.2f) [static]", posWatcher.x, posWatcher.y, posWatcher.z, posTarget.x, posTarget.y, posTarget.z, sizeWatcher, sizeTarget);
+	LogDebug("LOS from ([{}], [{}], [{}]) to ([{}], [{}], [{}]) sizes: ([{}], [{}]) [static]", posWatcher.x, posWatcher.y, posWatcher.z, posTarget.x, posTarget.y, posTarget.z, sizeWatcher, sizeTarget);
 #endif
 	return zone->zonemap->CheckLoS(posWatcher, posTarget);
 }
diff --git a/zone/api_service.cpp b/zone/api_service.cpp
index 957d2b012..b038da1a6 100644
--- a/zone/api_service.cpp
+++ b/zone/api_service.cpp
@@ -34,13 +34,25 @@
 
 extern Zone *zone;
 
-EQ::Net::WebsocketLoginStatus
-CheckLogin(EQ::Net::WebsocketServerConnection *connection, const std::string &username, const std::string &password)
+/**
+ * @param connection
+ * @param username
+ * @param password
+ * @return
+ */
+EQ::Net::WebsocketLoginStatus CheckLogin(
+	EQ::Net::WebsocketServerConnection *connection,
+	const std::string &username,
+	const std::string &password
+)
 {
 	EQ::Net::WebsocketLoginStatus ret;
 	ret.logged_in = false;
 
-	ret.account_id = database.CheckLogin(username.c_str(), password.c_str());
+
+	std::string prefix = "eqemu";
+
+	ret.account_id = database.CheckLogin(username.c_str(), password.c_str(), prefix.c_str());
 
 	if (ret.account_id == 0) {
 		return ret;
@@ -54,6 +66,11 @@ CheckLogin(EQ::Net::WebsocketServerConnection *connection, const std::string &us
 	return ret;
 }
 
+/**
+ * @param connection
+ * @param params
+ * @return
+ */
 Json::Value ApiGetPacketStatistics(EQ::Net::WebsocketServerConnection *connection, Json::Value params)
 {
 	if (zone->GetZoneID() == 0) {
@@ -225,7 +242,7 @@ Json::Value ApiGetNpcListDetail(EQ::Net::WebsocketServerConnection *connection,
 		row["sec_skill"]       = npc->GetSecSkill();
 		row["silver"]          = npc->GetSilver();
 		row["slow_mitigation"] = npc->GetSlowMitigation();
-		row["sp2"]             = npc->GetSp2();
+		row["spawn_group_id"]  = npc->GetSpawnGroupId();
 		row["swarm_owner"]     = npc->GetSwarmOwner();
 		row["swarm_target"]    = npc->GetSwarmTarget();
 		row["waypoint_max"]    = npc->GetWaypointMax();
@@ -803,7 +820,7 @@ Json::Value ApiGetZoneAttributes(EQ::Net::WebsocketServerConnection *connection,
 	row["mobs_aggro_count"]        = zone->MobsAggroCount();
 	row["save_zone_cfg"]           = zone->SaveZoneCFG();
 	row["short_name"]              = zone->GetShortName();
-	row["total_blocked_spells"]    = zone->GetTotalBlockedSpells();
+	row["total_blocked_spells"]    = zone->GetZoneTotalBlockedSpells();
 	row["zone_id"]                 = zone->GetZoneID();
 	row["zone_type"]               = zone->GetZoneType();
 
@@ -847,7 +864,7 @@ Json::Value ApiSetLoggingLevel(EQ::Net::WebsocketServerConnection *connection, J
 
 	response["status"] = "Category doesn't exist";
 
-	Log(Logs::General, Logs::Status, "Logging category is %i and level is %i",
+	LogInfo("Logging category is [{}] and level is [{}]",
 		logging_category,
 		logging_level
 	);
diff --git a/zone/attack.cpp b/zone/attack.cpp
index a51cd3163..911f22dfb 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "lua_parser.h"
 #include "fastmath.h"
 #include "mob.h"
+#include "npc.h"
 
 
 #include <assert.h>
@@ -392,7 +393,7 @@ bool Mob::AvoidDamage(Mob *other, DamageHitInfo &hit)
 	if (hit.hand != EQEmu::invslot::slotRange && (CanThisClassRiposte() || IsEnraged()) && InFront && !ImmuneRipo) {
 		if (IsEnraged()) {
 			hit.damage_done = DMG_RIPOSTED;
-			Log(Logs::Detail, Logs::Combat, "I am enraged, riposting frontal attack.");
+			LogCombat("I am enraged, riposting frontal attack");
 			return true;
 		}
 		if (IsClient())
@@ -723,7 +724,7 @@ int Mob::GetClassRaceACBonus()
 			hardcap = 32;
 			softcap = 15;
 		}
-		int weight = IsClient() ? CastToClient()->CalcCurrentWeight() : 0;
+		int weight = IsClient() ? CastToClient()->CalcCurrentWeight()/10 : 0;
 		if (weight < hardcap - 1) {
 			int temp = level + 5;
 			if (weight > softcap) {
@@ -849,11 +850,12 @@ int Mob::ACSum()
 			auto over_cap = ac - softcap;
 			ac = softcap + (over_cap * returns);
 		}
-		Log(Logs::Detail, Logs::Combat, "ACSum ac %d softcap %d returns %f", ac, softcap, returns);
+		LogCombatDetail("ACSum ac [{}] softcap [{}] returns [{}]", ac, softcap, returns);
 	}
 	else {
-		Log(Logs::Detail, Logs::Combat, "ACSum ac %d", ac);
+		LogCombatDetail("ACSum ac [{}]", ac);
 	}
+
 	return ac;
 }
 
@@ -1312,14 +1314,14 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts)
 {
 	if (!other)
 		return;
-	Log(Logs::Detail, Logs::Combat, "%s::DoAttack vs %s base %d min %d offense %d tohit %d skill %d", GetName(),
+	LogCombat("[{}]::DoAttack vs [{}] base [{}] min [{}] offense [{}] tohit [{}] skill [{}]", GetName(),
 		other->GetName(), hit.base_damage, hit.min_damage, hit.offense, hit.tohit, hit.skill);
 
 	// check to see if we hit..
 	if (other->AvoidDamage(this, hit)) {
 		int strike_through = itembonuses.StrikeThrough + spellbonuses.StrikeThrough + aabonuses.StrikeThrough;
 		if (strike_through && zone->random.Roll(strike_through)) {
-			Message_StringID(MT_StrikeThrough,
+			MessageString(Chat::StrikeThrough,
 				STRIKETHROUGH_STRING); // You strike through your opponents defenses!
 			hit.damage_done = 1;			// set to one, we will check this to continue
 		}
@@ -1329,7 +1331,7 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts)
 			//if (IsDead())
 			return;
 		}
-		Log(Logs::Detail, Logs::Combat, "Avoided/strikethrough damage with code %d", hit.damage_done);
+		LogCombat("Avoided/strikethrough damage with code [{}]", hit.damage_done);
 	}
 
 	if (hit.damage_done >= 0) {
@@ -1340,9 +1342,9 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts)
 					int stun_resist2 = other->spellbonuses.FrontalStunResist + other->itembonuses.FrontalStunResist + other->aabonuses.FrontalStunResist;
 					int stun_resist = other->spellbonuses.StunResist + other->itembonuses.StunResist + other->aabonuses.StunResist;
 					if (zone->random.Roll(stun_resist2)) {
-						other->Message_StringID(MT_Stun, AVOID_STUNNING_BLOW);
+						other->MessageString(Chat::Stun, AVOID_STUNNING_BLOW);
 					} else if (zone->random.Roll(stun_resist)) {
-						other->Message_StringID(MT_Stun, SHAKE_OFF_STUN);
+						other->MessageString(Chat::Stun, SHAKE_OFF_STUN);
 					} else {
 						other->Stun(3000); // yuck -- 3 seconds
 					}
@@ -1353,10 +1355,10 @@ void Mob::DoAttack(Mob *other, DamageHitInfo &hit, ExtraAttackOptions *opts)
 				ApplyDamageTable(hit);
 				CommonOutgoingHitSuccess(other, hit, opts);
 			}
-			Log(Logs::Detail, Logs::Combat, "Final damage after all reductions: %d", hit.damage_done);
+			LogCombat("Final damage after all reductions: [{}]", hit.damage_done);
 		}
 		else {
-			Log(Logs::Detail, Logs::Combat, "Attack missed. Damage set to 0.");
+			LogCombat("Attack missed. Damage set to 0");
 			hit.damage_done = 0;
 		}
 	}
@@ -1369,14 +1371,14 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
 {
 	if (!other) {
 		SetTarget(nullptr);
-		Log(Logs::General, Logs::Error, "A null Mob object was passed to Client::Attack() for evaluation!");
+		LogError("A null Mob object was passed to Client::Attack() for evaluation!");
 		return false;
 	}
 
 	if (!GetTarget())
 		SetTarget(other);
 
-	Log(Logs::Detail, Logs::Combat, "Attacking %s with hand %d %s", other ? other->GetName() : "(nullptr)", Hand, bRiposte ? "(this is a riposte)" : "");
+	LogCombat("Attacking [{}] with hand [{}] [{}]", other ? other->GetName() : "(nullptr)", Hand, bRiposte ? "(this is a riposte)" : "");
 
 	//SetAttackTimer();
 	if (
@@ -1386,13 +1388,13 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
 		|| (GetHP() < 0)
 		|| (!IsAttackAllowed(other))
 		) {
-		Log(Logs::Detail, Logs::Combat, "Attack canceled, invalid circumstances.");
+		LogCombat("Attack cancelled, invalid circumstances");
 		return false; // Only bards can attack while casting
 	}
 
 	if (DivineAura() && !GetGM()) {//cant attack while invulnerable unless your a gm
-		Log(Logs::Detail, Logs::Combat, "Attack canceled, Divine Aura is in effect.");
-		Message_StringID(MT_DefaultText, DIVINE_AURA_NO_ATK);	//You can't attack while invulnerable!
+		LogCombat("Attack cancelled, Divine Aura is in effect");
+		MessageString(Chat::DefaultText, DIVINE_AURA_NO_ATK);	//You can't attack while invulnerable
 		return false;
 	}
 
@@ -1411,20 +1413,20 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
 
 	if (weapon != nullptr) {
 		if (!weapon->IsWeapon()) {
-			Log(Logs::Detail, Logs::Combat, "Attack canceled, Item %s (%d) is not a weapon.", weapon->GetItem()->Name, weapon->GetID());
+			LogCombat("Attack cancelled, Item [{}] ([{}]) is not a weapon", weapon->GetItem()->Name, weapon->GetID());
 			return(false);
 		}
-		Log(Logs::Detail, Logs::Combat, "Attacking with weapon: %s (%d)", weapon->GetItem()->Name, weapon->GetID());
+		LogCombat("Attacking with weapon: [{}] ([{}])", weapon->GetItem()->Name, weapon->GetID());
 	}
 	else {
-		Log(Logs::Detail, Logs::Combat, "Attacking without a weapon.");
+		LogCombat("Attacking without a weapon");
 	}
 
 	DamageHitInfo my_hit;
 	// calculate attack_skill and skillinuse depending on hand and weapon
 	// also send Packet to near clients
 	my_hit.skill = AttackAnimation(Hand, weapon);
-	Log(Logs::Detail, Logs::Combat, "Attacking with %s in slot %d using skill %d", weapon ? weapon->GetItem()->Name : "Fist", Hand, my_hit.skill);
+	LogCombat("Attacking with [{}] in slot [{}] using skill [{}]", weapon ? weapon->GetItem()->Name : "Fist", Hand, my_hit.skill);
 
 	// Now figure out damage
 	my_hit.damage_done = 1;
@@ -1492,7 +1494,7 @@ bool Client::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, b
 
 		// damage = mod_client_damage(damage, skillinuse, Hand, weapon, other);
 
-		Log(Logs::Detail, Logs::Combat, "Damage calculated: base %d min damage %d skill %d", my_hit.base_damage, my_hit.min_damage, my_hit.skill);
+		LogCombat("Damage calculated: base [{}] min damage [{}] skill [{}]", my_hit.base_damage, my_hit.min_damage, my_hit.skill);
 
 		int hit_chance_bonus = 0;
 		my_hit.offense = offense(my_hit.skill); // we need this a few times
@@ -1615,20 +1617,20 @@ bool Client::Death(Mob* killerMob, int32 damage, uint16 spell, EQEmu::skills::Sk
 	if (killerMob && killerMob->IsClient() && (spell != SPELL_UNKNOWN) && damage > 0) {
 		char val1[20] = { 0 };
 
-		entity_list.MessageClose_StringID(
+		entity_list.MessageCloseString(
 			this, /* Sender */
 			false, /* Skip Sender */
 			RuleI(Range, DamageMessages),
-			MT_NonMelee, /* 283 */
+			Chat::NonMelee, /* 283 */
 			HIT_NON_MELEE, /* %1 hit %2 for %3 points of non-melee damage. */
 			killerMob->GetCleanName(), /* Message1 */
 			GetCleanName(), /* Message2 */
 			ConvertArray(damage, val1)/* Message3 */
-			);
+		);
 	}
 
 	int exploss = 0;
-	Log(Logs::Detail, Logs::Combat, "Fatal blow dealt by %s with %d damage, spell %d, skill %d", killerMob ? killerMob->GetName() : "Unknown", damage, spell, attack_skill);
+	LogCombat("Fatal blow dealt by [{}] with [{}] damage, spell [{}], skill [{}]", killerMob ? killerMob->GetName() : "Unknown", damage, spell, attack_skill);
 
 	/*
 	#1: Send death packet to everyone
@@ -1901,7 +1903,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
 {
 	if (!other) {
 		SetTarget(nullptr);
-		Log(Logs::General, Logs::Error, "A null Mob object was passed to NPC::Attack() for evaluation!");
+		LogError("A null Mob object was passed to NPC::Attack() for evaluation!");
 		return false;
 	}
 
@@ -1914,12 +1916,12 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
 	//Check that we can attack before we calc heading and face our target
 	if (!IsAttackAllowed(other)) {
 		if (this->GetOwnerID())
-			this->Say_StringID(NOT_LEGAL_TARGET);
+			this->SayString(NOT_LEGAL_TARGET);
 		if (other) {
 			if (other->IsClient())
 				other->CastToClient()->RemoveXTarget(this, false);
 			RemoveFromHateList(other);
-			Log(Logs::Detail, Logs::Combat, "I am not allowed to attack %s", other->GetName());
+			LogCombat("I am not allowed to attack [{}]", other->GetName());
 		}
 		return false;
 	}
@@ -1949,10 +1951,10 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
 	//We dont factor much from the weapon into the attack.
 	//Just the skill type so it doesn't look silly using punching animations and stuff while wielding weapons
 	if (weapon) {
-		Log(Logs::Detail, Logs::Combat, "Attacking with weapon: %s (%d) (too bad im not using it for much)", weapon->Name, weapon->ID);
+		LogCombat("Attacking with weapon: [{}] ([{}]) (too bad im not using it for much)", weapon->Name, weapon->ID);
 
-		if (Hand == EQEmu::invslot::slotSecondary && weapon->ItemType == EQEmu::item::ItemTypeShield) {
-			Log(Logs::Detail, Logs::Combat, "Attack with shield canceled.");
+		if (Hand == EQEmu::invslot::slotSecondary && !weapon->IsType1HWeapon()) {
+			LogCombat("Attack with non-weapon cancelled");
 			return false;
 		}
 
@@ -2054,7 +2056,7 @@ bool NPC::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, bool
 
 		other->AddToHateList(this, hate);
 
-		Log(Logs::Detail, Logs::Combat, "Final damage against %s: %d", other->GetName(), my_hit.damage_done);
+		LogCombat("Final damage against [{}]: [{}]", other->GetName(), my_hit.damage_done);
 
 		if (other->IsClient() && IsPet() && GetOwner()->IsClient()) {
 			//pets do half damage to clients in pvp
@@ -2111,7 +2113,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::Skill
 	//handle EVENT_ATTACK. Resets after we have not been attacked for 12 seconds
 	if (attacked_timer.Check())
 	{
-		Log(Logs::Detail, Logs::Combat, "Triggering EVENT_ATTACK due to attack by %s", other ? other->GetName() : "nullptr");
+		LogCombat("Triggering EVENT_ATTACK due to attack by [{}]", other ? other->GetName() : "nullptr");
 		parse->EventNPC(EVENT_ATTACK, this, other, "", 0);
 	}
 	attacked_timer.Start(CombatEventTimer_expire);
@@ -2129,7 +2131,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::Skill
 		{
 			if (IsLDoNTrapped())
 			{
-				Message_StringID(13, LDON_ACCIDENT_SETOFF2);
+				MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2);
 				SpellFinished(GetLDoNTrapSpellID(), other, EQEmu::spells::CastingSlot::Item, 0, -1, spells[GetLDoNTrapSpellID()].ResistDiff, false);
 				SetLDoNTrapSpellID(0);
 				SetLDoNTrapped(false);
@@ -2149,7 +2151,7 @@ void NPC::Damage(Mob* other, int32 damage, uint16 spell_id, EQEmu::skills::Skill
 
 bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQEmu::skills::SkillType attack_skill)
 {
-	Log(Logs::Detail, Logs::Combat, "Fatal blow dealt by %s with %d damage, spell %d, skill %d",
+	LogCombat("Fatal blow dealt by [{}] with [{}] damage, spell [{}], skill [{}]",
 		((killer_mob) ? (killer_mob->GetName()) : ("[nullptr]")), damage, spell, attack_skill);
 
 	Mob *oos = nullptr;
@@ -2169,16 +2171,16 @@ bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQEmu::skills::Skil
 		if (killer_mob->IsClient() && (spell != SPELL_UNKNOWN) && damage > 0) {
 			char val1[20] = { 0 };
 
-			entity_list.MessageClose_StringID(
+			entity_list.MessageCloseString(
 				this, /* Sender */
 				false, /* Skip Sender */
 				RuleI(Range, DamageMessages),
-				MT_NonMelee, /* 283 */
+				Chat::NonMelee, /* 283 */
 				HIT_NON_MELEE, /* %1 hit %2 for %3 points of non-melee damage. */
 				killer_mob->GetCleanName(), /* Message1 */
 				GetCleanName(), /* Message2 */
 				ConvertArray(damage, val1) /* Message3 */
-				);
+			);
 		}
 	}
 	else {
@@ -2437,10 +2439,13 @@ bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQEmu::skills::Skil
 		}
 	}
 
-	if (!HasOwner() && !IsMerc() && class_ != MERCHANT && class_ != ADVENTUREMERCHANT && !GetSwarmInfo()
-		&& MerchantType == 0 && ((killer && (killer->IsClient() || (killer->HasOwner() && killer->GetUltimateOwner()->IsClient()) ||
-			(killer->IsNPC() && killer->CastToNPC()->GetSwarmInfo() && killer->CastToNPC()->GetSwarmInfo()->GetOwner() && killer->CastToNPC()->GetSwarmInfo()->GetOwner()->IsClient())))
-			|| (killer_mob && IsLdonTreasure)))
+	bool    allow_merchant_corpse = RuleB(Merchant, AllowCorpse);
+	bool    is_merchant = (class_ == MERCHANT || class_ == ADVENTUREMERCHANT || MerchantType != 0);
+	
+	if (!HasOwner() && !IsMerc() && !GetSwarmInfo() && (!is_merchant || allow_merchant_corpse) &&
+		((killer && (killer->IsClient() || (killer->HasOwner() && killer->GetUltimateOwner()->IsClient()) ||
+		(killer->IsNPC() && killer->CastToNPC()->GetSwarmInfo() && killer->CastToNPC()->GetSwarmInfo()->GetOwner() && killer->CastToNPC()->GetSwarmInfo()->GetOwner()->IsClient())))
+		|| (killer_mob && IsLdonTreasure)))
 	{
 		if (killer != 0) {
 			if (killer->GetOwner() != 0 && killer->GetOwner()->IsClient())
@@ -2461,6 +2466,9 @@ bool NPC::Death(Mob* killer_mob, int32 damage, uint16 spell, EQEmu::skills::Skil
 		entity_list.UnMarkNPC(GetID());
 		entity_list.RemoveNPC(GetID());
 
+		// entity_list.RemoveMobFromCloseLists(this);
+		close_mobs.clear();
+
 		this->SetID(0);
 
 		if (killer != 0 && emoteid != 0)
@@ -2692,18 +2700,22 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
 #ifdef BOTS
 	// if other is a bot, add the bots client to the hate list
 	while (other->IsBot()) {
+
 		auto other_ = other->CastToBot();
-		if (!other_ || !other_->GetBotOwner())
+		if (!other_ || !other_->GetBotOwner()) {
 			break;
+		}
 
 		auto owner_ = other_->GetBotOwner()->CastToClient();
-		if (!owner_ || owner_->IsDead() || !owner_->InZone()) // added isdead and inzone checks to avoid issues in AddAutoXTarget(...) below
+		if (!owner_ || owner_->IsDead() || !owner_->InZone()) { // added isdead and inzone checks to avoid issues in AddAutoXTarget(...) below
 			break;
+		}
 
 		if (owner_->GetFeigned()) {
 			AddFeignMemory(owner_);
 		}
 		else if (!hate_list.IsEntOnHateList(owner_)) {
+
 			hate_list.AddEntToHateList(owner_, 0, 0, false, true);
 			owner_->AddAutoXTarget(this); // this was being called on dead/out-of-zone clients
 		}
@@ -2797,7 +2809,7 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) {
 	if (DS == 0 && rev_ds == 0)
 		return;
 
-	Log(Logs::Detail, Logs::Combat, "Applying Damage Shield of value %d to %s", DS, attacker->GetName());
+	LogCombat("Applying Damage Shield of value [{}] to [{}]", DS, attacker->GetName());
 
 	//invert DS... spells yield negative values for a true damage shield
 	if (DS < 0) {
@@ -2843,7 +2855,7 @@ void Mob::DamageShield(Mob* attacker, bool spell_ds) {
 		rev_ds_spell_id = spellbonuses.ReverseDamageShieldSpellID;
 
 	if (rev_ds < 0) {
-		Log(Logs::Detail, Logs::Combat, "Applying Reverse Damage Shield of value %d to %s", rev_ds, attacker->GetName());
+		LogCombat("Applying Reverse Damage Shield of value [{}] to [{}]", rev_ds, attacker->GetName());
 		attacker->Damage(this, -rev_ds, rev_ds_spell_id, EQEmu::skills::SkillAbjuration/*hackish*/, false); //"this" (us) will get the hate, etc. not sure how this works on Live, but it'll works for now, and tanks will love us for this
 																											//do we need to send a damage packet here also?
 	}
@@ -3053,16 +3065,14 @@ int32 Mob::ReduceDamage(int32 damage)
 			int damage_to_reduce = damage * spellbonuses.MeleeThresholdGuard[0] / 100;
 			if (damage_to_reduce >= buffs[slot].melee_rune)
 			{
-				Log(Logs::Detail, Logs::Spells, "Mob::ReduceDamage SE_MeleeThresholdGuard %d damage negated, %d"
-					" damage remaining, fading buff.", damage_to_reduce, buffs[slot].melee_rune);
+				LogSpells("Mob::ReduceDamage SE_MeleeThresholdGuard [{}] damage negated, [{}] damage remaining, fading buff", damage_to_reduce, buffs[slot].melee_rune);
 				damage -= buffs[slot].melee_rune;
 				if (!TryFadeEffect(slot))
 					BuffFadeBySlot(slot);
 			}
 			else
 			{
-				Log(Logs::Detail, Logs::Spells, "Mob::ReduceDamage SE_MeleeThresholdGuard %d damage negated, %d"
-					" damage remaining.", damage_to_reduce, buffs[slot].melee_rune);
+				LogSpells("Mob::ReduceDamage SE_MeleeThresholdGuard [{}] damage negated, [{}] damage remaining", damage_to_reduce, buffs[slot].melee_rune);
 				buffs[slot].melee_rune = (buffs[slot].melee_rune - damage_to_reduce);
 				damage -= damage_to_reduce;
 			}
@@ -3080,16 +3090,14 @@ int32 Mob::ReduceDamage(int32 damage)
 
 			if (spellbonuses.MitigateMeleeRune[3] && (damage_to_reduce >= buffs[slot].melee_rune))
 			{
-				Log(Logs::Detail, Logs::Spells, "Mob::ReduceDamage SE_MitigateMeleeDamage %d damage negated, %d"
-					" damage remaining, fading buff.", damage_to_reduce, buffs[slot].melee_rune);
+				LogSpells("Mob::ReduceDamage SE_MitigateMeleeDamage [{}] damage negated, [{}] damage remaining, fading buff", damage_to_reduce, buffs[slot].melee_rune);
 				damage -= buffs[slot].melee_rune;
 				if (!TryFadeEffect(slot))
 					BuffFadeBySlot(slot);
 			}
 			else
 			{
-				Log(Logs::Detail, Logs::Spells, "Mob::ReduceDamage SE_MitigateMeleeDamage %d damage negated, %d"
-					" damage remaining.", damage_to_reduce, buffs[slot].melee_rune);
+				LogSpells("Mob::ReduceDamage SE_MitigateMeleeDamage [{}] damage negated, [{}] damage remaining", damage_to_reduce, buffs[slot].melee_rune);
 
 				if (spellbonuses.MitigateMeleeRune[3])
 					buffs[slot].melee_rune = (buffs[slot].melee_rune - damage_to_reduce);
@@ -3206,16 +3214,14 @@ int32 Mob::AffectMagicalDamage(int32 damage, uint16 spell_id, const bool iBuffTi
 
 				if (spellbonuses.MitigateSpellRune[3] && (damage_to_reduce >= buffs[slot].magic_rune))
 				{
-					Log(Logs::Detail, Logs::Spells, "Mob::ReduceDamage SE_MitigateSpellDamage %d damage negated, %d"
-						" damage remaining, fading buff.", damage_to_reduce, buffs[slot].magic_rune);
+					LogSpells("Mob::ReduceDamage SE_MitigateSpellDamage [{}] damage negated, [{}] damage remaining, fading buff", damage_to_reduce, buffs[slot].magic_rune);
 					damage -= buffs[slot].magic_rune;
 					if (!TryFadeEffect(slot))
 						BuffFadeBySlot(slot);
 				}
 				else
 				{
-					Log(Logs::Detail, Logs::Spells, "Mob::ReduceDamage SE_MitigateMeleeDamage %d damage negated, %d"
-						" damage remaining.", damage_to_reduce, buffs[slot].magic_rune);
+					LogSpells("Mob::ReduceDamage SE_MitigateMeleeDamage [{}] damage negated, [{}] damage remaining", damage_to_reduce, buffs[slot].magic_rune);
 
 					if (spellbonuses.MitigateSpellRune[3])
 						buffs[slot].magic_rune = (buffs[slot].magic_rune - damage_to_reduce);
@@ -3370,13 +3376,13 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 		ignore_invul = spell_id == 982 || spells[spell_id].cast_not_standing; // cazic touch
 
 	if (!ignore_invul && (GetInvul() || DivineAura())) {
-		Log(Logs::Detail, Logs::Combat, "Avoiding %d damage due to invulnerability.", damage);
+		LogCombat("Avoiding [{}] damage due to invulnerability", damage);
 		damage = DMG_INVULNERABLE;
 	}
 
 	// this should actually happen MUCH sooner, need to investigate though -- good enough for now
 	if ((skill_used == EQEmu::skills::SkillArchery || skill_used == EQEmu::skills::SkillThrowing) && GetSpecialAbility(IMMUNE_RANGED_ATTACKS)) {
-		Log(Logs::Detail, Logs::Combat, "Avoiding %d damage due to IMMUNE_RANGED_ATTACKS.", damage);
+		LogCombat("Avoiding [{}] damage due to IMMUNE_RANGED_ATTACKS", damage);
 		damage = DMG_INVULNERABLE;
 	}
 
@@ -3420,12 +3426,12 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 				int healed = damage;
 
 				healed = attacker->GetActSpellHealing(spell_id, healed);
-				Log(Logs::Detail, Logs::Combat, "Applying lifetap heal of %d to %s", healed, attacker->GetName());
+				LogCombat("Applying lifetap heal of [{}] to [{}]", healed, attacker->GetName());
 				attacker->HealDamage(healed);
 
 				//we used to do a message to the client, but its gone now.
 				// emote goes with every one ... even npcs
-				entity_list.MessageClose(this, true, RuleI(Range, SpellMessages), MT_Emote, "%s beams a smile at %s", attacker->GetCleanName(), this->GetCleanName());
+				entity_list.MessageClose(this, true, RuleI(Range, SpellMessages), Chat::Emote, "%s beams a smile at %s", attacker->GetCleanName(), this->GetCleanName());
 			}
 		}	//end `if there is some damage being done and theres anattacker person involved`
 
@@ -3436,17 +3442,17 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 		if (pet && !pet->IsFamiliar() && !pet->GetSpecialAbility(IMMUNE_AGGRO) && !pet->IsEngaged() && attacker && attacker != this && !attacker->IsCorpse() && !pet->IsGHeld() && !attacker->IsTrap())
 		{
 			if (!pet->IsHeld()) {
-				Log(Logs::Detail, Logs::Aggro, "Sending pet %s into battle due to attack.", pet->GetName());
+				LogAggro("Sending pet [{}] into battle due to attack", pet->GetName());
 				pet->AddToHateList(attacker, 1, 0, true, false, false, spell_id);
 				pet->SetTarget(attacker);
-				Message_StringID(10, PET_ATTACKING, pet->GetCleanName(), attacker->GetCleanName());
+				MessageString(Chat::NPCQuestSay, PET_ATTACKING, pet->GetCleanName(), attacker->GetCleanName());
 			}
 		}
 
 		//see if any runes want to reduce this damage
 		if (spell_id == SPELL_UNKNOWN) {
 			damage = ReduceDamage(damage);
-			Log(Logs::Detail, Logs::Combat, "Melee Damage reduced to %d", damage);
+			LogCombat("Melee Damage reduced to [{}]", damage);
 			damage = ReduceAllDamage(damage);
 			TryTriggerThreshHold(damage, SE_TriggerMeleeThreshold, attacker);
 
@@ -3459,7 +3465,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 			damage = AffectMagicalDamage(damage, spell_id, iBuffTic, attacker);
 			if (origdmg != damage && attacker && attacker->IsClient()) {
 				if (attacker->CastToClient()->GetFilter(FilterDamageShields) != FilterHide)
-					attacker->Message(15, "The Spellshield absorbed %d of %d points of damage", origdmg - damage, origdmg);
+					attacker->Message(Chat::Yellow, "The Spellshield absorbed %d of %d points of damage", origdmg - damage, origdmg);
 			}
 			if (damage == 0 && attacker && origdmg != damage && IsClient()) {
 				//Kayen: Probably need to add a filter for this - Not sure if this msg is correct but there should be a message for spell negate/runes.
@@ -3506,16 +3512,16 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 
 		//fade mez if we are mezzed
 		if (IsMezzed() && attacker) {
-			Log(Logs::Detail, Logs::Combat, "Breaking mez due to attack.");
-			entity_list.MessageClose_StringID(
+			LogCombat("Breaking mez due to attack");
+			entity_list.MessageCloseString(
 				this, /* Sender */
 				true,  /* Skip Sender */
 				RuleI(Range, SpellMessages),
-				MT_WornOff, /* 284 */
+				Chat::SpellWornOff, /* 284 */
 				HAS_BEEN_AWAKENED, // %1 has been awakened by %2.
 				GetCleanName(), /* Message1 */
 				attacker->GetCleanName() /* Message2 */
-				);
+			);
 			BuffFadeByEffect(SE_Mez);
 		}
 
@@ -3564,13 +3570,13 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 					else {
 						// stun resist passed!
 						if (IsClient())
-							Message_StringID(MT_Stun, SHAKE_OFF_STUN);
+							MessageString(Chat::Stun, SHAKE_OFF_STUN);
 					}
 				}
 				else {
 					// stun resist 2 passed!
 					if (IsClient())
-						Message_StringID(MT_Stun, AVOID_STUNNING_BLOW);
+						MessageString(Chat::Stun, AVOID_STUNNING_BLOW);
 				}
 			}
 			else {
@@ -3593,7 +3599,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 			//increment chances of interrupting
 			if (IsCasting()) { //shouldnt interrupt on regular spell damage
 				attacked_count++;
-				Log(Logs::Detail, Logs::Combat, "Melee attack while casting. Attack count %d", attacked_count);
+				LogCombat("Melee attack while casting. Attack count [{}]", attacked_count);
 			}
 		}
 
@@ -3650,7 +3656,7 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 				if (((spell_id != SPELL_UNKNOWN) || (FromDamageShield)) && damage>0) {
 					//special crap for spell damage, looks hackish to me
 					char val1[20] = { 0 };
-					owner->Message_StringID(MT_NonMelee, OTHER_HIT_NONMELEE, GetCleanName(), ConvertArray(damage, val1));
+					owner->MessageString(Chat::NonMelee, OTHER_HIT_NONMELEE, GetCleanName(), ConvertArray(damage, val1));
 				}
 				else {
 					if (damage > 0) {
@@ -3680,19 +3686,19 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 					char val1[20] = { 0 };
 					if (FromDamageShield) {
 						if (attacker->CastToClient()->GetFilter(FilterDamageShields) != FilterHide)
-							attacker->Message_StringID(MT_DS, OTHER_HIT_NONMELEE, GetCleanName(), ConvertArray(damage, val1));
+							attacker->MessageString(Chat::DamageShield, OTHER_HIT_NONMELEE, GetCleanName(), ConvertArray(damage, val1));
 					}
 					else {
-						entity_list.MessageClose_StringID(
+						entity_list.MessageCloseString(
 							this, /* Sender */
 							true, /* Skip Sender */
 							RuleI(Range, SpellMessages),
-							MT_NonMelee, /* 283 */
+							Chat::NonMelee, /* 283 */
 							HIT_NON_MELEE, /* %1 hit %2 for %3 points of non-melee damage. */
 							attacker->GetCleanName(), /* Message1 */
 							GetCleanName(), /* Message2 */
 							ConvertArray(damage, val1) /* Message3 */
-							);
+						);
 					}
 				}
 				else {
@@ -3754,22 +3760,22 @@ void Mob::CommonDamage(Mob* attacker, int &damage, const uint16 spell_id, const
 		// So we can see our dot dmg like live shows it.
 		if (spell_id != SPELL_UNKNOWN && damage > 0 && attacker && attacker != this && attacker->IsClient()) {
 			//might filter on (attack_skill>200 && attack_skill<250), but I dont think we need it
-			attacker->FilteredMessage_StringID(attacker, MT_DoTDamage, FilterDOT,
+			attacker->FilteredMessageString(attacker, Chat::DotDamage, FilterDOT,
 				YOUR_HIT_DOT, GetCleanName(), itoa(damage), spells[spell_id].name);
 
 			/* older clients don't have the below String ID, but it will be filtered */
-			entity_list.FilteredMessageClose_StringID(
+			entity_list.FilteredMessageCloseString(
 				attacker, /* Sender */
 				true, /* Skip Sender */
 				RuleI(Range, SpellMessages),
-				MT_DoTDamage, /* Type: 325 */
+				Chat::DotDamage, /* Type: 325 */
 				FilterDOT, /* FilterType: 19 */
 				OTHER_HIT_DOT,  /* MessageFormat: %1 has taken %2 damage from %3 by %4. */
 				GetCleanName(), /* Message1 */
 				itoa(damage), /* Message2 */
 				attacker->GetCleanName(), /* Message3 */
 				spells[spell_id].name /* Message4 */
-				);
+			);
 		}
 	} //end packet sending
 
@@ -3792,42 +3798,42 @@ void Mob::HealDamage(uint32 amount, Mob *caster, uint16 spell_id)
 										 // message to caster
 				if (caster->IsClient() && caster == this) {
 					if (caster->CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater)
-						FilteredMessage_StringID(caster, MT_NonMelee, FilterHealOverTime,
+						FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime,
 							HOT_HEAL_SELF, itoa(acthealed), spells[spell_id].name);
 					else
-						FilteredMessage_StringID(caster, MT_NonMelee, FilterHealOverTime,
+						FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime,
 							YOU_HEALED, GetCleanName(), itoa(acthealed));
 				}
 				else if (caster->IsClient() && caster != this) {
 					if (caster->CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater)
-						caster->FilteredMessage_StringID(caster, MT_NonMelee, FilterHealOverTime,
+						caster->FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime,
 							HOT_HEAL_OTHER, GetCleanName(), itoa(acthealed),
 							spells[spell_id].name);
 					else
-						caster->FilteredMessage_StringID(caster, MT_NonMelee, FilterHealOverTime,
+						caster->FilteredMessageString(caster, Chat::NonMelee, FilterHealOverTime,
 							YOU_HEAL, GetCleanName(), itoa(acthealed));
 				}
 				// message to target
 				if (IsClient() && caster != this) {
 					if (CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater)
-						FilteredMessage_StringID(this, MT_NonMelee, FilterHealOverTime,
+						FilteredMessageString(this, Chat::NonMelee, FilterHealOverTime,
 							HOT_HEALED_OTHER, caster->GetCleanName(),
 							itoa(acthealed), spells[spell_id].name);
 					else
-						FilteredMessage_StringID(this, MT_NonMelee, FilterHealOverTime,
+						FilteredMessageString(this, Chat::NonMelee, FilterHealOverTime,
 							YOU_HEALED, caster->GetCleanName(), itoa(acthealed));
 				}
 			}
 			else { // normal heals
-				FilteredMessage_StringID(caster, MT_NonMelee, FilterSpellDamage,
+				FilteredMessageString(caster, Chat::NonMelee, FilterSpellDamage,
 					YOU_HEALED, caster->GetCleanName(), itoa(acthealed));
 				if (caster != this)
-					caster->FilteredMessage_StringID(caster, MT_NonMelee, FilterSpellDamage,
+					caster->FilteredMessageString(caster, Chat::NonMelee, FilterSpellDamage,
 						YOU_HEAL, GetCleanName(), itoa(acthealed));
 			}
 		}
 		else {
-			Message(MT_NonMelee, "You have been healed for %d points of damage.", acthealed);
+			Message(Chat::NonMelee, "You have been healed for %d points of damage.", acthealed);
 		}
 	}
 
@@ -3862,7 +3868,7 @@ float Mob::GetProcChances(float ProcBonus, uint16 hand)
 		ProcChance += ProcChance * ProcBonus / 100.0f;
 	}
 
-	Log(Logs::Detail, Logs::Combat, "Proc chance %.2f (%.2f from bonuses)", ProcChance, ProcBonus);
+	LogCombat("Proc chance [{}] ([{}] from bonuses)", ProcChance, ProcBonus);
 	return ProcChance;
 }
 
@@ -3881,7 +3887,7 @@ float Mob::GetDefensiveProcChances(float &ProcBonus, float &ProcChance, uint16 h
 	ProcBonus += static_cast<float>(myagi) * RuleR(Combat, DefProcPerMinAgiContrib) / 100.0f;
 	ProcChance = ProcChance + (ProcChance * ProcBonus);
 
-	Log(Logs::Detail, Logs::Combat, "Defensive Proc chance %.2f (%.2f from bonuses)", ProcChance, ProcBonus);
+	LogCombat("Defensive Proc chance [{}] ([{}] from bonuses)", ProcChance, ProcBonus);
 	return ProcChance;
 }
 
@@ -3890,7 +3896,7 @@ void Mob::TryDefensiveProc(Mob *on, uint16 hand) {
 
 	if (!on) {
 		SetTarget(nullptr);
-		Log(Logs::General, Logs::Error, "A null Mob object was passed to Mob::TryDefensiveProc for evaluation!");
+		LogError("A null Mob object was passed to Mob::TryDefensiveProc for evaluation!");
 		return;
 	}
 
@@ -3930,17 +3936,17 @@ void Mob::TryDefensiveProc(Mob *on, uint16 hand) {
 void Mob::TryWeaponProc(const EQEmu::ItemInstance* weapon_g, Mob *on, uint16 hand) {
 	if (!on) {
 		SetTarget(nullptr);
-		Log(Logs::General, Logs::Error, "A null Mob object was passed to Mob::TryWeaponProc for evaluation!");
+		LogError("A null Mob object was passed to Mob::TryWeaponProc for evaluation!");
 		return;
 	}
 
 	if (!IsAttackAllowed(on)) {
-		Log(Logs::Detail, Logs::Combat, "Preventing procing off of unattackable things.");
+		LogCombat("Preventing procing off of unattackable things");
 		return;
 	}
 
 	if (DivineAura()) {
-		Log(Logs::Detail, Logs::Combat, "Procs canceled, Divine Aura is in effect.");
+		LogCombat("Procs cancelled, Divine Aura is in effect");
 		return;
 	}
 
@@ -3987,22 +3993,19 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *
 			static_cast<float>(weapon->ProcRate)) / 100.0f;
 		if (zone->random.Roll(WPC)) {	// 255 dex = 0.084 chance of proc. No idea what this number should be really.
 			if (weapon->Proc.Level2 > ourlevel) {
-				Log(Logs::Detail, Logs::Combat,
-					"Tried to proc (%s), but our level (%d) is lower than required (%d)",
+				LogCombat("Tried to proc ([{}]), but our level ([{}]) is lower than required ([{}])",
 					weapon->Name, ourlevel, weapon->Proc.Level2);
 				if (IsPet()) {
 					Mob *own = GetOwner();
 					if (own)
-						own->Message_StringID(13, PROC_PETTOOLOW);
+						own->MessageString(Chat::Red, PROC_PETTOOLOW);
 				}
 				else {
-					Message_StringID(13, PROC_TOOLOW);
+					MessageString(Chat::Red, PROC_TOOLOW);
 				}
 			}
 			else {
-				Log(Logs::Detail, Logs::Combat,
-					"Attacking weapon (%s) successfully procing spell %d (%.2f percent chance)",
-					weapon->Name, weapon->Proc.Effect, WPC * 100);
+				LogCombat("Attacking weapon ([{}]) successfully procing spell [{}] ([{}] percent chance)", weapon->Name, weapon->Proc.Effect, WPC * 100);
 				ExecWeaponProc(inst, weapon->Proc.Effect, on);
 				proced = true;
 			}
@@ -4030,10 +4033,10 @@ void Mob::TryWeaponProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *
 						if (IsPet()) {
 							Mob *own = GetOwner();
 							if (own)
-								own->Message_StringID(13, PROC_PETTOOLOW);
+								own->MessageString(Chat::Red, PROC_PETTOOLOW);
 						}
 						else {
-							Message_StringID(13, PROC_TOOLOW);
+							MessageString(Chat::Red, PROC_TOOLOW);
 						}
 					}
 					else {
@@ -4073,43 +4076,46 @@ void Mob::TrySpellProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *w
 	if (!weapon && hand == EQEmu::invslot::slotRange && GetSpecialAbility(SPECATK_RANGED_ATK))
 		rangedattk = true;
 
+	int16 poison_slot=-1;
+
 	for (uint32 i = 0; i < MAX_PROCS; i++) {
 		if (IsPet() && hand != EQEmu::invslot::slotPrimary) //Pets can only proc spell procs from their primay hand (ie; beastlord pets)
 			continue; // If pets ever can proc from off hand, this will need to change
 
-					  // Not ranged
+		if (SpellProcs[i].base_spellID == POISON_PROC && 
+		    	(!weapon || weapon->ItemType != EQEmu::item::ItemType1HPiercing))
+			continue; // Old school poison will only proc with 1HP equipped.
+
+		// Not ranged
 		if (!rangedattk) {
 			// Perma procs (AAs)
 			if (PermaProcs[i].spellID != SPELL_UNKNOWN) {
 				if (zone->random.Roll(PermaProcs[i].chance)) { // TODO: Do these get spell bonus?
-					Log(Logs::Detail, Logs::Combat,
-						"Permanent proc %d procing spell %d (%d percent chance)",
-						i, PermaProcs[i].spellID, PermaProcs[i].chance);
+					LogCombat("Permanent proc [{}] procing spell [{}] ([{}] percent chance)", i, PermaProcs[i].spellID, PermaProcs[i].chance);
 					ExecWeaponProc(nullptr, PermaProcs[i].spellID, on);
 				}
 				else {
-					Log(Logs::Detail, Logs::Combat,
-						"Permanent proc %d failed to proc %d (%d percent chance)",
-						i, PermaProcs[i].spellID, PermaProcs[i].chance);
+					LogCombat("Permanent proc [{}] failed to proc [{}] ([{}] percent chance)", i, PermaProcs[i].spellID, PermaProcs[i].chance);
 				}
 			}
 
 			// Spell procs (buffs)
 			if (SpellProcs[i].spellID != SPELL_UNKNOWN) {
+				if (SpellProcs[i].base_spellID == POISON_PROC) {
+					poison_slot=i;					
+					continue; // Process the poison proc last per @mackal
+				}
+
 				float chance = ProcChance * (static_cast<float>(SpellProcs[i].chance) / 100.0f);
 				if (zone->random.Roll(chance)) {
-					Log(Logs::Detail, Logs::Combat,
-							"Spell proc %d procing spell %d (%.2f percent chance)",
-							i, SpellProcs[i].spellID, chance);
+					LogCombat("Spell proc [{}] procing spell [{}] ([{}] percent chance)", i, SpellProcs[i].spellID, chance);
 					SendBeginCast(SpellProcs[i].spellID, 0);
 					ExecWeaponProc(nullptr, SpellProcs[i].spellID, on, SpellProcs[i].level_override);
 					CheckNumHitsRemaining(NumHit::OffensiveSpellProcs, 0,
 						SpellProcs[i].base_spellID);
 				}
 				else {
-					Log(Logs::Detail, Logs::Combat,
-						"Spell proc %d failed to proc %d (%.2f percent chance)",
-						i, SpellProcs[i].spellID, chance);
+					LogCombat("Spell proc [{}] failed to proc [{}] ([{}] percent chance)", i, SpellProcs[i].spellID, chance);
 				}
 			}
 		}
@@ -4118,22 +4124,33 @@ void Mob::TrySpellProc(const EQEmu::ItemInstance *inst, const EQEmu::ItemData *w
 			if (RangedProcs[i].spellID != SPELL_UNKNOWN) {
 				float chance = ProcChance * (static_cast<float>(RangedProcs[i].chance) / 100.0f);
 				if (zone->random.Roll(chance)) {
-					Log(Logs::Detail, Logs::Combat,
-						"Ranged proc %d procing spell %d (%.2f percent chance)",
-						i, RangedProcs[i].spellID, chance);
+					LogCombat("Ranged proc [{}] procing spell [{}] ([{}] percent chance)", i, RangedProcs[i].spellID, chance);
 					ExecWeaponProc(nullptr, RangedProcs[i].spellID, on);
 					CheckNumHitsRemaining(NumHit::OffensiveSpellProcs, 0,
 						RangedProcs[i].base_spellID);
 				}
 				else {
-					Log(Logs::Detail, Logs::Combat,
-						"Ranged proc %d failed to proc %d (%.2f percent chance)",
-						i, RangedProcs[i].spellID, chance);
+					LogCombat("Ranged proc [{}] failed to proc [{}] ([{}] percent chance)", i, RangedProcs[i].spellID, chance);
 				}
 			}
 		}
 	}
 
+	if (poison_slot > -1) {
+		bool one_shot = !RuleB(Combat, UseExtendedPoisonProcs);
+		float chance = (one_shot) ? 100.0f : ProcChance * (static_cast<float>(SpellProcs[poison_slot].chance) / 100.0f);
+		uint16 spell_id = SpellProcs[poison_slot].spellID;
+
+		if (zone->random.Roll(chance)) {
+			LogCombat("Poison proc [{}] procing spell [{}] ([{}] percent chance)", poison_slot, spell_id, chance);
+			SendBeginCast(spell_id, 0);
+			ExecWeaponProc(nullptr, spell_id, on, SpellProcs[poison_slot].level_override);
+			if (one_shot) {
+				RemoveProcFromWeapon(spell_id);
+			}
+		}
+	}	
+
 	if (HasSkillProcs() && hand != EQEmu::invslot::slotRange) { //We check ranged skill procs within the attack functions.
 		uint16 skillinuse = 28;
 		if (weapon)
@@ -4183,16 +4200,16 @@ void Mob::TryPetCriticalHit(Mob *defender, DamageHitInfo &hit)
 			hit.damage_done += 5;
 			hit.damage_done = (hit.damage_done * critMod) / 100;
 
-			entity_list.FilteredMessageClose_StringID(
+			entity_list.FilteredMessageCloseString(
 				this, /* Sender */
 				false,  /* Skip Sender */
 				RuleI(Range, CriticalDamage),
-				MT_CritMelee, /* Type: 301 */
+				Chat::MeleeCrit, /* Type: 301 */
 				FilterMeleeCrits, /* FilterType: 12 */
 				CRITICAL_HIT, /* MessageFormat: %1 scores a critical hit! (%2) */
 				GetCleanName(), /* Message1 */
 				itoa(hit.damage_done + hit.min_damage) /* Message2 */
-				);
+			);
 
 		}
 	}
@@ -4243,29 +4260,29 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 
 				/* Female */
 				if (GetGender() == 1) {
-					entity_list.FilteredMessageClose_StringID(
+					entity_list.FilteredMessageCloseString(
 						this, /* Sender */
 						false, /* Skip Sender */
 						RuleI(Range, CriticalDamage),
-						MT_CritMelee, /* Type: 301 */
+						Chat::MeleeCrit, /* Type: 301 */
 						FilterMeleeCrits, /* FilterType: 12 */
 						FEMALE_SLAYUNDEAD, /* MessageFormat: %1's holy blade cleanses her target!(%2) */
 						GetCleanName(), /* Message1 */
 						itoa(hit.damage_done + hit.min_damage) /* Message2 */
-						);
+					);
 				}
 				/* Males and Neuter */
 				else {
-					entity_list.FilteredMessageClose_StringID(
+					entity_list.FilteredMessageCloseString(
 						this, /* Sender */
 						false, /* Skip Sender */
 						RuleI(Range, CriticalDamage),
-						MT_CritMelee, /* Type: 301 */
+						Chat::MeleeCrit, /* Type: 301 */
 						FilterMeleeCrits, /* FilterType: 12 */
 						MALE_SLAYUNDEAD, /* MessageFormat: %1's holy blade cleanses his target!(%2)  */
 						GetCleanName(), /* Message1 */
 						itoa(hit.damage_done + hit.min_damage) /* Message2 */
-						);
+					);
 				}
 				return;
 			}
@@ -4323,9 +4340,7 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 			}
 
 			hit.damage_done = hit.damage_done * crit_mod / 100;
-			Log(Logs::Detail, Logs::Combat,
-				"Crit success roll %d dex chance %d og dmg %d crit_mod %d new dmg %d", roll, dex_bonus,
-				og_damage, crit_mod, hit.damage_done);
+			LogCombat("Crit success roll [{}] dex chance [{}] og dmg [{}] crit_mod [{}] new dmg [{}]", roll, dex_bonus, og_damage, crit_mod, hit.damage_done);
 
 			// step 3: check deadly strike
 			if (GetClass() == ROGUE && hit.skill == EQEmu::skills::SkillThrowing) {
@@ -4340,16 +4355,16 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 						}
 						hit.damage_done = hit.damage_done * 200 / 100;
 
-						entity_list.FilteredMessageClose_StringID(
+						entity_list.FilteredMessageCloseString(
 							this, /* Sender */
 							false, /* Skip Sender */
 							RuleI(Range, CriticalDamage),
-							MT_CritMelee, /* Type: 301 */
+							Chat::MeleeCrit, /* Type: 301 */
 							FilterMeleeCrits, /* FilterType: 12 */
 							DEADLY_STRIKE, /* MessageFormat: %1 scores a Deadly Strike!(%2) */
 							GetCleanName(), /* Message1 */
 							itoa(hit.damage_done + hit.min_damage) /* Message2 */
-							);
+						);
 						return;
 					}
 				}
@@ -4366,18 +4381,18 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 
 			if (IsBerserk() || berserk) {
 				hit.damage_done += og_damage * 119 / 100;
-				Log(Logs::Detail, Logs::Combat, "Crip damage %d", hit.damage_done);
+				LogCombat("Crip damage [{}]", hit.damage_done);
 
-				entity_list.FilteredMessageClose_StringID(
+				entity_list.FilteredMessageCloseString(
 					this, /* Sender */
 					false, /* Skip Sender */
 					RuleI(Range, CriticalDamage),
-					MT_CritMelee, /* Type: 301 */
+					Chat::MeleeCrit, /* Type: 301 */
 					FilterMeleeCrits, /* FilterType: 12 */
 					CRIPPLING_BLOW, /* MessageFormat: %1 lands a Crippling Blow!(%2) */
 					GetCleanName(), /* Message1 */
 					itoa(hit.damage_done + hit.min_damage) /* Message2 */
-					);
+				);
 
 				// Crippling blows also have a chance to stun
 				// Kayen: Crippling Blow would cause a chance to interrupt for npcs < 55, with a
@@ -4390,16 +4405,16 @@ void Mob::TryCriticalHit(Mob *defender, DamageHitInfo &hit, ExtraAttackOptions *
 			}
 
 			/* Normal Critical hit message */
-			entity_list.FilteredMessageClose_StringID(
+			entity_list.FilteredMessageCloseString(
 				this, /* Sender */
 				false, /* Skip Sender */
 				RuleI(Range, CriticalDamage),
-				MT_CritMelee, /* Type: 301 */
+				Chat::MeleeCrit, /* Type: 301 */
 				FilterMeleeCrits, /* FilterType: 12 */
 				CRITICAL_HIT, /* MessageFormat: %1 scores a critical hit! (%2) */
 				GetCleanName(), /* Message1 */
 				itoa(hit.damage_done + hit.min_damage) /* Message2 */
-				);
+			);
 		}
 	}
 }
@@ -4427,15 +4442,15 @@ bool Mob::TryFinishingBlow(Mob *defender, int &damage)
 			(ProcChance >= zone->random.Int(1, 1000))) {
 
 			/* Finishing Blow Critical Message */
-			entity_list.FilteredMessageClose_StringID(
+			entity_list.FilteredMessageCloseString(
 				this, /* Sender */
 				false, /* Skip Sender */
 				RuleI(Range, CriticalDamage),
-				MT_CritMelee, /* Type: 301 */
+				Chat::MeleeCrit, /* Type: 301 */
 				FilterMeleeCrits, /* FilterType: 12 */
 				FINISHING_BLOW, /* MessageFormat: %1 scores a Finishing Blow!!) */
 				GetCleanName() /* Message1 */
-				);
+			);
 
 			damage = FB_Dmg;
 			return true;
@@ -4446,14 +4461,14 @@ bool Mob::TryFinishingBlow(Mob *defender, int &damage)
 
 void Mob::DoRiposte(Mob *defender)
 {
-	Log(Logs::Detail, Logs::Combat, "Preforming a riposte");
+	LogCombat("Preforming a riposte");
 
 	if (!defender)
 		return;
 
 	// so ahhh the angle you can riposte is larger than the angle you can hit :P
 	if (!defender->IsFacingMob(this)) {
-		defender->Message_StringID(MT_TooFarAway, CANT_SEE_TARGET);
+		defender->MessageString(Chat::TooFarAway, CANT_SEE_TARGET);
 		return;
 	}
 
@@ -4466,8 +4481,7 @@ void Mob::DoRiposte(Mob *defender)
 		defender->itembonuses.DoubleRiposte;
 
 	if (DoubleRipChance && zone->random.Roll(DoubleRipChance)) {
-		Log(Logs::Detail, Logs::Combat,
-			"Preforming a double riposted from SE_DoubleRiposte (%d percent chance)", DoubleRipChance);
+		LogCombat("Preforming a double riposted from SE_DoubleRiposte ([{}] percent chance)", DoubleRipChance);
 		defender->Attack(this, EQEmu::invslot::slotPrimary, true);
 		if (HasDied())
 			return;
@@ -4478,9 +4492,7 @@ void Mob::DoRiposte(Mob *defender)
 
 	// Live AA - Double Riposte
 	if (DoubleRipChance && zone->random.Roll(DoubleRipChance)) {
-		Log(Logs::Detail, Logs::Combat,
-			"Preforming a double riposted from SE_GiveDoubleRiposte base1 == 0 (%d percent chance)",
-			DoubleRipChance);
+		LogCombat("Preforming a double riposted from SE_GiveDoubleRiposte base1 == 0 ([{}] percent chance)", DoubleRipChance);
 		defender->Attack(this, EQEmu::invslot::slotPrimary, true);
 		if (HasDied())
 			return;
@@ -4492,8 +4504,7 @@ void Mob::DoRiposte(Mob *defender)
 	DoubleRipChance = defender->aabonuses.GiveDoubleRiposte[1];
 
 	if (DoubleRipChance && zone->random.Roll(DoubleRipChance)) {
-		Log(Logs::Detail, Logs::Combat, "Preforming a return SPECIAL ATTACK (%d percent chance)",
-			DoubleRipChance);
+		LogCombat("Preforming a return SPECIAL ATTACK ([{}] percent chance)", DoubleRipChance);
 
 		if (defender->GetClass() == MONK)
 			defender->MonkSpecialAttack(this, defender->aabonuses.GiveDoubleRiposte[2]);
@@ -4716,7 +4727,7 @@ void Mob::TrySkillProc(Mob *on, uint16 skill, uint16 ReuseTime, bool Success, ui
 
 	if (!on) {
 		SetTarget(nullptr);
-		Log(Logs::General, Logs::Error, "A null Mob object was passed to Mob::TrySkillProc for evaluation!");
+		LogError("A null Mob object was passed to Mob::TrySkillProc for evaluation!");
 		return;
 	}
 
@@ -4947,13 +4958,13 @@ bool Mob::TryRootFadeByDamage(int buffslot, Mob* attacker) {
 
 			if (!TryFadeEffect(spellbonuses.Root[1])) {
 				BuffFadeBySlot(spellbonuses.Root[1]);
-				Log(Logs::Detail, Logs::Combat, "Spell broke root! BreakChance percent chance");
+				LogCombat("Spell broke root! BreakChance percent chance");
 				return true;
 			}
 		}
 	}
 
-	Log(Logs::Detail, Logs::Combat, "Spell did not break root. BreakChance percent chance");
+	LogCombat("Spell did not break root. BreakChance percent chance");
 	return false;
 }
 
@@ -5042,7 +5053,7 @@ void Mob::CommonOutgoingHitSuccess(Mob* defender, DamageHitInfo &hit, ExtraAttac
 		else if (GetClass() == RANGER && GetLevel() > 50) { // no double dmg on headshot
 			if ((defender->IsNPC() && !defender->IsMoving() && !defender->IsRooted()) || !RuleB(Combat, ArcheryBonusRequiresStationary)) {
 				hit.damage_done *= 2;
-				Message_StringID(MT_CritMelee, BOW_DOUBLE_DAMAGE);
+				MessageString(Chat::MeleeCrit, BOW_DOUBLE_DAMAGE);
 			}
 		}
 	}
@@ -5129,19 +5140,19 @@ void Mob::CommonBreakInvisibleFromCombat()
 {
 	//break invis when you attack
 	if (invisible) {
-		Log(Logs::Detail, Logs::Combat, "Removing invisibility due to melee attack.");
+		LogCombat("Removing invisibility due to melee attack");
 		BuffFadeByEffect(SE_Invisibility);
 		BuffFadeByEffect(SE_Invisibility2);
 		invisible = false;
 	}
 	if (invisible_undead) {
-		Log(Logs::Detail, Logs::Combat, "Removing invisibility vs. undead due to melee attack.");
+		LogCombat("Removing invisibility vs. undead due to melee attack");
 		BuffFadeByEffect(SE_InvisVsUndead);
 		BuffFadeByEffect(SE_InvisVsUndead2);
 		invisible_undead = false;
 	}
 	if (invisible_animals) {
-		Log(Logs::Detail, Logs::Combat, "Removing invisibility vs. animals due to melee attack.");
+		LogCombat("Removing invisibility vs. animals due to melee attack");
 		BuffFadeByEffect(SE_InvisVsAnimals);
 		invisible_animals = false;
 	}
@@ -5347,7 +5358,7 @@ void Client::DoAttackRounds(Mob *target, int hand, bool IsFromSpell)
 						Attack(target, hand, false, false, IsFromSpell);
 						if (zone->random.Roll(flurrychance))
 							Attack(target, hand, false, false, IsFromSpell);
-						Message_StringID(MT_NPCFlurry, YOU_FLURRY);
+						MessageString(Chat::NPCFlurry, YOU_FLURRY);
 					}
 				}
 			}
diff --git a/zone/aura.cpp b/zone/aura.cpp
index d4aee01cb..50026f998 100644
--- a/zone/aura.cpp
+++ b/zone/aura.cpp
@@ -6,8 +6,9 @@
 #include "raids.h"
 
 Aura::Aura(NPCType *type_data, Mob *owner, AuraRecord &record)
-    : NPC(type_data, 0, owner->GetPosition(), GravityBehavior::Flying), spell_id(record.spell_id), distance(record.distance),
-      remove_timer(record.duration), movement_timer(100), process_timer(1000), aura_id(-1)
+	: NPC(type_data, 0, owner->GetPosition(), GravityBehavior::Flying), spell_id(record.spell_id),
+	  distance(record.distance),
+	  remove_timer(record.duration), movement_timer(100), process_timer(1000), aura_id(-1)
 {
 	GiveNPCTypeData(type_data); // we will delete this later on
 	m_owner = owner->GetID();
@@ -17,42 +18,48 @@ Aura::Aura(NPCType *type_data, Mob *owner, AuraRecord &record)
 		cast_timer.Disable(); // we don't want to be enabled yet
 	}
 
-	if (record.aura_type < static_cast<int>(AuraType::Max))
+	if (record.aura_type < static_cast<int>(AuraType::Max)) {
 		type = static_cast<AuraType>(record.aura_type);
-	else
+	}
+	else {
 		type = AuraType::OnAllGroupMembers;
+	}
 
-	if (record.spawn_type < static_cast<int>(AuraSpawns::Max))
+	if (record.spawn_type < static_cast<int>(AuraSpawns::Max)) {
 		spawn_type = static_cast<AuraSpawns>(record.spawn_type);
-	else
+	}
+	else {
 		spawn_type = AuraSpawns::GroupMembers;
+	}
 
-	if (record.movement < static_cast<int>(AuraMovement::Max))
+	if (record.movement < static_cast<int>(AuraMovement::Max)) {
 		movement_type = static_cast<AuraMovement>(record.movement);
-	else
+	}
+	else {
 		movement_type = AuraMovement::Follow;
+	}
 
 	switch (type) {
-	case AuraType::OnAllFriendlies:
-		process_func = &Aura::ProcessOnAllFriendlies;
-		break;
-	case AuraType::OnAllGroupMembers:
-		process_func = &Aura::ProcessOnAllGroupMembers;
-		break;
-	case AuraType::OnGroupMembersPets:
-		process_func = &Aura::ProcessOnGroupMembersPets;
-		break;
-	case AuraType::Totem:
-		process_func = &Aura::ProcessTotem;
-		break;
-	case AuraType::EnterTrap:
-		process_func = &Aura::ProcessEnterTrap;
-		break;
-	case AuraType::ExitTrap:
-		process_func = &Aura::ProcessExitTrap;
-		break;
-	default:
-		process_func = nullptr;
+		case AuraType::OnAllFriendlies:
+			process_func = &Aura::ProcessOnAllFriendlies;
+			break;
+		case AuraType::OnAllGroupMembers:
+			process_func = &Aura::ProcessOnAllGroupMembers;
+			break;
+		case AuraType::OnGroupMembersPets:
+			process_func = &Aura::ProcessOnGroupMembersPets;
+			break;
+		case AuraType::Totem:
+			process_func = &Aura::ProcessTotem;
+			break;
+		case AuraType::EnterTrap:
+			process_func = &Aura::ProcessEnterTrap;
+			break;
+		case AuraType::ExitTrap:
+			process_func = &Aura::ProcessExitTrap;
+			break;
+		default:
+			process_func = nullptr;
 	}
 }
 
@@ -64,9 +71,9 @@ Mob *Aura::GetOwner()
 // not 100% sure how this one should work and PVP affects ...
 void Aura::ProcessOnAllFriendlies(Mob *owner)
 {
-	auto &mob_list = entity_list.GetMobList(); // read only reference so we can do it all inline
+	auto          &mob_list = entity_list.GetCloseMobList(this, distance);
 	std::set<int> delayed_remove;
-	bool is_buff = IsBuffSpell(spell_id); // non-buff spells don't cast on enter
+	bool          is_buff   = IsBuffSpell(spell_id); // non-buff spells don't cast on enter
 
 	for (auto &e : mob_list) {
 		auto mob = e.second;
@@ -74,13 +81,16 @@ void Aura::ProcessOnAllFriendlies(Mob *owner)
 			auto it = casted_on.find(mob->GetID());
 
 			if (it != casted_on.end()) { // we are already on the list, let's check for removal
-				if (DistanceSquared(GetPosition(), mob->GetPosition()) > distance)
+				if (DistanceSquared(GetPosition(), mob->GetPosition()) > distance) {
 					delayed_remove.insert(mob->GetID());
-			} else { // not on list, lets check if we're in range
+				}
+			}
+			else { // not on list, lets check if we're in range
 				if (DistanceSquared(GetPosition(), mob->GetPosition()) <= distance) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
+					}
 				}
 			}
 		}
@@ -88,30 +98,34 @@ void Aura::ProcessOnAllFriendlies(Mob *owner)
 
 	for (auto &e : delayed_remove) {
 		auto mob = entity_list.GetMob(e);
-		if (mob != nullptr && is_buff) // some auras cast instant spells so no need to remove
+		if (mob != nullptr && is_buff) { // some auras cast instant spells so no need to remove
 			mob->BuffFadeBySpellIDAndCaster(spell_id, GetID());
+		}
 		casted_on.erase(e);
 	}
 
 	// so if we have a cast timer and our set isn't empty and timer is disabled we need to enable it
-	if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty())
+	if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty()) {
 		cast_timer.Start();
+	}
 
-	if (!cast_timer.Enabled() || !cast_timer.Check())
+	if (!cast_timer.Enabled() || !cast_timer.Check()) {
 		return;
+	}
 
 	for (auto &e : casted_on) {
 		auto mob = entity_list.GetMob(e);
-		if (mob != nullptr)
+		if (mob != nullptr) {
 			SpellFinished(spell_id, mob);
+		}
 	}
 }
 
 void Aura::ProcessOnAllGroupMembers(Mob *owner)
 {
-	auto &mob_list = entity_list.GetMobList(); // read only reference so we can do it all inline
+	auto          &mob_list = entity_list.GetCloseMobList(this, distance);
 	std::set<int> delayed_remove;
-	bool is_buff = IsBuffSpell(spell_id); // non-buff spells don't cast on enter
+	bool          is_buff   = IsBuffSpell(spell_id); // non-buff spells don't cast on enter
 
 	if (owner->IsRaidGrouped() && owner->IsClient()) { // currently raids are just client, but safety check
 		auto raid = owner->GetRaid();
@@ -126,9 +140,12 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
 			auto idx = raid->GetPlayerIndex(c);
 			if (c->GetID() == m_owner) {
 				return DistanceSquared(GetPosition(), c->GetPosition()) <= distance;
-			} else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id || raid->members[idx].GroupNumber == 0xFFFFFFFF) {
+			}
+			else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
+					 raid->members[idx].GroupNumber == 0xFFFFFFFF) {
 				return false;
-			} else if (DistanceSquared(GetPosition(), c->GetPosition()) > distance) {
+			}
+			else if (DistanceSquared(GetPosition(), c->GetPosition()) > distance) {
 				return false;
 			}
 			return true;
@@ -138,9 +155,12 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
 			auto idx = raid->GetPlayerIndex(m->GetOwner()->CastToClient());
 			if (m->GetOwner()->GetID() == m_owner) {
 				return DistanceSquared(GetPosition(), m->GetPosition()) <= distance;
-			} else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id || raid->members[idx].GroupNumber == 0xFFFFFFFF) {
+			}
+			else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
+					 raid->members[idx].GroupNumber == 0xFFFFFFFF) {
 				return false;
-			} else if (DistanceSquared(GetPosition(), m->GetPosition()) > distance) {
+			}
+			else if (DistanceSquared(GetPosition(), m->GetPosition()) > distance) {
 				return false;
 			}
 			return true;
@@ -148,14 +168,18 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
 
 		auto verify_raid_client_swarm = [&raid, &group_id, this](NPC *n) {
 			auto owner = entity_list.GetMob(n->GetSwarmOwner());
-			if (owner == nullptr)
+			if (owner == nullptr) {
 				return false;
+			}
 			auto idx = raid->GetPlayerIndex(owner->CastToClient());
 			if (owner->GetID() == m_owner) {
 				return DistanceSquared(GetPosition(), n->GetPosition()) <= distance;
-			} else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id || raid->members[idx].GroupNumber == 0xFFFFFFFF) {
+			}
+			else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
+					 raid->members[idx].GroupNumber == 0xFFFFFFFF) {
 				return false;
-			} else if (DistanceSquared(GetPosition(), n->GetPosition()) > distance) {
+			}
+			else if (DistanceSquared(GetPosition(), n->GetPosition()) > distance) {
 				return false;
 			}
 			return true;
@@ -164,40 +188,52 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
 		for (auto &e : mob_list) {
 			auto mob = e.second;
 			// step 1: check if we're already managing this NPC's buff
-			auto it = casted_on.find(mob->GetID());
+			auto it  = casted_on.find(mob->GetID());
 			if (it != casted_on.end()) {
 				// verify still good!
 				if (mob->IsClient()) {
-					if (!verify_raid_client(mob->CastToClient()))
-						delayed_remove.insert(mob->GetID());
-				} else if (mob->IsPet() && mob->IsPetOwnerClient() && mob->GetOwner()) {
-					if (!verify_raid_client_pet(mob))
-						delayed_remove.insert(mob->GetID());
-				} else if (mob->IsNPC() && mob->IsPetOwnerClient()) {
-					auto npc = mob->CastToNPC();
-					if (!verify_raid_client_swarm(npc))
+					if (!verify_raid_client(mob->CastToClient())) {
 						delayed_remove.insert(mob->GetID());
+					}
 				}
-			} else { // we're not on it!
+				else if (mob->IsPet() && mob->IsPetOwnerClient() && mob->GetOwner()) {
+					if (!verify_raid_client_pet(mob)) {
+						delayed_remove.insert(mob->GetID());
+					}
+				}
+				else if (mob->IsNPC() && mob->IsPetOwnerClient()) {
+					auto npc = mob->CastToNPC();
+					if (!verify_raid_client_swarm(npc)) {
+						delayed_remove.insert(mob->GetID());
+					}
+				}
+			}
+			else { // we're not on it!
 				if (mob->IsClient() && verify_raid_client(mob->CastToClient())) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
-				} else if (mob->IsPet() && mob->IsPetOwnerClient() && mob->GetOwner() && verify_raid_client_pet(mob)) {
+					}
+				}
+				else if (mob->IsPet() && mob->IsPetOwnerClient() && mob->GetOwner() && verify_raid_client_pet(mob)) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
-				} else if (mob->IsNPC() && mob->IsPetOwnerClient()) {
+					}
+				}
+				else if (mob->IsNPC() && mob->IsPetOwnerClient()) {
 					auto npc = mob->CastToNPC();
 					if (verify_raid_client_swarm(npc)) {
 						casted_on.insert(mob->GetID());
-						if (is_buff)
+						if (is_buff) {
 							SpellFinished(spell_id, mob);
+						}
 					}
 				}
 			}
 		}
-	} else if (owner->IsGrouped()) {
+	}
+	else if (owner->IsGrouped()) {
 		auto group = owner->GetGroup();
 		if (group == nullptr) { // uh oh
 			owner->RemoveAura(GetID(), false, true);
@@ -207,107 +243,133 @@ void Aura::ProcessOnAllGroupMembers(Mob *owner)
 		// lambdas to make for loop less ugly
 		auto verify_group_pet = [&group, this](Mob *m) {
 			auto owner = m->GetOwner();
-			if (owner != nullptr && group->IsGroupMember(owner) && DistanceSquared(GetPosition(), m->GetPosition()) <= distance)
+			if (owner != nullptr && group->IsGroupMember(owner) &&
+				DistanceSquared(GetPosition(), m->GetPosition()) <= distance) {
 				return true;
+			}
 			return false;
 		};
 
 		auto verify_group_swarm = [&group, this](NPC *n) {
 			auto owner = entity_list.GetMob(n->GetSwarmOwner());
-			if (owner != nullptr && group->IsGroupMember(owner) && DistanceSquared(GetPosition(), n->GetPosition()) <= distance)
+			if (owner != nullptr && group->IsGroupMember(owner) &&
+				DistanceSquared(GetPosition(), n->GetPosition()) <= distance) {
 				return true;
+			}
 			return false;
 		};
 
 		for (auto &e : mob_list) {
 			auto mob = e.second;
-			auto it = casted_on.find(mob->GetID());
+			auto it  = casted_on.find(mob->GetID());
 
 			if (it != casted_on.end()) { // make sure we're still valid
 				if (mob->IsPet()) {
-					if (!verify_group_pet(mob))
+					if (!verify_group_pet(mob)) {
 						delayed_remove.insert(mob->GetID());
-				} else if (mob->IsNPC() && mob->CastToNPC()->GetSwarmInfo()) {
-					if (!verify_group_swarm(mob->CastToNPC()))
+					}
+				}
+				else if (mob->IsNPC() && mob->CastToNPC()->GetSwarmInfo()) {
+					if (!verify_group_swarm(mob->CastToNPC())) {
 						delayed_remove.insert(mob->GetID());
-				} else if (!group->IsGroupMember(mob) || DistanceSquared(GetPosition(), mob->GetPosition()) > distance) {
+					}
+				}
+				else if (!group->IsGroupMember(mob) || DistanceSquared(GetPosition(), mob->GetPosition()) > distance) {
 					delayed_remove.insert(mob->GetID());
 				}
-			} else { // not on, check if we should be!
+			}
+			else { // not on, check if we should be!
 				if (mob->IsPet() && verify_group_pet(mob)) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
-				} else if (mob->IsNPC() && mob->CastToNPC()->GetSwarmInfo() && verify_group_swarm(mob->CastToNPC())) {
+					}
+				}
+				else if (mob->IsNPC() && mob->CastToNPC()->GetSwarmInfo() && verify_group_swarm(mob->CastToNPC())) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
-				} else if (group->IsGroupMember(mob) && DistanceSquared(GetPosition(), mob->GetPosition()) <= distance) {
+					}
+				}
+				else if (group->IsGroupMember(mob) && DistanceSquared(GetPosition(), mob->GetPosition()) <= distance) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
+					}
 				}
 			}
 		}
-	} else {
-		auto verify_solo = [&owner, this](Mob *m) {
-			if (m->IsPet() && m->GetOwnerID() == owner->GetID())
+	}
+	else {
+		auto      verify_solo = [&owner, this](Mob *m) {
+			if (m->IsPet() && m->GetOwnerID() == owner->GetID()) {
 				return true;
-			else if (m->IsNPC() && m->CastToNPC()->GetSwarmOwner() == owner->GetID())
+			}
+			else if (m->IsNPC() && m->CastToNPC()->GetSwarmOwner() == owner->GetID()) {
 				return true;
-			else if (m->GetID() == owner->GetID())
+			}
+			else if (m->GetID() == owner->GetID()) {
 				return true;
-			else
+			}
+			else {
 				return false;
+			}
 		};
 		for (auto &e : mob_list) {
-			auto mob = e.second;
-			auto it = casted_on.find(mob->GetID());
+			auto mob  = e.second;
+			auto it   = casted_on.find(mob->GetID());
 			bool good = verify_solo(mob);
 
 			if (it != casted_on.end()) { // make sure still valid
 				if (!good || DistanceSquared(GetPosition(), mob->GetPosition()) > distance) {
 					delayed_remove.insert(mob->GetID());
 				}
-			} else if (good && DistanceSquared(GetPosition(), mob->GetPosition()) <= distance) {
+			}
+			else if (good && DistanceSquared(GetPosition(), mob->GetPosition()) <= distance) {
 				casted_on.insert(mob->GetID());
-				if (is_buff)
+				if (is_buff) {
 					SpellFinished(spell_id, mob);
+				}
 			}
 		}
 	}
 
 	for (auto &e : delayed_remove) {
 		auto mob = entity_list.GetMob(e);
-		if (mob != nullptr && is_buff) // some auras cast instant spells so no need to remove
+		if (mob != nullptr && is_buff) { // some auras cast instant spells so no need to remove
 			mob->BuffFadeBySpellIDAndCaster(spell_id, GetID());
+		}
 		casted_on.erase(e);
 	}
 
 	// so if we have a cast timer and our set isn't empty and timer is disabled we need to enable it
-	if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty())
+	if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty()) {
 		cast_timer.Start();
+	}
 
-	if (!cast_timer.Enabled() || !cast_timer.Check())
+	if (!cast_timer.Enabled() || !cast_timer.Check()) {
 		return;
+	}
 
 	// some auras have to recast (DRU for example, non-buff too)
 	for (auto &e : casted_on) {
 		auto mob = entity_list.GetMob(e);
-		if (mob != nullptr)
+		if (mob != nullptr) {
 			SpellFinished(spell_id, mob);
+		}
 	}
 }
 
 void Aura::ProcessOnGroupMembersPets(Mob *owner)
 {
-	auto &mob_list = entity_list.GetMobList(); // read only reference so we can do it all inline
+	auto          &mob_list    = entity_list.GetCloseMobList(this,distance);
 	std::set<int> delayed_remove;
-	bool is_buff = IsBuffSpell(spell_id); // non-buff spells don't cast on enter
+	bool          is_buff      = IsBuffSpell(spell_id); // non-buff spells don't cast on enter
 	// This type can either live on the pet (level 55/70 MAG aura) or on the pet owner (level 85 MAG aura)
-	auto group_member = owner->GetOwnerOrSelf();
+	auto          group_member = owner->GetOwnerOrSelf();
 
-	if (group_member->IsRaidGrouped() && group_member->IsClient()) { // currently raids are just client, but safety check
+	if (group_member->IsRaidGrouped() &&
+		group_member->IsClient()) { // currently raids are just client, but safety check
 		auto raid = group_member->GetRaid();
 		if (raid == nullptr) { // well shit
 			owner->RemoveAura(GetID(), false, true);
@@ -320,9 +382,12 @@ void Aura::ProcessOnGroupMembersPets(Mob *owner)
 			auto idx = raid->GetPlayerIndex(m->GetOwner()->CastToClient());
 			if (m->GetOwner()->GetID() == group_member->GetID()) {
 				return DistanceSquared(GetPosition(), m->GetPosition()) <= distance;
-			} else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id || raid->members[idx].GroupNumber == 0xFFFFFFFF) {
+			}
+			else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
+					 raid->members[idx].GroupNumber == 0xFFFFFFFF) {
 				return false;
-			} else if (DistanceSquared(GetPosition(), m->GetPosition()) > distance) {
+			}
+			else if (DistanceSquared(GetPosition(), m->GetPosition()) > distance) {
 				return false;
 			}
 			return true;
@@ -330,14 +395,18 @@ void Aura::ProcessOnGroupMembersPets(Mob *owner)
 
 		auto verify_raid_client_swarm = [&raid, &group_id, &group_member, this](NPC *n) {
 			auto owner = entity_list.GetMob(n->GetSwarmOwner());
-			if (owner == nullptr)
+			if (owner == nullptr) {
 				return false;
+			}
 			auto idx = raid->GetPlayerIndex(owner->CastToClient());
 			if (owner->GetID() == group_member->GetID()) {
 				return DistanceSquared(GetPosition(), n->GetPosition()) <= distance;
-			} else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id || raid->members[idx].GroupNumber == 0xFFFFFFFF) {
+			}
+			else if (idx == 0xFFFFFFFF || raid->members[idx].GroupNumber != group_id ||
+					 raid->members[idx].GroupNumber == 0xFFFFFFFF) {
 				return false;
-			} else if (DistanceSquared(GetPosition(), n->GetPosition()) > distance) {
+			}
+			else if (DistanceSquared(GetPosition(), n->GetPosition()) > distance) {
 				return false;
 			}
 			return true;
@@ -346,35 +415,44 @@ void Aura::ProcessOnGroupMembersPets(Mob *owner)
 		for (auto &e : mob_list) {
 			auto mob = e.second;
 			// step 1: check if we're already managing this NPC's buff
-			auto it = casted_on.find(mob->GetID());
+			auto it  = casted_on.find(mob->GetID());
 			if (it != casted_on.end()) {
 				// verify still good!
 				if (mob->IsPet() && mob->IsPetOwnerClient() && mob->GetOwner()) {
-					if (!verify_raid_client_pet(mob))
-						delayed_remove.insert(mob->GetID());
-				} else if (mob->IsNPC() && mob->IsPetOwnerClient()) {
-					auto npc = mob->CastToNPC();
-					if (!verify_raid_client_swarm(npc))
+					if (!verify_raid_client_pet(mob)) {
 						delayed_remove.insert(mob->GetID());
+					}
 				}
-			} else { // we're not on it!
+				else if (mob->IsNPC() && mob->IsPetOwnerClient()) {
+					auto npc = mob->CastToNPC();
+					if (!verify_raid_client_swarm(npc)) {
+						delayed_remove.insert(mob->GetID());
+					}
+				}
+			}
+			else { // we're not on it!
 				if (mob->IsClient()) {
 					continue; // never hit client
-				} else if (mob->IsPet() && mob->IsPetOwnerClient() && mob->GetOwner() && verify_raid_client_pet(mob)) {
+				}
+				else if (mob->IsPet() && mob->IsPetOwnerClient() && mob->GetOwner() && verify_raid_client_pet(mob)) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
-				} else if (mob->IsNPC() && mob->IsPetOwnerClient()) {
+					}
+				}
+				else if (mob->IsNPC() && mob->IsPetOwnerClient()) {
 					auto npc = mob->CastToNPC();
 					if (verify_raid_client_swarm(npc)) {
 						casted_on.insert(mob->GetID());
-						if (is_buff)
+						if (is_buff) {
 							SpellFinished(spell_id, mob);
+						}
 					}
 				}
 			}
 		}
-	} else if (group_member->IsGrouped()) {
+	}
+	else if (group_member->IsGrouped()) {
 		auto group = group_member->GetGroup();
 		if (group == nullptr) { // uh oh
 			owner->RemoveAura(GetID(), false, true);
@@ -384,111 +462,131 @@ void Aura::ProcessOnGroupMembersPets(Mob *owner)
 		// lambdas to make for loop less ugly
 		auto verify_group_pet = [&group, this](Mob *m) {
 			auto owner = m->GetOwner();
-			if (owner != nullptr && group->IsGroupMember(owner) && DistanceSquared(GetPosition(), m->GetPosition()) <= distance)
-				return true;
-			return false;
+			return owner != nullptr && group->IsGroupMember(owner) &&
+				   DistanceSquared(GetPosition(), m->GetPosition()) <= distance;
 		};
 
 		auto verify_group_swarm = [&group, this](NPC *n) {
 			auto owner = entity_list.GetMob(n->GetSwarmOwner());
-			if (owner != nullptr && group->IsGroupMember(owner) && DistanceSquared(GetPosition(), n->GetPosition()) <= distance)
-				return true;
-			return false;
+			return owner != nullptr && group->IsGroupMember(owner) &&
+				   DistanceSquared(GetPosition(), n->GetPosition()) <= distance;
 		};
 
 		for (auto &e : mob_list) {
 			auto mob = e.second;
-			auto it = casted_on.find(mob->GetID());
+			auto it  = casted_on.find(mob->GetID());
 
 			if (it != casted_on.end()) { // make sure we're still valid
 				if (mob->IsPet()) {
-					if (!verify_group_pet(mob))
-						delayed_remove.insert(mob->GetID());
-				} else if (mob->IsNPC() && mob->CastToNPC()->GetSwarmInfo()) {
-					if (!verify_group_swarm(mob->CastToNPC()))
+					if (!verify_group_pet(mob)) {
 						delayed_remove.insert(mob->GetID());
+					}
 				}
-			} else { // not on, check if we should be!
+				else if (mob->IsNPC() && mob->CastToNPC()->GetSwarmInfo()) {
+					if (!verify_group_swarm(mob->CastToNPC())) {
+						delayed_remove.insert(mob->GetID());
+					}
+				}
+			}
+			else { // not on, check if we should be!
 				if (mob->IsClient()) {
 					continue;
-				} else if (mob->IsPet() && verify_group_pet(mob)) {
+				}
+				else if (mob->IsPet() && verify_group_pet(mob)) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
-				} else if (mob->IsNPC() && mob->CastToNPC()->GetSwarmInfo() && verify_group_swarm(mob->CastToNPC())) {
+					}
+				}
+				else if (mob->IsNPC() && mob->CastToNPC()->GetSwarmInfo() && verify_group_swarm(mob->CastToNPC())) {
 					casted_on.insert(mob->GetID());
-					if (is_buff)
+					if (is_buff) {
 						SpellFinished(spell_id, mob);
+					}
 				}
 			}
 		}
-	} else {
-		auto verify_solo = [&group_member, this](Mob *m) {
-			if (m->IsPet() && m->GetOwnerID() == group_member->GetID())
+	}
+	else {
+		auto      verify_solo = [&group_member, this](Mob *m) {
+			if (m->IsPet() && m->GetOwnerID() == group_member->GetID()) {
 				return true;
-			else if (m->IsNPC() && m->CastToNPC()->GetSwarmOwner() == group_member->GetID())
+			}
+			else if (m->IsNPC() && m->CastToNPC()->GetSwarmOwner() == group_member->GetID()) {
 				return true;
-			else
+			}
+			else {
 				return false;
+			}
 		};
 		for (auto &e : mob_list) {
-			auto mob = e.second;
-			auto it = casted_on.find(mob->GetID());
+			auto mob  = e.second;
+			auto it   = casted_on.find(mob->GetID());
 			bool good = verify_solo(mob);
 
 			if (it != casted_on.end()) { // make sure still valid
 				if (!good || DistanceSquared(GetPosition(), mob->GetPosition()) > distance) {
 					delayed_remove.insert(mob->GetID());
 				}
-			} else if (good && DistanceSquared(GetPosition(), mob->GetPosition()) <= distance) {
+			}
+			else if (good && DistanceSquared(GetPosition(), mob->GetPosition()) <= distance) {
 				casted_on.insert(mob->GetID());
-				if (is_buff)
+				if (is_buff) {
 					SpellFinished(spell_id, mob);
+				}
 			}
 		}
 	}
 
 	for (auto &e : delayed_remove) {
 		auto mob = entity_list.GetMob(e);
-		if (mob != nullptr && is_buff) // some auras cast instant spells so no need to remove
+		if (mob != nullptr && is_buff) { // some auras cast instant spells so no need to remove
 			mob->BuffFadeBySpellIDAndCaster(spell_id, GetID());
+		}
 		casted_on.erase(e);
 	}
 
 	// so if we have a cast timer and our set isn't empty and timer is disabled we need to enable it
-	if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty())
+	if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty()) {
 		cast_timer.Start();
+	}
 
-	if (!cast_timer.Enabled() || !cast_timer.Check())
+	if (!cast_timer.Enabled() || !cast_timer.Check()) {
 		return;
+	}
 
 	// some auras have to recast (DRU for example, non-buff too)
 	for (auto &e : casted_on) {
 		auto mob = entity_list.GetMob(e);
-		if (mob != nullptr)
+		if (mob != nullptr) {
 			SpellFinished(spell_id, mob);
+		}
 	}
 }
 
 void Aura::ProcessTotem(Mob *owner)
 {
-	auto &mob_list = entity_list.GetMobList(); // read only reference so we can do it all inline
+	auto          &mob_list = entity_list.GetCloseMobList(this, distance);
 	std::set<int> delayed_remove;
-	bool is_buff = IsBuffSpell(spell_id); // non-buff spells don't cast on enter
+	bool          is_buff   = IsBuffSpell(spell_id); // non-buff spells don't cast on enter
 
 	for (auto &e : mob_list) {
 		auto mob = e.second;
-		if (mob == this)
+		if (mob == this) {
 			continue;
-		if (mob == owner)
+		}
+		if (mob == owner) {
 			continue;
+		}
 		if (owner->IsAttackAllowed(mob)) { // might need more checks ...
 			bool in_range = DistanceSquared(GetPosition(), mob->GetPosition()) <= distance;
-			auto it = casted_on.find(mob->GetID());
+			auto it       = casted_on.find(mob->GetID());
 			if (it != casted_on.end()) {
-				if (!in_range)
+				if (!in_range) {
 					delayed_remove.insert(mob->GetID());
-			} else if (in_range) {
+				}
+			}
+			else if (in_range) {
 				casted_on.insert(mob->GetID());
 				SpellFinished(spell_id, mob);
 			}
@@ -497,33 +595,38 @@ void Aura::ProcessTotem(Mob *owner)
 
 	for (auto &e : delayed_remove) {
 		auto mob = entity_list.GetMob(e);
-		if (mob != nullptr && is_buff) // some auras cast instant spells so no need to remove
+		if (mob != nullptr && is_buff) { // some auras cast instant spells so no need to remove
 			mob->BuffFadeBySpellIDAndCaster(spell_id, GetID());
+		}
 		casted_on.erase(e);
 	}
 
 	// so if we have a cast timer and our set isn't empty and timer is disabled we need to enable it
-	if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty())
+	if (cast_timer.GetDuration() > 0 && !cast_timer.Enabled() && !casted_on.empty()) {
 		cast_timer.Start();
+	}
 
-	if (!cast_timer.Enabled() || !cast_timer.Check())
+	if (!cast_timer.Enabled() || !cast_timer.Check()) {
 		return;
+	}
 
 	for (auto &e : casted_on) {
 		auto mob = entity_list.GetMob(e);
-		if (mob != nullptr)
+		if (mob != nullptr) {
 			SpellFinished(spell_id, mob);
+		}
 	}
 }
 
 void Aura::ProcessEnterTrap(Mob *owner)
 {
-	auto &mob_list = entity_list.GetMobList(); // read only reference so we can do it all inline
+	auto &mob_list = entity_list.GetCloseMobList(this, distance);
 
 	for (auto &e : mob_list) {
 		auto mob = e.second;
-		if (mob == this)
+		if (mob == this) {
 			continue;
+		}
 		// might need more checks ...
 		if (owner->IsAttackAllowed(mob) && DistanceSquared(GetPosition(), mob->GetPosition()) <= distance) {
 			SpellFinished(spell_id, mob);
@@ -535,23 +638,25 @@ void Aura::ProcessEnterTrap(Mob *owner)
 
 void Aura::ProcessExitTrap(Mob *owner)
 {
-	auto &mob_list = entity_list.GetMobList(); // read only reference so we can do it all inline
+	auto &mob_list = entity_list.GetCloseMobList(this, distance);
 
 	for (auto &e : mob_list) {
 		auto mob = e.second;
-		if (mob == this)
+		if (mob == this) {
 			continue;
+		}
 		// might need more checks ...
 		if (owner->IsAttackAllowed(mob)) {
 			bool in_range = DistanceSquared(GetPosition(), mob->GetPosition()) <= distance;
-			auto it = casted_on.find(mob->GetID());
+			auto it       = casted_on.find(mob->GetID());
 			if (it != casted_on.end()) {
 				if (!in_range) {
 					SpellFinished(spell_id, mob);
 					owner->RemoveAura(GetID(), false); // if we're a buff we don't want to strip :P
 					break;
 				}
-			} else if (in_range) {
+			}
+			else if (in_range) {
 				casted_on.insert(mob->GetID());
 			}
 		}
@@ -562,9 +667,14 @@ void Aura::ProcessExitTrap(Mob *owner)
 // and hard to reason about
 void Aura::ProcessSpawns()
 {
-	const auto &clients = entity_list.GetClientList();
-	for (auto &e : clients) {
-		auto c = e.second;
+	const auto &clients = entity_list.GetCloseMobList(this, distance);
+	for (auto  &e : clients) {
+		if (!e.second->IsClient()) {
+			continue;
+		}
+
+		auto c = e.second->CastToClient();
+
 		bool spawned = spawned_for.find(c->GetID()) != spawned_for.end();
 		if (ShouldISpawnFor(c)) {
 			if (!spawned) {
@@ -574,21 +684,22 @@ void Aura::ProcessSpawns()
 				SendArmorAppearance(c);
 				spawned_for.insert(c->GetID());
 			}
-		} else if (spawned) {
+		}
+		else if (spawned) {
 			EQApplicationPacket app;
 			CreateDespawnPacket(&app, false);
 			c->QueuePacket(&app);
 			spawned_for.erase(c->GetID());
 		}
 	}
-	return;
 }
 
 bool Aura::Process()
 {
 	// Aura::Depop clears buffs
-	if (p_depop)
+	if (p_depop) {
 		return false;
+	}
 
 	auto owner = entity_list.GetMob(m_owner);
 	if (owner == nullptr) {
@@ -604,7 +715,7 @@ bool Aura::Process()
 	if (movement_type == AuraMovement::Follow && GetPosition() != owner->GetPosition() && movement_timer.Check()) {
 		m_Position = owner->GetPosition();
 		auto app = new EQApplicationPacket(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct));
-		auto spu = (PlayerPositionUpdateServer_Struct*)app->pBuffer;
+		auto spu = (PlayerPositionUpdateServer_Struct *) app->pBuffer;
 		MakeSpawnUpdate(spu);
 		auto it = spawned_for.begin();
 		while (it != spawned_for.end()) {
@@ -612,7 +723,8 @@ bool Aura::Process()
 			if (client) {
 				client->QueuePacket(app);
 				++it;
-			} else {
+			}
+			else {
 				it = spawned_for.erase(it);
 			}
 		}
@@ -620,14 +732,17 @@ bool Aura::Process()
 	}
 	// TODO: waypoints?
 
-	if (!process_timer.Check())
+	if (!process_timer.Check()) {
 		return true;
+	}
 
-	if (spawn_type != AuraSpawns::Noone)
-		ProcessSpawns(); // bit of a hack
+	if (spawn_type != AuraSpawns::Noone) {
+		ProcessSpawns();
+	} // bit of a hack
 
-	if (process_func)
+	if (process_func) {
 		process_func(*this, owner);
+	}
 
 	// TODO: quest calls
 	return true;
@@ -635,49 +750,61 @@ bool Aura::Process()
 
 bool Aura::ShouldISpawnFor(Client *c)
 {
-	if (spawn_type == AuraSpawns::Noone)
+	if (spawn_type == AuraSpawns::Noone) {
 		return false;
+	}
 
-	if (spawn_type == AuraSpawns::Everyone)
+	if (spawn_type == AuraSpawns::Everyone) {
 		return true;
+	}
 
 	// hey, it's our owner!
-	if (c->GetID() == m_owner)
+	if (c->GetID() == m_owner) {
 		return true;
+	}
 
 	// so this one is a bit trickier
 	auto owner = GetOwner();
-	if (owner == nullptr)
-		return false; // hmm
+	if (owner == nullptr) {
+		return false;
+	} // hmm
 
 	owner = owner->GetOwnerOrSelf(); // pet auras we need the pet's owner
-	if (owner == nullptr) // shouldn't really be needed
+	if (owner == nullptr) { // shouldn't really be needed
 		return false;
+	}
 
 	// gotta check again for pet aura case -.-
-	if (owner == c)
+	if (owner == c) {
 		return true;
+	}
 
 	if (owner->IsRaidGrouped() && owner->IsClient()) {
 		auto raid = owner->GetRaid();
-		if (raid == nullptr)
-			return false; // hmm
-		auto group_id = raid->GetGroup(owner->CastToClient());
-		if (group_id == 0xFFFFFFFF) // owner handled above, and they're in a raid and groupless
+		if (raid == nullptr) {
 			return false;
+		} // hmm
+		auto group_id = raid->GetGroup(owner->CastToClient());
+		if (group_id == 0xFFFFFFFF) { // owner handled above, and they're in a raid and groupless
+			return false;
+		}
 
 		auto idx = raid->GetPlayerIndex(c);
-		if (idx == 0xFFFFFFFF) // they're not in our raid!
+		if (idx == 0xFFFFFFFF) { // they're not in our raid!
 			return false;
+		}
 
-		if (raid->members[idx].GroupNumber != group_id) // in our raid, but not our group
+		if (raid->members[idx].GroupNumber != group_id) { // in our raid, but not our group
 			return false;
+		}
 
 		return true; // we got here so we know that 1 they're in our raid and 2 they're in our group!
-	} else if (owner->IsGrouped()) {
+	}
+	else if (owner->IsGrouped()) {
 		auto group = owner->GetGroup();
-		if (group == nullptr)
-			return false; // hmm
+		if (group == nullptr) {
+			return false;
+		} // hmm
 
 		// easy, in our group
 		return group->IsGroupMember(c);
@@ -693,32 +820,33 @@ void Aura::Depop(bool skip_strip)
 	if (!skip_strip && IsBuffSpell(spell_id)) {
 		for (auto &e : casted_on) {
 			auto mob = entity_list.GetMob(e);
-			if (mob != nullptr)
+			if (mob != nullptr) {
 				mob->BuffFadeBySpellIDAndCaster(spell_id, GetID());
+			}
 		}
 	}
 	casted_on.clear();
 	p_depop = true;
 }
 
-// This creates an aura from a casted spell
 void Mob::MakeAura(uint16 spell_id)
 {
 	// TODO: verify room in AuraMgr
-	if (!IsValidSpell(spell_id))
+	if (!IsValidSpell(spell_id)) {
 		return;
+	}
 
-	AuraRecord record;
+	AuraRecord record{};
 	if (!database.GetAuraEntry(spell_id, record)) {
-		Message(13, "Unable to find data for aura %s", spells[spell_id].name);
-		Log(Logs::General, Logs::Error, "Unable to find data for aura %d, check auras table.", spell_id);
+		Message(Chat::Red, "Unable to find data for aura %s", spells[spell_id].name);
+		LogError("Unable to find data for aura [{}], check auras table", spell_id);
 		return;
 	}
 
 	if (!IsValidSpell(record.spell_id)) {
-		Message(13, "Casted spell (%d) is not valid for aura %s", record.spell_id, spells[spell_id].name);
-		Log(Logs::General, Logs::Error, "Casted spell (%d) is not valid for aura %d, check auras table.",
-		    record.spell_id, spell_id);
+		Message(Chat::Red, "Casted spell (%d) is not valid for aura %s", record.spell_id, spells[spell_id].name);
+		LogError("Casted spell ([{}]) is not valid for aura [{}], check auras table",
+				 record.spell_id, spell_id);
 		return;
 	}
 
@@ -729,25 +857,28 @@ void Mob::MakeAura(uint16 spell_id)
 	bool trap = false;
 
 	switch (static_cast<AuraType>(record.aura_type)) {
-	case AuraType::ExitTrap:
-	case AuraType::EnterTrap:
-	case AuraType::Totem:
-		trap = true;
-		break;
-	default:
-		trap = false;
-		break;
+		case AuraType::ExitTrap:
+		case AuraType::EnterTrap:
+		case AuraType::Totem:
+			trap = true;
+			break;
+		default:
+			trap = false;
+			break;
 	}
 
-	if (!CanSpawnAura(trap))
+	if (!CanSpawnAura(trap)) {
 		return;
+	}
 
 	const auto base = database.LoadNPCTypesData(record.npc_type);
 	if (base == nullptr) {
-		Message(13, "Unable to load NPC data for aura %s", spells[spell_id].teleport_zone);
-		Log(Logs::General, Logs::Error,
-		    "Unable to load NPC data for aura %s (NPC ID %d), check auras and npc_types tables.",
-		    spells[spell_id].teleport_zone, record.npc_type);
+		Message(Chat::Red, "Unable to load NPC data for aura %s", spells[spell_id].teleport_zone);
+		LogError(
+			"Unable to load NPC data for aura [{}] (NPC ID [{}]), check auras and npc_types tables",
+			spells[spell_id].teleport_zone,
+			record.npc_type
+		);
 		return;
 	}
 
@@ -758,65 +889,82 @@ void Mob::MakeAura(uint16 spell_id)
 
 	auto npc = new Aura(npc_type, this, record);
 	npc->SetAuraID(spell_id);
-	if (trap)
-		npc->TryMoveAlong(5.0f, 0.0f, false); // try to place 5 units in front
+	if (trap) {
+		npc->TryMoveAlong(5.0f, 0.0f, false);
+	} // try to place 5 units in front
 	entity_list.AddNPC(npc, false);
 
-	if (trap)
+	if (trap) {
 		AddTrap(npc, record);
-	else
+	}
+	else {
 		AddAura(npc, record);
+	}
 }
 
 bool ZoneDatabase::GetAuraEntry(uint16 spell_id, AuraRecord &record)
 {
-	auto query = StringFormat("SELECT npc_type, name, spell_id, distance, aura_type, spawn_type, movement, "
-				  "duration, icon, cast_time FROM auras WHERE type='%d'",
-				  spell_id);
+	auto query = StringFormat(
+		"SELECT npc_type, name, spell_id, distance, aura_type, spawn_type, movement, "
+		"duration, icon, cast_time FROM auras WHERE type='%d'",
+		spell_id
+	);
 
 	auto results = QueryDatabase(query);
-	if (!results.Success())
+	if (!results.Success()) {
 		return false;
+	}
 
-	if (results.RowCount() != 1)
+	if (results.RowCount() != 1) {
 		return false;
+	}
 
 	auto row = results.begin();
 
 	record.npc_type = atoi(row[0]);
 	strn0cpy(record.name, row[1], 64);
-	record.spell_id = atoi(row[2]);
-	record.distance = atoi(row[3]);
+	record.spell_id   = atoi(row[2]);
+	record.distance   = atoi(row[3]);
 	record.distance *= record.distance; // so we can avoid sqrt
-	record.aura_type = atoi(row[4]);
+	record.aura_type  = atoi(row[4]);
 	record.spawn_type = atoi(row[5]);
-	record.movement = atoi(row[6]);
-	record.duration = atoi(row[7]) * 1000; // DB is in seconds
-	record.icon = atoi(row[8]);
-	record.cast_time = atoi(row[9]) * 1000; // DB is in seconds
+	record.movement   = atoi(row[6]);
+	record.duration   = atoi(row[7]) * 1000; // DB is in seconds
+	record.icon       = atoi(row[8]);
+	record.cast_time  = atoi(row[9]) * 1000; // DB is in seconds
 
 	return true;
 }
 
 void Mob::AddAura(Aura *aura, AuraRecord &record)
 {
+	LogAura(
+		"[AddAura] aura owner [{}] spawn_id [{}] aura_name [{}]",
+		GetCleanName(),
+		aura->GetID(),
+		aura->GetCleanName()
+	);
+
 	// this is called only when it's safe
 	assert(aura != nullptr);
 	strn0cpy(aura_mgr.auras[aura_mgr.count].name, aura->GetCleanName(), 64);
 	aura_mgr.auras[aura_mgr.count].spawn_id = aura->GetID();
-	aura_mgr.auras[aura_mgr.count].aura = aura;
-	if (record.icon == -1)
+	aura_mgr.auras[aura_mgr.count].aura     = aura;
+	if (record.icon == -1) {
 		aura_mgr.auras[aura_mgr.count].icon = spells[record.spell_id].new_icon;
-	else
+	}
+	else {
 		aura_mgr.auras[aura_mgr.count].icon = record.icon;
+	}
+
 	if (IsClient()) {
-		auto outapp = new EQApplicationPacket(OP_UpdateAura, sizeof(AuraCreate_Struct));
-		auto aura_create = (AuraCreate_Struct *)outapp->pBuffer;
+		auto outapp      = new EQApplicationPacket(OP_UpdateAura, sizeof(AuraCreate_Struct));
+		auto aura_create = (AuraCreate_Struct *) outapp->pBuffer;
 		aura_create->action = 0;
-		aura_create->type = 1; // this can be 0 sometimes too
+		aura_create->type   = 1; // this can be 0 sometimes too
 		strn0cpy(aura_create->aura_name, aura_mgr.auras[aura_mgr.count].name, 64);
 		aura_create->entity_id = aura_mgr.auras[aura_mgr.count].spawn_id;
-		aura_create->icon = aura_mgr.auras[aura_mgr.count].icon;
+		aura_create->icon      = aura_mgr.auras[aura_mgr.count].icon;
 		CastToClient()->FastQueuePacket(&outapp);
 	}
 	// we can increment this now
@@ -825,15 +973,24 @@ void Mob::AddAura(Aura *aura, AuraRecord &record)
 
 void Mob::AddTrap(Aura *aura, AuraRecord &record)
 {
+	LogAura(
+		"[AddTrap] aura owner [{}] spawn_id [{}] aura_name [{}]",
+		GetCleanName(),
+		aura->GetID(),
+		aura->GetCleanName()
+	);
+
 	// this is called only when it's safe
 	assert(aura != nullptr);
 	strn0cpy(trap_mgr.auras[trap_mgr.count].name, aura->GetCleanName(), 64);
 	trap_mgr.auras[trap_mgr.count].spawn_id = aura->GetID();
-	trap_mgr.auras[trap_mgr.count].aura = aura;
-	if (record.icon == -1)
+	trap_mgr.auras[trap_mgr.count].aura     = aura;
+	if (record.icon == -1) {
 		trap_mgr.auras[trap_mgr.count].icon = spells[record.spell_id].new_icon;
-	else
+	}
+	else {
 		trap_mgr.auras[trap_mgr.count].icon = record.icon;
+	}
 	// doesn't send to client
 	trap_mgr.count++;
 }
@@ -841,10 +998,11 @@ void Mob::AddTrap(Aura *aura, AuraRecord &record)
 bool Mob::CanSpawnAura(bool trap)
 {
 	if (trap && !HasFreeTrapSlots()) {
-		Message_StringID(MT_SpellFailure, NO_MORE_TRAPS);
+		MessageString(Chat::SpellFailure, NO_MORE_TRAPS);
 		return false;
-	} else if (!trap && !HasFreeAuraSlots()) {
-		Message_StringID(MT_SpellFailure, NO_MORE_AURAS);
+	}
+	else if (!trap && !HasFreeAuraSlots()) {
+		MessageString(Chat::SpellFailure, NO_MORE_AURAS);
 		return false;
 	}
 
@@ -863,8 +1021,16 @@ void Mob::RemoveAllAuras()
 	// this is sent on camp/zone, so it just despawns?
 	if (aura_mgr.count) {
 		for (auto &e : aura_mgr.auras) {
-			if (e.aura)
+			if (e.aura) {
+				LogAura(
+					"[RemoveAllAuras] aura owner [{}] spawn_id [{}] aura_name [{}]",
+					GetCleanName(),
+					e.spawn_id,
+					e.name
+				);
+
 				e.aura->Depop();
+			}
 		}
 	}
 
@@ -872,14 +1038,20 @@ void Mob::RemoveAllAuras()
 
 	if (trap_mgr.count) {
 		for (auto &e : trap_mgr.auras) {
-			if (e.aura)
+			if (e.aura) {
+				LogAura(
+					"[RemoveAllAuras] trap owner [{}] spawn_id [{}] aura_name [{}]",
+					GetCleanName(),
+					e.spawn_id,
+					e.name
+				);
+
 				e.aura->Depop();
+			}
 		}
 	}
 
 	trap_mgr.count = 0;
-
-	return;
 }
 
 void Mob::RemoveAura(int spawn_id, bool skip_strip, bool expired)
@@ -887,24 +1059,36 @@ void Mob::RemoveAura(int spawn_id, bool skip_strip, bool expired)
 	for (int i = 0; i < aura_mgr.count; ++i) {
 		auto &aura = aura_mgr.auras[i];
 		if (aura.spawn_id == spawn_id) {
-			if (aura.aura)
+			LogAura(
+				"[RemoveAura] mob [{}] spawn_id [{}] skip_strip [{}] expired [{}]",
+				GetCleanName(),
+				spawn_id,
+				skip_strip ? "true" : "false",
+				expired ? "true" : "false"
+			);
+
+			if (aura.aura) {
 				aura.aura->Depop(skip_strip);
+			}
 			if (expired && IsClient()) {
+				// TODO: verify color
 				CastToClient()->SendColoredText(
-				    CC_Yellow, StringFormat("%s has expired.", aura.name)); // TODO: verify color
+					Chat::Yellow,
+					StringFormat("%s has expired.", aura.name)
+				);
 				// need to update client UI too
 				auto app = new EQApplicationPacket(OP_UpdateAura, sizeof(AuraDestory_Struct));
-				auto ads = (AuraDestory_Struct *)app->pBuffer;
-				ads->action = 1; // delete
+				auto ads = (AuraDestory_Struct *) app->pBuffer;
+				ads->action    = 1; // delete
 				ads->entity_id = spawn_id;
 				CastToClient()->QueuePacket(app);
 				safe_delete(app);
 			}
 			while (aura_mgr.count - 1 > i) {
 				i++;
-				aura.spawn_id = aura_mgr.auras[i].spawn_id;
-				aura.icon = aura_mgr.auras[i].icon;
-				aura.aura = aura_mgr.auras[i].aura;
+				aura.spawn_id          = aura_mgr.auras[i].spawn_id;
+				aura.icon              = aura_mgr.auras[i].icon;
+				aura.aura              = aura_mgr.auras[i].aura;
 				aura_mgr.auras[i].aura = nullptr;
 				strn0cpy(aura.name, aura_mgr.auras[i].name, 64);
 			}
@@ -916,16 +1100,18 @@ void Mob::RemoveAura(int spawn_id, bool skip_strip, bool expired)
 	for (int i = 0; i < trap_mgr.count; ++i) {
 		auto &aura = trap_mgr.auras[i];
 		if (aura.spawn_id == spawn_id) {
-			if (aura.aura)
+			if (aura.aura) {
 				aura.aura->Depop(skip_strip);
-			if (expired && IsClient())
+			}
+			if (expired && IsClient()) {
 				CastToClient()->SendColoredText(
-				    CC_Yellow, StringFormat("%s has expired.", aura.name)); // TODO: verify color
+					Chat::Yellow, StringFormat("%s has expired.", aura.name));
+			} // TODO: verify color
 			while (trap_mgr.count - 1 > i) {
 				i++;
-				aura.spawn_id = trap_mgr.auras[i].spawn_id;
-				aura.icon = trap_mgr.auras[i].icon;
-				aura.aura = trap_mgr.auras[i].aura;
+				aura.spawn_id          = trap_mgr.auras[i].spawn_id;
+				aura.icon              = trap_mgr.auras[i].icon;
+				aura.aura              = trap_mgr.auras[i].aura;
 				trap_mgr.auras[i].aura = nullptr;
 				strn0cpy(aura.name, trap_mgr.auras[i].name, 64);
 			}
@@ -934,6 +1120,5 @@ void Mob::RemoveAura(int spawn_id, bool skip_strip, bool expired)
 		}
 	}
 
-	return;
 }
 
diff --git a/zone/aura.h b/zone/aura.h
index ff4f2d51c..ae4cd0a4a 100644
--- a/zone/aura.h
+++ b/zone/aura.h
@@ -73,7 +73,7 @@ private:
 	int m_owner;
 	int aura_id; // spell ID of the aura spell -1 if aura isn't from a casted spell
 	int spell_id; // spell we cast
-	int distance; // distance we remove
+	float distance; // distance we remove
 	Timer remove_timer; // when we depop
 	Timer process_timer; // rate limit process calls
 	Timer cast_timer; // some auras pulse
diff --git a/zone/bonuses.cpp b/zone/bonuses.cpp
index 9b7354190..ad314d214 100644
--- a/zone/bonuses.cpp
+++ b/zone/bonuses.cpp
@@ -663,7 +663,7 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon)
 		    effect == SE_StackingCommand_Overwrite)
 			continue;
 
-		Log(Logs::Detail, Logs::AA, "Applying Effect %d from AA %u in slot %d (base1: %d, base2: %d) on %s",
+		LogAA("Applying Effect [{}] from AA [{}] in slot [{}] (base1: [{}], base2: [{}]) on [{}]",
 			effect, rank.id, slot, base1, base2, GetCleanName());
 
 		uint8 focus = IsFocusEffect(0, 0, true, effect);
@@ -1205,8 +1205,12 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon)
 			break;
 		}
 
-		case SE_CastingLevel2:
 		case SE_CastingLevel: {
+			newbon->adjusted_casting_skill += base1;
+			break;
+		}
+
+		case SE_CastingLevel2: {
 			newbon->effective_casting_level += base1;
 			break;
 		}
@@ -1533,7 +1537,7 @@ void Mob::ApplyAABonuses(const AA::Rank &rank, StatBonuses *newbon)
 			break;
 
 		default:
-			Log(Logs::Detail, Logs::AA, "SPA %d not accounted for in AA %s (%d)", effect, rank.base_ability->name.c_str(), rank.id);
+			LogAA("SPA [{}] not accounted for in AA [{}] ([{}])", effect, rank.base_ability->name.c_str(), rank.id);
 			break;
 		}
 
@@ -1914,8 +1918,13 @@ void Mob::ApplySpellsBonuses(uint16 spell_id, uint8 casterlevel, StatBonuses *ne
 				break;
 			}
 
-			case SE_CastingLevel2:
 			case SE_CastingLevel:	// Brilliance of Ro
+			{
+				new_bonus->adjusted_casting_skill += effect_value;
+				break;
+			}
+
+			case SE_CastingLevel2:
 			{
 				new_bonus->effective_casting_level += effect_value;
 				break;
@@ -3850,8 +3859,13 @@ void Mob::NegateSpellsBonuses(uint16 spell_id)
 					aabonuses.Corrup = effect_value;
 					break;
 
-				case SE_CastingLevel2:
 				case SE_CastingLevel:	// Brilliance of Ro
+					spellbonuses.adjusted_casting_skill = effect_value;
+					aabonuses.adjusted_casting_skill = effect_value;
+					itembonuses.adjusted_casting_skill = effect_value;
+					break;
+
+				case SE_CastingLevel2:
 					spellbonuses.effective_casting_level = effect_value;
 					aabonuses.effective_casting_level = effect_value;
 					itembonuses.effective_casting_level = effect_value;
diff --git a/zone/bot.cpp b/zone/bot.cpp
index b47694103..5579b4bc5 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -81,6 +81,20 @@ Bot::Bot(NPCType *npcTypeData, Client* botOwner) : NPC(npcTypeData, nullptr, glm
 	SetAltOutOfCombatBehavior(GetClass() == BARD); // will need to be updated if more classes make use of this flag
 	SetShowHelm(true);
 	SetPauseAI(false);
+
+	m_alt_combat_hate_timer.Start(250);
+	m_auto_defend_timer.Disable();
+	//m_combat_jitter_timer.Disable();
+	//SetCombatJitterFlag(false);
+	SetGuardFlag(false);
+	SetHoldFlag(false);
+	SetAttackFlag(false);
+	SetAttackingFlag(false);
+	SetPullFlag(false);
+	SetPullingFlag(false);
+	SetReturningFlag(false);
+	m_previous_pet_order = SPO_Guard;
+
 	rest_timer.Disable();
 	ping_timer.Disable();
 	SetFollowDistance(BOT_FOLLOW_DISTANCE_DEFAULT);
@@ -159,13 +173,26 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to
 
 	bool stance_flag = false;
 	if (!database.botdb.LoadStance(this, stance_flag) && bot_owner)
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::LoadStance(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadStance(), GetCleanName());
 	if (!stance_flag && bot_owner)
-		bot_owner->Message(13, "Could not locate stance for '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Could not locate stance for '%s'", GetCleanName());
 
 	SetTaunting((GetClass() == WARRIOR || GetClass() == PALADIN || GetClass() == SHADOWKNIGHT) && (GetBotStance() == EQEmu::constants::stanceAggressive));
 	SetPauseAI(false);
 
+	m_alt_combat_hate_timer.Start(250);
+	m_auto_defend_timer.Disable();
+	//m_combat_jitter_timer.Disable();
+	//SetCombatJitterFlag(false);
+	SetGuardFlag(false);
+	SetHoldFlag(false);
+	SetAttackFlag(false);
+	SetAttackingFlag(false);
+	SetPullFlag(false);
+	SetPullingFlag(false);
+	SetReturningFlag(false);
+	m_previous_pet_order = SPO_Guard;
+
 	rest_timer.Disable();
 	ping_timer.Disable();
 	SetFollowDistance(BOT_FOLLOW_DISTANCE_DEFAULT);
@@ -178,25 +205,26 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to
 
 	memset(&_botInspectMessage, 0, sizeof(InspectMessage_Struct));
 	if (!database.botdb.LoadInspectMessage(GetBotID(), _botInspectMessage) && bot_owner)
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::LoadInspectMessage(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadInspectMessage(), GetCleanName());
 
 	if (!database.botdb.LoadGuildMembership(GetBotID(), _guildId, _guildRank, _guildName) && bot_owner)
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::LoadGuildMembership(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadGuildMembership(), GetCleanName());
 	
 	std::string error_message;
 
 	EquipBot(&error_message);
 	if(!error_message.empty()) {
 		if(bot_owner)
-			bot_owner->Message(13, error_message.c_str());
+			bot_owner->Message(Chat::Red, error_message.c_str());
 		error_message.clear();
 	}
 
 	for (int i = 0; i < MaxTimer; i++)
 		timers[i] = 0;
 
-	if (GetClass() == ROGUE)
-		evade_timer.Start();
+	if (GetClass() == ROGUE) {
+		m_evade_timer.Start();
+	}
 
 	m_CastingRoles.GroupHealer = false;
 	m_CastingRoles.GroupSlower = false;
@@ -206,12 +234,161 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to
 	GenerateBaseStats();
 
 	if (!database.botdb.LoadTimers(this) && bot_owner)
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::LoadTimers(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadTimers(), GetCleanName());
 
 	LoadAAs();
 
-	if (!database.botdb.LoadBuffs(this) && bot_owner)
-		bot_owner->Message(13, "&s for '%s'", BotDatabase::fail::LoadBuffs(), GetCleanName());
+	// copied from client CompleteConnect() handler - watch for problems
+	// (may have to move to post-spawn location if certain buffs still don't process correctly)
+	if (database.botdb.LoadBuffs(this) && bot_owner) {
+
+		//reapply some buffs
+		uint32 buff_count = GetMaxTotalSlots();
+		for (uint32 j1 = 0; j1 < buff_count; j1++) {
+			if (!IsValidSpell(buffs[j1].spellid))
+				continue;
+
+			const SPDat_Spell_Struct& spell = spells[buffs[j1].spellid];
+
+			int NimbusEffect = GetNimbusEffect(buffs[j1].spellid);
+			if (NimbusEffect) {
+				if (!IsNimbusEffectActive(NimbusEffect))
+					SendSpellEffect(NimbusEffect, 500, 0, 1, 3000, true);
+			}
+
+			for (int x1 = 0; x1 < EFFECT_COUNT; x1++) {
+				switch (spell.effectid[x1]) {
+				case SE_IllusionCopy:
+				case SE_Illusion: {
+					if (spell.base[x1] == -1) {
+						if (gender == 1)
+							gender = 0;
+						else if (gender == 0)
+							gender = 1;
+						SendIllusionPacket(GetRace(), gender, 0xFF, 0xFF);
+					}
+					else if (spell.base[x1] == -2) // WTF IS THIS
+					{
+						if (GetRace() == 128 || GetRace() == 130 || GetRace() <= 12)
+							SendIllusionPacket(GetRace(), GetGender(), spell.base2[x1], spell.max[x1]);
+					}
+					else if (spell.max[x1] > 0)
+					{
+						SendIllusionPacket(spell.base[x1], 0xFF, spell.base2[x1], spell.max[x1]);
+					}
+					else
+					{
+						SendIllusionPacket(spell.base[x1], 0xFF, 0xFF, 0xFF);
+					}
+					switch (spell.base[x1]) {
+					case OGRE:
+						SendAppearancePacket(AT_Size, 9);
+						break;
+					case TROLL:
+						SendAppearancePacket(AT_Size, 8);
+						break;
+					case VAHSHIR:
+					case BARBARIAN:
+						SendAppearancePacket(AT_Size, 7);
+						break;
+					case HALF_ELF:
+					case WOOD_ELF:
+					case DARK_ELF:
+					case FROGLOK:
+						SendAppearancePacket(AT_Size, 5);
+						break;
+					case DWARF:
+						SendAppearancePacket(AT_Size, 4);
+						break;
+					case HALFLING:
+					case GNOME:
+						SendAppearancePacket(AT_Size, 3);
+						break;
+					default:
+						SendAppearancePacket(AT_Size, 6);
+						break;
+					}
+					break;
+				}
+				//case SE_SummonHorse: {
+				//	SummonHorse(buffs[j1].spellid);
+				//	//hasmount = true;	//this was false, is that the correct thing?
+				//	break;
+				//}
+				case SE_Silence:
+				{
+					Silence(true);
+					break;
+				}
+				case SE_Amnesia:
+				{
+					Amnesia(true);
+					break;
+				}
+				case SE_DivineAura:
+				{
+					invulnerable = true;
+					break;
+				}
+				case SE_Invisibility2:
+				case SE_Invisibility:
+				{
+					invisible = true;
+					SendAppearancePacket(AT_Invis, 1);
+					break;
+				}
+				case SE_Levitate:
+				{
+					if (!zone->CanLevitate())
+					{
+						//if (!GetGM())
+						//{
+							SendAppearancePacket(AT_Levitate, 0);
+							BuffFadeByEffect(SE_Levitate);
+							//Message(Chat::Red, "You can't levitate in this zone.");
+						//}
+					}
+					else {
+						SendAppearancePacket(AT_Levitate, 2);
+					}
+					break;
+				}
+				case SE_InvisVsUndead2:
+				case SE_InvisVsUndead:
+				{
+					invisible_undead = true;
+					break;
+				}
+				case SE_InvisVsAnimals:
+				{
+					invisible_animals = true;
+					break;
+				}
+				case SE_AddMeleeProc:
+				case SE_WeaponProc:
+				{
+					AddProcToWeapon(GetProcID(buffs[j1].spellid, x1), false, 100 + spells[buffs[j1].spellid].base2[x1], buffs[j1].spellid, buffs[j1].casterlevel);
+					break;
+				}
+				case SE_DefensiveProc:
+				{
+					AddDefensiveProc(GetProcID(buffs[j1].spellid, x1), 100 + spells[buffs[j1].spellid].base2[x1], buffs[j1].spellid);
+					break;
+				}
+				case SE_RangedProc:
+				{
+					AddRangedProc(GetProcID(buffs[j1].spellid, x1), 100 + spells[buffs[j1].spellid].base2[x1], buffs[j1].spellid);
+					break;
+				}
+				}
+			}
+		}
+
+		
+	}
+	else {
+		bot_owner->Message(Chat::Red, "&s for '%s'", BotDatabase::fail::LoadBuffs(), GetCleanName());
+	}
 
 	CalcBotStats(false);
 	hp_regen = CalcHPRegen();
@@ -255,6 +432,64 @@ void Bot::SetBotSpellID(uint32 newSpellID) {
 	this->npc_spells_id = newSpellID;
 }
 
+void  Bot::SetSurname(std::string bot_surname) {
+
+	_surname = bot_surname.substr(0, 31);
+
+	if (spawned) {
+
+		auto outapp = new EQApplicationPacket(OP_GMLastName, sizeof(GMLastName_Struct));
+		GMLastName_Struct* gmn = (GMLastName_Struct*)outapp->pBuffer;
+
+		strcpy(gmn->name, GetCleanName());
+		strcpy(gmn->gmname, GetCleanName());
+		strcpy(gmn->lastname, GetSurname().c_str());
+		gmn->unknown[0] = 1;
+		gmn->unknown[1] = 1;
+		gmn->unknown[2] = 1;
+		gmn->unknown[3] = 1;
+
+		entity_list.QueueClients(this, outapp);
+		safe_delete(outapp);
+	}
+}
+
+void  Bot::SetTitle(std::string bot_title) {
+
+	_title = bot_title.substr(0, 31);
+
+	if (spawned) {
+
+		auto outapp = new EQApplicationPacket(OP_SetTitleReply, sizeof(SetTitleReply_Struct));
+		SetTitleReply_Struct* strs = (SetTitleReply_Struct*)outapp->pBuffer;
+
+		strs->is_suffix = 0;
+		strn0cpy(strs->title, _title.c_str(), sizeof(strs->title));
+		strs->entity_id = GetID();
+
+		entity_list.QueueClients(this, outapp, false);
+		safe_delete(outapp);
+	}
+}
+
+void  Bot::SetSuffix(std::string bot_suffix) {
+
+	_suffix = bot_suffix.substr(0, 31);
+
+	if (spawned) {
+
+		auto outapp = new EQApplicationPacket(OP_SetTitleReply, sizeof(SetTitleReply_Struct));
+		SetTitleReply_Struct* strs = (SetTitleReply_Struct*)outapp->pBuffer;
+
+		strs->is_suffix = 1;
+		strn0cpy(strs->title, _suffix.c_str(), sizeof(strs->title));
+		strs->entity_id = GetID();
+
+		entity_list.QueueClients(this, outapp, false);
+		safe_delete(outapp);
+	}
+}
+
 uint32 Bot::GetBotArcheryRange() {
 	const EQEmu::ItemInstance *range_inst = GetBotItem(EQEmu::invslot::slotRange);
 	const EQEmu::ItemInstance *ammo_inst = GetBotItem(EQEmu::invslot::slotAmmo);
@@ -1312,7 +1547,7 @@ int32 Bot::acmod() {
 	else
 		return (65 + ((agility - 300) / 21));
 #if EQDEBUG >= 11
-	Log(Logs::General, Logs::Error, "Error in Bot::acmod(): Agility: %i, Level: %i",agility,level);
+	LogError("Error in Bot::acmod(): Agility: [{}], Level: [{}]",agility,level);
 #endif
 	return 0;
 }
@@ -1419,7 +1654,7 @@ int32 Bot::GenerateBaseHitPoints() {
 }
 
 void Bot::LoadAAs() {
-	int maxAAExpansion = RuleI(Bots, AAExpansion); //get expansion to get AAs up to
+	
 	aa_ranks.clear();
 
 	int id = 0;
@@ -1701,28 +1936,28 @@ bool Bot::Save()
 	if(!GetBotID()) { // New bot record
 		uint32 bot_id = 0;
 		if (!database.botdb.SaveNewBot(this, bot_id) || !bot_id) {
-			bot_owner->Message(13, "%s '%s'", BotDatabase::fail::SaveNewBot(), GetCleanName());
+			bot_owner->Message(Chat::Red, "%s '%s'", BotDatabase::fail::SaveNewBot(), GetCleanName());
 			return false;
 		}
 		SetBotID(bot_id);
 	}
 	else { // Update existing bot record
 		if (!database.botdb.SaveBot(this)) {
-			bot_owner->Message(13, "%s '%s'", BotDatabase::fail::SaveBot(), GetCleanName());
+			bot_owner->Message(Chat::Red, "%s '%s'", BotDatabase::fail::SaveBot(), GetCleanName());
 			return false;
 		}
 	}
 	
 	// All of these continue to process if any fail
 	if (!database.botdb.SaveBuffs(this))
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::SaveBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::SaveBuffs(), GetCleanName());
 	if (!database.botdb.SaveTimers(this))
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::SaveTimers(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::SaveTimers(), GetCleanName());
 	if (!database.botdb.SaveStance(this))
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::SaveStance(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::SaveStance(), GetCleanName());
 	
 	if (!SavePet())
-		bot_owner->Message(13, "Failed to save pet for '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Failed to save pet for '%s'", GetCleanName());
 	
 	return true;
 }
@@ -1734,26 +1969,26 @@ bool Bot::DeleteBot()
 		return false;
 
 	if (!database.botdb.DeleteHealRotation(GetBotID())) {
-		bot_owner->Message(13, "%s", BotDatabase::fail::DeleteHealRotation());
+		bot_owner->Message(Chat::Red, "%s", BotDatabase::fail::DeleteHealRotation());
 		return false;
 	}
 
 	std::string query = StringFormat("DELETE FROM `bot_heal_rotation_members` WHERE `bot_id` = '%u'", GetBotID());
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		bot_owner->Message(13, "Failed to delete heal rotation member '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Failed to delete heal rotation member '%s'", GetCleanName());
 		return false;
 	}
 
 	query = StringFormat("DELETE FROM `bot_heal_rotation_targets` WHERE `target_name` LIKE '%s'", GetCleanName());
 	results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		bot_owner->Message(13, "Failed to delete heal rotation target '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Failed to delete heal rotation target '%s'", GetCleanName());
 		return false;
 	}
 
 	if (!DeletePet()) {
-		bot_owner->Message(13, "Failed to delete pet for '%s'", GetCleanName());
+		bot_owner->Message(Chat::Red, "Failed to delete pet for '%s'", GetCleanName());
 		return false;
 	}
 
@@ -1763,32 +1998,32 @@ bool Bot::DeleteBot()
 	std::string error_message;
 
 	if (!database.botdb.RemoveMemberFromBotGroup(GetBotID())) {
-		bot_owner->Message(13, "%s - '%s'", BotDatabase::fail::RemoveMemberFromBotGroup(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s - '%s'", BotDatabase::fail::RemoveMemberFromBotGroup(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteItems(GetBotID())) {
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::DeleteItems(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::DeleteItems(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteTimers(GetBotID())) {
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::DeleteTimers(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::DeleteTimers(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteBuffs(GetBotID())) {
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::DeleteBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::DeleteBuffs(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteStance(GetBotID())) {
-		bot_owner->Message(13, "%s for '%s'", BotDatabase::fail::DeleteStance(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::DeleteStance(), GetCleanName());
 		return false;
 	}
 
 	if (!database.botdb.DeleteBot(GetBotID())) {
-		bot_owner->Message(13, "%s '%s'", BotDatabase::fail::DeleteBot(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s '%s'", BotDatabase::fail::DeleteBot(), GetCleanName());
 		return false;
 	}
 
@@ -1832,7 +2067,7 @@ bool Bot::LoadPet()
 
 	uint32 pet_index = 0;
 	if (!database.botdb.LoadPetIndex(GetBotID(), pet_index)) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetIndex(), GetCleanName());		
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetIndex(), GetCleanName());
 		return false;
 	}
 	if (!pet_index)
@@ -1840,10 +2075,10 @@ bool Bot::LoadPet()
 
 	uint32 saved_pet_spell_id = 0;
 	if (!database.botdb.LoadPetSpellID(GetBotID(), saved_pet_spell_id)) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetSpellID(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetSpellID(), GetCleanName());
 	}
 	if (!IsValidSpell(saved_pet_spell_id)) {
-		bot_owner->Message(13, "Invalid spell id for %s's pet", GetCleanName());
+		bot_owner->Message(Chat::Red, "Invalid spell id for %s's pet", GetCleanName());
 		DeletePet();
 		return false;
 	}
@@ -1854,7 +2089,7 @@ bool Bot::LoadPet()
 	uint32 pet_spell_id = 0;
 
 	if (!database.botdb.LoadPetStats(GetBotID(), pet_name, pet_mana, pet_hp, pet_spell_id)) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetStats(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetStats(), GetCleanName());
 		return false;
 	}
 
@@ -1869,12 +2104,12 @@ bool Bot::LoadPet()
 	SpellBuff_Struct pet_buffs[PET_BUFF_COUNT];
 	memset(pet_buffs, 0, (sizeof(SpellBuff_Struct) * PET_BUFF_COUNT));
 	if (!database.botdb.LoadPetBuffs(GetBotID(), pet_buffs))
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetBuffs(), GetCleanName());
 
 	uint32 pet_items[EQEmu::invslot::EQUIPMENT_COUNT];
 	memset(pet_items, 0, (sizeof(uint32) * EQEmu::invslot::EQUIPMENT_COUNT));
 	if (!database.botdb.LoadPetItems(GetBotID(), pet_items))
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::LoadPetItems(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::LoadPetItems(), GetCleanName());
 
 	pet_inst->SetPetState(pet_buffs, pet_items);
 	pet_inst->CalcBonuses();
@@ -1913,14 +2148,14 @@ bool Bot::SavePet()
 	std::string error_message;
 
 	if (!database.botdb.SavePetStats(GetBotID(), pet_name_str, pet_inst->GetMana(), pet_inst->GetHP(), pet_inst->GetPetSpellID())) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::SavePetStats(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::SavePetStats(), GetCleanName());
 		return false;
 	}
 	
 	if (!database.botdb.SavePetBuffs(GetBotID(), pet_buffs))
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::SavePetBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::SavePetBuffs(), GetCleanName());
 	if (!database.botdb.SavePetItems(GetBotID(), pet_items))
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::SavePetItems(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::SavePetItems(), GetCleanName());
 
 	return true;
 }
@@ -1934,15 +2169,15 @@ bool Bot::DeletePet()
 	std::string error_message;
 
 	if (!database.botdb.DeletePetItems(GetBotID())) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::DeletePetItems(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::DeletePetItems(), GetCleanName());
 		return false;
 	}
 	if (!database.botdb.DeletePetBuffs(GetBotID())) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::DeletePetBuffs(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::DeletePetBuffs(), GetCleanName());
 		return false;
 	}
 	if (!database.botdb.DeletePetStats(GetBotID())) {
-		bot_owner->Message(13, "%s for %s's pet", BotDatabase::fail::DeletePetStats(), GetCleanName());
+		bot_owner->Message(Chat::Red, "%s for %s's pet", BotDatabase::fail::DeletePetStats(), GetCleanName());
 		return false;
 	}
 
@@ -1957,79 +2192,114 @@ bool Bot::DeletePet()
 	return true;
 }
 
-bool Bot::Process() {
-	if(IsStunned() && stunned_timer.Check())
+bool Bot::Process()
+{
+	if (IsStunned() && stunned_timer.Check()) {
 		Mob::UnStun();
+	}
 
-	if(!GetBotOwner())
+	if (!GetBotOwner()) {
 		return false;
+	}
 
 	if (GetDepop()) {
+
 		_botOwner = 0;
 		_botOwnerCharacterID = 0;
 		_previousTarget = 0;
+
 		return false;
 	}
 
+	if (mob_scan_close.Check()) {
+		LogAIScanClose(
+			"is_moving [{}] bot [{}] timer [{}]",
+			moving ? "true" : "false",
+			GetCleanName(),
+			mob_scan_close.GetDuration()
+		);
+
+		entity_list.ScanCloseClientMobs(close_mobs, this);
+	}
+
 	SpellProcess();
 
 	if(tic_timer.Check()) {
-		//6 seconds, or whatever the rule is set to has passed, send this position to everyone to avoid ghosting
+
+		// 6 seconds, or whatever the rule is set to has passed, send this position to everyone to avoid ghosting
 		if(!IsMoving() && !IsEngaged()) {
+
 			if(IsSitting()) {
-				if(!rest_timer.Enabled())
+
+				if (!rest_timer.Enabled()) {
 					rest_timer.Start(RuleI(Character, RestRegenTimeToActivate) * 1000);
+				}
 			}
 		}
 
 		BuffProcess();
 		CalcRestState();
-		if(currently_fleeing)
+
+		if (currently_fleeing) {
 			ProcessFlee();
+		}
 
-		if(GetHP() < GetMaxHP())
+		if (GetHP() < GetMaxHP()) {
 			SetHP(GetHP() + CalcHPRegen() + RestRegenHP);
+		}
 
-		if(GetMana() < GetMaxMana())
+		if (GetMana() < GetMaxMana()) {
 			SetMana(GetMana() + CalcManaRegen() + RestRegenMana);
+		}
 
 		CalcATK();
-		if(GetEndurance() < GetMaxEndurance())
+
+		if (GetEndurance() < GetMaxEndurance()) {
 			SetEndurance(GetEndurance() + CalcEnduranceRegen() + RestRegenEndurance);
+		}
 	}
 
 	if (send_hp_update_timer.Check(false)) {
+
 		SendHPUpdate();
-		if(HasPet())
+		if (HasPet()) {
 			GetPet()->SendHPUpdate();
+		}
 
 		// hack fix until percentage changes can be implemented
 		auto g = GetGroup();
 		if (g) {
+
 			g->SendManaPacketFrom(this);
 			g->SendEndurancePacketFrom(this);
 		}
 	}
 
-	if(GetAppearance() == eaDead && GetHP() > 0)
+	if (GetAppearance() == eaDead && GetHP() > 0) {
 		SetAppearance(eaStanding);
+	}
 
 	if (IsMoving()) {
 		ping_timer.Disable();
 	}
 	else {
-		if (!ping_timer.Enabled())
-			ping_timer.Start(BOT_KEEP_ALIVE_INTERVAL);
 
-		if (ping_timer.Check())
+		if (!ping_timer.Enabled()) {
+			ping_timer.Start(BOT_KEEP_ALIVE_INTERVAL);
+		}
+
+		if (ping_timer.Check()) {
 			SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0);
+		}
 	}
 
-	if (IsStunned() || IsMezzed())
+	if (IsStunned() || IsMezzed()) {
 		return true;
+	}
 
 	// Bot AI
 	AI_Process();
+
 	return true;
 }
 
@@ -2069,7 +2339,7 @@ void Bot::BotRangedAttack(Mob* other) {
 	//make sure the attack and ranged timers are up
 	//if the ranged timer is disabled, then they have no ranged weapon and shouldent be attacking anyhow
 	if((attack_timer.Enabled() && !attack_timer.Check(false)) || (ranged_timer.Enabled() && !ranged_timer.Check())) {
-		Log(Logs::Detail, Logs::Combat, "Bot Archery attack canceled. Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
+		LogCombat("Bot Archery attack canceled. Timer not up. Attack [{}], ranged [{}]", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
 		Message(0, "Error: Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
 		return;
 	}
@@ -2087,7 +2357,7 @@ void Bot::BotRangedAttack(Mob* other) {
 	if(!RangeWeapon || !Ammo)
 		return;
 
-	Log(Logs::Detail, Logs::Combat, "Shooting %s with bow %s (%d) and arrow %s (%d)", other->GetCleanName(), RangeWeapon->Name, RangeWeapon->ID, Ammo->Name, Ammo->ID);
+	LogCombat("Shooting [{}] with bow [{}] ([{}]) and arrow [{}] ([{}])", other->GetCleanName(), RangeWeapon->Name, RangeWeapon->ID, Ammo->Name, Ammo->ID);
 	if(!IsAttackAllowed(other) || IsCasting() || DivineAura() || IsStunned() || IsMezzed() || (GetAppearance() == eaDead))
 		return;
 
@@ -2097,21 +2367,21 @@ void Bot::BotRangedAttack(Mob* other) {
 
 	//break invis when you attack
 	if(invisible) {
-		Log(Logs::Detail, Logs::Combat, "Removing invisibility due to melee attack.");
+		LogCombat("Removing invisibility due to melee attack");
 		BuffFadeByEffect(SE_Invisibility);
 		BuffFadeByEffect(SE_Invisibility2);
 		invisible = false;
 	}
 
 	if(invisible_undead) {
-		Log(Logs::Detail, Logs::Combat, "Removing invisibility vs. undead due to melee attack.");
+		LogCombat("Removing invisibility vs. undead due to melee attack");
 		BuffFadeByEffect(SE_InvisVsUndead);
 		BuffFadeByEffect(SE_InvisVsUndead2);
 		invisible_undead = false;
 	}
 
 	if(invisible_animals) {
-		Log(Logs::Detail, Logs::Combat, "Removing invisibility vs. animals due to melee attack.");
+		LogCombat("Removing invisibility vs. animals due to melee attack");
 		BuffFadeByEffect(SE_InvisVsAnimals);
 		invisible_animals = false;
 	}
@@ -2222,39 +2492,61 @@ void Bot::SetTarget(Mob* mob) {
 }
 
 void Bot::SetStopMeleeLevel(uint8 level) {
-	if (IsCasterClass(GetClass()) || IsSpellFighterClass(GetClass()))
+	if (IsCasterClass(GetClass()) || IsHybridClass(GetClass()))
 		_stopMeleeLevel = level;
 	else
 		_stopMeleeLevel = 255;
 }
 
 void Bot::SetGuardMode() {
-	WipeHateList();
-	SetTarget(nullptr);
-	SetFollowID(GetID());
+
 	StopMoving();
 	m_GuardPoint = GetPosition();
+	SetGuardFlag();
 
-	if (HasPet()) {
-		GetPet()->WipeHateList();
-		GetPet()->SetTarget(nullptr);
+	if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
 		GetPet()->StopMoving();
 	}
 }
 
-// AI Processing for the Bot object
-void Bot::AI_Process() {
+void Bot::SetHoldMode() {
 
-#define TEST_TARGET() if (!GetTarget()) { return; }
+	SetHoldFlag();
+}
+
+// AI Processing for the Bot object
+
+constexpr float MAX_CASTER_DISTANCE[PLAYER_CLASS_COUNT] = {
+    0, (34 * 34), (24 * 24), (28 * 28), (26 * 26), (42 * 42), 0, (30 * 30), 0, (38 * 38), (54 * 54), (48 * 48), (52 * 52), (50 * 50), (32 * 32), 0
+//  W      C          P          R          S          D      M      B      R      S          N          W          M          E          B      B
+//  A      L          A          N          H          R      N      R      O      H          E          I          A          N          S      E
+//  R      R          L          G          D          U      K      D      G      M          C          Z          G          C          T      R
+};
+
+void Bot::AI_Process()
+{
+#define TEST_COMBATANTS() if (!GetTarget() || GetAppearance() == eaDead) { return; }
+#define PULLING_BOT (GetPullingFlag() || GetReturningFlag())
+#define NOT_PULLING_BOT (!GetPullingFlag() && !GetReturningFlag())
+#define GUARDING (GetGuardFlag())
+#define NOT_GUARDING (!GetGuardFlag())
+#define HOLDING (GetHoldFlag())
+#define NOT_HOLDING (!GetHoldFlag())
+#define PASSIVE (GetBotStance() == EQEmu::constants::stancePassive)
+#define NOT_PASSIVE (GetBotStance() != EQEmu::constants::stancePassive)
 
 	Client* bot_owner = (GetBotOwner() && GetBotOwner()->IsClient() ? GetBotOwner()->CastToClient() : nullptr);
 	Group* bot_group = GetGroup();
-	
+
+//#pragma region PRIMARY AI SKIP CHECKS
+
 	// Primary reasons for not processing AI
-	if (!bot_owner || !bot_group || !IsAIControlled())
+	if (!bot_owner || !bot_group || !IsAIControlled()) {
 		return;
+	}
 
 	if (bot_owner->IsDead()) {
+
 		SetTarget(nullptr);
 		SetBotOwner(nullptr);
 
@@ -2263,47 +2555,63 @@ void Bot::AI_Process() {
 
 	// We also need a leash owner and follow mob (subset of primary AI criteria)
 	Client* leash_owner = (bot_group->GetLeader() && bot_group->GetLeader()->IsClient() ? bot_group->GetLeader()->CastToClient() : bot_owner);
-	if (!leash_owner)
+	if (!leash_owner) {
 		return;
+	}
+
+//#pragma endregion
 
 	Mob* follow_mob = entity_list.GetMob(GetFollowID());
-
 	if (!follow_mob) {
+
 		follow_mob = leash_owner;
 		SetFollowID(leash_owner->GetID());
 	}
 
 	// Berserk updates should occur if primary AI criteria are met
 	if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
+
 		if (!berserk && GetHP() > 0 && GetHPRatio() < 30.0f) {
-			entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName());
+
+			entity_list.MessageCloseString(this, false, 200, 0, BERSERK_START, GetName());
 			berserk = true;
 		}
 
 		if (berserk && GetHPRatio() >= 30.0f) {
-			entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName());
+
+			entity_list.MessageCloseString(this, false, 200, 0, BERSERK_END, GetName());
 			berserk = false;
 		}
 	}
 
+//#pragma region SECONDARY AI SKIP CHECKS
+
 	// Secondary reasons for not processing AI
 	if (GetPauseAI() || IsStunned() || IsMezzed() || (GetAppearance() == eaDead)) {
-		if (IsCasting())
+
+		if (IsCasting()) {
 			InterruptSpell();
+		}
+
 		if (IsMyHealRotationSet() || (AmICastingForHealRotation() && m_member_of_heal_rotation->CastingMember() == this)) {
+
 			AdvanceHealRotation(false);
 			m_member_of_heal_rotation->SetMemberIsCasting(this, false);
 		}
-		
+
 		return;
 	}
-	
-	bool guard_mode = (follow_mob == this);
 
-	auto fm_dist = DistanceSquared(m_Position, follow_mob->GetPosition());
-	auto lo_distance = DistanceSquared(m_Position, leash_owner->GetPosition());
+//#pragma endregion
+
+	float fm_distance = DistanceSquared(m_Position, follow_mob->GetPosition());
+	float lo_distance = DistanceSquared(m_Position, leash_owner->GetPosition());
+	float leash_distance = RuleR(Bots, LeashDistance);
+
+//#pragma region CURRENTLY CASTING CHECKS
 
 	if (IsCasting()) {
+
 		if (IsHealRotationMember() &&
 			m_member_of_heal_rotation->CastingOverride() &&
 			m_member_of_heal_rotation->CastingTarget() != nullptr &&
@@ -2314,26 +2622,23 @@ void Bot::AI_Process() {
 			InterruptSpell();
 		}
 		else if (AmICastingForHealRotation() && m_member_of_heal_rotation->CastingMember() == this) {
+
 			AdvanceHealRotation(false);
 			return;
 		}
 		else if (GetClass() != BARD) {
-			if (IsEngaged())
-				return;
-			if (fm_dist > GetFollowDistance()) // Cancel out-of-combat casting if movement is required
-				InterruptSpell();
-			if (guard_mode) {
-				auto& my_pos = GetPosition();
-				auto& my_guard = GetGuardPoint();
 
-				if (my_pos.x != my_guard.x ||
-					my_pos.y != my_guard.y ||
-					my_pos.z != my_guard.z)
-				{
-					InterruptSpell();
-				}
+			if (IsEngaged()) {
+				return;
 			}
 
+			if (
+				(NOT_GUARDING && fm_distance > GetFollowDistance()) || // Cancel out-of-combat casting if movement to follow mob is required
+				(GUARDING && DistanceSquared(GetPosition(), GetGuardPoint()) > GetFollowDistance()) // Cancel out-of-combat casting if movement to guard point is required
+			) {
+				InterruptSpell();
+			}
+			
 			return;
 		}
 	}
@@ -2341,134 +2646,365 @@ void Bot::AI_Process() {
 		m_member_of_heal_rotation->SetMemberIsCasting(this, false);
 	}
 
+//#pragma endregion
+
 	// Can't move if rooted...
 	if (IsRooted() && IsMoving()) {
+
 		StopMoving();
 		return;
 	}
 
+//#pragma region HEAL ROTATION CASTING CHECKS
+
 	if (IsMyHealRotationSet()) {
-		Mob* delete_me = HealRotationTarget();
+
 		if (AIHealRotation(HealRotationTarget(), UseHealRotationFastHeals())) {
-#if (EQDEBUG >= 12)
-			Log(Logs::General, Logs::Error, "Bot::AI_Process() - Casting succeeded (m: %s, t: %s) : AdvHR(true)", GetCleanName(), ((delete_me) ? (delete_me->GetCleanName()) : ("nullptr")));
-#endif
+
 			m_member_of_heal_rotation->SetMemberIsCasting(this);
 			m_member_of_heal_rotation->UpdateTargetHealingStats(HealRotationTarget());
 			AdvanceHealRotation();
 		}
 		else {
-#if (EQDEBUG >= 12)
-			Log(Logs::General, Logs::Error, "Bot::AI_Process() - Casting failed (m: %s, t: %s) : AdvHR(false)", GetCleanName(), ((delete_me) ? (delete_me->GetCleanName()) : ("nullptr")));
-#endif
+
 			m_member_of_heal_rotation->SetMemberIsCasting(this, false);
 			AdvanceHealRotation(false);
 		}
 	}
 
-	// Empty hate list - let's find a target
-	if (!guard_mode && !IsEngaged()) {
-		Mob* lo_target = leash_owner->GetTarget();
+//#pragma endregion
 
-		if (lo_target && lo_target->IsNPC() &&
-			!lo_target->IsMezzed() &&
-			(lo_target->GetHateAmount(leash_owner) || leash_owner->AutoAttackEnabled()) &&
-			lo_distance <= BOT_LEASH_DISTANCE &&
-			DistanceSquared(m_Position, lo_target->GetPosition()) <= BOT_LEASH_DISTANCE &&
-			(CheckLosFN(lo_target) || leash_owner->CheckLosFN(lo_target)) &&
-			IsAttackAllowed(lo_target))
-		{
-			AddToHateList(lo_target, 1);
-			if (HasPet())
-				GetPet()->AddToHateList(lo_target, 1);
+	bool bo_alt_combat = (RuleB(Bots, AllowOwnerOptionAltCombat) && bot_owner->GetBotOption(Client::booAltCombat));
+
+//#pragma region ATTACK FLAG
+
+	if (GetAttackFlag()) { // Push owner's target onto our hate list
+
+		if (GetPet() && PULLING_BOT) {
+			GetPet()->SetPetOrder(m_previous_pet_order);
 		}
-		else {
-			for (int counter = 0; counter < bot_group->GroupCount(); counter++) {
-				Mob* bg_member = bot_group->members[counter];
-				if (!bg_member)
-					continue;
 
-				Mob* bgm_target = bg_member->GetTarget();
-				if (!bgm_target || !bgm_target->IsNPC())
-					continue;
+		SetAttackFlag(false);
+		SetAttackingFlag(false);
+		SetPullFlag(false);
+		SetPullingFlag(false);
+		SetReturningFlag(false);
+		bot_owner->SetBotPulling(false);
 
-				if (!bgm_target->IsMezzed() &&
-					bgm_target->GetHateAmount(bg_member) &&
-					lo_distance <= BOT_LEASH_DISTANCE &&
-					DistanceSquared(m_Position, bgm_target->GetPosition()) <= BOT_LEASH_DISTANCE &&
-					(CheckLosFN(bgm_target) || leash_owner->CheckLosFN(bgm_target)) &&
-					IsAttackAllowed(bgm_target))
-				{
-					AddToHateList(bgm_target, 1);
-					if (HasPet())
-						GetPet()->AddToHateList(bgm_target, 1);
+		if (NOT_HOLDING && NOT_PASSIVE) {
 
-					break;
+			auto attack_target = bot_owner->GetTarget();
+			if (attack_target) {
+
+				InterruptSpell();
+				WipeHateList();
+				AddToHateList(attack_target, 1);
+				SetTarget(attack_target);
+				SetAttackingFlag();
+				if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
+
+					GetPet()->WipeHateList();
+					GetPet()->AddToHateList(attack_target, 1);
+					GetPet()->SetTarget(attack_target);
 				}
 			}
 		}
 	}
 
+//#pragma endregion
+
+//#pragma region PULL FLAG
+
+	else if (GetPullFlag()) { // Push owner's target onto our hate list and set flags so other bots do not aggro
+
+		SetAttackFlag(false);
+		SetAttackingFlag(false);
+		SetPullFlag(false);
+		SetPullingFlag(false);
+		SetReturningFlag(false);
+		bot_owner->SetBotPulling(false);
+
+		if (NOT_HOLDING && NOT_PASSIVE) {
+
+			auto pull_target = bot_owner->GetTarget();
+			if (pull_target) {
+
+				Bot::BotGroupSay(this, "Pulling %s to the group..", pull_target->GetCleanName());
+				InterruptSpell();
+				WipeHateList();
+				AddToHateList(pull_target, 1);
+				SetTarget(pull_target);
+				SetPullingFlag();
+				bot_owner->SetBotPulling();
+				if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 1)) {
+					
+					GetPet()->WipeHateList();
+					GetPet()->SetTarget(nullptr);
+					m_previous_pet_order = GetPet()->GetPetOrder();
+					GetPet()->SetPetOrder(SPO_Guard);
+				}
+			}
+		}
+	}
+
+//#pragma endregion
+
+//#pragma region ALT COMBAT (ACQUIRE HATE)
+
+	else if (bo_alt_combat && m_alt_combat_hate_timer.Check(false)) { // 'Alt Combat' gives some more 'control' options on how bots process aggro
+		
+		// Empty hate list - let's find some aggro
+		if (!IsEngaged() && NOT_HOLDING && NOT_PASSIVE && (!bot_owner->GetBotPulling() || NOT_PULLING_BOT)) {
+
+			Mob* lo_target = leash_owner->GetTarget();
+			if (lo_target &&
+				lo_target->IsNPC() &&
+				!lo_target->IsMezzed() &&
+				((bot_owner->GetBotOption(Client::booAutoDefend) && lo_target->GetHateAmount(leash_owner)) || leash_owner->AutoAttackEnabled()) &&
+				lo_distance <= leash_distance &&
+				DistanceSquared(m_Position, lo_target->GetPosition()) <= leash_distance &&
+				(CheckLosFN(lo_target) || leash_owner->CheckLosFN(lo_target)) &&
+				IsAttackAllowed(lo_target))
+			{
+				AddToHateList(lo_target, 1);
+				if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
+
+					GetPet()->AddToHateList(lo_target, 1);
+					GetPet()->SetTarget(lo_target);
+				}
+			}
+			else {
+
+				for (int counter = 0; counter < bot_group->GroupCount(); counter++) {
+
+					Mob* bg_member = bot_group->members[counter];
+					if (!bg_member) {
+						continue;
+					}
+
+					Mob* bgm_target = bg_member->GetTarget();
+					if (!bgm_target || !bgm_target->IsNPC()) {
+						continue;
+					}
+
+					if (!bgm_target->IsMezzed() &&
+						((bot_owner->GetBotOption(Client::booAutoDefend) && bgm_target->GetHateAmount(bg_member)) || leash_owner->AutoAttackEnabled()) &&
+						lo_distance <= leash_distance &&
+						DistanceSquared(m_Position, bgm_target->GetPosition()) <= leash_distance &&
+						(CheckLosFN(bgm_target) || leash_owner->CheckLosFN(bgm_target)) &&
+						IsAttackAllowed(bgm_target))
+					{
+						AddToHateList(bgm_target, 1);
+						if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
+
+							GetPet()->AddToHateList(bgm_target, 1);
+							GetPet()->SetTarget(bgm_target);
+						}
+
+						break;
+					}
+				}
+			}
+		}
+	}
+
+//#pragma endregion
+
 	glm::vec3 Goal(0, 0, 0);
 
 	// We have aggro to choose from
 	if (IsEngaged()) {
-		if (rest_timer.Enabled())
+
+		if (rest_timer.Enabled()) {
 			rest_timer.Disable();
-
-		// Group roles can be expounded upon in the future
-		auto assist_mob = entity_list.GetMob(bot_group->GetMainAssistName());
-		bool find_target = true;
-		
-		if (assist_mob) {
-			if (assist_mob->GetTarget()) {
-				if (assist_mob != this) 
-					SetTarget(assist_mob->GetTarget());
-
-				find_target = false;
-			}
-			else if (assist_mob != this) {
-				SetTarget(nullptr);
-				if (HasPet())
-					GetPet()->SetTarget(nullptr);
-
-				find_target = false;
-			}
 		}
 
-		if (find_target) {
-			if (IsRooted()) {
-				SetTarget(hate_list.GetClosestEntOnHateList(this));
+//#pragma region PULLING FLAG (TARGET VALIDATION)
+
+		if (GetPullingFlag()) {
+
+			if (!GetTarget()) {
+
+				WipeHateList();
+				SetTarget(nullptr);
+				SetPullingFlag(false);
+				SetReturningFlag(false);
+				bot_owner->SetBotPulling(false);
+				if (GetPet()) {
+					GetPet()->SetPetOrder(m_previous_pet_order);
+				}
+
+				return;
+			}
+			else if (GetTarget()->GetHateList().size()) {
+
+				WipeHateList();
+				SetTarget(nullptr);
+				SetPullingFlag(false);
+				SetReturningFlag();
+
+				return;
 			}
 			else {
-				// This will keep bots on target for now..but, future updates will allow for rooting/stunning
-				SetTarget(hate_list.GetEscapingEntOnHateList(leash_owner, BOT_LEASH_DISTANCE));
-				if (!GetTarget())
-					SetTarget(hate_list.GetEntWithMostHateOnList(this));
+				// Default action is to aggress towards enemy
 			}
 		}
-		
-		TEST_TARGET();
 
-		Mob* tar = GetTarget();
-		if (!tar)
+//#pragma endregion
+
+//#pragma region RETURNING FLAG
+
+		else if (GetReturningFlag()) {
+
+			// Need to make it back to group before clearing return flag
+			if (fm_distance <= GetFollowDistance()) {
+
+				// Once we're back, clear blocking flags so everyone else can join in
+				SetReturningFlag(false);
+				bot_owner->SetBotPulling(false);
+				if (GetPet()) {
+					GetPet()->SetPetOrder(m_previous_pet_order);
+				}
+			}
+
+			// Need to keep puller out of combat until they reach their 'return to' destination
+			if (HasTargetReflection()) {
+
+				SetTarget(nullptr);
+				WipeHateList();
+
+				return;
+			}
+		}
+
+//#pragma endregion
+
+//#pragma region ALT COMBAT (ACQUIRE TARGET)
+
+		else if (bo_alt_combat && m_alt_combat_hate_timer.Check()) { // Find a mob from hate list to target
+
+			// Group roles can be expounded upon in the future
+			auto assist_mob = entity_list.GetMob(bot_group->GetMainAssistName());
+			bool find_target = true;
+
+			if (assist_mob) {
+
+				if (assist_mob->GetTarget()) {
+
+					if (assist_mob != this) {
+
+						SetTarget(assist_mob->GetTarget());
+						if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
+
+							// This artificially inflates pet's target aggro..but, less expensive than checking hate each AI process
+							GetPet()->AddToHateList(assist_mob->GetTarget(), 1);
+							GetPet()->SetTarget(assist_mob->GetTarget());
+						}
+					}
+
+					find_target = false;
+				}
+				else if (assist_mob != this) {
+
+					SetTarget(nullptr);
+					if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 1)) {
+
+						GetPet()->WipeHateList();
+						GetPet()->SetTarget(nullptr);
+					}
+
+					find_target = false;
+				}
+			}
+
+			if (find_target) {
+
+				if (IsRooted()) {
+					SetTarget(hate_list.GetClosestEntOnHateList(this, true));
+				}
+				else {
+
+					// This will keep bots on target for now..but, future updates will allow for rooting/stunning
+					SetTarget(hate_list.GetEscapingEntOnHateList(leash_owner, leash_distance));
+					if (!GetTarget()) {
+						SetTarget(hate_list.GetEntWithMostHateOnList(this, nullptr, true));
+					}
+				}
+			}
+		}
+
+//#pragma endregion
+
+//#pragma region DEFAULT (ACQUIRE TARGET)
+
+		else {
+
+			// Default behavior doesn't have a means of acquiring a target from the bot's hate list..
+			// ..that action occurs through commands or out-of-combat checks
+			// (Use current target, if already in combat)
+		}
+
+//#pragma endregion
+
+//#pragma region VERIFY TARGET AND STANCE
+
+		Mob* tar = GetTarget(); // We should have a target..if not, we're awaiting new orders
+		if (!tar || PASSIVE) {
+			
+			SetTarget(nullptr);
+			WipeHateList();
+			SetAttackFlag(false);
+			SetAttackingFlag(false);
+			if (PULLING_BOT) {
+
+				// 'Flags' should only be set on the bot that is pulling
+				SetPullingFlag(false);
+				SetReturningFlag(false);
+				bot_owner->SetBotPulling(false);
+				if (GetPet()) {
+					GetPet()->SetPetOrder(m_previous_pet_order);
+				}
+			}
+
+			if (GetArchetype() == ARCHETYPE_CASTER) {
+				BotMeditate(true);
+			}
+
 			return;
+		}
+
+//#pragma endregion
+
+//#pragma region ATTACKING FLAG (HATE VALIDATION)
+
+		if (GetAttackingFlag() && tar->CheckAggro(this)) {
+			SetAttackingFlag(false);
+		}
+
+//#pragma endregion
 
 		float tar_distance = DistanceSquared(m_Position, tar->GetPosition());
 
-		// Let's check if we have a los with our target.
-		// If we don't, our hate_list is wiped.
-		// Else, it was causing the bot to aggro behind wall etc... causing massive trains.
-		if (guard_mode ||
+//#pragma region TARGET VALIDATION
+
+		// DOUBLE-CHECK THIS CRITERIA
+
+		// Verify that our target has attackable criteria
+		if (HOLDING ||
 			!tar->IsNPC() ||
 			tar->IsMezzed() ||
-			(!tar->GetHateAmount(this) && !tar->GetHateAmount(leash_owner) && !leash_owner->AutoAttackEnabled()) ||
-			lo_distance > BOT_LEASH_DISTANCE ||
-			tar_distance > BOT_LEASH_DISTANCE ||
-			(!CheckLosFN(tar) && !leash_owner->CheckLosFN(tar)) ||
-			!IsAttackAllowed(tar))
+			lo_distance > leash_distance ||
+			tar_distance > leash_distance ||
+			(!GetAttackingFlag() && !CheckLosFN(tar) && !leash_owner->CheckLosFN(tar)) || // This is suppose to keep bots from attacking things behind walls
+			!IsAttackAllowed(tar) ||
+			(bo_alt_combat &&
+				(!GetAttackingFlag() && NOT_PULLING_BOT && !leash_owner->AutoAttackEnabled() && !tar->GetHateAmount(this) && !tar->GetHateAmount(leash_owner))
+			)
+		)
 		{
+			// Normally, we wouldn't want to do this without class checks..but, too many issues can arise if we let enchanter animation pets run rampant
 			if (HasPet()) {
+
 				GetPet()->RemoveFromHateList(tar);
 				GetPet()->SetTarget(nullptr);
 			}
@@ -2476,20 +3012,59 @@ void Bot::AI_Process() {
 			RemoveFromHateList(tar);
 			SetTarget(nullptr);
 
-			if (IsMoving())
+			SetAttackFlag(false);
+			SetAttackingFlag(false);
+			if (PULLING_BOT) {
+
+				SetPullingFlag(false);
+				SetReturningFlag(false);
+				bot_owner->SetBotPulling(false);
+				if (GetPet()) {
+					GetPet()->SetPetOrder(m_previous_pet_order);
+				}
+			}
+
+			if (IsMoving()) {
 				StopMoving();
-			
+			}
+
 			return;
 		}
 
-		if (HasPet()) // this causes conflicts with default pet handler (bounces between targets)
-			GetPet()->SetTarget(tar);
+//#pragma endregion
 
-		if (DivineAura())
+		// This causes conflicts with default pet handler (bounces between targets)
+		if (NOT_PULLING_BOT && HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
+
+			// We don't add to hate list here because it's assumed to already be on the list
+			GetPet()->SetTarget(tar);
+		}
+
+		if (DivineAura()) {
 			return;
-		
-		if (!(m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)))
+		}
+
+		if (!(m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))) {
 			SendAddPlayerState(PlayerState::Aggressive);
+		}
+
+//#pragma region PULLING FLAG (ACTIONABLE RANGE)
+
+		if (GetPullingFlag()) {
+
+			constexpr size_t PULL_AGGRO = 5225; // spells[5225]: 'Throw Stone' - 0 cast time
+
+			if (tar_distance <= (spells[PULL_AGGRO].range * spells[PULL_AGGRO].range)) {
+
+				StopMoving();
+				CastSpell(PULL_AGGRO, tar->GetID());
+				return;
+			}
+		}
+
+//#pragma endregion
+
+//#pragma region COMBAT RANGE CALCS
 
 		bool atCombatRange = false;
 
@@ -2499,251 +3074,312 @@ void Bot::AI_Process() {
 		bool behind_mob = false;
 		bool backstab_weapon = false;
 		if (GetClass() == ROGUE) {
-			behind_mob = BehindMob(tar, GetX(), GetY()); // can be separated for other future use
+
+			behind_mob = BehindMob(tar, GetX(), GetY()); // Can be separated for other future use
 			backstab_weapon = p_item && p_item->GetItemBackstabDamage();
 		}
 
-		// Calculate melee distance
+		// Calculate melee distances
 		float melee_distance_max = 0.0f;
+		float melee_distance = 0.0f;
 		{
 			float size_mod = GetSize();
 			float other_size_mod = tar->GetSize();
 
-			if (GetRace() == RT_DRAGON || GetRace() == RT_WURM || GetRace() == RT_DRAGON_7) //For races with a fixed size
+			if (GetRace() == RT_DRAGON || GetRace() == RT_WURM || GetRace() == RT_DRAGON_7) { // For races with a fixed size
 				size_mod = 60.0f;
-			else if (size_mod < 6.0f)
+			}
+			else if (size_mod < 6.0f) {
 				size_mod = 8.0f;
+			}
 
-			if (tar->GetRace() == RT_DRAGON || tar->GetRace() == RT_WURM || tar->GetRace() == RT_DRAGON_7) //For races with a fixed size
+			if (tar->GetRace() == RT_DRAGON || tar->GetRace() == RT_WURM || tar->GetRace() == RT_DRAGON_7) { // For races with a fixed size
 				other_size_mod = 60.0f;
-			else if (other_size_mod < 6.0f)
+			}
+			else if (other_size_mod < 6.0f) {
 				other_size_mod = 8.0f;
+			}
 
-			if (other_size_mod > size_mod)
+			if (other_size_mod > size_mod) {
 				size_mod = other_size_mod;
+			}
 
-			if (size_mod > 29.0f)
+			if (size_mod > 29.0f) {
 				size_mod *= size_mod;
-			else if (size_mod > 19.0f)
+			}
+			else if (size_mod > 19.0f) {
 				size_mod *= (size_mod * 2.0f);
-			else
+			}
+			else {
 				size_mod *= (size_mod * 4.0f);
+			}
 
-			// prevention of ridiculously sized hit boxes
-			if (size_mod > 10000.0f)
+			// Prevention of ridiculously sized hit boxes
+			if (size_mod > 10000.0f) {
 				size_mod = (size_mod / 7.0f);
+			}
 
 			melee_distance_max = size_mod;
-		}
 
-		float melee_distance = 0.0f;
+			switch (GetClass()) {
+			case WARRIOR:
+			case PALADIN:
+			case SHADOWKNIGHT:
+				if (p_item && p_item->GetItem()->IsType2HWeapon()) {
+					melee_distance = melee_distance_max * 0.45f;
+				}
+				else if ((s_item && s_item->GetItem()->IsTypeShield()) || (!p_item && !s_item)) {
+					melee_distance = melee_distance_max * 0.35f;
+				}
+				else {
+					melee_distance = melee_distance_max * 0.40f;
+				}
 
-		switch (GetClass()) {
-		case WARRIOR:
-		case PALADIN:
-		case SHADOWKNIGHT:
-			if (p_item && p_item->GetItem()->IsType2HWeapon())
-				melee_distance = melee_distance_max * 0.45f;
-			else if ((s_item && s_item->GetItem()->IsTypeShield()) || (!p_item && !s_item))
-				melee_distance = melee_distance_max * 0.35f;
-			else
-				melee_distance = melee_distance_max * 0.40f;
+				break;
+			case NECROMANCER:
+			case WIZARD:
+			case MAGICIAN:
+			case ENCHANTER:
+				if (p_item && p_item->GetItem()->IsType2HWeapon()) {
+					melee_distance = melee_distance_max * 0.95f;
+				}
+				else {
+					melee_distance = melee_distance_max * 0.75f;
+				}
 
-			break;
-		case NECROMANCER:
-		case WIZARD:
-		case MAGICIAN:
-		case ENCHANTER:
-			if (p_item && p_item->GetItem()->IsType2HWeapon())
-				melee_distance = melee_distance_max * 0.95f;
-			else
-				melee_distance = melee_distance_max * 0.75f;
+				break;
+			case ROGUE:
+				if (behind_mob && backstab_weapon) {
+					if (p_item->GetItem()->IsType2HWeapon()) { // 'p_item' tested in 'backstab_weapon' check above
+						melee_distance = melee_distance_max * 0.30f;
+					}
+					else {
+						melee_distance = melee_distance_max * 0.25f;
+					}
 
-			break;
-		case ROGUE:
-			if (behind_mob && backstab_weapon) {
-				if (p_item->GetItem()->IsType2HWeapon()) // p_item tested above
-					melee_distance = melee_distance_max * 0.30f;
-				else
-					melee_distance = melee_distance_max * 0.25f;
+					break;
+				}
+				// Fall-through
+			default:
+				if (p_item && p_item->GetItem()->IsType2HWeapon()) {
+					melee_distance = melee_distance_max * 0.70f;
+				}
+				else {
+					melee_distance = melee_distance_max * 0.50f;
+				}
 
 				break;
 			}
-			// Fall-through
-		default:
-			if (p_item && p_item->GetItem()->IsType2HWeapon())
-				melee_distance = melee_distance_max * 0.70f;
-			else
-				melee_distance = melee_distance_max * 0.50f;
-
-			break;
 		}
-
 		float melee_distance_min = melee_distance / 2.0f;
 
-		// Calculate casting distance
+		// Calculate caster distances
 		float caster_distance_max = 0.0f;
-		{
-			if (GetLevel() >= GetStopMeleeLevel()) {
-				switch (GetClass()) {
-				case CLERIC:
-					caster_distance_max = 1156.0f; // as DSq value (34 units)
-					break;
-				case PALADIN:
-					caster_distance_max = 576.0f; // as DSq value (24 units)
-					break;
-				case RANGER:
-					caster_distance_max = 784.0f; // as DSq value (28 units)
-					break;
-				case SHADOWKNIGHT:
-					caster_distance_max = 676.0f; // as DSq value (26 units)
-					break;
-				case DRUID:
-					caster_distance_max = 1764.0f; // as DSq value (42 units)
-					break;
-				case SHAMAN:
-					caster_distance_max = 1444.0f; // as DSq value (38 units)
-					break;
-				case NECROMANCER:
-					caster_distance_max = 2916.0f; // as DSq value (54 units)
-					break;
-				case WIZARD:
-					caster_distance_max = 2304.0f; // as DSq value (48 units)
-					break;
-				case MAGICIAN:
-					caster_distance_max = 2704.0f; // as DSq value (52 units)
-					break;
-				case ENCHANTER:
-					caster_distance_max = 2500.0f; // as DSq value (50 units)
-					break;
-				case BEASTLORD:
-					caster_distance_max = 900.0f; // as DSq value (30 units)
-					break;
-				default:
-					// pure melee classes (and BARD) do not get this option
-					break;
-				}
-			}
-		}
-
 		float caster_distance_min = 0.0f;
-		if (caster_distance_max) {
-			caster_distance_min = melee_distance_max;
+		float caster_distance = 0.0f;
+		{
+			if (GetLevel() >= GetStopMeleeLevel() && GetClass() >= WARRIOR && GetClass() <= BERSERKER) {
+				caster_distance_max = MAX_CASTER_DISTANCE[(GetClass() - 1)];
+			}
 
-			if (caster_distance_max <= caster_distance_min)
-				caster_distance_max = caster_distance_min * 1.25f;
+			if (caster_distance_max) {
+
+				caster_distance_min = melee_distance_max;
+				if (caster_distance_max <= caster_distance_min) {
+					caster_distance_max = caster_distance_min * 1.25f;
+				}
+
+				caster_distance = ((caster_distance_max + caster_distance_min) / 2);
+			}
 		}
 
 		bool atArcheryRange = IsArcheryRange(tar);
 
 		if (GetRangerAutoWeaponSelect()) {
+
 			bool changeWeapons = false;
 
 			if (atArcheryRange && !IsBotArcher()) {
+
 				SetBotArcher(true);
 				changeWeapons = true;
 			}
 			else if (!atArcheryRange && IsBotArcher()) {
+
 				SetBotArcher(false);
 				changeWeapons = true;
 			}
 
-			if (changeWeapons)
+			if (changeWeapons) {
 				ChangeBotArcherWeapons(IsBotArcher());
+			}
 		}
 
-		// all of this needs review...
+		if (IsBotArcher() && atArcheryRange) {
+			atCombatRange = true;
+		}
+		else if (caster_distance_max && tar_distance <= caster_distance_max) {
+			atCombatRange = true;
+		}
+		else if (tar_distance <= melee_distance) {
+			atCombatRange = true;
+		}
 
-		if (IsBotArcher() && atArcheryRange)
-			atCombatRange = true;
-		else if (caster_distance_max && tar_distance <= caster_distance_max)
-			atCombatRange = true;
-		else if (tar_distance <= melee_distance)
-			atCombatRange = true;
+//#pragma endregion
+
+//#pragma region ENGAGED AT COMBAT RANGE
 
 		// We can fight
 		if (atCombatRange) {
+			
+			//if (IsMoving() || GetCombatJitterFlag()) { // StopMoving() needs to be called so that the jitter timer can be reset
 			if (IsMoving()) {
-				StopMoving(CalculateHeadingToTarget(tar->GetX(), tar->GetY()));
+
+				// Since we're using a pseudo-shadowstep for jitter, disregard the combat jitter flag
+				//if (!GetCombatJitterFlag()) {
+					StopMoving(CalculateHeadingToTarget(tar->GetX(), tar->GetY()));
+				//}
+
 				return;
 			}
-			
+
 			// Combat 'jitter' code
+			// Note: Combat Jitter is disabled until a working movement solution can be found
 			if (AI_movement_timer->Check() && (!spellend_timer.Enabled() || GetClass() == BARD)) {
+
 				if (!IsRooted()) {
+
 					if (HasTargetReflection()) {
+
 						if (!tar->IsFeared() && !tar->IsStunned()) {
+
 							if (GetClass() == ROGUE) {
-								if (evade_timer.Check(false)) { // Attempt to evade
+
+								if (m_evade_timer.Check(false)) { // Attempt to evade
+
 									int timer_duration = (HideReuseTime - GetSkillReuseTime(EQEmu::skills::SkillHide)) * 1000;
-									if (timer_duration < 0)
+									if (timer_duration < 0) {
 										timer_duration = 0;
-
-									evade_timer.Start(timer_duration);
-									if (zone->random.Int(0, 260) < (int)GetSkill(EQEmu::skills::SkillHide))
-										RogueEvade(tar);
-
-									return;
-								}
-							}
-
-							if (tar->IsRooted()) { // Move caster/rogue back from rooted mob - out of combat range, if necessary
-								if (GetArchetype() == ARCHETYPE_CASTER || GetClass() == ROGUE) {
-									if (tar_distance <= melee_distance_max) {
-										if (PlotPositionAroundTarget(this, Goal.x, Goal.y, Goal.z)) {
-											WalkTo(Goal.x, Goal.y, Goal.z);
-											return;
-										}
 									}
-								}
-							}
-						}
-					}
-					else {
-						if (caster_distance_min && tar_distance < caster_distance_min && !tar->IsFeared()) { // Caster back-off adjustment
-							if (PlotPositionAroundTarget(this, Goal.x, Goal.y, Goal.z)) {
-								if (DistanceSquared(Goal, tar->GetPosition()) <= caster_distance_max) {
-									WalkTo(Goal.x, Goal.y, Goal.z);
-									return;
-								}
-							}
-						}
-						else if (tar_distance < melee_distance_min) { // Melee back-off adjustment
-							if (PlotPositionAroundTarget(this, Goal.x, Goal.y, Goal.z)) {
-								if (DistanceSquared(Goal, tar->GetPosition()) <= melee_distance_max) {
-									WalkTo(Goal.x, Goal.y, Goal.z);
-									return;
-								}
-							}
-						}
-						else if (backstab_weapon && !behind_mob) { // Move the rogue to behind the mob
-							if (PlotPositionAroundTarget(tar, Goal.x, Goal.y, Goal.z)) {
-								if (DistanceSquared(Goal, tar->GetPosition()) <= melee_distance_max) {
-									RunTo(Goal.x, Goal.y, Goal.z);
-									return;
-								}
-							}
-						}
-						else {
-							if (caster_distance_max == 0.0f && // Not a caster or a caster still below melee stop level (standard combat jitter)
-								zone->random.Int(1, 100) >= 94 && // 7:100 chance
-								PlotPositionAroundTarget(tar, Goal.x, Goal.y, Goal.z)) // If we're behind the mob, we can attack when it's enraged
-							{
-								if (DistanceSquared(Goal, tar->GetPosition()) <= melee_distance_max) {
-									WalkTo(Goal.x, Goal.y, Goal.z);
-									return;
-								}
-							}
-						}
 
-						if (!IsFacingMob(tar)) {
-							FaceTarget(tar);
-							return;
+									m_evade_timer.Start(timer_duration);
+									if (zone->random.Int(0, 260) < (int)GetSkill(EQEmu::skills::SkillHide)) {
+										RogueEvade(tar);
+									}
+
+									return;
+								}
+							}
+
+							//if (tar->IsRooted()) { // Move caster/rogue back from rooted mob - out of combat range, if necessary
+
+							//	if (GetArchetype() == ARCHETYPE_CASTER || GetClass() == ROGUE) {
+
+							//		if (tar_distance <= melee_distance_max) {
+
+							//			if (PlotPositionAroundTarget(this, Goal.x, Goal.y, Goal.z)) {
+							//			//if (PlotPositionBehindMeFacingTarget(tar, Goal.x, Goal.y, Goal.z)) {
+
+							//				Teleport(Goal);
+							//				//WalkTo(Goal.x, Goal.y, Goal.z);
+							//				SetCombatJitterFlag();
+
+							//				return;
+							//			}
+							//		}
+							//	}
+							//}
 						}
 					}
+					//else {
+
+					//	if (caster_distance_min && tar_distance < caster_distance_min && !tar->IsFeared()) { // Caster back-off adjustment
+
+					//		if (PlotPositionAroundTarget(this, Goal.x, Goal.y, Goal.z)) {
+					//		//if (PlotPositionBehindMeFacingTarget(tar, Goal.x, Goal.y, Goal.z)) {
+
+					//			if (DistanceSquared(Goal, tar->GetPosition()) <= caster_distance_max) {
+
+					//				Teleport(Goal);
+					//				//WalkTo(Goal.x, Goal.y, Goal.z);
+					//				SetCombatJitterFlag();
+
+					//				return;
+					//			}
+					//		}
+					//	}
+					//	else if (tar_distance < melee_distance_min) { // Melee back-off adjustment
+
+					//		if (PlotPositionAroundTarget(this, Goal.x, Goal.y, Goal.z)) {
+					//		//if (PlotPositionBehindMeFacingTarget(tar, Goal.x, Goal.y, Goal.z)) {
+
+					//			if (DistanceSquared(Goal, tar->GetPosition()) <= melee_distance_max) {
+
+					//				Teleport(Goal);
+					//				//WalkTo(Goal.x, Goal.y, Goal.z);
+					//				SetCombatJitterFlag();
+
+					//				return;
+					//			}
+					//		}
+					//	}
+					//	else if (backstab_weapon && !behind_mob) { // Move the rogue to behind the mob
+
+					//		if (PlotPositionAroundTarget(tar, Goal.x, Goal.y, Goal.z)) {
+					//		//if (PlotPositionOnArcBehindTarget(tar, Goal.x, Goal.y, Goal.z, melee_distance)) {
+
+					//			float distance_squared = DistanceSquared(Goal, tar->GetPosition());
+					//			if (/*distance_squared >= melee_distance_min && */distance_squared <= melee_distance_max) {
+
+					//				Teleport(Goal);
+					//				//RunTo(Goal.x, Goal.y, Goal.z);
+					//				SetCombatJitterFlag();
+
+					//				return;
+					//			}
+					//		}
+					//	}
+					//	else if (m_combat_jitter_timer.Check()) {
+
+					//		if (!caster_distance && PlotPositionAroundTarget(tar, Goal.x, Goal.y, Goal.z)) {
+					//		//if (!caster_distance && PlotPositionOnArcInFrontOfTarget(tar, Goal.x, Goal.y, Goal.z, melee_distance)) {
+
+					//			float distance_squared = DistanceSquared(Goal, tar->GetPosition());
+					//			if (/*distance_squared >= melee_distance_min && */distance_squared <= melee_distance_max) {
+
+					//				Teleport(Goal);
+					//				//WalkTo(Goal.x, Goal.y, Goal.z);
+					//				SetCombatJitterFlag();
+
+					//				return;
+					//			}
+					//		}
+					//		else if (caster_distance && PlotPositionAroundTarget(tar, Goal.x, Goal.y, Goal.z)) {
+					//		//else if (caster_distance && PlotPositionOnArcInFrontOfTarget(tar, Goal.x, Goal.y, Goal.z, caster_distance)) {
+
+					//			float distance_squared = DistanceSquared(Goal, tar->GetPosition());
+					//			if (/*distance_squared >= caster_distance_min && */distance_squared <= caster_distance_max) {
+
+					//				Teleport(Goal);
+					//				//WalkTo(Goal.x, Goal.y, Goal.z);
+					//				SetCombatJitterFlag();
+
+					//				return;
+					//			}
+					//		}
+					//	}
+
+					//	if (!IsFacingMob(tar)) {
+
+					//		FaceTarget(tar);
+					//		return;
+					//	}
+					//}
 				}
 				else {
+
 					if (!IsSitting() && !IsFacingMob(tar)) {
+
 						FaceTarget(tar);
 						return;
 					}
@@ -2755,93 +3391,111 @@ void Bot::AI_Process() {
 			}
 
 			// Up to this point, GetTarget() has been safe to dereference since the initial
-			// TEST_TARGET() call. Due to the chance of the target dying and our pointer
+			// TEST_COMBATANTS() call. Due to the chance of the target dying and our pointer
 			// being nullified, we need to test it before dereferencing to avoid crashes
 
-			if (IsBotArcher() && ranged_timer.Check(false)) { // can shoot mezzed, stunned and dead!?
-				TEST_TARGET();
-				if (GetTarget()->GetHPRatio() <= 99.0f)
+			if (IsBotArcher() && ranged_timer.Check(false)) { // Can shoot mezzed, stunned and dead!?
+
+				TEST_COMBATANTS();
+				if (GetTarget()->GetHPRatio() <= 99.0f) {
 					BotRangedAttack(tar);
+				}
 			}
-			else if (!IsBotArcher() && (IsBotNonSpellFighter() || GetLevel() < GetStopMeleeLevel())) {
-				// we can't fight if we don't have a target, are stun/mezzed or dead..
+			else if (!IsBotArcher() && GetLevel() < GetStopMeleeLevel()) {
+
+				// We can't fight if we don't have a target, are stun/mezzed or dead..
 				// Stop attacking if the target is enraged
-				TEST_TARGET();
-				if (GetBotStance() == EQEmu::constants::stancePassive || (tar->IsEnraged() && !BehindMob(tar, GetX(), GetY())))
+				TEST_COMBATANTS();
+				if (tar->IsEnraged() && !BehindMob(tar, GetX(), GetY())) {
 					return;
+				}
 
 				// First, special attack per class (kick, backstab etc..)
-				TEST_TARGET();
+				TEST_COMBATANTS();
 				DoClassAttacks(tar);
 
-				TEST_TARGET();
+				TEST_COMBATANTS();
 				if (attack_timer.Check()) { // Process primary weapon attacks
+
 					Attack(tar, EQEmu::invslot::slotPrimary);
 
-					TEST_TARGET();
+					TEST_COMBATANTS();
 					TriggerDefensiveProcs(tar, EQEmu::invslot::slotPrimary, false);
-					
-					TEST_TARGET();
-					TryWeaponProc(p_item, tar, EQEmu::invslot::slotPrimary);
-					
-					//bool tripleSuccess = false;
 
-					TEST_TARGET();
+					TEST_COMBATANTS();
+					TryWeaponProc(p_item, tar, EQEmu::invslot::slotPrimary);
+
+					// bool tripleSuccess = false;
+
+					TEST_COMBATANTS();
 					if (CanThisClassDoubleAttack()) {
-						if (CheckBotDoubleAttack())
-							Attack(tar, EQEmu::invslot::slotPrimary, true);
-						
-						TEST_TARGET();
-						if (GetSpecialAbility(SPECATK_TRIPLE) && CheckBotDoubleAttack(true)) {
-							//tripleSuccess = true;
+
+						if (CheckBotDoubleAttack()) {
 							Attack(tar, EQEmu::invslot::slotPrimary, true);
 						}
 
-						TEST_TARGET();
-						//quad attack, does this belong here??
-						if (GetSpecialAbility(SPECATK_QUAD) && CheckBotDoubleAttack(true))
+						TEST_COMBATANTS();
+						if (GetSpecialAbility(SPECATK_TRIPLE) && CheckBotDoubleAttack(true)) {
+							// tripleSuccess = true;
 							Attack(tar, EQEmu::invslot::slotPrimary, true);
+						}
+
+						TEST_COMBATANTS();
+						// quad attack, does this belong here??
+						if (GetSpecialAbility(SPECATK_QUAD) && CheckBotDoubleAttack(true)) {
+							Attack(tar, EQEmu::invslot::slotPrimary, true);
+						}
 					}
 
-					TEST_TARGET();
-					//Live AA - Flurry, Rapid Strikes ect (Flurry does not require Triple Attack).
+					TEST_COMBATANTS();
+					// Live AA - Flurry, Rapid Strikes ect (Flurry does not require Triple Attack).
 					int32 flurrychance = (aabonuses.FlurryChance + spellbonuses.FlurryChance + itembonuses.FlurryChance);
 					if (flurrychance) {
+
 						if (zone->random.Int(0, 100) < flurrychance) {
-							Message_StringID(MT_NPCFlurry, YOU_FLURRY);
+
+							MessageString(Chat::NPCFlurry, YOU_FLURRY);
 							Attack(tar, EQEmu::invslot::slotPrimary, false);
-							
-							TEST_TARGET();
+
+							TEST_COMBATANTS();
 							Attack(tar, EQEmu::invslot::slotPrimary, false);
 						}
 					}
 
-					TEST_TARGET();
+					TEST_COMBATANTS();
 					int32 ExtraAttackChanceBonus = (spellbonuses.ExtraAttackChance + itembonuses.ExtraAttackChance + aabonuses.ExtraAttackChance);
 					if (ExtraAttackChanceBonus) {
+
 						if (p_item && p_item->GetItem()->IsType2HWeapon()) {
-							if (zone->random.Int(0, 100) < ExtraAttackChanceBonus)
+
+							if (zone->random.Int(0, 100) < ExtraAttackChanceBonus) {
 								Attack(tar, EQEmu::invslot::slotPrimary, false);
+							}
 						}
 					}
 				}
 
-				TEST_TARGET();
+				TEST_COMBATANTS();
 				if (attack_dw_timer.Check() && CanThisClassDualWield()) { // Process secondary weapon attacks
+
 					const EQEmu::ItemData* s_itemdata = nullptr;
-					//can only dual wield without a weapon if you're a monk
+					// Can only dual wield without a weapon if you're a monk
 					if (s_item || (GetClass() == MONK)) {
-						if(s_item)
+
+						if (s_item) {
 							s_itemdata = s_item->GetItem();
+						}
 
 						int weapon_type = 0; // No weapon type.
 						bool use_fist = true;
 						if (s_itemdata) {
+
 							weapon_type = s_itemdata->ItemType;
 							use_fist = false;
 						}
 
 						if (use_fist || !s_itemdata->IsType2HWeapon()) {
+
 							float DualWieldProbability = 0.0f;
 
 							int32 Ambidexterity = (aabonuses.Ambidexterity + spellbonuses.Ambidexterity + itembonuses.Ambidexterity);
@@ -2851,140 +3505,220 @@ void Bot::AI_Process() {
 							DualWieldProbability += (DualWieldProbability * float(DWBonus) / 100.0f);
 
 							float random = zone->random.Real(0, 1);
-							
-							if (random < DualWieldProbability){ // Max 78% of DW
+							if (random < DualWieldProbability) { // Max 78% of DW
+
 								Attack(tar, EQEmu::invslot::slotSecondary);	// Single attack with offhand
-								
-								TEST_TARGET();
+
+								TEST_COMBATANTS();
 								TryWeaponProc(s_item, tar, EQEmu::invslot::slotSecondary);
 
-								TEST_TARGET();
+								TEST_COMBATANTS();
 								if (CanThisClassDoubleAttack() && CheckBotDoubleAttack()) {
-									if (tar->GetHP() > -10)
+
+									if (tar->GetHP() > -10) {
 										Attack(tar, EQEmu::invslot::slotSecondary);	// Single attack with offhand
+									}
 								}
 							}
 						}
 					}
 				}
 			}
-		}
-		else { // To far away to fight (GetTarget() validity can be iffy below this point - including outer scopes)
-			if (AI_movement_timer->Check() && (!spellend_timer.Enabled() || GetClass() == BARD)) { // Pursue processing
-				if (GetTarget() && !IsRooted()) {
-					Log(Logs::Detail, Logs::AI, "Pursuing %s while engaged.", GetTarget()->GetCleanName());
 
+			if (GetAppearance() == eaDead) {
+				return;
+			}
+		}
+
+//#pragma endregion
+
+//#pragma region ENGAGED NOT AT COMBAT RANGE
+
+		else { // To far away to fight (GetTarget() validity can be iffy below this point - including outer scopes)
+
+			// This code actually gets processed when we are too far away from target and have not engaged yet, too
+			if (/*!GetCombatJitterFlag() && */AI_movement_timer->Check() && (!spellend_timer.Enabled() || GetClass() == BARD)) { // Pursue processing
+
+				if (GetTarget() && !IsRooted()) {
+
+					LogAI("Pursuing [{}] while engaged", GetTarget()->GetCleanName());
 					Goal = GetTarget()->GetPosition();
-										
-					RunTo(Goal.x, Goal.y, Goal.z);
+					if (DistanceSquared(m_Position, Goal) <= leash_distance) {
+						RunTo(Goal.x, Goal.y, Goal.z);
+					}
+					else {
+
+						WipeHateList();
+						SetTarget(nullptr);
+						if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
+
+							GetPet()->WipeHateList();
+							GetPet()->SetTarget(nullptr);
+						}
+					}
+
 					return;
 				}
 				else {
-					if (IsMoving())
-						StopMoving();
 
+					if (IsMoving()) {
+						StopMoving();
+					}
 					return;
 				}
 			}
 
-			// Fix Z when following during pull, not when engaged and stationary
-
 			if (GetTarget() && GetTarget()->IsFeared() && !spellend_timer.Enabled() && AI_think_timer->Check()) {
-				if (!IsFacingMob(GetTarget()))
+
+				if (!IsFacingMob(GetTarget())) {
 					FaceTarget(GetTarget());
+				}
 
 				// This is a mob that is fleeing either because it has been feared or is low on hitpoints
-				if (GetBotStance() != EQEmu::constants::stancePassive) {
-					AI_PursueCastCheck(); // This appears to always return true..can't trust for success/fail
-					return;
-				}
+				AI_PursueCastCheck(); // This appears to always return true..can't trust for success/fail
+				
+				return;
 			}
-		} // end not in combat range
+		} // End not in combat range
+
+//#pragma endregion
 
 		if (!IsMoving() && !spellend_timer.Enabled()) { // This may actually need work...
-			if (GetBotStance() == EQEmu::constants::stancePassive)
-				return;
-			
-			if (GetTarget() && AI_EngagedCastCheck()) 
+
+			if (GetTarget() && AI_EngagedCastCheck()) {
 				BotMeditate(false);
-			else if (GetArchetype() == ARCHETYPE_CASTER) 
+			}
+			else if (GetArchetype() == ARCHETYPE_CASTER) {
 				BotMeditate(true);
-			
+			}
+
 			return;
 		}
 	}
 	else { // Out-of-combat behavior
+		
+		SetAttackFlag(false);
+		SetAttackingFlag(false);
+		if (!bot_owner->GetBotPulling()) {
+
+			SetPullingFlag(false);
+			SetReturningFlag(false);
+		}
+
+//#pragma region AUTO DEFEND
+
+		// This is as close as I could get without modifying the aggro mechanics and making it an expensive process...
+		// 'class Client' doesn't make use of hate_list...
+		if (RuleB(Bots, AllowOwnerOptionAutoDefend) && bot_owner->GetBotOption(Client::booAutoDefend)) {
+
+			if (!m_auto_defend_timer.Enabled()) {
+
+				m_auto_defend_timer.Start(zone->random.Int(250, 1250)); // random timer to simulate 'awareness' (cuts down on scanning overhead)
+				return;
+			}
+			
+			if (m_auto_defend_timer.Check() && bot_owner->GetAggroCount()) {
+
+				if (NOT_HOLDING && NOT_PASSIVE) {
+
+					auto xhaters = bot_owner->GetXTargetAutoMgr();
+					if (xhaters && !xhaters->empty()) {
+
+						for (auto hater_iter : xhaters->get_list()) {
+
+							if (!hater_iter.spawn_id) {
+								continue;
+							}
+
+							if (bot_owner->GetBotPulling() && bot_owner->GetTarget() && hater_iter.spawn_id == bot_owner->GetTarget()->GetID()) {
+								continue;
+							}
+
+							auto hater = entity_list.GetMob(hater_iter.spawn_id);
+							if (hater && !hater->IsMezzed() && DistanceSquared(hater->GetPosition(), bot_owner->GetPosition()) <= leash_distance) {
+
+								// This is roughly equivilent to npc attacking a client pet owner
+								AddToHateList(hater, 1);
+								SetTarget(hater);
+								SetAttackingFlag();
+								if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 2)) {
+
+									GetPet()->AddToHateList(hater, 1);
+									GetPet()->SetTarget(hater);
+								}
+
+								m_auto_defend_timer.Disable();
+
+								return;
+							}
+						}
+					}
+				}
+			}
+		}
+
+//#pragma endregion
+		
 		SetTarget(nullptr);
 
-		if (HasPet()) {
+		if (HasPet() && (GetClass() != ENCHANTER || GetPet()->GetPetType() != petAnimation || GetAA(aaAnimationEmpathy) >= 1)) {
+
 			GetPet()->WipeHateList();
 			GetPet()->SetTarget(nullptr);
 		}
-		
-		if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive))
+
+		if (m_PlayerState & static_cast<uint32>(PlayerState::Aggressive)) {
 			SendRemovePlayerState(PlayerState::Aggressive);
-
-		// Check guard point
-		if (guard_mode) {
-			auto& my_pos = GetPosition();
-			auto& my_guard = GetGuardPoint();
-
-			if (my_pos.x != my_guard.x ||
-				my_pos.y != my_guard.y ||
-				my_pos.z != my_guard.z)
-			{
-				if (IsMoving())
-					StopMoving();
-
-				Teleport(my_guard);
-
-				if (HasPet())
-					GetPet()->Teleport(my_guard);
-
-				return;
-			}
-		}
-		// Leash the bot
-		else if (lo_distance > BOT_LEASH_DISTANCE) {
-			if (IsMoving())
-				StopMoving();
-
-			Teleport(leash_owner->GetPosition());
-			
-			if (HasPet())
-				GetPet()->Teleport(leash_owner->GetPosition());
-
-			return;
 		}
 
+//#pragma region OK TO IDLE
+		
 		// Ok to idle
-		if (fm_dist <= GetFollowDistance()) {
+		if ((NOT_GUARDING && fm_distance <= GetFollowDistance()) || (GUARDING && DistanceSquared(GetPosition(), GetGuardPoint()) <= GetFollowDistance())) {
+
 			if (!IsMoving() && AI_think_timer->Check() && !spellend_timer.Enabled()) {
-				if (GetBotStance() != EQEmu::constants::stancePassive) {
-					if (!AI_IdleCastCheck() && !IsCasting() && GetClass() != BARD)
+
+				if (NOT_PASSIVE) {
+
+					if (!AI_IdleCastCheck() && !IsCasting() && GetClass() != BARD) {
 						BotMeditate(true);
+					}
 				}
 				else {
-					if (GetClass() != BARD)
+
+					if (GetClass() != BARD) {
 						BotMeditate(true);
+					}
 				}
 
 				return;
 			}
 		}
-		
+
 		// Non-engaged movement checks
 		if (AI_movement_timer->Check() && (!IsCasting() || GetClass() == BARD)) {
-			if (fm_dist > GetFollowDistance()) {
+
+			if (GUARDING) {
+				Goal = GetGuardPoint();
+			}
+			else {
+				Goal = follow_mob->GetPosition();
+			}
+			float destination_distance = DistanceSquared(GetPosition(), Goal);
+
+			if ((!bot_owner->GetBotPulling() || PULLING_BOT) && (destination_distance > GetFollowDistance())) {
+
 				if (!IsRooted()) {
-					if (rest_timer.Enabled())
+
+					if (rest_timer.Enabled()) {
 						rest_timer.Disable();
+					}
 
 					bool running = true;
-					if (fm_dist < GetFollowDistance() + BOT_FOLLOW_DISTANCE_WALK)
-						running = false;
 
-					Goal = follow_mob->GetPosition();
+					if (destination_distance < GetFollowDistance() + BOT_FOLLOW_DISTANCE_WALK) {
+						running = false;
+					}
 
 					if (running) {
 						RunTo(Goal.x, Goal.y, Goal.z);
@@ -2992,27 +3726,43 @@ void Bot::AI_Process() {
 					else {
 						WalkTo(Goal.x, Goal.y, Goal.z);
 					}
+
 					return;
 				}
 			}
 			else {
+
 				if (IsMoving()) {
+
 					StopMoving();
 					return;
 				}
 			}
 		}
-		
+
 		// Basically, bard bots get a chance to cast idle spells while moving
-		if (IsMoving()) {
-			if (GetBotStance() != EQEmu::constants::stancePassive) {
-				if (GetClass() == BARD && !spellend_timer.Enabled() && AI_think_timer->Check()) {
-					AI_IdleCastCheck();
-					return;
-				}
+		if (GetClass() == BARD && IsMoving() && NOT_PASSIVE) {
+
+			if (!spellend_timer.Enabled() && AI_think_timer->Check()) {
+
+				AI_IdleCastCheck();
+				return;
 			}
 		}
+
+//#pragma endregion
+
 	}
+
+#undef TEST_COMBATANTS
+#undef PULLING_BOT
+#undef NOT_PULLING_BOT
+#undef GUARDING
+#undef NOT_GUARDING
+#undef HOLDING
+#undef NOT_HOLDING
+#undef PASSIVE
+#undef NOT_PASSIVE
 }
 
 // AI Processing for a Bot object's pet
@@ -3177,7 +3927,7 @@ void Bot::PetAIProcess() {
 				else if (botPet->GetTarget() && botPet->GetAIMovementTimer()->Check()) {
 					botPet->SetRunAnimSpeed(0);
 					if(!botPet->IsRooted()) {
-						Log(Logs::Detail, Logs::AI, "Pursuing %s while engaged.", botPet->GetTarget()->GetCleanName());
+						LogAI("Pursuing [{}] while engaged", botPet->GetTarget()->GetCleanName());
 						botPet->RunTo(botPet->GetTarget()->GetX(), botPet->GetTarget()->GetY(), botPet->GetTarget()->GetZ());
 						return;
 					} else {
@@ -3256,11 +4006,11 @@ bool Bot::Spawn(Client* botCharacterOwner) {
 		this->texture = 0; //0xFF;
 
 		if(this->Save())
-			this->GetBotOwner()->CastToClient()->Message(0, "%s saved.", this->GetCleanName());
+			this->GetBotOwner()->CastToClient()->Message(Chat::White, "%s saved.", this->GetCleanName());
 		else
-			this->GetBotOwner()->CastToClient()->Message(13, "%s save failed!", this->GetCleanName());
+			this->GetBotOwner()->CastToClient()->Message(Chat::Red, "%s save failed!", this->GetCleanName());
 
-		// Spawn the bot at the bow owner's loc
+		// Spawn the bot at the bot owner's loc
 		this->m_Position.x = botCharacterOwner->GetX();
 		this->m_Position.y = botCharacterOwner->GetY();
 		this->m_Position.z = botCharacterOwner->GetZ();
@@ -3331,7 +4081,7 @@ uint32 Bot::GetBotItemBySlot(uint32 slotID)
 
 	if (!database.botdb.LoadItemBySlot(GetBotID(), slotID, item_id)) {
 		if (GetBotOwner() && GetBotOwner()->IsClient())
-			GetBotOwner()->CastToClient()->Message(13, "%s", BotDatabase::fail::LoadItemBySlot());
+			GetBotOwner()->CastToClient()->Message(Chat::Red, "%s", BotDatabase::fail::LoadItemBySlot());
 	}
 
 	return item_id;
@@ -3365,6 +4115,9 @@ void Bot::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) {
 		ns->spawn.helm = helmtexture; //(GetShowHelm() ? helmtexture : 0); //0xFF;
 		ns->spawn.equip_chest2 = texture; //0xFF;
 		ns->spawn.show_name = true;
+		strcpy(ns->spawn.lastName, GetSurname().c_str());
+		strcpy(ns->spawn.title, GetTitle().c_str());
+		strcpy(ns->spawn.suffix, GetSuffix().c_str());
 		const EQEmu::ItemData* item = nullptr;
 		const EQEmu::ItemInstance* inst = nullptr;
 		uint32 spawnedbotid = 0;
@@ -3434,7 +4187,7 @@ void Bot::LoadAndSpawnAllZonedBots(Client* botOwner) {
 				std::list<uint32> ActiveBots;
 				// Modified LoadGroupedBotsByGroupID to require a CharacterID
 				if (!database.botdb.LoadGroupedBotsByGroupID(botOwner->CharacterID(), TempGroupId, ActiveBots)) {
-					botOwner->Message(13, "%s", BotDatabase::fail::LoadGroupedBotsByGroupID());
+					botOwner->Message(Chat::Red, "%s", BotDatabase::fail::LoadGroupedBotsByGroupID());
 					return;
 				}
 				
@@ -3499,7 +4252,7 @@ void Bot::LevelBotWithClient(Client* client, uint8 level, bool sendlvlapp) {
 			Bot* bot = *biter;
 			if(bot && (bot->GetLevel() != client->GetLevel())) {
 				bot->SetPetChooser(false); // not sure what this does, but was in bot 'update' code
-				bot->CalcBotStats(client->GetBotOptionStatsUpdate());
+				bot->CalcBotStats(client->GetBotOption(Client::booStatsUpdate));
 				if(sendlvlapp)
 					bot->SendLevelAppearance();
 				// modified from Client::SetLevel()
@@ -3838,32 +4591,32 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 	}
 
 	if (client != GetOwner()) {
-		client->Message(CC_Red, "You are not the owner of this bot - Trade Canceled.");
+		client->Message(Chat::Red, "You are not the owner of this bot - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if ((beginSlotID != invslot::TRADE_BEGIN) && (beginSlotID != invslot::slotCursor)) {
-		client->Message(CC_Red, "Trade request processing from illegal 'begin' slot - Trade Canceled.");
+		client->Message(Chat::Red, "Trade request processing from illegal 'begin' slot - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if ((endSlotID != invslot::TRADE_END) && (endSlotID != invslot::slotCursor)) {
-		client->Message(CC_Red, "Trade request processing from illegal 'end' slot - Trade Canceled.");
+		client->Message(Chat::Red, "Trade request processing from illegal 'end' slot - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if (((beginSlotID == invslot::slotCursor) && (endSlotID != invslot::slotCursor)) || ((beginSlotID != invslot::slotCursor) && (endSlotID == invslot::slotCursor))) {
-		client->Message(CC_Red, "Trade request processing illegal slot range - Trade Canceled.");
+		client->Message(Chat::Red, "Trade request processing illegal slot range - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if (endSlotID < beginSlotID) {
-		client->Message(CC_Red, "Trade request processing in reverse slot order - Trade Canceled.");
+		client->Message(Chat::Red, "Trade request processing in reverse slot order - Trade Canceled.");
 		client->ResetTrade();
 		return;
 	}
 	if (client->IsEngaged() || IsEngaged()) {
-		client->Message(CC_Yellow, "You may not perform a trade while engaged - Trade Canceled!");
+		client->Message(Chat::Yellow, "You may not perform a trade while engaged - Trade Canceled!");
 		client->ResetTrade();
 		return;
 	}
@@ -3879,23 +4632,23 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 
 		if (!trade_instance->GetItem()) {
 			// TODO: add logging
-			client->Message(CC_Red, "A server error was encountered while processing client slot %i - Trade Canceled.", trade_index);
+			client->Message(Chat::Red, "A server error was encountered while processing client slot %i - Trade Canceled.", trade_index);
 			client->ResetTrade();
 			return;
 		}
 		if ((trade_index != invslot::slotCursor) && !trade_instance->IsDroppable()) {
 			// TODO: add logging
-			client->Message(CC_Red, "Trade hack detected - Trade Canceled.");
+			client->Message(Chat::Red, "Trade hack detected - Trade Canceled.");
 			client->ResetTrade();
 			return;
 		}
 		if (trade_instance->IsStackable() && (trade_instance->GetCharges() < trade_instance->GetItem()->StackSize)) { // temp until partial stacks are implemented
-			client->Message(CC_Yellow, "'%s' is only a partially stacked item - Trade Canceled!", trade_instance->GetItem()->Name);
+			client->Message(Chat::Yellow, "'%s' is only a partially stacked item - Trade Canceled!", trade_instance->GetItem()->Name);
 			client->ResetTrade();
 			return;
 		}
 		if (CheckLoreConflict(trade_instance->GetItem())) {
-			client->Message(CC_Yellow, "This bot already has lore equipment matching the item '%s' - Trade Canceled!", trade_instance->GetItem()->Name);
+			client->Message(Chat::Yellow, "This bot already has lore equipment matching the item '%s' - Trade Canceled!", trade_instance->GetItem()->Name);
 			client->ResetTrade();
 			return;
 		}
@@ -3925,13 +4678,13 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 			
 			if ((trade_iterator.tradeItemInstance->GetItem()->LoreGroup == -1) && (check_iterator.tradeItemInstance->GetItem()->ID == trade_iterator.tradeItemInstance->GetItem()->ID)) {
 				// TODO: add logging
-				client->Message(CC_Red, "Trade hack detected - Trade Canceled.");
+				client->Message(Chat::Red, "Trade hack detected - Trade Canceled.");
 				client->ResetTrade();
 				return;
 			}
 			if ((trade_iterator.tradeItemInstance->GetItem()->LoreGroup > 0) && (check_iterator.tradeItemInstance->GetItem()->LoreGroup == trade_iterator.tradeItemInstance->GetItem()->LoreGroup)) {
 				// TODO: add logging
-				client->Message(CC_Red, "Trade hack detected - Trade Canceled.");
+				client->Message(Chat::Red, "Trade hack detected - Trade Canceled.");
 				client->ResetTrade();
 				return;
 			}
@@ -4040,14 +4793,14 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 
 		if (!return_instance->GetItem()) {
 			// TODO: add logging
-			client->Message(CC_Red, "A server error was encountered while processing bot slot %i - Trade Canceled.", return_iterator.fromBotSlot);
+			client->Message(Chat::Red, "A server error was encountered while processing bot slot %i - Trade Canceled.", return_iterator.fromBotSlot);
 			client->ResetTrade();
 			return;
 		}
 		// non-failing checks above are causing this to trigger (i.e., !ItemClassCommon and !IsEquipable{race, class, min_level})
 		// this process is hindered by not having bots use the inventory trade method (TODO: implement bot inventory use)
 		if (client->CheckLoreConflict(return_instance->GetItem())) {
-			client->Message(CC_Yellow, "You already have lore equipment matching the item '%s' - Trade Canceled!", return_instance->GetItem()->Name);
+			client->Message(Chat::Yellow, "You already have lore equipment matching the item '%s' - Trade Canceled!", return_instance->GetItem()->Name);
 			client->ResetTrade();
 			return;
 		}
@@ -4104,7 +4857,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 		}
 
 		if (return_iterator.toClientSlot == invslot::SLOT_INVALID) {
-			client->Message(CC_Yellow, "You do not have room to complete this trade - Trade Canceled!");
+			client->Message(Chat::Yellow, "You do not have room to complete this trade - Trade Canceled!");
 			client->ResetTrade();
 			return;
 		}
@@ -4130,7 +4883,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 			//}
 
 			if (!database.botdb.DeleteItemBySlot(GetBotID(), return_iterator.fromBotSlot))
-				client->Message(CC_Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::DeleteItemBySlot(), return_iterator.fromBotSlot, (return_instance ? return_instance->GetItem()->Name : "nullptr"));
+				client->Message(Chat::Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::DeleteItemBySlot(), return_iterator.fromBotSlot, (return_instance ? return_instance->GetItem()->Name : "nullptr"));
 
 			BotRemoveEquipItem(return_iterator.fromBotSlot);
 			if (return_instance)
@@ -4145,7 +4898,7 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 		// TODO: code for stackables
 
 		if (!database.botdb.SaveItemBySlot(this, trade_iterator.toBotSlot, trade_iterator.tradeItemInstance))
-			client->Message(CC_Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::SaveItemBySlot(), trade_iterator.toBotSlot, (trade_iterator.tradeItemInstance ? trade_iterator.tradeItemInstance->GetItem()->Name : "nullptr"));
+			client->Message(Chat::Red, "%s (slot: %i, name: '%s')", BotDatabase::fail::SaveItemBySlot(), trade_iterator.toBotSlot, (trade_iterator.tradeItemInstance ? trade_iterator.tradeItemInstance->GetItem()->Name : "nullptr"));
 
 		m_inv.PutItem(trade_iterator.toBotSlot, *trade_iterator.tradeItemInstance);
 		this->BotAddEquipItem(trade_iterator.toBotSlot, (trade_iterator.tradeItemInstance ? trade_iterator.tradeItemInstance->GetID() : 0));
@@ -4165,20 +4918,20 @@ void Bot::PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* cli
 	// trade messages
 	for (const auto& return_iterator : client_return) {
 		if (return_iterator.failedItemName.size())
-			client->Message(MT_Tell, "%s tells you, \"%s, I can't use this '%s.'\"", GetCleanName(), client->GetName(), return_iterator.failedItemName.c_str());
+			client->Message(Chat::Tell, "%s tells you, \"%s, I can't use this '%s.'\"", GetCleanName(), client->GetName(), return_iterator.failedItemName.c_str());
 	}
 	for (const auto& trade_iterator : client_trade) {
 		if (trade_iterator.acceptedItemName.size())
-			client->Message(MT_Tell, "%s tells you, \"Thank you for the '%s,' %s!\"", GetCleanName(), trade_iterator.acceptedItemName.c_str(), client->GetName());
+			client->Message(Chat::Tell, "%s tells you, \"Thank you for the '%s,' %s!\"", GetCleanName(), trade_iterator.acceptedItemName.c_str(), client->GetName());
 	}
 
 	size_t accepted_count = client_trade.size();
 	size_t returned_count = client_return.size();
 
-	client->Message(CC_Lime, "Trade with '%s' resulted in %i accepted item%s, %i returned item%s.", GetCleanName(), accepted_count, ((accepted_count == 1) ? "" : "s"), returned_count, ((returned_count == 1) ? "" : "s"));
+	client->Message(Chat::Lime, "Trade with '%s' resulted in %i accepted item%s, %i returned item%s.", GetCleanName(), accepted_count, ((accepted_count == 1) ? "" : "s"), returned_count, ((returned_count == 1) ? "" : "s"));
 
 	if (accepted_count)
-		CalcBotStats(client->GetBotOptionStatsUpdate());
+		CalcBotStats(client->GetBotOption(Client::booStatsUpdate));
 }
 
 bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill) {
@@ -4188,11 +4941,11 @@ bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQEmu::skills::Sk
 	Save();
 
 	Mob *my_owner = GetBotOwner();
-	if (my_owner && my_owner->IsClient() && my_owner->CastToClient()->GetBotOptionDeathMarquee()) {
+	if (my_owner && my_owner->IsClient() && my_owner->CastToClient()->GetBotOption(Client::booDeathMarquee)) {
 		if (killerMob)
-			my_owner->CastToClient()->SendMarqueeMessage(CC_Yellow, 510, 0, 1000, 3000, StringFormat("%s has been slain by %s", GetCleanName(), killerMob->GetCleanName()));
+			my_owner->CastToClient()->SendMarqueeMessage(Chat::Red, 510, 0, 1000, 3000, StringFormat("%s has been slain by %s", GetCleanName(), killerMob->GetCleanName()));
 		else
-			my_owner->CastToClient()->SendMarqueeMessage(CC_Yellow, 510, 0, 1000, 3000, StringFormat("%s has been slain", GetCleanName()));
+			my_owner->CastToClient()->SendMarqueeMessage(Chat::Red, 510, 0, 1000, 3000, StringFormat("%s has been slain", GetCleanName()));
 	}
 
 	Mob *give_exp = hate_list.GetDamageTopOnHateList(this);
@@ -4261,6 +5014,10 @@ bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQEmu::skills::Sk
 
 	LeaveHealRotationMemberPool();
 
+	if ((GetPullingFlag() || GetReturningFlag()) && my_owner && my_owner->IsClient()) {
+		my_owner->CastToClient()->SetBotPulling(false);
+	}
+
 	entity_list.RemoveBot(this->GetID());
 	return true;
 }
@@ -4271,7 +5028,7 @@ void Bot::Damage(Mob *from, int32 damage, uint16 spell_id, EQEmu::skills::SkillT
 
 	//handle EVENT_ATTACK. Resets after we have not been attacked for 12 seconds
 	if(attacked_timer.Check()) {
-		Log(Logs::Detail, Logs::Combat, "Triggering EVENT_ATTACK due to attack by %s", from->GetName());
+		LogCombat("Triggering EVENT_ATTACK due to attack by [{}]", from->GetName());
 		parse->EventNPC(EVENT_ATTACK, this, from, "", 0);
 	}
 
@@ -4279,9 +5036,9 @@ void Bot::Damage(Mob *from, int32 damage, uint16 spell_id, EQEmu::skills::SkillT
 	// if spell is lifetap add hp to the caster
 	if (spell_id != SPELL_UNKNOWN && IsLifetapSpell(spell_id)) {
 		int healed = GetActSpellHealing(spell_id, damage);
-		Log(Logs::Detail, Logs::Combat, "Applying lifetap heal of %d to %s", healed, GetCleanName());
+		LogCombat("Applying lifetap heal of [{}] to [{}]", healed, GetCleanName());
 		HealDamage(healed);
-		entity_list.MessageClose(this, true, 300, MT_Spells, "%s beams a smile at %s", GetCleanName(), from->GetCleanName() );
+		entity_list.MessageClose(this, true, 300, Chat::Spells, "%s beams a smile at %s", GetCleanName(), from->GetCleanName() );
 	}
 
 	CommonDamage(from, damage, spell_id, attack_skill, avoidable, buffslot, iBuffTic, special);
@@ -4315,13 +5072,13 @@ void Bot::AddToHateList(Mob* other, uint32 hate, int32 damage, bool iYellForHelp
 bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, bool IsFromSpell, ExtraAttackOptions *opts) {	
 	if (!other) {
 		SetTarget(nullptr);
-		Log(Logs::General, Logs::Error, "A null Mob object was passed to Bot::Attack for evaluation!");
+		LogError("A null Mob object was passed to Bot::Attack for evaluation!");
 		return false;
 	}
 
 	if ((GetHP() <= 0) || (GetAppearance() == eaDead)) {
 		SetTarget(nullptr);
-		Log(Logs::Detail, Logs::Combat, "Attempted to attack %s while unconscious or, otherwise, appearing dead", other->GetCleanName());
+		LogCombat("Attempted to attack [{}] while unconscious or, otherwise, appearing dead", other->GetCleanName());
 		return false;
 	}
 
@@ -4333,20 +5090,20 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b
 	// takes more to compare a call result, load for a call, load a compare to address and compare, and finally
 	// push a value to an address than to just load for a call and push a value to an address.
 	
-	Log(Logs::Detail, Logs::Combat, "Attacking %s with hand %d %s", other->GetCleanName(), Hand, (FromRiposte ? "(this is a riposte)" : ""));
+	LogCombat("Attacking [{}] with hand [{}] [{}]", other->GetCleanName(), Hand, (FromRiposte ? "(this is a riposte)" : ""));
 	if ((IsCasting() && (GetClass() != BARD) && !IsFromSpell) || (!IsAttackAllowed(other))) {
 		if(this->GetOwnerID())
 			entity_list.MessageClose(this, 1, 200, 10, "%s says, '%s is not a legal target master.'", this->GetCleanName(), this->GetTarget()->GetCleanName());
 
 		if(other) {
 			RemoveFromHateList(other);
-			Log(Logs::Detail, Logs::Combat, "I am not allowed to attack %s", other->GetCleanName());
+			LogCombat("I am not allowed to attack [{}]", other->GetCleanName());
 		}
 		return false;
 	}
 
 	if(DivineAura()) {//cant attack while invulnerable
-		Log(Logs::Detail, Logs::Combat, "Attack canceled, Divine Aura is in effect.");
+		LogCombat("Attack canceled, Divine Aura is in effect");
 		return false;
 	}
 
@@ -4364,19 +5121,19 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b
 
 	if(weapon != nullptr) {
 		if (!weapon->IsWeapon()) {
-			Log(Logs::Detail, Logs::Combat, "Attack canceled, Item %s (%d) is not a weapon.", weapon->GetItem()->Name, weapon->GetID());
+			LogCombat("Attack canceled, Item [{}] ([{}]) is not a weapon", weapon->GetItem()->Name, weapon->GetID());
 			return false;
 		}
-		Log(Logs::Detail, Logs::Combat, "Attacking with weapon: %s (%d)", weapon->GetItem()->Name, weapon->GetID());
+		LogCombat("Attacking with weapon: [{}] ([{}])", weapon->GetItem()->Name, weapon->GetID());
 	}
 	else
-		Log(Logs::Detail, Logs::Combat, "Attacking without a weapon.");
+		LogCombat("Attacking without a weapon");
 
 	// calculate attack_skill and skillinuse depending on hand and weapon
 	// also send Packet to near clients
 	DamageHitInfo my_hit;
 	my_hit.skill = AttackAnimation(Hand, weapon);
-	Log(Logs::Detail, Logs::Combat, "Attacking with %s in slot %d using skill %d", weapon?weapon->GetItem()->Name:"Fist", Hand, my_hit.skill);
+	LogCombat("Attacking with [{}] in slot [{}] using skill [{}]", weapon?weapon->GetItem()->Name:"Fist", Hand, my_hit.skill);
 
 	// Now figure out damage
 	my_hit.damage_done = 1;
@@ -4424,7 +5181,7 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b
 			}
 		}
 
-		Log(Logs::Detail, Logs::Combat, "Damage calculated: base %d min damage %d skill %d", my_hit.base_damage, my_hit.min_damage, my_hit.skill);
+		LogCombat("Damage calculated: base [{}] min damage [{}] skill [{}]", my_hit.base_damage, my_hit.min_damage, my_hit.skill);
 
 		int hit_chance_bonus = 0;
 		my_hit.offense = offense(my_hit.skill);
@@ -4442,7 +5199,7 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b
 
 		DoAttack(other, my_hit, opts);
 
-		Log(Logs::Detail, Logs::Combat, "Final damage after all reductions: %d", my_hit.damage_done);
+		LogCombat("Final damage after all reductions: [{}]", my_hit.damage_done);
 	} else {
 		my_hit.damage_done = DMG_INVULNERABLE;
 	}
@@ -4477,7 +5234,7 @@ bool Bot::Attack(Mob* other, int Hand, bool FromRiposte, bool IsStrikethrough, b
 		return false;
 }
 
-int32 Bot::CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint32 points, uint16 spell_id)
+int32 Bot::CalcBotAAFocus(focusType type, uint32 aa_ID, uint32 points, uint16 spell_id)
 {
 	const SPDat_Spell_Struct &spell = spells[spell_id];
 	int32 value = 0;
@@ -4631,6 +5388,10 @@ int32 Bot::CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint32 points, uint16
 				if (type == focusImprovedDamage && base1 > value)
 					value = base1;
 				break;
+			case SE_ImprovedDamage2:
+				if (type == focusImprovedDamage2 && base1 > value)
+					value = base1;
+				break;
 			case SE_ImprovedHeal:
 				if (type == focusImprovedHeal && base1 > value)
 					value = base1;
@@ -4742,6 +5503,11 @@ int32 Bot::CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint32 points, uint16
 					value = base1;
 				break;
 			}
+			case SE_FcDamageAmt2: {
+				if(type == focusFcDamageAmt2)
+					value = base1;
+				break;
+			}
 			case SE_FcDamageAmtCrit: {
 				if(type == focusFcDamageAmtCrit)
 					value = base1;
@@ -4800,8 +5566,8 @@ int32 Bot::CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint32 points, uint16
 	return (value * lvlModifier / 100);
 }
 
-int32 Bot::GetBotFocusEffect(BotfocusType bottype, uint16 spell_id) {
-	if (IsBardSong(spell_id) && bottype != BotfocusFcBaseEffects)
+int32 Bot::GetBotFocusEffect(focusType bottype, uint16 spell_id) {
+	if (IsBardSong(spell_id) && bottype != focusFcBaseEffects)
 		return 0;
 
 	int32 realTotal = 0;
@@ -4810,7 +5576,7 @@ int32 Bot::GetBotFocusEffect(BotfocusType bottype, uint16 spell_id) {
 	bool rand_effectiveness = false;
 	//Improved Healing, Damage & Mana Reduction are handled differently in that some are random percentages
 	//In these cases we need to find the most powerful effect, so that each piece of gear wont get its own chance
-	if((bottype == BotfocusManaCost || bottype == BotfocusImprovedHeal || bottype == BotfocusImprovedDamage) && RuleB(Spells, LiveLikeFocusEffects))
+	if(RuleB(Spells, LiveLikeFocusEffects) && (bottype == focusManaCost || bottype == focusImprovedHeal || bottype == focusImprovedDamage || bottype == focusImprovedDamage2 || bottype == focusResistRate))
 		rand_effectiveness = true;
 
 	//Check if item focus effect exists for the client.
@@ -4951,16 +5717,16 @@ int32 Bot::GetBotFocusEffect(BotfocusType bottype, uint16 spell_id) {
 		}
 	}
 
-	if(bottype == BotfocusReagentCost && IsSummonPetSpell(spell_id) && GetAA(aaElementalPact))
+	if(bottype == focusReagentCost && IsSummonPetSpell(spell_id) && GetAA(aaElementalPact))
 		return 100;
 
-	if(bottype == BotfocusReagentCost && (IsEffectInSpell(spell_id, SE_SummonItem) || IsSacrificeSpell(spell_id)))
+	if(bottype == focusReagentCost && (IsEffectInSpell(spell_id, SE_SummonItem) || IsSacrificeSpell(spell_id)))
 		return 0;
 
 	return (realTotal + realTotal2);
 }
 
-int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spell_id, bool best_focus) {
+int32 Bot::CalcBotFocusEffect(focusType bottype, uint16 focus_id, uint16 spell_id, bool best_focus) {
 	if(!IsValidSpell(focus_id) || !IsValidSpell(spell_id))
 		return 0;
 
@@ -5054,7 +5820,7 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
 							return 0;
 						break;
 					default:
-						Log(Logs::General, Logs::Normal, "CalcFocusEffect: unknown limit spelltype %d", focus_spell.base[i]);
+						LogInfo("CalcFocusEffect: unknown limit spelltype [{}]", focus_spell.base[i]);
 				}
 				break;
 
@@ -5090,7 +5856,21 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
 					return 0;
 				break;
 			case SE_ImprovedDamage:
-				if (bottype == BotfocusImprovedDamage) {
+				if (bottype == focusImprovedDamage) {
+					if(best_focus) {
+						if (focus_spell.base2[i] != 0)
+							value = focus_spell.base2[i];
+						else
+							value = focus_spell.base[i];
+					}
+					else if (focus_spell.base2[i] == 0 || focus_spell.base[i] == focus_spell.base2[i])
+						value = focus_spell.base[i];
+					else
+						value = zone->random.Int(focus_spell.base[i], focus_spell.base2[i]);
+				}
+				break;
+			case SE_ImprovedDamage2:
+				if (bottype == focusImprovedDamage2) {
 					if(best_focus) {
 						if (focus_spell.base2[i] != 0)
 							value = focus_spell.base2[i];
@@ -5104,7 +5884,7 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
 				}
 				break;
 			case SE_ImprovedHeal:
-				if (bottype == BotfocusImprovedHeal) {
+				if (bottype == focusImprovedHeal) {
 					if(best_focus) {
 						if (focus_spell.base2[i] != 0)
 							value = focus_spell.base2[i];
@@ -5118,7 +5898,7 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
 				}
 				break;
 			case SE_ReduceManaCost:
-				if (bottype == BotfocusManaCost) {
+				if (bottype == focusManaCost) {
 					if(best_focus) {
 						if (focus_spell.base2[i] != 0)
 							value = focus_spell.base2[i];
@@ -5132,39 +5912,39 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
 				}
 				break;
 			case SE_IncreaseSpellHaste:
-				if (bottype == BotfocusSpellHaste && focus_spell.base[i] > value)
+				if (bottype == focusSpellHaste && focus_spell.base[i] > value)
 					value = focus_spell.base[i];
 				break;
 			case SE_IncreaseSpellDuration:
-				if (bottype == BotfocusSpellDuration && focus_spell.base[i] > value)
+				if (bottype == focusSpellDuration && focus_spell.base[i] > value)
 					value = focus_spell.base[i];
 				break;
 			case SE_SpellDurationIncByTic:
-				if (bottype == BotfocusSpellDurByTic && focus_spell.base[i] > value)
+				if (bottype == focusSpellDurByTic && focus_spell.base[i] > value)
 					value = focus_spell.base[i];
 				break;
 			case SE_SwarmPetDuration:
-				if (bottype == BotfocusSwarmPetDuration && focus_spell.base[i] > value)
+				if (bottype == focusSwarmPetDuration && focus_spell.base[i] > value)
 					value = focus_spell.base[i];
 				break;
 			case SE_IncreaseRange:
-				if (bottype == BotfocusRange && focus_spell.base[i] > value)
+				if (bottype == focusRange && focus_spell.base[i] > value)
 					value = focus_spell.base[i];
 				break;
 			case SE_ReduceReagentCost:
-				if (bottype == BotfocusReagentCost && focus_spell.base[i] > value)
+				if (bottype == focusReagentCost && focus_spell.base[i] > value)
 					value = focus_spell.base[i];
 				break;
 			case SE_PetPowerIncrease:
-				if (bottype == BotfocusPetPower && focus_spell.base[i] > value)
+				if (bottype == focusPetPower && focus_spell.base[i] > value)
 					value = focus_spell.base[i];
 				break;
 			case SE_SpellResistReduction:
-				if (bottype == BotfocusResistRate && focus_spell.base[i] > value)
+				if (bottype == focusResistRate && focus_spell.base[i] > value)
 					value = focus_spell.base[i];
 				break;
 			case SE_SpellHateMod:
-				if (bottype == BotfocusSpellHateMod) {
+				if (bottype == focusSpellHateMod) {
 					if(value != 0) {
 						if(value > 0) {
 							if(focus_spell.base[i] > value)
@@ -5179,12 +5959,12 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
 				}
 				break;
 			case SE_ReduceReuseTimer: {
-				if(bottype == BotfocusReduceRecastTime)
+				if(bottype == focusReduceRecastTime)
 					value = (focus_spell.base[i] / 1000);
 				break;
 			}
 			case SE_TriggerOnCast: {
-				if(bottype == BotfocusTriggerOnCast) {
+				if(bottype == focusTriggerOnCast) {
 					if(zone->random.Int(0, 100) <= focus_spell.base[i])
 						value = focus_spell.base2[i];
 					else
@@ -5193,24 +5973,24 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
 				break;
 			}
 			case SE_FcSpellVulnerability: {
-				if(bottype == BotfocusSpellVulnerability)
+				if(bottype == focusSpellVulnerability)
 					value = focus_spell.base[i];
 				break;
 			}
 			case SE_BlockNextSpellFocus: {
-				if(bottype == BotfocusBlockNextSpell) {
+				if(bottype == focusBlockNextSpell) {
 					if(zone->random.Int(1, 100) <= focus_spell.base[i])
 						value = 1;
 				}
 				break;
 			}
 			case SE_FcTwincast: {
-				if(bottype == BotfocusTwincast)
+				if(bottype == focusTwincast)
 					value = focus_spell.base[i];
 				break;
 			}
 			case SE_SympatheticProc: {
-				if(bottype == BotfocusSympatheticProc) {
+				if(bottype == focusSympatheticProc) {
 					float ProcChance = GetSympatheticProcChances(spell_id, focus_spell.base[i]);
 					if(zone->random.Real(0, 1) <= ProcChance)
 						value = focus_id;
@@ -5220,55 +6000,60 @@ int32 Bot::CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spel
 				break;
 			}
 			case SE_FcDamageAmt: {
-				if(bottype == BotfocusFcDamageAmt)
+				if(bottype == focusFcDamageAmt)
+					value = focus_spell.base[i];
+				break;
+			}
+			case SE_FcDamageAmt2: {
+				if(bottype == focusFcDamageAmt2)
 					value = focus_spell.base[i];
 				break;
 			}
 			case SE_FcDamageAmtCrit: {
-				if(bottype == BotfocusFcDamageAmtCrit)
+				if(bottype == focusFcDamageAmtCrit)
 					value = focus_spell.base[i];
 				break;
 			}
 			case SE_FcHealAmtIncoming:
-				if(bottype == BotfocusFcHealAmtIncoming)
+				if(bottype == focusFcHealAmtIncoming)
 					value = focus_spell.base[i];
 				break;
 			case SE_FcHealPctCritIncoming:
-				if (bottype == BotfocusFcHealPctCritIncoming)
+				if (bottype == focusFcHealPctCritIncoming)
 					value = focus_spell.base[i];
 				break;
 			case SE_FcHealAmtCrit:
-				if(bottype == BotfocusFcHealAmtCrit)
+				if(bottype == focusFcHealAmtCrit)
 					value = focus_spell.base[i];
 				break;
 			case  SE_FcHealAmt:
-				if(bottype == BotfocusFcHealAmt)
+				if(bottype == focusFcHealAmt)
 					value = focus_spell.base[i];
 				break;
 			case SE_FcHealPctIncoming:
-				if(bottype == BotfocusFcHealPctIncoming)
+				if(bottype == focusFcHealPctIncoming)
 					value = focus_spell.base[i];
 				break;
 			case SE_FcBaseEffects: {
-				if (bottype == BotfocusFcBaseEffects)
+				if (bottype == focusFcBaseEffects)
 					value = focus_spell.base[i];
 
 				break;
 			}
 			case SE_FcDamagePctCrit: {
-				if(bottype == BotfocusFcDamagePctCrit)
+				if(bottype == focusFcDamagePctCrit)
 					value = focus_spell.base[i];
 
 				break;
 			}
 			case SE_FcIncreaseNumHits: {
-				if(bottype == BotfocusIncreaseNumHits)
+				if(bottype == focusIncreaseNumHits)
 					value = focus_spell.base[i];
 
 				break;
 			}
 			default:
-				Log(Logs::General, Logs::Spells, "CalcFocusEffect: unknown effectid %d", focus_spell.effectid[i]);
+				LogSpells("CalcFocusEffect: unknown effectid [{}]", focus_spell.effectid[i]);
 				break;
 		}
 	}
@@ -5308,7 +6093,7 @@ float Bot::GetProcChances(float ProcBonus, uint16 hand) {
 		ProcChance += (ProcChance * ProcBonus / 100.0f);
 	}
 
-	Log(Logs::Detail, Logs::Combat, "Proc chance %.2f (%.2f from bonuses)", ProcChance, ProcBonus);
+	LogCombat("Proc chance [{}] ([{}] from bonuses)", ProcChance, ProcBonus);
 	return ProcChance;
 }
 
@@ -5362,13 +6147,13 @@ bool Bot::TryFinishingBlow(Mob *defender, int &damage)
 		int fb_damage = aabonuses.FinishingBlow[1];
 		int levelreq = aabonuses.FinishingBlowLvl[0];
 		if (defender->GetLevel() <= levelreq && (chance >= zone->random.Int(1, 1000))) {
-			Log(Logs::Detail, Logs::Combat, "Landed a finishing blow: levelreq at %d, other level %d",
+			LogCombat("Landed a finishing blow: levelreq at [{}], other level [{}]",
 				levelreq, defender->GetLevel());
-			entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, FINISHING_BLOW, GetName());
+			entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, FINISHING_BLOW, GetName());
 			damage = fb_damage;
 			return true;
 		} else {
-			Log(Logs::Detail, Logs::Combat, "FAILED a finishing blow: levelreq at %d, other level %d",
+			LogCombat("failed a finishing blow: levelreq at [{}], other level [{}]",
 				levelreq, defender->GetLevel());
 			return false;
 		}
@@ -5377,14 +6162,14 @@ bool Bot::TryFinishingBlow(Mob *defender, int &damage)
 }
 
 void Bot::DoRiposte(Mob* defender) {
-	Log(Logs::Detail, Logs::Combat, "Preforming a riposte");
+	LogCombat("Preforming a riposte");
 	if (!defender)
 		return;
 
 	defender->Attack(this, EQEmu::invslot::slotPrimary, true);
 	int32 DoubleRipChance = (defender->GetAABonuses().GiveDoubleRiposte[0] + defender->GetSpellBonuses().GiveDoubleRiposte[0] + defender->GetItemBonuses().GiveDoubleRiposte[0]);
 	if(DoubleRipChance && (DoubleRipChance >= zone->random.Int(0, 100))) {
-		Log(Logs::Detail, Logs::Combat, "Preforming a double riposte (%d percent chance)", DoubleRipChance);
+		LogCombat("Preforming a double riposte ([{}] percent chance)", DoubleRipChance);
 		defender->Attack(this, EQEmu::invslot::slotPrimary, true);
 	}
 
@@ -5572,7 +6357,7 @@ void Bot::TryBackstab(Mob *other, int ReuseTime) {
 	if (bIsBehind || bCanFrontalBS) {
 		int chance = (10 + (GetDEX() / 10) + (itembonuses.HeroicDEX / 10));
 		if(level >= 60 && other->GetLevel() <= 45 && !other->CastToNPC()->IsEngaged() && other->GetHP()<= 32000 && other->IsNPC() && zone->random.Real(0, 99) < chance) {
-			entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, ASSASSINATES, GetName());
+			entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, ASSASSINATES, GetName());
 			RogueAssassinate(other);
 		} else {
 			RogueBackstab(other);
@@ -5802,14 +6587,14 @@ void Bot::DoClassAttacks(Mob *target, bool IsRiposte) {
 
 int32 Bot::CheckAggroAmount(uint16 spellid) {
 	int32 AggroAmount = Mob::CheckAggroAmount(spellid, nullptr);
-	int32 focusAggro = GetBotFocusEffect(BotfocusSpellHateMod, spellid);
+	int32 focusAggro = GetBotFocusEffect(focusSpellHateMod, spellid);
 	AggroAmount = (AggroAmount * (100 + focusAggro) / 100);
 	return AggroAmount;
 }
 
 int32 Bot::CheckHealAggroAmount(uint16 spellid, Mob *target, uint32 heal_possible) {
 	int32 AggroAmount = Mob::CheckHealAggroAmount(spellid, target, heal_possible);
-	int32 focusAggro = GetBotFocusEffect(BotfocusSpellHateMod, spellid);
+	int32 focusAggro = GetBotFocusEffect(focusSpellHateMod, spellid);
 	AggroAmount = (AggroAmount * (100 + focusAggro) / 100);
 	return AggroAmount;
 }
@@ -5940,12 +6725,12 @@ void Bot::ProcessGuildInvite(Client* guildOfficer, Bot* botToGuild) {
 	if(guildOfficer && botToGuild) {
 		if(!botToGuild->IsInAGuild()) {
 			if (!guild_mgr.CheckPermission(guildOfficer->GuildID(), guildOfficer->GuildRank(), GUILD_INVITE)) {
-				guildOfficer->Message(13, "You dont have permission to invite.");
+				guildOfficer->Message(Chat::Red, "You dont have permission to invite.");
 				return;
 			}
 
 			if (!database.botdb.SaveGuildMembership(botToGuild->GetBotID(), guildOfficer->GuildID(), GUILD_MEMBER)) {
-				guildOfficer->Message(13, "%s for '%s'", BotDatabase::fail::SaveGuildMembership(), botToGuild->GetCleanName());
+				guildOfficer->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::SaveGuildMembership(), botToGuild->GetCleanName());
 				return;
 			}
 			
@@ -5958,7 +6743,7 @@ void Bot::ProcessGuildInvite(Client* guildOfficer, Bot* botToGuild) {
 
 			safe_delete(pack);
 		} else {
-			guildOfficer->Message(13, "Bot is in a guild.");
+			guildOfficer->Message(Chat::Red, "Bot is in a guild.");
 			return;
 		}
 	}
@@ -5974,10 +6759,10 @@ bool Bot::ProcessGuildRemoval(Client* guildOfficer, std::string botName) {
 		} else {
 			uint32 ownerId = 0;
 			if (!database.botdb.LoadOwnerID(botName, ownerId))
-				guildOfficer->Message(13, "%s for '%s'", BotDatabase::fail::LoadOwnerID(), botName.c_str());
+				guildOfficer->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadOwnerID(), botName.c_str());
 			uint32 botId = 0;
 			if (!database.botdb.LoadBotID(ownerId, botName, botId))
-				guildOfficer->Message(13, "%s for '%s'", BotDatabase::fail::LoadBotID(), botName.c_str());
+				guildOfficer->Message(Chat::Red, "%s for '%s'", BotDatabase::fail::LoadBotID(), botName.c_str());
 			if (botId && database.botdb.SaveGuildMembership(botId, 0, 0))
 				Result = true;
 		}
@@ -5987,7 +6772,7 @@ bool Bot::ProcessGuildRemoval(Client* guildOfficer, std::string botName) {
 			GuildManageRemove_Struct* gm = (GuildManageRemove_Struct*) outapp->pBuffer;
 			gm->guildeqid = guildOfficer->GuildID();
 			strcpy(gm->member, botName.c_str());
-			guildOfficer->Message(0, "%s successfully removed from your guild.", botName.c_str());
+			guildOfficer->Message(Chat::White, "%s successfully removed from your guild.", botName.c_str());
 			entity_list.QueueClientsGuild(guildOfficer, outapp, false, gm->guildeqid);
 			safe_delete(outapp);
 		}
@@ -6007,7 +6792,7 @@ int32 Bot::CalcMaxMana() {
 			break;
 		}
 		default: {
-			Log(Logs::General, Logs::None, "Invalid Class '%c' in CalcMaxMana", GetCasterClass());
+			LogDebug("Invalid Class [{}] in CalcMaxMana", GetCasterClass());
 			max_mana = 0;
 			break;
 		}
@@ -6083,7 +6868,7 @@ int32 Bot::GetActSpellDamage(uint16 spell_id, int32 value, Mob* target) {
 
 	bool Critical = false;
 	int32 value_BaseEffect = 0;
-	value_BaseEffect = (value + (value*GetBotFocusEffect(BotfocusFcBaseEffects, spell_id) / 100));
+	value_BaseEffect = (value + (value*GetBotFocusEffect(focusFcBaseEffects, spell_id) / 100));
 	// Need to scale HT damage differently after level 40! It no longer scales by the constant value in the spell file. It scales differently, instead of 10 more damage per level, it does 30 more damage per level. So we multiply the level minus 40 times 20 if they are over level 40.
 	if ( (spell_id == SPELL_HARM_TOUCH || spell_id == SPELL_HARM_TOUCH2 || spell_id == SPELL_IMP_HARM_TOUCH ) && GetLevel() > 40)
 		value -= ((GetLevel() - 40) * 20);
@@ -6111,36 +6896,40 @@ int32 Bot::GetActSpellDamage(uint16 spell_id, int32 value, Mob* target) {
 		ratio += RuleI(Spells, WizCritRatio);
 		if (Critical) {
 			value = (value_BaseEffect * ratio / 100);
-			value += (value_BaseEffect * GetBotFocusEffect(BotfocusImprovedDamage, spell_id) / 100);
-			value += (int(value_BaseEffect * GetBotFocusEffect(BotfocusFcDamagePctCrit, spell_id) / 100) * ratio / 100);
+			value += (value_BaseEffect * GetBotFocusEffect(focusImprovedDamage, spell_id) / 100);
+			value += (value_BaseEffect * GetBotFocusEffect(focusImprovedDamage2, spell_id) / 100);
+			value += (int(value_BaseEffect * GetBotFocusEffect(focusFcDamagePctCrit, spell_id) / 100) * ratio / 100);
 			if (target) {
 				value += (int(value_BaseEffect * target->GetVulnerability(this, spell_id, 0) / 100) * ratio / 100);
 				value -= target->GetFcDamageAmtIncoming(this, spell_id);
 			}
 
-			value -= (GetBotFocusEffect(BotfocusFcDamageAmtCrit, spell_id) * ratio / 100);
+			value -= (GetBotFocusEffect(focusFcDamageAmtCrit, spell_id) * ratio / 100);
 
-			value -= GetBotFocusEffect(BotfocusFcDamageAmt, spell_id);
+			value -= GetBotFocusEffect(focusFcDamageAmt, spell_id);
+			value -= GetBotFocusEffect(focusFcDamageAmt2, spell_id);
 
 			if(itembonuses.SpellDmg && spells[spell_id].classes[(GetClass() % 17) - 1] >= GetLevel() - 5)
 				value += (GetExtraSpellAmt(spell_id, itembonuses.SpellDmg, value) * ratio / 100);
 
-			entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s delivers a critical blast! (%d)", GetName(), -value);
+			entity_list.MessageClose(this, false, 100, Chat::SpellCrit, "%s delivers a critical blast! (%d)", GetName(), -value);
 
 			return value;
 		}
 	}
 
 	value = value_BaseEffect;
-	value += (value_BaseEffect * GetBotFocusEffect(BotfocusImprovedDamage, spell_id) / 100);
-	value += (value_BaseEffect * GetBotFocusEffect(BotfocusFcDamagePctCrit, spell_id) / 100);
+	value += (value_BaseEffect * GetBotFocusEffect(focusImprovedDamage, spell_id) / 100);
+	value += (value_BaseEffect * GetBotFocusEffect(focusImprovedDamage2, spell_id) / 100);
+	value += (value_BaseEffect * GetBotFocusEffect(focusFcDamagePctCrit, spell_id) / 100);
 	if (target) {
 		value += (value_BaseEffect * target->GetVulnerability(this, spell_id, 0) / 100);
 		value -= target->GetFcDamageAmtIncoming(this, spell_id);
 	}
 
-	value -= GetBotFocusEffect(BotfocusFcDamageAmtCrit, spell_id);
-	value -= GetBotFocusEffect(BotfocusFcDamageAmt, spell_id);
+	value -= GetBotFocusEffect(focusFcDamageAmtCrit, spell_id);
+	value -= GetBotFocusEffect(focusFcDamageAmt, spell_id);
+	value -= GetBotFocusEffect(focusFcDamageAmt2, spell_id);
 	if(itembonuses.SpellDmg && spells[spell_id].classes[(GetClass() % 17) - 1] >= GetLevel() - 5)
 		value += GetExtraSpellAmt(spell_id, itembonuses.SpellDmg, value);
 
@@ -6155,9 +6944,9 @@ int32 Bot::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
 	int32 chance = 0;
 	int8 modifier = 1;
 	bool Critical = false;
-	value_BaseEffect = (value + (value*GetBotFocusEffect(BotfocusFcBaseEffects, spell_id) / 100));
+	value_BaseEffect = (value + (value*GetBotFocusEffect(focusFcBaseEffects, spell_id) / 100));
 	value = value_BaseEffect;
-	value += int(value_BaseEffect*GetBotFocusEffect(BotfocusImprovedHeal, spell_id) / 100);
+	value += int(value_BaseEffect*GetBotFocusEffect(focusImprovedHeal, spell_id) / 100);
 	if(spells[spell_id].buffduration < 1) {
 		chance += (itembonuses.CriticalHealChance + spellbonuses.CriticalHealChance + aabonuses.CriticalHealChance);
 		chance += target->GetFocusIncoming(focusFcHealPctCritIncoming, SE_FcHealPctCritIncoming, this, spell_id);
@@ -6170,8 +6959,8 @@ int32 Bot::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
 		}
 
 		value *= modifier;
-		value += (GetBotFocusEffect(BotfocusFcHealAmtCrit, spell_id) * modifier);
-		value += GetBotFocusEffect(BotfocusFcHealAmt, spell_id);
+		value += (GetBotFocusEffect(focusFcHealAmtCrit, spell_id) * modifier);
+		value += GetBotFocusEffect(focusFcHealAmt, spell_id);
 		value += target->GetFocusIncoming(focusFcHealAmtIncoming, SE_FcHealAmtIncoming, this, spell_id);
 
 		if(itembonuses.HealAmt && spells[spell_id].classes[(GetClass() % 17) - 1] >= GetLevel() - 5)
@@ -6179,7 +6968,7 @@ int32 Bot::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
 
 		value += (value * target->GetHealRate(spell_id, this) / 100);
 		if (Critical)
-			entity_list.MessageClose(this, false, 100, MT_SpellCrits, "%s performs an exceptional heal! (%d)", GetName(), value);
+			entity_list.MessageClose(this, false, 100, Chat::SpellCrit, "%s performs an exceptional heal! (%d)", GetName(), value);
 
 		return value;
 	} else {
@@ -6196,7 +6985,7 @@ int32 Bot::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
 
 int32 Bot::GetActSpellCasttime(uint16 spell_id, int32 casttime) {
 	int32 cast_reducer = 0;
-	cast_reducer += GetBotFocusEffect(BotfocusSpellHaste, spell_id);
+	cast_reducer += GetBotFocusEffect(focusSpellHaste, spell_id);
 	uint8 botlevel = GetLevel();
 	uint8 botclass = GetClass();
 	if (botlevel >= 51 && casttime >= 3000 && !BeneficialSpell(spell_id) && (botclass == SHADOWKNIGHT || botclass == RANGER || botclass == PALADIN || botclass == BEASTLORD ))
@@ -6331,7 +7120,7 @@ int32 Bot::GetActSpellCost(uint16 spell_id, int32 cost) {
 		}
 	}
 
-	int32 focus_redux = GetBotFocusEffect(BotfocusManaCost, spell_id);
+	int32 focus_redux = GetBotFocusEffect(focusManaCost, spell_id);
 
 	if(focus_redux > 0)
 		PercentManaReduction += zone->random.Real(1, (double)focus_redux);
@@ -6358,14 +7147,14 @@ int32 Bot::GetActSpellCost(uint16 spell_id, int32 cost) {
 
 float Bot::GetActSpellRange(uint16 spell_id, float range) {
 	float extrange = 100;
-	extrange += GetBotFocusEffect(BotfocusRange, spell_id);
+	extrange += GetBotFocusEffect(focusRange, spell_id);
 	return ((range * extrange) / 100);
 }
 
 int32 Bot::GetActSpellDuration(uint16 spell_id, int32 duration) {
 	int increase = 100;
-	increase += GetBotFocusEffect(BotfocusSpellDuration, spell_id);
-	int tic_inc = 0;	tic_inc = GetBotFocusEffect(BotfocusSpellDurByTic, spell_id);
+	increase += GetBotFocusEffect(focusSpellDuration, spell_id);
+	int tic_inc = 0;	tic_inc = GetBotFocusEffect(focusSpellDurByTic, spell_id);
 
 	if(IsBeneficialSpell(spell_id)) {
 		switch (GetAA(aaSpellCastingReinforcement)) {
@@ -6435,20 +7224,20 @@ bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlo
 					uint32* oSpellWillFinish, uint32 item_slot, int16 *resist_adjust, uint32 aa_id) {
 	bool Result = false;
 	if(zone && !zone->IsSpellBlocked(spell_id, glm::vec3(GetPosition()))) {
-		Log(Logs::Detail, Logs::Spells, "CastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item slot %d", spells[spell_id].name, spell_id, target_id, slot, cast_time, mana_cost, (item_slot==0xFFFFFFFF)?999:item_slot);
+		// LogSpells("CastSpell called for spell [{}] ([{}]) on entity [{}], slot [{}], time [{}], mana [{}], from item slot [{}]", spells[spell_id].name, spell_id, target_id, slot, cast_time, mana_cost, (item_slot==0xFFFFFFFF)?999:item_slot);
 
 		if(casting_spell_id == spell_id)
 			ZeroCastingVars();
 
 		if(GetClass() != BARD) {
 			if(!IsValidSpell(spell_id) || casting_spell_id || delaytimer || spellend_timer.Enabled() || IsStunned() || IsFeared() || IsMezzed() || (IsSilenced() && !IsDiscipline(spell_id)) || (IsAmnesiad() && IsDiscipline(spell_id))) {
-				Log(Logs::Detail, Logs::Spells, "Spell casting canceled: not able to cast now. Valid? %d, casting %d, waiting? %d, spellend? %d, stunned? %d, feared? %d, mezed? %d, silenced? %d", IsValidSpell(spell_id), casting_spell_id, delaytimer, spellend_timer.Enabled(), IsStunned(), IsFeared(), IsMezzed(), IsSilenced() );
+				LogSpells("Spell casting canceled: not able to cast now. Valid? [{}], casting [{}], waiting? [{}], spellend? [{}], stunned? [{}], feared? [{}], mezed? [{}], silenced? [{}]", IsValidSpell(spell_id), casting_spell_id, delaytimer, spellend_timer.Enabled(), IsStunned(), IsFeared(), IsMezzed(), IsSilenced() );
 				if(IsSilenced() && !IsDiscipline(spell_id))
-					Message_StringID(13, SILENCED_STRING);
+					MessageString(Chat::Red, SILENCED_STRING);
 
 				if(IsAmnesiad() && IsDiscipline(spell_id))
 
-					Message_StringID(13, MELEE_SILENCE);
+					MessageString(Chat::Red, MELEE_SILENCE);
 
 				if(casting_spell_id)
 					AI_Event_SpellCastFinished(false, static_cast<uint16>(casting_spell_slot));
@@ -6458,7 +7247,7 @@ bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlo
 		}
 
 		if(IsDetrimentalSpell(spell_id) && !zone->CanDoCombat()){
-			Message_StringID(13, SPELL_WOULDNT_HOLD);
+			MessageString(Chat::Red, SPELL_WOULDNT_HOLD);
 			if(casting_spell_id)
 				AI_Event_SpellCastFinished(false, static_cast<uint16>(casting_spell_slot));
 
@@ -6466,7 +7255,7 @@ bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlo
 		}
 
 		if(DivineAura()) {
-			Log(Logs::Detail, Logs::Spells, "Spell casting canceled: cannot cast while Divine Aura is in effect.");
+			LogSpells("Spell casting canceled: cannot cast while Divine Aura is in effect");
 			InterruptSpell(173, 0x121, false);
 			return false;
 		}
@@ -6476,13 +7265,13 @@ bool Bot::CastSpell(uint16 spell_id, uint16 target_id, EQEmu::spells::CastingSlo
 			InterruptSpell(fizzle_msg, 0x121, spell_id);
 
 			uint32 use_mana = ((spells[spell_id].mana) / 4);
-			Log(Logs::Detail, Logs::Spells, "Spell casting canceled: fizzled. %d mana has been consumed", use_mana);
+			LogSpells("Spell casting canceled: fizzled. [{}] mana has been consumed", use_mana);
 			SetMana(GetMana() - use_mana);
 			return false;
 		}
 
 		if (HasActiveSong()) {
-			Log(Logs::Detail, Logs::Spells, "Casting a new spell/song while singing a song. Killing old song %d.", bardsong);
+			LogSpells("Casting a new spell/song while singing a song. Killing old song [{}]", bardsong);
 			bardsong = 0;
 			bardsong_target_id = 0;
 			bardsong_slot = EQEmu::spells::CastingSlot::Gem1;
@@ -6596,19 +7385,19 @@ bool Bot::IsImmuneToSpell(uint16 spell_id, Mob *caster) {
 			if(caster->IsBot()) {
 				if(spells[spell_id].targettype == ST_Undead) {
 					if((GetBodyType() != BT_SummonedUndead) && (GetBodyType() != BT_Undead) && (GetBodyType() != BT_Vampire)) {
-						Log(Logs::Detail, Logs::Spells, "Bot's target is not an undead.");
+						LogSpells("Bot's target is not an undead");
 						return true;
 					}
 				}
 				if(spells[spell_id].targettype == ST_Summoned) {
 					if((GetBodyType() != BT_SummonedUndead) && (GetBodyType() != BT_Summoned) && (GetBodyType() != BT_Summoned2) && (GetBodyType() != BT_Summoned3)) {
-						Log(Logs::Detail, Logs::Spells, "Bot's target is not a summoned creature.");
+						LogSpells("Bot's target is not a summoned creature");
 						return true;
 					}
 				}
 			}
 
-			Log(Logs::Detail, Logs::Spells, "No bot immunities to spell %d found.", spell_id);
+			LogSpells("No bot immunities to spell [{}] found", spell_id);
 		}
 	}
 
@@ -6759,7 +7548,7 @@ bool Bot::DoFinishedSpellSingleTarget(uint16 spell_id, Mob* spellTarget, EQEmu::
 					if((spelltypeequal || spelltypetargetequal) || spelltypeclassequal || slotequal) {
 						if(((spells[thespell].effectid[0] == 0) && (spells[thespell].base[0] < 0)) &&
 							(spellTarget->GetHP() < ((spells[thespell].base[0] * (-1)) + 100))) {
-							Log(Logs::General, Logs::Spells, "Bot::DoFinishedSpellSingleTarget - GroupBuffing failure");
+							LogSpells("Bot::DoFinishedSpellSingleTarget - GroupBuffing failure");
 							return false;
 						}
 
@@ -7465,9 +8254,14 @@ void Bot::DoEnduranceUpkeep() {
 void Bot::Camp(bool databaseSave) {
 	Sit();
 
-	if(IsGrouped())
+	//auto group = GetGroup();
+	if(GetGroup())
 		RemoveBotFromGroup(this, GetGroup());
 
+	// RemoveBotFromGroup() code is too complicated for this to work as-is (still needs to be addressed to prevent memory leaks)
+	//if (group->GroupCount() < 2)
+	//	group->DisbandGroup();
+
 	LeaveHealRotationMemberPool();
 
 	if(databaseSave)
@@ -8155,52 +8949,58 @@ void Bot::CalcBotStats(bool showtext) {
 		return;
 
 	if(showtext) {
-		GetBotOwner()->Message(15, "Updating %s...", GetCleanName());
+		GetBotOwner()->Message(Chat::Yellow, "Updating %s...", GetCleanName());
 	}
 
-	if(!IsValidRaceClassCombo()) {
-		GetBotOwner()->Message(15, "A %s - %s bot was detected. Is this Race/Class combination allowed?.", GetRaceIDName(GetRace()), GetClassIDName(GetClass(), GetLevel()));
-		GetBotOwner()->Message(15, "Previous Bots Code releases did not check Race/Class combinations during create.");
-		GetBotOwner()->Message(15, "Unless you are experiencing heavy lag, you should delete and remake this bot.");
-	}
+	// this code is annoying since many classes change their name and illusions change the race id
+	/*if(!IsValidRaceClassCombo()) {
+		GetBotOwner()->Message(Chat::Yellow, "A %s - %s bot was detected. Is this Race/Class combination allowed?.", GetRaceIDName(GetRace()), GetClassIDName(GetClass(), GetLevel()));
+		GetBotOwner()->Message(Chat::Yellow, "Previous Bots Code releases did not check Race/Class combinations during create.");
+		GetBotOwner()->Message(Chat::Yellow, "Unless you are experiencing heavy lag, you should delete and remake this bot.");
+	}*/
 
 	if(GetBotOwner()->GetLevel() != GetLevel())
 		SetLevel(GetBotOwner()->GetLevel());
 
+	for (int sindex = 0; sindex <= EQEmu::skills::HIGHEST_SKILL; ++sindex) {
+		skills[sindex] = database.GetSkillCap(GetClass(), (EQEmu::skills::SkillType)sindex, GetLevel());
+	}
+
+	LoadAAs();
 	GenerateSpecialAttacks();
 
 	if(showtext) {
-		GetBotOwner()->Message(15, "Base stats:");
-		GetBotOwner()->Message(15, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), base_hp, AC, max_mana, STR, STA, DEX, AGI, INT, WIS, CHA);
-		GetBotOwner()->Message(15, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",MR,PR,FR,CR,DR,Corrup);
+		GetBotOwner()->Message(Chat::Yellow, "Base stats:");
+		GetBotOwner()->Message(Chat::Yellow, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), base_hp, AC, max_mana, STR, STA, DEX, AGI, INT, WIS, CHA);
+		GetBotOwner()->Message(Chat::Yellow, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",MR,PR,FR,CR,DR,Corrup);
 		// Test Code
 		if(GetClass() == BARD)
-			GetBotOwner()->Message(15, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i",
+			GetBotOwner()->Message(Chat::Yellow, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i",
 			GetSkill(EQEmu::skills::SkillBrassInstruments), GetSkill(EQEmu::skills::SkillPercussionInstruments), GetSkill(EQEmu::skills::SkillSinging), GetSkill(EQEmu::skills::SkillStringedInstruments), GetSkill(EQEmu::skills::SkillWindInstruments));
 	}
 
 	//if(this->Save())
-	//	this->GetBotOwner()->CastToClient()->Message(0, "%s saved.", this->GetCleanName());
+	//	this->GetBotOwner()->CastToClient()->Message(Chat::White, "%s saved.", this->GetCleanName());
 	//else
-	//	this->GetBotOwner()->CastToClient()->Message(13, "%s save failed!", this->GetCleanName());
+	//	this->GetBotOwner()->CastToClient()->Message(Chat::Red, "%s save failed!", this->GetCleanName());
 
 	CalcBonuses();
 
 	AI_AddNPCSpells(this->GetBotSpellID());
 
 	if(showtext) {
-		GetBotOwner()->Message(15, "%s has been updated.", GetCleanName());
-		GetBotOwner()->Message(15, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), max_hp, GetAC(), max_mana, GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
-		GetBotOwner()->Message(15, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",GetMR(),GetPR(),GetFR(),GetCR(),GetDR(),GetCorrup());
+		GetBotOwner()->Message(Chat::Yellow, "%s has been updated.", GetCleanName());
+		GetBotOwner()->Message(Chat::Yellow, "Level: %i HP: %i AC: %i Mana: %i STR: %i STA: %i DEX: %i AGI: %i INT: %i WIS: %i CHA: %i", GetLevel(), max_hp, GetAC(), max_mana, GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
+		GetBotOwner()->Message(Chat::Yellow, "Resists-- Magic: %i, Poison: %i, Fire: %i, Cold: %i, Disease: %i, Corruption: %i.",GetMR(),GetPR(),GetFR(),GetCR(),GetDR(),GetCorrup());
 		// Test Code
 		if(GetClass() == BARD) {
-			GetBotOwner()->Message(15, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i",
+			GetBotOwner()->Message(Chat::Yellow, "Bard Skills-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i",
 				GetSkill(EQEmu::skills::SkillBrassInstruments) + GetBrassMod(),
 				GetSkill(EQEmu::skills::SkillPercussionInstruments) + GetPercMod(),
 				GetSkill(EQEmu::skills::SkillSinging) + GetSingMod(),
 				GetSkill(EQEmu::skills::SkillStringedInstruments) + GetStringMod(),
 				GetSkill(EQEmu::skills::SkillWindInstruments) + GetWindMod());
-			GetBotOwner()->Message(15, "Bard Skill Mods-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", GetBrassMod(), GetPercMod(), GetSingMod(), GetStringMod(), GetWindMod());
+			GetBotOwner()->Message(Chat::Yellow, "Bard Skill Mods-- Brass: %i, Percussion: %i, Singing: %i, Stringed: %i, Wind: %i", GetBrassMod(), GetPercMod(), GetSingMod(), GetStringMod(), GetWindMod());
 		}
 	}
 }
@@ -8218,7 +9018,7 @@ bool Bot::CheckLoreConflict(const EQEmu::ItemData* item) {
 
 bool EntityList::Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint32 iSpellTypes) {
 	if((iSpellTypes & SPELL_TYPES_DETRIMENTAL) != 0) {
-		Log(Logs::General, Logs::Error, "Error: detrimental spells requested from AICheckCloseBeneficialSpells!!");
+		LogError("Error: detrimental spells requested from AICheckCloseBeneficialSpells!!");
 		return false;
 	}
 
@@ -8444,6 +9244,20 @@ Bot* EntityList::GetBotByBotName(std::string botName) {
 	return Result;
 }
 
+Client* EntityList::GetBotOwnerByBotEntityID(uint16 entityID) {
+	Client* Result = nullptr;
+	if (entityID > 0) {
+		for (std::list<Bot*>::iterator botListItr = bot_list.begin(); botListItr != bot_list.end(); ++botListItr) {
+			Bot* tempBot = *botListItr;
+			if (tempBot && tempBot->GetID() == entityID) {
+				Result = tempBot->GetBotOwner()->CastToClient();
+				break;
+			}
+		}
+	}
+	return Result;
+}
+
 void EntityList::AddBot(Bot *newBot, bool SendSpawnPacket, bool dontqueue) {
 	if(newBot) {
 		newBot->SetID(GetFreeID());
@@ -8606,6 +9420,39 @@ void EntityList::ShowSpawnWindow(Client* client, int Distance, bool NamedOnly) {
 	return;
 }
 
+/**
+ * @param close_mobs
+ * @param scanning_mob
+ */
+void EntityList::ScanCloseClientMobs(std::unordered_map<uint16, Mob*>& close_mobs, Mob* scanning_mob)
+{
+	float scan_range = RuleI(Range, MobCloseScanDistance) * RuleI(Range, MobCloseScanDistance);
+
+	close_mobs.clear();
+
+	for (auto& e : mob_list) {
+		auto mob = e.second;
+
+		if (!mob->IsClient()) {
+			continue;
+		}
+
+		if (mob->GetID() <= 0) {
+			continue;
+		}
+
+		float distance = DistanceSquared(scanning_mob->GetPosition(), mob->GetPosition());
+		if (distance <= scan_range) {
+			close_mobs.insert(std::pair<uint16, Mob*>(mob->GetID(), mob));
+		}
+		else if (mob->GetAggroRange() >= scan_range) {
+			close_mobs.insert(std::pair<uint16, Mob*>(mob->GetID(), mob));
+		}
+	}
+
+	LogAIScanClose("Close Client Mob List Size [{}] for mob [{}]", close_mobs.size(), scanning_mob->GetCleanName());
+}
+
 uint8 Bot::GetNumberNeedingHealedInGroup(uint8 hpr, bool includePets) {
 	uint8 needHealed = 0;
 	Group *g = nullptr;
@@ -8776,18 +9623,19 @@ bool Bot::GetNeedsHateRedux(Mob *tar) {
 	if (!tar || !tar->IsEngaged() || !tar->HasTargetReflection() || !tar->GetTarget()->IsNPC())
 		return false;
 	
-	if (tar->IsClient()) {
-		switch (tar->GetClass()) {
-			// TODO: figure out affectable classes..
-			// Might need flag to allow player to determine redux req...
-		default:
-			return false;
-		}
-	}
-	else if (tar->IsBot()) {
+	//if (tar->IsClient()) {
+	//	switch (tar->GetClass()) {
+	//		// TODO: figure out affectable classes..
+	//		// Might need flag to allow player to determine redux req...
+	//	default:
+	//		return false;
+	//	}
+	//}
+	//else if (tar->IsBot()) {
+	if (tar->IsBot()) {
 		switch (tar->GetClass()) {
 		case ROGUE:
-			if (tar->CanFacestab() || tar->CastToBot()->evade_timer.Check(false))
+			if (tar->CanFacestab() || tar->CastToBot()->m_evade_timer.Check(false))
 				return false;
 		case CLERIC:
 		case DRUID:
@@ -8868,7 +9716,7 @@ bool Bot::UseDiscipline(uint32 spell_id, uint32 target) {
 				SetDisciplineRecastTimer(spells[spell_id].EndurTimerIndex, spell.recast_time);
 		} else {
 			uint32 remain = (GetDisciplineRemainingTime(this, spells[spell_id].EndurTimerIndex) / 1000);
-			GetOwner()->Message(0, "%s can use this discipline in %d minutes %d seconds.", GetCleanName(), (remain / 60), (remain % 60));
+			GetOwner()->Message(Chat::White, "%s can use this discipline in %d minutes %d seconds.", GetCleanName(), (remain / 60), (remain % 60));
 			return false;
 		}
 	}
@@ -9070,7 +9918,7 @@ bool Bot::DyeArmor(int16 slot_id, uint32 rgb, bool all_flag, bool save_flag)
 
 		if (!database.botdb.SaveEquipmentColor(GetBotID(), save_slot, rgb)) {
 			if (GetBotOwner() && GetBotOwner()->IsClient())
-				GetBotOwner()->CastToClient()->Message(13, "%s", BotDatabase::fail::SaveEquipmentColor());
+				GetBotOwner()->CastToClient()->Message(Chat::Red, "%s", BotDatabase::fail::SaveEquipmentColor());
 			return false;
 		}
 	}
@@ -9100,6 +9948,22 @@ std::string Bot::CreateSayLink(Client* c, const char* message, const char* name)
 	return saylink;
 }
 
+void Bot::StopMoving()
+{
+	//SetCombatJitterFlag(false);
+	//m_combat_jitter_timer.Start(zone->random.Int(BOT_COMBAT_JITTER_INTERVAL_MIN, BOT_COMBAT_JITTER_INTERVAL_MAX));
+
+	Mob::StopMoving();
+}
+
+void Bot::StopMoving(float new_heading)
+{
+	//SetCombatJitterFlag(false);
+	//m_combat_jitter_timer.Start(zone->random.Int(BOT_COMBAT_JITTER_INTERVAL_MIN, BOT_COMBAT_JITTER_INTERVAL_MAX));
+
+	Mob::StopMoving(new_heading);
+}
+
 uint8 Bot::spell_casting_chances[SPELL_TYPE_COUNT][PLAYER_CLASS_COUNT][EQEmu::constants::STANCE_TYPE_COUNT][cntHSND] = { 0 };
 
 #endif
diff --git a/zone/bot.h b/zone/bot.h
index 3b363748a..b456fd77f 100644
--- a/zone/bot.h
+++ b/zone/bot.h
@@ -37,21 +37,22 @@
 
 #include <sstream>
 
-#define BOT_FOLLOW_DISTANCE_DEFAULT 184 // as DSq value (~13.565 units)
-#define BOT_FOLLOW_DISTANCE_DEFAULT_MAX 2500 // as DSq value (50 units)
-#define BOT_FOLLOW_DISTANCE_WALK 1000 // as DSq value (~31.623 units)
+constexpr float BOT_FOLLOW_DISTANCE_DEFAULT = 184.0f; // as DSq value (~13.565 units)
+constexpr float BOT_FOLLOW_DISTANCE_DEFAULT_MAX = 2500.0f; // as DSq value (50 units)
+constexpr float BOT_FOLLOW_DISTANCE_WALK = 1000.0f; // as DSq value (~31.623 units)
 
-#define BOT_LEASH_DISTANCE 250000 // as DSq value (500 units)
+constexpr uint32 BOT_KEEP_ALIVE_INTERVAL = 5000; // 5 seconds
 
-#define BOT_KEEP_ALIVE_INTERVAL 5000 // 5 seconds
+//constexpr uint32 BOT_COMBAT_JITTER_INTERVAL_MIN = 5000; // 5 seconds
+//constexpr uint32 BOT_COMBAT_JITTER_INTERVAL_MAX = 20000; // 20 seconds
 
 extern WorldServer worldserver;
 
-const int BotAISpellRange = 100; // TODO: Write a method that calcs what the bot's spell range is based on spell, equipment, AA, whatever and replace this
-const int MaxSpellTimer = 15;
-const int MaxDisciplineTimer = 10;
-const int DisciplineReuseStart = MaxSpellTimer + 1;
-const int MaxTimer = MaxSpellTimer + MaxDisciplineTimer;
+constexpr int BotAISpellRange = 100; // TODO: Write a method that calcs what the bot's spell range is based on spell, equipment, AA, whatever and replace this
+constexpr int MaxSpellTimer = 15;
+constexpr int MaxDisciplineTimer = 10;
+constexpr int DisciplineReuseStart = MaxSpellTimer + 1;
+constexpr int MaxTimer = MaxSpellTimer + MaxDisciplineTimer;
 
 
 
@@ -98,40 +99,6 @@ class Bot : public NPC {
 	friend class Mob;
 public:
 	// Class enums
-	enum BotfocusType {	//focus types
-		BotfocusSpellHaste = 1,
-		BotfocusSpellDuration,
-		BotfocusRange,
-		BotfocusReagentCost,
-		BotfocusManaCost,
-		BotfocusImprovedHeal,
-		BotfocusImprovedDamage,
-		BotfocusImprovedDOT,		//i dont know about this...
-		BotfocusFcDamagePctCrit,
-		BotfocusImprovedUndeadDamage,
-		BotfocusPetPower,
-		BotfocusResistRate,
-		BotfocusSpellHateMod,
-		BotfocusTriggerOnCast,
-		BotfocusSpellVulnerability,
-		BotfocusTwincast,
-		BotfocusSympatheticProc,
-		BotfocusFcDamageAmt,
-		BotfocusFcDamageAmtCrit,
-		BotfocusSpellDurByTic,
-		BotfocusSwarmPetDuration,
-		BotfocusReduceRecastTime,
-		BotfocusBlockNextSpell,
-		BotfocusFcHealPctIncoming,
-		BotfocusFcDamageAmtIncoming,
-		BotfocusFcHealAmtIncoming,
-		BotfocusFcBaseEffects,
-		BotfocusIncreaseNumHits,
-		BotfocusFcHealPctCritIncoming,
-		BotfocusFcHealAmt,
-		BotfocusFcHealAmtCrit,
-	};
-
 	enum BotTradeType {	// types of trades a bot can do
 		BotTradeClientNormal,
 		BotTradeClientNoDropNoTrade
@@ -260,17 +227,36 @@ public:
 	void Stand();
 	bool IsSitting();
 	bool IsStanding();
-	virtual int GetWalkspeed() const { return (int)((float)_GetWalkSpeed() * 1.785714f); } // 1.25 / 0.7 = 1.7857142857142857142857142857143
-	virtual int GetRunspeed() const { return (int)((float)_GetRunSpeed() * 1.785714f); }
+	virtual int GetWalkspeed() const { return (int)((float)_GetWalkSpeed() * 1.785714285f); } // 1.25 / 0.7 = 1.7857142857142857142857142857143
+	virtual int GetRunspeed() const { return (int)((float)_GetRunSpeed() * 1.785714285f); }
 	virtual void WalkTo(float x, float y, float z);
 	virtual void RunTo(float x, float y, float z);
+	virtual void StopMoving();
+	virtual void StopMoving(float new_heading);
+	//bool GetCombatJitterFlag() { return m_combat_jitter_flag; }
+	bool GetGuardFlag() { return m_guard_flag; }
+	void SetGuardFlag(bool flag = true) { m_guard_flag = flag; }
+	bool GetHoldFlag() { return m_hold_flag; }
+	void SetHoldFlag(bool flag = true) { m_hold_flag = flag; }
+	bool GetAttackFlag() { return m_attack_flag; }
+	void SetAttackFlag(bool flag = true) { m_attack_flag = flag; }
+	bool GetAttackingFlag() { return m_attacking_flag; }
+	bool GetPullFlag() { return m_pull_flag; }
+	void SetPullFlag(bool flag = true) { m_pull_flag = flag; }
+	bool GetPullingFlag() { return m_pulling_flag; }
+	bool GetReturningFlag() { return m_returning_flag; }
 	bool UseDiscipline(uint32 spell_id, uint32 target);
 	uint8 GetNumberNeedingHealedInGroup(uint8 hpr, bool includePets);
 	bool GetNeedsCured(Mob *tar);
 	bool GetNeedsHateRedux(Mob *tar);
 	bool HasOrMayGetAggro();
 	void SetDefaultBotStance();
-
+	void SetSurname(std::string bot_surname);
+	void SetTitle(std::string bot_title);
+	void SetSuffix(std::string bot_suffix);
+	std::string GetSurname() { return _surname; }
+	std::string GetTitle() { return _title; }
+	std::string GetSuffix() { return _suffix; }
 	inline virtual int32	GetMaxStat();
 	inline virtual int32	GetMaxResist();
 	inline virtual int32	GetMaxSTR();
@@ -333,6 +319,7 @@ public:
 	uint8 GetStopMeleeLevel() { return _stopMeleeLevel; }
 	void SetStopMeleeLevel(uint8 level);
 	void SetGuardMode();
+	void SetHoldMode();
 	
 	// Mob AI Virtual Override Methods
 	virtual void AI_Process();
@@ -362,6 +349,7 @@ public:
 	void EquipBot(std::string* errorMessage);
 	bool CheckLoreConflict(const EQEmu::ItemData* item);
 	virtual void UpdateEquipmentLight() { m_Light.Type[EQEmu::lightsource::LightEquipment] = m_inv.FindBrightestLightType(); m_Light.Level[EQEmu::lightsource::LightEquipment] = EQEmu::lightsource::TypeToLevel(m_Light.Type[EQEmu::lightsource::LightEquipment]); }
+	const EQEmu::InventoryProfile& GetBotInv() const { return m_inv; }
 
 	// Static Class Methods	
 	//static void DestroyBotRaidObjects(Client* client);	// Can be removed after bot raids are dumped
@@ -614,9 +602,9 @@ protected:
 	virtual void PetAIProcess();
 	virtual void BotMeditate(bool isSitting);
 	virtual bool CheckBotDoubleAttack(bool Triple = false);
-	virtual int32 GetBotFocusEffect(BotfocusType bottype, uint16 spell_id);
-	virtual int32 CalcBotFocusEffect(BotfocusType bottype, uint16 focus_id, uint16 spell_id, bool best_focus=false);
-	virtual int32 CalcBotAAFocus(BotfocusType type, uint32 aa_ID, uint32 points, uint16 spell_id);
+	virtual int32 GetBotFocusEffect(focusType bottype, uint16 spell_id);
+	virtual int32 CalcBotFocusEffect(focusType bottype, uint16 focus_id, uint16 spell_id, bool best_focus=false);
+	virtual int32 CalcBotAAFocus(focusType type, uint32 aa_ID, uint32 points, uint16 spell_id);
 	virtual void PerformTradeWithClient(int16 beginSlotID, int16 endSlotID, Client* client);
 	virtual bool AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore = 0);
 
@@ -650,6 +638,9 @@ private:
 	uint32 _guildId;
 	uint8 _guildRank;
 	std::string _guildName;
+	std::string _surname;
+	std::string _title;
+	std::string _suffix;
 	uint32 _lastZoneId;
 	bool _rangerAutoWeaponSelect;
 	BotRoleType _botRole;
@@ -666,7 +657,19 @@ private:
 	int32	end_regen;
 	uint32 timers[MaxTimer];
 	
-	Timer evade_timer; // can be moved to pTimers at some point
+	Timer m_evade_timer; // can be moved to pTimers at some point
+	Timer m_alt_combat_hate_timer;
+	Timer m_auto_defend_timer;
+	//Timer m_combat_jitter_timer;
+	//bool m_combat_jitter_flag;
+	bool m_guard_flag;
+	bool m_hold_flag;
+	bool m_attack_flag;
+	bool m_attacking_flag;
+	bool m_pull_flag;
+	bool m_pulling_flag;
+	bool m_returning_flag;
+	eStandingPetOrder m_previous_pet_order;
 
 	BotCastingRoles m_CastingRoles;
 
@@ -708,6 +711,10 @@ private:
 	int32 GenerateBaseManaPoints();
 	void GenerateSpecialAttacks();
 	void SetBotID(uint32 botID);
+	//void SetCombatJitterFlag(bool flag = true) { m_combat_jitter_flag = flag; }
+	void SetAttackingFlag(bool flag = true) { m_attacking_flag = flag; }
+	void SetPullingFlag(bool flag = true) { m_pulling_flag = flag; }
+	void SetReturningFlag(bool flag = true) { m_returning_flag = flag; }
 
 	// Private "Inventory" Methods
 	void GetBotItems(EQEmu::InventoryProfile &inv, std::string* errorMessage);
diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp
index 69191d991..dc9d40aab 100644
--- a/zone/bot_command.cpp
+++ b/zone/bot_command.cpp
@@ -71,6 +71,8 @@
 #include "water_map.h"
 #include "worldserver.h"
 
+#include <fmt/format.h>
+
 extern QueryServ* QServ;
 extern WorldServer worldserver;
 extern TaskManager *taskmanager;
@@ -84,17 +86,18 @@ namespace
 {
 //#define BCSTSPELLDUMP // only needed if you're adding/tailoring bot command spells and need a file dump
 
-#define m_message CC_WhiteSmoke
-#define m_action CC_Yellow
-#define m_note CC_Gray
-#define m_usage CC_Cyan
-#define m_fail CC_Red
-#define m_unknown CC_Magenta
+#define m_message Chat::White
+#define m_action Chat::Yellow
+#define m_note Chat::Gray
+#define m_usage Chat::Cyan
+#define m_fail Chat::Red
+#define m_unknown Chat::Magenta
 
 #define HP_RATIO_DELTA 5.0f
 
 	enum { EffectIDFirst = 1, EffectIDLast = 12 };
 
+#define VALIDATECLASSID(x) ((x >= WARRIOR && x <= BERSERKER) ? (x) : (0))
 #define CLASSIDTOINDEX(x) ((x >= WARRIOR && x <= BERSERKER) ? (x - 1) : (0))
 #define EFFECTIDTOINDEX(x) ((x >= EffectIDFirst && x <= EffectIDLast) ? (x - 1) : (0))
 #define AILMENTIDTOINDEX(x) ((x >= BCEnum::AT_Blindness && x <= BCEnum::AT_Corruption) ? (x - 1) : (0))
@@ -453,7 +456,7 @@ public:
 			
 			if (target_type == BCEnum::TT_Self && (entry_prototype->BCST() != BCEnum::SpT_Stance && entry_prototype->BCST() != BCEnum::SpT_SummonCorpse)) {
 #ifdef BCSTSPELLDUMP
-				Log(Logs::General, Logs::Error, "DELETING entry_prototype (primary clause) - name: %s, target_type: %s, BCST: %s",
+				LogError("DELETING entry_prototype (primary clause) - name: [{}], target_type: [{}], BCST: [{}]",
 					spells[spell_id].name, BCEnum::TargetTypeEnumToString(target_type).c_str(), BCEnum::SpellTypeEnumToString(entry_prototype->BCST()).c_str());
 #endif
 				safe_delete(entry_prototype);
@@ -461,7 +464,7 @@ public:
 			}
 			if (entry_prototype->BCST() == BCEnum::SpT_Stance && target_type != BCEnum::TT_Self) {
 #ifdef BCSTSPELLDUMP
-				Log(Logs::General, Logs::Error, "DELETING entry_prototype (secondary clause) - name: %s, BCST: %s, target_type: %s",
+				LogError("DELETING entry_prototype (secondary clause) - name: [{}], BCST: [{}], target_type: [{}]",
 					spells[spell_id].name, BCEnum::SpellTypeEnumToString(entry_prototype->BCST()).c_str(), BCEnum::TargetTypeEnumToString(target_type).c_str());
 #endif
 				safe_delete(entry_prototype);
@@ -1060,7 +1063,7 @@ private:
 		std::string query = "SELECT `short_name`, `long_name` FROM `zone` WHERE '' NOT IN (`short_name`, `long_name`)";
 		auto results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			Log(Logs::General, Logs::Error, "load_teleport_zone_names() - Error in zone names query: %s", results.ErrorMessage().c_str());
+			LogError("load_teleport_zone_names() - Error in zone names query: [{}]", results.ErrorMessage().c_str());
 			return;
 		}
 
@@ -1087,14 +1090,14 @@ private:
 	}
 
 	static void status_report() {
-		Log(Logs::General, Logs::Commands, "load_bot_command_spells(): - 'RuleI(Bots, CommandSpellRank)' set to %i.", RuleI(Bots, CommandSpellRank));
+		LogCommands("load_bot_command_spells(): - 'RuleI(Bots, CommandSpellRank)' set to [{}]", RuleI(Bots, CommandSpellRank));
 		if (bot_command_spells.empty()) {
-			Log(Logs::General, Logs::Error, "load_bot_command_spells() - 'bot_command_spells' is empty.");
+			LogError("load_bot_command_spells() - 'bot_command_spells' is empty");
 			return;
 		}
 
 		for (int i = BCEnum::SpellTypeFirst; i <= BCEnum::SpellTypeLast; ++i)
-			Log(Logs::General, Logs::Commands, "load_bot_command_spells(): - '%s' returned %u spell entries.",
+			LogCommands("load_bot_command_spells(): - [{}] returned [{}] spell entries",
 				BCEnum::SpellTypeEnumToString(static_cast<BCEnum::SpType>(i)).c_str(), bot_command_spells[static_cast<BCEnum::SpType>(i)].size());
 	}
 
@@ -1318,6 +1321,8 @@ int bot_command_init(void)
 	if (
 		bot_command_add("actionable", "Lists actionable command arguments and use descriptions", 0, bot_command_actionable) ||
 		bot_command_add("aggressive", "Orders a bot to use a aggressive discipline", 0, bot_command_aggressive) ||
+		bot_command_add("applypoison", "Applies cursor-held poison to a rogue bot's weapon", 0, bot_command_apply_poison) ||
+		bot_command_add("applypotion", "Applies cursor-held potion to a bot's effects", 0, bot_command_apply_potion) ||
 		bot_command_add("attack", "Orders bots to attack a designated target", 0, bot_command_attack) ||
 		bot_command_add("bindaffinity", "Orders a bot to attempt an affinity binding", 0, bot_command_bind_affinity) ||
 		bot_command_add("bot", "Lists the available bot management [subcommands]", 0, bot_command_bot) ||
@@ -1350,10 +1355,13 @@ int bot_command_init(void)
 		bot_command_add("botspawn", "Spawns a created bot", 0, bot_subcommand_bot_spawn) ||
 		bot_command_add("botstance", "Changes the stance of a bot", 0, bot_subcommand_bot_stance) ||
 		bot_command_add("botstopmeleelevel", "Sets the level a caster or spell-casting fighter bot will stop melee combat", 0, bot_subcommand_bot_stop_melee_level) ||
+		bot_command_add("botsuffix", "Sets a bots suffix", 0, bot_subcommand_bot_suffix) ||
 		bot_command_add("botsummon", "Summons bot(s) to your location", 0, bot_subcommand_bot_summon) ||
+		bot_command_add("botsurname", "Sets a bots surname (last name)", 0, bot_subcommand_bot_surname) ||
 		bot_command_add("bottattoo", "Changes the Drakkin tattoo of a bot", 0, bot_subcommand_bot_tattoo) ||
 		bot_command_add("bottogglearcher", "Toggles a archer bot between melee and ranged weapon use", 0, bot_subcommand_bot_toggle_archer) ||
 		bot_command_add("bottogglehelm", "Toggles the helm visibility of a bot between shown and hidden", 0, bot_subcommand_bot_toggle_helm) ||
+		bot_command_add("bottitle", "Sets a bots title", 0, bot_subcommand_bot_title) ||
 		bot_command_add("botupdate", "Updates a bot to reflect any level changes that you have experienced", 0, bot_subcommand_bot_update) ||
 		bot_command_add("botwoad", "Changes the Barbarian woad of a bot", 0, bot_subcommand_bot_woad) ||
 		bot_command_add("charm", "Attempts to have a bot charm your target", 0, bot_command_charm) ||
@@ -1363,7 +1371,7 @@ int bot_command_init(void)
 		bot_command_add("depart", "Orders a bot to open a magical doorway to a specified destination", 0, bot_command_depart) ||
 		bot_command_add("escape", "Orders a bot to send a target group to a safe location within the zone", 0, bot_command_escape) ||
 		bot_command_add("findaliases", "Find available aliases for a bot command", 0, bot_command_find_aliases) ||
-		bot_command_add("follow", "Orders bots to follow a designated target", 0, bot_command_follow) ||
+		bot_command_add("follow", "Orders bots to follow a designated target (option 'chain' auto-links eligible spawned bots)", 0, bot_command_follow) ||
 		bot_command_add("guard", "Orders bots to guard their current positions", 0, bot_command_guard) ||
 		bot_command_add("healrotation", "Lists the available bot heal rotation [subcommands]", 0, bot_command_heal_rotation) ||
 		bot_command_add("healrotationadaptivetargeting", "Enables or disables adaptive targeting within the heal rotation instance", 0, bot_subcommand_heal_rotation_adaptive_targeting) ||
@@ -1387,7 +1395,7 @@ int bot_command_init(void)
 		bot_command_add("healrotationstart", "Starts a heal rotation", 0, bot_subcommand_heal_rotation_start) ||
 		bot_command_add("healrotationstop", "Stops a heal rotation", 0, bot_subcommand_heal_rotation_stop) ||
 		bot_command_add("help", "List available commands and their description - specify partial command as argument to search", 0, bot_command_help) ||
-		bot_command_add("hold", "Suspends a bot's AI processing until released", 0, bot_command_hold) ||
+		bot_command_add("hold", "Prevents a bot from attacking until released", 0, bot_command_hold) ||
 		bot_command_add("identify", "Orders a bot to cast an item identification spell", 0, bot_command_identify) ||
 		bot_command_add("inventory", "Lists the available bot inventory [subcommands]", 0, bot_command_inventory) ||
 		bot_command_add("inventorygive", "Gives the item on your cursor to a bot", 0, bot_subcommand_inventory_give) ||
@@ -1395,6 +1403,7 @@ int bot_command_init(void)
 		bot_command_add("inventoryremove", "Removes an item from a bot's inventory", 0, bot_subcommand_inventory_remove) ||
 		bot_command_add("inventorywindow", "Displays all items in a bot's inventory in a pop-up window", 0, bot_subcommand_inventory_window) ||
 		bot_command_add("invisibility", "Orders a bot to cast a cloak of invisibility, or allow them to be seen", 0, bot_command_invisibility) ||
+		bot_command_add("itemuse", "Elicits a report from spawned bots that can use the item on your cursor (option 'empty' yields only empty slots)", 0, bot_command_item_use) ||
 		bot_command_add("levitation", "Orders a bot to cast a levitation spell", 0, bot_command_levitation) ||
 		bot_command_add("lull", "Orders a bot to cast a pacification spell", 0, bot_command_lull) ||
 		bot_command_add("mesmerize", "Orders a bot to cast a mesmerization spell", 0, bot_command_mesmerize) ||
@@ -1405,6 +1414,7 @@ int bot_command_init(void)
 		bot_command_add("petremove", "Orders a bot to remove its charmed pet", 0, bot_subcommand_pet_remove) ||
 		bot_command_add("petsettype", "Orders a Magician bot to use a specified pet type", 0, bot_subcommand_pet_set_type) ||
 		bot_command_add("picklock", "Orders a capable bot to pick the lock of the closest door", 0, bot_command_pick_lock) ||
+		bot_command_add("precombat", "Sets flag used to determine pre-combat behavior", 0, bot_command_precombat) ||
 		bot_command_add("portal", "Orders a Wizard bot to open a magical doorway to a specified destination", 0, bot_subcommand_portal) ||
 		bot_command_add("pull", "Orders a designated bot to 'pull' an enemy", 0, bot_command_pull) ||
 		bot_command_add("release", "Releases a suspended bot's AI processing (with hate list wipe)", 0, bot_command_release) ||
@@ -1414,6 +1424,7 @@ int bot_command_init(void)
 		bot_command_add("sendhome", "Orders a bot to open a magical doorway home", 0, bot_command_send_home) ||
 		bot_command_add("size", "Orders a bot to change a player's size", 0, bot_command_size) ||
 		bot_command_add("summoncorpse", "Orders a bot to summon a corpse to its feet", 0, bot_command_summon_corpse) ||
+		bot_command_add("suspend", "Suspends a bot's AI processing until released", 0, bot_command_suspend) ||
 		bot_command_add("taunt", "Toggles taunt use by a bot", 0, bot_command_taunt) ||
 		bot_command_add("track", "Orders a capable bot to track enemies", 0, bot_command_track) ||
 		bot_command_add("waterbreathing", "Orders a bot to cast a water breathing spell", 0, bot_command_water_breathing)
@@ -1425,35 +1436,93 @@ int bot_command_init(void)
 	std::map<std::string, std::pair<uint8, std::vector<std::string>>> bot_command_settings;
 	database.botdb.LoadBotCommandSettings(bot_command_settings);
 
+	std::vector<std::pair<std::string, uint8>> injected_bot_command_settings;
+	std::vector<std::string> orphaned_bot_command_settings;
+
+	for (auto bcs_iter : bot_command_settings) {
+
+		auto bcl_iter = bot_command_list.find(bcs_iter.first);
+		if (bcl_iter == bot_command_list.end()) {
+
+			orphaned_bot_command_settings.push_back(bcs_iter.first);
+			LogInfo(
+				"Bot Command [{}] no longer exists... Deleting orphaned entry from `bot_command_settings` table",
+				bcs_iter.first.c_str()
+			);
+		}
+	}
+
+	if (orphaned_bot_command_settings.size()) {
+		if (!database.botdb.UpdateOrphanedBotCommandSettings(orphaned_bot_command_settings)) {
+			LogInfo("Failed to process 'Orphaned Bot Commands' update operation.");
+		}
+	}
+
 	auto working_bcl = bot_command_list;
 	for (auto working_bcl_iter : working_bcl) {
-		auto bot_command_settings_iter = bot_command_settings.find(working_bcl_iter.first);
-		if (bot_command_settings_iter == bot_command_settings.end()) {
-			if (working_bcl_iter.second->access == 0)
-				Log(Logs::General, Logs::Commands, "bot_command_init(): Warning: Bot Command '%s' defaulting to access level 0!", working_bcl_iter.first.c_str());
+
+		auto bcs_iter = bot_command_settings.find(working_bcl_iter.first);
+		if (bcs_iter == bot_command_settings.end()) {
+
+			injected_bot_command_settings.push_back(std::pair<std::string, uint8>(working_bcl_iter.first, working_bcl_iter.second->access));
+			LogInfo(
+				"New Bot Command [{}] found... Adding to `bot_command_settings` table with access [{}]",
+				working_bcl_iter.first.c_str(),
+				working_bcl_iter.second->access
+			);
+
+			if (working_bcl_iter.second->access == 0) {
+				LogCommands(
+					"bot_command_init(): Warning: Bot Command [{}] defaulting to access level 0!",
+					working_bcl_iter.first.c_str()
+				);
+			}
+			
 			continue;
 		}
 
-		working_bcl_iter.second->access = bot_command_settings_iter->second.first;
-		Log(Logs::General, Logs::Commands, "bot_command_init(): - Bot Command '%s' set to access level %d.", working_bcl_iter.first.c_str(), bot_command_settings_iter->second.first);
-		if (bot_command_settings_iter->second.second.empty())
+		working_bcl_iter.second->access = bcs_iter->second.first;
+		LogCommands(
+			"bot_command_init(): - Bot Command [{}] set to access level [{}]",
+			working_bcl_iter.first.c_str(),
+			bcs_iter->second.first
+		);
+		
+		if (bcs_iter->second.second.empty()) {
 			continue;
+		}
 
-		for (auto alias_iter : bot_command_settings_iter->second.second) {
-			if (alias_iter.empty())
+		for (auto alias_iter : bcs_iter->second.second) {
+			if (alias_iter.empty()) {
 				continue;
+			}
+
 			if (bot_command_list.find(alias_iter) != bot_command_list.end()) {
-				Log(Logs::General, Logs::Commands, "bot_command_init(): Warning: Alias '%s' already exists as a bot command - skipping!", alias_iter.c_str());
+				LogCommands(
+					"bot_command_init(): Warning: Alias [{}] already exists as a bot command - skipping!",
+					alias_iter.c_str()
+				);
+
 				continue;
 			}
 
 			bot_command_list[alias_iter] = working_bcl_iter.second;
 			bot_command_aliases[alias_iter] = working_bcl_iter.first;
 
-			Log(Logs::General, Logs::Commands, "bot_command_init(): - Alias '%s' added to bot command '%s'.", alias_iter.c_str(), bot_command_aliases[alias_iter].c_str());
+			LogCommands(
+				"bot_command_init(): - Alias [{}] added to bot command [{}]",
+				alias_iter.c_str(),
+				bot_command_aliases[alias_iter].c_str()
+			);
 		}
 	}
 
+	if (injected_bot_command_settings.size()) {
+		if (!database.botdb.UpdateInjectedBotCommandSettings(injected_bot_command_settings)) {
+			LogInfo("Failed to process 'Injected Bot Commands' update operation.");
+		}
+	}
+	
 	bot_command_dispatch = bot_command_real_dispatch;
 
 	BCSpells::Load();
@@ -1496,21 +1565,21 @@ void bot_command_deinit(void)
 int bot_command_add(std::string bot_command_name, const char *desc, int access, BotCmdFuncPtr function)
 {
 	if (bot_command_name.empty()) {
-		Log(Logs::General, Logs::Error, "bot_command_add() - Bot command added with empty name string - check bot_command.cpp.");
+		LogError("bot_command_add() - Bot command added with empty name string - check bot_command.cpp");
 		return -1;
 	}
 	if (function == nullptr) {
-		Log(Logs::General, Logs::Error, "bot_command_add() - Bot command '%s' added without a valid function pointer - check bot_command.cpp.", bot_command_name.c_str());
+		LogError("bot_command_add() - Bot command [{}] added without a valid function pointer - check bot_command.cpp", bot_command_name.c_str());
 		return -1;
 	}
 	if (bot_command_list.count(bot_command_name) != 0) {
-		Log(Logs::General, Logs::Error, "bot_command_add() - Bot command '%s' is a duplicate bot command name - check bot_command.cpp.", bot_command_name.c_str());
+		LogError("bot_command_add() - Bot command [{}] is a duplicate bot command name - check bot_command.cpp", bot_command_name.c_str());
 		return -1;
 	}
 	for (auto iter : bot_command_list) {
 		if (iter.second->function != function)
 			continue;
-		Log(Logs::General, Logs::Error, "bot_command_add() - Bot command '%s' equates to an alias of '%s' - check bot_command.cpp.", bot_command_name.c_str(), iter.first.c_str());
+		LogError("bot_command_add() - Bot command [{}] equates to an alias of [{}] - check bot_command.cpp", bot_command_name.c_str(), iter.first.c_str());
 		return -1;
 	}
 
@@ -1565,11 +1634,11 @@ int bot_command_real_dispatch(Client *c, const char *message)
 	}
 
 	if(cur->access >= COMMANDS_LOGGING_MIN_STATUS) {
-		Log(Logs::General, Logs::Commands, "%s (%s) used bot command: %s (target=%s)",  c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE");
+		LogCommands("[{}] ([{}]) used bot command: [{}] (target=[{}])",  c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE");
 	}
 
 	if(cur->function == nullptr) {
-		Log(Logs::General, Logs::Error, "Bot command '%s' has a null function\n",  cstr.c_str());
+		LogError("Bot command [{}] has a null function\n", cstr.c_str());
 		return(-1);
 	} else {
 		//dispatch C++ bot command
@@ -2513,40 +2582,217 @@ void bot_command_aggressive(Client *c, const Seperator *sep)
 	c->Message(m_action, "%i of %i bots have used aggressive disciplines", success_count, candidate_count);
 }
 
+void bot_command_apply_poison(Client *c, const Seperator *sep)
+{
+	if (helper_command_disabled(c, RuleB(Bots, AllowApplyPoisonCommand), "applypoison")) {
+		return;
+	}
+	if (helper_command_alias_fail(c, "bot_command_apply_poison", sep->arg[0], "applypoison")) {
+		return;
+	}
+	if (helper_is_help_or_usage(sep->arg[1])) {
+
+		c->Message(m_usage, "usage: <rogue_bot_target> %s", sep->arg[0]);
+		return;
+	}
+
+	Bot *my_rogue_bot = nullptr;
+	if (c->GetTarget() && c->GetTarget()->IsBot() && c->GetTarget()->CastToBot()->GetBotOwnerCharacterID() == c->CharacterID() && c->GetTarget()->CastToBot()->GetClass() == ROGUE) {
+		my_rogue_bot = c->GetTarget()->CastToBot();
+	}
+	if (!my_rogue_bot) {
+
+		c->Message(m_fail, "You must target a rogue bot that you own to use this command!");
+		return;
+	}
+	if (my_rogue_bot->GetLevel() < 18) {
+
+		c->Message(m_fail, "Your rogue bot must be level 18 before %s can apply poison!", (my_rogue_bot->GetGender() == 1 ? "she" : "he"));
+		return;
+	}
+	
+	const auto poison_instance = c->GetInv().GetItem(EQEmu::invslot::slotCursor);
+	if (!poison_instance) {
+
+		c->Message(m_fail, "No item found on cursor!");
+		return;
+	}
+
+	auto poison_data = poison_instance->GetItem();
+	if (!poison_data) {
+
+		c->Message(m_fail, "No data found for cursor item!");
+		return;
+	}
+
+	if (poison_data->ItemType == EQEmu::item::ItemTypePoison) {
+
+		if ((~poison_data->Races) & GetPlayerRaceBit(my_rogue_bot->GetRace())) {
+
+			c->Message(m_fail, "Invalid race for weapon poison!");
+			return;
+		}
+
+		if (poison_data->Proc.Level2 > my_rogue_bot->GetLevel()) {
+
+			c->Message(m_fail, "This poison is too powerful for your intended target!");
+			return;
+		}
+
+		// generalized from client ApplyPoison handler
+		double ChanceRoll = zone->random.Real(0, 1);
+		uint16 poison_skill = 95 + ((my_rogue_bot->GetLevel() - 18) * 5);
+		if (poison_skill > 200) {
+			poison_skill = 200;
+		}
+		bool apply_poison_chance = (ChanceRoll < (.75 + poison_skill / 1000));
+
+		if (apply_poison_chance && my_rogue_bot->AddProcToWeapon(poison_data->Proc.Effect, false, (my_rogue_bot->GetDEX() / 100) + 103, POISON_PROC)) {
+			c->Message(m_action, "Successfully applied %s to %s's weapon.", poison_data->Name, my_rogue_bot->GetCleanName());
+		}
+		else {
+			c->Message(m_fail, "Failed to apply %s to %s's weapon.", poison_data->Name, my_rogue_bot->GetCleanName());
+		}
+
+		c->DeleteItemInInventory(EQEmu::invslot::slotCursor, 1, true);
+	}
+	else {
+
+		c->Message(m_fail, "Item on cursor is not a weapon poison!");
+		return;
+	}
+}
+
+void bot_command_apply_potion(Client* c, const Seperator* sep)
+{
+	if (helper_command_disabled(c, RuleB(Bots, AllowApplyPotionCommand), "applypotion")) {
+		return;
+	}
+	if (helper_command_alias_fail(c, "bot_command_apply_potion", sep->arg[0], "applypotion")) {
+		return;
+	}
+	if (helper_is_help_or_usage(sep->arg[1])) {
+
+		c->Message(m_usage, "usage: <bot_target> %s", sep->arg[0]);
+		return;
+	}
+
+	Bot* my_bot = nullptr;
+	if (c->GetTarget() && c->GetTarget()->IsBot() && c->GetTarget()->CastToBot()->GetBotOwnerCharacterID() == c->CharacterID()) {
+		my_bot = c->GetTarget()->CastToBot();
+	}
+	if (!my_bot) {
+
+		c->Message(m_fail, "You must target a bot that you own to use this command!");
+		return;
+	}
+
+	const auto potion_instance = c->GetInv().GetItem(EQEmu::invslot::slotCursor);
+	if (!potion_instance) {
+
+		c->Message(m_fail, "No item found on cursor!");
+		return;
+	}
+
+	auto potion_data = potion_instance->GetItem();
+	if (!potion_data) {
+
+		c->Message(m_fail, "No data found for cursor item!");
+		return;
+	}
+
+	if (potion_data->ItemType == EQEmu::item::ItemTypePotion && potion_data->Click.Effect > 0) {
+
+		if (RuleB(Bots, RestrictApplyPotionToRogue) && potion_data->Classes != PLAYER_CLASS_ROGUE_BIT) {
+
+			c->Message(m_fail, "This command is restricted to rogue poison potions only!");
+			return;
+		}
+		if ((~potion_data->Races) & GetPlayerRaceBit(my_bot->GetRace())) {
+
+			c->Message(m_fail, "Invalid race for potion!");
+			return;
+		}
+		if ((~potion_data->Classes) & GetPlayerClassBit(my_bot->GetClass())) {
+
+			c->Message(m_fail, "Invalid class for potion!");
+			return;
+		}
+
+		if (potion_data->Click.Level2 > my_bot->GetLevel()) {
+
+			c->Message(m_fail, "This potion is too powerful for your intended target!");
+			return;
+		}
+
+		// TODO: figure out best way to handle casting time/animation
+		if (my_bot->SpellFinished(potion_data->Click.Effect, my_bot, EQEmu::spells::CastingSlot::Item, 0)) {
+			c->Message(m_action, "Successfully applied %s to %s's buff effects.", potion_data->Name, my_bot->GetCleanName());
+		}
+		else {
+			c->Message(m_fail, "Failed to apply %s to %s's buff effects.", potion_data->Name, my_bot->GetCleanName());
+		}
+
+		c->DeleteItemInInventory(EQEmu::invslot::slotCursor, 1, true);
+	}
+	else {
+
+		c->Message(m_fail, "Item on cursor is not a potion!");
+		return;
+	}
+}
+
 void bot_command_attack(Client *c, const Seperator *sep)
 {
-	if (helper_command_alias_fail(c, "bot_command_attack", sep->arg[0], "attack"))
+	if (helper_command_alias_fail(c, "bot_command_attack", sep->arg[0], "attack")) {
 		return;
+	}
 	if (helper_is_help_or_usage(sep->arg[1])) {
-		c->Message(m_usage, "usage: <enemy_target> %s [actionable: byname | ownergroup | botgroup | namesgroup | healrotation | spawned] ([actionable_name])", sep->arg[0]);
+		
+		c->Message(m_usage, "usage: <enemy_target> %s [actionable: byname | ownergroup | botgroup | namesgroup | healrotation | default: spawned] ([actionable_name])", sep->arg[0]);
 		return;
 	}
 	const int ab_mask = ActionableBots::ABM_Type2;
 
 	Mob* target_mob = ActionableTarget::AsSingle_ByAttackable(c);
 	if (!target_mob) {
+		
 		c->Message(m_fail, "You must <target> an enemy to use this command");
 		return;
 	}
 
+	std::string ab_arg(sep->arg[1]);
+	if (ab_arg.empty()) {
+		ab_arg = "spawned";
+	}
+	
 	std::list<Bot*> sbl;
-	if (ActionableBots::PopulateSBL(c, sep->arg[1], sbl, ab_mask, sep->arg[2]) == ActionableBots::ABT_None)
+	if (ActionableBots::PopulateSBL(c, ab_arg.c_str(), sbl, ab_mask, sep->arg[2]) == ActionableBots::ABT_None) {
 		return;
+	}
 
+	size_t attacker_count = 0;
+	Bot *first_attacker = nullptr;
 	sbl.remove(nullptr);
 	for (auto bot_iter : sbl) {
-		bot_iter->WipeHateList();
-		bot_iter->AddToHateList(target_mob, 1);
-		if (!bot_iter->GetPet())
-			continue;
 
-		bot_iter->GetPet()->WipeHateList();
-		bot_iter->GetPet()->AddToHateList(target_mob, 1);
+		if (bot_iter->GetAppearance() != eaDead && bot_iter->GetBotStance() != EQEmu::constants::stancePassive) {
+
+			if (!first_attacker) {
+				first_attacker = bot_iter;
+			}
+			++attacker_count;
+
+			bot_iter->SetAttackFlag();
+		}
+	}
+
+	if (attacker_count == 1 && first_attacker) {
+		Bot::BotGroupSay(first_attacker, "Attacking %s!", target_mob->GetCleanName());
+	}
+	else {
+		c->Message(m_action, "%i of your bots are attacking %s!", sbl.size(), target_mob->GetCleanName());
 	}
-	if (sbl.size() == 1)
-		Bot::BotGroupSay(sbl.front(), "Attacking %s", target_mob->GetCleanName());
-	else
-		c->Message(m_action, "%i of your bots are attacking %s", sbl.size(), target_mob->GetCleanName());
 }
 
 void bot_command_bind_affinity(Client *c, const Seperator *sep)
@@ -2968,6 +3214,7 @@ void bot_command_follow(Client *c, const Seperator *sep)
 		return;
 	if (helper_is_help_or_usage(sep->arg[1])) {
 		c->Message(m_usage, "usage: (<friendly_target>) %s ([option: reset]) [actionable: byname | ownergroup | botgroup | namesgroup | healrotation | spawned] ([actionable_name])", sep->arg[0]);
+		c->Message(m_usage, "usage: %s chain", sep->arg[0]);
 		return;
 	}
 	const int ab_mask = ActionableBots::ABM_Type2;
@@ -2977,8 +3224,15 @@ void bot_command_follow(Client *c, const Seperator *sep)
 	int name_arg = 2;
 	Mob* target_mob = nullptr;
 
-	std::string reset_arg = sep->arg[1];
-	if (!reset_arg.compare("reset")) {
+	std::string optional_arg = sep->arg[1];
+	if (!optional_arg.compare("chain")) {
+
+		auto chain_count = helper_bot_follow_option_chain(c);
+		c->Message(m_action, "%i of your bots %s now chain following you", chain_count, (chain_count == 1 ? "is" : "are"));
+
+		return;
+	}
+	else if (!optional_arg.compare("reset")) {
 		reset = true;
 		ab_arg = 2;
 		name_arg = 3;
@@ -3005,16 +3259,21 @@ void bot_command_follow(Client *c, const Seperator *sep)
 					bot_iter->SetFollowID(c->GetID());
 				else
 					bot_iter->SetFollowID(my_group->GetLeader()->GetID());
+
+				bot_iter->SetManualFollow(false);
 			}
 			else {
 				if (bot_iter == target_mob)
 					bot_iter->SetFollowID(c->GetID());
 				else
 					bot_iter->SetFollowID(target_mob->GetID());
+
+				bot_iter->SetManualFollow(true);
 			}
 		}
 		else {
 			bot_iter->SetFollowID(0);
+			bot_iter->SetManualFollow(false);
 		}
 		if (!bot_iter->GetPet())
 			continue;
@@ -3036,26 +3295,50 @@ void bot_command_follow(Client *c, const Seperator *sep)
 
 void bot_command_guard(Client *c, const Seperator *sep)
 {
-	if (helper_command_alias_fail(c, "bot_command_guard", sep->arg[0], "guard"))
+	if (helper_command_alias_fail(c, "bot_command_guard", sep->arg[0], "guard")) {
 		return;
+	}
 	if (helper_is_help_or_usage(sep->arg[1])) {
-		c->Message(m_usage, "usage: %s [actionable: target | byname | ownergroup | botgroup | namesgroup | healrotation | spawned] ([actionable_name])", sep->arg[0]);
+
+		c->Message(m_usage, "usage: %s ([option: clear]) [actionable: target | byname | ownergroup | botgroup | namesgroup | healrotation | spawned] ([actionable_name])", sep->arg[0]);
 		return;
 	}
 	const int ab_mask = (ActionableBots::ABM_Target | ActionableBots::ABM_Type2);
 
+	bool clear = false;
+	int ab_arg = 1;
+	int name_arg = 2;
+
+	std::string clear_arg = sep->arg[1];
+	if (!clear_arg.compare("clear")) {
+
+		clear = true;
+		ab_arg = 2;
+		name_arg = 3;
+	}
+
 	std::list<Bot*> sbl;
-	if (ActionableBots::PopulateSBL(c, sep->arg[1], sbl, ab_mask, sep->arg[2]) == ActionableBots::ABT_None)
+	if (ActionableBots::PopulateSBL(c, sep->arg[ab_arg], sbl, ab_mask, sep->arg[name_arg]) == ActionableBots::ABT_None) {
 		return;
+	}
 
 	sbl.remove(nullptr);
 	for (auto bot_iter : sbl) {
-		bot_iter->SetGuardMode();
+
+		if (clear) {
+			bot_iter->SetGuardFlag(false);
+		}
+		else {
+			bot_iter->SetGuardMode();
+		}
+	}
+
+	if (sbl.size() == 1) {
+		Bot::BotGroupSay(sbl.front(), "%suarding this position.", (clear ? "No longer g" : "G"));
+	}
+	else {
+		c->Message(m_action, "%i of your bots are %sguarding their positions.", sbl.size(), (clear ? "no longer " : ""));
 	}
-	if (sbl.size() == 1)
-		Bot::BotGroupSay(sbl.front(), "Guarding this position");
-	else
-		c->Message(m_action, "%i of your bots are guarding their positions", sbl.size());
 }
 
 void bot_command_heal_rotation(Client *c, const Seperator *sep)
@@ -3131,29 +3414,62 @@ void bot_command_help(Client *c, const Seperator *sep)
 		c->Message(m_usage, "%c%s - %s", BOT_COMMAND_CHAR, command_iter.first.c_str(), command_iter.second->desc == nullptr ? "[no description]" : command_iter.second->desc);
 		++bot_commands_shown;
 	}
+	if (parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) {
+		int i = parse->EventPlayer(EVENT_BOT_COMMAND, c, sep->msg, 0);
+		if (i >= 1) {
+			bot_commands_shown += i;
+		}
+	}
 	c->Message(m_message, "%d bot command%s listed.", bot_commands_shown, bot_commands_shown != 1 ? "s" : "");
 	c->Message(m_note, "type %ccommand [help | usage] for more information", BOT_COMMAND_CHAR);
 }
 
 void bot_command_hold(Client *c, const Seperator *sep)
 {
-	if (helper_command_alias_fail(c, "bot_command_hold", sep->arg[0], "hold"))
-		return;
-	if (helper_is_help_or_usage(sep->arg[1])) {
-		c->Message(m_usage, "usage: %s ([actionable: <any>] ([actionable_name]))", sep->arg[0]);
+	if (helper_command_alias_fail(c, "bot_command_hold", sep->arg[0], "hold")) {
 		return;
 	}
-	const int ab_mask = ActionableBots::ABM_NoFilter;
+	if (helper_is_help_or_usage(sep->arg[1])) {
+
+		c->Message(m_usage, "usage: %s ([option: clear]) [actionable: target | byname | ownergroup | botgroup | namesgroup | healrotation | spawned] ([actionable_name])", sep->arg[0]);
+		return;
+	}
+	const int ab_mask = (ActionableBots::ABM_Target | ActionableBots::ABM_Type2);
+
+	bool clear = false;
+	int ab_arg = 1;
+	int name_arg = 2;
+
+	std::string clear_arg = sep->arg[1];
+	if (!clear_arg.compare("clear")) {
+
+		clear = true;
+		ab_arg = 2;
+		name_arg = 3;
+	}
 
 	std::list<Bot*> sbl;
-	if (ActionableBots::PopulateSBL(c, sep->arg[1], sbl, ab_mask, sep->arg[2]) == ActionableBots::ABT_None)
+	if (ActionableBots::PopulateSBL(c, sep->arg[ab_arg], sbl, ab_mask, sep->arg[name_arg]) == ActionableBots::ABT_None) {
 		return;
+	}
 
 	sbl.remove(nullptr);
-	for (auto bot_iter : sbl)
-		bot_iter->SetPauseAI(true);
-	
-	c->Message(m_action, "%i of your bots %s suspended", sbl.size(), ((sbl.size() != 1) ? ("are") : ("is")));
+	for (auto bot_iter : sbl) {
+
+		if (clear) {
+			bot_iter->SetHoldFlag(false);
+		}
+		else {
+			bot_iter->SetHoldMode();
+		}
+	}
+
+	if (sbl.size() == 1) {
+		Bot::BotGroupSay(sbl.front(), "%solding my attacks.", (clear ? "No longer h" : "H"));
+	}
+	else {
+		c->Message(m_action, "%i of your bots are %sholding their attacks.", sbl.size(), (clear ? "no longer " : ""));
+	}
 }
 
 void bot_command_identify(Client *c, const Seperator *sep)
@@ -3269,6 +3585,105 @@ void bot_command_invisibility(Client *c, const Seperator *sep)
 	helper_no_available_bots(c, my_bot);
 }
 
+void bot_command_item_use(Client* c, const Seperator* sep)
+{
+	if (helper_is_help_or_usage(sep->arg[1])) {
+
+		c->Message(m_usage, "usage: %s ([empty])", sep->arg[0]);
+		return;
+	}
+
+	bool empty_only = false;
+	std::string arg1 = sep->arg[1];
+	if (arg1.compare("empty") == 0) {
+		empty_only = true;
+	}
+
+	const auto item_instance = c->GetInv().GetItem(EQEmu::invslot::slotCursor);
+	if (!item_instance) {
+
+		c->Message(m_fail, "No item found on cursor!");
+		return;
+	}
+
+	auto item_data = item_instance->GetItem();
+	if (!item_data) {
+
+		c->Message(m_fail, "No data found for cursor item!");
+		return;
+	}
+
+	if (item_data->ItemClass != EQEmu::item::ItemClassCommon || item_data->Slots == 0) {
+
+		c->Message(m_fail, "'%s' is not an equipable item!", item_data->Name);
+		return;
+	}
+
+	std::list<int16> equipable_slot_list;
+	for (int16 equipable_slot = EQEmu::invslot::EQUIPMENT_BEGIN; equipable_slot <= EQEmu::invslot::EQUIPMENT_END; ++equipable_slot) {
+		if (item_data->Slots & (1 << equipable_slot)) {
+			equipable_slot_list.push_back(equipable_slot);
+		}
+	}
+
+	std::string msg;
+	std::string text_link;
+
+	EQEmu::SayLinkEngine linker;
+	linker.SetLinkType(EQEmu::saylink::SayLinkItemInst);
+
+	std::list<Bot*> sbl;
+	MyBots::PopulateSBL_BySpawnedBots(c, sbl);
+
+	for (auto bot_iter : sbl) {
+
+		if (!bot_iter) {
+			continue;
+		}
+
+		if (((~item_data->Races) & GetPlayerRaceBit(bot_iter->GetRace())) || ((~item_data->Classes) & GetPlayerClassBit(bot_iter->GetClass()))) {
+			continue;
+		}
+
+		msg = StringFormat("%cinventorygive byname %s", BOT_COMMAND_CHAR, bot_iter->GetCleanName());
+		text_link = bot_iter->CreateSayLink(c, msg.c_str(), bot_iter->GetCleanName());
+		
+		for (auto slot_iter : equipable_slot_list) {
+
+			// needs more failure criteria - this should cover the bulk for now
+			if (slot_iter == EQEmu::invslot::slotSecondary && item_data->Damage && !bot_iter->CanThisClassDualWield()) {
+				continue;
+			}
+
+			auto equipped_item = bot_iter->GetBotInv()[slot_iter];
+
+			if (equipped_item && !empty_only) {
+
+				linker.SetItemInst(equipped_item);
+
+				c->Message(
+					Chat::Say,
+					"[%s] says, 'I can use that for my %s! (replaces: [%s])'",
+					text_link.c_str(),
+					EQEmu::invslot::GetInvPossessionsSlotName(slot_iter),
+					linker.GenerateLink().c_str()
+				);
+				bot_iter->DoAnim(29);
+			}
+			else if (!equipped_item) {
+
+				c->Message(
+					Chat::Say,
+					"[%s] says, 'I can use that for my %s!'",
+					text_link.c_str(),
+					EQEmu::invslot::GetInvPossessionsSlotName(slot_iter)
+				);
+				bot_iter->DoAnim(29);
+			}
+		}
+	}
+}
+
 void bot_command_levitation(Client *c, const Seperator *sep)
 {
 	bcst_list* local_list = &bot_command_spells[BCEnum::SpT_Levitation];
@@ -3442,34 +3857,279 @@ void bot_command_movement_speed(Client *c, const Seperator *sep)
 void bot_command_owner_option(Client *c, const Seperator *sep)
 {
 	if (helper_is_help_or_usage(sep->arg[1])) {
-		c->Message(m_usage, "usage: %s [deathmarquee | statsupdate] (argument: enable | disable | null (toggles))", sep->arg[0]);
+
+		c->Message(m_usage, "usage: %s [option] [argument]", sep->arg[0]);
+		
+		std::string window_title = "Bot Owner Options";
+		std::string window_text =
+			"<table>"
+				"<tr>"
+					"<td><c \"#FFFFFF\">Option<br>------</td>"
+					"<td><c \"#00FF00\">Argument<br>-------</td>"
+					"<td><c \"#AAAAAA\">Notes<br>-----</td>"
+				"</tr>"
+				"<tr>"
+					"<td><c \"#CCCCCC\">deathmarquee</td>"
+					"<td><c \"#00CC00\">enable <c \"#CCCCCC\">| <c \"#00CC00\">disable</td>"
+					"<td><c \"#888888\">marquee message on death</td>"
+				"</tr>"
+				"<tr>"
+					"<td></td>"
+					"<td><c \"#00CCCC\">null</td>"
+					"<td><c \"#888888\">(toggles)</td>"
+				"</tr>"
+				"<tr>"
+					"<td><c \"#CCCCCC\">statsupdate</td>"
+					"<td><c \"#00CC00\">enable <c \"#CCCCCC\">| <c \"#00CC00\">disable</td>"
+					"<td><c \"#888888\">report stats on update</td>"
+				"</tr>"
+				"<tr>"
+					"<td></td>"
+					"<td><c \"#00CCCC\">null</td>"
+					"<td><c \"#888888\">(toggles)</td>"
+				"</tr>"
+				"<tr>"
+					"<td><c \"#CCCCCC\">spawnmessage</td>"
+					"<td><c \"#00CC00\">say <c \"#CCCCCC\">| <c \"#00CC00\">tell <c \"#CCCCCC\">| <c \"#00CC00\">silent</td>"
+					"<td><c \"#888888\">spawn message into channel</td>"
+				"</tr>"
+				"<tr>"
+					"<td></td>"
+					"<td><c \"#00CC00\">class <c \"#CCCCCC\">| <c \"#00CC00\">default</td>"
+					"<td><c \"#888888\">spawn with class-based message</td>"
+				"</tr>"
+				"<tr>"
+					"<td><c \"#CCCCCC\">altcombat</td>"
+					"<td><c \"#00CC00\">enable <c \"#CCCCCC\">| <c \"#00CC00\">disable</td>"
+					"<td><c \"#888888\">use alternate ai combat behavior</td>"
+				"</tr>"
+				"<tr>"
+					"<td></td>"
+					"<td><c \"#00CCCC\">null</td>"
+					"<td><c \"#888888\">(toggles)</td>"
+				"</tr>"
+				"<tr>"
+					"<td><c \"#CCCCCC\">autodefend</td>"
+					"<td><c \"#00CC00\">enable <c \"#CCCCCC\">| <c \"#00CC00\">disable</td>"
+					"<td><c \"#888888\">bots defend owner when aggroed</td>"
+				"</tr>"
+				"<tr>"
+					"<td></td>"
+					"<td><c \"#00CCCC\">null</td>"
+					"<td><c \"#888888\">(toggles)</td>"
+				"</tr>"
+				"<tr>"
+					"<td><c \"#CCCCCC\">buffcounter</td>"
+					"<td><c \"#00CC00\">enable <c \"#CCCCCC\">| <c \"#00CC00\">disable</td>"
+					"<td><c \"#888888\">marquee message on buff counter change</td>"
+				"</tr>"
+				"<tr>"
+					"<td></td>"
+					"<td><c \"#00CCCC\">null</td>"
+					"<td><c \"#888888\">(toggles)</td>"
+				"</tr>"
+				"<tr>"
+					"<td><c \"#CCCCCC\">current</td>"
+					"<td></td>"
+					"<td><c \"#888888\">show current settings</td>"
+				"</tr>"
+			"</table>";
+		
+		c->SendPopupToClient(window_title.c_str(), window_text.c_str());
+
 		return;
 	}
 
-	std::string owner_option = sep->arg[1];
-	std::string flag = sep->arg[2];
+	std::string owner_option(sep->arg[1]);
+	std::string argument(sep->arg[2]);
 
 	if (!owner_option.compare("deathmarquee")) {
-		if (!flag.compare("enable"))
-			c->SetBotOptionDeathMarquee(true);
-		else if (!flag.compare("disable"))
-			c->SetBotOptionDeathMarquee(false);
-		else
-			c->SetBotOptionDeathMarquee(!c->GetBotOptionDeathMarquee());
+
+		if (!argument.compare("enable")) {
+			c->SetBotOption(Client::booDeathMarquee, true);
+		}
+		else if (!argument.compare("disable")) {
+			c->SetBotOption(Client::booDeathMarquee, false);
+		}
+		else {
+			c->SetBotOption(Client::booDeathMarquee, !c->GetBotOption(Client::booDeathMarquee));
+		}
 		
-		database.botdb.SaveOwnerOptionDeathMarquee(c->CharacterID(), c->GetBotOptionDeathMarquee());
-		c->Message(m_action, "Bot 'death marquee' is now %s.", (c->GetBotOptionDeathMarquee() == true ? "enabled" : "disabled"));
+		database.botdb.SaveOwnerOption(c->CharacterID(), Client::booDeathMarquee, c->GetBotOption(Client::booDeathMarquee));
+
+		c->Message(m_action, "Bot 'death marquee' is now %s.", (c->GetBotOption(Client::booDeathMarquee) == true ? "enabled" : "disabled"));
 	}
 	else if (!owner_option.compare("statsupdate")) {
-		if (!flag.compare("enable"))
-			c->SetBotOptionStatsUpdate(true);
-		else if (!flag.compare("disable"))
-			c->SetBotOptionStatsUpdate(false);
-		else
-			c->SetBotOptionStatsUpdate(!c->GetBotOptionStatsUpdate());
 
-		database.botdb.SaveOwnerOptionStatsUpdate(c->CharacterID(), c->GetBotOptionStatsUpdate());
-		c->Message(m_action, "Bot 'stats update' is now %s.", (c->GetBotOptionStatsUpdate() == true ? "enabled" : "disabled"));
+		if (!argument.compare("enable")) {
+			c->SetBotOption(Client::booStatsUpdate, true);
+		}
+		else if (!argument.compare("disable")) {
+			c->SetBotOption(Client::booStatsUpdate, false);
+		}
+		else {
+			c->SetBotOption(Client::booStatsUpdate, !c->GetBotOption(Client::booStatsUpdate));
+		}
+
+		database.botdb.SaveOwnerOption(c->CharacterID(), Client::booStatsUpdate, c->GetBotOption(Client::booStatsUpdate));
+
+		c->Message(m_action, "Bot 'stats update' is now %s.", (c->GetBotOption(Client::booStatsUpdate) == true ? "enabled" : "disabled"));
+	}
+	else if (!owner_option.compare("spawnmessage")) {
+
+		Client::BotOwnerOption boo = Client::_booCount;
+
+		if (!argument.compare("say")) {
+
+			boo = Client::booSpawnMessageSay;
+			c->SetBotOption(Client::booSpawnMessageSay, true);
+			c->SetBotOption(Client::booSpawnMessageTell, false);
+		}
+		else if (!argument.compare("tell")) {
+
+			boo = Client::booSpawnMessageSay;
+			c->SetBotOption(Client::booSpawnMessageSay, false);
+			c->SetBotOption(Client::booSpawnMessageTell, true);
+		}
+		else if (!argument.compare("silent")) {
+
+			boo = Client::booSpawnMessageSay;
+			c->SetBotOption(Client::booSpawnMessageSay, false);
+			c->SetBotOption(Client::booSpawnMessageTell, false);
+		}
+		else if (!argument.compare("class")) {
+
+			boo = Client::booSpawnMessageClassSpecific;
+			c->SetBotOption(Client::booSpawnMessageClassSpecific, true);
+		}
+		else if (!argument.compare("default")) {
+
+			boo = Client::booSpawnMessageClassSpecific;
+			c->SetBotOption(Client::booSpawnMessageClassSpecific, false);
+		}
+		else {
+
+			c->Message(m_fail, "Owner option '%s' argument '%s' is not recognized.", owner_option.c_str(), argument.c_str());
+			return;
+		}
+
+		if (boo == Client::booSpawnMessageSay) {
+
+			database.botdb.SaveOwnerOption(
+				c->CharacterID(),
+				std::pair<size_t, size_t>(
+					Client::booSpawnMessageSay,
+					Client::booSpawnMessageTell
+				),
+				std::pair<bool, bool>(
+					c->GetBotOption(Client::booSpawnMessageSay),
+					c->GetBotOption(Client::booSpawnMessageTell)
+				)
+			);
+		}
+		else if (boo == Client::booSpawnMessageClassSpecific) {
+
+			database.botdb.SaveOwnerOption(
+				c->CharacterID(),
+				Client::booSpawnMessageClassSpecific,
+				c->GetBotOption(Client::booSpawnMessageClassSpecific)
+			);
+		}
+		else {
+
+			c->Message(m_action, "Bot 'spawn message' is now ERROR.");
+			return;
+		}
+
+		c->Message(m_action, "Bot 'spawn message' is now %s.", argument.c_str());
+	}
+	else if (!owner_option.compare("altcombat")) {
+		
+		if (RuleB(Bots, AllowOwnerOptionAltCombat)) {
+
+			if (!argument.compare("enable")) {
+				c->SetBotOption(Client::booAltCombat, true);
+			}
+			else if (!argument.compare("disable")) {
+				c->SetBotOption(Client::booAltCombat, false);
+			}
+			else {
+				c->SetBotOption(Client::booAltCombat, !c->GetBotOption(Client::booAltCombat));
+			}
+
+			database.botdb.SaveOwnerOption(c->CharacterID(), Client::booAltCombat, c->GetBotOption(Client::booAltCombat));
+
+			c->Message(m_action, "Bot 'alt combat' is now %s.", (c->GetBotOption(Client::booAltCombat) == true ? "enabled" : "disabled"));
+		}
+		else {
+			c->Message(m_fail, "Bot owner option 'altcombat' is not allowed on this server.");
+		}
+	}
+	else if (!owner_option.compare("autodefend")) {
+
+		if (RuleB(Bots, AllowOwnerOptionAutoDefend)) {
+
+			if (!argument.compare("enable")) {
+				c->SetBotOption(Client::booAutoDefend, true);
+			}
+			else if (!argument.compare("disable")) {
+				c->SetBotOption(Client::booAutoDefend, false);
+			}
+			else {
+				c->SetBotOption(Client::booAutoDefend, !c->GetBotOption(Client::booAutoDefend));
+			}
+
+			database.botdb.SaveOwnerOption(c->CharacterID(), Client::booAutoDefend, c->GetBotOption(Client::booAutoDefend));
+
+			c->Message(m_action, "Bot 'auto defend' is now %s.", (c->GetBotOption(Client::booAutoDefend) == true ? "enabled" : "disabled"));
+		}
+		else {
+			c->Message(m_fail, "Bot owner option 'autodefend' is not allowed on this server.");
+		}
+	}
+	else if (!owner_option.compare("buffcounter")) {
+
+		if (!argument.compare("enable")) {
+			c->SetBotOption(Client::booBuffCounter, true);
+		}
+		else if (!argument.compare("disable")) {
+			c->SetBotOption(Client::booBuffCounter, false);
+		}
+		else {
+			c->SetBotOption(Client::booBuffCounter, !c->GetBotOption(Client::booBuffCounter));
+		}
+
+		database.botdb.SaveOwnerOption(c->CharacterID(), Client::booBuffCounter, c->GetBotOption(Client::booBuffCounter));
+
+		c->Message(m_action, "Bot 'buff counter' is now %s.", (c->GetBotOption(Client::booBuffCounter) == true ? "enabled" : "disabled"));
+	}
+	else if (!owner_option.compare("current")) {
+		
+		std::string window_title = "Current Bot Owner Options Settings";
+		std::string window_text = fmt::format(
+			"<table>"
+				"<tr>"
+					"<td><c \"#FFFFFF\">Option<br>------</td>"
+					"<td><c \"#00FF00\">Argument<br>-------</td>"
+				"</tr>"
+				"<tr>" "<td><c \"#CCCCCC\">deathmarquee</td>" "<td><c \"#00CC00\">{}</td>" "</tr>"
+				"<tr>" "<td><c \"#CCCCCC\">statsupdate</td>"  "<td><c \"#00CC00\">{}</td>" "</tr>"
+				"<tr>" "<td><c \"#CCCCCC\">spawnmessage</td>" "<td><c \"#00CC00\">{}</td>" "</tr>"
+				"<tr>" "<td><c \"#CCCCCC\">spawnmessage</td>" "<td><c \"#00CC00\">{}</td>" "</tr>"
+				"<tr>" "<td><c \"#CCCCCC\">altcombat</td>"    "<td><c \"#00CC00\">{}</td>" "</tr>"
+				"<tr>" "<td><c \"#CCCCCC\">autodefend</td>"   "<td><c \"#00CC00\">{}</td>" "</tr>"
+				"<tr>" "<td><c \"#CCCCCC\">buffcounter</td>"  "<td><c \"#00CC00\">{}</td>" "</tr>"
+			"</table>",
+			(c->GetBotOption(Client::booDeathMarquee) ? "enabled" : "disabled"),
+			(c->GetBotOption(Client::booStatsUpdate) ? "enabled" : "disabled"),
+			(c->GetBotOption(Client::booSpawnMessageSay) ? "say" : (c->GetBotOption(Client::booSpawnMessageTell) ? "tell" : "silent")),
+			(c->GetBotOption(Client::booSpawnMessageClassSpecific) ? "class" : "default"),
+			(RuleB(Bots, AllowOwnerOptionAltCombat) ? (c->GetBotOption(Client::booAltCombat) ? "enabled" : "disabled") : "restricted"),
+			(RuleB(Bots, AllowOwnerOptionAutoDefend) ? (c->GetBotOption(Client::booAutoDefend) ? "enabled" : "disabled") : "restricted"),
+			(c->GetBotOption(Client::booBuffCounter) ? "enabled" : "disabled")
+		);
+		
+		c->SendPopupToClient(window_title.c_str(), window_text.c_str());
 	}
 	else {
 		c->Message(m_fail, "Owner option '%s' is not recognized.", owner_option.c_str());
@@ -3552,38 +4212,151 @@ void bot_command_pick_lock(Client *c, const Seperator *sep)
 	c->Message(m_action, "%i door%s attempted - %i door%s successful", door_count, ((door_count != 1) ? ("s") : ("")), open_count, ((open_count != 1) ? ("s") : ("")));
 }
 
+void bot_command_precombat(Client* c, const Seperator* sep)
+{
+	if (helper_command_alias_fail(c, "bot_command_precombat", sep->arg[0], "precombat")) {
+		return;
+	}
+	if (helper_is_help_or_usage(sep->arg[1])) {
+
+		c->Message(m_usage, "usage: %s ([set | clear])", sep->arg[0]);
+		return;
+	}
+
+	if (!c->GetTarget() || !c->IsAttackAllowed(c->GetTarget())) {
+
+		c->Message(m_fail, "This command requires an attackable target.");
+		return;
+	}
+
+	std::string argument(sep->arg[1]);
+
+	if (!argument.compare("set")) {
+		c->SetBotPrecombat(true);
+	}
+	else if (!argument.compare("clear")) {
+		c->SetBotPrecombat(false);
+	}
+	else {
+		c->SetBotPrecombat(!c->GetBotPrecombat());
+	}
+
+	c->Message(m_action, "Precombat flag is now %s.", (c->GetBotPrecombat() == true ? "set" : "clear"));
+}
+
+// TODO: Rework to allow owner specificed criteria for puller
 void bot_command_pull(Client *c, const Seperator *sep)
 {
-	if (helper_command_alias_fail(c, "bot_command_pull", sep->arg[0], "pull"))
+	if (helper_command_alias_fail(c, "bot_command_pull", sep->arg[0], "pull")) {
 		return;
+	}
 	if (helper_is_help_or_usage(sep->arg[1])) {
+
 		c->Message(m_usage, "usage: <enemy_target> %s", sep->arg[0]);
 		return;
 	}
 	int ab_mask = ActionableBots::ABM_OwnerGroup; // existing behavior - need to add c->IsGrouped() check and modify code if different behavior is desired
 
 	std::list<Bot*> sbl;
-	if (ActionableBots::PopulateSBL(c, "ownergroup", sbl, ab_mask) == ActionableBots::ABT_None)
+	if (ActionableBots::PopulateSBL(c, "ownergroup", sbl, ab_mask) == ActionableBots::ABT_None) {
 		return;
+	}
 	sbl.remove(nullptr);
 
 	auto target_mob = ActionableTarget::VerifyEnemy(c, BCEnum::TT_Single);
 	if (!target_mob) {
-		c->Message(m_fail, "Your current target is not attackable");
+
+		c->Message(m_fail, "Your current target is not attackable!");
+		return;
+	}
+
+	if (target_mob->IsNPC() && target_mob->GetHateList().size()) {
+
+		c->Message(m_fail, "Your current target is already engaged!");
 		return;
 	}
 
 	Bot* bot_puller = nullptr;
 	for (auto bot_iter : sbl) {
-		if (!bot_iter->IsArcheryRange(target_mob))
+
+		if (bot_iter->GetAppearance() == eaDead || bot_iter->GetBotStance() == EQEmu::constants::stancePassive) {
 			continue;
+		}
 		
-		Bot::BotGroupSay(bot_iter, "Attempting to pull %s..", target_mob->GetCleanName());
-		bot_iter->InterruptSpell();
-		bot_iter->BotRangedAttack(target_mob);
+		switch (bot_iter->GetClass()) {
+		case ROGUE:
+		case MONK:
+		case BARD:
+		case RANGER:
+			bot_puller = bot_iter;
+			break;
+		case WARRIOR:
+		case SHADOWKNIGHT:
+		case PALADIN:
+		case BERSERKER:
+		case BEASTLORD:
+			if (!bot_puller) {
+
+				bot_puller = bot_iter;
+				continue;
+			}
+
+			switch (bot_puller->GetClass()) {
+			case DRUID:
+			case SHAMAN:
+			case CLERIC:
+			case WIZARD:
+			case NECROMANCER:
+			case MAGICIAN:
+			case ENCHANTER:
+				bot_puller = bot_iter;
+			default:
+				continue;
+			}
+
+			continue;
+		case DRUID:
+		case SHAMAN:
+		case CLERIC:
+			if (!bot_puller) {
+
+				bot_puller = bot_iter;
+				continue;
+			}
+
+			switch (bot_puller->GetClass()) {
+			case WIZARD:
+			case NECROMANCER:
+			case MAGICIAN:
+			case ENCHANTER:
+				bot_puller = bot_iter;
+			default:
+				continue;
+			}
+
+			continue;
+		case WIZARD:
+		case NECROMANCER:
+		case MAGICIAN:
+		case ENCHANTER:
+			if (!bot_puller) {
+				bot_puller = bot_iter;
+			}
+
+			continue;
+		default:
+			continue;
+		}
+
+
 		bot_puller = bot_iter;
+
 		break;
 	}
+
+	if (bot_puller) {
+		bot_puller->SetPullFlag();
+	}
 	
 	helper_no_available_bots(c, bot_puller);
 }
@@ -3608,7 +4381,7 @@ void bot_command_release(Client *c, const Seperator *sep)
 		bot_iter->SetPauseAI(false);
 	}
 
-	c->Message(m_action, "%i of your bots %s unsuspended", sbl.size(), ((sbl.size() != 1) ? ("are") : ("is")));
+	c->Message(m_action, "%i of your bots %s released.", sbl.size(), ((sbl.size() != 1) ? ("are") : ("is")));
 }
 
 void bot_command_resistance(Client *c, const Seperator *sep)
@@ -3917,6 +4690,30 @@ void bot_command_summon_corpse(Client *c, const Seperator *sep)
 	helper_no_available_bots(c, my_bot);
 }
 
+void bot_command_suspend(Client *c, const Seperator *sep)
+{
+	if (helper_command_alias_fail(c, "bot_command_suspend", sep->arg[0], "suspend")) {
+		return;
+	}
+	if (helper_is_help_or_usage(sep->arg[1])) {
+		c->Message(m_usage, "usage: %s ([actionable: <any>] ([actionable_name]))", sep->arg[0]);
+		return;
+	}
+	const int ab_mask = ActionableBots::ABM_NoFilter;
+
+	std::list<Bot*> sbl;
+	if (ActionableBots::PopulateSBL(c, sep->arg[1], sbl, ab_mask, sep->arg[2]) == ActionableBots::ABT_None) {
+		return;
+	}
+
+	sbl.remove(nullptr);
+	for (auto bot_iter : sbl) {
+		bot_iter->SetPauseAI(true);
+	}
+
+	c->Message(m_action, "%i of your bots %s suspended.", sbl.size(), ((sbl.size() != 1) ? ("are") : ("is")));
+}
+
 void bot_command_taunt(Client *c, const Seperator *sep)
 {
 	if (helper_command_alias_fail(c, "bot_command_taunt", sep->arg[0], "taunt"))
@@ -4223,7 +5020,7 @@ void bot_subcommand_bot_clone(Client *c, const Seperator *sep)
 	}
 	if (!my_bot->GetBotID()) {
 		c->Message(m_unknown, "An unknown error has occured - BotName: %s, BotID: %u", my_bot->GetCleanName(), my_bot->GetBotID());
-		Log(Logs::General, Logs::Commands, "bot_command_clone(): - Error: Active bot reported invalid ID (BotName: %s, BotID: %u, OwnerName: %s, OwnerID: %u, AcctName: %s, AcctID: %u)",
+		LogCommands("bot_command_clone(): - Error: Active bot reported invalid ID (BotName: [{}], BotID: [{}], OwnerName: [{}], OwnerID: [{}], AcctName: [{}], AcctID: [{}])",
 			my_bot->GetCleanName(), my_bot->GetBotID(), c->GetCleanName(), c->CharacterID(), c->AccountName(), c->AccountID());
 		return;
 	}
@@ -4284,17 +5081,17 @@ void bot_subcommand_bot_clone(Client *c, const Seperator *sep)
 void bot_subcommand_bot_create(Client *c, const Seperator *sep)
 {
 	const std::string class_substrs[17] = { "",
-		"%u(WAR)", "%u(CLR)", "%u(PAL)", "%u(RNG)",
-		"%u(SHD)", "%u(DRU)", "%u(MNK)", "%u(BRD)",
-		"%u(ROG)", "%u(SHM)", "%u(NEC)", "%u(WIZ)",
-		"%u(MAG)", "%u(ENC)", "%u(BST)", "%u(BER)"
+		"%u (WAR)", "%u (CLR)", "%u (PAL)", "%u (RNG)",
+		"%u (SHD)", "%u (DRU)", "%u (MNK)", "%u (BRD)",
+		"%u (ROG)", "%u (SHM)", "%u (NEC)", "%u (WIZ)",
+		"%u (MAG)", "%u (ENC)", "%u (BST)", "%u (BER)"
 	};
 
 	const std::string race_substrs[17] = { "",
-		"%u(HUM)", "%u(BAR)", "%u(ERU)", "%u(ELF)",
-		"%u(HIE)", "%u(DEF)", "%u(HEF)", "%u(DWF)",
-		"%u(TRL)", "%u(OGR)", "%u(HFL)", "%u(GNM)",
-		"%u(IKS)", "%u(VAH)", "%u(FRG)", "%u(DRK)"
+		"%u (HUM)", "%u (BAR)", "%u (ERU)", "%u (ELF)",
+		"%u (HIE)", "%u (DEF)", "%u (HEF)", "%u (DWF)",
+		"%u (TRL)", "%u (OGR)", "%u (HFL)", "%u (GNM)",
+		"%u (IKS)", "%u (VAH)", "%u (FRG)", "%u (DRK)"
 	};
 
 	const uint16 race_values[17] = { 0,
@@ -4305,54 +5102,70 @@ void bot_subcommand_bot_create(Client *c, const Seperator *sep)
 	};
 
 	const std::string gender_substrs[2] = {
-		"%u(M)", "%u(F)",
+		"%u (M)", "%u (F)",
 	};
 
-	std::string msg_class = "class:";
-	std::string msg_race = "race:";
-	std::string msg_gender = "gender:";
-	std::string msg_separator;
-
-	msg_separator = " ";
-	for (int i = 0; i <= 15; ++i) {
-		if (((1 << i) & RuleI(Bots, AllowedClasses)) == 0)
-			continue;
-
-		msg_class.append(const_cast<const std::string&>(msg_separator));
-		msg_class.append(StringFormat(class_substrs[i + 1].c_str(), (i + 1)));
-
-		msg_separator = ", ";
-	}
-
-	msg_separator = " ";
-	for (int i = 0; i <= 15; ++i) {
-		if (((1 << i) & RuleI(Bots, AllowedRaces)) == 0)
-			continue;
-
-		msg_race.append(const_cast<const std::string&>(msg_separator));
-		msg_race.append(StringFormat(race_substrs[i + 1].c_str(), race_values[i + 1]));
-
-		msg_separator = ", ";
-	}
-
-	msg_separator = " ";
-	for (int i = 0; i <= 1; ++i) {
-		if (((1 << i) & RuleI(Bots, AllowedGenders)) == 0)
-			continue;
-
-		msg_gender.append(const_cast<const std::string&>(msg_separator));
-		msg_gender.append(StringFormat(gender_substrs[i].c_str(), i));
-
-		msg_separator = ", ";
-	}
-
 	if (helper_command_alias_fail(c, "bot_subcommand_bot_create", sep->arg[0], "botcreate"))
 		return;
 	if (helper_is_help_or_usage(sep->arg[1])) {
 		c->Message(m_usage, "usage: %s [bot_name] [bot_class] [bot_race] [bot_gender]", sep->arg[0]);
-		c->Message(m_note, msg_class.c_str());
-		c->Message(m_note, msg_race.c_str());
-		c->Message(m_note, msg_gender.c_str());
+		std::string window_title = "Bot Create Options";
+		std::string window_text;
+		std::string message_separator;
+		int object_count = 0;
+		const int object_max = 5;
+
+		window_text.append("<c \"#FFFFFF\">Classes:<c \"#FFFF\">");
+		message_separator = " ";
+		object_count = 1;
+		for (int i = 0; i <= 15; ++i) {
+			if (((1 << i) & RuleI(Bots, AllowedClasses)) == 0)
+				continue;
+
+			window_text.append(const_cast<const std::string&>(message_separator));
+			if (object_count >= object_max) {
+				window_text.append("<br>");
+				object_count = 0;
+			}
+			window_text.append(StringFormat(class_substrs[i + 1].c_str(), (i + 1)));
+			++object_count;
+			message_separator = ", ";
+		}
+		window_text.append("<br><br>");
+
+		window_text.append("<c \"#FFFFFF\">Races:<c \"#FFFF\">");
+		message_separator = " ";
+		object_count = 1;
+		for (int i = 0; i <= 15; ++i) {
+			if (((1 << i) & RuleI(Bots, AllowedRaces)) == 0)
+				continue;
+
+			window_text.append(const_cast<const std::string&>(message_separator));
+			if (object_count >= object_max) {
+				window_text.append("<br>");
+				object_count = 0;
+			}
+			window_text.append(StringFormat(race_substrs[i + 1].c_str(), race_values[i + 1]));
+			++object_count;
+			message_separator = ", ";
+		}
+		window_text.append("<br><br>");
+
+		window_text.append("<c \"#FFFFFF\">Genders:<c \"#FFFF\">");
+		message_separator = " ";
+		for (int i = 0; i <= 1; ++i) {
+			if (((1 << i) & RuleI(Bots, AllowedGenders)) == 0)
+				continue;
+
+			window_text.append(const_cast<const std::string&>(message_separator));
+			window_text.append(StringFormat(gender_substrs[i].c_str(), i));
+
+			message_separator = ", ";
+		}
+
+
+		c->SendPopupToClient(window_title.c_str(), window_text.c_str());
+
 		return;
 	}
 
@@ -4361,21 +5174,21 @@ void bot_subcommand_bot_create(Client *c, const Seperator *sep)
 		return;
 	}
 	std::string bot_name = sep->arg[1];
-
+	bot_name = ucfirst(bot_name);
 	if (sep->arg[2][0] == '\0' || !sep->IsNumber(2)) {
-		c->Message(m_fail, msg_class.c_str());
+		c->Message(m_fail, "Invalid Class!");
 		return;
 	}
 	uint8 bot_class = atoi(sep->arg[2]);
 
 	if (sep->arg[3][0] == '\0' || !sep->IsNumber(3)) {
-		c->Message(m_fail, msg_race.c_str());
+		c->Message(m_fail, "Invalid Race!");
 		return;
 	}
 	uint16 bot_race = atoi(sep->arg[3]);
 
 	if (sep->arg[4][0] == '\0') {
-		c->Message(m_fail, msg_gender.c_str());
+		c->Message(m_fail, "Invalid Gender!");
 		return;
 	}
 	uint8 bot_gender = atoi(sep->arg[4]);
@@ -4833,7 +5646,7 @@ void bot_subcommand_bot_inspect_message(Client *c, const Seperator *sep)
 		set_flag = true;
 	}
 	else if (strcasecmp(sep->arg[1], "clear")) {
-		c->Message(15, "This command requires a [set | clear] argument");
+		c->Message(Chat::Yellow, "This command requires a [set | clear] argument");
 		return;
 	}
 
@@ -4889,17 +5702,22 @@ void bot_subcommand_bot_list(Client *c, const Seperator *sep)
 	if (helper_command_alias_fail(c, "bot_subcommand_bot_list", sep->arg[0], "botlist"))
 		return;
 	if (helper_is_help_or_usage(sep->arg[1])) {
-		c->Message(m_usage, "usage: %s ([class] [value]) ([race] [value]) ([name] [partial-full])", sep->arg[0]);
+		c->Message(m_usage, "usage: %s (account) ([class] [value]) ([race] [value]) ([name] [partial-full])", sep->arg[0]);
 		c->Message(m_note, "note: filter criteria is orderless and optional");
 		return;
 	}
-
+	bool Account = false;
+	int seps = 1;
 	uint32 filter_value[FilterCount];
 	int name_criteria_arg = 0;
 	memset(&filter_value, 0, sizeof(uint32) * FilterCount);
 
 	int filter_mask = 0;
-	for (int i = 1; i < (FilterCount * 2); i += 2) {
+	if (strcasecmp(sep->arg[1], "account") == 0) {
+		Account = true;
+		seps = 2;
+	}
+	for (int i = seps; i < (FilterCount * 2); i += 2) {
 		if (sep->arg[i][0] == '\0')
 			break;
 
@@ -4924,7 +5742,7 @@ void bot_subcommand_bot_list(Client *c, const Seperator *sep)
 	}
 
 	std::list<BotsAvailableList> bots_list;
-	if (!database.botdb.LoadBotsList(c->CharacterID(), bots_list)) {
+	if (!database.botdb.LoadBotsList(c->CharacterID(), bots_list, Account)) {
 		c->Message(m_fail, "%s", BotDatabase::fail::LoadBotsList());
 		return;
 	}
@@ -4934,6 +5752,7 @@ void bot_subcommand_bot_list(Client *c, const Seperator *sep)
 	}
 
 	int bot_count = 0;
+	int bots_owned = 0;
 	for (auto bots_iter : bots_list) {
 		if (filter_mask) {
 			if ((filter_mask & MaskClass) && filter_value[FilterClass] != bots_iter.Class)
@@ -4949,23 +5768,26 @@ void bot_subcommand_bot_list(Client *c, const Seperator *sep)
 					continue;
 			}
 		}
-
-		c->Message(m_message, "%s is a level %u %s %s %s",
-			bots_iter.Name,
+		Bot * botCheckNotOnline = entity_list.GetBotByBotName(bots_iter.Name);
+		std::string	botspawn_saylink = StringFormat("^botspawn %s", bots_iter.Name);
+		c->Message(Chat::White, "[%s] is a level %u %s %s %s who is owned by %s",
+			((c->CharacterID() == bots_iter.Owner_ID) && (!botCheckNotOnline) ? (EQEmu::SayLinkEngine::GenerateQuestSaylink(botspawn_saylink, false, bots_iter.Name).c_str()) : (bots_iter.Name)),
 			bots_iter.Level,
 			Bot::RaceIdToString(bots_iter.Race).c_str(),
 			((bots_iter.Gender == FEMALE) ? ("Female") : ((bots_iter.Gender == MALE) ? ("Male") : ("Neuter"))),
-			Bot::ClassIdToString(bots_iter.Class).c_str()
+			Bot::ClassIdToString(bots_iter.Class).c_str(),
+			bots_iter.Owner
 		);
-
+		if (c->CharacterID() == bots_iter.Owner_ID) { ++bots_owned; }
 		++bot_count;
 	}
 	if (!bot_count) {
-		c->Message(m_fail, "You have no bots meeting this criteria");
+		c->Message(Chat::Red, "You have no bots meeting this criteria");
 	}
 	else {
-		c->Message(m_action, "%i of %i bot%s shown", bot_count, bots_list.size(), ((bot_count != 1) ? ("s") : ("")));
-		c->Message(m_message, "Your limit is %i bot%s", RuleI(Bots, CreationLimit), ((RuleI(Bots, CreationLimit) != 1) ? ("s") : ("")));
+		c->Message(Chat::Yellow, "%i of %i bot%s shown.", bot_count, bots_list.size(), ((bot_count != 1) ? ("s") : ("")));
+		c->Message(Chat::Yellow, "%i of %i bot%s are owned by you. (You may spawn any available by clicking name)", bots_owned, bot_count, ((bot_count != 1) ? ("s") : ("")));
+		c->Message(Chat::White, "Your limit is %i bot%s", RuleI(Bots, CreationLimit), ((RuleI(Bots, CreationLimit) != 1) ? ("s") : ("")));
 	}
 }
 
@@ -5011,6 +5833,90 @@ void bot_subcommand_bot_out_of_combat(Client *c, const Seperator *sep)
 	}
 }
 
+void bot_subcommand_bot_surname(Client *c, const Seperator *sep)
+{
+	if (sep->arg[1][0] == '\0' || sep->IsNumber(1)) {
+		c->Message(Chat::Red, "You must specify a [surname] to use this command (use _ to define spaces or -remove to clear.)");
+		return;
+	}
+	auto my_bot = ActionableBots::AsTarget_ByBot(c);
+	if (!my_bot) {
+		c->Message(Chat::Red, "You must <target> a bot that you own to use this command");
+		return;
+	}
+	if (strlen(sep->arg[1]) > 31) {
+		c->Message(Chat::Red, "Surname must be 31 characters or less.");
+		return;
+	}
+	std::string bot_surname = sep->arg[1];
+	bot_surname = (bot_surname == "-remove") ? "" : bot_surname;
+	std::replace(bot_surname.begin(), bot_surname.end(), '_', ' ');
+
+	my_bot->SetSurname(bot_surname);
+	if (!database.botdb.SaveBot(my_bot)) {
+		c->Message(Chat::Red, BotDatabase::fail::SaveBot());
+	}
+	else {
+		c->Message(Chat::Yellow, "Bot Surname Saved.");
+	}
+}
+
+void bot_subcommand_bot_title(Client *c, const Seperator *sep)
+{
+	if (sep->arg[1][0] == '\0' || sep->IsNumber(1)) {
+		c->Message(Chat::Red, "You must specify a [title] to use this command. (use _ to define spaces or -remove to clear.)");
+		return;
+	}
+	auto my_bot = ActionableBots::AsTarget_ByBot(c);
+	if (!my_bot) {
+		c->Message(Chat::Red, "You must <target> a bot that you own to use this command");
+		return;
+	}
+	if (strlen(sep->arg[1]) > 31) {
+		c->Message(Chat::Red, "Title must be 31 characters or less.");
+		return;
+	}
+	std::string bot_title = sep->arg[1];
+	bot_title = (bot_title == "-remove") ? "" : bot_title;
+	std::replace(bot_title.begin(), bot_title.end(), '_', ' ');
+
+	my_bot->SetTitle(bot_title);
+	if (!database.botdb.SaveBot(my_bot)) {
+		c->Message(Chat::Red, BotDatabase::fail::SaveBot());
+	}
+	else {
+		c->Message(Chat::Yellow, "Bot Title Saved.");
+	}
+}
+
+void bot_subcommand_bot_suffix(Client *c, const Seperator *sep)
+{
+	if (sep->arg[1][0] == '\0' || sep->IsNumber(1)) {
+		c->Message(Chat::Red, "You must specify a [suffix] to use this command. (use _ to define spaces or -remove to clear.)");
+		return;
+	}
+	auto my_bot = ActionableBots::AsTarget_ByBot(c);
+	if (!my_bot) {
+		c->Message(Chat::Red, "You must <target> a bot that you own to use this command");
+		return;
+	}
+	if (strlen(sep->arg[1]) > 31) {
+		c->Message(Chat::Red, "Suffix must be 31 characters or less.");
+		return;
+	}
+	std::string bot_suffix = sep->arg[1];
+	bot_suffix = (bot_suffix == "-remove") ? "" : bot_suffix;
+	std::replace(bot_suffix.begin(), bot_suffix.end(), '_', ' ');
+
+	my_bot->SetSuffix(bot_suffix);
+	if (!database.botdb.SaveBot(my_bot)) {
+		c->Message(Chat::Red, BotDatabase::fail::SaveBot());
+	}
+	else {
+		c->Message(Chat::Yellow, "Bot Suffix Saved.");
+	}
+}
+
 void bot_subcommand_bot_report(Client *c, const Seperator *sep)
 {
 	if (helper_command_alias_fail(c, "bot_subcommand_bot_report", sep->arg[0], "botreport"))
@@ -5153,8 +6059,9 @@ void bot_subcommand_bot_spawn(Client *c, const Seperator *sep)
 		return;
 	}
 
-	static const char* bot_spawn_message[16] = {
-		"A solid weapon is my ally!", // WARRIOR / 'generic'
+	static const char* bot_spawn_message[17] = {
+		"I am ready to fight!", // DEFAULT
+		"A solid weapon is my ally!", // WARRIOR
 		"The pious shall never die!", // CLERIC
 		"I am the symbol of Light!", // PALADIN
 		"There are enemies near!", // RANGER
@@ -5172,7 +6079,17 @@ void bot_subcommand_bot_spawn(Client *c, const Seperator *sep)
 		"My bloodthirst shall not be quenched!" // BERSERKER
 	};
 
-	Bot::BotGroupSay(my_bot, "%s", bot_spawn_message[CLASSIDTOINDEX(my_bot->GetClass())]);
+	uint8 message_index = 0;
+	if (c->GetBotOption(Client::booSpawnMessageClassSpecific)) {
+		message_index = VALIDATECLASSID(my_bot->GetClass());
+	}
+
+	if (c->GetBotOption(Client::booSpawnMessageSay)) {
+		Bot::BotGroupSay(my_bot, "%s", bot_spawn_message[message_index]);
+	}
+	else if (c->GetBotOption(Client::booSpawnMessageTell)) {
+		c->Message(Chat::Tell, "%s tells you, \"%s\"", my_bot->GetCleanName(), bot_spawn_message[message_index]);
+	}
 }
 
 void bot_subcommand_bot_stance(Client *c, const Seperator *sep)
@@ -5240,7 +6157,7 @@ void bot_subcommand_bot_stop_melee_level(Client *c, const Seperator *sep)
 		return;
 	if (helper_is_help_or_usage(sep->arg[1])) {
 		c->Message(m_usage, "usage: <target_bot> %s [current | reset | sync | value: 0-255]", sep->arg[0]);
-		c->Message(m_note, "note: Only caster and spell-casting fighter class bots may be modified");
+		c->Message(m_note, "note: Only caster or hybrid class bots may be modified");
 		c->Message(m_note, "note: Use [reset] to set stop melee level to server rule");
 		c->Message(m_note, "note: Use [sync] to set stop melee level to current bot level");
 		return;
@@ -5251,8 +6168,8 @@ void bot_subcommand_bot_stop_melee_level(Client *c, const Seperator *sep)
 		c->Message(m_fail, "You must <target> a bot that you own to use this command");
 		return;
 	}
-	if (!IsCasterClass(my_bot->GetClass()) && !IsSpellFighterClass(my_bot->GetClass())) {
-		c->Message(m_fail, "You must <target> a caster or spell-casting fighter class bot to use this command");
+	if (!IsCasterClass(my_bot->GetClass()) && !IsHybridClass(my_bot->GetClass())) {
+		c->Message(m_fail, "You must <target> a caster or hybrid class bot to use this command");
 		return;
 	}
 
@@ -5552,7 +6469,7 @@ void bot_subcommand_bot_update(Client *c, const Seperator *sep)
 			continue;
 
 		bot_iter->SetPetChooser(false);
-		bot_iter->CalcBotStats(c->GetBotOptionStatsUpdate());
+		bot_iter->CalcBotStats(c->GetBotOption(Client::booStatsUpdate));
 		bot_iter->SendAppearancePacket(AT_WhoLevel, bot_iter->GetLevel(), true, true);
 		++bot_count;
 	}
@@ -7284,7 +8201,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 	int ab_mask = (ActionableBots::ABM_Target | ActionableBots::ABM_ByName);
 
 	if (c->GetTradeskillObject() || (c->trade->state == Trading)) {
-		c->Message_StringID(MT_Tell, MERCHANT_BUSY);
+		c->MessageString(Chat::Tell, MERCHANT_BUSY);
 		return;
 	}
 
@@ -7310,7 +8227,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 		itm = itminst->GetItem();
 
 	if (itminst && itm && c->CheckLoreConflict(itm)) {
-		c->Message_StringID(0, PICK_LORE);
+		c->MessageString(Chat::White, PICK_LORE);
 		return;
 	}
 
@@ -7324,7 +8241,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 		if (!c->CheckLoreConflict(itma->GetItem()))
 			continue;
 
-		c->Message_StringID(0, PICK_LORE);
+		c->MessageString(Chat::White, PICK_LORE);
 		return;
 	}
 	
@@ -7341,7 +8258,7 @@ void bot_subcommand_inventory_remove(Client *c, const Seperator *sep)
 		}
 
 		my_bot->BotRemoveEquipItem(slotId);
-		my_bot->CalcBotStats(c->GetBotOptionStatsUpdate());
+		my_bot->CalcBotStats(c->GetBotOption(Client::booStatsUpdate));
 	}
 
 	switch (slotId) {
@@ -7454,7 +8371,7 @@ void bot_subcommand_pet_get_lost(Client *c, const Seperator *sep)
 		if (!bot_iter->GetPet() || bot_iter->GetPet()->IsCharmed())
 			continue;
 
-		bot_iter->GetPet()->Say_StringID(PET_GETLOST_STRING);
+		bot_iter->GetPet()->SayString(PET_GETLOST_STRING);
 		bot_iter->GetPet()->Depop(false);
 		bot_iter->SetPetID(0);
 		database.botdb.DeletePetItems(bot_iter->GetBotID());
@@ -7500,7 +8417,7 @@ void bot_subcommand_pet_remove(Client *c, const Seperator *sep)
 		}
 
 		if (bot_iter->GetPet()) {
-			bot_iter->GetPet()->Say_StringID(PET_GETLOST_STRING);
+			bot_iter->GetPet()->SayString(PET_GETLOST_STRING);
 			bot_iter->GetPet()->Depop(false);
 			bot_iter->SetPetID(0);
 		}
@@ -7817,6 +8734,75 @@ void helper_bot_out_of_combat(Client *bot_owner, Bot *my_bot)
 	}
 }
 
+int helper_bot_follow_option_chain(Client* bot_owner)
+{
+	if (!bot_owner) {
+		return 0;
+	}
+
+	std::list<Bot*> sbl;
+	MyBots::PopulateSBL_BySpawnedBots(bot_owner, sbl);
+	if (sbl.empty()) {
+		return 0;
+	}
+
+	int chain_follow_count = 0;
+	Mob* followee = bot_owner;
+
+	// only add groups that do not belong to bot_owner
+	std::map<uint32, Group*> bot_group_map;
+	for (auto bot_iter : sbl) {
+
+		if (!bot_iter || bot_iter->GetManualFollow() || bot_iter->GetGroup() == bot_owner->GetGroup()) {
+			continue;
+		}
+
+		Group* bot_group = bot_iter->GetGroup();
+		if (!bot_iter->GetGroup()) {
+			continue;
+		}
+
+		bot_group_map[bot_group->GetID()] = bot_group;
+	}
+
+	std::list<Bot*> bot_member_list;
+	if (bot_owner->GetGroup()) {
+
+		bot_owner->GetGroup()->GetBotList(bot_member_list);
+		for (auto bot_member_iter : bot_member_list) {
+
+			if (!bot_member_iter || bot_member_iter->GetBotOwnerCharacterID() != bot_owner->CharacterID() || bot_member_iter == followee || bot_member_iter->GetManualFollow()) {
+				continue;
+			}
+
+			bot_member_iter->SetFollowID(followee->GetID());
+			followee = bot_member_iter;
+			++chain_follow_count;
+		}
+	}
+
+	for (auto bot_group_iter : bot_group_map) {
+
+		if (!bot_group_iter.second) {
+			continue;
+		}
+
+		bot_group_iter.second->GetBotList(bot_member_list);
+		for (auto bot_member_iter : bot_member_list) {
+
+			if (!bot_member_iter || bot_member_iter->GetBotOwnerCharacterID() != bot_owner->CharacterID() || bot_member_iter == followee || bot_member_iter->GetManualFollow()) {
+				continue;
+			}
+
+			bot_member_iter->SetFollowID(followee->GetID());
+			followee = bot_member_iter;
+			++chain_follow_count;
+		}
+	}
+
+	return chain_follow_count;
+}
+
 bool helper_cast_standard_spell(Bot* casting_bot, Mob* target_mob, int spell_id, bool annouce_cast, uint32* dont_root_before)
 {
 	if (!casting_bot || !target_mob)
@@ -7829,6 +8815,16 @@ bool helper_cast_standard_spell(Bot* casting_bot, Mob* target_mob, int spell_id,
 	return casting_bot->CastSpell(spell_id, target_mob->GetID(), EQEmu::spells::CastingSlot::Gem2, -1, -1, dont_root_before);
 }
 
+bool helper_command_disabled(Client* bot_owner, bool rule_value, const char* command)
+{
+	if (rule_value == false) {
+		bot_owner->Message(m_fail, "Bot command %s is not enabled on this server.", command);
+		return true;
+	}
+
+	return false;
+}
+
 bool helper_command_alias_fail(Client *bot_owner, const char* command_handler, const char *alias, const char *command)
 {
 	auto alias_iter = bot_command_aliases.find(&alias[1]);
diff --git a/zone/bot_command.h b/zone/bot_command.h
index d60238f23..84a56f239 100644
--- a/zone/bot_command.h
+++ b/zone/bot_command.h
@@ -553,6 +553,8 @@ void bot_command_log_command(Client *c, const char *message);
 // bot commands
 void bot_command_actionable(Client *c, const Seperator *sep);
 void bot_command_aggressive(Client *c, const Seperator *sep);
+void bot_command_apply_poison(Client *c, const Seperator *sep);
+void bot_command_apply_potion(Client* c, const Seperator* sep);
 void bot_command_attack(Client *c, const Seperator *sep);
 void bot_command_bind_affinity(Client *c, const Seperator *sep);
 void bot_command_bot(Client *c, const Seperator *sep);
@@ -571,6 +573,7 @@ void bot_command_hold(Client *c, const Seperator *sep);
 void bot_command_identify(Client *c, const Seperator *sep);
 void bot_command_inventory(Client *c, const Seperator *sep);
 void bot_command_invisibility(Client *c, const Seperator *sep);
+void bot_command_item_use(Client *c, const Seperator *sep);
 void bot_command_levitation(Client *c, const Seperator *sep);
 void bot_command_lull(Client *c, const Seperator *sep);
 void bot_command_mesmerize(Client *c, const Seperator *sep);
@@ -578,6 +581,7 @@ void bot_command_movement_speed(Client *c, const Seperator *sep);
 void bot_command_owner_option(Client *c, const Seperator *sep);
 void bot_command_pet(Client *c, const Seperator *sep);
 void bot_command_pick_lock(Client *c, const Seperator *sep);
+void bot_command_precombat(Client* c, const Seperator* sep);
 void bot_command_pull(Client *c, const Seperator *sep);
 void bot_command_release(Client *c, const Seperator *sep);
 void bot_command_resistance(Client *c, const Seperator *sep);
@@ -586,6 +590,7 @@ void bot_command_rune(Client *c, const Seperator *sep);
 void bot_command_send_home(Client *c, const Seperator *sep);
 void bot_command_size(Client *c, const Seperator *sep);
 void bot_command_summon_corpse(Client *c, const Seperator *sep);
+void bot_command_suspend(Client *c, const Seperator *sep);
 void bot_command_taunt(Client *c, const Seperator *sep);
 void bot_command_track(Client *c, const Seperator *sep);
 void bot_command_water_breathing(Client *c, const Seperator *sep);
@@ -614,8 +619,11 @@ void bot_subcommand_bot_report(Client *c, const Seperator *sep);
 void bot_subcommand_bot_spawn(Client *c, const Seperator *sep);
 void bot_subcommand_bot_stance(Client *c, const Seperator *sep);
 void bot_subcommand_bot_stop_melee_level(Client *c, const Seperator *sep);
+void bot_subcommand_bot_suffix(Client *c, const Seperator *sep);
 void bot_subcommand_bot_summon(Client *c, const Seperator *sep);
+void bot_subcommand_bot_surname(Client *c, const Seperator *sep);
 void bot_subcommand_bot_tattoo(Client *c, const Seperator *sep);
+void bot_subcommand_bot_title(Client *c, const Seperator *sep);
 void bot_subcommand_bot_toggle_archer(Client *c, const Seperator *sep);
 void bot_subcommand_bot_toggle_helm(Client *c, const Seperator *sep);
 void bot_subcommand_bot_update(Client *c, const Seperator *sep);
@@ -665,7 +673,9 @@ void helper_bot_appearance_form_final(Client *bot_owner, Bot *my_bot);
 void helper_bot_appearance_form_update(Bot *my_bot);
 uint32 helper_bot_create(Client *bot_owner, std::string bot_name, uint8 bot_class, uint16 bot_race, uint8 bot_gender);
 void helper_bot_out_of_combat(Client *bot_owner, Bot *my_bot);
+int helper_bot_follow_option_chain(Client *bot_owner);
 bool helper_cast_standard_spell(Bot* casting_bot, Mob* target_mob, int spell_id, bool annouce_cast = true, uint32* dont_root_before = nullptr);
+bool helper_command_disabled(Client *bot_owner, bool rule_value, const char *command);
 bool helper_command_alias_fail(Client *bot_owner, const char* command_handler, const char *alias, const char *command);
 void helper_command_depart_list(Client* bot_owner, Bot* druid_bot, Bot* wizard_bot, bcst_list* local_list, bool single_flag = false);
 bool helper_is_help_or_usage(const char* arg);
diff --git a/zone/bot_database.cpp b/zone/bot_database.cpp
index 2aaf677bb..2f6f9c1c6 100644
--- a/zone/bot_database.cpp
+++ b/zone/bot_database.cpp
@@ -27,6 +27,8 @@
 #include "bot.h"
 #include "client.h"
 
+#include <fmt/format.h>
+
 
 bool BotDatabase::LoadBotCommandSettings(std::map<std::string, std::pair<uint8, std::vector<std::string>>> &bot_command_settings)
 {
@@ -52,6 +54,58 @@ bool BotDatabase::LoadBotCommandSettings(std::map<std::string, std::pair<uint8,
 	return true;
 }
 
+bool BotDatabase::UpdateInjectedBotCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected)
+{
+	if (injected.size()) {
+
+		query = fmt::format(
+			"REPLACE INTO `bot_command_settings`(`bot_command`, `access`) VALUES {}",
+			implode(
+				",",
+				std::pair<char, char>('(', ')'),
+				join_pair(",", std::pair<char, char>('\'', '\''), injected)
+			)
+		);
+
+		if (!database.QueryDatabase(query).Success()) {
+			return false;
+		}
+
+		Log(Logs::General,
+			Logs::Status,
+			"%u New Bot Command%s Added",
+			injected.size(),
+			(injected.size() == 1 ? "" : "s")
+		);
+	}
+
+	return true;
+}
+
+bool BotDatabase::UpdateOrphanedBotCommandSettings(const std::vector<std::string> &orphaned)
+{
+	if (orphaned.size()) {
+
+		query = fmt::format(
+			"DELETE FROM `bot_command_settings` WHERE `bot_command` IN ({})",
+			implode(",", std::pair<char, char>('\'', '\''), orphaned)
+		);
+
+		if (!database.QueryDatabase(query).Success()) {
+			return false;
+		}
+
+		Log(Logs::General,
+			Logs::Status,
+			"%u Orphaned Bot Command%s Deleted",
+			orphaned.size(),
+			(orphaned.size() == 1 ? "" : "s")
+		);
+	}
+
+	return true;
+}
+
 bool BotDatabase::LoadBotSpellCastingChances()
 {
 	query =
@@ -163,12 +217,19 @@ bool BotDatabase::LoadQuestableSpawnCount(const uint32 owner_id, int& spawn_coun
 	return true;
 }
 
-bool BotDatabase::LoadBotsList(const uint32 owner_id, std::list<BotsAvailableList>& bots_list)
+bool BotDatabase::LoadBotsList(const uint32 owner_id, std::list<BotsAvailableList>& bots_list, bool ByAccount)
 {
 	if (!owner_id)
 		return false;
 
-	query = StringFormat("SELECT `bot_id`, `name`, `class`, `level`, `race`, `gender` FROM `bot_data` WHERE `owner_id` = '%u'", owner_id);
+	if (ByAccount == true)
+		 query = StringFormat("SELECT bot_id, bd.`name`, bd.class, bd.`level`, bd.race, bd.gender, cd.`name` as owner, bd.owner_id, cd.account_id, cd.id"
+			 " FROM bot_data as bd inner join character_data as cd on bd.owner_id = cd.id"
+			 " WHERE cd.account_id = (select account_id from bot_data bd inner join character_data as cd on bd.owner_id = cd.id where bd.owner_id = '%u' LIMIT 1)"
+			 " ORDER BY bd.owner_id", owner_id);
+	else
+		 query = StringFormat("SELECT `bot_id`, `name`, `class`, `level`, `race`, `gender`, 'You' as owner, owner_id FROM `bot_data` WHERE `owner_id` = '%u'", owner_id);
+
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
 		return false;
@@ -186,12 +247,17 @@ bool BotDatabase::LoadBotsList(const uint32 owner_id, std::list<BotsAvailableLis
 			bot_name = bot_name.substr(0, 63);
 		if (!bot_name.empty())
 			strcpy(bot_entry.Name, bot_name.c_str());
-
+		memset(&bot_entry.Owner, 0, sizeof(bot_entry.Owner));
+		std::string bot_owner = row[6];
+		if (bot_owner.size() > 63)
+			 bot_owner = bot_owner.substr(0, 63);
+		if (!bot_owner.empty())
+			 strcpy(bot_entry.Owner, bot_owner.c_str());
 		bot_entry.Class = atoi(row[2]);
 		bot_entry.Level = atoi(row[3]);
 		bot_entry.Race = atoi(row[4]);
 		bot_entry.Gender = atoi(row[5]);
-
+		bot_entry.Owner_ID = atoi(row[7]);
 		bots_list.push_back(bot_entry);
 	}
 
@@ -266,8 +332,8 @@ bool BotDatabase::LoadBot(const uint32 bot_id, Bot*& loaded_bot)
 		" `spells_id`,"
 		" `name`,"
 		" `last_name`,"
-		" `title`,"				/* planned use[4] */
-		" `suffix`,"			/* planned use[5] */
+		" `title`,"
+		" `suffix`,"
 		" `zone_id`,"
 		" `gender`,"
 		" `race`,"
@@ -364,7 +430,9 @@ bool BotDatabase::LoadBot(const uint32 bot_id, Bot*& loaded_bot)
 	loaded_bot = new Bot(bot_id, atoi(row[0]), atoi(row[1]), atof(row[14]), atoi(row[6]), tempNPCStruct);
 	if (loaded_bot) {
 		loaded_bot->SetShowHelm((atoi(row[43]) > 0 ? true : false));
-
+		loaded_bot->SetSurname(row[3]);//maintaining outside mob::lastname to cater to spaces
+		loaded_bot->SetTitle(row[4]);
+		loaded_bot->SetSuffix(row[5]);
 		uint32 bfd = atoi(row[44]);
 		if (bfd < 1)
 			bfd = 1;
@@ -512,7 +580,7 @@ bool BotDatabase::SaveNewBot(Bot* bot_inst, uint32& bot_id)
 		bot_inst->GetPR(),
 		bot_inst->GetDR(),
 		bot_inst->GetCorrup(),
-		BOT_FOLLOW_DISTANCE_DEFAULT,
+		(uint32)BOT_FOLLOW_DISTANCE_DEFAULT,
 		(IsCasterClass(bot_inst->GetClass()) ? (uint8)RuleI(Bots, CasterStopMeleeLevel) : 255)
 	);
 	auto results = database.QueryDatabase(query);
@@ -573,12 +641,14 @@ bool BotDatabase::SaveBot(Bot* bot_inst)
 		" `corruption` = '%i',"
 		" `show_helm` = '%i',"
 		" `follow_distance` = '%i',"
-		" `stop_melee_level` = '%u'"
+		" `stop_melee_level` = '%u',"
+		" `title` = '%s',"
+		" `suffix` = '%s'"
 		" WHERE `bot_id` = '%u'",
 		bot_inst->GetBotOwnerCharacterID(),
 		bot_inst->GetBotSpellID(),
 		bot_inst->GetCleanName(),
-		bot_inst->GetLastName(),
+		bot_inst->GetSurname().c_str(),
 		bot_inst->GetLastZoneID(),
 		bot_inst->GetBaseGender(),
 		bot_inst->GetBaseRace(),
@@ -616,6 +686,8 @@ bool BotDatabase::SaveBot(Bot* bot_inst)
 		((bot_inst->GetShowHelm()) ? (1) : (0)),
 		bot_inst->GetFollowDistance(),
 		bot_inst->GetStopMeleeLevel(),
+		bot_inst->GetTitle().c_str(),
+		bot_inst->GetSuffix().c_str(),
 		bot_inst->GetBotID()
 	);
 	auto results = database.QueryDatabase(query);
@@ -1121,7 +1193,7 @@ bool BotDatabase::LoadItems(const uint32 bot_id, EQEmu::InventoryProfile& invent
 			(uint32)atoul(row[14])
 		);
 		if (!item_inst) {
-			Log(Logs::General, Logs::Error, "Warning: bot_id '%i' has an invalid item_id '%i' in inventory slot '%i'", bot_id, item_id, slot_id);
+			LogError("Warning: bot_id [{}] has an invalid item_id [{}] in inventory slot [{}]", bot_id, item_id, slot_id);
 			continue;
 		}
 
@@ -1174,7 +1246,7 @@ bool BotDatabase::LoadItems(const uint32 bot_id, EQEmu::InventoryProfile& invent
 		item_inst->SetOrnamentHeroModel((uint32)atoul(row[8]));
 
 		if (inventory_inst.PutItem(slot_id, *item_inst) == INVALID_INDEX)
-			Log(Logs::General, Logs::Error, "Warning: Invalid slot_id for item in inventory: bot_id = '%i', item_id = '%i', slot_id = '%i'", bot_id, item_id, slot_id);
+			LogError("Warning: Invalid slot_id for item in inventory: bot_id = [{}], item_id = [{}], slot_id = [{}]", bot_id, item_id, slot_id);
 
 		safe_delete(item_inst);
 	}
@@ -2153,67 +2225,96 @@ bool BotDatabase::SaveStopMeleeLevel(const uint32 owner_id, const uint32 bot_id,
 
 bool BotDatabase::LoadOwnerOptions(Client *owner)
 {
-	if (!owner || !owner->CharacterID())
-		return false;
-
-	query = StringFormat(
-		"SELECT `death_marquee`, `stats_update` FROM `bot_owner_options`"
-		" WHERE `owner_id` = '%u'",
-		owner->CharacterID()
-	);
-	auto results = database.QueryDatabase(query);
-	if (!results.Success())
-		return false;
-	if (!results.RowCount()) {
-		query = StringFormat("REPLACE INTO `bot_owner_options` (`owner_id`) VALUES ('%u')", owner->CharacterID());
-		results = database.QueryDatabase(query);
-
+	if (!owner || !owner->CharacterID()) {
 		return false;
 	}
 
-	auto row = results.begin();
-	owner->SetBotOptionDeathMarquee((atoi(row[0]) != 0));
-	owner->SetBotOptionStatsUpdate((atoi(row[1]) != 0));
+	query = fmt::format("SELECT `option_type`, `option_value` FROM `bot_owner_options` WHERE `owner_id` = '{}'", owner->CharacterID());
+
+	auto results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		return false;
+	}
+
+	for (auto row : results) {
+		
+		owner->SetBotOption(static_cast<Client::BotOwnerOption>(atoul(row[0])), (atoul(row[1]) != 0));
+	}
 
 	return true;
 }
 
-bool BotDatabase::SaveOwnerOptionDeathMarquee(const uint32 owner_id, const bool flag)
+bool BotDatabase::SaveOwnerOption(const uint32 owner_id, size_t type, const bool flag)
 {
-	if (!owner_id)
+	if (!owner_id) {
 		return false;
+	}
 
-	query = StringFormat(
-		"UPDATE `bot_owner_options`"
-		" SET `death_marquee` = '%u'"
-		" WHERE `owner_id` = '%u'",
-		(flag == true ? 1 : 0),
-		owner_id
-	);
-	auto results = database.QueryDatabase(query);
-	if (!results.Success())
+	switch (static_cast<Client::BotOwnerOption>(type)) {
+	case Client::booDeathMarquee:
+	case Client::booStatsUpdate:
+	case Client::booSpawnMessageClassSpecific:
+	case Client::booAltCombat:
+	case Client::booAutoDefend:
+	case Client::booBuffCounter:
+	{
+		query = fmt::format(
+			"REPLACE INTO `bot_owner_options`(`owner_id`, `option_type`, `option_value`) VALUES ('{}', '{}', '{}')",
+			owner_id,
+			type,
+			(flag == true ? 1 : 0)
+		);
+
+		auto results = database.QueryDatabase(query);
+		if (!results.Success()) {
+			return false;
+		}
+
+		return true;
+	}
+	default:
 		return false;
-
-	return true;
+	}
 }
 
-bool BotDatabase::SaveOwnerOptionStatsUpdate(const uint32 owner_id, const bool flag)
+bool BotDatabase::SaveOwnerOption(const uint32 owner_id, const std::pair<size_t, size_t> type, const std::pair<bool, bool> flag)
 {
-	if (!owner_id)
+	if (!owner_id) {
 		return false;
+	}
 
-	query = StringFormat(
-		"UPDATE `bot_owner_options`"
-		" SET `stats_update` = '%u'"
-		" WHERE `owner_id` = '%u'",
-		(flag == true ? 1 : 0),
-		owner_id
-	);
-	auto results = database.QueryDatabase(query);
-	if (!results.Success())
+	switch (static_cast<Client::BotOwnerOption>(type.first)) {
+	case Client::booSpawnMessageSay:
+	case Client::booSpawnMessageTell:
+	{
+		switch (static_cast<Client::BotOwnerOption>(type.second)) {
+		case Client::booSpawnMessageSay:
+		case Client::booSpawnMessageTell:
+		{
+			query = fmt::format(
+				"REPLACE INTO `bot_owner_options`(`owner_id`, `option_type`, `option_value`) VALUES ('{}', '{}', '{}'), ('{}', '{}', '{}')",
+				owner_id,
+				type.first,
+				(flag.first == true ? 1 : 0),
+				owner_id,
+				type.second,
+				(flag.second == true ? 1 : 0)
+			);
+
+			auto results = database.QueryDatabase(query);
+			if (!results.Success()) {
+				return false;
+			}
+
+			return true;
+		}
+		default:
+			return false;
+		}
+	}
+	default:
 		return false;
-
-	return true;
+	}
 }
 
 
diff --git a/zone/bot_database.h b/zone/bot_database.h
index a94d2a902..82cf68f09 100644
--- a/zone/bot_database.h
+++ b/zone/bot_database.h
@@ -43,6 +43,8 @@ class BotDatabase
 {
 public:
 	bool LoadBotCommandSettings(std::map<std::string, std::pair<uint8, std::vector<std::string>>> &bot_command_settings);
+	bool UpdateInjectedBotCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected);
+	bool UpdateOrphanedBotCommandSettings(const std::vector<std::string> &orphaned);
 	bool LoadBotSpellCastingChances();
 
 
@@ -50,7 +52,7 @@ public:
 	bool QueryNameAvailablity(const std::string& bot_name, bool& available_flag);
 	bool QueryBotCount(const uint32 owner_id, uint32& bot_count);
 	bool LoadQuestableSpawnCount(const uint32 owner_id, int& spawn_count);
-	bool LoadBotsList(const uint32 owner_id, std::list<BotsAvailableList>& bots_list);
+	bool LoadBotsList(const uint32 owner_id, std::list<BotsAvailableList>& bots_list, bool ByAccount = false);
 
 	bool LoadOwnerID(const std::string& bot_name, uint32& owner_id);
 	bool LoadOwnerID(const uint32 bot_id, uint32& owner_id);
@@ -139,9 +141,9 @@ public:
 	bool SaveStopMeleeLevel(const uint32 owner_id, const uint32 bot_id, const uint8 sml_value);
 
 	bool LoadOwnerOptions(Client *owner);
-	bool SaveOwnerOptionDeathMarquee(const uint32 owner_id, const bool flag);
-	bool SaveOwnerOptionStatsUpdate(const uint32 owner_id, const bool flag);
-
+	bool SaveOwnerOption(const uint32 owner_id, size_t type, const bool flag);
+	bool SaveOwnerOption(const uint32 owner_id, const std::pair<size_t, size_t> type, const std::pair<bool, bool> flag);
+	
 	/* Bot bot-group functions   */
 	bool QueryBotGroupExistence(const std::string& botgroup_name, bool& extant_flag);
 
diff --git a/zone/bot_structs.h b/zone/bot_structs.h
index d54c0c042..7ba32349b 100644
--- a/zone/bot_structs.h
+++ b/zone/bot_structs.h
@@ -32,6 +32,8 @@ struct BotsAvailableList {
 	uint8 Level;
 	uint16 Race;
 	uint8 Gender;
+	char Owner[64];
+	uint32 Owner_ID;
 };
 
 struct BotGroup {
diff --git a/zone/botspellsai.cpp b/zone/botspellsai.cpp
index 3ec7e7202..9acc8ac8b 100644
--- a/zone/botspellsai.cpp
+++ b/zone/botspellsai.cpp
@@ -1134,7 +1134,7 @@ bool Bot::AI_PursueCastCheck() {
 
 		AIautocastspell_timer->Disable();	//prevent the timer from going off AGAIN while we are casting.
 
-		Log(Logs::Detail, Logs::AI, "Bot Engaged (pursuing) autocast check triggered. Trying to cast offensive spells.");
+		LogAI("Bot Engaged (pursuing) autocast check triggered. Trying to cast offensive spells");
 
 		if(!AICastSpell(GetTarget(), 100, SpellType_Snare)) {
 			if(!AICastSpell(GetTarget(), 100, SpellType_Lifetap)) {
@@ -1162,20 +1162,23 @@ bool Bot::AI_IdleCastCheck() {
 
 	if (AIautocastspell_timer->Check(false)) {
 #if BotAI_DEBUG_Spells >= 25
-		Log(Logs::Detail, Logs::AI, "Bot Non-Engaged autocast check triggered: %s", this->GetCleanName());
+		LogAI("Bot Non-Engaged autocast check triggered: [{}]", this->GetCleanName());
 #endif
 		AIautocastspell_timer->Disable();	//prevent the timer from going off AGAIN while we are casting.
 
 		bool pre_combat = false;
-		Mob* test_against = nullptr;
+		Client* test_against = nullptr;
 
-		if (HasGroup() && GetGroup()->GetLeader() && GetGroup()->GetLeader()->IsClient())
-			test_against = GetGroup()->GetLeader();
-		else if (GetOwner() && GetOwner()->IsClient())
-			test_against = GetOwner();
+		if (HasGroup() && GetGroup()->GetLeader() && GetGroup()->GetLeader()->IsClient()) {
+			test_against = GetGroup()->GetLeader()->CastToClient();
+		}
+		else if (GetOwner() && GetOwner()->IsClient()) {
+			test_against = GetOwner()->CastToClient();
+		}
 
-		if (test_against && test_against->GetTarget() && test_against->GetTarget()->IsNPC() && !test_against->GetTarget()->IsPet())
-			pre_combat = true;
+		if (test_against) {
+			pre_combat = test_against->GetBotPrecombat();
+		}
 
 		//Ok, IdleCastCheck depends of class.
 		switch (GetClass()) {
@@ -1310,7 +1313,7 @@ bool Bot::AI_EngagedCastCheck() {
 		EQEmu::constants::StanceType botStance = GetBotStance();
 		bool mayGetAggro = HasOrMayGetAggro();
 
-		Log(Logs::Detail, Logs::AI, "Engaged autocast check triggered (BOTS). Trying to cast healing spells then maybe offensive spells.");
+		LogAI("Engaged autocast check triggered (BOTS). Trying to cast healing spells then maybe offensive spells");
 
 		if(botClass == CLERIC) {
 			if(!AICastSpell(GetTarget(), GetChanceToCastBySpellType(SpellType_Escape), SpellType_Escape)) {
@@ -1560,11 +1563,11 @@ bool Bot::AIHealRotation(Mob* tar, bool useFastHeals) {
 	}
 
 #if BotAI_DEBUG_Spells >= 10
-	Log(Logs::Detail, Logs::AI, "Bot::AIHealRotation: heal spellid = %u, fastheals = %c, casterlevel = %u",
+	LogAI("Bot::AIHealRotation: heal spellid = [{}], fastheals = [{}], casterlevel = [{}]",
 		botSpell.SpellId, ((useFastHeals) ? ('T') : ('F')), GetLevel());
 #endif
 #if BotAI_DEBUG_Spells >= 25
-	Log(Logs::Detail, Logs::AI, "Bot::AIHealRotation: target = %s, current_time = %u, donthealmebefore = %u", tar->GetCleanName(), Timer::GetCurrentTime(), tar->DontHealMeBefore());
+	LogAI("Bot::AIHealRotation: target = [{}], current_time = [{}], donthealmebefore = [{}]", tar->GetCleanName(), Timer::GetCurrentTime(), tar->DontHealMeBefore());
 #endif
 
 	// If there is still no spell id, then there isn't going to be one so we are done
diff --git a/zone/client.cpp b/zone/client.cpp
index fd2df48bc..9ea27869a 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -41,7 +41,6 @@ extern volatile bool RunLoops;
 #include "../common/profanity_manager.h"
 #include "data_bucket.h"
 #include "position.h"
-#include "net.h"
 #include "worldserver.h"
 #include "zonedb.h"
 #include "petitions.h"
@@ -67,6 +66,8 @@ extern PetitionList petition_list;
 bool commandlogged;
 char entirecommand[255];
 
+void UpdateWindowTitle(char* iNewTitle);
+
 Client::Client(EQStreamInterface* ieqs)
 : Mob("No name",	// name
 	"",	// lastname
@@ -122,48 +123,49 @@ Client::Client(EQStreamInterface* ieqs)
 	0,
 	0
 	),
-	hpupdate_timer(2000),
-	camp_timer(29000),
-	process_timer(100),
-	consume_food_timer(CONSUMPTION_TIMER),
-	zoneinpacket_timer(1000),
-	linkdead_timer(RuleI(Zone,ClientLinkdeadMS)),
-	dead_timer(2000),
-	global_channel_timer(1000),
-	shield_timer(500),
-	fishing_timer(8000),
-	endupkeep_timer(1000),
-	forget_timer(0),
-	autosave_timer(RuleI(Character, AutosaveIntervalS) * 1000),
-	client_scan_npc_aggro_timer(RuleI(Aggro, ClientAggroCheckInterval) * 1000),
-	tribute_timer(Tribute_duration),
-	proximity_timer(ClientProximity_interval),
-	TaskPeriodic_Timer(RuleI(TaskSystem, PeriodicCheckTimer) * 1000),
-	charm_update_timer(6000),
-	rest_timer(1),
-	charm_class_attacks_timer(3000),
-	charm_cast_timer(3500),
-	qglobal_purge_timer(30000),
-	TrackingTimer(2000),
-	RespawnFromHoverTimer(0),
-	merc_timer(RuleI(Mercs, UpkeepIntervalMS)),
-	ItemTickTimer(10000),
-	ItemQuestTimer(500),
-	anon_toggle_timer(250),
-	afk_toggle_timer(250),
-	helm_toggle_timer(250),
-	aggro_meter_timer(AGGRO_METER_UPDATE_MS),
-	m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number
+  hpupdate_timer(2000),
+  camp_timer(29000),
+  process_timer(100),
+  consume_food_timer(CONSUMPTION_TIMER),
+  zoneinpacket_timer(1000),
+  linkdead_timer(RuleI(Zone,ClientLinkdeadMS)),
+  dead_timer(2000),
+  global_channel_timer(1000),
+  shield_timer(500),
+  fishing_timer(8000),
+  endupkeep_timer(1000),
+  forget_timer(0),
+  autosave_timer(RuleI(Character, AutosaveIntervalS) * 1000),
+  client_scan_npc_aggro_timer(RuleI(Aggro, ClientAggroCheckInterval) * 1000),
+  client_zone_wide_full_position_update_timer(5 * 60 * 1000),
+  tribute_timer(Tribute_duration),
+  proximity_timer(ClientProximity_interval),
+  TaskPeriodic_Timer(RuleI(TaskSystem, PeriodicCheckTimer) * 1000),
+  charm_update_timer(6000),
+  rest_timer(1),
+  charm_class_attacks_timer(3000),
+  charm_cast_timer(3500),
+  qglobal_purge_timer(30000),
+  TrackingTimer(2000),
+  RespawnFromHoverTimer(0),
+  merc_timer(RuleI(Mercs, UpkeepIntervalMS)),
+  ItemTickTimer(10000),
+  ItemQuestTimer(500),
+  anon_toggle_timer(250),
+  afk_toggle_timer(250),
+  helm_toggle_timer(250),
+  aggro_meter_timer(AGGRO_METER_UPDATE_MS),
+  m_Proximity(FLT_MAX, FLT_MAX, FLT_MAX), //arbitrary large number
 	m_ZoneSummonLocation(-2.0f,-2.0f,-2.0f),
-	m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f),
-	m_AutoAttackTargetLocation(0.0f, 0.0f, 0.0f),
-	last_region_type(RegionTypeUnsupported),
-	m_dirtyautohaters(false),
-	npc_close_scan_timer(6000),
-	hp_self_update_throttle_timer(300),
-	hp_other_update_throttle_timer(500),
-	position_update_timer(10000),
-	tmSitting(0)
+  m_AutoAttackPosition(0.0f, 0.0f, 0.0f, 0.0f),
+  m_AutoAttackTargetLocation(0.0f, 0.0f, 0.0f),
+  last_region_type(RegionTypeUnsupported),
+  m_dirtyautohaters(false),
+  mob_close_scan_timer(6000),
+  hp_self_update_throttle_timer(300),
+  hp_other_update_throttle_timer(500),
+  position_update_timer(10000),
+  tmSitting(0)
 {
 
 	for (int client_filter = 0; client_filter < _FilterCount; client_filter++)
@@ -243,7 +245,7 @@ Client::Client(EQStreamInterface* ieqs)
 	PendingRezzSpellID = 0;
 	numclients++;
 	// emuerror;
-	UpdateWindowTitle();
+	UpdateWindowTitle(nullptr);
 	horseId = 0;
 	tgb = false;
 	tribute_master_id = 0xFFFFFFFF;
@@ -264,6 +266,7 @@ Client::Client(EQStreamInterface* ieqs)
 	PendingTranslocate = false;
 	PendingSacrifice = false;
 	controlling_boat_id = 0;
+	controlled_mob_id = 0;
 
 	if (!RuleB(Character, PerCharacterQglobalMaxLevel) && !RuleB(Character, PerCharacterBucketMaxLevel)) {
 		SetClientMaxLevel(0);
@@ -346,7 +349,17 @@ Client::Client(EQStreamInterface* ieqs)
 	dev_tools_window_enabled = true;
 
 #ifdef BOTS
-	bot_owner_options = DefaultBotOwnerOptions;
+	bot_owner_options[booDeathMarquee] = false;
+	bot_owner_options[booStatsUpdate] = false;
+	bot_owner_options[booSpawnMessageSay] = false;
+	bot_owner_options[booSpawnMessageTell] = true;
+	bot_owner_options[booSpawnMessageClassSpecific] = true;
+	bot_owner_options[booAltCombat] = RuleB(Bots, AllowOwnerOptionAltCombat);
+	bot_owner_options[booAutoDefend] = RuleB(Bots, AllowOwnerOptionAutoDefend);
+	bot_owner_options[booBuffCounter] = false;
+
+	SetBotPulling(false);
+	SetBotPrecombat(false);
 #endif
 
 	AI_Init();
@@ -376,7 +389,7 @@ Client::~Client() {
 		ToggleBuyerMode(false);
 
 	if(conn_state != ClientConnectFinished) {
-		Log(Logs::General, Logs::None, "Client '%s' was destroyed before reaching the connected state:", GetName());
+		LogDebug("Client [{}] was destroyed before reaching the connected state:", GetName());
 		ReportConnectingState();
 	}
 
@@ -444,9 +457,9 @@ Client::~Client() {
 	ClearRespawnOptions();
 
 	numclients--;
-	UpdateWindowTitle();
+	UpdateWindowTitle(nullptr);
 	if(zone)
-	zone->RemoveAuth(GetName());
+		zone->RemoveAuth(GetName(), lskey);
 
 	//let the stream factory know were done with this stream
 	eqs->Close();
@@ -537,31 +550,31 @@ void Client::SendLogoutPackets() {
 void Client::ReportConnectingState() {
 	switch(conn_state) {
 	case NoPacketsReceived:		//havent gotten anything
-		Log(Logs::General, Logs::None, "Client has not sent us an initial zone entry packet.");
+		LogDebug("Client has not sent us an initial zone entry packet");
 		break;
 	case ReceivedZoneEntry:		//got the first packet, loading up PP
-		Log(Logs::General, Logs::None, "Client sent initial zone packet, but we never got their player info from the database.");
+		LogDebug("Client sent initial zone packet, but we never got their player info from the database");
 		break;
 	case PlayerProfileLoaded:	//our DB work is done, sending it
-		Log(Logs::General, Logs::None, "We were sending the player profile, tributes, tasks, spawns, time and weather, but never finished.");
+		LogDebug("We were sending the player profile, tributes, tasks, spawns, time and weather, but never finished");
 		break;
 	case ZoneInfoSent:		//includes PP, tributes, tasks, spawns, time and weather
-		Log(Logs::General, Logs::None, "We successfully sent player info and spawns, waiting for client to request new zone.");
+		LogDebug("We successfully sent player info and spawns, waiting for client to request new zone");
 		break;
 	case NewZoneRequested:	//received and sent new zone request
-		Log(Logs::General, Logs::None, "We received client's new zone request, waiting for client spawn request.");
+		LogDebug("We received client's new zone request, waiting for client spawn request");
 		break;
 	case ClientSpawnRequested:	//client sent ReqClientSpawn
-		Log(Logs::General, Logs::None, "We received the client spawn request, and were sending objects, doors, zone points and some other stuff, but never finished.");
+		LogDebug("We received the client spawn request, and were sending objects, doors, zone points and some other stuff, but never finished");
 		break;
 	case ZoneContentsSent:		//objects, doors, zone points
-		Log(Logs::General, Logs::None, "The rest of the zone contents were successfully sent, waiting for client ready notification.");
+		LogDebug("The rest of the zone contents were successfully sent, waiting for client ready notification");
 		break;
 	case ClientReadyReceived:	//client told us its ready, send them a bunch of crap like guild MOTD, etc
-		Log(Logs::General, Logs::None, "We received client ready notification, but never finished Client::CompleteConnect");
+		LogDebug("We received client ready notification, but never finished Client::CompleteConnect");
 		break;
 	case ClientConnectFinished:	//client finally moved to finished state, were done here
-		Log(Logs::General, Logs::None, "Client is successfully connected.");
+		LogDebug("Client is successfully connected");
 		break;
 	};
 }
@@ -691,7 +704,7 @@ bool Client::Save(uint8 iCommitNow) {
 	database.SaveCharacterTribute(this->CharacterID(), &m_pp);
 	SaveTaskState(); /* Save Character Task */
 
-	Log(Logs::General, Logs::Food, "Client::Save - hunger_level: %i thirst_level: %i", m_pp.hunger_level, m_pp.thirst_level);
+	LogFood("Client::Save - hunger_level: [{}] thirst_level: [{}]", m_pp.hunger_level, m_pp.thirst_level);
 
 	// perform snapshot before SaveCharacterData() so that m_epp will contain the updated time
 	if (RuleB(Character, ActiveInvSnapshots) && time(nullptr) >= GetNextInvSnapshotTime()) {
@@ -765,7 +778,7 @@ bool Client::SendAllPackets() {
 		if(eqs)
 			eqs->FastQueuePacket((EQApplicationPacket **)&cp->app, cp->ack_req);
 		clientpackets.pop_front();
-		Log(Logs::Moderate, Logs::Client_Server_Packet, "Transmitting a packet");
+		Log(Logs::Moderate, Logs::PacketClientServer, "Transmitting a packet");
 	}
 	return true;
 }
@@ -813,7 +826,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 	char message[4096];
 	strn0cpy(message, orig_message, sizeof(message));
 
-	Log(Logs::Detail, Logs::Zone_Server, "Client::ChannelMessageReceived() Channel:%i message:'%s'", chan_num, message);
+	LogDebug("Client::ChannelMessageReceived() Channel:[{}] message:[{}]", chan_num, message);
 
 	if (targetname == nullptr) {
 		targetname = (!GetTarget()) ? "" : GetTarget()->GetName();
@@ -845,7 +858,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 				{
 					if(AttemptedMessages > RuleI(Chat, MaxMessagesBeforeKick))
 					{
-						Kick();
+						Kick("Sent too many chat messages at once.");
 						return;
 					}
 					if(GlobalChatLimiterTimer)
@@ -913,7 +926,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 	{
 	case ChatChannel_Guild: { /* Guild Chat */
 		if (!IsInAGuild())
-			Message_StringID(MT_DefaultText, GUILD_NOT_MEMBER2);	//You are not a member of any guild.
+			MessageString(Chat::DefaultText, GUILD_NOT_MEMBER2);	//You are not a member of any guild.
 		else if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_SPEAK))
 			Message(0, "Error: You dont have permission to speak to the guild.");
 		else if (!worldserver.SendChannelMessage(this, targetname, chan_num, GuildID(), language, lang_skill, message))
@@ -1093,40 +1106,56 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s
 	case ChatChannel_Say: { /* Say */
 		if(message[0] == COMMAND_CHAR) {
 			if(command_dispatch(this, message) == -2) {
-				if(parse->PlayerHasQuestSub(EVENT_COMMAND)) {
+				if (parse->PlayerHasQuestSub(EVENT_COMMAND)) {
 					int i = parse->EventPlayer(EVENT_COMMAND, this, message, 0);
-					if(i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
-						Message(13, "Command '%s' not recognized.", message);
+					if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
+						Message(Chat::Red, "Command '%s' not recognized.", message);
+					}
+				}
+				else if (parse->PlayerHasQuestSub(EVENT_SAY)) {
+					int i = parse->EventPlayer(EVENT_SAY, this, message, 0);
+					if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
+						Message(Chat::Red, "Command '%s' not recognized.", message);
+					}
+				}
+				else {
+					if (!RuleB(Chat, SuppressCommandErrors)) {
+						Message(Chat::Red, "Command '%s' not recognized.", message);
 					}
-				} else {
-					if(!RuleB(Chat, SuppressCommandErrors))
-						Message(13, "Command '%s' not recognized.", message);
 				}
 			}
 			break;
 		}
 
-		if (EQEmu::ProfanityManager::IsCensorshipActive())
-			EQEmu::ProfanityManager::RedactMessage(message);
-
 #ifdef BOTS
 		if (message[0] == BOT_COMMAND_CHAR) {
 			if (bot_command_dispatch(this, message) == -2) {
-				if (parse->PlayerHasQuestSub(EVENT_COMMAND)) {
-					int i = parse->EventPlayer(EVENT_COMMAND, this, message, 0);
+				if (parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) {
+					int i = parse->EventPlayer(EVENT_BOT_COMMAND, this, message, 0);
 					if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
-						Message(13, "Bot command '%s' not recognized.", message);
+						Message(Chat::Red, "Bot command '%s' not recognized.", message);
+					}
+				}
+				else if (parse->PlayerHasQuestSub(EVENT_SAY)) {
+					int i = parse->EventPlayer(EVENT_SAY, this, message, 0);
+					if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
+						Message(Chat::Red, "Bot command '%s' not recognized.", message);
 					}
 				}
 				else {
-					if (!RuleB(Chat, SuppressCommandErrors))
-						Message(13, "Bot command '%s' not recognized.", message);
+					if (!RuleB(Chat, SuppressCommandErrors)) {
+						Message(Chat::Red, "Bot command '%s' not recognized.", message);
+					}
 				}
 			}
 			break;
 		}
 #endif
 
+		if (EQEmu::ProfanityManager::IsCensorshipActive()) {
+			EQEmu::ProfanityManager::RedactMessage(message);
+		}
+
 		Mob* sender = this;
 		if (GetPet() && GetTarget() == GetPet() && GetPet()->FindType(SE_VoiceGraft))
 			sender = GetPet();
@@ -1264,11 +1293,11 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num
 }
 
 void Client::Message(uint32 type, const char* message, ...) {
-	if (GetFilter(FilterSpellDamage) == FilterHide && type == MT_NonMelee)
+	if (GetFilter(FilterSpellDamage) == FilterHide && type == Chat::NonMelee)
 		return;
-	if (GetFilter(FilterMeleeCrits) == FilterHide && type == MT_CritMelee) //98 is self...
+	if (GetFilter(FilterMeleeCrits) == FilterHide && type == Chat::MeleeCrit) //98 is self...
 		return;
-	if (GetFilter(FilterSpellCrits) == FilterHide && type == MT_SpellCrits)
+	if (GetFilter(FilterSpellCrits) == FilterHide && type == Chat::SpellCrit)
 		return;
 
 	va_list argptr;
@@ -1277,21 +1306,19 @@ void Client::Message(uint32 type, const char* message, ...) {
 	vsnprintf(buffer, 4096, message, argptr);
 	va_end(argptr);
 
-	size_t len = strlen(buffer);
+	SerializeBuffer buf(sizeof(SpecialMesgHeader_Struct) + 12 + 64 + 64);
+	buf.WriteInt8(static_cast<int8>(Journal::SpeakMode::Raw));
+	buf.WriteInt8(static_cast<int8>(Journal::Mode::None));
+	buf.WriteInt8(0); // language
+	buf.WriteUInt32(type);
+	buf.WriteUInt32(0); // target spawn ID used for journal filtering, ignored here
+	buf.WriteString(""); // send name, not applicable here
+	buf.WriteInt32(0); // location, client seems to ignore
+	buf.WriteInt32(0);
+	buf.WriteInt32(0);
+	buf.WriteString(buffer);
 
-	//client dosent like our packet all the time unless
-	//we make it really big, then it seems to not care that
-	//our header is malformed.
-	//len = 4096 - sizeof(SpecialMesg_Struct);
-
-	uint32 len_packet = sizeof(SpecialMesg_Struct)+len;
-	auto app = new EQApplicationPacket(OP_SpecialMesg, len_packet);
-	SpecialMesg_Struct* sm=(SpecialMesg_Struct*)app->pBuffer;
-	sm->header[0] = 0x00; // Header used for #emote style messages..
-	sm->header[1] = 0x00; // Play around with these to see other types
-	sm->header[2] = 0x00;
-	sm->msg_type = type;
-	memcpy(sm->message, buffer, len+1);
+	auto app = new EQApplicationPacket(OP_SpecialMesg, buf);
 
 	FastQueuePacket(&app);
 
@@ -1308,67 +1335,25 @@ void Client::FilteredMessage(Mob *sender, uint32 type, eqFilterType filter, cons
 	vsnprintf(buffer, 4096, message, argptr);
 	va_end(argptr);
 
-	size_t len = strlen(buffer);
+	SerializeBuffer buf(sizeof(SpecialMesgHeader_Struct) + 12 + 64 + 64);
+	buf.WriteInt8(static_cast<int8>(Journal::SpeakMode::Raw));
+	buf.WriteInt8(static_cast<int8>(Journal::Mode::None));
+	buf.WriteInt8(0); // language
+	buf.WriteUInt32(type);
+	buf.WriteUInt32(0); // target spawn ID used for journal filtering, ignored here
+	buf.WriteString(""); // send name, not applicable here
+	buf.WriteInt32(0); // location, client seems to ignore
+	buf.WriteInt32(0);
+	buf.WriteInt32(0);
+	buf.WriteString(buffer);
 
-	//client dosent like our packet all the time unless
-	//we make it really big, then it seems to not care that
-	//our header is malformed.
-	//len = 4096 - sizeof(SpecialMesg_Struct);
-
-	uint32 len_packet = sizeof(SpecialMesg_Struct) + len;
-	auto app = new EQApplicationPacket(OP_SpecialMesg, len_packet);
-	SpecialMesg_Struct* sm = (SpecialMesg_Struct*)app->pBuffer;
-	sm->header[0] = 0x00; // Header used for #emote style messages..
-	sm->header[1] = 0x00; // Play around with these to see other types
-	sm->header[2] = 0x00;
-	sm->msg_type = type;
-	memcpy(sm->message, buffer, len + 1);
+	auto app = new EQApplicationPacket(OP_SpecialMesg, buf);
 
 	FastQueuePacket(&app);
 
 	safe_delete_array(buffer);
 }
 
-void Client::QuestJournalledMessage(const char *npcname, const char* message) {
-
-	// npcnames longer than 60 characters crash the client when they log back in
-	const int MaxNPCNameLength = 60;
-	// I assume there is an upper safe limit on the message length. Don't know what it is, but 4000 doesn't crash
-	// the client.
-	const int MaxMessageLength = 4000;
-
-	char OutNPCName[MaxNPCNameLength+1];
-	char OutMessage[MaxMessageLength+1];
-
-	// Apparently Visual C++ snprintf is not C99 compliant and doesn't put the null terminator
-	// in if the formatted string >= the maximum length, so we put it in.
-	//
-	snprintf(OutNPCName, MaxNPCNameLength, "%s", npcname); OutNPCName[MaxNPCNameLength]='\0';
-	snprintf(OutMessage, MaxMessageLength, "%s", message); OutMessage[MaxMessageLength]='\0';
-
-	uint32 len_packet = sizeof(SpecialMesg_Struct) + strlen(OutNPCName) + strlen(OutMessage);
-	auto app = new EQApplicationPacket(OP_SpecialMesg, len_packet);
-	SpecialMesg_Struct* sm=(SpecialMesg_Struct*)app->pBuffer;
-
-	sm->header[0] = 0;
-	sm->header[1] = 2;
-	sm->header[2] = 0;
-	sm->msg_type = 0x0a;
-	sm->target_spawn_id = GetID();
-
-	char *dest = &sm->sayer[0];
-
-	memcpy(dest, OutNPCName, strlen(OutNPCName) + 1);
-
-	dest = dest + strlen(OutNPCName) + 13;
-
-	memcpy(dest, OutMessage, strlen(OutMessage) + 1);
-
-	QueuePacket(app);
-
-	safe_delete(app);
-}
-
 void Client::SetMaxHP() {
 	if(dead)
 		return;
@@ -1552,7 +1537,7 @@ void Client::IncreaseLanguageSkill(int skill_id, int value) {
 	QueuePacket(outapp);
 	safe_delete(outapp);
 
-	Message_StringID( MT_Skills, LANG_SKILL_IMPROVED ); //Notify client
+	MessageString( Chat::Skills, LANG_SKILL_IMPROVED ); //Notify client
 }
 
 void Client::AddSkill(EQEmu::skills::SkillType skillid, uint16 value) {
@@ -1679,7 +1664,7 @@ void Client::UpdateAdmin(bool iFromDB) {
 
 	if(m_pp.gm)
 	{
-		Log(Logs::Moderate, Logs::Zone_Server, "%s - %s is a GM", __FUNCTION__ , GetName());
+		LogInfo("[{}] - [{}] is a GM", __FUNCTION__ , GetName());
 // no need for this, having it set in pp you already start as gm
 // and it's also set in your spawn packet so other people see it too
 //		SendAppearancePacket(AT_GM, 1, false);
@@ -2090,7 +2075,7 @@ bool Client::ChangeFirstName(const char* in_firstname, const char* gmname)
 void Client::SetGM(bool toggle) {
 	m_pp.gm = toggle ? 1 : 0;
 	m_inv.SetGMInventory((bool)m_pp.gm);
-	Message(13, "You are %s a GM.", m_pp.gm ? "now" : "no longer");
+	Message(Chat::Red, "You are %s a GM.", m_pp.gm ? "now" : "no longer");
 	SendAppearancePacket(AT_GM, m_pp.gm);
 	Save();
 	UpdateWho();
@@ -2110,7 +2095,7 @@ void Client::ReadBook(BookRequest_Struct *book) {
 
 	if (booktxt2[0] != '\0') {
 #if EQDEBUG >= 6
-		Log(Logs::General, Logs::Normal, "Client::ReadBook() textfile:%s Text:%s", txtfile, booktxt2.c_str());
+		LogInfo("Client::ReadBook() textfile:[{}] Text:[{}]", txtfile, booktxt2.c_str());
 #endif
 		auto outapp = new EQApplicationPacket(OP_ReadBook, length + sizeof(BookText_Struct));
 
@@ -2330,7 +2315,7 @@ void Client::AddMoneyToPP(uint64 copper, bool updateclient){
 
 	SaveCurrency();
 
-	Log(Logs::General, Logs::None, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i", GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper);
+	LogDebug("Client::AddMoneyToPP() [{}] should have: plat:[{}] gold:[{}] silver:[{}] copper:[{}]", GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper);
 }
 
 void Client::EVENT_ITEM_ScriptStopReturn(){
@@ -2370,7 +2355,7 @@ void Client::AddMoneyToPP(uint32 copper, uint32 silver, uint32 gold, uint32 plat
 	SaveCurrency();
 
 #if (EQDEBUG>=5)
-		Log(Logs::General, Logs::None, "Client::AddMoneyToPP() %s should have: plat:%i gold:%i silver:%i copper:%i",
+		LogDebug("Client::AddMoneyToPP() [{}] should have: plat:[{}] gold:[{}] silver:[{}] copper:[{}]",
 			GetName(), m_pp.platinum, m_pp.gold, m_pp.silver, m_pp.copper);
 #endif
 }
@@ -2462,13 +2447,13 @@ bool Client::CheckIncreaseSkill(EQEmu::skills::SkillType skillid, Mob *against_w
 		if(zone->random.Real(0, 99) < Chance)
 		{
 			SetSkill(skillid, GetRawSkill(skillid) + 1);
-			Log(Logs::Detail, Logs::Skills, "Skill %d at value %d successfully gain with %d%%chance (mod %d)", skillid, skillval, Chance, chancemodi);
+			LogSkills("Skill [{}] at value [{}] successfully gain with [{}]% chance (mod [{}])", skillid, skillval, Chance, chancemodi);
 			return true;
 		} else {
-			Log(Logs::Detail, Logs::Skills, "Skill %d at value %d failed to gain with %d%%chance (mod %d)", skillid, skillval, Chance, chancemodi);
+			LogSkills("Skill [{}] at value [{}] failed to gain with [{}]% chance (mod [{}])", skillid, skillval, Chance, chancemodi);
 		}
 	} else {
-		Log(Logs::Detail, Logs::Skills, "Skill %d at value %d cannot increase due to maxmum %d", skillid, skillval, maxskill);
+		LogSkills("Skill [{}] at value [{}] cannot increase due to maxmum [{}]", skillid, skillval, maxskill);
 	}
 	return false;
 }
@@ -2489,10 +2474,10 @@ void Client::CheckLanguageSkillIncrease(uint8 langid, uint8 TeacherSkill) {
 
 		if(zone->random.Real(0,100) < Chance) {	// if they make the roll
 			IncreaseLanguageSkill(langid);	// increase the language skill by 1
-			Log(Logs::Detail, Logs::Skills, "Language %d at value %d successfully gain with %.4f%%chance", langid, LangSkill, Chance);
+			LogSkills("Language [{}] at value [{}] successfully gain with [{}] % chance", langid, LangSkill, Chance);
 		}
 		else
-			Log(Logs::Detail, Logs::Skills, "Language %d at value %d failed to gain with %.4f%%chance", langid, LangSkill, Chance);
+			LogSkills("Language [{}] at value [{}] failed to gain with [{}] % chance", langid, LangSkill, Chance);
 	}
 }
 
@@ -2593,7 +2578,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(EQEmu::skills::SkillType skil
 			}
 			else
 			{
-				Message(13, "Your spell casting specializations skills have been reset. "
+				Message(Chat::Red, "Your spell casting specializations skills have been reset. "
 						"Only %i primary specialization skill is allowed.", MaxSpecializations);
 
 				for (int i = EQEmu::skills::SkillSpecializeAbjure; i <= EQEmu::skills::SkillSpecializeEvocation; ++i)
@@ -2601,7 +2586,7 @@ uint16 Client::GetMaxSkillAfterSpecializationRules(EQEmu::skills::SkillType skil
 
 				Save();
 
-				Log(Logs::General, Logs::Normal, "Reset %s's caster specialization skills to 1. "
+				LogInfo("Reset [{}]'s caster specialization skills to 1"
 								"Too many specializations skills were above 50.", GetCleanName());
 			}
 
@@ -2621,22 +2606,28 @@ void Client::SetPVP(bool toggle, bool message) {
 
 	if (message) {
 		if(GetPVP())
-			this->Message_StringID(MT_Shout,PVP_ON);
+			this->MessageString(Chat::Shout,PVP_ON);
 		else
-			Message(13, "You no longer follow the ways of discord.");
+			Message(Chat::Red, "You no longer follow the ways of discord.");
 	}
 
 	SendAppearancePacket(AT_PVP, GetPVP());
 	Save();
 }
 
+void Client::Kick(const std::string &reason) {
+	client_state = CLIENT_KICKED;
+
+	LogClientLogin("Client [{}] kicked, reason [{}]", GetCleanName(), reason.c_str());
+}
+
 void Client::WorldKick() {
 	auto outapp = new EQApplicationPacket(OP_GMKick, sizeof(GMKick_Struct));
 	GMKick_Struct* gmk = (GMKick_Struct *)outapp->pBuffer;
 	strcpy(gmk->name,GetName());
 	QueuePacket(outapp);
 	safe_delete(outapp);
-	Kick();
+	Kick("World kick issued");
 }
 
 void Client::GMKill() {
@@ -2751,22 +2742,22 @@ void Client::Disarm(Client* disarmer, int chance) {
 					if (matslot != EQEmu::textures::materialInvalid)
 						SendWearChange(matslot);
 				}
-				Message_StringID(MT_Skills, DISARMED);
+				MessageString(Chat::Skills, DISARMED);
 				if (disarmer != this)
-					disarmer->Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName());
+					disarmer->MessageString(Chat::Skills, DISARM_SUCCESS, this->GetCleanName());
 				if (chance != 1000)
 					disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4);
 				CalcBonuses();
 				// CalcEnduranceWeightFactor();
 				return;
 			}
-			disarmer->Message_StringID(MT_Skills, DISARM_FAILED);
+			disarmer->MessageString(Chat::Skills, DISARM_FAILED);
 			if (chance != 1000)
 				disarmer->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2);
 			return;
 		}
 	}
-	disarmer->Message_StringID(MT_Skills, DISARM_FAILED);
+	disarmer->MessageString(Chat::Skills, DISARM_FAILED);
 }
 
 bool Client::BindWound(Mob *bindmob, bool start, bool fail)
@@ -2808,7 +2799,7 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail)
 			} else {
 				// send bindmob "stand still"
 				if (!bindmob->IsAIControlled() && bindmob != this) {
-					bindmob->CastToClient()->Message_StringID(clientMessageYellow,
+					bindmob->CastToClient()->MessageString(Chat::Yellow,
 										  YOU_ARE_BEING_BANDAGED);
 				} else if (bindmob->IsAIControlled() && bindmob != this) {
 					; // Tell IPC to stand still?
@@ -2892,7 +2883,7 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail)
 						}
 						else {
 							// I dont have the real, live
-							Message(15, "You cannot bind wounds above %d%% hitpoints.",
+							Message(Chat::Yellow, "You cannot bind wounds above %d%% hitpoints.",
 								max_percent);
 							if (bindmob != this && bindmob->IsClient())
 								bindmob->CastToClient()->Message(
@@ -2953,9 +2944,9 @@ bool Client::BindWound(Mob *bindmob, bool start, bool fail)
 							bindmob->SendHPUpdate();
 						}
 						else {
-							Message(15, "You cannot bind wounds above %d%% hitpoints", max_percent);
+							Message(Chat::Yellow, "You cannot bind wounds above %d%% hitpoints", max_percent);
 							if (bindmob != this && bindmob->IsClient())
-								bindmob->CastToClient()->Message(15, "You cannot have your wounds bound above %d%% hitpoints", max_percent);
+								bindmob->CastToClient()->Message(Chat::Yellow, "You cannot have your wounds bound above %d%% hitpoints", max_percent);
 						}
 					}
 				}
@@ -3112,13 +3103,13 @@ void Client::ServerFilter(SetServerFilter_Struct* filter){
 }
 
 // this version is for messages with no parameters
-void Client::Message_StringID(uint32 type, uint32 string_id, uint32 distance)
+void Client::MessageString(uint32 type, uint32 string_id, uint32 distance)
 {
-	if (GetFilter(FilterSpellDamage) == FilterHide && type == MT_NonMelee)
+	if (GetFilter(FilterSpellDamage) == FilterHide && type == Chat::NonMelee)
 		return;
-	if (GetFilter(FilterMeleeCrits) == FilterHide && type == MT_CritMelee) //98 is self...
+	if (GetFilter(FilterMeleeCrits) == FilterHide && type == Chat::MeleeCrit) //98 is self...
 		return;
-	if (GetFilter(FilterSpellCrits) == FilterHide && type == MT_SpellCrits)
+	if (GetFilter(FilterSpellCrits) == FilterHide && type == Chat::SpellCrit)
 		return;
 	auto outapp = new EQApplicationPacket(OP_SimpleMessage, 12);
 	SimpleMessage_Struct* sms = (SimpleMessage_Struct*)outapp->pBuffer;
@@ -3140,30 +3131,30 @@ void Client::Message_StringID(uint32 type, uint32 string_id, uint32 distance)
 // to load the eqstr file and count them in the string.
 // This hack sucks but it's gonna work for now.
 //
-void Client::Message_StringID(uint32 type, uint32 string_id, const char* message1,
+void Client::MessageString(uint32 type, uint32 string_id, const char* message1,
 	const char* message2,const char* message3,const char* message4,
 	const char* message5,const char* message6,const char* message7,
 	const char* message8,const char* message9, uint32 distance)
 {
-	if (GetFilter(FilterSpellDamage) == FilterHide && type == MT_NonMelee)
+	if (GetFilter(FilterSpellDamage) == FilterHide && type == Chat::NonMelee)
 		return;
-	if (GetFilter(FilterMeleeCrits) == FilterHide && type == MT_CritMelee) //98 is self...
+	if (GetFilter(FilterMeleeCrits) == FilterHide && type == Chat::MeleeCrit) //98 is self...
 		return;
-	if (GetFilter(FilterSpellCrits) == FilterHide && type == MT_SpellCrits)
+	if (GetFilter(FilterSpellCrits) == FilterHide && type == Chat::SpellCrit)
 		return;
-	if (GetFilter(FilterDamageShields) == FilterHide && type == MT_DS)
+	if (GetFilter(FilterDamageShields) == FilterHide && type == Chat::DamageShield)
 		return;
 
 	int i = 0, argcount = 0, length = 0;
 	char *bufptr = nullptr;
 	const char *message_arg[9] = {0};
 
-	if(type==MT_Emote)
+	if(type==Chat::Emote)
 		type=4;
 
 	if(!message1)
 	{
-		Message_StringID(type, string_id);	// use the simple message instead
+		MessageString(type, string_id);	// use the simple message instead
 		return;
 	}
 
@@ -3242,7 +3233,7 @@ bool Client::FilteredMessageCheck(Mob *sender, eqFilterType filter)
 	return true;
 }
 
-void Client::FilteredMessage_StringID(Mob *sender, uint32 type,
+void Client::FilteredMessageString(Mob *sender, uint32 type,
 		eqFilterType filter, uint32 string_id)
 {
 	if (!FilteredMessageCheck(sender, filter))
@@ -3261,7 +3252,7 @@ void Client::FilteredMessage_StringID(Mob *sender, uint32 type,
 	return;
 }
 
-void Client::FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id,
+void Client::FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id,
 		const char *message1, const char *message2, const char *message3,
 		const char *message4, const char *message5, const char *message6,
 		const char *message7, const char *message8, const char *message9)
@@ -3273,11 +3264,11 @@ void Client::FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType fil
 	char *bufptr = nullptr;
 	const char *message_arg[9] = {0};
 
-	if (type == MT_Emote)
+	if (type == Chat::Emote)
 		type = 4;
 
 	if (!message1) {
-		FilteredMessage_StringID(sender, type, filter, string_id);	// use the simple message instead
+		FilteredMessageString(sender, type, filter, string_id);	// use the simple message instead
 		return;
 	}
 
@@ -3318,7 +3309,7 @@ void Client::Tell_StringID(uint32 string_id, const char *who, const char *messag
 	char string_id_str[10];
 	snprintf(string_id_str, 10, "%d", string_id);
 
-	Message_StringID(MT_TellEcho, TELL_QUEUED_MESSAGE, who, string_id_str, message);
+	MessageString(Chat::EchoTell, TELL_QUEUED_MESSAGE, who, string_id_str, message);
 }
 
 void Client::SetTint(int16 in_slot, uint32 color) {
@@ -3381,7 +3372,7 @@ void Client::SetLanguageSkill(int langid, int value)
 	QueuePacket(outapp);
 	safe_delete(outapp);
 
-	Message_StringID( MT_Skills, LANG_SKILL_IMPROVED ); //Notify the client
+	MessageString( Chat::Skills, LANG_SKILL_IMPROVED ); //Notify the client
 }
 
 void Client::LinkDead()
@@ -3469,7 +3460,7 @@ void Client::Escape()
 	entity_list.RemoveFromTargets(this, true);
 	SetInvisible(1);
 
-	Message_StringID(MT_Skills, ESCAPE);
+	MessageString(Chat::Skills, ESCAPE);
 }
 
 float Client::CalcPriceMod(Mob* other, bool reverse)
@@ -3865,9 +3856,9 @@ void Client::EnteringMessages(Client* client)
 		uint8 flag = database.GetAgreementFlag(client->AccountID());
 		if(!flag)
 		{
-			client->Message(13,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
-			client->Message(13,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
-			client->Message(13,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
+			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
+			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
+			client->Message(Chat::Red,"You must agree to the Rules, before you can move. (type #serverrules to view the rules)");
 			client->SendAppearancePacket(AT_Anim, ANIM_FREEZE);
 		}
 	}
@@ -3882,7 +3873,7 @@ void Client::SendRules(Client* client)
 
 	auto lines = SplitString(rules, '\n');
 	for (auto&& e : lines)
-		client->Message(0, "%s", e.c_str());
+		client->Message(Chat::White, "%s", e.c_str());
 }
 
 void Client::SetEndurance(int32 newEnd)
@@ -3909,13 +3900,13 @@ void Client::SacrificeConfirm(Client *caster)
 	}
 
 	if (GetLevel() < RuleI(Spells, SacrificeMinLevel)) {
-		caster->Message_StringID(13, SAC_TOO_LOW); // This being is not a worthy sacrifice.
+		caster->MessageString(Chat::Red, SAC_TOO_LOW); // This being is not a worthy sacrifice.
 		safe_delete(outapp);
 		return;
 	}
 
 	if (GetLevel() > RuleI(Spells, SacrificeMaxLevel)) {
-		caster->Message_StringID(13, SAC_TOO_HIGH);
+		caster->MessageString(Chat::Red, SAC_TOO_HIGH);
 		safe_delete(outapp);
 		return;
 	}
@@ -3984,7 +3975,7 @@ void Client::Sacrifice(Client *caster)
 				caster->SummonItem(RuleI(Spells, SacrificeItemID));
 		}
 	} else {
-		caster->Message_StringID(13, SAC_TOO_LOW); // This being is not a worthy sacrifice.
+		caster->MessageString(Chat::Red, SAC_TOO_LOW); // This being is not a worthy sacrifice.
 	}
 }
 
@@ -4259,7 +4250,7 @@ void Client::KeyRingAdd(uint32 item_id)
 		return;
 	}
 
-	Message(4,"Added to keyring.");
+	Message(Chat::LightBlue,"Added to keyring.");
 
 	keyring.push_back(item_id);
 }
@@ -4275,11 +4266,11 @@ bool Client::KeyRingCheck(uint32 item_id)
 
 void Client::KeyRingList()
 {
-	Message(4,"Keys on Keyring:");
+	Message(Chat::LightBlue,"Keys on Keyring:");
 	const EQEmu::ItemData *item = nullptr;
 	for (auto iter = keyring.begin(); iter != keyring.end(); ++iter) {
 		if ((item = database.GetItem(*iter))!=nullptr) {
-			Message(4,item->Name);
+			Message(Chat::LightBlue,item->Name);
 		}
 	}
 }
@@ -4451,8 +4442,8 @@ bool Client::GroupFollow(Client* inviter) {
 
 			if (group->GetID() == 0)
 			{
-				Message(13, "Unable to get new group id. Cannot create group.");
-				inviter->Message(13, "Unable to get new group id. Cannot create group.");
+				Message(Chat::Red, "Unable to get new group id. Cannot create group.");
+				inviter->Message(Chat::Red, "Unable to get new group id. Cannot create group.");
 				return false;
 			}
 
@@ -4952,16 +4943,16 @@ void Client::HandleLDoNOpen(NPC *target)
 	{
 		if(target->GetClass() != LDON_TREASURE)
 		{
-			Log(Logs::General, Logs::None, "%s tried to open %s but %s was not a treasure chest.",
+			LogDebug("[{}] tried to open [{}] but [{}] was not a treasure chest",
 				GetName(), target->GetName(), target->GetName());
 			return;
 		}
 
 		if(DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 		{
-			Log(Logs::General, Logs::None, "%s tried to open %s but %s was out of range",
+			LogDebug("[{}] tried to open [{}] but [{}] was out of range",
 				GetName(), target->GetName(), target->GetName());
-			Message(13, "Treasure chest out of range.");
+			Message(Chat::Red, "Treasure chest out of range.");
 			return;
 		}
 
@@ -4969,7 +4960,7 @@ void Client::HandleLDoNOpen(NPC *target)
 		{
 			if(target->GetLDoNTrapSpellID() != 0)
 			{
-				Message_StringID(13, LDON_ACCIDENT_SETOFF2);
+				MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2);
 				target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff);
 				target->SetLDoNTrapSpellID(0);
 				target->SetLDoNTrapped(false);
@@ -4985,7 +4976,7 @@ void Client::HandleLDoNOpen(NPC *target)
 
 		if(target->IsLDoNLocked())
 		{
-			Message_StringID(MT_Skills, LDON_STILL_LOCKED, target->GetCleanName());
+			MessageString(Chat::Skills, LDON_STILL_LOCKED, target->GetCleanName());
 			return;
 		}
 		else
@@ -5019,13 +5010,13 @@ void Client::HandleLDoNSenseTraps(NPC *target, uint16 skill, uint8 type)
 		{
 			if((target->GetLDoNTrapType() == LDoNTypeCursed || target->GetLDoNTrapType() == LDoNTypeMagical) && type != target->GetLDoNTrapType())
 			{
-				Message_StringID(MT_Skills, LDON_CANT_DETERMINE_TRAP, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_CANT_DETERMINE_TRAP, target->GetCleanName());
 				return;
 			}
 
 			if(target->IsLDoNTrapDetected())
 			{
-				Message_StringID(MT_Skills, LDON_CERTAIN_TRAP, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_CERTAIN_TRAP, target->GetCleanName());
 			}
 			else
 			{
@@ -5034,10 +5025,10 @@ void Client::HandleLDoNSenseTraps(NPC *target, uint16 skill, uint8 type)
 				{
 				case -1:
 				case 0:
-					Message_StringID(MT_Skills, LDON_DONT_KNOW_TRAPPED, target->GetCleanName());
+					MessageString(Chat::Skills, LDON_DONT_KNOW_TRAPPED, target->GetCleanName());
 					break;
 				case 1:
-					Message_StringID(MT_Skills, LDON_CERTAIN_TRAP, target->GetCleanName());
+					MessageString(Chat::Skills, LDON_CERTAIN_TRAP, target->GetCleanName());
 					target->SetLDoNTrapDetected(true);
 					break;
 				default:
@@ -5047,7 +5038,7 @@ void Client::HandleLDoNSenseTraps(NPC *target, uint16 skill, uint8 type)
 		}
 		else
 		{
-			Message_StringID(MT_Skills, LDON_CERTAIN_NOT_TRAP, target->GetCleanName());
+			MessageString(Chat::Skills, LDON_CERTAIN_NOT_TRAP, target->GetCleanName());
 		}
 	}
 }
@@ -5060,13 +5051,13 @@ void Client::HandleLDoNDisarm(NPC *target, uint16 skill, uint8 type)
 		{
 			if(!target->IsLDoNTrapped())
 			{
-				Message_StringID(MT_Skills, LDON_WAS_NOT_TRAPPED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_WAS_NOT_TRAPPED, target->GetCleanName());
 				return;
 			}
 
 			if((target->GetLDoNTrapType() == LDoNTypeCursed || target->GetLDoNTrapType() == LDoNTypeMagical) && type != target->GetLDoNTrapType())
 			{
-				Message_StringID(MT_Skills, LDON_HAVE_NOT_DISARMED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_HAVE_NOT_DISARMED, target->GetCleanName());
 				return;
 			}
 
@@ -5085,13 +5076,13 @@ void Client::HandleLDoNDisarm(NPC *target, uint16 skill, uint8 type)
 				target->SetLDoNTrapDetected(false);
 				target->SetLDoNTrapped(false);
 				target->SetLDoNTrapSpellID(0);
-				Message_StringID(MT_Skills, LDON_HAVE_DISARMED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_HAVE_DISARMED, target->GetCleanName());
 				break;
 			case 0:
-				Message_StringID(MT_Skills, LDON_HAVE_NOT_DISARMED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_HAVE_NOT_DISARMED, target->GetCleanName());
 				break;
 			case -1:
-				Message_StringID(13, LDON_ACCIDENT_SETOFF2);
+				MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2);
 				target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff);
 				target->SetLDoNTrapSpellID(0);
 				target->SetLDoNTrapped(false);
@@ -5110,7 +5101,7 @@ void Client::HandleLDoNPickLock(NPC *target, uint16 skill, uint8 type)
 		{
 			if(target->IsLDoNTrapped())
 			{
-				Message_StringID(13, LDON_ACCIDENT_SETOFF2);
+				MessageString(Chat::Red, LDON_ACCIDENT_SETOFF2);
 				target->SpellFinished(target->GetLDoNTrapSpellID(), this, EQEmu::spells::CastingSlot::Item, 0, -1, spells[target->GetLDoNTrapSpellID()].ResistDiff);
 				target->SetLDoNTrapSpellID(0);
 				target->SetLDoNTrapped(false);
@@ -5119,13 +5110,13 @@ void Client::HandleLDoNPickLock(NPC *target, uint16 skill, uint8 type)
 
 			if(!target->IsLDoNLocked())
 			{
-				Message_StringID(MT_Skills, LDON_WAS_NOT_LOCKED, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_WAS_NOT_LOCKED, target->GetCleanName());
 				return;
 			}
 
 			if((target->GetLDoNTrapType() == LDoNTypeCursed || target->GetLDoNTrapType() == LDoNTypeMagical) && type != target->GetLDoNTrapType())
 			{
-				Message(MT_Skills, "You cannot unlock %s with this skill.", target->GetCleanName());
+				Message(Chat::Skills, "You cannot unlock %s with this skill.", target->GetCleanName());
 				return;
 			}
 
@@ -5135,11 +5126,11 @@ void Client::HandleLDoNPickLock(NPC *target, uint16 skill, uint8 type)
 			{
 			case 0:
 			case -1:
-				Message_StringID(MT_Skills, LDON_PICKLOCK_FAILURE, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_PICKLOCK_FAILURE, target->GetCleanName());
 				break;
 			case 1:
 				target->SetLDoNLocked(false);
-				Message_StringID(MT_Skills, LDON_PICKLOCK_SUCCESS, target->GetCleanName());
+				MessageString(Chat::Skills, LDON_PICKLOCK_SUCCESS, target->GetCleanName());
 				break;
 			}
 		}
@@ -5198,7 +5189,7 @@ void Client::SummonAndRezzAllCorpses()
 	int CorpseCount = database.SummonAllCharacterCorpses(CharacterID(), zone->GetZoneID(), zone->GetInstanceID(), GetPosition());
 	if(CorpseCount <= 0)
 	{
-		Message(clientMessageYellow, "You have no corpses to summnon.");
+		Message(Chat::Yellow, "You have no corpses to summnon.");
 		return;
 	}
 
@@ -5207,7 +5198,7 @@ void Client::SummonAndRezzAllCorpses()
 	if(RezzExp > 0)
 		SetEXP(GetEXP() + RezzExp, GetAAXP(), true);
 
-	Message(clientMessageYellow, "All your corpses have been summoned to your feet and have received a 100% resurrection.");
+	Message(Chat::Yellow, "All your corpses have been summoned to your feet and have received a 100% resurrection.");
 }
 
 void Client::SummonAllCorpses(const glm::vec4& position)
@@ -5287,7 +5278,7 @@ void Client::SetStartZone(uint32 zoneid, float x, float y, float z)
 	// setting city to zero allows the player to use /setstartcity to set the city themselves
 	if(zoneid == 0) {
 		m_pp.binds[4].zoneId = 0;
-		this->Message(15,"Your starting city has been reset. Use /setstartcity to choose a new one");
+		this->Message(Chat::Yellow,"Your starting city has been reset. Use /setstartcity to choose a new one");
 		return;
 	}
 
@@ -5616,7 +5607,7 @@ void Client::SuspendMinion()
 		if(m_suspendedminion.SpellID > 0)
 		{
 			if (m_suspendedminion.SpellID >= SPDAT_RECORDS) {
-				Message(13, "Invalid suspended minion spell id (%u).", m_suspendedminion.SpellID);
+				Message(Chat::Red, "Invalid suspended minion spell id (%u).", m_suspendedminion.SpellID);
 				memset(&m_suspendedminion, 0, sizeof(PetInfo));
 				return;
 			}
@@ -5628,7 +5619,7 @@ void Client::SuspendMinion()
 
 			if(!CurrentPet)
 			{
-				Message(13, "Failed to recall suspended minion.");
+				Message(Chat::Red, "Failed to recall suspended minion.");
 				return;
 			}
 
@@ -5644,7 +5635,7 @@ void Client::SuspendMinion()
 
 			CurrentPet->SetMana(m_suspendedminion.Mana);
 
-			Message_StringID(clientMessageTell, SUSPEND_MINION_UNSUSPEND, CurrentPet->GetCleanName());
+			MessageString(Chat::Magenta, SUSPEND_MINION_UNSUSPEND, CurrentPet->GetCleanName());
 
 			memset(&m_suspendedminion, 0, sizeof(struct PetInfo));
 			// TODO: These pet command states need to be synced ...
@@ -5674,19 +5665,19 @@ void Client::SuspendMinion()
 		{
 			if(m_suspendedminion.SpellID > 0)
 			{
-				Message_StringID(clientMessageError,ONLY_ONE_PET);
+				MessageString(Chat::Red,ONLY_ONE_PET);
 
 				return;
 			}
 			else if(CurrentPet->IsEngaged())
 			{
-				Message_StringID(clientMessageError,SUSPEND_MINION_FIGHTING);
+				MessageString(Chat::Red,SUSPEND_MINION_FIGHTING);
 
 				return;
 			}
 			else if(entity_list.Fighting(CurrentPet))
 			{
-				Message_StringID(clientMessageBlue,SUSPEND_MINION_HAS_AGGRO);
+				MessageString(Chat::Blue,SUSPEND_MINION_HAS_AGGRO);
 			}
 			else
 			{
@@ -5703,7 +5694,7 @@ void Client::SuspendMinion()
 				else
 					strn0cpy(m_suspendedminion.Name, CurrentPet->GetName(), 64); // Name stays even at rank 1
 
-				Message_StringID(clientMessageTell, SUSPEND_MINION_SUSPEND, CurrentPet->GetCleanName());
+				MessageString(Chat::Magenta, SUSPEND_MINION_SUSPEND, CurrentPet->GetCleanName());
 
 				CurrentPet->Depop(false);
 
@@ -5712,7 +5703,7 @@ void Client::SuspendMinion()
 		}
 		else
 		{
-			Message_StringID(clientMessageError, ONLY_SUMMONED_PETS);
+			MessageString(Chat::Red, ONLY_SUMMONED_PETS);
 
 			return;
 		}
@@ -5785,7 +5776,7 @@ void Client::ProcessInspectRequest(Client* requestee, Client* requester) {
 		strcpy(insr->text, requestee->GetInspectMessage().text);
 
 		// There could be an OP for this..or not... (Ti clients are not processed here..this message is generated client-side)
-		if(requestee->IsClient() && (requestee != requester)) { requestee->Message(0, "%s is looking at your equipment...", requester->GetName()); }
+		if(requestee->IsClient() && (requestee != requester)) { requestee->Message(Chat::White, "%s is looking at your equipment...", requester->GetName()); }
 
 		requester->QueuePacket(outapp); // Send answer to requester
 		safe_delete(outapp);
@@ -6186,16 +6177,16 @@ void Client::LocateCorpse()
 
 	if(ClosestCorpse)
 	{
-		Message_StringID(MT_Spells, SENSE_CORPSE_DIRECTION);
+		MessageString(Chat::Spells, SENSE_CORPSE_DIRECTION);
 		SetHeading(CalculateHeadingToTarget(ClosestCorpse->GetX(), ClosestCorpse->GetY()));
 		SetTarget(ClosestCorpse);
 		SendTargetCommand(ClosestCorpse->GetID());
 		SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0, true);
 	}
 	else if(!GetTarget())
-		Message_StringID(clientMessageError, SENSE_CORPSE_NONE);
+		MessageString(Chat::Red, SENSE_CORPSE_NONE);
 	else
-		Message_StringID(clientMessageError, SENSE_CORPSE_NOT_NAME);
+		MessageString(Chat::Red, SENSE_CORPSE_NOT_NAME);
 }
 
 void Client::NPCSpawn(NPC *target_npc, const char *identifier, uint32 extra)
@@ -6255,7 +6246,7 @@ void Client::DragCorpses()
 		if (!corpse || !corpse->IsPlayerCorpse() ||
 				corpse->CastToCorpse()->IsBeingLooted() ||
 				!corpse->CastToCorpse()->Summon(this, false, false)) {
-			Message_StringID(MT_DefaultText, CORPSEDRAG_STOP);
+			MessageString(Chat::DefaultText, CORPSEDRAG_STOP);
 			It = DraggedCorpses.erase(It);
 			if (It == DraggedCorpses.end())
 				break;
@@ -6271,8 +6262,8 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid
 	PetRecord record;
 	if(!database.GetPetEntry(spells[spell_id].teleport_zone, &record))
 	{
-		Log(Logs::General, Logs::Error, "Unknown doppelganger spell id: %d, check pets table", spell_id);
-		Message(13, "Unable to find data for pet %s", spells[spell_id].teleport_zone);
+		LogError("Unknown doppelganger spell id: [{}], check pets table", spell_id);
+		Message(Chat::Red, "Unable to find data for pet %s", spells[spell_id].teleport_zone);
 		return;
 	}
 
@@ -6285,7 +6276,7 @@ void Client::Doppelganger(uint16 spell_id, Mob *target, const char *name_overrid
 
 	const NPCType *npc_type = database.LoadNPCTypesData(pet.npc_id);
 	if(npc_type == nullptr) {
-		Log(Logs::General, Logs::Error, "Unknown npc type for doppelganger spell id: %d", spell_id);
+		LogError("Unknown npc type for doppelganger spell id: [{}]", spell_id);
 		Message(0,"Unable to find pet!");
 		return;
 	}
@@ -6768,11 +6759,22 @@ void Client::SendStatsWindow(Client* client, bool use_window)
 	GetRawACNoShield(shield_ac);
 
 	std::string skill_list[] = {
-		"1H Blunt","1H Slashing","2H Blunt","2H Slashing","Abjuration","Alteration","Apply Poison","Archery","Backstab","Bind Wound","Bash","Block","Brass Instruments","Channeling","Conjuration",
-		"Defense","Disarm","Disarm Traps","Divination","Dodge","Double Attack","Dragon Punch","Dual Wield","Eagle Strike","Evocation","Feign Death","Flying Kick","Forage","Hand To Hand","Hide","Kick",
-		"Meditate","Mend","Offense","Parry","Pick Lock","Piercing","Riposte","Round Kick","Safe Fall","Sense Heading","Singing","Sneak","Specialize Abjuration","Specialize Alteration","Specialize Conjuration",
-		"Specialize Divination","Specialize Evocation","Pick Pockets","Stringed_Instruments","Swimming","Throwing","Tiger Claw","Tracking","Wind Instruments","Fishing","Make Poison","Tinkering","Research","Alchemy",
-		"Baking","Tailoring","Sense Traps","Blacksmithing","Fletching","Brewing","Alcohol_Tolerance","Begging","Jewelry Making","Pottery","Percussion Instruments","Intimidation","Berserking","Taunt","Frenzy"
+		"1H Blunt","1H Slashing","2H Blunt","2H Slashing","Abjuration",
+		"Alteration","Apply Poison","Archery","Backstab","Bind Wound",
+		"Bash","Block","Brass Instruments","Channeling","Conjuration",
+		"Defense","Disarm","Disarm Traps","Divination","Dodge",
+		"Double Attack","Dragon Punch","Dual Wield","Eagle Strike","Evocation",
+		"Feign Death","Flying Kick","Forage","Hand To Hand","Hide",
+		"Kick","Meditate","Mend","Offense","Parry",
+		"Pick Lock","1H Piercing","Riposte","Round Kick","Safe Fall",
+		"Sense Heading","Singing","Sneak","Specialize Abjuration","Specialize Alteration",
+		"Specialize Conjuration","Specialize Divination","Specialize Evocation","Pick Pockets","Stringed Instruments",
+		"Swimming","Throwing","Tiger Claw","Tracking","Wind Instruments",
+		"Fishing","Make Poison","Tinkering","Research","Alchemy",
+		"Baking","Tailoring","Sense Traps","Blacksmithing","Fletching",
+		"Brewing","Alcohol_Tolerance","Begging","Jewelry Making","Pottery",
+		"Percussion Instruments","Intimidation","Berserking","Taunt","Frenzy",
+		"Remove Traps","Triple Attack","2H Piercing"
 	};
 
 	std::string skill_mods = "";
@@ -6887,35 +6889,35 @@ void Client::SendStatsWindow(Client* client, bool use_window)
 			goto Extra_Info;
 		}
 		else {
-			client->Message(15, "The window has exceeded its character limit, displaying stats to chat window:");
+			client->Message(Chat::Yellow, "The window has exceeded its character limit, displaying stats to chat window:");
 		}
 	}
 
-	client->Message(15, "~~~~~ %s %s ~~~~~", GetCleanName(), GetLastName());
-	client->Message(0, " Level: %i Class: %i Race: %i DS: %i/%i Size: %1.1f  Weight: %.1f/%d  ", GetLevel(), GetClass(), GetRace(), GetDS(), RuleI(Character, ItemDamageShieldCap), GetSize(), (float)CalcCurrentWeight() / 10.0f, GetSTR());
-	client->Message(0, " HP: %i/%i  HP Regen: %i/%i",GetHP(), GetMaxHP(), CalcHPRegen(), CalcHPRegenCap());
-	client->Message(0, " compute_tohit: %i TotalToHit: %i", compute_tohit(skill), GetTotalToHit(skill, 0));
-	client->Message(0, " compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense());
-	client->Message(0, " offense: %i mitigation ac: %i", offense(skill), GetMitigationAC());
+	client->Message(Chat::Yellow, "~~~~~ %s %s ~~~~~", GetCleanName(), GetLastName());
+	client->Message(Chat::White, " Level: %i Class: %i Race: %i DS: %i/%i Size: %1.1f  Weight: %.1f/%d  ", GetLevel(), GetClass(), GetRace(), GetDS(), RuleI(Character, ItemDamageShieldCap), GetSize(), (float)CalcCurrentWeight() / 10.0f, GetSTR());
+	client->Message(Chat::White, " HP: %i/%i  HP Regen: %i/%i",GetHP(), GetMaxHP(), CalcHPRegen(), CalcHPRegenCap());
+	client->Message(Chat::White, " compute_tohit: %i TotalToHit: %i", compute_tohit(skill), GetTotalToHit(skill, 0));
+	client->Message(Chat::White, " compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense());
+	client->Message(Chat::White, " offense: %i mitigation ac: %i", offense(skill), GetMitigationAC());
 	if(CalcMaxMana() > 0)
-		client->Message(0, " Mana: %i/%i  Mana Regen: %i/%i", GetMana(), GetMaxMana(), CalcManaRegen(), CalcManaRegenCap());
-	client->Message(0, " End.: %i/%i  End. Regen: %i/%i",GetEndurance(), GetMaxEndurance(), CalcEnduranceRegen(), CalcEnduranceRegenCap());
-	client->Message(0, " ATK: %i  Worn/Spell ATK %i/%i  Server Side ATK: %i", GetTotalATK(), RuleI(Character, ItemATKCap), GetATKBonus(), GetATK());
-	client->Message(0, " Haste: %i / %i (Item: %i + Spell: %i + Over: %i)", GetHaste(), RuleI(Character, HasteCap), itembonuses.haste, spellbonuses.haste + spellbonuses.hastetype2, spellbonuses.hastetype3 + ExtraHaste);
-	client->Message(0, " STR: %i  STA: %i  DEX: %i  AGI: %i  INT: %i  WIS: %i  CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
-	client->Message(0, " hSTR: %i  hSTA: %i  hDEX: %i  hAGI: %i  hINT: %i  hWIS: %i  hCHA: %i", GetHeroicSTR(), GetHeroicSTA(), GetHeroicDEX(), GetHeroicAGI(), GetHeroicINT(), GetHeroicWIS(), GetHeroicCHA());
-	client->Message(0, " MR: %i  PR: %i  FR: %i  CR: %i  DR: %i Corruption: %i PhR: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup(), GetPhR());
-	client->Message(0, " hMR: %i  hPR: %i  hFR: %i  hCR: %i  hDR: %i hCorruption: %i", GetHeroicMR(), GetHeroicPR(), GetHeroicFR(), GetHeroicCR(), GetHeroicDR(), GetHeroicCorrup());
-	client->Message(0, " Shielding: %i  Spell Shield: %i  DoT Shielding: %i Stun Resist: %i  Strikethrough: %i  Avoidance: %i  Accuracy: %i  Combat Effects: %i", GetShielding(), GetSpellShield(), GetDoTShield(), GetStunResist(), GetStrikeThrough(), GetAvoidance(), GetAccuracy(), GetCombatEffects());
-	client->Message(0, " Heal Amt.: %i  Spell Dmg.: %i  Clairvoyance: %i DS Mitigation: %i", GetHealAmt(), GetSpellDmg(), GetClair(), GetDSMit());
+		client->Message(Chat::White, " Mana: %i/%i  Mana Regen: %i/%i", GetMana(), GetMaxMana(), CalcManaRegen(), CalcManaRegenCap());
+	client->Message(Chat::White, " End.: %i/%i  End. Regen: %i/%i",GetEndurance(), GetMaxEndurance(), CalcEnduranceRegen(), CalcEnduranceRegenCap());
+	client->Message(Chat::White, " ATK: %i  Worn/Spell ATK %i/%i  Server Side ATK: %i", GetTotalATK(), RuleI(Character, ItemATKCap), GetATKBonus(), GetATK());
+	client->Message(Chat::White, " Haste: %i / %i (Item: %i + Spell: %i + Over: %i)", GetHaste(), RuleI(Character, HasteCap), itembonuses.haste, spellbonuses.haste + spellbonuses.hastetype2, spellbonuses.hastetype3 + ExtraHaste);
+	client->Message(Chat::White, " STR: %i  STA: %i  DEX: %i  AGI: %i  INT: %i  WIS: %i  CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
+	client->Message(Chat::White, " hSTR: %i  hSTA: %i  hDEX: %i  hAGI: %i  hINT: %i  hWIS: %i  hCHA: %i", GetHeroicSTR(), GetHeroicSTA(), GetHeroicDEX(), GetHeroicAGI(), GetHeroicINT(), GetHeroicWIS(), GetHeroicCHA());
+	client->Message(Chat::White, " MR: %i  PR: %i  FR: %i  CR: %i  DR: %i Corruption: %i PhR: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup(), GetPhR());
+	client->Message(Chat::White, " hMR: %i  hPR: %i  hFR: %i  hCR: %i  hDR: %i hCorruption: %i", GetHeroicMR(), GetHeroicPR(), GetHeroicFR(), GetHeroicCR(), GetHeroicDR(), GetHeroicCorrup());
+	client->Message(Chat::White, " Shielding: %i  Spell Shield: %i  DoT Shielding: %i Stun Resist: %i  Strikethrough: %i  Avoidance: %i  Accuracy: %i  Combat Effects: %i", GetShielding(), GetSpellShield(), GetDoTShield(), GetStunResist(), GetStrikeThrough(), GetAvoidance(), GetAccuracy(), GetCombatEffects());
+	client->Message(Chat::White, " Heal Amt.: %i  Spell Dmg.: %i  Clairvoyance: %i DS Mitigation: %i", GetHealAmt(), GetSpellDmg(), GetClair(), GetDSMit());
 	if(GetClass() == BARD)
-		client->Message(0, " Singing: %i  Brass: %i  String: %i Percussion: %i Wind: %i", GetSingMod(), GetBrassMod(), GetStringMod(), GetPercMod(), GetWindMod());
+		client->Message(Chat::White, " Singing: %i  Brass: %i  String: %i Percussion: %i Wind: %i", GetSingMod(), GetBrassMod(), GetStringMod(), GetPercMod(), GetWindMod());
 
 	Extra_Info:
 
-	client->Message(0, " BaseRace: %i  Gender: %i  BaseGender: %i Texture: %i  HelmTexture: %i", GetBaseRace(), GetGender(), GetBaseGender(), GetTexture(), GetHelmTexture());
+	client->Message(Chat::White, " BaseRace: %i  Gender: %i  BaseGender: %i Texture: %i  HelmTexture: %i", GetBaseRace(), GetGender(), GetBaseGender(), GetTexture(), GetHelmTexture());
 	if (client->Admin() >= 100) {
-		client->Message(0, "  CharID: %i  EntityID: %i  PetID: %i  OwnerID: %i  AIControlled: %i  Targetted: %i", CharacterID(), GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted);
+		client->Message(Chat::White, "  CharID: %i  EntityID: %i  PetID: %i  OwnerID: %i  AIControlled: %i  Targetted: %i", CharacterID(), GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted);
 	}
 }
 
@@ -7285,17 +7287,17 @@ void Client::ShowXTargets(Client *c)
 		return;
 
 	for(int i = 0; i < GetMaxXTargets(); ++i)
-		c->Message(0, "Xtarget Slot: %i, Type: %2i, ID: %4i, Name: %s", i, XTargets[i].Type, XTargets[i].ID, XTargets[i].Name);
+		c->Message(Chat::White, "Xtarget Slot: %i, Type: %2i, ID: %4i, Name: %s", i, XTargets[i].Type, XTargets[i].ID, XTargets[i].Name);
 	auto &list = GetXTargetAutoMgr()->get_list();
 	 // yeah, I kept having to do something for debugging to tell if managers were the same object or not :P
 	 // so lets use the address as an "ID"
-	c->Message(0, "XTargetAutoMgr ID %p size %d", GetXTargetAutoMgr(), list.size());
+	c->Message(Chat::White, "XTargetAutoMgr ID %p size %d", GetXTargetAutoMgr(), list.size());
 	int count = 0;
 	for (auto &e : list) {
-		c->Message(0, "spawn id %d count %d", e.spawn_id, e.count);
+		c->Message(Chat::White, "spawn id %d count %d", e.spawn_id, e.count);
 		count++;
 		if (count == 20) { // lets not spam too many ...
-			c->Message(0, " ... ");
+			c->Message(Chat::White, " ... ");
 			break;
 		}
 	}
@@ -7660,7 +7662,7 @@ void Client::DuplicateLoreMessage(uint32 ItemID)
 {
 	if (!(m_ClientVersionBit & EQEmu::versions::maskRoFAndLater))
 	{
-		Message_StringID(0, PICK_LORE);
+		MessageString(Chat::White, PICK_LORE);
 		return;
 	}
 
@@ -7669,7 +7671,7 @@ void Client::DuplicateLoreMessage(uint32 ItemID)
 	if(!item)
 		return;
 
-	Message_StringID(0, PICK_LORE, item->Name);
+	MessageString(Chat::White, PICK_LORE, item->Name);
 }
 
 void Client::GarbleMessage(char *message, uint8 variance)
@@ -7721,6 +7723,14 @@ FACTION_VALUE Client::GetReverseFactionCon(Mob* iOther) {
 	return GetFactionLevel(CharacterID(), 0, GetFactionRace(), GetClass(), GetDeity(), iOther->GetPrimaryFaction(), iOther);
 }
 
+bool Client::ReloadCharacterFaction(Client *c, uint32 facid, uint32 charid)
+{
+	if (database.SetCharacterFactionLevel(charid, facid, 0, 0, factionvalues))
+		return true;
+	else
+		return false;
+}
+
 //o--------------------------------------------------------------
 //| Name: GetFactionLevel; Dec. 16, 2001
 //o--------------------------------------------------------------
@@ -7833,7 +7843,7 @@ void Client::SetFactionLevel(uint32 char_id, uint32 npc_id, uint8 char_class, ui
 
 		UpdatePersonalFaction(char_id, npc_value[i], faction_id[i], &current_value, temp[i], this_faction_min, this_faction_max);
 
-		//Message(14, "Min(%d) Max(%d) Before(%d), After(%d)\n", this_faction_min, this_faction_max, faction_before_hit, current_value);
+		//Message(Chat::Lime, "Min(%d) Max(%d) Before(%d), After(%d)\n", this_faction_min, this_faction_max, faction_before_hit, current_value);
 
 		SendFactionMessage(npc_value[i], faction_id[i], faction_before_hit, current_value, temp[i], this_faction_min, this_faction_max);
 	}
@@ -7876,7 +7886,7 @@ void Client::SetFactionLevel2(uint32 char_id, int32 faction_id, uint8 char_class
 
 		UpdatePersonalFaction(char_id, value, faction_id, &current_value, temp, this_faction_min, this_faction_max);
 
-		//Message(14, "Min(%d) Max(%d) Before(%d), After(%d)\n", this_faction_min, this_faction_max, faction_before_hit, current_value);
+		//Message(Chat::Lime, "Min(%d) Max(%d) Before(%d), After(%d)\n", this_faction_min, this_faction_max, faction_before_hit, current_value);
 
 		SendFactionMessage(value, faction_id, faction_before_hit, current_value, temp, this_faction_min, this_faction_max);
 	}
@@ -7985,7 +7995,7 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
 	}
 	// If no primary faction or biggest influence is your faction hit
 	if (primaryfaction <= 0 || lowestvalue == tmpFactionValue) {
-		merchant->Say_StringID(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS6));
+		merchant->SayString(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS6));
 	} else if (lowestvalue == fmod.race_mod) { // race biggest
 		// Non-standard race (ex. illusioned to wolf)
 		if (GetRace() > PLAYER_RACE_COUNT) {
@@ -8004,7 +8014,7 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
 				messageid = WONT_SELL_NONSTDRACE1;
 				break;
 			}
-			merchant->Say_StringID(messageid);
+			merchant->SayString(messageid);
 		} else { // normal player races
 			messageid = zone->random.Int(1, 4);
 			switch (messageid) {
@@ -8024,15 +8034,15 @@ void Client::MerchantRejectMessage(Mob *merchant, int primaryfaction)
 				messageid = WONT_SELL_RACE1;
 				break;
 			}
-			merchant->Say_StringID(messageid, itoa(GetRace()));
+			merchant->SayString(messageid, itoa(GetRace()));
 		}
 	} else if (lowestvalue == fmod.class_mod) {
-		merchant->Say_StringID(zone->random.Int(WONT_SELL_CLASS1, WONT_SELL_CLASS5), itoa(GetClass()));
+		merchant->SayString(zone->random.Int(WONT_SELL_CLASS1, WONT_SELL_CLASS5), itoa(GetClass()));
 	} else {
 		// Must be deity - these two sound the best for that.
 		// Can't use a message with a field, GUI wants class/race names.
 		// for those message IDs.  These are straight text.
-		merchant->Say_StringID(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS2));
+		merchant->SayString(zone->random.Int(WONT_SELL_DEEDS1, WONT_SELL_DEEDS2));
 	}
 	return;
 }
@@ -8068,15 +8078,15 @@ void Client::SendFactionMessage(int32 tmpvalue, int32 faction_id, int32 faction_
 	if (tmpvalue == 0 || temp == 1 || temp == 2)
 		return;
 	else if (faction_value >= this_faction_max)
-		Message_StringID(15, FACTION_BEST, name);
+		MessageString(Chat::Yellow, FACTION_BEST, name);
 	else if (faction_value <= this_faction_min)
-		Message_StringID(15, FACTION_WORST, name);
+		MessageString(Chat::Yellow, FACTION_WORST, name);
 	else if (tmpvalue > 0 && faction_value < this_faction_max && !RuleB(Client, UseLiveFactionMessage))
-		Message_StringID(15, FACTION_BETTER, name);
+		MessageString(Chat::Yellow, FACTION_BETTER, name);
 	else if (tmpvalue < 0 && faction_value > this_faction_min && !RuleB(Client, UseLiveFactionMessage))
-		Message_StringID(15, FACTION_WORSE, name);
+		MessageString(Chat::Yellow, FACTION_WORSE, name);
 	else if (RuleB(Client, UseLiveFactionMessage))
-		Message(15, "Your faction standing with %s has been adjusted by %i.", name, tmpvalue); //New Live faction message (14261)
+		Message(Chat::Yellow, "Your faction standing with %s has been adjusted by %i.", name, tmpvalue); //New Live faction message (14261)
 
 	return;
 }
@@ -8396,15 +8406,14 @@ void Client::Consume(const EQEmu::ItemData *item, uint8 type, int16 slot, bool a
 
 		m_pp.hunger_level += increase;
 
-		Log(Logs::General, Logs::Food, "Consuming food, points added to hunger_level: %i - current_hunger: %i",
-		    increase, m_pp.hunger_level);
+		LogFood("Consuming food, points added to hunger_level: [{}] - current_hunger: [{}]", increase, m_pp.hunger_level);
 
 		DeleteItemInInventory(slot, 1, false);
 
 		if (!auto_consume) // no message if the client consumed for us
-			entity_list.MessageClose_StringID(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name);
+			entity_list.MessageCloseString(this, true, 50, 0, EATING_MESSAGE, GetName(), item->Name);
 
-		Log(Logs::General, Logs::Food, "Eating from slot: %i", (int)slot);
+		LogFood("Eating from slot: [{}]", (int)slot);
 
 	} else {
 		increase = mod_drink_value(item, increase);
@@ -8416,13 +8425,12 @@ void Client::Consume(const EQEmu::ItemData *item, uint8 type, int16 slot, bool a
 
 		DeleteItemInInventory(slot, 1, false);
 
-		Log(Logs::General, Logs::Food, "Consuming drink, points added to thirst_level: %i current_thirst: %i",
-		    increase, m_pp.thirst_level);
+		LogFood("Consuming drink, points added to thirst_level: [{}] current_thirst: [{}]", increase, m_pp.thirst_level);
 
 		if (!auto_consume) // no message if the client consumed for us
-			entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
+			entity_list.MessageCloseString(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
 
-		Log(Logs::General, Logs::Food, "Drinking from slot: %i", (int)slot);
+		LogFood("Drinking from slot: [{}]", (int)slot);
 	}
 }
 
@@ -8465,7 +8473,7 @@ void Client::ExpeditionSay(const char *str, int ExpID) {
 		return;
 
 	if(results.RowCount() == 0) {
-		this->Message(14, "You say to the expedition, '%s'", str);
+		this->Message(Chat::Lime, "You say to the expedition, '%s'", str);
 		return;
 	}
 
@@ -8568,7 +8576,7 @@ void Client::SendHPUpdateMarquee(){
 		return;
 
 	std::string health_update_notification = StringFormat("Health: %u%%", health_percentage);
-	this->SendMarqueeMessage(15, 510, 0, 3000, 3000, health_update_notification);
+	this->SendMarqueeMessage(Chat::Yellow, 510, 0, 3000, 3000, health_update_notification);
 }
 
 uint32 Client::GetMoney(uint8 type, uint8 subtype) {
@@ -9081,7 +9089,7 @@ void Client::SetPrimaryWeaponOrnamentation(uint32 model_id)
 		SendItemPacket(EQEmu::invslot::slotPrimary, primary_item, ItemPacketTrade);
 		WearChange(EQEmu::textures::weaponPrimary, static_cast<uint16>(model_id), 0);
 
-		Message(15, "Your primary weapon appearance has been modified");
+		Message(Chat::Yellow, "Your primary weapon appearance has been modified");
 	}
 }
 
@@ -9104,7 +9112,7 @@ void Client::SetSecondaryWeaponOrnamentation(uint32 model_id)
 		SendItemPacket(EQEmu::invslot::slotSecondary, secondary_item, ItemPacketTrade);
 		WearChange(EQEmu::textures::weaponSecondary, static_cast<uint16>(model_id), 0);
 		
-		Message(15, "Your secondary weapon appearance has been modified");
+		Message(Chat::Yellow, "Your secondary weapon appearance has been modified");
 	}
 }
 
@@ -9144,7 +9152,7 @@ bool Client::GotoPlayer(std::string player_name)
 		auto heading     = static_cast<float>(atof(row[5]));
 
 		if (instance_id > 0 && !database.CheckInstanceExists(instance_id)) {
-			this->Message(15, "Instance no longer exists...");
+			this->Message(Chat::Yellow, "Instance no longer exists...");
 			return false;
 		}
 
@@ -9159,3 +9167,36 @@ bool Client::GotoPlayer(std::string player_name)
 
 	return false;
 }
+
+glm::vec4 &Client::GetLastPositionBeforeBulkUpdate()
+{
+	return last_position_before_bulk_update;
+}
+
+/**
+ * @param in_last_position_before_bulk_update
+ */
+void Client::SetLastPositionBeforeBulkUpdate(glm::vec4 in_last_position_before_bulk_update)
+{
+	Client::last_position_before_bulk_update = in_last_position_before_bulk_update;
+}
+
+#ifdef BOTS
+
+bool Client::GetBotOption(BotOwnerOption boo) const {
+
+	if (boo < _booCount) {
+		return bot_owner_options[boo];
+	}
+
+	return false;
+}
+
+void Client::SetBotOption(BotOwnerOption boo, bool flag) {
+
+	if (boo < _booCount) {
+		bot_owner_options[boo] = flag;
+	}
+}
+
+#endif
diff --git a/zone/client.h b/zone/client.h
index a44e83087..4ff431520 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -90,23 +90,6 @@ public:
 	bool ack_req;
 };
 
-enum { //Type arguments to the Message* routines.
-	//all not explicitly listed are the same grey color
-	clientMessageWhite0 = 0,
-	clientMessageLoot = 2, //dark green
-	clientMessageTradeskill = 4, //light blue
-	clientMessageTell = 5, //magenta
-	clientMessageWhite = 7,
-	clientMessageWhite2 = 10,
-	clientMessageLightGrey = 12,
-	clientMessageError = 13, //red
-	clientMessageGreen = 14,
-	clientMessageYellow = 15,
-	clientMessageBlue = 16,
-	clientMessageGroup = 18, //cyan
-	clientMessageWhite3 = 20,
-};
-
 #define SPELLBAR_UNLOCK 0x2bc
 enum { //scribing argument to MemorizeSpell
 	memSpellUnknown = -1, // this modifies some state data
@@ -243,7 +226,6 @@ public:
 	Client(EQStreamInterface * ieqs);
 	~Client();
 
-	std::unordered_map<Mob *, float> close_mobs;
 	bool is_client_moving;
 
 	void SetDisplayMobInfoWindow(bool display_mob_info_window);
@@ -295,11 +277,11 @@ public:
 	void SendBazaarWelcome();
 	void DyeArmor(EQEmu::TintProfile* dye);
 	uint8 SlotConvert(uint8 slot,bool bracer=false);
-	void Message_StringID(uint32 type, uint32 string_id, uint32 distance = 0);
-	void Message_StringID(uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
+	void MessageString(uint32 type, uint32 string_id, uint32 distance = 0);
+	void MessageString(uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
 	bool FilteredMessageCheck(Mob *sender, eqFilterType filter);
-	void FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id);
-	void FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter,
+	void FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id);
+	void FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter,
 					uint32 string_id, const char *message1, const char *message2 = nullptr,
 					const char *message3 = nullptr, const char *message4 = nullptr,
 					const char *message5 = nullptr, const char *message6 = nullptr,
@@ -341,7 +323,6 @@ public:
 	void ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...);
 	void Message(uint32 type, const char* message, ...);
 	void FilteredMessage(Mob *sender, uint32 type, eqFilterType filter, const char* message, ...);
-	void QuestJournalledMessage(const char *npcname, const char* message);
 	void VoiceMacroReceived(uint32 Type, char *Target, uint32 MacroNumber);
 	void SendSound();
 	void LearnRecipe(uint32 recipeID);
@@ -372,9 +353,9 @@ public:
 	inline bool ClientDataLoaded() const { return client_data_loaded; }
 	inline bool Connected() const { return (client_state == CLIENT_CONNECTED); }
 	inline bool InZone() const { return (client_state == CLIENT_CONNECTED || client_state == CLIENT_LINKDEAD); }
-	inline void Kick() { client_state = CLIENT_KICKED; }
 	inline void Disconnect() { eqs->Close(); client_state = DISCONNECTED; }
 	inline bool IsLD() const { return (bool) (client_state == CLIENT_LINKDEAD); }
+	void Kick(const std::string &reason);
 	void WorldKick();
 	inline uint8 GetAnon() const { return m_pp.anon; }
 	inline PlayerProfile_Struct& GetPP() { return m_pp; }
@@ -621,7 +602,7 @@ public:
 	void CalculateLeadershipExp(uint32 &add_exp, uint8 conlevel);
 	void CalculateExp(uint32 in_add_exp, uint32 &add_exp, uint32 &add_aaxp, uint8 conlevel, bool resexp);
 	void SetEXP(uint32 set_exp, uint32 set_aaxp, bool resexp=false);
-	void AddLevelBasedExp(uint8 exp_percentage, uint8 max_level=0);
+	void AddLevelBasedExp(uint8 exp_percentage, uint8 max_level = 0, bool ignore_mods = false);
 	void SetLeadershipEXP(uint32 group_exp, uint32 raid_exp);
 	void AddLeadershipEXP(uint32 group_exp, uint32 raid_exp);
 	void SendLeadershipEXPUpdate();
@@ -669,6 +650,7 @@ public:
 
 	FACTION_VALUE GetReverseFactionCon(Mob* iOther);
 	FACTION_VALUE GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 p_race, uint32 p_class, uint32 p_deity, int32 pFaction, Mob* tnpc);
+	bool ReloadCharacterFaction(Client *c, uint32 facid, uint32 charid);
 	int32 GetCharacterFactionLevel(int32 faction_id);
 	int32 GetModCharacterFactionLevel(int32 faction_id);
 	void MerchantRejectMessage(Mob *merchant, int primaryfaction);
@@ -814,6 +796,7 @@ public:
 
 	void SummonHorse(uint16 spell_id);
 	void SetHorseId(uint16 horseid_in);
+	inline void SetControlledMobId(uint16 mob_id_in) { controlled_mob_id = mob_id_in; }
 	uint16 GetHorseId() const { return horseId; }
 	bool CanMedOnHorse();
 
@@ -1310,6 +1293,9 @@ public:
 
 	uint32 trapid; //ID of trap player has triggered. This is cleared when the player leaves the trap's radius, or it despawns.
 
+	void SetLastPositionBeforeBulkUpdate(glm::vec4 in_last_position_before_bulk_update);
+	glm::vec4 &GetLastPositionBeforeBulkUpdate();
+
 protected:
 	friend class Mob;
 	void CalcItemBonuses(StatBonuses* newbon);
@@ -1414,6 +1400,7 @@ private:
 	uint32 WID;
 	uint32 account_id;
 	char account_name[30];
+	char loginserver[64];
 	uint32 lsaccountid;
 	char lskey[30];
 	int16 admin;
@@ -1445,6 +1432,7 @@ private:
 	bool berserk;
 	bool dead;
 	uint16 controlling_boat_id;
+	uint16 controlled_mob_id;
 	uint16 TrackingID;
 	uint16 CustomerID;
 	uint16 TraderID;
@@ -1518,6 +1506,7 @@ private:
 	Timer forget_timer; // our 2 min everybody forgets you timer
 	Timer autosave_timer;
 	Timer client_scan_npc_aggro_timer;
+	Timer client_zone_wide_full_position_update_timer;
 	Timer tribute_timer;
 
 	Timer proximity_timer;
@@ -1534,12 +1523,13 @@ private:
 	Timer afk_toggle_timer;
 	Timer helm_toggle_timer;
 	Timer aggro_meter_timer;
-	Timer npc_close_scan_timer;
+	Timer mob_close_scan_timer;
 	Timer hp_self_update_throttle_timer; /* This is to prevent excessive packet sending under trains/fast combat */
 	Timer hp_other_update_throttle_timer; /* This is to keep clients from DOSing the server with macros that change client targets constantly */
 	Timer position_update_timer; /* Timer used when client hasn't updated within a 10 second window */
 
 	glm::vec3 m_Proximity;
+	glm::vec4 last_position_before_bulk_update;
 
 	void BulkSendInventoryItems();
 
@@ -1639,26 +1629,34 @@ private:
 	int client_max_level;
 	
 #ifdef BOTS
-	struct BotOwnerOptions {
-		bool death_marquee;
-		bool stats_update;
-	};
-
-	BotOwnerOptions bot_owner_options;
-
-	const BotOwnerOptions DefaultBotOwnerOptions = {
-		false,	// death_marquee
-		false	// stats_update
-	};
-
+	
 public:
-	void SetBotOptionDeathMarquee(bool flag) { bot_owner_options.death_marquee = flag; }
-	void SetBotOptionStatsUpdate(bool flag) { bot_owner_options.stats_update = flag; }
+	enum BotOwnerOption : size_t {
+		booDeathMarquee,
+		booStatsUpdate,
+		booSpawnMessageSay,
+		booSpawnMessageTell,
+		booSpawnMessageClassSpecific,
+		booAltCombat,
+		booAutoDefend,
+		booBuffCounter,
+		_booCount
+	};
 
-	bool GetBotOptionDeathMarquee() const { return bot_owner_options.death_marquee; }
-	bool GetBotOptionStatsUpdate() const { return bot_owner_options.stats_update; }
+	bool GetBotOption(BotOwnerOption boo) const;
+	void SetBotOption(BotOwnerOption boo, bool flag = true);
+	
+	bool GetBotPulling() { return m_bot_pulling; }
+	void SetBotPulling(bool flag = true) { m_bot_pulling = flag; }
+
+	bool GetBotPrecombat() { return m_bot_precombat; }
+	void SetBotPrecombat(bool flag = true) { m_bot_precombat = flag; }
+
+private:
+	bool bot_owner_options[_booCount];
+	bool m_bot_pulling;
+	bool m_bot_precombat;
 
-private:		
 #endif
 };
 
diff --git a/zone/client_mods.cpp b/zone/client_mods.cpp
index 1f9049262..2d61a59ec 100644
--- a/zone/client_mods.cpp
+++ b/zone/client_mods.cpp
@@ -576,7 +576,7 @@ int32 Client::CalcMaxMana()
 				break;
 			}
 		default: {
-				Log(Logs::Detail, Logs::Spells, "Invalid Class '%c' in CalcMaxMana", GetCasterClass());
+				LogSpells("Invalid Class [{}] in CalcMaxMana", GetCasterClass());
 				max_mana = 0;
 				break;
 			}
@@ -594,7 +594,7 @@ int32 Client::CalcMaxMana()
 			current_mana = curMana_cap;
 		}
 	}
-	Log(Logs::Detail, Logs::Spells, "Client::CalcMaxMana() called for %s - returning %d", GetName(), max_mana);
+	LogSpells("Client::CalcMaxMana() called for [{}] - returning [{}]", GetName(), max_mana);
 	return max_mana;
 }
 
@@ -610,14 +610,13 @@ int32 Client::CalcBaseMana()
 		case 'I':
 			WisInt = GetINT();
 			if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) {
+				ConvertedWisInt = WisInt;
+				int over200 = WisInt;
 				if (WisInt > 100) {
-					ConvertedWisInt = (((WisInt - 100) * 5 / 2) + 100);
-					if (WisInt > 201) {
-						ConvertedWisInt -= ((WisInt - 201) * 5 / 4);
+					if (WisInt > 200) {
+						over200 = (WisInt - 200) / -2 + WisInt;
 					}
-				}
-				else {
-					ConvertedWisInt = WisInt;
+					ConvertedWisInt = (3 * over200 - 300) / 2 + over200;
 				}
 				auto base_data = database.GetBaseData(GetLevel(), GetClass());
 				if (base_data) {
@@ -643,14 +642,13 @@ int32 Client::CalcBaseMana()
 		case 'W':
 			WisInt = GetWIS();
 			if (ClientVersion() >= EQEmu::versions::ClientVersion::SoF && RuleB(Character, SoDClientUseSoDHPManaEnd)) {
+				ConvertedWisInt = WisInt;
+				int over200 = WisInt;
 				if (WisInt > 100) {
-					ConvertedWisInt = (((WisInt - 100) * 5 / 2) + 100);
-					if (WisInt > 201) {
-						ConvertedWisInt -= ((WisInt - 201) * 5 / 4);
+					if (WisInt > 200) {
+						over200 = (WisInt - 200) / -2 + WisInt;
 					}
-				}
-				else {
-					ConvertedWisInt = WisInt;
+					ConvertedWisInt = (3 * over200 - 300) / 2 + over200;
 				}
 				auto base_data = database.GetBaseData(GetLevel(), GetClass());
 				if (base_data) {
@@ -678,13 +676,13 @@ int32 Client::CalcBaseMana()
 				break;
 			}
 		default: {
-				Log(Logs::General, Logs::None, "Invalid Class '%c' in CalcMaxMana", GetCasterClass());
+				LogDebug("Invalid Class [{}] in CalcMaxMana", GetCasterClass());
 				max_m = 0;
 				break;
 			}
 	}
 	#if EQDEBUG >= 11
-	Log(Logs::General, Logs::None, "Client::CalcBaseMana() called for %s - returning %d", GetName(), max_m);
+	LogDebug("Client::CalcBaseMana() called for [{}] - returning [{}]", GetName(), max_m);
 	#endif
 	return max_m;
 }
@@ -1597,8 +1595,9 @@ uint32 Mob::GetInstrumentMod(uint16 spell_id) const
 		effectmod = 10;
 	if (!nocap && effectmod > effectmodcap) // if the cap is calculated to be 0 using new rules, no cap.
 		effectmod = effectmodcap;
-	Log(Logs::Detail, Logs::Spells, "%s::GetInstrumentMod() spell=%d mod=%d modcap=%d\n", GetName(), spell_id,
-		effectmod, effectmodcap);
+
+	LogSpells("[{}]::GetInstrumentMod() spell=[{}] mod=[{}] modcap=[{}]\n", GetName(), spell_id, effectmod, effectmodcap);
+
 	return effectmod;
 }
 
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 6cc05a65f..ebc6bd38a 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -60,6 +60,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "water_map.h"
 #include "worldserver.h"
 #include "zone.h"
+#include "mob_movement_manager.h"
 
 #ifdef BOTS
 #include "bot.h"
@@ -419,14 +420,14 @@ int Client::HandlePacket(const EQApplicationPacket *app)
 	if (LogSys.log_settings[Logs::LogCategory::Netcode].is_category_enabled == 1) {
 		char buffer[64];
 		app->build_header_dump(buffer);
-		Log(Logs::Detail, Logs::Client_Server_Packet, "Dispatch opcode: %s", buffer);
+		Log(Logs::Detail, Logs::PacketClientServer, "Dispatch opcode: %s", buffer);
 	}
 
-	if (LogSys.log_settings[Logs::Client_Server_Packet].is_category_enabled == 1)
-		Log(Logs::General, Logs::Client_Server_Packet, "[%s - 0x%04x] [Size: %u]", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size());
+	if (LogSys.log_settings[Logs::PacketClientServer].is_category_enabled == 1)
+		Log(Logs::General, Logs::PacketClientServer, "[%s - 0x%04x] [Size: %u]", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size());
 
-	if (LogSys.log_settings[Logs::Client_Server_Packet_With_Dump].is_category_enabled == 1)
-		Log(Logs::General, Logs::Client_Server_Packet_With_Dump, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size(), DumpPacketToString(app).c_str());
+	if (LogSys.log_settings[Logs::PacketClientServerWithDump].is_category_enabled == 1)
+		Log(Logs::General, Logs::PacketClientServerWithDump, "[%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(app->GetOpcode()), app->GetOpcode(), app->Size(), DumpPacketToString(app).c_str());
 
 	EmuOpcode opcode = app->GetOpcode();
 	if (opcode == OP_AckPacket) {
@@ -445,11 +446,6 @@ int Client::HandlePacket(const EQApplicationPacket *app)
 			args.push_back(const_cast<EQApplicationPacket*>(app));
 			parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 1, &args);
 
-#if EQDEBUG >= 10
-			Log(Logs::General, Logs::Error, "HandlePacket() Opcode error: Unexpected packet during CLIENT_CONNECTING: opcode:"
-				" %s (#%d eq=0x%04x), size: %i", OpcodeNames[opcode], opcode, 0, app->size);
-			DumpPacket(app);
-#endif
 			break;
 		}
 
@@ -474,10 +470,10 @@ int Client::HandlePacket(const EQApplicationPacket *app)
 			args.push_back(const_cast<EQApplicationPacket*>(app));
 			parse->EventPlayer(EVENT_UNHANDLED_OPCODE, this, "", 0, &args);
 
-			if (LogSys.log_settings[Logs::Client_Server_Packet_Unhandled].is_category_enabled == 1) {
+			if (LogSys.log_settings[Logs::PacketClientServerUnhandled].is_category_enabled == 1) {
 				char buffer[64];
 				app->build_header_dump(buffer);
-				Log(Logs::General, Logs::Client_Server_Packet_Unhandled, "%s %s", buffer, DumpPacketToString(app).c_str());
+				Log(Logs::General, Logs::PacketClientServerUnhandled, "%s %s", buffer, DumpPacketToString(app).c_str());
 			}
 			break;
 		}
@@ -491,7 +487,7 @@ int Client::HandlePacket(const EQApplicationPacket *app)
 	case CLIENT_LINKDEAD:
 		break;
 	default:
-		Log(Logs::General, Logs::None, "Unknown client_state: %d\n", client_state);
+		LogDebug("Unknown client_state: [{}]\n", client_state);
 		break;
 	}
 
@@ -540,7 +536,7 @@ void Client::CompleteConnect()
 
 	//SendAATable();
 
-	if (GetHideMe()) Message(13, "[GM] You are currently hidden to all clients");
+	if (GetHideMe()) Message(Chat::Red, "[GM] You are currently hidden to all clients");
 
 	uint32 raidid = database.GetRaidID(GetName());
 	Raid *raid = nullptr;
@@ -710,7 +706,7 @@ void Client::CompleteConnect()
 					{
 						SendAppearancePacket(AT_Levitate, 0);
 						BuffFadeByEffect(SE_Levitate);
-						Message(13, "You can't levitate in this zone.");
+						Message(Chat::Red, "You can't levitate in this zone.");
 					}
 				}
 				else {
@@ -792,7 +788,7 @@ void Client::CompleteConnect()
 
 	//enforce some rules..
 	if (!CanBeInZone()) {
-		Log(Logs::Detail, Logs::None, "[CLIENT] Kicking char from zone, not allowed here");
+		LogDebug("[CLIENT] Kicking char from zone, not allowed here");
 		GoToSafeCoords(database.GetZoneID("arena"), 0);
 		return;
 	}
@@ -805,6 +801,8 @@ void Client::CompleteConnect()
 
 	parse->EventPlayer(EVENT_ENTER_ZONE, this, "", 0);
 
+	SetLastPositionBeforeBulkUpdate(GetPosition());
+
 	/* This sub event is for if a player logs in for the first time since entering world. */
 	if (firstlogon == 1) {
 		parse->EventPlayer(EVENT_CONNECT, this, "", 0);
@@ -833,19 +831,19 @@ void Client::CompleteConnect()
 			uint32 minute = (ttime / 60000) % 60;
 			uint32 second = (ttime / 1000) % 60;
 			if (day) {
-				Message(15, "%s(%u) will expire in %u days, %u hours, %u minutes, and %u seconds.",
+				Message(Chat::Yellow, "%s(%u) will expire in %u days, %u hours, %u minutes, and %u seconds.",
 					zone->GetLongName(), zone->GetInstanceID(), day, hour, minute, second);
 			}
 			else if (hour) {
-				Message(15, "%s(%u) will expire in %u hours, %u minutes, and %u seconds.",
+				Message(Chat::Yellow, "%s(%u) will expire in %u hours, %u minutes, and %u seconds.",
 					zone->GetLongName(), zone->GetInstanceID(), hour, minute, second);
 			}
 			else if (minute) {
-				Message(15, "%s(%u) will expire in %u minutes, and %u seconds.",
+				Message(Chat::Yellow, "%s(%u) will expire in %u minutes, and %u seconds.",
 					zone->GetLongName(), zone->GetInstanceID(), minute, second);
 			}
 			else {
-				Message(15, "%s(%u) will expire in in %u seconds.",
+				Message(Chat::Yellow, "%s(%u) will expire in in %u seconds.",
 					zone->GetLongName(), zone->GetInstanceID(), second);
 			}
 		}
@@ -907,6 +905,8 @@ void Client::CompleteConnect()
 	entity_list.RefreshClientXTargets(this);
 
 	worldserver.RequestTellQueue(GetName());
+
+	entity_list.ScanCloseMobs(close_mobs, this);
 }
 
 // connecting opcode handlers
@@ -924,7 +924,7 @@ return;
 void Client::Handle_Connect_OP_ApproveZone(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ApproveZone_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size on OP_ApproveZone: Expected %i, Got %i",
+		LogError("Invalid size on OP_ApproveZone: Expected [{}], Got [{}]",
 			sizeof(ApproveZone_Struct), app->size);
 		return;
 	}
@@ -937,15 +937,15 @@ void Client::Handle_Connect_OP_ApproveZone(const EQApplicationPacket *app)
 void Client::Handle_Connect_OP_ClientError(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ClientError_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size on OP_ClientError: Expected %i, Got %i",
+		LogError("Invalid size on OP_ClientError: Expected [{}], Got [{}]",
 			sizeof(ClientError_Struct), app->size);
 		return;
 	}
 	// Client reporting error to server
 	ClientError_Struct* error = (ClientError_Struct*)app->pBuffer;
-	Log(Logs::General, Logs::Error, "Client error: %s", error->character_name);
-	Log(Logs::General, Logs::Error, "Error message: %s", error->message);
-	Message(13, error->message);
+	LogError("Client error: [{}]", error->character_name);
+	LogError("Error message: [{}]", error->message);
+	Message(Chat::Red, error->message);
 #if (EQDEBUG>=5)
 	DumpPacket(app);
 #endif
@@ -1082,7 +1082,7 @@ void Client::Handle_Connect_OP_SendTributes(const EQApplicationPacket *app)
 void Client::Handle_Connect_OP_SetServerFilter(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(SetServerFilter_Struct)) {
-		Log(Logs::General, Logs::Error, "Received invalid sized OP_SetServerFilter");
+		LogError("Received invalid sized OP_SetServerFilter");
 		DumpPacket(app);
 		return;
 	}
@@ -1099,7 +1099,7 @@ void Client::Handle_Connect_OP_SpawnAppearance(const EQApplicationPacket *app)
 void Client::Handle_Connect_OP_TGB(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(uint32)) {
-		Log(Logs::General, Logs::Error, "Invalid size on OP_TGB: Expected %i, Got %i",
+		LogError("Invalid size on OP_TGB: Expected [{}], Got [{}]",
 			sizeof(uint32), app->size);
 		return;
 	}
@@ -1166,13 +1166,11 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	*/
 	Client* client = entity_list.GetClientByName(cze->char_name);
 	if (!zone->GetAuth(ip, cze->char_name, &WID, &account_id, &character_id, &admin, lskey, &tellsoff)) {
-		Log(Logs::General, Logs::Error, "GetAuth() returned false kicking client");
-		if (client != 0) {
+		LogClientLogin("[{}] failed zone auth check", cze->char_name);
+		if (nullptr != client) {
 			client->Save();
-			client->Kick();
+			client->Kick("Failed auth check");
 		}
-		//ret = false; // TODO: Can we tell the client to get lost in a good way
-		client_state = CLIENT_KICKED;
 		return;
 	}
 
@@ -1182,7 +1180,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 		struct in_addr ghost_addr;
 		ghost_addr.s_addr = eqs->GetRemoteIP();
 
-		Log(Logs::General, Logs::Error, "Ghosting client: Account ID:%i Name:%s Character:%s IP:%s",
+		LogError("Ghosting client: Account ID:[{}] Name:[{}] Character:[{}] IP:[{}]",
 			client->AccountID(), client->AccountName(), client->GetName(), inet_ntoa(ghost_addr));
 		client->Save();
 		client->Disconnect();
@@ -1204,16 +1202,17 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	database.LoadCharacterFactionValues(cid, factionvalues);
 
 	/* Load Character Account Data: Temp until I move */
-	query = StringFormat("SELECT `status`, `name`, `lsaccount_id`, `gmspeed`, `revoked`, `hideme`, `time_creation` FROM `account` WHERE `id` = %u", this->AccountID());
+	query = StringFormat("SELECT `status`, `name`, `ls_id`, `lsaccount_id`, `gmspeed`, `revoked`, `hideme`, `time_creation` FROM `account` WHERE `id` = %u", this->AccountID());
 	auto results = database.QueryDatabase(query);
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		admin = atoi(row[0]);
-		strncpy(account_name, row[1], 30);
-		lsaccountid = atoi(row[2]);
-		gmspeed = atoi(row[3]);
-		revoked = atoi(row[4]);
-		gm_hide_me = atoi(row[5]);
-		account_creation = atoul(row[6]);
+		strn0cpy(account_name, row[1], sizeof(account_name));
+		strn0cpy(loginserver, row[2], sizeof(loginserver));
+		lsaccountid = atoi(row[3]);
+		gmspeed = atoi(row[4]);
+		revoked = atoi(row[5]);
+		gm_hide_me = atoi(row[6]);
+		account_creation = atoul(row[7]);
 	}
 
 	/* Load Character Data */
@@ -1422,7 +1421,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	}
 
 	if (!database.LoadAlternateAdvancement(this)) {
-		Log(Logs::General, Logs::Error, "Error loading AA points for %s", GetName());
+		LogError("Error loading AA points for [{}]", GetName());
 	}
 
 	if (SPDAT_RECORDS > 0) {
@@ -1554,7 +1553,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 
 	p_timers.SetCharID(CharacterID());
 	if (!p_timers.Load(&database)) {
-		Log(Logs::General, Logs::Error, "Unable to load ability timers from the database for %s (%i)!", GetCleanName(), CharacterID());
+		LogError("Unable to load ability timers from the database for [{}] ([{}])!", GetCleanName(), CharacterID());
 	}
 
 	/* Load Spell Slot Refresh from Currently Memoried Spells */
@@ -1681,7 +1680,7 @@ void Client::Handle_Connect_OP_ZoneEntry(const EQApplicationPacket *app)
 	/**
 	 * DevTools Load Settings
 	 */
-	if (Admin() >= 200) {
+	if (Admin() >= EQEmu::DevTools::GM_ACCOUNT_STATUS_LEVEL) {
 		std::string dev_tools_window_key = StringFormat("%i-dev-tools-window-disabled", AccountID());
 		if (DataBucket::GetData(dev_tools_window_key) == "true") {
 			dev_tools_window_enabled = false;
@@ -1734,16 +1733,16 @@ void Client::Handle_0x0193(const EQApplicationPacket *app)
 
 void Client::Handle_OP_AAAction(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::AA, "Received OP_AAAction");
+	LogAA("Received OP_AAAction");
 
 	if (app->size != sizeof(AA_Action)) {
-		Log(Logs::General, Logs::AA, "Error! OP_AAAction size didnt match!");
+		LogAA("Error! OP_AAAction size didnt match!");
 		return;
 	}
 	AA_Action* action = (AA_Action*)app->pBuffer;
 
 	if (action->action == aaActionActivate) {//AA Hotkey
-		Log(Logs::Detail, Logs::AA, "Activating AA %d", action->ability);
+		LogAA("Activating AA [{}]", action->ability);
 		ActivateAlternateAdvancementAbility(action->ability, action->target_id);
 	}
 	else if (action->action == aaActionBuy) {
@@ -1751,14 +1750,14 @@ void Client::Handle_OP_AAAction(const EQApplicationPacket *app)
 	}
 	else if (action->action == aaActionDisableEXP) { //Turn Off AA Exp
 		if (m_epp.perAA > 0)
-			Message_StringID(0, AA_OFF);
+			MessageString(Chat::White, AA_OFF);
 
 		m_epp.perAA = 0;
 		SendAlternateAdvancementStats();
 	}
 	else if (action->action == aaActionSetEXP) {
 		if (m_epp.perAA == 0)
-			Message_StringID(0, AA_ON);
+			MessageString(Chat::White, AA_ON);
 		m_epp.perAA = action->exp_value;
 		if (m_epp.perAA < 0 || m_epp.perAA > 100)
 			m_epp.perAA = 0;	// stop exploit with sanity check
@@ -1768,7 +1767,7 @@ void Client::Handle_OP_AAAction(const EQApplicationPacket *app)
 		SendAlternateAdvancementTable();
 	}
 	else {
-		Log(Logs::General, Logs::AA, "Unknown AA action : %u %u %u %d", action->action, action->ability, action->target_id, action->exp_value);
+		LogAA("Unknown AA action : [{}] [{}] [{}] [{}]", action->action, action->ability, action->target_id, action->exp_value);
 	}
 }
 
@@ -1776,8 +1775,7 @@ void Client::Handle_OP_AcceptNewTask(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(AcceptNewTask_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_AcceptNewTask expected %i got %i",
-			sizeof(AcceptNewTask_Struct), app->size);
+		LogDebug("Size mismatch in OP_AcceptNewTask expected [{}] got [{}]", sizeof(AcceptNewTask_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -1791,7 +1789,7 @@ void Client::Handle_OP_AdventureInfoRequest(const EQApplicationPacket *app)
 {
 	if (app->size < sizeof(EntityId_Struct))
 	{
-		Log(Logs::General, Logs::Error, "Handle_OP_AdventureInfoRequest had a packet that was too small.");
+		LogError("Handle_OP_AdventureInfoRequest had a packet that was too small");
 		return;
 	}
 	EntityId_Struct* ent = (EntityId_Struct*)app->pBuffer;
@@ -1846,7 +1844,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Adventure_Purchase_Struct))
 	{
-		Log(Logs::General, Logs::Error, "OP size error: OP_AdventureMerchantPurchase expected:%i got:%i", sizeof(Adventure_Purchase_Struct), app->size);
+		LogError("OP size error: OP_AdventureMerchantPurchase expected:[{}] got:[{}]", sizeof(Adventure_Purchase_Struct), app->size);
 		return;
 	}
 
@@ -1896,14 +1894,14 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 		}
 	}
 	if (!item || !found) {
-		Message(13, "Error: The item you purchased does not exist!");
+		Message(Chat::Red, "Error: The item you purchased does not exist!");
 		return;
 	}
 
 	if (aps->Type == LDoNMerchant)
 	{
 		if (m_pp.ldon_points_available < int32(item->LDoNPrice)) {
-			Message(13, "You cannot afford that item.");
+			Message(Chat::Red, "You cannot afford that item.");
 			return;
 		}
 
@@ -1913,7 +1911,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_tak < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in tak to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in tak to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1921,7 +1919,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_ruj < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in ruj to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in ruj to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1929,7 +1927,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_mmc < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in mmc to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in mmc to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1937,7 +1935,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_mir < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in mir to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in mir to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1945,7 +1943,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 			{
 				if (m_pp.ldon_points_guk < int32(item->LDoNPrice))
 				{
-					Message(13, "You need at least %u points in guk to purchase this item.", int32(item->LDoNPrice));
+					Message(Chat::Red, "You need at least %u points in guk to purchase this item.", int32(item->LDoNPrice));
 					return;
 				}
 			}
@@ -1955,7 +1953,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 	{
 		if (GetPVPPoints() < item->LDoNPrice)
 		{
-			Message(13, "You need at least %u PVP points to purchase this item.", int32(item->LDoNPrice));
+			Message(Chat::Red, "You need at least %u PVP points to purchase this item.", int32(item->LDoNPrice));
 			return;
 		}
 	}
@@ -1963,7 +1961,7 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 	{
 		if (GetRadiantCrystals() < item->LDoNPrice)
 		{
-			Message(13, "You need at least %u Radiant Crystals to purchase this item.", int32(item->LDoNPrice));
+			Message(Chat::Red, "You need at least %u Radiant Crystals to purchase this item.", int32(item->LDoNPrice));
 			return;
 		}
 	}
@@ -1971,20 +1969,20 @@ void Client::Handle_OP_AdventureMerchantPurchase(const EQApplicationPacket *app)
 	{
 		if (GetEbonCrystals() < item->LDoNPrice)
 		{
-			Message(13, "You need at least %u Ebon Crystals to purchase this item.", int32(item->LDoNPrice));
+			Message(Chat::Red, "You need at least %u Ebon Crystals to purchase this item.", int32(item->LDoNPrice));
 			return;
 		}
 	}
 	else
 	{
-		Message(13, "Unknown Adventure Merchant type.");
+		Message(Chat::Red, "Unknown Adventure Merchant type.");
 		return;
 	}
 
 
 	if (CheckLoreConflict(item))
 	{
-		Message(15, "You can only have one of a lore item.");
+		Message(Chat::Yellow, "You can only have one of a lore item.");
 		return;
 	}
 
@@ -2026,7 +2024,7 @@ void Client::Handle_OP_AdventureMerchantRequest(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(AdventureMerchant_Struct))
 	{
-		Log(Logs::General, Logs::Error, "OP size error: OP_AdventureMerchantRequest expected:%i got:%i", sizeof(AdventureMerchant_Struct), app->size);
+		LogError("OP size error: OP_AdventureMerchantRequest expected:[{}] got:[{}]", sizeof(AdventureMerchant_Struct), app->size);
 		return;
 	}
 	std::stringstream ss(std::stringstream::in | std::stringstream::out);
@@ -2115,8 +2113,7 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Adventure_Sell_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch on OP_AdventureMerchantSell: got %u expected %u",
-			app->size, sizeof(Adventure_Sell_Struct));
+		LogDebug("Size mismatch on OP_AdventureMerchantSell: got [{}] expected [{}]", app->size, sizeof(Adventure_Sell_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -2127,13 +2124,13 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 	if (vendor == 0 || !vendor->IsNPC() || ((vendor->GetClass() != ADVENTUREMERCHANT) &&
 		(vendor->GetClass() != NORRATHS_KEEPERS_MERCHANT) && (vendor->GetClass() != DARK_REIGN_MERCHANT)))
 	{
-		Message(13, "Vendor was not found.");
+		Message(Chat::Red, "Vendor was not found.");
 		return;
 	}
 
 	if (DistanceSquared(m_Position, vendor->GetPosition())  > USE_NPC_RANGE2)
 	{
-		Message(13, "Vendor is out of range.");
+		Message(Chat::Red, "Vendor is out of range.");
 		return;
 	}
 
@@ -2141,14 +2138,14 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 
 	if (itemid == 0)
 	{
-		Message(13, "Found no item at that slot.");
+		Message(Chat::Red, "Found no item at that slot.");
 		return;
 	}
 
 	const EQEmu::ItemData* item = database.GetItem(itemid);
 	EQEmu::ItemInstance* inst = GetInv().GetItem(ams_in->slot);
 	if (!item || !inst) {
-		Message(13, "You seemed to have misplaced that item...");
+		Message(Chat::Red, "You seemed to have misplaced that item...");
 		return;
 	}
 
@@ -2167,13 +2164,13 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 	// that case here.
 	if (item->LDoNSold == 0)
 	{
-		Message(13, "The merchant does not want that item.");
+		Message(Chat::Red, "The merchant does not want that item.");
 		return;
 	}
 
 	if (item->LDoNPrice == 0)
 	{
-		Message(13, "The merchant does not want that item.");
+		Message(Chat::Red, "The merchant does not want that item.");
 		return;
 	}
 
@@ -2182,7 +2179,7 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 
 	if (price == 0)
 	{
-		Message(13, "The merchant does not want that item.");
+		Message(Chat::Red, "The merchant does not want that item.");
 		return;
 	}
 
@@ -2202,7 +2199,7 @@ void Client::Handle_OP_AdventureMerchantSell(const EQApplicationPacket *app)
 
 		if (ams_in->charges == 0)
 		{
-			Message(13, "Charge mismatch error.");
+			Message(Chat::Red, "Charge mismatch error.");
 			return;
 		}
 
@@ -2248,7 +2245,7 @@ void Client::Handle_OP_AdventureRequest(const EQApplicationPacket *app)
 {
 	if (app->size < sizeof(AdventureRequest_Struct))
 	{
-		Log(Logs::General, Logs::Error, "Handle_OP_AdventureRequest had a packet that was too small.");
+		LogError("Handle_OP_AdventureRequest had a packet that was too small");
 		return;
 	}
 
@@ -2387,7 +2384,7 @@ void Client::Handle_OP_AdventureStatsRequest(const EQApplicationPacket *app)
 void Client::Handle_OP_AggroMeterLockTarget(const EQApplicationPacket *app)
 {
 	if (app->size < sizeof(uint32)) {
-		Log(Logs::General, Logs::Error, "Handle_OP_AggroMeterLockTarget had a packet that was too small.");
+		LogError("Handle_OP_AggroMeterLockTarget had a packet that was too small");
 		return;
 	}
 
@@ -2522,18 +2519,18 @@ void Client::Handle_OP_AltCurrencyPurchase(const EQApplicationPacket *app)
 		}
 
 		if (!item || !found) {
-			Message(13, "Error: The item you purchased does not exist!");
+			Message(Chat::Red, "Error: The item you purchased does not exist!");
 			return;
 		}
 
 		if (cost > current_currency) {
-			Message(13, "You cannot afford that item right now.");
+			Message(Chat::Red, "You cannot afford that item right now.");
 			return;
 		}
 
 		if (CheckLoreConflict(item))
 		{
-			Message(15, "You can only have one of a lore item.");
+			Message(Chat::Yellow, "You can only have one of a lore item.");
 			return;
 		}
 
@@ -2688,7 +2685,7 @@ void Client::Handle_OP_AltCurrencySell(const EQApplicationPacket *app)
 
 			if (sell->charges == 0)
 			{
-				Message(13, "Charge mismatch error.");
+				Message(Chat::Red, "Charge mismatch error.");
 				return;
 			}
 
@@ -2789,9 +2786,7 @@ void Client::Handle_OP_AltCurrencySellSelection(const EQApplicationPacket *app)
 void Client::Handle_OP_Animation(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Animation_Struct)) {
-		Log(Logs::General, Logs::Error, "Received invalid sized "
-			"OP_Animation: got %d, expected %d", app->size,
-			sizeof(Animation_Struct));
+		LogError("Received invalid sized OP_Animation: got [{}], expected [{}]", app->size, sizeof(Animation_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -2807,7 +2802,7 @@ void Client::Handle_OP_Animation(const EQApplicationPacket *app)
 void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ApplyPoison_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_ApplyPoison, size=%i, expected %i", app->size, sizeof(ApplyPoison_Struct));
+		LogError("Wrong size: OP_ApplyPoison, size=[{}], expected [{}]", app->size, sizeof(ApplyPoison_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -2816,12 +2811,8 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
 
 	uint32 ApplyPoisonSuccessResult = 0;
 
-	const EQEmu::ItemInstance* PrimaryWeapon = GetInv().GetItem(EQEmu::invslot::slotPrimary);
-	const EQEmu::ItemInstance* SecondaryWeapon = GetInv().GetItem(EQEmu::invslot::slotSecondary);
 	const EQEmu::ItemInstance* PoisonItemInstance = GetInv().GetItem(ApplyPoisonData->inventorySlot);
 
-	const EQEmu::ItemData* primary = (PrimaryWeapon ? PrimaryWeapon->GetItem() : nullptr);
-	const EQEmu::ItemData* secondary = (SecondaryWeapon ? SecondaryWeapon->GetItem() : nullptr);
 	const EQEmu::ItemData* poison = (PoisonItemInstance ? PoisonItemInstance->GetItem() : nullptr);
 
 	bool IsPoison = (poison && poison->ItemType == EQEmu::item::ItemTypePoison);
@@ -2833,12 +2824,9 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
 
 		if (poison->Proc.Level2 > GetLevel()) {
 			// Poison is too high to apply.
-			Message_StringID(clientMessageTradeskill, POISON_TOO_HIGH);
+			MessageString(Chat::LightBlue, POISON_TOO_HIGH);
 		}
-		else if ((primary && 
-				primary->ItemType == EQEmu::item::ItemType1HPiercing) ||
-			(secondary && 
-			secondary->ItemType == EQEmu::item::ItemType1HPiercing)) {
+		else {
 
 			double ChanceRoll = zone->random.Real(0, 1);
 
@@ -2851,10 +2839,11 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
 			// Poisons that don't proc until a level higher than the
 			// rogue simply won't apply at all, no skill check done.
 
-			if (ChanceRoll < (.9 + GetLevel()/1000)) {
+			uint16 poison_skill = GetSkill(EQEmu::skills::SkillApplyPoison);
+			
+			if (ChanceRoll < (.75 + poison_skill / 1000)) {
 				ApplyPoisonSuccessResult = 1;
-				AddProcToWeapon(poison->Proc.Effect, false, 
-										(GetDEX() / 100) + 103);
+				AddProcToWeapon(poison->Proc.Effect, false, (GetDEX() / 100) + 103, POISON_PROC);
 			}
 		}
 
@@ -2873,7 +2862,7 @@ void Client::Handle_OP_ApplyPoison(const EQApplicationPacket *app)
 void Client::Handle_OP_Assist(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(EntityId_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_Assist expected %i got %i", sizeof(EntityId_Struct), app->size);
+		LogDebug("Size mismatch in OP_Assist expected [{}] got [{}]", sizeof(EntityId_Struct), app->size);
 		return;
 	}
 
@@ -2906,7 +2895,7 @@ void Client::Handle_OP_Assist(const EQApplicationPacket *app)
 void Client::Handle_OP_AssistGroup(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(EntityId_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_AssistGroup expected %i got %i", sizeof(EntityId_Struct), app->size);
+		LogDebug("Size mismatch in OP_AssistGroup expected [{}] got [{}]", sizeof(EntityId_Struct), app->size);
 		return;
 	}
 	QueuePacket(app);
@@ -2919,8 +2908,7 @@ void Client::Handle_OP_AugmentInfo(const EQApplicationPacket *app)
 	// Some clients this seems to nuke the charm text (ex. Adventurer's Stone)
 
 	if (app->size != sizeof(AugmentInfo_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_AugmentInfo expected %i got %i",
-			sizeof(AugmentInfo_Struct), app->size);
+		LogDebug("Size mismatch in OP_AugmentInfo expected [{}] got [{}]", sizeof(AugmentInfo_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -2938,7 +2926,7 @@ void Client::Handle_OP_AugmentInfo(const EQApplicationPacket *app)
 void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(AugmentItem_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for AugmentItem_Struct: Expected: %i, Got: %i",
+		LogError("Invalid size for AugmentItem_Struct: Expected: [{}], Got: [{}]",
 			sizeof(AugmentItem_Struct), app->size);
 		return;
 	}
@@ -2950,7 +2938,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 		if ((in_augment->container_slot < EQEmu::invslot::EQUIPMENT_BEGIN || in_augment->container_slot > EQEmu::invslot::GENERAL_END) &&
 			(in_augment->container_slot < EQEmu::invbag::GENERAL_BAGS_BEGIN || in_augment->container_slot > EQEmu::invbag::GENERAL_BAGS_END))
 		{
-			Message(13, "The server does not allow augmentation actions from this slot.");
+			Message(Chat::Red, "The server does not allow augmentation actions from this slot.");
 			auto cursor_item = m_inv[EQEmu::invslot::slotCursor];
 			auto augmented_item = m_inv[in_augment->container_slot];
 			SendItemPacket(EQEmu::invslot::slotCursor, cursor_item, ItemPacketCharInventory);
@@ -2961,7 +2949,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 
 		EQEmu::ItemInstance *itemOneToPush = nullptr, *itemTwoToPush = nullptr;
 
-		//Log(Logs::DebugLevel::Moderate, Logs::Debug, "cslot: %i aslot: %i cidx: %i aidx: %i act: %i dest: %i",
+		//Log(Logs::DebugLevel::Moderate, Logs::Debug, "cslot: [{}] aslot: [{}] cidx: [{}] aidx: [{}] act: [{}] dest: [{}]",
 		//	in_augment->container_slot, in_augment->augment_slot, in_augment->container_index, in_augment->augment_index, in_augment->augment_action, in_augment->dest_inst_id);
 
 		EQEmu::ItemInstance *tobe_auged = nullptr, *old_aug = nullptr, *new_aug = nullptr, *aug = nullptr, *solvent = nullptr;
@@ -2973,7 +2961,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 
 		if (item_slot == INVALID_INDEX || solvent_slot == INVALID_INDEX)
 		{
-			Message(13, "Error: Invalid Aug Index.");
+			Message(Chat::Red, "Error: Invalid Aug Index.");
 			return;
 		}
 
@@ -2982,7 +2970,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 
 		if (!tobe_auged)
 		{
-			Message(13, "Error: Invalid item passed for augmenting.");
+			Message(Chat::Red, "Error: Invalid item passed for augmenting.");
 			return;
 		}
 
@@ -2994,8 +2982,8 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 			{
 				old_aug = tobe_auged->GetAugment(in_augment->augment_index);
 				if (!old_aug || old_aug->GetItem()->AugDistiller != 0) {
-					Log(Logs::General, Logs::Error, "Player tried to safely remove an augment without a distiller.");
-					Message(13, "Error: Missing an augmentation distiller for safely removing this augment.");
+					LogError("Player tried to safely remove an augment without a distiller");
+					Message(Chat::Red, "Error: Missing an augmentation distiller for safely removing this augment.");
 					return;
 				}
 			}
@@ -3005,21 +2993,21 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 
 				if (!old_aug)
 				{
-					Log(Logs::General, Logs::Error, "Player tried to safely remove a nonexistent augment.");
-					Message(13, "Error: No augment found in slot %i for safely removing.", in_augment->augment_index);
+					LogError("Player tried to safely remove a nonexistent augment");
+					Message(Chat::Red, "Error: No augment found in slot %i for safely removing.", in_augment->augment_index);
 					return;
 				}
 				else if (solvent->GetItem()->ID != old_aug->GetItem()->AugDistiller)
 				{
-					Log(Logs::General, Logs::Error, "Player tried to safely remove an augment with the wrong distiller (item %u vs expected %u).", solvent->GetItem()->ID, old_aug->GetItem()->AugDistiller);
-					Message(13, "Error: Wrong augmentation distiller for safely removing this augment.");
+					LogError("Player tried to safely remove an augment with the wrong distiller (item [{}] vs expected [{}])", solvent->GetItem()->ID, old_aug->GetItem()->AugDistiller);
+					Message(Chat::Red, "Error: Wrong augmentation distiller for safely removing this augment.");
 					return;
 				}
 			}
 			else if (solvent->GetItem()->ItemType != EQEmu::item::ItemTypePerfectedAugmentationDistiller)
 			{
-				Log(Logs::General, Logs::Error, "Player tried to safely remove an augment with a non-distiller item.");
-				Message(13, "Error: Invalid augmentation distiller for safely removing this augment.");
+				LogError("Player tried to safely remove an augment with a non-distiller item");
+				Message(Chat::Red, "Error: Invalid augmentation distiller for safely removing this augment.");
 				return;
 			}
 		}
@@ -3032,8 +3020,8 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 
 			if (!new_aug) // Shouldn't get the OP code without the augment on the user's cursor, but maybe it's h4x.
 			{
-				Log(Logs::General, Logs::Error, "AugmentItem OpCode with 'Insert' or 'Swap' action received, but no augment on client's cursor.");
-				Message(13, "Error: No augment found on cursor for inserting.");
+				LogError("AugmentItem OpCode with 'Insert' or 'Swap' action received, but no augment on client's cursor");
+				Message(Chat::Red, "Error: No augment found on cursor for inserting.");
 				return;
 			}
 			else
@@ -3072,7 +3060,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 					}
 					else
 					{
-						Message(13, "Error: Could not properly insert augmentation into augment slot %i. Aborting.", in_augment->augment_index);
+						Message(Chat::Red, "Error: Could not properly insert augmentation into augment slot %i. Aborting.", in_augment->augment_index);
 						return;
 					}
 
@@ -3099,8 +3087,8 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 							// This is a swap. Return the old aug to the player's cursor.
 							if (!PutItemInInventory(EQEmu::invslot::slotCursor, *itemTwoToPush, true))
 							{
-								Log(Logs::General, Logs::Error, "Problem returning old augment to player's cursor after augmentation swap.");
-								Message(15, "Error: Failed to retrieve old augment after augmentation swap!");
+								LogError("Problem returning old augment to player's cursor after augmentation swap");
+								Message(Chat::Yellow, "Error: Failed to retrieve old augment after augmentation swap!");
 							}
 						}
 
@@ -3117,17 +3105,17 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 						}
 						else
 						{
-							Message(13, "Error: No available slot for end result. Please free up the augment slot.");
+							Message(Chat::Red, "Error: No available slot for end result. Please free up the augment slot.");
 						}
 					}
 					else
 					{
-						Message(13, "Error in cloning item for augment. Aborted.");
+						Message(Chat::Red, "Error in cloning item for augment. Aborted.");
 					}
 				}
 				else
 				{
-					Message(13, "Error: No available slot for augment in that item.");
+					Message(Chat::Red, "Error: No available slot for augment in that item.");
 				}
 			}
 			break;
@@ -3147,7 +3135,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 			}
 			else
 			{
-				Message(13, "Error: Could not find augmentation to remove at index %i. Aborting.", in_augment->augment_index);
+				Message(Chat::Red, "Error: Could not find augmentation to remove at index %i. Aborting.", in_augment->augment_index);
 				return;
 			}
 
@@ -3170,8 +3158,8 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				// Replace it with the unaugmented item
 				if (!PutItemInInventory(item_slot, *itemOneToPush, true))
 				{
-					Log(Logs::General, Logs::Error, "Problem returning equipment item to player's inventory after safe augment removal.");
-					Message(15, "Error: Failed to return item after de-augmentation!");
+					LogError("Problem returning equipment item to player's inventory after safe augment removal");
+					Message(Chat::Yellow, "Error: Failed to return item after de-augmentation!");
 				}
 
 				CalcBonuses();
@@ -3184,8 +3172,8 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 				// Drop the removed augment on the player's cursor
 				if (!PutItemInInventory(EQEmu::invslot::slotCursor, *itemTwoToPush, true))
 				{
-					Log(Logs::General, Logs::Error, "Problem returning augment to player's cursor after safe removal.");
-					Message(15, "Error: Failed to return augment after removal from item!");
+					LogError("Problem returning augment to player's cursor after safe removal");
+					Message(Chat::Yellow, "Error: Failed to return augment after removal from item!");
 					return;
 				}
 			}
@@ -3210,7 +3198,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 			}
 			else
 			{
-				Message(13, "Error: Could not find augmentation to remove at index %i. Aborting.");
+				Message(Chat::Red, "Error: Could not find augmentation to remove at index %i. Aborting.");
 				return;
 			}
 
@@ -3224,8 +3212,8 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 
 				if (!PutItemInInventory(item_slot, *itemOneToPush, true))
 				{
-					Log(Logs::General, Logs::Error, "Problem returning equipment item to player's inventory after augment deletion.");
-					Message(15, "Error: Failed to return item after destroying augment!");
+					LogError("Problem returning equipment item to player's inventory after augment deletion");
+					Message(Chat::Yellow, "Error: Failed to return item after destroying augment!");
 				}
 			}
 
@@ -3237,7 +3225,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 			}
 			break;
 		default: // Unknown
-			Log(Logs::General, Logs::Inventory, "Unrecognized augmentation action - cslot: %i aslot: %i cidx: %i aidx: %i act: %i dest: %i",
+			LogInventory("Unrecognized augmentation action - cslot: [{}] aslot: [{}] cidx: [{}] aidx: [{}] act: [{}] dest: [{}]",
 				in_augment->container_slot, in_augment->augment_slot, in_augment->container_index, in_augment->augment_index, in_augment->augment_action, in_augment->dest_inst_id);
 			break;
 		}
@@ -3253,7 +3241,7 @@ void Client::Handle_OP_AugmentItem(const EQApplicationPacket *app)
 void Client::Handle_OP_AutoAttack(const EQApplicationPacket *app)
 {
 	if (app->size != 4) {
-		Log(Logs::General, Logs::Error, "OP size error: OP_AutoAttack expected:4 got:%i", app->size);
+		LogError("OP size error: OP_AutoAttack expected:4 got:[{}]", app->size);
 		return;
 	}
 
@@ -3303,7 +3291,7 @@ void Client::Handle_OP_AutoAttack2(const EQApplicationPacket *app)
 void Client::Handle_OP_AutoFire(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(bool)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_AutoFire expected %i got %i", sizeof(bool), app->size);
+		LogDebug("Size mismatch in OP_AutoFire expected [{}] got [{}]", sizeof(bool), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -3318,8 +3306,7 @@ void Client::Handle_OP_Bandolier(const EQApplicationPacket *app)
 	// Although there are three different structs for OP_Bandolier, they are all the same size.
 	//
 	if (app->size != sizeof(BandolierCreate_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_Bandolier expected %i got %i",
-			sizeof(BandolierCreate_Struct), app->size);
+		LogDebug("Size mismatch in OP_Bandolier expected [{}] got [{}]", sizeof(BandolierCreate_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -3338,7 +3325,7 @@ void Client::Handle_OP_Bandolier(const EQApplicationPacket *app)
 		SetBandolier(app);
 		break;
 	default:
-		Log(Logs::General, Logs::None, "Unknown Bandolier action %i", bs->Action);
+		LogDebug("Unknown Bandolier action [{}]", bs->Action);
 		break;
 	}
 }
@@ -3347,7 +3334,7 @@ void Client::Handle_OP_BankerChange(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(BankerChange_Struct) && app->size != 4) //Titanium only sends 4 Bytes for this
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_BankerChange expected %i got %i", sizeof(BankerChange_Struct), app->size);
+		LogDebug("Size mismatch in OP_BankerChange expected [{}] got [{}]", sizeof(BankerChange_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -3432,7 +3419,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 
 	if (app->size < 4)
 	{
-		Log(Logs::General, Logs::None, "OP_Barter packet below minimum expected size. The packet was %i bytes.", app->size);
+		LogDebug("OP_Barter packet below minimum expected size. The packet was [{}] bytes", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -3469,7 +3456,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 		else {
 			Buf = (char *)app->pBuffer;
 			VARSTRUCT_ENCODE_TYPE(uint32, Buf, Barter_BuyerModeOff);
-			Message(13, "You cannot be a Trader and Buyer at the same time.");
+			Message(Chat::Red, "You cannot be a Trader and Buyer at the same time.");
 		}
 		QueuePacket(app);
 		break;
@@ -3525,7 +3512,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 		const EQEmu::ItemData* item = database.GetItem(bislr->ItemID);
 
 		if (!item)
-			Message(13, "Error: This item does not exist!");
+			Message(Chat::Red, "Error: This item does not exist!");
 		else
 		{
 			EQEmu::ItemInstance* inst = database.CreateItem(item);
@@ -3558,7 +3545,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 		const EQEmu::ItemData* item = database.GetItem(bislr->ItemID);
 
 		if (!item)
-			Message(13, "Error: This item does not exist!");
+			Message(Chat::Red, "Error: This item does not exist!");
 		else
 		{
 			EQEmu::ItemInstance* inst = database.CreateItem(item);
@@ -3578,8 +3565,8 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 	}
 
 	default:
-		Message(13, "Unrecognised Barter action.");
-		Log(Logs::Detail, Logs::Trading, "Unrecognised Barter Action %i", Action);
+		Message(Chat::Red, "Unrecognised Barter action.");
+		LogTrading("Unrecognised Barter Action [{}]", Action);
 
 	}
 }
@@ -3587,7 +3574,7 @@ void Client::Handle_OP_Barter(const EQApplicationPacket *app)
 void Client::Handle_OP_BazaarInspect(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(BazaarInspect_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for BazaarInspect_Struct: Expected %i, Got %i",
+		LogError("Invalid size for BazaarInspect_Struct: Expected [{}], Got [{}]",
 			sizeof(BazaarInspect_Struct), app->size);
 		return;
 	}
@@ -3597,7 +3584,7 @@ void Client::Handle_OP_BazaarInspect(const EQApplicationPacket *app)
 	const EQEmu::ItemData* item = database.GetItem(bis->ItemID);
 
 	if (!item) {
-		Message(13, "Error: This item does not exist!");
+		Message(Chat::Red, "Error: This item does not exist!");
 		return;
 	}
 
@@ -3641,8 +3628,8 @@ void Client::Handle_OP_BazaarSearch(const EQApplicationPacket *app)
 		return;
 	}
 	else {
-		Log(Logs::Detail, Logs::Trading, "Malformed BazaarSearch_Struct packe, Action %it received, ignoring...");
-		Log(Logs::General, Logs::Error, "Malformed BazaarSearch_Struct packet received, ignoring...\n");
+		LogTrading("Malformed BazaarSearch_Struct packe, Action [{}]t received, ignoring");
+		LogError("Malformed BazaarSearch_Struct packet received, ignoring\n");
 	}
 
 	return;
@@ -3652,7 +3639,7 @@ void Client::Handle_OP_Begging(const EQApplicationPacket *app)
 {
 	if (!p_timers.Expired(&database, pTimerBeggingPickPocket, false))
 	{
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 
 		auto outapp = new EQApplicationPacket(OP_Begging, sizeof(BeggingResponse_Struct));
 		BeggingResponse_Struct *brs = (BeggingResponse_Struct*)outapp->pBuffer;
@@ -3727,16 +3714,16 @@ void Client::Handle_OP_Begging(const EQApplicationPacket *app)
 void Client::Handle_OP_Bind_Wound(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(BindWound_Struct)) {
-		Log(Logs::General, Logs::Error, "Size mismatch for Bind wound packet");
+		LogError("Size mismatch for Bind wound packet");
 		DumpPacket(app);
 	}
 	BindWound_Struct* bind_in = (BindWound_Struct*)app->pBuffer;
 	Mob* bindmob = entity_list.GetMob(bind_in->to);
 	if (!bindmob) {
-		Log(Logs::General, Logs::Error, "Bindwound on non-exsistant mob from %s", this->GetName());
+		LogError("Bindwound on non-exsistant mob from [{}]", this->GetName());
 	}
 	else {
-		Log(Logs::General, Logs::None, "BindWound in: to:\'%s\' from=\'%s\'", bindmob->GetName(), GetName());
+		LogDebug("BindWound in: to:\'[{}]\' from=\'[{}]\'", bindmob->GetName(), GetName());
 		BindWound(bindmob, true);
 	}
 	return;
@@ -3749,8 +3736,7 @@ void Client::Handle_OP_BlockedBuffs(const EQApplicationPacket *app)
 
 	if (app->size != sizeof(BlockedBuffs_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_BlockedBuffs expected %i got %i",
-			sizeof(BlockedBuffs_Struct), app->size);
+		LogDebug("Size mismatch in OP_BlockedBuffs expected [{}] got [{}]", sizeof(BlockedBuffs_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -3844,7 +3830,7 @@ void Client::Handle_OP_BoardBoat(const EQApplicationPacket *app)
 	// this sends unclean mob name, so capped at 64
 	// a_boat006
 	if (app->size <= 5 || app->size > 64) {
-		Log(Logs::General, Logs::Error, "Size mismatch in OP_BoardBoad. Expected greater than 5 less than 64, got %i", app->size);
+		LogError("Size mismatch in OP_BoardBoad. Expected greater than 5 less than 64, got [{}]", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -3854,8 +3840,9 @@ void Client::Handle_OP_BoardBoat(const EQApplicationPacket *app)
 	boatname[63] = '\0';
 
 	Mob* boat = entity_list.GetMob(boatname);
-	if (!boat || (boat->GetRace() != CONTROLLED_BOAT && boat->GetRace() != 502))
+	if (!boat || !boat->IsControllableBoat()) {
 		return;
+	}
 	controlling_boat_id = boat->GetID();	// set the client's BoatID to show that it's on this boat
 
 	Message(0, "Board boat: %s", boatname);
@@ -3867,14 +3854,14 @@ void Client::Handle_OP_Buff(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(SpellBuffPacket_Struct))
 	{
-		Log(Logs::General, Logs::Error, "Size mismatch in OP_Buff. expected %i got %i", sizeof(SpellBuffPacket_Struct), app->size);
+		LogError("Size mismatch in OP_Buff. expected [{}] got [{}]", sizeof(SpellBuffPacket_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
 
 	SpellBuffPacket_Struct* sbf = (SpellBuffPacket_Struct*)app->pBuffer;
 	uint32 spid = sbf->buff.spellid;
-	Log(Logs::Detail, Logs::Spells, "Client requested that buff with spell id %d be canceled.", spid);
+	LogSpells("Client requested that buff with spell id [{}] be canceled", spid);
 
 	//something about IsDetrimentalSpell() crashes this portion of code..
 	//tbh we shouldn't use it anyway since this is a simple red vs blue buff check and
@@ -3951,6 +3938,11 @@ void Client::Handle_OP_Camp(const EQApplicationPacket *app)
 #ifdef BOTS
 	// This block is necessary to clean up any bot objects owned by a Client
 	Bot::BotOrderCampAll(this);
+	// Evidently, this is bad under certain conditions and causes crashes...
+	// Group and Raid code really needs to be overhauled to account for non-client types (mercs and bots)
+	//auto group = GetGroup();
+	//if (group && group->GroupCount() < 2)
+	//	group->DisbandGroup();
 #endif
 	if (IsLFP())
 		worldserver.StopLFP(CharacterID());
@@ -3968,8 +3960,7 @@ void Client::Handle_OP_CancelTask(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(CancelTask_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_CancelTask expected %i got %i",
-			sizeof(CancelTask_Struct), app->size);
+		LogDebug("Size mismatch in OP_CancelTask expected [{}] got [{}]", sizeof(CancelTask_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -3982,7 +3973,7 @@ void Client::Handle_OP_CancelTask(const EQApplicationPacket *app)
 void Client::Handle_OP_CancelTrade(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(CancelTrade_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_CancelTrade, size=%i, expected %i", app->size, sizeof(CancelTrade_Struct));
+		LogError("Wrong size: OP_CancelTrade, size=[{}], expected [{}]", app->size, sizeof(CancelTrade_Struct));
 		return;
 	}
 	Mob* with = trade->With();
@@ -4022,8 +4013,8 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 		return;
 	}
 	if (IsAIControlled()) {
-		this->Message_StringID(13, NOT_IN_CONTROL);
-		//Message(13, "You cant cast right now, you arent in control of yourself!");
+		this->MessageString(Chat::Red, NOT_IN_CONTROL);
+		//Message(Chat::Red, "You cant cast right now, you arent in control of yourself!");
 		return;
 	}
 
@@ -4031,7 +4022,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 
 	m_TargetRing = glm::vec3(castspell->x_pos, castspell->y_pos, castspell->z_pos);
 
-	Log(Logs::General, Logs::Spells, "OP CastSpell: slot=%d, spell=%d, target=%d, inv=%lx", castspell->slot, castspell->spell_id, castspell->target_id, (unsigned long)castspell->inventoryslot);
+	LogSpells("OP CastSpell: slot [{}] spell [{}] target [{}] inv [{}]", castspell->slot, castspell->spell_id, castspell->target_id, (unsigned long)castspell->inventoryslot);
 	CastingSlot slot = static_cast<CastingSlot>(castspell->slot);
 
 	/* Memorized Spell */
@@ -4127,7 +4118,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 	/* Discipline -- older clients use the same slot as items, but we translate to it's own */
 	else if (slot == CastingSlot::Discipline) {
 		if (!UseDiscipline(castspell->spell_id, castspell->target_id)) {
-			Log(Logs::General, Logs::Spells, "Unknown ability being used by %s, spell being cast is: %i\n", GetName(), castspell->spell_id);
+			LogSpells("Unknown ability being used by [{}], spell being cast is: [{}]\n", GetName(), castspell->spell_id);
 			InterruptSpell(castspell->spell_id);
 			return;
 		}
@@ -4138,7 +4129,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 
 		if (castspell->spell_id == SPELL_LAY_ON_HANDS && GetClass() == PALADIN) {
 			if (!p_timers.Expired(&database, pTimerLayHands)) {
-				Message(13, "Ability recovery time not yet met.");
+				Message(Chat::Red, "Ability recovery time not yet met.");
 				InterruptSpell(castspell->spell_id);
 				return;
 			}
@@ -4148,7 +4139,7 @@ void Client::Handle_OP_CastSpell(const EQApplicationPacket *app)
 		else if ((castspell->spell_id == SPELL_HARM_TOUCH
 			|| castspell->spell_id == SPELL_HARM_TOUCH2) && GetClass() == SHADOWKNIGHT) {
 			if (!p_timers.Expired(&database, pTimerHarmTouch)) {
-				Message(13, "Ability recovery time not yet met.");
+				Message(Chat::Red, "Ability recovery time not yet met.");
 				InterruptSpell(castspell->spell_id);
 				return;
 			}
@@ -4177,7 +4168,7 @@ void Client::Handle_OP_ChannelMessage(const EQApplicationPacket *app)
 		return;
 	}
 	if (IsAIControlled()) {
-		Message(13, "You try to speak but cant move your mouth!");
+		Message(Chat::Red, "You try to speak but cant move your mouth!");
 		return;
 	}
 
@@ -4197,7 +4188,7 @@ void Client::Handle_OP_ClearBlockedBuffs(const EQApplicationPacket *app)
 
 	if (app->size != 1)
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_ClearBlockedBuffs expected 1 got %i", app->size);
+		LogDebug("Size mismatch in OP_ClearBlockedBuffs expected 1 got [{}]", app->size);
 
 		DumpPacket(app);
 
@@ -4219,8 +4210,7 @@ void Client::Handle_OP_ClearNPCMarks(const EQApplicationPacket *app)
 
 	if (app->size != 0)
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_ClearNPCMarks expected 0 got %i",
-			app->size);
+		LogDebug("Size mismatch in OP_ClearNPCMarks expected 0 got [{}]", app->size);
 
 		DumpPacket(app);
 
@@ -4241,7 +4231,7 @@ void Client::Handle_OP_ClearSurname(const EQApplicationPacket *app)
 void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ClickDoor_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_ClickDoor, size=%i, expected %i", app->size, sizeof(ClickDoor_Struct));
+		LogError("Wrong size: OP_ClickDoor, size=[{}], expected [{}]", app->size, sizeof(ClickDoor_Struct));
 		return;
 	}
 	ClickDoor_Struct* cd = (ClickDoor_Struct*)app->pBuffer;
@@ -4266,7 +4256,7 @@ void Client::Handle_OP_ClickDoor(const EQApplicationPacket *app)
 void Client::Handle_OP_ClickObject(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ClickObject_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size on ClickObject_Struct: Expected %i, Got %i",
+		LogError("Invalid size on ClickObject_Struct: Expected [{}], Got [{}]",
 			sizeof(ClickObject_Struct), app->size);
 		return;
 	}
@@ -4313,7 +4303,7 @@ void Client::Handle_OP_ClickObjectAction(const EQApplicationPacket *app)
 	else
 	{
 		if (app->size != sizeof(ClickObjectAction_Struct)) {
-			Log(Logs::General, Logs::Error, "Invalid size on OP_ClickObjectAction: Expected %i, Got %i",
+			LogError("Invalid size on OP_ClickObjectAction: Expected [{}], Got [{}]",
 				sizeof(ClickObjectAction_Struct), app->size);
 			return;
 		}
@@ -4326,11 +4316,11 @@ void Client::Handle_OP_ClickObjectAction(const EQApplicationPacket *app)
 				object->Close();
 			}
 			else {
-				Log(Logs::General, Logs::Error, "Unsupported action %d in OP_ClickObjectAction", oos->open);
+				LogError("Unsupported action [{}] in OP_ClickObjectAction", oos->open);
 			}
 		}
 		else {
-			Log(Logs::General, Logs::Error, "Invalid object %d in OP_ClickObjectAction", oos->drop_id);
+			LogError("Invalid object [{}] in OP_ClickObjectAction", oos->drop_id);
 		}
 	}
 
@@ -4347,8 +4337,8 @@ void Client::Handle_OP_ClickObjectAction(const EQApplicationPacket *app)
 void Client::Handle_OP_ClientError(const EQApplicationPacket *app)
 {
 	ClientError_Struct* error = (ClientError_Struct*)app->pBuffer;
-	Log(Logs::General, Logs::Error, "Client error: %s", error->character_name);
-	Log(Logs::General, Logs::Error, "Error message:%s", error->message);
+	LogError("Client error: [{}]", error->character_name);
+	LogError("Error message:[{}]", error->message);
 	return;
 }
 
@@ -4368,7 +4358,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	if (app->size != sizeof(PlayerPositionUpdateClient_Struct)
 		&& app->size != (sizeof(PlayerPositionUpdateClient_Struct) + 1)
 			) {
-		Log(Logs::General, Logs::Error, "OP size error: OP_ClientUpdate expected:%i got:%i",
+		LogError("OP size error: OP_ClientUpdate expected:[{}] got:[{}]",
 			sizeof(PlayerPositionUpdateClient_Struct), app->size);
 		return;
 	}
@@ -4378,7 +4368,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	/* Boat handling */
 	if (ppu->spawn_id != GetID()) {
 		/* If player is controlling boat */
-		if (ppu->spawn_id == controlling_boat_id) {
+		if (ppu->spawn_id && ppu->spawn_id == controlling_boat_id) {
 			Mob *boat = entity_list.GetMob(controlling_boat_id);
 			if (boat == 0) {
 				controlling_boat_id = 0;
@@ -4397,9 +4387,56 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 			/* Update the boat's position on the server, without sending an update */
 			boat->GMMove(ppu->x_pos, ppu->y_pos, ppu->z_pos, EQ12toFloat(ppu->heading), false);
 			return;
-		} else return;
+		}
+		else {
+			// Eye of Zomm needs code here to track position of the eye on server
+			// so that other clients see it.  I could add a check here for eye of zomm
+			// race, to limit this code, but this should handle any client controlled
+			// mob that gets updates from OP_ClientUpdate
+			if (ppu->spawn_id == controlled_mob_id) {
+				Mob *cmob = entity_list.GetMob(ppu->spawn_id);
+				if (cmob != nullptr) {
+					cmob->SetPosition(ppu->x_pos, ppu->y_pos, ppu->z_pos);
+					cmob->SetHeading(EQ12toFloat(ppu->heading));
+					mMovementManager->SendCommandToClients(cmob, 0.0, 0.0, 0.0, 
+							0.0, 0, ClientRangeAny, nullptr, this);
+					cmob->CastToNPC()->SaveGuardSpot(glm::vec4(ppu->x_pos, 
+							ppu->y_pos, ppu->z_pos, EQ12toFloat(ppu->heading)));
+				}
+			}
+		}
+	return;
 	}
+
+	// At this point, all that's left is a client update.
+	// Pure boat updates, and client contolled mob updates are complete.
+	// This can still be tricky.  If ppu->vehicle_id is set, then the client
+	// position is actually an offset from the boat he is inside.
+
+	bool	on_boat = (ppu->vehicle_id != 0);
+
+	// From this point forward, we need to use a new set of variables for client
+	// position.  If the client is in a boat, we need to add the boat pos and
+	// the client offset together.
 	
+	float	cx = ppu->x_pos;
+	float	cy = ppu->y_pos;
+	float	cz = ppu->z_pos;
+	float 	new_heading = EQ12toFloat(ppu->heading);
+
+	if (on_boat) {
+		Mob *boat = entity_list.GetMob(ppu->vehicle_id);
+		if (boat == 0) {
+			LogError("Can't find boat for client position offset.");
+		}
+		else {
+			cx += boat->GetX();
+			cy += boat->GetY();
+			cz += boat->GetZ();
+			new_heading += boat->GetHeading();
+		}
+	}
+
 	if (IsDraggingCorpse())
 		DragCorpses();
 
@@ -4407,9 +4444,9 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	float rewind_x_diff = 0;
 	float rewind_y_diff = 0;
 	
-	rewind_x_diff = ppu->x_pos - m_RewindLocation.x;
+	rewind_x_diff = cx - m_RewindLocation.x;
 	rewind_x_diff *= rewind_x_diff;
-	rewind_y_diff = ppu->y_pos - m_RewindLocation.y;
+	rewind_y_diff = cy - m_RewindLocation.y;
 	rewind_y_diff *= rewind_y_diff;
 	
 	/* 
@@ -4427,26 +4464,26 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	*/
 	
 	if ((rewind_x_diff > 5000) || (rewind_y_diff > 5000))
-		m_RewindLocation = glm::vec3(ppu->x_pos, ppu->y_pos, ppu->z_pos);
+		m_RewindLocation = glm::vec3(cx, cy, cz);
 	
 	if (proximity_timer.Check()) {
-		entity_list.ProcessMove(this, glm::vec3(ppu->x_pos, ppu->y_pos, ppu->z_pos));
+		entity_list.ProcessMove(this, glm::vec3(cx, cy, cz));
 		if (RuleB(TaskSystem, EnableTaskSystem) && RuleB(TaskSystem, EnableTaskProximity))
-			ProcessTaskProximities(ppu->x_pos, ppu->y_pos, ppu->z_pos);
+			ProcessTaskProximities(cx, cy, cz);
 	
-		m_Proximity = glm::vec3(ppu->x_pos, ppu->y_pos, ppu->z_pos);
+		m_Proximity = glm::vec3(cx, cy, cz);
 	}
 	
 	/* Update internal state */
 	m_Delta = glm::vec4(ppu->delta_x, ppu->delta_y, ppu->delta_z, EQ10toFloat(ppu->delta_heading));
 	
-	if (IsTracking() && ((m_Position.x != ppu->x_pos) || (m_Position.y != ppu->y_pos))) {
+	if (IsTracking() && ((m_Position.x != cx) || (m_Position.y != cy))) {
 		if (zone->random.Real(0, 100) < 70)//should be good
 			CheckIncreaseSkill(EQEmu::skills::SkillTracking, nullptr, -20);
 	}
 	
 	/* Break Hide if moving without sneaking and set rewind timer if moved */
-	if (ppu->y_pos != m_Position.y || ppu->x_pos != m_Position.x) {
+	if (cy != m_Position.y || cx != m_Position.x) {
 		if ((hidden || improved_hidden) && !sneaking) {
 			hidden = false;
 			improved_hidden = false;
@@ -4465,37 +4502,77 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	}
 	
 	/* Handle client aggro scanning timers NPCs */
-	is_client_moving = (ppu->y_pos == m_Position.y && ppu->x_pos == m_Position.x) ? false : true;
-	
+	is_client_moving = (cy == m_Position.y && cx == m_Position.x) ? false : true;
+
 	if (is_client_moving) {
-		Log(Logs::Detail, Logs::Normal, "ClientUpdate: Client is moving - scan timer is: %u",
-			client_scan_npc_aggro_timer.GetDuration());
+		LogDebug("ClientUpdate: Client is moving - scan timer is: [{}]", client_scan_npc_aggro_timer.GetDuration());
 		if (client_scan_npc_aggro_timer.GetDuration() > 1000) {
 			client_scan_npc_aggro_timer.Disable();
 			client_scan_npc_aggro_timer.Start(500);
-	
 		}
-	} else {
-		Log(Logs::Detail, Logs::Normal, "ClientUpdate: Client is NOT moving - scan timer is: %u",
-			client_scan_npc_aggro_timer.GetDuration());
+	}
+	else {
+		LogDebug("ClientUpdate: Client is NOT moving - scan timer is: [{}]", client_scan_npc_aggro_timer.GetDuration());
 		if (client_scan_npc_aggro_timer.GetDuration() < 1000) {
 			client_scan_npc_aggro_timer.Disable();
 			client_scan_npc_aggro_timer.Start(3000);
 		}
 	}
-	
-	float new_heading = EQ12toFloat(ppu->heading);
+
+	/**
+	 * On a normal basis we limit mob movement updates based on distance
+	 * This ensures we send a periodic full zone update to a client that has started moving after 5 or so minutes
+	 *
+	 * For very large zones we will also force a full update based on distance
+	 *
+	 * We ignore a small distance around us so that we don't interrupt already pathing deltas as those npcs will appear
+	 * to full stop when they are actually still pathing
+	 */
+
+	float distance_moved                      = DistanceNoZ(GetLastPositionBeforeBulkUpdate(), GetPosition());
+	bool  moved_far_enough_before_bulk_update = distance_moved >= zone->GetNpcPositionUpdateDistance();
+	bool  is_ready_to_update                  = (
+		client_zone_wide_full_position_update_timer.Check() || moved_far_enough_before_bulk_update
+	);
+
+	if (is_client_moving && is_ready_to_update) {
+		LogDebug("[[{}]] Client Zone Wide Position Update NPCs", GetCleanName());
+
+		auto &mob_movement_manager = MobMovementManager::Get();
+		auto &mob_list             = entity_list.GetMobList();
+
+		for (auto &it : mob_list) {
+			Mob *entity = it.second;
+			if (!entity->IsNPC()) {
+				continue;
+			}
+
+			int animation_speed = 0;
+			if (entity->IsMoving()) {
+				if (entity->IsRunning()) {
+					animation_speed = (entity->IsFeared() ? entity->GetFearSpeed() : entity->GetRunspeed());
+				}
+				else {
+					animation_speed = entity->GetWalkspeed();
+				}
+			}
+
+			mob_movement_manager.SendCommandToClients(entity, 0.0, 0.0, 0.0, 0.0, animation_speed, ClientRangeAny, this);
+		}
+
+		SetLastPositionBeforeBulkUpdate(GetPosition());
+	}
+
 	int32 new_animation = ppu->animation;
 	
 	/* Update internal server position from what the client has sent */
-	m_Position.x = ppu->x_pos;
-	m_Position.y = ppu->y_pos;
-	m_Position.z = ppu->z_pos;
+	m_Position.x = cx;
+	m_Position.y = cy;
+	m_Position.z = cz;
 	
 	/* Visual Debugging */
 	if (RuleB(Character, OPClientUpdateVisualDebug)) {
-		Log(Logs::General, Logs::Debug, "ClientUpdate: ppu x: %f y: %f z: %f h: %u", ppu->x_pos, ppu->y_pos, ppu->z_pos,
-			ppu->heading);
+		LogDebug("ClientUpdate: ppu x: [{}] y: [{}] z: [{}] h: [{}]", cx, cy, cz, new_heading);
 		this->SendAppearanceEffect(78, 0, 0, 0, 0);
 		this->SendAppearanceEffect(41, 0, 0, 0, 0);
 	}
@@ -4504,7 +4581,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	if (is_client_moving || new_heading != m_Position.w || new_animation != animation) {
 	
 		animation = ppu->animation;
-		m_Position.w = EQ12toFloat(ppu->heading);
+		m_Position.w = new_heading;
 	
 		/* Broadcast update to other clients */
 		auto outapp = new EQApplicationPacket(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct));
@@ -4513,7 +4590,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 		MakeSpawnUpdate(position_update);
 	
 		if (gm_hide_me) {
-			entity_list.QueueClientsStatus(this, outapp, true, Admin(), 250);
+			entity_list.QueueClientsStatus(this, outapp, true, Admin(), 255);
 		} else {
 			entity_list.QueueCloseClients(this, outapp, true, RuleI(Range, ClientPositionUpdates), nullptr, true);
 		}
@@ -4580,7 +4657,7 @@ void Client::Handle_OP_Consent(const EQApplicationPacket *app)
 			safe_delete(pack);
 		}
 		else {
-			Message_StringID(0, CONSENT_YOURSELF);
+			MessageString(Chat::White, CONSENT_YOURSELF);
 		}
 	}
 	return;
@@ -4609,7 +4686,7 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Consider_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in Consider expected %i got %i", sizeof(Consider_Struct), app->size);
+		LogDebug("Size mismatch in Consider expected [{}] got [{}]", sizeof(Consider_Struct), app->size);
 		return;
 	}
 	Consider_Struct* conin = (Consider_Struct*)app->pBuffer;
@@ -4619,7 +4696,7 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app)
 
 	if (tmob->GetClass() == LDON_TREASURE)
 	{
-		Message(15, "%s", tmob->GetCleanName());
+		Message(Chat::Yellow, "%s", tmob->GetCleanName());
 		return;
 	}
 
@@ -4720,10 +4797,10 @@ void Client::Handle_OP_Consider(const EQApplicationPacket *app)
 	// this could be done better, but this is only called when you con so w/e
 	// Shroud of Stealth has a special message
 	if (improved_hidden && (!tmob->see_improved_hide && (tmob->see_invis || tmob->see_hide)))
-		Message_StringID(10, SOS_KEEPS_HIDDEN);
+		MessageString(Chat::NPCQuestSay, SOS_KEEPS_HIDDEN);
 	// we are trying to hide but they can see us
 	else if ((invisible || invisible_undead || hidden || invisible_animals) && !IsInvisible(tmob))
-		Message_StringID(10, SUSPECT_SEES_YOU);
+		MessageString(Chat::NPCQuestSay, SUSPECT_SEES_YOU);
 
 	safe_delete(outapp);
 
@@ -4734,7 +4811,7 @@ void Client::Handle_OP_ConsiderCorpse(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Consider_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in Consider corpse expected %i got %i", sizeof(Consider_Struct), app->size);
+		LogDebug("Size mismatch in Consider corpse expected [{}] got [{}]", sizeof(Consider_Struct), app->size);
 		return;
 	}
 	Consider_Struct* conin = (Consider_Struct*)app->pBuffer;
@@ -4746,10 +4823,10 @@ void Client::Handle_OP_ConsiderCorpse(const EQApplicationPacket *app)
 			min = (ttime / 60000) % 60; // Total seconds / 60 drop .00
 			char val1[20] = { 0 };
 			char val2[20] = { 0 };
-			Message_StringID(10, CORPSE_DECAY1, ConvertArray(min, val1), ConvertArray(sec, val2));
+			MessageString(Chat::NPCQuestSay, CORPSE_DECAY1, ConvertArray(min, val1), ConvertArray(sec, val2));
 		}
 		else {
-			Message_StringID(10, CORPSE_DECAY_NOW);
+			MessageString(Chat::NPCQuestSay, CORPSE_DECAY_NOW);
 		}
 	}
 	else if (tcorpse && tcorpse->IsPlayerCorpse()) {
@@ -4780,12 +4857,12 @@ void Client::Handle_OP_ConsiderCorpse(const EQApplicationPacket *app)
 			Message(0, "This corpse can be resurrected for %i minutes and %i seconds.", min, sec);
 			}
 			else {
-			Message_StringID(0, CORPSE_TOO_OLD);
+			MessageString(Chat::White, CORPSE_TOO_OLD);
 			}
 			*/
 		}
 		else {
-			Message_StringID(10, CORPSE_DECAY_NOW);
+			MessageString(Chat::NPCQuestSay, CORPSE_DECAY_NOW);
 		}
 	}
 }
@@ -4794,7 +4871,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Consume_Struct))
 	{
-		Log(Logs::General, Logs::Error, "OP size error: OP_Consume expected:%i got:%i", sizeof(Consume_Struct), app->size);
+		LogError("OP size error: OP_Consume expected:[{}] got:[{}]", sizeof(Consume_Struct), app->size);
 		return;
 	}
 	Consume_Struct* pcs = (Consume_Struct*)app->pBuffer;
@@ -4831,7 +4908,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
 
 	EQEmu::ItemInstance *myitem = GetInv().GetItem(pcs->slot);
 	if (myitem == nullptr) {
-		Log(Logs::General, Logs::Error, "Consuming from empty slot %d", pcs->slot);
+		LogError("Consuming from empty slot [{}]", pcs->slot);
 		return;
 	}
 
@@ -4843,7 +4920,7 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
 		Consume(eat_item, EQEmu::item::ItemTypeDrink, pcs->slot, (pcs->auto_consumed == 0xffffffff));
 	}
 	else {
-		Log(Logs::General, Logs::Error, "OP_Consume: unknown type, type:%i", (int)pcs->type);
+		LogError("OP_Consume: unknown type, type:[{}]", (int)pcs->type);
 		return;
 	}
 	if (m_pp.hunger_level > 50000)
@@ -4864,15 +4941,19 @@ void Client::Handle_OP_Consume(const EQApplicationPacket *app)
 void Client::Handle_OP_ControlBoat(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ControlBoat_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_ControlBoat, size=%i, expected %i", app->size, sizeof(ControlBoat_Struct));
+		LogError("Wrong size: OP_ControlBoat, size=[{}], expected [{}]", app->size, sizeof(ControlBoat_Struct));
 		return;
 	}
+
 	ControlBoat_Struct* cbs = (ControlBoat_Struct*)app->pBuffer;
 	Mob* boat = entity_list.GetMob(cbs->boatId);
-	if (boat == 0)
-		return;	// do nothing if the boat isn't valid
+	if (!boat) {
 
-	if (!boat->IsNPC() || (boat->GetRace() != CONTROLLED_BOAT && boat->GetRace() != 502))
+		LogError("Player tried to take control of non-existent boat (char_id: %u, boat_eid: %u)", CharacterID(), cbs->boatId);
+		return;	// do nothing if the boat isn't valid
+	}
+
+	if (!boat->IsNPC() || !boat->IsControllableBoat())
 	{
 		char *hacked_string = nullptr;
 		MakeAnyLenString(&hacked_string, "OP_Control Boat was sent against %s which is of race %u", boat->GetName(), boat->GetRace());
@@ -4883,20 +4964,24 @@ void Client::Handle_OP_ControlBoat(const EQApplicationPacket *app)
 
 	if (cbs->TakeControl) {
 		// this uses the boat's target to indicate who has control of it. It has to check hate to make sure the boat isn't actually attacking anyone.
-		if ((boat->GetTarget() == 0) || (boat->GetTarget() == this && boat->GetHateAmount(this) == 0)) {
+		if (!boat->GetTarget() || (boat->GetTarget() == this && boat->GetHateAmount(this) == 0)) {
 			boat->SetTarget(this);
 		}
 		else {
-			this->Message_StringID(13, IN_USE);
+
+			this->MessageString(Chat::Red, IN_USE);
 			return;
 		}
 	}
-	else
-		boat->SetTarget(0);
+	else {
+		if (boat->GetTarget() == this) {
+			boat->SetTarget(nullptr);
+		}
+	}
+
+	// client responds better to a packet echo than an empty op
+	QueuePacket(app);
 
-	auto outapp = new EQApplicationPacket(OP_ControlBoat, 0);
-	FastQueuePacket(&outapp);
-	safe_delete(outapp);
 	// have the boat signal itself, so quests can be triggered by boat use
 	boat->CastToNPC()->SignalNPC(0);
 }
@@ -4905,7 +4990,7 @@ void Client::Handle_OP_CorpseDrag(const EQApplicationPacket *app)
 {
 	if (DraggedCorpses.size() >= (unsigned int)RuleI(Character, MaxDraggedCorpses))
 	{
-		Message_StringID(13, CORPSEDRAG_LIMIT);
+		MessageString(Chat::Red, CORPSEDRAG_LIMIT);
 		return;
 	}
 
@@ -4923,9 +5008,9 @@ void Client::Handle_OP_CorpseDrag(const EQApplicationPacket *app)
 	if (c)
 	{
 		if (c == this)
-			Message_StringID(MT_DefaultText, CORPSEDRAG_ALREADY, corpse->GetCleanName());
+			MessageString(Chat::DefaultText, CORPSEDRAG_ALREADY, corpse->GetCleanName());
 		else
-			Message_StringID(MT_DefaultText, CORPSEDRAG_SOMEONE_ELSE, corpse->GetCleanName());
+			MessageString(Chat::DefaultText, CORPSEDRAG_SOMEONE_ELSE, corpse->GetCleanName());
 
 		return;
 	}
@@ -4935,14 +5020,14 @@ void Client::Handle_OP_CorpseDrag(const EQApplicationPacket *app)
 
 	DraggedCorpses.push_back(std::pair<std::string, uint16>(cds->CorpseName, corpse->GetID()));
 
-	Message_StringID(MT_DefaultText, CORPSEDRAG_BEGIN, cds->CorpseName);
+	MessageString(Chat::DefaultText, CORPSEDRAG_BEGIN, cds->CorpseName);
 }
 
 void Client::Handle_OP_CorpseDrop(const EQApplicationPacket *app)
 {
 	if (app->size == 1)
 	{
-		Message_StringID(MT_DefaultText, CORPSEDRAG_STOPALL);
+		MessageString(Chat::DefaultText, CORPSEDRAG_STOPALL);
 		ClearDraggedCorpses();
 		return;
 	}
@@ -4951,7 +5036,7 @@ void Client::Handle_OP_CorpseDrop(const EQApplicationPacket *app)
 	{
 		if (!strcasecmp(Iterator->first.c_str(), (const char *)app->pBuffer))
 		{
-			Message_StringID(MT_DefaultText, CORPSEDRAG_STOP);
+			MessageString(Chat::DefaultText, CORPSEDRAG_STOP);
 			Iterator = DraggedCorpses.erase(Iterator);
 			return;
 		}
@@ -4966,7 +5051,7 @@ void Client::Handle_OP_CrashDump(const EQApplicationPacket *app)
 void Client::Handle_OP_CreateObject(const EQApplicationPacket *app)
 {
 	if (LogSys.log_settings[Logs::Inventory].is_category_enabled)
-		Log(Logs::Detail, Logs::Inventory, "Handle_OP_CreateObject() [psize: %u] %s", app->size, DumpPacketToString(app).c_str());
+		LogInventory("Handle_OP_CreateObject() [psize: [{}]] [{}]", app->size, DumpPacketToString(app).c_str());
 
 	DropItem(EQEmu::invslot::slotCursor);
 	return;
@@ -5034,8 +5119,7 @@ void Client::Handle_OP_CrystalReclaim(const EQApplicationPacket *app)
 void Client::Handle_OP_Damage(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(CombatDamage_Struct)) {
-		Log(Logs::General, Logs::Error, "Received invalid sized OP_Damage: got %d, expected %d", app->size,
-			sizeof(CombatDamage_Struct));
+		LogError("Received invalid sized OP_Damage: got [{}], expected [{}]", app->size, sizeof(CombatDamage_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -5072,8 +5156,7 @@ void Client::Handle_OP_DelegateAbility(const EQApplicationPacket *app)
 
 	if (app->size != sizeof(DelegateAbility_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_DelegateAbility expected %i got %i",
-			sizeof(DelegateAbility_Struct), app->size);
+		LogDebug("Size mismatch in OP_DelegateAbility expected [{}] got [{}]", sizeof(DelegateAbility_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -5123,7 +5206,7 @@ void Client::Handle_OP_DeleteItem(const EQApplicationPacket *app)
 	DeleteItem_Struct* alc = (DeleteItem_Struct*)app->pBuffer;
 	const EQEmu::ItemInstance *inst = GetInv().GetItem(alc->from_slot);
 	if (inst && inst->GetItem()->ItemType == EQEmu::item::ItemTypeAlcohol) {
-		entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), inst->GetItem()->Name);
+		entity_list.MessageCloseString(this, true, 50, 0, DRINKING_MESSAGE, GetName(), inst->GetItem()->Name);
 		CheckIncreaseSkill(EQEmu::skills::SkillAlcoholTolerance, nullptr, 25);
 
 		int16 AlcoholTolerance = GetSkill(EQEmu::skills::SkillAlcoholTolerance);
@@ -5175,14 +5258,14 @@ void Client::Handle_OP_Disarm(const EQApplicationPacket *app) {
 		return;
 
 	if (app->size != sizeof(Disarm_Struct)) {
-		Log(Logs::General, Logs::Skills, "Size mismatch for Disarm_Struct packet");
+		LogSkills("Size mismatch for Disarm_Struct packet");
 		return;
 	}
 
 	Disarm_Struct *disarm = (Disarm_Struct *)app->pBuffer;
 
 	if (!p_timers.Expired(&database, pTimerCombatAbility2, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -5255,7 +5338,7 @@ void Client::Handle_OP_Disarm(const EQApplicationPacket *app) {
 		return;
 	}
 	// Trying to disarm something we can't disarm
-	Message_StringID(MT_Skills, DISARM_NO_TARGET);
+	MessageString(Chat::Skills, DISARM_NO_TARGET);
 
 	return;
 }
@@ -5289,7 +5372,7 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app)
 		return;
 
 	if (!p_timers.Expired(&database, pTimerDisarmTraps, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -5313,14 +5396,14 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app)
 			if ((zone->random.Int(0, 49) + uskill) >= (zone->random.Int(0, 49) + trap->skill))
 			{
 				success = SKILLUP_SUCCESS;
-				Message_StringID(MT_Skills, DISARMED_TRAP);
+				MessageString(Chat::Skills, DISARMED_TRAP);
 				trap->disarmed = true;
 				Log(Logs::General, Logs::Traps, "Trap %d is disarmed.", trap->trap_id);
 				trap->UpdateTrap();
 			}
 			else
 			{
-				Message_StringID(MT_Skills, FAIL_DISARM_DETECTED_TRAP);
+				MessageString(Chat::Skills, FAIL_DISARM_DETECTED_TRAP);
 				if (zone->random.Int(0, 99) < 25) {
 					trap->Trigger(this);
 				}
@@ -5330,12 +5413,12 @@ void Client::Handle_OP_DisarmTraps(const EQApplicationPacket *app)
 		}
 		else
 		{
-			Message_StringID(MT_Skills, TRAP_TOO_FAR);
+			MessageString(Chat::Skills, TRAP_TOO_FAR);
 		}
 	}
 	else
 	{
-		Message_StringID(MT_Skills, LDON_SENSE_TRAP2);
+		MessageString(Chat::Skills, LDON_SENSE_TRAP2);
 	}
 
 	return;
@@ -5346,8 +5429,7 @@ void Client::Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket *app)
 
 	if (app->size != sizeof(DoGroupLeadershipAbility_Struct)) {
 
-		Log(Logs::General, Logs::None, "Size mismatch in OP_DoGroupLeadershipAbility expected %i got %i",
-			sizeof(DoGroupLeadershipAbility_Struct), app->size);
+		LogDebug("Size mismatch in OP_DoGroupLeadershipAbility expected [{}] got [{}]", sizeof(DoGroupLeadershipAbility_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -5398,8 +5480,7 @@ void Client::Handle_OP_DoGroupLeadershipAbility(const EQApplicationPacket *app)
 	}
 
 	default:
-		Log(Logs::General, Logs::None, "Got unhandled OP_DoGroupLeadershipAbility Ability: %d Parameter: %d",
-			dglas->Ability, dglas->Parameter);
+		LogDebug("Got unhandled OP_DoGroupLeadershipAbility Ability: [{}] Parameter: [{}]", dglas->Ability, dglas->Parameter);
 		break;
 	}
 }
@@ -5419,9 +5500,9 @@ void Client::Handle_OP_DuelResponse(const EQApplicationPacket *app)
 	initiator->CastToClient()->SetDuelTarget(0);
 	initiator->CastToClient()->SetDueling(false);
 	if (GetID() == initiator->GetID())
-		entity->CastToClient()->Message_StringID(10, DUEL_DECLINE, initiator->GetName());
+		entity->CastToClient()->MessageString(Chat::NPCQuestSay, DUEL_DECLINE, initiator->GetName());
 	else
-		initiator->CastToClient()->Message_StringID(10, DUEL_DECLINE, entity->GetName());
+		initiator->CastToClient()->MessageString(Chat::NPCQuestSay, DUEL_DECLINE, entity->GetName());
 	return;
 }
 
@@ -5480,9 +5561,7 @@ void Client::Handle_OP_Dye(const EQApplicationPacket *app)
 void Client::Handle_OP_Emote(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Emote_Struct)) {
-		Log(Logs::General, Logs::Error, "Received invalid sized "
-			"OP_Emote: got %d, expected %d", app->size,
-			sizeof(Emote_Struct));
+		LogError("Received invalid sized OP_Emote: got [{}], expected [{}]", app->size, sizeof(Emote_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -5544,7 +5623,7 @@ void Client::Handle_OP_EndLootRequest(const EQApplicationPacket *app)
 
 	Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer));
 	if (entity == 0) {
-		Message(13, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
+		Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
 		if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD)
 			Corpse::SendEndLootErrorPacket(this);
 		else
@@ -5552,7 +5631,7 @@ void Client::Handle_OP_EndLootRequest(const EQApplicationPacket *app)
 		return;
 	}
 	else if (!entity->IsCorpse()) {
-		Message(13, "Error: OP_EndLootRequest: Corpse not found (!entity->IsCorpse())");
+		Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (!entity->IsCorpse())");
 		Corpse::SendLootReqErrorPacket(this);
 		return;
 	}
@@ -5571,8 +5650,7 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
 	}
 
 	if (app->size != sizeof(EnvDamage2_Struct)) {
-		Log(Logs::General, Logs::Error, "Received invalid sized OP_EnvDamage: got %d, expected %d", app->size,
-			sizeof(EnvDamage2_Struct));
+		LogError("Received invalid sized OP_EnvDamage: got [{}], expected [{}]", app->size, sizeof(EnvDamage2_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -5591,12 +5669,12 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
 		damage = 31337;
 
 	if (admin >= minStatusToAvoidFalling && GetGM()) {
-		Message(13, "Your GM status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
+		Message(Chat::Red, "Your GM status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
 		SetHP(GetHP() - 1);//needed or else the client wont acknowledge
 		return;
 	}
 	else if (GetInvul()) {
-		Message(13, "Your invuln status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
+		Message(Chat::Red, "Your invuln status protects you from %i points of type %i environmental damage.", ed->damage, ed->dmgtype);
 		SetHP(GetHP() - 1);//needed or else the client wont acknowledge
 		return;
 	}
@@ -5625,7 +5703,7 @@ void Client::Handle_OP_EnvDamage(const EQApplicationPacket *app)
 void Client::Handle_OP_FaceChange(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(FaceChange_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for OP_FaceChange: Expected: %i, Got: %i",
+		LogError("Invalid size for OP_FaceChange: Expected: [{}], Got: [{}]",
 			sizeof(FaceChange_Struct), app->size);
 		return;
 	}
@@ -5645,8 +5723,8 @@ void Client::Handle_OP_FaceChange(const EQApplicationPacket *app)
 	m_pp.drakkin_tattoo = fc->drakkin_tattoo;
 	m_pp.drakkin_details = fc->drakkin_details;
 	Save();
-	Message_StringID(13, FACE_ACCEPTED);
-	//Message(13, "Facial features updated.");
+	MessageString(Chat::Red, FACE_ACCEPTED);
+	//Message(Chat::Red, "Facial features updated.");
 	return;
 }
 
@@ -5655,7 +5733,7 @@ void Client::Handle_OP_FeignDeath(const EQApplicationPacket *app)
 	if (GetClass() != MONK)
 		return;
 	if (!p_timers.Expired(&database, pTimerFeignDeath, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -5682,7 +5760,7 @@ void Client::Handle_OP_FeignDeath(const EQApplicationPacket *app)
 	uint16 totalfeign = primfeign + secfeign;
 	if (zone->random.Real(0, 160) > totalfeign) {
 		SetFeigned(false);
-		entity_list.MessageClose_StringID(this, false, 200, 10, STRING_FEIGNFAILED, GetName());
+		entity_list.MessageCloseString(this, false, 200, 10, STRING_FEIGNFAILED, GetName());
 	}
 	else {
 		SetFeigned(true);
@@ -5711,7 +5789,7 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app)
 	
 		if (!RuleB(Pathing, Find) && RuleB(Bazaar, EnableWarpToTrader) && target->IsClient() && (target->CastToClient()->Trader ||
 			target->CastToClient()->Buyer)) {
-			Message(15, "Moving you to Trader %s", target->GetName());
+			Message(Chat::Yellow, "Moving you to Trader %s", target->GetName());
 			MovePC(zone->GetZoneID(), zone->GetInstanceID(), target->GetX(), target->GetY(), target->GetZ(), 0.0f);
 		}
 	
@@ -5804,7 +5882,7 @@ void Client::Handle_OP_FindPersonRequest(const EQApplicationPacket *app)
 void Client::Handle_OP_Fishing(const EQApplicationPacket *app)
 {
 	if (!p_timers.Expired(&database, pTimerFishing, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -5824,7 +5902,7 @@ void Client::Handle_OP_Forage(const EQApplicationPacket *app)
 {
 
 	if (!p_timers.Expired(&database, pTimerForaging, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerForaging, ForagingReuseTime - 1);
@@ -5843,7 +5921,7 @@ void Client::Handle_OP_FriendsWho(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GetGuildMOTD(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GetGuildMOTD");
+	LogGuilds("Received OP_GetGuildMOTD");
 
 	SendGuildMOTD(true);
 
@@ -5856,7 +5934,7 @@ void Client::Handle_OP_GetGuildMOTD(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GetGuildsList(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GetGuildsList");
+	LogGuilds("Received OP_GetGuildsList");
 
 	SendGuildList();
 }
@@ -5864,12 +5942,12 @@ void Client::Handle_OP_GetGuildsList(const EQApplicationPacket *app)
 void Client::Handle_OP_GMBecomeNPC(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/becomenpc");
 		return;
 	}
 	if (app->size != sizeof(BecomeNPC_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GMBecomeNPC, size=%i, expected %i", app->size, sizeof(BecomeNPC_Struct));
+		LogError("Wrong size: OP_GMBecomeNPC, size=[{}], expected [{}]", app->size, sizeof(BecomeNPC_Struct));
 		return;
 	}
 	//entity_list.QueueClients(this, app, false);
@@ -5884,7 +5962,7 @@ void Client::Handle_OP_GMBecomeNPC(const EQApplicationPacket *app)
 	cli->SendAppearancePacket(AT_NPCName, 1, true);
 	cli->CastToClient()->SetBecomeNPC(true);
 	cli->CastToClient()->SetBecomeNPCLevel(bnpc->maxlevel);
-	cli->Message_StringID(0, TOGGLE_OFF);
+	cli->MessageString(Chat::White, TOGGLE_OFF);
 	cli->CastToClient()->tellsoff = true;
 	//TODO: Make this toggle a BecomeNPC flag so that it gets updated when people zone in as well; Make combat work with this.
 	return;
@@ -5895,7 +5973,7 @@ void Client::Handle_OP_GMDelCorpse(const EQApplicationPacket *app)
 	if (app->size != sizeof(GMDelCorpse_Struct))
 		return;
 	if (this->Admin() < commandEditPlayerCorpses) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/delcorpse");
 		return;
 	}
@@ -5909,19 +5987,19 @@ void Client::Handle_OP_GMDelCorpse(const EQApplicationPacket *app)
 	}
 	corpse->CastToCorpse()->Delete();
 	std::cout << name << " deleted corpse " << dc->corpsename << std::endl;
-	Message(13, "Corpse %s deleted.", dc->corpsename);
+	Message(Chat::Red, "Corpse %s deleted.", dc->corpsename);
 	return;
 }
 
 void Client::Handle_OP_GMEmoteZone(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/emote");
 		return;
 	}
 	if (app->size != sizeof(GMEmoteZone_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GMEmoteZone, size=%i, expected %i", app->size, sizeof(GMEmoteZone_Struct));
+		LogError("Wrong size: OP_GMEmoteZone, size=[{}], expected [{}]", app->size, sizeof(GMEmoteZone_Struct));
 		return;
 	}
 	GMEmoteZone_Struct* gmez = (GMEmoteZone_Struct*)app->pBuffer;
@@ -5938,7 +6016,7 @@ void Client::Handle_OP_GMEmoteZone(const EQApplicationPacket *app)
 void Client::Handle_OP_GMEndTraining(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GMTrainEnd_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_GMEndTraining expected %i got %i", sizeof(GMTrainEnd_Struct), app->size);
+		LogDebug("Size mismatch in OP_GMEndTraining expected [{}] got [{}]", sizeof(GMTrainEnd_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -5949,12 +6027,12 @@ void Client::Handle_OP_GMEndTraining(const EQApplicationPacket *app)
 void Client::Handle_OP_GMFind(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/find");
 		return;
 	}
 	if (app->size != sizeof(GMSummon_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GMFind, size=%i, expected %i", app->size, sizeof(GMSummon_Struct));
+		LogError("Wrong size: OP_GMFind, size=[{}], expected [{}]", app->size, sizeof(GMSummon_Struct));
 		return;
 	}
 	//Break down incoming
@@ -5987,7 +6065,7 @@ void Client::Handle_OP_GMGoto(const EQApplicationPacket *app)
 		return;
 	}
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/goto");
 		return;
 	}
@@ -6014,16 +6092,16 @@ void Client::Handle_OP_GMGoto(const EQApplicationPacket *app)
 void Client::Handle_OP_GMHideMe(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/hideme");
 		return;
 	}
 	if (app->size != sizeof(SpawnAppearance_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GMHideMe, size=%i, expected %i", app->size, sizeof(SpawnAppearance_Struct));
+		LogError("Wrong size: OP_GMHideMe, size=[{}], expected [{}]", app->size, sizeof(SpawnAppearance_Struct));
 		return;
 	}
 	SpawnAppearance_Struct* sa = (SpawnAppearance_Struct*)app->pBuffer;
-	Message(13, "#: %i, %i", sa->type, sa->parameter);
+	Message(Chat::Red, "#: %i, %i", sa->type, sa->parameter);
 	SetHideMe(!sa->parameter);
 	return;
 
@@ -6034,7 +6112,7 @@ void Client::Handle_OP_GMKick(const EQApplicationPacket *app)
 	if (app->size != sizeof(GMKick_Struct))
 		return;
 	if (this->Admin() < minStatusToKick) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/kick");
 		return;
 	}
@@ -6064,12 +6142,12 @@ void Client::Handle_OP_GMKick(const EQApplicationPacket *app)
 void Client::Handle_OP_GMKill(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/kill");
 		return;
 	}
 	if (app->size != sizeof(GMKill_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GMKill, size=%i, expected %i", app->size, sizeof(GMKill_Struct));
+		LogError("Wrong size: OP_GMKill, size=[{}], expected [{}]", app->size, sizeof(GMKill_Struct));
 		return;
 	}
 	GMKill_Struct* gmk = (GMKill_Struct *)app->pBuffer;
@@ -6107,16 +6185,16 @@ void Client::Handle_OP_GMLastName(const EQApplicationPacket *app)
 	}
 	GMLastName_Struct* gmln = (GMLastName_Struct*)app->pBuffer;
 	if (strlen(gmln->lastname) >= 64) {
-		Message(13, "/LastName: New last name too long. (max=63)");
+		Message(Chat::Red, "/LastName: New last name too long. (max=63)");
 	}
 	else {
 		Client* client = entity_list.GetClientByName(gmln->name);
 		if (client == 0) {
-			Message(13, "/LastName: %s not found", gmln->name);
+			Message(Chat::Red, "/LastName: %s not found", gmln->name);
 		}
 		else {
 			if (this->Admin() < minStatusToUseGMCommands) {
-				Message(13, "Your account has been reported for hacking.");
+				Message(Chat::Red, "Your account has been reported for hacking.");
 				database.SetHackerFlag(client->account_name, client->name, "/lastname");
 				return;
 			}
@@ -6136,28 +6214,28 @@ void Client::Handle_OP_GMLastName(const EQApplicationPacket *app)
 void Client::Handle_OP_GMNameChange(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GMName_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GMNameChange, size=%i, expected %i", app->size, sizeof(GMName_Struct));
+		LogError("Wrong size: OP_GMNameChange, size=[{}], expected [{}]", app->size, sizeof(GMName_Struct));
 		return;
 	}
 	const GMName_Struct* gmn = (const GMName_Struct *)app->pBuffer;
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/name");
 		return;
 	}
 	Client* client = entity_list.GetClientByName(gmn->oldname);
-	Log(Logs::General, Logs::Status, "GM(%s) changeing players name. Old:%s New:%s", GetName(), gmn->oldname, gmn->newname);
+	LogInfo("GM([{}]) changeing players name. Old:[{}] New:[{}]", GetName(), gmn->oldname, gmn->newname);
 	bool usedname = database.CheckUsedName((const char*)gmn->newname);
 	if (client == 0) {
-		Message(13, "%s not found for name change. Operation failed!", gmn->oldname);
+		Message(Chat::Red, "%s not found for name change. Operation failed!", gmn->oldname);
 		return;
 	}
 	if ((strlen(gmn->newname) > 63) || (strlen(gmn->newname) == 0)) {
-		Message(13, "Invalid number of characters in new name (%s).", gmn->newname);
+		Message(Chat::Red, "Invalid number of characters in new name (%s).", gmn->newname);
 		return;
 	}
 	if (!usedname) {
-		Message(13, "%s is already in use. Operation failed!", gmn->newname);
+		Message(Chat::Red, "%s is already in use. Operation failed!", gmn->newname);
 		return;
 
 	}
@@ -6188,8 +6266,7 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app)
 
 	if (app->size < sizeof(GMSearchCorpse_Struct))
 	{
-		Log(Logs::General, Logs::None, "OP_GMSearchCorpse size lower than expected: got %u expected at least %u",
-			app->size, sizeof(GMSearchCorpse_Struct));
+		LogDebug("OP_GMSearchCorpse size lower than expected: got [{}] expected at least [{}]", app->size, sizeof(GMSearchCorpse_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -6213,9 +6290,9 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app)
 		return;
 
 	if (results.RowCount() == maxResults)
-		Message(clientMessageError, "Your search found too many results; some are not displayed.");
+		Message(Chat::Red, "Your search found too many results; some are not displayed.");
 	else
-		Message(clientMessageYellow, "There are %i corpse(s) that match the search string '%s'.", results.RowCount(), gmscs->Name);
+		Message(Chat::Yellow, "There are %i corpse(s) that match the search string '%s'.", results.RowCount(), gmscs->Name);
 
 	char charName[64], time_of_death[20];
 
@@ -6242,7 +6319,7 @@ void Client::Handle_OP_GMSearchCorpse(const EQApplicationPacket *app)
 			corpseRezzed ? "Yes" : "No", corpseBuried ? "Yes" : "No");
 
 		if (popupText.size() > 4000) {
-			Message(clientMessageError, "Unable to display all the results.");
+			Message(Chat::Red, "Unable to display all the results.");
 			break;
 		}
 
@@ -6285,19 +6362,19 @@ void Client::Handle_OP_GMToggle(const EQApplicationPacket *app)
 		return;
 	}
 	if (this->Admin() < minStatusToUseGMCommands) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/toggle");
 		return;
 	}
 	GMToggle_Struct *ts = (GMToggle_Struct *)app->pBuffer;
 	if (ts->toggle == 0) {
-		this->Message_StringID(0, TOGGLE_OFF);
+		this->MessageString(Chat::White, TOGGLE_OFF);
 		//Message(0, "Turning tells OFF");
 		tellsoff = true;
 	}
 	else if (ts->toggle == 1) {
 		//Message(0, "Turning tells ON");
-		this->Message_StringID(0, TOGGLE_ON);
+		this->MessageString(Chat::White, TOGGLE_ON);
 		tellsoff = false;
 	}
 	else {
@@ -6310,7 +6387,7 @@ void Client::Handle_OP_GMToggle(const EQApplicationPacket *app)
 void Client::Handle_OP_GMTraining(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GMTrainee_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_GMTraining expected %i got %i", sizeof(GMTrainee_Struct), app->size);
+		LogDebug("Size mismatch in OP_GMTraining expected [{}] got [{}]", sizeof(GMTrainee_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -6321,7 +6398,7 @@ void Client::Handle_OP_GMTraining(const EQApplicationPacket *app)
 void Client::Handle_OP_GMTrainSkill(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GMSkillChange_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_GMTrainSkill expected %i got %i", sizeof(GMSkillChange_Struct), app->size);
+		LogDebug("Size mismatch in OP_GMTrainSkill expected [{}] got [{}]", sizeof(GMSkillChange_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -6336,7 +6413,7 @@ void Client::Handle_OP_GMZoneRequest(const EQApplicationPacket *app)
 		return;
 	}
 	if (this->Admin() < minStatusToBeGM) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/zone");
 		return;
 	}
@@ -6384,12 +6461,12 @@ void Client::Handle_OP_GMZoneRequest(const EQApplicationPacket *app)
 void Client::Handle_OP_GMZoneRequest2(const EQApplicationPacket *app)
 {
 	if (this->Admin() < minStatusToBeGM) {
-		Message(13, "Your account has been reported for hacking.");
+		Message(Chat::Red, "Your account has been reported for hacking.");
 		database.SetHackerFlag(this->account_name, this->name, "/zone");
 		return;
 	}
 	if (app->size < sizeof(uint32)) {
-		Log(Logs::General, Logs::Error, "OP size error: OP_GMZoneRequest2 expected:%i got:%i", sizeof(uint32), app->size);
+		LogError("OP size error: OP_GMZoneRequest2 expected:[{}] got:[{}]", sizeof(uint32), app->size);
 		return;
 	}
 
@@ -6406,7 +6483,7 @@ void Client::Handle_OP_GroupAcknowledge(const EQApplicationPacket *app)
 void Client::Handle_OP_GroupCancelInvite(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GroupCancel_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for OP_GroupCancelInvite: Expected: %i, Got: %i",
+		LogError("Invalid size for OP_GroupCancelInvite: Expected: [{}], Got: [{}]",
 			sizeof(GroupCancel_Struct), app->size);
 		return;
 	}
@@ -6450,12 +6527,12 @@ void Client::Handle_OP_GroupDelete(const EQApplicationPacket *app)
 void Client::Handle_OP_GroupDisband(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GroupGeneric_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for GroupGeneric_Struct: Expected: %i, Got: %i",
+		LogError("Invalid size for GroupGeneric_Struct: Expected: [{}], Got: [{}]",
 			sizeof(GroupGeneric_Struct), app->size);
 		return;
 	}
 
-	Log(Logs::General, Logs::None, "Member Disband Request from %s\n", GetName());
+	LogDebug("Member Disband Request from [{}]\n", GetName());
 
 	GroupGeneric_Struct* gd = (GroupGeneric_Struct*)app->pBuffer;
 
@@ -6611,7 +6688,7 @@ void Client::Handle_OP_GroupDisband(const EQApplicationPacket *app)
 		}
 		else
 		{
-			Log(Logs::General, Logs::Error, "Failed to remove player from group. Unable to find player named %s in player group", gd->name2);
+			LogError("Failed to remove player from group. Unable to find player named [{}] in player group", gd->name2);
 		}
 	}
 	if (LFP)
@@ -6631,7 +6708,7 @@ void Client::Handle_OP_GroupFollow(const EQApplicationPacket *app)
 void Client::Handle_OP_GroupFollow2(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GroupGeneric_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for OP_GroupFollow: Expected: %i, Got: %i",
+		LogError("Invalid size for OP_GroupFollow: Expected: [{}], Got: [{}]",
 			sizeof(GroupGeneric_Struct), app->size);
 		return;
 	}
@@ -6680,7 +6757,7 @@ void Client::Handle_OP_GroupInvite(const EQApplicationPacket *app)
 void Client::Handle_OP_GroupInvite2(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GroupInvite_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for OP_GroupInvite: Expected: %i, Got: %i",
+		LogError("Invalid size for OP_GroupInvite: Expected: [{}], Got: [{}]",
 			sizeof(GroupInvite_Struct), app->size);
 		return;
 	}
@@ -6691,7 +6768,7 @@ void Client::Handle_OP_GroupInvite2(const EQApplicationPacket *app)
 
 	if (Invitee == this)
 	{
-		Message_StringID(clientMessageWhite, GROUP_INVITEE_SELF);
+		MessageString(Chat::LightGray, GROUP_INVITEE_SELF);
 		return;
 	}
 
@@ -6750,7 +6827,7 @@ void Client::Handle_OP_GroupMakeLeader(const EQApplicationPacket *app)
 		if (g->IsLeader(this))
 			g->ChangeLeader(NewLeader);
 		else {
-			Log(Logs::General, Logs::None, "Group /makeleader request originated from non-leader member: %s", GetName());
+			LogDebug("Group /makeleader request originated from non-leader member: [{}]", GetName());
 			DumpPacket(app);
 		}
 	}
@@ -6759,7 +6836,7 @@ void Client::Handle_OP_GroupMakeLeader(const EQApplicationPacket *app)
 void Client::Handle_OP_GroupMentor(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GroupMentor_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GroupMentor, size=%i, expected %i", app->size, sizeof(GroupMentor_Struct));
+		LogError("Wrong size: OP_GroupMentor, size=[{}], expected [{}]", app->size, sizeof(GroupMentor_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -6795,7 +6872,7 @@ void Client::Handle_OP_GroupMentor(const EQApplicationPacket *app)
 void Client::Handle_OP_GroupRoles(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GroupRole_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GroupRoles, size=%i, expected %i", app->size, sizeof(GroupRole_Struct));
+		LogError("Wrong size: OP_GroupRoles, size=[{}], expected [{}]", app->size, sizeof(GroupRole_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -6841,8 +6918,7 @@ void Client::Handle_OP_GroupUpdate(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GroupUpdate_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch on OP_GroupUpdate: got %u expected %u",
-			app->size, sizeof(GroupUpdate_Struct));
+		LogDebug("Size mismatch on OP_GroupUpdate: got [{}] expected [{}]", app->size, sizeof(GroupUpdate_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -6860,7 +6936,7 @@ void Client::Handle_OP_GroupUpdate(const EQApplicationPacket *app)
 			if (group->IsLeader(this))
 				group->ChangeLeader(newleader);
 			else {
-				Log(Logs::General, Logs::None, "Group /makeleader request originated from non-leader member: %s", GetName());
+				LogDebug("Group /makeleader request originated from non-leader member: [{}]", GetName());
 				DumpPacket(app);
 			}
 		}
@@ -6869,7 +6945,7 @@ void Client::Handle_OP_GroupUpdate(const EQApplicationPacket *app)
 
 	default:
 	{
-		Log(Logs::General, Logs::None, "Received unhandled OP_GroupUpdate requesting action %u", gu->action);
+		LogDebug("Received unhandled OP_GroupUpdate requesting action [{}]", gu->action);
 		DumpPacket(app);
 		return;
 	}
@@ -6883,13 +6959,13 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 	if ((int)zone->GetZoneID() != RuleI(World, GuildBankZoneID))
 	{
-		Message(13, "The Guild Bank is not available in this zone.");
+		Message(Chat::Red, "The Guild Bank is not available in this zone.");
 
 		return;
 	}
 
 	if (app->size < sizeof(uint32)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_GuildBank, size=%i, expected %i", app->size, sizeof(uint32));
+		LogError("Wrong size: OP_GuildBank, size=[{}], expected [{}]", app->size, sizeof(uint32));
 		DumpPacket(app);
 		return;
 	}
@@ -6901,7 +6977,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 	if (!IsInAGuild())
 	{
-		Message(13, "You must be in a Guild to use the Guild Bank.");
+		Message(Chat::Red, "You must be in a Guild to use the Guild Bank.");
 
 		if (Action == GuildBankDeposit)
 			GuildBankDepositAck(true, sentAction);
@@ -6915,7 +6991,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	{
 		if ((Action != GuildBankDeposit) && (Action != GuildBankViewItem) && (Action != GuildBankWithdraw))
 		{
-			Log(Logs::General, Logs::Error, "Suspected hacking attempt on guild bank from %s", GetName());
+			LogError("Suspected hacking attempt on guild bank from [{}]", GetName());
 
 			GuildBankAck();
 
@@ -6929,7 +7005,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	{
 		if (GuildBanks->IsAreaFull(GuildID(), GuildBankMainArea))
 		{
-			Message_StringID(13, GUILD_BANK_FULL);
+			MessageString(Chat::Red, GUILD_BANK_FULL);
 
 			GuildBankDepositAck(true, sentAction);
 
@@ -6946,12 +7022,12 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 			if (inst)
 			{
-				Message_StringID(clientMessageWhite, GUILD_BANK_TRANSFERRED, inst->GetItem()->Name);
+				MessageString(Chat::LightGray, GUILD_BANK_TRANSFERRED, inst->GetItem()->Name);
 				safe_delete(inst);
 			}
 		}
 		else
-			Message(13, "Unexpected error while moving item into Guild Bank.");
+			Message(Chat::Red, "Unexpected error while moving item into Guild Bank.");
 
 		GuildBankAck();
 
@@ -6978,7 +7054,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	{
 		if (GuildBanks->IsAreaFull(GuildID(), GuildBankDepositArea))
 		{
-			Message_StringID(13, GUILD_BANK_FULL);
+			MessageString(Chat::Red, GUILD_BANK_FULL);
 
 			GuildBankDepositAck(true, sentAction);
 
@@ -6991,7 +7067,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 		if (!CursorItemInst)
 		{
-			Message(13, "No Item on the cursor.");
+			Message(Chat::Red, "No Item on the cursor.");
 
 			GuildBankDepositAck(true, sentAction);
 
@@ -7023,7 +7099,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 		if (!Allowed)
 		{
-			Message_StringID(13, GUILD_BANK_CANNOT_DEPOSIT);
+			MessageString(Chat::Red, GUILD_BANK_CANNOT_DEPOSIT);
 			GuildBankDepositAck(true, sentAction);
 
 			return;
@@ -7056,7 +7132,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	{
 		if (GetInv()[EQEmu::invslot::slotCursor])
 		{
-			Message_StringID(13, GUILD_BANK_EMPTY_HANDS);
+			MessageString(Chat::Red, GUILD_BANK_EMPTY_HANDS);
 
 			GuildBankAck();
 
@@ -7076,7 +7152,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 		if (!IsGuildBanker() && !GuildBanks->AllowedToWithdraw(GuildID(), gbwis->Area, gbwis->SlotID, GetName()))
 		{
-			Log(Logs::General, Logs::Error, "Suspected attempted hack on the guild bank from %s", GetName());
+			LogError("Suspected attempted hack on the guild bank from [{}]", GetName());
 
 			GuildBankAck();
 
@@ -7087,7 +7163,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 		if (CheckLoreConflict(inst->GetItem()))
 		{
-			Message_StringID(13, DUP_LORE);
+			MessageString(Chat::Red, DUP_LORE);
 
 			GuildBankAck();
 
@@ -7119,7 +7195,7 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 	case GuildBankSplitStacks:
 	{
 		if (GuildBanks->IsAreaFull(GuildID(), GuildBankMainArea))
-			Message_StringID(13, GUILD_BANK_FULL);
+			MessageString(Chat::Red, GUILD_BANK_FULL);
 		else
 		{
 			GuildBankWithdrawItem_Struct *gbwis = (GuildBankWithdrawItem_Struct*)app->pBuffer;
@@ -7145,9 +7221,9 @@ void Client::Handle_OP_GuildBank(const EQApplicationPacket *app)
 
 	default:
 	{
-		Message(13, "Unexpected GuildBank action.");
+		Message(Chat::Red, "Unexpected GuildBank action.");
 
-		Log(Logs::General, Logs::Error, "Received unexpected guild bank action code %i from %s", Action, GetName());
+		LogError("Received unexpected guild bank action code [{}] from [{}]", Action, GetName());
 	}
 	}
 }
@@ -7156,13 +7232,13 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 {
 	if (IsInAGuild())
 	{
-		Message(clientMessageError, "You are already in a guild!");
+		Message(Chat::Red, "You are already in a guild!");
 		return;
 	}
 
 	if (!RuleB(Guild, PlayerCreationAllowed))
 	{
-		Message(clientMessageError, "This feature is disabled on this server. Contact a GM or post on your server message boards to create a guild.");
+		Message(Chat::Red, "This feature is disabled on this server. Contact a GM or post on your server message boards to create a guild.");
 		return;
 	}
 
@@ -7170,7 +7246,7 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 		(GetLevel() < RuleI(Guild, PlayerCreationRequiredLevel)) ||
 		(database.GetTotalTimeEntitledOnAccount(AccountID()) < (unsigned int)RuleI(Guild, PlayerCreationRequiredTime)))
 	{
-		Message(clientMessageError, "Your status, level or time playing on this account are insufficient to use this feature.");
+		Message(Chat::Red, "Your status, level or time playing on this account are insufficient to use this feature.");
 		return;
 	}
 
@@ -7189,7 +7265,7 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 	if (strnlen(GuildName, 64) > 60)
 #endif // DARWIN
 	{
-		Message(clientMessageError, "Guild name too long.");
+		Message(Chat::Red, "Guild name too long.");
 		return;
 	}
 
@@ -7197,7 +7273,7 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 	{
 		if (!isalpha(GuildName[i]) && (GuildName[i] != ' '))
 		{
-			Message(clientMessageError, "Invalid character in Guild name.");
+			Message(Chat::Red, "Invalid character in Guild name.");
 			return;
 		}
 	}
@@ -7206,30 +7282,30 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 
 	if (GuildCount >= RuleI(Guild, PlayerCreationLimit))
 	{
-		Message(clientMessageError, "You cannot create this guild because this account may only be leader of %i guilds.", RuleI(Guild, PlayerCreationLimit));
+		Message(Chat::Red, "You cannot create this guild because this account may only be leader of %i guilds.", RuleI(Guild, PlayerCreationLimit));
 		return;
 	}
 
 	if (guild_mgr.GetGuildIDByName(GuildName) != GUILD_NONE)
 	{
-		Message_StringID(clientMessageError, GUILD_NAME_IN_USE);
+		MessageString(Chat::Red, GUILD_NAME_IN_USE);
 		return;
 	}
 
 	uint32 NewGuildID = guild_mgr.CreateGuild(GuildName, CharacterID());
 
-	Log(Logs::Detail, Logs::Guilds, "%s: Creating guild %s with leader %d via UF+ GUI. It was given id %lu.", GetName(),
+	LogGuilds("[{}]: Creating guild [{}] with leader [{}] via UF+ GUI. It was given id [{}]", GetName(),
 		GuildName, CharacterID(), (unsigned long)NewGuildID);
 
 	if (NewGuildID == GUILD_NONE)
-		Message(clientMessageError, "Guild creation failed.");
+		Message(Chat::Red, "Guild creation failed.");
 	else
 	{
 		if (!guild_mgr.SetGuild(CharacterID(), NewGuildID, GUILD_LEADER))
-			Message(clientMessageError, "Unable to set guild leader's guild in the database. Contact a GM.");
+			Message(Chat::Red, "Unable to set guild leader's guild in the database. Contact a GM.");
 		else
 		{
-			Message(clientMessageYellow, "You are now the leader of %s", GuildName);
+			Message(Chat::Yellow, "You are now the leader of %s", GuildName);
 
 			if (zone->GetZoneID() == RuleI(World, GuildBankZoneID) && GuildBanks)
 				GuildBanks->SendGuildBank(this);
@@ -7240,12 +7316,12 @@ void Client::Handle_OP_GuildCreate(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildDelete(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GuildDelete");
+	LogGuilds("Received OP_GuildDelete");
 
 	if (!IsInAGuild() || !guild_mgr.IsGuildLeader(GuildID(), CharacterID()))
 		Message(0, "You are not a guild leader or not in a guild.");
 	else {
-		Log(Logs::Detail, Logs::Guilds, "Deleting guild %s (%d)", guild_mgr.GetGuildName(GuildID()), GuildID());
+		LogGuilds("Deleting guild [{}] ([{}])", guild_mgr.GetGuildName(GuildID()), GuildID());
 		if (!guild_mgr.DeleteGuild(GuildID()))
 			Message(0, "Guild delete failed.");
 		else {
@@ -7256,10 +7332,10 @@ void Client::Handle_OP_GuildDelete(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildDemote(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GuildDemote");
+	LogGuilds("Received OP_GuildDemote");
 
 	if (app->size != sizeof(GuildDemoteStruct)) {
-		Log(Logs::Detail, Logs::Guilds, "Error: app size of %i != size of GuildDemoteStruct of %i\n", app->size, sizeof(GuildDemoteStruct));
+		LogGuilds("Error: app size of [{}] != size of GuildDemoteStruct of [{}]\n", app->size, sizeof(GuildDemoteStruct));
 		return;
 	}
 
@@ -7289,14 +7365,14 @@ void Client::Handle_OP_GuildDemote(const EQApplicationPacket *app)
 		uint8 rank = gci.rank - 1;
 
 
-		Log(Logs::Detail, Logs::Guilds, "Demoting %s (%d) from rank %s (%d) to %s (%d) in %s (%d)",
+		LogGuilds("Demoting [{}] ([{}]) from rank [{}] ([{}]) to [{}] ([{}]) in [{}] ([{}])",
 			demote->target, gci.char_id,
 			guild_mgr.GetRankName(GuildID(), gci.rank), gci.rank,
 			guild_mgr.GetRankName(GuildID(), rank), rank,
 			guild_mgr.GetGuildName(GuildID()), GuildID());
 
 		if (!guild_mgr.SetGuildRank(gci.char_id, rank)) {
-			Message(13, "Error while setting rank %d on '%s'.", rank, demote->target);
+			Message(Chat::Red, "Error while setting rank %d on '%s'.", rank, demote->target);
 			return;
 		}
 		Message(0, "Successfully demoted %s to rank %d", demote->target, rank);
@@ -7307,7 +7383,7 @@ void Client::Handle_OP_GuildDemote(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GuildInvite");
+	LogGuilds("Received OP_GuildInvite");
 
 	if (app->size != sizeof(GuildCommand_Struct)) {
 		std::cout << "Wrong size: OP_GuildInvite, size=" << app->size << ", expected " << sizeof(GuildCommand_Struct) << std::endl;
@@ -7319,7 +7395,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 	if (!IsInAGuild())
 		Message(0, "Error: You are not in a guild!");
 	else if (gc->officer > GUILD_MAX_RANK)
-		Message(13, "Invalid rank.");
+		Message(Chat::Red, "Invalid rank.");
 	else if (!worldserver.Connected())
 		Message(0, "Error: World server disconnected");
 	else {
@@ -7328,7 +7404,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 		Mob* invitee = entity_list.GetMob(gc->othername);
 
 		if (!invitee) {
-			Message(13, "Prospective guild member %s must be in zone to preform guild operations on them.", gc->othername);
+			Message(Chat::Red, "Prospective guild member %s must be in zone to preform guild operations on them.", gc->othername);
 			return;
 		}
 
@@ -7341,21 +7417,21 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 				if (gc->officer < client->GuildRank()) {
 					//demotion
 					if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_DEMOTE)) {
-						Message(13, "You dont have permission to demote.");
+						Message(Chat::Red, "You dont have permission to demote.");
 						return;
 					}
 
 					//we could send this to the member and prompt them to see if they want to
 					//be demoted (I guess), but I dont see a point in that.
 
-					Log(Logs::Detail, Logs::Guilds, "%s (%d) is demoting %s (%d) to rank %d in guild %s (%d)",
+					LogGuilds("[{}] ([{}]) is demoting [{}] ([{}]) to rank [{}] in guild [{}] ([{}])",
 						GetName(), CharacterID(),
 						client->GetName(), client->CharacterID(),
 						gc->officer,
 						guild_mgr.GetGuildName(GuildID()), GuildID());
 
 					if (!guild_mgr.SetGuildRank(client->CharacterID(), gc->officer)) {
-						Message(13, "There was an error during the demotion, DB may now be inconsistent.");
+						Message(Chat::Red, "There was an error during the demotion, DB may now be inconsistent.");
 						return;
 					}
 
@@ -7363,11 +7439,11 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 				else if (gc->officer > client->GuildRank()) {
 					//promotion
 					if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_PROMOTE)) {
-						Message(13, "You dont have permission to demote.");
+						Message(Chat::Red, "You dont have permission to demote.");
 						return;
 					}
 
-					Log(Logs::Detail, Logs::Guilds, "%s (%d) is asking to promote %s (%d) to rank %d in guild %s (%d)",
+					LogGuilds("[{}] ([{}]) is asking to promote [{}] ([{}]) to rank [{}] in guild [{}] ([{}])",
 						GetName(), CharacterID(),
 						client->GetName(), client->CharacterID(),
 						gc->officer,
@@ -7379,12 +7455,12 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 					if (gc->guildeqid == 0)
 						gc->guildeqid = GuildID();
 
-					Log(Logs::Detail, Logs::Guilds, "Sending OP_GuildInvite for promotion to %s, length %d", client->GetName(), app->size);
+					LogGuilds("Sending OP_GuildInvite for promotion to [{}], length [{}]", client->GetName(), app->size);
 					client->QueuePacket(app);
 
 				}
 				else {
-					Message(13, "That member is already that rank.");
+					Message(Chat::Red, "That member is already that rank.");
 					return;
 				}
 			}
@@ -7393,16 +7469,16 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 				//
 				if (client->GetPendingGuildInvitation())
 				{
-					Message(13, "That person is already considering a guild invitation.");
+					Message(Chat::Red, "That person is already considering a guild invitation.");
 					return;
 				}
 
 				if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_INVITE)) {
-					Message(13, "You dont have permission to invite.");
+					Message(Chat::Red, "You dont have permission to invite.");
 					return;
 				}
 
-				Log(Logs::Detail, Logs::Guilds, "Inviting %s (%d) into guild %s (%d)",
+				LogGuilds("Inviting [{}] ([{}]) into guild [{}] ([{}])",
 					client->GetName(), client->CharacterID(),
 					guild_mgr.GetGuildName(GuildID()), GuildID());
 
@@ -7422,14 +7498,14 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 					gc->officer = 8;
 				}
 
-				Log(Logs::Detail, Logs::Guilds, "Sending OP_GuildInvite for invite to %s, length %d", client->GetName(), app->size);
+				LogGuilds("Sending OP_GuildInvite for invite to [{}], length [{}]", client->GetName(), app->size);
 				client->SetPendingGuildInvitation(true);
 				client->QueuePacket(app);
 
 			}
 			else {
 				//they are in some other guild
-				Message(13, "Player is in a guild.");
+				Message(Chat::Red, "Player is in a guild.");
 				return;
 			}
 		}
@@ -7445,7 +7521,7 @@ void Client::Handle_OP_GuildInvite(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GuildInviteAccept");
+	LogGuilds("Received OP_GuildInviteAccept");
 
 	SetPendingGuildInvitation(false);
 
@@ -7483,7 +7559,7 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 	else if (!worldserver.Connected())
 		Message(0, "Error: World server disconnected");
 	else {
-		Log(Logs::Detail, Logs::Guilds, "Guild Invite Accept: guild %d, response %d, inviter %s, person %s",
+		LogGuilds("Guild Invite Accept: guild [{}], response [{}], inviter [{}], person [{}]",
 			gj->guildeqid, gj->response, gj->inviter, gj->newmember);
 
 		//ok, the invite is also used for changing rank as well.
@@ -7506,26 +7582,26 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 		//it has been authorized with the guild manager
 		if (!guild_mgr.VerifyAndClearInvite(CharacterID(), gj->guildeqid, guildrank)) {
 			worldserver.SendEmoteMessage(gj->inviter, 0, 0, "%s has sent an invalid response to your invite!", GetName());
-			Message(13, "Invalid invite response packet!");
+			Message(Chat::Red, "Invalid invite response packet!");
 			return;
 		}
 
 		if (gj->guildeqid == GuildID()) {
 			//only need to change rank.
 
-			Log(Logs::Detail, Logs::Guilds, "Changing guild rank of %s (%d) to rank %d in guild %s (%d)",
+			LogGuilds("Changing guild rank of [{}] ([{}]) to rank [{}] in guild [{}] ([{}])",
 				GetName(), CharacterID(),
 				gj->response,
 				guild_mgr.GetGuildName(GuildID()), GuildID());
 
 			if (!guild_mgr.SetGuildRank(CharacterID(), gj->response)) {
-				Message(13, "There was an error during the rank change, DB may now be inconsistent.");
+				Message(Chat::Red, "There was an error during the rank change, DB may now be inconsistent.");
 				return;
 			}
 		}
 		else {
 
-			Log(Logs::Detail, Logs::Guilds, "Adding %s (%d) to guild %s (%d) at rank %d",
+			LogGuilds("Adding [{}] ([{}]) to guild [{}] ([{}]) at rank [{}]",
 				GetName(), CharacterID(),
 				guild_mgr.GetGuildName(gj->guildeqid), gj->guildeqid,
 				gj->response);
@@ -7543,7 +7619,7 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 			}
 
 			if (!guild_mgr.SetGuild(CharacterID(), gj->guildeqid, guildrank)) {
-				Message(13, "There was an error during the invite, DB may now be inconsistent.");
+				Message(Chat::Red, "There was an error during the invite, DB may now be inconsistent.");
 				return;
 			}
 			if (zone->GetZoneID() == RuleI(World, GuildBankZoneID) && GuildBanks)
@@ -7554,10 +7630,10 @@ void Client::Handle_OP_GuildInviteAccept(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildLeader(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GuildLeader");
+	LogGuilds("Received OP_GuildLeader");
 
 	if (app->size < 2) {
-		Log(Logs::Detail, Logs::Guilds, "Invalid length %d on OP_GuildLeader", app->size);
+		LogGuilds("Invalid length [{}] on OP_GuildLeader", app->size);
 		return;
 	}
 
@@ -7576,13 +7652,13 @@ void Client::Handle_OP_GuildLeader(const EQApplicationPacket *app)
 		Client* newleader = entity_list.GetClientByName(gml->target);
 		if (newleader) {
 
-			Log(Logs::Detail, Logs::Guilds, "Transfering leadership of %s (%d) to %s (%d)",
+			LogGuilds("Transfering leadership of [{}] ([{}]) to [{}] ([{}])",
 				guild_mgr.GetGuildName(GuildID()), GuildID(),
 				newleader->GetName(), newleader->CharacterID());
 
 			if (guild_mgr.SetGuildLeader(GuildID(), newleader->CharacterID())) {
 				Message(0, "Successfully Transfered Leadership to %s.", gml->target);
-				newleader->Message(15, "%s has transfered the guild leadership into your hands.", GetName());
+				newleader->Message(Chat::Yellow, "%s has transfered the guild leadership into your hands.", GetName());
 			}
 			else
 				Message(0, "Could not change leadership at this time.");
@@ -7597,15 +7673,15 @@ void Client::Handle_OP_GuildLeader(const EQApplicationPacket *app)
 void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 {
 
-	Log(Logs::Detail, Logs::Guilds, "Got OP_GuildManageBanker of len %d", app->size);
+	LogGuilds("Got OP_GuildManageBanker of len [{}]", app->size);
 	if (app->size != sizeof(GuildManageBanker_Struct)) {
-		Log(Logs::Detail, Logs::Guilds, "Error: app size of %i != size of OP_GuildManageBanker of %i\n", app->size, sizeof(GuildManageBanker_Struct));
+		LogGuilds("Error: app size of [{}] != size of OP_GuildManageBanker of [{}]\n", app->size, sizeof(GuildManageBanker_Struct));
 		return;
 	}
 	GuildManageBanker_Struct* gmb = (GuildManageBanker_Struct*)app->pBuffer;
 
 	if (!IsInAGuild()) {
-		Message(13, "Your not in a guild!");
+		Message(Chat::Red, "Your not in a guild!");
 		return;
 	}
 
@@ -7626,7 +7702,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 
 	if ((IsCurrentlyABanker != NewBankerStatus) && !guild_mgr.IsGuildLeader(GuildID(), CharacterID()))
 	{
-		Message(13, "Only the guild leader can assign guild bankers!");
+		Message(Chat::Red, "Only the guild leader can assign guild bankers!");
 		return;
 	}
 
@@ -7636,7 +7712,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 
 		if (!IsAllowed)
 		{
-			Message(13, "You are not allowed to change the alt status of %s", gmb->member);
+			Message(Chat::Red, "You are not allowed to change the alt status of %s", gmb->member);
 			return;
 		}
 	}
@@ -7649,7 +7725,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 	if (IsCurrentlyABanker != NewBankerStatus)
 	{
 		if (!guild_mgr.SetBankerFlag(gci.char_id, NewBankerStatus)) {
-			Message(13, "Error setting guild banker flag.");
+			Message(Chat::Red, "Error setting guild banker flag.");
 			return;
 		}
 
@@ -7661,7 +7737,7 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 	if (IsCurrentlyAnAlt != NewAltStatus)
 	{
 		if (!guild_mgr.SetAltFlag(gci.char_id, NewAltStatus)) {
-			Message(13, "Error setting guild alt flag.");
+			Message(Chat::Red, "Error setting guild alt flag.");
 			return;
 		}
 
@@ -7674,16 +7750,16 @@ void Client::Handle_OP_GuildManageBanker(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildPeace(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Got OP_GuildPeace of len %d", app->size);
+	LogGuilds("Got OP_GuildPeace of len [{}]", app->size);
 	return;
 }
 
 void Client::Handle_OP_GuildPromote(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GuildPromote");
+	LogGuilds("Received OP_GuildPromote");
 
 	if (app->size != sizeof(GuildPromoteStruct)) {
-		Log(Logs::Detail, Logs::Guilds, "Error: app size of %i != size of GuildDemoteStruct of %i\n", app->size, sizeof(GuildPromoteStruct));
+		LogGuilds("Error: app size of [{}] != size of GuildDemoteStruct of [{}]\n", app->size, sizeof(GuildPromoteStruct));
 		return;
 	}
 
@@ -7715,14 +7791,14 @@ void Client::Handle_OP_GuildPromote(const EQApplicationPacket *app)
 		}
 
 
-		Log(Logs::Detail, Logs::Guilds, "Promoting %s (%d) from rank %s (%d) to %s (%d) in %s (%d)",
+		LogGuilds("Promoting [{}] ([{}]) from rank [{}] ([{}]) to [{}] ([{}]) in [{}] ([{}])",
 			promote->target, gci.char_id,
 			guild_mgr.GetRankName(GuildID(), gci.rank), gci.rank,
 			guild_mgr.GetRankName(GuildID(), rank), rank,
 			guild_mgr.GetGuildName(GuildID()), GuildID());
 
 		if (!guild_mgr.SetGuildRank(gci.char_id, rank)) {
-			Message(13, "Error while setting rank %d on '%s'.", rank, promote->target);
+			Message(Chat::Red, "Error while setting rank %d on '%s'.", rank, promote->target);
 			return;
 		}
 		Message(0, "Successfully promoted %s to rank %d", promote->target, rank);
@@ -7732,7 +7808,7 @@ void Client::Handle_OP_GuildPromote(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildPublicNote(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GuildPublicNote");
+	LogGuilds("Received OP_GuildPublicNote");
 
 	if (app->size < sizeof(GuildUpdate_PublicNote)) {
 		// client calls for a motd on login even if they arent in a guild
@@ -7751,13 +7827,13 @@ void Client::Handle_OP_GuildPublicNote(const EQApplicationPacket *app)
 		return;
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Setting public note on %s (%d) in guild %s (%d) to: %s",
+	LogGuilds("Setting public note on [{}] ([{}]) in guild [{}] ([{}]) to: [{}]",
 		gpn->target, gci.char_id,
 		guild_mgr.GetGuildName(GuildID()), GuildID(),
 		gpn->note);
 
 	if (!guild_mgr.SetPublicNote(gci.char_id, gpn->note)) {
-		Message(13, "Failed to set public note on %s", gpn->target);
+		Message(Chat::Red, "Failed to set public note on %s", gpn->target);
 	}
 	else {
 		Message(0, "Successfully changed public note on %s", gpn->target);
@@ -7768,7 +7844,7 @@ void Client::Handle_OP_GuildPublicNote(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildRemove(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_GuildRemove");
+	LogGuilds("Received OP_GuildRemove");
 
 	if (app->size != sizeof(GuildCommand_Struct)) {
 		std::cout << "Wrong size: OP_GuildRemove, size=" << app->size << ", expected " << sizeof(GuildCommand_Struct) << std::endl;
@@ -7798,7 +7874,7 @@ void Client::Handle_OP_GuildRemove(const EQApplicationPacket *app)
 			}
 			char_id = client->CharacterID();
 
-			Log(Logs::Detail, Logs::Guilds, "Removing %s (%d) from guild %s (%d)",
+			LogGuilds("Removing [{}] ([{}]) from guild [{}] ([{}])",
 				client->GetName(), client->CharacterID(),
 				guild_mgr.GetGuildName(GuildID()), GuildID());
 		}
@@ -7814,7 +7890,7 @@ void Client::Handle_OP_GuildRemove(const EQApplicationPacket *app)
 			}
 			char_id = gci.char_id;
 
-			Log(Logs::Detail, Logs::Guilds, "Removing remote/offline %s (%d) into guild %s (%d)",
+			LogGuilds("Removing remote/offline [{}] ([{}]) into guild [{}] ([{}])",
 				gci.char_name.c_str(), gci.char_id,
 				guild_mgr.GetGuildName(GuildID()), GuildID());
 		}
@@ -7839,8 +7915,7 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GuildStatus_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_GuildStatus expected %i got %i",
-			sizeof(GuildStatus_Struct), app->size);
+		LogDebug("Size mismatch in OP_GuildStatus expected [{}] got [{}]", sizeof(GuildStatus_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -7852,7 +7927,7 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app)
 
 	if (!c)
 	{
-		Message_StringID(clientMessageWhite, TARGET_PLAYER_FOR_GUILD_STATUS);
+		MessageString(Chat::LightGray, TARGET_PLAYER_FOR_GUILD_STATUS);
 		return;
 	}
 
@@ -7860,7 +7935,7 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app)
 
 	if (TargetGuildID == GUILD_NONE)
 	{
-		Message_StringID(clientMessageWhite, NOT_IN_A_GUILD, c->GetName());
+		MessageString(Chat::LightGray, NOT_IN_A_GUILD, c->GetName());
 		return;
 	}
 
@@ -7875,29 +7950,28 @@ void Client::Handle_OP_GuildStatus(const EQApplicationPacket *app)
 	if ((TargetGuildID == GuildID()) && (c != this))
 	{
 		if (IsLeader)
-			Message_StringID(clientMessageWhite, LEADER_OF_YOUR_GUILD, c->GetName());
+			MessageString(Chat::LightGray, LEADER_OF_YOUR_GUILD, c->GetName());
 		else if (IsOfficer)
-			Message_StringID(clientMessageWhite, OFFICER_OF_YOUR_GUILD, c->GetName());
+			MessageString(Chat::LightGray, OFFICER_OF_YOUR_GUILD, c->GetName());
 		else
-			Message_StringID(clientMessageWhite, MEMBER_OF_YOUR_GUILD, c->GetName());
+			MessageString(Chat::LightGray, MEMBER_OF_YOUR_GUILD, c->GetName());
 
 		return;
 	}
 
 	if (IsLeader)
-		Message_StringID(clientMessageWhite, LEADER_OF_X_GUILD, c->GetName(), GuildName);
+		MessageString(Chat::LightGray, LEADER_OF_X_GUILD, c->GetName(), GuildName);
 	else if (IsOfficer)
-		Message_StringID(clientMessageWhite, OFFICER_OF_X_GUILD, c->GetName(), GuildName);
+		MessageString(Chat::LightGray, OFFICER_OF_X_GUILD, c->GetName(), GuildName);
 	else
-		Message_StringID(clientMessageWhite, MEMBER_OF_X_GUILD, c->GetName(), GuildName);
+		MessageString(Chat::LightGray, MEMBER_OF_X_GUILD, c->GetName(), GuildName);
 }
 
 void Client::Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(GuildUpdateURLAndChannel_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_GuildUpdateURLAndChannel expected %i got %i",
-			sizeof(GuildUpdateURLAndChannel_Struct), app->size);
+		LogDebug("Size mismatch in OP_GuildUpdateURLAndChannel expected [{}] got [{}]", sizeof(GuildUpdateURLAndChannel_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -7911,7 +7985,7 @@ void Client::Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app)
 
 	if (!guild_mgr.IsGuildLeader(GuildID(), CharacterID()))
 	{
-		Message(13, "Only the guild leader can change the Channel or URL.!");
+		Message(Chat::Red, "Only the guild leader can change the Channel or URL.!");
 		return;
 	}
 
@@ -7924,7 +7998,7 @@ void Client::Handle_OP_GuildUpdateURLAndChannel(const EQApplicationPacket *app)
 
 void Client::Handle_OP_GuildWar(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Got OP_GuildWar of len %d", app->size);
+	LogGuilds("Got OP_GuildWar of len [{}]", app->size);
 	return;
 }
 
@@ -7939,7 +8013,7 @@ void Client::Handle_OP_Hide(const EQApplicationPacket *app)
 	if (app->size == 4) {
 		auto data = app->ReadUInt32(0);
 		if (data)
-			Log(Logs::Detail, Logs::None, "Got OP_Hide with unexpected data %d", data);
+			LogDebug("Got OP_Hide with unexpected data [{}]", data);
 		return;
 	}
 
@@ -7950,7 +8024,7 @@ void Client::Handle_OP_Hide(const EQApplicationPacket *app)
 	}
 
 	if (!p_timers.Expired(&database, pTimerHide, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	int reuse = HideReuseTime - GetSkillReuseTime(EQEmu::skills::SkillHide);
@@ -8013,8 +8087,7 @@ void Client::Handle_OP_HideCorpse(const EQApplicationPacket *app)
 	//
 	if (app->size != sizeof(HideCorpse_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_HideCorpse expected %i got %i",
-			sizeof(HideCorpse_Struct), app->size);
+		LogDebug("Size mismatch in OP_HideCorpse expected [{}] got [{}]", sizeof(HideCorpse_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -8042,8 +8115,7 @@ void Client::Handle_OP_Ignore(const EQApplicationPacket *app)
 void Client::Handle_OP_Illusion(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Illusion_Struct)) {
-		Log(Logs::General, Logs::Error, "Received invalid sized OP_Illusion: got %d, expected %d", app->size,
-			sizeof(Illusion_Struct));
+		LogError("Received invalid sized OP_Illusion: got [{}], expected [{}]", app->size, sizeof(Illusion_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -8072,7 +8144,7 @@ void Client::Handle_OP_InspectAnswer(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(InspectResponse_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_InspectAnswer, size=%i, expected %i", app->size, sizeof(InspectResponse_Struct));
+		LogError("Wrong size: OP_InspectAnswer, size=[{}], expected [{}]", app->size, sizeof(InspectResponse_Struct));
 		return;
 	}
 
@@ -8117,7 +8189,7 @@ void Client::Handle_OP_InspectMessageUpdate(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(InspectMessage_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_InspectMessageUpdate, size=%i, expected %i", app->size, sizeof(InspectMessage_Struct));
+		LogError("Wrong size: OP_InspectMessageUpdate, size=[{}], expected [{}]", app->size, sizeof(InspectMessage_Struct));
 		return;
 	}
 
@@ -8131,7 +8203,7 @@ void Client::Handle_OP_InspectRequest(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(Inspect_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_InspectRequest, size=%i, expected %i", app->size, sizeof(Inspect_Struct));
+		LogError("Wrong size: OP_InspectRequest, size=[{}], expected [{}]", app->size, sizeof(Inspect_Struct));
 		return;
 	}
 
@@ -8156,7 +8228,7 @@ void Client::Handle_OP_InstillDoubt(const EQApplicationPacket *app)
 	//packet is empty as of 12/14/04
 
 	if (!p_timers.Expired(&database, pTimerInstillDoubt, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerInstillDoubt, InstillDoubtReuseTime - 1);
@@ -8168,7 +8240,7 @@ void Client::Handle_OP_InstillDoubt(const EQApplicationPacket *app)
 void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ItemViewRequest_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size on OP_ItemLinkClick. Got: %i, Expected: %i", app->size,
+		LogError("Wrong size on OP_ItemLinkClick. Got: [{}], Expected: [{}]", app->size,
 			sizeof(ItemViewRequest_Struct));
 		DumpPacket(app);
 		return;
@@ -8182,7 +8254,7 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 	const EQEmu::ItemData *item = database.GetItem(ivrs->item_id);
 	if (!item) {
 		if (ivrs->item_id != SAYLINK_ITEM_ID) {
-			Message(13, "Error: The item for the link you have clicked on does not exist!");
+			Message(Chat::Red, "Error: The item for the link you have clicked on does not exist!");
 			return;
 		}
 		// This new scheme will shuttle the ID in the first augment for non-silent links
@@ -8195,12 +8267,12 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 			std::string query = StringFormat("SELECT `phrase` FROM saylink WHERE `id` = '%i'", sayid);
 			auto results = database.QueryDatabase(query);
 			if (!results.Success()) {
-				Message(13, "Error: The saylink (%s) was not found in the database.", response.c_str());
+				Message(Chat::Red, "Error: The saylink (%s) was not found in the database.", response.c_str());
 				return;
 			}
 
 			if (results.RowCount() != 1) {
-				Message(13, "Error: The saylink (%s) was not found in the database.", response.c_str());
+				Message(Chat::Red, "Error: The saylink (%s) was not found in the database.", response.c_str());
 				return;
 			}
 
@@ -8216,27 +8288,48 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 			if (GetTarget() && GetTarget()->IsNPC()) {
 				if (silentsaylink) {
 					parse->EventNPC(EVENT_SAY, GetTarget()->CastToNPC(), this, response.c_str(), 0);
-					parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0);
+
+					if (response[0] == '#' && parse->PlayerHasQuestSub(EVENT_COMMAND)) {
+						parse->EventPlayer(EVENT_COMMAND, this, response.c_str(), 0);
+					}
+#ifdef BOTS
+					else if (response[0] == '^' && parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) {
+						parse->EventPlayer(EVENT_BOT_COMMAND, this, response.c_str(), 0);
+					}
+#endif
+					else {
+						parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0);
+					}
 				}
 				else {
-					Message(7, "You say, '%s'", response.c_str());
+					Message(Chat::LightGray, "You say, '%s'", response.c_str());
 					ChannelMessageReceived(8, 0, 100, response.c_str());
 				}
 				return;
 			}
 			else {
 				if (silentsaylink) {
-					parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0);
+					if (response[0] == '#' && parse->PlayerHasQuestSub(EVENT_COMMAND)) {
+						parse->EventPlayer(EVENT_COMMAND, this, response.c_str(), 0);
+					}
+#ifdef BOTS
+					else if (response[0] == '^' && parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) {
+						parse->EventPlayer(EVENT_BOT_COMMAND, this, response.c_str(), 0);
+					}
+#endif
+					else {
+						parse->EventPlayer(EVENT_SAY, this, response.c_str(), 0);
+					}
 				}
 				else {
-					Message(7, "You say, '%s'", response.c_str());
+					Message(Chat::LightGray, "You say, '%s'", response.c_str());
 					ChannelMessageReceived(8, 0, 100, response.c_str());
 				}
 				return;
 			}
 		}
 		else {
-			Message(13, "Error: Say Link not found or is too long.");
+			Message(Chat::Red, "Error: Say Link not found or is too long.");
 			return;
 		}
 	}
@@ -8254,7 +8347,7 @@ void Client::Handle_OP_ItemLinkClick(const EQApplicationPacket *app)
 void Client::Handle_OP_ItemLinkResponse(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(LDONItemViewRequest_Struct)) {
-		Log(Logs::General, Logs::Error, "OP size error: OP_ItemLinkResponse expected:%i got:%i", sizeof(LDONItemViewRequest_Struct), app->size);
+		LogError("OP size error: OP_ItemLinkResponse expected:[{}] got:[{}]", sizeof(LDONItemViewRequest_Struct), app->size);
 		return;
 	}
 	LDONItemViewRequest_Struct* item = (LDONItemViewRequest_Struct*)app->pBuffer;
@@ -8269,7 +8362,7 @@ void Client::Handle_OP_ItemLinkResponse(const EQApplicationPacket *app)
 void Client::Handle_OP_ItemName(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ItemNamePacket_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for ItemNamePacket_Struct: Expected: %i, Got: %i",
+		LogError("Invalid size for ItemNamePacket_Struct: Expected: [{}], Got: [{}]",
 			sizeof(ItemNamePacket_Struct), app->size);
 		return;
 	}
@@ -8469,7 +8562,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 	using EQEmu::spells::CastingSlot;
 	if (app->size != sizeof(ItemVerifyRequest_Struct))
 	{
-		Log(Logs::General, Logs::Error, "OP size error: OP_ItemVerifyRequest expected:%i got:%i", sizeof(ItemVerifyRequest_Struct), app->size);
+		LogError("OP size error: OP_ItemVerifyRequest expected:[{}] got:[{}]", sizeof(ItemVerifyRequest_Struct), app->size);
 		return;
 	}
 
@@ -8492,12 +8585,12 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 
 
 	if (IsAIControlled()) {
-		this->Message_StringID(13, NOT_IN_CONTROL);
+		this->MessageString(Chat::Red, NOT_IN_CONTROL);
 		return;
 	}
 
 	if (slot_id < 0) {
-		Log(Logs::General, Logs::None, "Unknown slot being used by %s, slot being used is: %i", GetName(), request->slot);
+		LogDebug("Unknown slot being used by [{}], slot being used is: [{}]", GetName(), request->slot);
 		return;
 	}
 
@@ -8545,7 +8638,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 	if (spell_id > 0 && (spells[spell_id].targettype == ST_Pet || spells[spell_id].targettype == ST_SummonedPet))
 		target_id = GetPetID();
 
-	Log(Logs::General, Logs::None, "OP ItemVerifyRequest: spell=%i, target=%i, inv=%i", spell_id, target_id, slot_id);
+	LogDebug("OP ItemVerifyRequest: spell=[{}], target=[{}], inv=[{}]", spell_id, target_id, slot_id);
 
 	if (m_inv.SupportsClickCasting(slot_id) || ((item->ItemType == EQEmu::item::ItemTypePotion || item->PotionBelt) && m_inv.SupportsPotionBeltCasting(slot_id))) // sanity check
 	{
@@ -8583,7 +8676,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 
 		if ((spell_id <= 0) && (item->ItemType != EQEmu::item::ItemTypeFood && item->ItemType != EQEmu::item::ItemTypeDrink && item->ItemType != EQEmu::item::ItemTypeAlcohol && item->ItemType != EQEmu::item::ItemTypeSpell))
 		{
-			Log(Logs::General, Logs::None, "Item with no effect right clicked by %s", GetName());
+			LogDebug("Item with no effect right clicked by [{}]", GetName());
 		}
 		else if (inst->IsClassCommon())
 		{
@@ -8601,7 +8694,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				if (inst->GetCharges() == 0)
 				{
 					//Message(0, "This item is out of charges.");
-					Message_StringID(13, ITEM_OUT_OF_CHARGES);
+					MessageString(Chat::Red, ITEM_OUT_OF_CHARGES);
 					return;
 				}
 				if (GetLevel() >= item->Click.Level2)
@@ -8621,7 +8714,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				}
 				else
 				{
-					Message_StringID(13, ITEMS_INSUFFICIENT_LEVEL);
+					MessageString(Chat::Red, ITEMS_INSUFFICIENT_LEVEL);
 					return;
 				}
 			}
@@ -8630,7 +8723,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				if (clickaug->GetCharges() == 0)
 				{
 					//Message(0, "This item is out of charges.");
-					Message_StringID(13, ITEM_OUT_OF_CHARGES);
+					MessageString(Chat::Red, ITEM_OUT_OF_CHARGES);
 					return;
 				}
 				if (GetLevel() >= augitem->Click.Level2)
@@ -8650,7 +8743,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				}
 				else
 				{
-					Message_StringID(13, ITEMS_INSUFFICIENT_LEVEL);
+					MessageString(Chat::Red, ITEMS_INSUFFICIENT_LEVEL);
 					return;
 				}
 			}
@@ -8660,7 +8753,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				{
 					if (item->ItemType != EQEmu::item::ItemTypeFood && item->ItemType != EQEmu::item::ItemTypeDrink && item->ItemType != EQEmu::item::ItemTypeAlcohol)
 					{
-						Log(Logs::General, Logs::None, "Error: unknown item->Click.Type (%i)", item->Click.Type);
+						LogDebug("Error: unknown item->Click.Type ([{}])", item->Click.Type);
 					}
 					else
 					{
@@ -8678,11 +8771,11 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 						else if (item->ItemType == EQEmu::item::ItemTypeAlcohol)
 						{
 #if EQDEBUG >= 1
-							Log(Logs::General, Logs::None, "Drinking Alcohol from slot:%i", slot_id);
+							LogDebug("Drinking Alcohol from slot:[{}]", slot_id);
 #endif
 							// This Seems to be handled in OP_DeleteItem handling
 							//DeleteItemInInventory(slot_id, 1, false);
-							//entity_list.MessageClose_StringID(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
+							//entity_list.MessageCloseString(this, true, 50, 0, DRINKING_MESSAGE, GetName(), item->Name);
 							//Should add intoxication level to the PP at some point
 							//CheckIncreaseSkill(ALCOHOL_TOLERANCE, nullptr, 25);
 						}
@@ -8707,7 +8800,7 @@ void Client::Handle_OP_ItemVerifyRequest(const EQApplicationPacket *app)
 				}
 				else
 				{
-					Log(Logs::General, Logs::None, "Error: unknown item->Click.Type (%i)", item->Click.Type);
+					LogDebug("Error: unknown item->Click.Type ([{}])", item->Click.Type);
 				}
 			}
 		}
@@ -8784,13 +8877,13 @@ void Client::Handle_OP_LDoNDisarmTraps(const EQApplicationPacket *app)
 		{
 			if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				Message(13, "%s is too far away.", target->GetCleanName());
+				Message(Chat::Red, "%s is too far away.", target->GetCleanName());
 				return;
 			}
 			HandleLDoNDisarm(target->CastToNPC(), GetSkill(EQEmu::skills::SkillDisarmTraps), LDoNTypeMechanical);
 		}
 		else
-			Message(13, "You do not have the disarm trap skill.");
+			Message(Chat::Red, "You do not have the disarm trap skill.");
 	}
 }
 
@@ -8798,7 +8891,7 @@ void Client::Handle_OP_LDoNInspect(const EQApplicationPacket *app)
 {
 	Mob * target = GetTarget();
 	if (target && target->GetClass() == LDON_TREASURE)
-		Message(15, "%s", target->GetCleanName());
+		Message(Chat::Yellow, "%s", target->GetCleanName());
 }
 
 void Client::Handle_OP_LDoNOpen(const EQApplicationPacket *app)
@@ -8817,13 +8910,13 @@ void Client::Handle_OP_LDoNPickLock(const EQApplicationPacket *app)
 		{
 			if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				Message(13, "%s is too far away.", target->GetCleanName());
+				Message(Chat::Red, "%s is too far away.", target->GetCleanName());
 				return;
 			}
 			HandleLDoNPickLock(target->CastToNPC(), GetSkill(EQEmu::skills::SkillPickLock), LDoNTypeMechanical);
 		}
 		else
-			Message(13, "You do not have the pick locks skill.");
+			Message(Chat::Red, "You do not have the pick locks skill.");
 	}
 }
 
@@ -8836,20 +8929,20 @@ void Client::Handle_OP_LDoNSenseTraps(const EQApplicationPacket *app)
 		{
 			if (DistanceSquaredNoZ(m_Position, target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				Message(13, "%s is too far away.", target->GetCleanName());
+				Message(Chat::Red, "%s is too far away.", target->GetCleanName());
 				return;
 			}
 			HandleLDoNSenseTraps(target->CastToNPC(), GetSkill(EQEmu::skills::SkillSenseTraps), LDoNTypeMechanical);
 		}
 		else
-			Message(13, "You do not have the sense traps skill.");
+			Message(Chat::Red, "You do not have the sense traps skill.");
 	}
 }
 
 void Client::Handle_OP_LeadershipExpToggle(const EQApplicationPacket *app)
 {
 	if (app->size != 1) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_LeadershipExpToggle expected %i got %i", 1, app->size);
+		LogDebug("Size mismatch in OP_LeadershipExpToggle expected [{}] got [{}]", 1, app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -8857,12 +8950,12 @@ void Client::Handle_OP_LeadershipExpToggle(const EQApplicationPacket *app)
 	if (*mode) {
 		m_pp.leadAAActive = 1;
 		Save();
-		Message_StringID(clientMessageYellow, LEADERSHIP_EXP_ON);
+		MessageString(Chat::Yellow, LEADERSHIP_EXP_ON);
 	}
 	else {
 		m_pp.leadAAActive = 0;
 		Save();
-		Message_StringID(clientMessageYellow, LEADERSHIP_EXP_OFF);
+		MessageString(Chat::Yellow, LEADERSHIP_EXP_OFF);
 	}
 }
 
@@ -8879,10 +8972,13 @@ void Client::Handle_OP_LeaveBoat(const EQApplicationPacket *app)
 {
 	Mob* boat = entity_list.GetMob(this->controlling_boat_id);	// find the mob corresponding to the boat id
 	if (boat) {
-		if ((boat->GetTarget() == this) && boat->GetHateAmount(this) == 0)	// if the client somehow left while still controlling the boat (and the boat isn't attacking them)
-			boat->SetTarget(0);			// fix it to stop later problems
+		if ((boat->GetTarget() == this) && boat->GetHateAmount(this) == 0) { // if the client somehow left while still controlling the boat (and the boat isn't attacking them)
+			boat->SetTarget(nullptr); // fix it to stop later problems
+		}
 	}
+
 	this->controlling_boat_id = 0;
+
 	return;
 }
 
@@ -8936,7 +9032,7 @@ void Client::Handle_OP_LFGGetMatchesRequest(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(LFGGetMatchesRequest_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_LFGGetMatchesRequest, size=%i, expected %i", app->size, sizeof(LFGGetMatchesRequest_Struct));
+		LogError("Wrong size: OP_LFGGetMatchesRequest, size=[{}], expected [{}]", app->size, sizeof(LFGGetMatchesRequest_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -9098,7 +9194,7 @@ void Client::Handle_OP_LFPCommand(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(LFP_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_LFPCommand, size=%i, expected %i", app->size, sizeof(LFP_Struct));
+		LogError("Wrong size: OP_LFPCommand, size=[{}], expected [{}]", app->size, sizeof(LFP_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -9135,7 +9231,7 @@ void Client::Handle_OP_LFPCommand(const EQApplicationPacket *app)
 		// This should not happen. The client checks if you are in a group and will not let you put LFP on if
 		// you are not the leader.
 		if (!g->IsLeader(this)) {
-			Log(Logs::General, Logs::Error, "Client sent LFP on for character %s who is grouped but not leader.", GetName());
+			LogError("Client sent LFP on for character [{}] who is grouped but not leader", GetName());
 			return;
 		}
 		// Fill the LFPMembers array with the rest of the group members, excluding ourself
@@ -9160,7 +9256,7 @@ void Client::Handle_OP_LFPGetMatchesRequest(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(LFPGetMatchesRequest_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_LFPGetMatchesRequest, size=%i, expected %i", app->size, sizeof(LFPGetMatchesRequest_Struct));
+		LogError("Wrong size: OP_LFPGetMatchesRequest, size=[{}], expected [{}]", app->size, sizeof(LFPGetMatchesRequest_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -9200,7 +9296,7 @@ void Client::Handle_OP_LoadSpellSet(const EQApplicationPacket *app)
 
 void Client::Handle_OP_Logout(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::None, "%s sent a logout packet.", GetName());
+	LogDebug("[{}] sent a logout packet", GetName());
 
 	SendLogoutPackets();
 
@@ -9214,14 +9310,14 @@ void Client::Handle_OP_Logout(const EQApplicationPacket *app)
 void Client::Handle_OP_LootItem(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(LootingItem_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_LootItem, size=%i, expected %i", app->size, sizeof(LootingItem_Struct));
+		LogError("Wrong size: OP_LootItem, size=[{}], expected [{}]", app->size, sizeof(LootingItem_Struct));
 		return;
 	}
 
 	EQApplicationPacket* outapp = nullptr;
 	Entity* entity = entity_list.GetID(*((uint16*)app->pBuffer));
 	if (entity == 0) {
-		Message(13, "Error: OP_LootItem: Corpse not found (ent = 0)");
+		Message(Chat::Red, "Error: OP_LootItem: Corpse not found (ent = 0)");
 		outapp = new EQApplicationPacket(OP_LootComplete, 0);
 		QueuePacket(outapp);
 		safe_delete(outapp);
@@ -9233,7 +9329,7 @@ void Client::Handle_OP_LootItem(const EQApplicationPacket *app)
 		return;
 	}
 	else {
-		Message(13, "Error: Corpse not found! (!ent->IsCorpse())");
+		Message(Chat::Red, "Error: Corpse not found! (!ent->IsCorpse())");
 		Corpse::SendEndLootErrorPacket(this);
 	}
 
@@ -9249,7 +9345,7 @@ void Client::Handle_OP_LootRequest(const EQApplicationPacket *app)
 
 	Entity* ent = entity_list.GetID(*((uint32*)app->pBuffer));
 	if (ent == 0) {
-		Message(13, "Error: OP_LootRequest: Corpse not found (ent = 0)");
+		Message(Chat::Red, "Error: OP_LootRequest: Corpse not found (ent = 0)");
 		Corpse::SendLootReqErrorPacket(this);
 		return;
 	}
@@ -9262,7 +9358,7 @@ void Client::Handle_OP_LootRequest(const EQApplicationPacket *app)
 	}
 	else {
 		std::cout << "npc == 0 LOOTING FOOKED3" << std::endl;
-		Message(13, "Error: OP_LootRequest: Corpse not a corpse?");
+		Message(Chat::Red, "Error: OP_LootRequest: Corpse not a corpse?");
 		Corpse::SendLootReqErrorPacket(this);
 	}
 	return;
@@ -9314,7 +9410,7 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app)
 		return;
 
 	if (!p_timers.Expired(&database, pTimerMend, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerMend, MendReuseTime - 1);
@@ -9327,11 +9423,11 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app)
 
 		if (zone->random.Int(0, 99) < criticalchance) {
 			mendhp *= 2;
-			Message_StringID(4, MEND_CRITICAL);
+			MessageString(Chat::LightBlue, MEND_CRITICAL);
 		}
 		SetHP(GetHP() + mendhp);
 		SendHPUpdate();
-		Message_StringID(4, MEND_SUCCESS);
+		MessageString(Chat::LightBlue, MEND_SUCCESS);
 	}
 	else {
 		/* the purpose of the following is to make the chance to worsen wounds much less common,
@@ -9344,10 +9440,10 @@ void Client::Handle_OP_Mend(const EQApplicationPacket *app)
 		{
 			SetHP(currenthp > mendhp ? (GetHP() - mendhp) : 1);
 			SendHPUpdate();
-			Message_StringID(4, MEND_WORSEN);
+			MessageString(Chat::LightBlue, MEND_WORSEN);
 		}
 		else
-			Message_StringID(4, MEND_FAIL);
+			MessageString(Chat::LightBlue, MEND_FAIL);
 	}
 
 	CheckIncreaseSkill(EQEmu::skills::SkillMend, nullptr, 10);
@@ -9358,8 +9454,8 @@ void Client::Handle_OP_MercenaryCommand(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(MercenaryCommand_Struct))
 	{
-		Message(13, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size);
-		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenaryCommand expected %i got %i", sizeof(MercenaryCommand_Struct), app->size);
+		LogDebug("Size mismatch in OP_MercenaryCommand expected [{}] got [{}]", sizeof(MercenaryCommand_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -9414,7 +9510,7 @@ void Client::Handle_OP_MercenaryDataRequest(const EQApplicationPacket *app)
 	// The payload is 4 bytes. The EntityID of the Mercenary Liason which are of class 71.
 	if (app->size != sizeof(MercenaryMerchantShopRequest_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryDataRequest expected 4 got %i", app->size);
+		LogDebug("Size mismatch in OP_MercenaryDataRequest expected 4 got [{}]", app->size);
 
 		DumpPacket(app);
 
@@ -9545,8 +9641,8 @@ void Client::Handle_OP_MercenaryDataUpdateRequest(const EQApplicationPacket *app
 	// The payload is 0 bytes.
 	if (app->size != 0)
 	{
-		Message(13, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size);
-		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got %i", app->size);
+		LogDebug("Size mismatch in OP_MercenaryDataUpdateRequest expected 0 got [{}]", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -9564,8 +9660,8 @@ void Client::Handle_OP_MercenaryDismiss(const EQApplicationPacket *app)
 	// The payload is 0 or 1 bytes.
 	if (app->size > 1)
 	{
-		Message(13, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size);
-		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenaryDismiss expected 0 got %i", app->size);
+		LogDebug("Size mismatch in OP_MercenaryDismiss expected 0 got [{}]", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -9589,7 +9685,7 @@ void Client::Handle_OP_MercenaryHire(const EQApplicationPacket *app)
 	// The payload is 16 bytes. First four bytes are the Merc ID (Template ID)
 	if (app->size != sizeof(MercenaryMerchantRequest_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryHire expected %i got %i", sizeof(MercenaryMerchantRequest_Struct), app->size);
+		LogDebug("Size mismatch in OP_MercenaryHire expected [{}] got [{}]", sizeof(MercenaryMerchantRequest_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -9659,8 +9755,8 @@ void Client::Handle_OP_MercenarySuspendRequest(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(SuspendMercenary_Struct))
 	{
-		Message(13, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size);
-		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenarySuspendRequest expected %i got %i", sizeof(SuspendMercenary_Struct), app->size);
+		LogDebug("Size mismatch in OP_MercenarySuspendRequest expected [{}] got [{}]", sizeof(SuspendMercenary_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -9682,8 +9778,8 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
 	// The payload is 0 bytes.
 	if (app->size > 1)
 	{
-		Message(13, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size);
-		Log(Logs::General, Logs::None, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size);
+		Message(Chat::Red, "Size mismatch in OP_MercenaryTimerRequest expected 0 got %i", app->size);
+		LogDebug("Size mismatch in OP_MercenaryTimerRequest expected 0 got [{}]", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -9720,7 +9816,7 @@ void Client::Handle_OP_MercenaryTimerRequest(const EQApplicationPacket *app)
 void Client::Handle_OP_MoveCoin(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(MoveCoin_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size on OP_MoveCoin. Got: %i, Expected: %i", app->size, sizeof(MoveCoin_Struct));
+		LogError("Wrong size on OP_MoveCoin. Got: [{}], Expected: [{}]", app->size, sizeof(MoveCoin_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -9736,7 +9832,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 	}
 
 	if (app->size != sizeof(MoveItem_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_MoveItem, size=%i, expected %i", app->size, sizeof(MoveItem_Struct));
+		LogError("Wrong size: OP_MoveItem, size=[{}], expected [{}]", app->size, sizeof(MoveItem_Struct));
 		return;
 	}
 
@@ -9756,7 +9852,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 				casting_spell_id);
 			database.SetMQDetectionFlag(AccountName(), GetName(), detect, zone->GetShortName());
 			safe_delete_array(detect);
-			Kick(); // Kick client to prevent client and server from getting out-of-sync inventory slots
+			Kick("Inventory desync"); // Kick client to prevent client and server from getting out-of-sync inventory slots
 			return;
 		}
 	}
@@ -9784,7 +9880,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 		}
 	}
 
-	if (mi_hack) { Message(15, "Caution: Illegal use of inaccessible bag slots!"); }
+	if (mi_hack) { Message(Chat::Yellow, "Caution: Illegal use of inaccessible bag slots!"); }
 
 	if (!SwapItem(mi) && IsValidSlot(mi->from_slot) && IsValidSlot(mi->to_slot)) {
 		SwapItemResync(mi);
@@ -9800,7 +9896,7 @@ void Client::Handle_OP_MoveItem(const EQApplicationPacket *app)
 
 void Client::Handle_OP_MoveMultipleItems(const EQApplicationPacket *app)
 {
-	Kick(); // TODO: lets not desync though
+	Kick("Unimplemented move multiple items"); // TODO: lets not desync though
 }
 
 void Client::Handle_OP_OpenContainer(const EQApplicationPacket *app)
@@ -9824,7 +9920,7 @@ void Client::Handle_OP_OpenContainer(const EQApplicationPacket *app)
 
 void Client::Handle_OP_OpenGuildTributeMaster(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Tribute, "Received OP_OpenGuildTributeMaster of length %d", app->size);
+	LogTribute("Received OP_OpenGuildTributeMaster of length [{}]", app->size);
 
 	if (app->size != sizeof(StartTribute_Struct))
 		printf("Error in OP_OpenGuildTributeMaster. Expected size of: %zu, but got: %i\n", sizeof(StartTribute_Struct), app->size);
@@ -9855,7 +9951,7 @@ void Client::Handle_OP_OpenInventory(const EQApplicationPacket *app)
 
 void Client::Handle_OP_OpenTributeMaster(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Tribute, "Received OP_OpenTributeMaster of length %d", app->size);
+	LogTribute("Received OP_OpenTributeMaster of length [{}]", app->size);
 
 	if (app->size != sizeof(StartTribute_Struct))
 		printf("Error in OP_OpenTributeMaster. Expected size of: %zu, but got: %i\n", sizeof(StartTribute_Struct), app->size);
@@ -9881,20 +9977,20 @@ void Client::Handle_OP_OpenTributeMaster(const EQApplicationPacket *app)
 void Client::Handle_OP_PDeletePetition(const EQApplicationPacket *app)
 {
 	if (app->size < 2) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_PDeletePetition, size=%i, expected %i", app->size, 2);
+		LogError("Wrong size: OP_PDeletePetition, size=[{}], expected [{}]", app->size, 2);
 		return;
 	}
 	if (petition_list.DeletePetitionByCharName((char*)app->pBuffer))
-		Message_StringID(0, PETITION_DELETED);
+		MessageString(Chat::White, PETITION_DELETED);
 	else
-		Message_StringID(0, PETITION_NO_DELETE);
+		MessageString(Chat::White, PETITION_NO_DELETE);
 	return;
 }
 
 void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(PetCommand_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_PetCommands, size=%i, expected %i", app->size, sizeof(PetCommand_Struct));
+		LogError("Wrong size: OP_PetCommands, size=[{}], expected [{}]", app->size, sizeof(PetCommand_Struct));
 		return;
 	}
 	char val1[20] = { 0 };
@@ -9908,11 +10004,11 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (target) {
 				auto owner = target->GetOwner();
 				if (owner)
-					target->Say_StringID(PET_LEADERIS, owner->GetCleanName());
+					target->SayString(PET_LEADERIS, owner->GetCleanName());
 				else
-					target->Say_StringID(I_FOLLOW_NOONE);
+					target->SayString(I_FOLLOW_NOONE);
 			} else if (mypet) {
-				mypet->Say_StringID(PET_LEADERIS, GetName());
+				mypet->SayString(PET_LEADERIS, GetName());
 			}
 		}
 
@@ -9944,14 +10040,14 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (!target)
 			break;
 		if (target->IsMezzed()) {
-			Message_StringID(10, CANNOT_WAKE, mypet->GetCleanName(), target->GetCleanName());
+			MessageString(Chat::NPCQuestSay, CANNOT_WAKE, mypet->GetCleanName(), target->GetCleanName());
 			break;
 		}
 		if (mypet->IsFeared())
 			break; //prevent pet from attacking stuff while feared
 
 		if (!mypet->IsAttackAllowed(target)) {
-			mypet->SayTo_StringID(this, NOT_LEGAL_TARGET);
+			mypet->SayString(this, NOT_LEGAL_TARGET);
 			break;
 		}
 
@@ -9982,7 +10078,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 						hate += mypet->GetHateAmount(top) - mypet->GetHateAmount(target) + 100; // should be enough to cause target change
 				}
 				mypet->AddToHateList(target, hate, 0, true, false, false, SPELL_UNKNOWN, true);
-				Message_StringID(MT_PetResponse, PET_ATTACKING, mypet->GetCleanName(), target->GetCleanName());
+				MessageString(Chat::PetResponse, PET_ATTACKING, mypet->GetCleanName(), target->GetCleanName());
 				SetTarget(target);
 			}
 		}
@@ -9995,12 +10091,12 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (!GetTarget())
 			break;
 		if (GetTarget()->IsMezzed()) {
-			Message_StringID(10, CANNOT_WAKE, mypet->GetCleanName(), GetTarget()->GetCleanName());
+			MessageString(Chat::NPCQuestSay, CANNOT_WAKE, mypet->GetCleanName(), GetTarget()->GetCleanName());
 			break;
 		}
 
 		if (!mypet->IsAttackAllowed(GetTarget())) {
-			mypet->SayTo_StringID(this, NOT_LEGAL_TARGET);
+			mypet->SayString(this, NOT_LEGAL_TARGET);
 			break;
 		}
 
@@ -10016,7 +10112,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 				}
 				zone->AddAggroMob();
 				mypet->AddToHateList(GetTarget(), 1, 0, true, false, false, SPELL_UNKNOWN, true);
-				Message_StringID(MT_PetResponse, PET_ATTACKING, mypet->GetCleanName(), GetTarget()->GetCleanName());
+				MessageString(Chat::PetResponse, PET_ATTACKING, mypet->GetCleanName(), GetTarget()->GetCleanName());
 			}
 		}
 		break;
@@ -10025,7 +10121,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //keeps pet running while feared
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_CALMING);
+			mypet->SayString(this, Chat::PetResponse, PET_CALMING);
 			mypet->WipeHateList();
 			mypet->SetTarget(nullptr);
 			if (mypet->IsPetStop()) {
@@ -10037,7 +10133,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	}
 	case PET_HEALTHREPORT: {
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			Message_StringID(MT_PetResponse, PET_REPORT_HP, ConvertArrayF(mypet->GetHPRatio(), val1));
+			MessageString(Chat::PetResponse, PET_REPORT_HP, ConvertArrayF(mypet->GetHPRatio(), val1));
 			mypet->ShowBuffList(this);
 		}
 		break;
@@ -10056,13 +10152,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			SetPet(nullptr);
 		}
 
-		mypet->SayTo_StringID(this, MT_PetResponse, PET_GETLOST_STRING);
+		mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
 		mypet->CastToNPC()->Depop();
 
 		//Oddly, the client (Titanium) will still allow "/pet get lost" command despite me adding the code below. If someone can figure that out, you can uncomment this code and use it.
 		/*
 		if((mypet->GetPetType() == petAnimation && GetAA(aaAnimationEmpathy) >= 2) || mypet->GetPetType() != petAnimation) {
-		mypet->Say_StringID(PET_GETLOST_STRING);
+		mypet->SayString(PET_GETLOST_STRING);
 		mypet->CastToNPC()->Depop();
 		}
 		*/
@@ -10074,7 +10170,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
 			if (mypet->IsNPC()) {
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_GUARDINGLIFE);
+				mypet->SayString(this, Chat::PetResponse, PET_GUARDINGLIFE);
 				mypet->SetPetOrder(SPO_Guard);
 				mypet->CastToNPC()->SaveGuardSpot(mypet->GetPosition());
 				if (!mypet->GetTarget()) // want them to not twitch if they're chasing something down
@@ -10091,7 +10187,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_FOLLOWING);
+			mypet->SayString(this, Chat::PetResponse, PET_FOLLOWING);
 			mypet->SetPetOrder(SPO_Follow);
 			mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
 			if (mypet->IsPetStop()) {
@@ -10105,12 +10201,12 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
 			if (mypet->CastToNPC()->IsTaunting())
 			{
-				Message_StringID(MT_PetResponse, PET_NO_TAUNT);
+				MessageString(Chat::PetResponse, PET_NO_TAUNT);
 				mypet->CastToNPC()->SetTaunting(false);
 			}
 			else
 			{
-				Message_StringID(MT_PetResponse, PET_DO_TAUNT);
+				MessageString(Chat::PetResponse, PET_DO_TAUNT);
 				mypet->CastToNPC()->SetTaunting(true);
 			}
 		}
@@ -10118,14 +10214,14 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	}
 	case PET_TAUNT_ON: {
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			Message_StringID(MT_PetResponse, PET_DO_TAUNT);
+			MessageString(Chat::PetResponse, PET_DO_TAUNT);
 			mypet->CastToNPC()->SetTaunting(true);
 		}
 		break;
 	}
 	case PET_TAUNT_OFF: {
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			Message_StringID(MT_PetResponse, PET_NO_TAUNT);
+			MessageString(Chat::PetResponse, PET_NO_TAUNT);
 			mypet->CastToNPC()->SetTaunting(false);
 		}
 		break;
@@ -10134,7 +10230,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_GUARDME_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_GUARDME_STRING);
 			mypet->SetPetOrder(SPO_Follow);
 			mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
 			if (mypet->IsPetStop()) {
@@ -10150,13 +10246,13 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
 			if (mypet->GetPetOrder() == SPO_Sit)
 			{
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_SIT_STRING);
+				mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
 				mypet->SetPetOrder(SPO_Follow);
 				mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
 			}
 			else
 			{
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_SIT_STRING);
+				mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
 				mypet->SetPetOrder(SPO_Sit);
 				mypet->SetRunAnimSpeed(0);
 				if (!mypet->UseBardSpellLogic())	//maybe we can have a bard pet
@@ -10170,7 +10266,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_SIT_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
 			mypet->SetPetOrder(SPO_Follow);
 			mypet->SendAppearancePacket(AT_Anim, ANIM_STAND);
 		}
@@ -10180,7 +10276,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (mypet->IsFeared()) break; //could be exploited like PET_BACKOFF
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_SIT_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_SIT_STRING);
 			mypet->SetPetOrder(SPO_Sit);
 			mypet->SetRunAnimSpeed(0);
 			if (!mypet->UseBardSpellLogic())	//maybe we can have a bard pet
@@ -10194,18 +10290,18 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsHeld())
 			{
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_HOLD_SET_OFF);
+					MessageString(Chat::PetResponse, PET_HOLD_SET_OFF);
 				mypet->SetHeld(false);
 			}
 			else
 			{
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_HOLD_SET_ON);
+					MessageString(Chat::PetResponse, PET_HOLD_SET_ON);
 
 				if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
-					mypet->SayTo_StringID(this, MT_PetResponse, PET_NOW_HOLDING);
+					mypet->SayString(this, Chat::PetResponse, PET_NOW_HOLDING);
 				else
-					mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_HOLD);
+					mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
 
 				mypet->SetHeld(true);
 			}
@@ -10217,12 +10313,12 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	case PET_HOLD_ON: {
 		if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && !mypet->IsHeld()) {
 			if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-				Message_StringID(MT_PetResponse, PET_HOLD_SET_ON);
+				MessageString(Chat::PetResponse, PET_HOLD_SET_ON);
 
 			if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_NOW_HOLDING);
+				mypet->SayString(this, Chat::PetResponse, PET_NOW_HOLDING);
 			else
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_HOLD);
+				mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
 			mypet->SetHeld(true);
 			mypet->SetGHeld(false);
 			SetPetCommandState(PET_BUTTON_GHOLD, 0);
@@ -10232,7 +10328,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	case PET_HOLD_OFF: {
 		if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsHeld()) {
 			if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-				Message_StringID(MT_PetResponse, PET_HOLD_SET_OFF);
+				MessageString(Chat::PetResponse, PET_HOLD_SET_OFF);
 			mypet->SetHeld(false);
 		}
 		break;
@@ -10242,16 +10338,16 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsGHeld())
 			{
 				if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
-					Message_StringID(MT_PetResponse, PET_OFF_GHOLD);
+					MessageString(Chat::PetResponse, PET_OFF_GHOLD);
 				mypet->SetGHeld(false);
 			}
 			else
 			{
 				if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) {
-					Message_StringID(MT_PetResponse, PET_ON_GHOLD);
-					mypet->SayTo_StringID(this, MT_PetResponse, PET_GHOLD_ON_MSG);
+					MessageString(Chat::PetResponse, PET_ON_GHOLD);
+					mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG);
 				} else {
-					mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_HOLD);
+					mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
 				}
 				mypet->SetGHeld(true);
 			}
@@ -10263,10 +10359,10 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	case PET_GHOLD_ON: {
 		if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC()) {
 			if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater) {
-				Message_StringID(MT_PetResponse, PET_ON_GHOLD);
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_GHOLD_ON_MSG);
+				MessageString(Chat::PetResponse, PET_ON_GHOLD);
+				mypet->SayString(this, Chat::PetResponse, PET_GHOLD_ON_MSG);
 			} else {
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_HOLD);
+				mypet->SayString(this, Chat::PetResponse, PET_ON_HOLD);
 			}
 			mypet->SetGHeld(true);
 			mypet->SetHeld(false);
@@ -10277,7 +10373,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 	case PET_GHOLD_OFF: {
 		if (aabonuses.PetCommands[PetCommand] && mypet->IsNPC() && mypet->IsGHeld()) {
 			if (m_ClientVersionBit & EQEmu::versions::maskUFAndLater)
-				Message_StringID(MT_PetResponse, PET_OFF_GHOLD);
+				MessageString(Chat::PetResponse, PET_OFF_GHOLD);
 			mypet->SetGHeld(false);
 		}
 		break;
@@ -10287,15 +10383,15 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (mypet->IsNoCast()) {
-				Message_StringID(MT_PetResponse, PET_CASTING);
+				MessageString(Chat::PetResponse, PET_CASTING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_OFF);
+					MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_OFF);
 				mypet->SetNoCast(false);
 			}
 			else {
-				Message_StringID(MT_PetResponse, PET_NOT_CASTING);
+				MessageString(Chat::PetResponse, PET_NOT_CASTING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_ON);
+					MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_ON);
 				mypet->SetNoCast(true);
 			}
 		}
@@ -10306,9 +10402,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (!mypet->IsNoCast()) {
-				Message_StringID(MT_PetResponse, PET_NOT_CASTING);
+				MessageString(Chat::PetResponse, PET_NOT_CASTING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_ON);
+					MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_ON);
 				mypet->SetNoCast(true);
 			}
 		}
@@ -10319,9 +10415,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (mypet->IsNoCast()) {
-				Message_StringID(MT_PetResponse, PET_CASTING);
+				MessageString(Chat::PetResponse, PET_CASTING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_SPELLHOLD_SET_OFF);
+					MessageString(Chat::PetResponse, PET_SPELLHOLD_SET_OFF);
 				mypet->SetNoCast(false);
 			}
 		}
@@ -10332,15 +10428,15 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (mypet->IsFocused()) {
-				Message_StringID(MT_PetResponse, PET_NOT_FOCUSING);
+				MessageString(Chat::PetResponse, PET_NOT_FOCUSING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_FOCUS_SET_OFF);
+					MessageString(Chat::PetResponse, PET_FOCUS_SET_OFF);
 				mypet->SetFocused(false);
 			}
 			else {
-				Message_StringID(MT_PetResponse, PET_NOW_FOCUSING);
+				MessageString(Chat::PetResponse, PET_NOW_FOCUSING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_FOCUS_SET_ON);
+					MessageString(Chat::PetResponse, PET_FOCUS_SET_ON);
 				mypet->SetFocused(true);
 			}
 		}
@@ -10351,9 +10447,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (!mypet->IsFocused()) {
-				Message_StringID(MT_PetResponse, PET_NOW_FOCUSING);
+				MessageString(Chat::PetResponse, PET_NOW_FOCUSING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_FOCUS_SET_ON);
+					MessageString(Chat::PetResponse, PET_FOCUS_SET_ON);
 				mypet->SetFocused(true);
 			}
 		}
@@ -10364,9 +10460,9 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			if (mypet->IsFeared())
 				break;
 			if (mypet->IsFocused()) {
-				Message_StringID(MT_PetResponse, PET_NOT_FOCUSING);
+				MessageString(Chat::PetResponse, PET_NOT_FOCUSING);
 				if (m_ClientVersionBit & EQEmu::versions::maskSoDAndLater)
-					Message_StringID(MT_PetResponse, PET_FOCUS_SET_OFF);
+					MessageString(Chat::PetResponse, PET_FOCUS_SET_OFF);
 				mypet->SetFocused(false);
 			}
 		}
@@ -10387,7 +10483,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 					SetPetCommandState(PET_BUTTON_REGROUP, 0);
 				}
 			}
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_GETLOST_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
 		}
 		break;
 	}
@@ -10398,7 +10494,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 			mypet->SetPetStop(true);
 			mypet->StopNavigation();
 			mypet->SetTarget(nullptr);
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_GETLOST_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
 			if (mypet->IsPetRegroup()) {
 				mypet->SetPetRegroup(false);
 				SetPetCommandState(PET_BUTTON_REGROUP, 0);
@@ -10411,7 +10507,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 
 		if ((mypet->GetPetType() == petAnimation && aabonuses.PetCommands[PetCommand]) || mypet->GetPetType() != petAnimation) {
 			mypet->SetPetStop(false);
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_GETLOST_STRING);
+			mypet->SayString(this, Chat::PetResponse, PET_GETLOST_STRING);
 		}
 		break;
 	}
@@ -10421,11 +10517,11 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (aabonuses.PetCommands[PetCommand]) {
 			if (mypet->IsPetRegroup()) {
 				mypet->SetPetRegroup(false);
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_OFF_REGROUPING);
+				mypet->SayString(this, Chat::PetResponse, PET_OFF_REGROUPING);
 			} else {
 				mypet->SetPetRegroup(true);
 				mypet->SetTarget(nullptr);
-				mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_REGROUPING);
+				mypet->SayString(this, Chat::PetResponse, PET_ON_REGROUPING);
 				if (mypet->IsPetStop()) {
 					mypet->SetPetStop(false);
 					SetPetCommandState(PET_BUTTON_STOP, 0);
@@ -10440,7 +10536,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 		if (aabonuses.PetCommands[PetCommand]) {
 			mypet->SetPetRegroup(true);
 			mypet->SetTarget(nullptr);
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_ON_REGROUPING);
+			mypet->SayString(this, Chat::PetResponse, PET_ON_REGROUPING);
 			if (mypet->IsPetStop()) {
 				mypet->SetPetStop(false);
 				SetPetCommandState(PET_BUTTON_STOP, 0);
@@ -10453,7 +10549,7 @@ void Client::Handle_OP_PetCommands(const EQApplicationPacket *app)
 
 		if (aabonuses.PetCommands[PetCommand]) {
 			mypet->SetPetRegroup(false);
-			mypet->SayTo_StringID(this, MT_PetResponse, PET_OFF_REGROUPING);
+			mypet->SayString(this, Chat::PetResponse, PET_OFF_REGROUPING);
 		}
 		break;
 	}
@@ -10511,7 +10607,7 @@ void Client::Handle_OP_PetitionBug(const EQApplicationPacket *app)
 void Client::Handle_OP_PetitionCheckIn(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Petition_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_PetitionCheckIn, size=%i, expected %i", app->size, sizeof(Petition_Struct));
+		LogError("Wrong size: OP_PetitionCheckIn, size=[{}], expected [{}]", app->size, sizeof(Petition_Struct));
 		return;
 	}
 	Petition_Struct* inpet = (Petition_Struct*)app->pBuffer;
@@ -10555,7 +10651,7 @@ void Client::Handle_OP_PetitionCheckout(const EQApplicationPacket *app)
 void Client::Handle_OP_PetitionDelete(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(PetitionUpdate_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_PetitionDelete, size=%i, expected %i", app->size, sizeof(PetitionUpdate_Struct));
+		LogError("Wrong size: OP_PetitionDelete, size=[{}], expected [{}]", app->size, sizeof(PetitionUpdate_Struct));
 		return;
 	}
 	auto outapp = new EQApplicationPacket(OP_PetitionUpdate, sizeof(PetitionUpdate_Struct));
@@ -10650,7 +10746,7 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(PickPocket_Struct))
 	{
-		Log(Logs::General, Logs::Error, "Size mismatch for Pick Pocket packet");
+		LogError("Size mismatch for Pick Pocket packet");
 		DumpPacket(app);
 	}
 
@@ -10661,7 +10757,7 @@ void Client::Handle_OP_PickPocket(const EQApplicationPacket *app)
 
 	if (!p_timers.Expired(&database, pTimerBeggingPickPocket, false))
 	{
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		database.SetMQDetectionFlag(this->AccountName(), this->GetName(), "OP_PickPocket was sent again too quickly.", zone->GetShortName());
 		return;
 	}
@@ -10720,11 +10816,7 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(PopupResponse_Struct)) {
-		Log(Logs::General,
-			Logs::None,
-			"Size mismatch in OP_PopupResponse expected %i got %i",
-			sizeof(PopupResponse_Struct),
-			app->size);
+		LogDebug("Size mismatch in OP_PopupResponse expected [{}] got [{}]", sizeof(PopupResponse_Struct), app->size);
 
 		DumpPacket(app);
 		return;
@@ -10748,14 +10840,14 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
 
 		case EQEmu::popupresponse::MOB_INFO_DISMISS:
 			this->SetDisplayMobInfoWindow(false);
-			this->Message(15, "[DevTools] Window snoozed in this zone...");
+			this->Message(Chat::Yellow, "[DevTools] Window snoozed in this zone...");
 			break;
 		default:
 			break;
 	}
 
 	char buf[16];
-	sprintf(buf, "%d\0", popup_response->popupid);
+	sprintf(buf, "%d", popup_response->popupid);
 
 	parse->EventPlayer(EVENT_POPUP_RESPONSE, this, buf, 0);
 
@@ -10768,15 +10860,14 @@ void Client::Handle_OP_PopupResponse(const EQApplicationPacket *app)
 void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(MovePotionToBelt_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_PotionBelt expected %i got %i",
-			sizeof(MovePotionToBelt_Struct), app->size);
+		LogDebug("Size mismatch in OP_PotionBelt expected [{}] got [{}]", sizeof(MovePotionToBelt_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
 
 	MovePotionToBelt_Struct *mptbs = (MovePotionToBelt_Struct*)app->pBuffer;
 	if (!EQEmu::ValueWithin(mptbs->SlotNumber, 0U, 3U)) {
-		Log(Logs::General, Logs::None, "Client::Handle_OP_PotionBelt mptbs->SlotNumber out of range.");
+		LogDebug("Client::Handle_OP_PotionBelt mptbs->SlotNumber out of range");
 		return;
 	}
 
@@ -10799,7 +10890,7 @@ void Client::Handle_OP_PotionBelt(const EQApplicationPacket *app)
 void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(uint32)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_LeadershipExpToggle expected %i got %i", 1, app->size);
+		LogDebug("Size mismatch in OP_LeadershipExpToggle expected [{}] got [{}]", 1, app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -10810,13 +10901,13 @@ void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app)
 
 	uint32 current_rank = m_pp.leader_abilities.ranks[aaid];
 	if (current_rank >= MAX_LEADERSHIP_TIERS) {
-		Message(13, "This ability can be trained no further.");
+		Message(Chat::Red, "This ability can be trained no further.");
 		return;
 	}
 
 	uint8 cost = LeadershipAACosts[aaid][current_rank];
 	if (cost == 0) {
-		Message(13, "This ability can be trained no further.");
+		Message(Chat::Red, "This ability can be trained no further.");
 		return;
 	}
 
@@ -10825,7 +10916,7 @@ void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app)
 	if (aaid >= raidAAMarkNPC) {
 		//it is a raid ability.
 		if (cost > m_pp.raid_leadership_points) {
-			Message(13, "You do not have enough points to purchase this ability.");
+			Message(Chat::Red, "You do not have enough points to purchase this ability.");
 			return;
 		}
 
@@ -10838,7 +10929,7 @@ void Client::Handle_OP_PurchaseLeadershipAA(const EQApplicationPacket *app)
 	else {
 		//it is a group ability.
 		if (cost > m_pp.group_leadership_points) {
-			Message(13, "You do not have enough points to purchase this ability.");
+			Message(Chat::Red, "You do not have enough points to purchase this ability.");
 			return;
 		}
 
@@ -10892,8 +10983,7 @@ void Client::Handle_OP_PVPLeaderBoardDetailsRequest(const EQApplicationPacket *a
 	//
 	if (app->size != sizeof(PVPLeaderBoardDetailsRequest_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_PVPLeaderBoardDetailsRequest expected %i got %i",
-			sizeof(PVPLeaderBoardDetailsRequest_Struct), app->size);
+		LogDebug("Size mismatch in OP_PVPLeaderBoardDetailsRequest expected [{}] got [{}]", sizeof(PVPLeaderBoardDetailsRequest_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -10919,8 +11009,7 @@ void Client::Handle_OP_PVPLeaderBoardRequest(const EQApplicationPacket *app)
 	//
 	if (app->size != sizeof(PVPLeaderBoardRequest_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_PVPLeaderBoardRequest expected %i got %i",
-			sizeof(PVPLeaderBoardRequest_Struct), app->size);
+		LogDebug("Size mismatch in OP_PVPLeaderBoardRequest expected [{}] got [{}]", sizeof(PVPLeaderBoardRequest_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -11018,7 +11107,7 @@ void Client::Handle_OP_QueryUCSServerStatus(const EQApplicationPacket *app)
 void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 {
 	if (app->size < sizeof(RaidGeneral_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_RaidCommand, size=%i, expected at least %i", app->size, sizeof(RaidGeneral_Struct));
+		LogError("Wrong size: OP_RaidCommand, size=[{}], expected at least [{}]", app->size, sizeof(RaidGeneral_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -11037,12 +11126,12 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 			Group *player_to_invite_group = player_to_invite->GetGroup();
 			
 			if (player_to_invite->HasRaid()) {
-				Message(13, "%s is already in a raid.", player_to_invite->GetName());
+				Message(Chat::Red, "%s is already in a raid.", player_to_invite->GetName());
 				break;
 			}
 
 			if (player_to_invite_group && !player_to_invite_group->IsLeader(player_to_invite)) {
-				Message(13, "You can only invite an ungrouped player or group leader to join your raid.");
+				Message(Chat::Red, "You can only invite an ungrouped player or group leader to join your raid.");
 				break;
 			}
 			
@@ -11066,7 +11155,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 			Client *player_accepting_invite = entity_list.GetClientByName(raid_command_packet->player_name);
 			if (player_accepting_invite) {
 				if (IsRaidGrouped()) {
-					player_accepting_invite->Message_StringID(0, ALREADY_IN_RAID, GetName()); //group failed, must invite members not in raid...
+					player_accepting_invite->MessageString(Chat::White, ALREADY_IN_RAID, GetName()); //group failed, must invite members not in raid...
 					return;
 				}
 				Raid *raid = entity_list.GetRaidByClient(player_accepting_invite);
@@ -11075,13 +11164,13 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 					Group *group = GetGroup();
 					if (group) {
 						if (group->GroupCount() + raid->RaidCount() > MAX_RAID_MEMBERS) {
-							player_accepting_invite->Message(13, "Invite failed, group invite would create a raid larger than the maximum number of members allowed.");
+							player_accepting_invite->Message(Chat::Red, "Invite failed, group invite would create a raid larger than the maximum number of members allowed.");
 							return;
 						}
 					}
 					else {
 						if (1 + raid->RaidCount() > MAX_RAID_MEMBERS) {
-							player_accepting_invite->Message(13, "Invite failed, member invite would create a raid larger than the maximum number of members allowed.");
+							player_accepting_invite->Message(Chat::Red, "Invite failed, member invite would create a raid larger than the maximum number of members allowed.");
 							return;
 						}
 					}
@@ -11537,7 +11626,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 				client_moved->GetRaid()->SendHPManaEndPacketsTo(client_moved);
 				client_moved->GetRaid()->SendHPManaEndPacketsFrom(client_moved);
 
-				Log(Logs::General, Logs::HP_Update,
+				Log(Logs::General, Logs::HPUpdate,
 					"Client::Handle_OP_RaidCommand :: %s sending and recieving HP/Mana/End updates",
 					client_moved->GetCleanName()
 				);
@@ -11573,7 +11662,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 		{
 			Raid *raid = entity_list.GetRaidByClient(this);
 			if (raid) {
-				Message(15, "Loot type changed to: %d.", raid_command_packet->parameter);
+				Message(Chat::Yellow, "Loot type changed to: %d.", raid_command_packet->parameter);
 				raid->ChangeLootType(raid_command_packet->parameter);
 			}
 			break;
@@ -11584,7 +11673,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 		{
 			Raid *raid = entity_list.GetRaidByClient(this);
 			if (raid) {
-				Message(15, "Adding %s as a raid looter.", raid_command_packet->leader_name);
+				Message(Chat::Yellow, "Adding %s as a raid looter.", raid_command_packet->leader_name);
 				raid->AddRaidLooter(raid_command_packet->leader_name);
 			}
 			break;
@@ -11595,7 +11684,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 		{
 			Raid *raid = entity_list.GetRaidByClient(this);
 			if (raid) {
-				Message(15, "Removing %s as a raid looter.", raid_command_packet->leader_name);
+				Message(Chat::Yellow, "Removing %s as a raid looter.", raid_command_packet->leader_name);
 				raid->RemoveRaidLooter(raid_command_packet->leader_name);
 			}
 			break;
@@ -11628,7 +11717,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 		}
 
 		default: {
-			Message(13, "Raid command (%d) NYI", raid_command_packet->action);
+			Message(Chat::Red, "Raid command (%d) NYI", raid_command_packet->action);
 			break;
 		}
 	}
@@ -11637,7 +11726,7 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket *app)
 void Client::Handle_OP_RandomReq(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(RandomReq_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_RandomReq, size=%i, expected %i", app->size, sizeof(RandomReq_Struct));
+		LogError("Wrong size: OP_RandomReq, size=[{}], expected [{}]", app->size, sizeof(RandomReq_Struct));
 		return;
 	}
 	const RandomReq_Struct* rndq = (const RandomReq_Struct*)app->pBuffer;
@@ -11666,7 +11755,7 @@ void Client::Handle_OP_RandomReq(const EQApplicationPacket *app)
 void Client::Handle_OP_ReadBook(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(BookRequest_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_ReadBook, size=%i, expected %i", app->size, sizeof(BookRequest_Struct));
+		LogError("Wrong size: OP_ReadBook, size=[{}], expected [{}]", app->size, sizeof(BookRequest_Struct));
 		return;
 	}
 	BookRequest_Struct* book = (BookRequest_Struct*)app->pBuffer;
@@ -11682,7 +11771,7 @@ void Client::Handle_OP_ReadBook(const EQApplicationPacket *app)
 void Client::Handle_OP_RecipeAutoCombine(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(RecipeAutoCombine_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for RecipeAutoCombine_Struct: Expected: %i, Got: %i",
+		LogError("Invalid size for RecipeAutoCombine_Struct: Expected: [{}], Got: [{}]",
 			sizeof(RecipeAutoCombine_Struct), app->size);
 		return;
 	}
@@ -11696,7 +11785,7 @@ void Client::Handle_OP_RecipeAutoCombine(const EQApplicationPacket *app)
 void Client::Handle_OP_RecipeDetails(const EQApplicationPacket *app)
 {
 	if (app->size < sizeof(uint32)) {
-		Log(Logs::General, Logs::Error, "Invalid size for RecipeDetails Request: Expected: %i, Got: %i",
+		LogError("Invalid size for RecipeDetails Request: Expected: [{}], Got: [{}]",
 			sizeof(uint32), app->size);
 		return;
 	}
@@ -11710,14 +11799,14 @@ void Client::Handle_OP_RecipeDetails(const EQApplicationPacket *app)
 void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(TradeskillFavorites_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for TradeskillFavorites_Struct: Expected: %i, Got: %i",
+		LogError("Invalid size for TradeskillFavorites_Struct: Expected: [{}], Got: [{}]",
 			sizeof(TradeskillFavorites_Struct), app->size);
 		return;
 	}
 
 	TradeskillFavorites_Struct* tsf = (TradeskillFavorites_Struct*)app->pBuffer;
 
-	Log(Logs::General, Logs::None, "Requested Favorites for: %d - %d\n", tsf->object_type, tsf->some_id);
+	LogDebug("Requested Favorites for: [{}] - [{}]\n", tsf->object_type, tsf->some_id);
 
 	// results show that object_type is combiner type
 	// some_id = 0 if world combiner, item number otherwise
@@ -11734,7 +11823,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
 		auto item = database.GetItem(tsf->some_id);
 		if (!item)
 		{
-			Log(Logs::General, Logs::Error, "Invalid container ID: %d.  GetItem returned null.  Defaulting to BagSlots = 10.\n", tsf->some_id);
+			LogError("Invalid container ID: [{}]. GetItem returned null. Defaulting to BagSlots = 10.\n", tsf->some_id);
 			combineObjectSlots = 10;
 		}
 		else
@@ -11783,7 +11872,7 @@ void Client::Handle_OP_RecipesFavorite(const EQApplicationPacket *app)
 void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(RecipesSearch_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for RecipesSearch_Struct: Expected: %i, Got: %i",
+		LogError("Invalid size for RecipesSearch_Struct: Expected: [{}], Got: [{}]",
 			sizeof(RecipesSearch_Struct), app->size);
 		return;
 	}
@@ -11792,7 +11881,7 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
 	rss->query[55] = '\0';	//just to be sure.
 
 
-	Log(Logs::General, Logs::None, "Requested search recipes for: %d - %d\n", rss->object_type, rss->some_id);
+	LogDebug("Requested search recipes for: [{}] - [{}]\n", rss->object_type, rss->some_id);
 
 	// make where clause segment for container(s)
 	char containers[30];
@@ -11808,7 +11897,7 @@ void Client::Handle_OP_RecipesSearch(const EQApplicationPacket *app)
 		auto item = database.GetItem(rss->some_id);
 		if (!item)
 		{
-			Log(Logs::General, Logs::Error, "Invalid container ID: %d.  GetItem returned null.  Defaulting to BagSlots = 10.\n", rss->some_id);
+			LogError("Invalid container ID: [{}]. GetItem returned null. Defaulting to BagSlots = 10.\n", rss->some_id);
 			combineObjectSlots = 10;
 		}
 		else
@@ -11864,8 +11953,7 @@ void Client::Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app)
 
 	if (app->size != sizeof(BlockedBuffs_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_RemoveBlockedBuffs expected %i got %i",
-			sizeof(BlockedBuffs_Struct), app->size);
+		LogDebug("Size mismatch in OP_RemoveBlockedBuffs expected [{}] got [{}]", sizeof(BlockedBuffs_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -11922,7 +12010,7 @@ void Client::Handle_OP_RemoveBlockedBuffs(const EQApplicationPacket *app)
 void Client::Handle_OP_RemoveTrap(const EQApplicationPacket *app)
 {
 	if (app->size != 4) {// just an int
-		Log(Logs::General, Logs::None, "Size mismatch in OP_RemoveTrap expected 4 got %i", app->size);
+		LogDebug("Size mismatch in OP_RemoveTrap expected 4 got [{}]", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -11938,14 +12026,14 @@ void Client::Handle_OP_RemoveTrap(const EQApplicationPacket *app)
 	if (good)
 		RemoveAura(id);
 	else
-		Message_StringID(MT_SpellFailure, NOT_YOUR_TRAP); // pretty sure this was red
+		MessageString(Chat::SpellFailure, NOT_YOUR_TRAP); // pretty sure this was red
 }
 
 void Client::Handle_OP_Report(const EQApplicationPacket *app)
 {
 	if (!CanUseReport)
 	{
-		Message_StringID(MT_System, REPORT_ONCE);
+		MessageString(Chat::System, REPORT_ONCE);
 		return;
 	}
 
@@ -12012,11 +12100,11 @@ void Client::Handle_OP_RequestDuel(const EQApplicationPacket *app)
 	ds->duel_target = duel;
 	Entity* entity = entity_list.GetID(ds->duel_target);
 	if (GetID() != ds->duel_target && entity->IsClient() && (entity->CastToClient()->IsDueling() && entity->CastToClient()->GetDuelTarget() != 0)) {
-		Message_StringID(10, DUEL_CONSIDERING, entity->GetName());
+		MessageString(Chat::NPCQuestSay, DUEL_CONSIDERING, entity->GetName());
 		return;
 	}
 	if (IsDueling()) {
-		Message_StringID(10, DUEL_INPROGRESS);
+		MessageString(Chat::NPCQuestSay, DUEL_INPROGRESS);
 		return;
 	}
 
@@ -12049,8 +12137,7 @@ void Client::Handle_OP_RespawnWindow(const EQApplicationPacket *app)
 	//
 	if (app->size != 4)
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_RespawnWindow expected %i got %i",
-			4, app->size);
+		LogDebug("Size mismatch in OP_RespawnWindow expected [{}] got [{}]", 4, app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -12063,7 +12150,7 @@ void Client::Handle_OP_RespawnWindow(const EQApplicationPacket *app)
 void Client::Handle_OP_Rewind(const EQApplicationPacket *app)
 {
 	if ((rewind_timer.GetRemainingTime() > 1 && rewind_timer.Enabled())) {
-		Message_StringID(MT_System, REWIND_WAIT);
+		MessageString(Chat::System, REWIND_WAIT);
 	}
 	else {
 		CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), m_RewindLocation.x, m_RewindLocation.y, m_RewindLocation.z, 0, 2, Rewind);
@@ -12077,7 +12164,7 @@ void Client::Handle_OP_RezzAnswer(const EQApplicationPacket *app)
 
 	const Resurrect_Struct* ra = (const Resurrect_Struct*)app->pBuffer;
 
-	Log(Logs::Detail, Logs::Spells, "Received OP_RezzAnswer from client. Pendingrezzexp is %i, action is %s",
+	LogSpells("Received OP_RezzAnswer from client. Pendingrezzexp is [{}], action is [{}]",
 		PendingRezzXP, ra->action ? "ACCEPT" : "DECLINE");
 
 
@@ -12099,14 +12186,14 @@ void Client::Handle_OP_Sacrifice(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(Sacrifice_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_Sacrifice expected %i got %i", sizeof(Sacrifice_Struct), app->size);
+		LogDebug("Size mismatch in OP_Sacrifice expected [{}] got [{}]", sizeof(Sacrifice_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
 	Sacrifice_Struct *ss = (Sacrifice_Struct*)app->pBuffer;
 
 	if (!PendingSacrifice) {
-		Log(Logs::General, Logs::Error, "Unexpected OP_Sacrifice reply");
+		LogError("Unexpected OP_Sacrifice reply");
 		DumpPacket(app);
 		return;
 	}
@@ -12144,12 +12231,12 @@ void Client::Handle_OP_SaveOnZoneReq(const EQApplicationPacket *app)
 
 void Client::Handle_OP_SelectTribute(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Tribute, "Received OP_SelectTribute of length %d", app->size);
+	LogTribute("Received OP_SelectTribute of length [{}]", app->size);
 
 	//we should enforce being near a real tribute master to change this
 	//but im not sure how I wanna do that right now.
 	if (app->size != sizeof(SelectTributeReq_Struct))
-		Log(Logs::General, Logs::Error, "Invalid size on OP_SelectTribute packet");
+		LogError("Invalid size on OP_SelectTribute packet");
 	else {
 		SelectTributeReq_Struct *t = (SelectTributeReq_Struct *)app->pBuffer;
 		SendTributeDetails(t->client_id, t->tribute_id);
@@ -12175,7 +12262,7 @@ void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app)
 		return;
 
 	if (!p_timers.Expired(&database, pTimerSenseTraps, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -12198,23 +12285,23 @@ void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app)
 			auto diff = trap->m_Position - glm::vec3(GetPosition());
 
 			if (diff.x == 0 && diff.y == 0)
-				Message(MT_Skills, "You sense a trap right under your feet!");
+				Message(Chat::Skills, "You sense a trap right under your feet!");
 			else if (diff.x > 10 && diff.y > 10)
-				Message(MT_Skills, "You sense a trap to the NorthWest.");
+				Message(Chat::Skills, "You sense a trap to the NorthWest.");
 			else if (diff.x < -10 && diff.y > 10)
-				Message(MT_Skills, "You sense a trap to the NorthEast.");
+				Message(Chat::Skills, "You sense a trap to the NorthEast.");
 			else if (diff.y > 10)
-				Message(MT_Skills, "You sense a trap to the North.");
+				Message(Chat::Skills, "You sense a trap to the North.");
 			else if (diff.x > 10 && diff.y < -10)
-				Message(MT_Skills, "You sense a trap to the SouthWest.");
+				Message(Chat::Skills, "You sense a trap to the SouthWest.");
 			else if (diff.x < -10 && diff.y < -10)
-				Message(MT_Skills, "You sense a trap to the SouthEast.");
+				Message(Chat::Skills, "You sense a trap to the SouthEast.");
 			else if (diff.y < -10)
-				Message(MT_Skills, "You sense a trap to the South.");
+				Message(Chat::Skills, "You sense a trap to the South.");
 			else if (diff.x > 10)
-				Message(MT_Skills, "You sense a trap to the West.");
+				Message(Chat::Skills, "You sense a trap to the West.");
 			else
-				Message(MT_Skills, "You sense a trap to the East.");
+				Message(Chat::Skills, "You sense a trap to the East.");
 			trap->detected = true;
 
 			float angle = CalculateHeadingToTarget(trap->m_Position.x, trap->m_Position.y);
@@ -12227,13 +12314,13 @@ void Client::Handle_OP_SenseTraps(const EQApplicationPacket *app)
 			return;
 		}
 	}
-	Message(MT_Skills, "You did not find any traps nearby.");
+	Message(Chat::Skills, "You did not find any traps nearby.");
 	return;
 }
 
 void Client::Handle_OP_SetGuildMOTD(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Guilds, "Received OP_SetGuildMOTD");
+	LogGuilds("Received OP_SetGuildMOTD");
 
 	if (app->size != sizeof(GuildMOTD_Struct)) {
 		// client calls for a motd on login even if they arent in a guild
@@ -12241,17 +12328,17 @@ void Client::Handle_OP_SetGuildMOTD(const EQApplicationPacket *app)
 		return;
 	}
 	if (!IsInAGuild()) {
-		Message(13, "You are not in a guild!");
+		Message(Chat::Red, "You are not in a guild!");
 		return;
 	}
 	if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_MOTD)) {
-		Message(13, "You do not have permissions to edit your guild's MOTD.");
+		Message(Chat::Red, "You do not have permissions to edit your guild's MOTD.");
 		return;
 	}
 
 	GuildMOTD_Struct* gmotd = (GuildMOTD_Struct*)app->pBuffer;
 
-	Log(Logs::Detail, Logs::Guilds, "Setting MOTD for %s (%d) to: %s - %s",
+	LogGuilds("Setting MOTD for [{}] ([{}]) to: [{}] - [{}]",
 		guild_mgr.GetGuildName(GuildID()), GuildID(), GetName(), gmotd->motd);
 
 	if (!guild_mgr.SetGuildMOTD(GuildID(), gmotd->motd, GetName())) {
@@ -12264,9 +12351,7 @@ void Client::Handle_OP_SetGuildMOTD(const EQApplicationPacket *app)
 void Client::Handle_OP_SetRunMode(const EQApplicationPacket *app)
 {
 	if (app->size < sizeof(SetRunMode_Struct)) {
-		Log(Logs::General, Logs::Error, "Received invalid sized "
-			"OP_SetRunMode: got %d, expected %d", app->size,
-			sizeof(SetRunMode_Struct));
+		LogError("Received invalid sized OP_SetRunMode: got [{}], expected [{}]", app->size, sizeof(SetRunMode_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -12281,9 +12366,7 @@ void Client::Handle_OP_SetRunMode(const EQApplicationPacket *app)
 void Client::Handle_OP_SetServerFilter(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(SetServerFilter_Struct)) {
-		Log(Logs::General, Logs::Error, "Received invalid sized "
-			"OP_SetServerFilter: got %d, expected %d", app->size,
-			sizeof(SetServerFilter_Struct));
+		LogError("Received invalid sized OP_SetServerFilter: got [{}], expected [{}]", app->size, sizeof(SetServerFilter_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -12296,12 +12379,12 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 {
 	// if the character has a start city, don't let them use the command
 	if (m_pp.binds[4].zoneId != 0 && m_pp.binds[4].zoneId != 189) {
-		Message(15, "Your home city has already been set.", m_pp.binds[4].zoneId, database.GetZoneName(m_pp.binds[4].zoneId));
+		Message(Chat::Yellow, "Your home city has already been set.", m_pp.binds[4].zoneId, database.GetZoneName(m_pp.binds[4].zoneId));
 		return;
 	}
 
 	if (app->size < 1) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_SetStartCity, size=%i, expected %i", app->size, 1);
+		LogError("Wrong size: OP_SetStartCity, size=[{}], expected [{}]", app->size, 1);
 		DumpPacket(app);
 		return;
 	}
@@ -12315,7 +12398,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 		m_pp.class_, m_pp.deity, m_pp.race);
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "No valid start zones found for /setstartcity");
+		LogError("No valid start zones found for /setstartcity");
 		return;
 	}
 
@@ -12336,7 +12419,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 	}
 
 	if (validCity) {
-		Message(15, "Your home city has been set");
+		Message(Chat::Yellow, "Your home city has been set");
 		SetStartZone(startCity, x, y, z);
 		return;
 	}
@@ -12348,7 +12431,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 	if (!results.Success())
 		return;
 
-	Message(15, "Use \"/setstartcity #\" to choose a home city from the following list:");
+	Message(Chat::Yellow, "Use \"/setstartcity #\" to choose a home city from the following list:");
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		if (atoi(row[1]) != 0)
@@ -12358,7 +12441,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 
 		char* name = nullptr;
 		database.GetZoneLongName(database.GetZoneName(zoneid), &name);
-		Message(15, "%d - %s", zoneid, name);
+		Message(Chat::Yellow, "%d - %s", zoneid, name);
 	}
 
 }
@@ -12366,7 +12449,7 @@ void Client::Handle_OP_SetStartCity(const EQApplicationPacket *app)
 void Client::Handle_OP_SetTitle(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(SetTitle_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_SetTitle expected %i got %i", sizeof(SetTitle_Struct), app->size);
+		LogDebug("Size mismatch in OP_SetTitle expected [{}] got [{}]", sizeof(SetTitle_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -12390,7 +12473,7 @@ void Client::Handle_OP_SetTitle(const EQApplicationPacket *app)
 void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Shielding_Struct)) {
-		Log(Logs::General, Logs::Error, "OP size error: OP_Shielding expected:%i got:%i", sizeof(Shielding_Struct), app->size);
+		LogError("OP size error: OP_Shielding expected:[{}] got:[{}]", sizeof(Shielding_Struct), app->size);
 		return;
 	}
 	if (GetClass() != WARRIOR)
@@ -12400,7 +12483,8 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
 
 	if (shield_target)
 	{
-		entity_list.MessageClose_StringID(this, false, 100, 0,
+		entity_list.MessageCloseString(
+			this, false, 100, 0,
 			END_SHIELDING, GetName(), shield_target->GetName());
 		for (int y = 0; y < 2; y++)
 		{
@@ -12426,7 +12510,8 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
 			{
 				if (shield_target->shielder[x].shielder_id == 0)
 				{
-					entity_list.MessageClose_StringID(this, false, 100, 0,
+					entity_list.MessageCloseString(
+						this, false, 100, 0,
 						START_SHIELDING, GetName(), shield_target->GetName());
 					shield_target->shielder[x].shielder_id = GetID();
 					int shieldbonus = shield->AC * 2;
@@ -12464,7 +12549,7 @@ void Client::Handle_OP_Shielding(const EQApplicationPacket *app)
 	}
 	if (!ack)
 	{
-		Message_StringID(0, ALREADY_SHIELDED);
+		MessageString(Chat::White, ALREADY_SHIELDED);
 		shield_target = 0;
 		return;
 	}
@@ -12481,7 +12566,7 @@ void Client::Handle_OP_ShopEnd(const EQApplicationPacket *app)
 void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Merchant_Sell_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size on OP_ShopPlayerBuy: Expected %i, Got %i",
+		LogError("Invalid size on OP_ShopPlayerBuy: Expected [{}], Got [{}]",
 			sizeof(Merchant_Sell_Struct), app->size);
 		return;
 	}
@@ -12489,7 +12574,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 	t1.start();
 	Merchant_Sell_Struct* mp = (Merchant_Sell_Struct*)app->pBuffer;
 #if EQDEBUG >= 5
-	Log(Logs::General, Logs::None, "%s, purchase item..", GetName());
+	LogDebug("[{}], purchase item", GetName());
 	DumpPacket(app);
 #endif
 
@@ -12541,7 +12626,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 	item = database.GetItem(item_id);
 	if (!item) {
 		//error finding item, client didnt get the update packet for whatever reason, roleplay a tad
-		Message(15, "%s tells you 'Sorry, that item is for display purposes only.' as they take the item off the shelf.", tmp->GetCleanName());
+		Message(Chat::Yellow, "%s tells you 'Sorry, that item is for display purposes only.' as they take the item off the shelf.", tmp->GetCleanName());
 		auto delitempacket = new EQApplicationPacket(OP_ShopDelItem, sizeof(Merchant_DelItem_Struct));
 		Merchant_DelItem_Struct* delitem = (Merchant_DelItem_Struct*)delitempacket->pBuffer;
 		delitem->itemslot = mp->itemslot;
@@ -12554,7 +12639,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 	}
 	if (CheckLoreConflict(item))
 	{
-		Message(15, "You can only have one of a lore item.");
+		Message(Chat::Yellow, "You can only have one of a lore item.");
 		return;
 	}
 	if (tmpmer_used && (mp->quantity > prevcharges || item->MaxCharges > 1))
@@ -12628,7 +12713,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 	//make sure we are not completely full...
 	if (freeslotid == EQEmu::invslot::slotCursor) {
 		if (m_inv.GetItem(EQEmu::invslot::slotCursor) != nullptr) {
-			Message(13, "You do not have room for any more items.");
+			Message(Chat::Red, "You do not have room for any more items.");
 			safe_delete(outapp);
 			safe_delete(inst);
 			return;
@@ -12637,7 +12722,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 
 	if (!stacked && freeslotid == INVALID_INDEX)
 	{
-		Message(13, "You do not have room for any more items.");
+		Message(Chat::Red, "You do not have room for any more items.");
 		safe_delete(outapp);
 		safe_delete(inst);
 		return;
@@ -12649,7 +12734,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 		SendItemPacket(freeslotid, inst, ItemPacketTrade);
 	}
 	else if (!stacked) {
-		Log(Logs::General, Logs::Error, "OP_ShopPlayerBuy: item->ItemClass Unknown! Type: %i", item->ItemClass);
+		LogError("OP_ShopPlayerBuy: item->ItemClass Unknown! Type: [{}]", item->ItemClass);
 	}
 	QueuePacket(outapp);
 	if (inst && tmpmer_used) {
@@ -12721,7 +12806,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 			qsaudit->items[0].aug_5 = 0;
 
 			if (freeslotid != INVALID_INDEX) {
-				Log(Logs::General, Logs::Error, "Handle_OP_ShopPlayerBuy: QS Audit could not locate merchant (%u) purchased item in player (%u) inventory slot (%i)",
+				LogError("Handle_OP_ShopPlayerBuy: QS Audit could not locate merchant ([{}]) purchased item in player ([{}]) inventory slot ([{}])",
 					qsaudit->merchant_id, qsaudit->char_id, freeslotid);
 			}
 		}
@@ -12749,7 +12834,7 @@ void Client::Handle_OP_ShopPlayerBuy(const EQApplicationPacket *app)
 void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Merchant_Purchase_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size on OP_ShopPlayerSell: Expected %i, Got %i",
+		LogError("Invalid size on OP_ShopPlayerSell: Expected [{}], Got [{}]",
 			sizeof(Merchant_Purchase_Struct), app->size);
 		return;
 	}
@@ -12772,7 +12857,7 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
 	const EQEmu::ItemData* item = database.GetItem(itemid);
 	EQEmu::ItemInstance* inst = GetInv().GetItem(mp->itemslot);
 	if (!item || !inst) {
-		Message(13, "You seemed to have misplaced that item..");
+		Message(Chat::Red, "You seemed to have misplaced that item..");
 		return;
 	}
 	if (mp->quantity > 1)
@@ -12782,7 +12867,7 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
 	}
 
 	if (!item->NoDrop) {
-		//Message(13,"%s tells you, 'LOL NOPE'", vendor->GetName());
+		//Message(Chat::Red,"%s tells you, 'LOL NOPE'", vendor->GetName());
 		return;
 	}
 
@@ -12942,7 +13027,7 @@ void Client::Handle_OP_ShopPlayerSell(const EQApplicationPacket *app)
 void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Merchant_Click_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_ShopRequest, size=%i, expected %i", app->size, sizeof(Merchant_Click_Struct));
+		LogError("Wrong size: OP_ShopRequest, size=[{}], expected [{}]", app->size, sizeof(Merchant_Click_Struct));
 		return;
 	}
 
@@ -12976,7 +13061,7 @@ void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app)
 		return;
 	}
 	if (tmp->IsEngaged()) {
-		this->Message_StringID(0, MERCHANT_BUSY);
+		this->MessageString(Chat::White, MERCHANT_BUSY);
 		action = 0;
 	}
 	if (GetFeigned() || IsInvisible())
@@ -12996,7 +13081,7 @@ void Client::Handle_OP_ShopRequest(const EQApplicationPacket *app)
 
 	// 1199 I don't have time for that now. etc
 	if (!tmp->CastToNPC()->IsMerchantOpen()) {
-		tmp->Say_StringID(zone->random.Int(1199, 1202));
+		tmp->SayString(zone->random.Int(1199, 1202));
 		action = 0;
 	}
 
@@ -13029,7 +13114,7 @@ void Client::Handle_OP_Sneak(const EQApplicationPacket *app)
 	}
 
 	if (!p_timers.Expired(&database, pTimerSneak, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerSneak, SneakReuseTime - 1);
@@ -13149,7 +13234,7 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app)
 		}
 
 		else {
-			Log(Logs::Detail, Logs::Error, "Client %s :: unknown appearance %i", name, (int)sa->parameter);
+			LogError("Client [{}] :: unknown appearance [{}]", name, (int)sa->parameter);
 			return;
 		}
 
@@ -13171,7 +13256,7 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app)
 			m_pp.anon = 0;
 		}
 		else {
-			Log(Logs::Detail, Logs::Error, "Client %s :: unknown Anon/Roleplay Switch %i", name, (int)sa->parameter);
+			LogError("Client [{}] :: unknown Anon/Roleplay Switch [{}]", name, (int)sa->parameter);
 			return;
 		}
 		entity_list.QueueClients(this, app, true);
@@ -13240,7 +13325,7 @@ void Client::Handle_OP_SpawnAppearance(const EQApplicationPacket *app)
 void Client::Handle_OP_Split(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Split_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_Split, size=%i, expected %i", app->size, sizeof(Split_Struct));
+		LogError("Wrong size: OP_Split, size=[{}], expected [{}]", app->size, sizeof(Split_Struct));
 		return;
 	}
 	// The client removes the money on its own, but we have to
@@ -13250,13 +13335,13 @@ void Client::Handle_OP_Split(const EQApplicationPacket *app)
 	//Per the note above, Im not exactly sure what to do on error
 	//to notify the client of the error...
 	if (!isgrouped) {
-		Message(13, "You can not split money if you're not in a group.");
+		Message(Chat::Red, "You can not split money if you're not in a group.");
 		return;
 	}
 	Group *cgroup = GetGroup();
 	if (cgroup == nullptr) {
 		//invalid group, not sure if we should say more...
-		Message(13, "You can not split money if you're not in a group.");
+		Message(Chat::Red, "You can not split money if you're not in a group.");
 		return;
 	}
 
@@ -13264,7 +13349,7 @@ void Client::Handle_OP_Split(const EQApplicationPacket *app)
 		10 * static_cast<uint64>(split->silver) +
 		100 * static_cast<uint64>(split->gold) +
 		1000 * static_cast<uint64>(split->platinum))) {
-		Message(13, "You do not have enough money to do that split.");
+		Message(Chat::Red, "You do not have enough money to do that split.");
 		return;
 	}
 	cgroup->SplitMoney(split->copper, split->silver, split->gold, split->platinum);
@@ -13277,19 +13362,19 @@ void Client::Handle_OP_Surname(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(Surname_Struct))
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in Surname expected %i got %i", sizeof(Surname_Struct), app->size);
+		LogDebug("Size mismatch in Surname expected [{}] got [{}]", sizeof(Surname_Struct), app->size);
 		return;
 	}
 
 	if (!p_timers.Expired(&database, pTimerSurnameChange, false) && !GetGM())
 	{
-		Message(15, "You may only change surnames once every 7 days, your /surname is currently on cooldown.");
+		Message(Chat::Yellow, "You may only change surnames once every 7 days, your /surname is currently on cooldown.");
 		return;
 	}
 
 	if (GetLevel() < 20)
 	{
-		Message_StringID(15, SURNAME_LEVEL);
+		MessageString(Chat::Yellow, SURNAME_LEVEL);
 		return;
 	}
 
@@ -13311,13 +13396,13 @@ void Client::Handle_OP_Surname(const EQApplicationPacket *app)
 	}
 
 	if (strlen(surname->lastname) >= 20) {
-		Message_StringID(15, SURNAME_TOO_LONG);
+		MessageString(Chat::Yellow, SURNAME_TOO_LONG);
 		return;
 	}
 
 	if (!database.CheckNameFilter(surname->lastname, true))
 	{
-		Message_StringID(15, SURNAME_REJECTED);
+		MessageString(Chat::Yellow, SURNAME_REJECTED);
 		return;
 	}
 
@@ -13370,7 +13455,7 @@ void Client::Handle_OP_SwapSpell(const EQApplicationPacket *app)
 void Client::Handle_OP_TargetCommand(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(ClientTarget_Struct)) {
-		Log(Logs::General, Logs::Error, "OP size error: OP_TargetMouse expected:%i got:%i", sizeof(ClientTarget_Struct), app->size);
+		LogError("OP size error: OP_TargetMouse expected:[{}] got:[{}]", sizeof(ClientTarget_Struct), app->size);
 		return;
 	}
 
@@ -13593,8 +13678,7 @@ void Client::Handle_OP_TaskHistoryRequest(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(TaskHistoryRequest_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_TaskHistoryRequest expected %i got %i",
-			sizeof(TaskHistoryRequest_Struct), app->size);
+		LogDebug("Size mismatch in OP_TaskHistoryRequest expected [{}] got [{}]", sizeof(TaskHistoryRequest_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -13612,7 +13696,7 @@ void Client::Handle_OP_Taunt(const EQApplicationPacket *app)
 	}
 
 	if (!p_timers.Expired(&database, pTimerTaunt, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 	p_timers.Start(pTimerTaunt, TauntReuseTime - 1);
@@ -13621,7 +13705,7 @@ void Client::Handle_OP_Taunt(const EQApplicationPacket *app)
 		return;
 
 	if (!zone->CanDoCombat()) {
-		Message(13, "You cannot taunt in a no combat zone.");
+		Message(Chat::Red, "You cannot taunt in a no combat zone.");
 		return;
 	}
 
@@ -13651,7 +13735,7 @@ void Client::Handle_OP_Track(const EQApplicationPacket *app)
 		CheckIncreaseSkill(EQEmu::skills::SkillTracking, nullptr, 15);
 
 	if (!entity_list.MakeTrackPacket(this))
-		Log(Logs::General, Logs::Error, "Unable to generate OP_Track packet requested by client.");
+		LogError("Unable to generate OP_Track packet requested by client");
 
 	return;
 }
@@ -13665,7 +13749,7 @@ void Client::Handle_OP_TrackTarget(const EQApplicationPacket *app)
 
 	if (app->size != sizeof(TrackTarget_Struct))
 	{
-		Log(Logs::General, Logs::Error, "Invalid size for OP_TrackTarget: Expected: %i, Got: %i",
+		LogError("Invalid size for OP_TrackTarget: Expected: [{}], Got: [{}]",
 			sizeof(TrackTarget_Struct), app->size);
 		return;
 	}
@@ -13697,31 +13781,31 @@ void Client::Handle_OP_TradeAcceptClick(const EQApplicationPacket *app)
 			trade->state = TradeCompleting;
 
 			if (CheckTradeLoreConflict(other) || other->CheckTradeLoreConflict(this)) {
-				Message_StringID(13, TRADE_CANCEL_LORE);
-				other->Message_StringID(13, TRADE_CANCEL_LORE);
+				MessageString(Chat::Red, TRADE_CANCEL_LORE);
+				other->MessageString(Chat::Red, TRADE_CANCEL_LORE);
 				this->FinishTrade(this);
 				other->FinishTrade(other);
 				other->trade->Reset();
 				trade->Reset();
 			}
 			else if (CheckTradeNonDroppable()) {
-				Message_StringID(13, TRADE_HAS_BEEN_CANCELLED);
-				other->Message_StringID(13, TRADE_HAS_BEEN_CANCELLED);
+				MessageString(Chat::Red, TRADE_HAS_BEEN_CANCELLED);
+				other->MessageString(Chat::Red, TRADE_HAS_BEEN_CANCELLED);
 				this->FinishTrade(this);
 				other->FinishTrade(other);
 				other->trade->Reset();
 				trade->Reset();
-				Message(15, "Hacking activity detected in trade transaction.");
+				Message(Chat::Yellow, "Hacking activity detected in trade transaction.");
 				// TODO: query (this) as a hacker
 			}
 			else if (other->CheckTradeNonDroppable()) {
-				Message_StringID(13, TRADE_HAS_BEEN_CANCELLED);
-				other->Message_StringID(13, TRADE_HAS_BEEN_CANCELLED);
+				MessageString(Chat::Red, TRADE_HAS_BEEN_CANCELLED);
+				other->MessageString(Chat::Red, TRADE_HAS_BEEN_CANCELLED);
 				this->FinishTrade(this);
 				other->FinishTrade(other);
 				other->trade->Reset();
 				trade->Reset();
-				other->Message(15, "Hacking activity detected in trade transaction.");
+				other->Message(Chat::Yellow, "Hacking activity detected in trade transaction.");
 				// TODO: query (other) as a hacker
 			}
 			else {
@@ -13840,7 +13924,7 @@ void Client::Handle_OP_TradeAcceptClick(const EQApplicationPacket *app)
 void Client::Handle_OP_TradeBusy(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(TradeBusy_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_TradeBusy, size=%i, expected %i", app->size, sizeof(TradeBusy_Struct));
+		LogError("Wrong size: OP_TradeBusy, size=[{}], expected [{}]", app->size, sizeof(TradeBusy_Struct));
 		return;
 	}
 	// Trade request recipient is cancelling the trade due to being busy
@@ -13879,7 +13963,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 		{
 		case BazaarTrader_EndTraderMode: {
 			Trader_EndTrader();
-			Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: End Trader Session");
+			LogTrading("Client::Handle_OP_Trader: End Trader Session");
 			break;
 		}
 		case BazaarTrader_EndTransaction: {
@@ -13888,20 +13972,20 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 			if (c)
 			{
 				c->WithCustomer(0);
-				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: End Transaction");
+				LogTrading("Client::Handle_OP_Trader: End Transaction");
 			}
 			else
-				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Null Client Pointer");
+				LogTrading("Client::Handle_OP_Trader: Null Client Pointer");
 
 			break;
 		}
 		case BazaarTrader_ShowItems: {
 			Trader_ShowItems();
-			Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Show Trader Items");
+			LogTrading("Client::Handle_OP_Trader: Show Trader Items");
 			break;
 		}
 		default: {
-			Log(Logs::Detail, Logs::Trading, "Unhandled action code in OP_Trader ShowItems_Struct");
+			LogTrading("Unhandled action code in OP_Trader ShowItems_Struct");
 			break;
 		}
 		}
@@ -13910,7 +13994,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 	{
 		if (Buyer) {
 			Trader_EndTrader();
-			Message(13, "You cannot be a Trader and Buyer at the same time.");
+			Message(Chat::Red, "You cannot be a Trader and Buyer at the same time.");
 			return;
 		}
 
@@ -13920,7 +14004,7 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 		{
 			GetItems_Struct* gis = GetTraderItems();
 
-			Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Start Trader Mode");
+			LogTrading("Client::Handle_OP_Trader: Start Trader Mode");
 			// Verify there are no NODROP or items with a zero price
 			bool TradeItemsValid = true;
 
@@ -13929,20 +14013,20 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 				if (gis->Items[i] == 0) break;
 
 				if (ints->ItemCost[i] == 0) {
-					Message(13, "Item in Trader Satchel with no price. Unable to start trader mode");
+					Message(Chat::Red, "Item in Trader Satchel with no price. Unable to start trader mode");
 					TradeItemsValid = false;
 					break;
 				}
 				const EQEmu::ItemData *Item = database.GetItem(gis->Items[i]);
 
 				if (!Item) {
-					Message(13, "Unexpected error. Unable to start trader mode");
+					Message(Chat::Red, "Unexpected error. Unable to start trader mode");
 					TradeItemsValid = false;
 					break;
 				}
 
 				if (Item->NoDrop == 0) {
-					Message(13, "NODROP Item in Trader Satchel. Unable to start trader mode");
+					Message(Chat::Red, "NODROP Item in Trader Satchel. Unable to start trader mode");
 					TradeItemsValid = false;
 					break;
 				}
@@ -13983,32 +14067,32 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 			}
 		}
 		else {
-			Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Unknown TraderStruct code of: %i\n",
+			LogTrading("Client::Handle_OP_Trader: Unknown TraderStruct code of: [{}]\n",
 				ints->Code);
 
-			Log(Logs::General, Logs::Error, "Unknown TraderStruct code of: %i\n", ints->Code);
+			LogError("Unknown TraderStruct code of: [{}]\n", ints->Code);
 		}
 	}
 	else if (app->size == sizeof(TraderStatus_Struct))
 	{
 		TraderStatus_Struct* tss = (TraderStatus_Struct*)app->pBuffer;
 
-		Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Trader Status Code: %d", tss->Code);
+		LogTrading("Client::Handle_OP_Trader: Trader Status Code: [{}]", tss->Code);
 
 		switch (tss->Code)
 		{
 		case BazaarTrader_EndTraderMode: {
 			Trader_EndTrader();
-			Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: End Trader Session");
+			LogTrading("Client::Handle_OP_Trader: End Trader Session");
 			break;
 		}
 		case BazaarTrader_ShowItems: {
 			Trader_ShowItems();
-			Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Show Trader Items");
+			LogTrading("Client::Handle_OP_Trader: Show Trader Items");
 			break;
 		}
 		default: {
-			Log(Logs::Detail, Logs::Trading, "Unhandled action code in OP_Trader ShowItems_Struct");
+			LogTrading("Unhandled action code in OP_Trader ShowItems_Struct");
 			break;
 		}
 		}
@@ -14017,12 +14101,12 @@ void Client::Handle_OP_Trader(const EQApplicationPacket *app)
 	}
 	else if (app->size == sizeof(TraderPriceUpdate_Struct))
 	{
-		Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Trader Price Update");
+		LogTrading("Client::Handle_OP_Trader: Trader Price Update");
 		HandleTraderPriceUpdate(app);
 	}
 	else {
-		Log(Logs::Detail, Logs::Trading, "Unknown size for OP_Trader: %i\n", app->size);
-		Log(Logs::General, Logs::Error, "Unknown size for OP_Trader: %i\n", app->size);
+		LogTrading("Unknown size for OP_Trader: [{}]\n", app->size);
+		LogError("Unknown size for OP_Trader: [{}]\n", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -14037,7 +14121,7 @@ void Client::Handle_OP_TraderBuy(const EQApplicationPacket *app)
 	// Client has elected to buy an item from a Trader
 	//
 	if (app->size != sizeof(TraderBuy_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_TraderBuy, size=%i, expected %i", app->size, sizeof(TraderBuy_Struct));
+		LogError("Wrong size: OP_TraderBuy, size=[{}], expected [{}]", app->size, sizeof(TraderBuy_Struct));
 		return;
 	}
 
@@ -14045,10 +14129,10 @@ void Client::Handle_OP_TraderBuy(const EQApplicationPacket *app)
 
 	if (Client* Trader = entity_list.GetClientByID(tbs->TraderID)) {
 		BuyTraderItem(tbs, Trader, app);
-		Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderBuy: Buy Trader Item ");
+		LogTrading("Client::Handle_OP_TraderBuy: Buy Trader Item ");
 	}
 	else {
-		Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderBuy: Null Client Pointer");
+		LogTrading("Client::Handle_OP_TraderBuy: Null Client Pointer");
 	}
 
 
@@ -14058,7 +14142,7 @@ void Client::Handle_OP_TraderBuy(const EQApplicationPacket *app)
 void Client::Handle_OP_TradeRequest(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(TradeRequest_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_TradeRequest, size=%i, expected %i", app->size, sizeof(TradeRequest_Struct));
+		LogError("Wrong size: OP_TradeRequest, size=[{}], expected [{}]", app->size, sizeof(TradeRequest_Struct));
 		return;
 	}
 	// Client requesting a trade session from an npc/client
@@ -14078,23 +14162,23 @@ void Client::Handle_OP_TradeRequest(const EQApplicationPacket *app)
 #else
 	else if (tradee && (tradee->IsNPC() || tradee->IsBot())) {
 #endif
-		//npcs always accept
-		trade->Start(msg->to_mob_id);
-
-		auto outapp = new EQApplicationPacket(OP_TradeRequestAck, sizeof(TradeRequest_Struct));
-		TradeRequest_Struct* acc = (TradeRequest_Struct*)outapp->pBuffer;
-		acc->from_mob_id = msg->to_mob_id;
-		acc->to_mob_id = msg->from_mob_id;
-		FastQueuePacket(&outapp);
-		safe_delete(outapp);
-	}
+        if (!tradee->IsEngaged()) {
+            trade->Start(msg->to_mob_id);
+            EQApplicationPacket *outapp = new EQApplicationPacket(OP_TradeRequestAck, sizeof(TradeRequest_Struct));
+            TradeRequest_Struct *acc = (TradeRequest_Struct *) outapp->pBuffer;
+            acc->from_mob_id = msg->to_mob_id;
+            acc->to_mob_id = msg->from_mob_id;
+            FastQueuePacket(&outapp);
+            safe_delete(outapp);
+        }
+    }
 	return;
 	}
 
 void Client::Handle_OP_TradeRequestAck(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(TradeRequest_Struct)) {
-		Log(Logs::General, Logs::Error, "Wrong size: OP_TradeRequestAck, size=%i, expected %i", app->size, sizeof(TradeRequest_Struct));
+		LogError("Wrong size: OP_TradeRequestAck, size=[{}], expected [{}]", app->size, sizeof(TradeRequest_Struct));
 		return;
 	}
 	// Trade request recipient is acknowledging they are able to trade
@@ -14119,12 +14203,12 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
 
 		TraderClick_Struct* tcs = (TraderClick_Struct*)app->pBuffer;
 
-		Log(Logs::Detail, Logs::Trading, "Handle_OP_TraderShop: TraderClick_Struct TraderID %d, Code %d, Unknown008 %d, Approval %d",
+		LogTrading("Handle_OP_TraderShop: TraderClick_Struct TraderID [{}], Code [{}], Unknown008 [{}], Approval [{}]",
 			tcs->TraderID, tcs->Code, tcs->Unknown008, tcs->Approval);
 
 		if (tcs->Code == BazaarWelcome)
 		{
-			Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderShop: Sent Bazaar Welcome Info");
+			LogTrading("Client::Handle_OP_TraderShop: Sent Bazaar Welcome Info");
 			SendBazaarWelcome();
 		}
 		else
@@ -14140,10 +14224,10 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
 			if (Trader)
 			{
 				outtcs->Approval = Trader->WithCustomer(GetID());
-				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderShop: Shop Request (%s) to (%s) with Approval: %d", GetCleanName(), Trader->GetCleanName(), outtcs->Approval);
+				LogTrading("Client::Handle_OP_TraderShop: Shop Request ([{}]) to ([{}]) with Approval: [{}]", GetCleanName(), Trader->GetCleanName(), outtcs->Approval);
 			}
 			else {
-				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderShop: entity_list.GetClientByID(tcs->traderid)"
+				LogTrading("Client::Handle_OP_TraderShop: entity_list.GetClientByID(tcs->traderid)"
 					" returned a nullptr pointer");
 				safe_delete(outapp);
 				return;
@@ -14160,12 +14244,12 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
 				this->BulkSendTraderInventory(Trader->CharacterID());
 				Trader->Trader_CustomerBrowsing(this);
 				TraderID = tcs->TraderID;
-				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderShop: Trader Inventory Sent");
+				LogTrading("Client::Handle_OP_TraderShop: Trader Inventory Sent");
 			}
 			else
 			{
-				Message_StringID(clientMessageYellow, TRADER_BUSY);
-				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderShop: Trader Busy");
+				MessageString(Chat::Yellow, TRADER_BUSY);
+				LogTrading("Client::Handle_OP_TraderShop: Trader Busy");
 			}
 
 			safe_delete(outapp);
@@ -14178,7 +14262,7 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
 		// RoF+
 		// Client requested Bazaar Welcome Info (Trader and Item Total Counts)
 		SendBazaarWelcome();
-		Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_TraderShop: Sent Bazaar Welcome Info");
+		LogTrading("Client::Handle_OP_TraderShop: Sent Bazaar Welcome Info");
 	}
 	else if (app->size == sizeof(TraderBuy_Struct))
 	{
@@ -14190,12 +14274,12 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
 		if (Client* Trader = entity_list.GetClientByID(tbs->TraderID))
 		{
 			BuyTraderItem(tbs, Trader, app);
-			Log(Logs::Detail, Logs::Trading, "Handle_OP_TraderShop: Buy Action %d, Price %d, Trader %d, ItemID %d, Quantity %d, ItemName, %s",
+			LogTrading("Handle_OP_TraderShop: Buy Action [{}], Price [{}], Trader [{}], ItemID [{}], Quantity [{}], ItemName, [{}]",
 				tbs->Action, tbs->Price, tbs->TraderID, tbs->ItemID, tbs->Quantity, tbs->ItemName);
 		}
 		else
 		{
-			Log(Logs::Detail, Logs::Trading, "OP_TraderShop: Null Client Pointer");
+			LogTrading("OP_TraderShop: Null Client Pointer");
 		}
 	}
 	else if (app->size == 4)
@@ -14211,24 +14295,24 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
 			if (c)
 			{
 				c->WithCustomer(0);
-				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: End Transaction - Code %d", Command);
+				LogTrading("Client::Handle_OP_Trader: End Transaction - Code [{}]", Command);
 			}
 			else
 			{
-				Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Null Client Pointer for Trader - Code %d", Command);
+				LogTrading("Client::Handle_OP_Trader: Null Client Pointer for Trader - Code [{}]", Command);
 			}
 			EQApplicationPacket empty(OP_ShopEndConfirm);
 			QueuePacket(&empty);
 		}
 		else
 		{
-			Log(Logs::Detail, Logs::Trading, "Client::Handle_OP_Trader: Unhandled Code %d", Command);
+			LogTrading("Client::Handle_OP_Trader: Unhandled Code [{}]", Command);
 		}
 	}
 	else
 	{
-		Log(Logs::Detail, Logs::Trading, "Unknown size for OP_TraderShop: %i\n", app->size);
-		Log(Logs::General, Logs::Error, "Unknown size for OP_TraderShop: %i\n", app->size);
+		LogTrading("Unknown size for OP_TraderShop: [{}]\n", app->size);
+		LogError("Unknown size for OP_TraderShop: [{}]\n", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -14237,12 +14321,12 @@ void Client::Handle_OP_TraderShop(const EQApplicationPacket *app)
 void Client::Handle_OP_TradeSkillCombine(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(NewCombine_Struct)) {
-		Log(Logs::General, Logs::Error, "Invalid size for NewCombine_Struct: Expected: %i, Got: %i",
+		LogError("Invalid size for NewCombine_Struct: Expected: [{}], Got: [{}]",
 			sizeof(NewCombine_Struct), app->size);
 		return;
 	}
 	/*if (m_tradeskill_object == nullptr) {
-	Message(13, "Error: Server is not aware of the tradeskill container you are attempting to use");
+	Message(Chat::Red, "Error: Server is not aware of the tradeskill container you are attempting to use");
 	return;
 	}*/
 
@@ -14258,7 +14342,7 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app)
 {
 
 	if (app->size != sizeof(Translocate_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_Translocate expected %i got %i", sizeof(Translocate_Struct), app->size);
+		LogDebug("Size mismatch in OP_Translocate expected [{}] got [{}]", sizeof(Translocate_Struct), app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -14268,7 +14352,7 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app)
 		return;
 
 	if ((RuleI(Spells, TranslocateTimeLimit) > 0) && (time(nullptr) > (TranslocateTime + RuleI(Spells, TranslocateTimeLimit)))) {
-		Message(13, "You did not accept the Translocate within the required time limit.");
+		Message(Chat::Red, "You did not accept the Translocate within the required time limit.");
 		PendingTranslocate = false;
 		return;
 	}
@@ -14306,7 +14390,7 @@ void Client::Handle_OP_Translocate(const EQApplicationPacket *app)
 
 void Client::Handle_OP_TributeItem(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Tribute, "Received OP_TributeItem of length %d", app->size);
+	LogTribute("Received OP_TributeItem of length [{}]", app->size);
 
 	//player donates an item...
 	if (app->size != sizeof(TributeItem_Struct))
@@ -14324,7 +14408,7 @@ void Client::Handle_OP_TributeItem(const EQApplicationPacket *app)
 
 		t->tribute_points = TributeItem(t->slot, t->quantity);
 
-		Log(Logs::Detail, Logs::Tribute, "Sending tribute item reply with %d points", t->tribute_points);
+		LogTribute("Sending tribute item reply with [{}] points", t->tribute_points);
 
 		QueuePacket(app);
 	}
@@ -14333,7 +14417,7 @@ void Client::Handle_OP_TributeItem(const EQApplicationPacket *app)
 
 void Client::Handle_OP_TributeMoney(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Tribute, "Received OP_TributeMoney of length %d", app->size);
+	LogTribute("Received OP_TributeMoney of length [{}]", app->size);
 
 	//player donates money
 	if (app->size != sizeof(TributeMoney_Struct))
@@ -14351,7 +14435,7 @@ void Client::Handle_OP_TributeMoney(const EQApplicationPacket *app)
 
 		t->tribute_points = TributeMoney(t->platinum);
 
-		Log(Logs::Detail, Logs::Tribute, "Sending tribute money reply with %d points", t->tribute_points);
+		LogTribute("Sending tribute money reply with [{}] points", t->tribute_points);
 
 		QueuePacket(app);
 	}
@@ -14360,17 +14444,17 @@ void Client::Handle_OP_TributeMoney(const EQApplicationPacket *app)
 
 void Client::Handle_OP_TributeNPC(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Tribute, "Received OP_TributeNPC of length %d", app->size);
+	LogTribute("Received OP_TributeNPC of length [{}]", app->size);
 
 	return;
 }
 
 void Client::Handle_OP_TributeToggle(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Tribute, "Received OP_TributeToggle of length %d", app->size);
+	LogTribute("Received OP_TributeToggle of length [{}]", app->size);
 
 	if (app->size != sizeof(uint32))
-		Log(Logs::General, Logs::Error, "Invalid size on OP_TributeToggle packet");
+		LogError("Invalid size on OP_TributeToggle packet");
 	else {
 		uint32 *val = (uint32 *)app->pBuffer;
 		ToggleTribute(*val ? true : false);
@@ -14380,11 +14464,11 @@ void Client::Handle_OP_TributeToggle(const EQApplicationPacket *app)
 
 void Client::Handle_OP_TributeUpdate(const EQApplicationPacket *app)
 {
-	Log(Logs::Detail, Logs::Tribute, "Received OP_TributeUpdate of length %d", app->size);
+	LogTribute("Received OP_TributeUpdate of length [{}]", app->size);
 
 	//sent when the client changes their tribute settings...
 	if (app->size != sizeof(TributeInfo_Struct))
-		Log(Logs::General, Logs::Error, "Invalid size on OP_TributeUpdate packet");
+		LogError("Invalid size on OP_TributeUpdate packet");
 	else {
 		TributeInfo_Struct *t = (TributeInfo_Struct *)app->pBuffer;
 		ChangeTributeSettings(t);
@@ -14395,9 +14479,7 @@ void Client::Handle_OP_TributeUpdate(const EQApplicationPacket *app)
 void Client::Handle_OP_VetClaimRequest(const EQApplicationPacket *app)
 {
 	if (app->size < sizeof(VeteranClaim)) {
-		Log(Logs::General, Logs::None,
-			"OP_VetClaimRequest size lower than expected: got %u expected at least %u", app->size,
-			sizeof(VeteranClaim));
+		LogDebug("OP_VetClaimRequest size lower than expected: got [{}] expected at least [{}]", app->size, sizeof(VeteranClaim));
 		DumpPacket(app);
 		return;
 	}
@@ -14427,8 +14509,7 @@ void Client::Handle_OP_VoiceMacroIn(const EQApplicationPacket *app)
 
 	if (app->size != sizeof(VoiceMacroIn_Struct)) {
 
-		Log(Logs::General, Logs::None, "Size mismatch in OP_VoiceMacroIn expected %i got %i",
-			sizeof(VoiceMacroIn_Struct), app->size);
+		LogDebug("Size mismatch in OP_VoiceMacroIn expected [{}] got [{}]", sizeof(VoiceMacroIn_Struct), app->size);
 
 		DumpPacket(app);
 
@@ -14446,8 +14527,7 @@ void Client::Handle_OP_VoiceMacroIn(const EQApplicationPacket *app)
 void Client::Handle_OP_UpdateAura(const EQApplicationPacket *app)
 {
 	if (app->size != sizeof(AuraDestory_Struct)) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_UpdateAura expected %i got %i",
-		    sizeof(AuraDestory_Struct), app->size);
+		LogDebug("Size mismatch in OP_UpdateAura expected [{}] got [{}]", sizeof(AuraDestory_Struct), app->size);
 		return;
 	}
 
@@ -14499,7 +14579,7 @@ void Client::Handle_OP_XTargetAutoAddHaters(const EQApplicationPacket *app)
 {
 	if (app->size != 1)
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_XTargetAutoAddHaters, expected 1, got %i", app->size);
+		LogDebug("Size mismatch in OP_XTargetAutoAddHaters, expected 1, got [{}]", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -14511,7 +14591,7 @@ void Client::Handle_OP_XTargetAutoAddHaters(const EQApplicationPacket *app)
 void Client::Handle_OP_XTargetOpen(const EQApplicationPacket *app)
 {
 	if (app->size != 4) {
-		Log(Logs::General, Logs::None, "Size mismatch in OP_XTargetOpen, expected 1, got %i", app->size);
+		LogDebug("Size mismatch in OP_XTargetOpen, expected 1, got [{}]", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -14524,7 +14604,7 @@ void Client::Handle_OP_XTargetRequest(const EQApplicationPacket *app)
 {
 	if (app->size < 12)
 	{
-		Log(Logs::General, Logs::None, "Size mismatch in OP_XTargetRequest, expected at least 12, got %i", app->size);
+		LogDebug("Size mismatch in OP_XTargetRequest, expected at least 12, got [{}]", app->size);
 		DumpPacket(app);
 		return;
 	}
@@ -14747,7 +14827,7 @@ void Client::Handle_OP_XTargetRequest(const EQApplicationPacket *app)
 	}
 
 	default:
-		Log(Logs::General, Logs::None, "Unhandled XTarget Type %i", Type);
+		LogDebug("Unhandled XTarget Type [{}]", Type);
 		break;
 	}
 
diff --git a/zone/client_process.cpp b/zone/client_process.cpp
index 5c750f03a..d8ec451a9 100644
--- a/zone/client_process.cpp
+++ b/zone/client_process.cpp
@@ -241,36 +241,22 @@ bool Client::Process() {
 		if (RuleB(Character, ActiveInvSnapshots) && time(nullptr) >= GetNextInvSnapshotTime()) {
 			if (database.SaveCharacterInvSnapshot(CharacterID())) {
 				SetNextInvSnapshot(RuleI(Character, InvSnapshotMinIntervalM));
-				Log(Logs::Moderate, Logs::Inventory, "Successful inventory snapshot taken of %s - setting next interval for %i minute%s.",
+				LogInventory("Successful inventory snapshot taken of [{}] - setting next interval for [{}] minute[{}]",
 					GetName(), RuleI(Character, InvSnapshotMinIntervalM), (RuleI(Character, InvSnapshotMinIntervalM) == 1 ? "" : "s"));
 			}
 			else {
 				SetNextInvSnapshot(RuleI(Character, InvSnapshotMinRetryM));
-				Log(Logs::Moderate, Logs::Inventory, "Failed to take inventory snapshot of %s - retrying in %i minute%s.",
+				LogInventory("Failed to take inventory snapshot of [{}] - retrying in [{}] minute[{}]",
 					GetName(), RuleI(Character, InvSnapshotMinRetryM), (RuleI(Character, InvSnapshotMinRetryM) == 1 ? "" : "s"));
 			}
 		}
 
-		/* Build a close range list of NPC's  */
-		if (npc_close_scan_timer.Check()) {
-			close_mobs.clear();
-			//Force spawn updates when traveled far 
-			bool force_spawn_updates = false;
-			float client_update_range = (RuleI(Range, ClientForceSpawnUpdateRange) *  RuleI(Range, ClientForceSpawnUpdateRange));
-			float scan_range = (RuleI(Range, ClientNPCScan) * RuleI(Range, ClientNPCScan));
-			auto &mob_list = entity_list.GetMobList();
-			for (auto itr = mob_list.begin(); itr != mob_list.end(); ++itr) {
-				Mob* mob = itr->second;
-				float distance = DistanceSquared(m_Position, mob->GetPosition());
-				if (mob->IsNPC()) {
-					if (distance <= scan_range) {
-						close_mobs.insert(std::pair<Mob *, float>(mob, distance));
-					}
-					else if ((mob->GetAggroRange() * mob->GetAggroRange()) > scan_range) {
-						close_mobs.insert(std::pair<Mob *, float>(mob, distance));
-					}
-				}
-			}
+		/**
+		 * Scan close range mobs
+		 * Used in aggro checks
+		 */
+		if (mob_close_scan_timer.Check()) {
+			entity_list.ScanCloseMobs(close_mobs, this);
 		}
 		
 		bool may_use_attacks = false;
@@ -378,10 +364,10 @@ bool Client::Process() {
 			}
 
 			if (!CombatRange(auto_attack_target)) {
-				Message_StringID(MT_TooFarAway, TARGET_TOO_FAR);
+				MessageString(Chat::TooFarAway, TARGET_TOO_FAR);
 			}
 			else if (auto_attack_target == this) {
-				Message_StringID(MT_TooFarAway, TRY_ATTACKING_SOMEONE);
+				MessageString(Chat::TooFarAway, TRY_ATTACKING_SOMEONE);
 			}
 			else if (!los_status || !los_status_facing) {
 				//you can't see your target
@@ -401,11 +387,11 @@ bool Client::Process() {
 
 		if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
 			if (!dead && !IsBerserk() && GetHPRatio() < RuleI(Combat, BerserkerFrenzyStart)) {
-				entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName());
+				entity_list.MessageCloseString(this, false, 200, 0, BERSERK_START, GetName());
 				berserk = true;
 			}
 			if (IsBerserk() && GetHPRatio() > RuleI(Combat, BerserkerFrenzyEnd)) {
-				entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName());
+				entity_list.MessageCloseString(this, false, 200, 0, BERSERK_END, GetName());
 				berserk = false;
 			}
 		}
@@ -416,11 +402,11 @@ bool Client::Process() {
 			// Range check
 			if (!CombatRange(auto_attack_target)) {
 				// this is a duplicate message don't use it.
-				//Message_StringID(MT_TooFarAway,TARGET_TOO_FAR);
+				//MessageString(Chat::TooFarAway,TARGET_TOO_FAR);
 			}
 			// Don't attack yourself
 			else if (auto_attack_target == this) {
-				//Message_StringID(MT_TooFarAway,TRY_ATTACKING_SOMEONE);
+				//MessageString(Chat::TooFarAway,TRY_ATTACKING_SOMEONE);
 			}
 			else if (!los_status || !los_status_facing)
 			{
@@ -465,7 +451,8 @@ bool Client::Process() {
 			{
 				if (!CombatRange(shield_target))
 				{
-					entity_list.MessageClose_StringID(this, false, 100, 0,
+					entity_list.MessageCloseString(
+						this, false, 100, 0,
 						END_SHIELDING, GetCleanName(), shield_target->GetCleanName());
 					for (int y = 0; y < 2; y++)
 					{
@@ -558,11 +545,10 @@ bool Client::Process() {
 
 	if (client_state != CLIENT_LINKDEAD && !eqs->CheckState(ESTABLISHED)) {
 		OnDisconnect(true);
-		Log(Logs::General, Logs::Zone_Server, "Client linkdead: %s", name);
+		LogInfo("Client linkdead: {}", name);
 
-		if (GetGM()) {
-			if (GetMerc())
-			{
+		if (Admin() > 100) {
+			if (GetMerc()) {
 				GetMerc()->Save();
 				GetMerc()->Depop();
 			}
@@ -592,8 +578,8 @@ bool Client::Process() {
 	// only if client is not feigned
 	if (zone->CanDoCombat() && ret && !GetFeigned() && client_scan_npc_aggro_timer.Check()) {
 		int npc_scan_count = 0;
-		for (auto it = close_mobs.begin(); it != close_mobs.end(); ++it) {
-			Mob *mob = it->first;
+		for (auto & close_mob : close_mobs) {
+			Mob *mob = close_mob.second;
 
 			if (!mob)
 				continue;
@@ -604,9 +590,10 @@ bool Client::Process() {
 			if (mob->CheckWillAggro(this) && !mob->CheckAggro(this)) {
 				mob->AddToHateList(this, 25);
 			}
+
 			npc_scan_count++;
 		}
-		Log(Logs::General, Logs::Aggro, "Checking Reverse Aggro (client->npc) scanned_npcs (%i)", npc_scan_count);
+		LogAggro("Checking Reverse Aggro (client->npc) scanned_npcs ([{}])", npc_scan_count);
 	}
 
 	if (client_state != CLIENT_LINKDEAD && (client_state == CLIENT_ERROR || client_state == DISCONNECTED || client_state == CLIENT_KICKED || !eqs->CheckState(ESTABLISHED)))
@@ -708,7 +695,7 @@ void Client::OnDisconnect(bool hard_disconnect) {
 	Mob *Other = trade->With();
 	if(Other)
 	{
-		Log(Logs::Detail, Logs::Trading, "Client disconnected during a trade. Returning their items.");
+		LogTrading("Client disconnected during a trade. Returning their items");
 		FinishTrade(this);
 
 		if(Other->IsClient())
@@ -740,7 +727,7 @@ void Client::BulkSendInventoryItems()
 		if(inst) {
 			bool is_arrow = (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow) ? true : false;
 			int16 free_slot_id = m_inv.FindFreeSlot(inst->IsClassBag(), true, inst->GetItem()->Size, is_arrow);
-			Log(Logs::Detail, Logs::Inventory, "Incomplete Trade Transaction: Moving %s from slot %i to %i", inst->GetItem()->Name, slot_id, free_slot_id);
+			LogInventory("Incomplete Trade Transaction: Moving [{}] from slot [{}] to [{}]", inst->GetItem()->Name, slot_id, free_slot_id);
 			PutItemInInventory(free_slot_id, *inst, false);
 			database.SaveInventory(character_id, nullptr, slot_id);
 			safe_delete(inst);
@@ -769,7 +756,7 @@ void Client::BulkSendInventoryItems()
 		inst->Serialize(ob, slot_id);
 
 		if (ob.tellp() == last_pos)
-			Log(Logs::General, Logs::Inventory, "Serialization failed on item slot %d during BulkSendInventoryItems.  Item skipped.", slot_id);
+			LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
 		
 		last_pos = ob.tellp();
 	}
@@ -783,7 +770,7 @@ void Client::BulkSendInventoryItems()
 		inst->Serialize(ob, slot_id);
 
 		if (ob.tellp() == last_pos)
-			Log(Logs::General, Logs::Inventory, "Serialization failed on item slot %d during BulkSendInventoryItems.  Item skipped.", slot_id);
+			LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
 
 		last_pos = ob.tellp();
 	}
@@ -797,7 +784,7 @@ void Client::BulkSendInventoryItems()
 		inst->Serialize(ob, slot_id);
 
 		if (ob.tellp() == last_pos)
-			Log(Logs::General, Logs::Inventory, "Serialization failed on item slot %d during BulkSendInventoryItems.  Item skipped.", slot_id);
+			LogInventory("Serialization failed on item slot [{}] during BulkSendInventoryItems. Item skipped", slot_id);
 
 		last_pos = ob.tellp();
 	}
@@ -885,7 +872,7 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
 		// Account for merchant lists with gaps.
 		if (ml.slot >= i) {
 			if (ml.slot > i)
-				Log(Logs::General, Logs::None, "(WARNING) Merchantlist contains gap at slot %d. Merchant: %d, NPC: %d", i, merchant_id, npcid);
+				LogDebug("(WARNING) Merchantlist contains gap at slot [{}]. Merchant: [{}], NPC: [{}]", i, merchant_id, npcid);
 			i = ml.slot + 1;
 		}
 	}
@@ -950,9 +937,9 @@ void Client::BulkSendMerchantInventory(int merchant_id, int npcid) {
 		sprintf(handy_id, "%i", greet_id);
 
 		if (greet_id != MERCHANT_GREETING)
-			Message_StringID(10, GENERIC_STRINGID_SAY, merch->GetCleanName(), handy_id, this->GetName(), handyitem->Name);
+			MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, merch->GetCleanName(), handy_id, this->GetName(), handyitem->Name);
 		else
-			Message_StringID(10, GENERIC_STRINGID_SAY, merch->GetCleanName(), handy_id, this->GetName());
+			MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, merch->GetCleanName(), handy_id, this->GetName());
 	}
 
 //		safe_delete_array(cpi);
@@ -975,7 +962,7 @@ uint8 Client::WithCustomer(uint16 NewCustomer){
 	Client* c = entity_list.GetClientByID(CustomerID);
 
 	if(!c) {
-		Log(Logs::Detail, Logs::Trading, "Previous customer has gone away.");
+		LogTrading("Previous customer has gone away");
 		CustomerID = NewCustomer;
 		return 1;
 	}
@@ -987,8 +974,8 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I
 {
 	if(PendingRezzXP < 0) {
 		// pendingrezexp is set to -1 if we are not expecting an OP_RezzAnswer
-		Log(Logs::Detail, Logs::Spells, "Unexpected OP_RezzAnswer. Ignoring it.");
-		Message(13, "You have already been resurrected.\n");
+		LogSpells("Unexpected OP_RezzAnswer. Ignoring it");
+		Message(Chat::Red, "You have already been resurrected.\n");
 		return;
 	}
 
@@ -997,7 +984,7 @@ void Client::OPRezzAnswer(uint32 Action, uint32 SpellID, uint16 ZoneID, uint16 I
 		// Mark the corpse as rezzed in the database, just in case the corpse has buried, or the zone the
 		// corpse is in has shutdown since the rez spell was cast.
 		database.MarkCorpseAsRezzed(PendingRezzDBID);
-		Log(Logs::Detail, Logs::Spells, "Player %s got a %i Rezz, spellid %i in zone%i, instance id %i",
+		LogSpells("Player [{}] got a [{}] Rezz, spellid [{}] in zone[{}], instance id [{}]",
 				this->name, (uint16)spells[SpellID].base[0],
 				SpellID, ZoneID, InstanceID);
 
@@ -1042,7 +1029,7 @@ void Client::OPTGB(const EQApplicationPacket *app)
 
 	uint32 tgb_flag = *(uint32 *)app->pBuffer;
 	if(tgb_flag == 2)
-		Message_StringID(0, TGB() ? TGB_ON : TGB_OFF);
+		MessageString(Chat::White, TGB() ? TGB_ON : TGB_OFF);
 	else
 		tgb = tgb_flag;
 }
@@ -1051,7 +1038,7 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app)
 {
 	if(app->size != sizeof(MemorizeSpell_Struct))
 	{
-		Log(Logs::General, Logs::Error, "Wrong size on OP_MemorizeSpell. Got: %i, Expected: %i", app->size, sizeof(MemorizeSpell_Struct));
+		LogError("Wrong size on OP_MemorizeSpell. Got: [{}], Expected: [{}]", app->size, sizeof(MemorizeSpell_Struct));
 		DumpPacket(app);
 		return;
 	}
@@ -1060,7 +1047,7 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app)
 
 	if(!IsValidSpell(memspell->spell_id))
 	{
-		Message(13, "Unexpected error: spell id out of range");
+		Message(Chat::Red, "Unexpected error: spell id out of range");
 		return;
 	}
 
@@ -1071,8 +1058,8 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app)
 	)
 	{
 		char val1[20]={0};
-		Message_StringID(13,SPELL_LEVEL_TO_LOW,ConvertArray(spells[memspell->spell_id].classes[GetClass()-1],val1),spells[memspell->spell_id].name);
-		//Message(13, "Unexpected error: Class cant use this spell at your level!");
+		MessageString(Chat::Red,SPELL_LEVEL_TO_LOW,ConvertArray(spells[memspell->spell_id].classes[GetClass()-1],val1),spells[memspell->spell_id].name);
+		//Message(Chat::Red, "Unexpected error: Class cant use this spell at your level!");
 		return;
 	}
 
@@ -1086,7 +1073,7 @@ void Client::OPMemorizeSpell(const EQApplicationPacket* app)
 				const EQEmu::ItemData* item = inst->GetItem();
 
 				if (RuleB(Character, RestrictSpellScribing) && !item->IsEquipable(GetRace(), GetClass())) {
-					Message_StringID(13, CANNOT_USE_ITEM);
+					MessageString(Chat::Red, CANNOT_USE_ITEM);
 					break;
 				}
 
@@ -1438,7 +1425,7 @@ void Client::OPMoveCoin(const EQApplicationPacket* app)
 		}
 		else{
 			if (to_bucket == &m_pp.platinum_shared || from_bucket == &m_pp.platinum_shared){
-				this->Message(13, "::: WARNING! ::: SHARED BANK IS DISABLED AND YOUR PLATINUM WILL BE DESTROYED IF YOU PUT IT HERE");
+				this->Message(Chat::Red, "::: WARNING! ::: SHARED BANK IS DISABLED AND YOUR PLATINUM WILL BE DESTROYED IF YOU PUT IT HERE");
 			}
 		}
 	}
@@ -1454,8 +1441,8 @@ void Client::OPMoveCoin(const EQApplicationPacket* app)
 			with->trade->state = Trading;
 
 		Client* recipient = trader->CastToClient();
-		recipient->Message(15, "%s adds some coins to the trade.", GetName());
-		recipient->Message(15, "The total trade is: %i PP, %i GP, %i SP, %i CP",
+		recipient->Message(Chat::Yellow, "%s adds some coins to the trade.", GetName());
+		recipient->Message(Chat::Yellow, "The total trade is: %i PP, %i GP, %i SP, %i CP",
 			trade->pp, trade->gp,
 			trade->sp, trade->cp
 		);
@@ -1525,7 +1512,7 @@ void Client::OPGMTraining(const EQApplicationPacket *app)
 	// welcome message
 	if (pTrainer && pTrainer->IsNPC())
 	{
-		pTrainer->Say_StringID(zone->random.Int(1204, 1207), GetCleanName());
+		pTrainer->SayString(zone->random.Int(1204, 1207), GetCleanName());
 	}
 }
 
@@ -1554,7 +1541,7 @@ void Client::OPGMEndTraining(const EQApplicationPacket *app)
 	// goodbye message
 	if (pTrainer->IsNPC())
 	{
-		pTrainer->Say_StringID(zone->random.Int(1208, 1211), GetCleanName());
+		pTrainer->SayString(zone->random.Int(1208, 1211), GetCleanName());
 	}
 }
 
@@ -1610,12 +1597,12 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 		EQEmu::skills::SkillType skill = (EQEmu::skills::SkillType)gmskill->skill_id;
 
 		if(!CanHaveSkill(skill)) {
-			Log(Logs::Detail, Logs::Skills, "Tried to train skill %d, which is not allowed.", skill);
+			LogSkills("Tried to train skill [{}], which is not allowed", skill);
 			return;
 		}
 
 		if(MaxSkill(skill) == 0) {
-			Log(Logs::Detail, Logs::Skills, "Tried to train skill %d, but training is not allowed at this level.", skill);
+			LogSkills("Tried to train skill [{}], but training is not allowed at this level", skill);
 			return;
 		}
 
@@ -1644,7 +1631,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 			case EQEmu::skills::SkillJewelryMaking:
 			case EQEmu::skills::SkillPottery:
 				if(skilllevel >= RuleI(Skills, MaxTrainTradeskills)) {
-					Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
+					MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
 					return;
 				}
 				break;
@@ -1654,7 +1641,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 			case EQEmu::skills::SkillSpecializeDivination:
 			case EQEmu::skills::SkillSpecializeEvocation:
 				if(skilllevel >= RuleI(Skills, MaxTrainSpecializations)) {
-					Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
+					MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
 					return;
 				}
 			default:
@@ -1665,7 +1652,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 			if (skilllevel >= MaxSkillValue)
 			{
 				// Don't allow training over max skill level
-				Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
+				MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
 				return;
 			}
 
@@ -1675,7 +1662,7 @@ void Client::OPGMTrainSkill(const EQApplicationPacket *app)
 				if (skilllevel >= MaxSpecSkill)
 				{
 					// Restrict specialization training to follow the rules
-					Message_StringID(13, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
+					MessageString(Chat::Red, MORE_SKILLED_THAN_I, pTrainer->GetCleanName());
 					return;
 				}
 			}
@@ -1800,8 +1787,7 @@ void Client::DoStaminaHungerUpdate()
 	auto outapp = new EQApplicationPacket(OP_Stamina, sizeof(Stamina_Struct));
 	Stamina_Struct *sta = (Stamina_Struct *)outapp->pBuffer;
 
-	Log(Logs::General, Logs::Food, "Client::DoStaminaHungerUpdate() hunger_level: %i thirst_level: %i before loss",
-	    m_pp.hunger_level, m_pp.thirst_level);
+	LogFood("Client::DoStaminaHungerUpdate() hunger_level: [{}] thirst_level: [{}] before loss", m_pp.hunger_level, m_pp.thirst_level);
 
 	if (zone->GetZoneID() != 151 && !GetGM()) {
 		int loss = RuleI(Character, FoodLossPerUpdate);
@@ -1822,9 +1808,7 @@ void Client::DoStaminaHungerUpdate()
 		sta->water = 6000;
 	}
 
-	Log(Logs::General, Logs::Food,
-	    "Client::DoStaminaHungerUpdate() Current hunger_level: %i = (%i minutes left) thirst_level: %i = (%i "
-	    "minutes left) - after loss",
+	LogFood("Client::DoStaminaHungerUpdate() Current hunger_level: [{}] = ([{}] minutes left) thirst_level: [{}] = ([{}] minutes left) - after loss",
 	    m_pp.hunger_level, m_pp.hunger_level, m_pp.thirst_level, m_pp.thirst_level);
 
 	FastQueuePacket(&outapp);
@@ -1918,7 +1902,7 @@ void Client::DoTracking()
 	Mob *m = entity_list.GetMob(TrackingID);
 
 	if (!m || m->IsCorpse()) {
-		Message_StringID(MT_Skills, TRACK_LOST_TARGET);
+		MessageString(Chat::Skills, TRACK_LOST_TARGET);
 		TrackingID = 0;
 		return;
 	}
@@ -1929,23 +1913,23 @@ void Client::DoTracking()
 		RelativeHeading += 512;
 
 	if (RelativeHeading > 480)
-		Message_StringID(MT_Skills, TRACK_STRAIGHT_AHEAD, m->GetCleanName());
+		MessageString(Chat::Skills, TRACK_STRAIGHT_AHEAD, m->GetCleanName());
 	else if (RelativeHeading > 416)
-		Message_StringID(MT_Skills, TRACK_AHEAD_AND_TO, m->GetCleanName(), "left");
+		MessageString(Chat::Skills, TRACK_AHEAD_AND_TO, m->GetCleanName(), "left");
 	else if (RelativeHeading > 352)
-		Message_StringID(MT_Skills, TRACK_TO_THE, m->GetCleanName(), "left");
+		MessageString(Chat::Skills, TRACK_TO_THE, m->GetCleanName(), "left");
 	else if (RelativeHeading > 288)
-		Message_StringID(MT_Skills, TRACK_BEHIND_AND_TO, m->GetCleanName(), "left");
+		MessageString(Chat::Skills, TRACK_BEHIND_AND_TO, m->GetCleanName(), "left");
 	else if (RelativeHeading > 224)
-		Message_StringID(MT_Skills, TRACK_BEHIND_YOU, m->GetCleanName());
+		MessageString(Chat::Skills, TRACK_BEHIND_YOU, m->GetCleanName());
 	else if (RelativeHeading > 160)
-		Message_StringID(MT_Skills, TRACK_BEHIND_AND_TO, m->GetCleanName(), "right");
+		MessageString(Chat::Skills, TRACK_BEHIND_AND_TO, m->GetCleanName(), "right");
 	else if (RelativeHeading > 96)
-		Message_StringID(MT_Skills, TRACK_TO_THE, m->GetCleanName(), "right");
+		MessageString(Chat::Skills, TRACK_TO_THE, m->GetCleanName(), "right");
 	else if (RelativeHeading > 32)
-		Message_StringID(MT_Skills, TRACK_AHEAD_AND_TO, m->GetCleanName(), "right");
+		MessageString(Chat::Skills, TRACK_AHEAD_AND_TO, m->GetCleanName(), "right");
 	else if (RelativeHeading >= 0)
-		Message_StringID(MT_Skills, TRACK_STRAIGHT_AHEAD, m->GetCleanName());
+		MessageString(Chat::Skills, TRACK_STRAIGHT_AHEAD, m->GetCleanName());
 }
 
 void Client::HandleRespawnFromHover(uint32 Option)
@@ -2003,7 +1987,7 @@ void Client::HandleRespawnFromHover(uint32 Option)
 		{
 			if (PendingRezzXP < 0 || PendingRezzSpellID == 0)
 			{
-				Log(Logs::Detail, Logs::Spells, "Unexpected Rezz from hover request.");
+				LogSpells("Unexpected Rezz from hover request");
 				return;
 			}
 			SetHP(GetMaxHP() / 5);
@@ -2037,10 +2021,10 @@ void Client::HandleRespawnFromHover(uint32 Option)
 
 			if (corpse && corpse->IsCorpse())
 			{
-				Log(Logs::Detail, Logs::Spells, "Hover Rez in zone %s for corpse %s",
+				LogSpells("Hover Rez in zone [{}] for corpse [{}]",
 						zone->GetShortName(), PendingRezzCorpseName.c_str());
 
-				Log(Logs::Detail, Logs::Spells, "Found corpse. Marking corpse as rezzed.");
+				LogSpells("Found corpse. Marking corpse as rezzed");
 
 				corpse->IsRezzed(true);
 				corpse->CompleteResurrection();
diff --git a/zone/command.cpp b/zone/command.cpp
index bd5aa71c9..877529c2b 100755
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -38,6 +38,7 @@
 #include <algorithm>
 #include <ctime>
 #include <thread>
+#include <fmt/format.h>
 
 #ifdef _WINDOWS
 #define strcasecmp _stricmp
@@ -105,7 +106,7 @@ LinkedList<CommandRecord *> cleanup_commandlist;
  */
 int command_notavail(Client *c, const char *message)
 {
-	c->Message(13, "Commands not available.");
+	c->Message(Chat::Red, "Commands not available.");
 	return -1;
 }
 
@@ -151,7 +152,7 @@ Access Levels:
 int command_init(void)
 {
 	commandaliases.clear();
-	
+
 	if (
 		command_add("acceptrules", "[acceptrules] - Accept the EQEmu Agreement", 0, command_acceptrules) ||
 		command_add("advnpcspawn", "[maketype|makegroup|addgroupentry|addgroupspawn][removegroupspawn|movespawn|editgroupbox|cleargroupbox]", 150, command_advnpcspawn) ||
@@ -181,6 +182,7 @@ int command_init(void)
 		command_add("crashtest", "- Crash the zoneserver", 255, command_crashtest) ||
 		command_add("cvs", "- Summary of client versions currently online.", 200, command_cvs) ||
 		command_add("damage", "[amount] - Damage your target", 100, command_damage) ||
+		command_add("databuckets", "View|Delete [key] [limit]- View data buckets, limit 50 default or Delete databucket by key", 80, command_databuckets) ||
 		command_add("date", "[yyyy] [mm] [dd] [HH] [MM] - Set EQ time", 90, command_date) ||
 		command_add("dbspawn2", "[spawngroup] [respawn] [variance] - Spawn an NPC from a predefined row in the spawn2 table", 100, command_dbspawn2) ||
 		command_add("delacct", "[accountname] - Delete an account", 150, command_delacct) ||
@@ -200,6 +202,7 @@ int command_init(void)
 		command_add("enablerecipe",  "[recipe_id] - Enables a recipe using the recipe id.",  80, command_enablerecipe) ||
 		command_add("equipitem", "[slotid(0-21)] - Equip the item on your cursor into the specified slot", 50, command_equipitem) ||
 		command_add("face", "- Change the face of your target", 80, command_face) ||
+		command_add("faction", "[Find (criteria | all ) | Review (criteria | all) | Reset (id)] - Resets Player's Faction", 80, command_faction) ||
 		command_add("findaliases", "[search term]- Searches for available command aliases, by alias or command", 0, command_findaliases) ||
 		command_add("findnpctype", "[search criteria] - Search database NPC types", 100, command_findnpctype) ||
 		command_add("findspell", "[searchstring] - Search for a spell", 50, command_findspell) ||
@@ -222,7 +225,7 @@ int command_init(void)
 		command_add("gm", "- Turn player target's or your GM flag on or off", 80, command_gm) ||
 		command_add("gmspeed", "[on/off] - Turn GM speed hack on/off for you or your player target", 100, command_gmspeed) ||
 		command_add("gmzone", "[zone_short_name] [zone_version=0] [identifier=gmzone] - Zones to a private GM instance", 100, command_gmzone) ||
-		command_add("goto", "[x] [y] [z] - Teleport to the provided coordinates or to your target", 10, command_goto) ||
+		command_add("goto", "[playername] or [x y z] [h] - Teleport to the provided coordinates or to your target", 10, command_goto) ||
 		command_add("grid", "[add/delete] [grid_num] [wandertype] [pausetype] - Create/delete a wandering grid", 170, command_grid) ||
 		command_add("guild", "- Guild manipulation commands. Use argument help for more info.", 10, command_guild) ||
 		command_add("guildapprove", "[guildapproveid] - Approve a guild with specified ID (guild creator receives the id)", 0, command_guildapprove) ||
@@ -282,6 +285,7 @@ int command_init(void)
 		command_add("network", "- Admin commands for the udp network interface.", 250, command_network) ||
 		command_add("npccast", "[targetname/entityid] [spellid] - Causes NPC target to cast spellid on targetname/entityid", 80, command_npccast) ||
 		command_add("npcedit", "[column] [value] - Mega NPC editing command", 100, command_npcedit) ||
+		command_add("npceditmass", "[name-search] [column] [value] - Mass (Zone wide) NPC data editing command", 100, command_npceditmass) ||
 		command_add("npcemote", "[message] - Make your NPC target emote a message.", 150, command_npcemote) ||
 		command_add("npcloot", "[show/money/add/remove] [itemid/all/money: pp gp sp cp] - Manipulate the loot an NPC is carrying", 80, command_npcloot) ||
 		command_add("npcsay", "[message] - Make your NPC target say a message.", 150, command_npcsay) ||
@@ -291,6 +295,7 @@ int command_init(void)
 		command_add("npcstats", "- Show stats about target NPC", 80, command_npcstats) ||
 		command_add("npctype_cache",  "[id] or all - Clears the npc type cache for either the id or all npcs.",  250, command_npctype_cache) ||
 		command_add("npctypespawn", "[npctypeid] [factionid] - Spawn an NPC from the db", 10, command_npctypespawn) ||
+		command_add("nudge", "- Nudge your target's current position by specific values", 80, command_nudge) ||
 		command_add("nukebuffs", "- Strip all buffs on you or your target", 50, command_nukebuffs) ||
 		command_add("nukeitem", "[itemid] - Remove itemid from your player target's inventory", 150, command_nukeitem) ||
 		command_add("object", "List|Add|Edit|Move|Rotate|Copy|Save|Undo|Delete - Manipulate static and tradeskill objects within the zone", 100, command_object) ||
@@ -344,6 +349,7 @@ int command_init(void)
 		command_add("resetaa", "- Resets a Player's AA in their profile and refunds spent AA's to unspent, may disconnect player.", 200, command_resetaa) ||
 		command_add("resetaa_timer", "Command to reset AA cooldown timers.", 200, command_resetaa_timer) ||
 		command_add("revoke", "[charname] [1/0] - Makes charname unable to talk on OOC", 200, command_revoke) ||
+		command_add("roambox", "Manages roambox settings for an NPC", 200, command_roambox) ||
 		command_add("rules", "(subcommand) - Manage server rules", 250, command_rules) ||
 		command_add("save", "- Force your player or player corpse target to be saved to the database", 50, command_save) ||
 		command_add("scale", "- Handles npc scaling", 150, command_scale) ||
@@ -380,6 +386,7 @@ int command_init(void)
 		command_add("shutdown", "- Shut this zone process down", 150, command_shutdown) ||
 		command_add("size", "[size] - Change size of you or your target", 50, command_size) ||
 		command_add("spawn", "[name] [race] [level] [material] [hp] [gender] [class] [priweapon] [secweapon] [merchantid] - Spawn an NPC", 10, command_spawn) ||
+		command_add("spawneditmass", "Mass editing spawn command", 150, command_spawneditmass) ||
 		command_add("spawnfix", "- Find targeted NPC in database based on its X/Y/heading and update the database to make it spawn at your current location/heading.", 170, command_spawnfix) ||
 		command_add("spawnstatus", "- Show respawn timer status", 100, command_spawnstatus) ||
 		command_add("spellinfo", "[spellid] - Get detailed info about a spell", 10, command_spellinfo) ||
@@ -445,37 +452,94 @@ int command_init(void)
 		command_deinit();
 		return -1;
 	}
-	
+
 	std::map<std::string, std::pair<uint8, std::vector<std::string>>> command_settings;
 	database.GetCommandSettings(command_settings);
 
-	std::map<std::string, CommandRecord *> working_cl = commandlist;
-	for (auto iter_cl = working_cl.begin(); iter_cl != working_cl.end(); ++iter_cl) {
-		auto iter_cs = command_settings.find(iter_cl->first);
-		if (iter_cs == command_settings.end()) {
-			if (iter_cl->second->access == 0)
-				Log(Logs::General, Logs::Commands, "command_init(): Warning: Command '%s' defaulting to access level 0!", iter_cl->first.c_str());
+	std::vector<std::pair<std::string, uint8>> injected_command_settings;
+	std::vector<std::string> orphaned_command_settings;
+
+	for (auto cs_iter : command_settings) {
+
+		auto cl_iter = commandlist.find(cs_iter.first);
+		if (cl_iter == commandlist.end()) {
+
+			orphaned_command_settings.push_back(cs_iter.first);
+			LogInfo(
+				"Command [{}] no longer exists... Deleting orphaned entry from `command_settings` table...",
+				cs_iter.first.c_str()
+			);
+		}
+	}
+
+	if (orphaned_command_settings.size()) {
+		if (!database.UpdateOrphanedCommandSettings(orphaned_command_settings)) {
+			LogInfo("Failed to process 'Orphaned Commands' update operation.");
+		}
+	}
+
+	auto working_cl = commandlist;
+	for (auto working_cl_iter : working_cl) {
+
+		auto cs_iter = command_settings.find(working_cl_iter.first);
+		if (cs_iter == command_settings.end()) {
+
+			injected_command_settings.push_back(std::pair<std::string, uint8>(working_cl_iter.first, working_cl_iter.second->access));
+			LogInfo(
+				"New Command [{}] found... Adding to `command_settings` table with access [{}]...",
+				working_cl_iter.first.c_str(),
+				working_cl_iter.second->access
+			);
+
+			if (working_cl_iter.second->access == 0) {
+				LogCommands(
+					"command_init(): Warning: Command [{}] defaulting to access level 0!",
+					working_cl_iter.first.c_str()
+				);
+			}
+			
 			continue;
 		}
 
-		iter_cl->second->access = iter_cs->second.first;
-		Log(Logs::General, Logs::Commands, "command_init(): - Command '%s' set to access level %d.", iter_cl->first.c_str(), iter_cs->second.first);
-		if (iter_cs->second.second.empty())
+		working_cl_iter.second->access = cs_iter->second.first;
+		LogCommands(
+			"command_init(): - Command [{}] set to access level [{}]",
+			working_cl_iter.first.c_str(),
+			cs_iter->second.first
+		);
+		
+		if (cs_iter->second.second.empty()) {
 			continue;
+		}
 
-		for (auto iter_aka = iter_cs->second.second.begin(); iter_aka != iter_cs->second.second.end();
-		     ++iter_aka) {
-			if (iter_aka->empty())
-				continue;
-			if (commandlist.find(*iter_aka) != commandlist.end()) {
-				Log(Logs::General, Logs::Commands, "command_init(): Warning: Alias '%s' already exists as a command - skipping!", iter_aka->c_str());
+		for (auto alias_iter : cs_iter->second.second) {
+			if (alias_iter.empty()) {
 				continue;
 			}
 
-			commandlist[*iter_aka] = iter_cl->second;
-			commandaliases[*iter_aka] = iter_cl->first;
+			if (commandlist.find(alias_iter) != commandlist.end()) {
+				LogCommands(
+					"command_init(): Warning: Alias [{}] already exists as a command - skipping!",
+					alias_iter.c_str()
+				);
+				
+				continue;
+			}
 
-			Log(Logs::General, Logs::Commands, "command_init(): - Alias '%s' added to command '%s'.", iter_aka->c_str(), commandaliases[*iter_aka].c_str());
+			commandlist[alias_iter] = working_cl_iter.second;
+			commandaliases[alias_iter] = working_cl_iter.first;
+
+			LogCommands(
+				"command_init(): - Alias [{}] added to command [{}]",
+				alias_iter.c_str(),
+				commandaliases[alias_iter].c_str()
+			);
+		}
+	}
+
+	if (injected_command_settings.size()) {
+		if (!database.UpdateInjectedCommandSettings(injected_command_settings)) {
+			LogInfo("Failed to process 'Injected Commands' update operation.");
 		}
 	}
 
@@ -515,21 +579,21 @@ void command_deinit(void)
 int command_add(std::string command_name, const char *desc, int access, CmdFuncPtr function)
 {
 	if (command_name.empty()) {
-		Log(Logs::General, Logs::Error, "command_add() - Command added with empty name string - check command.cpp.");
+		LogError("command_add() - Command added with empty name string - check command.cpp");
 		return -1;
 	}
 	if (function == nullptr) {
-		Log(Logs::General, Logs::Error, "command_add() - Command '%s' added without a valid function pointer - check command.cpp.", command_name.c_str());
+		LogError("command_add() - Command [{}] added without a valid function pointer - check command.cpp", command_name.c_str());
 		return -1;
 	}
 	if (commandlist.count(command_name) != 0) {
-		Log(Logs::General, Logs::Error, "command_add() - Command '%s' is a duplicate command name - check command.cpp.", command_name.c_str());
+		LogError("command_add() - Command [{}] is a duplicate command name - check command.cpp", command_name.c_str());
 		return -1;
 	}
 	for (auto iter = commandlist.begin(); iter != commandlist.end(); ++iter) {
 		if (iter->second->function != function)
 			continue;
-		Log(Logs::General, Logs::Error, "command_add() - Command '%s' equates to an alias of '%s' - check command.cpp.", command_name.c_str(), iter->first.c_str());
+		LogError("command_add() - Command [{}] equates to an alias of [{}] - check command.cpp", command_name.c_str(), iter->first.c_str());
 		return -1;
 	}
 
@@ -572,7 +636,7 @@ int command_realdispatch(Client *c, const char *message)
 
 	CommandRecord *cur = commandlist[cstr];
 	if(c->Admin() < cur->access){
-		c->Message(13,"Your access level is not high enough to use this command.");
+		c->Message(Chat::Red,"Your access level is not high enough to use this command.");
 		return(-1);
 	}
 
@@ -583,11 +647,11 @@ int command_realdispatch(Client *c, const char *message)
 	}
 
 	if(cur->access >= COMMANDS_LOGGING_MIN_STATUS) {
-		Log(Logs::General, Logs::Commands, "%s (%s) used command: %s (target=%s)",  c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE");
+		LogCommands("[{}] ([{}]) used command: [{}] (target=[{}])",  c->GetName(), c->AccountName(), message, c->GetTarget()?c->GetTarget()->GetName():"NONE");
 	}
 
 	if(cur->function == nullptr) {
-		Log(Logs::General, Logs::Error, "Command '%s' has a null function\n",  cstr.c_str());
+		LogError("Command [{}] has a null function\n", cstr.c_str());
 		return(-1);
 	} else {
 		//dispatch C++ command
@@ -670,9 +734,9 @@ void command_setstat(Client* c, const Seperator* sep){
 		c->GetTarget()->CastToClient()->SetStats(atoi(sep->arg[1]),atoi(sep->arg[2]));
 	}
 	else{
-		c->Message(0,"This command is used to permanently increase or decrease a players stats.");
-		c->Message(0,"Usage: #setstat {type} {value the stat should be}");
-		c->Message(0,"Types: Str: 0, Sta: 1, Agi: 2, Dex: 3, Int: 4, Wis: 5, Cha: 6");
+		c->Message(Chat::White,"This command is used to permanently increase or decrease a players stats.");
+		c->Message(Chat::White,"Usage: #setstat {type} {value the stat should be}");
+		c->Message(Chat::White,"Types: Str: 0, Sta: 1, Agi: 2, Dex: 3, Int: 4, Wis: 5, Cha: 6");
 	}
 }
 
@@ -681,27 +745,27 @@ void command_incstat(Client* c, const Seperator* sep){
 		c->GetTarget()->CastToClient()->IncStats(atoi(sep->arg[1]),atoi(sep->arg[2]));
 	}
 	else{
-		c->Message(0,"This command is used to permanently increase or decrease a players stats.");
-		c->Message(0,"Usage: #setstat {type} {value by which to increase or decrease}");
-		c->Message(0,"Note: The value is in increments of 2, so a value of 3 will actually increase the stat by 6");
-		c->Message(0,"Types: Str: 0, Sta: 1, Agi: 2, Dex: 3, Int: 4, Wis: 5, Cha: 6");
+		c->Message(Chat::White,"This command is used to permanently increase or decrease a players stats.");
+		c->Message(Chat::White,"Usage: #setstat {type} {value by which to increase or decrease}");
+		c->Message(Chat::White,"Note: The value is in increments of 2, so a value of 3 will actually increase the stat by 6");
+		c->Message(Chat::White,"Types: Str: 0, Sta: 1, Agi: 2, Dex: 3, Int: 4, Wis: 5, Cha: 6");
 	}
 }
 
 void command_resetaa(Client* c,const Seperator *sep) {
 	if(c->GetTarget() && c->GetTarget()->IsClient()){
 		c->GetTarget()->CastToClient()->ResetAA();
-		c->Message(13,"Successfully reset %s's AAs", c->GetTarget()->GetName());
+		c->Message(Chat::Red,"Successfully reset %s's AAs", c->GetTarget()->GetName());
 	}
 	else
-		c->Message(0,"Usage: Target a client and use #resetaa to reset the AA data in their Profile.");
+		c->Message(Chat::White,"Usage: Target a client and use #resetaa to reset the AA data in their Profile.");
 }
 
 void command_help(Client *c, const Seperator *sep)
 {
 	int commands_shown=0;
 
-	c->Message(0, "Available EQEMu commands:");
+	c->Message(Chat::White, "Available EQEMu commands:");
 
 	std::map<std::string, CommandRecord *>::iterator cur,end;
 	cur = commandlist.begin();
@@ -717,29 +781,35 @@ void command_help(Client *c, const Seperator *sep)
 		if(c->Admin() < cur->second->access)
 			continue;
 		commands_shown++;
-		c->Message(0, "	%c%s %s",  COMMAND_CHAR, cur->first.c_str(), cur->second->desc == nullptr?"":cur->second->desc);
+		c->Message(Chat::White, "	%c%s %s",  COMMAND_CHAR, cur->first.c_str(), cur->second->desc == nullptr?"":cur->second->desc);
 	}
-	c->Message(0, "%d command%s listed.",  commands_shown, commands_shown!=1?"s":"");
+	if (parse->PlayerHasQuestSub(EVENT_COMMAND)) {
+		int i = parse->EventPlayer(EVENT_COMMAND, c, sep->msg, 0);
+		if (i >= 1) {
+			commands_shown += i;
+		}
+	}
+	c->Message(Chat::White, "%d command%s listed.",  commands_shown, commands_shown!=1?"s":"");
 
 }
 
 void command_version(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Current version information.");
-	c->Message(0, "	%s",  CURRENT_VERSION);
-	c->Message(0, "	Compiled on: %s at %s",  COMPILE_DATE, COMPILE_TIME);
-	c->Message(0, "	Last modified on: %s",  LAST_MODIFIED);
+	c->Message(Chat::White, "Current version information.");
+	c->Message(Chat::White, "	%s",  CURRENT_VERSION);
+	c->Message(Chat::White, "	Compiled on: %s at %s",  COMPILE_DATE, COMPILE_TIME);
+	c->Message(Chat::White, "	Last modified on: %s",  LAST_MODIFIED);
 }
 
 void command_setfaction(Client *c, const Seperator *sep)
 {
 	if((sep->arg[1][0] == 0 || strcasecmp(sep->arg[1],"*")==0) || ((c->GetTarget()==0) || (c->GetTarget()->IsClient()))) {
-		c->Message(0, "Usage: #setfaction [faction number]");
+		c->Message(Chat::White, "Usage: #setfaction [faction number]");
 		return;
     }
 
     auto npcTypeID = c->GetTarget()->CastToNPC()->GetNPCTypeID();
-    c->Message(15,"Setting NPC %u to faction %i",  npcTypeID, atoi(sep->argplus[1]));
+    c->Message(Chat::Yellow,"Setting NPC %u to faction %i",  npcTypeID, atoi(sep->argplus[1]));
 
     std::string query = StringFormat("UPDATE npc_types SET npc_faction_id = %i WHERE id = %i",
                                     atoi(sep->argplus[1]), npcTypeID);
@@ -749,9 +819,9 @@ void command_setfaction(Client *c, const Seperator *sep)
 void command_serversidename(Client *c, const Seperator *sep)
 {
 	if(c->GetTarget())
-		c->Message(0, c->GetTarget()->GetName());
+		c->Message(Chat::White, c->GetTarget()->GetName());
 	else
-		c->Message(0, "Error: no target");
+		c->Message(Chat::White, "Error: no target");
 }
 
 void command_wc(Client *c, const Seperator *sep)
@@ -763,7 +833,7 @@ void command_wc(Client *c, const Seperator *sep)
 		);
 	}
 	else if (c->GetTarget() == nullptr) {
-		c->Message(13, "You must have a target to do a wear change.");
+		c->Message(Chat::Red, "You must have a target to do a wear change.");
 	}
 	else {
 		uint32 hero_forge_model = 0;
@@ -799,10 +869,10 @@ void command_wc(Client *c, const Seperator *sep)
 void command_heromodel(Client *c, const Seperator *sep)
 {
 	if (sep->argnum < 1) {
-		c->Message(0, "Usage: #heromodel [hero forge model] [ [slot] ] (example: #heromodel 63)");
+		c->Message(Chat::White, "Usage: #heromodel [hero forge model] [ [slot] ] (example: #heromodel 63)");
 	}
 	else if (c->GetTarget() == nullptr) {
-		c->Message(13, "You must have a target to do a wear change for Hero's Forge Models.");
+		c->Message(Chat::Red, "You must have a target to do a wear change for Hero's Forge Models.");
 	}
 	else {
 		uint32 hero_forge_model = atoi(sep->arg[1]);
@@ -823,7 +893,7 @@ void command_heromodel(Client *c, const Seperator *sep)
 				}
 			}
 			else {
-				c->Message(13, "Hero's Forge Model must be greater than 0.");
+				c->Message(Chat::Red, "Hero's Forge Model must be greater than 0.");
 			}
 		}
 	}
@@ -834,12 +904,12 @@ void command_setanim(Client *c, const Seperator *sep)
 	if (c->GetTarget() && sep->IsNumber(1)) {
 		int num = atoi(sep->arg[1]);
 		if (num < 0 || num >= _eaMaxAppearance) {
-			c->Message(0, "Invalid animation number, between 0 and %d", _eaMaxAppearance - 1);
+			c->Message(Chat::White, "Invalid animation number, between 0 and %d", _eaMaxAppearance - 1);
 		}
 		c->GetTarget()->SetAppearance(EmuAppearance(num));
 	}
 	else {
-		c->Message(0, "Usage: #setanim [animnum]");
+		c->Message(Chat::White, "Usage: #setanim [animnum]");
 	}
 }
 
@@ -851,50 +921,50 @@ void command_serverinfo(Client *c, const Seperator *sep)
 	auto rss = EQ::GetRSS();
 	auto uptime = EQ::GetUptime();
 
-	c->Message(0, "Operating System Information");
-	c->Message(0, "==================================================");
-	c->Message(0, "System: %s", os.sysname.c_str());
-	c->Message(0, "Release: %s", os.release.c_str());
-	c->Message(0, "Version: %s", os.version.c_str());
-	c->Message(0, "Machine: %s", os.machine.c_str());
-	c->Message(0, "Uptime: %.2f seconds", uptime);
-	c->Message(0, "==================================================");
-	c->Message(0, "CPU Information");
-	c->Message(0, "==================================================");
+	c->Message(Chat::White, "Operating System Information");
+	c->Message(Chat::White, "==================================================");
+	c->Message(Chat::White, "System: %s", os.sysname.c_str());
+	c->Message(Chat::White, "Release: %s", os.release.c_str());
+	c->Message(Chat::White, "Version: %s", os.version.c_str());
+	c->Message(Chat::White, "Machine: %s", os.machine.c_str());
+	c->Message(Chat::White, "Uptime: %.2f seconds", uptime);
+	c->Message(Chat::White, "==================================================");
+	c->Message(Chat::White, "CPU Information");
+	c->Message(Chat::White, "==================================================");
 	for (size_t i = 0; i < cpus.size(); ++i) {
 		auto &cp = cpus[i];
-		c->Message(0, "CPU #%i: %s, Speed: %.2fGhz", i, cp.model.c_str(), cp.speed);
+		c->Message(Chat::White, "CPU #%i: %s, Speed: %.2fGhz", i, cp.model.c_str(), cp.speed);
 	}
-	c->Message(0, "==================================================");
-	c->Message(0, "Process Information");
-	c->Message(0, "==================================================");
-	c->Message(0, "PID: %u", pid);
-	c->Message(0, "RSS: %.2f MB", rss / 1048576.0);
-	c->Message(0, "==================================================");
+	c->Message(Chat::White, "==================================================");
+	c->Message(Chat::White, "Process Information");
+	c->Message(Chat::White, "==================================================");
+	c->Message(Chat::White, "PID: %u", pid);
+	c->Message(Chat::White, "RSS: %.2f MB", rss / 1048576.0);
+	c->Message(Chat::White, "==================================================");
 }
 
 void command_getvariable(Client *c, const Seperator *sep)
 {
 	std::string tmp;
 	if (database.GetVariable(sep->argplus[1], tmp))
-		c->Message(0, "%s = %s",  sep->argplus[1], tmp.c_str());
+		c->Message(Chat::White, "%s = %s",  sep->argplus[1], tmp.c_str());
 	else
-		c->Message(0, "GetVariable(%s) returned false",  sep->argplus[1]);
+		c->Message(Chat::White, "GetVariable(%s) returned false",  sep->argplus[1]);
 }
 
 void command_chat(Client *c, const Seperator *sep)
 {
 	if (sep->arg[2][0] == 0)
-		c->Message(0, "Usage: #chat [channum] [message]");
+		c->Message(Chat::White, "Usage: #chat [channum] [message]");
 	else
 		if (!worldserver.SendChannelMessage(0, 0, (uint8) atoi(sep->arg[1]), 0, 0, 100, sep->argplus[2]))
-			c->Message(0, "Error: World server disconnected");
+			c->Message(Chat::White, "Error: World server disconnected");
 }
 
 void command_npcloot(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "Error: No target");
+		c->Message(Chat::White, "Error: No target");
 	// #npcloot show
 	else if (strcasecmp(sep->arg[1], "show") == 0)
 	{
@@ -903,11 +973,11 @@ void command_npcloot(Client *c, const Seperator *sep)
 		else if (c->GetTarget()->IsCorpse())
 			c->GetTarget()->CastToCorpse()->QueryLoot(c);
 		else
-			c->Message(0, "Error: Target's type doesnt have loot");
+			c->Message(Chat::White, "Error: Target's type doesnt have loot");
 	}
 	// These 2 types are *BAD* for the next few commands
 	else if (c->GetTarget()->IsClient() || c->GetTarget()->IsCorpse())
-		c->Message(0, "Error: Invalid target type, try a NPC =).");
+		c->Message(Chat::White, "Error: Invalid target type, try a NPC =).");
 	// #npcloot add
 	else if (strcasecmp(sep->arg[1], "add") == 0)
 	{
@@ -921,22 +991,22 @@ void command_npcloot(Client *c, const Seperator *sep)
 					c->GetTarget()->CastToNPC()->AddItem(item, atoi(sep->arg[3]), 0);
 				else
 					c->GetTarget()->CastToNPC()->AddItem(item, 1, 0);
-				c->Message(0, "Added item(%i) to the %s's loot.",  item, c->GetTarget()->GetName());
+				c->Message(Chat::White, "Added item(%i) to the %s's loot.",  item, c->GetTarget()->GetName());
 			}
 			else
-				c->Message(0, "Error: #npcloot add: Item(%i) does not exist!",  item);
+				c->Message(Chat::White, "Error: #npcloot add: Item(%i) does not exist!",  item);
 		}
 		else if (!sep->IsNumber(2))
-			c->Message(0, "Error: #npcloot add: Itemid must be a number.");
+			c->Message(Chat::White, "Error: #npcloot add: Itemid must be a number.");
 		else
-			c->Message(0, "Error: #npcloot add: This is not a valid target.");
+			c->Message(Chat::White, "Error: #npcloot add: This is not a valid target.");
 	}
 	// #npcloot remove
 	else if (strcasecmp(sep->arg[1], "remove") == 0)
 	{
 		//#npcloot remove all
 		if (strcasecmp(sep->arg[2], "all") == 0)
-			c->Message(0, "Error: #npcloot remove all: Not yet implemented.");
+			c->Message(Chat::White, "Error: #npcloot remove all: Not yet implemented.");
 		//#npcloot remove itemid
 		else
 		{
@@ -944,12 +1014,12 @@ void command_npcloot(Client *c, const Seperator *sep)
 			{
 				uint32 item = atoi(sep->arg[2]);
 				c->GetTarget()->CastToNPC()->RemoveItem(item);
-				c->Message(0, "Removed item(%i) from the %s's loot.",  item, c->GetTarget()->GetName());
+				c->Message(Chat::White, "Removed item(%i) from the %s's loot.",  item, c->GetTarget()->GetName());
 			}
 			else if (!sep->IsNumber(2))
-				c->Message(0, "Error: #npcloot remove: Item must be a number.");
+				c->Message(Chat::White, "Error: #npcloot remove: Item must be a number.");
 			else
-				c->Message(0, "Error: #npcloot remove: This is not a valid target.");
+				c->Message(Chat::White, "Error: #npcloot remove: This is not a valid target.");
 		}
 	}
 	// #npcloot money
@@ -960,16 +1030,16 @@ void command_npcloot(Client *c, const Seperator *sep)
 			if ((atoi(sep->arg[2]) < 34465 && atoi(sep->arg[2]) >= 0) && (atoi(sep->arg[3]) < 34465 && atoi(sep->arg[3]) >= 0) && (atoi(sep->arg[4]) < 34465 && atoi(sep->arg[4]) >= 0) && (atoi(sep->arg[5]) < 34465 && atoi(sep->arg[5]) >= 0))
 			{
 				c->GetTarget()->CastToNPC()->AddCash(atoi(sep->arg[5]), atoi(sep->arg[4]), atoi(sep->arg[3]), atoi(sep->arg[2]));
-				c->Message(0, "Set %i Platinum, %i Gold, %i Silver, and %i Copper as %s's money.",  atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), c->GetTarget()->GetName());
+				c->Message(Chat::White, "Set %i Platinum, %i Gold, %i Silver, and %i Copper as %s's money.",  atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), atoi(sep->arg[5]), c->GetTarget()->GetName());
 			}
 			else
-				c->Message(0, "Error: #npcloot money: Values must be between 0-34465.");
+				c->Message(Chat::White, "Error: #npcloot money: Values must be between 0-34465.");
 		}
 		else
-			c->Message(0, "Usage: #npcloot money platinum gold silver copper");
+			c->Message(Chat::White, "Usage: #npcloot money platinum gold silver copper");
 	}
 	else
-		c->Message(0, "Usage: #npcloot [show/money/add/remove] [itemid/all/money: pp gp sp cp]");
+		c->Message(Chat::White, "Usage: #npcloot [show/money/add/remove] [itemid/all/money: pp gp sp cp]");
 }
 
 void command_gm(Client *c, const Seperator *sep)
@@ -982,10 +1052,10 @@ void command_gm(Client *c, const Seperator *sep)
 
 	if(sep->arg[1][0] != 0) {
 		t->SetGM(state);
-		c->Message(0, "%s is %s a GM.",  t->GetName(), state?"now":"no longer");
+		c->Message(Chat::White, "%s is %s a GM.",  t->GetName(), state?"now":"no longer");
 	}
 	else
-		c->Message(0, "Usage: #gm [on/off]");
+		c->Message(Chat::White, "Usage: #gm [on/off]");
 }
 
 // there's no need for this, as /summon already takes care of it
@@ -1007,11 +1077,11 @@ void command_summon(Client *c, const Seperator *sep)
 		else
 		{
 			if (!worldserver.Connected())
-				c->Message(0, "Error: World server disconnected.");
+				c->Message(Chat::White, "Error: World server disconnected.");
 			else
 			{ // player is in another zone
 				//Taking this command out until we test the factor of 8 in ServerOP_ZonePlayer
-				//c->Message(0, "Summoning player from another zone not yet implemented.");
+				//c->Message(Chat::White, "Summoning player from another zone not yet implemented.");
 				//return;
 
 				auto pack = new ServerPacket(ServerOP_ZonePlayer, sizeof(ServerZonePlayer_Struct));
@@ -1036,9 +1106,9 @@ void command_summon(Client *c, const Seperator *sep)
 	else
 	{
 		/*if(c->Admin() < 150)
-			c->Message(0, "You need a NPC/corpse target for this command");
+			c->Message(Chat::White, "You need a NPC/corpse target for this command");
 		else*/
-			c->Message(0, "Usage: #summon [charname] Either target or charname is required");
+			c->Message(Chat::White, "Usage: #summon [charname] Either target or charname is required");
 		return;
 	}
 
@@ -1047,23 +1117,23 @@ void command_summon(Client *c, const Seperator *sep)
 
 	if (t->IsNPC())
 	{ // npc target
-		c->Message(0, "Summoning NPC %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
+		c->Message(Chat::White, "Summoning NPC %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
 		t->CastToNPC()->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading());
 		t->CastToNPC()->SaveGuardSpot(glm::vec4(0.0f));
 	}
 	else if (t->IsCorpse())
 	{ // corpse target
-		c->Message(0, "Summoning corpse %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
+		c->Message(Chat::White, "Summoning corpse %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
 		t->CastToCorpse()->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading());
 	}
 	else if (t->IsClient())
 	{
 		/*if(c->Admin() < 150)
 		{
-			c->Message(0, "You may not summon a player.");
+			c->Message(Chat::White, "You may not summon a player.");
 			return;
 		}*/
-		c->Message(0, "Summoning player %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
+		c->Message(Chat::White, "Summoning player %s to %1.1f, %1.1f, %1.1f",  t->GetName(), c->GetX(), c->GetY(), c->GetZ());
 		t->CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(), 2, GMSummon);
 	}
 }
@@ -1072,7 +1142,7 @@ void command_zone(Client *c, const Seperator *sep)
 {
 	if(c->Admin() < commandZoneToCoords &&
 		(sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4))) {
-		c->Message(0, "Your status is not high enough to zone to specific coordinates.");
+		c->Message(Chat::White, "Your status is not high enough to zone to specific coordinates.");
 		return;
 	}
 
@@ -1081,29 +1151,29 @@ void command_zone(Client *c, const Seperator *sep)
 	if (sep->IsNumber(1))
 	{
 		if(atoi(sep->arg[1])==26 && (c->Admin() < commandZoneToSpecials)){ //cshome
-				c->Message(0, "Only Guides and above can goto that zone.");
+				c->Message(Chat::White, "Only Guides and above can goto that zone.");
 				return;
 		}
 		zoneid = atoi(sep->arg[1]);
 	}
 	else if (sep->arg[1][0] == 0)
 	{
-		c->Message(0, "Usage: #zone [zonename]");
-		c->Message(0, "Optional Usage: #zone [zonename] y x z");
+		c->Message(Chat::White, "Usage: #zone [zonename]");
+		c->Message(Chat::White, "Optional Usage: #zone [zonename] y x z");
 		return;
 	}
 	else if (zone->GetZoneID() == 184 && c->Admin() < commandZoneToSpecials) {	// Zone: 'Load'
-		c->Message(0, "The Gods brought you here, only they can send you away.");
+		c->Message(Chat::White, "The Gods brought you here, only they can send you away.");
 		return;
 	} else {
 		if((strcasecmp(sep->arg[1], "cshome")==0) && (c->Admin() < commandZoneToSpecials)){
-			c->Message(0, "Only Guides and above can goto that zone.");
+			c->Message(Chat::White, "Only Guides and above can goto that zone.");
 			return;
 		}
 
 		zoneid = database.GetZoneID(sep->arg[1]);
 		if(zoneid == 0) {
-			c->Message(0, "Unable to locate zone '%s'",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to locate zone '%s'",  sep->arg[1]);
 			return;
 		}
 	}
@@ -1128,14 +1198,14 @@ void command_zone_instance(Client *c, const Seperator *sep)
 {
 	if(c->Admin() < commandZoneToCoords &&
 		(sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4))) {
-		c->Message(0, "Your status is not high enough to zone to specific coordinates.");
+		c->Message(Chat::White, "Your status is not high enough to zone to specific coordinates.");
 		return;
 	}
 
 	if (sep->arg[1][0] == 0)
 	{
-		c->Message(0, "Usage: #zoneinstance [instance id]");
-		c->Message(0, "Optional Usage: #zoneinstance [instance id] y x z");
+		c->Message(Chat::White, "Usage: #zoneinstance [instance id]");
+		c->Message(Chat::White, "Optional Usage: #zoneinstance [instance id] y x z");
 		return;
 	}
 
@@ -1147,26 +1217,26 @@ void command_zone_instance(Client *c, const Seperator *sep)
 		instanceid = atoi(sep->arg[1]);
 		if(!instanceid)
 		{
-			c->Message(0, "Must enter a valid instance id.");
+			c->Message(Chat::White, "Must enter a valid instance id.");
 			return;
 		}
 
 		zoneid = database.ZoneIDFromInstanceID(instanceid);
 		if(!zoneid)
 		{
-			c->Message(0, "Instance not found or zone is set to null.");
+			c->Message(Chat::White, "Instance not found or zone is set to null.");
 			return;
 		}
 	}
 	else
 	{
-		c->Message(0, "Must enter a valid instance id.");
+		c->Message(Chat::White, "Must enter a valid instance id.");
 		return;
 	}
 
 	if(!database.VerifyInstanceAlive(instanceid, c->CharacterID()))
 	{
-		c->Message(0, "Instance ID expiried or you are not apart of this instance.");
+		c->Message(Chat::White, "Instance ID expiried or you are not apart of this instance.");
 		return;
 	}
 
@@ -1192,12 +1262,12 @@ void command_peqzone(Client *c, const Seperator *sep)
 	uint32 timeleft = c->GetPTimers().GetRemainingTime(pTimerPeqzoneReuse)/60;
 
 	if(!c->GetPTimers().Expired(&database, pTimerPeqzoneReuse, false)) {
-		c->Message(13,"You must wait %i minute(s) before using this ability again.",  timeleft);
+		c->Message(Chat::Red,"You must wait %i minute(s) before using this ability again.",  timeleft);
 		return;
 	}
 
 	if(c->GetHPRatio() < 75) {
-		c->Message(0, "You cannot use this command with less than 75 percent health.");
+		c->Message(Chat::White, "You cannot use this command with less than 75 percent health.");
 		return;
 	}
 
@@ -1210,7 +1280,7 @@ void command_peqzone(Client *c, const Seperator *sep)
 		|| c->AutoAttackEnabled()
 		|| c->GetInvul()
 	) {
-		c->Message(0, "You cannot use this command in your current state. Settle down and wait.");
+		c->Message(Chat::White, "You cannot use this command in your current state. Settle down and wait.");
 		return;
 	}
 
@@ -1221,33 +1291,33 @@ void command_peqzone(Client *c, const Seperator *sep)
 		zoneid = atoi(sep->arg[1]);
 		destzone = database.GetPEQZone(zoneid, 0);
 		if(destzone == 0){
-			c->Message(13, "You cannot use this command to enter that zone!");
+			c->Message(Chat::Red, "You cannot use this command to enter that zone!");
 			return;
 		}
 		if(zoneid == zone->GetZoneID()) {
-			c->Message(13, "You cannot use this command on the zone you are in!");
+			c->Message(Chat::Red, "You cannot use this command on the zone you are in!");
 			return;
 		}
 	}
 	else if (sep->arg[1][0] == 0 || sep->IsNumber(2) || sep->IsNumber(3) || sep->IsNumber(4) || sep->IsNumber(5))
 	{
-		c->Message(0, "Usage: #peqzone [zonename]");
-		c->Message(0, "Optional Usage: #peqzone [zoneid]");
+		c->Message(Chat::White, "Usage: #peqzone [zonename]");
+		c->Message(Chat::White, "Optional Usage: #peqzone [zoneid]");
 		return;
 	}
 	else {
 		zoneid = database.GetZoneID(sep->arg[1]);
 		destzone = database.GetPEQZone(zoneid, 0);
 		if(zoneid == 0) {
-			c->Message(0, "Unable to locate zone '%s'",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to locate zone '%s'",  sep->arg[1]);
 			return;
 		}
 		if(destzone == 0){
-			c->Message(13, "You cannot use this command to enter that zone!");
+			c->Message(Chat::Red, "You cannot use this command to enter that zone!");
 			return;
 		}
 		if(zoneid == zone->GetZoneID()) {
-			c->Message(13, "You cannot use this command on the zone you are in!");
+			c->Message(Chat::Red, "You cannot use this command on the zone you are in!");
 			return;
 		}
 	}
@@ -1265,9 +1335,9 @@ void command_peqzone(Client *c, const Seperator *sep)
 void command_movechar(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0]==0 || sep->arg[2][0] == 0)
-		c->Message(0, "Usage: #movechar [charactername] [zonename]");
+		c->Message(Chat::White, "Usage: #movechar [charactername] [zonename]");
 	else if (c->Admin() < commandMovecharToSpecials && strcasecmp(sep->arg[2], "cshome") == 0 || strcasecmp(sep->arg[2], "load") == 0 || strcasecmp(sep->arg[2], "load2") == 0)
-		c->Message(0, "Invalid zone name");
+		c->Message(Chat::White, "Invalid zone name");
 	else
 	{
 		uint32 tmp = database.GetAccountIDByChar(sep->arg[1]);
@@ -1275,14 +1345,14 @@ void command_movechar(Client *c, const Seperator *sep)
 		{
 			if (c->Admin() >= commandMovecharSelfOnly || tmp == c->AccountID())
 				if (!database.MoveCharacterToZone((char*) sep->arg[1], (char*) sep->arg[2]))
-					c->Message(0, "Character Move Failed!");
+					c->Message(Chat::White, "Character Move Failed!");
 				else
-					c->Message(0, "Character has been moved.");
+					c->Message(Chat::White, "Character has been moved.");
 			else
-				c->Message(13,"You cannot move characters that are not on your account.");
+				c->Message(Chat::Red,"You cannot move characters that are not on your account.");
 		}
 		else
-			c->Message(0, "Character Does Not Exist");
+			c->Message(Chat::White, "Character Does Not Exist");
 	}
 }
 
@@ -1291,7 +1361,7 @@ void command_movement(Client *c, const Seperator *sep)
 	auto &mgr = MobMovementManager::Get();
 
 	if (sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
+		c->Message(Chat::White, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
 		return;
 	}
 
@@ -1307,7 +1377,7 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
@@ -1317,7 +1387,7 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
@@ -1327,7 +1397,7 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
@@ -1337,7 +1407,7 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
@@ -1347,48 +1417,48 @@ void command_movement(Client *c, const Seperator *sep)
 	{
 		auto target = c->GetTarget();
 		if (target == nullptr) {
-			c->Message(0, "No target found.");
+			c->Message(Chat::White, "No target found.");
 			return;
 		}
 
 		mgr.SendCommandToClients(target, atof(sep->arg[2]), atof(sep->arg[3]), atof(sep->arg[4]), atof(sep->arg[5]), atoi(sep->arg[6]), ClientRangeAny);
 	}
 	else {
-		c->Message(0, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
+		c->Message(Chat::White, "Usage: #movement stats/clearstats/walkto/runto/rotateto/stop/packet");
 	}
 }
 
 void command_viewpetition(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #viewpetition (petition number) Type #listpetition for a list");
+		c->Message(Chat::White, "Usage: #viewpetition (petition number) Type #listpetition for a list");
 		return;
     }
 
-    c->Message(13,"	ID : Character Name , Petition Text");
+    c->Message(Chat::Red,"	ID : Character Name , Petition Text");
 
     std::string query = "SELECT petid, charname, petitiontext FROM petitions ORDER BY petid";
     auto results = database.QueryDatabase(query);
     if (!results.Success())
         return;
 
-    Log(Logs::General, Logs::Normal, "View petition request from %s, petition number: %i",  c->GetName(), atoi(sep->argplus[1]) );
+    LogInfo("View petition request from [{}], petition number: [{}]",  c->GetName(), atoi(sep->argplus[1]) );
 
     if (results.RowCount() == 0) {
-        c->Message(13,"There was an error in your request: ID not found! Please check the Id and try again.");
+        c->Message(Chat::Red,"There was an error in your request: ID not found! Please check the Id and try again.");
         return;
     }
 
     for (auto row = results.begin(); row != results.end(); ++row)
         if (strcasecmp(row[0], sep->argplus[1]) == 0)
-			c->Message(15, " %s:	%s , %s ",  row[0], row[1], row[2]);
+			c->Message(Chat::Yellow, " %s:	%s , %s ",  row[0], row[1], row[2]);
 
 }
 
 void command_petitioninfo(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #petitioninfo (petition number) Type #listpetition for a list");
+		c->Message(Chat::White, "Usage: #petitioninfo (petition number) Type #listpetition for a list");
 		return;
     }
 
@@ -1397,39 +1467,39 @@ void command_petitioninfo(Client *c, const Seperator *sep)
     if (!results.Success())
         return;
 
-    Log(Logs::General, Logs::Normal, "Petition information request from %s, petition number:",  c->GetName(), atoi(sep->argplus[1]) );
+    LogInfo("Petition information request from [{}], petition number:",  c->GetName(), atoi(sep->argplus[1]) );
 
     if (results.RowCount() == 0) {
-		c->Message(13,"There was an error in your request: ID not found! Please check the Id and try again.");
+		c->Message(Chat::Red,"There was an error in your request: ID not found! Please check the Id and try again.");
         return;
     }
 
 	for (auto row = results.begin(); row != results.end(); ++row)
 		if (strcasecmp(row[0],sep->argplus[1])== 0)
-			c->Message(13,"	ID : %s Character Name: %s Account Name: %s Zone: %s Character Class: %s Character Race: %s Character Level: %s", row[0],row[1],row[2],row[3],row[4],row[5],row[6]);
+			c->Message(Chat::Red,"	ID : %s Character Name: %s Account Name: %s Zone: %s Character Class: %s Character Race: %s Character Level: %s", row[0],row[1],row[2],row[3],row[4],row[5],row[6]);
 
 }
 
 void command_delpetition(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0 || strcasecmp(sep->arg[1],"*") == 0) {
-		c->Message(0, "Usage: #delpetition (petition number) Type #listpetition for a list");
+		c->Message(Chat::White, "Usage: #delpetition (petition number) Type #listpetition for a list");
 		return;
     }
 
-	c->Message(13,"Attempting to delete petition number: %i", atoi(sep->argplus[1]));
+	c->Message(Chat::Red,"Attempting to delete petition number: %i", atoi(sep->argplus[1]));
 	std::string query = StringFormat("DELETE FROM petitions WHERE petid = %i",  atoi(sep->argplus[1]));
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
         return;
 
-    Log(Logs::General, Logs::Normal, "Delete petition request from %s, petition number:",  c->GetName(), atoi(sep->argplus[1]) );
+    LogInfo("Delete petition request from [{}], petition number:",  c->GetName(), atoi(sep->argplus[1]) );
 
 }
 
 void command_listnpcs(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Deprecated, use the #list command (#list npcs <search>)");
+	c->Message(Chat::White, "Deprecated, use the #list command (#list npcs <search>)");
 }
 
 void command_list(Client *c, const Seperator *sep)
@@ -1686,9 +1756,9 @@ void command_list(Client *c, const Seperator *sep)
 		}
 	}
 	else {
-		c->Message(0, "Usage of #list");
-		c->Message(0, "- #list [npcs|players|corpses|doors|objects] [search]");
-		c->Message(0, "- Example: #list npc (Blank for all)");
+		c->Message(Chat::White, "Usage of #list");
+		c->Message(Chat::White, "- #list [npcs|players|corpses|doors|objects] [search]");
+		c->Message(Chat::White, "- Example: #list npc (Blank for all)");
 	}
 }
 
@@ -1696,7 +1766,7 @@ void command_date(Client *c, const Seperator *sep)
 {
 	//yyyy mm dd hh mm local
 	if(sep->arg[3][0]==0 || !sep->IsNumber(1) || !sep->IsNumber(2) || !sep->IsNumber(3)) {
-		c->Message(13, "Usage: #date yyyy mm dd [HH MM]");
+		c->Message(Chat::Red, "Usage: #date yyyy mm dd [HH MM]");
 	}
 	else {
 		int h=0, m=0;
@@ -1710,7 +1780,7 @@ void command_date(Client *c, const Seperator *sep)
 			m=eqTime.minute;
 		else
 			m=atoi(sep->arg[5]);
-		c->Message(13, "Setting world time to %s-%s-%s %i:%i...",  sep->arg[1], sep->arg[2], sep->arg[3], h, m);
+		c->Message(Chat::Red, "Setting world time to %s-%s-%s %i:%i...",  sep->arg[1], sep->arg[2], sep->arg[3], h, m);
 		zone->SetDate(atoi(sep->arg[1]), atoi(sep->arg[2]), atoi(sep->arg[3]), h, m);
 	}
 }
@@ -1718,15 +1788,15 @@ void command_date(Client *c, const Seperator *sep)
 void command_timezone(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0]==0 && !sep->IsNumber(1)) {
-		c->Message(13, "Usage: #timezone HH [MM]");
-		c->Message(13, "Current timezone is: %ih %im",  zone->zone_time.getEQTimeZoneHr(), zone->zone_time.getEQTimeZoneMin());
+		c->Message(Chat::Red, "Usage: #timezone HH [MM]");
+		c->Message(Chat::Red, "Current timezone is: %ih %im",  zone->zone_time.getEQTimeZoneHr(), zone->zone_time.getEQTimeZoneMin());
 	}
 	else {
 		uint8 hours = atoi(sep->arg[1]);
 		uint8 minutes = atoi(sep->arg[2]);
 		if(!sep->IsNumber(2))
 			minutes = 0;
-		c->Message(13, "Setting timezone to %i h %i m",  hours, minutes);
+		c->Message(Chat::Red, "Setting timezone to %i h %i m",  hours, minutes);
 		uint32 ntz=(hours*60)+minutes;
 		zone->zone_time.setEQTimeZone(ntz);
 		database.SetZoneTZ(zone->GetZoneID(), zone->GetInstanceVersion(), ntz);
@@ -1750,10 +1820,10 @@ void command_invul(Client *c, const Seperator *sep)
 
 	if(sep->arg[1][0] != 0) {
 		t->SetInvul(state);
-		c->Message(0, "%s is %s invulnerable from attack.",  t->GetName(), state?"now":"no longer");
+		c->Message(Chat::White, "%s is %s invulnerable from attack.",  t->GetName(), state?"now":"no longer");
 	}
 	else
-		c->Message(0, "Usage: #invulnerable [on/off]");
+		c->Message(Chat::White, "Usage: #invulnerable [on/off]");
 }
 
 void command_hideme(Client *c, const Seperator *sep)
@@ -1761,18 +1831,18 @@ void command_hideme(Client *c, const Seperator *sep)
 	bool state=atobool(sep->arg[1]);
 
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #hideme [on/off]");
+		c->Message(Chat::White, "Usage: #hideme [on/off]");
 	else
 	{
 		c->SetHideMe(state);
-		c->Message_StringID(MT_Broadcasts, c->GetHideMe() ? NOW_INVISIBLE : NOW_VISIBLE, c->GetName());
+		c->MessageString(Chat::Broadcasts, c->GetHideMe() ? NOW_INVISIBLE : NOW_VISIBLE, c->GetName());
 	}
 }
 
 void command_emote(Client *c, const Seperator *sep)
 {
 	if (sep->arg[3][0] == 0)
-		c->Message(0, "Usage: #emote [name | world | zone] type# message");
+		c->Message(Chat::White, "Usage: #emote [name | world | zone] type# message");
 	else {
 		if (strcasecmp(sep->arg[1], "zone") == 0){
 			char* newmessage=0;
@@ -1784,7 +1854,7 @@ void command_emote(Client *c, const Seperator *sep)
 			}
 		}
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server disconnected");
+			c->Message(Chat::White, "Error: World server disconnected");
 		else if (strcasecmp(sep->arg[1], "world") == 0)
 			worldserver.SendEmoteMessage(0, 0, atoi(sep->arg[2]), sep->argplus[3]);
 		else
@@ -1796,42 +1866,42 @@ void command_fov(Client *c, const Seperator *sep)
 {
 	if(c->GetTarget())
 		if(c->BehindMob(c->GetTarget(), c->GetX(), c->GetY()))
-			c->Message(0, "You are behind mob %s, it is looking to %d",  c->GetTarget()->GetName(), c->GetTarget()->GetHeading());
+			c->Message(Chat::White, "You are behind mob %s, it is looking to %d",  c->GetTarget()->GetName(), c->GetTarget()->GetHeading());
 		else
-			c->Message(0, "You are NOT behind mob %s, it is looking to %d",  c->GetTarget()->GetName(), c->GetTarget()->GetHeading());
+			c->Message(Chat::White, "You are NOT behind mob %s, it is looking to %d",  c->GetTarget()->GetName(), c->GetTarget()->GetHeading());
 	else
-		c->Message(0, "I Need a target!");
+		c->Message(Chat::White, "I Need a target!");
 }
 
 void command_npcstats(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "ERROR: No target!");
+		c->Message(Chat::White, "ERROR: No target!");
 	else if (!c->GetTarget()->IsNPC())
-		c->Message(0, "ERROR: Target is not a NPC!");
+		c->Message(Chat::White, "ERROR: Target is not a NPC!");
 	else {
 		auto target_npc = c->GetTarget()->CastToNPC();
-		c->Message(0, "# NPC Stats");
-		c->Message(0, "- Name: %s   NpcID: %u", target_npc->GetName(), target_npc->GetNPCTypeID());
-		c->Message(0, "- Race: %i  Level: %i  Class: %i  Material: %i", target_npc->GetRace(), target_npc->GetLevel(), target_npc->GetClass(), target_npc->GetTexture());
-		c->Message(0, "- Current HP: %i  Max HP: %i", target_npc->GetHP(), target_npc->GetMaxHP());
-		//c->Message(0, "Weapon Item Number: %s", target_npc->GetWeapNo());
-		c->Message(0, "- Gender: %i  Size: %f  Bodytype: %d", target_npc->GetGender(), target_npc->GetSize(), target_npc->GetBodyType());
-		c->Message(0, "- Runspeed: %.3f  Walkspeed: %.3f", static_cast<float>(0.025f * target_npc->GetRunspeed()), static_cast<float>(0.025f * target_npc->GetWalkspeed()));
-		c->Message(0, "- Spawn Group: %i  Grid: %i", target_npc->GetSp2(), target_npc->GetGrid());
+		c->Message(Chat::White, "# NPC Stats");
+		c->Message(Chat::White, "- Name: %s   NpcID: %u", target_npc->GetName(), target_npc->GetNPCTypeID());
+		c->Message(Chat::White, "- Race: %i  Level: %i  Class: %i  Material: %i", target_npc->GetRace(), target_npc->GetLevel(), target_npc->GetClass(), target_npc->GetTexture());
+		c->Message(Chat::White, "- Current HP: %i  Max HP: %i", target_npc->GetHP(), target_npc->GetMaxHP());
+		//c->Message(Chat::White, "Weapon Item Number: %s", target_npc->GetWeapNo());
+		c->Message(Chat::White, "- Gender: %i  Size: %f  Bodytype: %d", target_npc->GetGender(), target_npc->GetSize(), target_npc->GetBodyType());
+		c->Message(Chat::White, "- Runspeed: %.3f  Walkspeed: %.3f", static_cast<float>(0.025f * target_npc->GetRunspeed()), static_cast<float>(0.025f * target_npc->GetWalkspeed()));
+		c->Message(Chat::White, "- Spawn Group: %i  Grid: %i", target_npc->GetSpawnGroupId(), target_npc->GetGrid());
 		if (target_npc->proximity) {
-			c->Message(0, "- Proximity: Enabled");
-			c->Message(0, "-- Cur_X: %1.3f, Cur_Y: %1.3f, Cur_Z: %1.3f", target_npc->GetX(), target_npc->GetY(), target_npc->GetZ());
-			c->Message(0, "-- Min_X: %1.3f(%1.3f), Max_X: %1.3f(%1.3f), X_Range: %1.3f", target_npc->proximity->min_x, (target_npc->proximity->min_x - target_npc->GetX()), target_npc->proximity->max_x, (target_npc->proximity->max_x - target_npc->GetX()), (target_npc->proximity->max_x - target_npc->proximity->min_x));
-			c->Message(0, "-- Min_Y: %1.3f(%1.3f), Max_Y: %1.3f(%1.3f), Y_Range: %1.3f", target_npc->proximity->min_y, (target_npc->proximity->min_y - target_npc->GetY()), target_npc->proximity->max_y, (target_npc->proximity->max_y - target_npc->GetY()), (target_npc->proximity->max_y - target_npc->proximity->min_y));
-			c->Message(0, "-- Min_Z: %1.3f(%1.3f), Max_Z: %1.3f(%1.3f), Z_Range: %1.3f", target_npc->proximity->min_z, (target_npc->proximity->min_z - target_npc->GetZ()), target_npc->proximity->max_z, (target_npc->proximity->max_z - target_npc->GetZ()), (target_npc->proximity->max_z - target_npc->proximity->min_z));
-			c->Message(0, "-- Say: %s", (target_npc->proximity->say ? "Enabled" : "Disabled"));
+			c->Message(Chat::White, "- Proximity: Enabled");
+			c->Message(Chat::White, "-- Cur_X: %1.3f, Cur_Y: %1.3f, Cur_Z: %1.3f", target_npc->GetX(), target_npc->GetY(), target_npc->GetZ());
+			c->Message(Chat::White, "-- Min_X: %1.3f(%1.3f), Max_X: %1.3f(%1.3f), X_Range: %1.3f", target_npc->proximity->min_x, (target_npc->proximity->min_x - target_npc->GetX()), target_npc->proximity->max_x, (target_npc->proximity->max_x - target_npc->GetX()), (target_npc->proximity->max_x - target_npc->proximity->min_x));
+			c->Message(Chat::White, "-- Min_Y: %1.3f(%1.3f), Max_Y: %1.3f(%1.3f), Y_Range: %1.3f", target_npc->proximity->min_y, (target_npc->proximity->min_y - target_npc->GetY()), target_npc->proximity->max_y, (target_npc->proximity->max_y - target_npc->GetY()), (target_npc->proximity->max_y - target_npc->proximity->min_y));
+			c->Message(Chat::White, "-- Min_Z: %1.3f(%1.3f), Max_Z: %1.3f(%1.3f), Z_Range: %1.3f", target_npc->proximity->min_z, (target_npc->proximity->min_z - target_npc->GetZ()), target_npc->proximity->max_z, (target_npc->proximity->max_z - target_npc->GetZ()), (target_npc->proximity->max_z - target_npc->proximity->min_z));
+			c->Message(Chat::White, "-- Say: %s", (target_npc->proximity->say ? "Enabled" : "Disabled"));
 		}
 		else {
-			c->Message(0, "-Proximity: Disabled");
+			c->Message(Chat::White, "-Proximity: Disabled");
 		}
-		c->Message(0, "");
-		c->Message(0, "EmoteID: %i", target_npc->GetEmoteID());
+		c->Message(Chat::White, "");
+		c->Message(Chat::White, "EmoteID: %i", target_npc->GetEmoteID());
 		target_npc->QueryLoot(c);
 	}
 }
@@ -1840,13 +1910,13 @@ void command_zclip(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if(sep->arg[2][0]==0)
-		c->Message(0, "Usage: #zclip <min clip> <max clip>");
+		c->Message(Chat::White, "Usage: #zclip <min clip> <max clip>");
 	else if(atoi(sep->arg[1])<=0)
-		c->Message(0, "ERROR: Min clip can not be zero or less!");
+		c->Message(Chat::White, "ERROR: Min clip can not be zero or less!");
 	else if(atoi(sep->arg[2])<=0)
-		c->Message(0, "ERROR: Max clip can not be zero or less!");
+		c->Message(Chat::White, "ERROR: Max clip can not be zero or less!");
 	else if(atoi(sep->arg[1])>atoi(sep->arg[2]))
-		c->Message(0, "ERROR: Min clip is greater than max clip!");
+		c->Message(Chat::White, "ERROR: Min clip is greater than max clip!");
 	else {
 		zone->newzone_data.minclip = atof(sep->arg[1]);
 		zone->newzone_data.maxclip = atof(sep->arg[2]);
@@ -1872,27 +1942,27 @@ void command_npccast(Client *c, const Seperator *sep)
 		if (spelltar)
 			c->GetTarget()->CastSpell(atoi(sep->arg[2]), spelltar->GetID());
 		else
-			c->Message(0, "Error: %s not found",  sep->arg[1]);
+			c->Message(Chat::White, "Error: %s not found",  sep->arg[1]);
 	}
 	else if (c->GetTarget() && c->GetTarget()->IsNPC() && sep->IsNumber(1) && sep->IsNumber(2) ) {
 		Mob* spelltar = entity_list.GetMob(atoi(sep->arg[1]));
 		if (spelltar)
 			c->GetTarget()->CastSpell(atoi(sep->arg[2]), spelltar->GetID());
 		else
-			c->Message(0, "Error: target ID %i not found",  atoi(sep->arg[1]));
+			c->Message(Chat::White, "Error: target ID %i not found",  atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: (needs NPC targeted) #npccast targetname/entityid spellid");
+		c->Message(Chat::White, "Usage: (needs NPC targeted) #npccast targetname/entityid spellid");
 }
 
 void command_zstats(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Zone Header Data:");
-	c->Message(0, "Sky Type: %i",  zone->newzone_data.sky);
-	c->Message(0, "Fog Colour: Red: %i; Blue: %i; Green %i",  zone->newzone_data.fog_red[0], zone->newzone_data.fog_green[0], zone->newzone_data.fog_blue[0]);
-	c->Message(0, "Safe Coords: %f, %f, %f",  zone->newzone_data.safe_x, zone->newzone_data.safe_y, zone->newzone_data.safe_z);
-	c->Message(0, "Underworld Coords: %f",  zone->newzone_data.underworld);
-	c->Message(0, "Clip Plane: %f - %f",  zone->newzone_data.minclip, zone->newzone_data.maxclip);
+	c->Message(Chat::White, "Zone Header Data:");
+	c->Message(Chat::White, "Sky Type: %i",  zone->newzone_data.sky);
+	c->Message(Chat::White, "Fog Colour: Red: %i; Blue: %i; Green %i",  zone->newzone_data.fog_red[0], zone->newzone_data.fog_green[0], zone->newzone_data.fog_blue[0]);
+	c->Message(Chat::White, "Safe Coords: %f, %f, %f",  zone->newzone_data.safe_x, zone->newzone_data.safe_y, zone->newzone_data.safe_z);
+	c->Message(Chat::White, "Underworld Coords: %f",  zone->newzone_data.underworld);
+	c->Message(Chat::White, "Clip Plane: %f - %f",  zone->newzone_data.minclip, zone->newzone_data.maxclip);
 }
 
 void command_permaclass(Client *c, const Seperator *sep)
@@ -1903,16 +1973,16 @@ void command_permaclass(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0]==0) {
-		c->Message(0,"Usage: #permaclass <classnum>");
+		c->Message(Chat::White,"Usage: #permaclass <classnum>");
 	}
 	else if(!t->IsClient())
-		c->Message(0,"Target is not a client.");
+		c->Message(Chat::White,"Target is not a client.");
 	else {
-		c->Message(0, "Setting %s's class...Sending to char select.",  t->GetName());
-		Log(Logs::General, Logs::Normal, "Class change request from %s for %s, requested class:%i",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
+		c->Message(Chat::White, "Setting %s's class...Sending to char select.",  t->GetName());
+		LogInfo("Class change request from [{}] for [{}], requested class:[{}]",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
 		t->SetBaseClass(atoi(sep->arg[1]));
 		t->Save();
-		t->Kick();
+		t->Kick("Class was changed.");
 	}
 }
 
@@ -1924,14 +1994,14 @@ void command_permarace(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0]==0) {
-		c->Message(0,"Usage: #permarace <racenum>");
-		c->Message(0,"NOTE: Not all models are global. If a model is not global, it will appear as a human on character select and in zones without the model.");
+		c->Message(Chat::White,"Usage: #permarace <racenum>");
+		c->Message(Chat::White,"NOTE: Not all models are global. If a model is not global, it will appear as a human on character select and in zones without the model.");
 	}
 	else if(!t->IsClient())
-		c->Message(0,"Target is not a client.");
+		c->Message(Chat::White,"Target is not a client.");
 	else {
-		c->Message(0, "Setting %s's race - zone to take effect", t->GetName());
-		Log(Logs::General, Logs::Normal, "Permanant race change request from %s for %s, requested race:%i",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
+		c->Message(Chat::White, "Setting %s's race - zone to take effect", t->GetName());
+		LogInfo("Permanant race change request from [{}] for [{}], requested race:[{}]",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
 		uint32 tmp = Mob::GetDefaultGender(atoi(sep->arg[1]), t->GetBaseGender());
 		t->SetBaseRace(atoi(sep->arg[1]));
 		t->SetBaseGender(tmp);
@@ -1948,14 +2018,14 @@ void command_permagender(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0]==0) {
-		c->Message(0,"Usage: #permagender <gendernum>");
-		c->Message(0,"Gender Numbers: 0=Male, 1=Female, 2=Neuter");
+		c->Message(Chat::White,"Usage: #permagender <gendernum>");
+		c->Message(Chat::White,"Gender Numbers: 0=Male, 1=Female, 2=Neuter");
 	}
 	else if(!t->IsClient())
-		c->Message(0,"Target is not a client.");
+		c->Message(Chat::White,"Target is not a client.");
 	else {
-		c->Message(0, "Setting %s's gender - zone to take effect", t->GetName());
-		Log(Logs::General, Logs::Normal, "Permanant gender change request from %s for %s, requested gender:%i",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
+		c->Message(Chat::White, "Setting %s's gender - zone to take effect", t->GetName());
+		LogInfo("Permanant gender change request from [{}] for [{}], requested gender:[{}]",  c->GetName(), t->GetName(), atoi(sep->arg[1]) );
 		t->SetBaseGender(atoi(sep->arg[1]));
 		t->Save();
 		t->SendIllusionPacket(atoi(sep->arg[1]));
@@ -1965,12 +2035,12 @@ void command_permagender(Client *c, const Seperator *sep)
 void command_weather(Client *c, const Seperator *sep)
 {
 	if (!(sep->arg[1][0] == '0' || sep->arg[1][0] == '1' || sep->arg[1][0] == '2' || sep->arg[1][0] == '3')) {
-		c->Message(0, "Usage: #weather <0/1/2/3> - Off/Rain/Snow/Manual.");
+		c->Message(Chat::White, "Usage: #weather <0/1/2/3> - Off/Rain/Snow/Manual.");
 	}
 	else if(zone->zone_weather == 0) {
 		if(sep->arg[1][0] == '3')	{ // Put in modifications here because it had a very good chance at screwing up the client's weather system if rain was sent during snow -T7
 			if(sep->arg[2][0] != 0 && sep->arg[3][0] != 0) {
-				c->Message(0, "Sending weather packet... TYPE=%s, INTENSITY=%s",  sep->arg[2], sep->arg[3]);
+				c->Message(Chat::White, "Sending weather packet... TYPE=%s, INTENSITY=%s",  sep->arg[2], sep->arg[3]);
 				zone->zone_weather = atoi(sep->arg[2]);
 				auto outapp = new EQApplicationPacket(OP_Weather, 8);
 				outapp->pBuffer[0] = atoi(sep->arg[2]);
@@ -1979,7 +2049,7 @@ void command_weather(Client *c, const Seperator *sep)
 				safe_delete(outapp);
 			}
 			else {
-				c->Message(0, "Manual Usage: #weather 3 <type> <intensity>");
+				c->Message(Chat::White, "Manual Usage: #weather 3 <type> <intensity>");
 			}
 		}
 		else if(sep->arg[1][0] == '2')	{
@@ -2033,16 +2103,16 @@ void command_zheader(Client *c, const Seperator *sep)
 {
 	// sends zhdr packet
 	if(sep->arg[1][0]==0) {
-		c->Message(0, "Usage: #zheader <zone name>");
+		c->Message(Chat::White, "Usage: #zheader <zone name>");
 	}
 	else if(database.GetZoneID(sep->argplus[1])==0)
-		c->Message(0, "Invalid Zone Name: %s",  sep->argplus[1]);
+		c->Message(Chat::White, "Invalid Zone Name: %s",  sep->argplus[1]);
 	else {
 
 		if (zone->LoadZoneCFG(sep->argplus[1], 0))
-			c->Message(0, "Successfully loaded zone header for %s from database.",  sep->argplus[1]);
+			c->Message(Chat::White, "Successfully loaded zone header for %s from database.",  sep->argplus[1]);
 		else
-			c->Message(0, "Failed to load zone header %s from database",  sep->argplus[1]);
+			c->Message(Chat::White, "Failed to load zone header %s from database",  sep->argplus[1]);
 		auto outapp = new EQApplicationPacket(OP_NewZone, sizeof(NewZone_Struct));
 		memcpy(outapp->pBuffer, &zone->newzone_data, outapp->size);
 		entity_list.QueueClients(c, outapp);
@@ -2054,9 +2124,9 @@ void command_zsky(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #zsky <sky type>");
+		c->Message(Chat::White, "Usage: #zsky <sky type>");
 	else if(atoi(sep->arg[1])<0||atoi(sep->arg[1])>255)
-		c->Message(0, "ERROR: Sky type can not be less than 0 or greater than 255!");
+		c->Message(Chat::White, "ERROR: Sky type can not be less than 0 or greater than 255!");
 	else {
 		zone->newzone_data.sky = atoi(sep->arg[1]);
 		auto outapp = new EQApplicationPacket(OP_NewZone, sizeof(NewZone_Struct));
@@ -2070,13 +2140,13 @@ void command_zcolor(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if (sep->arg[3][0]==0)
-		c->Message(0, "Usage: #zcolor <red> <green> <blue>");
+		c->Message(Chat::White, "Usage: #zcolor <red> <green> <blue>");
 	else if (atoi(sep->arg[1])<0||atoi(sep->arg[1])>255)
-		c->Message(0, "ERROR: Red can not be less than 0 or greater than 255!");
+		c->Message(Chat::White, "ERROR: Red can not be less than 0 or greater than 255!");
 	else if (atoi(sep->arg[2])<0||atoi(sep->arg[2])>255)
-		c->Message(0, "ERROR: Green can not be less than 0 or greater than 255!");
+		c->Message(Chat::White, "ERROR: Green can not be less than 0 or greater than 255!");
 	else if (atoi(sep->arg[3])<0||atoi(sep->arg[3])>255)
-		c->Message(0, "ERROR: Blue can not be less than 0 or greater than 255!");
+		c->Message(Chat::White, "ERROR: Blue can not be less than 0 or greater than 255!");
 	else {
 		for (int z=0; z<4; z++) {
 			zone->newzone_data.fog_red[z] = atoi(sep->arg[1]);
@@ -2103,25 +2173,6 @@ void command_spoff(Client *c, const Seperator *sep)
 	safe_delete(outapp);
 }
 
-void command_itemtest(Client *c, const Seperator *sep)
-{
-	char chBuffer[8192] = {0};
-	//Using this to determine new item layout
-	FILE* f = nullptr;
-	if (!(f = fopen("c:\\EQEMUcvs\\ItemDump.txt",  "rb"))) {
-		c->Message(13, "Error: Could not open c:\\EQEMUcvs\\ItemDump.txt");
-		return;
-	}
-
-	fread(chBuffer, sizeof(chBuffer), sizeof(char), f);
-	fclose(f);
-
-	auto outapp = new EQApplicationPacket(OP_ItemLinkResponse, strlen(chBuffer) + 5);
-	memcpy(&outapp->pBuffer[4], chBuffer, strlen(chBuffer));
-	c->QueuePacket(outapp);
-	safe_delete(outapp);
-}
-
 void command_gassign(Client *c, const Seperator *sep)
 {
 	if (sep->IsNumber(1) && c->GetTarget() && c->GetTarget()->IsNPC() && c->GetTarget()->CastToNPC()->GetSpawnPointID() > 0) {
@@ -2129,7 +2180,7 @@ void command_gassign(Client *c, const Seperator *sep)
 		database.AssignGrid(c, atoi(sep->arg[1]), spawn2id);
 	}
 	else
-		c->Message(0, "Usage: #gassign [num] - must have an npc target!");
+		c->Message(Chat::White, "Usage: #gassign [num] - must have an npc target!");
 }
 
 void command_ai(Client *c, const Seperator *sep)
@@ -2141,37 +2192,37 @@ void command_ai(Client *c, const Seperator *sep)
 			if (target->IsNPC())
 				target->CastToNPC()->SetNPCFactionID(atoi(sep->arg[2]));
 			else
-				c->Message(0, "%s is not an NPC.",  target->GetName());
+				c->Message(Chat::White, "%s is not an NPC.",  target->GetName());
 		}
 		else
-			c->Message(0, "Usage: (targeted) #ai factionid [factionid]");
+			c->Message(Chat::White, "Usage: (targeted) #ai factionid [factionid]");
 	}
 	else if (strcasecmp(sep->arg[1], "spellslist") == 0) {
 		if (target && sep->IsNumber(2) && atoi(sep->arg[2]) >= 0) {
 			if (target->IsNPC())
 				target->CastToNPC()->AI_AddNPCSpells(atoi(sep->arg[2]));
 			else
-				c->Message(0, "%s is not an NPC.",  target->GetName());
+				c->Message(Chat::White, "%s is not an NPC.",  target->GetName());
 		}
 		else
-			c->Message(0, "Usage: (targeted) #ai spellslist [npc_spells_id]");
+			c->Message(Chat::White, "Usage: (targeted) #ai spellslist [npc_spells_id]");
 	}
 	else if (strcasecmp(sep->arg[1], "con") == 0) {
 		if (target && sep->arg[2][0] != 0) {
 			Mob* tar2 = entity_list.GetMob(sep->arg[2]);
 			if (tar2)
-				c->Message(0, "%s considering %s: %i",  target->GetName(), tar2->GetName(), tar2->GetReverseFactionCon(target));
+				c->Message(Chat::White, "%s considering %s: %i",  target->GetName(), tar2->GetName(), tar2->GetReverseFactionCon(target));
 			else
-				c->Message(0, "Error: %s not found.",  sep->arg[2]);
+				c->Message(Chat::White, "Error: %s not found.",  sep->arg[2]);
 		}
 		else
-			c->Message(0, "Usage: (targeted) #ai con [mob name]");
+			c->Message(Chat::White, "Usage: (targeted) #ai con [mob name]");
 	}
 	else if (strcasecmp(sep->arg[1], "guard") == 0) {
 		if (target && target->IsNPC())
 			target->CastToNPC()->SaveGuardSpot(target->GetPosition());
 		else
-			c->Message(0, "Usage: (targeted) #ai guard - sets npc to guard the current location (use #summon to move)");
+			c->Message(Chat::White, "Usage: (targeted) #ai guard - sets npc to guard the current location (use #summon to move)");
 	}
 	else if (strcasecmp(sep->arg[1], "roambox") == 0) {
 		if (target && target->IsAIControlled() && target->IsNPC()) {
@@ -2194,39 +2245,39 @@ void command_ai(Client *c, const Seperator *sep)
 				target->CastToNPC()->AI_SetRoambox(atof(sep->arg[2]), atof(sep->arg[3]), tmp, tmp2);
 			}
 			else {
-				c->Message(0, "Usage: #ai roambox dist max_x min_x max_y min_y [delay] [mindelay]");
-				c->Message(0, "Usage: #ai roambox dist roamdist [delay] [mindelay]");
+				c->Message(Chat::White, "Usage: #ai roambox dist max_x min_x max_y min_y [delay] [mindelay]");
+				c->Message(Chat::White, "Usage: #ai roambox dist roamdist [delay] [mindelay]");
 			}
 		}
 		else
-			c->Message(0, "You need a AI NPC targeted");
+			c->Message(Chat::White, "You need a AI NPC targeted");
 	}
 	else if (strcasecmp(sep->arg[1], "stop") == 0 && c->Admin() >= commandToggleAI) {
 		if (target) {
 			if (target->IsAIControlled())
 				target->AI_Stop();
 			else
-				c->Message(0, "Error: Target is not AI controlled");
+				c->Message(Chat::White, "Error: Target is not AI controlled");
 		}
 		else
-			c->Message(0, "Usage: Target a Mob with AI enabled and use this to turn off their AI.");
+			c->Message(Chat::White, "Usage: Target a Mob with AI enabled and use this to turn off their AI.");
 	}
 	else if (strcasecmp(sep->arg[1], "start") == 0 && c->Admin() >= commandToggleAI) {
 		if (target) {
 			if (!target->IsAIControlled())
 				target->AI_Start();
 			else
-				c->Message(0, "Error: Target is already AI controlled");
+				c->Message(Chat::White, "Error: Target is already AI controlled");
 		}
 		else
-			c->Message(0, "Usage: Target a Mob with AI disabled and use this to turn on their AI.");
+			c->Message(Chat::White, "Usage: Target a Mob with AI disabled and use this to turn on their AI.");
 	}
 	else {
-		c->Message(0, "#AI Sub-commands");
-		c->Message(0, "  factionid");
-		c->Message(0, "  spellslist");
-		c->Message(0, "  con");
-		c->Message(0, "  guard");
+		c->Message(Chat::White, "#AI Sub-commands");
+		c->Message(Chat::White, "  factionid");
+		c->Message(Chat::White, "  spellslist");
+		c->Message(Chat::White, "  con");
+		c->Message(Chat::White, "  guard");
 	}
 }
 
@@ -2238,7 +2289,7 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 	if (worldserver.Connected()) {
 		if(sep->IsNumber(1) && sep->IsNumber(2) && ((time=atoi(sep->arg[1]))>0) && ((interval=atoi(sep->arg[2]))>0)) {
 			worldserver.SendEmoteMessage(0,0,15,"<SYSTEMWIDE MESSAGE>:SYSTEM MSG:World coming down in %i minutes, everyone log out before this time.",  (time / 60 ));
-			c->Message(0, "Sending shutdown packet now, World will shutdown in: %i minutes with an interval of: %i seconds",  (time / 60), interval);
+			c->Message(Chat::White, "Sending shutdown packet now, World will shutdown in: %i minutes with an interval of: %i seconds",  (time / 60), interval);
 			auto pack = new ServerPacket(ServerOP_ShutdownAll, sizeof(WorldShutDown_Struct));
 			WorldShutDown_Struct* wsd = (WorldShutDown_Struct*)pack->pBuffer;
 			wsd->time=time*1000;
@@ -2248,7 +2299,7 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 		}
 		else if(strcasecmp(sep->arg[1], "now") == 0){
 			worldserver.SendEmoteMessage(0,0,15,"<SYSTEMWIDE MESSAGE>:SYSTEM MSG:World coming down, everyone log out now.");
-			c->Message(0, "Sending shutdown packet");
+			c->Message(Chat::White, "Sending shutdown packet");
 			auto pack = new ServerPacket;
 			pack->opcode = ServerOP_ShutdownAll;
 			pack->size=0;
@@ -2256,7 +2307,7 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 			safe_delete(pack);
 		}
 		else if(strcasecmp(sep->arg[1], "disable") == 0){
-			c->Message(0, "Shutdown prevented, next time I may not be so forgiving...");
+			c->Message(Chat::White, "Shutdown prevented, next time I may not be so forgiving...");
 			auto pack = new ServerPacket(ServerOP_ShutdownAll, sizeof(WorldShutDown_Struct));
 			WorldShutDown_Struct* wsd = (WorldShutDown_Struct*)pack->pBuffer;
 			wsd->time=0;
@@ -2265,14 +2316,14 @@ void command_worldshutdown(Client *c, const Seperator *sep)
 			safe_delete(pack);
 		}
 		else{
-			c->Message(0,"#worldshutdown - Shuts down the server and all zones.");
-			c->Message(0,"Usage: #worldshutdown now - Shuts down the server and all zones immediately.");
-			c->Message(0,"Usage: #worldshutdown disable - Stops the server from a previously scheduled shut down.");
-			c->Message(0,"Usage: #worldshutdown [timer] [interval] - Shuts down the server and all zones after [timer] seconds and sends warning every [interval] seconds.");
+			c->Message(Chat::White,"#worldshutdown - Shuts down the server and all zones.");
+			c->Message(Chat::White,"Usage: #worldshutdown now - Shuts down the server and all zones immediately.");
+			c->Message(Chat::White,"Usage: #worldshutdown disable - Stops the server from a previously scheduled shut down.");
+			c->Message(Chat::White,"Usage: #worldshutdown [timer] [interval] - Shuts down the server and all zones after [timer] seconds and sends warning every [interval] seconds.");
 		}
 	}
 	else
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 }
 
 void command_sendzonespawns(Client *c, const Seperator *sep)
@@ -2283,10 +2334,10 @@ void command_sendzonespawns(Client *c, const Seperator *sep)
 void command_zsave(Client *c, const Seperator *sep)
 {
 	if (zone->SaveZoneCFG()) {
-		c->Message(13, "Zone header saved successfully.");
+		c->Message(Chat::Red, "Zone header saved successfully.");
 	}
 	else {
-		c->Message(13, "ERROR: Zone header data was NOT saved.");
+		c->Message(Chat::Red, "ERROR: Zone header data was NOT saved.");
 	}
 }
 
@@ -2294,7 +2345,7 @@ void command_dbspawn2(Client *c, const Seperator *sep)
 {
 
 	if (sep->IsNumber(1) && sep->IsNumber(2) && sep->IsNumber(3)) {
-		Log(Logs::General, Logs::Normal, "Spawning database spawn");
+		LogInfo("Spawning database spawn");
 		uint16 cond = 0;
 		int16 cond_min = 0;
 		if(sep->IsNumber(4)) {
@@ -2305,7 +2356,7 @@ void command_dbspawn2(Client *c, const Seperator *sep)
 		database.CreateSpawn2(c, atoi(sep->arg[1]), zone->GetShortName(), c->GetPosition(), atoi(sep->arg[2]), atoi(sep->arg[3]), cond, cond_min);
 	}
 	else {
-		c->Message(0, "Usage: #dbspawn2 spawngroup respawn variance [condition_id] [condition_min]");
+		c->Message(Chat::White, "Usage: #dbspawn2 spawngroup respawn variance [condition_id] [condition_min]");
 	}
 }
 
@@ -2316,53 +2367,62 @@ void command_shutdown(Client *c, const Seperator *sep)
 
 void command_delacct(Client *c, const Seperator *sep)
 {
-	if(sep->arg[1][0] == 0)
-		c->Message(0, "Format: #delacct accountname");
-	else
-		if (database.DeleteAccount(sep->arg[1]))
-			c->Message(0, "The account was deleted.");
+	if (sep->arg[1][0] == 0)
+		c->Message(Chat::White, "Format: #delacct accountname");
+	else {
+		std::string user;
+		std::string loginserver;
+		ParseAccountString(sep->arg[1], user, loginserver);
+
+		if (database.DeleteAccount(user.c_str(), loginserver.c_str()))
+			c->Message(Chat::White, "The account was deleted.");
 		else
-			c->Message(0, "Unable to delete account.");
+			c->Message(Chat::White, "Unable to delete account.");
+	}
 }
 
 void command_setpass(Client *c, const Seperator *sep)
 {
 	if(sep->argnum != 2)
-		c->Message(0, "Format: #setpass accountname password");
+		c->Message(Chat::White, "Format: #setpass accountname password");
 	else {
+		std::string user;
+		std::string loginserver;
+		ParseAccountString(sep->arg[1], user, loginserver);
+
 		int16 tmpstatus = 0;
-		uint32 tmpid = database.GetAccountIDByName(sep->arg[1], &tmpstatus);
+		uint32 tmpid = database.GetAccountIDByName(user.c_str(), loginserver.c_str(), &tmpstatus);
 		if (!tmpid)
-			c->Message(0, "Error: Account not found");
+			c->Message(Chat::White, "Error: Account not found");
 		else if (tmpstatus > c->Admin())
-			c->Message(0, "Cannot change password: Account's status is higher than yours");
+			c->Message(Chat::White, "Cannot change password: Account's status is higher than yours");
 		else if (database.SetLocalPassword(tmpid, sep->arg[2]))
-			c->Message(0, "Password changed.");
+			c->Message(Chat::White, "Password changed.");
 		else
-			c->Message(0, "Error changing password.");
+			c->Message(Chat::White, "Error changing password.");
 	}
 }
 
 void command_setlsinfo(Client *c, const Seperator *sep)
 {
 	if(sep->argnum != 2)
-		c->Message(0, "Format: #setlsinfo email password");
+		c->Message(Chat::White, "Format: #setlsinfo email password");
 	else {
 		auto pack = new ServerPacket(ServerOP_LSAccountUpdate, sizeof(ServerLSAccountUpdate_Struct));
 		ServerLSAccountUpdate_Struct* s = (ServerLSAccountUpdate_Struct *) pack->pBuffer;
 		s->useraccountid = c->LSAccountID();
 		strn0cpy(s->useraccount, c->AccountName(), 30);
-		strn0cpy(s->useremail, sep->arg[1], 100);
+		strn0cpy(s->user_email, sep->arg[1], 100);
 		strn0cpy(s->userpassword, sep->arg[2], 50);
 		worldserver.SendPacket(pack);
-		c->Message(0, "Login Server update packet sent.");
+		c->Message(Chat::White, "Login Server update packet sent.");
 	}
 }
 
 void command_grid(Client *c, const Seperator *sep)
 {
 	if (strcasecmp("max", sep->arg[1]) == 0) {
-		c->Message(0, "Highest grid ID in this zone: %d", database.GetHighestGrid(zone->GetZoneID()));
+		c->Message(Chat::White, "Highest grid ID in this zone: %d", database.GetHighestGrid(zone->GetZoneID()));
 	}
 	else if (strcasecmp("add", sep->arg[1]) == 0) {
 		database.ModifyGrid(c, false, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), zone->GetZoneID());
@@ -2372,7 +2432,7 @@ void command_grid(Client *c, const Seperator *sep)
 		Mob *target = c->GetTarget();
 
 		if (!target || !target->IsNPC()) {
-			c->Message(0, "You need a NPC target!");
+			c->Message(Chat::White, "You need a NPC target!");
 			return;
 		}
 
@@ -2387,12 +2447,12 @@ void command_grid(Client *c, const Seperator *sep)
 
 		auto results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			c->Message(0, "Error querying database.");
-			c->Message(0, query.c_str());
+			c->Message(Chat::White, "Error querying database.");
+			c->Message(Chat::White, query.c_str());
 		}
 
 		if (results.RowCount() == 0) {
-			c->Message(0, "No grid found");
+			c->Message(Chat::White, "No grid found");
 			return;
 		}
 
@@ -2428,8 +2488,9 @@ void command_grid(Client *c, const Seperator *sep)
 		database.ModifyGrid(c, true, atoi(sep->arg[2]), 0, 0, zone->GetZoneID());
 	}
 	else {
-		c->Message(0, "Usage: #grid add/delete grid_num wandertype pausetype");
-		c->Message(0, "Usage: #grid max - displays the highest grid ID used in this zone (for add)");
+		c->Message(Chat::White, "Usage: #grid add/delete grid_num wandertype pausetype");
+		c->Message(Chat::White, "Usage: #grid max - displays the highest grid ID used in this zone (for add)");
+		c->Message(Chat::White, "Usage: #grid show - displays wp nodes as boxes");
 	}
 }
 
@@ -2452,7 +2513,7 @@ void command_wp(Client *c, const Seperator *sep)
 	else if (strcasecmp("delete", sep->arg[1]) == 0)
 		database.DeleteWaypoint(c, atoi(sep->arg[2]),wp,zone->GetZoneID());
 	else
-		c->Message(0,"Usage: #wp add/delete grid_num pause wp_num [-h]");
+		c->Message(Chat::White,"Usage: #wp add/delete grid_num pause wp_num [-h]");
 }
 
 void command_iplookup(Client *c, const Seperator *sep)
@@ -2472,15 +2533,15 @@ void command_size(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #size [0 - 255] (Decimal increments are allowed)");
+		c->Message(Chat::White, "Usage: #size [0 - 255] (Decimal increments are allowed)");
 	else {
 		float newsize = atof(sep->arg[1]);
 		if (newsize > 255)
-			c->Message(0, "Error: #size: Size can not be greater than 255.");
+			c->Message(Chat::White, "Error: #size: Size can not be greater than 255.");
 		else if (newsize < 0)
-			c->Message(0, "Error: #size: Size can not be less than 0.");
+			c->Message(Chat::White, "Error: #size: Size can not be less than 0.");
 		else if (!target)
-			c->Message(0,"Error: this command requires a target");
+			c->Message(Chat::White,"Error: this command requires a target");
 		else {
 			uint16 Race = target->GetRace();
 			uint8 Gender = target->GetGender();
@@ -2501,7 +2562,7 @@ void command_size(Client *c, const Seperator *sep)
 										EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 										DrakkinHeritage, DrakkinTattoo, DrakkinDetails, newsize);
 
-			c->Message(0,"Size = %f",  atof(sep->arg[1]));
+			c->Message(Chat::White,"Size = %f",  atof(sep->arg[1]));
 		}
 	}
 }
@@ -2523,7 +2584,7 @@ void command_flymode(Client *c, const Seperator *sep)
 	Mob *t = c;
 
 	if (strlen(sep->arg[1]) == 1 && !(sep->arg[1][0] == '0' || sep->arg[1][0] == '1' || sep->arg[1][0] == '2' || sep->arg[1][0] == '3' || sep->arg[1][0] == '4' || sep->arg[1][0] == '5'))
-		c->Message(0, "#flymode [0/1/2/3/4/5]");
+		c->Message(Chat::White, "#flymode [0/1/2/3/4/5]");
 	else {
 		if (c->GetTarget()) {
 			t = c->GetTarget();
@@ -2534,22 +2595,22 @@ void command_flymode(Client *c, const Seperator *sep)
 		t->SetFlyMode(static_cast<GravityBehavior>(fm));
 		t->SendAppearancePacket(AT_Levitate, fm);
 		if (sep->arg[1][0] == '0') {
-			c->Message(0, "Setting %s to Grounded", t->GetName());
+			c->Message(Chat::White, "Setting %s to Grounded", t->GetName());
 		}
 		else if (sep->arg[1][0] == '1') {
-			c->Message(0, "Setting %s to Flying", t->GetName());
+			c->Message(Chat::White, "Setting %s to Flying", t->GetName());
 		}
 		else if (sep->arg[1][0] == '2') {
-			c->Message(0, "Setting %s to Levitating", t->GetName());
+			c->Message(Chat::White, "Setting %s to Levitating", t->GetName());
 		}
 		else if (sep->arg[1][0] == '3') {
-			c->Message(0, "Setting %s to In Water", t->GetName());
+			c->Message(Chat::White, "Setting %s to In Water", t->GetName());
 		}
 		else if (sep->arg[1][0] == '4') {
-			c->Message(0, "Setting %s to Floating(Boat)", t->GetName());
+			c->Message(Chat::White, "Setting %s to Floating(Boat)", t->GetName());
 		}
 		else if (sep->arg[1][0] == '5') {
-			c->Message(0, "Setting %s to Levitating While Running", t->GetName());
+			c->Message(Chat::White, "Setting %s to Levitating While Running", t->GetName());
 		}
 	}
 }
@@ -2561,24 +2622,24 @@ void command_showskills(Client *c, const Seperator *sep)
 	if(c->GetTarget() && c->GetTarget()->IsClient())
 		t=c->GetTarget()->CastToClient();
 
-	c->Message(0, "Skills for %s",  t->GetName());
+	c->Message(Chat::White, "Skills for %s",  t->GetName());
 	for (EQEmu::skills::SkillType i = EQEmu::skills::Skill1HBlunt; i <= EQEmu::skills::HIGHEST_SKILL; i = (EQEmu::skills::SkillType)(i + 1))
-		c->Message(0, "Skill [%d] is at [%d] - %u",  i, t->GetSkill(i), t->GetRawSkill(i));
+		c->Message(Chat::White, "Skill [%d] is at [%d] - %u",  i, t->GetSkill(i), t->GetRawSkill(i));
 }
 
 void command_findspell(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #FindSpell [spellname]");
+		c->Message(Chat::White, "Usage: #FindSpell [spellname]");
 	else if (SPDAT_RECORDS <= 0)
-		c->Message(0, "Spells not loaded");
+		c->Message(Chat::White, "Spells not loaded");
 	else if (Seperator::IsNumber(sep->argplus[1])) {
 		int spellid = atoi(sep->argplus[1]);
 		if (spellid <= 0 || spellid >= SPDAT_RECORDS) {
-			c->Message(0, "Error: Number out of range");
+			c->Message(Chat::White, "Error: Number out of range");
 		}
 		else {
-			c->Message(0, "  %i: %s",  spellid, spells[spellid].name);
+			c->Message(Chat::White, "  %i: %s",  spellid, spells[spellid].name);
 		}
 	}
 	else {
@@ -2595,7 +2656,7 @@ void command_findspell(Client *c, const Seperator *sep)
 				strupr(sName);
 				char* pdest = strstr(sName, sCriteria);
 				if ((pdest != nullptr) && (count <=20)) {
-					c->Message(0, "  %i: %s",  i, spells[i].name);
+					c->Message(Chat::White, "  %i: %s",  i, spells[i].name);
 					count++;
 				}
 				else if (count > 20)
@@ -2603,16 +2664,16 @@ void command_findspell(Client *c, const Seperator *sep)
 			}
 		}
 		if (count > 20)
-			c->Message(0, "20 spells found... max reached.");
+			c->Message(Chat::White, "20 spells found... max reached.");
 		else
-			c->Message(0, "%i spells found.",  count);
+			c->Message(Chat::White, "%i spells found.",  count);
 	}
 }
 
 void command_castspell(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #CastSpell spellid");
+		c->Message(Chat::White, "Usage: #CastSpell spellid");
 	else {
 		uint16 spellid = atoi(sep->arg[1]);
 		/*
@@ -2625,9 +2686,9 @@ void command_castspell(Client *c, const Seperator *sep)
 			((spellid >= 1342) && (spellid <= 1348)) || (spellid == 1923) || (spellid == 1924) ||
 			(spellid == 3355)) &&
 			c->Admin() < commandCastSpecials)
-			c->Message(13, "Unable to cast spell.");
+			c->Message(Chat::Red, "Unable to cast spell.");
 		else if (spellid >= SPDAT_RECORDS)
-			c->Message(0, "Error: #CastSpell: Argument out of range");
+			c->Message(Chat::White, "Error: #CastSpell: Argument out of range");
 		else
 			if (c->GetTarget() == 0)
 				if(c->Admin() >= commandInstacast)
@@ -2646,55 +2707,55 @@ void command_setlanguage(Client *c, const Seperator *sep)
 {
 	if (strcasecmp(sep->arg[1], "list" ) == 0 )
 	{
-		c->Message(0, "Languages:");
-		c->Message(0, "(0) Common Tongue");
-		c->Message(0, "(1) Barbarian");
-		c->Message(0, "(2) Erudian");
-		c->Message(0, "(3) Elvish");
-		c->Message(0, "(4) Dark Elvish");
-		c->Message(0, "(5) Dwarvish");
-		c->Message(0, "(6) Troll");
-		c->Message(0, "(7) Ogre");
-		c->Message(0, "(8) Gnomish");
-		c->Message(0, "(9) Halfling");
-		c->Message(0, "(10) Thieves Cant");
-		c->Message(0, "(11) Old Erudian");
-		c->Message(0, "(12) Elder Elvish");
-		c->Message(0, "(13) Froglok");
-		c->Message(0, "(14) Goblin");
-		c->Message(0, "(15) Gnoll");
-		c->Message(0, "(16) Combine Tongue");
-		c->Message(0, "(17) Elder Teir`Dal");
-		c->Message(0, "(18) Lizardman");
-		c->Message(0, "(19) Orcish");
-		c->Message(0, "(20) Faerie");
-		c->Message(0, "(21) Dragon");
-		c->Message(0, "(22) Elder Dragon");
-		c->Message(0, "(23) Dark Speech");
-		c->Message(0, "(24) Vah Shir");
-		c->Message(0, "(25) Alaran");
-		c->Message(0, "(26) Hadal");
-		c->Message(0, "(27) Unknown1");
+		c->Message(Chat::White, "Languages:");
+		c->Message(Chat::White, "(0) Common Tongue");
+		c->Message(Chat::White, "(1) Barbarian");
+		c->Message(Chat::White, "(2) Erudian");
+		c->Message(Chat::White, "(3) Elvish");
+		c->Message(Chat::White, "(4) Dark Elvish");
+		c->Message(Chat::White, "(5) Dwarvish");
+		c->Message(Chat::White, "(6) Troll");
+		c->Message(Chat::White, "(7) Ogre");
+		c->Message(Chat::White, "(8) Gnomish");
+		c->Message(Chat::White, "(9) Halfling");
+		c->Message(Chat::White, "(10) Thieves Cant");
+		c->Message(Chat::White, "(11) Old Erudian");
+		c->Message(Chat::White, "(12) Elder Elvish");
+		c->Message(Chat::White, "(13) Froglok");
+		c->Message(Chat::White, "(14) Goblin");
+		c->Message(Chat::White, "(15) Gnoll");
+		c->Message(Chat::White, "(16) Combine Tongue");
+		c->Message(Chat::White, "(17) Elder Teir`Dal");
+		c->Message(Chat::White, "(18) Lizardman");
+		c->Message(Chat::White, "(19) Orcish");
+		c->Message(Chat::White, "(20) Faerie");
+		c->Message(Chat::White, "(21) Dragon");
+		c->Message(Chat::White, "(22) Elder Dragon");
+		c->Message(Chat::White, "(23) Dark Speech");
+		c->Message(Chat::White, "(24) Vah Shir");
+		c->Message(Chat::White, "(25) Alaran");
+		c->Message(Chat::White, "(26) Hadal");
+		c->Message(Chat::White, "(27) Unknown1");
 	}
 	else if( c->GetTarget() == 0 )
 	{
-		c->Message(0, "Error: #setlanguage: No target.");
+		c->Message(Chat::White, "Error: #setlanguage: No target.");
 	}
 	else if( !c->GetTarget()->IsClient() )
 	{
-		c->Message(0, "Error: Target must be a player.");
+		c->Message(Chat::White, "Error: Target must be a player.");
 	}
 	else if (
 				!sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > 27 ||
 				!sep->IsNumber(2) || atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > 100
 			)
 	{
-		c->Message(0, "Usage: #setlanguage [language ID] [value] (0-27, 0-100)");
-		c->Message(0, "Try #setlanguage list for a list of language IDs");
+		c->Message(Chat::White, "Usage: #setlanguage [language ID] [value] (0-27, 0-100)");
+		c->Message(Chat::White, "Try #setlanguage list for a list of language IDs");
 	}
 	else
 	{
-		Log(Logs::General, Logs::Normal, "Set language request from %s, target:%s lang_id:%i value:%i",  c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) );
+		LogInfo("Set language request from [{}], target:[{}] lang_id:[{}] value:[{}]",  c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) );
 		uint8 langid = (uint8)atoi(sep->arg[1]);
 		uint8 value = (uint8)atoi(sep->arg[2]);
 		c->GetTarget()->CastToClient()->SetLanguageSkill( langid, value );
@@ -2704,22 +2765,22 @@ void command_setlanguage(Client *c, const Seperator *sep)
 void command_setskill(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == nullptr) {
-		c->Message(0, "Error: #setskill: No target.");
+		c->Message(Chat::White, "Error: #setskill: No target.");
 	}
 	else if (!c->GetTarget()->IsClient()) {
-		c->Message(0, "Error: #setskill: Target must be a client.");
+		c->Message(Chat::White, "Error: #setskill: Target must be a client.");
 	}
 	else if (
 		!sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > EQEmu::skills::HIGHEST_SKILL ||
 						!sep->IsNumber(2) || atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > HIGHEST_CAN_SET_SKILL
 					)
 	{
-		c->Message(0, "Usage: #setskill skill x ");
-		c->Message(0, "       skill = 0 to %d", EQEmu::skills::HIGHEST_SKILL);
-		c->Message(0, "       x = 0 to %d",  HIGHEST_CAN_SET_SKILL);
+		c->Message(Chat::White, "Usage: #setskill skill x ");
+		c->Message(Chat::White, "       skill = 0 to %d", EQEmu::skills::HIGHEST_SKILL);
+		c->Message(Chat::White, "       x = 0 to %d",  HIGHEST_CAN_SET_SKILL);
 	}
 	else {
-		Log(Logs::General, Logs::Normal, "Set skill request from %s, target:%s skill_id:%i value:%i",  c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) );
+		LogInfo("Set skill request from [{}], target:[{}] skill_id:[{}] value:[{}]",  c->GetName(), c->GetTarget()->GetName(), atoi(sep->arg[1]), atoi(sep->arg[2]) );
 		int skill_num = atoi(sep->arg[1]);
 		uint16 skill_value = atoi(sep->arg[2]);
 		if (skill_num <= EQEmu::skills::HIGHEST_SKILL)
@@ -2730,23 +2791,23 @@ void command_setskill(Client *c, const Seperator *sep)
 void command_setskillall(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "Error: #setallskill: No target.");
+		c->Message(Chat::White, "Error: #setallskill: No target.");
 	else if (!c->GetTarget()->IsClient())
-		c->Message(0, "Error: #setskill: Target must be a client.");
+		c->Message(Chat::White, "Error: #setskill: Target must be a client.");
 	else if (!sep->IsNumber(1) || atoi(sep->arg[1]) < 0 || atoi(sep->arg[1]) > HIGHEST_CAN_SET_SKILL) {
-		c->Message(0, "Usage: #setskillall value ");
-		c->Message(0, "       value = 0 to %d",  HIGHEST_CAN_SET_SKILL);
+		c->Message(Chat::White, "Usage: #setskillall value ");
+		c->Message(Chat::White, "       value = 0 to %d",  HIGHEST_CAN_SET_SKILL);
 	}
 	else {
 		if (c->Admin() >= commandSetSkillsOther || c->GetTarget()==c || c->GetTarget()==0) {
-			Log(Logs::General, Logs::Normal, "Set ALL skill request from %s, target:%s",  c->GetName(), c->GetTarget()->GetName());
+			LogInfo("Set ALL skill request from [{}], target:[{}]",  c->GetName(), c->GetTarget()->GetName());
 			uint16 level = atoi(sep->arg[1]);
 			for (EQEmu::skills::SkillType skill_num = EQEmu::skills::Skill1HBlunt; skill_num <= EQEmu::skills::HIGHEST_SKILL; skill_num = (EQEmu::skills::SkillType)(skill_num + 1)) {
 				c->GetTarget()->CastToClient()->SetSkill(skill_num, level);
 			}
 		}
 		else
-			c->Message(0, "Error: Your status is not high enough to set anothers skills");
+			c->Message(Chat::White, "Error: Your status is not high enough to set anothers skills");
 	}
 }
 
@@ -2763,11 +2824,11 @@ void command_race(Client *c, const Seperator *sep)
 			target->SendIllusionPacket(race);
 		}
 		else {
-			c->Message(0, "Usage: #race [0-732, 2253-2259] (0 for back to normal)");
+			c->Message(Chat::White, "Usage: #race [0-732, 2253-2259] (0 for back to normal)");
 		}
 	}
 	else {
-		c->Message(0, "Usage: #race [0-732, 2253-2259] (0 for back to normal)");
+		c->Message(Chat::White, "Usage: #race [0-732, 2253-2259] (0 for back to normal)");
 	}
 }
 
@@ -2781,13 +2842,13 @@ void command_gender(Client *c, const Seperator *sep)
 		t->SendIllusionPacket(t->GetRace(), atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: #gender [0/1/2]");
+		c->Message(Chat::White, "Usage: #gender [0/1/2]");
 }
 
 void command_makepet(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == '\0')
-		c->Message(0, "Usage: #makepet pet_type_name (will not survive across zones)");
+		c->Message(Chat::White, "Usage: #makepet pet_type_name (will not survive across zones)");
 	else
 		c->MakePet(0, sep->arg[1]);
 }
@@ -2797,7 +2858,7 @@ void command_level(Client *c, const Seperator *sep)
 	uint16 level = atoi(sep->arg[1]);
 
 	if ((level <= 0) || ((level > RuleI(Character, MaxLevel)) && (c->Admin() < commandLevelAboveCap))) {
-		c->Message(0, "Error: #Level: Invalid Level");
+		c->Message(Chat::White, "Error: #Level: Invalid Level");
 	}
 	else if (c->Admin() < RuleI(GM, MinStatusToLevelTarget)) {
 		c->SetLevel(level, true);
@@ -2807,11 +2868,11 @@ void command_level(Client *c, const Seperator *sep)
 #endif
 	}
 	else if (!c->GetTarget()) {
-		c->Message(0, "Error: #Level: No target");
+		c->Message(Chat::White, "Error: #Level: No target");
 	}
 	else {
 		if (!c->GetTarget()->IsNPC() && ((c->Admin() < commandLevelNPCAboveCap) && (level > RuleI(Character, MaxLevel)))) {
-			c->Message(0, "Error: #Level: Invalid Level");
+			c->Message(Chat::White, "Error: #Level: Invalid Level");
 		}
 		else {
 			c->GetTarget()->SetLevel(level, true);
@@ -2826,27 +2887,157 @@ void command_level(Client *c, const Seperator *sep)
 	}
 }
 
+void command_spawneditmass(Client *c, const Seperator *sep)
+{
+	std::string query = fmt::format(
+		SQL(
+			SELECT
+			npc_types.id,
+			npc_types.name,
+			spawn2.respawntime,
+			spawn2.id
+				FROM
+					npc_types
+				JOIN spawnentry ON spawnentry.npcID = npc_types.id
+				JOIN spawn2 ON spawn2.spawngroupID = spawnentry.spawngroupID
+				WHERE
+				spawn2.zone = '{0}' and spawn2.version = {1}
+				GROUP BY npc_types.id
+		),
+		zone->GetShortName(),
+		zone->GetInstanceVersion()
+	);
+
+	std::string status = "(Searching)";
+
+	if (strcasecmp(sep->arg[4], "apply") == 0) {
+		status = "(Applying)";
+	}
+
+	std::string search_value;
+	std::string edit_option;
+	std::string edit_value;
+	std::string apply_set;
+
+	if (sep->arg[1]) {
+		search_value = sep->arg[1];
+	}
+
+	if (sep->arg[2]) {
+		edit_option = sep->arg[2];
+	}
+
+	if (sep->arg[3]) {
+		edit_value = sep->arg[3];
+	}
+
+	if (sep->arg[4]) {
+		apply_set = sep->arg[4];
+	}
+
+	if (!edit_option.empty() && edit_value.empty()) {
+		c->Message(Chat::Yellow, "Please specify an edit option value | #npceditmass <search> <option> <value>");
+		return;
+	}
+
+	std::vector<std::string> npc_ids;
+	std::vector<std::string> spawn2_ids;
+
+	int  found_count = 0;
+	auto results     = database.QueryDatabase(query);
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+
+		std::string npc_id       = row[0];
+		std::string npc_name     = row[1];
+		std::string respawn_time = row[2];
+		std::string spawn2_id    = row[3];
+
+		if (npc_name.find(search_value) == std::string::npos) {
+			continue;
+		}
+
+		c->Message(
+			Chat::Yellow,
+			fmt::format(
+				"NPC ({0}) [{1}] respawn_time [{2}] {3}",
+				npc_id,
+				npc_name,
+				respawn_time,
+				status
+			).c_str()
+		);
+
+		npc_ids.push_back(npc_id);
+		spawn2_ids.push_back(spawn2_id);
+
+		found_count++;
+	}
+
+	c->Message(Chat::Yellow, "Found [%i] NPC Spawn2 entries that match this criteria in this zone", found_count);
+	if (edit_option.empty()) {
+		c->Message(Chat::Yellow, "Please specify an edit option | #npceditmass <search> <option>");
+		c->Message(Chat::Yellow, "Options [respawn_time]");
+		return;
+	}
+
+	std::string saylink = fmt::format(
+		"#spawneditmass {} {} {} apply",
+		search_value,
+		edit_option,
+		edit_value
+	);
+
+	if (found_count > 0) {
+		c->Message(
+			Chat::Yellow, "To apply these changes, click <%s> or type [%s]",
+			EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(),
+			saylink.c_str()
+		);
+	}
+
+	if (edit_option == "respawn_time" && apply_set == "apply") {
+		std::string spawn2_ids_string = implode(",", spawn2_ids);
+		if (spawn2_ids_string.empty()) {
+			c->Message(Chat::Red, "Error: Ran into an unknown error compiling Spawn2 IDs");
+			return;
+		}
+
+		database.QueryDatabase(
+			fmt::format(
+				SQL(
+					UPDATE spawn2 SET respawntime = {} WHERE id IN({})
+				),
+				std::stoi(edit_value),
+				spawn2_ids_string
+			)
+		);
+
+		c->Message(Chat::Yellow, "Updated [%i] spawns", found_count);
+	}
+}
+
 void command_spawn(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] != 0){
 		Client* client = entity_list.GetClientByName(sep->arg[1]);
 		if(client){
-				c->Message(0,"You cannot spawn a mob with the same name as a character!");
+				c->Message(Chat::White,"You cannot spawn a mob with the same name as a character!");
 				return;
 		}
 	}
 
 	NPC* npc = NPC::SpawnNPC(sep->argplus[1], c->GetPosition(), c);
 	if (!npc) {
-		c->Message(0, "Format: #spawn name race level material hp gender class priweapon secweapon merchantid bodytype - spawns a npc those parameters.");
-		c->Message(0, "Name Format: NPCFirstname_NPCLastname - All numbers in a name are stripped and \"_\" characters become a space.");
-		c->Message(0, "Note: Using \"-\" for gender will autoselect the gender for the race. Using \"-\" for HP will use the calculated maximum HP.");
+		c->Message(Chat::White, "Format: #spawn name race level material hp gender class priweapon secweapon merchantid bodytype - spawns a npc those parameters.");
+		c->Message(Chat::White, "Name Format: NPCFirstname_NPCLastname - All numbers in a name are stripped and \"_\" characters become a space.");
+		c->Message(Chat::White, "Note: Using \"-\" for gender will autoselect the gender for the race. Using \"-\" for HP will use the calculated maximum HP.");
 	}
 }
 
 void command_test(Client *c, const Seperator *sep)
 {
-	c->Message(15, "Triggering test command");
+	c->Message(Chat::Yellow, "Triggering test command");
 
 	if (sep->arg[1]) {
 		c->SetPrimaryWeaponOrnamentation(atoi(sep->arg[1]));
@@ -2860,6 +3051,7 @@ void command_texture(Client *c, const Seperator *sep)
 {
 
 	uint16 texture;
+
 	if (sep->IsNumber(1) && atoi(sep->arg[1]) >= 0 && atoi(sep->arg[1]) <= 255) {
 		texture = atoi(sep->arg[1]);
 		uint8 helm = 0xFF;
@@ -2871,9 +3063,9 @@ void command_texture(Client *c, const Seperator *sep)
 			{
 				c->SendTextureWC(i, texture);
 			}
-		else if ((c->GetTarget()->GetRace() > 0 && c->GetTarget()->GetRace() <= 12) ||
-			c->GetTarget()->GetRace() == 128 || c->GetTarget()->GetRace() == 130 ||
-			c->GetTarget()->GetRace() == 330 || c->GetTarget()->GetRace() == 522) {
+		else if ((c->GetTarget()->GetModel() > 0 && c->GetTarget()->GetModel() <= 12) ||
+			c->GetTarget()->GetModel() == 128 || c->GetTarget()->GetModel() == 130 ||
+			c->GetTarget()->GetModel() == 330 || c->GetTarget()->GetModel() == 522) {
 			for (i = EQEmu::textures::textureBegin; i <= EQEmu::textures::LastTintableTexture; i++)
 			{
 				c->GetTarget()->SendTextureWC(i, texture);
@@ -2892,13 +3084,13 @@ void command_texture(Client *c, const Seperator *sep)
 			}
 
 			if ((c->GetTarget()) && (c->Admin() >= commandTextureOthers))
-				c->GetTarget()->SendIllusionPacket(c->GetTarget()->GetRace(), 0xFF, texture, helm);
+				c->GetTarget()->SendIllusionPacket(c->GetTarget()->GetModel(), 0xFF, texture, helm);
 			else
 				c->SendIllusionPacket(c->GetRace(), 0xFF, texture, helm);
 		}
 	}
 	else
-		c->Message(0, "Usage: #texture [texture] [helmtexture] (0-255, 255 for show equipment)");
+		c->Message(Chat::White, "Usage: #texture [texture] [helmtexture] (0-255, 255 for show equipment)");
 }
 
 void command_npctypespawn(Client *c, const Seperator *sep)
@@ -2917,17 +3109,92 @@ void command_npctypespawn(Client *c, const Seperator *sep)
 			entity_list.AddNPC(npc);
 		}
 		else
-			c->Message(0, "NPC Type %i not found",  atoi(sep->arg[1]));
+			c->Message(Chat::White, "NPC Type %i not found",  atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: #npctypespawn npctypeid factionid");
+		c->Message(Chat::White, "Usage: #npctypespawn npctypeid factionid");
 
 }
 
+void command_nudge(Client* c, const Seperator* sep)
+{
+	if (sep->arg[1][0] == 0) {
+		c->Message(Chat::White, "Usage: #nudge [x=f] [y=f] [z=f] [h=f] (partial/mixed arguments allowed)");
+	}
+	else {
+
+		auto target = c->GetTarget();
+		if (!target) {
+
+			c->Message(Chat::Yellow, "This command requires a target.");
+			return;
+		}
+		if (target->IsMoving()) {
+
+			c->Message(Chat::Yellow, "This command requires a stationary target.");
+			return;
+		}
+
+		glm::vec4 position_offset(0.0f, 0.0f, 0.0f, 0.0f);
+		for (auto index = 1; index <= 4; ++index) {
+
+			if (!sep->arg[index]) {
+				continue;
+			}
+
+			Seperator argsep(sep->arg[index], '=');
+			if (!argsep.arg[1][0]) {
+				continue;
+			}
+
+			switch (argsep.arg[0][0]) {
+			case 'x':
+				position_offset.x = atof(argsep.arg[1]);
+				break;
+			case 'y':
+				position_offset.y = atof(argsep.arg[1]);
+				break;
+			case 'z':
+				position_offset.z = atof(argsep.arg[1]);
+				break;
+			case 'h':
+				position_offset.w = atof(argsep.arg[1]);
+				break;
+			default:
+				break;
+			}
+		}
+
+		const auto& current_position = target->GetPosition();
+		glm::vec4 new_position(
+			(current_position.x + position_offset.x),
+			(current_position.y + position_offset.y),
+			(current_position.z + position_offset.z),
+			(current_position.w + position_offset.w)
+		);
+
+		target->GMMove(new_position.x, new_position.y, new_position.z, new_position.w);
+
+		c->Message(
+			Chat::White,
+			"Nudging '%s' to {%1.3f, %1.3f, %1.3f, %1.2f} (adjustment: {%1.3f, %1.3f, %1.3f, %1.2f})",
+			target->GetName(),
+			new_position.x,
+			new_position.y,
+			new_position.z,
+			new_position.w,
+			position_offset.x,
+			position_offset.y,
+			position_offset.z,
+			position_offset.w
+		);
+	}
+}
+
 void command_heal(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget()==0)
-		c->Message(0, "Error: #Heal: No Target.");
+		c->Message(Chat::White, "Error: #Heal: No Target.");
 	else
 		c->GetTarget()->Heal();
 }
@@ -2939,12 +3206,12 @@ void command_appearance(Client *c, const Seperator *sep)
 	// sends any appearance packet
 	// Dev debug command, for appearance types
 	if (sep->arg[2][0] == 0)
-		c->Message(0, "Usage: #appearance type value");
+		c->Message(Chat::White, "Usage: #appearance type value");
 	else {
 		if ((c->GetTarget()))
 			t=c->GetTarget();
 		t->SendAppearancePacket(atoi(sep->arg[1]), atoi(sep->arg[2]));
-		c->Message(0, "Sending appearance packet: target=%s, type=%s, value=%s",  t->GetName(), sep->arg[1], sep->arg[2]);
+		c->Message(Chat::White, "Sending appearance packet: target=%s, type=%s, value=%s",  t->GetName(), sep->arg[1], sep->arg[2]);
 	}
 }
 
@@ -2955,10 +3222,10 @@ void command_nukeitem(Client *c, const Seperator *sep)
 	if (c->GetTarget() && c->GetTarget()->IsClient() && (sep->IsNumber(1) || sep->IsHexNumber(1))) {
 		itemid=sep->IsNumber(1)?atoi(sep->arg[1]):hextoi(sep->arg[1]);
 		numitems = c->GetTarget()->CastToClient()->NukeItem(itemid);
-		c->Message(0, " %u items deleted",  numitems);
+		c->Message(Chat::White, " %u items deleted",  numitems);
 	}
 	else
-		c->Message(0, "Usage: (targted) #nukeitem itemnum - removes the item from the player's inventory");
+		c->Message(Chat::White, "Usage: (targted) #nukeitem itemnum - removes the item from the player's inventory");
 }
 
 void command_peekinv(Client *c, const Seperator *sep)
@@ -2998,7 +3265,7 @@ void command_peekinv(Client *c, const Seperator *sep)
 		return;
 
 	if (c->GetTarget() && !c->GetTarget()->IsClient()) {
-		c->Message(0, "You must target a PC for this command.");
+		c->Message(Chat::White, "You must target a PC for this command.");
 		return;
 	}
 
@@ -3019,9 +3286,9 @@ void command_peekinv(Client *c, const Seperator *sep)
 	else if (strcasecmp(sep->arg[1], "world") == 0) { scopeMask |= peekWorld; }
 
 	if (!scopeMask) {
-		c->Message(0, "Usage: #peekinv [equip|gen|cursor|poss|limbo|curlim|trib|bank|shbank|allbank|trade|world|all]");
-		c->Message(0, "- Displays a portion of the targeted user's inventory");
-		c->Message(0, "- Caution: 'all' is a lot of information!");
+		c->Message(Chat::White, "Usage: #peekinv [equip|gen|cursor|poss|limbo|curlim|trib|bank|shbank|allbank|trade|world|all]");
+		c->Message(Chat::White, "- Displays a portion of the targeted user's inventory");
+		c->Message(Chat::White, "- Caution: 'all' is a lot of information!");
 		return;
 	}
 
@@ -3037,7 +3304,7 @@ void command_peekinv(Client *c, const Seperator *sep)
 	EQEmu::SayLinkEngine linker;
 	linker.SetLinkType(EQEmu::saylink::SayLinkItemInst);
 
-	c->Message(0, "Displaying inventory for %s...", targetClient->GetName());
+	c->Message(Chat::White, "Displaying inventory for %s...", targetClient->GetName());
 
 	Object* objectTradeskill = targetClient->GetTradeskillObject();
 
@@ -3049,11 +3316,11 @@ void command_peekinv(Client *c, const Seperator *sep)
 
 		if (scopeBit & peekWorld) {
 			if (objectTradeskill == nullptr) {
-				c->Message(1, "No world tradeskill object selected...");
+				c->Message(Chat::Default, "No world tradeskill object selected...");
 				continue;
 			}
 			else {
-				c->Message(0, "[WorldObject DBID: %i (entityid: %i)]", objectTradeskill->GetDBID(), objectTradeskill->GetID());
+				c->Message(Chat::White, "[WorldObject DBID: %i (entityid: %i)]", objectTradeskill->GetDBID(), objectTradeskill->GetID());
 			}
 		}
 
@@ -3257,7 +3524,7 @@ void command_peekinv(Client *c, const Seperator *sep)
 	}
 
 	if (!itemsFound)
-		c->Message(0, "No items found.");
+		c->Message(Chat::White, "No items found.");
 }
 
 void command_interrogateinv(Client *c, const Seperator *sep)
@@ -3276,14 +3543,14 @@ void command_interrogateinv(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "help") == 0) {
 		if (c->Admin() < commandInterrogateInv) {
-			c->Message(0, "Usage: #interrogateinv");
-			c->Message(0, "  Displays your inventory's current in-memory nested storage references");
+			c->Message(Chat::White, "Usage: #interrogateinv");
+			c->Message(Chat::White, "  Displays your inventory's current in-memory nested storage references");
 		}
 		else {
-			c->Message(0, "Usage: #interrogateinv [log] [silent]");
-			c->Message(0, "  Displays your or your Player target inventory's current in-memory nested storage references");
-			c->Message(0, "  [log] - Logs interrogation to file");
-			c->Message(0, "  [silent] - Omits the in-game message portion of the interrogation");
+			c->Message(Chat::White, "Usage: #interrogateinv [log] [silent]");
+			c->Message(Chat::White, "  Displays your or your Player target inventory's current in-memory nested storage references");
+			c->Message(Chat::White, "  [log] - Logs interrogation to file");
+			c->Message(Chat::White, "  [silent] - Omits the in-game message portion of the interrogation");
 		}
 		return;
 	}
@@ -3297,8 +3564,8 @@ void command_interrogateinv(Client *c, const Seperator *sep)
 
 	if (c->Admin() < commandInterrogateInv) {
 		if (c->GetInterrogateInvState()) {
-			c->Message(13, "The last use of #interrogateinv on this inventory instance discovered an error...");
-			c->Message(13, "Logging out, zoning or re-arranging items at this point will result in item loss!");
+			c->Message(Chat::Red, "The last use of #interrogateinv on this inventory instance discovered an error...");
+			c->Message(Chat::Red, "Logging out, zoning or re-arranging items at this point will result in item loss!");
 			return;
 		}
 		target = c;
@@ -3312,7 +3579,7 @@ void command_interrogateinv(Client *c, const Seperator *sep)
 			target = c->GetTarget()->CastToClient();
 		}
 		else {
-			c->Message(1, "Use of this command is limited to Client entities");
+			c->Message(Chat::Default, "Use of this command is limited to Client entities");
 			return;
 		}
 
@@ -3325,7 +3592,7 @@ void command_interrogateinv(Client *c, const Seperator *sep)
 	bool success = target->InterrogateInventory(c, log, silent, allowtrip, error);
 
 	if (!success)
-		c->Message(13, "An unknown error occurred while processing Client::InterrogateInventory()");
+		c->Message(Chat::Red, "An unknown error occurred while processing Client::InterrogateInventory()");
 }
 
 void command_invsnapshot(Client *c, const Seperator *sep)
@@ -3353,7 +3620,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 					"<td></td>"
 					"<td><c \"#AAAAAA\">takes snapshot of character inventory</td>"
 				"</tr>";
-		
+
 		if (c->Admin() >= commandInvSnapshot)
 			window_text.append(
 				"<tr>"
@@ -3411,7 +3678,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 
 		if (strcmp(sep->arg[1], "gcount") == 0) {
 			auto is_count = database.CountInvSnapshots();
-			c->Message(0, "There %s %i inventory snapshot%s.", (is_count == 1 ? "is" : "are"), is_count, (is_count == 1 ? "" : "s"));
+			c->Message(Chat::White, "There %s %i inventory snapshot%s.", (is_count == 1 ? "is" : "are"), is_count, (is_count == 1 ? "" : "s"));
 
 			return;
 		}
@@ -3419,11 +3686,11 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 		if (strcmp(sep->arg[1], "gclear") == 0) {
 			if (strcmp(sep->arg[2], "now") == 0) {
 				database.ClearInvSnapshots(true);
-				c->Message(0, "Inventory snapshots cleared using current time.");
+				c->Message(Chat::White, "Inventory snapshots cleared using current time.");
 			}
 			else {
 				database.ClearInvSnapshots();
-				c->Message(0, "Inventory snapshots cleared using RuleI(Character, InvSnapshotHistoryD) (%i day%s).",
+				c->Message(Chat::White, "Inventory snapshots cleared using RuleI(Character, InvSnapshotHistoryD) (%i day%s).",
 					RuleI(Character, InvSnapshotHistoryD), (RuleI(Character, InvSnapshotHistoryD) == 1 ? "" : "s"));
 			}
 
@@ -3432,7 +3699,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 	}
 
 	if (!c->GetTarget() || !c->GetTarget()->IsClient()) {
-		c->Message(0, "Target must be a client.");
+		c->Message(Chat::White, "Target must be a client.");
 		return;
 	}
 
@@ -3441,12 +3708,12 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 	if (strcmp(sep->arg[1], "capture") == 0) {
 		if (database.SaveCharacterInvSnapshot(tc->CharacterID())) {
 			tc->SetNextInvSnapshot(RuleI(Character, InvSnapshotMinIntervalM));
-			c->Message(0, "Successful inventory snapshot taken of %s - setting next interval for %i minute%s.",
+			c->Message(Chat::White, "Successful inventory snapshot taken of %s - setting next interval for %i minute%s.",
 				tc->GetName(), RuleI(Character, InvSnapshotMinIntervalM), (RuleI(Character, InvSnapshotMinIntervalM) == 1 ? "" : "s"));
 		}
 		else {
 			tc->SetNextInvSnapshot(RuleI(Character, InvSnapshotMinRetryM));
-			c->Message(0, "Failed to take inventory snapshot of %s - retrying in %i minute%s.",
+			c->Message(Chat::White, "Failed to take inventory snapshot of %s - retrying in %i minute%s.",
 				tc->GetName(), RuleI(Character, InvSnapshotMinRetryM), (RuleI(Character, InvSnapshotMinRetryM) == 1 ? "" : "s"));
 		}
 
@@ -3456,7 +3723,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 	if (c->Admin() >= commandInvSnapshot) {
 		if (strcmp(sep->arg[1], "count") == 0) {
 			auto is_count = database.CountCharacterInvSnapshots(tc->CharacterID());
-			c->Message(0, "%s (id: %u) has %i inventory snapshot%s.", tc->GetName(), tc->CharacterID(), is_count, (is_count == 1 ? "" : "s"));
+			c->Message(Chat::White, "%s (id: %u) has %i inventory snapshot%s.", tc->GetName(), tc->CharacterID(), is_count, (is_count == 1 ? "" : "s"));
 
 			return;
 		}
@@ -3464,11 +3731,11 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 		if (strcmp(sep->arg[1], "clear") == 0) {
 			if (strcmp(sep->arg[2], "now") == 0) {
 				database.ClearCharacterInvSnapshots(tc->CharacterID(), true);
-				c->Message(0, "%s\'s (id: %u) inventory snapshots cleared using current time.", tc->GetName(), tc->CharacterID());
+				c->Message(Chat::White, "%s\'s (id: %u) inventory snapshots cleared using current time.", tc->GetName(), tc->CharacterID());
 			}
 			else {
 				database.ClearCharacterInvSnapshots(tc->CharacterID());
-				c->Message(0, "%s\'s (id: %u) inventory snapshots cleared using RuleI(Character, InvSnapshotHistoryD) (%i day%s).",
+				c->Message(Chat::White, "%s\'s (id: %u) inventory snapshots cleared using RuleI(Character, InvSnapshotHistoryD) (%i day%s).",
 					tc->GetName(), tc->CharacterID(), RuleI(Character, InvSnapshotHistoryD), (RuleI(Character, InvSnapshotHistoryD) == 1 ? "" : "s"));
 			}
 
@@ -3480,7 +3747,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 			database.ListCharacterInvSnapshots(tc->CharacterID(), is_list);
 
 			if (is_list.empty()) {
-				c->Message(0, "No inventory snapshots for %s (id: %u)", tc->GetName(), tc->CharacterID());
+				c->Message(Chat::White, "No inventory snapshots for %s (id: %u)", tc->GetName(), tc->CharacterID());
 				return;
 			}
 
@@ -3526,14 +3793,14 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 
 		if (strcmp(sep->arg[1], "parse") == 0) {
 			if (!sep->IsNumber(2)) {
-				c->Message(0, "A timestamp is required to use this option.");
+				c->Message(Chat::White, "A timestamp is required to use this option.");
 				return;
 			}
 
 			uint32 timestamp = atoul(sep->arg[2]);
 
 			if (!database.ValidateCharacterInvSnapshotTimestamp(tc->CharacterID(), timestamp)) {
-				c->Message(0, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
+				c->Message(Chat::White, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
 				return;
 			}
 
@@ -3543,7 +3810,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 			std::string window_title = StringFormat("Snapshot Parse for %s @ %u", tc->GetName(), timestamp);
 
 			std::string window_text = "Slot: ItemID - Description<br>";
-			
+
 			for (auto iter : parse_list) {
 				auto item_data = database.GetItem(iter.second);
 				std::string window_line = StringFormat("%i: %u - %s<br>", iter.first, iter.second, (item_data ? item_data->Name : "[error]"));
@@ -3552,7 +3819,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 					window_text.append(window_line);
 				}
 				else {
-					c->Message(0, "Too many snapshot entries to list...");
+					c->Message(Chat::White, "Too many snapshot entries to list...");
 					break;
 				}
 			}
@@ -3564,14 +3831,14 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 
 		if (strcmp(sep->arg[1], "compare") == 0) {
 			if (!sep->IsNumber(2)) {
-				c->Message(0, "A timestamp is required to use this option.");
+				c->Message(Chat::White, "A timestamp is required to use this option.");
 				return;
 			}
 
 			uint32 timestamp = atoul(sep->arg[2]);
-			
+
 			if (!database.ValidateCharacterInvSnapshotTimestamp(tc->CharacterID(), timestamp)) {
-				c->Message(0, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
+				c->Message(Chat::White, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
 				return;
 			}
 
@@ -3584,7 +3851,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 			std::string window_title = StringFormat("Snapshot Comparison for %s @ %u", tc->GetName(), timestamp);
 
 			std::string window_text = "Slot: (action) Snapshot -&gt; Inventory<br>";
-			
+
 			auto inv_iter = inv_compare_list.begin();
 			auto iss_iter = iss_compare_list.begin();
 
@@ -3622,7 +3889,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 					window_text.append(window_line);
 				}
 				else {
-					c->Message(0, "Too many comparison entries to list...");
+					c->Message(Chat::White, "Too many comparison entries to list...");
 					break;
 				}
 			}
@@ -3634,14 +3901,14 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 
 		if (strcmp(sep->arg[1], "restore") == 0) {
 			if (!sep->IsNumber(2)) {
-				c->Message(0, "A timestamp is required to use this option.");
+				c->Message(Chat::White, "A timestamp is required to use this option.");
 				return;
 			}
 
 			uint32 timestamp = atoul(sep->arg[2]);
 
 			if (!database.ValidateCharacterInvSnapshotTimestamp(tc->CharacterID(), timestamp)) {
-				c->Message(0, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
+				c->Message(Chat::White, "No inventory snapshots for %s (id: %u) exist at %u.", tc->GetName(), tc->CharacterID(), timestamp);
 				return;
 			}
 
@@ -3649,7 +3916,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 				tc->SetNextInvSnapshot(RuleI(Character, InvSnapshotMinIntervalM));
 			}
 			else {
-				c->Message(13, "Failed to take pre-restore inventory snapshot of %s (id: %u).",
+				c->Message(Chat::Red, "Failed to take pre-restore inventory snapshot of %s (id: %u).",
 					tc->GetName(), tc->CharacterID());
 				return;
 			}
@@ -3658,14 +3925,14 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 				// cannot delete all valid item slots from client..so, we worldkick
 				tc->WorldKick(); // self restores update before the 'kick' is processed
 
-				c->Message(0, "Successfully applied snapshot %u to %s's (id: %u) inventory.",
+				c->Message(Chat::White, "Successfully applied snapshot %u to %s's (id: %u) inventory.",
 					timestamp, tc->GetName(), tc->CharacterID());
 			}
 			else {
-				c->Message(13, "Failed to apply snapshot %u to %s's (id: %u) inventory.",
+				c->Message(Chat::Red, "Failed to apply snapshot %u to %s's (id: %u) inventory.",
 					timestamp, tc->GetName(), tc->CharacterID());
 			}
-			
+
 			return;
 		}
 	}
@@ -3674,7 +3941,7 @@ void command_invsnapshot(Client *c, const Seperator *sep)
 void command_findnpctype(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #findnpctype [search criteria]");
+		c->Message(Chat::White, "Usage: #findnpctype [search criteria]");
 		return;
     }
 
@@ -3716,77 +3983,236 @@ void command_findnpctype(Client *c, const Seperator *sep)
 
 }
 
+void command_faction(Client *c, const Seperator *sep)
+{
+	if (sep->arg[1][0] == 0) {
+		c->Message(Chat::White, "Usage: #faction -- Displays Target NPC's Primary faction");
+		c->Message(Chat::White, "Usage: #faction Find [criteria | all] -- Displays factions name & id");
+		c->Message(Chat::White, "Usage: #faction Review [criteria | all] -- Review Targeted Players faction hits");
+		c->Message(Chat::White, "Usage: #faction Reset [id] -- Reset Targeted Players specified faction to base");
+		uint32 npcfac;
+		std::string npcname;
+		if (c->GetTarget() && c->GetTarget()->IsNPC()) {
+			npcfac = c->GetTarget()->CastToNPC()->GetPrimaryFaction();
+			npcname = c->GetTarget()->CastToNPC()->GetCleanName();
+			std::string blurb = fmt::format("( Target Npc: {} : has primary faction id: {} )", npcname, npcfac);
+			c->Message(Chat::Yellow, blurb.c_str());
+			c->Message(Chat::White, "Use: #setfaction [id] - to alter an NPC's faction");
+		}
+		return;
+	}
+
+	std::string faction_filter;
+	if (sep->arg[2]) {
+		faction_filter = str_tolower(sep->arg[2]);
+	}
+	if (strcasecmp(sep->arg[1], "find") == 0) {
+		std::string query;
+		if (strcasecmp(sep->arg[2], "all") == 0) {
+
+			query = "SELECT `id`,`name` FROM `faction_list`";
+		}
+		else {
+			query = fmt::format("SELECT `id`,`name` FROM `faction_list` WHERE `name` LIKE '%{}%'", faction_filter.c_str());
+		}
+		auto results = database.QueryDatabase(query);
+		if (!results.Success())
+			return;
+		if (results.RowCount() == 0) {
+			c->Message(Chat::Yellow, "No factions found with specified criteria");
+			return;
+		}
+		int _ctr = 0;
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			auto    id = static_cast<uint32>(atoi(row[0]));
+			std::string name = row[1];
+			_ctr++;
+			c->Message(Chat::Yellow, "%s : id: %s", name.c_str(), std::to_string(id).c_str());
+		}
+		std::string response = _ctr > 0 ? fmt::format("Found {} matching factions", _ctr).c_str() : "No factions found.";
+		c->Message(Chat::Yellow, response.c_str());
+	}
+	if (strcasecmp(sep->arg[1], "review") == 0) {
+		if (!(c->GetTarget() && c->GetTarget()->IsClient())) {
+			c->Message(Chat::Red, "Player Target Required for faction review");
+			return;
+		}
+		uint32 charid = c->GetTarget()->CastToClient()->CharacterID();
+		std::string revquery;
+		if (strcasecmp(sep->arg[2], "all") == 0) {
+			revquery = fmt::format(
+				"SELECT id,`name`, current_value FROM faction_list INNER JOIN faction_values ON faction_list.id = faction_values.faction_id WHERE char_id = {}", charid);
+		}
+		else
+		{
+			revquery = fmt::format(
+				"SELECT id,`name`, current_value FROM faction_list INNER JOIN faction_values ON faction_list.id = faction_values.faction_id WHERE `name` like '%{}%' and char_id = {}", faction_filter.c_str(), charid);
+		}
+		auto revresults = database.QueryDatabase(revquery);
+		if (!revresults.Success())
+			return;
+		if (revresults.RowCount() == 0) {
+			c->Message(Chat::Yellow, "No faction hits found. All are at base level");
+			return;
+		}
+		int _ctr2 = 0;
+		for (auto rrow = revresults.begin(); rrow != revresults.end(); ++rrow) {
+			auto    f_id = static_cast<uint32>(atoi(rrow[0]));
+			std::string cname = rrow[1];
+			std::string fvalue = rrow[2];
+			_ctr2++;
+			std::string resetlink = fmt::format("#faction reset {}", f_id);
+			c->Message(Chat::Yellow, "Reset: %s         id: %s (%s)", EQEmu::SayLinkEngine::GenerateQuestSaylink(resetlink, false, cname.c_str()).c_str(), std::to_string(f_id).c_str(), fvalue.c_str());
+		}
+		std::string response = _ctr2 > 0 ? fmt::format("Found {} matching factions", _ctr2).c_str() : "No faction hits found.";
+		c->Message(Chat::Yellow, response.c_str());
+	}
+	else if (strcasecmp(sep->arg[1], "reset") == 0)
+	{
+		if (!(faction_filter == "")) {
+			if (c->GetTarget() && c->GetTarget()->IsClient())
+			{
+				if (!c->CastToClient()->GetFeigned() && c->CastToClient()->GetAggroCount() == 0)
+				{
+					uint32 charid = c->GetTarget()->CastToClient()->CharacterID();
+					uint32 factionid = atoi(faction_filter.c_str());
+
+					if (c->GetTarget()->CastToClient()->ReloadCharacterFaction(c->GetTarget()->CastToClient(), factionid, charid))
+						c->Message(Chat::Yellow, "faction %u was cleared.", factionid);
+					else
+						c->Message(Chat::Red, "An error occurred clearing faction %u", factionid);
+				}
+				else
+				{
+					c->Message(Chat::Red, "Cannot be in Combat");
+					return;
+				}
+			}
+			else {
+				c->Message(Chat::Red, "Player Target Required (whose not feigning death)");
+				return;
+			}
+		}
+		else
+			c->Message(Chat::Red, "No faction id entered");
+	}
+}
+
 void command_findzone(Client *c, const Seperator *sep)
 {
-	if(sep->arg[1][0] == 0) {
-		c->Message(0, "Usage: #findzone [search criteria]");
-        return;
-    }
+	if (sep->arg[1][0] == 0) {
+		c->Message(Chat::White, "Usage: #findzone [search criteria]");
+		c->Message(Chat::White, "Usage: #findzone expansion [expansion number]");
+		return;
+	}
 
-    std::string query;
-    int id = atoi((const char *)sep->arg[1]);
-    if (id == 0) { // If id evaluates to 0, then search as if user entered a string.
-	    auto escName = new char[strlen(sep->arg[1]) * 2 + 1];
-	    database.DoEscapeString(escName, sep->arg[1], strlen(sep->arg[1]));
+	std::string query;
+	int         id = atoi((const char *) sep->arg[1]);
 
-	    query = StringFormat("SELECT zoneidnumber, short_name, long_name FROM zone "
-				 "WHERE long_name RLIKE '%s' AND version = 0",
-				 escName);
-	    safe_delete_array(escName);
-    }
-    else // Otherwise, look for just that zoneidnumber.
-		query = StringFormat("SELECT zoneidnumber, short_name, long_name FROM zone "
-                            "WHERE zoneidnumber = %i AND version = 0",  id);
+	std::string arg1 = sep->arg[1];
 
-    auto results = database.QueryDatabase(query);
-    if (!results.Success()) {
-        c->Message (0, "Error querying database.");
-        c->Message (0, query.c_str());
-        return;
-    }
+	if (arg1 == "expansion") {
+		query = fmt::format(
+			"SELECT zoneidnumber, short_name, long_name, version FROM zone WHERE expansion = {}",
+			sep->arg[2]
+		);
+	}
+	else {
 
-    int count = 0;
-    const int maxrows = 20;
+		/**
+		 * If id evaluates to 0, then search as if user entered a string
+		 */
+		if (id == 0) {
+			query = fmt::format(
+				"SELECT zoneidnumber, short_name, long_name, version FROM zone WHERE long_name LIKE '%{}%'",
+				EscapeString(sep->arg[1])
+			);
+		}
+		else {
+			query = fmt::format(
+				"SELECT zoneidnumber, short_name, long_name, version FROM zone WHERE zoneidnumber = {}",
+				id
+			);
+		}
+	}
 
-    for(auto row = results.begin(); row != results.end(); ++row) {
-        if (++count > maxrows) {
-            c->Message (0, "%i zones shown. Too many results.",  maxrows);
-            break;
-        }
+	auto results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		c->Message(Chat::White, "Error querying database.");
+		c->Message(Chat::White, query.c_str());
+		return;
+	}
 
-        c->Message (0, "  %s: %s, %s",  row[0], row[1], row[2]);
-    }
+	int       count   = 0;
+	const int maxrows = 100;
 
-    if (count <= maxrows)
-        c->Message (0, "Query complete. %i rows shown.",  count);
-    else if (count == 0)
-        c->Message (0, "No matches found for %s.",  sep->arg[1]);
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		std::string zone_id    = row[0];
+		std::string short_name = row[1];
+		std::string long_name  = row[2];
+		int         version    = atoi(row[3]);
+
+		if (++count > maxrows) {
+			c->Message(Chat::White, "%i zones shown. Too many results.", maxrows);
+			break;
+		}
+
+		std::string command_zone   = EQEmu::SayLinkEngine::GenerateQuestSaylink("#zone " + short_name, false, "zone");
+		std::string command_gmzone = EQEmu::SayLinkEngine::GenerateQuestSaylink(
+			fmt::format("#gmzone {} {}", short_name, version),
+			false,
+			"gmzone"
+		);
+
+		c->Message(
+			Chat::White,
+			fmt::format(
+				"[{}] [{}] [{}] Version ({}) [{}]",
+				(version == 0 ? command_zone : "zone"),
+				command_gmzone,
+				short_name,
+				version,
+				long_name
+			).c_str()
+		);
+	}
+
+	if (count <= maxrows) {
+		c->Message(
+			Chat::White,
+			"Query complete. %i rows shown. %s",
+			count,
+			(arg1 == "expansion" ? "(expansion search)" : ""));
+	}
+	else if (count == 0) {
+		c->Message(Chat::White, "No matches found for %s.", sep->arg[1]);
+	}
 }
 
 void command_viewnpctype(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #viewnpctype [npctype id]");
+		c->Message(Chat::White, "Usage: #viewnpctype [npctype id]");
 	else
 	{
 		uint32 npctypeid=atoi(sep->arg[1]);
 		const NPCType* npct = database.LoadNPCTypesData(npctypeid);
 		if (npct) {
-			c->Message(0, " NPCType Info, ");
-			c->Message(0, "  NPCTypeID: %u",  npct->npc_id);
-			c->Message(0, "  Name: %s",  npct->name);
-			c->Message(0, "  Level: %i",  npct->level);
-			c->Message(0, "  Race: %i",  npct->race);
-			c->Message(0, "  Class: %i",  npct->class_);
-			c->Message(0, "  MinDmg: %i",  npct->min_dmg);
-			c->Message(0, "  MaxDmg: %i",  npct->max_dmg);
-			c->Message(0, "  Special Abilities: %s",  npct->special_abilities);
-			c->Message(0, "  Spells: %i",  npct->npc_spells_id);
-			c->Message(0, "  Loot Table: %i",  npct->loottable_id);
-			c->Message(0, "  NPCFactionID: %i",  npct->npc_faction_id);
+			c->Message(Chat::White, " NPCType Info, ");
+			c->Message(Chat::White, "  NPCTypeID: %u",  npct->npc_id);
+			c->Message(Chat::White, "  Name: %s",  npct->name);
+			c->Message(Chat::White, "  Level: %i",  npct->level);
+			c->Message(Chat::White, "  Race: %i",  npct->race);
+			c->Message(Chat::White, "  Class: %i",  npct->class_);
+			c->Message(Chat::White, "  MinDmg: %i",  npct->min_dmg);
+			c->Message(Chat::White, "  MaxDmg: %i",  npct->max_dmg);
+			c->Message(Chat::White, "  Special Abilities: %s",  npct->special_abilities);
+			c->Message(Chat::White, "  Spells: %i",  npct->npc_spells_id);
+			c->Message(Chat::White, "  Loot Table: %i",  npct->loottable_id);
+			c->Message(Chat::White, "  NPCFactionID: %i",  npct->npc_faction_id);
 		}
 		else
-			c->Message(0, "NPC #%d not found",  npctypeid);
+			c->Message(Chat::White, "NPC #%d not found",  npctypeid);
 	}
 }
 
@@ -3794,13 +4220,13 @@ void command_reloadqst(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
 	{
-		c->Message(0, "Clearing quest memory cache.");
+		c->Message(Chat::White, "Clearing quest memory cache.");
 		entity_list.ClearAreas();
 		parse->ReloadQuests();
 	}
 	else
 	{
-		c->Message(0, "Clearing quest memory cache and stopping timers.");
+		c->Message(Chat::White, "Clearing quest memory cache and stopping timers.");
 		entity_list.ClearAreas();
 		parse->ReloadQuests(true);
 	}
@@ -3814,17 +4240,22 @@ void command_corpsefix(Client *c, const Seperator *sep)
 
 void command_reloadworld(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Reloading quest cache and repopping zones worldwide.");
+	int world_repop = atoi(sep->arg[1]);
+	if (world_repop == 0)
+		c->Message(Chat::White, "Reloading quest cache worldwide.");
+	else
+		c->Message(Chat::White, "Reloading quest cache and repopping zones worldwide.");
+	
 	auto pack = new ServerPacket(ServerOP_ReloadWorld, sizeof(ReloadWorld_Struct));
 	ReloadWorld_Struct* RW = (ReloadWorld_Struct*) pack->pBuffer;
-	RW->Option = ((atoi(sep->arg[1]) == 1) ? 1 : 0);
+	RW->Option = world_repop;
 	worldserver.SendPacket(pack);
 	safe_delete(pack);
 }
 
 void command_reloadmerchants(Client *c, const Seperator *sep) {
 	entity_list.ReloadMerchants();
-	c->Message(15, "Reloading merchants.");
+	c->Message(Chat::Yellow, "Reloading merchants.");
 }
 
 void command_reloadlevelmods(Client *c, const Seperator *sep)
@@ -3833,9 +4264,9 @@ void command_reloadlevelmods(Client *c, const Seperator *sep)
 	{
 		if(RuleB(Zone, LevelBasedEXPMods)){
 			zone->LoadLevelEXPMods();
-			c->Message(15, "Level based EXP Mods have been reloaded zonewide");
+			c->Message(Chat::Yellow, "Level based EXP Mods have been reloaded zonewide");
 		}else{
-			c->Message(15, "Level based EXP Mods are disabled in rules!");
+			c->Message(Chat::Yellow, "Level based EXP Mods are disabled in rules!");
 		}
 	}
 }
@@ -3843,15 +4274,15 @@ void command_reloadlevelmods(Client *c, const Seperator *sep)
 void command_reloadzps(Client *c, const Seperator *sep)
 {
 	database.LoadStaticZonePoints(&zone->zone_point_list, zone->GetShortName(), zone->GetInstanceVersion());
-	c->Message(0, "Reloading server zone_points.");
+	c->Message(Chat::White, "Reloading server zone_points.");
 }
 
 void command_zoneshutdown(Client *c, const Seperator *sep)
 {
 	if (!worldserver.Connected())
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 	else if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #zoneshutdown zoneshortname");
+		c->Message(Chat::White, "Usage: #zoneshutdown zoneshortname");
 	else {
 		auto pack = new ServerPacket(ServerOP_ZoneShutdown, sizeof(ServerZoneStateChange_struct));
 		ServerZoneStateChange_struct* s = (ServerZoneStateChange_struct *) pack->pBuffer;
@@ -3868,9 +4299,9 @@ void command_zoneshutdown(Client *c, const Seperator *sep)
 void command_zonebootup(Client *c, const Seperator *sep)
 {
 	if (!worldserver.Connected())
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 	else if (sep->arg[2][0] == 0) {
-		c->Message(0, "Usage: #zonebootup ZoneServerID# zoneshortname");
+		c->Message(Chat::White, "Usage: #zonebootup ZoneServerID# zoneshortname");
 	}
 	else {
 		auto pack = new ServerPacket(ServerOP_ZoneBootup, sizeof(ServerZoneStateChange_struct));
@@ -3887,20 +4318,20 @@ void command_zonebootup(Client *c, const Seperator *sep)
 void command_kick(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #kick [charname]");
+		c->Message(Chat::White, "Usage: #kick [charname]");
 	else {
 		Client* client = entity_list.GetClientByName(sep->arg[1]);
 		if (client != 0) {
 			if (client->Admin() <= c->Admin()) {
-				client->Message(0, "You have been kicked by %s", c->GetName());
+				client->Message(Chat::White, "You have been kicked by %s", c->GetName());
 				auto outapp = new EQApplicationPacket(OP_GMKick, 0);
 				client->QueuePacket(outapp);
-				client->Kick();
-				c->Message(0, "Kick: local: kicking %s",  sep->arg[1]);
+				client->Kick("Ordered kicked by command");
+				c->Message(Chat::White, "Kick: local: kicking %s",  sep->arg[1]);
 			}
 		}
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server disconnected");
+			c->Message(Chat::White, "Error: World server disconnected");
 		else {
 			auto pack = new ServerPacket(ServerOP_KickPlayer, sizeof(ServerKickPlayer_Struct));
 			ServerKickPlayer_Struct* skp = (ServerKickPlayer_Struct*) pack->pBuffer;
@@ -3920,10 +4351,10 @@ void command_attack(Client *c, const Seperator *sep)
 		if (sictar)
 			c->GetTarget()->CastToNPC()->AddToHateList(sictar, 1, 0);
 		else
-			c->Message(0, "Error: %s not found",  sep->arg[1]);
+			c->Message(Chat::White, "Error: %s not found",  sep->arg[1]);
 	}
 	else
-		c->Message(0, "Usage: (needs NPC targeted) #attack targetname");
+		c->Message(Chat::White, "Usage: (needs NPC targeted) #attack targetname");
 }
 
 void command_lock(Client *c, const Seperator *sep)
@@ -3963,15 +4394,15 @@ void command_listpetition(Client *c, const Seperator *sep)
 	if (!results.Success())
         return;
 
-    Log(Logs::General, Logs::Normal, "Petition list requested by %s",  c->GetName());
+    LogInfo("Petition list requested by [{}]",  c->GetName());
 
     if (results.RowCount() == 0)
         return;
 
-    c->Message(13,"	ID : Character Name , Account Name");
+    c->Message(Chat::Red,"	ID : Character Name , Account Name");
 
     for (auto row = results.begin(); row != results.end(); ++row)
-        c->Message(15, " %s:	%s , %s ", row[0],row[1],row[2]);
+        c->Message(Chat::Yellow, " %s:	%s , %s ", row[0],row[1],row[2]);
 }
 
 void command_equipitem(Client *c, const Seperator *sep)
@@ -4007,7 +4438,7 @@ void command_equipitem(Client *c, const Seperator *sep)
 
 			if (partialmove) { // remove this con check if someone can figure out removing charges from cursor stack issue below
 				// mi->number_in_stack is always from_inst->GetCharges() when partialmove is false
-				c->Message(13, "Error: Partial stack added to existing stack exceeds allowable stacksize");
+				c->Message(Chat::Red, "Error: Partial stack added to existing stack exceeds allowable stacksize");
 				safe_delete(outapp);
 				return;
 			}
@@ -4025,7 +4456,7 @@ void command_equipitem(Client *c, const Seperator *sep)
 				//	di->to_slot				= 0xFFFFFFFF;
 				//	di->number_in_stack		= 0xFFFFFFFF;
 
-				//	c->Message(0, "Deleting %i charges from stack",  movecount); // debug line..delete
+				//	c->Message(Chat::White, "Deleting %i charges from stack",  movecount); // debug line..delete
 
 				//	for (int16 deletecount=0; deletecount < movecount; deletecount++)
 						// have to use 'movecount' because mi->number_in_stack is 'ENCODED' at this point (i.e., 99 charges returns 22...)
@@ -4035,19 +4466,19 @@ void command_equipitem(Client *c, const Seperator *sep)
 				//}
 			}
 			else {
-				c->Message(13, "Error: Unable to equip current item");
+				c->Message(Chat::Red, "Error: Unable to equip current item");
 			}
 			safe_delete(outapp);
 
 			// also send out a wear change packet?
 		}
 		else if (from_inst == nullptr)
-			c->Message(13, "Error: There is no item on your cursor");
+			c->Message(Chat::Red, "Error: There is no item on your cursor");
 		else
-			c->Message(13, "Error: Item on your cursor cannot be equipped");
+			c->Message(Chat::Red, "Error: Item on your cursor cannot be equipped");
 	}
 	else
-		c->Message(0, "Usage: #equipitem slotid[0-21] - equips the item on your cursor to the position");
+		c->Message(Chat::White, "Usage: #equipitem slotid[0-21] - equips the item on your cursor to the position");
 }
 
 void command_zonelock(Client *c, const Seperator *sep)
@@ -4067,7 +4498,7 @@ void command_zonelock(Client *c, const Seperator *sep)
 			worldserver.SendPacket(pack);
 		}
 		else
-			c->Message(0, "Usage: #zonelock lock [zonename]");
+			c->Message(Chat::White, "Usage: #zonelock lock [zonename]");
 	}
 	else if (strcasecmp(sep->arg[1], "unlock") == 0 && c->Admin() >= commandLockZones) {
 		uint16 tmp = database.GetZoneID(sep->arg[2]);
@@ -4077,15 +4508,15 @@ void command_zonelock(Client *c, const Seperator *sep)
 			worldserver.SendPacket(pack);
 		}
 		else
-			c->Message(0, "Usage: #zonelock unlock [zonename]");
+			c->Message(Chat::White, "Usage: #zonelock unlock [zonename]");
 	}
 	else {
-		c->Message(0, "#zonelock sub-commands");
-		c->Message(0, "  list");
+		c->Message(Chat::White, "#zonelock sub-commands");
+		c->Message(Chat::White, "  list");
 		if(c->Admin() >= commandLockZones)
 		{
-			c->Message(0, "  lock [zonename]");
-			c->Message(0, "  unlock [zonename]");
+			c->Message(Chat::White, "  lock [zonename]");
+			c->Message(Chat::White, "  unlock [zonename]");
 		}
 	}
 	safe_delete(pack);
@@ -4098,24 +4529,24 @@ void command_corpse(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "DeletePlayerCorpses") == 0 && c->Admin() >= commandEditPlayerCorpses) {
 		int32 tmp = entity_list.DeletePlayerCorpses();
 		if (tmp >= 0)
-			c->Message(0, "%i corpses deleted.",  tmp);
+			c->Message(Chat::White, "%i corpses deleted.",  tmp);
 		else
-			c->Message(0, "DeletePlayerCorpses Error #%i",  tmp);
+			c->Message(Chat::White, "DeletePlayerCorpses Error #%i",  tmp);
 	}
 	else if (strcasecmp(sep->arg[1], "delete") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target the corpse you wish to delete");
+			c->Message(Chat::White, "Error: Target the corpse you wish to delete");
 		else if (target->IsNPCCorpse()) {
 
-			c->Message(0, "Depoping %s.",  target->GetName());
+			c->Message(Chat::White, "Depoping %s.",  target->GetName());
 			target->CastToCorpse()->Delete();
 		}
 		else if (c->Admin() >= commandEditPlayerCorpses) {
-			c->Message(0, "Deleting %s.",  target->GetName());
+			c->Message(Chat::White, "Deleting %s.",  target->GetName());
 			target->CastToCorpse()->Delete();
 		}
 		else
-			c->Message(0, "Insufficient status to delete player corpse.");
+			c->Message(Chat::White, "Insufficient status to delete player corpse.");
 	}
 	else if (strcasecmp(sep->arg[1], "ListNPC") == 0) {
 		entity_list.ListNPCCorpses(c);
@@ -4126,101 +4557,101 @@ void command_corpse(Client *c, const Seperator *sep)
 	else if (strcasecmp(sep->arg[1], "DeleteNPCCorpses") == 0) {
 		int32 tmp = entity_list.DeleteNPCCorpses();
 		if (tmp >= 0)
-			c->Message(0, "%d corpses deleted.",  tmp);
+			c->Message(Chat::White, "%d corpses deleted.",  tmp);
 		else
-			c->Message(0, "DeletePlayerCorpses Error #%d",  tmp);
+			c->Message(Chat::White, "DeletePlayerCorpses Error #%d",  tmp);
 	}
 	else if (strcasecmp(sep->arg[1], "charid") == 0 && c->Admin() >= commandEditPlayerCorpses) {
 		if (target == 0 || !target->IsPlayerCorpse())
-			c->Message(0, "Error: Target must be a player corpse.");
+			c->Message(Chat::White, "Error: Target must be a player corpse.");
 		else if (!sep->IsNumber(2))
-			c->Message(0, "Error: charid must be a number.");
+			c->Message(Chat::White, "Error: charid must be a number.");
 		else
-			c->Message(0, "Setting CharID=%u on PlayerCorpse '%s'",  target->CastToCorpse()->SetCharID(atoi(sep->arg[2])), target->GetName());
+			c->Message(Chat::White, "Setting CharID=%u on PlayerCorpse '%s'",  target->CastToCorpse()->SetCharID(atoi(sep->arg[2])), target->GetName());
 	}
 	else if (strcasecmp(sep->arg[1], "ResetLooter") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target the corpse you wish to reset");
+			c->Message(Chat::White, "Error: Target the corpse you wish to reset");
 		else
 			target->CastToCorpse()->ResetLooter();
 	}
 	else if (strcasecmp(sep->arg[1], "RemoveCash") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target the corpse you wish to remove the cash from");
+			c->Message(Chat::White, "Error: Target the corpse you wish to remove the cash from");
 		else if (!target->IsPlayerCorpse() || c->Admin() >= commandEditPlayerCorpses) {
-			c->Message(0, "Removing Cash from %s.",  target->GetName());
+			c->Message(Chat::White, "Removing Cash from %s.",  target->GetName());
 			target->CastToCorpse()->RemoveCash();
 		}
 		else
-			c->Message(0, "Insufficient status to modify player corpse.");
+			c->Message(Chat::White, "Insufficient status to modify player corpse.");
 	}
 	else if (strcasecmp(sep->arg[1], "InspectLoot") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target must be a corpse.");
+			c->Message(Chat::White, "Error: Target must be a corpse.");
 		else
 			target->CastToCorpse()->QueryLoot(c);
 	}
 	else if (strcasecmp(sep->arg[1], "lock") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target must be a corpse.");
+			c->Message(Chat::White, "Error: Target must be a corpse.");
 		else {
 			target->CastToCorpse()->Lock();
-			c->Message(0, "Locking %s...",  target->GetName());
+			c->Message(Chat::White, "Locking %s...",  target->GetName());
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "unlock") == 0) {
 		if (target == 0 || !target->IsCorpse())
-			c->Message(0, "Error: Target must be a corpse.");
+			c->Message(Chat::White, "Error: Target must be a corpse.");
 		else {
 			target->CastToCorpse()->UnLock();
-			c->Message(0, "Unlocking %s...",  target->GetName());
+			c->Message(Chat::White, "Unlocking %s...",  target->GetName());
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "depop") == 0) {
 		if (target == 0 || !target->IsPlayerCorpse())
-			c->Message(0, "Error: Target must be a player corpse.");
+			c->Message(Chat::White, "Error: Target must be a player corpse.");
 		else if (c->Admin() >= commandEditPlayerCorpses && target->IsPlayerCorpse()) {
-			c->Message(0, "Depoping %s.",  target->GetName());
+			c->Message(Chat::White, "Depoping %s.",  target->GetName());
 			target->CastToCorpse()->DepopPlayerCorpse();
 			if(!sep->arg[2][0] || atoi(sep->arg[2]) != 0)
 				target->CastToCorpse()->Bury();
 		}
 		else
-			c->Message(0, "Insufficient status to depop player corpse.");
+			c->Message(Chat::White, "Insufficient status to depop player corpse.");
 	}
 	else if (strcasecmp(sep->arg[1], "depopall") == 0) {
 		if (target == 0 || !target->IsClient())
-			c->Message(0, "Error: Target must be a player.");
+			c->Message(Chat::White, "Error: Target must be a player.");
 		else if (c->Admin() >= commandEditPlayerCorpses && target->IsClient()) {
-			c->Message(0, "Depoping %s\'s corpses.",  target->GetName());
+			c->Message(Chat::White, "Depoping %s\'s corpses.",  target->GetName());
 			target->CastToClient()->DepopAllCorpses();
 			if(!sep->arg[2][0] || atoi(sep->arg[2]) != 0)
 				target->CastToClient()->BuryPlayerCorpses();
 		}
 		else
-			c->Message(0, "Insufficient status to depop player corpse.");
+			c->Message(Chat::White, "Insufficient status to depop player corpse.");
 
 	}
 	else if (sep->arg[1][0] == 0 || strcasecmp(sep->arg[1], "help") == 0) {
-		c->Message(0, "#Corpse Sub-Commands:");
-		c->Message(0, "  DeleteNPCCorpses");
-		c->Message(0, "  Delete - Delete targetted corpse");
-		c->Message(0, "  ListNPC");
-		c->Message(0, "  ListPlayer");
-		c->Message(0, "  Lock - GM locks the corpse - cannot be looted by non-GM");
-		c->Message(0, "  UnLock");
-		c->Message(0, "  RemoveCash");
-		c->Message(0, "  InspectLoot");
-		c->Message(0, "  [to remove items from corpses, loot them]");
-		c->Message(0, "Lead-GM status required to delete/modify player corpses");
-		c->Message(0, "  DeletePlayerCorpses");
-		c->Message(0, "  CharID [charid] - change player corpse's owner");
-		c->Message(0, "  Depop [bury] - Depops single target corpse.");
-		c->Message(0, "  Depopall [bury] - Depops all target player's corpses.");
-		c->Message(0, "Set bury to 0 to skip burying the corpses.");
+		c->Message(Chat::White, "#Corpse Sub-Commands:");
+		c->Message(Chat::White, "  DeleteNPCCorpses");
+		c->Message(Chat::White, "  Delete - Delete targetted corpse");
+		c->Message(Chat::White, "  ListNPC");
+		c->Message(Chat::White, "  ListPlayer");
+		c->Message(Chat::White, "  Lock - GM locks the corpse - cannot be looted by non-GM");
+		c->Message(Chat::White, "  UnLock");
+		c->Message(Chat::White, "  RemoveCash");
+		c->Message(Chat::White, "  InspectLoot");
+		c->Message(Chat::White, "  [to remove items from corpses, loot them]");
+		c->Message(Chat::White, "Lead-GM status required to delete/modify player corpses");
+		c->Message(Chat::White, "  DeletePlayerCorpses");
+		c->Message(Chat::White, "  CharID [charid] - change player corpse's owner");
+		c->Message(Chat::White, "  Depop [bury] - Depops single target corpse.");
+		c->Message(Chat::White, "  Depopall [bury] - Depops all target player's corpses.");
+		c->Message(Chat::White, "Set bury to 0 to skip burying the corpses.");
 	}
 	else
-		c->Message(0, "Error, #corpse sub-command not found");
+		c->Message(Chat::White, "Error, #corpse sub-command not found");
 }
 
 void command_fixmob(Client *c, const Seperator *sep)
@@ -4229,9 +4660,9 @@ void command_fixmob(Client *c, const Seperator *sep)
 	const char* Usage = "Usage: #fixmob [race|gender|texture|helm|face|hair|haircolor|beard|beardcolor|heritage|tattoo|detail] [next|prev]";
 
 	if (!sep->arg[1])
-		c->Message(0,Usage);
+		c->Message(Chat::White,Usage);
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else
 	{
 
@@ -4433,7 +4864,7 @@ void command_fixmob(Client *c, const Seperator *sep)
 
 		if (ChangeType == nullptr)
 		{
-			c->Message(0,Usage);
+			c->Message(Chat::White,Usage);
 		}
 		else
 		{
@@ -4441,7 +4872,7 @@ void command_fixmob(Client *c, const Seperator *sep)
 										EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 										DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-			c->Message(0, "%s=%i",  ChangeType, ChangeSetting);
+			c->Message(Chat::White, "%s=%i",  ChangeType, ChangeSetting);
 		}
 	}
 }
@@ -4457,19 +4888,19 @@ void command_gmspeed(Client *c, const Seperator *sep)
 
 	if (sep->arg[1][0] != 0) {
 		database.SetGMSpeed(t->AccountID(), state ? 1 : 0);
-		c->Message(0, "Turning GMSpeed %s for %s (zone to take effect)", state ? "On" : "Off", t->GetName());
+		c->Message(Chat::White, "Turning GMSpeed %s for %s (zone to take effect)", state ? "On" : "Off", t->GetName());
 	}
 	else {
-		c->Message(0, "Usage: #gmspeed [on/off]");
+		c->Message(Chat::White, "Usage: #gmspeed [on/off]");
 	}
 }
 
 void command_gmzone(Client *c, const Seperator *sep)
 {
 	if (!sep->arg[1]) {
-		c->Message(0, "Usage");
-		c->Message(0, "-------");
-		c->Message(0, "#gmzone [zone_short_name] [zone_version=0]");
+		c->Message(Chat::White, "Usage");
+		c->Message(Chat::White, "-------");
+		c->Message(Chat::White, "#gmzone [zone_short_name] [zone_version=0]");
 		return;
 	}
 
@@ -4482,7 +4913,7 @@ void command_gmzone(Client *c, const Seperator *sep)
 	uint16      instance_id            = 0;
 
 	if (zone_id == 0) {
-		c->Message(13, "Invalid zone specified");
+		c->Message(Chat::Red, "Invalid zone specified");
 		return;
 	}
 
@@ -4490,27 +4921,27 @@ void command_gmzone(Client *c, const Seperator *sep)
 		identifier = sep->arg[3];
 	}
 
-	std::string bucket_key             = StringFormat("%s-%s-instance", zone_short_name, identifier.c_str());
+	std::string bucket_key             = StringFormat("%s-%s-%u-instance", zone_short_name, identifier.c_str(), zone_version);
 	std::string existing_zone_instance = DataBucket::GetData(bucket_key);
 
 	if (existing_zone_instance.length() > 0) {
 		instance_id = std::stoi(existing_zone_instance);
 
-		c->Message(15, "Found already created instance (%s) (%u)", zone_short_name, instance_id);
+		c->Message(Chat::Yellow, "Found already created instance (%s) (%u)", zone_short_name, instance_id);
 	}
 
 	if (instance_id == 0) {
 		if (!database.GetUnusedInstanceID(instance_id)) {
-			c->Message(13, "Server was unable to find a free instance id.");
+			c->Message(Chat::Red, "Server was unable to find a free instance id.");
 			return;
 		}
 
 		if (!database.CreateInstance(instance_id, zone_id, zone_version, duration)) {
-			c->Message(13, "Server was unable to create a new instance.");
+			c->Message(Chat::Red, "Server was unable to create a new instance.");
 			return;
 		}
 
-		c->Message(15, "New private GM instance %s was created with id %lu.", zone_short_name, (unsigned long) instance_id);
+		c->Message(Chat::Yellow, "New private GM instance %s was created with id %lu.", zone_short_name, (unsigned long) instance_id);
 		DataBucket::SetData(bucket_key, std::to_string(instance_id));
 	}
 
@@ -4528,10 +4959,10 @@ void command_gmzone(Client *c, const Seperator *sep)
 			&min_status,
 			&min_level
 		)) {
-			c->Message(13, "Failed to find safe coordinates for specified zone");
+			c->Message(Chat::Red, "Failed to find safe coordinates for specified zone");
 		}
 
-		c->Message(15, "Zoning to private GM instance (%s) (%u)", zone_short_name, instance_id);
+		c->Message(Chat::Yellow, "Zoning to private GM instance (%s) (%u)", zone_short_name, instance_id);
 
 		c->AssignToInstance(instance_id);
 		c->MovePC(zone_id, instance_id, target_x, target_y, target_z, 0, 1);
@@ -4541,7 +4972,7 @@ void command_gmzone(Client *c, const Seperator *sep)
 void command_title(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0]==0)
-		c->Message(0, "Usage: #title [remove|text] [1 = Create row in title table] - remove or set title to 'text'");
+		c->Message(Chat::White, "Usage: #title [remove|text] [1 = Create row in title table] - remove or set title to 'text'");
 	else {
 		bool Save = (atoi(sep->arg[2]) == 1);
 
@@ -4549,13 +4980,13 @@ void command_title(Client *c, const Seperator *sep)
 		if(!target_mob)
 			target_mob = c;
 		if(!target_mob->IsClient()) {
-			c->Message(13, "#title only works on players.");
+			c->Message(Chat::Red, "#title only works on players.");
 			return;
 		}
 		Client *t = target_mob->CastToClient();
 
 		if(strlen(sep->arg[1]) > 31) {
-			c->Message(13, "Title must be 31 characters or less.");
+			c->Message(Chat::Red, "Title must be 31 characters or less.");
 			return;
 		}
 
@@ -4576,13 +5007,13 @@ void command_title(Client *c, const Seperator *sep)
 		t->Save();
 
 		if(removed) {
-			c->Message(13, "%s's title has been removed.",  t->GetName(), sep->arg[1]);
+			c->Message(Chat::Red, "%s's title has been removed.",  t->GetName(), sep->arg[1]);
 			if(t != c)
-				t->Message(13, "Your title has been removed.",  sep->arg[1]);
+				t->Message(Chat::Red, "Your title has been removed.",  sep->arg[1]);
 		} else {
-			c->Message(13, "%s's title has been changed to '%s'.",  t->GetName(), sep->arg[1]);
+			c->Message(Chat::Red, "%s's title has been changed to '%s'.",  t->GetName(), sep->arg[1]);
 			if(t != c)
-				t->Message(13, "Your title has been changed to '%s'.",  sep->arg[1]);
+				t->Message(Chat::Red, "Your title has been changed to '%s'.",  sep->arg[1]);
 		}
 	}
 }
@@ -4591,7 +5022,7 @@ void command_title(Client *c, const Seperator *sep)
 void command_titlesuffix(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0]==0)
-		c->Message(0, "Usage: #titlesuffix [remove|text] [1 = create row in title table] - remove or set title suffix to 'text'");
+		c->Message(Chat::White, "Usage: #titlesuffix [remove|text] [1 = create row in title table] - remove or set title suffix to 'text'");
 	else {
 		bool Save = (atoi(sep->arg[2]) == 1);
 
@@ -4599,13 +5030,13 @@ void command_titlesuffix(Client *c, const Seperator *sep)
 		if(!target_mob)
 			target_mob = c;
 		if(!target_mob->IsClient()) {
-			c->Message(13, "#titlesuffix only works on players.");
+			c->Message(Chat::Red, "#titlesuffix only works on players.");
 			return;
 		}
 		Client *t = target_mob->CastToClient();
 
 		if(strlen(sep->arg[1]) > 31) {
-			c->Message(13, "Title suffix must be 31 characters or less.");
+			c->Message(Chat::Red, "Title suffix must be 31 characters or less.");
 			return;
 		}
 
@@ -4627,13 +5058,13 @@ void command_titlesuffix(Client *c, const Seperator *sep)
 		t->Save();
 
 		if(removed) {
-			c->Message(13, "%s's title suffix has been removed.",  t->GetName(), sep->arg[1]);
+			c->Message(Chat::Red, "%s's title suffix has been removed.",  t->GetName(), sep->arg[1]);
 			if(t != c)
-				t->Message(13, "Your title suffix has been removed.",  sep->arg[1]);
+				t->Message(Chat::Red, "Your title suffix has been removed.",  sep->arg[1]);
 		} else {
-			c->Message(13, "%s's title suffix has been changed to '%s'.",  t->GetName(), sep->arg[1]);
+			c->Message(Chat::Red, "%s's title suffix has been changed to '%s'.",  t->GetName(), sep->arg[1]);
 			if(t != c)
-				t->Message(13, "Your title suffix has been changed to '%s'.",  sep->arg[1]);
+				t->Message(Chat::Red, "Your title suffix has been changed to '%s'.",  sep->arg[1]);
 		}
 	}
 }
@@ -4641,53 +5072,53 @@ void command_titlesuffix(Client *c, const Seperator *sep)
 void command_spellinfo(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #spellinfo [spell_id]");
+		c->Message(Chat::White, "Usage: #spellinfo [spell_id]");
 	else {
 		short int spell_id=atoi(sep->arg[1]);
 		const struct SPDat_Spell_Struct *s=&spells[spell_id];
-		c->Message(0, "Spell info for spell #%d:",  spell_id);
-		c->Message(0, "  name: %s",  s->name);
-		c->Message(0, "  player_1: %s",  s->player_1);
-		c->Message(0, "  teleport_zone: %s",  s->teleport_zone);
-		c->Message(0, "  you_cast: %s",  s->you_cast);
-		c->Message(0, "  other_casts: %s",  s->other_casts);
-		c->Message(0, "  cast_on_you: %s",  s->cast_on_you);
-		c->Message(0, "  spell_fades: %s",  s->spell_fades);
-		c->Message(0, "  range: %f",  s->range);
-		c->Message(0, "  aoerange: %f",  s->aoerange);
-		c->Message(0, "  pushback: %f",  s->pushback);
-		c->Message(0, "  pushup: %f",  s->pushup);
-		c->Message(0, "  cast_time: %d",  s->cast_time);
-		c->Message(0, "  recovery_time: %d",  s->recovery_time);
-		c->Message(0, "  recast_time: %d",  s->recast_time);
-		c->Message(0, "  buffdurationformula: %d",  s->buffdurationformula);
-		c->Message(0, "  buffduration: %d",  s->buffduration);
-		c->Message(0, "  AEDuration: %d",  s->AEDuration);
-		c->Message(0, "  mana: %d",  s->mana);
-		c->Message(0, "  base[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->base[0], s->base[1], s->base[2], s->base[3], s->base[4], s->base[5], s->base[6], s->base[7], s->base[8], s->base[9], s->base[10], s->base[11]);
-		c->Message(0, "  base22[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->base2[0], s->base2[1], s->base2[2], s->base2[3], s->base2[4], s->base2[5], s->base2[6], s->base2[7], s->base2[8], s->base2[9], s->base2[10], s->base2[11]);
-		c->Message(0, "  max[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->max[0], s->max[1], s->max[2], s->max[3], s->max[4], s->max[5], s->max[6], s->max[7], s->max[8], s->max[9], s->max[10], s->max[11]);
-		c->Message(0, "  components[4]: %d, %d, %d, %d",  s->components[0], s->components[1], s->components[2], s->components[3]);
-		c->Message(0, "  component_counts[4]: %d, %d, %d, %d",  s->component_counts[0], s->component_counts[1], s->component_counts[2], s->component_counts[3]);
-		c->Message(0, "  NoexpendReagent[4]: %d, %d, %d, %d",  s->NoexpendReagent[0], s->NoexpendReagent[1], s->NoexpendReagent[2], s->NoexpendReagent[3]);
-		c->Message(0, "  formula[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x",  s->formula[0], s->formula[1], s->formula[2], s->formula[3], s->formula[4], s->formula[5], s->formula[6], s->formula[7], s->formula[8], s->formula[9], s->formula[10], s->formula[11]);
-		c->Message(0, "  goodEffect: %d",  s->goodEffect);
-		c->Message(0, "  Activated: %d",  s->Activated);
-		c->Message(0, "  resisttype: %d",  s->resisttype);
-		c->Message(0, "  effectid[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x",  s->effectid[0], s->effectid[1], s->effectid[2], s->effectid[3], s->effectid[4], s->effectid[5], s->effectid[6], s->effectid[7], s->effectid[8], s->effectid[9], s->effectid[10], s->effectid[11]);
-		c->Message(0, "  targettype: %d",  s->targettype);
-		c->Message(0, "  basediff: %d",  s->basediff);
-		c->Message(0, "  skill: %d",  s->skill);
-		c->Message(0, "  zonetype: %d",  s->zonetype);
-		c->Message(0, "  EnvironmentType: %d",  s->EnvironmentType);
-		c->Message(0, "  TimeOfDay: %d",  s->TimeOfDay);
-		c->Message(0, "  classes[15]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",
+		c->Message(Chat::White, "Spell info for spell #%d:",  spell_id);
+		c->Message(Chat::White, "  name: %s",  s->name);
+		c->Message(Chat::White, "  player_1: %s",  s->player_1);
+		c->Message(Chat::White, "  teleport_zone: %s",  s->teleport_zone);
+		c->Message(Chat::White, "  you_cast: %s",  s->you_cast);
+		c->Message(Chat::White, "  other_casts: %s",  s->other_casts);
+		c->Message(Chat::White, "  cast_on_you: %s",  s->cast_on_you);
+		c->Message(Chat::White, "  spell_fades: %s",  s->spell_fades);
+		c->Message(Chat::White, "  range: %f",  s->range);
+		c->Message(Chat::White, "  aoerange: %f",  s->aoerange);
+		c->Message(Chat::White, "  pushback: %f",  s->pushback);
+		c->Message(Chat::White, "  pushup: %f",  s->pushup);
+		c->Message(Chat::White, "  cast_time: %d",  s->cast_time);
+		c->Message(Chat::White, "  recovery_time: %d",  s->recovery_time);
+		c->Message(Chat::White, "  recast_time: %d",  s->recast_time);
+		c->Message(Chat::White, "  buffdurationformula: %d",  s->buffdurationformula);
+		c->Message(Chat::White, "  buffduration: %d",  s->buffduration);
+		c->Message(Chat::White, "  AEDuration: %d",  s->AEDuration);
+		c->Message(Chat::White, "  mana: %d",  s->mana);
+		c->Message(Chat::White, "  base[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->base[0], s->base[1], s->base[2], s->base[3], s->base[4], s->base[5], s->base[6], s->base[7], s->base[8], s->base[9], s->base[10], s->base[11]);
+		c->Message(Chat::White, "  base22[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->base2[0], s->base2[1], s->base2[2], s->base2[3], s->base2[4], s->base2[5], s->base2[6], s->base2[7], s->base2[8], s->base2[9], s->base2[10], s->base2[11]);
+		c->Message(Chat::White, "  max[12]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",  s->max[0], s->max[1], s->max[2], s->max[3], s->max[4], s->max[5], s->max[6], s->max[7], s->max[8], s->max[9], s->max[10], s->max[11]);
+		c->Message(Chat::White, "  components[4]: %d, %d, %d, %d",  s->components[0], s->components[1], s->components[2], s->components[3]);
+		c->Message(Chat::White, "  component_counts[4]: %d, %d, %d, %d",  s->component_counts[0], s->component_counts[1], s->component_counts[2], s->component_counts[3]);
+		c->Message(Chat::White, "  NoexpendReagent[4]: %d, %d, %d, %d",  s->NoexpendReagent[0], s->NoexpendReagent[1], s->NoexpendReagent[2], s->NoexpendReagent[3]);
+		c->Message(Chat::White, "  formula[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x",  s->formula[0], s->formula[1], s->formula[2], s->formula[3], s->formula[4], s->formula[5], s->formula[6], s->formula[7], s->formula[8], s->formula[9], s->formula[10], s->formula[11]);
+		c->Message(Chat::White, "  goodEffect: %d",  s->goodEffect);
+		c->Message(Chat::White, "  Activated: %d",  s->Activated);
+		c->Message(Chat::White, "  resisttype: %d",  s->resisttype);
+		c->Message(Chat::White, "  effectid[12]: 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x, 0x%02x",  s->effectid[0], s->effectid[1], s->effectid[2], s->effectid[3], s->effectid[4], s->effectid[5], s->effectid[6], s->effectid[7], s->effectid[8], s->effectid[9], s->effectid[10], s->effectid[11]);
+		c->Message(Chat::White, "  targettype: %d",  s->targettype);
+		c->Message(Chat::White, "  basediff: %d",  s->basediff);
+		c->Message(Chat::White, "  skill: %d",  s->skill);
+		c->Message(Chat::White, "  zonetype: %d",  s->zonetype);
+		c->Message(Chat::White, "  EnvironmentType: %d",  s->EnvironmentType);
+		c->Message(Chat::White, "  TimeOfDay: %d",  s->TimeOfDay);
+		c->Message(Chat::White, "  classes[15]: %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d",
 			s->classes[0], s->classes[1], s->classes[2], s->classes[3], s->classes[4],
 			s->classes[5], s->classes[6], s->classes[7], s->classes[8], s->classes[9],
 			s->classes[10], s->classes[11], s->classes[12], s->classes[13], s->classes[14]);
-		c->Message(0, "  CastingAnim: %d",  s->CastingAnim);
-		c->Message(0, "  SpellAffectIndex: %d",  s->SpellAffectIndex);
-		c->Message(0, " RecourseLink: %d",  s->RecourseLink);
+		c->Message(Chat::White, "  CastingAnim: %d",  s->CastingAnim);
+		c->Message(Chat::White, "  SpellAffectIndex: %d",  s->SpellAffectIndex);
+		c->Message(Chat::White, " RecourseLink: %d",  s->RecourseLink);
 	}
 }
 
@@ -4697,12 +5128,12 @@ void command_lastname(Client *c, const Seperator *sep)
 
 	if(c->GetTarget() && c->GetTarget()->IsClient())
 		t=c->GetTarget()->CastToClient();
-	Log(Logs::General, Logs::Normal, "#lastname request from %s for %s",  c->GetName(), t->GetName());
+	LogInfo("#lastname request from [{}] for [{}]",  c->GetName(), t->GetName());
 
 	if(strlen(sep->arg[1]) <= 70)
 		t->ChangeLastName(sep->arg[1]);
 	else
-		c->Message(0, "Usage: #lastname <lastname> where <lastname> is less than 70 chars long");
+		c->Message(Chat::White, "Usage: #lastname <lastname> where <lastname> is less than 70 chars long");
 }
 
 void command_memspell(Client *c, const Seperator *sep)
@@ -4712,7 +5143,7 @@ void command_memspell(Client *c, const Seperator *sep)
 
 	if (!(sep->IsNumber(1) && sep->IsNumber(2)))
 	{
-		c->Message(0, "Usage: #MemSpell slotid spellid");
+		c->Message(Chat::White, "Usage: #MemSpell slotid spellid");
 	}
 	else
 	{
@@ -4720,12 +5151,12 @@ void command_memspell(Client *c, const Seperator *sep)
 		spell_id = atoi(sep->arg[2]);
 		if (slot > EQEmu::spells::SPELL_GEM_COUNT || spell_id >= SPDAT_RECORDS)
 		{
-			c->Message(0, "Error: #MemSpell: Arguement out of range");
+			c->Message(Chat::White, "Error: #MemSpell: Arguement out of range");
 		}
 		else
 		{
 			c->MemSpell(spell_id, slot);
-			c->Message(0, "Spell slot changed, have fun!");
+			c->Message(Chat::White, "Spell slot changed, have fun!");
 		}
 	}
 }
@@ -4733,21 +5164,21 @@ void command_memspell(Client *c, const Seperator *sep)
 void command_save(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "Error: no target");
+		c->Message(Chat::White, "Error: no target");
 	else if (c->GetTarget()->IsClient()) {
 		if (c->GetTarget()->CastToClient()->Save(2))
-			c->Message(0, "%s successfully saved.",  c->GetTarget()->GetName());
+			c->Message(Chat::White, "%s successfully saved.",  c->GetTarget()->GetName());
 		else
-			c->Message(0, "Manual save for %s failed.",  c->GetTarget()->GetName());
+			c->Message(Chat::White, "Manual save for %s failed.",  c->GetTarget()->GetName());
 	}
 	else if (c->GetTarget()->IsPlayerCorpse()) {
 		if (c->GetTarget()->CastToMob()->Save())
-			c->Message(0, "%s successfully saved. (dbid=%u)",  c->GetTarget()->GetName(), c->GetTarget()->CastToCorpse()->GetCorpseDBID());
+			c->Message(Chat::White, "%s successfully saved. (dbid=%u)",  c->GetTarget()->GetName(), c->GetTarget()->CastToCorpse()->GetCorpseDBID());
 		else
-			c->Message(0, "Manual save for %s failed.",  c->GetTarget()->GetName());
+			c->Message(Chat::White, "Manual save for %s failed.",  c->GetTarget()->GetName());
 	}
 	else
-		c->Message(0, "Error: target not a Client/PlayerCorpse");
+		c->Message(Chat::White, "Error: target not a Client/PlayerCorpse");
 }
 
 void command_showstats(Client *c, const Seperator *sep)
@@ -4760,7 +5191,7 @@ void command_showstats(Client *c, const Seperator *sep)
 
 void command_showzonegloballoot(Client *c, const Seperator *sep)
 {
-	c->Message(0, "GlobalLoot for %s (%d:%d)", zone->GetShortName(), zone->GetZoneID(), zone->GetInstanceVersion());
+	c->Message(Chat::White, "GlobalLoot for %s (%d:%d)", zone->GetShortName(), zone->GetZoneID(), zone->GetInstanceVersion());
 	zone->ShowZoneGlobalLoot(c);
 }
 
@@ -4787,7 +5218,7 @@ void command_bind(Client *c, const Seperator *sep)
 		if (c->GetTarget()->IsClient())
 			c->GetTarget()->CastToClient()->SetBindPoint();
 		else
-			c->Message(0, "Error: target not a Player");
+			c->Message(Chat::White, "Error: target not a Player");
 	} else
 		c->SetBindPoint();
 }
@@ -4795,9 +5226,9 @@ void command_bind(Client *c, const Seperator *sep)
 void command_depop(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0 || !(c->GetTarget()->IsNPC() || c->GetTarget()->IsNPCCorpse()))
-		c->Message(0, "You must have a NPC target for this command. (maybe you meant #depopzone?)");
+		c->Message(Chat::White, "You must have a NPC target for this command. (maybe you meant #depopzone?)");
 	else {
-		c->Message(0, "Depoping '%s'.",  c->GetTarget()->GetName());
+		c->Message(Chat::White, "Depoping '%s'.",  c->GetTarget()->GetName());
 		c->GetTarget()->Depop();
 	}
 }
@@ -4805,7 +5236,7 @@ void command_depop(Client *c, const Seperator *sep)
 void command_depopzone(Client *c, const Seperator *sep)
 {
 	zone->Depop();
-	c->Message(0, "Zone depoped.");
+	c->Message(Chat::White, "Zone depoped.");
 }
 
 void command_devtools(Client *c, const Seperator *sep)
@@ -4847,8 +5278,8 @@ void command_devtools(Client *c, const Seperator *sep)
 	/**
 	 * Print menu
 	 */
-	c->Message(0, "| [Devtools] Window %s", window_toggle_command.c_str());
-	c->Message(0, "| [Devtools] Search %s", menu_commands_search.c_str());
+	c->Message(Chat::White, "| [Devtools] Window %s", window_toggle_command.c_str());
+	c->Message(Chat::White, "| [Devtools] Search %s", menu_commands_search.c_str());
 }
 
 void command_repop(Client *c, const Seperator *sep)
@@ -4870,11 +5301,11 @@ void command_repop(Client *c, const Seperator *sep)
 			auto results = database.QueryDatabase(query);
 			iterator.Advance();
 		}
-		c->Message(0, "Zone depop: Force resetting spawn timers.");
+		c->Message(Chat::White, "Zone depop: Force resetting spawn timers.");
 	}
 
 	if (!sep->IsNumber(timearg)) {
-        c->Message(0, "Zone depopped - repopping now.");
+        c->Message(Chat::White, "Zone depopped - repopping now.");
 
 		zone->Repop();
 
@@ -4883,7 +5314,7 @@ void command_repop(Client *c, const Seperator *sep)
 		return;
 	}
 
-    c->Message(0, "Zone depoped. Repop in %i seconds",  atoi(sep->arg[timearg]));
+    c->Message(Chat::White, "Zone depoped. Repop in %i seconds",  atoi(sep->arg[timearg]));
 	zone->Repop(atoi(sep->arg[timearg]) * 1000);
 
 	zone->spawn2_timer.Trigger();
@@ -4906,13 +5337,13 @@ void command_repopclose(Client *c, const Seperator *sep)
 			auto results = database.QueryDatabase(query);
 			iterator.Advance();
 		}
-		c->Message(0, "Zone depop: Force resetting spawn timers.");
+		c->Message(Chat::White, "Zone depop: Force resetting spawn timers.");
 	}
 	if (sep->IsNumber(1)) {
 		repop_distance = atoi(sep->arg[1]);
 	}
 
-	c->Message(0, "Zone depoped. Repopping NPC's within %i distance units", repop_distance);
+	c->Message(Chat::White, "Zone depoped. Repopping NPC's within %i distance units", repop_distance);
 	zone->RepopClose(c->GetPosition(), repop_distance);
 }
 
@@ -4940,7 +5371,7 @@ void command_spawnstatus(Client *c, const Seperator *sep)
 	}
 	else if(strcmp(sep->arg[1], "help") == 0)
 	{
-		c->Message(0, "Usage: #spawnstatus <[a]ll | [d]isabled | [e]nabled | {Spawn2 ID}>");
+		c->Message(Chat::White, "Usage: #spawnstatus <[a]ll | [d]isabled | [e]nabled | {Spawn2 ID}>");
 	}
 	else {
 		zone->SpawnStatus(c);
@@ -4959,7 +5390,7 @@ void command_zuwcoords(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #zuwcoords <under world coords>");
+		c->Message(Chat::White, "Usage: #zuwcoords <under world coords>");
 	else {
 		zone->newzone_data.underworld = atof(sep->arg[1]);
 		//float newdata = atof(sep->arg[1]);
@@ -4974,7 +5405,7 @@ void command_zuwcoords(Client *c, const Seperator *sep)
 void command_zunderworld(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0]==0)
-		c->Message(0, "Usage: #zunderworld <zcoord>");
+		c->Message(Chat::White, "Usage: #zunderworld <zcoord>");
 	else {
 		zone->newzone_data.underworld = atof(sep->arg[1]);
 	}
@@ -4984,7 +5415,7 @@ void command_zsafecoords(Client *c, const Seperator *sep)
 {
 	// modifys and resends zhdr packet
 	if(sep->arg[3][0]==0)
-		c->Message(0, "Usage: #zsafecoords <safe x> <safe y> <safe z>");
+		c->Message(Chat::White, "Usage: #zsafecoords <safe x> <safe y> <safe z>");
 	else {
 		zone->newzone_data.safe_x = atof(sep->arg[1]);
 		zone->newzone_data.safe_y = atof(sep->arg[2]);
@@ -5008,7 +5439,7 @@ void command_freeze(Client *c, const Seperator *sep)
 	if (c->GetTarget() != 0)
 		c->GetTarget()->SendAppearancePacket(AT_Anim, ANIM_FREEZE);
 	else
-		c->Message(0, "ERROR: Freeze requires a target.");
+		c->Message(Chat::White, "ERROR: Freeze requires a target.");
 }
 
 void command_unfreeze(Client *c, const Seperator *sep)
@@ -5016,7 +5447,7 @@ void command_unfreeze(Client *c, const Seperator *sep)
 	if (c->GetTarget() != 0)
 		c->GetTarget()->SendAppearancePacket(AT_Anim, ANIM_STAND);
 	else
-		c->Message(0, "ERROR: Unfreeze requires a target.");
+		c->Message(Chat::White, "ERROR: Unfreeze requires a target.");
 }
 
 void command_push(Client *c, const Seperator *sep)
@@ -5026,7 +5457,7 @@ void command_push(Client *c, const Seperator *sep)
 		t = c->GetTarget();
 
 	if (!sep->arg[1] || !sep->IsNumber(1)) {
-		c->Message(0, "ERROR: Must provide at least a push back.");
+		c->Message(Chat::White, "ERROR: Must provide at least a push back.");
 		return;
 	}
 
@@ -5049,7 +5480,7 @@ void command_push(Client *c, const Seperator *sep)
 void command_proximity(Client *c, const Seperator *sep)
 {
 	if (!c->GetTarget() && !c->GetTarget()->IsNPC()) {
-		c->Message(0, "You must target an NPC");
+		c->Message(Chat::White, "You must target an NPC");
 		return;
 	}
 
@@ -5128,10 +5559,10 @@ void command_pvp(Client *c, const Seperator *sep)
 
 	if(sep->arg[1][0] != 0) {
 		t->SetPVP(state);
-		c->Message(0, "%s now follows the ways of %s.",  t->GetName(), state?"discord":"order");
+		c->Message(Chat::White, "%s now follows the ways of %s.",  t->GetName(), state?"discord":"order");
 	}
 	else
-		c->Message(0, "Usage: #pvp [on/off]");
+		c->Message(Chat::White, "Usage: #pvp [on/off]");
 }
 
 void command_setxp(Client *c, const Seperator *sep)
@@ -5143,12 +5574,12 @@ void command_setxp(Client *c, const Seperator *sep)
 
 	if (sep->IsNumber(1)) {
 		if (atoi(sep->arg[1]) > 9999999)
-			c->Message(0, "Error: Value too high.");
+			c->Message(Chat::White, "Error: Value too high.");
 		else
 			t->AddEXP(atoi(sep->arg[1]));
 	}
 	else
-		c->Message(0, "Usage: #setxp number");
+		c->Message(Chat::White, "Usage: #setxp number");
 }
 
 void command_setpvppoints(Client *c, const Seperator *sep)
@@ -5160,7 +5591,7 @@ void command_setpvppoints(Client *c, const Seperator *sep)
 
 	if (sep->IsNumber(1)) {
 		if (atoi(sep->arg[1]) > 9999999)
-			c->Message(0, "Error: Value too high.");
+			c->Message(Chat::White, "Error: Value too high.");
 		else
 		{
 			t->SetPVPPoints(atoi(sep->arg[1]));
@@ -5169,7 +5600,7 @@ void command_setpvppoints(Client *c, const Seperator *sep)
 		}
 	}
 	else
-		c->Message(0, "Usage: #setpvppoints number");
+		c->Message(Chat::White, "Usage: #setpvppoints number");
 }
 
 void command_name(Client *c, const Seperator *sep)
@@ -5177,20 +5608,20 @@ void command_name(Client *c, const Seperator *sep)
 	Client *target;
 
 	if( (strlen(sep->arg[1]) == 0) || (!(c->GetTarget() && c->GetTarget()->IsClient())) )
-		c->Message(0, "Usage: #name newname (requires player target)");
+		c->Message(Chat::White, "Usage: #name newname (requires player target)");
 	else
 	{
 		target = c->GetTarget()->CastToClient();
 		char *oldname = strdup(target->GetName());
 		if(target->ChangeFirstName(sep->arg[1], c->GetName()))
 		{
-			c->Message(0, "Successfully renamed %s to %s",  oldname, sep->arg[1]);
+			c->Message(Chat::White, "Successfully renamed %s to %s",  oldname, sep->arg[1]);
 			// until we get the name packet working right this will work
-			c->Message(0, "Sending player to char select.");
-			target->Kick();
+			c->Message(Chat::White, "Sending player to char select.");
+			target->Kick("Name was changed");
 		}
 		else
-			c->Message(13, "ERROR: Unable to rename %s. Check that the new name '%s' isn't already taken.",  oldname, sep->arg[2]);
+			c->Message(Chat::Red, "ERROR: Unable to rename %s. Check that the new name '%s' isn't already taken.",  oldname, sep->arg[2]);
 		free(oldname);
 	}
 }
@@ -5201,17 +5632,17 @@ void command_tempname(Client *c, const Seperator *sep)
 	target = c->GetTarget();
 
 	if(!target)
-		c->Message(0, "Usage: #tempname newname (requires a target)");
+		c->Message(Chat::White, "Usage: #tempname newname (requires a target)");
 	else if(strlen(sep->arg[1]) > 0)
 	{
 		char *oldname = strdup(target->GetName());
 		target->TempName(sep->arg[1]);
-		c->Message(0, "Renamed %s to %s",  oldname, sep->arg[1]);
+		c->Message(Chat::White, "Renamed %s to %s",  oldname, sep->arg[1]);
 		free(oldname);
 	}
 	else {
 		target->TempName();
-		c->Message(0, "Restored the original name");
+		c->Message(Chat::White, "Restored the original name");
 	}
 }
 
@@ -5221,34 +5652,34 @@ void command_petname(Client *c, const Seperator *sep)
 	target = c->GetTarget();
 
 	if(!target)
-		c->Message(0, "Usage: #petname newname (requires a target)");
+		c->Message(Chat::White, "Usage: #petname newname (requires a target)");
 	else if(target->IsPet() && (target->GetOwnerID() == c->GetID()) && strlen(sep->arg[1]) > 0)
 	{
 		char *oldname = strdup(target->GetName());
 		target->TempName(sep->arg[1]);
-		c->Message(0, "Renamed %s to %s",  oldname, sep->arg[1]);
+		c->Message(Chat::White, "Renamed %s to %s",  oldname, sep->arg[1]);
 		free(oldname);
 	}
 	else {
 		target->TempName();
-		c->Message(0, "Restored the original name");
+		c->Message(Chat::White, "Restored the original name");
 	}
 }
 
 void command_npcspecialattk(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget()==0 || c->GetTarget()->IsClient() || strlen(sep->arg[1]) <= 0 || strlen(sep->arg[2]) <= 0)
-		c->Message(0, "Usage: #npcspecialattk *flagchar* *permtag* (Flags are E(nrage) F(lurry) R(ampage) S(ummon), permtag is 1 = True, 0 = False).");
+		c->Message(Chat::White, "Usage: #npcspecialattk *flagchar* *permtag* (Flags are E(nrage) F(lurry) R(ampage) S(ummon), permtag is 1 = True, 0 = False).");
 	else {
 		c->GetTarget()->CastToNPC()->NPCSpecialAttacks(sep->arg[1],atoi(sep->arg[2]));
-		c->Message(0, "NPC Special Attack set.");
+		c->Message(Chat::White, "NPC Special Attack set.");
 	}
 }
 
 void command_kill(Client *c, const Seperator *sep)
 {
 	if (!c->GetTarget()) {
-		c->Message(0, "Error: #Kill: No target.");
+		c->Message(Chat::White, "Error: #Kill: No target.");
 	}
 	else
 		if (!c->GetTarget()->IsClient() || c->GetTarget()->CastToClient()->Admin() <= c->Admin())
@@ -5295,7 +5726,7 @@ void command_killallnpcs(Client *c, const Seperator *sep)
 		count++;
 	}
 
-	c->Message(15, "Killed (%i) npc(s)", count);
+	c->Message(Chat::Yellow, "Killed (%i) npc(s)", count);
 }
 
 void command_haste(Client *c, const Seperator *sep)
@@ -5308,23 +5739,23 @@ void command_haste(Client *c, const Seperator *sep)
 		c->SetExtraHaste(Haste);
 		// SetAttackTimer must be called to make this take effect, so player needs to change
 		// the primary weapon.
-		c->Message(0, "Haste set to %d%% - Need to re-equip primary weapon before it takes effect",  Haste);
+		c->Message(Chat::White, "Haste set to %d%% - Need to re-equip primary weapon before it takes effect",  Haste);
 	}
 	else
-		c->Message(0, "Usage: #haste [percentage]");
+		c->Message(Chat::White, "Usage: #haste [percentage]");
 }
 
 void command_damage(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget()==0)
-		c->Message(0, "Error: #Damage: No Target.");
+		c->Message(Chat::White, "Error: #Damage: No Target.");
 	else if (!sep->IsNumber(1)) {
-		c->Message(0, "Usage: #damage x");
+		c->Message(Chat::White, "Usage: #damage x");
 	}
 	else {
 		int32 nkdmg = atoi(sep->arg[1]);
 		if (nkdmg > 2100000000)
-			c->Message(0, "Enter a value less then 2,100,000,000.");
+			c->Message(Chat::White, "Enter a value less then 2,100,000,000.");
 		else
 			c->GetTarget()->Damage(c, nkdmg, SPELL_UNKNOWN, EQEmu::skills::SkillHandtoHand, false);
 	}
@@ -5332,7 +5763,7 @@ void command_damage(Client *c, const Seperator *sep)
 
 void command_zonespawn(Client *c, const Seperator *sep)
 {
-	c->Message(0, "This command is not yet implemented.");
+	c->Message(Chat::White, "This command is not yet implemented.");
 	return;
 
 /* this was kept from client.cpp verbatim (it was commented out) */
@@ -5381,7 +5812,7 @@ void command_npcspawn(Client *c, const Seperator *sep)
 				extra = 1;
 			}
 			database.NPCSpawnDB(0, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC(), extra);
-			c->Message(0, "%s created successfully!",  target->GetName());
+			c->Message(Chat::White, "%s created successfully!",  target->GetName());
 		}
 		else if (strcasecmp(sep->arg[1], "add") == 0) {
 			if (atoi(sep->arg[2]))
@@ -5394,42 +5825,42 @@ void command_npcspawn(Client *c, const Seperator *sep)
 				extra = 1200;
 			}
 			database.NPCSpawnDB(1, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC(), extra);
-			c->Message(0, "%s added successfully!",  target->GetName());
+			c->Message(Chat::White, "%s added successfully!",  target->GetName());
 		}
 		else if (strcasecmp(sep->arg[1], "update") == 0) {
 			database.NPCSpawnDB(2, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC());
-			c->Message(0, "%s updated!",  target->GetName());
+			c->Message(Chat::White, "%s updated!",  target->GetName());
 		}
 		else if (strcasecmp(sep->arg[1], "remove") == 0) {
 			database.NPCSpawnDB(3, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC());
-			c->Message(0, "%s removed successfully from database!",  target->GetName());
+			c->Message(Chat::White, "%s removed successfully from database!",  target->GetName());
 			target->Depop(false);
 		}
 		else if (strcasecmp(sep->arg[1], "delete") == 0) {
 			database.NPCSpawnDB(4, zone->GetShortName(), zone->GetInstanceVersion(), c, target->CastToNPC());
-			c->Message(0, "%s deleted from database!",  target->GetName());
+			c->Message(Chat::White, "%s deleted from database!",  target->GetName());
 			target->Depop(false);
 		}
 		else {
-			c->Message(0, "Error: #npcspawn: Invalid command.");
-			c->Message(0, "Usage: #npcspawn [create|add|update|remove|delete]");
+			c->Message(Chat::White, "Error: #npcspawn: Invalid command.");
+			c->Message(Chat::White, "Usage: #npcspawn [create|add|update|remove|delete]");
 		}
 	}
 	else
-		c->Message(0, "Error: #npcspawn: You must have a NPC targeted!");
+		c->Message(Chat::White, "Error: #npcspawn: You must have a NPC targeted!");
 }
 
 void command_spawnfix(Client *c, const Seperator *sep) {
 	Mob *targetMob = c->GetTarget();
 	if (!targetMob || !targetMob->IsNPC()) {
-		c->Message(0, "Error: #spawnfix: Need an NPC target.");
+		c->Message(Chat::White, "Error: #spawnfix: Need an NPC target.");
 		return;
     }
 
     Spawn2* s2 = targetMob->CastToNPC()->respawn2;
 
     if(!s2) {
-        c->Message(0, "#spawnfix FAILED -- cannot determine which spawn entry in the database this mob came from.");
+        c->Message(Chat::White, "#spawnfix FAILED -- cannot determine which spawn entry in the database this mob came from.");
         return;
     }
 
@@ -5437,12 +5868,12 @@ void command_spawnfix(Client *c, const Seperator *sep) {
                                     c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(),s2->GetID());
     auto results = database.QueryDatabase(query);
     if (!results.Success()) {
-        c->Message(13, "Update failed! MySQL gave the following error:");
-        c->Message(13, results.ErrorMessage().c_str());
+        c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+        c->Message(Chat::Red, results.ErrorMessage().c_str());
         return;
     }
 
-    c->Message(0, "Updating coordinates successful.");
+    c->Message(Chat::White, "Updating coordinates successful.");
     targetMob->Depop(false);
 }
 
@@ -5450,28 +5881,28 @@ void command_loc(Client *c, const Seperator *sep)
 {
 	Mob *t=c->GetTarget()?c->GetTarget():c->CastToMob();
 
-	c->Message(0, "%s's Location (XYZ): %1.2f, %1.2f, %1.2f; heading=%1.1f",  t->GetName(), t->GetX(), t->GetY(), t->GetZ(), t->GetHeading());
+	c->Message(Chat::White, "%s's Location (XYZ): %1.2f, %1.2f, %1.2f; heading=%1.1f",  t->GetName(), t->GetX(), t->GetY(), t->GetZ(), t->GetHeading());
 }
 
 void command_goto(Client *c, const Seperator *sep)
 {
-	/**
-	 * Goto via target and no args
-	 */
-	if (sep->arg[1][0] == '\0' && c->GetTarget()) {
+	std::string arg1 = sep->arg[1];
+
+	bool goto_via_target_no_args = sep->arg[1][0] == '\0' && c->GetTarget();
+	bool goto_via_player_name    = !sep->IsNumber(1) && !arg1.empty();
+	bool goto_via_x_y_z          = sep->IsNumber(1) && sep->IsNumber(2) && sep->IsNumber(3);
+
+	if (goto_via_target_no_args) {
 		c->MovePC(
 			zone->GetZoneID(),
 			zone->GetInstanceID(),
 			c->GetTarget()->GetX(),
 			c->GetTarget()->GetY(),
 			c->GetTarget()->GetZ(),
-			c->GetTarget()->GetHeading());
+			c->GetTarget()->GetHeading()
+		);
 	}
-
-	/**
-	 * Goto via player name
-	 */
-	else if (!sep->IsNumber(1) && sep->arg[1]) {
+	else if (goto_via_player_name) {
 
 		/**
 		 * Find them in zone first
@@ -5486,33 +5917,31 @@ void command_goto(Client *c, const Seperator *sep)
 				client->GetX(),
 				client->GetY(),
 				client->GetZ(),
-				client->GetHeading());
+				client->GetHeading()
+			);
 
-			c->Message(15, "Goto player '%s' same zone", player_name_string.c_str());
+			c->Message(Chat::Yellow, "Goto player '%s' same zone", player_name_string.c_str());
 		}
 		else if (c->GotoPlayer(player_name_string)) {
-			c->Message(15, "Goto player '%s' different zone", player_name_string.c_str());
+			c->Message(Chat::Yellow, "Goto player '%s' different zone", player_name_string.c_str());
 		}
 		else {
-			c->Message(15, "Player '%s' not found", player_name_string.c_str());
+			c->Message(Chat::Yellow, "Player '%s' not found", player_name_string.c_str());
 		}
 	}
-
-	/**
-	 * Goto via x y z
-	 */
-	else if (sep->IsNumber(1) && sep->IsNumber(2) && sep->IsNumber(3)) {
+	else if (goto_via_x_y_z) {
 		c->MovePC(
 			zone->GetZoneID(),
 			zone->GetInstanceID(),
 			atof(sep->arg[1]),
 			atof(sep->arg[2]),
 			atof(sep->arg[3]),
-			c->GetHeading());
+			(sep->arg[4] ? atof(sep->arg[4]) : c->GetHeading())
+		);
 	}
 	else {
-		c->Message(0, "Usage: #goto [x y z]");
-		c->Message(0, "Usage: #goto [player_name]");
+		c->Message(Chat::White, "Usage: #goto [x y z] [h]");
+		c->Message(Chat::White, "Usage: #goto [player_name]");
 	}
 }
 
@@ -5520,13 +5949,13 @@ void command_iteminfo(Client *c, const Seperator *sep)
 {
 	auto inst = c->GetInv()[EQEmu::invslot::slotCursor];
 	if (!inst) {
-		c->Message(13, "Error: You need an item on your cursor for this command");
+		c->Message(Chat::Red, "Error: You need an item on your cursor for this command");
 		return;
 	}
 	auto item = inst->GetItem();
 	if (!item) {
-		Log(Logs::General, Logs::Inventory, "(%s) Command #iteminfo processed an item with no data pointer");
-		c->Message(13, "Error: This item has no data reference");
+		LogInventory("([{}]) Command #iteminfo processed an item with no data pointer");
+		c->Message(Chat::Red, "Error: This item has no data reference");
 		return;
 	}
 
@@ -5534,41 +5963,41 @@ void command_iteminfo(Client *c, const Seperator *sep)
 	linker.SetLinkType(EQEmu::saylink::SayLinkItemInst);
 	linker.SetItemInst(inst);
 
-	c->Message(0, "*** Item Info for [%s] ***", linker.GenerateLink().c_str());
-	c->Message(0, ">> ID: %u, ItemUseType: %u, ItemClassType: %u", item->ID, item->ItemType, item->ItemClass);
-	c->Message(0, ">> IDFile: '%s', IconID: %u", item->IDFile, item->Icon);
-	c->Message(0, ">> Size: %u, Weight: %u, Price: %u, LDoNPrice: %u", item->Size, item->Weight, item->Price, item->LDoNPrice);
-	c->Message(0, ">> Material: 0x%02X, Color: 0x%08X, Tint: 0x%08X, Light: 0x%02X", item->Material, item->Color, inst->GetColor(), item->Light);
-	c->Message(0, ">> IsLore: %s, LoreGroup: %u, Lore: '%s'", (item->LoreFlag ? "TRUE" : "FALSE"), item->LoreGroup, item->Lore);
-	c->Message(0, ">> NoDrop: %u, NoRent: %u, NoPet: %u, NoTransfer: %u, FVNoDrop: %u",
+	c->Message(Chat::White, "*** Item Info for [%s] ***", linker.GenerateLink().c_str());
+	c->Message(Chat::White, ">> ID: %u, ItemUseType: %u, ItemClassType: %u", item->ID, item->ItemType, item->ItemClass);
+	c->Message(Chat::White, ">> IDFile: '%s', IconID: %u", item->IDFile, item->Icon);
+	c->Message(Chat::White, ">> Size: %u, Weight: %u, Price: %u, LDoNPrice: %u", item->Size, item->Weight, item->Price, item->LDoNPrice);
+	c->Message(Chat::White, ">> Material: 0x%02X, Color: 0x%08X, Tint: 0x%08X, Light: 0x%02X", item->Material, item->Color, inst->GetColor(), item->Light);
+	c->Message(Chat::White, ">> IsLore: %s, LoreGroup: %u, Lore: '%s'", (item->LoreFlag ? "TRUE" : "FALSE"), item->LoreGroup, item->Lore);
+	c->Message(Chat::White, ">> NoDrop: %u, NoRent: %u, NoPet: %u, NoTransfer: %u, FVNoDrop: %u",
 		item->NoDrop, item->NoRent, (uint8)item->NoPet, (uint8)item->NoTransfer, item->FVNoDrop);
 
 	if (item->IsClassBook()) {
-		c->Message(0, "*** This item is a Book (filename:'%s') ***", item->Filename);
+		c->Message(Chat::White, "*** This item is a Book (filename:'%s') ***", item->Filename);
 	}
 	else if (item->IsClassBag()) {
-		c->Message(0, "*** This item is a Container (%u slots) ***", item->BagSlots);
+		c->Message(Chat::White, "*** This item is a Container (%u slots) ***", item->BagSlots);
 	}
 	else {
-		c->Message(0, "*** This item is Common ***");
-		c->Message(0, ">> Classes: %u, Races: %u, Slots: %u", item->Classes, item->Races, item->Slots);
-		c->Message(0, ">> ReqSkill: %u, ReqLevel: %u, RecLevel: %u", item->RecSkill, item->ReqLevel, item->RecLevel);
-		c->Message(0, ">> SkillModType: %u, SkillModValue: %i", item->SkillModType, item->SkillModValue);
-		c->Message(0, ">> BaneRaceType: %u, BaneRaceDamage: %u, BaneBodyType: %u, BaneBodyDamage: %i",
+		c->Message(Chat::White, "*** This item is Common ***");
+		c->Message(Chat::White, ">> Classes: %u, Races: %u, Slots: %u", item->Classes, item->Races, item->Slots);
+		c->Message(Chat::White, ">> ReqSkill: %u, ReqLevel: %u, RecLevel: %u", item->RecSkill, item->ReqLevel, item->RecLevel);
+		c->Message(Chat::White, ">> SkillModType: %u, SkillModValue: %i", item->SkillModType, item->SkillModValue);
+		c->Message(Chat::White, ">> BaneRaceType: %u, BaneRaceDamage: %u, BaneBodyType: %u, BaneBodyDamage: %i",
 			item->BaneDmgRace, item->BaneDmgRaceAmt, item->BaneDmgBody, item->BaneDmgAmt);
-		c->Message(0, ">> Magic: %s, SpellID: %i, ProcLevel: %u, Charges: %u, MaxCharges: %u",
+		c->Message(Chat::White, ">> Magic: %s, SpellID: %i, ProcLevel: %u, Charges: %u, MaxCharges: %u",
 			(item->Magic ? "TRUE" : "FALSE"), item->Click.Effect, item->Click.Level, inst->GetCharges(), item->MaxCharges);
-		c->Message(0, ">> EffectType: 0x%02X, CastTime: %.2f", (uint8)item->Click.Type, ((double)item->CastTime / 1000));
+		c->Message(Chat::White, ">> EffectType: 0x%02X, CastTime: %.2f", (uint8)item->Click.Type, ((double)item->CastTime / 1000));
 	}
 
 	if (c->Admin() >= 200)
-		c->Message(0, ">> MinStatus: %u", item->MinStatus);
+		c->Message(Chat::White, ">> MinStatus: %u", item->MinStatus);
 }
 
 void command_uptime(Client *c, const Seperator *sep)
 {
 	if (!worldserver.Connected())
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 	else
 	{
 		auto pack = new ServerPacket(ServerOP_Uptime, sizeof(ServerUptime_Struct));
@@ -5586,36 +6015,40 @@ void command_flag(Client *c, const Seperator *sep)
 	if(sep->arg[2][0] == 0) {
 		if (!c->GetTarget() || (c->GetTarget() && c->GetTarget() == c)) {
 			c->UpdateAdmin();
-			c->Message(0, "Refreshed your admin flag from DB.");
+			c->Message(Chat::White, "Refreshed your admin flag from DB.");
 		} else if (c->GetTarget() && c->GetTarget() != c && c->GetTarget()->IsClient()) {
 			c->GetTarget()->CastToClient()->UpdateAdmin();
-			c->Message(0, "%s's admin flag has been refreshed.", c->GetTarget()->GetName());
-			c->GetTarget()->Message(0, "%s refreshed your admin flag.", c->GetName());
+			c->Message(Chat::White, "%s's admin flag has been refreshed.", c->GetTarget()->GetName());
+			c->GetTarget()->Message(Chat::White, "%s refreshed your admin flag.", c->GetName());
 		}
 	}
 	else if (!sep->IsNumber(1) || atoi(sep->arg[1]) < -2 || atoi(sep->arg[1]) > 255 || strlen(sep->arg[2]) == 0)
-		c->Message(0, "Usage: #flag [status] [acctname]");
+		c->Message(Chat::White, "Usage: #flag [status] [acctname]");
 
 	else if (c->Admin() < commandChangeFlags) {
-//this check makes banning players by less than this level
-//impossible, but i'll leave it in anyways
-		c->Message(0, "You may only refresh your own flag, doing so now.");
+		//this check makes banning players by less than this level
+		//impossible, but i'll leave it in anyways
+		c->Message(Chat::White, "You may only refresh your own flag, doing so now.");
 		c->UpdateAdmin();
 	}
 	else {
 		if (atoi(sep->arg[1]) > c->Admin())
-			c->Message(0, "You cannot set people's status to higher than your own");
+			c->Message(Chat::White, "You cannot set people's status to higher than your own");
 		else if (atoi(sep->arg[1]) < 0 && c->Admin() < commandBanPlayers)
-			c->Message(0, "You have too low of status to suspend/ban");
+			c->Message(Chat::White, "You have too low of status to suspend/ban");
 		else if (!database.SetAccountStatus(sep->argplus[2], atoi(sep->arg[1])))
-			c->Message(0, "Unable to set GM Flag.");
+			c->Message(Chat::White, "Unable to set GM Flag.");
 		else {
-			c->Message(0, "Set GM Flag on account.");
-			auto pack = new ServerPacket(ServerOP_FlagUpdate, 6);
-			*((uint32*) pack->pBuffer) = database.GetAccountIDByName(sep->argplus[2]);
-			*((int16*) &pack->pBuffer[4]) = atoi(sep->arg[1]);
-			worldserver.SendPacket(pack);
-			delete pack;
+			c->Message(Chat::White, "Set GM Flag on account.");
+
+			std::string user;
+			std::string loginserver;
+			ParseAccountString(sep->argplus[2], user, loginserver);
+
+			ServerPacket pack(ServerOP_FlagUpdate, 6);
+			*((uint32*) pack.pBuffer) = database.GetAccountIDByName(user.c_str(), loginserver.c_str());
+			*((int16*) &pack.pBuffer[4]) = atoi(sep->arg[1]);
+			worldserver.SendPacket(&pack);
 		}
 	}
 }
@@ -5628,12 +6061,12 @@ void command_time(Client *c, const Seperator *sep)
 		if(sep->IsNumber(2)) {
 			minutes=atoi(sep->arg[2]);
 		}
-		c->Message(13, "Setting world time to %s:%i (Timezone: 0)...",  sep->arg[1], minutes);
+		c->Message(Chat::Red, "Setting world time to %s:%i (Timezone: 0)...",  sep->arg[1], minutes);
 		zone->SetTime(atoi(sep->arg[1])+1, minutes);
-		Log(Logs::General, Logs::Zone_Server, "%s :: Setting world time to %s:%i (Timezone: 0)...", c->GetCleanName(), sep->arg[1], minutes);
+		LogInfo("{} :: Setting world time to {}:{} (Timezone: 0)...", c->GetCleanName(), sep->arg[1], minutes);
 	}
 	else {
-		c->Message(13, "To set the Time: #time HH [MM]");
+		c->Message(Chat::Red, "To set the Time: #time HH [MM]");
 		TimeOfDay_Struct eqTime;
 		zone->zone_time.GetCurrentEQTimeOfDay( time(0), &eqTime);
 		sprintf(timeMessage,"%02d:%s%d %s (Timezone: %ih %im)",
@@ -5644,8 +6077,8 @@ void command_time(Client *c, const Seperator *sep)
 			zone->zone_time.getEQTimeZoneHr(),
 			zone->zone_time.getEQTimeZoneMin()
 			);
-		c->Message(13, "It is now %s.", timeMessage);
-		Log(Logs::General, Logs::Zone_Server, "Current Time is: %s", timeMessage);
+		c->Message(Chat::Red, "It is now %s.", timeMessage);
+		LogInfo("Current Time is: {}", timeMessage);
 	}
 }
 
@@ -5655,14 +6088,14 @@ void command_guild(Client *c, const Seperator *sep)
 	Mob *target=c->GetTarget();
 
 	if (strcasecmp(sep->arg[1], "help") == 0) {
-		c->Message(0, "GM Guild commands:");
-		c->Message(0, "  #guild list - lists all guilds on the server");
-		c->Message(0, "  #guild create {guildleader charname or CharID} guildname");
-		c->Message(0, "  #guild delete guildID");
-		c->Message(0, "  #guild rename guildID newname");
-		c->Message(0, "  #guild set charname guildID    (0=no guild)");
-		c->Message(0, "  #guild setrank charname rank");
-		c->Message(0, "  #guild setleader guildID {guildleader charname or CharID}");
+		c->Message(Chat::White, "GM Guild commands:");
+		c->Message(Chat::White, "  #guild list - lists all guilds on the server");
+		c->Message(Chat::White, "  #guild create {guildleader charname or CharID} guildname");
+		c->Message(Chat::White, "  #guild delete guildID");
+		c->Message(Chat::White, "  #guild rename guildID newname");
+		c->Message(Chat::White, "  #guild set charname guildID    (0=no guild)");
+		c->Message(Chat::White, "  #guild setrank charname rank");
+		c->Message(Chat::White, "  #guild setleader guildID {guildleader charname or CharID}");
 	}
 	else if (strcasecmp(sep->arg[1], "status") == 0 || strcasecmp(sep->arg[1], "stat") == 0) {
 		Client* client = 0;
@@ -5671,24 +6104,24 @@ void command_guild(Client *c, const Seperator *sep)
 		else if (target != 0 && target->IsClient())
 			client = target->CastToClient();
 		if (client == 0)
-			c->Message(0, "You must target someone or specify a character name");
+			c->Message(Chat::White, "You must target someone or specify a character name");
 		else if ((client->Admin() >= minStatusToEditOtherGuilds && admin < minStatusToEditOtherGuilds) && client->GuildID() != c->GuildID()) // no peeping for GMs, make sure tell message stays the same
-			c->Message(0, "You must target someone or specify a character name.");
+			c->Message(Chat::White, "You must target someone or specify a character name.");
 		else {
 			if (client->IsInAGuild())
-				c->Message(0, "%s is not in a guild.",  client->GetName());
+				c->Message(Chat::White, "%s is not in a guild.",  client->GetName());
 			else if (guild_mgr.IsGuildLeader(client->GuildID(), client->CharacterID()))
-				c->Message(0, "%s is the leader of <%s> rank: %s",  client->GetName(), guild_mgr.GetGuildName(client->GuildID()), guild_mgr.GetRankName(client->GuildID(), client->GuildRank()));
+				c->Message(Chat::White, "%s is the leader of <%s> rank: %s",  client->GetName(), guild_mgr.GetGuildName(client->GuildID()), guild_mgr.GetRankName(client->GuildID(), client->GuildRank()));
 			else
-				c->Message(0, "%s is a member of <%s> rank: %s",  client->GetName(), guild_mgr.GetGuildName(client->GuildID()), guild_mgr.GetRankName(client->GuildID(), client->GuildRank()));
+				c->Message(Chat::White, "%s is a member of <%s> rank: %s",  client->GetName(), guild_mgr.GetGuildName(client->GuildID()), guild_mgr.GetRankName(client->GuildID(), client->GuildRank()));
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "info") == 0) {
 		if (sep->arg[2][0] == 0 && c->IsInAGuild()) {
 			if (admin >= minStatusToEditOtherGuilds)
-				c->Message(0, "Usage: #guildinfo guild_id");
+				c->Message(Chat::White, "Usage: #guildinfo guild_id");
 			else
-				c->Message(0, "You're not in a guild");
+				c->Message(Chat::White, "You're not in a guild");
 		}
 		else {
 			uint32 tmp = GUILD_NONE;
@@ -5704,19 +6137,19 @@ void command_guild(Client *c, const Seperator *sep)
 	/*
 	else if (strcasecmp(sep->arg[1], "edit") == 0) {
 		if (c->GuildDBID() == 0)
-			c->Message(0, "You arent in a guild!");
+			c->Message(Chat::White, "You arent in a guild!");
 		else if (!sep->IsNumber(2))
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else if (atoi(sep->arg[2]) < 0 || atoi(sep->arg[2]) > GUILD_MAX_RANK)
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else if (!c->GuildRank() == 0)
-			c->Message(0, "You must be rank %s to use edit.",  guilds[c->GuildEQID()].rank[0].rankname);
+			c->Message(Chat::White, "You must be rank %s to use edit.",  guilds[c->GuildEQID()].rank[0].rankname);
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			if (!helper_guild_edit(c, c->GuildDBID(), c->GuildEQID(), atoi(sep->arg[2]), sep->arg[3], sep->argplus[4])) {
-				c->Message(0, "  #guild edit rank title newtitle");
-				c->Message(0, "  #guild edit rank permission 0/1");
+				c->Message(Chat::White, "  #guild edit rank title newtitle");
+				c->Message(Chat::White, "  #guild edit rank permission 0/1");
 			}
 			else {
 				ServerPacket* pack = new ServerPacket(ServerOP_RefreshGuild, 5);
@@ -5729,20 +6162,20 @@ void command_guild(Client *c, const Seperator *sep)
 	}
 	else if (strcasecmp(sep->arg[1], "gmedit") == 0 && admin >= 100) {
 		if (!sep->IsNumber(2))
-			c->Message(0, "Error: invalid guilddbid.");
+			c->Message(Chat::White, "Error: invalid guilddbid.");
 		else if (!sep->IsNumber(3))
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else if (atoi(sep->arg[3]) < 0 || atoi(sep->arg[3]) > GUILD_MAX_RANK)
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 eqid = database.GetGuildEQID(atoi(sep->arg[2]));
 			if (eqid == GUILD_NONE)
-				c->Message(0, "Error: Guild not found");
+				c->Message(Chat::White, "Error: Guild not found");
 			else if (!helper_guild_edit(c, atoi(sep->arg[2]), eqid, atoi(sep->arg[3]), sep->arg[4], sep->argplus[5])) {
-				c->Message(0, "  #guild gmedit guilddbid rank title newtitle");
-				c->Message(0, "  #guild gmedit guilddbid rank permission 0/1");
+				c->Message(Chat::White, "  #guild gmedit guilddbid rank title newtitle");
+				c->Message(Chat::White, "  #guild gmedit guilddbid rank permission 0/1");
 			}
 			else {
 				ServerPacket* pack = new ServerPacket(ServerOP_RefreshGuild, 5);
@@ -5755,59 +6188,56 @@ void command_guild(Client *c, const Seperator *sep)
 	*/
 	else if (strcasecmp(sep->arg[1], "set") == 0) {
 		if (!sep->IsNumber(3))
-			c->Message(0, "Usage: #guild set charname guildgbid (0 = clear guildtag)");
+			c->Message(Chat::White, "Usage: #guild set charname guildgbid (0 = clear guildtag)");
 		else {
 			uint32 guild_id = atoi(sep->arg[3]);
 
 			if(guild_id == 0)
 				guild_id = GUILD_NONE;
 			else if(!guild_mgr.GuildExists(guild_id)) {
-				c->Message(13, "Guild %d does not exist.",  guild_id);
+				c->Message(Chat::Red, "Guild %d does not exist.",  guild_id);
 				return;
 			}
 
 			uint32 charid = database.GetCharacterID(sep->arg[2]);
 			if(charid == 0) {
-				c->Message(13, "Unable to find character '%s'",  charid);
+				c->Message(Chat::Red, "Unable to find character '%s'",  charid);
 				return;
 			}
 
 			//we could do the checking we need for guild_mgr.CheckGMStatus, but im lazy right now
 			if(admin < minStatusToEditOtherGuilds) {
-				c->Message(13, "Access denied.");
+				c->Message(Chat::Red, "Access denied.");
 				return;
 			}
 
 			if(guild_id == GUILD_NONE) {
-				Log(Logs::Detail, Logs::Guilds, "%s: Removing %s (%d) from guild with GM command.",  c->GetName(),
-					sep->arg[2], charid);
+				LogGuilds("[{}]: Removing [{}] ([{}]) from guild with GM command",  c->GetName(), sep->arg[2], charid);
 			} else {
-				Log(Logs::Detail, Logs::Guilds, "%s: Putting %s (%d) into guild %s (%d) with GM command.",  c->GetName(),
-					sep->arg[2], charid,
-					guild_mgr.GetGuildName(guild_id), guild_id);
+				LogGuilds("[{}]: Putting [{}] ([{}]) into guild [{}] ([{}]) with GM command",  c->GetName(), sep->arg[2], charid, guild_mgr.GetGuildName(guild_id), guild_id);
 			}
 
 			if(!guild_mgr.SetGuild(charid, guild_id, GUILD_MEMBER)) {
-				c->Message(13, "Error putting '%s' into guild %d",  sep->arg[2], guild_id);
+				c->Message(Chat::Red, "Error putting '%s' into guild %d",  sep->arg[2], guild_id);
 			} else {
-				c->Message(0, "%s has been put into guild %d",  sep->arg[2], guild_id);
+				c->Message(Chat::White, "%s has been put into guild %d",  sep->arg[2], guild_id);
 			}
 		}
 	}
 	/*else if (strcasecmp(sep->arg[1], "setdoor") == 0 && admin >= minStatusToEditOtherGuilds) {
 
 		if (!sep->IsNumber(2))
-			c->Message(0, "Usage: #guild setdoor guildEQid (0 = delete guilddoor)");
+			c->Message(Chat::White, "Usage: #guild setdoor guildEQid (0 = delete guilddoor)");
 		else {
 // guild doors
 			if((!guilds[atoi(sep->arg[2])].databaseID) && (atoi(sep->arg[2])!=0) )
 			{
 
-				c->Message(0, "These is no guild with this guildEQid");
+				c->Message(Chat::White, "These is no guild with this guildEQid");
 			}
 			else {
 				c->SetIsSettingGuildDoor(true);
-				c->Message(0, "Click on a door you want to become a guilddoor");
+				c->Message(Chat::White, "Click on a door you want to become a guilddoor");
 				c->SetSetGuildDoorID(atoi(sep->arg[2]));
 			}
 		}
@@ -5815,36 +6245,35 @@ void command_guild(Client *c, const Seperator *sep)
 	else if (strcasecmp(sep->arg[1], "setrank") == 0) {
 		int rank = atoi(sep->arg[3]);
 		if (!sep->IsNumber(3))
-			c->Message(0, "Usage: #guild setrank charname rank");
+			c->Message(Chat::White, "Usage: #guild setrank charname rank");
 		else if (rank < 0 || rank > GUILD_MAX_RANK)
-			c->Message(0, "Error: invalid rank #.");
+			c->Message(Chat::White, "Error: invalid rank #.");
 		else {
 			uint32 charid = database.GetCharacterID(sep->arg[2]);
 			if(charid == 0) {
-				c->Message(13, "Unable to find character '%s'",  charid);
+				c->Message(Chat::Red, "Unable to find character '%s'",  charid);
 				return;
 			}
 
 			//we could do the checking we need for guild_mgr.CheckGMStatus, but im lazy right now
 			if(admin < minStatusToEditOtherGuilds) {
-				c->Message(13, "Access denied.");
+				c->Message(Chat::Red, "Access denied.");
 				return;
 			}
 
-			Log(Logs::Detail, Logs::Guilds, "%s: Setting %s (%d)'s guild rank to %d with GM command.",  c->GetName(),
-				sep->arg[2], charid, rank);
+			LogGuilds("[{}]: Setting [{}] ([{}])'s guild rank to [{}] with GM command", c->GetName(), sep->arg[2], charid, rank);
 
 			if(!guild_mgr.SetGuildRank(charid, rank))
-				c->Message(13, "Error while setting rank %d on '%s'.",  rank, sep->arg[2]);
+				c->Message(Chat::Red, "Error while setting rank %d on '%s'.",  rank, sep->arg[2]);
 			else
-				c->Message(0, "%s has been set to rank %d",  sep->arg[2], rank);
+				c->Message(Chat::White, "%s has been set to rank %d",  sep->arg[2], rank);
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "create") == 0) {
 		if (sep->arg[3][0] == 0)
-			c->Message(0, "Usage: #guild create {guildleader charname or CharID} guild name");
+			c->Message(Chat::White, "Usage: #guild create {guildleader charname or CharID} guild name");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 leader = 0;
 			if (sep->IsNumber(2)) {
@@ -5852,37 +6281,37 @@ void command_guild(Client *c, const Seperator *sep)
 			} else if((leader=database.GetCharacterID(sep->arg[2])) != 0) {
 				//got it from the db..
 			} else {
-				c->Message(13, "Unable to find char '%s'",  sep->arg[2]);
+				c->Message(Chat::Red, "Unable to find char '%s'",  sep->arg[2]);
 				return;
 			}
 			if (leader == 0) {
-				c->Message(0, "Guild leader not found.");
+				c->Message(Chat::White, "Guild leader not found.");
 				return;
 			}
 
 			uint32 tmp = guild_mgr.FindGuildByLeader(leader);
 			if (tmp != GUILD_NONE) {
-				c->Message(0, "Error: %s already is the leader of DB# %i '%s'.",  sep->arg[2], tmp, guild_mgr.GetGuildName(tmp));
+				c->Message(Chat::White, "Error: %s already is the leader of DB# %i '%s'.",  sep->arg[2], tmp, guild_mgr.GetGuildName(tmp));
 			}
 			else {
 
 				if(admin < minStatusToEditOtherGuilds) {
-					c->Message(13, "Access denied.");
+					c->Message(Chat::Red, "Access denied.");
 					return;
 				}
 
 				uint32 id = guild_mgr.CreateGuild(sep->argplus[3], leader);
 
-				Log(Logs::Detail, Logs::Guilds, "%s: Creating guild %s with leader %d with GM command. It was given id %lu.",  c->GetName(),
+				LogGuilds("[{}]: Creating guild [{}] with leader [{}] with GM command. It was given id [{}]",  c->GetName(),
 					sep->argplus[3], leader, (unsigned long)id);
 
 				if (id == GUILD_NONE)
-					c->Message(0, "Guild creation failed.");
+					c->Message(Chat::White, "Guild creation failed.");
 				else {
-					c->Message(0, "Guild created: Leader: %i, number %i: %s",  leader, id, sep->argplus[3]);
+					c->Message(Chat::White, "Guild created: Leader: %i, number %i: %s",  leader, id, sep->argplus[3]);
 
 					if(!guild_mgr.SetGuild(leader, id, GUILD_LEADER))
-						c->Message(0, "Unable to set guild leader's guild in the database. Your going to have to run #guild set");
+						c->Message(Chat::White, "Unable to set guild leader's guild in the database. Your going to have to run #guild set");
 				}
 
 			}
@@ -5890,77 +6319,77 @@ void command_guild(Client *c, const Seperator *sep)
 	}
 	else if (strcasecmp(sep->arg[1], "delete") == 0) {
 		if (!sep->IsNumber(2))
-			c->Message(0, "Usage: #guild delete guildID");
+			c->Message(Chat::White, "Usage: #guild delete guildID");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 id = atoi(sep->arg[2]);
 
 			if(!guild_mgr.GuildExists(id)) {
-				c->Message(0, "Guild %d does not exist!",  id);
+				c->Message(Chat::White, "Guild %d does not exist!",  id);
 				return;
 			}
 
 			if(admin < minStatusToEditOtherGuilds) {
 				//this person is not allowed to just edit any guild, check this guild's min status.
 				if(c->GuildID() != id) {
-					c->Message(13, "Access denied to edit other people's guilds");
+					c->Message(Chat::Red, "Access denied to edit other people's guilds");
 					return;
 				} else if(!guild_mgr.CheckGMStatus(id, admin)) {
-					c->Message(13, "Access denied to edit your guild with GM commands.");
+					c->Message(Chat::Red, "Access denied to edit your guild with GM commands.");
 					return;
 				}
 			}
 
-			Log(Logs::Detail, Logs::Guilds, "%s: Deleting guild %s (%d) with GM command.",  c->GetName(),
+			LogGuilds("[{}]: Deleting guild [{}] ([{}]) with GM command",  c->GetName(),
 				guild_mgr.GetGuildName(id), id);
 
 			if (!guild_mgr.DeleteGuild(id))
-				c->Message(0, "Guild delete failed.");
+				c->Message(Chat::White, "Guild delete failed.");
 			else {
-				c->Message(0, "Guild %d deleted.",  id);
+				c->Message(Chat::White, "Guild %d deleted.",  id);
 			}
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "rename") == 0) {
 		if ((!sep->IsNumber(2)) || sep->arg[3][0] == 0)
-			c->Message(0, "Usage: #guild rename guildID newname");
+			c->Message(Chat::White, "Usage: #guild rename guildID newname");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 id = atoi(sep->arg[2]);
 
 			if(!guild_mgr.GuildExists(id)) {
-				c->Message(0, "Guild %d does not exist!",  id);
+				c->Message(Chat::White, "Guild %d does not exist!",  id);
 				return;
 			}
 
 			if(admin < minStatusToEditOtherGuilds) {
 				//this person is not allowed to just edit any guild, check this guild's min status.
 				if(c->GuildID() != id) {
-					c->Message(13, "Access denied to edit other people's guilds");
+					c->Message(Chat::Red, "Access denied to edit other people's guilds");
 					return;
 				} else if(!guild_mgr.CheckGMStatus(id, admin)) {
-					c->Message(13, "Access denied to edit your guild with GM commands.");
+					c->Message(Chat::Red, "Access denied to edit your guild with GM commands.");
 					return;
 				}
 			}
 
-			Log(Logs::Detail, Logs::Guilds, "%s: Renaming guild %s (%d) to '%s' with GM command.",  c->GetName(),
+			LogGuilds("[{}]: Renaming guild [{}] ([{}]) to [{}] with GM command",  c->GetName(),
 				guild_mgr.GetGuildName(id), id, sep->argplus[3]);
 
 			if (!guild_mgr.RenameGuild(id, sep->argplus[3]))
-				c->Message(0, "Guild rename failed.");
+				c->Message(Chat::White, "Guild rename failed.");
 			else {
-				c->Message(0, "Guild %d renamed to %s",  id, sep->argplus[3]);
+				c->Message(Chat::White, "Guild %d renamed to %s",  id, sep->argplus[3]);
 			}
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "setleader") == 0) {
 		if (sep->arg[3][0] == 0 || !sep->IsNumber(2))
-			c->Message(0, "Usage: #guild setleader guild_id {guildleader charname or CharID}");
+			c->Message(Chat::White, "Usage: #guild setleader guild_id {guildleader charname or CharID}");
 		else if (!worldserver.Connected())
-			c->Message(0, "Error: World server dirconnected");
+			c->Message(Chat::White, "Error: World server dirconnected");
 		else {
 			uint32 leader = 0;
 			if (sep->IsNumber(2)) {
@@ -5968,55 +6397,55 @@ void command_guild(Client *c, const Seperator *sep)
 			} else if((leader=database.GetCharacterID(sep->arg[2])) != 0) {
 				//got it from the db..
 			} else {
-				c->Message(13, "Unable to find char '%s'",  sep->arg[2]);
+				c->Message(Chat::Red, "Unable to find char '%s'",  sep->arg[2]);
 				return;
 			}
 
 			uint32 tmpdb = guild_mgr.FindGuildByLeader(leader);
 			if (leader == 0)
-				c->Message(0, "New leader not found.");
+				c->Message(Chat::White, "New leader not found.");
 			else if (tmpdb != 0) {
-				c->Message(0, "Error: %s already is the leader of guild # %i",  sep->arg[2], tmpdb);
+				c->Message(Chat::White, "Error: %s already is the leader of guild # %i",  sep->arg[2], tmpdb);
 			}
 			else {
 				uint32 id = atoi(sep->arg[2]);
 
 				if(!guild_mgr.GuildExists(id)) {
-					c->Message(0, "Guild %d does not exist!",  id);
+					c->Message(Chat::White, "Guild %d does not exist!",  id);
 					return;
 				}
 
 				if(admin < minStatusToEditOtherGuilds) {
 					//this person is not allowed to just edit any guild, check this guild's min status.
 					if(c->GuildID() != id) {
-						c->Message(13, "Access denied to edit other people's guilds");
+						c->Message(Chat::Red, "Access denied to edit other people's guilds");
 						return;
 					} else if(!guild_mgr.CheckGMStatus(id, admin)) {
-						c->Message(13, "Access denied to edit your guild with GM commands.");
+						c->Message(Chat::Red, "Access denied to edit your guild with GM commands.");
 						return;
 					}
 				}
 
-				Log(Logs::Detail, Logs::Guilds, "%s: Setting leader of guild %s (%d) to %d with GM command.",  c->GetName(),
+				LogGuilds("[{}]: Setting leader of guild [{}] ([{}]) to [{}] with GM command",  c->GetName(),
 					guild_mgr.GetGuildName(id), id, leader);
 
 				if(!guild_mgr.SetGuildLeader(id, leader))
-					c->Message(0, "Guild leader change failed.");
+					c->Message(Chat::White, "Guild leader change failed.");
 				else {
-					c->Message(0, "Guild leader changed: guild # %d, Leader: %s",  id, sep->argplus[3]);
+					c->Message(Chat::White, "Guild leader changed: guild # %d, Leader: %s",  id, sep->argplus[3]);
 				}
 			}
 		}
 	}
 	else if (strcasecmp(sep->arg[1], "list") == 0) {
 		if(admin < minStatusToEditOtherGuilds) {
-			c->Message(13, "Access denied.");
+			c->Message(Chat::Red, "Access denied.");
 			return;
 		}
 		guild_mgr.ListGuilds(c);
 	}
 	else {
-		c->Message(0, "Unknown guild command, try #guild help");
+		c->Message(Chat::White, "Unknown guild command, try #guild help");
 	}
 }
 /*
@@ -6034,12 +6463,12 @@ bool helper_guild_edit(Client *c, uint32 dbid, uint32 eqid, uint8 rank, const ch
 
 	if (strcasecmp(what, "title") == 0) {
 		if (strlen(value) > 100)
-			c->Message(0, "Error: Title has a maxium length of 100 characters.");
+			c->Message(Chat::White, "Error: Title has a maxium length of 100 characters.");
 		else
 			strcpy(grl.rankname, value);
 	}
 	else if (rank == 0)
-		c->Message(0, "Error: Rank 0's permissions can not be changed.");
+		c->Message(Chat::White, "Error: Rank 0's permissions can not be changed.");
 	else {
 		if (!(strlen(value) == 1 && (value[0] == '0' || value[0] == '1')))
 
@@ -6062,17 +6491,17 @@ bool helper_guild_edit(Client *c, uint32 dbid, uint32 eqid, uint8 rank, const ch
 		else if (strcasecmp(what, "warpeace") == 0)
 			grl.warpeace = (value[0] == '1');
 		else
-			c->Message(0, "Error: Permission name not recognized.");
+			c->Message(Chat::White, "Error: Permission name not recognized.");
 	}
 	if (!database.EditGuild(dbid, rank, &grl))
-		c->Message(0, "Error: database.EditGuild() failed");
+		c->Message(Chat::White, "Error: database.EditGuild() failed");
 	return true;
 }*/
 
 void command_zonestatus(Client *c, const Seperator *sep)
 {
 	if (!worldserver.Connected())
-		c->Message(0, "Error: World server disconnected");
+		c->Message(Chat::White, "Error: World server disconnected");
 	else {
 		auto pack = new ServerPacket(ServerOP_ZoneStatus, strlen(c->GetName()) + 2);
 		memset(pack->pBuffer, (uint8) c->Admin(), 1);
@@ -6085,11 +6514,11 @@ void command_zonestatus(Client *c, const Seperator *sep)
 void command_doanim(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1))
-		c->Message(0, "Usage: #DoAnim [number]");
+		c->Message(Chat::White, "Usage: #DoAnim [number]");
 	else
 		if (c->Admin() >= commandDoAnimOthers)
 			if (c->GetTarget() == 0)
-				c->Message(0, "Error: You need a target.");
+				c->Message(Chat::White, "Error: You need a target.");
 			else
 				c->GetTarget()->DoAnim(atoi(sep->arg[1]),atoi(sep->arg[2]));
 		else
@@ -6100,13 +6529,13 @@ void command_randomfeatures(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!target)
-		c->Message(0,"Error: This command requires a target");
+		c->Message(Chat::White,"Error: This command requires a target");
 	else
 	{
 		if (target->RandomizeFeatures())
-			c->Message(0,"Features Randomized");
+			c->Message(Chat::White,"Features Randomized");
 		else
-			c->Message(0,"This command requires a Playable Race as the target");
+			c->Message(Chat::White,"This command requires a Playable Race as the target");
 	}
 }
 
@@ -6114,9 +6543,9 @@ void command_face(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #face [number of face]");
+		c->Message(Chat::White,"Usage: #face [number of face]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6137,49 +6566,49 @@ void command_face(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Face = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Face = %i",  atoi(sep->arg[1]));
 	}
 }
 
 void command_findaliases(Client *c, const Seperator *sep)
 {
 	if (!sep->arg[1][0]) {
-		c->Message(0, "Usage: #findaliases [alias | command]");
+		c->Message(Chat::White, "Usage: #findaliases [alias | command]");
 		return;
 	}
 
 	auto find_iter = commandaliases.find(sep->arg[1]);
 	if (find_iter == commandaliases.end()) {
-		c->Message(15, "No commands or aliases match '%s'", sep->arg[1]);
+		c->Message(Chat::Yellow, "No commands or aliases match '%s'", sep->arg[1]);
 		return;
 	}
 
 	auto command_iter = commandlist.find(find_iter->second);
 	if (find_iter->second.empty() || command_iter == commandlist.end()) {
-		c->Message(0, "An unknown condition occurred...");
+		c->Message(Chat::White, "An unknown condition occurred...");
 		return;
 	}
 
-	c->Message(0, "Available command aliases for '%s':", command_iter->first.c_str());
+	c->Message(Chat::White, "Available command aliases for '%s':", command_iter->first.c_str());
 
 	int commandaliasesshown = 0;
 	for (auto alias_iter = commandaliases.begin(); alias_iter != commandaliases.end(); ++alias_iter) {
 		if (strcasecmp(find_iter->second.c_str(), alias_iter->second.c_str()) || c->Admin() < command_iter->second->access)
 			continue;
 
-		c->Message(0, "%c%s", COMMAND_CHAR, alias_iter->first.c_str());
+		c->Message(Chat::White, "%c%s", COMMAND_CHAR, alias_iter->first.c_str());
 		++commandaliasesshown;
 	}
-	c->Message(0, "%d command alias%s listed.", commandaliasesshown, commandaliasesshown != 1 ? "es" : "");
+	c->Message(Chat::White, "%d command alias%s listed.", commandaliasesshown, commandaliasesshown != 1 ? "es" : "");
 }
 
 void command_details(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #details [number of drakkin detail]");
+		c->Message(Chat::White,"Usage: #details [number of drakkin detail]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6200,7 +6629,7 @@ void command_details(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Details = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Details = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6208,9 +6637,9 @@ void command_heritage(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #heritage [number of Drakkin heritage]");
+		c->Message(Chat::White,"Usage: #heritage [number of Drakkin heritage]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6231,7 +6660,7 @@ void command_heritage(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Heritage = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Heritage = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6239,9 +6668,9 @@ void command_tattoo(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #tattoo [number of Drakkin tattoo]");
+		c->Message(Chat::White,"Usage: #tattoo [number of Drakkin tattoo]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6262,7 +6691,7 @@ void command_tattoo(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Tattoo = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Tattoo = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6270,9 +6699,9 @@ void command_helm(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #helm [number of helm texture]");
+		c->Message(Chat::White,"Usage: #helm [number of helm texture]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6293,7 +6722,7 @@ void command_helm(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Helm = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Helm = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6301,9 +6730,9 @@ void command_hair(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #hair [number of hair style]");
+		c->Message(Chat::White,"Usage: #hair [number of hair style]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6324,7 +6753,7 @@ void command_hair(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Hair = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Hair = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6332,9 +6761,9 @@ void command_haircolor(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #haircolor [number of hair color]");
+		c->Message(Chat::White,"Usage: #haircolor [number of hair color]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6355,7 +6784,7 @@ void command_haircolor(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Hair Color = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Hair Color = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6363,9 +6792,9 @@ void command_beard(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #beard [number of beard style]");
+		c->Message(Chat::White,"Usage: #beard [number of beard style]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6386,7 +6815,7 @@ void command_beard(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Beard = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Beard = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6394,9 +6823,9 @@ void command_beardcolor(Client *c, const Seperator *sep)
 {
 	Mob *target=c->GetTarget();
 	if (!sep->IsNumber(1))
-		c->Message(0,"Usage: #beardcolor [number of beard color]");
+		c->Message(Chat::White,"Usage: #beardcolor [number of beard color]");
 	else if (!target)
-		c->Message(0,"Error: this command requires a target");
+		c->Message(Chat::White,"Error: this command requires a target");
 	else {
 		uint16 Race = target->GetRace();
 		uint8 Gender = target->GetGender();
@@ -6417,7 +6846,7 @@ void command_beardcolor(Client *c, const Seperator *sep)
 									EyeColor1, EyeColor2, HairStyle, LuclinFace, Beard, 0xFF,
 									DrakkinHeritage, DrakkinTattoo, DrakkinDetails);
 
-		c->Message(0,"Beard Color = %i",  atoi(sep->arg[1]));
+		c->Message(Chat::White,"Beard Color = %i",  atoi(sep->arg[1]));
 	}
 }
 
@@ -6428,7 +6857,7 @@ void command_scribespells(Client *c, const Seperator *sep)
 		t = c->GetTarget()->CastToClient();
 
 	if(sep->argnum < 1 || !sep->IsNumber(1)) {
-		c->Message(0, "FORMAT: #scribespells <max level> <min level>");
+		c->Message(Chat::White, "FORMAT: #scribespells <max level> <min level>");
 		return;
 	}
 
@@ -6441,18 +6870,18 @@ void command_scribespells(Client *c, const Seperator *sep)
 		min_level = (uint8)RuleI(Character, MaxLevel); // default to Character:MaxLevel if we're not a GM & it's higher than the max level
 
 	if(max_level < 1 || min_level < 1) {
-		c->Message(0, "ERROR: Level must be greater than 1.");
+		c->Message(Chat::White, "ERROR: Level must be greater than 1.");
 		return;
 	}
 	if (min_level > max_level) {
-		c->Message(0, "ERROR: Min Level must be less than or equal to Max Level.");
+		c->Message(Chat::White, "ERROR: Min Level must be less than or equal to Max Level.");
 		return;
 	}
 
-	t->Message(0, "Scribing spells to spellbook.");
+	t->Message(Chat::White, "Scribing spells to spellbook.");
 	if(t != c)
-		c->Message(0, "Scribing spells for %s.",  t->GetName());
-	Log(Logs::General, Logs::Normal, "Scribe spells request for %s from %s, levels: %u -> %u",  t->GetName(), c->GetName(), min_level, max_level);
+		c->Message(Chat::White, "Scribing spells for %s.",  t->GetName());
+	LogInfo("Scribe spells request for [{}] from [{}], levels: [{}] -> [{}]",  t->GetName(), c->GetName(), min_level, max_level);
 
 	int book_slot = t->GetNextAvailableSpellBookSlot();
 	int spell_id = 0;
@@ -6478,14 +6907,14 @@ void command_scribespells(Client *c, const Seperator *sep)
 			break;
 		}
 		if (spell_id < 0 || spell_id >= SPDAT_RECORDS) {
-			c->Message(13, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
+			c->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
 			return;
 		}
 		if (book_slot < 0 || book_slot >= EQEmu::spells::SPELLBOOK_SIZE) {
-			c->Message(13, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE);
+			c->Message(Chat::Red, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE);
 			return;
 		}
-		
+
 		while (true) {
 			if (spells[spell_id].classes[WARRIOR] == 0) // check if spell exists
 				break;
@@ -6498,7 +6927,7 @@ void command_scribespells(Client *c, const Seperator *sep)
 
 			uint16 spell_id_ = (uint16)spell_id;
 			if ((spell_id_ != spell_id) || (spell_id != spell_id_)) {
-				c->Message(13, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
+				c->Message(Chat::Red, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
 				return;
 			}
 
@@ -6514,14 +6943,14 @@ void command_scribespells(Client *c, const Seperator *sep)
 	}
 
 	if (count > 0) {
-		t->Message(0, "Successfully scribed %i spells.",  count);
+		t->Message(Chat::White, "Successfully scribed %i spells.",  count);
 		if (t != c)
-			c->Message(0, "Successfully scribed %i spells for %s.",  count, t->GetName());
+			c->Message(Chat::White, "Successfully scribed %i spells for %s.",  count, t->GetName());
 	}
 	else {
-		t->Message(0, "No spells scribed.");
+		t->Message(Chat::White, "No spells scribed.");
 		if (t != c)
-			c->Message(0, "No spells scribed for %s.",  t->GetName());
+			c->Message(Chat::White, "No spells scribed for %s.",  t->GetName());
 	}
 }
 
@@ -6534,19 +6963,19 @@ void command_scribespell(Client *c, const Seperator *sep) {
 		t=c->GetTarget()->CastToClient();
 
 	if(!sep->arg[1][0]) {
-		c->Message(0, "FORMAT: #scribespell <spellid>");
+		c->Message(Chat::White, "FORMAT: #scribespell <spellid>");
 		return;
 	}
 
 	spell_id = atoi(sep->arg[1]);
 
 	if(IsValidSpell(spell_id)) {
-		t->Message(0, "Scribing spell: %s (%i) to spellbook.",  spells[spell_id].name, spell_id);
+		t->Message(Chat::White, "Scribing spell: %s (%i) to spellbook.",  spells[spell_id].name, spell_id);
 
 		if(t != c)
-			c->Message(0, "Scribing spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
+			c->Message(Chat::White, "Scribing spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
 
-		Log(Logs::General, Logs::Normal, "Scribe spell: %s (%i) request for %s from %s.",  spells[spell_id].name, spell_id, t->GetName(), c->GetName());
+		LogInfo("Scribe spell: [{}] ([{}]) request for [{}] from [{}]",  spells[spell_id].name, spell_id, t->GetName(), c->GetName());
 
 		if (spells[spell_id].classes[WARRIOR] != 0 && spells[spell_id].skill != 52 && spells[spell_id].classes[t->GetPP().class_ - 1] > 0 && !IsDiscipline(spell_id)) {
 			book_slot = t->GetNextAvailableSpellBookSlot();
@@ -6554,17 +6983,17 @@ void command_scribespell(Client *c, const Seperator *sep) {
 			if(book_slot >= 0 && t->FindSpellBookSlotBySpellID(spell_id) < 0)
 				t->ScribeSpell(spell_id, book_slot);
 			else {
-				t->Message(13, "Unable to scribe spell: %s (%i) to your spellbook.",  spells[spell_id].name, spell_id);
+				t->Message(Chat::Red, "Unable to scribe spell: %s (%i) to your spellbook.",  spells[spell_id].name, spell_id);
 
 				if(t != c)
-					c->Message(13, "Unable to scribe spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
+					c->Message(Chat::Red, "Unable to scribe spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
 			}
 		}
 		else
-			c->Message(13, "Your target can not scribe this spell.");
+			c->Message(Chat::Red, "Your target can not scribe this spell.");
 	}
 	else
-		c->Message(13, "Spell ID: %i is an unknown spell and cannot be scribed.",  spell_id);
+		c->Message(Chat::Red, "Spell ID: %i is an unknown spell and cannot be scribed.",  spell_id);
 }
 
 void command_unscribespell(Client *c, const Seperator *sep) {
@@ -6576,7 +7005,7 @@ void command_unscribespell(Client *c, const Seperator *sep) {
 		t=c->GetTarget()->CastToClient();
 
 	if(!sep->arg[1][0]) {
-		c->Message(0, "FORMAT: #unscribespell <spellid>");
+		c->Message(Chat::White, "FORMAT: #unscribespell <spellid>");
 		return;
 	}
 
@@ -6588,18 +7017,18 @@ void command_unscribespell(Client *c, const Seperator *sep) {
 		if(book_slot >= 0) {
 			t->UnscribeSpell(book_slot);
 
-			t->Message(0, "Unscribing spell: %s (%i) from spellbook.",  spells[spell_id].name, spell_id);
+			t->Message(Chat::White, "Unscribing spell: %s (%i) from spellbook.",  spells[spell_id].name, spell_id);
 
 			if(t != c)
-				c->Message(0, "Unscribing spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
+				c->Message(Chat::White, "Unscribing spell: %s (%i) for %s.",  spells[spell_id].name, spell_id, t->GetName());
 
-			Log(Logs::General, Logs::Normal, "Unscribe spell: %s (%i) request for %s from %s.",  spells[spell_id].name, spell_id, t->GetName(), c->GetName());
+			LogInfo("Unscribe spell: [{}] ([{}]) request for [{}] from [{}]",  spells[spell_id].name, spell_id, t->GetName(), c->GetName());
 		}
 		else {
-			t->Message(13, "Unable to unscribe spell: %s (%i) from your spellbook. This spell is not scribed.",  spells[spell_id].name, spell_id);
+			t->Message(Chat::Red, "Unable to unscribe spell: %s (%i) from your spellbook. This spell is not scribed.",  spells[spell_id].name, spell_id);
 
 			if(t != c)
-				c->Message(13, "Unable to unscribe spell: %s (%i) for %s due to spell not scribed.",  spells[spell_id].name, spell_id, t->GetName());
+				c->Message(Chat::Red, "Unable to unscribe spell: %s (%i) for %s due to spell not scribed.",  spells[spell_id].name, spell_id, t->GetName());
 		}
 	}
 }
@@ -6618,7 +7047,7 @@ void command_untraindisc(Client *c, const Seperator *sep) {
 	Client *t = c;
 	if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM())
 		t = c->GetTarget()->CastToClient();
-	
+
 	for (int i = 0; i < MAX_PP_DISCIPLINES; i++) {
 		if (t->GetPP().disciplines.values[i] == atoi(sep->arg[1])) {
 			t->UntrainDisc(i, 1);
@@ -6631,7 +7060,7 @@ void command_untraindiscs(Client *c, const Seperator *sep) {
 	Client *t = c;
 	if (c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM())
 		t = c->GetTarget()->CastToClient();
-	
+
 	t->UntrainDiscAll();
 }
 
@@ -6640,7 +7069,7 @@ void command_wpinfo(Client *c, const Seperator *sep)
 	Mob *t=c->GetTarget();
 
 	if (t == nullptr || !t->IsNPC()) {
-		c->Message(0,"You must target an NPC to use this.");
+		c->Message(Chat::White,"You must target an NPC to use this.");
 		return;
 	}
 
@@ -6650,47 +7079,54 @@ void command_wpinfo(Client *c, const Seperator *sep)
 
 void command_wpadd(Client *c, const Seperator *sep)
 {
-	int	type1=0,
-		type2=0,
-		pause=0;	// Defaults for a new grid
+	int type1 = 0,
+		type2 = 0,
+		pause = 0;    // Defaults for a new grid
 
-	Mob *t=c->GetTarget();
-	if (t && t->IsNPC())
-	{
-		Spawn2* s2info = t->CastToNPC()->respawn2;
+	Mob *target = c->GetTarget();
+	if (target && target->IsNPC()) {
+		Spawn2 *s2info = target->CastToNPC()->respawn2;
 
-		if(s2info == nullptr)	// Can't figure out where this mob's spawn came from... maybe a dynamic mob created by #spawn
+		if (s2info ==
+			nullptr)    // Can't figure out where this mob's spawn came from... maybe a dynamic mob created by #spawn
 		{
-			c->Message(0,"#wpadd FAILED -- Can't determine which spawn record in the database this mob came from!");
+			c->Message(
+				Chat::White,
+				"#wpadd FAILED -- Can't determine which spawn record in the database this mob came from!"
+			);
 			return;
 		}
 
-		if (sep->arg[1][0])
-		{
-			if (atoi(sep->arg[1]) >= 0)
-				pause=atoi(sep->arg[1]);
-			else
-			{
-				c->Message(0,"Usage: #wpadd [pause] [-h]");
+		if (sep->arg[1][0]) {
+			if (atoi(sep->arg[1]) >= 0) {
+				pause = atoi(sep->arg[1]);
+			}
+			else {
+				c->Message(Chat::White, "Usage: #wpadd [pause] [-h]");
 				return;
 			}
 		}
 		auto position = c->GetPosition();
-		if (strcmp("-h",sep->arg[2]) != 0)
+		if (strcmp("-h", sep->arg[2]) != 0) {
 			position.w = -1;
+		}
 
 		uint32 tmp_grid = database.AddWPForSpawn(c, s2info->GetID(), position, pause, type1, type2, zone->GetZoneID());
-		if (tmp_grid)
-			t->CastToNPC()->SetGrid(tmp_grid);
+		if (tmp_grid) {
+			target->CastToNPC()->SetGrid(tmp_grid);
+		}
 
-		t->CastToNPC()->AssignWaypoints(t->CastToNPC()->GetGrid());
-		c->Message(0,"Waypoint added. Use #wpinfo to see waypoints for this NPC (may need to #repop first).");
+		target->CastToNPC()->AssignWaypoints(target->CastToNPC()->GetGrid());
+		c->Message(
+			Chat::White,
+			"Waypoint added. Use #wpinfo to see waypoints for this NPC (may need to #repop first)."
+		);
+	}
+	else {
+		c->Message(Chat::White, "You must target an NPC to use this.");
 	}
-	else
-		c->Message(0,"You must target an NPC to use this.");
 }
 
-
 void command_interrupt(Client *c, const Seperator *sep)
 {
 	uint16 ci_message=0x01b7, ci_color=0x0121;
@@ -6716,14 +7152,14 @@ void command_summonitem(Client *c, const Seperator *sep)
 		itemid = link_body.item_id;
 	}
 	else if (!sep->IsNumber(1)) {
-		c->Message(0, "Usage: #summonitem [item id | link] [charges], charges are optional");
+		c->Message(Chat::White, "Usage: #summonitem [item id | link] [charges], charges are optional");
 		return;
 	}
 	else {
 		itemid = atoi(sep->arg[1]);
 	}
 	if (!itemid) {
-		c->Message(0, "A valid item id number is required (derived: 0)");
+		c->Message(Chat::White, "A valid item id number is required (derived: 0)");
 		return;
 	}
 
@@ -6734,7 +7170,7 @@ void command_summonitem(Client *c, const Seperator *sep)
 	}
 
 	if (item_status > c->Admin())
-		c->Message(13, "Error: Insufficient status to summon this item.");
+		c->Message(Chat::Red, "Error: Insufficient status to summon this item.");
 	else if (sep->argnum == 2 && sep->IsNumber(2))
 		c->SummonItem(itemid, atoi(sep->arg[2]));
 	else if (sep->argnum == 3)
@@ -6752,17 +7188,17 @@ void command_summonitem(Client *c, const Seperator *sep)
 	else {
 		c->SummonItem(itemid);
 	}
-	
+
 }
 
 void command_giveitem(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1)) {
-		c->Message(13, "Usage: #summonitem [item id] [charges], charges are optional");
+		c->Message(Chat::Red, "Usage: #summonitem [item id] [charges], charges are optional");
 	} else if(c->GetTarget() == nullptr) {
-		c->Message(13, "You must target a client to give the item to.");
+		c->Message(Chat::Red, "You must target a client to give the item to.");
 	} else if(!c->GetTarget()->IsClient()) {
-		c->Message(13, "You can only give items to players with this command.");
+		c->Message(Chat::Red, "You can only give items to players with this command.");
 	} else {
 		Client *t = c->GetTarget()->CastToClient();
 		uint32 itemid = atoi(sep->arg[1]);
@@ -6773,7 +7209,7 @@ void command_giveitem(Client *c, const Seperator *sep)
 		}
 
 		if (item_status > c->Admin())
-			c->Message(13, "Error: Insufficient status to summon this item.");
+			c->Message(Chat::Red, "Error: Insufficient status to summon this item.");
 		else if (sep->argnum==2 && sep->IsNumber(2))
 			t->SummonItem(itemid, atoi(sep->arg[2]));
 		else if (sep->argnum==3)
@@ -6797,25 +7233,25 @@ void command_giveitem(Client *c, const Seperator *sep)
 void command_givemoney(Client *c, const Seperator *sep)
 {
 	if (!sep->IsNumber(1)) {	//as long as the first one is a number, we'll just let atoi convert the rest to 0 or a number
-		c->Message(13, "Usage: #Usage: #givemoney [pp] [gp] [sp] [cp]");
+		c->Message(Chat::Red, "Usage: #Usage: #givemoney [pp] [gp] [sp] [cp]");
 	}
 	else if(c->GetTarget() == nullptr) {
-		c->Message(13, "You must target a player to give money to.");
+		c->Message(Chat::Red, "You must target a player to give money to.");
 	}
 	else if(!c->GetTarget()->IsClient()) {
-		c->Message(13, "You can only give money to players with this command.");
+		c->Message(Chat::Red, "You can only give money to players with this command.");
 	}
 	else {
 		//TODO: update this to the client, otherwise the client doesn't show any weight change until you zone, move an item, etc
 		c->GetTarget()->CastToClient()->AddMoneyToPP(atoi(sep->arg[4]), atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[1]), true);
-		c->Message(0, "Added %i Platinum, %i Gold, %i Silver, and %i Copper to %s's inventory.",  atoi(sep->arg[1]), atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), c->GetTarget()->GetName());
+		c->Message(Chat::White, "Added %i Platinum, %i Gold, %i Silver, and %i Copper to %s's inventory.",  atoi(sep->arg[1]), atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), c->GetTarget()->GetName());
 	}
 }
 
 void command_itemsearch(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #itemsearch [search string]");
+		c->Message(Chat::White, "Usage: #itemsearch [search string]");
 	else
 	{
 		const char *search_criteria=sep->argplus[1];
@@ -6829,10 +7265,10 @@ void command_itemsearch(Client *c, const Seperator *sep)
 			if (item) {
 				linker.SetItemData(item);
 
-				c->Message(0, "%u: %s",  item->ID, linker.GenerateLink().c_str());
+				c->Message(Chat::White, "%u: %s",  item->ID, linker.GenerateLink().c_str());
 			}
 			else {
-				c->Message(0, "Item #%s not found",  search_criteria);
+				c->Message(Chat::White, "Item #%s not found",  search_criteria);
 			}
 
 			return;
@@ -6852,7 +7288,7 @@ void command_itemsearch(Client *c, const Seperator *sep)
 			if (pdest != nullptr) {
 				linker.SetItemData(item);
 
-				c->Message(0, "%u: %s",  item->ID, linker.GenerateLink().c_str());
+				c->Message(Chat::White, "%u: %s",  item->ID, linker.GenerateLink().c_str());
 
 				++count;
 			}
@@ -6862,9 +7298,9 @@ void command_itemsearch(Client *c, const Seperator *sep)
 		}
 
 		if (count == 50)
-			c->Message(0, "50 items shown...too many results.");
+			c->Message(Chat::White, "50 items shown...too many results.");
 		else
-			c->Message(0, "%i items found",  count);
+			c->Message(Chat::White, "%i items found",  count);
 
 	}
 }
@@ -6882,7 +7318,7 @@ void command_setaaxp(Client *c, const Seperator *sep)
 			t->SetLeadershipEXP(atoi(sep->arg[2]), atoi(sep->arg[3]));
 		}
 	} else
-		c->Message(0, "Usage: #setaaxp <new AA XP value> (<new Group AA XP value> <new Raid XP value>)");
+		c->Message(Chat::White, "Usage: #setaaxp <new AA XP value> (<new Group AA XP value> <new Raid XP value>)");
 }
 
 void command_setaapts(Client *c, const Seperator *sep)
@@ -6893,23 +7329,23 @@ void command_setaapts(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0] == '\0' || sep->arg[2][0] == '\0')
-		c->Message(0, "Usage: #setaapts <AA|group|raid> <new AA points value>");
+		c->Message(Chat::White, "Usage: #setaapts <AA|group|raid> <new AA points value>");
 	else if(atoi(sep->arg[2]) <= 0 || atoi(sep->arg[2]) > 5000)
-		c->Message(0, "You must have a number greater than 0 for points and no more than 5000.");
+		c->Message(Chat::White, "You must have a number greater than 0 for points and no more than 5000.");
 	else if(!strcasecmp(sep->arg[1], "group")) {
 		t->GetPP().group_leadership_points = atoi(sep->arg[2]);
 		t->GetPP().group_leadership_exp = 0;
-		t->Message(MT_Experience, "Setting Group AA points to %u", t->GetPP().group_leadership_points);
+		t->Message(Chat::Experience, "Setting Group AA points to %u", t->GetPP().group_leadership_points);
 		t->SendLeadershipEXPUpdate();
 	} else if(!strcasecmp(sep->arg[1], "raid")) {
 		t->GetPP().raid_leadership_points = atoi(sep->arg[2]);
 		t->GetPP().raid_leadership_exp = 0;
-		t->Message(MT_Experience, "Setting Raid AA points to %u", t->GetPP().raid_leadership_points);
+		t->Message(Chat::Experience, "Setting Raid AA points to %u", t->GetPP().raid_leadership_points);
 		t->SendLeadershipEXPUpdate();
 	} else {
 		t->GetPP().aapoints = atoi(sep->arg[2]);
 		t->GetPP().expAA = 0;
-		t->Message(MT_Experience, "Setting personal AA points to %u", t->GetPP().aapoints);
+		t->Message(Chat::Experience, "Setting personal AA points to %u", t->GetPP().aapoints);
 		t->SendAlternateAdvancementStats();
 	}
 }
@@ -6922,9 +7358,9 @@ void command_setcrystals(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(sep->arg[1][0] == '\0' || sep->arg[2][0] == '\0')
-		c->Message(0, "Usage: #setcrystals <radiant|ebon> <new crystal count value>");
+		c->Message(Chat::White, "Usage: #setcrystals <radiant|ebon> <new crystal count value>");
 	else if(atoi(sep->arg[2]) <= 0 || atoi(sep->arg[2]) > 100000)
-		c->Message(0, "You must have a number greater than 0 for crystals and no more than 100000.");
+		c->Message(Chat::White, "You must have a number greater than 0 for crystals and no more than 100000.");
 	else if(!strcasecmp(sep->arg[1], "radiant"))
 	{
 		t->SetRadiantCrystals(atoi(sep->arg[2]));
@@ -6939,7 +7375,7 @@ void command_setcrystals(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Usage: #setcrystals <radiant|ebon> <new crystal count value>");
+		c->Message(Chat::White, "Usage: #setcrystals <radiant|ebon> <new crystal count value>");
 	}
 }
 
@@ -6959,14 +7395,14 @@ void command_stun(Client *c, const Seperator *sep)
 			t->CastToNPC()->Stun(duration);
 	}
 	else
-		c->Message(0, "Usage: #stun [duration]");
+		c->Message(Chat::White, "Usage: #stun [duration]");
 }
 
 
 void command_ban(Client *c, const Seperator *sep)
 {
 if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
-		c->Message(0, "Usage: #ban <charname> <message>");
+		c->Message(Chat::White, "Usage: #ban <charname> <message>");
 		return;
 	}
 
@@ -6988,12 +7424,12 @@ if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
     }
 
     if(message.length() == 0) {
-        c->Message(0, "Usage: #ban <charname> <message>");
+        c->Message(Chat::White, "Usage: #ban <charname> <message>");
         return;
     }
 
     if(account_id == 0) {
-        c->Message(13, "Character does not exist.");
+        c->Message(Chat::Red, "Character does not exist.");
         return;
     }
 
@@ -7001,7 +7437,7 @@ if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
                                     "WHERE id = %i",  EscapeString(message).c_str(), account_id);
     auto results = database.QueryDatabase(query);
 
-    c->Message(13, "Account number %i with the character %s has been banned with message: \"%s\"",  account_id, sep->arg[1], message.c_str());
+    c->Message(Chat::Red, "Account number %i with the character %s has been banned with message: \"%s\"",  account_id, sep->arg[1], message.c_str());
 
     ServerPacket flagUpdatePack(ServerOP_FlagUpdate, 6);
     *((uint32*)&flagUpdatePack.pBuffer[0]) = account_id;
@@ -7026,7 +7462,7 @@ if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
 void command_suspend(Client *c, const Seperator *sep)
 {
 	if((sep->arg[1][0] == 0) || (sep->arg[2][0] == 0)) {
-		c->Message(0, "Usage: #suspend <charname> <days> (Specify 0 days to lift the suspension immediately) <message>");
+		c->Message(Chat::White, "Usage: #suspend <charname> <days> (Specify 0 days to lift the suspension immediately) <message>");
 		return;
     }
 
@@ -7053,7 +7489,7 @@ void command_suspend(Client *c, const Seperator *sep)
         }
 
         if(message.length() == 0) {
-            c->Message(0, "Usage: #suspend <charname> <days>(Specify 0 days to lift the suspension immediately) <message>");
+            c->Message(Chat::White, "Usage: #suspend <charname> <days>(Specify 0 days to lift the suspension immediately) <message>");
             return;
         }
     }
@@ -7064,7 +7500,7 @@ void command_suspend(Client *c, const Seperator *sep)
     safe_delete_array(escName);
 
     if (accountID <= 0) {
-        c->Message(13,"Character does not exist.");
+        c->Message(Chat::Red,"Character does not exist.");
         return;
     }
 
@@ -7074,9 +7510,9 @@ void command_suspend(Client *c, const Seperator *sep)
     auto results = database.QueryDatabase(query);
 
     if(duration)
-        c->Message(13,"Account number %i with the character %s has been temporarily suspended for %i day(s).",  accountID, sep->arg[1], duration);
+        c->Message(Chat::Red,"Account number %i with the character %s has been temporarily suspended for %i day(s).",  accountID, sep->arg[1], duration);
     else
-        c->Message(13,"Account number %i with the character %s is no longer suspended.",  accountID, sep->arg[1]);
+        c->Message(Chat::Red,"Account number %i with the character %s is no longer suspended.",  accountID, sep->arg[1]);
 
     Client *bannedClient = entity_list.GetClientByName(sep->arg[1]);
 
@@ -7101,12 +7537,12 @@ void command_ipban(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1] == 0)
 	{
-		c->Message(0, "Usage: #ipban [xxx.xxx.xxx.xxx]");
+		c->Message(Chat::White, "Usage: #ipban [xxx.xxx.xxx.xxx]");
 	} else {
 		if(database.AddBannedIP(sep->arg[1], c->GetName())) {
-			c->Message(0, "%s has been successfully added to the Banned_IPs table by %s", sep->arg[1], c->GetName());
+			c->Message(Chat::White, "%s has been successfully added to the banned_ips table by %s", sep->arg[1], c->GetName());
 		} else {
-			c->Message(0, "IPBan Failed (IP address is possibly already in the table?)");
+			c->Message(Chat::White, "IPBan Failed (IP address is possibly already in the table?)");
 		}
 	}
 }
@@ -7114,13 +7550,13 @@ void command_ipban(Client *c, const Seperator *sep)
 void command_revoke(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == 0 || sep->arg[2][0] == 0) {
-		c->Message(0, "Usage: #revoke [charname] [1/0]");
+		c->Message(Chat::White, "Usage: #revoke [charname] [1/0]");
 		return;
 	}
 
     uint32 characterID = database.GetAccountIDByChar(sep->arg[1]);
     if(characterID == 0) {
-        c->Message(13,"Character does not exist.");
+        c->Message(Chat::Red,"Character does not exist.");
         return;
     }
 
@@ -7128,16 +7564,16 @@ void command_revoke(Client *c, const Seperator *sep)
     std::string query = StringFormat("UPDATE account SET revoked = %d WHERE id = %i",  flag, characterID);
     auto results = database.QueryDatabase(query);
 
-    c->Message(13,"%s account number %i with the character %s.",  flag? "Revoking": "Unrevoking",  characterID, sep->arg[1]);
+    c->Message(Chat::Red,"%s account number %i with the character %s.",  flag? "Revoking": "Unrevoking",  characterID, sep->arg[1]);
 
     Client* revokee = entity_list.GetClientByAccID(characterID);
     if(revokee) {
-        c->Message(0, "Found %s in this zone.",  revokee->GetName());
+        c->Message(Chat::White, "Found %s in this zone.",  revokee->GetName());
         revokee->SetRevoked(flag);
         return;
     }
 
-	c->Message(13, "#revoke: Couldn't find %s in this zone, passing request to worldserver.", sep->arg[1]);
+	c->Message(Chat::Red, "#revoke: Couldn't find %s in this zone, passing request to worldserver.", sep->arg[1]);
 
 	auto outapp = new ServerPacket(ServerOP_Revoke, sizeof(RevokeStruct));
 	RevokeStruct *revoke = (RevokeStruct *)outapp->pBuffer;
@@ -7148,10 +7584,100 @@ void command_revoke(Client *c, const Seperator *sep)
 	safe_delete(outapp);
 }
 
+void command_roambox(Client *c, const Seperator *sep)
+{
+	std::string arg1  = sep->arg[1];
+
+	Mob *target = c->GetTarget();
+	if (!target || !target->IsNPC()) {
+		c->Message(Chat::Red, "You need a valid NPC target for this command");
+		return;
+	}
+
+	NPC *npc           = dynamic_cast<NPC *>(target);
+	int spawn_group_id = npc->GetSpawnGroupId();
+	if (spawn_group_id <= 0) {
+		c->Message(Chat::Red, "NPC needs a valid SpawnGroup!");
+		return;
+	}
+
+	if (arg1 == "set") {
+		int box_size = (sep->arg[2] ? atoi(sep->arg[2]) : 0);
+		int delay = (sep->arg[3] ? atoi(sep->arg[3]) : 15000);
+		if (box_size > 0) {
+			std::string query = fmt::format(
+				SQL(
+					UPDATE spawngroup SET
+					dist = {},
+					min_x = {},
+					max_x = {},
+					min_y = {},
+					max_y = {},
+					delay = {}
+					WHERE id = {}
+				),
+				(box_size / 2),
+				npc->GetX() - (box_size / 2),
+				npc->GetX() + (box_size / 2),
+				npc->GetY() - (box_size / 2),
+				npc->GetY() + (box_size / 2),
+				delay,
+				spawn_group_id
+			);
+
+			database.QueryDatabase(query);
+
+			c->Message(
+				Chat::Yellow,
+				"NPC (%s) Roam Box set to box size of [%i] SpawnGroupId [%i] delay [%i]",
+				npc->GetCleanName(),
+				box_size,
+				spawn_group_id,
+				delay
+			);
+
+			return;
+		}
+
+		c->Message(Chat::Red, "Box size must be set!");
+	}
+
+	if (arg1 == "remove") {
+		std::string query = fmt::format(
+			SQL(
+				UPDATE spawngroup SET
+				dist = 0,
+				min_x = 0,
+				max_x = 0,
+				min_y = 0,
+				max_y = 0,
+				delay = 0
+					WHERE id = {}
+			),
+			spawn_group_id
+		);
+
+		database.QueryDatabase(query);
+
+		c->Message(
+			Chat::Yellow,
+			"NPC (%s) Roam Box has been removed from SpawnGroupID [%i]",
+			npc->GetCleanName(),
+			spawn_group_id
+		);
+
+		return;
+	}
+
+	c->Message(Chat::Yellow, "> Command Usage");
+	c->Message(Chat::Yellow, "#roambox set box_size [delay = 0]");
+	c->Message(Chat::Yellow, "#roambox remove");
+}
+
 void command_oocmute(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == 0 || !(sep->arg[1][0] == '1' || sep->arg[1][0] == '0'))
-		c->Message(0, "Usage: #oocmute [1/0]");
+		c->Message(Chat::White, "Usage: #oocmute [1/0]");
 	else {
 		auto outapp = new ServerPacket(ServerOP_OOCMute, 1);
 		*(outapp->pBuffer) = atoi(sep->arg[1]);
@@ -7162,17 +7688,16 @@ void command_oocmute(Client *c, const Seperator *sep)
 
 void command_checklos(Client *c, const Seperator *sep)
 {
-	if(c->GetTarget())
-	{
-//		if(c->CheckLos(c->GetTarget()))
-		if(c->CheckLosFN(c->GetTarget()))
-			c->Message(0, "You have LOS to %s",  c->GetTarget()->GetName());
-		else
-			c->Message(0, "You do not have LOS to %s",  c->GetTarget()->GetName());
+	if (c->GetTarget()) {
+		if (c->CheckLosFN(c->GetTarget())) {
+			c->Message(Chat::White, "You have LOS to %s", c->GetTarget()->GetName());
+		}
+		else {
+			c->Message(Chat::White, "You do not have LOS to %s", c->GetTarget()->GetName());
+		}
 	}
-	else
-	{
-		c->Message(0, "ERROR: Target required");
+	else {
+		c->Message(Chat::White, "ERROR: Target required");
 	}
 }
 
@@ -7185,17 +7710,17 @@ void command_set_adventure_points(Client *c, const Seperator *sep)
 
 	if(!sep->arg[1][0])
 	{
-		c->Message(0, "Usage: #setadventurepoints [points] [theme]");
+		c->Message(Chat::White, "Usage: #setadventurepoints [points] [theme]");
 		return;
 	}
 
 	if(!sep->IsNumber(1) || !sep->IsNumber(2))
 	{
-		c->Message(0, "Usage: #setadventurepoints [points] [theme]");
+		c->Message(Chat::White, "Usage: #setadventurepoints [points] [theme]");
 		return;
 	}
 
-	c->Message(0, "Updating adventure points for %s",  t->GetName());
+	c->Message(Chat::White, "Updating adventure points for %s",  t->GetName());
 	t->UpdateLDoNPoints(atoi(sep->arg[1]), atoi(sep->arg[2]));
 }
 
@@ -7207,7 +7732,7 @@ void command_npcsay(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Usage: #npcsay message (requires NPC target");
+		c->Message(Chat::White, "Usage: #npcsay message (requires NPC target");
 	}
 }
 
@@ -7219,13 +7744,13 @@ void command_npcshout(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Usage: #npcshout message (requires NPC target");
+		c->Message(Chat::White, "Usage: #npcshout message (requires NPC target");
 	}
 }
 
 void command_timers(Client *c, const Seperator *sep) {
 	if(!c->GetTarget() || !c->GetTarget()->IsClient()) {
-		c->Message(0,"Need a player target for timers.");
+		c->Message(Chat::White,"Need a player target for timers.");
 		return;
 	}
 	Client *them = c->GetTarget()->CastToClient();
@@ -7233,12 +7758,12 @@ void command_timers(Client *c, const Seperator *sep) {
 	std::vector< std::pair<pTimerType, PersistentTimer *> > res;
 	them->GetPTimers().ToVector(res);
 
-	c->Message(0,"Timers for target:");
+	c->Message(Chat::White,"Timers for target:");
 
 	int r;
 	int l = res.size();
 	for(r = 0; r < l; r++) {
-		c->Message(0,"Timer %d: %d seconds remain.",  res[r].first, res[r].second->GetRemainingTime());
+		c->Message(Chat::White,"Timer %d: %d seconds remain.",  res[r].first, res[r].second->GetRemainingTime());
 	}
 }
 
@@ -7250,595 +7775,784 @@ void command_npcemote(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Usage: #npcemote message (requires NPC target");
+		c->Message(Chat::White, "Usage: #npcemote message (requires NPC target");
+	}
+}
+
+void command_npceditmass(Client *c, const Seperator *sep)
+{
+	if (strcasecmp(sep->arg[1], "usage") == 0) {
+		c->Message(Chat::White, "#npceditmass search_column [exact_match: =]search_value change_column change_value");
+		return;
+	}
+	
+	std::string query = SQL(
+		SELECT
+				COLUMN_NAME
+		FROM
+		INFORMATION_SCHEMA.COLUMNS
+		WHERE
+			table_name = 'npc_types'
+		AND
+		COLUMN_NAME != 'id'
+	);
+
+	std::string search_column, search_value, change_column, change_value;
+	if (sep->arg[1]) {
+		search_column = sep->arg[1];
+	}
+	if (sep->arg[2]) {
+		search_value = sep->arg[2];
+	}
+	if (sep->arg[3]) {
+		change_column = sep->arg[3];
+	}
+	if (sep->arg[4]) {
+		change_value = sep->arg[4];
+	}
+
+	bool valid_change_column = false;
+	bool valid_search_column = false;
+	auto results             = database.QueryDatabase(query);
+
+	std::vector <std::string> possible_column_options;
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		if (row[0] == change_column) {
+			valid_change_column = true;
+		}
+		if (row[0] == search_column) {
+			valid_search_column = true;
+		}
+
+		possible_column_options.push_back(row[0]);
+	}
+
+	std::string options_glue = ", ";
+
+	if (!valid_search_column) {
+		c->Message(Chat::Red, "You must specify a valid search column. [%s] is not valid", search_column.c_str());
+		c->Message(Chat::Yellow, "Possible columns [%s]", implode(options_glue, possible_column_options).c_str());
+		return;
+	}
+
+	if (!valid_change_column) {
+		c->Message(Chat::Red, "You must specify a valid change column. [%s] is not valid", change_column.c_str());
+		c->Message(Chat::Yellow, "Possible columns [%s]", implode(options_glue, possible_column_options).c_str());
+		return;
+	}
+
+	if (!valid_search_column || !valid_change_column) {
+		c->Message(Chat::Red, "One requested column is invalid");
+		return;
+	}
+
+	query = fmt::format(
+		SQL(
+			select
+			id,
+			name,
+			{0},
+			{1}
+				from
+				npc_types
+				where
+				id IN(
+					select
+				spawnentry.npcID
+				from
+					spawnentry
+				join spawn2 on spawn2.spawngroupID = spawnentry.spawngroupID
+				where
+				spawn2.zone = '{2}' and spawn2.version = {3}
+			)
+		),
+		search_column,
+		change_column,
+		zone->GetShortName(),
+		zone->GetInstanceVersion()
+	);
+
+	std::string status = "(Searching)";
+
+	if (strcasecmp(sep->arg[5], "apply") == 0) {
+		status = "(Applying)";
+	}
+
+	std::vector <std::string> npc_ids;
+
+	bool exact_match = false;
+	if (search_value[0] == '=') {
+		exact_match = true;
+		search_value = search_value.substr(1);
+	}
+
+	int found_count = 0;
+	results = database.QueryDatabase(query);
+	for (auto row = results.begin(); row != results.end(); ++row) {
+
+		std::string npc_id                      = row[0];
+		std::string npc_name                    = row[1];
+		std::string search_column_value         = str_tolower(row[2]);
+		std::string change_column_current_value = row[3];
+
+		if (exact_match) {
+			if (search_column_value.compare(search_value) != 0) {
+				continue;
+			}
+		}
+		else {
+			if (search_column_value.find(search_value) == std::string::npos) {
+				continue;
+			}
+		}
+		
+		c->Message(
+			Chat::Yellow,
+			fmt::format(
+				"NPC ({0}) [{1}] ({2}) [{3}] Current ({4}) [{5}] New [{6}] {7}",
+				npc_id,
+				npc_name,
+				search_column,
+				search_column_value,
+				change_column,
+				change_column_current_value,
+				change_value,
+				status
+			).c_str()
+		);
+
+		npc_ids.push_back(npc_id);
+
+		found_count++;
+	}
+
+	std::string saylink = fmt::format(
+		"#npceditmass {} {}{} {} {} apply",
+		search_column,
+		(exact_match ? '=' : '\0'),
+		search_value,
+		change_column,
+		change_value
+	);
+
+	if (strcasecmp(sep->arg[5], "apply") == 0) {
+		std::string npc_ids_string = implode(",", npc_ids);
+		if (npc_ids_string.empty()) {
+			c->Message(Chat::Red, "Error: Ran into an unknown error compiling NPC IDs");
+			return;
+		}
+
+		database.QueryDatabase(
+			fmt::format(
+				"UPDATE `npc_types` SET {} = '{}' WHERE id IN ({})",
+				change_column,
+				change_value,
+				npc_ids_string
+			)
+		);
+
+		c->Message(Chat::Yellow, "Changes applied to (%i) NPC's", found_count);
+		zone->Repop();
+	}
+	else {
+		c->Message(Chat::Yellow, "Found (%i) NPC's that match this search...", found_count);
+
+		if (found_count > 0) {
+			c->Message(
+				Chat::Yellow, "To apply these changes, click <%s> or type [%s]",
+				EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(),
+				saylink.c_str()
+			);
+		}
 	}
 }
 
 void command_npcedit(Client *c, const Seperator *sep)
 {	if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
-		c->Message(0, "Error: Must have NPC targeted");
+		c->Message(Chat::White, "Error: Must have NPC targeted");
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "help") == 0) {
 
-		c->Message(0, "Help File for #npcedit. Syntax for commands are:");
-		c->Message(0, "#npcedit Name - Sets an NPC's name");
-		c->Message(0, "#npcedit Lastname - Sets an NPC's lastname");
-		c->Message(0, "#npcedit Level - Sets an NPC's level");
-		c->Message(0, "#npcedit Maxlevel - Sets an NPC's maximum level");
-		c->Message(0, "#npcedit Race - Sets an NPC's race");
-		c->Message(0, "#npcedit Class - Sets an NPC's class");
-		c->Message(0, "#npcedit Bodytype - Sets an NPC's bodytype");
-		c->Message(0, "#npcedit HP - Sets an NPC's hitpoints");
-		c->Message(0, "#npcedit Gender - Sets an NPC's gender");
-		c->Message(0, "#npcedit Texture - Sets an NPC's texture");
-		c->Message(0, "#npcedit Helmtexture - Sets an NPC's helmet texture");
-		c->Message(0, "#npcedit Armtexture - Sets an NPC's arm texture");
-		c->Message(0, "#npcedit Bracertexture - Sets an NPC's bracer texture");
-		c->Message(0, "#npcedit Handtexture - Sets an NPC's hand texture");
-		c->Message(0, "#npcedit Legtexture - Sets an NPC's leg texture");
-		c->Message(0, "#npcedit Feettexture - Sets an NPC's feettexture");
-		c->Message(0, "#npcedit Herosforgemodel - Sets an NPC's Hero's Forge Model");
-		c->Message(0, "#npcedit Size - Sets an NPC's size");
-		c->Message(0, "#npcedit Hpregen - Sets an NPC's hitpoint regen rate per tick");
-		c->Message(0, "#npcedit Manaregen - Sets an NPC's mana regen rate per tick");
-		c->Message(0, "#npcedit Loottable - Sets the loottable ID for an NPC ");
-		c->Message(0, "#npcedit Merchantid - Sets the merchant ID for an NPC");
-		c->Message(0, "#npcedit alt_currency_id - Sets the Alternate Currency ID for an alterative currency Merchant");
-		c->Message(0, "#npcedit npc_spells_effects_id - Sets the NPC Spell Effects ID");
-		c->Message(0, "#npcedit adventure_template_id - Sets the NPC's Adventure Template ID");
-		c->Message(0, "#npcedit trap_template - Sets the NPC's Trap Template ID");
-		c->Message(0, "#npcedit special_abilities - Sets the NPC's Special Abilities");
-		c->Message(0, "#npcedit Spell - Sets the npc spells list ID for an NPC");
-		c->Message(0, "#npcedit Faction - Sets the NPC's faction id");
-		c->Message(0, "#npcedit Damage - Sets an NPC's damage");
-		c->Message(0, "#npcedit Meleetype - Sets an NPC's melee types");
-		c->Message(0, "#npcedit Rangedtype - Sets an NPC's ranged type");
-		c->Message(0, "#npcedit Ammoidfile - Sets an NPC's ammo id file");
-		c->Message(0, "#npcedit Aggroradius - Sets an NPC's aggro radius");
-		c->Message(0, "#npcedit Assistradius - Sets an NPC's assist radius");
-		c->Message(0, "#npcedit Social - Set to 1 if an NPC should assist others on its faction");
-		c->Message(0, "#npcedit Runspeed - Sets an NPC's run speed");
-		c->Message(0, "#npcedit Walkspeed - Sets an NPC's walk speed");
-		c->Message(0, "#npcedit AGI - Sets an NPC's Agility");
-		c->Message(0, "#npcedit CHA - Sets an NPC's Charisma");
-		c->Message(0, "#npcedit DEX - Sets an NPC's Dexterity");
-		c->Message(0, "#npcedit INT - Sets an NPC's Intelligence");
-		c->Message(0, "#npcedit STA - Sets an NPC's Stamina");
-		c->Message(0, "#npcedit STR - Sets an NPC's Strength");
-		c->Message(0, "#npcedit WIS - Sets an NPC's Wisdom");
-		c->Message(0, "#npcedit MR - Sets an NPC's Magic Resistance");
-		c->Message(0, "#npcedit PR - Sets an NPC's Poison Resistance");
-		c->Message(0, "#npcedit DR - Sets an NPC's Disease Resistance");
-		c->Message(0, "#npcedit FR - Sets an NPC's Fire Resistance");
-		c->Message(0, "#npcedit CR - Sets an NPC's Cold Resistance");
-		c->Message(0, "#npcedit Corrup - Sets an NPC's Corruption Resistance");
-		c->Message(0, "#npcedit PhR - Sets and NPC's Physical Resistance");
-		c->Message(0, "#npcedit Seeinvis - Sets an NPC's ability to see invis");
-		c->Message(0, "#npcedit Seeinvisundead - Sets an NPC's ability to see through invis vs. undead");
-		c->Message(0, "#npcedit Seehide - Sets an NPC's ability to see through hide");
-		c->Message(0, "#npcedit Seeimprovedhide - Sets an NPC's ability to see through improved hide");
-		c->Message(0, "#npcedit AC - Sets an NPC's Armor Class");
-		c->Message(0, "#npcedit ATK - Sets an NPC's Attack");
-		c->Message(0, "#npcedit Accuracy - Sets an NPC's Accuracy");
-		c->Message(0, "#npcedit Avoidance - Sets an NPC's Avoidance");
-		c->Message(0, "#npcedit npcaggro - Sets an NPC's npc_aggro flag");
-		c->Message(0, "#npcedit qglobal - Sets an NPC's quest global flag");
-		c->Message(0, "#npcedit spawn_limit - Sets an NPC's spawn limit counter");
-		c->Message(0, "#npcedit Attackspeed - Sets an NPC's attack speed modifier");
-		c->Message(0, "#npcedit Attackdelay - Sets an NPC's attack delay");
-		c->Message(0, "#npcedit Attackcount - Sets an NPC's attack count");
-		c->Message(0, "#npcedit findable - Sets an NPC's findable flag");
-		c->Message(0, "#npcedit trackable - Sets an NPC's trackable flag");
-		c->Message(0, "#npcedit weapon - Sets an NPC's primary and secondary weapon model");
-		c->Message(0, "#npcedit featuresave - Saves all current facial features to the database");
-		c->Message(0, "#npcedit color - Sets an NPC's red, green, and blue armor tint");
-		c->Message(0, "#npcedit armortint_id - Set an NPC's Armor tint ID");
-		c->Message(0, "#npcedit setanimation - Set an NPC's animation on spawn (Stored in spawn2 table)");
-		c->Message(0, "#npcedit scalerate - Set an NPC's scaling rate");
-		c->Message(0, "#npcedit healscale - Set an NPC's heal scaling rate");
-		c->Message(0, "#npcedit spellscale - Set an NPC's spell scaling rate");
-		c->Message(0, "#npcedit no_target - Set an NPC's ability to be targeted with the target hotkey");
-		c->Message(0, "#npcedit version - Set an NPC's version");
-		c->Message(0, "#npcedit slow_mitigation - Set an NPC's slow mitigation");
-		c->Message(0, "#npcedit flymode - Set an NPC's flymode [0 = ground, 1 = flying, 2 = levitate, 3 = water, 4 = floating]");
+		c->Message(Chat::White, "Help File for #npcedit. Syntax for commands are:");
+		c->Message(Chat::White, "#npcedit Name - Sets an NPC's name");
+		c->Message(Chat::White, "#npcedit Lastname - Sets an NPC's lastname");
+		c->Message(Chat::White, "#npcedit Level - Sets an NPC's level");
+		c->Message(Chat::White, "#npcedit Maxlevel - Sets an NPC's maximum level");
+		c->Message(Chat::White, "#npcedit Race - Sets an NPC's race");
+		c->Message(Chat::White, "#npcedit Class - Sets an NPC's class");
+		c->Message(Chat::White, "#npcedit Bodytype - Sets an NPC's bodytype");
+		c->Message(Chat::White, "#npcedit HP - Sets an NPC's hitpoints");
+		c->Message(Chat::White, "#npcedit Gender - Sets an NPC's gender");
+		c->Message(Chat::White, "#npcedit Texture - Sets an NPC's texture");
+		c->Message(Chat::White, "#npcedit Helmtexture - Sets an NPC's helmet texture");
+		c->Message(Chat::White, "#npcedit Armtexture - Sets an NPC's arm texture");
+		c->Message(Chat::White, "#npcedit Bracertexture - Sets an NPC's bracer texture");
+		c->Message(Chat::White, "#npcedit Handtexture - Sets an NPC's hand texture");
+		c->Message(Chat::White, "#npcedit Legtexture - Sets an NPC's leg texture");
+		c->Message(Chat::White, "#npcedit Feettexture - Sets an NPC's feettexture");
+		c->Message(Chat::White, "#npcedit Herosforgemodel - Sets an NPC's Hero's Forge Model");
+		c->Message(Chat::White, "#npcedit Size - Sets an NPC's size");
+		c->Message(Chat::White, "#npcedit Hpregen - Sets an NPC's hitpoint regen rate per tick");
+		c->Message(Chat::White, "#npcedit Manaregen - Sets an NPC's mana regen rate per tick");
+		c->Message(Chat::White, "#npcedit Loottable - Sets the loottable ID for an NPC ");
+		c->Message(Chat::White, "#npcedit Merchantid - Sets the merchant ID for an NPC");
+		c->Message(Chat::White, "#npcedit alt_currency_id - Sets the Alternate Currency ID for an alterative currency Merchant");
+		c->Message(Chat::White, "#npcedit npc_spells_effects_id - Sets the NPC Spell Effects ID");
+		c->Message(Chat::White, "#npcedit adventure_template_id - Sets the NPC's Adventure Template ID");
+		c->Message(Chat::White, "#npcedit trap_template - Sets the NPC's Trap Template ID");
+		c->Message(Chat::White, "#npcedit special_abilities - Sets the NPC's Special Abilities");
+		c->Message(Chat::White, "#npcedit Spell - Sets the npc spells list ID for an NPC");
+		c->Message(Chat::White, "#npcedit Faction - Sets the NPC's faction id");
+		c->Message(Chat::White, "#npcedit Damage - Sets an NPC's damage");
+		c->Message(Chat::White, "#npcedit Meleetype - Sets an NPC's melee types");
+		c->Message(Chat::White, "#npcedit Rangedtype - Sets an NPC's ranged type");
+		c->Message(Chat::White, "#npcedit Ammoidfile - Sets an NPC's ammo id file");
+		c->Message(Chat::White, "#npcedit Aggroradius - Sets an NPC's aggro radius");
+		c->Message(Chat::White, "#npcedit Assistradius - Sets an NPC's assist radius");
+		c->Message(Chat::White, "#npcedit Social - Set to 1 if an NPC should assist others on its faction");
+		c->Message(Chat::White, "#npcedit Runspeed - Sets an NPC's run speed");
+		c->Message(Chat::White, "#npcedit Walkspeed - Sets an NPC's walk speed");
+		c->Message(Chat::White, "#npcedit AGI - Sets an NPC's Agility");
+		c->Message(Chat::White, "#npcedit CHA - Sets an NPC's Charisma");
+		c->Message(Chat::White, "#npcedit DEX - Sets an NPC's Dexterity");
+		c->Message(Chat::White, "#npcedit INT - Sets an NPC's Intelligence");
+		c->Message(Chat::White, "#npcedit STA - Sets an NPC's Stamina");
+		c->Message(Chat::White, "#npcedit STR - Sets an NPC's Strength");
+		c->Message(Chat::White, "#npcedit WIS - Sets an NPC's Wisdom");
+		c->Message(Chat::White, "#npcedit MR - Sets an NPC's Magic Resistance");
+		c->Message(Chat::White, "#npcedit PR - Sets an NPC's Poison Resistance");
+		c->Message(Chat::White, "#npcedit DR - Sets an NPC's Disease Resistance");
+		c->Message(Chat::White, "#npcedit FR - Sets an NPC's Fire Resistance");
+		c->Message(Chat::White, "#npcedit CR - Sets an NPC's Cold Resistance");
+		c->Message(Chat::White, "#npcedit Corrup - Sets an NPC's Corruption Resistance");
+		c->Message(Chat::White, "#npcedit PhR - Sets and NPC's Physical Resistance");
+		c->Message(Chat::White, "#npcedit Seeinvis - Sets an NPC's ability to see invis");
+		c->Message(Chat::White, "#npcedit Seeinvisundead - Sets an NPC's ability to see through invis vs. undead");
+		c->Message(Chat::White, "#npcedit Seehide - Sets an NPC's ability to see through hide");
+		c->Message(Chat::White, "#npcedit Seeimprovedhide - Sets an NPC's ability to see through improved hide");
+		c->Message(Chat::White, "#npcedit AC - Sets an NPC's Armor Class");
+		c->Message(Chat::White, "#npcedit ATK - Sets an NPC's Attack");
+		c->Message(Chat::White, "#npcedit Accuracy - Sets an NPC's Accuracy");
+		c->Message(Chat::White, "#npcedit Avoidance - Sets an NPC's Avoidance");
+		c->Message(Chat::White, "#npcedit npcaggro - Sets an NPC's npc_aggro flag");
+		c->Message(Chat::White, "#npcedit qglobal - Sets an NPC's quest global flag");
+		c->Message(Chat::White, "#npcedit spawn_limit - Sets an NPC's spawn limit counter");
+		c->Message(Chat::White, "#npcedit Attackspeed - Sets an NPC's attack speed modifier");
+		c->Message(Chat::White, "#npcedit Attackdelay - Sets an NPC's attack delay");
+		c->Message(Chat::White, "#npcedit Attackcount - Sets an NPC's attack count");
+		c->Message(Chat::White, "#npcedit findable - Sets an NPC's findable flag");
+		c->Message(Chat::White, "#npcedit trackable - Sets an NPC's trackable flag");
+		c->Message(Chat::White, "#npcedit weapon - Sets an NPC's primary and secondary weapon model");
+		c->Message(Chat::White, "#npcedit featuresave - Saves all current facial features to the database");
+		c->Message(Chat::White, "#npcedit color - Sets an NPC's red, green, and blue armor tint");
+		c->Message(Chat::White, "#npcedit armortint_id - Set an NPC's Armor tint ID");
+		c->Message(Chat::White, "#npcedit setanimation - Set an NPC's animation on spawn (Stored in spawn2 table)");
+		c->Message(Chat::White, "#npcedit scalerate - Set an NPC's scaling rate");
+		c->Message(Chat::White, "#npcedit healscale - Set an NPC's heal scaling rate");
+		c->Message(Chat::White, "#npcedit spellscale - Set an NPC's spell scaling rate");
+		c->Message(Chat::White, "#npcedit no_target - Set an NPC's ability to be targeted with the target hotkey");
+		c->Message(Chat::White, "#npcedit version - Set an NPC's version");
+		c->Message(Chat::White, "#npcedit slow_mitigation - Set an NPC's slow mitigation");
+		c->Message(Chat::White, "#npcedit flymode - Set an NPC's flymode [0 = ground, 1 = flying, 2 = levitate, 3 = water, 4 = floating]");
 
 	}
 
 	uint32 npcTypeID = c->GetTarget()->CastToNPC()->GetNPCTypeID();
 	if (strcasecmp(sep->arg[1], "name") == 0) {
-        c->Message(15,"NPCID %u now has the name %s.", npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has the name %s.", npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET name = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "lastname") == 0) {
-        c->Message(15,"NPCID %u now has the lastname %s.", npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has the lastname %s.", npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET lastname = '%s' WHERE id = %i", sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "flymode") == 0) {
-        c->Message(15,"NPCID %u now has flymode [%s]", npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has flymode [%s]", npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET flymode = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "race") == 0) {
-        c->Message(15,"NPCID %u now has the race %i.", npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has the race %i.", npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET race = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "class") == 0) {
-        c->Message(15,"NPCID %u is now class %i.", npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now class %i.", npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET class = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "bodytype") == 0) {
-        c->Message(15,"NPCID %u now has type %i bodytype.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has type %i bodytype.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET bodytype = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "hp") == 0) {
-        c->Message(15,"NPCID %u now has %i Hitpoints.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Hitpoints.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET hp = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "gender") == 0) {
-        c->Message(15,"NPCID %u is now gender %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now gender %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET gender = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "texture") == 0) {
-        c->Message(15,"NPCID %u now uses texture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses texture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET texture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "helmtexture") == 0) {
-        c->Message(15,"NPCID %u now uses helmtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses helmtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET helmtexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "armtexture") == 0) {
-        c->Message(15,"NPCID %u now uses armtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses armtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET armtexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "bracertexture") == 0) {
-        c->Message(15,"NPCID %u now uses bracertexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses bracertexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET bracertexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "handtexture") == 0) {
-        c->Message(15,"NPCID %u now uses handtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses handtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET handtexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "legtexture") == 0) {
-        c->Message(15,"NPCID %u now uses legtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses legtexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET legtexture = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "feettexture") == 0) {
-        c->Message(15,"NPCID %u now uses feettexture %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses feettexture %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET feettexture = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "herosforgemodel") == 0) {
-        c->Message(15,"NPCID %u now uses herosforgemodel %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses herosforgemodel %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET herosforgemodel = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "size") == 0) {
-        c->Message(15,"NPCID %u is now size %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now size %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET size = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "hpregen") == 0) {
-        c->Message(15,"NPCID %u now regens %i hitpoints per tick.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now regens %i hitpoints per tick.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET hp_regen_rate = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "manaregen") == 0) {
-        c->Message(15,"NPCID %u now regens %i mana per tick.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now regens %i mana per tick.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET mana_regen_rate = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
     if (strcasecmp(sep->arg[1], "loottable") == 0) {
-        c->Message(15,"NPCID %u is now on loottable_id %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now on loottable_id %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET loottable_id = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "merchantid") == 0) {
-        c->Message(15,"NPCID %u is now merchant_id %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now merchant_id %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET merchant_id = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "alt_currency_id") == 0) {
-        c->Message(15,"NPCID %u now has field 'alt_currency_id' set to %s.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has field 'alt_currency_id' set to %s.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET alt_currency_id = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "npc_spells_effects_id") == 0) {
-        c->Message(15,"NPCID %u now has field 'npc_spells_effects_id' set to %s.",  npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'npc_spells_effects_id' set to %s.",  npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET npc_spells_effects_id = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "adventure_template_id") == 0) {
-        c->Message(15,"NPCID %u now has field 'adventure_template_id' set to %s.",  npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'adventure_template_id' set to %s.",  npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET adventure_template_id = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "trap_template") == 0) {
-        c->Message(15,"NPCID %u now has field 'trap_template' set to %s.",  npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'trap_template' set to %s.",  npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET trap_template = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "special_abilities") == 0) {
-        c->Message(15,"NPCID %u now has field 'special_abilities' set to %s.",  npcTypeID, sep->argplus[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'special_abilities' set to %s.",  npcTypeID, sep->argplus[2]);
 		std::string query = StringFormat("UPDATE npc_types SET special_abilities = '%s' WHERE id = %i",  sep->argplus[2],npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "spell") == 0) {
-        c->Message(15,"NPCID %u now uses spell list %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now uses spell list %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET npc_spells_id = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "faction") == 0) {
-        c->Message(15,"NPCID %u is now faction %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now faction %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET npc_faction_id = %i WHERE id = %i",  atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "damage") == 0) {
-        c->Message(15,"NPCID %u now hits from %i to %i",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
+        c->Message(Chat::Yellow,"NPCID %u now hits from %i to %i",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
 		std::string query = StringFormat("UPDATE npc_types SET mindmg = %i, maxdmg = %i WHERE id = %i",  atoi(sep->arg[2]), atoi(sep->arg[3]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "meleetype") == 0) {
-        c->Message(15,"NPCID %u now has a primary melee type of %i and a secondary melee type of %i.",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
+        c->Message(Chat::Yellow,"NPCID %u now has a primary melee type of %i and a secondary melee type of %i.",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
 		std::string query = StringFormat("UPDATE npc_types SET prim_melee_type = %i, sec_melee_type = %i WHERE id = %i",  atoi(sep->arg[2]), atoi(sep->arg[3]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "rangedtype") == 0) {
-        c->Message(15,"NPCID %u now has a ranged type of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a ranged type of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET ranged_type = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "ammoidfile") == 0) {
-        c->Message(15,"NPCID %u's ammo id file is now %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u's ammo id file is now %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET ammoidfile = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "aggroradius") == 0) {
-        c->Message(15,"NPCID %u now has an aggro radius of %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has an aggro radius of %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET aggroradius = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "assistradius") == 0) {
-        c->Message(15,"NPCID %u now has an assist radius of %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has an assist radius of %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET assistradius = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "social") == 0) {
-        c->Message(15,"NPCID %u social status is now %i",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u social status is now %i",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET social = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "runspeed") == 0) {
-        c->Message(15,"NPCID %u now runs at %f",  npcTypeID, atof(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now runs at %f",  npcTypeID, atof(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET runspeed = %f WHERE id = %i",  atof(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "walkspeed") == 0) {
-        c->Message(15,"NPCID %u now walks at %f",  npcTypeID, atof(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now walks at %f",  npcTypeID, atof(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET walkspeed = %f WHERE id = %i",  atof(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "AGI") == 0) {
-        c->Message(15,"NPCID %u now has %i Agility.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Agility.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET AGI = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "CHA") == 0) {
-        c->Message(15,"NPCID %u now has %i Charisma.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Charisma.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET CHA = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "DEX") == 0) {
-        c->Message(15,"NPCID %u now has %i Dexterity.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Dexterity.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET DEX = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "INT") == 0) {
-        c->Message(15,"NPCID %u now has %i Intelligence.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Intelligence.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET _INT = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "STA") == 0) {
-        c->Message(15,"NPCID %u now has %i Stamina.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Stamina.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET STA = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "STR") == 0) {
-        c->Message(15,"NPCID %u now has %i Strength.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Strength.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET STR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "WIS") == 0) {
-        c->Message(15,"NPCID %u now has a Magic Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Magic Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET WIS = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "MR") == 0) {
-        c->Message(15,"NPCID %u now has a Magic Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Magic Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET MR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "DR") == 0) {
-        c->Message(15,"NPCID %u now has a Disease Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Disease Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET DR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "CR") == 0) {
-        c->Message(15,"NPCID %u now has a Cold Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Cold Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET CR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
     if (strcasecmp(sep->arg[1], "FR") == 0) {
-        c->Message(15,"NPCID %u now has a Fire Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Fire Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET FR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
     if (strcasecmp(sep->arg[1], "PR") == 0) {
-        c->Message(15,"NPCID %u now has a Poison Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Poison Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET PR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Corrup") == 0) {
-        c->Message(15,"NPCID %u now has a Corruption Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Corruption Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET corrup = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "PhR") == 0) {
-        c->Message(15,"NPCID %u now has a Physical Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a Physical Resistance of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET PhR = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "seeinvis") == 0) {
-        c->Message(15,"NPCID %u now has seeinvis set to %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has seeinvis set to %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET see_invis = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "seeinvisundead") == 0) {
-        c->Message(15,"NPCID %u now has seeinvisundead set to %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has seeinvisundead set to %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET see_invis_undead = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "seehide") == 0) {
-        c->Message(15,"NPCID %u now has seehide set to %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has seehide set to %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET see_hide = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "seeimprovedhide") == 0) {
-        c->Message(15,"NPCID %u now has seeimprovedhide set to %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has seeimprovedhide set to %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET see_improved_hide = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "AC") == 0) {
-        c->Message(15,"NPCID %u now has %i Armor Class.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Armor Class.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET ac = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "ATK") == 0) {
-        c->Message(15,"NPCID %u now has %i Attack.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Attack.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET atk = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Accuracy") == 0) {
-        c->Message(15,"NPCID %u now has %i Accuracy.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Accuracy.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET accuracy = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Avoidance") == 0) {
-        c->Message(15,"NPCID %u now has %i Avoidance.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i Avoidance.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET avoidance = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "level") == 0) {
-        c->Message(15,"NPCID %u is now level %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u is now level %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET level = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "maxlevel") == 0) {
-        c->Message(15,"NPCID %u now has a maximum level of %i.",  npcTypeID, atoi(sep->argplus[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a maximum level of %i.",  npcTypeID, atoi(sep->argplus[2]));
 		std::string query = StringFormat("UPDATE npc_types SET maxlevel = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "qglobal") == 0) {
-        c->Message(15,"Quest globals have been %s for NPCID %u",  atoi(sep->arg[2]) == 0 ? "disabled" : "enabled",  npcTypeID);
+        c->Message(Chat::Yellow,"Quest globals have been %s for NPCID %u",  atoi(sep->arg[2]) == 0 ? "disabled" : "enabled",  npcTypeID);
 		std::string query = StringFormat("UPDATE npc_types SET qglobal = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "npcaggro") == 0) {
-        c->Message(15,"NPCID %u will now %s other NPCs with negative faction npc_value",  npcTypeID, atoi(sep->arg[2]) == 0? "not aggro": "aggro");
+        c->Message(Chat::Yellow,"NPCID %u will now %s other NPCs with negative faction npc_value",  npcTypeID, atoi(sep->arg[2]) == 0? "not aggro": "aggro");
 		std::string query = StringFormat("UPDATE npc_types SET npc_aggro = %i WHERE id = %i",  atoi(sep->argplus[2]) == 0? 0: 1, npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "spawn_limit") == 0) {
-        c->Message(15,"NPCID %u now has a spawn limit of %i",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a spawn limit of %i",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET spawn_limit = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Attackspeed") == 0) {
-        c->Message(15,"NPCID %u now has attack_speed set to %f",  npcTypeID, atof(sep->arg[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has attack_speed set to %f",  npcTypeID, atof(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET attack_speed = %f WHERE id = %i",  atof(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Attackdelay") == 0) {
-		c->Message(15,"NPCID %u now has attack_delay set to %i", npcTypeID,atoi(sep->arg[2]));
+		c->Message(Chat::Yellow,"NPCID %u now has attack_delay set to %i", npcTypeID,atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET attack_delay = %i WHERE id = %i", atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "Attackcount") == 0) {
-		c->Message(15,"NPCID %u now has attack_count set to %i", npcTypeID,atoi(sep->arg[2]));
+		c->Message(Chat::Yellow,"NPCID %u now has attack_count set to %i", npcTypeID,atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET attack_count = %i WHERE id = %i", atoi(sep->argplus[2]),npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "findable") == 0) {
-        c->Message(15,"NPCID %u is now %s",  npcTypeID, atoi(sep->arg[2]) == 0? "not findable": "findable");
+        c->Message(Chat::Yellow,"NPCID %u is now %s",  npcTypeID, atoi(sep->arg[2]) == 0? "not findable": "findable");
 		std::string query = StringFormat("UPDATE npc_types SET findable = %i WHERE id = %i",  atoi(sep->argplus[2]) == 0? 0: 1, npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "trackable") == 0) {
-        c->Message(15,"NPCID %u is now %s",  npcTypeID, atoi(sep->arg[2]) == 0? "not trackable": "trackable");
+        c->Message(Chat::Yellow,"NPCID %u is now %s",  npcTypeID, atoi(sep->arg[2]) == 0? "not trackable": "trackable");
 		std::string query = StringFormat("UPDATE npc_types SET trackable = %i WHERE id = %i",  atoi(sep->argplus[2]) == 0? 0: 1, npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "weapon") == 0) {
-        c->Message(15,"NPCID %u will have item graphic %i set to his primary and item graphic %i set to his secondary on repop.",   npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
+        c->Message(Chat::Yellow,"NPCID %u will have item graphic %i set to his primary and item graphic %i set to his secondary on repop.",   npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]));
 		std::string query = StringFormat("UPDATE npc_types SET d_melee_texture1 = %i, d_melee_texture2 = %i WHERE id = %i",  atoi(sep->arg[2]), atoi(sep->arg[3]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "featuresave") == 0) {
-        c->Message(15,"NPCID %u saved with all current facial feature settings",  npcTypeID);
+        c->Message(Chat::Yellow,"NPCID %u saved with all current facial feature settings",  npcTypeID);
         Mob* target = c->GetTarget();
 		std::string query = StringFormat("UPDATE npc_types "
                                         "SET luclin_haircolor = %i, luclin_beardcolor = %i, "
@@ -7856,14 +8570,14 @@ void command_npcedit(Client *c, const Seperator *sep)
 	}
 
 	if (strcasecmp(sep->arg[1], "color") == 0) {
-        c->Message(15,"NPCID %u now has %i red, %i green, and %i blue tinting on their armor.",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
+        c->Message(Chat::Yellow,"NPCID %u now has %i red, %i green, and %i blue tinting on their armor.",  npcTypeID, atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
 		std::string query = StringFormat("UPDATE npc_types SET armortint_red = %i, armortint_green = %i, armortint_blue = %i WHERE id = %i",  atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "armortint_id") == 0) {
-        c->Message(15,"NPCID %u now has field 'armortint_id' set to %s",  npcTypeID, sep->arg[2]);
+        c->Message(Chat::Yellow,"NPCID %u now has field 'armortint_id' set to %s",  npcTypeID, sep->arg[2]);
 		std::string query = StringFormat("UPDATE npc_types SET armortint_id = '%s' WHERE id = %i",  sep->argplus[2], npcTypeID);
 		database.QueryDatabase(query);
 		return;
@@ -7883,14 +8597,16 @@ void command_npcedit(Client *c, const Seperator *sep)
 			if((strcasecmp(sep->arg[2], "loot" ) == 0) || atoi(sep->arg[2]) == 4)
 				animation = 4; //Looting Animation
 		} else {
-			c->Message(0, "You must specifiy an animation stand, sit, crouch, dead, loot (0-4)");
-			c->Message(0, "Example: #npcedit setanimation sit");
-			c->Message(0, "Example: #npcedit setanimation 0");
+			c->Message(Chat::White, "You must specifiy an animation stand, sit, crouch, dead, loot (0-4)");
+			c->Message(Chat::White, "Example: #npcedit setanimation sit");
+			c->Message(Chat::White, "Example: #npcedit setanimation 0");
 			return;
 		}
 
-		c->Message(15,"NPCID %u now has the animation set to %i on spawn with spawngroup %i",  npcTypeID, animation, c->GetTarget()->CastToNPC()->GetSp2() );
-		std::string query = StringFormat("UPDATE spawn2 SET animation = %i " "WHERE spawngroupID = %i",  animation, c->GetTarget()->CastToNPC()->GetSp2());
+		c->Message(Chat::Yellow,"NPCID %u now has the animation set to %i on spawn with spawngroup %i",  npcTypeID, animation,
+				   c->GetTarget()->CastToNPC()->GetSpawnGroupId() );
+		std::string query = StringFormat("UPDATE spawn2 SET animation = %i " "WHERE spawngroupID = %i",  animation,
+										 c->GetTarget()->CastToNPC()->GetSpawnGroupId());
 		database.QueryDatabase(query);
 
 		c->GetTarget()->SetAppearance(EmuAppearance(animation));
@@ -7898,49 +8614,49 @@ void command_npcedit(Client *c, const Seperator *sep)
 	}
 
 	if (strcasecmp(sep->arg[1], "scalerate") == 0) {
-        c->Message(15,"NPCID %u now has a scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow,"NPCID %u now has a scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET scalerate = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "healscale") == 0) {
-        c->Message(15, "NPCID %u now has a heal scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow, "NPCID %u now has a heal scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET healscale = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "spellscale") == 0) {
-        c->Message(15, "NPCID %u now has a spell scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow, "NPCID %u now has a spell scaling rate of %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET spellscale = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "no_target") == 0) {
-        c->Message(15, "NPCID %u is now %s.",  npcTypeID, atoi(sep->arg[2]) == 0? "targetable": "untargetable");
+        c->Message(Chat::Yellow, "NPCID %u is now %s.",  npcTypeID, atoi(sep->arg[2]) == 0? "targetable": "untargetable");
 		std::string query = StringFormat("UPDATE npc_types SET no_target_hotkey = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "version") == 0) {
-        c->Message(15, "NPCID %u is now version %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow, "NPCID %u is now version %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET version = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "slow_mitigation") == 0) {
-        c->Message(15, "NPCID %u's slow mitigation limit is now %i.",  npcTypeID, atoi(sep->arg[2]));
+        c->Message(Chat::Yellow, "NPCID %u's slow mitigation limit is now %i.",  npcTypeID, atoi(sep->arg[2]));
 		std::string query = StringFormat("UPDATE npc_types SET slow_mitigation = %i WHERE id = %i",  atoi(sep->argplus[2]), npcTypeID);
 		database.QueryDatabase(query);
 		return;
 	}
 
 	if((sep->arg[1][0] == 0 || strcasecmp(sep->arg[1],"*")==0) || ((c->GetTarget()==0) || (c->GetTarget()->IsClient())))
-		c->Message(0, "Type #npcedit help for more info");
+		c->Message(Chat::White, "Type #npcedit help for more info");
 
 }
 
@@ -7967,21 +8683,21 @@ void command_profilereset(Client *c, const Seperator *sep) {
 void command_opcode(Client *c, const Seperator *sep) {
 	if(!strcasecmp(sep->arg[1], "reload" )) {
 		ReloadAllPatches();
-		c->Message(0, "Opcodes for all patches have been reloaded");
+		c->Message(Chat::White, "Opcodes for all patches have been reloaded");
 	}
 }
 
 void command_qglobal(Client *c, const Seperator *sep) {
 	//In-game switch for qglobal column
 	if(sep->arg[1][0] == 0) {
-		c->Message(0, "Syntax: #qglobal [on/off/view]. Requires NPC target.");
+		c->Message(Chat::White, "Syntax: #qglobal [on/off/view]. Requires NPC target.");
 		return;
 	}
 
 	Mob *target = c->GetTarget();
 
 	if(!target || !target->IsNPC()) {
-		c->Message(13, "NPC Target Required!");
+		c->Message(Chat::Red, "NPC Target Required!");
 		return;
 	}
 
@@ -7990,11 +8706,11 @@ void command_qglobal(Client *c, const Seperator *sep) {
                                         target->GetNPCTypeID());
         auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			c->Message(15, "Could not update database.");
+			c->Message(Chat::Yellow, "Could not update database.");
 			return;
 		}
 
-        c->Message(15, "Success! Changes take effect on zone reboot.");
+        c->Message(Chat::Yellow, "Success! Changes take effect on zone reboot.");
 		return;
 	}
 
@@ -8003,26 +8719,26 @@ void command_qglobal(Client *c, const Seperator *sep) {
                                         target->GetNPCTypeID());
         auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			c->Message(15, "Could not update database.");
+			c->Message(Chat::Yellow, "Could not update database.");
 			return;
 		}
 
-        c->Message(15, "Success! Changes take effect on zone reboot.");
+        c->Message(Chat::Yellow, "Success! Changes take effect on zone reboot.");
 		return;
 	}
 
 	if(!strcasecmp(sep->arg[1], "view")) {
 		const NPCType *type = database.LoadNPCTypesData(target->GetNPCTypeID());
 		if(!type)
-			c->Message(15, "Invalid NPC type.");
+			c->Message(Chat::Yellow, "Invalid NPC type.");
 		else if(type->qglobal)
-			c->Message(15, "This NPC has quest globals active.");
+			c->Message(Chat::Yellow, "This NPC has quest globals active.");
 		else
-			c->Message(15, "This NPC has quest globals disabled.");
+			c->Message(Chat::Yellow, "This NPC has quest globals disabled.");
 		return;
 	}
 
-    c->Message(15, "Invalid action specified.");
+    c->Message(Chat::Yellow, "Invalid action specified.");
 }
 
 void command_path(Client *c, const Seperator *sep)
@@ -8057,7 +8773,7 @@ void command_undye(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "ERROR: Client target required");
+		c->Message(Chat::White, "ERROR: Client target required");
 	}
 }
 
@@ -8065,8 +8781,8 @@ void command_ucs(Client *c, const Seperator *sep)
 {
 	if (!c)
 		return;
-	
-	Log(Logs::Detail, Logs::UCS_Server, "Character %s attempting ucs reconnect while ucs server is %savailable",
+
+	LogInfo("Character [{}] attempting ucs reconnect while ucs server is [{}] available",
 		c->GetName(), (zone->IsUCSServerAvailable() ? "" : "un"));
 
 	if (zone->IsUCSServerAvailable()) {
@@ -8149,7 +8865,7 @@ void command_undyeme(Client *c, const Seperator *sep)
 {
 	if(c) {
 		c->Undye();
-		c->Message(13, "Dye removed from all slots. Please zone for the process to complete.");
+		c->Message(Chat::Red, "Dye removed from all slots. Please zone for the process to complete.");
 	}
 }
 
@@ -8164,23 +8880,23 @@ void command_ginfo(Client *c, const Seperator *sep)
 
 	Group *g = t->GetGroup();
 	if(!g) {
-		c->Message(0, "This client is not in a group");
+		c->Message(Chat::White, "This client is not in a group");
 		return;
 	}
 
-	c->Message(0, "Player: %s is in Group #%lu: with %i members",  t->GetName(), (unsigned long)g->GetID(), g->GroupCount());
+	c->Message(Chat::White, "Player: %s is in Group #%lu: with %i members",  t->GetName(), (unsigned long)g->GetID(), g->GroupCount());
 
 	uint32 r;
 	for(r = 0; r < MAX_GROUP_MEMBERS; r++) {
 		if(g->members[r] == nullptr) {
 			if(g->membername[r][0] == '\0')
 				continue;
-			c->Message(0, "...Zoned Member: %s, Roles: %s %s %s",  g->membername[r],
+			c->Message(Chat::White, "...Zoned Member: %s, Roles: %s %s %s",  g->membername[r],
 				(g->MemberRoles[r] & RoleAssist) ? "Assist" : "",
 				(g->MemberRoles[r] & RoleTank) ? "Tank" : "",
 				(g->MemberRoles[r] & RolePuller) ? "Puller" : "");
 		} else {
-			c->Message(0, "...In-Zone Member: %s (0x%x) Roles: %s %s %s",  g->membername[r], g->members[r],
+			c->Message(Chat::White, "...In-Zone Member: %s (0x%x) Roles: %s %s %s",  g->membername[r], g->members[r],
 				(g->MemberRoles[r] & RoleAssist) ? "Assist" : "",
 				(g->MemberRoles[r] & RoleTank) ? "Tank" : "",
 				(g->MemberRoles[r] & RolePuller) ? "Puller" : "");
@@ -8198,12 +8914,12 @@ void command_hp(Client *c, const Seperator *sep)
 void command_aggro(Client *c, const Seperator *sep)
 {
 	if(c->GetTarget() == nullptr || !c->GetTarget()->IsNPC()) {
-		c->Message(0, "Error: you must have an NPC target.");
+		c->Message(Chat::White, "Error: you must have an NPC target.");
 		return;
 	}
 	float d = atof(sep->arg[1]);
 	if(d == 0.0f) {
-		c->Message(13, "Error: distance argument required.");
+		c->Message(Chat::Red, "Error: distance argument required.");
 		return;
 	}
 	bool verbose = false;
@@ -8219,18 +8935,18 @@ void command_pf(Client *c, const Seperator *sep)
 	if(c->GetTarget())
 	{
 		Mob *who = c->GetTarget();
-		c->Message(0, "POS: (%.2f, %.2f, %.2f)",  who->GetX(), who->GetY(), who->GetZ());
-		c->Message(0, "WP: %s (%d/%d)",  to_string(who->GetCurrentWayPoint()).c_str(), who->IsNPC()?who->CastToNPC()->GetMaxWp():-1);
-		c->Message(0, "pause=%d RAspeed=%d",  who->GetCWPP(), who->GetRunAnimSpeed());
+		c->Message(Chat::White, "POS: (%.2f, %.2f, %.2f)",  who->GetX(), who->GetY(), who->GetZ());
+		c->Message(Chat::White, "WP: %s (%d/%d)",  to_string(who->GetCurrentWayPoint()).c_str(), who->IsNPC()?who->CastToNPC()->GetMaxWp():-1);
+		c->Message(Chat::White, "pause=%d RAspeed=%d",  who->GetCWPP(), who->GetRunAnimSpeed());
 		//who->DumpMovement(c);
 	} else {
-		c->Message(0, "ERROR: target required");
+		c->Message(Chat::White, "ERROR: target required");
 	}
 }
 
 void command_bestz(Client *c, const Seperator *sep) {
 	if (zone->zonemap == nullptr) {
-		c->Message(0,"Map not loaded for this zone");
+		c->Message(Chat::White,"Map not loaded for this zone");
 	} else {
 		glm::vec3 me;
 		me.x = c->GetX();
@@ -8244,16 +8960,16 @@ void command_bestz(Client *c, const Seperator *sep) {
 
 		if (best_z != BEST_Z_INVALID)
 		{
-			c->Message(0, "Z is %.3f at (%.3f, %.3f).",  best_z, me.x, me.y);
+			c->Message(Chat::White, "Z is %.3f at (%.3f, %.3f).",  best_z, me.x, me.y);
 		}
 		else
 		{
-			c->Message(0, "Found no Z.");
+			c->Message(Chat::White, "Found no Z.");
 		}
 	}
 
 	if(zone->watermap == nullptr) {
-		c->Message(0,"Water Region Map not loaded for this zone");
+		c->Message(Chat::White,"Water Region Map not loaded for this zone");
 	} else {
 		WaterRegionType RegionType;
 		float z;
@@ -8262,28 +8978,28 @@ void command_bestz(Client *c, const Seperator *sep) {
 			z=c->GetTarget()->GetZ();
 			auto position = glm::vec3(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z);
 			RegionType = zone->watermap->ReturnRegionType(position);
-			c->Message(0,"InWater returns %d",  zone->watermap->InWater(position));
-			c->Message(0,"InLava returns %d",  zone->watermap->InLava(position));
+			c->Message(Chat::White,"InWater returns %d",  zone->watermap->InWater(position));
+			c->Message(Chat::White,"InLava returns %d",  zone->watermap->InLava(position));
 
 		}
 		else {
 			z=c->GetZ();
 			auto position = glm::vec3(c->GetX(), c->GetY(), z);
 			RegionType = zone->watermap->ReturnRegionType(position);
-			c->Message(0,"InWater returns %d",  zone->watermap->InWater(position));
-			c->Message(0,"InLava returns %d",  zone->watermap->InLava(position));
+			c->Message(Chat::White,"InWater returns %d",  zone->watermap->InWater(position));
+			c->Message(Chat::White,"InLava returns %d",  zone->watermap->InLava(position));
 
 		}
 
 		switch(RegionType) {
-			case RegionTypeNormal:	{ c->Message(0,"There is nothing special about the region you are in!"); break; }
-			case RegionTypeWater:	{ c->Message(0,"You/your target are in Water."); break; }
-			case RegionTypeLava:	{ c->Message(0,"You/your target are in Lava."); break; }
-			case RegionTypeVWater:	{ c->Message(0,"You/your target are in VWater (Icy Water?)."); break; }
-			case RegionTypePVP:	{ c->Message(0, "You/your target are in a pvp enabled area."); break; }
-			case RegionTypeSlime:	{ c->Message(0, "You/your target are in slime."); break; }
-			case RegionTypeIce:	{ c->Message(0, "You/your target are in ice."); break; }
-			default: c->Message(0,"You/your target are in an unknown region type.");
+			case RegionTypeNormal:	{ c->Message(Chat::White,"There is nothing special about the region you are in!"); break; }
+			case RegionTypeWater:	{ c->Message(Chat::White,"You/your target are in Water."); break; }
+			case RegionTypeLava:	{ c->Message(Chat::White,"You/your target are in Lava."); break; }
+			case RegionTypeVWater:	{ c->Message(Chat::White,"You/your target are in VWater (Icy Water?)."); break; }
+			case RegionTypePVP:	{ c->Message(Chat::White, "You/your target are in a pvp enabled area."); break; }
+			case RegionTypeSlime:	{ c->Message(Chat::White, "You/your target are in slime."); break; }
+			case RegionTypeIce:	{ c->Message(Chat::White, "You/your target are in ice."); break; }
+			default: c->Message(Chat::White,"You/your target are in an unknown region type.");
 		}
 	}
 
@@ -8292,7 +9008,7 @@ void command_bestz(Client *c, const Seperator *sep) {
 
 
 void command_reloadstatic(Client *c, const Seperator *sep) {
-	c->Message(0, "Reloading zone static data...");
+	c->Message(Chat::White, "Reloading zone static data...");
 	zone->ReloadStaticData();
 }
 
@@ -8311,13 +9027,13 @@ void command_flags(Client *c, const Seperator *sep) {
 void command_flagedit(Client *c, const Seperator *sep) {
 	//super-command for editing zone flags
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
-		c->Message(0, "Syntax: #flagedit [lockzone|unlockzone|listzones|give|take].");
-		c->Message(0, "...lockzone [zone id/short] [flag name] - Set the specified flag name on the zone, locking the zone");
-		c->Message(0, "...unlockzone [zone id/short] - Removes the flag requirement from the specified zone");
-		c->Message(0, "...listzones - List all zones which require a flag, and their flag's name");
-		c->Message(0, "...give [zone id/short] - Give your target the zone flag for the specified zone.");
-		c->Message(0, "...take [zone id/short] - Take the zone flag for the specified zone away from your target");
-		c->Message(0, "...Note: use #flags to view flags on a person");
+		c->Message(Chat::White, "Syntax: #flagedit [lockzone|unlockzone|listzones|give|take].");
+		c->Message(Chat::White, "...lockzone [zone id/short] [flag name] - Set the specified flag name on the zone, locking the zone");
+		c->Message(Chat::White, "...unlockzone [zone id/short] - Removes the flag requirement from the specified zone");
+		c->Message(Chat::White, "...listzones - List all zones which require a flag, and their flag's name");
+		c->Message(Chat::White, "...give [zone id/short] - Give your target the zone flag for the specified zone.");
+		c->Message(Chat::White, "...take [zone id/short] - Take the zone flag for the specified zone away from your target");
+		c->Message(Chat::White, "...Note: use #flags to view flags on a person");
 		return;
 	}
 
@@ -8330,13 +9046,13 @@ void command_flagedit(Client *c, const Seperator *sep) {
 			}
 		}
 		if(zoneid < 1) {
-			c->Message(13, "zone required. see help.");
+			c->Message(Chat::Red, "zone required. see help.");
 			return;
 		}
 
 		char flag_name[128];
 		if(sep->argplus[3][0] == '\0') {
-			c->Message(13, "flag name required. see help.");
+			c->Message(Chat::Red, "flag name required. see help.");
 			return;
 		}
 		database.DoEscapeString(flag_name, sep->argplus[3], 64);
@@ -8347,11 +9063,11 @@ void command_flagedit(Client *c, const Seperator *sep) {
                                         flag_name, zoneid, zone->GetInstanceVersion());
         auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			c->Message(13, "Error updating zone: %s",  results.ErrorMessage().c_str());
+			c->Message(Chat::Red, "Error updating zone: %s",  results.ErrorMessage().c_str());
 			return;
 		}
 
-        c->Message(15, "Success! Zone %s now requires a flag, named %s",  database.GetZoneName(zoneid), flag_name);
+        c->Message(Chat::Yellow, "Success! Zone %s now requires a flag, named %s",  database.GetZoneName(zoneid), flag_name);
         return;
 	}
 
@@ -8365,7 +9081,7 @@ void command_flagedit(Client *c, const Seperator *sep) {
 		}
 
 		if(zoneid < 1) {
-			c->Message(13, "zone required. see help.");
+			c->Message(Chat::Red, "zone required. see help.");
 			return;
 		}
 
@@ -8374,11 +9090,11 @@ void command_flagedit(Client *c, const Seperator *sep) {
                                         zoneid, zone->GetInstanceVersion());
         auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			c->Message(15, "Error updating zone: %s",  results.ErrorMessage().c_str());
+			c->Message(Chat::Yellow, "Error updating zone: %s",  results.ErrorMessage().c_str());
 			return;
 		}
 
-        c->Message(15, "Success! Zone %s no longer requires a flag.",  database.GetZoneName(zoneid));
+        c->Message(Chat::Yellow, "Success! Zone %s no longer requires a flag.",  database.GetZoneName(zoneid));
         return;
 	}
 
@@ -8390,9 +9106,9 @@ void command_flagedit(Client *c, const Seperator *sep) {
             return;
         }
 
-        c->Message(0, "Zones which require flags:");
+        c->Message(Chat::White, "Zones which require flags:");
         for (auto row = results.begin(); row != results.end(); ++row)
-            c->Message(0, "Zone %s (%s,%s) version %s requires key %s",  row[2], row[0], row[1], row[3], row[4]);
+            c->Message(Chat::White, "Zone %s (%s,%s) version %s requires key %s",  row[2], row[0], row[1], row[3], row[4]);
 
         return;
 	}
@@ -8406,13 +9122,13 @@ void command_flagedit(Client *c, const Seperator *sep) {
 			}
 		}
 		if(zoneid < 1) {
-			c->Message(13, "zone required. see help.");
+			c->Message(Chat::Red, "zone required. see help.");
 			return;
 		}
 
 		Mob *t = c->GetTarget();
 		if(t == nullptr || !t->IsClient()) {
-			c->Message(13, "client target required");
+			c->Message(Chat::Red, "client target required");
 			return;
 		}
 
@@ -8429,13 +9145,13 @@ void command_flagedit(Client *c, const Seperator *sep) {
 			}
 		}
 		if(zoneid < 1) {
-			c->Message(13, "zone required. see help.");
+			c->Message(Chat::Red, "zone required. see help.");
 			return;
 		}
 
 		Mob *t = c->GetTarget();
 		if(t == nullptr || !t->IsClient()) {
-			c->Message(13, "client target required");
+			c->Message(Chat::Red, "client target required");
 			return;
 		}
 
@@ -8443,7 +9159,7 @@ void command_flagedit(Client *c, const Seperator *sep) {
 		return;
 	}
 
-    c->Message(15, "Invalid action specified. use '#flagedit help' for help");
+    c->Message(Chat::Yellow, "Invalid action specified. use '#flagedit help' for help");
 }
 
 void command_serverrules(Client *c, const Seperator *sep)
@@ -8457,7 +9173,7 @@ void command_acceptrules(Client *c, const Seperator *sep)
 	{
 		database.SetAgreementFlag(c->AccountID());
 		c->SendAppearancePacket(AT_Anim, ANIM_STAND);
-		c->Message(0,"It is recorded you have agreed to the rules.");
+		c->Message(Chat::White,"It is recorded you have agreed to the rules.");
 	}
 }
 
@@ -8469,7 +9185,7 @@ void command_guildcreate(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0,"Guild name must be more than 4 characters and less than 16.");
+		c->Message(Chat::White,"Guild name must be more than 4 characters and less than 16.");
 	}
 }
 
@@ -8486,17 +9202,17 @@ void command_guildlist(Client *c, const Seperator *sep)
 		tmp->ApprovedMembers(c);
 	}
 	else
-		c->Message(0,"Could not find reference id.");
+		c->Message(Chat::White,"Could not find reference id.");
 }
 
 void command_hatelist(Client *c, const Seperator *sep) {
 	Mob *target = c->GetTarget();
 	if(target == nullptr) {
-		c->Message(0, "Error: you must have a target.");
+		c->Message(Chat::White, "Error: you must have a target.");
 		return;
 	}
 
-	c->Message(0, "Display hate list for %s..",  target->GetName());
+	c->Message(Chat::White, "Display hate list for %s..",  target->GetName());
 	target->PrintHateListToClient(c);
 }
 
@@ -8504,142 +9220,142 @@ void command_hatelist(Client *c, const Seperator *sep) {
 void command_rules(Client *c, const Seperator *sep) {
 	//super-command for managing rules settings
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
-		c->Message(0, "Syntax: #rules [subcommand].");
-		c->Message(0, "-- Rule Set Manipulation --");
-		c->Message(0, "...listsets - List avaliable rule sets");
-		c->Message(0, "...current - gives the name of the ruleset currently running in this zone");
-		c->Message(0, "...reload - Reload the selected ruleset in this zone");
-		c->Message(0, "...switch (ruleset name) - Change the selected ruleset and load it");
-		c->Message(0, "...load (ruleset name) - Load a ruleset in just this zone without changing the selected set");
+		c->Message(Chat::White, "Syntax: #rules [subcommand].");
+		c->Message(Chat::White, "-- Rule Set Manipulation --");
+		c->Message(Chat::White, "...listsets - List avaliable rule sets");
+		c->Message(Chat::White, "...current - gives the name of the ruleset currently running in this zone");
+		c->Message(Chat::White, "...reload - Reload the selected ruleset in this zone");
+		c->Message(Chat::White, "...switch (ruleset name) - Change the selected ruleset and load it");
+		c->Message(Chat::White, "...load (ruleset name) - Load a ruleset in just this zone without changing the selected set");
 //too lazy to write this right now:
-//		c->Message(0, "...wload (ruleset name) - Load a ruleset in all zones without changing the selected set");
-		c->Message(0, "...store [ruleset name] - Store the running ruleset as the specified name");
-		c->Message(0, "---------------------");
-		c->Message(0, "-- Running Rule Manipulation --");
-		c->Message(0, "...reset - Reset all rules to their default values");
-		c->Message(0, "...get [rule] - Get the specified rule's local value");
-		c->Message(0, "...set (rule) (value) - Set the specified rule to the specified value locally only");
-		c->Message(0, "...setdb (rule) (value) - Set the specified rule to the specified value locally and in the DB");
-		c->Message(0, "...list [catname] - List all rules in the specified category (or all categiries if omitted)");
-		c->Message(0, "...values [catname] - List the value of all rules in the specified category");
+//		c->Message(Chat::White, "...wload (ruleset name) - Load a ruleset in all zones without changing the selected set");
+		c->Message(Chat::White, "...store [ruleset name] - Store the running ruleset as the specified name");
+		c->Message(Chat::White, "---------------------");
+		c->Message(Chat::White, "-- Running Rule Manipulation --");
+		c->Message(Chat::White, "...reset - Reset all rules to their default values");
+		c->Message(Chat::White, "...get [rule] - Get the specified rule's local value");
+		c->Message(Chat::White, "...set (rule) (value) - Set the specified rule to the specified value locally only");
+		c->Message(Chat::White, "...setdb (rule) (value) - Set the specified rule to the specified value locally and in the DB");
+		c->Message(Chat::White, "...list [catname] - List all rules in the specified category (or all categiries if omitted)");
+		c->Message(Chat::White, "...values [catname] - List the value of all rules in the specified category");
 		return;
 	}
 
 	if(!strcasecmp(sep->arg[1], "current")) {
-		c->Message(0, "Currently running ruleset '%s' (%d)",  RuleManager::Instance()->GetActiveRuleset(),
+		c->Message(Chat::White, "Currently running ruleset '%s' (%d)",  RuleManager::Instance()->GetActiveRuleset(),
 			RuleManager::Instance()->GetActiveRulesetID());
 	} else if(!strcasecmp(sep->arg[1], "listsets")) {
 		std::map<int, std::string> sets;
 		if(!RuleManager::Instance()->ListRulesets(&database, sets)) {
-			c->Message(13, "Failed to list rule sets!");
+			c->Message(Chat::Red, "Failed to list rule sets!");
 			return;
 		}
 
-		c->Message(0, "Avaliable rule sets:");
+		c->Message(Chat::White, "Avaliable rule sets:");
 		std::map<int, std::string>::iterator cur, end;
 		cur = sets.begin();
 		end = sets.end();
 		for(; cur != end; ++cur) {
-			c->Message(0, "(%d) %s",  cur->first, cur->second.c_str());
+			c->Message(Chat::White, "(%d) %s",  cur->first, cur->second.c_str());
 		}
 	} else if(!strcasecmp(sep->arg[1], "reload")) {
 		RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true);
-		c->Message(0, "The active ruleset (%s (%d)) has been reloaded",  RuleManager::Instance()->GetActiveRuleset(),
+		c->Message(Chat::White, "The active ruleset (%s (%d)) has been reloaded",  RuleManager::Instance()->GetActiveRuleset(),
 			RuleManager::Instance()->GetActiveRulesetID());
 	} else if(!strcasecmp(sep->arg[1], "switch")) {
 		//make sure this is a valid rule set..
 		int rsid = RuleManager::Instance()->GetRulesetID(&database, sep->arg[2]);
 		if(rsid < 0) {
-			c->Message(13, "Unknown rule set '%s'",  sep->arg[2]);
+			c->Message(Chat::Red, "Unknown rule set '%s'",  sep->arg[2]);
 			return;
 		}
 		if(!database.SetVariable("RuleSet",  sep->arg[2])) {
-			c->Message(13, "Failed to update variables table to change selected rule set");
+			c->Message(Chat::Red, "Failed to update variables table to change selected rule set");
 			return;
 		}
 
 		//TODO: we likely want to reload this ruleset everywhere...
 		RuleManager::Instance()->LoadRules(&database, sep->arg[2], true);
 
-		c->Message(0, "The selected ruleset has been changed to (%s (%d)) and reloaded locally",  sep->arg[2], rsid);
+		c->Message(Chat::White, "The selected ruleset has been changed to (%s (%d)) and reloaded locally",  sep->arg[2], rsid);
 	} else if(!strcasecmp(sep->arg[1], "load")) {
 		//make sure this is a valid rule set..
 		int rsid = RuleManager::Instance()->GetRulesetID(&database, sep->arg[2]);
 		if(rsid < 0) {
-			c->Message(13, "Unknown rule set '%s'",  sep->arg[2]);
+			c->Message(Chat::Red, "Unknown rule set '%s'",  sep->arg[2]);
 			return;
 		}
 		RuleManager::Instance()->LoadRules(&database, sep->arg[2], true);
-		c->Message(0, "Loaded ruleset '%s' (%d) locally",  sep->arg[2], rsid);
+		c->Message(Chat::White, "Loaded ruleset '%s' (%d) locally",  sep->arg[2], rsid);
 	} else if(!strcasecmp(sep->arg[1], "store")) {
 		if(sep->argnum == 1) {
 			//store current rule set.
 			RuleManager::Instance()->SaveRules(&database);
-			c->Message(0, "Rules saved");
+			c->Message(Chat::White, "Rules saved");
 		} else if(sep->argnum == 2) {
 			RuleManager::Instance()->SaveRules(&database, sep->arg[2]);
 			int prersid = RuleManager::Instance()->GetActiveRulesetID();
 			int rsid = RuleManager::Instance()->GetRulesetID(&database, sep->arg[2]);
 			if(rsid < 0) {
-				c->Message(13, "Unable to query ruleset ID after store, it most likely failed.");
+				c->Message(Chat::Red, "Unable to query ruleset ID after store, it most likely failed.");
 			} else {
-				c->Message(0, "Stored rules as ruleset '%s' (%d)",  sep->arg[2], rsid);
+				c->Message(Chat::White, "Stored rules as ruleset '%s' (%d)",  sep->arg[2], rsid);
 				if(prersid != rsid) {
-					c->Message(0, "Rule set %s (%d) is now active in this zone",  sep->arg[2], rsid);
+					c->Message(Chat::White, "Rule set %s (%d) is now active in this zone",  sep->arg[2], rsid);
 				}
 			}
 		} else {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		}
 	} else if(!strcasecmp(sep->arg[1], "reset")) {
 		RuleManager::Instance()->ResetRules(true);
-		c->Message(0, "The running ruleset has been set to defaults");
-	
+		c->Message(Chat::White, "The running ruleset has been set to defaults");
+
 	} else if(!strcasecmp(sep->arg[1], "get")) {
 		if(sep->argnum != 2) {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		}
 		std::string value;
 		if(!RuleManager::Instance()->GetRule(sep->arg[2], value))
-			c->Message(13, "Unable to find rule %s",  sep->arg[2]);
+			c->Message(Chat::Red, "Unable to find rule %s",  sep->arg[2]);
 		else
-			c->Message(0, "%s - %s",  sep->arg[2], value.c_str());
+			c->Message(Chat::White, "%s - %s",  sep->arg[2], value.c_str());
 
 	} else if(!strcasecmp(sep->arg[1], "set")) {
 		if(sep->argnum != 3) {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		}
 		if(!RuleManager::Instance()->SetRule(sep->arg[2], sep->arg[3], nullptr, false, true)) {
-			c->Message(13, "Failed to modify rule");
+			c->Message(Chat::Red, "Failed to modify rule");
 		} else {
-			c->Message(0, "Rule modified locally.");
+			c->Message(Chat::White, "Rule modified locally.");
 		}
 	} else if(!strcasecmp(sep->arg[1], "setdb")) {
 		if(sep->argnum != 3) {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		}
 		if(!RuleManager::Instance()->SetRule(sep->arg[2], sep->arg[3], &database, true, true)) {
-			c->Message(13, "Failed to modify rule");
+			c->Message(Chat::Red, "Failed to modify rule");
 		} else {
-			c->Message(0, "Rule modified locally and in the database.");
+			c->Message(Chat::White, "Rule modified locally and in the database.");
 		}
 	} else if(!strcasecmp(sep->arg[1], "list")) {
 		if(sep->argnum == 1) {
 			std::vector<const char *> rule_list;
 			if(!RuleManager::Instance()->ListCategories(rule_list)) {
-				c->Message(13, "Failed to list categories!");
+				c->Message(Chat::Red, "Failed to list categories!");
 				return;
 			}
-			c->Message(0, "Rule Categories:");
+			c->Message(Chat::White, "Rule Categories:");
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
 			for(; cur != end; ++cur) {
-				c->Message(0, " %s",  *cur);
+				c->Message(Chat::White, " %s",  *cur);
 			}
 		} else if(sep->argnum == 2) {
 			const char *catfilt = nullptr;
@@ -8647,22 +9363,22 @@ void command_rules(Client *c, const Seperator *sep) {
 				catfilt = sep->arg[2];
 			std::vector<const char *> rule_list;
 			if(!RuleManager::Instance()->ListRules(catfilt, rule_list)) {
-				c->Message(13, "Failed to list rules!");
+				c->Message(Chat::Red, "Failed to list rules!");
 				return;
 			}
-			c->Message(0, "Rules in category %s:",  sep->arg[2]);
+			c->Message(Chat::White, "Rules in category %s:",  sep->arg[2]);
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
 			for(; cur != end; ++cur) {
-				c->Message(0, " %s",  *cur);
+				c->Message(Chat::White, " %s",  *cur);
 			}
 		} else {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 		}
 	} else if(!strcasecmp(sep->arg[1], "values")) {
 		if(sep->argnum != 2) {
-			c->Message(13, "Invalid argument count, see help.");
+			c->Message(Chat::Red, "Invalid argument count, see help.");
 			return;
 		} else {
 			const char *catfilt = nullptr;
@@ -8670,21 +9386,21 @@ void command_rules(Client *c, const Seperator *sep) {
 				catfilt = sep->arg[2];
 			std::vector<const char *> rule_list;
 			if(!RuleManager::Instance()->ListRules(catfilt, rule_list)) {
-				c->Message(13, "Failed to list rules!");
+				c->Message(Chat::Red, "Failed to list rules!");
 				return;
 			}
-			c->Message(0, "Rules & values in category %s:",  sep->arg[2]);
+			c->Message(Chat::White, "Rules & values in category %s:",  sep->arg[2]);
 			std::vector<const char *>::iterator cur, end;
 			cur = rule_list.begin();
 			end = rule_list.end();
 			for(std::string tmp_value; cur != end; ++cur) {
 				if (RuleManager::Instance()->GetRule(*cur, tmp_value))
-					c->Message(0, " %s - %s",  *cur, tmp_value.c_str());
+					c->Message(Chat::White, " %s - %s",  *cur, tmp_value.c_str());
 			}
 		}
 
 	} else {
-		c->Message(15, "Invalid action specified. use '#rules help' for help");
+		c->Message(Chat::Yellow, "Invalid action specified. use '#rules help' for help");
 	}
 }
 
@@ -8692,15 +9408,15 @@ void command_rules(Client *c, const Seperator *sep) {
 void command_task(Client *c, const Seperator *sep) {
 	//super-command for managing tasks
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
-		c->Message(0, "Syntax: #task [subcommand].");
-		c->Message(0, "-- Task System Commands --");
-		c->Message(0, "...show - List active tasks for a client");
-		c->Message(0, "...update <TaskID> <ActivityID> [Count]");
-		c->Message(0, "...reloadall - Reload all Task information from the database");
-		c->Message(0, "...reload task <TaskID> - Reload Task and Activity informnation for a single task");
-		c->Message(0, "...reload lists - Reload goal/reward list information");
-		c->Message(0, "...reload prox - Reload proximity information");
-		c->Message(0, "...reload sets - Reload task set information");
+		c->Message(Chat::White, "Syntax: #task [subcommand].");
+		c->Message(Chat::White, "-- Task System Commands --");
+		c->Message(Chat::White, "...show - List active tasks for a client");
+		c->Message(Chat::White, "...update <TaskID> <ActivityID> [Count]");
+		c->Message(Chat::White, "...reloadall - Reload all Task information from the database");
+		c->Message(Chat::White, "...reload task <TaskID> - Reload Task and Activity informnation for a single task");
+		c->Message(Chat::White, "...reload lists - Reload goal/reward list information");
+		c->Message(Chat::White, "...reload prox - Reload proximity information");
+		c->Message(Chat::White, "...reload sets - Reload task set information");
 		return;
 	}
 
@@ -8724,51 +9440,51 @@ void command_task(Client *c, const Seperator *sep) {
 				if(Count <= 0)
 					Count = 1;
 			}
-			c->Message(15, "Updating Task %i, Activity %i, Count %i",  TaskID, ActivityID, Count);
+			c->Message(Chat::Yellow, "Updating Task %i, Activity %i, Count %i",  TaskID, ActivityID, Count);
 			c->UpdateTaskActivity(TaskID, ActivityID, Count);
 		}
 		return;
 	}
 	if(!strcasecmp(sep->arg[1], "reloadall")) {
-		c->Message(15, "Sending reloadtasks to world");
+		c->Message(Chat::Yellow, "Sending reloadtasks to world");
 		worldserver.SendReloadTasks(RELOADTASKS);
-		c->Message(15, "Back again");
+		c->Message(Chat::Yellow, "Back again");
 		return;
 	}
 
 	if(!strcasecmp(sep->arg[1], "reload")) {
 		if(sep->arg[2][0] != '\0') {
 			if(!strcasecmp(sep->arg[2], "lists")) {
-				c->Message(15, "Sending reload lists to world");
+				c->Message(Chat::Yellow, "Sending reload lists to world");
 				worldserver.SendReloadTasks(RELOADTASKGOALLISTS);
-				c->Message(15, "Back again");
+				c->Message(Chat::Yellow, "Back again");
 				return;
 			}
 			if(!strcasecmp(sep->arg[2], "prox")) {
-				c->Message(15, "Sending reload proximities to world");
+				c->Message(Chat::Yellow, "Sending reload proximities to world");
 				worldserver.SendReloadTasks(RELOADTASKPROXIMITIES);
-				c->Message(15, "Back again");
+				c->Message(Chat::Yellow, "Back again");
 				return;
 			}
 			if(!strcasecmp(sep->arg[2], "sets")) {
-				c->Message(15, "Sending reload task sets to world");
+				c->Message(Chat::Yellow, "Sending reload task sets to world");
 				worldserver.SendReloadTasks(RELOADTASKSETS);
-				c->Message(15, "Back again");
+				c->Message(Chat::Yellow, "Back again");
 				return;
 			}
 			if(!strcasecmp(sep->arg[2], "task") && (sep->arg[3][0] != '\0')) {
 				int TaskID = atoi(sep->arg[3]);
 				if((TaskID > 0) && (TaskID < MAXTASKS)) {
-					c->Message(15, "Sending reload task %i to world");
+					c->Message(Chat::Yellow, "Sending reload task %i to world");
 					worldserver.SendReloadTasks(RELOADTASKS, TaskID);
-					c->Message(15, "Back again");
+					c->Message(Chat::Yellow, "Back again");
 					return;
 				}
 			}
 		}
 
 	}
-	c->Message(0, "Unable to interpret command. Type #task help");
+	c->Message(Chat::White, "Unable to interpret command. Type #task help");
 
 }
 void command_reloadtitles(Client *c, const Seperator *sep)
@@ -8776,7 +9492,7 @@ void command_reloadtitles(Client *c, const Seperator *sep)
 	auto pack = new ServerPacket(ServerOP_ReloadTitles, 0);
 	worldserver.SendPacket(pack);
 	safe_delete(pack);
-	c->Message(15, "Player Titles Reloaded.");
+	c->Message(Chat::Yellow, "Player Titles Reloaded.");
 
 }
 
@@ -8787,7 +9503,7 @@ void command_traindisc(Client *c, const Seperator *sep)
 		t = c->GetTarget()->CastToClient();
 
 	if (sep->argnum < 1 || !sep->IsNumber(1)) {
-		c->Message(0, "FORMAT: #traindisc <max level> <min level>");
+		c->Message(Chat::White, "FORMAT: #traindisc <max level> <min level>");
 		return;
 	}
 
@@ -8800,18 +9516,18 @@ void command_traindisc(Client *c, const Seperator *sep)
 		min_level = (uint8)RuleI(Character, MaxLevel); // default to Character:MaxLevel if we're not a GM & it's higher than the max level
 
 	if(max_level < 1 || min_level < 1) {
-		c->Message(0, "ERROR: Level must be greater than 1.");
+		c->Message(Chat::White, "ERROR: Level must be greater than 1.");
 		return;
 	}
 	if (min_level > max_level) {
-		c->Message(0, "Error: Min Level must be less than or equal to Max Level.");
+		c->Message(Chat::White, "Error: Min Level must be less than or equal to Max Level.");
 		return;
 	}
 
-	t->Message(0, "Training disciplines");
+	t->Message(Chat::White, "Training disciplines");
 	if(t != c)
-		c->Message(0, "Training disciplines for %s.",  t->GetName());
-	Log(Logs::General, Logs::Normal, "Train disciplines request for %s from %s, levels: %u -> %u",  t->GetName(), c->GetName(), min_level, max_level);
+		c->Message(Chat::White, "Training disciplines for %s.",  t->GetName());
+	LogInfo("Train disciplines request for [{}] from [{}], levels: [{}] -> [{}]",  t->GetName(), c->GetName(), min_level, max_level);
 
 	int spell_id = 0;
 	int count = 0;
@@ -8820,7 +9536,7 @@ void command_traindisc(Client *c, const Seperator *sep)
 
 	for( ; spell_id < SPDAT_RECORDS; ++spell_id) {
 		if (spell_id < 0 || spell_id >= SPDAT_RECORDS) {
-			c->Message(13, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
+			c->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
 			return;
 		}
 
@@ -8833,10 +9549,10 @@ void command_traindisc(Client *c, const Seperator *sep)
 				break;
 			if (spells[spell_id].skill == 52)
 				break;
-			
+
 			uint16 spell_id_ = (uint16)spell_id;
 			if ((spell_id_ != spell_id) || (spell_id != spell_id_)) {
-				c->Message(13, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
+				c->Message(Chat::Red, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
 				return;
 			}
 
@@ -8845,14 +9561,14 @@ void command_traindisc(Client *c, const Seperator *sep)
 
 			for (uint32 r = 0; r < MAX_PP_DISCIPLINES; ++r) {
 				if (t->GetPP().disciplines.values[r] == spell_id_) {
-					t->Message(13, "You already know this discipline.");
+					t->Message(Chat::Red, "You already know this discipline.");
 					break; // continue the 1st loop
 				}
 				else if (t->GetPP().disciplines.values[r] == 0) {
 					t->GetPP().disciplines.values[r] = spell_id_;
 					database.SaveCharacterDisc(t->CharacterID(), r, spell_id_);
 					change = true;
-					t->Message(0, "You have learned a new discipline!");
+					t->Message(Chat::White, "You have learned a new discipline!");
 					++count; // success counter
 					break; // continue the 1st loop
 				} // if we get to this point, there's already a discipline in this slot, so we continue onto the next slot
@@ -8866,13 +9582,13 @@ void command_traindisc(Client *c, const Seperator *sep)
 		t->SendDisciplineUpdate();
 
 	if (count > 0) {
-		t->Message(0, "Successfully trained %u disciplines.",  count);
+		t->Message(Chat::White, "Successfully trained %u disciplines.",  count);
 		if (t != c)
-			c->Message(0, "Successfully trained %u disciplines for %s.",  count, t->GetName());
+			c->Message(Chat::White, "Successfully trained %u disciplines for %s.",  count, t->GetName());
 	} else {
-		t->Message(0, "No disciplines trained.");
+		t->Message(Chat::White, "No disciplines trained.");
 		if (t != c)
-			c->Message(0, "No disciplines trained for %s.",  t->GetName());
+			c->Message(Chat::White, "No disciplines trained for %s.",  t->GetName());
 	}
 }
 
@@ -8886,7 +9602,7 @@ void command_setgraveyard(Client *c, const Seperator *sep)
 		t=c->GetTarget()->CastToClient();
 
 	if(!sep->arg[1][0]) {
-		c->Message(0, "Usage: #setgraveyard [zonename]");
+		c->Message(Chat::White, "Usage: #setgraveyard [zonename]");
 		return;
 	}
 
@@ -8896,21 +9612,21 @@ void command_setgraveyard(Client *c, const Seperator *sep)
 		graveyard_id = database.CreateGraveyardRecord(zoneid, t->GetPosition());
 
 		if(graveyard_id > 0) {
-			c->Message(0, "Successfuly added a new record for this graveyard!");
+			c->Message(Chat::White, "Successfuly added a new record for this graveyard!");
 			if(database.AddGraveyardIDToZone(zoneid, graveyard_id) > 0) {
-				c->Message(0, "Successfuly added this new graveyard for the zone %s.",  sep->arg[1]);
+				c->Message(Chat::White, "Successfuly added this new graveyard for the zone %s.",  sep->arg[1]);
 				// TODO: Set graveyard data to the running zone process.
-				c->Message(0, "Done!");
+				c->Message(Chat::White, "Done!");
 			}
 			else
-				c->Message(0, "Unable to add this new graveyard to the zone %s.",  sep->arg[1]);
+				c->Message(Chat::White, "Unable to add this new graveyard to the zone %s.",  sep->arg[1]);
 		}
 		else {
-			c->Message(0, "Unable to create a new graveyard record in the database.");
+			c->Message(Chat::White, "Unable to create a new graveyard record in the database.");
 		}
 	}
 	else {
-		c->Message(0, "Unable to retrieve a ZoneID for the zone: %s",  sep->arg[1]);
+		c->Message(Chat::White, "Unable to retrieve a ZoneID for the zone: %s",  sep->arg[1]);
 	}
 
 	return;
@@ -8922,7 +9638,7 @@ void command_deletegraveyard(Client *c, const Seperator *sep)
 	uint32 graveyard_id = 0;
 
 	if(!sep->arg[1][0]) {
-		c->Message(0, "Usage: #deletegraveyard [zonename]");
+		c->Message(Chat::White, "Usage: #deletegraveyard [zonename]");
 		return;
 	}
 
@@ -8931,15 +9647,15 @@ void command_deletegraveyard(Client *c, const Seperator *sep)
 
 	if(zoneid > 0 && graveyard_id > 0) {
 		if(database.DeleteGraveyard(zoneid, graveyard_id))
-			c->Message(0, "Successfuly deleted graveyard %u for zone %s.",  graveyard_id, sep->arg[1]);
+			c->Message(Chat::White, "Successfuly deleted graveyard %u for zone %s.",  graveyard_id, sep->arg[1]);
 		else
-			c->Message(0, "Unable to delete graveyard %u for zone %s.",  graveyard_id, sep->arg[1]);
+			c->Message(Chat::White, "Unable to delete graveyard %u for zone %s.",  graveyard_id, sep->arg[1]);
 	}
 	else {
 		if(zoneid <= 0)
-			c->Message(0, "Unable to retrieve a ZoneID for the zone: %s",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to retrieve a ZoneID for the zone: %s",  sep->arg[1]);
 		else if(graveyard_id <= 0)
-			c->Message(0, "Unable to retrieve a valid GraveyardID for the zone: %s",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to retrieve a valid GraveyardID for the zone: %s",  sep->arg[1]);
 	}
 
 	return;
@@ -8952,14 +9668,14 @@ void command_summonburiedplayercorpse(Client *c, const Seperator *sep)
 	if(c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM())
 		t = c->GetTarget()->CastToClient();
 	else {
-		c->Message(0, "You must first select a target!");
+		c->Message(Chat::White, "You must first select a target!");
 		return;
 	}
 
 	Corpse* PlayerCorpse = database.SummonBuriedCharacterCorpses(t->CharacterID(), t->GetZoneID(), zone->GetInstanceID(), t->GetPosition());
 
 	if(!PlayerCorpse)
-		c->Message(0, "Your target doesn't have any buried corpses.");
+		c->Message(Chat::White, "Your target doesn't have any buried corpses.");
 
 	return;
 }
@@ -8971,16 +9687,16 @@ void command_getplayerburiedcorpsecount(Client *c, const Seperator *sep)
 	if(c->GetTarget() && c->GetTarget()->IsClient() && c->GetGM())
 		t = c->GetTarget()->CastToClient();
 	else {
-		c->Message(0, "You must first select a target!");
+		c->Message(Chat::White, "You must first select a target!");
 		return;
 	}
 
 	uint32 CorpseCount = database.GetCharacterBuriedCorpseCount(t->CharacterID());
 
 	if(CorpseCount > 0)
-		c->Message(0, "Your target has a total of %u buried corpses.",  CorpseCount);
+		c->Message(Chat::White, "Your target has a total of %u buried corpses.",  CorpseCount);
 	else
-		c->Message(0, "Your target doesn't have any buried corpses.");
+		c->Message(Chat::White, "Your target doesn't have any buried corpses.");
 
 	return;
 }
@@ -9005,7 +9721,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
     if (strcasecmp(sep->arg[1], "maketype") == 0) {
         if(!target || !target->IsNPC()) {
-            c->Message(0, "Target Required!");
+            c->Message(Chat::White, "Target Required!");
             return;
         }
 
@@ -9015,7 +9731,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
     if (strcasecmp(sep->arg[1], "makegroup") == 0) {
         if(!sep->arg[2]) {
-            c->Message(0, "Format: #advnpdspawn makegroup <name> [spawn limit] [dist] [max x] [min x] [max y] [min y] [delay]");
+            c->Message(Chat::White, "Format: #advnpdspawn makegroup <name> [spawn limit] [dist] [max x] [min x] [max y] [min y] [delay]");
             return;
         }
 
@@ -9032,18 +9748,18 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         (sep->arg[9]? atoi(sep->arg[9]): 0));
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(0, "Invalid Arguments -- MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::White, "Invalid Arguments -- MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Group ID %i created successfully!",  results.LastInsertedID());
+        c->Message(Chat::White, "Group ID %i created successfully!",  results.LastInsertedID());
         return;
     }
 
 	if (strcasecmp(sep->arg[1], "addgroupentry") == 0) {
         if(!atoi(sep->arg[2]) || !atoi(sep->arg[3]) || !atoi(sep->arg[4])) {
-            c->Message(0, "Format: #advnpdspawn addgroupentry <spawnggroupID> <npcID> <chance>");
+            c->Message(Chat::White, "Format: #advnpdspawn addgroupentry <spawnggroupID> <npcID> <chance>");
             return;
         }
 
@@ -9052,19 +9768,19 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         atoi(sep->arg[2]), atoi(sep->arg[3]), atoi(sep->arg[4]));
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(0, "Invalid Arguments -- MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::White, "Invalid Arguments -- MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "NPC %i added to group %i with %i chance!",  atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[4]) );
+        c->Message(Chat::White, "NPC %i added to group %i with %i chance!",  atoi(sep->arg[3]), atoi(sep->arg[2]), atoi(sep->arg[4]) );
 
         return;
     }
 
     if (strcasecmp(sep->arg[1], "editgroupbox") == 0) {
         if(!atof(sep->arg[2]) || !atof(sep->arg[3]) || !atof(sep->arg[4]) || !atof(sep->arg[5]) || !atof(sep->arg[6]) || !atof(sep->arg[7]) || !atof(sep->arg[8])) {
-            c->Message(0, "Format: #advnpdspawn editgroupbox <spawngroupID> <dist> <max x> <min x> <max y> <min y> <delay>");
+            c->Message(Chat::White, "Format: #advnpdspawn editgroupbox <spawngroupID> <dist> <max x> <min x> <max y> <min y> <delay>");
             return;
         }
 
@@ -9075,19 +9791,19 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         atoi(sep->arg[2]));
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(0, "Invalid Arguments -- MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::White, "Invalid Arguments -- MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Group ID %i created successfully!",  results.LastInsertedID());
+        c->Message(Chat::White, "Group ID %i created successfully!",  results.LastInsertedID());
 
         return;
     }
 
 	if (strcasecmp(sep->arg[1], "cleargroupbox") == 0) {
         if(!atoi(sep->arg[2])) {
-            c->Message(0, "Format: #advnpdspawn cleargroupbox <spawngroupID>");
+            c->Message(Chat::White, "Format: #advnpdspawn cleargroupbox <spawngroupID>");
             return;
         }
 
@@ -9097,44 +9813,44 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         "WHERE id = '%i' ",  atoi(sep->arg[2]));
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(0, "Invalid Arguments -- MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::White, "Invalid Arguments -- MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Group ID %i created successfully!",  results.LastInsertedID());
+        c->Message(Chat::White, "Group ID %i created successfully!",  results.LastInsertedID());
 
         return;
     }
 
 	if (strcasecmp(sep->arg[1], "addgroupspawn") == 0 && atoi(sep->arg[2])!=0) {
         database.NPCSpawnDB(5, zone->GetShortName(), zone->GetInstanceVersion(), c, 0, atoi(sep->arg[2]));
-        c->Message(0, "Mob of group %i added successfully!",  atoi(sep->arg[2]));
+        c->Message(Chat::White, "Mob of group %i added successfully!",  atoi(sep->arg[2]));
         return;
     }
 
 	if (strcasecmp(sep->arg[1], "removegroupspawn") == 0) {
         if (!target || !target->IsNPC()) {
-            c->Message(0, "Error: Need an NPC target.");
+            c->Message(Chat::White, "Error: Need an NPC target.");
             return;
         }
 
         Spawn2* s2 = target->CastToNPC()->respawn2;
 
         if(!s2) {
-            c->Message(0, "removegroupspawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
+            c->Message(Chat::White, "removegroupspawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
             return;
         }
 
         std::string query = StringFormat("DELETE FROM spawn2 WHERE id = '%i'",  s2->GetID());
         auto results = database.QueryDatabase(query);
         if(!results.Success()) {
-            c->Message(13, "Update failed! MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Spawnpoint Removed successfully.");
+        c->Message(Chat::White, "Spawnpoint Removed successfully.");
         target->Depop(false);
 
         return;
@@ -9142,14 +9858,14 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "movespawn") == 0) {
         if (!target || !target->IsNPC()) {
-            c->Message(0, "Error: Need an NPC target.");
+            c->Message(Chat::White, "Error: Need an NPC target.");
             return;
         }
 
         Spawn2* s2 = target->CastToNPC()->respawn2;
 
         if(!s2) {
-            c->Message(0, "movespawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
+            c->Message(Chat::White, "movespawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
             return;
         }
 
@@ -9158,12 +9874,12 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         c->GetX(), c->GetY(), c->GetZ(), c->GetHeading(),s2->GetID());
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(13, "Update failed! MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Updating coordinates successful.");
+        c->Message(Chat::White, "Updating coordinates successful.");
         target->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading());
 
         return;
@@ -9171,7 +9887,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "editrespawn") == 0) {
         if (!target || !target->IsNPC()) {
-            c->Message(0, "Error: Need an NPC target.");
+            c->Message(Chat::White, "Error: Need an NPC target.");
             return;
         }
 
@@ -9180,7 +9896,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
         uint32 new_rs = 0;
         uint32 new_var = s2->GetVariance();
         if(!sep->IsNumber(2)) {
-            c->Message(0, "editrespawn FAILED -- cannot set respawn to be 0");
+            c->Message(Chat::White, "editrespawn FAILED -- cannot set respawn to be 0");
             return;
         }
 
@@ -9190,7 +9906,7 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
             new_var = atoi(sep->arg[3]);
 
         if(!s2) {
-            c->Message(0, "editrespawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
+            c->Message(Chat::White, "editrespawn FAILED -- cannot determine which spawn entry in the database this mob came from.");
             return;
         }
 
@@ -9198,12 +9914,12 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
                                         "WHERE id = '%i'",  new_rs, new_var, s2->GetID());
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(13, "Update failed! MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Updating respawn timer successful.");
+        c->Message(Chat::White, "Updating respawn timer successful.");
         s2->SetRespawnTimer(new_rs);
         s2->SetVariance(new_var);
 
@@ -9212,27 +9928,28 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "setversion") == 0) {
         if (!target || !target->IsNPC()) {
-            c->Message(0, "Error: Need an NPC target.");
+            c->Message(Chat::White, "Error: Need an NPC target.");
             return;
         }
 
         if(!sep->IsNumber(2)) {
-            c->Message(0, "setversion FAILED -- You must set a version number");
+            c->Message(Chat::White, "setversion FAILED -- You must set a version number");
             return;
         }
 
         int16 version = atoi(sep->arg[2]);
         std::string query = StringFormat("UPDATE spawn2 SET version = %i "
                                         "WHERE spawngroupID = '%i'",
-                                        version, c->GetTarget()->CastToNPC()->GetSp2());
+                                        version, c->GetTarget()->CastToNPC()->GetSpawnGroupId());
         auto results = database.QueryDatabase(query);
         if (!results.Success()) {
-            c->Message(13, "Update failed! MySQL gave the following error:");
-            c->Message(13, results.ErrorMessage().c_str());
+            c->Message(Chat::Red, "Update failed! MySQL gave the following error:");
+            c->Message(Chat::Red, results.ErrorMessage().c_str());
             return;
         }
 
-        c->Message(0, "Version change to %i was successful from SpawnGroupID %i",  version, c->GetTarget()->CastToNPC()->GetSp2());
+        c->Message(Chat::White, "Version change to %i was successful from SpawnGroupID %i",  version,
+				   c->GetTarget()->CastToNPC()->GetSpawnGroupId());
         c->GetTarget()->Depop(false);
 
         return;
@@ -9240,13 +9957,13 @@ void command_advnpcspawn(Client *c, const Seperator *sep)
 
 	if (strcasecmp(sep->arg[1], "testload") == 0 && atoi(sep->arg[2])!=0) {
         database.LoadSpawnGroupsByID(atoi(sep->arg[2]),&zone->spawn_group_list);
-        c->Message(0, "Group %i loaded successfully!",  atoi(sep->arg[2]));
+        c->Message(Chat::White, "Group %i loaded successfully!",  atoi(sep->arg[2]));
         return;
     }
 
-    c->Message(0, "Error: #advnpcspawn: Invalid command.");
-    c->Message(0, "Usage: #advnpcspawn [maketype|makegroup|addgroupentry|addgroupspawn|setversion]");
-    c->Message(0, "Usage: #advnpcspawn [removegroupspawn|movespawn|editrespawn|editgroupbox|cleargroupbox]");
+    c->Message(Chat::White, "Error: #advnpcspawn: Invalid command.");
+    c->Message(Chat::White, "Usage: #advnpcspawn [maketype|makegroup|addgroupentry|addgroupspawn|setversion]");
+    c->Message(Chat::White, "Usage: #advnpcspawn [removegroupspawn|movespawn|editrespawn|editgroupbox|cleargroupbox]");
 }
 
 void command_aggrozone(Client *c, const Seperator *sep) {
@@ -9260,7 +9977,7 @@ void command_aggrozone(Client *c, const Seperator *sep) {
 
 	uint32 hate = atoi(sep->arg[1]); //should default to 0 if we don't enter anything
 	entity_list.AggroZone(m, hate);
-	c->Message(0, "Train to you! Last chance to go invulnerable...");
+	c->Message(Chat::White, "Train to you! Last chance to go invulnerable...");
 }
 
 void command_modifynpcstat(Client *c, const Seperator *sep)
@@ -9270,8 +9987,8 @@ void command_modifynpcstat(Client *c, const Seperator *sep)
 
 	if(sep->arg[1][0] == '\0')
 	{
-		c->Message(0, "usage #modifynpcstat arg value");
-		c->Message(0, "Args: ac, str, sta, agi, dex, wis, _int, cha, max_hp, mr, fr, cr, pr, dr, runspeed, special_attacks, "
+		c->Message(Chat::White, "usage #modifynpcstat arg value");
+		c->Message(Chat::White, "Args: ac, str, sta, agi, dex, wis, _int, cha, max_hp, mr, fr, cr, pr, dr, runspeed, special_attacks, "
 			"attack_speed, atk, accuracy, trackable, min_hit, max_hit, see_invis_undead, see_hide, see_improved_hide, "
 			"hp_regen, mana_regen, aggro, assist, slow_mitigation, loottable_id, healscale, spellscale");
 		return;
@@ -9301,22 +10018,22 @@ void command_instance(Client *c, const Seperator *sep)
 
 	if(strcasecmp(sep->arg[1], "help") == 0)
 	{
-		c->Message(0, "#instance usage:");
-		c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
+		c->Message(Chat::White, "#instance usage:");
+		c->Message(Chat::White, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
 			"zone with id matching zone_id, will last for duration seconds.");
-		c->Message(0, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
-		c->Message(0, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
+		c->Message(Chat::White, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
+		c->Message(Chat::White, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
 			"with id matching instance_id.");
-		c->Message(0, "#instance remove instance_id player_name - removes the player 'player_name' from the "
+		c->Message(Chat::White, "#instance remove instance_id player_name - removes the player 'player_name' from the "
 			"instance with id matching instance_id.");
-		c->Message(0, "#instance list player_name - lists all the instances 'player_name' is apart of.");
+		c->Message(Chat::White, "#instance list player_name - lists all the instances 'player_name' is apart of.");
 		return;
 	}
 	else if(strcasecmp(sep->arg[1], "create") == 0)
 	{
 		if(!sep->IsNumber(3) || !sep->IsNumber(4))
 		{
-			c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
+			c->Message(Chat::White, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
 				"zone with id matching zone_id, will last for duration seconds.");
 			return;
 		}
@@ -9339,42 +10056,42 @@ void command_instance(Client *c, const Seperator *sep)
 
 		if(!zn)
 		{
-			c->Message(0, "Zone with id %lu was not found by the server.",  (unsigned long)zone_id);
+			c->Message(Chat::White, "Zone with id %lu was not found by the server.",  (unsigned long)zone_id);
 			return;
 		}
 
 		uint16 id = 0;
 		if(!database.GetUnusedInstanceID(id))
 		{
-			c->Message(0, "Server was unable to find a free instance id.");
+			c->Message(Chat::White, "Server was unable to find a free instance id.");
 			return;
 		}
 
 		if(!database.CreateInstance(id, zone_id, version, duration))
 		{
-			c->Message(0, "Server was unable to create a new instance.");
+			c->Message(Chat::White, "Server was unable to create a new instance.");
 			return;
 		}
 
-		c->Message(0, "New instance %s was created with id %lu.",  zn, (unsigned long)id);
+		c->Message(Chat::White, "New instance %s was created with id %lu.",  zn, (unsigned long)id);
 	}
 	else if(strcasecmp(sep->arg[1], "destroy") == 0)
 	{
 		if(!sep->IsNumber(2))
 		{
-			c->Message(0, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
+			c->Message(Chat::White, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
 			return;
 		}
 
 		uint16 id = atoi(sep->arg[2]);
 		database.DeleteInstance(id);
-		c->Message(0, "Destroyed instance with id %lu.",  (unsigned long)id);
+		c->Message(Chat::White, "Destroyed instance with id %lu.",  (unsigned long)id);
 	}
 	else if(strcasecmp(sep->arg[1], "add") == 0)
 	{
 		if(!sep->IsNumber(2))
 		{
-			c->Message(0, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
+			c->Message(Chat::White, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
 				"with id matching instance_id.");
 			return;
 		}
@@ -9384,13 +10101,13 @@ void command_instance(Client *c, const Seperator *sep)
 
 		if(id <= 0 || charid <= 0)
 		{
-			c->Message(0, "Must enter a valid instance id and player name.");
+			c->Message(Chat::White, "Must enter a valid instance id and player name.");
 			return;
 		}
 
 		if(!database.CheckInstanceExists(id))
 		{
-			c->Message(0, "Instance does not exist.");
+			c->Message(Chat::White, "Instance does not exist.");
 			return;
 		}
 
@@ -9401,23 +10118,23 @@ void command_instance(Client *c, const Seperator *sep)
 		{
 			if(database.AddClientToInstance(id, charid))
 			{
-				c->Message(0, "Added client to instance.");
+				c->Message(Chat::White, "Added client to instance.");
 			}
 			else
 			{
-				c->Message(0, "Failed to add client to instance.");
+				c->Message(Chat::White, "Failed to add client to instance.");
 			}
 		}
 		else
 		{
-			c->Message(0, "Client was already saved to %u which has uses the same zone and version as that instance.",  cur_id);
+			c->Message(Chat::White, "Client was already saved to %u which has uses the same zone and version as that instance.",  cur_id);
 		}
 	}
 	else if(strcasecmp(sep->arg[1], "remove") == 0)
 	{
 		if(!sep->IsNumber(2))
 		{
-			c->Message(0, "#instance remove instance_id player_name - removes the player 'player_name' from the "
+			c->Message(Chat::White, "#instance remove instance_id player_name - removes the player 'player_name' from the "
 				"instance with id matching instance_id.");
 			return;
 		}
@@ -9427,16 +10144,16 @@ void command_instance(Client *c, const Seperator *sep)
 
 		if(id <= 0 || charid <= 0)
 		{
-			c->Message(0, "Must enter a valid instance id and player name.");
+			c->Message(Chat::White, "Must enter a valid instance id and player name.");
 		}
 
 		if(database.RemoveClientFromInstance(id, charid))
 		{
-			c->Message(0, "Removed client from instance.");
+			c->Message(Chat::White, "Removed client from instance.");
 		}
 		else
 		{
-			c->Message(0, "Failed to remove client from instance.");
+			c->Message(Chat::White, "Failed to remove client from instance.");
 		}
 	}
 	else if(strcasecmp(sep->arg[1], "list") == 0)
@@ -9446,7 +10163,7 @@ void command_instance(Client *c, const Seperator *sep)
 		{
 			if(c->GetTarget() == nullptr || (c->GetTarget() && !c->GetTarget()->IsClient()))
 			{
-				c->Message(0, "Character not found.");
+				c->Message(Chat::White, "Character not found.");
 				return;
 			}
 			else
@@ -9457,16 +10174,16 @@ void command_instance(Client *c, const Seperator *sep)
 	}
 	else
 	{
-		c->Message(0, "Invalid Argument.");
-		c->Message(0, "#instance usage:");
-		c->Message(0, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
+		c->Message(Chat::White, "Invalid Argument.");
+		c->Message(Chat::White, "#instance usage:");
+		c->Message(Chat::White, "#instance create zone_id version duration - Creates an instance of version 'version' in the "
 			"zone with id matching zone_id, will last for duration seconds.");
-		c->Message(0, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
-		c->Message(0, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
+		c->Message(Chat::White, "#instance destroy instance_id - Destroys the instance with id matching instance_id.");
+		c->Message(Chat::White, "#instance add instance_id player_name - adds the player 'player_name' to the instance "
 			"with id matching instance_id.");
-		c->Message(0, "#instance remove instance_id player_name - removes the player 'player_name' from the "
+		c->Message(Chat::White, "#instance remove instance_id player_name - removes the player 'player_name' from the "
 			"instance with id matching instance_id.");
-		c->Message(0, "#instance list player_name - lists all the instances 'player_name' is apart of.");
+		c->Message(Chat::White, "#instance list player_name - lists all the instances 'player_name' is apart of.");
 		return;
 	}
 }
@@ -9478,8 +10195,8 @@ void command_setstartzone(Client *c, const Seperator *sep)
 	if(c->GetTarget() && c->GetTarget()->IsClient() && sep->arg[1][0] != 0)
 		target = c->GetTarget()->CastToClient();
 	else {
-		c->Message(0, "Usage: (needs PC target) #setstartzone zonename");
-		c->Message(0, "Optional Usage: Use '#setstartzone reset' or '#setstartzone 0' to clear a starting zone. Player can select a starting zone using /setstartcity");
+		c->Message(Chat::White, "Usage: (needs PC target) #setstartzone zonename");
+		c->Message(Chat::White, "Optional Usage: Use '#setstartzone reset' or '#setstartzone 0' to clear a starting zone. Player can select a starting zone using /setstartcity");
 		return;
 	}
 
@@ -9492,7 +10209,7 @@ void command_setstartzone(Client *c, const Seperator *sep)
 	else {
 		startzone = database.GetZoneID(sep->arg[1]);
 		if(startzone == 0) {
-			c->Message(0, "Unable to locate zone '%s'",  sep->arg[1]);
+			c->Message(Chat::White, "Unable to locate zone '%s'",  sep->arg[1]);
 			return;
 		}
 	}
@@ -9508,73 +10225,73 @@ void command_netstats(Client *c, const Seperator *sep)
 		if (c->GetTarget() && c->GetTarget()->IsClient()) {
 			client = c->GetTarget()->CastToClient();
 		}
-		
+
 		if (strcasecmp(sep->arg[1], "reset") == 0) {
 			auto connection = c->Connection();
-			c->Message(0, "Resetting client stats (packet loss will not read correctly after reset).");
+			c->Message(Chat::White, "Resetting client stats (packet loss will not read correctly after reset).");
 			connection->ResetStats();
 			return;
 		}
-		
+
 		auto connection = c->Connection();
 		auto opts = connection->GetManager()->GetOptions();
 		auto eqs_stats = connection->GetStats();
 		auto &stats = eqs_stats.DaybreakStats;
 		auto now = EQ::Net::Clock::now();
 		auto sec_since_stats_reset = std::chrono::duration_cast<std::chrono::duration<double>>(now - stats.created).count();
-		
-		c->Message(0, "Netstats:");
-		c->Message(0, "--------------------------------------------------------------------");
-		c->Message(0, "Sent Bytes: %u (%.2f/sec)", stats.sent_bytes, stats.sent_bytes / sec_since_stats_reset);
-		c->Message(0, "Recv Bytes: %u (%.2f/sec)", stats.recv_bytes, stats.recv_bytes / sec_since_stats_reset);
-		c->Message(0, "Bytes Before Encode (Sent): %u, Compression Rate: %.2f%%", stats.bytes_before_encode, 
+
+		c->Message(Chat::White, "Netstats:");
+		c->Message(Chat::White, "--------------------------------------------------------------------");
+		c->Message(Chat::White, "Sent Bytes: %u (%.2f/sec)", stats.sent_bytes, stats.sent_bytes / sec_since_stats_reset);
+		c->Message(Chat::White, "Recv Bytes: %u (%.2f/sec)", stats.recv_bytes, stats.recv_bytes / sec_since_stats_reset);
+		c->Message(Chat::White, "Bytes Before Encode (Sent): %u, Compression Rate: %.2f%%", stats.bytes_before_encode,
 			static_cast<double>(stats.bytes_before_encode - stats.sent_bytes) / static_cast<double>(stats.bytes_before_encode) * 100.0);
-		c->Message(0, "Bytes After Decode (Recv): %u, Compression Rate: %.2f%%", stats.bytes_after_decode,
+		c->Message(Chat::White, "Bytes After Decode (Recv): %u, Compression Rate: %.2f%%", stats.bytes_after_decode,
 			static_cast<double>(stats.bytes_after_decode - stats.recv_bytes) / static_cast<double>(stats.bytes_after_decode) * 100.0);
-		c->Message(0, "Min Ping: %u", stats.min_ping);
-		c->Message(0, "Max Ping: %u", stats.max_ping);
-		c->Message(0, "Last Ping: %u", stats.last_ping);
-		c->Message(0, "Average Ping: %u", stats.avg_ping);
-		c->Message(0, "--------------------------------------------------------------------");
-		c->Message(0, "(Realtime) Recv Packets: %u (%.2f/sec)", stats.recv_packets, stats.recv_packets / sec_since_stats_reset);
-		c->Message(0, "(Realtime) Sent Packets: %u (%.2f/sec)", stats.sent_packets, stats.sent_packets / sec_since_stats_reset);
-		c->Message(0, "(Sync) Recv Packets: %u", stats.sync_recv_packets);
-		c->Message(0, "(Sync) Sent Packets: %u", stats.sync_sent_packets);
-		c->Message(0, "(Sync) Remote Recv Packets: %u", stats.sync_remote_recv_packets);
-		c->Message(0, "(Sync) Remote Sent Packets: %u", stats.sync_remote_sent_packets);
-		c->Message(0, "Packet Loss In: %.2f%%", 100.0 * (1.0 - static_cast<double>(stats.sync_recv_packets) / static_cast<double>(stats.sync_remote_sent_packets)));
-		c->Message(0, "Packet Loss Out: %.2f%%", 100.0 * (1.0 - static_cast<double>(stats.sync_remote_recv_packets) / static_cast<double>(stats.sync_sent_packets)));
-		c->Message(0, "--------------------------------------------------------------------");
-		c->Message(0, "Resent Packets: %u (%.2f/sec)", stats.resent_packets, stats.resent_packets / sec_since_stats_reset);
-		c->Message(0, "Resent Fragments: %u (%.2f/sec)", stats.resent_fragments, stats.resent_fragments / sec_since_stats_reset);
-		c->Message(0, "Resent Non-Fragments: %u (%.2f/sec)", stats.resent_full, stats.resent_full / sec_since_stats_reset);
-		c->Message(0, "Dropped Datarate Packets: %u (%.2f/sec)", stats.dropped_datarate_packets, stats.dropped_datarate_packets / sec_since_stats_reset);
-		
+		c->Message(Chat::White, "Min Ping: %u", stats.min_ping);
+		c->Message(Chat::White, "Max Ping: %u", stats.max_ping);
+		c->Message(Chat::White, "Last Ping: %u", stats.last_ping);
+		c->Message(Chat::White, "Average Ping: %u", stats.avg_ping);
+		c->Message(Chat::White, "--------------------------------------------------------------------");
+		c->Message(Chat::White, "(Realtime) Recv Packets: %u (%.2f/sec)", stats.recv_packets, stats.recv_packets / sec_since_stats_reset);
+		c->Message(Chat::White, "(Realtime) Sent Packets: %u (%.2f/sec)", stats.sent_packets, stats.sent_packets / sec_since_stats_reset);
+		c->Message(Chat::White, "(Sync) Recv Packets: %u", stats.sync_recv_packets);
+		c->Message(Chat::White, "(Sync) Sent Packets: %u", stats.sync_sent_packets);
+		c->Message(Chat::White, "(Sync) Remote Recv Packets: %u", stats.sync_remote_recv_packets);
+		c->Message(Chat::White, "(Sync) Remote Sent Packets: %u", stats.sync_remote_sent_packets);
+		c->Message(Chat::White, "Packet Loss In: %.2f%%", 100.0 * (1.0 - static_cast<double>(stats.sync_recv_packets) / static_cast<double>(stats.sync_remote_sent_packets)));
+		c->Message(Chat::White, "Packet Loss Out: %.2f%%", 100.0 * (1.0 - static_cast<double>(stats.sync_remote_recv_packets) / static_cast<double>(stats.sync_sent_packets)));
+		c->Message(Chat::White, "--------------------------------------------------------------------");
+		c->Message(Chat::White, "Resent Packets: %u (%.2f/sec)", stats.resent_packets, stats.resent_packets / sec_since_stats_reset);
+		c->Message(Chat::White, "Resent Fragments: %u (%.2f/sec)", stats.resent_fragments, stats.resent_fragments / sec_since_stats_reset);
+		c->Message(Chat::White, "Resent Non-Fragments: %u (%.2f/sec)", stats.resent_full, stats.resent_full / sec_since_stats_reset);
+		c->Message(Chat::White, "Dropped Datarate Packets: %u (%.2f/sec)", stats.dropped_datarate_packets, stats.dropped_datarate_packets / sec_since_stats_reset);
+
 		if (opts.daybreak_options.outgoing_data_rate > 0.0) {
-			c->Message(0, "Outgoing Link Saturation %.2f%% (%.2fkb/sec)", 100.0 * (1.0 - ((opts.daybreak_options.outgoing_data_rate - stats.datarate_remaining) / opts.daybreak_options.outgoing_data_rate)), opts.daybreak_options.outgoing_data_rate);
+			c->Message(Chat::White, "Outgoing Link Saturation %.2f%% (%.2fkb/sec)", 100.0 * (1.0 - ((opts.daybreak_options.outgoing_data_rate - stats.datarate_remaining) / opts.daybreak_options.outgoing_data_rate)), opts.daybreak_options.outgoing_data_rate);
 		}
-		
+
 		if (strcasecmp(sep->arg[1], "full") == 0) {
-			c->Message(0, "--------------------------------------------------------------------");
-			c->Message(0, "Sent Packet Types");
+			c->Message(Chat::White, "--------------------------------------------------------------------");
+			c->Message(Chat::White, "Sent Packet Types");
 			for (auto i = 0; i < _maxEmuOpcode; ++i) {
 				auto cnt = eqs_stats.SentCount[i];
 				if (cnt > 0) {
-					c->Message(0, "%s: %u (%.2f / sec)", OpcodeNames[i], cnt, cnt / sec_since_stats_reset);
+					c->Message(Chat::White, "%s: %u (%.2f / sec)", OpcodeNames[i], cnt, cnt / sec_since_stats_reset);
 				}
 			}
 
-			c->Message(0, "--------------------------------------------------------------------");
-			c->Message(0, "Recv Packet Types");
+			c->Message(Chat::White, "--------------------------------------------------------------------");
+			c->Message(Chat::White, "Recv Packet Types");
 			for (auto i = 0; i < _maxEmuOpcode; ++i) {
 				auto cnt = eqs_stats.RecvCount[i];
 				if (cnt > 0) {
-					c->Message(0, "%s: %u (%.2f / sec)", OpcodeNames[i], cnt, cnt / sec_since_stats_reset);
+					c->Message(Chat::White, "%s: %u (%.2f / sec)", OpcodeNames[i], cnt, cnt / sec_since_stats_reset);
 				}
 			}
 		}
-		
-		c->Message(0, "--------------------------------------------------------------------");
+
+		c->Message(Chat::White, "--------------------------------------------------------------------");
 	}
 }
 
@@ -9587,7 +10304,7 @@ void command_object(Client *c, const Seperator *sep)
 	const char *usage_string = "Usage: #object List|Add|Edit|Move|Rotate|Save|Copy|Delete|Undo";
 
 	if ((!sep) || (sep->argnum == 0)) {
-		c->Message(0, usage_string);
+		c->Message(Chat::White, usage_string);
 		return;
 	}
 
@@ -9620,7 +10337,7 @@ void command_object(Client *c, const Seperator *sep)
 		// Insufficient or invalid args
 		if ((sep->argnum < 2) || (sep->arg[2][0] < '0') ||
 		    ((sep->arg[2][0] > '9') && ((sep->arg[2][0] & 0xDF) != 'A'))) {
-			c->Message(0, "Usage: #object List All|(radius)");
+			c->Message(Chat::White, "Usage: #object List All|(radius)");
 			return;
 		}
 
@@ -9630,9 +10347,9 @@ void command_object(Client *c, const Seperator *sep)
 			radius = 500; // Invalid radius. Default to 500 units.
 
 		if (radius == 0)
-			c->Message(0, "Objects within this zone:");
+			c->Message(Chat::White, "Objects within this zone:");
 		else
-			c->Message(0, "Objects within %u units of your current location:", radius);
+			c->Message(Chat::White, "Objects within %u units of your current location:", radius);
 
 		std::string query;
 		if (radius)
@@ -9657,7 +10374,7 @@ void command_object(Client *c, const Seperator *sep)
 
 		auto results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			c->Message(0, "Error in objects query");
+			c->Message(Chat::White, "Error in objects query");
 			return;
 		}
 
@@ -9684,27 +10401,27 @@ void command_object(Client *c, const Seperator *sep)
 				if (od.size == 0) // Unknown08 field is optional Size parameter for static objects
 					od.size = 100; // Static object default Size is 100%
 
-				c->Message(0, "- STATIC Object (%s): id %u, x %.1f, y %.1f, z %.1f, h %.1f, model %s, "
+				c->Message(Chat::White, "- STATIC Object (%s): id %u, x %.1f, y %.1f, z %.1f, h %.1f, model %s, "
 					      "size %u, solidtype %u, incline %u",
 					   (od.object_type == 0) ? "locked" : "unlocked", id, od.x, od.y, od.z,
 					   od.heading, od.object_name, od.size, od.solidtype, od.unknown020);
 				break;
 
 			case OT_DROPPEDITEM: // Ground Spawn
-				c->Message(0, "- TEMPORARY Object: id %u, x %.1f, y %.1f, z %.1f, h %.1f, itemid %u, "
+				c->Message(Chat::White, "- TEMPORARY Object: id %u, x %.1f, y %.1f, z %.1f, h %.1f, itemid %u, "
 					      "model %s, icon %u",
 					   id, od.x, od.y, od.z, od.heading, itemid, od.object_name, icon);
 				break;
 
 			default: // All others == Tradeskill Objects
-				c->Message(0, "- TRADESKILL Object: id %u, x %.1f, y %.1f, z %.1f, h %.1f, model %s, "
+				c->Message(Chat::White, "- TRADESKILL Object: id %u, x %.1f, y %.1f, z %.1f, h %.1f, model %s, "
 					      "type %u, icon %u",
 					   id, od.x, od.y, od.z, od.heading, od.object_name, od.object_type, icon);
 				break;
 			}
 		}
 
-		c->Message(0, "%u object%s found", results.RowCount(), (results.RowCount() == 1) ? "" : "s");
+		c->Message(Chat::White, "%u object%s found", results.RowCount(), (results.RowCount() == 1) ? "" : "s");
 		return;
 	}
 
@@ -9712,10 +10429,10 @@ void command_object(Client *c, const Seperator *sep)
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 3) ||
 		    ((sep->arg[3][0] == '\0') && (sep->arg[4][0] < '0') && (sep->arg[4][0] > '9'))) {
-			c->Message(0, "Usage: (Static Object): #object Add [ObjectID] 0 Model [SizePercent] "
+			c->Message(Chat::White, "Usage: (Static Object): #object Add [ObjectID] 0 Model [SizePercent] "
 				      "[SolidType] [Incline]");
-			c->Message(0, "Usage: (Tradeskill Object): #object Add [ObjectID] TypeNum Model Icon");
-			c->Message(0, "- Notes: Model must start with a letter, max length 16. SolidTypes = 0 (Solid), "
+			c->Message(Chat::White, "Usage: (Tradeskill Object): #object Add [ObjectID] TypeNum Model Icon");
+			c->Message(Chat::White, "- Notes: Model must start with a letter, max length 16. SolidTypes = 0 (Solid), "
 				      "1 (Sometimes Non-Solid)");
 			return;
 		}
@@ -9757,7 +10474,7 @@ void command_object(Client *c, const Seperator *sep)
 			break;
 
 		case 1: // Ground Spawn
-			c->Message(0, "ERROR: Object Type 1 is used for temporarily spawned ground spawns and dropped "
+			c->Message(Chat::White, "ERROR: Object Type 1 is used for temporarily spawned ground spawns and dropped "
 				      "items, which are not supported with #object. See the 'ground_spawns' table in "
 				      "the database.");
 			return;
@@ -9766,7 +10483,7 @@ void command_object(Client *c, const Seperator *sep)
 			icon = ((sep->argnum - col) > 3) ? atoi(sep->arg[4 + col]) : 0;
 
 			if (icon == 0) {
-				c->Message(0, "ERROR: Required property 'Icon' not specified for Tradeskill Object");
+				c->Message(Chat::White, "ERROR: Required property 'Icon' not specified for Tradeskill Object");
 				return;
 			}
 
@@ -9795,7 +10512,7 @@ void command_object(Client *c, const Seperator *sep)
 				id = 0;
 
 			if (id == 0) {
-				c->Message(0, "ERROR: An object already exists with the id %u", atoi(sep->arg[2]));
+				c->Message(Chat::White, "ERROR: An object already exists with the id %u", atoi(sep->arg[2]));
 				return;
 			}
 		}
@@ -9823,7 +10540,7 @@ void command_object(Client *c, const Seperator *sep)
 			objectsFound = 1;
 
 		if (objectsFound) {
-			c->Message(0, "ERROR: Object already at this location.");
+			c->Message(Chat::White, "ERROR: Object already at this location.");
 			return;
 		}
 
@@ -9844,7 +10561,7 @@ void command_object(Client *c, const Seperator *sep)
 		strupr(od.object_name); // Model names are always upper-case.
 
 		if ((od.object_name[0] < 'A') || (od.object_name[0] > 'Z')) {
-			c->Message(0, "ERROR: Model name must start with a letter.");
+			c->Message(Chat::White, "ERROR: Model name must start with a letter.");
 			return;
 		}
 
@@ -9885,13 +10602,13 @@ void command_object(Client *c, const Seperator *sep)
 		y2 = 10.0f * cos(c->GetHeading() / 256.0f * 3.14159265f);
 		c->MovePC(c->GetX() - x2, c->GetY() - y2, c->GetZ(), c->GetHeading());
 
-		c->Message(0, "Spawning object with tentative id %u at location (%.1f, %.1f, %.1f heading %.1f). Use "
+		c->Message(Chat::White, "Spawning object with tentative id %u at location (%.1f, %.1f, %.1f heading %.1f). Use "
 			      "'#object Save' to save to database when satisfied with placement.",
 			   id, od.x, od.y, od.z, od.heading);
 
 		// Temporary Static Object
 		if (od.object_type == staticType)
-			c->Message(0, "- Note: Static Object will act like a tradeskill container and will not reflect "
+			c->Message(Chat::White, "- Note: Static Object will act like a tradeskill container and will not reflect "
 				      "size, solidtype, or incline values until you commit with '#object Save', after "
 				      "which it will be unchangeable until you use '#object Edit' and zone back in.");
 
@@ -9901,9 +10618,9 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "edit") == 0) {
 
 		if ((sep->argnum < 2) || ((id = atoi(sep->arg[2])) < 1)) {
-			c->Message(0, "Usage: #object Edit (ObjectID) [PropertyName] [NewValue]");
-			c->Message(0, "- Static Object (Type 0) Properties: model, type, size, solidtype, incline");
-			c->Message(0, "- Tradeskill Object (Type 2+) Properties: model, type, icon");
+			c->Message(Chat::White, "Usage: #object Edit (ObjectID) [PropertyName] [NewValue]");
+			c->Message(Chat::White, "- Static Object (Type 0) Properties: model, type, size, solidtype, incline");
+			c->Message(Chat::White, "- Tradeskill Object (Type 2+) Properties: model, type, icon");
 
 			return;
 		}
@@ -9915,7 +10632,7 @@ void command_object(Client *c, const Seperator *sep)
 			// Yep, looks like we can make real-time changes.
 			if (sep->argnum < 4) {
 				// Or not. '#object Edit (ObjectID)' called without PropertyName and NewValue
-				c->Message(0, "Note: Object %u already unlocked and ready for changes", id);
+				c->Message(Chat::White, "Note: Object %u already unlocked and ready for changes", id);
 				return;
 			}
 		} else {
@@ -9923,7 +10640,7 @@ void command_object(Client *c, const Seperator *sep)
 			std::string query = StringFormat("SELECT zoneid, version, type FROM object WHERE id = %u", id);
 			auto results = database.QueryDatabase(query);
 			if (!results.Success() || results.RowCount() == 0) {
-				c->Message(0, "ERROR: Object %u not found", id);
+				c->Message(Chat::White, "ERROR: Object %u not found", id);
 				return;
 			}
 
@@ -9935,13 +10652,13 @@ void command_object(Client *c, const Seperator *sep)
 
 			// Object not in this zone?
 			if (od.zone_id != zone->GetZoneID()) {
-				c->Message(0, "ERROR: Object %u not in this zone.", id);
+				c->Message(Chat::White, "ERROR: Object %u not in this zone.", id);
 				return;
 			}
 
 			// Object not in this instance?
 			if (od.zone_instance != zone->GetInstanceVersion()) {
-				c->Message(0, "ERROR: Object %u not part of this instance version.", id);
+				c->Message(Chat::White, "ERROR: Object %u not part of this instance version.", id);
 				return;
 			}
 
@@ -9952,23 +10669,23 @@ void command_object(Client *c, const Seperator *sep)
 
 				database.QueryDatabase(query);
 
-				c->Message(0, "Static Object %u unlocked for editing. You must zone out and back in to "
+				c->Message(Chat::White, "Static Object %u unlocked for editing. You must zone out and back in to "
 					      "make your changes, then commit them with '#object Save'.",
 					   id);
 				if (sep->argnum >= 4)
-					c->Message(0, "NOTE: The change you specified has not been applied, since the "
+					c->Message(Chat::White, "NOTE: The change you specified has not been applied, since the "
 						      "static object had not been unlocked for editing yet.");
 				return;
 
 			case OT_DROPPEDITEM:
-				c->Message(0, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, "
+				c->Message(Chat::White, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, "
 					      "which cannot be manipulated with #object. See the 'ground_spawns' table "
 					      "in the database.",
 					   id);
 				return;
 
 			case staticType:
-				c->Message(0, "ERROR: Object %u has been unlocked for editing, but you must zone out "
+				c->Message(Chat::White, "ERROR: Object %u has been unlocked for editing, but you must zone out "
 					      "and back in for your client to refresh its object table before you can "
 					      "make changes to it.",
 					   id);
@@ -9976,7 +10693,7 @@ void command_object(Client *c, const Seperator *sep)
 
 			default:
 				// Unknown error preventing us from seeing the object in the zone.
-				c->Message(0, "ERROR: Unknown problem attempting to manipulate object %u", id);
+				c->Message(Chat::White, "ERROR: Unknown problem attempting to manipulate object %u", id);
 				return;
 			}
 		}
@@ -9993,7 +10710,7 @@ void command_object(Client *c, const Seperator *sep)
 		if (strcmp(sep->arg[3], "model") == 0) {
 
 			if ((sep->arg[4][0] < 'A') || (sep->arg[4][0] > 'Z')) {
-				c->Message(0, "ERROR: Model names must begin with a letter.");
+				c->Message(Chat::White, "ERROR: Model names must begin with a letter.");
 				return;
 			}
 
@@ -10001,10 +10718,10 @@ void command_object(Client *c, const Seperator *sep)
 
 			o->SetObjectData(&od);
 
-			c->Message(0, "Object %u now being rendered with model '%s'", id, od.object_name);
+			c->Message(Chat::White, "Object %u now being rendered with model '%s'", id, od.object_name);
 		} else if (strcmp(sep->arg[3], "type") == 0) {
 			if ((sep->arg[4][0] < '0') || (sep->arg[4][0] > '9')) {
-				c->Message(0, "ERROR: Invalid type number");
+				c->Message(Chat::White, "ERROR: Invalid type number");
 				return;
 			}
 
@@ -10014,20 +10731,20 @@ void command_object(Client *c, const Seperator *sep)
 			case 0:
 				// Convert Static Object to temporary changeable type
 				od.object_type = staticType;
-				c->Message(0, "Note: Static Object will still act like tradeskill object and will not "
+				c->Message(Chat::White, "Note: Static Object will still act like tradeskill object and will not "
 					      "reflect size, solidtype, or incline settings until committed to the "
 					      "database with '#object Save', after which it will be unchangeable until "
 					      "it is unlocked again with '#object Edit'.");
 				break;
 
 			case OT_DROPPEDITEM:
-				c->Message(0, "ERROR: Object Type 1 is used for temporarily spawned ground spawns and "
+				c->Message(Chat::White, "ERROR: Object Type 1 is used for temporarily spawned ground spawns and "
 					      "dropped items, which are not supported with #object. See the "
 					      "'ground_spawns' table in the database.");
 				return;
 
 			default:
-				c->Message(0, "Object %u changed to Tradeskill Object Type %u", id, od.object_type);
+				c->Message(Chat::White, "Object %u changed to Tradeskill Object Type %u", id, od.object_type);
 				break;
 			}
 
@@ -10041,7 +10758,7 @@ void command_object(Client *c, const Seperator *sep)
 			}
 
 			if ((sep->arg[4][0] < '0') || (sep->arg[4][0] > '9')) {
-				c->Message(0, "ERROR: Invalid size specified. Please enter a number.");
+				c->Message(Chat::White, "ERROR: Invalid size specified. Please enter a number.");
 				return;
 			}
 
@@ -10051,47 +10768,47 @@ void command_object(Client *c, const Seperator *sep)
 			if (od.size == 0) // 0 == unspecified == 100%
 				od.size = 100;
 
-			c->Message(0, "Static Object %u set to %u%% size. Size will take effect when you commit to the "
+			c->Message(Chat::White, "Static Object %u set to %u%% size. Size will take effect when you commit to the "
 				      "database with '#object Save', after which the object will be unchangeable until "
 				      "you unlock it again with '#object Edit' and zone out and back in.",
 				   id, od.size);
 		} else if (strcmp(sep->arg[3], "solidtype") == 0) {
 
 			if (od.object_type != staticType) {
-				c->Message(0, "ERROR: Object %u is not a Static Object and does not support the "
+				c->Message(Chat::White, "ERROR: Object %u is not a Static Object and does not support the "
 					      "SolidType property",
 					   id);
 				return;
 			}
 
 			if ((sep->arg[4][0] < '0') || (sep->arg[4][0] > '9')) {
-				c->Message(0, "ERROR: Invalid solidtype specified. Please enter a number.");
+				c->Message(Chat::White, "ERROR: Invalid solidtype specified. Please enter a number.");
 				return;
 			}
 
 			od.solidtype = atoi(sep->arg[4]);
 			o->SetObjectData(&od);
 
-			c->Message(0, "Static Object %u set to SolidType %u. Change will take effect when you commit "
+			c->Message(Chat::White, "Static Object %u set to SolidType %u. Change will take effect when you commit "
 				      "to the database with '#object Save'. Support for this property is on a "
 				      "per-model basis, mostly seen in smaller objects such as chests and tables.",
 					  id, od.solidtype);
 		} else if (strcmp(sep->arg[3], "icon") == 0) {
 
 			if ((od.object_type < 2) || (od.object_type == staticType)) {
-				c->Message(0, "ERROR: Object %u is not a Tradeskill Object and does not support the "
+				c->Message(Chat::White, "ERROR: Object %u is not a Tradeskill Object and does not support the "
 					      "Icon property",
 					   id);
 				return;
 			}
 
 			if ((icon = atoi(sep->arg[4])) == 0) {
-				c->Message(0, "ERROR: Invalid Icon specified. Please enter an icon number.");
+				c->Message(Chat::White, "ERROR: Invalid Icon specified. Please enter an icon number.");
 				return;
 			}
 
 			o->SetIcon(icon);
-			c->Message(0, "Tradeskill Object %u icon set to %u", id, icon);
+			c->Message(Chat::White, "Tradeskill Object %u icon set to %u", id, icon);
 		} else if (strcmp(sep->arg[3], "incline") == 0) {
 			if (od.object_type != staticType) {
 				c->Message(
@@ -10111,12 +10828,12 @@ void command_object(Client *c, const Seperator *sep)
 			od.unknown020 = atoi(sep->arg[4]);
 			o->SetObjectData(&od);
 
-			c->Message(0, "Static Object %u set to %u incline. Incline will take effect when you commit to "
+			c->Message(Chat::White, "Static Object %u set to %u incline. Incline will take effect when you commit to "
 				      "the database with '#object Save', after which the object will be unchangeable "
 				      "until you unlock it again with '#object Edit' and zone out and back in.",
 				   id, od.unknown020);
 		} else {
-			c->Message(0, "ERROR: Unrecognized property name: %s", sep->arg[3]);
+			c->Message(Chat::White, "ERROR: Unrecognized property name: %s", sep->arg[3]);
 			return;
 		}
 
@@ -10139,7 +10856,7 @@ void command_object(Client *c, const Seperator *sep)
 		    ((id = atoi(sep->arg[2])) == 0) || // ID not specified
 		    (((sep->arg[3][0] < '0') || (sep->arg[3][0] > '9')) && ((sep->arg[3][0] & 0xDF) != 'T') &&
 		     (sep->arg[3][0] != '-') && (sep->arg[3][0] != '.'))) { // Location argument not specified correctly
-			c->Message(0, "Usage: #object Move (ObjectID) ToMe|(x y z [h])");
+			c->Message(Chat::White, "Usage: #object Move (ObjectID) ToMe|(x y z [h])");
 			return;
 		}
 
@@ -10147,7 +10864,7 @@ void command_object(Client *c, const Seperator *sep)
 			std::string query = StringFormat("SELECT zoneid, version, type FROM object WHERE id = %u", id);
 			auto results = database.QueryDatabase(query);
 			if (!results.Success() || results.RowCount() == 0) {
-				c->Message(0, "ERROR: Object %u not found", id);
+				c->Message(Chat::White, "ERROR: Object %u not found", id);
 				return;
 			}
 
@@ -10157,38 +10874,38 @@ void command_object(Client *c, const Seperator *sep)
 			od.object_type = atoi(row[2]);
 
 			if (od.zone_id != zone->GetZoneID()) {
-				c->Message(0, "ERROR: Object %u is not in this zone", id);
+				c->Message(Chat::White, "ERROR: Object %u is not in this zone", id);
 				return;
 			}
 
 			if (od.zone_instance != zone->GetInstanceVersion()) {
-				c->Message(0, "ERROR: Object %u is not in this instance version", id);
+				c->Message(Chat::White, "ERROR: Object %u is not in this instance version", id);
 				return;
 			}
 
 			switch (od.object_type) {
 			case 0:
-				c->Message(0, "ERROR: Object %u is not yet unlocked for editing. Use '#object Edit' "
+				c->Message(Chat::White, "ERROR: Object %u is not yet unlocked for editing. Use '#object Edit' "
 					      "then zone out and back in to move it.",
 					   id);
 				return;
 
 			case staticType:
-				c->Message(0, "ERROR: Object %u has been unlocked for editing, but you must zone out "
+				c->Message(Chat::White, "ERROR: Object %u has been unlocked for editing, but you must zone out "
 					      "and back in before your client sees the change and will allow you to "
 					      "move it.",
 					   id);
 				return;
 
 			case 1:
-				c->Message(0, "ERROR: Object %u is a temporary spawned object and cannot be "
+				c->Message(Chat::White, "ERROR: Object %u is a temporary spawned object and cannot be "
 					      "manipulated with #object. See the 'ground_spawns' table in the "
 					      "database.",
 					   id);
 				return;
 
 			default:
-				c->Message(0, "ERROR: Object %u not located in zone.", id);
+				c->Message(Chat::White, "ERROR: Object %u not located in zone.", id);
 				return;
 			}
 		}
@@ -10243,12 +10960,12 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "rotate") == 0) {
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 3) || ((id = atoi(sep->arg[2])) == 0)) {
-			c->Message(0, "Usage: #object Rotate (ObjectID) (Heading, 0-512)");
+			c->Message(Chat::White, "Usage: #object Rotate (ObjectID) (Heading, 0-512)");
 			return;
 		}
 
 		if ((o = entity_list.FindObject(id)) == nullptr) {
-			c->Message(0, "ERROR: Object %u not found in zone, or is a static object not yet unlocked with "
+			c->Message(Chat::White, "ERROR: Object %u not found in zone, or is a static object not yet unlocked with "
 				      "'#object Edit' for editing.",
 				   id);
 			return;
@@ -10272,7 +10989,7 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "save") == 0) {
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 2) || ((id = atoi(sep->arg[2])) == 0)) {
-			c->Message(0, "Usage: #object Save (ObjectID)");
+			c->Message(Chat::White, "Usage: #object Save (ObjectID)");
 			return;
 		}
 
@@ -10300,36 +11017,36 @@ void command_object(Client *c, const Seperator *sep)
 			// Object not found in zone. Can't save an object we can't see.
 
 			if (bNewObject) {
-				c->Message(0, "ERROR: Object %u not found", id);
+				c->Message(Chat::White, "ERROR: Object %u not found", id);
 				return;
 			}
 
 			if (od.zone_id != zone->GetZoneID()) {
-				c->Message(0, "ERROR: Wrong Object ID. %u is not part of this zone.", id);
+				c->Message(Chat::White, "ERROR: Wrong Object ID. %u is not part of this zone.", id);
 				return;
 			}
 
 			if (od.zone_instance != zone->GetInstanceVersion()) {
-				c->Message(0, "ERROR: Wrong Object ID. %u is not part of this instance version.", id);
+				c->Message(Chat::White, "ERROR: Wrong Object ID. %u is not part of this instance version.", id);
 				return;
 			}
 
 			if (od.object_type == 0) {
-				c->Message(0, "ERROR: Static Object %u has already been committed. Use '#object Edit "
+				c->Message(Chat::White, "ERROR: Static Object %u has already been committed. Use '#object Edit "
 					      "%u' and zone out and back in to make changes.",
 					   id, id);
 				return;
 			}
 
 			if (od.object_type == 1) {
-				c->Message(0, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, "
+				c->Message(Chat::White, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, "
 					      "which is not supported with #object. See the 'ground_spawns' table in "
 					      "the database.",
 					   id);
 				return;
 			}
 
-			c->Message(0, "ERROR: Object %u not found.", id);
+			c->Message(Chat::White, "ERROR: Object %u not found.", id);
 			return;
 		}
 
@@ -10382,28 +11099,28 @@ void command_object(Client *c, const Seperator *sep)
 
 		results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			c->Message(0, "Database Error: %s", results.ErrorMessage().c_str());
+			c->Message(Chat::White, "Database Error: %s", results.ErrorMessage().c_str());
 			return;
 		}
 
 		if (results.RowsAffected() == 0) {
 			// No change made, but no error message given
-			c->Message(0, "Database Error: Could not save change to Object %u", id);
+			c->Message(Chat::White, "Database Error: Could not save change to Object %u", id);
 			return;
 		}
 
 		if (bNewObject) {
 			if (newid == results.LastInsertedID()) {
-				c->Message(0, "Saved new Object %u to database", id);
+				c->Message(Chat::White, "Saved new Object %u to database", id);
 				return;
 			}
 
-			c->Message(0, "Saved Object. NOTE: Database returned a new ID number for object: %u", newid);
+			c->Message(Chat::White, "Saved Object. NOTE: Database returned a new ID number for object: %u", newid);
 			id = newid;
 			return;
 		}
 
-		c->Message(0, "Saved changes to Object %u", id);
+		c->Message(Chat::White, "Saved changes to Object %u", id);
 		newid = id;
 
 		if (od.object_type == 0) {
@@ -10477,7 +11194,7 @@ void command_object(Client *c, const Seperator *sep)
 			entity_list.QueueClients(0, app);
 			safe_delete(app);
 
-			c->Message(0, "NOTE: Object %u is now a static object, and is unchangeable. To make future "
+			c->Message(Chat::White, "NOTE: Object %u is now a static object, and is unchangeable. To make future "
 				      "changes, use '#object Edit' to convert it to a changeable form, then zone out "
 				      "and back in.",
 				   id);
@@ -10489,15 +11206,15 @@ void command_object(Client *c, const Seperator *sep)
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 3) ||
 		    (((sep->arg[2][0] & 0xDF) != 'A') && ((sep->arg[2][0] < '0') || (sep->arg[2][0] > '9')))) {
-			c->Message(0, "Usage: #object Copy All|(ObjectID) (InstanceVersion)");
-			c->Message(0, "- Note: Only objects saved in the database can be copied to another instance.");
+			c->Message(Chat::White, "Usage: #object Copy All|(ObjectID) (InstanceVersion)");
+			c->Message(Chat::White, "- Note: Only objects saved in the database can be copied to another instance.");
 			return;
 		}
 
 		od.zone_instance = atoi(sep->arg[3]);
 
 		if (od.zone_instance == zone->GetInstanceVersion()) {
-			c->Message(0, "ERROR: Source and destination instance versions are the same.");
+			c->Message(Chat::White, "ERROR: Source and destination instance versions are the same.");
 			return;
 		}
 
@@ -10514,11 +11231,11 @@ void command_object(Client *c, const Seperator *sep)
 					 od.zone_instance, zone->GetZoneID(), zone->GetInstanceVersion());
 			auto results = database.QueryDatabase(query);
 			if (!results.Success()) {
-				c->Message(0, "Database Error: %s", results.ErrorMessage().c_str());
+				c->Message(Chat::White, "Database Error: %s", results.ErrorMessage().c_str());
 				return;
 			}
 
-			c->Message(0, "Copied %u object%s into instance version %u", results.RowCount(),
+			c->Message(Chat::White, "Copied %u object%s into instance version %u", results.RowCount(),
 				   (results.RowCount() == 1) ? "" : "s", od.zone_instance);
 			return;
 		}
@@ -10534,7 +11251,7 @@ void command_object(Client *c, const Seperator *sep)
 						 od.zone_instance, id, zone->GetZoneID(), zone->GetInstanceVersion());
 		auto results = database.QueryDatabase(query);
 		if (results.Success() && results.RowsAffected() > 0) {
-			c->Message(0, "Copied Object %u into instance version %u", id, od.zone_instance);
+			c->Message(Chat::White, "Copied Object %u into instance version %u", id, od.zone_instance);
 			return;
 		}
 
@@ -10542,7 +11259,7 @@ void command_object(Client *c, const Seperator *sep)
 
 		// got an error message
 		if (!results.Success()) {
-			c->Message(0, "Database Error: %s", results.ErrorMessage().c_str());
+			c->Message(Chat::White, "Database Error: %s", results.ErrorMessage().c_str());
 			return;
 		}
 
@@ -10554,25 +11271,25 @@ void command_object(Client *c, const Seperator *sep)
 			return;
 
 		if (results.RowCount() == 0) {
-			c->Message(0, "ERROR: Object %u not found", id);
+			c->Message(Chat::White, "ERROR: Object %u not found", id);
 			return;
 		}
 
 		auto row = results.begin();
 		// Wrong ZoneID?
 		if (atoi(row[0]) != zone->GetZoneID()) {
-			c->Message(0, "ERROR: Object %u is not part of this zone.", id);
+			c->Message(Chat::White, "ERROR: Object %u is not part of this zone.", id);
 			return;
 		}
 
 		// Wrong Instance Version?
 		if (atoi(row[1]) != zone->GetInstanceVersion()) {
-			c->Message(0, "ERROR: Object %u is not part of this instance version.", id);
+			c->Message(Chat::White, "ERROR: Object %u is not part of this instance version.", id);
 			return;
 		}
 
 		// Well, NO clue at this point. Just let 'em know something screwed up.
-		c->Message(0, "ERROR: Unknown database error copying Object %u to instance version %u", id,
+		c->Message(Chat::White, "ERROR: Unknown database error copying Object %u to instance version %u", id,
 			   od.zone_instance);
 		return;
 	}
@@ -10580,7 +11297,7 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "delete") == 0) {
 
 		if ((sep->argnum < 2) || ((id = atoi(sep->arg[2])) <= 0)) {
-			c->Message(0, "Usage: #object Delete (ObjectID) -- NOTE: Object deletions are permanent and "
+			c->Message(Chat::White, "Usage: #object Delete (ObjectID) -- NOTE: Object deletions are permanent and "
 				      "cannot be undone!");
 			return;
 		}
@@ -10604,7 +11321,7 @@ void command_object(Client *c, const Seperator *sep)
 							 id, zone->GetZoneID(), zone->GetInstanceVersion());
 			auto results = database.QueryDatabase(query);
 
-			c->Message(0, "Object %u deleted", id);
+			c->Message(Chat::White, "Object %u deleted", id);
 			return;
 		}
 
@@ -10618,7 +11335,7 @@ void command_object(Client *c, const Seperator *sep)
 			return;
 
 		if (results.RowCount() == 0) {
-			c->Message(0, "ERROR: Object %u not found in this zone or instance!", id);
+			c->Message(Chat::White, "ERROR: Object %u not found in this zone or instance!", id);
 			return;
 		}
 
@@ -10631,13 +11348,13 @@ void command_object(Client *c, const Seperator *sep)
 					     id, zone->GetZoneID(), zone->GetInstanceVersion());
 			results = database.QueryDatabase(query);
 
-			c->Message(0, "Object %u deleted. NOTE: This static object will remain for anyone currently in "
+			c->Message(Chat::White, "Object %u deleted. NOTE: This static object will remain for anyone currently in "
 				      "the zone until they next zone out and in.",
 				   id);
 			return;
 
 		case 1: // Temporary Spawn
-			c->Message(0, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, which "
+			c->Message(Chat::White, "ERROR: Object %u is a temporarily spawned ground spawn or dropped item, which "
 				      "is not supported with #object. See the 'ground_spawns' table in the database.",
 				   id);
 			return;
@@ -10649,7 +11366,7 @@ void command_object(Client *c, const Seperator *sep)
 	if (strcasecmp(sep->arg[1], "undo") == 0) {
 		// Insufficient or invalid arguments
 		if ((sep->argnum < 2) || ((id = atoi(sep->arg[2])) == 0)) {
-			c->Message(0, "Usage: #object Undo (ObjectID) -- Reload object from database, undoing any "
+			c->Message(Chat::White, "Usage: #object Undo (ObjectID) -- Reload object from database, undoing any "
 				      "changes you have made");
 			return;
 		}
@@ -10657,13 +11374,13 @@ void command_object(Client *c, const Seperator *sep)
 		o = entity_list.FindObject(id);
 
 		if (!o) {
-			c->Message(0, "ERROR: Object %u not found in zone in a manipulable form. No changes to undo.",
+			c->Message(Chat::White, "ERROR: Object %u not found in zone in a manipulable form. No changes to undo.",
 				   id);
 			return;
 		}
 
 		if (o->GetType() == OT_DROPPEDITEM) {
-			c->Message(0, "ERROR: Object %u is a temporary spawned item and cannot be manipulated with "
+			c->Message(Chat::White, "ERROR: Object %u is a temporary spawned item and cannot be manipulated with "
 				      "#object. See the 'ground_spawns' table in the database.",
 				   id);
 			return;
@@ -10683,7 +11400,7 @@ void command_object(Client *c, const Seperator *sep)
 						 id);
 		auto results = database.QueryDatabase(query);
 		if (!results.Success() || results.RowCount() == 0) {
-			c->Message(0, "Database Error: %s", results.ErrorMessage().c_str());
+			c->Message(Chat::White, "Database Error: %s", results.ErrorMessage().c_str());
 			return;
 		}
 
@@ -10708,11 +11425,11 @@ void command_object(Client *c, const Seperator *sep)
 		o = new Object(id, od.object_type, icon, od, nullptr);
 		entity_list.AddObject(o, true);
 
-		c->Message(0, "Object %u reloaded from database.", id);
+		c->Message(Chat::White, "Object %u reloaded from database.", id);
 		return;
 	}
 
-	c->Message(0, usage_string);
+	c->Message(Chat::White, usage_string);
 }
 
 void command_showspellslist(Client *c, const Seperator *sep)
@@ -10720,12 +11437,12 @@ void command_showspellslist(Client *c, const Seperator *sep)
 	Mob *target = c->GetTarget();
 
 	if (!target) {
-		c->Message(0, "Must target an NPC.");
+		c->Message(Chat::White, "Must target an NPC.");
 		return;
 	}
 
 	if (!target->IsNPC()) {
-		c->Message(0, "%s is not an NPC.",  target->GetName());
+		c->Message(Chat::White, "%s is not an NPC.",  target->GetName());
 		return;
 	}
 
@@ -10737,7 +11454,7 @@ void command_showspellslist(Client *c, const Seperator *sep)
 void command_raidloot(Client *c, const Seperator *sep)
 {
 	if(!sep->arg[1][0]) {
-		c->Message(0, "Usage: #raidloot [LEADER/GROUPLEADER/SELECTED/ALL]");
+		c->Message(Chat::White, "Usage: #raidloot [LEADER/GROUPLEADER/SELECTED/ALL]");
 		return;
 	}
 
@@ -10750,7 +11467,7 @@ void command_raidloot(Client *c, const Seperator *sep)
 			{
 				if(r->members[x].IsRaidLeader == 0)
 				{
-					c->Message(0, "You must be the raid leader to use this command.");
+					c->Message(Chat::White, "You must be the raid leader to use this command.");
 				}
 				else
 				{
@@ -10761,32 +11478,32 @@ void command_raidloot(Client *c, const Seperator *sep)
 
 		if(strcasecmp(sep->arg[1], "LEADER") == 0)
 		{
-			c->Message(15, "Loot type changed to: 1");
+			c->Message(Chat::Yellow, "Loot type changed to: 1");
 			r->ChangeLootType(1);
 		}
 		else if(strcasecmp(sep->arg[1], "GROUPLEADER") == 0)
 		{
-			c->Message(15, "Loot type changed to: 2");
+			c->Message(Chat::Yellow, "Loot type changed to: 2");
 			r->ChangeLootType(2);
 		}
 		else if(strcasecmp(sep->arg[1], "SELECTED") == 0)
 		{
-			c->Message(15, "Loot type changed to: 3");
+			c->Message(Chat::Yellow, "Loot type changed to: 3");
 			r->ChangeLootType(3);
 		}
 		else if(strcasecmp(sep->arg[1], "ALL") == 0)
 		{
-			c->Message(15, "Loot type changed to: 4");
+			c->Message(Chat::Yellow, "Loot type changed to: 4");
 			r->ChangeLootType(4);
 		}
 		else
 		{
-			c->Message(0, "Usage: #raidloot [LEADER/GROUPLEADER/SELECTED/ALL]");
+			c->Message(Chat::White, "Usage: #raidloot [LEADER/GROUPLEADER/SELECTED/ALL]");
 		}
 	}
 	else
 	{
-		c->Message(0, "You must be in a raid to use that command.");
+		c->Message(Chat::White, "You must be in a raid to use that command.");
 	}
 }
 
@@ -10794,7 +11511,7 @@ void command_emoteview(Client *c, const Seperator *sep)
 {
 	if(!c->GetTarget() || !c->GetTarget()->IsNPC())
 	{
-		c->Message(0, "You must target a NPC to view their emotes.");
+		c->Message(Chat::White, "You must target a NPC to view their emotes.");
 		return;
 	}
 
@@ -10810,22 +11527,22 @@ void command_emoteview(Client *c, const Seperator *sep)
 			NPC_Emote_Struct* nes = iterator.GetData();
 			if(emoteid == nes->emoteid)
 			{
-				c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
+				c->Message(Chat::White, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
 				count++;
 			}
 			iterator.Advance();
 		}
 		if (count == 0)
-			c->Message(0, "No emotes found.");
+			c->Message(Chat::White, "No emotes found.");
 		else
-			c->Message(0, "%i emote(s) found",  count);
+			c->Message(Chat::White, "%i emote(s) found",  count);
 	}
 }
 
 void command_emotesearch(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == 0)
-		c->Message(0, "Usage: #emotesearch [search string or emoteid]");
+		c->Message(Chat::White, "Usage: #emotesearch [search string or emoteid]");
 	else
 	{
 		const char *search_criteria=sep->argplus[1];
@@ -10841,15 +11558,15 @@ void command_emotesearch(Client *c, const Seperator *sep)
 			NPC_Emote_Struct* nes = iterator.GetData();
 				if(emoteid == nes->emoteid)
 				{
-					c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
+					c->Message(Chat::White, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
 					count++;
 				}
 				iterator.Advance();
 			}
 			if (count == 0)
-				c->Message(0, "No emotes found.");
+				c->Message(Chat::White, "No emotes found.");
 			else
-				c->Message(0, "%i emote(s) found",  count);
+				c->Message(Chat::White, "%i emote(s) found",  count);
 		}
 		else
 		{
@@ -10869,7 +11586,7 @@ void command_emotesearch(Client *c, const Seperator *sep)
 			pdest = strstr(sText, sCriteria);
 				if (pdest != nullptr)
 				{
-					c->Message(0, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
+					c->Message(Chat::White, "EmoteID: %i Event: %i Type: %i Text: %s",  nes->emoteid, nes->event_, nes->type, nes->text);
 					count++;
 				}
 				if (count == 50)
@@ -10878,9 +11595,9 @@ void command_emotesearch(Client *c, const Seperator *sep)
 				iterator.Advance();
 			}
 			if (count == 50)
-				c->Message(0, "50 emotes shown...too many results.");
+				c->Message(Chat::White, "50 emotes shown...too many results.");
 			else
-				c->Message(0, "%i emote(s) found",  count);
+				c->Message(Chat::White, "%i emote(s) found",  count);
 		}
 	}
 }
@@ -10889,7 +11606,7 @@ void command_reloademote(Client *c, const Seperator *sep)
 {
 	zone->NPCEmoteList.Clear();
 	zone->LoadNPCEmotes(&zone->NPCEmoteList);
-	c->Message(0, "NPC emotes reloaded.");
+	c->Message(Chat::White, "NPC emotes reloaded.");
 }
 
 void command_globalview(Client *c, const Seperator *sep)
@@ -10933,14 +11650,14 @@ void command_globalview(Client *c, const Seperator *sep)
 		auto iter = globalMap.begin();
 		uint32 gcount = 0;
 
-		c->Message(0, "Name, Value");
+		c->Message(Chat::White, "Name, Value");
 		while(iter != globalMap.end())
 		{
-			c->Message(0, "%s %s",  (*iter).name.c_str(), (*iter).value.c_str());
+			c->Message(Chat::White, "%s %s",  (*iter).name.c_str(), (*iter).value.c_str());
 			++iter;
 			++gcount;
 		}
-		c->Message(0, "%u globals loaded.",  gcount);
+		c->Message(Chat::White, "%u globals loaded.",  gcount);
 	}
 	else
 	{
@@ -10966,14 +11683,14 @@ void command_globalview(Client *c, const Seperator *sep)
 		auto iter = globalMap.begin();
 		uint32 gcount = 0;
 
-		c->Message(0, "Name, Value");
+		c->Message(Chat::White, "Name, Value");
 		while(iter != globalMap.end())
 		{
-			c->Message(0, "%s %s",  (*iter).name.c_str(), (*iter).value.c_str());
+			c->Message(Chat::White, "%s %s",  (*iter).name.c_str(), (*iter).value.c_str());
 			++iter;
 			++gcount;
 		}
-		c->Message(0, "%u globals loaded.",  gcount);
+		c->Message(Chat::White, "%u globals loaded.",  gcount);
 	}
 }
 
@@ -10981,7 +11698,7 @@ void command_distance(Client *c, const Seperator *sep) {
 	if(c && c->GetTarget()) {
 		Mob* target = c->GetTarget();
 
-		c->Message(0, "Your target, %s, is %1.1f units from you.",  c->GetTarget()->GetName(), Distance(c->GetPosition(), target->GetPosition()));
+		c->Message(Chat::White, "Your target, %s, is %1.1f units from you.",  c->GetTarget()->GetName(), Distance(c->GetPosition(), target->GetPosition()));
 	}
 }
 
@@ -11025,24 +11742,24 @@ void command_max_all_skills(Client *c, const Seperator *sep)
 void command_showbonusstats(Client *c, const Seperator *sep)
 {
 	if (c->GetTarget() == 0)
-		c->Message(0, "ERROR: No target!");
+		c->Message(Chat::White, "ERROR: No target!");
 	else if (!c->GetTarget()->IsMob() && !c->GetTarget()->IsClient())
-		c->Message(0, "ERROR: Target is not a Mob or Player!");
+		c->Message(Chat::White, "ERROR: Target is not a Mob or Player!");
 	else {
 		bool bAll = false;
 		if(sep->arg[1][0] == '\0' || strcasecmp(sep->arg[1], "all") == 0)
 			bAll = true;
 		if (bAll || (strcasecmp(sep->arg[1], "item")==0)) {
-			c->Message(0, "Target Item Bonuses:");
-			c->Message(0, "  Accuracy: %i%%   Divine Save: %i%%", c->GetTarget()->GetItemBonuses().Accuracy, c->GetTarget()->GetItemBonuses().DivineSaveChance);
-			c->Message(0, "  Flurry: %i%%     HitChance: %i%%", c->GetTarget()->GetItemBonuses().FlurryChance, c->GetTarget()->GetItemBonuses().HitChance / 15);
+			c->Message(Chat::White, "Target Item Bonuses:");
+			c->Message(Chat::White, "  Accuracy: %i%%   Divine Save: %i%%", c->GetTarget()->GetItemBonuses().Accuracy, c->GetTarget()->GetItemBonuses().DivineSaveChance);
+			c->Message(Chat::White, "  Flurry: %i%%     HitChance: %i%%", c->GetTarget()->GetItemBonuses().FlurryChance, c->GetTarget()->GetItemBonuses().HitChance / 15);
 		}
 		if (bAll || (strcasecmp(sep->arg[1], "spell")==0)) {
-			c->Message(0, "  Target Spell Bonuses:");
-			c->Message(0, "  Accuracy: %i%%   Divine Save: %i%%", c->GetTarget()->GetSpellBonuses().Accuracy, c->GetTarget()->GetSpellBonuses().DivineSaveChance);
-			c->Message(0, "  Flurry: %i%%     HitChance: %i%% ", c->GetTarget()->GetSpellBonuses().FlurryChance, c->GetTarget()->GetSpellBonuses().HitChance / 15);
+			c->Message(Chat::White, "  Target Spell Bonuses:");
+			c->Message(Chat::White, "  Accuracy: %i%%   Divine Save: %i%%", c->GetTarget()->GetSpellBonuses().Accuracy, c->GetTarget()->GetSpellBonuses().DivineSaveChance);
+			c->Message(Chat::White, "  Flurry: %i%%     HitChance: %i%% ", c->GetTarget()->GetSpellBonuses().FlurryChance, c->GetTarget()->GetSpellBonuses().HitChance / 15);
 		}
-		c->Message(0, "  Effective Casting Level: %i", c->GetTarget()->GetCasterLevel(0));
+		c->Message(Chat::White, "  Effective Casting Level: %i", c->GetTarget()->GetCasterLevel(0));
 	}
 }
 
@@ -11052,7 +11769,7 @@ void command_reloadallrules(Client *c, const Seperator *sep)
 	{
 		auto pack = new ServerPacket(ServerOP_ReloadRules, 0);
 		worldserver.SendPacket(pack);
-		c->Message(13, "Successfully sent the packet to world to reload rules globally. (including world)");
+		c->Message(Chat::Red, "Successfully sent the packet to world to reload rules globally. (including world)");
 		safe_delete(pack);
 
 	}
@@ -11064,7 +11781,7 @@ void command_reloadworldrules(Client *c, const Seperator *sep)
 	{
 		auto pack = new ServerPacket(ServerOP_ReloadRulesWorld, 0);
 		worldserver.SendPacket(pack);
-		c->Message(13, "Successfully sent the packet to world to reload rules. (only world)");
+		c->Message(Chat::Red, "Successfully sent the packet to world to reload rules. (only world)");
 		safe_delete(pack);
 	}
 }
@@ -11080,11 +11797,11 @@ void command_camerashake(Client *c, const Seperator *sep)
 			scss->duration = atoi(sep->arg[1]);
 			scss->intensity = atoi(sep->arg[2]);
 			worldserver.SendPacket(pack);
-			c->Message(13, "Successfully sent the packet to world! Shake it, world, shake it!");
+			c->Message(Chat::Red, "Successfully sent the packet to world! Shake it, world, shake it!");
 			safe_delete(pack);
 		}
 		else {
-			c->Message(13, "Usage -- #camerashake [duration], [intensity [1-10])");
+			c->Message(Chat::Red, "Usage -- #camerashake [duration], [intensity [1-10])");
 		}
 	}
 	return;
@@ -11096,7 +11813,7 @@ void command_disarmtrap(Client *c, const Seperator *sep)
 
 	if(!target)
 	{
-		c->Message(13, "You must have a target.");
+		c->Message(Chat::Red, "You must have a target.");
 		return;
 	}
 
@@ -11106,13 +11823,13 @@ void command_disarmtrap(Client *c, const Seperator *sep)
 		{
 			if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				c->Message(13, "%s is too far away.",  target->GetCleanName());
+				c->Message(Chat::Red, "%s is too far away.",  target->GetCleanName());
 				return;
 			}
 			c->HandleLDoNDisarm(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillDisarmTraps), LDoNTypeMechanical);
 		}
 		else
-			c->Message(13, "You do not have the disarm trap skill.");
+			c->Message(Chat::Red, "You do not have the disarm trap skill.");
 	}
 }
 
@@ -11121,7 +11838,7 @@ void command_sensetrap(Client *c, const Seperator *sep)
 	Mob * target = c->GetTarget();
 	if(!target)
 	{
-		c->Message(13, "You must have a target.");
+		c->Message(Chat::Red, "You must have a target.");
 		return;
 	}
 
@@ -11131,13 +11848,13 @@ void command_sensetrap(Client *c, const Seperator *sep)
 		{
 			if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				c->Message(13, "%s is too far away.",  target->GetCleanName());
+				c->Message(Chat::Red, "%s is too far away.",  target->GetCleanName());
 				return;
 			}
 			c->HandleLDoNSenseTraps(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillSenseTraps), LDoNTypeMechanical);
 		}
 		else
-			c->Message(13, "You do not have the sense traps skill.");
+			c->Message(Chat::Red, "You do not have the sense traps skill.");
 	}
 }
 
@@ -11146,7 +11863,7 @@ void command_picklock(Client *c, const Seperator *sep)
 	Mob * target = c->GetTarget();
 	if(!target)
 	{
-		c->Message(13, "You must have a target.");
+		c->Message(Chat::Red, "You must have a target.");
 		return;
 	}
 
@@ -11156,20 +11873,20 @@ void command_picklock(Client *c, const Seperator *sep)
 		{
 			if(DistanceSquaredNoZ(c->GetPosition(), target->GetPosition()) > RuleI(Adventure, LDoNTrapDistanceUse))
 			{
-				c->Message(13, "%s is too far away.",  target->GetCleanName());
+				c->Message(Chat::Red, "%s is too far away.",  target->GetCleanName());
 				return;
 			}
 			c->HandleLDoNPickLock(target->CastToNPC(), c->GetSkill(EQEmu::skills::SkillPickLock), LDoNTypeMechanical);
 		}
 		else
-			c->Message(13, "You do not have the pick locks skill.");
+			c->Message(Chat::Red, "You do not have the pick locks skill.");
 	}
 }
 
 void command_profanity(Client *c, const Seperator *sep)
 {
 	std::string arg1(sep->arg[1]);
-	
+
 	while (true) {
 		if (arg1.compare("list") == 0) {
 			// do nothing
@@ -11182,21 +11899,21 @@ void command_profanity(Client *c, const Seperator *sep)
 		}
 		else if (arg1.compare("add") == 0) {
 			if (!EQEmu::ProfanityManager::AddProfanity(&database, sep->arg[2]))
-				c->Message(CC_Red, "Could not add '%s' to the profanity list.", sep->arg[2]);
+				c->Message(Chat::Red, "Could not add '%s' to the profanity list.", sep->arg[2]);
 			auto pack = new ServerPacket(ServerOP_RefreshCensorship);
 			worldserver.SendPacket(pack);
 			safe_delete(pack);
 		}
 		else if (arg1.compare("del") == 0) {
 			if (!EQEmu::ProfanityManager::RemoveProfanity(&database, sep->arg[2]))
-				c->Message(CC_Red, "Could not delete '%s' from the profanity list.", sep->arg[2]);
+				c->Message(Chat::Red, "Could not delete '%s' from the profanity list.", sep->arg[2]);
 			auto pack = new ServerPacket(ServerOP_RefreshCensorship);
 			worldserver.SendPacket(pack);
 			safe_delete(pack);
 		}
 		else if (arg1.compare("reload") == 0) {
 			if (!EQEmu::ProfanityManager::UpdateProfanityList(&database))
-				c->Message(CC_Red, "Could not reload the profanity list.");
+				c->Message(Chat::Red, "Could not reload the profanity list.");
 			auto pack = new ServerPacket(ServerOP_RefreshCensorship);
 			worldserver.SendPacket(pack);
 			safe_delete(pack);
@@ -11217,31 +11934,31 @@ void command_profanity(Client *c, const Seperator *sep)
 			popup.append("** End of List **<br>");
 
 		c->SendPopupToClient("Profanity List", popup.c_str());
-		
+
 		return;
 	}
-	
-	c->Message(0, "Usage: #profanity [list] - shows profanity list");
-	c->Message(0, "Usage: #profanity [clear] - deletes all entries");
-	c->Message(0, "Usage: #profanity [add] [<word>] - adds entry");
-	c->Message(0, "Usage: #profanity [del] [<word>] - deletes entry");
-	c->Message(0, "Usage: #profanity [reload] - reloads profanity list");
+
+	c->Message(Chat::White, "Usage: #profanity [list] - shows profanity list");
+	c->Message(Chat::White, "Usage: #profanity [clear] - deletes all entries");
+	c->Message(Chat::White, "Usage: #profanity [add] [<word>] - adds entry");
+	c->Message(Chat::White, "Usage: #profanity [del] [<word>] - deletes entry");
+	c->Message(Chat::White, "Usage: #profanity [reload] - reloads profanity list");
 }
 
 void command_mysql(Client *c, const Seperator *sep)
 {
 	if(!sep->arg[1][0] || !sep->arg[2][0]) {
-		c->Message(0, "Usage: #mysql query \"Query here\"");
+		c->Message(Chat::White, "Usage: #mysql query \"Query here\"");
 		return;
 	}
 
 	if (strcasecmp(sep->arg[1], "help") == 0) {
-		c->Message(0, "MYSQL In-Game CLI Interface:");
-		c->Message(0, "Example: #mysql query \"Query goes here quoted\" -s -h");
-		c->Message(0, "To use 'like \"%%something%%\" replace the %% with #");
-		c->Message(0, "Example: #mysql query \"select * from table where name like \"#something#\"");
-		c->Message(0, "-s - Spaces select entries apart");
-		c->Message(0, "-h - Colors every other select result");
+		c->Message(Chat::White, "MYSQL In-Game CLI Interface:");
+		c->Message(Chat::White, "Example: #mysql query \"Query goes here quoted\" -s -h");
+		c->Message(Chat::White, "To use 'like \"%%something%%\" replace the %% with #");
+		c->Message(Chat::White, "Example: #mysql query \"select * from table where name like \"#something#\"");
+		c->Message(Chat::White, "-s - Spaces select entries apart");
+		c->Message(Chat::White, "-h - Colors every other select result");
 		return;
 	}
 
@@ -11255,7 +11972,7 @@ void command_mysql(Client *c, const Seperator *sep)
 				case 's': optionS = true; break;
 				case 'h': optionH = true; break;
 				default:
-                    c->Message(15, "%s, there is no option '%c'",  c->GetName(), sep->arg[argnum][1]);
+                    c->Message(Chat::Yellow, "%s, there is no option '%c'",  c->GetName(), sep->arg[argnum][1]);
                     return;
 			}
 			++argnum;
@@ -11278,7 +11995,7 @@ void command_mysql(Client *c, const Seperator *sep)
             query.insert(pos, "%%");
             pos = query.find('#');
         }
-        c->Message(15, "---Running query: '%s'",  query.c_str());
+        c->Message(Chat::Yellow, "---Running query: '%s'",  query.c_str());
 
         for (auto row = results.begin(); row != results.end(); ++row) {
             std::stringstream lineText;
@@ -11297,7 +12014,7 @@ void command_mysql(Client *c, const Seperator *sep)
             lineVec.push_back(lineText.str());
 
             if(optionS) //This provides spacing for the space switch
-                c->Message(0, " ");
+                c->Message(Chat::White, " ");
             if(optionH) //This option will highlight every other row
                 highlightTextIndex = 1 - highlightTextIndex;
 
@@ -11322,11 +12039,11 @@ void command_xtargets(Client *c, const Seperator *sep)
 
 		if((NewMax < 5) || (NewMax > XTARGET_HARDCAP))
 		{
-			c->Message(13, "Number of XTargets must be between 5 and %i",  XTARGET_HARDCAP);
+			c->Message(Chat::Red, "Number of XTargets must be between 5 and %i",  XTARGET_HARDCAP);
 			return;
 		}
 		t->SetMaxXTargets(NewMax);
-		c->Message(0, "Max number of XTargets set to %i",  NewMax);
+		c->Message(Chat::White, "Max number of XTargets set to %i",  NewMax);
 	}
 	else
 		t->ShowXTargets(c);
@@ -11337,11 +12054,11 @@ void command_zopp(Client *c, const Seperator *sep)
 	if (!c)
 		return;
 	else if (sep->argnum < 3 || sep->argnum > 4)
-		c->Message(0, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
+		c->Message(Chat::White, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
 	else if (!strcasecmp(sep->arg[1], "trade") == 0 && !strcasecmp(sep->arg[1], "t") == 0 && !strcasecmp(sep->arg[1], "summon") == 0 && !strcasecmp(sep->arg[1], "s") == 0)
-		c->Message(0, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
+		c->Message(Chat::White, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
 	else if (!sep->IsNumber(2) || !sep->IsNumber(3) || (sep->argnum == 4 && !sep->IsNumber(4)))
-		c->Message(0, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
+		c->Message(Chat::White, "Usage: #zopp [trade/summon] [slot id] [item id] [*charges]");
 	else {
 		ItemPacketType packettype;
 
@@ -11359,7 +12076,7 @@ void command_zopp(Client *c, const Seperator *sep)
 		const EQEmu::ItemData* FakeItem = database.GetItem(itemid);
 
 		if (!FakeItem) {
-			c->Message(13, "Error: Item [%u] is not a valid item id.",  itemid);
+			c->Message(Chat::Red, "Error: Item [%u] is not a valid item id.",  itemid);
 			return;
 		}
 
@@ -11369,18 +12086,18 @@ void command_zopp(Client *c, const Seperator *sep)
 			item_status = static_cast<int16>(item->MinStatus);
 		}
 		if (item_status > c->Admin()) {
-			c->Message(13, "Error: Insufficient status to use this command.");
+			c->Message(Chat::Red, "Error: Insufficient status to use this command.");
 			return;
 		}
 
 		if (charges < 0 || charges > FakeItem->StackSize) {
-			c->Message(13, "Warning: The specified charge count does not meet expected criteria!");
-			c->Message(0, "Processing request..results may cause unpredictable behavior.");
+			c->Message(Chat::Red, "Warning: The specified charge count does not meet expected criteria!");
+			c->Message(Chat::White, "Processing request..results may cause unpredictable behavior.");
 		}
 
 		EQEmu::ItemInstance* FakeItemInst = database.CreateItem(FakeItem, charges);
 		c->SendItemPacket(slotid, FakeItemInst, packettype);
-		c->Message(0, "Sending zephyr op packet to client - [%s] %s (%u) with %i %s to slot %i.",
+		c->Message(Chat::White, "Sending zephyr op packet to client - [%s] %s (%u) with %i %s to slot %i.",
 			   packettype == ItemPacketTrade ? "Trade" : "Summon",  FakeItem->Name, itemid, charges,
 			   std::abs(charges == 1) ? "charge" : "charges",  slotid);
 		safe_delete(FakeItemInst);
@@ -11404,17 +12121,17 @@ void command_questerrors(Client *c, const Seperator *sep)
 {
 	std::list<std::string> err;
 	parse->GetErrors(err);
-	c->Message(0, "Current Quest Errors:");
+	c->Message(Chat::White, "Current Quest Errors:");
 
 	auto iter = err.begin();
 	int i = 0;
 	while(iter != err.end()) {
 		if(i >= 30) {
-			c->Message(0, "Maximum of 30 Errors shown...");
+			c->Message(Chat::White, "Maximum of 30 Errors shown...");
 			break;
 		}
 
-		c->Message(0, iter->c_str());
+		c->Message(Chat::White, iter->c_str());
 		++i;
 		++iter;
 	}
@@ -11429,20 +12146,20 @@ void command_enablerecipe(Client *c, const Seperator *sep)
 			recipe_id = atoi(sep->arg[1]);
 		}
 		else {
-			c->Message(0, "Invalid number of arguments.\nUsage: #enablerecipe recipe_id");
+			c->Message(Chat::White, "Invalid number of arguments.\nUsage: #enablerecipe recipe_id");
 			return;
 		}
 		if (recipe_id > 0) {
 			success = database.EnableRecipe(recipe_id);
 			if (success) {
-				c->Message(0, "Recipe enabled.");
+				c->Message(Chat::White, "Recipe enabled.");
 			}
 			else {
-				c->Message(0, "Recipe not enabled.");
+				c->Message(Chat::White, "Recipe not enabled.");
 			}
 		}
 		else {
-			c->Message(0, "Invalid recipe id.\nUsage: #enablerecipe recipe_id");
+			c->Message(Chat::White, "Invalid recipe id.\nUsage: #enablerecipe recipe_id");
 		}
 	}
 }
@@ -11456,20 +12173,20 @@ void command_disablerecipe(Client *c, const Seperator *sep)
 			recipe_id = atoi(sep->arg[1]);
 		}
 		else {
-			c->Message(0, "Invalid number of arguments.\nUsage: #disablerecipe recipe_id");
+			c->Message(Chat::White, "Invalid number of arguments.\nUsage: #disablerecipe recipe_id");
 			return;
 		}
 		if (recipe_id > 0) {
 			success = database.DisableRecipe(recipe_id);
 			if (success) {
-				c->Message(0, "Recipe disabled.");
+				c->Message(Chat::White, "Recipe disabled.");
 			}
 			else {
-				c->Message(0, "Recipe not disabled.");
+				c->Message(Chat::White, "Recipe not disabled.");
 			}
 		}
 		else {
-			c->Message(0, "Invalid recipe id.\nUsage: #disablerecipe recipe_id");
+			c->Message(Chat::White, "Invalid recipe id.\nUsage: #disablerecipe recipe_id");
 		}
 	}
 }
@@ -11479,13 +12196,13 @@ void command_npctype_cache(Client *c, const Seperator *sep)
 	if (sep->argnum > 0) {
 		for (int i = 0; i < sep->argnum; ++i) {
 			if (strcasecmp(sep->arg[i + 1], "all") == 0) {
-				c->Message(0, "Clearing all npc types from the cache.");
+				c->Message(Chat::White, "Clearing all npc types from the cache.");
 				zone->ClearNPCTypeCache(-1);
 			}
 			else {
 				int id = atoi(sep->arg[i + 1]);
 				if (id > 0) {
-					c->Message(0, "Clearing npc type %d from the cache.",  id);
+					c->Message(Chat::White, "Clearing npc type %d from the cache.",  id);
 					zone->ClearNPCTypeCache(id);
 					return;
 				}
@@ -11493,9 +12210,9 @@ void command_npctype_cache(Client *c, const Seperator *sep)
 		}
 	}
 	else {
-		c->Message(0, "Usage:");
-		c->Message(0, "#npctype_cache [npctype_id] ...");
-		c->Message(0, "#npctype_cache all");
+		c->Message(Chat::White, "Usage:");
+		c->Message(Chat::White, "#npctype_cache [npctype_id] ...");
+		c->Message(Chat::White, "#npctype_cache all");
 	}
 }
 
@@ -11503,7 +12220,7 @@ void command_merchantopenshop(Client *c, const Seperator *sep)
 {
 	Mob *merchant = c->GetTarget();
 	if (!merchant || merchant->GetClass() != MERCHANT) {
-		c->Message(0, "You must target a merchant to open their shop.");
+		c->Message(Chat::White, "You must target a merchant to open their shop.");
 		return;
 	}
 
@@ -11514,7 +12231,7 @@ void command_merchantcloseshop(Client *c, const Seperator *sep)
 {
 	Mob *merchant = c->GetTarget();
 	if (!merchant || merchant->GetClass() != MERCHANT) {
-		c->Message(0, "You must target a merchant to close their shop.");
+		c->Message(Chat::White, "You must target a merchant to close their shop.");
 		return;
 	}
 
@@ -11532,12 +12249,12 @@ void command_shownpcgloballoot(Client *c, const Seperator *sep)
 	auto tar = c->GetTarget();
 
 	if (!tar || !tar->IsNPC()) {
-		c->Message(0, "You must target an NPC to use this command.");
+		c->Message(Chat::White, "You must target an NPC to use this command.");
 		return;
 	}
 
 	auto npc = tar->CastToNPC();
-	c->Message(0, "GlobalLoot for %s (%d)", npc->GetName(), npc->GetNPCTypeID());
+	c->Message(Chat::White, "GlobalLoot for %s (%d)", npc->GetName(), npc->GetNPCTypeID());
 	zone->ShowNPCGlobalLoot(c, npc);
 }
 
@@ -11546,33 +12263,33 @@ void command_tune(Client *c, const Seperator *sep)
 	//Work in progress - Kayen
 
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
-		c->Message(0, "Syntax: #tune [subcommand].");
-		c->Message(0, "-- Tune System Commands --");
-		c->Message(0, "-- Usage: Returning recommended combat statistical values based on a desired outcome.");
-		c->Message(0, "-- Note: If targeted mob does not have a target (ie not engaged in combat), YOU will be considered the target.");
-		c->Message(0, "-- Warning: The calculations done in this process are intense and can potentially cause zone crashes depending on parameters set, use with caution!");
-		c->Message(0, "-- Below are OPTIONAL parameters.");
-		c->Message(0, "-- Note: [interval] Determines how fast the stat being checked increases/decreases till it finds the best result. Default [ATK/AC 50][Acc/Avoid 10] ");
-		c->Message(0, "-- Note: [loop_max] Determines how many iterations are done to increases/decreases the stat till it finds the best result. Default [ATK/AC 100][Acc/Avoid 1000]");
-		c->Message(0, "-- Note: [Stat Override] Will override that stat on mob being checkd with the specified value. Default=0");
-		c->Message(0, "-- Note: [Info Level] How much statistical detail is displayed[0 - 3]. Default=0 ");
-		c->Message(0, "-- Note: Results are only approximations usually accurate to +/- 2 intervals.");
+		c->Message(Chat::White, "Syntax: #tune [subcommand].");
+		c->Message(Chat::White, "-- Tune System Commands --");
+		c->Message(Chat::White, "-- Usage: Returning recommended combat statistical values based on a desired outcome.");
+		c->Message(Chat::White, "-- Note: If targeted mob does not have a target (ie not engaged in combat), YOU will be considered the target.");
+		c->Message(Chat::White, "-- Warning: The calculations done in this process are intense and can potentially cause zone crashes depending on parameters set, use with caution!");
+		c->Message(Chat::White, "-- Below are OPTIONAL parameters.");
+		c->Message(Chat::White, "-- Note: [interval] Determines how fast the stat being checked increases/decreases till it finds the best result. Default [ATK/AC 50][Acc/Avoid 10] ");
+		c->Message(Chat::White, "-- Note: [loop_max] Determines how many iterations are done to increases/decreases the stat till it finds the best result. Default [ATK/AC 100][Acc/Avoid 1000]");
+		c->Message(Chat::White, "-- Note: [Stat Override] Will override that stat on mob being checkd with the specified value. Default=0");
+		c->Message(Chat::White, "-- Note: [Info Level] How much statistical detail is displayed[0 - 3]. Default=0 ");
+		c->Message(Chat::White, "-- Note: Results are only approximations usually accurate to +/- 2 intervals.");
 
-		c->Message(0, "... ");
-		c->Message(0, "...### Category A ### Target = ATTACKER ### YOU or Target's Target = DEFENDER ###");
-		c->Message(0, "...### Category B ### Target = DEFENDER ### YOU or Target's Target = ATTACKER ###");
-		c->Message(0, "... ");
-		c->Message(0, "...#Returns recommended ATK adjustment +/- on ATTACKER that will result in an average mitigation pct on DEFENDER. ");
-		c->Message(0, "...tune FindATK [A/B] [pct mitigation] [interval][loop_max][AC Overwride][Info Level]");
-		c->Message(0, "... ");
-		c->Message(0, "...#Returns recommended AC adjustment +/- on DEFENDER for an average mitigation pct from ATTACKER. ");
-		c->Message(0, "...tune FindAC [A/B] [pct mitigation] [interval][loop_max][ATK Overwride][Info Level] ");
-		c->Message(0, "... ");
-		c->Message(0, "...#Returns recommended Accuracy adjustment +/- on ATTACKER that will result in a hit chance pct on DEFENDER. ");
-		c->Message(0, "...tune FindAccuracy [A/B] [hit chance] [interval][loop_max][Avoidance Overwride][Info Level]");
-		c->Message(0, "... ");
-		c->Message(0, "...#Returns recommended Avoidance adjustment +/- on DEFENDER for in a hit chance pct from ATTACKER. ");
-		c->Message(0, "...tune FindAvoidance [A/B] [pct mitigation] [interval][loop_max][Accuracy Overwride][Info Level] ");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...### Category A ### Target = ATTACKER ### YOU or Target's Target = DEFENDER ###");
+		c->Message(Chat::White, "...### Category B ### Target = DEFENDER ### YOU or Target's Target = ATTACKER ###");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...#Returns recommended ATK adjustment +/- on ATTACKER that will result in an average mitigation pct on DEFENDER. ");
+		c->Message(Chat::White, "...tune FindATK [A/B] [pct mitigation] [interval][loop_max][AC Overwride][Info Level]");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...#Returns recommended AC adjustment +/- on DEFENDER for an average mitigation pct from ATTACKER. ");
+		c->Message(Chat::White, "...tune FindAC [A/B] [pct mitigation] [interval][loop_max][ATK Overwride][Info Level] ");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...#Returns recommended Accuracy adjustment +/- on ATTACKER that will result in a hit chance pct on DEFENDER. ");
+		c->Message(Chat::White, "...tune FindAccuracy [A/B] [hit chance] [interval][loop_max][Avoidance Overwride][Info Level]");
+		c->Message(Chat::White, "... ");
+		c->Message(Chat::White, "...#Returns recommended Avoidance adjustment +/- on DEFENDER for in a hit chance pct from ATTACKER. ");
+		c->Message(Chat::White, "...tune FindAvoidance [A/B] [pct mitigation] [interval][loop_max][Accuracy Overwride][Info Level] ");
 
 		return;
 	}
@@ -11582,7 +12299,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 	if (!attacker)
 	{
-		c->Message(0, "#Tune - Error no target selected. [#Tune help]");
+		c->Message(Chat::White, "#Tune - Error no target selected. [#Tune help]");
 		return;
 	}
 
@@ -11601,7 +12318,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (!pct_mitigation)
 		{
-			c->Message(13, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
+			c->Message(Chat::Red, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
 			return;
 		}
 
@@ -11619,9 +12336,9 @@ void command_tune(Client *c, const Seperator *sep)
 		else if(!strcasecmp(sep->arg[2], "B"))
 			c->Tune_FindATKByPctMitigation(attacker,defender, pct_mitigation, interval, max_loop,ac_override,info_level);
 		else {
-			c->Message(0, "#Tune - Error no category selcted. [#Tune help]");
-			c->Message(0, "Usage #tune FindATK [A/B] [pct mitigation] [interval][loop_max][AC Overwride][Info Level] ");
-			c->Message(0, "Example #tune FindATK A 60");
+			c->Message(Chat::White, "#Tune - Error no category selcted. [#Tune help]");
+			c->Message(Chat::White, "Usage #tune FindATK [A/B] [pct mitigation] [interval][loop_max][AC Overwride][Info Level] ");
+			c->Message(Chat::White, "Example #tune FindATK A 60");
 		}
 		return;
 	}
@@ -11636,7 +12353,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (!pct_mitigation)
 		{
-			c->Message(13, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
+			c->Message(Chat::Red, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
 			return;
 		}
 
@@ -11654,9 +12371,9 @@ void command_tune(Client *c, const Seperator *sep)
 		else if(!strcasecmp(sep->arg[2], "B"))
 			c->Tune_FindACByPctMitigation(attacker, defender, pct_mitigation, interval, max_loop,atk_override,info_level);
 		else {
-			c->Message(0, "#Tune - Error no category selcted. [#Tune help]");
-			c->Message(0, "Usage #tune FindAC [A/B] [pct mitigation] [interval][loop_max][ATK Overwride][Info Level] ");
-			c->Message(0, "Example #tune FindAC A 60");
+			c->Message(Chat::White, "#Tune - Error no category selcted. [#Tune help]");
+			c->Message(Chat::White, "Usage #tune FindAC [A/B] [pct mitigation] [interval][loop_max][ATK Overwride][Info Level] ");
+			c->Message(Chat::White, "Example #tune FindAC A 60");
 		}
 
 		return;
@@ -11672,7 +12389,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (!hit_chance)
 		{
-			c->Message(10, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
+			c->Message(Chat::NPCQuestSay, "#Tune - Error must enter the desired percent mitigation on defender. Ie. Defender to mitigate on average 20 pct of max damage.");
 			return;
 		}
 
@@ -11687,7 +12404,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (hit_chance > RuleR(Combat,MaxChancetoHit) || hit_chance < RuleR(Combat,MinChancetoHit))
 		{
-			c->Message(10, "#Tune - Error hit chance out of bounds. [Max %.2f Min .2f]",  RuleR(Combat,MaxChancetoHit),RuleR(Combat,MinChancetoHit));
+			c->Message(Chat::NPCQuestSay, "#Tune - Error hit chance out of bounds. [Max %.2f Min .2f]",  RuleR(Combat,MaxChancetoHit),RuleR(Combat,MinChancetoHit));
 			return;
 		}
 
@@ -11696,9 +12413,9 @@ void command_tune(Client *c, const Seperator *sep)
 		else if(!strcasecmp(sep->arg[2], "B"))
 			c->Tune_FindAccuaryByHitChance(attacker, defender, hit_chance, interval, max_loop,avoid_override,info_level);
 		else {
-			c->Message(0, "#Tune - Error no category selcted. [#Tune help]");
-			c->Message(0, "Usage #tune FindAcccuracy [A/B] [hit chance] [interval][loop_max][Avoidance Overwride][Info Level]");
-			c->Message(0, "Exampled #tune FindAccuracy B 30");
+			c->Message(Chat::White, "#Tune - Error no category selcted. [#Tune help]");
+			c->Message(Chat::White, "Usage #tune FindAcccuracy [A/B] [hit chance] [interval][loop_max][Avoidance Overwride][Info Level]");
+			c->Message(Chat::White, "Exampled #tune FindAccuracy B 30");
 		}
 
 		return;
@@ -11714,7 +12431,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (!hit_chance)
 		{
-			c->Message(0, "#Tune - Error must enter the desired hit chance on defender. Ie. Defender to have hit chance of 40 pct.");
+			c->Message(Chat::White, "#Tune - Error must enter the desired hit chance on defender. Ie. Defender to have hit chance of 40 pct.");
 			return;
 		}
 
@@ -11729,7 +12446,7 @@ void command_tune(Client *c, const Seperator *sep)
 
 		if (hit_chance > RuleR(Combat,MaxChancetoHit) || hit_chance < RuleR(Combat,MinChancetoHit))
 		{
-			c->Message(10, "#Tune - Error hit chance out of bounds. [Max %.2f Min .2f]",  RuleR(Combat,MaxChancetoHit),RuleR(Combat,MinChancetoHit));
+			c->Message(Chat::NPCQuestSay, "#Tune - Error hit chance out of bounds. [Max %.2f Min .2f]",  RuleR(Combat,MaxChancetoHit),RuleR(Combat,MinChancetoHit));
 			return;
 		}
 
@@ -11738,9 +12455,9 @@ void command_tune(Client *c, const Seperator *sep)
 		else if(!strcasecmp(sep->arg[2], "B"))
 			c->Tune_FindAvoidanceByHitChance(attacker, defender, hit_chance, interval, max_loop,acc_override, info_level);
 		else {
-			c->Message(0, "#Tune - Error no category selcted. [#Tune help]");
-			c->Message(0, "Usage #tune FindAvoidance [A/B] [hit chance] [interval][loop_max][Accuracy Overwride][Info Level]");
-			c->Message(0, "Exampled #tune FindAvoidance B 30");
+			c->Message(Chat::White, "#Tune - Error no category selcted. [#Tune help]");
+			c->Message(Chat::White, "Usage #tune FindAvoidance [A/B] [hit chance] [interval][loop_max][Accuracy Overwride][Info Level]");
+			c->Message(Chat::White, "Exampled #tune FindAvoidance B 30");
 		}
 
 		return;
@@ -11756,7 +12473,7 @@ void command_logtest(Client *c, const Seperator *sep){
 		uint32 i = 0;
 		t = std::clock();
 		for (i = 0; i < atoi(sep->arg[1]); i++){
-			Log(Logs::General, Logs::Debug, "[%u] Test #2... Took %f seconds", i, ((float)(std::clock() - t)) / CLOCKS_PER_SEC);
+			LogDebug("[[{}]] Test #2 Took [{}] seconds", i, ((float)(std::clock() - t)) / CLOCKS_PER_SEC);
 		}
 
 	}
@@ -11764,7 +12481,7 @@ void command_logtest(Client *c, const Seperator *sep){
 
 void command_crashtest(Client *c, const Seperator *sep)
 {
-	c->Message(0, "Alright, now we get an GPF ;) ");
+	c->Message(Chat::White, "Alright, now we get an GPF ;) ");
 	char* gpf = 0;
 	memcpy(gpf, "Ready to crash",  30);
 }
@@ -11776,17 +12493,17 @@ void command_logs(Client *c, const Seperator *sep){
 		if (strcasecmp(sep->arg[1], "reload_all") == 0){
 			auto pack = new ServerPacket(ServerOP_ReloadLogs, 0);
 			worldserver.SendPacket(pack);
-			c->Message(13, "Successfully sent the packet to world to reload log settings from the database for all zones");
+			c->Message(Chat::Red, "Successfully sent the packet to world to reload log settings from the database for all zones");
 			safe_delete(pack);
 		}
 		/* #logs list_settings */
 		if (strcasecmp(sep->arg[1], "list_settings") == 0 ||
 			(strcasecmp(sep->arg[1], "set") == 0 && strcasecmp(sep->arg[3], "") == 0)) {
-			c->Message(0, "[Category ID | console | file | gmsay | Category Description]");
+			c->Message(Chat::White, "[Category ID | console | file | gmsay | Category Description]");
 			int redisplay_columns = 0;
 			for (int i            = 0; i < Logs::LogCategory::MaxCategoryID; i++) {
 				if (redisplay_columns == 10) {
-					c->Message(0, "[Category ID | console | file | gmsay | Category Description]");
+					c->Message(Chat::White, "[Category ID | console | file | gmsay | Category Description]");
 					redisplay_columns = 0;
 				}
 				c->Message(
@@ -11817,12 +12534,12 @@ void command_logs(Client *c, const Seperator *sep){
 				logs_set = 1;
 			}
 			else{
-				c->Message(0, "--- #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> - Sets log settings during the lifetime of the zone");
-				c->Message(0, "--- #logs set gmsay 20 1 - Would output Quest errors to gmsay");
+				c->Message(Chat::White, "--- #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> - Sets log settings during the lifetime of the zone");
+				c->Message(Chat::White, "--- #logs set gmsay 20 1 - Would output Quest errors to gmsay");
 			}
 			if (logs_set == 1){
-				c->Message(15, "Your Log Settings have been applied");
-				c->Message(15, "Output Method: %s :: Debug Level: %i - Category: %s",  sep->arg[2], atoi(sep->arg[4]), Logs::LogCategoryName[atoi(sep->arg[3])]);
+				c->Message(Chat::Yellow, "Your Log Settings have been applied");
+				c->Message(Chat::Yellow, "Output Method: %s :: Debug Level: %i - Category: %s",  sep->arg[2], atoi(sep->arg[4]), Logs::LogCategoryName[atoi(sep->arg[3])]);
 			}
 			/* We use a general 'is_category_enabled' now, let's update when we update any output settings
 				This is used in hot places of code to check if its enabled in any way before triggering logs
@@ -11836,10 +12553,10 @@ void command_logs(Client *c, const Seperator *sep){
 		}
 	}
 	else {
-		c->Message(0, "#logs usage:");
-		c->Message(0, "--- #logs reload_all - Reload all settings in world and all zone processes with what is defined in the database");
-		c->Message(0, "--- #logs list_settings - Shows current log settings and categories loaded into the current process' memory");
-		c->Message(0, "--- #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> - Sets log settings during the lifetime of the zone");
+		c->Message(Chat::White, "#logs usage:");
+		c->Message(Chat::White, "--- #logs reload_all - Reload all settings in world and all zone processes with what is defined in the database");
+		c->Message(Chat::White, "--- #logs list_settings - Shows current log settings and categories loaded into the current process' memory");
+		c->Message(Chat::White, "--- #logs set [console|file|gmsay] <category_id> <debug_level (1-3)> - Sets log settings during the lifetime of the zone");
 	}
 }
 
@@ -11854,7 +12571,7 @@ void command_mysqltest(Client *c, const Seperator *sep)
 			auto results = database.QueryDatabase(query);
 		}
 	}
-	Log(Logs::General, Logs::Debug, "MySQL Test... Took %f seconds", ((float)(std::clock() - t)) / CLOCKS_PER_SEC);
+	LogDebug("MySQL Test Took [{}] seconds", ((float)(std::clock() - t)) / CLOCKS_PER_SEC);
 }
 
 void command_resetaa_timer(Client *c, const Seperator *sep) {
@@ -11868,64 +12585,79 @@ void command_resetaa_timer(Client *c, const Seperator *sep) {
 	if(sep->IsNumber(1))
 	{
 		int timer_id = atoi(sep->arg[1]);
-		c->Message(0, "Reset of timer %i for %s", timer_id, c->GetName());
+		c->Message(Chat::White, "Reset of timer %i for %s", timer_id, c->GetName());
 		c->ResetAlternateAdvancementTimer(timer_id);
 	}
 	else if(!strcasecmp(sep->arg[1], "all"))
 	{
-		c->Message(0, "Reset all timers for %s", c->GetName());
+		c->Message(Chat::White, "Reset all timers for %s", c->GetName());
 		c->ResetAlternateAdvancementTimers();
 	}
 	else
 	{
-		c->Message(0, "usage: #resetaa_timer [all | timer_id]");
+		c->Message(Chat::White, "usage: #resetaa_timer [all | timer_id]");
 	}
 }
 
 void command_reloadaa(Client *c, const Seperator *sep) {
-	c->Message(0, "Reloading Alternate Advancement Data...");
+	c->Message(Chat::White, "Reloading Alternate Advancement Data...");
 	zone->LoadAlternateAdvancement();
-	c->Message(0, "Alternate Advancement Data Reloaded");
+	c->Message(Chat::White, "Alternate Advancement Data Reloaded");
 	entity_list.SendAlternateAdvancementStats();
 }
 
-void command_hotfix(Client *c, const Seperator *sep) {
+inline bool file_exists(const std::string& name) {
+	std::ifstream f(name.c_str());
+	return f.good();
+}
+
+void command_hotfix(Client *c, const Seperator *sep)
+{
 	std::string hotfix;
 	database.GetVariable("hotfix_name", hotfix);
 
 	std::string hotfix_name;
-	if(!strcasecmp(hotfix.c_str(), "hotfix_")) {
+	if (!strcasecmp(hotfix.c_str(), "hotfix_")) {
 		hotfix_name = "";
-	} else {
+	}
+	else {
 		hotfix_name = "hotfix_";
 	}
 
-	c->Message(0, "Creating and applying hotfix");
-	std::thread t1([c,hotfix_name]() {
+	c->Message(Chat::White, "Creating and applying hotfix");
+	std::thread t1(
+		[c, hotfix_name]() {
 #ifdef WIN32
-		if(hotfix_name.length() > 0) {
-			system(StringFormat("shared_memory -hotfix=%s", hotfix_name.c_str()).c_str());
-		} else {
-			system(StringFormat("shared_memory").c_str());
-		}
+			if(hotfix_name.length() > 0) {
+				if(system(StringFormat("shared_memory -hotfix=%s", hotfix_name.c_str()).c_str()));
+			} else {
+				if(system(StringFormat("shared_memory").c_str()));
+			}
 #else
-		if(hotfix_name.length() > 0) {
-			system(StringFormat("./shared_memory -hotfix=%s", hotfix_name.c_str()).c_str());
-		}
-		else {
-			system(StringFormat("./shared_memory").c_str());
-		}
+
+			std::string shared_memory_path = "./shared_memory";
+			if (file_exists("./bin/shared_memory")) {
+				shared_memory_path = "./bin/shared_memory";
+			}
+
+			if (hotfix_name.length() > 0) {
+				if (system(StringFormat("%s -hotfix=%s", shared_memory_path.c_str(), hotfix_name.c_str()).c_str())) {}
+			}
+			else {
+				if (system(StringFormat("%s", shared_memory_path.c_str()).c_str())) {}
+			}
 #endif
-		database.SetVariable("hotfix_name", hotfix_name);
+			database.SetVariable("hotfix_name", hotfix_name);
 
-		ServerPacket pack(ServerOP_ChangeSharedMem, hotfix_name.length() + 1);
-		if(hotfix_name.length() > 0) {
-			strcpy((char*)pack.pBuffer, hotfix_name.c_str());
+			ServerPacket pack(ServerOP_ChangeSharedMem, hotfix_name.length() + 1);
+			if (hotfix_name.length() > 0) {
+				strcpy((char *) pack.pBuffer, hotfix_name.c_str());
+			}
+			worldserver.SendPacket(&pack);
+
+			if (c) { c->Message(Chat::White, "Hotfix applied"); }
 		}
-		worldserver.SendPacket(&pack);
-
-		if (c) c->Message(0, "Hotfix applied");
-	});
+	);
 
 	t1.detach();
 }
@@ -11936,28 +12668,28 @@ void command_load_shared_memory(Client *c, const Seperator *sep) {
 
 	std::string hotfix_name;
 	if(strcasecmp(hotfix.c_str(), sep->arg[1]) == 0) {
-		c->Message(0, "Cannot attempt to load this shared memory segment as it is already loaded.");
+		c->Message(Chat::White, "Cannot attempt to load this shared memory segment as it is already loaded.");
 		return;
 	}
 
 	hotfix_name = sep->arg[1];
-	c->Message(0, "Loading shared memory segment %s", hotfix_name.c_str());
+	c->Message(Chat::White, "Loading shared memory segment %s", hotfix_name.c_str());
 	std::thread t1([c,hotfix_name]() {
 #ifdef WIN32
 		if(hotfix_name.length() > 0) {
-			system(StringFormat("shared_memory -hotfix=%s", hotfix_name.c_str()).c_str());
+			if(system(StringFormat("shared_memory -hotfix=%s", hotfix_name.c_str()).c_str()));
 		} else {
-			system(StringFormat("shared_memory").c_str());
+			if(system(StringFormat("shared_memory").c_str()));
 		}
 #else
 		if(hotfix_name.length() > 0) {
-			system(StringFormat("./shared_memory -hotfix=%s", hotfix_name.c_str()).c_str());
+			if(system(StringFormat("./shared_memory -hotfix=%s", hotfix_name.c_str()).c_str()));
 		}
 		else {
-			system(StringFormat("./shared_memory").c_str());
+			if(system(StringFormat("./shared_memory").c_str()));
 		}
 #endif
-		c->Message(0, "Shared memory segment finished loading.");
+		c->Message(Chat::White, "Shared memory segment finished loading.");
 	});
 
 	t1.detach();
@@ -11968,7 +12700,7 @@ void command_apply_shared_memory(Client *c, const Seperator *sep) {
 	database.GetVariable("hotfix_name", hotfix);
 	std::string hotfix_name = sep->arg[1];
 
-	c->Message(0, "Applying shared memory segment %s", hotfix_name.c_str());
+	c->Message(Chat::White, "Applying shared memory segment %s", hotfix_name.c_str());
 	database.SetVariable("hotfix_name", hotfix_name);
 
 	ServerPacket pack(ServerOP_ChangeSharedMem, hotfix_name.length() + 1);
@@ -11984,7 +12716,7 @@ void command_reloadperlexportsettings(Client *c, const Seperator *sep)
 	{
 		auto pack = new ServerPacket(ServerOP_ReloadPerlExportSettings, 0);
 		worldserver.SendPacket(pack);
-		c->Message(13, "Successfully sent the packet to world to reload Perl Export settings");
+		c->Message(Chat::Red, "Successfully sent the packet to world to reload Perl Export settings");
 		safe_delete(pack);
 
 	}
@@ -11998,16 +12730,16 @@ void command_trapinfo(Client *c, const Seperator *sep)
 void command_reloadtraps(Client *c, const Seperator *sep)
 {
 	entity_list.UpdateAllTraps(true, true);
-	c->Message(CC_Default, "Traps reloaded for %s.", zone->GetShortName());
+	c->Message(Chat::Default, "Traps reloaded for %s.", zone->GetShortName());
 }
 
 void command_scale(Client *c, const Seperator *sep)
 {
 	if (sep->argnum == 0) {
-		c->Message(15, "# Usage # ");
-		c->Message(15, "#scale [static/dynamic] (With targeted NPC)");
-		c->Message(15, "#scale [npc_name_search] [static/dynamic] (To make zone-wide changes)");
-		c->Message(15, "#scale all [static/dynamic]");
+		c->Message(Chat::Yellow, "# Usage # ");
+		c->Message(Chat::Yellow, "#scale [static/dynamic] (With targeted NPC)");
+		c->Message(Chat::Yellow, "#scale [npc_name_search] [static/dynamic] (To make zone-wide changes)");
+		c->Message(Chat::Yellow, "#scale all [static/dynamic]");
 		return;
 	}
 
@@ -12019,11 +12751,11 @@ void command_scale(Client *c, const Seperator *sep)
 
 		bool apply_status = false;
 		if (strcasecmp(sep->arg[1], "dynamic") == 0) {
-			c->Message(15, "Applying global base scaling to npc dynamically (All stats set to zeroes)...");
+			c->Message(Chat::Yellow, "Applying global base scaling to npc dynamically (All stats set to zeroes)...");
 			apply_status = npc_scale_manager->ApplyGlobalBaseScalingToNPCDynamically(npc);
 		}
 		else if (strcasecmp(sep->arg[1], "static") == 0) {
-			c->Message(15, "Applying global base scaling to npc statically (Copying base stats onto NPC)...");
+			c->Message(Chat::Yellow, "Applying global base scaling to npc statically (Copying base stats onto NPC)...");
 			apply_status = npc_scale_manager->ApplyGlobalBaseScalingToNPCStatically(npc);
 		}
 		else {
@@ -12031,15 +12763,15 @@ void command_scale(Client *c, const Seperator *sep)
 		}
 
 		if (apply_status) {
-			c->Message(15, "Applied to NPC '%s' successfully!", npc->GetName());
+			c->Message(Chat::Yellow, "Applied to NPC '%s' successfully!", npc->GetName());
 		}
 		else {
-			c->Message(15, "Failed to load scaling data from the database "
+			c->Message(Chat::Yellow, "Failed to load scaling data from the database "
 						   "for this npc / type, see 'NPCScaling' log for more info");
 		}
 	}
 	else if (c->GetTarget() && sep->argnum < 2) {
-		c->Message(15, "Target must be an npc!");
+		c->Message(Chat::Yellow, "Target must be an npc!");
 	}
 
 	/**
@@ -12056,9 +12788,9 @@ void command_scale(Client *c, const Seperator *sep)
 		}
 
 		if (scale_type.length() <= 0) {
-			c->Message(15, "You must first set if you intend on using static versus dynamic for these changes");
-			c->Message(15, "#scale [npc_name_search] [static/dynamic]");
-			c->Message(15, "#scale all [static/dynamic]");
+			c->Message(Chat::Yellow, "You must first set if you intend on using static versus dynamic for these changes");
+			c->Message(Chat::Yellow, "#scale [npc_name_search] [static/dynamic]");
+			c->Message(Chat::Yellow, "#scale all [static/dynamic]");
 			return;
 		}
 
@@ -12108,7 +12840,7 @@ void command_scale(Client *c, const Seperator *sep)
 		}
 
 		if (strcasecmp(sep->arg[3], "apply") == 0) {
-			c->Message(15, "%s scaling applied against (%i) NPC's", sep->arg[2], found_count);
+			c->Message(Chat::Yellow, "%s scaling applied against (%i) NPC's", sep->arg[2], found_count);
 		}
 		else {
 
@@ -12118,9 +12850,9 @@ void command_scale(Client *c, const Seperator *sep)
 				sep->arg[2]
 			);
 
-			c->Message(15, "Found (%i) NPC's that match this search...", found_count);
+			c->Message(Chat::Yellow, "Found (%i) NPC's that match this search...", found_count);
 			c->Message(
-				15, "To apply these changes, click <%s> or type %s",
+				Chat::Yellow, "To apply these changes, click <%s> or type %s",
 				EQEmu::SayLinkEngine::GenerateQuestSaylink(saylink, false, "Apply").c_str(),
 				saylink.c_str()
 			);
@@ -12128,6 +12860,85 @@ void command_scale(Client *c, const Seperator *sep)
 	}
 }
 
+void command_databuckets(Client *c, const Seperator *sep)
+ {
+	if (sep->arg[1][0] == 0) {
+		c->Message(Chat::Yellow, "Usage: #databuckets view (partial key)|(limit) OR #databuckets delete (key)");
+		return;
+	}
+	if (strcasecmp(sep->arg[1], "view") == 0) {
+
+		std::string key_filter;
+		uint8 limit = 50;
+		for (int i = 2; i < 4; i++) {
+			if (sep->arg[i][0] == '\0')
+				break;
+			if (strcasecmp(sep->arg[i], "limit") == 0) {
+				limit = (uint8)atoi(sep->arg[i + 1]);
+				continue;
+			}
+		}
+		if (sep->arg[2]) {
+			key_filter = str_tolower(sep->arg[2]);
+		}
+		std::string query = "SELECT `id`, `key`, `value`, `expires` FROM data_buckets";
+		if (!key_filter.empty())  query += StringFormat(" WHERE `key` LIKE '%%%s%%'", key_filter.c_str());
+		query += StringFormat(" LIMIT %u", limit);
+		auto results = database.QueryDatabase(query);
+		if (!results.Success())
+			return;
+		if (results.RowCount() == 0) {
+			c->Message(Chat::Yellow, "No data_buckets found");
+			return;
+		}
+		int _ctr = 0;
+		// put in window for easier readability in case want command line for something else
+		std::string window_title = "Data Buckets";
+		std::string window_text =
+			"<table>"
+			"<tr>"
+			"<td>ID</td>"
+			"<td>Expires</td>"
+			"<td>Key</td>"
+			"<td>Value</td>"
+			"</tr>";
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			auto        id = static_cast<uint32>(atoi(row[0]));
+			std::string key = row[1];
+			std::string value = row[2];
+			std::string expires = row[3];
+			window_text.append(StringFormat(
+				"<tr>"
+				"<td>%u</td>"
+				"<td>%s</td>"
+				"<td>%s</td>"
+				"<td>%s</td>"
+				"</tr>",
+				id,
+				expires.c_str(),
+				key.c_str(),
+				value.c_str()
+			));
+			_ctr++;
+			std::string	del_saylink = StringFormat("#databuckets delete %s", key.c_str());
+			c->Message(Chat::White, "%s : %s",
+				EQEmu::SayLinkEngine::GenerateQuestSaylink(del_saylink, false, "Delete").c_str(), key.c_str(), "  Value:  ", value.c_str());
+		}
+		window_text.append("</table>");
+		c->SendPopupToClient(window_title.c_str(), window_text.c_str());
+		std::string response = _ctr > 0 ? StringFormat("Found %i matching data buckets", _ctr).c_str() : "No Databuckets found.";
+		c->Message(Chat::Yellow, response.c_str());
+	}
+	else if (strcasecmp(sep->arg[1], "delete") == 0)
+	{
+		if (DataBucket::DeleteData(sep->argplus[2]))
+			c->Message(Chat::Yellow, "data bucket %s deleted.", sep->argplus[2]);
+		else
+			c->Message(Chat::Red, "An error occurred deleting data bucket %s", sep->argplus[2]);
+		return;
+	}
+}
+
 void command_who(Client *c, const Seperator *sep)
 {
 	std::string query =
@@ -12155,7 +12966,7 @@ void command_who(Client *c, const Seperator *sep)
 		return;
 
 	if (results.RowCount() == 0) {
-		c->Message(15, "No results found");
+		c->Message(Chat::Yellow, "No results found");
 		return;
 	}
 
@@ -12167,8 +12978,8 @@ void command_who(Client *c, const Seperator *sep)
 
 	int found_count = 0;
 
-	c->Message(5, "Players in EverQuest");
-	c->Message(5, "--------------------");
+	c->Message(Chat::Magenta, "Players in EverQuest");
+	c->Message(Chat::Magenta, "--------------------");
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		auto        account_id      = static_cast<uint32>(atoi(row[0]));
@@ -12245,7 +13056,7 @@ void command_who(Client *c, const Seperator *sep)
 			"There are no players in EverQuest that match those who filters."
 	);
 
-	c->Message(5, message.c_str());
+	c->Message(Chat::Magenta, message.c_str());
 }
 
 void command_network(Client *c, const Seperator *sep)
@@ -12255,57 +13066,57 @@ void command_network(Client *c, const Seperator *sep)
 		auto eqsi = c->Connection();
 		auto manager = eqsi->GetManager();
 		auto opts = manager->GetOptions();
-	
+
 		if (!strcasecmp(sep->arg[2], "all"))
 		{
-			c->Message(0, "max_packet_size: %llu", (uint64_t)opts.daybreak_options.max_packet_size);
-			c->Message(0, "max_connection_count: %llu", (uint64_t)opts.daybreak_options.max_connection_count);
-			c->Message(0, "keepalive_delay_ms: %llu", (uint64_t)opts.daybreak_options.keepalive_delay_ms);
-			c->Message(0, "resend_delay_factor: %.2f", opts.daybreak_options.resend_delay_factor);
-			c->Message(0, "resend_delay_ms: %llu", (uint64_t)opts.daybreak_options.resend_delay_ms);
-			c->Message(0, "resend_delay_min: %llu", (uint64_t)opts.daybreak_options.resend_delay_min);
-			c->Message(0, "resend_delay_max: %llu", (uint64_t)opts.daybreak_options.resend_delay_max);
-			c->Message(0, "connect_delay_ms: %llu", (uint64_t)opts.daybreak_options.connect_delay_ms);
-			c->Message(0, "connect_stale_ms: %llu", (uint64_t)opts.daybreak_options.connect_stale_ms);
-			c->Message(0, "stale_connection_ms: %llu", (uint64_t)opts.daybreak_options.stale_connection_ms);
-			c->Message(0, "crc_length: %llu", (uint64_t)opts.daybreak_options.crc_length);
-			c->Message(0, "hold_size: %llu", (uint64_t)opts.daybreak_options.hold_size);
-			c->Message(0, "hold_length_ms: %llu", (uint64_t)opts.daybreak_options.hold_length_ms);
-			c->Message(0, "simulated_in_packet_loss: %llu", (uint64_t)opts.daybreak_options.simulated_in_packet_loss);
-			c->Message(0, "simulated_out_packet_loss: %llu", (uint64_t)opts.daybreak_options.simulated_out_packet_loss);
-			c->Message(0, "tic_rate_hertz: %.2f", opts.daybreak_options.tic_rate_hertz);
-			c->Message(0, "resend_timeout: %llu", (uint64_t)opts.daybreak_options.resend_timeout);
-			c->Message(0, "connection_close_time: %llu", (uint64_t)opts.daybreak_options.connection_close_time);
-			c->Message(0, "encode_passes[0]: %llu", (uint64_t)opts.daybreak_options.encode_passes[0]);
-			c->Message(0, "encode_passes[1]: %llu", (uint64_t)opts.daybreak_options.encode_passes[1]);
-			c->Message(0, "port: %llu", (uint64_t)opts.daybreak_options.port);
+			c->Message(Chat::White, "max_packet_size: %llu", (uint64_t)opts.daybreak_options.max_packet_size);
+			c->Message(Chat::White, "max_connection_count: %llu", (uint64_t)opts.daybreak_options.max_connection_count);
+			c->Message(Chat::White, "keepalive_delay_ms: %llu", (uint64_t)opts.daybreak_options.keepalive_delay_ms);
+			c->Message(Chat::White, "resend_delay_factor: %.2f", opts.daybreak_options.resend_delay_factor);
+			c->Message(Chat::White, "resend_delay_ms: %llu", (uint64_t)opts.daybreak_options.resend_delay_ms);
+			c->Message(Chat::White, "resend_delay_min: %llu", (uint64_t)opts.daybreak_options.resend_delay_min);
+			c->Message(Chat::White, "resend_delay_max: %llu", (uint64_t)opts.daybreak_options.resend_delay_max);
+			c->Message(Chat::White, "connect_delay_ms: %llu", (uint64_t)opts.daybreak_options.connect_delay_ms);
+			c->Message(Chat::White, "connect_stale_ms: %llu", (uint64_t)opts.daybreak_options.connect_stale_ms);
+			c->Message(Chat::White, "stale_connection_ms: %llu", (uint64_t)opts.daybreak_options.stale_connection_ms);
+			c->Message(Chat::White, "crc_length: %llu", (uint64_t)opts.daybreak_options.crc_length);
+			c->Message(Chat::White, "hold_size: %llu", (uint64_t)opts.daybreak_options.hold_size);
+			c->Message(Chat::White, "hold_length_ms: %llu", (uint64_t)opts.daybreak_options.hold_length_ms);
+			c->Message(Chat::White, "simulated_in_packet_loss: %llu", (uint64_t)opts.daybreak_options.simulated_in_packet_loss);
+			c->Message(Chat::White, "simulated_out_packet_loss: %llu", (uint64_t)opts.daybreak_options.simulated_out_packet_loss);
+			c->Message(Chat::White, "tic_rate_hertz: %.2f", opts.daybreak_options.tic_rate_hertz);
+			c->Message(Chat::White, "resend_timeout: %llu", (uint64_t)opts.daybreak_options.resend_timeout);
+			c->Message(Chat::White, "connection_close_time: %llu", (uint64_t)opts.daybreak_options.connection_close_time);
+			c->Message(Chat::White, "encode_passes[0]: %llu", (uint64_t)opts.daybreak_options.encode_passes[0]);
+			c->Message(Chat::White, "encode_passes[1]: %llu", (uint64_t)opts.daybreak_options.encode_passes[1]);
+			c->Message(Chat::White, "port: %llu", (uint64_t)opts.daybreak_options.port);
 		}
 		else {
-			c->Message(0, "Unknown get option: %s", sep->arg[2]);
-			c->Message(0, "Available options:");
+			c->Message(Chat::White, "Unknown get option: %s", sep->arg[2]);
+			c->Message(Chat::White, "Available options:");
 			//Todo the rest of these when im less lazy.
-			//c->Message(0, "max_packet_size");
-			//c->Message(0, "max_connection_count");
-			//c->Message(0, "keepalive_delay_ms");
-			//c->Message(0, "resend_delay_factor");
-			//c->Message(0, "resend_delay_ms");
-			//c->Message(0, "resend_delay_min");
-			//c->Message(0, "resend_delay_max");
-			//c->Message(0, "connect_delay_ms");
-			//c->Message(0, "connect_stale_ms");
-			//c->Message(0, "stale_connection_ms");
-			//c->Message(0, "crc_length");
-			//c->Message(0, "hold_size");
-			//c->Message(0, "hold_length_ms");
-			//c->Message(0, "simulated_in_packet_loss");
-			//c->Message(0, "simulated_out_packet_loss");
-			//c->Message(0, "tic_rate_hertz");
-			//c->Message(0, "resend_timeout");
-			//c->Message(0, "connection_close_time");
-			//c->Message(0, "encode_passes[0]");
-			//c->Message(0, "encode_passes[1]");
-			//c->Message(0, "port");
-			c->Message(0, "all");
+			//c->Message(Chat::White, "max_packet_size");
+			//c->Message(Chat::White, "max_connection_count");
+			//c->Message(Chat::White, "keepalive_delay_ms");
+			//c->Message(Chat::White, "resend_delay_factor");
+			//c->Message(Chat::White, "resend_delay_ms");
+			//c->Message(Chat::White, "resend_delay_min");
+			//c->Message(Chat::White, "resend_delay_max");
+			//c->Message(Chat::White, "connect_delay_ms");
+			//c->Message(Chat::White, "connect_stale_ms");
+			//c->Message(Chat::White, "stale_connection_ms");
+			//c->Message(Chat::White, "crc_length");
+			//c->Message(Chat::White, "hold_size");
+			//c->Message(Chat::White, "hold_length_ms");
+			//c->Message(Chat::White, "simulated_in_packet_loss");
+			//c->Message(Chat::White, "simulated_out_packet_loss");
+			//c->Message(Chat::White, "tic_rate_hertz");
+			//c->Message(Chat::White, "resend_timeout");
+			//c->Message(Chat::White, "connection_close_time");
+			//c->Message(Chat::White, "encode_passes[0]");
+			//c->Message(Chat::White, "encode_passes[1]");
+			//c->Message(Chat::White, "port");
+			c->Message(Chat::White, "all");
 		}
 	}
 	else if (!strcasecmp(sep->arg[1], "setopt"))
@@ -12313,19 +13124,19 @@ void command_network(Client *c, const Seperator *sep)
 		auto eqsi = c->Connection();
 		auto manager = eqsi->GetManager();
 		auto opts = manager->GetOptions();
-	
+
 		if (!strcasecmp(sep->arg[3], ""))
 		{
-			c->Message(0, "Missing value for set");
+			c->Message(Chat::White, "Missing value for set");
 			return;
 		}
-	
+
 		std::string value = sep->arg[3];
 		if (!strcasecmp(sep->arg[2], "max_connection_count"))
 		{
 			opts.daybreak_options.max_connection_count = std::stoull(value);
 			manager->SetOptions(opts);
-		} 
+		}
 		else if (!strcasecmp(sep->arg[2], "keepalive_delay_ms"))
 		{
 			opts.daybreak_options.keepalive_delay_ms = std::stoull(value);
@@ -12397,30 +13208,30 @@ void command_network(Client *c, const Seperator *sep)
 			manager->SetOptions(opts);
 		}
 		else {
-			c->Message(0, "Unknown set option: %s", sep->arg[2]);
-			c->Message(0, "Available options:");
-			c->Message(0, "max_connection_count");
-			c->Message(0, "keepalive_delay_ms");
-			c->Message(0, "resend_delay_factor");
-			c->Message(0, "resend_delay_ms");
-			c->Message(0, "resend_delay_min");
-			c->Message(0, "resend_delay_max");
-			c->Message(0, "connect_delay_ms");
-			c->Message(0, "connect_stale_ms");
-			c->Message(0, "stale_connection_ms");
-			c->Message(0, "hold_size");
-			c->Message(0, "hold_length_ms");
-			c->Message(0, "simulated_in_packet_loss");
-			c->Message(0, "simulated_out_packet_loss");
-			c->Message(0, "resend_timeout");
-			c->Message(0, "connection_close_time");
+			c->Message(Chat::White, "Unknown set option: %s", sep->arg[2]);
+			c->Message(Chat::White, "Available options:");
+			c->Message(Chat::White, "max_connection_count");
+			c->Message(Chat::White, "keepalive_delay_ms");
+			c->Message(Chat::White, "resend_delay_factor");
+			c->Message(Chat::White, "resend_delay_ms");
+			c->Message(Chat::White, "resend_delay_min");
+			c->Message(Chat::White, "resend_delay_max");
+			c->Message(Chat::White, "connect_delay_ms");
+			c->Message(Chat::White, "connect_stale_ms");
+			c->Message(Chat::White, "stale_connection_ms");
+			c->Message(Chat::White, "hold_size");
+			c->Message(Chat::White, "hold_length_ms");
+			c->Message(Chat::White, "simulated_in_packet_loss");
+			c->Message(Chat::White, "simulated_out_packet_loss");
+			c->Message(Chat::White, "resend_timeout");
+			c->Message(Chat::White, "connection_close_time");
 		}
 	}
 	else {
-		c->Message(0, "Unknown command: %s", sep->arg[1]);
-		c->Message(0, "Network commands avail:");
-		c->Message(0, "getopt optname - Retrieve the current option value set.");
-		c->Message(0, "setopt optname - Set the current option allowed.");
+		c->Message(Chat::White, "Unknown command: %s", sep->arg[1]);
+		c->Message(Chat::White, "Network commands avail:");
+		c->Message(Chat::White, "getopt optname - Retrieve the current option value set.");
+		c->Message(Chat::White, "setopt optname - Set the current option allowed.");
 	}
 }
 
@@ -12440,15 +13251,15 @@ void command_bot(Client *c, const Seperator *sep)
 	}
 	
 	if (bot_command_dispatch(c, bot_message.c_str()) == -2) {
-		if (parse->PlayerHasQuestSub(EVENT_COMMAND)) {
-			int i = parse->EventPlayer(EVENT_COMMAND, c, bot_message, 0);
+		if (parse->PlayerHasQuestSub(EVENT_BOT_COMMAND)) {
+			int i = parse->EventPlayer(EVENT_BOT_COMMAND, c, bot_message, 0);
 			if (i == 0 && !RuleB(Chat, SuppressCommandErrors)) {
-				c->Message(13, "Bot command '%s' not recognized.", bot_message.c_str());
+				c->Message(Chat::Red, "Bot command '%s' not recognized.", bot_message.c_str());
 			}
 		}
 		else {
 			if (!RuleB(Chat, SuppressCommandErrors))
-				c->Message(13, "Bot command '%s' not recognized.", bot_message.c_str());
+				c->Message(Chat::Red, "Bot command '%s' not recognized.", bot_message.c_str());
 		}
 	}
 }
diff --git a/zone/command.h b/zone/command.h
index e11b7bcfb..d64950f9c 100644
--- a/zone/command.h
+++ b/zone/command.h
@@ -77,6 +77,7 @@ void command_crashtest(Client *c, const Seperator *sep);
 void command_cvs(Client *c, const Seperator *sep);
 void command_d1(Client *c, const Seperator *sep);
 void command_damage(Client *c, const Seperator *sep);
+void command_databuckets(Client *c, const Seperator *sep);
 void command_date(Client *c, const Seperator *sep);
 void command_dbspawn2(Client *c, const Seperator *sep);
 void command_delacct(Client *c, const Seperator *sep);
@@ -96,6 +97,7 @@ void command_emoteview(Client* c, const Seperator *sep);
 void command_enablerecipe(Client *c, const Seperator *sep);
 void command_equipitem(Client *c, const Seperator *sep);
 void command_face(Client *c, const Seperator *sep);
+void command_faction(Client *c, const Seperator *sep);
 void command_findaliases(Client *c, const Seperator *sep);
 void command_findnpctype(Client *c, const Seperator *sep);
 void command_findspell(Client *c, const Seperator *sep);
@@ -148,7 +150,6 @@ void command_ipc(Client *c, const Seperator *sep);
 void command_iplookup(Client *c, const Seperator *sep);
 void command_iteminfo(Client *c, const Seperator *sep);
 void command_itemsearch(Client *c, const Seperator *sep);
-void command_itemtest(Client *c, const Seperator *sep);
 void command_kick(Client *c, const Seperator *sep);
 void command_killallnpcs(Client *c, const Seperator *sep);
 void command_kill(Client *c, const Seperator *sep);
@@ -182,6 +183,7 @@ void command_netstats(Client *c, const Seperator *sep);
 void command_network(Client *c, const Seperator *sep);
 void command_npccast(Client *c, const Seperator *sep);
 void command_npcedit(Client *c, const Seperator *sep);
+void command_npceditmass(Client *c, const Seperator *sep);
 void command_npcemote(Client *c, const Seperator *sep);
 void command_npcloot(Client *c, const Seperator *sep);
 void command_npcsay(Client *c, const Seperator *sep);
@@ -191,6 +193,7 @@ void command_npcspecialattk(Client *c, const Seperator *sep);
 void command_npcstats(Client *c, const Seperator *sep);
 void command_npctype_cache(Client *c, const Seperator *sep);
 void command_npctypespawn(Client *c, const Seperator *sep);
+void command_nudge(Client* c, const Seperator* sep);
 void command_nukebuffs(Client *c, const Seperator *sep);
 void command_nukeitem(Client *c, const Seperator *sep);
 void command_numauths(Client *c, const Seperator *sep);
@@ -247,6 +250,7 @@ void command_repopclose(Client *c, const Seperator *sep);
 void command_resetaa(Client* c,const Seperator *sep);
 void command_resetaa_timer(Client *c, const Seperator *sep);
 void command_revoke(Client *c, const Seperator *sep);
+void command_roambox(Client *c, const Seperator *sep);
 void command_rules(Client *c, const Seperator *sep);
 void command_save(Client *c, const Seperator *sep);
 void command_scale(Client *c, const Seperator *sep);
@@ -286,6 +290,7 @@ void command_showzonegloballoot(Client *c, const Seperator *sep);
 void command_shutdown(Client *c, const Seperator *sep);
 void command_size(Client *c, const Seperator *sep);
 void command_spawn(Client *c, const Seperator *sep);
+void command_spawneditmass(Client *c, const Seperator *sep);
 void command_spawnfix(Client *c, const Seperator *sep);
 void command_spawnstatus(Client *c, const Seperator *sep);
 void command_spellinfo(Client *c, const Seperator *sep);
diff --git a/zone/common.h b/zone/common.h
index 62f1d9771..e06fa134a 100644
--- a/zone/common.h
+++ b/zone/common.h
@@ -272,6 +272,31 @@ enum class LootRequestType : uint8 {
 	AllowedPVPDefined,
 };
 
+namespace Journal {
+	enum class SpeakMode : uint8 {
+		Raw = 0,	// this just uses the raw message
+		Say = 1,	// prints with "%1 says,%2 '%3'" if in another language else "%1 says '%2'"
+		Shout = 2,	// prints with "%1 shouts,%2 '%3'" if in another language else "%1 shouts '%2'"
+		EmoteAlt = 3,	// prints "%2", this should just be the same as raw ...
+		Emote = 4,	// prints "%1 %2" if message doesn't start with "\" or "@", else "%1%2"
+		Group = 5	// prints "%1 tells the group,%2 '%3'"
+	};
+
+	enum class Mode : uint8 {
+		None = 0,
+		Log1 = 1, // 1 and 2 log to journal
+		Log2 = 2, // our current code uses 2
+	};
+
+	struct Options {
+		SpeakMode speak_mode;
+		Mode journal_mode;
+		int8 language;
+		uint32 message_type;
+		uint32 target_spawn_id; // who the message is talking to (limits journaling)
+	};
+};
+
 //this is our internal representation of the BUFF struct, can put whatever we want in it
 struct Buffs_Struct {
 	uint16	spellid;
@@ -363,6 +388,7 @@ struct StatBonuses {
 	int32	skillmod[EQEmu::skills::HIGHEST_SKILL + 1];
 	int32	skillmodmax[EQEmu::skills::HIGHEST_SKILL + 1];
 	int		effective_casting_level;
+	int		adjusted_casting_skill;				// SPA 112 for fizzles
 	int		reflect_chance;						// chance to reflect incoming spell
 	uint32	singingMod;
 	uint32	Amplification;						// stacks with singingMod
diff --git a/zone/corpse.cpp b/zone/corpse.cpp
index 1465064f3..09661826d 100644
--- a/zone/corpse.cpp
+++ b/zone/corpse.cpp
@@ -803,7 +803,7 @@ bool Corpse::Process() {
 			spc->zone_id = zone->graveyard_zoneid();
 			worldserver.SendPacket(pack);
 			safe_delete(pack);
-			Log(Logs::General, Logs::None, "Moved %s player corpse to the designated graveyard in zone %s.", this->GetName(), database.GetZoneName(zone->graveyard_zoneid()));
+			LogDebug("Moved [{}] player corpse to the designated graveyard in zone [{}]", this->GetName(), database.GetZoneName(zone->graveyard_zoneid()));
 			corpse_db_id = 0;
 		}
 
@@ -833,10 +833,10 @@ bool Corpse::Process() {
 				Save();
 				player_corpse_depop = true;
 				corpse_db_id = 0;
-				Log(Logs::General, Logs::None, "Tagged %s player corpse has buried.", this->GetName());
+				LogDebug("Tagged [{}] player corpse has buried", this->GetName());
 			}
 			else {
-				Log(Logs::General, Logs::Error, "Unable to bury %s player corpse.", this->GetName());
+				LogError("Unable to bury [{}] player corpse", this->GetName());
 				return true;
 			}
 		}
@@ -889,14 +889,14 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 
 	if(IsPlayerCorpse() && !corpse_db_id) { // really should try to resave in this case
 		// SendLootReqErrorPacket(client, 0);
-		client->Message(13, "Warning: Corpse's dbid = 0! Corpse will not survive zone shutdown!");
+		client->Message(Chat::Red, "Warning: Corpse's dbid = 0! Corpse will not survive zone shutdown!");
 		std::cout << "Error: PlayerCorpse::MakeLootRequestPackets: dbid = 0!" << std::endl;
 		// return;
 	}
 
 	if(is_locked && client->Admin() < 100) {
 		SendLootReqErrorPacket(client, LootResponse::SomeoneElse);
-		client->Message(13, "Error: Corpse locked by GM.");
+		client->Message(Chat::Red, "Error: Corpse locked by GM.");
 		return;
 	}
 
@@ -943,7 +943,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 
 	}
 
-	Log(Logs::Moderate, Logs::Inventory, "MakeLootRequestPackets() LootRequestType %u for %s", loot_request_type, client->GetName());
+	LogInventory("MakeLootRequestPackets() LootRequestType [{}] for [{}]", (int) loot_request_type, client->GetName());
 
 	if (loot_request_type == LootRequestType::Forbidden) {
 		SendLootReqErrorPacket(client, LootResponse::NotAtThisTime);
@@ -960,7 +960,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 		loot_coin = (tmp[0] == 1 && tmp[1] == '\0');
 
 	if (loot_request_type == LootRequestType::GMPeek || loot_request_type == LootRequestType::GMAllowed) {
-		client->Message(15, "This corpse contains %u platinum, %u gold, %u silver and %u copper.",
+		client->Message(Chat::Yellow, "This corpse contains %u platinum, %u gold, %u silver and %u copper.",
 			GetPlatinum(), GetGold(), GetSilver(), GetCopper());
 
 		auto outapp = new EQApplicationPacket(OP_MoneyOnCorpse, sizeof(moneyOnCorpseStruct));
@@ -1027,15 +1027,15 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 			if (pkitem->RecastDelay)
 				pkinst->SetRecastTimestamp(timestamps.count(pkitem->RecastType) ? timestamps.at(pkitem->RecastType) : 0);
 
-			Log(Logs::Detail, Logs::Inventory, "MakeLootRequestPackets() Slot %u, Item '%s'", EQEmu::invslot::CORPSE_BEGIN, pkitem->Name);
+			LogInventory("MakeLootRequestPackets() Slot [{}], Item [{}]", EQEmu::invslot::CORPSE_BEGIN, pkitem->Name);
 
 			client->SendItemPacket(EQEmu::invslot::CORPSE_BEGIN, pkinst, ItemPacketLoot);
 			safe_delete(pkinst);
 		}
 		else {
-			Log(Logs::General, Logs::Inventory, "MakeLootRequestPackets() PlayerKillItem %i not found", pkitemid);
+			LogInventory("MakeLootRequestPackets() PlayerKillItem [{}] not found", pkitemid);
 
-			client->Message(CC_Red, "PlayerKillItem (id: %i) could not be found!", pkitemid);
+			client->Message(Chat::Red, "PlayerKillItem (id: %i) could not be found!", pkitemid);
 		}
 
 		client->QueuePacket(app);
@@ -1083,7 +1083,7 @@ void Corpse::MakeLootRequestPackets(Client* client, const EQApplicationPacket* a
 		if (item->RecastDelay)
 			inst->SetRecastTimestamp(timestamps.count(item->RecastType) ? timestamps.at(item->RecastType) : 0);
 
-		Log(Logs::Moderate, Logs::Inventory, "MakeLootRequestPackets() Slot %i, Item '%s'", loot_slot, item->Name);
+		LogInventory("MakeLootRequestPackets() Slot [{}], Item [{}]", loot_slot, item->Name);
 
 		client->SendItemPacket(loot_slot, inst, ItemPacketLoot);
 		safe_delete(inst);
@@ -1107,7 +1107,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 	auto lootitem = (LootingItem_Struct *)app->pBuffer;
 
-	Log(Logs::Moderate, Logs::Inventory, "LootItem() LootRequestType %u, Slot %u for %s", loot_request_type, lootitem->slot_id, client->GetName());
+	LogInventory("LootItem() LootRequestType [{}], Slot [{}] for [{}]", (int) loot_request_type, lootitem->slot_id, client->GetName());
 
 	if (loot_request_type < LootRequestType::GMAllowed) { // LootRequestType::Forbidden and LootRequestType::GMPeek
 		client->QueuePacket(app);
@@ -1129,7 +1129,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 	/* To prevent item loss for a player using 'Loot All' who doesn't have inventory space for all their items. */
 	if (RuleB(Character, CheckCursorEmptyWhenLooting) && !client->GetInv().CursorEmpty()) {
-		client->Message(13, "You may not loot an item while you have an item on your cursor.");
+		client->Message(Chat::Red, "You may not loot an item while you have an item on your cursor.");
 		client->QueuePacket(app);
 		SendEndLootErrorPacket(client);
 		/* Unlock corpse for others */
@@ -1146,7 +1146,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 	if (IsPlayerCorpse() && !CanPlayerLoot(client->CharacterID()) && !become_npc &&
 		(char_id != client->CharacterID() && client->Admin() < 150)) {
-		client->Message(13, "Error: This is a player corpse and you dont own it.");
+		client->Message(Chat::Red, "Error: This is a player corpse and you dont own it.");
 		client->QueuePacket(app);
 		SendEndLootErrorPacket(client);
 		return;
@@ -1155,13 +1155,13 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 	if (is_locked && client->Admin() < 100) {
 		client->QueuePacket(app);
 		SendLootReqErrorPacket(client, LootResponse::SomeoneElse);
-		client->Message(13, "Error: Corpse locked by GM.");
+		client->Message(Chat::Red, "Error: Corpse locked by GM.");
 		return;
 	}
 
 	if (IsPlayerCorpse() && (char_id != client->CharacterID()) && CanPlayerLoot(client->CharacterID()) &&
 		GetPlayerKillItem() == 0) {
-		client->Message(13, "Error: You cannot loot any more items from this corpse.");
+		client->Message(Chat::Red, "Error: You cannot loot any more items from this corpse.");
 		client->QueuePacket(app);
 		SendEndLootErrorPacket(client);
 		ResetLooter();
@@ -1201,7 +1201,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 	if (client && inst) {
 		if (client->CheckLoreConflict(item)) {
-			client->Message_StringID(0, LOOT_LORE_ERROR);
+			client->MessageString(Chat::White, LOOT_LORE_ERROR);
 			client->QueuePacket(app);
 			SendEndLootErrorPacket(client);
 			ResetLooter();
@@ -1214,7 +1214,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 				EQEmu::ItemInstance *itm = inst->GetAugment(i);
 				if (itm) {
 					if (client->CheckLoreConflict(itm->GetItem())) {
-						client->Message_StringID(0, LOOT_LORE_ERROR);
+						client->MessageString(Chat::White, LOOT_LORE_ERROR);
 						client->QueuePacket(app);
 						SendEndLootErrorPacket(client);
 						ResetLooter();
@@ -1236,7 +1236,7 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 		args.push_back(this);
 		if (parse->EventPlayer(EVENT_LOOT, client, buf, 0, &args) != 0) {
 			lootitem->auto_loot = -1;
-			client->Message_StringID(CC_Red, LOOT_NOT_ALLOWED, inst->GetItem()->Name);
+			client->MessageString(Chat::Red, LOOT_NOT_ALLOWED, inst->GetItem()->Name);
 			client->QueuePacket(app);
 			delete inst;
 			return;
@@ -1312,18 +1312,18 @@ void Corpse::LootItem(Client *client, const EQApplicationPacket *app)
 
 		linker.GenerateLink();
 
-		client->Message_StringID(MT_LootMessages, LOOTED_MESSAGE, linker.Link().c_str());
+		client->MessageString(Chat::Loot, LOOTED_MESSAGE, linker.Link().c_str());
 
 		if (!IsPlayerCorpse()) {
 			Group *g = client->GetGroup();
 			if (g != nullptr) {
-				g->GroupMessage_StringID(client, MT_LootMessages, OTHER_LOOTED_MESSAGE,
+				g->GroupMessageString(client, Chat::Loot, OTHER_LOOTED_MESSAGE,
 					client->GetName(), linker.Link().c_str());
 			}
 			else {
 				Raid *r = client->GetRaid();
 				if (r != nullptr) {
-					r->RaidMessage_StringID(client, MT_LootMessages, OTHER_LOOTED_MESSAGE,
+					r->RaidMessageString(client, Chat::Loot, OTHER_LOOTED_MESSAGE,
 						client->GetName(), linker.Link().c_str());
 				}
 			}
@@ -1371,7 +1371,7 @@ void Corpse::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho) {
 
 void Corpse::QueryLoot(Client* to) {
 	int x = 0, y = 0; // x = visible items, y = total items
-	to->Message(0, "Coin: %ip, %ig, %is, %ic", platinum, gold, silver, copper);
+	to->Message(Chat::White, "Coin: %ip, %ig, %is, %ic", platinum, gold, silver, copper);
 
 	ItemList::iterator cur,end;
 	cur = itemlist.begin();
@@ -1405,19 +1405,19 @@ void Corpse::QueryLoot(Client* to) {
 			const EQEmu::ItemData* item = database.GetItem(sitem->item_id);
 
 			if (item)
-				to->Message(0, "LootSlot: %i Item: %s (%d), Count: %i", sitem->lootslot, item->Name, item->ID, sitem->charges);
+				to->Message(Chat::White, "LootSlot: %i Item: %s (%d), Count: %i", sitem->lootslot, item->Name, item->ID, sitem->charges);
 			else
-				to->Message(0, "Error: 0x%04x", sitem->item_id);
+				to->Message(Chat::White, "Error: 0x%04x", sitem->item_id);
 
 			y++;
 		}
 	}
 
 	if (IsPlayerCorpse()) {
-		to->Message(0, "%i visible %s (%i total) on %s (DBID: %i).", x, x==1?"item":"items", y, this->GetName(), this->GetCorpseDBID());
+		to->Message(Chat::White, "%i visible %s (%i total) on %s (DBID: %i).", x, x==1?"item":"items", y, this->GetName(), this->GetCorpseDBID());
 	}
 	else {
-		to->Message(0, "%i %s on %s.", y, y==1?"item":"items", this->GetName());
+		to->Message(Chat::White, "%i %s on %s.", y, y==1?"item":"items", this->GetName());
 	}
 }
 
@@ -1426,7 +1426,7 @@ bool Corpse::Summon(Client* client, bool spell, bool CheckDistance) {
 	if (!spell) {
 		if (this->GetCharID() == client->CharacterID()) {
 			if (IsLocked() && client->Admin() < 100) {
-				client->Message(13, "That corpse is locked by a GM.");
+				client->Message(Chat::Red, "That corpse is locked by a GM.");
 				return false;
 			}
 			if (!CheckDistance || (DistanceSquaredNoZ(m_Position, client->GetPosition()) <= dist2)) {
@@ -1434,7 +1434,7 @@ bool Corpse::Summon(Client* client, bool spell, bool CheckDistance) {
 				is_corpse_changed = true;
 			}
 			else {
-				client->Message(0, "Corpse is too far away.");
+				client->Message(Chat::White, "Corpse is too far away.");
 				return false;
 			}
 		}
@@ -1449,14 +1449,14 @@ bool Corpse::Summon(Client* client, bool spell, bool CheckDistance) {
 						is_corpse_changed = true;
 					}
 					else {
-						client->Message(0, "Corpse is too far away.");
+						client->Message(Chat::White, "Corpse is too far away.");
 						return false;
 					}
 					consented = true;
 				}
 			}
 			if(!consented) {
-				client->Message(0, "You do not have permission to move this corpse.");
+				client->Message(Chat::White, "You do not have permission to move this corpse.");
 				return false;
 			}
 		}
diff --git a/zone/doors.cpp b/zone/doors.cpp
index 899e3f6b5..92e83f06d 100644
--- a/zone/doors.cpp
+++ b/zone/doors.cpp
@@ -171,7 +171,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 			if (RuleI(Adventure, ItemIDToEnablePorts) != 0) {
 				if (!sender->KeyRingCheck(RuleI(Adventure, ItemIDToEnablePorts))) {
 					if (sender->GetInv().HasItem(RuleI(Adventure, ItemIDToEnablePorts)) == INVALID_INDEX) {
-						sender->Message_StringID(13, DUNGEON_SEALED);
+						sender->MessageString(Chat::Red, DUNGEON_SEALED);
 						safe_delete(outapp);
 						return;
 					} else {
@@ -267,7 +267,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 				strcpy(door_message, "Door is locked by an unknown guild");
 			}
 
-			sender->Message(4, door_message);
+			sender->Message(Chat::LightBlue, door_message);
 			safe_delete(outapp);
 			return;
 		}
@@ -275,13 +275,13 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 		/**
 		 * Key required
 		 */
-		sender->Message(4, "This is locked...");
+		sender->Message(Chat::LightBlue, "This is locked...");
 
 		/**
 		 * GM can always open locks
 		 */
 		if (sender->GetGM()) {
-			sender->Message_StringID(4, DOORS_GM);
+			sender->MessageString(Chat::LightBlue, DOORS_GM);
 
 			if (!IsDoorOpen() || (open_type == 58)) {
 				move_door_packet->action = static_cast<uint8>(invert_state == 0 ? OPEN_DOOR : OPEN_INVDOOR);
@@ -306,7 +306,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 					sender->KeyRingAdd(player_key);
 				}
 
-				sender->Message(4, "You got it open!");
+				sender->Message(Chat::LightBlue, "You got it open!");
 
 				if (!IsDoorOpen() || (open_type == 58)) {
 					move_door_packet->action = static_cast<uint8>(invert_state == 0 ? OPEN_DOOR : OPEN_INVDOOR);
@@ -325,7 +325,7 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 					float player_pick_lock_skill = sender->GetSkill(EQEmu::skills::SkillPickLock);
 					sender->CheckIncreaseSkill(EQEmu::skills::SkillPickLock, nullptr, 1);
 
-					Log(Logs::General, Logs::Skills, "Client has lockpicks: skill=%f", player_pick_lock_skill);
+					LogSkills("Client has lockpicks: skill=[{}]", player_pick_lock_skill);
 
 					if (GetLockpick() <= player_pick_lock_skill) {
 						if (!IsDoorOpen()) {
@@ -333,19 +333,19 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 						} else {
 							move_door_packet->action = static_cast<uint8>(invert_state == 0 ? CLOSE_DOOR : CLOSE_INVDOOR);
 						}
-						sender->Message_StringID(4, DOORS_SUCCESSFUL_PICK);
+						sender->MessageString(Chat::LightBlue, DOORS_SUCCESSFUL_PICK);
 					} else {
-						sender->Message_StringID(4, DOORS_INSUFFICIENT_SKILL);
+						sender->MessageString(Chat::LightBlue, DOORS_INSUFFICIENT_SKILL);
 						safe_delete(outapp);
 						return;
 					}
 				} else {
-					sender->Message_StringID(4, DOORS_NO_PICK);
+					sender->MessageString(Chat::LightBlue, DOORS_NO_PICK);
 					safe_delete(outapp);
 					return;
 				}
 			} else {
-				sender->Message_StringID(4, DOORS_CANT_PICK);
+				sender->MessageString(Chat::LightBlue, DOORS_CANT_PICK);
 				safe_delete(outapp);
 				return;
 			}
@@ -361,14 +361,14 @@ void Doors::HandleClick(Client* sender, uint8 trigger) {
 			 */
 			if (sender->KeyRingCheck(required_key_item)) {
 				player_key = required_key_item;
-				sender->Message(4, "You got it open!"); // more debug spam
+				sender->Message(Chat::LightBlue, "You got it open!"); // more debug spam
 				if (!IsDoorOpen() || (open_type == 58)) {
 					move_door_packet->action = static_cast<uint8>(invert_state == 0 ? OPEN_DOOR : OPEN_INVDOOR);
 				} else {
 					move_door_packet->action = static_cast<uint8>(invert_state == 0 ? CLOSE_DOOR : CLOSE_INVDOOR);
 				}
 			} else {
-				sender->Message_StringID(4, DOORS_LOCKED);
+				sender->MessageString(Chat::LightBlue, DOORS_LOCKED);
 				safe_delete(outapp);
 				return;
 			}
@@ -679,7 +679,7 @@ int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version)
 }
 
 bool ZoneDatabase::LoadDoors(int32 door_count, Door *into, const char *zone_name, int16 version) {
-	Log(Logs::General, Logs::Status, "Loading Doors from database...");
+	LogInfo("Loading Doors from database");
 
 	std::string query = StringFormat(
 			" SELECT "
diff --git a/zone/effects.cpp b/zone/effects.cpp
index 7887eb652..7e2ecdbc7 100644
--- a/zone/effects.cpp
+++ b/zone/effects.cpp
@@ -122,11 +122,12 @@ int32 Mob::GetActSpellDamage(uint16 spell_id, int32 value, Mob* target) {
 			else if (IsNPC() && CastToNPC()->GetSpellScale())
 				value = int(static_cast<float>(value) * CastToNPC()->GetSpellScale() / 100.0f);
 
-			entity_list.MessageClose_StringID(this, true, 100, MT_SpellCrits,
-					OTHER_CRIT_BLAST, GetName(), itoa(-value));
+			entity_list.MessageCloseString(
+				this, true, 100, Chat::SpellCrit,
+				OTHER_CRIT_BLAST, GetName(), itoa(-value));
 
 			if (IsClient())
-				Message_StringID(MT_SpellCrits, YOU_CRIT_BLAST, itoa(-value));
+				MessageString(Chat::SpellCrit, YOU_CRIT_BLAST, itoa(-value));
 
 			return value;
 		}
@@ -306,11 +307,12 @@ int32 Mob::GetActSpellHealing(uint16 spell_id, int32 value, Mob* target) {
 			value = int(static_cast<float>(value) * CastToNPC()->GetHealScale() / 100.0f);
 
 		if (Critical) {
-			entity_list.MessageClose_StringID(this, true, 100, MT_SpellCrits,
-					OTHER_CRIT_HEAL, GetName(), itoa(value));
+			entity_list.MessageCloseString(
+				this, true, 100, Chat::SpellCrit,
+				OTHER_CRIT_HEAL, GetName(), itoa(value));
 
 			if (IsClient())
-				Message_StringID(MT_SpellCrits, YOU_CRIT_HEAL, itoa(value));
+				MessageString(Chat::SpellCrit, YOU_CRIT_HEAL, itoa(value));
 		}
 
 		return value;
@@ -432,13 +434,13 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	//get the item info
 	const EQEmu::ItemData *item = database.GetItem(itemid);
 	if(item == nullptr) {
-		Message(13, "Unable to find the tome you turned in!");
-		Log(Logs::General, Logs::Error, "Unable to find turned in tome id %lu\n", (unsigned long)itemid);
+		Message(Chat::Red, "Unable to find the tome you turned in!");
+		LogError("Unable to find turned in tome id [{}]\n", (unsigned long)itemid);
 		return(false);
 	}
 
 	if (!item->IsClassCommon() || item->ItemType != EQEmu::item::ItemTypeSpell) {
-		Message(13, "Invalid item type, you cannot learn from this item.");
+		Message(Chat::Red, "Invalid item type, you cannot learn from this item.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -462,7 +464,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 		item->Name[5] == ':' &&
 		item->Name[6] == ' '
 		)) {
-		Message(13, "This item is not a tome.");
+		Message(Chat::Red, "This item is not a tome.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -470,7 +472,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 
 	int myclass = GetClass();
 	if(myclass == WIZARD || myclass == ENCHANTER || myclass == MAGICIAN || myclass == NECROMANCER) {
-		Message(13, "Your class cannot learn from this tome.");
+		Message(Chat::Red, "Your class cannot learn from this tome.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -480,7 +482,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	//can we use the item?
 	uint32 cbit = 1 << (myclass-1);
 	if(!(item->Classes & cbit)) {
-		Message(13, "Your class cannot learn from this tome.");
+		Message(Chat::Red, "Your class cannot learn from this tome.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -488,7 +490,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 
 	uint32 spell_id = item->Scroll.Effect;
 	if(!IsValidSpell(spell_id)) {
-		Message(13, "This tome contains invalid knowledge.");
+		Message(Chat::Red, "This tome contains invalid knowledge.");
 		return(false);
 	}
 
@@ -496,14 +498,14 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	const SPDat_Spell_Struct &spell = spells[spell_id];
 	uint8 level_to_use = spell.classes[myclass - 1];
 	if(level_to_use == 255) {
-		Message(13, "Your class cannot learn from this tome.");
+		Message(Chat::Red, "Your class cannot learn from this tome.");
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
 	}
 
 	if(level_to_use > GetLevel()) {
-		Message(13, "You must be at least level %d to learn this discipline.", level_to_use);
+		Message(Chat::Red, "You must be at least level %d to learn this discipline.", level_to_use);
 		//summon them the item back...
 		SummonItem(itemid);
 		return(false);
@@ -513,7 +515,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 	int r;
 	for(r = 0; r < MAX_PP_DISCIPLINES; r++) {
 		if(m_pp.disciplines.values[r] == spell_id) {
-			Message(13, "You already know this discipline.");
+			Message(Chat::Red, "You already know this discipline.");
 			//summon them the item back...
 			SummonItem(itemid);
 			return(false);
@@ -525,7 +527,7 @@ bool Client::TrainDiscipline(uint32 itemid) {
 			return(true);
 		}
 	}
-	Message(13, "You have learned too many disciplines and can learn no more.");
+	Message(Chat::Red, "You have learned too many disciplines and can learn no more.");
 	return(false);
 }
 
@@ -537,7 +539,7 @@ void Client::TrainDiscBySpellID(int32 spell_id)
 			m_pp.disciplines.values[i] = spell_id;
 			database.SaveCharacterDisc(this->CharacterID(), i, spell_id);
 			SendDisciplineUpdate();
-			Message(15, "You have learned a new combat ability!");
+			Message(Chat::Yellow, "You have learned a new combat ability!");
 			return;
 		}
 	}
@@ -581,7 +583,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 
 	//make sure we can use it..
 	if(!IsValidSpell(spell_id)) {
-		Message(13, "This tome contains invalid knowledge.");
+		Message(Chat::Red, "This tome contains invalid knowledge.");
 		return(false);
 	}
 
@@ -589,13 +591,13 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 	const SPDat_Spell_Struct &spell = spells[spell_id];
 	uint8 level_to_use = spell.classes[GetClass() - 1];
 	if(level_to_use == 255) {
-		Message(13, "Your class cannot learn from this tome.");
+		Message(Chat::Red, "Your class cannot learn from this tome.");
 		//should summon them a new one...
 		return(false);
 	}
 
 	if(level_to_use > GetLevel()) {
-		Message_StringID(13, DISC_LEVEL_USE_ERROR);
+		MessageString(Chat::Red, DISC_LEVEL_USE_ERROR);
 		//should summon them a new one...
 		return(false);
 	}
@@ -607,7 +609,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 
 	// sneak attack discs require you to be hidden for 4 seconds before use
 	if (spell.sneak && (!hidden || (hidden && (Timer::GetCurrentTime() - tmHidden) < 4000))) {
-		Message_StringID(MT_SpellFailure, SNEAK_RESTRICT);
+		MessageString(Chat::SpellFailure, SNEAK_RESTRICT);
 		return false;
 	}
 
@@ -621,7 +623,7 @@ bool Client::UseDiscipline(uint32 spell_id, uint32 target) {
 		/*char val1[20]={0};*/	//unused
 		/*char val2[20]={0};*/	//unused
 		uint32 remain = p_timers.GetRemainingTime(DiscTimer);
-		//Message_StringID(0, DISCIPLINE_CANUSEIN, ConvertArray((remain)/60,val1), ConvertArray(remain%60,val2));
+		//MessageString(Chat::White, DISCIPLINE_CANUSEIN, ConvertArray((remain)/60,val1), ConvertArray(remain%60,val2));
 		Message(0, "You can use this discipline in %d minutes %d seconds.", ((remain)/60), (remain%60));
 		return(false);
 	}
@@ -671,252 +673,429 @@ void Client::SendDisciplineTimer(uint32 timer_id, uint32 duration)
 	}
 }
 
-void EntityList::AETaunt(Client* taunter, float range, int32 bonus_hate)
+/**
+ * @param taunter
+ * @param range
+ * @param bonus_hate
+ */
+void EntityList::AETaunt(Client *taunter, float range, int32 bonus_hate)
 {
-	if (range == 0)
-		range = 40;		//Live AE taunt range - Hardcoded.
 
-	range = range * range;
+	/**
+	 * Live AE taunt range - Hardcoded.
+	 */
+	if (range == 0) {
+		range = 40;
+	}
 
-	auto it = npc_list.begin();
-	while (it != npc_list.end()) {
-		NPC *them = it->second;
-		float zdiff = taunter->GetZ() - them->GetZ();
-		if (zdiff < 0)
-			zdiff *= -1;
-		if (zdiff < 10
-				&& taunter->IsAttackAllowed(them)
-				&& DistanceSquaredNoZ(taunter->GetPosition(), them->GetPosition()) <= range) {
+	float range_squared = range * range;
+
+	for (auto &it : entity_list.GetCloseMobList(taunter, range)) {
+		Mob *them = it.second;
+
+		if (!them->IsNPC()) {
+			continue;
+		}
+
+		float z_difference = taunter->GetZ() - them->GetZ();
+		if (z_difference < 0) {
+			z_difference *= -1;
+		}
+
+		if (z_difference < 10
+			&& taunter->IsAttackAllowed(them)
+			&& DistanceSquaredNoZ(taunter->GetPosition(), them->GetPosition()) <= range_squared) {
 			if (taunter->CheckLosFN(them)) {
-				taunter->Taunt(them, true,0,true,bonus_hate);
+				taunter->Taunt(them->CastToNPC(), true, 0, true, bonus_hate);
 			}
 		}
-		++it;
 	}
 }
 
-// causes caster to hit every mob within dist range of center with
-// spell_id.
-// NPC spells will only affect other NPCs with compatible faction
-void EntityList::AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster, int16 resist_adjust, int *max_targets)
+/**
+ * Causes caster to hit every mob within dist range of center with spell_id
+ *
+ * @param caster_mob
+ * @param center_mob
+ * @param spell_id
+ * @param affect_caster
+ * @param resist_adjust
+ * @param max_targets
+ */
+void EntityList::AESpell(
+	Mob *caster_mob,
+	Mob *center_mob,
+	uint16 spell_id,
+	bool affect_caster,
+	int16 resist_adjust,
+	int *max_targets
+)
 {
-	Mob *curmob = nullptr;
+	const auto &cast_target_position =
+				   spells[spell_id].targettype == ST_Ring ?
+					   caster_mob->GetTargetRingLocation() :
+					   static_cast<glm::vec3>(center_mob->GetPosition());
 
-	float dist = caster->GetAOERange(spell_id);
-	float dist2 = dist * dist;
-	float min_range2 = spells[spell_id].min_range * spells[spell_id].min_range;
-	float dist_targ = 0;
+	Mob       *current_mob         = nullptr;
+	bool      is_detrimental_spell = IsDetrimentalSpell(spell_id);
+	bool      is_npc               = caster_mob->IsNPC();
+	float     distance             = caster_mob->GetAOERange(spell_id);
+	float     distance_squared     = distance * distance;
+	float     min_range2           = spells[spell_id].min_range * spells[spell_id].min_range;
+	glm::vec2 min                  = {cast_target_position.x - distance, cast_target_position.y - distance};
+	glm::vec2 max                  = {cast_target_position.x + distance, cast_target_position.y + distance};
 
-	const auto &position = spells[spell_id].targettype == ST_Ring ? caster->GetTargetRingLocation() : static_cast<glm::vec3>(center->GetPosition());
-	glm::vec2 min = { position.x - dist, position.y - dist };
-	glm::vec2 max = { position.x + dist, position.y + dist };
+	/**
+	 * If using Old Rain Targets - there is no max target limitation
+	 */
+	if (RuleB(Spells, OldRainTargets)) {
+		max_targets = nullptr;
+	}
 
-	bool bad = IsDetrimentalSpell(spell_id);
-	bool isnpc = caster->IsNPC();
-
-	if (RuleB(Spells, OldRainTargets))
-		max_targets = nullptr; // ignore it!
-
-	// if we have a passed in value, use it, otherwise default to data
-	// detrimental Target AEs have a default value of 4 for PCs and unlimited for NPCs
+	/**
+	 * Max AOE targets
+	 */
 	int max_targets_allowed = 0; // unlimited
-	if (max_targets) // rains pass this in since they need to preserve the count through waves
+	if (max_targets) { // rains pass this in since they need to preserve the count through waves
 		max_targets_allowed = *max_targets;
-	else if (spells[spell_id].aemaxtargets)
+	}
+	else if (spells[spell_id].aemaxtargets) {
 		max_targets_allowed = spells[spell_id].aemaxtargets;
-	else if (IsTargetableAESpell(spell_id) && bad && !isnpc)
+	}
+	else if (IsTargetableAESpell(spell_id) && is_detrimental_spell && !is_npc) {
 		max_targets_allowed = 4;
+	}
 
-	int iCounter = 0;
+	int   target_hit_counter = 0;
+	float distance_to_target = 0;
 
-	for (auto it = mob_list.begin(); it != mob_list.end(); ++it) {
-		curmob = it->second;
-		// test to fix possible cause of random zone crashes..external methods accessing client properties before they're initialized
-		if (curmob->IsClient() && !curmob->CastToClient()->ClientFinishedLoading())
-			continue;
-		if (curmob == caster && !affect_caster)	//watch for caster too
-			continue;
-		if (spells[spell_id].targettype == ST_TargetAENoPlayersPets && curmob->IsPetOwnerClient())
-			continue;
-		if (spells[spell_id].targettype == ST_AreaClientOnly && !curmob->IsClient())
-			continue;
-		if (spells[spell_id].targettype == ST_AreaNPCOnly && !curmob->IsNPC())
-			continue;
-		// check PC/NPC only flag 1 = PCs, 2 = NPCs
-		if (spells[spell_id].pcnpc_only_flag == 1 && !curmob->IsClient() && !curmob->IsMerc())
-			continue;
-		if (spells[spell_id].pcnpc_only_flag == 2 && (curmob->IsClient() || curmob->IsMerc()))
-			continue;
-		if (!IsWithinAxisAlignedBox(static_cast<glm::vec2>(curmob->GetPosition()), min, max))
-			continue;
+	LogAoeCast(
+		"Close scan distance [{}] cast distance [{}]",
+		RuleI(Range, MobCloseScanDistance),
+		distance
+	);
 
-		dist_targ = DistanceSquared(curmob->GetPosition(), position);
+	for (auto &it : entity_list.GetCloseMobList(caster_mob, distance)) {
+		current_mob = it.second;
 
-		if (dist_targ > dist2)	//make sure they are in range
+		if (!current_mob) {
 			continue;
-		if (dist_targ < min_range2)	//make sure they are in range
+		}
+
+		LogAoeCast("Checking AOE against mob [{}]", current_mob->GetCleanName());
+
+		if (current_mob->IsClient() && !current_mob->CastToClient()->ClientFinishedLoading()) {
 			continue;
-		if (isnpc && curmob->IsNPC() && spells[spell_id].targettype != ST_AreaNPCOnly) {	//check npc->npc casting
-			FACTION_VALUE f = curmob->GetReverseFactionCon(caster);
-			if (bad) {
+		}
+
+		if (current_mob == caster_mob && !affect_caster) {
+			continue;
+		}
+
+		if (spells[spell_id].targettype == ST_TargetAENoPlayersPets && current_mob->IsPetOwnerClient()) {
+			continue;
+		}
+
+		if (spells[spell_id].targettype == ST_AreaClientOnly && !current_mob->IsClient()) {
+			continue;
+		}
+
+		if (spells[spell_id].targettype == ST_AreaNPCOnly && !current_mob->IsNPC()) {
+			continue;
+		}
+
+		/**
+		 * Check PC / NPC
+		 * 1 = PC
+		 * 2 = NPC
+		 */
+		if (spells[spell_id].pcnpc_only_flag == 1 && !current_mob->IsClient() && !current_mob->IsMerc() &&
+		    !current_mob->IsBot()) {
+			continue;
+		}
+
+		if (spells[spell_id].pcnpc_only_flag == 2 &&
+		    (current_mob->IsClient() || current_mob->IsMerc() || current_mob->IsBot())) {
+			continue;
+		}
+
+		if (!IsWithinAxisAlignedBox(static_cast<glm::vec2>(current_mob->GetPosition()), min, max)) {
+			continue;
+		}
+
+		distance_to_target = DistanceSquared(current_mob->GetPosition(), cast_target_position);
+
+		if (distance_to_target > distance_squared) {
+			continue;
+		}
+
+		if (distance_to_target < min_range2) {
+			continue;
+		}
+
+		if (is_npc && current_mob->IsNPC() &&
+			spells[spell_id].targettype != ST_AreaNPCOnly) {    //check npc->npc casting
+			FACTION_VALUE faction_value = current_mob->GetReverseFactionCon(caster_mob);
+			if (is_detrimental_spell) {
 				//affect mobs that are on our hate list, or
 				//which have bad faction with us
-				if (!(caster->CheckAggro(curmob) || f == FACTION_THREATENLY || f == FACTION_SCOWLS) )
+				if (
+					!(caster_mob->CheckAggro(current_mob) ||
+					  faction_value == FACTION_THREATENLY ||
+					  faction_value == FACTION_SCOWLS)) {
 					continue;
-			} else {
+				}
+			}
+			else {
 				//only affect mobs we would assist.
-				if (!(f <= FACTION_AMIABLE))
+				if (!(faction_value <= FACTION_AMIABLE)) {
 					continue;
+				}
 			}
 		}
-		//finally, make sure they are within range
-		if (bad) {
-			if (!caster->IsAttackAllowed(curmob, true))
+
+		/**
+		 * Finally, make sure they are within range
+		 */
+		if (is_detrimental_spell) {
+			if (!caster_mob->IsAttackAllowed(current_mob, true)) {
 				continue;
-			if (center && !spells[spell_id].npc_no_los && !center->CheckLosFN(curmob))
+			}
+			if (center_mob && !spells[spell_id].npc_no_los && !center_mob->CheckLosFN(current_mob)) {
 				continue;
-			if (!center && !spells[spell_id].npc_no_los && !caster->CheckLosFN(caster->GetTargetRingX(), caster->GetTargetRingY(), caster->GetTargetRingZ(), curmob->GetSize()))
+			}
+			if (!center_mob && !spells[spell_id].npc_no_los && !caster_mob->CheckLosFN(
+				caster_mob->GetTargetRingX(),
+				caster_mob->GetTargetRingY(),
+				caster_mob->GetTargetRingZ(),
+				current_mob->GetSize())) {
 				continue;
-		} else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies...
-			// This does not check faction for beneficial AE buffs..only agro and attackable.
-			// I've tested for spells that I can find without problem, but a faction-based
-			// check may still be needed. Any changes here should also reflect in BardAEPulse()
-			if (caster->IsAttackAllowed(curmob, true))
+			}
+		}
+		else {
+
+			/**
+			 * Check to stop casting beneficial ae buffs (to wit: bard songs) on enemies...
+			 * This does not check faction for beneficial AE buffs... only agro and attackable.
+			 * I've tested for spells that I can find without problem, but a faction-based
+			 * check may still be needed. Any changes here should also reflect in BardAEPulse()
+			 */
+			if (caster_mob->IsAttackAllowed(current_mob, true)) {
 				continue;
-			if (caster->CheckAggro(curmob))
+			}
+			if (caster_mob->CheckAggro(current_mob)) {
 				continue;
+			}
 		}
 
-		curmob->CalcSpellPowerDistanceMod(spell_id, dist_targ);
-		caster->SpellOnTarget(spell_id, curmob, false, true, resist_adjust);
-
-		if (max_targets_allowed) { // if we have a limit, increment count
-			iCounter++;
-			if (iCounter >= max_targets_allowed) // we done
+		/**
+		 * Increment hit count if max targets
+		 */
+		if (max_targets_allowed) {
+			target_hit_counter++;
+			if (target_hit_counter >= max_targets_allowed) {
 				break;
+			}
 		}
+
+		current_mob->CalcSpellPowerDistanceMod(spell_id, distance_to_target);
+		caster_mob->SpellOnTarget(spell_id, current_mob, false, true, resist_adjust);
 	}
 
-	if (max_targets && max_targets_allowed)
-		*max_targets = *max_targets - iCounter;
+	LogAoeCast("Done iterating [{}]", caster_mob->GetCleanName());
+
+	if (max_targets && max_targets_allowed) {
+		*max_targets = *max_targets - target_hit_counter;
+	}
 }
 
-void EntityList::MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster)
+/**
+ * @param caster
+ * @param center
+ * @param spell_id
+ * @param affect_caster
+ */
+void EntityList::MassGroupBuff(
+	Mob *caster,
+	Mob *center,
+	uint16 spell_id,
+	bool affect_caster)
 {
-	Mob *curmob = nullptr;
+	Mob   *current_mob         = nullptr;
+	float distance             = caster->GetAOERange(spell_id);
+	float distance_squared     = distance * distance;
+	bool  is_detrimental_spell = IsDetrimentalSpell(spell_id);
 
-	float dist = caster->GetAOERange(spell_id);
-	float dist2 = dist * dist;
+	for (auto &it : entity_list.GetCloseMobList(caster, distance)) {
+		current_mob = it.second;
 
-	bool bad = IsDetrimentalSpell(spell_id);
-
-	for (auto it = mob_list.begin(); it != mob_list.end(); ++it) {
-		curmob = it->second;
-		if (curmob == center)	//do not affect center
-			continue;
-		if (curmob == caster && !affect_caster)	//watch for caster too
-			continue;
-		if (DistanceSquared(center->GetPosition(), curmob->GetPosition()) > dist2)	//make sure they are in range
+		/**
+		 * Skip center
+		 */
+		if (current_mob == center) {
 			continue;
+		}
 
-		//Only npcs mgb should hit are client pets...
-		if (curmob->IsNPC()) {
-			Mob *owner = curmob->GetOwner();
+		/**
+		 * Skip self
+		 */
+		if (current_mob == caster && !affect_caster) {
+			continue;
+		}
+
+		if (DistanceSquared(center->GetPosition(), current_mob->GetPosition()) > distance_squared) {    //make sure they are in range
+			continue;
+		}
+
+		/**
+		 * Pets
+		 */
+		if (current_mob->IsNPC()) {
+			Mob *owner = current_mob->GetOwner();
 			if (owner) {
 				if (!owner->IsClient()) {
 					continue;
 				}
-			} else {
+			}
+			else {
 				continue;
 			}
 		}
 
-		if (bad) {
+		if (is_detrimental_spell) {
 			continue;
 		}
 
-		caster->SpellOnTarget(spell_id, curmob);
+		caster->SpellOnTarget(spell_id, current_mob);
 	}
 }
 
-// causes caster to hit every mob within dist range of center with
-// a bard pulse of spell_id.
-// NPC spells will only affect other NPCs with compatible faction
-void EntityList::AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster)
+/**
+ * Causes caster to hit every mob within dist range of center with a bard pulse of spell_id
+ * NPC spells will only affect other NPCs with compatible faction
+ *
+ * @param caster
+ * @param center
+ * @param spell_id
+ * @param affect_caster
+ */
+void EntityList::AEBardPulse(
+	Mob *caster,
+	Mob *center,
+	uint16 spell_id,
+	bool affect_caster)
 {
-	Mob *curmob = nullptr;
+	Mob   *current_mob         = nullptr;
+	float distance             = caster->GetAOERange(spell_id);
+	float distance_squared     = distance * distance;
+	bool  is_detrimental_spell = IsDetrimentalSpell(spell_id);
+	bool  is_npc               = caster->IsNPC();
 
-	float dist = caster->GetAOERange(spell_id);
-	float dist2 = dist * dist;
+	for (auto &it : entity_list.GetCloseMobList(caster, distance)) {
+		current_mob = it.second;
 
-	bool bad = IsDetrimentalSpell(spell_id);
-	bool isnpc = caster->IsNPC();
+		/**
+		 * Skip self
+		 */
+		if (current_mob == center) {
+			continue;
+		}
 
-	for (auto it = mob_list.begin(); it != mob_list.end(); ++it) {
-		curmob = it->second;
-		if (curmob == center)	//do not affect center
+		if (current_mob == caster && !affect_caster) {
 			continue;
-		if (curmob == caster && !affect_caster)	//watch for caster too
+		}
+
+		if (DistanceSquared(center->GetPosition(), current_mob->GetPosition()) > distance_squared) {    //make sure they are in range
 			continue;
-		if (DistanceSquared(center->GetPosition(), curmob->GetPosition()) > dist2)	//make sure they are in range
-			continue;
-		if (isnpc && curmob->IsNPC()) {	//check npc->npc casting
-			FACTION_VALUE f = curmob->GetReverseFactionCon(caster);
-			if (bad) {
+		}
+
+		/**
+		 * check npc->npc casting
+		 */
+		if (is_npc && current_mob->IsNPC()) {
+			FACTION_VALUE faction = current_mob->GetReverseFactionCon(caster);
+			if (is_detrimental_spell) {
 				//affect mobs that are on our hate list, or
 				//which have bad faction with us
-				if (!(caster->CheckAggro(curmob) || f == FACTION_THREATENLY || f == FACTION_SCOWLS) )
+				if (!(caster->CheckAggro(current_mob) || faction == FACTION_THREATENLY || faction == FACTION_SCOWLS)) {
 					continue;
-			} else {
+				}
+			}
+			else {
 				//only affect mobs we would assist.
-				if (!(f <= FACTION_AMIABLE))
+				if (!(faction <= FACTION_AMIABLE)) {
 					continue;
+				}
 			}
 		}
-		//finally, make sure they are within range
-		if (bad) {
-			if (!center->CheckLosFN(curmob))
+
+		/**
+		 * LOS
+		 */
+		if (is_detrimental_spell) {
+			if (!center->CheckLosFN(current_mob)) {
 				continue;
-		} else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies...
+			}
+		}
+		else { // check to stop casting beneficial ae buffs (to wit: bard songs) on enemies...
 			// See notes in AESpell() above for more info.
-			if (caster->IsAttackAllowed(curmob, true))
+			if (caster->IsAttackAllowed(current_mob, true)) {
 				continue;
-			if (caster->CheckAggro(curmob))
+			}
+			if (caster->CheckAggro(current_mob)) {
 				continue;
+			}
 		}
 
-		//if we get here... cast the spell.
-		curmob->BardPulse(spell_id, caster);
+		current_mob->BardPulse(spell_id, caster);
 	}
-	if (caster->IsClient())
+	if (caster->IsClient()) {
 		caster->CastToClient()->CheckSongSkillIncrease(spell_id);
+	}
 }
 
-// Rampage and stuff for clients. Normal and Duration rampages
-//NPCs handle it differently in Mob::Rampage
-void EntityList::AEAttack(Mob *attacker, float dist, int Hand, int count, bool IsFromSpell) {
-//Dook- Will need tweaking, currently no pets or players or horses
-	Mob *curmob = nullptr;
+/**
+ * Rampage - Normal and Duration rampages
+ * NPCs handle it differently in Mob::Rampage
+ *
+ * @param attacker
+ * @param distance
+ * @param Hand
+ * @param count
+ * @param is_from_spell
+ */
+void EntityList::AEAttack(
+	Mob *attacker,
+	float distance,
+	int Hand,
+	int count,
+	bool is_from_spell)
+{
+	Mob   *current_mob     = nullptr;
+	float distance_squared = distance * distance;
+	int   hit_count        = 0;
 
-	float dist2 = dist * dist;
+	for (auto &it : entity_list.GetCloseMobList(attacker, distance)) {
+		current_mob = it.second;
 
-	int hit = 0;
+		if (current_mob->IsNPC()
+			&& current_mob != attacker //this is not needed unless NPCs can use this
+			&& (attacker->IsAttackAllowed(current_mob))
+			&& current_mob->GetRace() != 216 && current_mob->GetRace() != 472 /* dont attack horses */
+			&& (DistanceSquared(current_mob->GetPosition(), attacker->GetPosition()) <= distance_squared)
+			) {
 
-	for (auto it = mob_list.begin(); it != mob_list.end(); ++it) {
-		curmob = it->second;
-		if (curmob->IsNPC()
-				&& curmob != attacker //this is not needed unless NPCs can use this
-				&&(attacker->IsAttackAllowed(curmob))
-				&& curmob->GetRace() != 216 && curmob->GetRace() != 472 /* dont attack horses */
-				&& (DistanceSquared(curmob->GetPosition(), attacker->GetPosition()) <= dist2)
-		) {
-			if (!attacker->IsClient() || attacker->GetClass() == MONK || attacker->GetClass() == RANGER)
-				attacker->Attack(curmob, Hand, false, false, IsFromSpell);
-			else
-				attacker->CastToClient()->DoAttackRounds(curmob, Hand, IsFromSpell);
-			hit++;
-			if (count != 0 && hit >= count)
+			if (!attacker->IsClient() || attacker->GetClass() == MONK || attacker->GetClass() == RANGER) {
+				attacker->Attack(current_mob, Hand, false, false, is_from_spell);
+			}
+			else {
+				attacker->CastToClient()->DoAttackRounds(current_mob, Hand, is_from_spell);
+			}
+
+			hit_count++;
+			if (count != 0 && hit_count >= count) {
 				return;
+			}
 		}
 	}
 }
diff --git a/zone/embparser.cpp b/zone/embparser.cpp
index 759fe5931..f89c09ad4 100644
--- a/zone/embparser.cpp
+++ b/zone/embparser.cpp
@@ -31,7 +31,7 @@
 #include <algorithm>
 #include <sstream>
 
-extern Zone* zone;
+extern Zone *zone;
 
 const char *QuestEventSubroutines[_LargestEventID] = {
 	"EVENT_SAY",
@@ -98,7 +98,7 @@ const char *QuestEventSubroutines[_LargestEventID] = {
 	"EVENT_DUEL_LOSE",
 	"EVENT_ENCOUNTER_LOAD",
 	"EVENT_ENCOUNTER_UNLOAD",
-	"EVENT_SAY",
+	"EVENT_COMMAND",
 	"EVENT_DROP_ITEM",
 	"EVENT_DESTROY_ITEM",
 	"EVENT_FEIGN_DEATH",
@@ -118,110 +118,144 @@ const char *QuestEventSubroutines[_LargestEventID] = {
 	"EVENT_SPAWN_ZONE",
 	"EVENT_DEATH_ZONE",
 	"EVENT_USE_SKILL",
+	"EVENT_COMBINE_VALIDATE",
+	"EVENT_BOT_COMMAND"
 };
 
-PerlembParser::PerlembParser() : perl(nullptr) {
-	global_npc_quest_status_ = questUnloaded;
-	player_quest_status_ = questUnloaded;
+PerlembParser::PerlembParser() : perl(nullptr)
+{
+	global_npc_quest_status_    = questUnloaded;
+	player_quest_status_        = questUnloaded;
 	global_player_quest_status_ = questUnloaded;
 }
 
-PerlembParser::~PerlembParser() {
+PerlembParser::~PerlembParser()
+{
 	safe_delete(perl);
 }
 
-void PerlembParser::ReloadQuests() {
+void PerlembParser::ReloadQuests()
+{
 	try {
-		if(perl == nullptr) {
+		if (perl == nullptr) {
 			perl = new Embperl;
-		} else {
+		}
+		else {
 			perl->Reinit();
 		}
 		MapFunctions();
 	}
-	catch(std::exception &e) {
-		if(perl != nullptr) {
+	catch (std::exception &e) {
+		if (perl != nullptr) {
 			delete perl;
 			perl = nullptr;
 		}
 
-		Log(Logs::General, Logs::Status, "Error re-initializing perlembed: %s", e.what());
+		LogInfo("Error Re-Initializing PerlEmbed: [{}]", e.what());
 		throw e.what();
 	}
 
 	errors_.clear();
 	npc_quest_status_.clear();
-	global_npc_quest_status_ = questUnloaded;
-	player_quest_status_ = questUnloaded;
+	global_npc_quest_status_    = questUnloaded;
+	player_quest_status_        = questUnloaded;
 	global_player_quest_status_ = questUnloaded;
 	item_quest_status_.clear();
 	spell_quest_status_.clear();
 }
 
-int PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * data, NPC* npcmob, EQEmu::ItemInstance* item_inst, Mob* mob,
-	uint32 extradata, bool global, std::vector<EQEmu::Any> *extra_pointers)
+int PerlembParser::EventCommon(
+	QuestEventID event, uint32 objid, const char *data, NPC *npcmob, EQEmu::ItemInstance *item_inst, Mob *mob,
+	uint32 extradata, bool global, std::vector<EQEmu::Any> *extra_pointers
+)
 {
-	if(!perl)
+	if (!perl) {
 		return 0;
+	}
 
-	if(event >= _LargestEventID)
+	if (event >= _LargestEventID) {
 		return 0;
+	}
 
-	bool isPlayerQuest = false;
-	bool isGlobalPlayerQuest = false;
-	bool isGlobalNPC = false;
-	bool isItemQuest = false;
-	bool isSpellQuest = false;
+	bool        isPlayerQuest       = false;
+	bool        isGlobalPlayerQuest = false;
+	bool        isGlobalNPC         = false;
+	bool        isItemQuest         = false;
+	bool        isSpellQuest        = false;
 	std::string package_name;
 
-	GetQuestTypes(isPlayerQuest, isGlobalPlayerQuest, isGlobalNPC, isItemQuest, isSpellQuest,
-		event, npcmob, item_inst, mob, global);
-	GetQuestPackageName(isPlayerQuest, isGlobalPlayerQuest, isGlobalNPC, isItemQuest, isSpellQuest,
-		package_name, event, objid, data, npcmob, item_inst, global);
+	GetQuestTypes(
+		isPlayerQuest, isGlobalPlayerQuest, isGlobalNPC, isItemQuest, isSpellQuest,
+		event, npcmob, item_inst, mob, global
+	);
+	GetQuestPackageName(
+		isPlayerQuest, isGlobalPlayerQuest, isGlobalNPC, isItemQuest, isSpellQuest,
+		package_name, event, objid, data, npcmob, item_inst, global
+	);
 
 	const char *sub_name = QuestEventSubroutines[event];
-	if(!perl->SubExists(package_name.c_str(), sub_name)) {
+	if (!perl->SubExists(package_name.c_str(), sub_name)) {
 		return 0;
 	}
 
 	int char_id = 0;
 	ExportCharID(package_name, char_id, npcmob, mob);
-	
+
 	/* Check for QGlobal export event enable */
-	if (parse->perl_event_export_settings[event].qglobals){
-		ExportQGlobals(isPlayerQuest, isGlobalPlayerQuest, isGlobalNPC, isItemQuest, isSpellQuest, package_name, npcmob, mob, char_id);
+	if (parse->perl_event_export_settings[event].qglobals) {
+		ExportQGlobals(
+			isPlayerQuest,
+			isGlobalPlayerQuest,
+			isGlobalNPC,
+			isItemQuest,
+			isSpellQuest,
+			package_name,
+			npcmob,
+			mob,
+			char_id
+		);
 	}
 
 	/* Check for Mob export event enable */
-	if (parse->perl_event_export_settings[event].mob){
-		ExportMobVariables(isPlayerQuest, isGlobalPlayerQuest, isGlobalNPC, isItemQuest, isSpellQuest, package_name, mob, npcmob);
+	if (parse->perl_event_export_settings[event].mob) {
+		ExportMobVariables(
+			isPlayerQuest,
+			isGlobalPlayerQuest,
+			isGlobalNPC,
+			isItemQuest,
+			isSpellQuest,
+			package_name,
+			mob,
+			npcmob
+		);
 	}
 
 	/* Check for Zone export event enable */
-	if (parse->perl_event_export_settings[event].zone){
+	if (parse->perl_event_export_settings[event].zone) {
 		ExportZoneVariables(package_name);
 	}
 
 	/* Check for Item export event enable */
-	if (parse->perl_event_export_settings[event].item){
+	if (parse->perl_event_export_settings[event].item) {
 		ExportItemVariables(package_name, mob);
 	}
 
 	/* Check for Event export event enable */
-	if (parse->perl_event_export_settings[event].event_variables){
+	if (parse->perl_event_export_settings[event].event_variables) {
 		ExportEventVariables(package_name, event, objid, data, npcmob, item_inst, mob, extradata, extra_pointers);
 	}
 
-	if(isPlayerQuest || isGlobalPlayerQuest){
+	if (isPlayerQuest || isGlobalPlayerQuest) {
 		return SendCommands(package_name.c_str(), sub_name, 0, mob, mob, nullptr);
 	}
-	else if(isItemQuest) {
+	else if (isItemQuest) {
 		return SendCommands(package_name.c_str(), sub_name, 0, mob, mob, item_inst);
 	}
-	else if(isSpellQuest){
-		if(mob) {
+	else if (isSpellQuest) {
+		if (mob) {
 			return SendCommands(package_name.c_str(), sub_name, 0, mob, mob, nullptr);
-		} else {
+		}
+		else {
 			return SendCommands(package_name.c_str(), sub_name, 0, npcmob, mob, nullptr);
 		}
 	}
@@ -230,169 +264,212 @@ int PerlembParser::EventCommon(QuestEventID event, uint32 objid, const char * da
 	}
 }
 
-int PerlembParser::EventNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data,
-							std::vector<EQEmu::Any> *extra_pointers) {
+int PerlembParser::EventNPC(
+	QuestEventID evt, NPC *npc, Mob *init, std::string data, uint32 extra_data,
+	std::vector<EQEmu::Any> *extra_pointers
+)
+{
 	return EventCommon(evt, npc->GetNPCTypeID(), data.c_str(), npc, nullptr, init, extra_data, false, extra_pointers);
 }
 
-int PerlembParser::EventGlobalNPC(QuestEventID evt, NPC* npc, Mob *init, std::string data, uint32 extra_data,
-								  std::vector<EQEmu::Any> *extra_pointers) {
+int PerlembParser::EventGlobalNPC(
+	QuestEventID evt, NPC *npc, Mob *init, std::string data, uint32 extra_data,
+	std::vector<EQEmu::Any> *extra_pointers
+)
+{
 	return EventCommon(evt, npc->GetNPCTypeID(), data.c_str(), npc, nullptr, init, extra_data, true, extra_pointers);
 }
 
-int PerlembParser::EventPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data,
-								std::vector<EQEmu::Any> *extra_pointers) {
+int PerlembParser::EventPlayer(
+	QuestEventID evt, Client *client, std::string data, uint32 extra_data,
+	std::vector<EQEmu::Any> *extra_pointers
+)
+{
 	return EventCommon(evt, 0, data.c_str(), nullptr, nullptr, client, extra_data, false, extra_pointers);
 }
 
-int PerlembParser::EventGlobalPlayer(QuestEventID evt, Client *client, std::string data, uint32 extra_data,
-									std::vector<EQEmu::Any> *extra_pointers) {
+int PerlembParser::EventGlobalPlayer(
+	QuestEventID evt, Client *client, std::string data, uint32 extra_data,
+	std::vector<EQEmu::Any> *extra_pointers
+)
+{
 	return EventCommon(evt, 0, data.c_str(), nullptr, nullptr, client, extra_data, true, extra_pointers);
 }
 
-int PerlembParser::EventItem(QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data,
-							std::vector<EQEmu::Any> *extra_pointers) {
+int PerlembParser::EventItem(
+	QuestEventID evt, Client *client, EQEmu::ItemInstance *item, Mob *mob, std::string data, uint32 extra_data,
+	std::vector<EQEmu::Any> *extra_pointers
+)
+{
 	// needs pointer validation on 'item' argument
 	return EventCommon(evt, item->GetID(), nullptr, nullptr, item, client, extra_data, false, extra_pointers);
 }
 
-int PerlembParser::EventSpell(QuestEventID evt, NPC* npc, Client *client, uint32 spell_id, uint32 extra_data,
-							std::vector<EQEmu::Any> *extra_pointers) {
+int PerlembParser::EventSpell(
+	QuestEventID evt, NPC *npc, Client *client, uint32 spell_id, uint32 extra_data,
+	std::vector<EQEmu::Any> *extra_pointers
+)
+{
 	return EventCommon(evt, 0, itoa(spell_id), npc, nullptr, client, extra_data, false, extra_pointers);
 }
 
-bool PerlembParser::HasQuestSub(uint32 npcid, QuestEventID evt) {
+bool PerlembParser::HasQuestSub(uint32 npcid, QuestEventID evt)
+{
 	std::stringstream package_name;
 	package_name << "qst_npc_" << npcid;
 
-	if(!perl)
+	if (!perl) {
 		return false;
+	}
 
-	if(evt >= _LargestEventID)
+	if (evt >= _LargestEventID) {
 		return false;
+	}
 
 	const char *subname = QuestEventSubroutines[evt];
 
 	auto iter = npc_quest_status_.find(npcid);
-	if(iter == npc_quest_status_.end() || iter->second == QuestFailedToLoad) {
+	if (iter == npc_quest_status_.end() || iter->second == QuestFailedToLoad) {
 		return false;
 	}
 
-	return(perl->SubExists(package_name.str().c_str(), subname));
+	return (perl->SubExists(package_name.str().c_str(), subname));
 }
 
-bool PerlembParser::HasGlobalQuestSub(QuestEventID evt) {
-	if(!perl)
-		return false;
-
-	if(global_npc_quest_status_ != questLoaded) {
+bool PerlembParser::HasGlobalQuestSub(QuestEventID evt)
+{
+	if (!perl) {
 		return false;
 	}
 
-	if(evt >= _LargestEventID)
+	if (global_npc_quest_status_ != questLoaded) {
 		return false;
+	}
+
+	if (evt >= _LargestEventID) {
+		return false;
+	}
 
 	const char *subname = QuestEventSubroutines[evt];
 
-	return(perl->SubExists("qst_global_npc", subname));
+	return (perl->SubExists("qst_global_npc", subname));
 }
 
-bool PerlembParser::PlayerHasQuestSub(QuestEventID evt) {
-	if(!perl)
-		return false;
-
-	if(player_quest_status_ != questLoaded) {
+bool PerlembParser::PlayerHasQuestSub(QuestEventID evt)
+{
+	if (!perl) {
 		return false;
 	}
 
-	if(evt >= _LargestEventID)
-		return false;
-
-	const char *subname = QuestEventSubroutines[evt];
-
-	return(perl->SubExists("qst_player", subname));
-}
-
-bool PerlembParser::GlobalPlayerHasQuestSub(QuestEventID evt) {
-	if(!perl)
-		return false;
-
-	if(global_player_quest_status_ != questLoaded) {
+	if (player_quest_status_ != questLoaded) {
 		return false;
 	}
 
-	if(evt >= _LargestEventID)
+	if (evt >= _LargestEventID) {
 		return false;
+	}
 
 	const char *subname = QuestEventSubroutines[evt];
 
-	return(perl->SubExists("qst_global_player", subname));
+	return (perl->SubExists("qst_player", subname));
 }
 
-bool PerlembParser::SpellHasQuestSub(uint32 spell_id, QuestEventID evt) {
+bool PerlembParser::GlobalPlayerHasQuestSub(QuestEventID evt)
+{
+	if (!perl) {
+		return false;
+	}
+
+	if (global_player_quest_status_ != questLoaded) {
+		return false;
+	}
+
+	if (evt >= _LargestEventID) {
+		return false;
+	}
+
+	const char *subname = QuestEventSubroutines[evt];
+
+	return (perl->SubExists("qst_global_player", subname));
+}
+
+bool PerlembParser::SpellHasQuestSub(uint32 spell_id, QuestEventID evt)
+{
 	std::stringstream package_name;
 	package_name << "qst_spell_" << spell_id;
 
-	if(!perl)
-		return false;
-
-	auto iter = spell_quest_status_.find(spell_id);
-	if(iter == spell_quest_status_.end() || iter->second == QuestFailedToLoad) {
+	if (!perl) {
 		return false;
 	}
 
-	if(evt >= _LargestEventID)
+	auto iter = spell_quest_status_.find(spell_id);
+	if (iter == spell_quest_status_.end() || iter->second == QuestFailedToLoad) {
 		return false;
+	}
+
+	if (evt >= _LargestEventID) {
+		return false;
+	}
 
 	const char *subname = QuestEventSubroutines[evt];
 
-	return(perl->SubExists(package_name.str().c_str(), subname));
+	return (perl->SubExists(package_name.str().c_str(), subname));
 }
 
-bool PerlembParser::ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt) {
+bool PerlembParser::ItemHasQuestSub(EQEmu::ItemInstance *itm, QuestEventID evt)
+{
 	std::stringstream package_name;
 	package_name << "qst_item_" << itm->GetID();
 
-	if(!perl)
+	if (!perl) {
 		return false;
+	}
 
-	if (itm == nullptr)
+	if (itm == nullptr) {
 		return false;
+	}
 
-	if(evt >= _LargestEventID)
+	if (evt >= _LargestEventID) {
 		return false;
+	}
 
 	const char *subname = QuestEventSubroutines[evt];
 
 	auto iter = item_quest_status_.find(itm->GetID());
-	if(iter == item_quest_status_.end() || iter->second == QuestFailedToLoad) {
+	if (iter == item_quest_status_.end() || iter->second == QuestFailedToLoad) {
 		return false;
 	}
 
-	return(perl->SubExists(package_name.str().c_str(), subname));
+	return (perl->SubExists(package_name.str().c_str(), subname));
 }
 
-void PerlembParser::LoadNPCScript(std::string filename, int npc_id) {
+void PerlembParser::LoadNPCScript(std::string filename, int npc_id)
+{
 	std::stringstream package_name;
 	package_name << "qst_npc_" << npc_id;
 
-	if(!perl)
+	if (!perl) {
 		return;
+	}
 
 	auto iter = npc_quest_status_.find(npc_id);
-	if(iter != npc_quest_status_.end()) {
+	if (iter != npc_quest_status_.end()) {
 		return;
 	}
 
 	try {
 		perl->eval_file(package_name.str().c_str(), filename.c_str());
 	}
-	catch(const char *err)
-	{
-        std::string error = "Error compiling quest file " + filename;
-        error += ": ";
-        error += err;
-        AddError(error);
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error Compiling NPC Quest File [{}] NPC ID [{}] Error [{}]",
+				filename,
+				npc_id,
+				e
+			)
+		);
+
 		npc_quest_status_[npc_id] = questFailedToLoad;
 		return;
 	}
@@ -400,23 +477,28 @@ void PerlembParser::LoadNPCScript(std::string filename, int npc_id) {
 	npc_quest_status_[npc_id] = questLoaded;
 }
 
-void PerlembParser::LoadGlobalNPCScript(std::string filename) {
-	if(!perl)
+void PerlembParser::LoadGlobalNPCScript(std::string filename)
+{
+	if (!perl) {
 		return;
+	}
 
-	if(global_npc_quest_status_ != questUnloaded) {
+	if (global_npc_quest_status_ != questUnloaded) {
 		return;
 	}
 
 	try {
 		perl->eval_file("qst_global_npc", filename.c_str());
 	}
-	catch(const char *err)
-	{
-		std::string error = "Error compiling quest file " + filename;
-        error += ": ";
-        error += err;
-        AddError(error);
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error Compiling Global NPC Quest File [{}] Error [{}]",
+				filename,
+				e
+			)
+		);
+
 		global_npc_quest_status_ = questFailedToLoad;
 		return;
 	}
@@ -424,23 +506,28 @@ void PerlembParser::LoadGlobalNPCScript(std::string filename) {
 	global_npc_quest_status_ = questLoaded;
 }
 
-void PerlembParser::LoadPlayerScript(std::string filename) {
-	if(!perl)
+void PerlembParser::LoadPlayerScript(std::string filename)
+{
+	if (!perl) {
 		return;
+	}
 
-	if(player_quest_status_ != questUnloaded) {
+	if (player_quest_status_ != questUnloaded) {
 		return;
 	}
 
 	try {
 		perl->eval_file("qst_player", filename.c_str());
 	}
-	catch(const char *err)
-	{
-		std::string error = "Error compiling quest file " + filename;
-        error += ": ";
-        error += err;
-        AddError(error);
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error Compiling Player Quest File [{}] Error [{}]",
+				filename,
+				e
+			)
+		);
+
 		player_quest_status_ = questFailedToLoad;
 		return;
 	}
@@ -448,23 +535,28 @@ void PerlembParser::LoadPlayerScript(std::string filename) {
 	player_quest_status_ = questLoaded;
 }
 
-void PerlembParser::LoadGlobalPlayerScript(std::string filename) {
-	if(!perl)
+void PerlembParser::LoadGlobalPlayerScript(std::string filename)
+{
+	if (!perl) {
 		return;
+	}
 
-	if(global_player_quest_status_ != questUnloaded) {
+	if (global_player_quest_status_ != questUnloaded) {
 		return;
 	}
 
 	try {
 		perl->eval_file("qst_global_player", filename.c_str());
 	}
-	catch(const char *err)
-	{
-		std::string error = "Error compiling quest file " + filename;
-        error += ": ";
-        error += err;
-        AddError(error);
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error Compiling Global Player Quest File [{}] Error [{}]",
+				filename,
+				e
+			)
+		);
+
 		global_player_quest_status_ = questFailedToLoad;
 		return;
 	}
@@ -472,30 +564,37 @@ void PerlembParser::LoadGlobalPlayerScript(std::string filename) {
 	global_player_quest_status_ = questLoaded;
 }
 
-void PerlembParser::LoadItemScript(std::string filename, EQEmu::ItemInstance *item) {
-	if (item == nullptr)
+void PerlembParser::LoadItemScript(std::string filename, EQEmu::ItemInstance *item)
+{
+	if (item == nullptr) {
 		return;
+	}
 
 	std::stringstream package_name;
 	package_name << "qst_item_" << item->GetID();
 
-	if(!perl)
+	if (!perl) {
 		return;
+	}
 
 	auto iter = item_quest_status_.find(item->GetID());
-	if(iter != item_quest_status_.end()) {
+	if (iter != item_quest_status_.end()) {
 		return;
 	}
 
 	try {
 		perl->eval_file(package_name.str().c_str(), filename.c_str());
 	}
-	catch(const char *err)
-	{
-		std::string error = "Error compiling quest file " + filename;
-        error += ": ";
-        error += err;
-        AddError(error);
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error Compiling Item Quest File [{}] Item ID [{}] Error [{}]",
+				filename,
+				item->GetID(),
+				e
+			)
+		);
+
 		item_quest_status_[item->GetID()] = questFailedToLoad;
 		return;
 	}
@@ -503,27 +602,33 @@ void PerlembParser::LoadItemScript(std::string filename, EQEmu::ItemInstance *it
 	item_quest_status_[item->GetID()] = questLoaded;
 }
 
-void PerlembParser::LoadSpellScript(std::string filename, uint32 spell_id) {
+void PerlembParser::LoadSpellScript(std::string filename, uint32 spell_id)
+{
 	std::stringstream package_name;
 	package_name << "qst_spell_" << spell_id;
 
-	if(!perl)
+	if (!perl) {
 		return;
+	}
 
 	auto iter = spell_quest_status_.find(spell_id);
-	if(iter != spell_quest_status_.end()) {
+	if (iter != spell_quest_status_.end()) {
 		return;
 	}
 
 	try {
 		perl->eval_file(package_name.str().c_str(), filename.c_str());
 	}
-	catch(const char *err)
-	{
-		std::string error = "Error compiling quest file " + filename;
-        error += ": ";
-        error += err;
-        AddError(error);
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error Compiling Spell Quest File [{}] Spell ID [{}] Error [{}]",
+				filename,
+				spell_id,
+				e
+			)
+		);
+
 		spell_quest_status_[spell_id] = questFailedToLoad;
 		return;
 	}
@@ -531,13 +636,15 @@ void PerlembParser::LoadSpellScript(std::string filename, uint32 spell_id) {
 	spell_quest_status_[spell_id] = questLoaded;
 }
 
-void PerlembParser::AddVar(std::string name, std::string val) {
+void PerlembParser::AddVar(std::string name, std::string val)
+{
 	vars_[name] = val;
 }
 
-std::string PerlembParser::GetVar(std::string name) {
+std::string PerlembParser::GetVar(std::string name)
+{
 	auto iter = vars_.find(name);
-	if(iter != vars_.end()) {
+	if (iter != vars_.end()) {
 		return iter->second;
 	}
 
@@ -546,126 +653,157 @@ std::string PerlembParser::GetVar(std::string name) {
 
 void PerlembParser::ExportHash(const char *pkgprefix, const char *hashname, std::map<std::string, std::string> &vals)
 {
-	if(!perl)
+	if (!perl) {
 		return;
+	}
 
-	try
-	{
+	try {
 		perl->sethash(
 			std::string(pkgprefix).append("::").append(hashname).c_str(),
 			vals
 		);
-	} catch(const char *err) {
-        std::string error = "Error exporting hash: ";
-        error += err;
-        AddError(error);
+	} catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error exporting Perl hash [{}]",
+				e
+			)
+		);
 	}
 }
 
-void PerlembParser::ExportVar(const char * pkgprefix, const char * varname, int value)
+void PerlembParser::ExportVar(const char *pkgprefix, const char *varname, int value)
 {
 
-	if(!perl)
+	if (!perl) {
 		return;
+	}
 
 	try {
 		perl->seti(std::string(pkgprefix).append("::").append(varname).c_str(), value);
 
-	} catch(const char * err) {
-		std::string error = "Error exporting var: ";
-        error += err;
-        AddError(error);
+	}
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error exporting Perl variable [{}]",
+				e
+			)
+		);
 	}
 }
 
-void PerlembParser::ExportVar(const char * pkgprefix, const char * varname, unsigned int value)
+void PerlembParser::ExportVar(const char *pkgprefix, const char *varname, unsigned int value)
 {
 
-	if(!perl)
+	if (!perl) {
 		return;
+	}
 
 	try {
 		perl->seti(std::string(pkgprefix).append("::").append(varname).c_str(), value);
 
-	} catch(const char * err) {
-		std::string error = "Error exporting var: ";
-        error += err;
-        AddError(error);
+	} catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error exporting Perl variable [{}]",
+				e
+			)
+		);
 	}
 }
 
-void PerlembParser::ExportVar(const char * pkgprefix, const char * varname, float value)
+void PerlembParser::ExportVar(const char *pkgprefix, const char *varname, float value)
 {
 
-	if(!perl)
+	if (!perl) {
 		return;
+	}
 
 	try {
 		perl->setd(std::string(pkgprefix).append("::").append(varname).c_str(), value);
-	} catch(const char * err) {
-		std::string error = "Error exporting var: ";
-        error += err;
-        AddError(error);
+	} catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error exporting Perl variable [{}]",
+				e
+			)
+		);
 	}
 }
 
-void PerlembParser::ExportVarComplex(const char * pkgprefix, const char *varname, const char *value)
+void PerlembParser::ExportVarComplex(const char *pkgprefix, const char *varname, const char *value)
 {
 
-	if(!perl)
+	if (!perl) {
 		return;
-	try
-	{
+	}
+	try {
 		perl->eval(std::string("$").append(pkgprefix).append("::").append(varname).append("=").append(value).append(";").c_str());
 	}
-	catch(const char * err)
-	{
-		std::string error = "Error exporting var: ";
-        error += err;
-        AddError(error);
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error exporting Perl variable [{}]",
+				e
+			)
+		);
 	}
 }
 
 void PerlembParser::ExportVar(const char *pkgprefix, const char *varname, const char *value)
 {
-	if(!perl)
+	if (!perl) {
 		return;
+	}
 
-	try
-	{
+	try {
 		perl->setstr(std::string(pkgprefix).append("::").append(varname).c_str(), value);
 	}
-	catch(const char * err)
-	{
-		std::string error = "Error exporting var: ";
-        error += err;
-        AddError(error);
+	catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Error exporting Perl variable [{}]",
+				e
+			)
+		);
 	}
 }
 
-int PerlembParser::SendCommands(const char *pkgprefix, const char *event, uint32 npcid, Mob* other, Mob* mob, EQEmu::ItemInstance* item_inst) {
-	if(!perl)
+int PerlembParser::SendCommands(
+	const char *pkgprefix,
+	const char *event,
+	uint32 npcid,
+	Mob *other,
+	Mob *mob,
+	EQEmu::ItemInstance *item_inst
+)
+{
+	if (!perl) {
 		return 0;
+	}
 
 	int ret_value = 0;
-	if(mob && mob->IsClient())
+	if (mob && mob->IsClient()) {
 		quest_manager.StartQuest(other, mob->CastToClient(), item_inst);
-	else
+	}
+	else {
 		quest_manager.StartQuest(other, nullptr, nullptr);
+	}
 
 	try {
 
-		std::string cmd = "package " + (std::string)(pkgprefix) + (std::string)(";");
+		std::string cmd = "package " + (std::string) (pkgprefix) + (std::string) (";");
 		perl->eval(cmd.c_str());
 
 #ifdef EMBPERL_XS_CLASSES
 
 		{
-			std::string cl = (std::string)"$" + (std::string)pkgprefix + (std::string)"::client";
-			std::string np = (std::string)"$" + (std::string)pkgprefix + (std::string)"::npc";
-			std::string qi = (std::string)"$" + (std::string)pkgprefix + (std::string)"::questitem";
-			std::string enl = (std::string)"$" + (std::string)pkgprefix + (std::string)"::entity_list";
-			if(clear_vars_.find(cl) != clear_vars_.end()) {
+			std::string cl  = (std::string) "$" + (std::string) pkgprefix + (std::string) "::client";
+			std::string np  = (std::string) "$" + (std::string) pkgprefix + (std::string) "::npc";
+			std::string qi  = (std::string) "$" + (std::string) pkgprefix + (std::string) "::questitem";
+			std::string enl = (std::string) "$" + (std::string) pkgprefix + (std::string) "::entity_list";
+			if (clear_vars_.find(cl) != clear_vars_.end()) {
 				std::string eval_str = cl;
 				eval_str += " = undef;";
 				perl->eval(eval_str.c_str());
@@ -696,15 +834,16 @@ int PerlembParser::SendCommands(const char *pkgprefix, const char *event, uint32
 		Client *curc = quest_manager.GetInitiator();
 		snprintf(namebuf, 64, "%s::client", pkgprefix);
 		SV *client = get_sv(namebuf, true);
-		if(curc != nullptr) {
+		if (curc != nullptr) {
 			sv_setref_pv(client, "Client", curc);
-		} else {
+		}
+		else {
 			//clear out the value, mainly to get rid of blessedness
 			sv_setsv(client, _empty_sv);
 		}
 
 		//only export NPC if it's a npc quest
-		if(!other->IsClient()){
+		if (!other->IsClient()) {
 			NPC *curn = quest_manager.GetNPC();
 			snprintf(namebuf, 64, "%s::npc", pkgprefix);
 			SV *npc = get_sv(namebuf, true);
@@ -712,8 +851,8 @@ int PerlembParser::SendCommands(const char *pkgprefix, const char *event, uint32
 		}
 
 		//only export QuestItem if it's an item quest
-		if(item_inst) {
-			EQEmu::ItemInstance* curi = quest_manager.GetQuestItem();
+		if (item_inst) {
+			EQEmu::ItemInstance *curi = quest_manager.GetQuestItem();
 			snprintf(namebuf, 64, "%s::questitem", pkgprefix);
 			SV *questitem = get_sv(namebuf, true);
 			sv_setref_pv(questitem, "QuestItem", curi);
@@ -729,40 +868,35 @@ int PerlembParser::SendCommands(const char *pkgprefix, const char *event, uint32
 
 #ifdef EMBPERL_XS_CLASSES
 		{
-			std::string cl = (std::string)"$" + (std::string)pkgprefix + (std::string)"::client";
-			std::string np = (std::string)"$" + (std::string)pkgprefix + (std::string)"::npc";
-			std::string qi = (std::string)"$" + (std::string)pkgprefix + (std::string)"::questitem";
-			std::string enl = (std::string)"$" + (std::string)pkgprefix + (std::string)"::entity_list";
-			clear_vars_[cl] = 1;
-			clear_vars_[np] = 1;
-			clear_vars_[qi] = 1;
+			std::string cl  = (std::string) "$" + (std::string) pkgprefix + (std::string) "::client";
+			std::string np  = (std::string) "$" + (std::string) pkgprefix + (std::string) "::npc";
+			std::string qi  = (std::string) "$" + (std::string) pkgprefix + (std::string) "::questitem";
+			std::string enl = (std::string) "$" + (std::string) pkgprefix + (std::string) "::entity_list";
+			clear_vars_[cl]  = 1;
+			clear_vars_[np]  = 1;
+			clear_vars_[qi]  = 1;
 			clear_vars_[enl] = 1;
 		}
 #endif
 
-	} catch(const char * err) {
-
-		//try to reduce some of the console spam...
-		//todo: tweak this to be more accurate at deciding what to filter (we don't want to gag legit errors)
-		if(!strstr(err,"Undefined subroutine")) {
-            std::string error = "Script error: ";
-            error += pkgprefix;
-            error += "::";
-            error += event;
-            error += " - ";
-			if(strlen(err) > 0)
-				error += err;
-            AddError(error);
-        }
+	} catch (std::string e) {
+		AddError(
+			fmt::format(
+				"Script Error | Package [{}] Event [{}] Error [{}]",
+				pkgprefix,
+				event,
+				trim(e)
+			)
+		);
 	}
 
 	quest_manager.EndQuest();
 
 #ifdef EMBPERL_XS_CLASSES
-	if(!quest_manager.QuestsRunning()) {
-		auto iter = clear_vars_.begin();
+	if (!quest_manager.QuestsRunning()) {
+		auto        iter = clear_vars_.begin();
 		std::string eval_str;
-		while(iter != clear_vars_.end()) {
+		while (iter != clear_vars_.end()) {
 			eval_str += iter->first;
 			eval_str += " = undef;";
 			++iter;
@@ -772,11 +906,13 @@ int PerlembParser::SendCommands(const char *pkgprefix, const char *event, uint32
 		try {
 			perl->eval(eval_str.c_str());
 		}
-		catch (const char * err) {
-			std::string error = "Script clear error: ";
-			if (strlen(err) > 0)
-				error += err;
-			AddError(error);
+		catch (std::string e) {
+			AddError(
+				fmt::format(
+					"Script Clear Error | Error [{}]",
+					e
+				)
+			);
 		}
 	}
 #endif
@@ -784,198 +920,221 @@ int PerlembParser::SendCommands(const char *pkgprefix, const char *event, uint32
 	return ret_value;
 }
 
-void PerlembParser::MapFunctions() {
+void PerlembParser::MapFunctions()
+{
 	_empty_sv = newSV(0);
 
 	perl->eval(
-	"{"
-	"package quest;"
-	"&boot_quest;"			//load our quest XS
-#ifdef EMBPERL_XS_CLASSES
-	"package Mob;"
-	"&boot_Mob;"			//load our Mob XS
+		"{"
+		"package quest;"
+		"&boot_quest;"            //load our quest XS
+		#ifdef EMBPERL_XS_CLASSES
+		"package Mob;"
+		"&boot_Mob;"            //load our Mob XS
 
-	"package Client;"
-	"our @ISA = qw(Mob);"	//client inherits mob.
-	"&boot_Mob;"			//load our Mob XS
-	"&boot_Client;"			//load our Client XS
+		"package Client;"
+		"our @ISA = qw(Mob);"    //client inherits mob.
+		"&boot_Mob;"            //load our Mob XS
+		"&boot_Client;"            //load our Client XS
 
-	"package NPC;"
-	"our @ISA = qw(Mob);"	//NPC inherits mob.
-	"&boot_Mob;"			//load our Mob XS
-	"&boot_NPC;"			//load our NPC XS
+		"package NPC;"
+		"our @ISA = qw(Mob);"    //NPC inherits mob.
+		"&boot_Mob;"            //load our Mob XS
+		"&boot_NPC;"            //load our NPC XS
 
-	"package Corpse;"
-	"our @ISA = qw(Mob);"	//Corpse inherits mob.
-	"&boot_Mob;"			//load our Mob XS
-	"&boot_Corpse;"			//load our Mob XS
+		"package Corpse;"
+		"our @ISA = qw(Mob);"    //Corpse inherits mob.
+		"&boot_Mob;"            //load our Mob XS
+		"&boot_Corpse;"            //load our Mob XS
 
-	"package EntityList;"
-	"&boot_EntityList;"		//load our EntityList XS
+		"package EntityList;"
+		"&boot_EntityList;"        //load our EntityList XS
 
-	"package PerlPacket;"
-	"&boot_PerlPacket;"		//load our PerlPacket XS
+		"package PerlPacket;"
+		"&boot_PerlPacket;"        //load our PerlPacket XS
 
-	"package Group;"
-	"&boot_Group;"		//load our Group XS
+		"package Group;"
+		"&boot_Group;"        //load our Group XS
 
-	"package Raid;"
-	"&boot_Raid;"		//load our Raid XS
+		"package Raid;"
+		"&boot_Raid;"        //load our Raid XS
 
-	"package QuestItem;"
-	"&boot_QuestItem;"	// load quest Item XS
+		"package QuestItem;"
+		"&boot_QuestItem;"    // load quest Item XS
 
-	"package HateEntry;"
-	"&boot_HateEntry;"	// load quest Hate XS
+		"package HateEntry;"
+		"&boot_HateEntry;"    // load quest Hate XS
 
-	"package Object;"
-	"&boot_Object;"	// load quest Object XS
+		"package Object;"
+		"&boot_Object;"    // load quest Object XS
 
-	"package Doors;"
-	"&boot_Doors;"	// load quest Doors XS
+		"package Doors;"
+		"&boot_Doors;"    // load quest Doors XS
 
-#endif
-	"package main;"
-	"}"
+		#endif
+		"package main;"
+		"}"
 	);
 }
 
-void PerlembParser::GetQuestTypes(bool &isPlayerQuest, bool &isGlobalPlayerQuest, bool &isGlobalNPC, bool &isItemQuest,
-		bool &isSpellQuest, QuestEventID event, NPC* npcmob, EQEmu::ItemInstance* item_inst, Mob* mob, bool global)
+void PerlembParser::GetQuestTypes(
+	bool &isPlayerQuest, bool &isGlobalPlayerQuest, bool &isGlobalNPC, bool &isItemQuest,
+	bool &isSpellQuest, QuestEventID event, NPC *npcmob, EQEmu::ItemInstance *item_inst, Mob *mob, bool global
+)
 {
-	if(event == EVENT_SPELL_EFFECT_CLIENT ||
+	if (event == EVENT_SPELL_EFFECT_CLIENT ||
 		event == EVENT_SPELL_EFFECT_NPC ||
 		event == EVENT_SPELL_BUFF_TIC_CLIENT ||
 		event == EVENT_SPELL_BUFF_TIC_NPC ||
 		event == EVENT_SPELL_FADE ||
-		event == EVENT_SPELL_EFFECT_TRANSLOCATE_COMPLETE)
-	{
+		event == EVENT_SPELL_EFFECT_TRANSLOCATE_COMPLETE) {
 		isSpellQuest = true;
 	}
-	else
-	{
-		if(!npcmob && mob) {
-			if(!item_inst) {
-				if(global) {
+	else {
+		if (!npcmob && mob) {
+			if (!item_inst) {
+				if (global) {
 					isGlobalPlayerQuest = true;
-				} else {
+				}
+				else {
 					isPlayerQuest = true;
 				}
 			}
-			else
+			else {
 				isItemQuest = true;
+			}
 		}
 	}
 }
 
-void PerlembParser::GetQuestPackageName(bool &isPlayerQuest, bool &isGlobalPlayerQuest, bool &isGlobalNPC, bool &isItemQuest,
-		bool &isSpellQuest, std::string &package_name, QuestEventID event, uint32 objid, const char * data,
-		NPC* npcmob, EQEmu::ItemInstance* item_inst, bool global)
+void PerlembParser::GetQuestPackageName(
+	bool &isPlayerQuest,
+	bool &isGlobalPlayerQuest,
+	bool &isGlobalNPC,
+	bool &isItemQuest,
+	bool &isSpellQuest,
+	std::string &package_name,
+	QuestEventID event,
+	uint32 objid,
+	const char *data,
+	NPC *npcmob,
+	EQEmu::ItemInstance *item_inst,
+	bool global
+)
 {
-	if(!isPlayerQuest && !isGlobalPlayerQuest && !isItemQuest && !isSpellQuest) {
-		if(global) {
-			isGlobalNPC = true;
+	if (!isPlayerQuest && !isGlobalPlayerQuest && !isItemQuest && !isSpellQuest) {
+		if (global) {
+			isGlobalNPC  = true;
 			package_name = "qst_global_npc";
-		} else {
+		}
+		else {
 			package_name = "qst_npc_";
 			package_name += itoa(npcmob->GetNPCTypeID());
 		}
 	}
-	else if(isItemQuest) {
+	else if (isItemQuest) {
 		// need a valid EQEmu::ItemInstance pointer check here..unsure how to cancel this process
-		const EQEmu::ItemData* item = item_inst->GetItem();
+		const EQEmu::ItemData *item = item_inst->GetItem();
 		package_name = "qst_item_";
 		package_name += itoa(item->ID);
 	}
-	else if(isPlayerQuest) {
+	else if (isPlayerQuest) {
 		package_name = "qst_player";
 	}
-	else if(isGlobalPlayerQuest) {
+	else if (isGlobalPlayerQuest) {
 		package_name = "qst_global_player";
 	}
-	else
-	{
+	else {
 		package_name = "qst_spell_";
 		package_name += data;
 	}
 }
 
-void PerlembParser::ExportCharID(const std::string &package_name, int &char_id, NPC *npcmob, Mob *mob) {
+void PerlembParser::ExportCharID(const std::string &package_name, int &char_id, NPC *npcmob, Mob *mob)
+{
 	if (mob && mob->IsClient()) {  // some events like waypoint and spawn don't have a player involved
 		char_id = mob->CastToClient()->CharacterID();
-	} else {
-		if(npcmob)
-		{
+	}
+	else {
+		if (npcmob) {
 			char_id = -static_cast<int>(npcmob->GetNPCTypeID());  // make char id negative npc id as a fudge
 		}
-		else if(mob && mob->IsNPC())
-		{
+		else if (mob && mob->IsNPC()) {
 			char_id = -static_cast<int>(mob->CastToNPC()->GetNPCTypeID());  // make char id negative npc id as a fudge
 		}
 	}
 	ExportVar(package_name.c_str(), "charid", char_id);
 }
 
-void PerlembParser::ExportQGlobals(bool isPlayerQuest, bool isGlobalPlayerQuest, bool isGlobalNPC, bool isItemQuest,
-	bool isSpellQuest, std::string &package_name, NPC *npcmob, Mob *mob, int char_id) {
+void PerlembParser::ExportQGlobals(
+	bool isPlayerQuest, bool isGlobalPlayerQuest, bool isGlobalNPC, bool isItemQuest,
+	bool isSpellQuest, std::string &package_name, NPC *npcmob, Mob *mob, int char_id
+)
+{
 	//NPC quest
-	if(!isPlayerQuest && !isGlobalPlayerQuest && !isItemQuest && !isSpellQuest)
-	{
+	if (!isPlayerQuest && !isGlobalPlayerQuest && !isItemQuest && !isSpellQuest) {
 		//only export for npcs that are global enabled.
-		if(npcmob && npcmob->GetQglobal())
-		{
+		if (npcmob && npcmob->GetQglobal()) {
 			std::map<std::string, std::string> globhash;
-			QGlobalCache *npc_c = nullptr;
-			QGlobalCache *char_c = nullptr;
-			QGlobalCache *zone_c = nullptr;
+			QGlobalCache                       *npc_c  = nullptr;
+			QGlobalCache                       *char_c = nullptr;
+			QGlobalCache                       *zone_c = nullptr;
 
 			//retrieve our globals
-			npc_c = npcmob->GetQGlobals();
-			if(mob && mob->IsClient())
+			npc_c  = npcmob->GetQGlobals();
+			if (mob && mob->IsClient()) {
 				char_c = mob->CastToClient()->GetQGlobals();
+			}
 			zone_c = zone->GetQGlobals();
 
-			if(!npc_c)
-			{
+			if (!npc_c) {
 				npc_c = npcmob->CreateQGlobals();
 				npc_c->LoadByNPCID(npcmob->GetNPCTypeID());
 			}
 
-			if(!char_c)
-			{
-				if(mob && mob->IsClient())
-				{
+			if (!char_c) {
+				if (mob && mob->IsClient()) {
 					char_c = mob->CastToClient()->CreateQGlobals();
 					char_c->LoadByCharID(mob->CastToClient()->CharacterID());
 				}
 			}
 
-			if(!zone_c)
-			{
+			if (!zone_c) {
 				zone_c = zone->CreateQGlobals();
 				zone_c->LoadByZoneID(zone->GetZoneID());
 				zone_c->LoadByGlobalContext();
 			}
 
 			std::list<QGlobal> globalMap;
-			if(npc_c)
-			{
-				QGlobalCache::Combine(globalMap, npc_c->GetBucket(), npcmob->GetNPCTypeID(), char_id, zone->GetZoneID());
+			if (npc_c) {
+				QGlobalCache::Combine(
+					globalMap,
+					npc_c->GetBucket(),
+					npcmob->GetNPCTypeID(),
+					char_id,
+					zone->GetZoneID());
 			}
 
-			if(char_c)
-			{
-				QGlobalCache::Combine(globalMap, char_c->GetBucket(), npcmob->GetNPCTypeID(), char_id, zone->GetZoneID());
+			if (char_c) {
+				QGlobalCache::Combine(
+					globalMap,
+					char_c->GetBucket(),
+					npcmob->GetNPCTypeID(),
+					char_id,
+					zone->GetZoneID());
 			}
 
-			if(zone_c)
-			{
-				QGlobalCache::Combine(globalMap, zone_c->GetBucket(), npcmob->GetNPCTypeID(), char_id, zone->GetZoneID());
+			if (zone_c) {
+				QGlobalCache::Combine(
+					globalMap,
+					zone_c->GetBucket(),
+					npcmob->GetNPCTypeID(),
+					char_id,
+					zone->GetZoneID());
 			}
 
 			auto iter = globalMap.begin();
-			while(iter != globalMap.end())
-			{
+			while (iter != globalMap.end()) {
 				globhash[(*iter).name] = (*iter).value;
 				ExportVar(package_name.c_str(), (*iter).name.c_str(), (*iter).value.c_str());
 				++iter;
@@ -983,47 +1142,41 @@ void PerlembParser::ExportQGlobals(bool isPlayerQuest, bool isGlobalPlayerQuest,
 			ExportHash(package_name.c_str(), "qglobals", globhash);
 		}
 	}
-	else
-	{
+	else {
 		std::map<std::string, std::string> globhash;
-		QGlobalCache *char_c = nullptr;
-		QGlobalCache *zone_c = nullptr;
+		QGlobalCache                       *char_c = nullptr;
+		QGlobalCache                       *zone_c = nullptr;
 
 		//retrieve our globals
-		if(mob && mob->IsClient())
+		if (mob && mob->IsClient()) {
 			char_c = mob->CastToClient()->GetQGlobals();
-		zone_c = zone->GetQGlobals();
+		}
+		zone_c                                     = zone->GetQGlobals();
 
-		if(!char_c)
-		{
-			if(mob && mob->IsClient())
-			{
+		if (!char_c) {
+			if (mob && mob->IsClient()) {
 				char_c = mob->CastToClient()->CreateQGlobals();
 				char_c->LoadByCharID(mob->CastToClient()->CharacterID());
 			}
 		}
 
-		if(!zone_c)
-		{
+		if (!zone_c) {
 			zone_c = zone->CreateQGlobals();
 			zone_c->LoadByZoneID(zone->GetZoneID());
 			zone_c->LoadByGlobalContext();
 		}
 
 		std::list<QGlobal> globalMap;
-		if(char_c)
-		{
+		if (char_c) {
 			QGlobalCache::Combine(globalMap, char_c->GetBucket(), 0, char_id, zone->GetZoneID());
 		}
 
-		if(zone_c)
-		{
+		if (zone_c) {
 			QGlobalCache::Combine(globalMap, zone_c->GetBucket(), 0, char_id, zone->GetZoneID());
 		}
 
 		auto iter = globalMap.begin();
-		while(iter != globalMap.end())
-		{
+		while (iter != globalMap.end()) {
 			globhash[(*iter).name] = (*iter).value;
 			ExportVar(package_name.c_str(), (*iter).name.c_str(), (*iter).value.c_str());
 			++iter;
@@ -1032,8 +1185,10 @@ void PerlembParser::ExportQGlobals(bool isPlayerQuest, bool isGlobalPlayerQuest,
 	}
 }
 
-void PerlembParser::ExportMobVariables(bool isPlayerQuest, bool isGlobalPlayerQuest, bool isGlobalNPC, bool isItemQuest,
-		bool isSpellQuest, std::string &package_name, Mob *mob, NPC *npcmob)
+void PerlembParser::ExportMobVariables(
+	bool isPlayerQuest, bool isGlobalPlayerQuest, bool isGlobalNPC, bool isItemQuest,
+	bool isSpellQuest, std::string &package_name, Mob *mob, NPC *npcmob
+)
 {
 	uint8 fac = 0;
 	if (mob && mob->IsClient()) {
@@ -1042,16 +1197,18 @@ void PerlembParser::ExportMobVariables(bool isPlayerQuest, bool isGlobalPlayerQu
 		ExportVar(package_name.c_str(), "status", mob->CastToClient()->Admin());
 	}
 
-	if(!isPlayerQuest && !isGlobalPlayerQuest && !isItemQuest) {
+	if (!isPlayerQuest && !isGlobalPlayerQuest && !isItemQuest) {
 		if (mob && npcmob && mob->IsClient()) {
-			Client* client = mob->CastToClient();
+			Client *client = mob->CastToClient();
 
-			fac = client->GetFactionLevel(client->CharacterID(), npcmob->GetID(), client->GetFactionRace(),
-				client->GetClass(), client->GetDeity(), npcmob->GetPrimaryFaction(), npcmob);
+			fac = client->GetFactionLevel(
+				client->CharacterID(), npcmob->GetID(), client->GetFactionRace(),
+				client->GetClass(), client->GetDeity(), npcmob->GetPrimaryFaction(), npcmob
+			);
 		}
 	}
 
-	if(mob) {
+	if (mob) {
 		ExportVar(package_name.c_str(), "name", mob->GetName());
 		ExportVar(package_name.c_str(), "race", GetRaceIDName(mob->GetRace()));
 		ExportVar(package_name.c_str(), "class", GetClassIDName(mob->GetClass()));
@@ -1059,19 +1216,17 @@ void PerlembParser::ExportMobVariables(bool isPlayerQuest, bool isGlobalPlayerQu
 		ExportVar(package_name.c_str(), "userid", mob->GetID());
 	}
 
-	if(!isPlayerQuest && !isGlobalPlayerQuest && !isItemQuest && !isSpellQuest)
-	{
-		if (npcmob)
-		{
+	if (!isPlayerQuest && !isGlobalPlayerQuest && !isItemQuest && !isSpellQuest) {
+		if (npcmob) {
 			ExportVar(package_name.c_str(), "mname", npcmob->GetName());
 			ExportVar(package_name.c_str(), "mobid", npcmob->GetID());
 			ExportVar(package_name.c_str(), "mlevel", npcmob->GetLevel());
-			ExportVar(package_name.c_str(), "hpratio",npcmob->GetHPRatio());
-			ExportVar(package_name.c_str(), "x", npcmob->GetX() );
-			ExportVar(package_name.c_str(), "y", npcmob->GetY() );
-			ExportVar(package_name.c_str(), "z", npcmob->GetZ() );
-			ExportVar(package_name.c_str(), "h", npcmob->GetHeading() );
-			if(npcmob->GetTarget()) {
+			ExportVar(package_name.c_str(), "hpratio", npcmob->GetHPRatio());
+			ExportVar(package_name.c_str(), "x", npcmob->GetX());
+			ExportVar(package_name.c_str(), "y", npcmob->GetY());
+			ExportVar(package_name.c_str(), "z", npcmob->GetZ());
+			ExportVar(package_name.c_str(), "h", npcmob->GetHeading());
+			if (npcmob->GetTarget()) {
 				ExportVar(package_name.c_str(), "targetid", npcmob->GetTarget()->GetID());
 				ExportVar(package_name.c_str(), "targetname", npcmob->GetTarget()->GetName());
 			}
@@ -1083,7 +1238,8 @@ void PerlembParser::ExportMobVariables(bool isPlayerQuest, bool isGlobalPlayerQu
 	}
 }
 
-void PerlembParser::ExportZoneVariables(std::string &package_name) {
+void PerlembParser::ExportZoneVariables(std::string &package_name)
+{
 	if (zone) {
 		ExportVar(package_name.c_str(), "zoneid", zone->GetZoneID());
 		ExportVar(package_name.c_str(), "zoneln", zone->GetLongName());
@@ -1091,7 +1247,7 @@ void PerlembParser::ExportZoneVariables(std::string &package_name) {
 		ExportVar(package_name.c_str(), "instanceid", zone->GetInstanceID());
 		ExportVar(package_name.c_str(), "instanceversion", zone->GetInstanceVersion());
 		TimeOfDay_Struct eqTime;
-		zone->zone_time.GetCurrentEQTimeOfDay( time(0), &eqTime);
+		zone->zone_time.GetCurrentEQTimeOfDay(time(0), &eqTime);
 		ExportVar(package_name.c_str(), "zonehour", eqTime.hour - 1);
 		ExportVar(package_name.c_str(), "zonemin", eqTime.minute);
 		ExportVar(package_name.c_str(), "zonetime", (eqTime.hour - 1) * 100 + eqTime.minute);
@@ -1099,20 +1255,18 @@ void PerlembParser::ExportZoneVariables(std::string &package_name) {
 	}
 }
 
-void PerlembParser::ExportItemVariables(std::string &package_name, Mob *mob) {
-	if(mob && mob->IsClient())
-	{
+void PerlembParser::ExportItemVariables(std::string &package_name, Mob *mob)
+{
+	if (mob && mob->IsClient()) {
 		std::string hashname = package_name + std::string("::hasitem");
 
 		//start with an empty hash
 		perl->eval(std::string("%").append(hashname).append(" = ();").c_str());
 
-		for(int slot = EQEmu::invslot::EQUIPMENT_BEGIN; slot <= EQEmu::invslot::GENERAL_END; slot++)
-		{
-			char *hi_decl=nullptr;
-			int itemid = mob->CastToClient()->GetItemIDAt(slot);
-			if(itemid != -1 && itemid != 0)
-			{
+		for (int slot = EQEmu::invslot::EQUIPMENT_BEGIN; slot <= EQEmu::invslot::GENERAL_END; slot++) {
+			char *hi_decl = nullptr;
+			int  itemid   = mob->CastToClient()->GetItemIDAt(slot);
+			if (itemid != -1 && itemid != 0) {
 				MakeAnyLenString(&hi_decl, "push (@{$%s{%d}},%d);", hashname.c_str(), itemid, slot);
 				perl->eval(hi_decl);
 				safe_delete_array(hi_decl);
@@ -1120,25 +1274,27 @@ void PerlembParser::ExportItemVariables(std::string &package_name, Mob *mob) {
 		}
 	}
 
-	if(mob && mob->IsClient()) {
+	if (mob && mob->IsClient()) {
 		std::string hashname = package_name + std::string("::oncursor");
 		perl->eval(std::string("%").append(hashname).append(" = ();").c_str());
 		char *hi_decl = nullptr;
-		int itemid = mob->CastToClient()->GetItemIDAt(EQEmu::invslot::slotCursor);
-		if(itemid != -1 && itemid != 0) {
-			MakeAnyLenString(&hi_decl, "push (@{$%s{%d}},%d);",hashname.c_str(), itemid, EQEmu::invslot::slotCursor);
+		int  itemid   = mob->CastToClient()->GetItemIDAt(EQEmu::invslot::slotCursor);
+		if (itemid != -1 && itemid != 0) {
+			MakeAnyLenString(&hi_decl, "push (@{$%s{%d}},%d);", hashname.c_str(), itemid, EQEmu::invslot::slotCursor);
 			perl->eval(hi_decl);
 			safe_delete_array(hi_decl);
 		}
 	}
 }
 
-void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID event, uint32 objid, const char * data,
-	NPC* npcmob, EQEmu::ItemInstance* item_inst, Mob* mob, uint32 extradata, std::vector<EQEmu::Any> *extra_pointers)
+void PerlembParser::ExportEventVariables(
+	std::string &package_name, QuestEventID event, uint32 objid, const char *data,
+	NPC *npcmob, EQEmu::ItemInstance *item_inst, Mob *mob, uint32 extradata, std::vector<EQEmu::Any> *extra_pointers
+)
 {
 	switch (event) {
 		case EVENT_SAY: {
-			if(npcmob && mob) {
+			if (npcmob && mob) {
 				npcmob->DoQuestPause(mob);
 			}
 
@@ -1149,15 +1305,15 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 		}
 
 		case EVENT_TRADE: {
-			if(extra_pointers) {
-				size_t sz = extra_pointers->size();
-				for(size_t i = 0; i < sz; ++i) {
-					EQEmu::ItemInstance *inst = EQEmu::any_cast<EQEmu::ItemInstance*>(extra_pointers->at(i));
+			if (extra_pointers) {
+				size_t      sz = extra_pointers->size();
+				for (size_t i  = 0; i < sz; ++i) {
+					EQEmu::ItemInstance *inst = EQEmu::any_cast<EQEmu::ItemInstance *>(extra_pointers->at(i));
 
 					std::string var_name = "item";
 					var_name += std::to_string(i + 1);
 
-					if(inst) {
+					if (inst) {
 						ExportVar(package_name.c_str(), var_name.c_str(), inst->GetItem()->ID);
 
 						std::string temp_var_name = var_name;
@@ -1167,7 +1323,8 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 						temp_var_name = var_name;
 						temp_var_name += "_attuned";
 						ExportVar(package_name.c_str(), temp_var_name.c_str(), inst->IsAttuned());
-					} else {
+					}
+					else {
 						ExportVar(package_name.c_str(), var_name.c_str(), 0);
 
 						std::string temp_var_name = var_name;
@@ -1205,8 +1362,7 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 				ExportVar(package_name.c_str(), "hpevent", "-1");
 				ExportVar(package_name.c_str(), "inchpevent", data);
 			}
-			else
-			{
+			else {
 				ExportVar(package_name.c_str(), "hpevent", data);
 				ExportVar(package_name.c_str(), "inchpevent", "-1");
 			}
@@ -1247,7 +1403,7 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 			break;
 		}
 
-		case EVENT_ZONE:{
+		case EVENT_ZONE: {
 			ExportVar(package_name.c_str(), "target_zone_id", data);
 			break;
 		}
@@ -1259,26 +1415,26 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 			break;
 		}
 
-		case EVENT_TASK_ACCEPTED:{
+		case EVENT_TASK_ACCEPTED: {
 			ExportVar(package_name.c_str(), "task_id", data);
 			break;
 		}
 
-		case EVENT_TASK_STAGE_COMPLETE:{
+		case EVENT_TASK_STAGE_COMPLETE: {
 			Seperator sep(data);
 			ExportVar(package_name.c_str(), "task_id", sep.arg[0]);
 			ExportVar(package_name.c_str(), "activity_id", sep.arg[1]);
 			break;
 		}
 
-		case EVENT_TASK_FAIL:{
+		case EVENT_TASK_FAIL: {
 			Seperator sep(data);
 			ExportVar(package_name.c_str(), "task_id", sep.arg[0]);
 			break;
 		}
 
 		case EVENT_TASK_COMPLETE:
-		case EVENT_TASK_UPDATE:{
+		case EVENT_TASK_UPDATE: {
 			Seperator sep(data);
 			ExportVar(package_name.c_str(), "donecount", sep.arg[0]);
 			ExportVar(package_name.c_str(), "activity_id", sep.arg[1]);
@@ -1286,7 +1442,7 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 			break;
 		}
 
-		case EVENT_PLAYER_PICKUP:{
+		case EVENT_PLAYER_PICKUP: {
 			ExportVar(package_name.c_str(), "picked_up_id", data);
 			ExportVar(package_name.c_str(), "picked_up_entity_id", extradata);
 			break;
@@ -1299,11 +1455,11 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 			break;
 		}
 
-		case EVENT_POPUP_RESPONSE:{
+		case EVENT_POPUP_RESPONSE: {
 			ExportVar(package_name.c_str(), "popupid", data);
 			break;
 		}
-		case EVENT_ENVIRONMENTAL_DAMAGE:{
+		case EVENT_ENVIRONMENTAL_DAMAGE: {
 			Seperator sep(data);
 			ExportVar(package_name.c_str(), "env_damage", sep.arg[0]);
 			ExportVar(package_name.c_str(), "env_damage_type", sep.arg[1]);
@@ -1337,8 +1493,7 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 		}
 
 		case EVENT_GROUP_CHANGE: {
-			if(mob && mob->IsClient())
-			{
+			if (mob && mob->IsClient()) {
 				ExportVar(package_name.c_str(), "grouped", mob->IsGrouped());
 				ExportVar(package_name.c_str(), "raided", mob->IsRaidGrouped());
 			}
@@ -1353,16 +1508,14 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 		case EVENT_SPELL_EFFECT_CLIENT:
 		case EVENT_SPELL_EFFECT_NPC:
 		case EVENT_SPELL_BUFF_TIC_CLIENT:
-		case EVENT_SPELL_BUFF_TIC_NPC:
-		{
+		case EVENT_SPELL_BUFF_TIC_NPC: {
 			ExportVar(package_name.c_str(), "caster_id", extradata);
 			break;
 		}
 
-		//tradeskill events
+			//tradeskill events
 		case EVENT_COMBINE_SUCCESS:
-		case EVENT_COMBINE_FAILURE:
-		{
+		case EVENT_COMBINE_FAILURE: {
 			ExportVar(package_name.c_str(), "recipe_id", extradata);
 			ExportVar(package_name.c_str(), "recipe_name", data);
 			break;
@@ -1390,9 +1543,12 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 		}
 
 		case EVENT_COMMAND: {
+			Seperator sep(data);
+			ExportVar(package_name.c_str(), "command", (sep.arg[0] + 1));
+			ExportVar(package_name.c_str(), "args", (sep.argnum >= 1 ? (&data[strlen(sep.arg[0]) + 1]) : "0"));
+			ExportVar(package_name.c_str(), "data", objid);
 			ExportVar(package_name.c_str(), "text", data);
-			ExportVar(package_name.c_str(), "data", "0");
-			ExportVar(package_name.c_str(), "langid", "0");
+			ExportVar(package_name.c_str(), "langid", extradata);
 			break;
 		}
 
@@ -1434,12 +1590,39 @@ void PerlembParser::ExportEventVariables(std::string &package_name, QuestEventID
 			ExportVar(package_name.c_str(), "killed_npc_id", sep.arg[4]);
 			break;
 		}
-		case EVENT_USE_SKILL:{
+		case EVENT_USE_SKILL: {
 			Seperator sep(data);
 			ExportVar(package_name.c_str(), "skill_id", sep.arg[0]);
 			ExportVar(package_name.c_str(), "skill_level", sep.arg[1]);
 			break;
 		}
+		case EVENT_COMBINE_VALIDATE: {
+			Seperator sep(data);
+			ExportVar(package_name.c_str(), "recipe_id", extradata);
+			ExportVar(package_name.c_str(), "validate_type", sep.arg[0]);
+
+			std::string zone_id       = "-1";
+			std::string tradeskill_id = "-1";
+			if (strcmp(sep.arg[0], "check_zone") == 0) {
+				zone_id = sep.arg[1];
+			}
+			else if (strcmp(sep.arg[0], "check_tradeskill") == 0) {
+				tradeskill_id = sep.arg[1];
+			}
+
+			ExportVar(package_name.c_str(), "zone_id", zone_id.c_str());
+			ExportVar(package_name.c_str(), "tradeskill_id", tradeskill_id.c_str());
+			break;
+		}
+		case EVENT_BOT_COMMAND: {
+			Seperator sep(data);
+			ExportVar(package_name.c_str(), "bot_command", (sep.arg[0] + 1));
+			ExportVar(package_name.c_str(), "args", (sep.argnum >= 1 ? (&data[strlen(sep.arg[0]) + 1]) : "0"));
+			ExportVar(package_name.c_str(), "data", objid);
+			ExportVar(package_name.c_str(), "text", data);
+			ExportVar(package_name.c_str(), "langid", extradata);
+			break;
+		}
 
 		default: {
 			break;
diff --git a/zone/embparser_api.cpp b/zone/embparser_api.cpp
index 154e28566..871cc0ced 100644
--- a/zone/embparser_api.cpp
+++ b/zone/embparser_api.cpp
@@ -155,12 +155,31 @@ XS(XS__say); // prototype to pass -Wmissing-prototypes
 XS(XS__say) {
 	dXSARGS;
 
-	if (items == 1)
-		quest_manager.say(SvPV_nolen(ST(0)));
-	else if (items == 2)
-		quest_manager.say(SvPV_nolen(ST(0)), (int) SvIV(ST(1)));
-	else
-		Perl_croak(aTHX_ "Usage: quest::say(string message, int language_id])");
+	Journal::Options opts;
+	// we currently default to these
+	opts.speak_mode = Journal::SpeakMode::Say;
+	opts.journal_mode = Journal::Mode::Log2;
+	opts.language = 0;
+	opts.message_type = Chat::NPCQuestSay;
+	if (items == 0 || items > 5) {
+		Perl_croak(aTHX_ "Usage: quest::say(string message, [int language_id], [int message_type], [int speak_mode], [int journal_mode])");
+	} else if (items == 2) {
+		opts.language = (int)SvIV(ST(1));
+	} else if (items == 3) {
+		opts.language = (int)SvIV(ST(1));
+		opts.message_type = (int)SvIV(ST(2));
+	} else if (items == 4) {
+		opts.language = (int)SvIV(ST(1));
+		opts.message_type = (int)SvIV(ST(2));
+		opts.speak_mode = (Journal::SpeakMode)SvIV(ST(3));
+	} else if (items == 5) {
+		opts.language = (int)SvIV(ST(1));
+		opts.message_type = (int)SvIV(ST(2));
+		opts.speak_mode = (Journal::SpeakMode)SvIV(ST(3));
+		opts.journal_mode = (Journal::Mode)SvIV(ST(4));
+	}
+
+	quest_manager.say(SvPV_nolen(ST(0)), opts);
 
 	XSRETURN_EMPTY;
 }
@@ -207,8 +226,7 @@ XS(XS__spawn);
 XS(XS__spawn) {
 	dXSARGS;
 	if (items != 6)
-		Perl_croak(aTHX_
-		           "Usage: quest::spawn(int npc_type_id, int grid_id, int int_unused, float x, float y, float z)");
+		Perl_croak(aTHX_ "Usage: quest::spawn(int npc_type_id, int grid_id, int int_unused, float x, float y, float z)");
 
 	uint16 RETVAL;
 	dXSTARG;
@@ -230,8 +248,7 @@ XS(XS__spawn2);
 XS(XS__spawn2) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: quest::spawn2(int npc_type_id, int grid_id, int int_unused, float x, float y, float z, float heading)");
+		Perl_croak(aTHX_ "Usage: quest::spawn2(int npc_type_id, int grid_id, int int_unused, float x, float y, float z, float heading)");
 
 	uint16 RETVAL;
 	dXSTARG;
@@ -253,8 +270,7 @@ XS(XS__unique_spawn);
 XS(XS__unique_spawn) {
 	dXSARGS;
 	if (items != 6 && items != 7)
-		Perl_croak(aTHX_
-		           "Usage: quest::unique_spawn(int npc_type_id, int grid_id, int int_unused, float x, float y, float z, [float heading])");
+		Perl_croak(aTHX_ "Usage: quest::unique_spawn(int npc_type_id, int grid_id, int int_unused, float x, float y, float z, [float heading])");
 
 	uint16 RETVAL;
 	dXSTARG;
@@ -356,71 +372,98 @@ XS(XS__getinventoryslotid) {
 	if (items != 1)
 		Perl_croak(aTHX_ "Usage: quest::getinventoryslotid(string identifier)");
 
-	int16 RETVAL;
+	int16 RETVAL = EQEmu::invslot::SLOT_INVALID;
 	dXSTARG;
 
 	std::string identifier = (Const_char *)SvPV_nolen(ST(0));
 	for (std::string::size_type i = 0; i < identifier.length(); ++i)
 		identifier[i] = std::tolower(identifier[i]);
 
-	if (identifier == "invalid")                   RETVAL = EQEmu::invslot::SLOT_INVALID;
-	else if (identifier == "cursor")               RETVAL = EQEmu::invslot::slotCursor;
-	else if (identifier == "possessions.begin")    RETVAL = EQEmu::invslot::POSSESSIONS_BEGIN;
-	else if (identifier == "possessions.end")      RETVAL = EQEmu::invslot::POSSESSIONS_END;
-	else if (identifier == "bank.begin")           RETVAL = EQEmu::invslot::BANK_BEGIN;
-	else if (identifier == "bank.end")             RETVAL = EQEmu::invslot::BANK_END;
-	else if (identifier == "sharedbank.begin")     RETVAL = EQEmu::invslot::SHARED_BANK_BEGIN;
-	else if (identifier == "sharedbank.end")       RETVAL = EQEmu::invslot::SHARED_BANK_END;
-	else if (identifier == "generalbags.begin")    RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN;
-	else if (identifier == "generalbags.end")      RETVAL = EQEmu::invbag::GENERAL_BAGS_END;
-	else if (identifier == "cursorbag.begin")      RETVAL = EQEmu::invbag::CURSOR_BAG_BEGIN;
-	else if (identifier == "cursorbag.end")        RETVAL = EQEmu::invbag::CURSOR_BAG_END;
-	else if (identifier == "bankbags.begin")       RETVAL = EQEmu::invbag::BANK_BAGS_BEGIN;
-	else if (identifier == "bankbags.end")         RETVAL = EQEmu::invbag::BANK_BAGS_END;
-	else if (identifier == "sharedbankbags.begin") RETVAL = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN;
-	else if (identifier == "sharedbankbags.end")   RETVAL = EQEmu::invbag::SHARED_BANK_BAGS_END;
-	else if (identifier == "bagslot.begin")        RETVAL = EQEmu::invbag::SLOT_BEGIN;
-	else if (identifier == "bagslot.end")          RETVAL = EQEmu::invbag::SLOT_END;
-	else if (identifier == "augsocket.begin")      RETVAL = EQEmu::invaug::SOCKET_BEGIN;
-	else if (identifier == "augsocket.end")        RETVAL = EQEmu::invaug::SOCKET_END;
-	else if (identifier == "equipment.begin")      RETVAL = EQEmu::invslot::EQUIPMENT_BEGIN;
-	else if (identifier == "equipment.end")        RETVAL = EQEmu::invslot::EQUIPMENT_END;
-	else if (identifier == "general.begin")        RETVAL = EQEmu::invslot::GENERAL_BEGIN;
-	else if (identifier == "general.end")          RETVAL = EQEmu::invslot::GENERAL_END;
-	else if (identifier == "charm")                RETVAL = EQEmu::invslot::slotCharm;
-	else if (identifier == "ear1")                 RETVAL = EQEmu::invslot::slotEar1;
-	else if (identifier == "head")                 RETVAL = EQEmu::invslot::slotHead;
-	else if (identifier == "face")                 RETVAL = EQEmu::invslot::slotFace;
-	else if (identifier == "ear2")                 RETVAL = EQEmu::invslot::slotEar2;
-	else if (identifier == "neck")                 RETVAL = EQEmu::invslot::slotNeck;
-	else if (identifier == "shoulders")            RETVAL = EQEmu::invslot::slotShoulders;
-	else if (identifier == "arms")                 RETVAL = EQEmu::invslot::slotArms;
-	else if (identifier == "back")                 RETVAL = EQEmu::invslot::slotBack;
-	else if (identifier == "wrist1")               RETVAL = EQEmu::invslot::slotWrist1;
-	else if (identifier == "wrist2")               RETVAL = EQEmu::invslot::slotWrist2;
-	else if (identifier == "range")                RETVAL = EQEmu::invslot::slotRange;
-	else if (identifier == "hands")                RETVAL = EQEmu::invslot::slotHands;
-	else if (identifier == "primary")              RETVAL = EQEmu::invslot::slotPrimary;
-	else if (identifier == "secondary")            RETVAL = EQEmu::invslot::slotSecondary;
-	else if (identifier == "finger1")              RETVAL = EQEmu::invslot::slotFinger1;
-	else if (identifier == "finger2")              RETVAL = EQEmu::invslot::slotFinger2;
-	else if (identifier == "chest")                RETVAL = EQEmu::invslot::slotChest;
-	else if (identifier == "legs")                 RETVAL = EQEmu::invslot::slotLegs;
-	else if (identifier == "feet")                 RETVAL = EQEmu::invslot::slotFeet;
-	else if (identifier == "waist")                RETVAL = EQEmu::invslot::slotWaist;
-	else if (identifier == "powersource")          RETVAL = EQEmu::invslot::slotPowerSource;
-	else if (identifier == "ammo")                 RETVAL = EQEmu::invslot::slotAmmo;
-	else if (identifier == "general1")             RETVAL = EQEmu::invslot::slotGeneral1;
-	else if (identifier == "general2")             RETVAL = EQEmu::invslot::slotGeneral2;
-	else if (identifier == "general3")             RETVAL = EQEmu::invslot::slotGeneral3;
-	else if (identifier == "general4")             RETVAL = EQEmu::invslot::slotGeneral4;
-	else if (identifier == "general5")             RETVAL = EQEmu::invslot::slotGeneral5;
-	else if (identifier == "general6")             RETVAL = EQEmu::invslot::slotGeneral6;
-	else if (identifier == "general7")             RETVAL = EQEmu::invslot::slotGeneral7;
-	else if (identifier == "general8")             RETVAL = EQEmu::invslot::slotGeneral8;
-	else if (identifier == "general9")             RETVAL = EQEmu::invslot::slotGeneral9;
-	else if (identifier == "general10")            RETVAL = EQEmu::invslot::slotGeneral10;
-	else                                           RETVAL = EQEmu::invslot::SLOT_INVALID;
+	if (identifier.find('.') == std::string::npos) {
+		if (identifier == "invalid")                    RETVAL = EQEmu::invslot::SLOT_INVALID;
+		else if (identifier == "charm")                 RETVAL = EQEmu::invslot::slotCharm;
+		else if (identifier == "ear1")                  RETVAL = EQEmu::invslot::slotEar1;
+		else if (identifier == "head")                  RETVAL = EQEmu::invslot::slotHead;
+		else if (identifier == "face")                  RETVAL = EQEmu::invslot::slotFace;
+		else if (identifier == "ear2")                  RETVAL = EQEmu::invslot::slotEar2;
+		else if (identifier == "neck")                  RETVAL = EQEmu::invslot::slotNeck;
+		else if (identifier == "shoulders")             RETVAL = EQEmu::invslot::slotShoulders;
+		else if (identifier == "arms")                  RETVAL = EQEmu::invslot::slotArms;
+		else if (identifier == "back")                  RETVAL = EQEmu::invslot::slotBack;
+		else if (identifier == "wrist1")                RETVAL = EQEmu::invslot::slotWrist1;
+		else if (identifier == "wrist2")                RETVAL = EQEmu::invslot::slotWrist2;
+		else if (identifier == "range")                 RETVAL = EQEmu::invslot::slotRange;
+		else if (identifier == "hands")                 RETVAL = EQEmu::invslot::slotHands;
+		else if (identifier == "primary")               RETVAL = EQEmu::invslot::slotPrimary;
+		else if (identifier == "secondary")             RETVAL = EQEmu::invslot::slotSecondary;
+		else if (identifier == "finger1")               RETVAL = EQEmu::invslot::slotFinger1;
+		else if (identifier == "finger2")               RETVAL = EQEmu::invslot::slotFinger2;
+		else if (identifier == "chest")                 RETVAL = EQEmu::invslot::slotChest;
+		else if (identifier == "legs")                  RETVAL = EQEmu::invslot::slotLegs;
+		else if (identifier == "feet")                  RETVAL = EQEmu::invslot::slotFeet;
+		else if (identifier == "waist")                 RETVAL = EQEmu::invslot::slotWaist;
+		else if (identifier == "powersource")           RETVAL = EQEmu::invslot::slotPowerSource;
+		else if (identifier == "ammo")                  RETVAL = EQEmu::invslot::slotAmmo;
+		else if (identifier == "general1")              RETVAL = EQEmu::invslot::slotGeneral1;
+		else if (identifier == "general2")              RETVAL = EQEmu::invslot::slotGeneral2;
+		else if (identifier == "general3")              RETVAL = EQEmu::invslot::slotGeneral3;
+		else if (identifier == "general4")              RETVAL = EQEmu::invslot::slotGeneral4;
+		else if (identifier == "general5")              RETVAL = EQEmu::invslot::slotGeneral5;
+		else if (identifier == "general6")              RETVAL = EQEmu::invslot::slotGeneral6;
+		else if (identifier == "general7")              RETVAL = EQEmu::invslot::slotGeneral7;
+		else if (identifier == "general8")              RETVAL = EQEmu::invslot::slotGeneral8;
+		else if (identifier == "general9")              RETVAL = EQEmu::invslot::slotGeneral9;
+		else if (identifier == "general10")             RETVAL = EQEmu::invslot::slotGeneral10;
+		else if (identifier == "cursor")                RETVAL = EQEmu::invslot::slotCursor;
+		else if (identifier == "tradeskill")            RETVAL = EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE;
+		else if (identifier == "augment")               RETVAL = EQEmu::invslot::SLOT_AUGMENT_GENERIC_RETURN;
+	}
+	else {
+		if (identifier == "possessions.begin")          RETVAL = EQEmu::invslot::POSSESSIONS_BEGIN;
+		else if (identifier == "possessions.end")       RETVAL = EQEmu::invslot::POSSESSIONS_END;
+		else if (identifier == "equipment.begin")       RETVAL = EQEmu::invslot::EQUIPMENT_BEGIN;
+		else if (identifier == "equipment.end")         RETVAL = EQEmu::invslot::EQUIPMENT_END;
+		else if (identifier == "general.begin")         RETVAL = EQEmu::invslot::GENERAL_BEGIN;
+		else if (identifier == "general.end")           RETVAL = EQEmu::invslot::GENERAL_END;
+		else if (identifier == "possessionsbags.begin") RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN;
+		else if (identifier == "possessionsbags.end")   RETVAL = EQEmu::invbag::CURSOR_BAG_END;
+		else if (identifier == "generalbags.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN;
+		else if (identifier == "generalbags.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_END;
+		else if (identifier == "general1bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN;
+		else if (identifier == "general1bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 9;
+		else if (identifier == "general2bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 10;
+		else if (identifier == "general2bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 19;
+		else if (identifier == "general3bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 20;
+		else if (identifier == "general3bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 29;
+		else if (identifier == "general4bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 30;
+		else if (identifier == "general4bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 39;
+		else if (identifier == "general5bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 40;
+		else if (identifier == "general5bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 49;
+		else if (identifier == "general6bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 50;
+		else if (identifier == "general6bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 59;
+		else if (identifier == "general7bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 60;
+		else if (identifier == "general7bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 69;
+		else if (identifier == "general8bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 70;
+		else if (identifier == "general8bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 79;
+		else if (identifier == "general9bag.begin")     RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 80;
+		else if (identifier == "general9bag.end")       RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 89;
+		else if (identifier == "general10bag.begin")    RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 90;
+		else if (identifier == "general10bag.end")      RETVAL = EQEmu::invbag::GENERAL_BAGS_BEGIN + 99;
+		else if (identifier == "cursorbag.begin")       RETVAL = EQEmu::invbag::CURSOR_BAG_BEGIN;
+		else if (identifier == "cursorbag.end")         RETVAL = EQEmu::invbag::CURSOR_BAG_END;
+		else if (identifier == "bank.begin")            RETVAL = EQEmu::invslot::BANK_BEGIN;
+		else if (identifier == "bank.end")              RETVAL = EQEmu::invslot::BANK_END;
+		else if (identifier == "bankbags.begin")        RETVAL = EQEmu::invbag::BANK_BAGS_BEGIN;
+		else if (identifier == "bankbags.end")          RETVAL = EQEmu::invbag::BANK_BAGS_END;
+		else if (identifier == "sharedbank.begin")      RETVAL = EQEmu::invslot::SHARED_BANK_BEGIN;
+		else if (identifier == "sharedbank.end")        RETVAL = EQEmu::invslot::SHARED_BANK_END;
+		else if (identifier == "sharedbankbags.begin")  RETVAL = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN;
+		else if (identifier == "sharedbankbags.end")    RETVAL = EQEmu::invbag::SHARED_BANK_BAGS_END;
+		else if (identifier == "bagslot.begin")         RETVAL = EQEmu::invbag::SLOT_BEGIN;
+		else if (identifier == "bagslot.end")           RETVAL = EQEmu::invbag::SLOT_END;
+		else if (identifier == "augsocket.begin")       RETVAL = EQEmu::invaug::SOCKET_BEGIN;
+		else if (identifier == "augsocket.end")         RETVAL = EQEmu::invaug::SOCKET_END;
+	}
 
 	XSprePUSH; PUSHu((IV)RETVAL);
 
@@ -1296,8 +1339,7 @@ XS(XS__targlobal);
 XS(XS__targlobal) {
 	dXSARGS;
 	if (items != 6)
-		Perl_croak(aTHX_
-		           "Usage: quest::targlobal(stirng key, string value, string duration, int npc_id, int chararacter_id, int zone_id)");
+		Perl_croak(aTHX_ "Usage: quest::targlobal(stirng key, string value, string duration, int npc_id, int chararacter_id, int zone_id)");
 
 	char *key       = (char *) SvPV_nolen(ST(0));
 	char *str_value = (char *) SvPV_nolen(ST(1));
@@ -1392,8 +1434,7 @@ XS(XS__moveto);
 XS(XS__moveto) {
 	dXSARGS;
 	if (items != 3 && items != 4 && items != 5)
-		Perl_croak(aTHX_
-		           "Usage: quest::moveto(float x, float y, float z, [float heading], [bool save_guard_location])");
+		Perl_croak(aTHX_ "Usage: quest::moveto(float x, float y, float z, [float heading], [bool save_guard_location])");
 
 	float x = (float) SvNV(ST(0));
 	float y = (float) SvNV(ST(1));
@@ -1542,8 +1583,7 @@ XS(XS__set_proximity);
 XS(XS__set_proximity) {
 	dXSARGS;
 	if (items != 4 && items != 6 && items != 7)
-		Perl_croak(aTHX_
-		           "Usage: quest::set_proximity(float min_x, float max_x, float min_y, float max_y, [float min_z], [float max_z], [say])");
+		Perl_croak(aTHX_ "Usage: quest::set_proximity(float min_x, float max_x, float min_y, float max_y, [float min_z], [float max_z], [say])");
 
 	float min_x = (float) SvNV(ST(0));
 	float max_x = (float) SvNV(ST(1));
@@ -1624,8 +1664,7 @@ XS(XS__spawn_condition);
 XS(XS__spawn_condition) {
 	dXSARGS;
 	if (items < 3 || items > 4)
-		Perl_croak(aTHX_
-		           "Usage: quest::spawn_condition(string zone_short, [int instance_id], uint16 condition_id, int16 value)");
+		Perl_croak(aTHX_ "Usage: quest::spawn_condition(string zone_short, [int instance_id], uint16 condition_id, int16 value)");
 
 	if (items == 3) {
 		char   *zone_short  = (char *) SvPV_nolen(ST(0));
@@ -1682,8 +1721,7 @@ XS(XS__toggle_spawn_event);
 XS(XS__toggle_spawn_event) {
 	dXSARGS;
 	if (items != 4)
-		Perl_croak(aTHX_
-		           "Usage: quest::toggle_spawn_event(uint32 event_id, [bool is_enabled = false], [bool is_strict = false], [bool reset_base = false])");
+		Perl_croak(aTHX_ "Usage: quest::toggle_spawn_event(uint32 event_id, [bool is_enabled = false], [bool is_strict = false], [bool reset_base = false])");
 
 	uint32 event_id   = (int) SvIV(ST(0));
 	bool   is_enabled = ((int) SvIV(ST(1))) == 0 ? false : true;
@@ -1744,8 +1782,7 @@ XS(XS__summonburiedplayercorpse);
 XS(XS__summonburiedplayercorpse) {
 	dXSARGS;
 	if (items != 5)
-		Perl_croak(aTHX_
-		           "Usage: quest::summonburiedplayercorpse(uint32 char_id, float dest_x, float dest_y, float dest_z, float dest_heading)");
+		Perl_croak(aTHX_ "Usage: quest::summonburiedplayercorpse(uint32 char_id, float dest_x, float dest_y, float dest_z, float dest_heading)");
 
 	bool   RETVAL;
 	uint32 char_id  = (int) SvIV(ST(0));
@@ -1762,8 +1799,7 @@ XS(XS__summonallplayercorpses);
 XS(XS__summonallplayercorpses) {
 	dXSARGS;
 	if (items != 5)
-		Perl_croak(aTHX_
-		           "Usage: quest::summonallplayercorpses(int char_id, float dest_x, float dest_y, float dest_z, float dest_heading)");
+		Perl_croak(aTHX_ "Usage: quest::summonallplayercorpses(int char_id, float dest_x, float dest_y, float dest_z, float dest_heading)");
 
 	bool   RETVAL;
 	uint32 char_id  = (int) SvIV(ST(0));
@@ -1776,6 +1812,43 @@ XS(XS__summonallplayercorpses) {
 	XSRETURN(1);
 }
 
+XS(XS__getplayercorpsecount);
+XS(XS__getplayercorpsecount) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: quest::getplayercorpsecount(uint32 char_id)");
+
+	uint32 RETVAL;
+	dXSTARG;
+
+	uint32 char_id = (int) SvIV(ST(0));
+
+	RETVAL = quest_manager.getplayercorpsecount(char_id);
+	XSprePUSH;
+	PUSHu((IV) RETVAL);
+
+	XSRETURN(1);
+}
+
+XS(XS__getplayercorpsecountbyzoneid);
+XS(XS__getplayercorpsecountbyzoneid) {
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: quest::getplayercorpsecountbyzoneid(uint32 char_id, uint32 zone_id)");
+
+	uint32 RETVAL;
+	dXSTARG;
+
+	uint32 char_id = (int) SvIV(ST(0));
+	uint32 zone_id = (int)SvIV(ST(1));
+
+	RETVAL = quest_manager.getplayercorpsecountbyzoneid(char_id, zone_id);
+	XSprePUSH;
+	PUSHu((IV) RETVAL);
+
+	XSRETURN(1);
+}
+
 XS(XS__getplayerburiedcorpsecount);
 XS(XS__getplayerburiedcorpsecount) {
 	dXSARGS;
@@ -2019,8 +2092,7 @@ XS(XS__playerfeature);
 XS(XS__playerfeature) {
 	dXSARGS;
 	if (items != 2)
-		Perl_croak(aTHX_
-		           "Usage: quest::playerfeature(string feature [race|gender|texture|helm|haircolor|beardcolor|eyecolor1|eyecolor2|hair|face|beard|heritage|tatoo|details|size], int setting)");
+		Perl_croak(aTHX_ "Usage: quest::playerfeature(string feature [race|gender|texture|helm|haircolor|beardcolor|eyecolor1|eyecolor2|hair|face|beard|heritage|tatoo|details|size], int setting)");
 
 	char *str_value = (char *) SvPV_nolen(ST(0));
 	int  int_value  = (int) SvIV(ST(1));
@@ -2034,8 +2106,7 @@ XS(XS__npcfeature);
 XS(XS__npcfeature) {
 	dXSARGS;
 	if (items != 2)
-		Perl_croak(aTHX_
-		           "Usage: quest::npcfeature(string feature [race|gender|texture|helm|haircolor|beardcolor|eyecolor1|eyecolor2|hair|face|beard|heritage|tatoo|details|size], int value)");
+		Perl_croak(aTHX_ "Usage: quest::npcfeature(string feature [race|gender|texture|helm|haircolor|beardcolor|eyecolor1|eyecolor2|hair|face|beard|heritage|tatoo|details|size], int value)");
 
 	char *str_value = (char *) SvPV_nolen(ST(0));
 	int  int_value  = (int) SvIV(ST(1));
@@ -2262,8 +2333,7 @@ XS(XS__updatetaskactivity) {
 		}
 		quest_manager.updatetaskactivity(task_id, activity_id, count, ignore_quest_update);
 	} else {
-		Perl_croak(aTHX_
-		           "Usage: quest::updatetaskactivity(int task_id, int activity_id, [int count], [bool ignore_quest_update = false])");
+		Perl_croak(aTHX_ "Usage: quest::updatetaskactivity(int task_id, int activity_id, [int count], [bool ignore_quest_update = false])");
 	}
 
 	XSRETURN_EMPTY;
@@ -2551,8 +2621,7 @@ XS(XS__popup) {
 	int duration = 0;
 
 	if ((items < 2) || (items > 5))
-		Perl_croak(aTHX_
-		           "Usage: quest::popup(string window_title, string message, int popup_id, int buttons, int duration)");
+		Perl_croak(aTHX_ "Usage: quest::popup(string window_title, string message, int popup_id, int buttons, int duration)");
 
 	if (items >= 3)
 		popup_id = (int) SvIV(ST(2));
@@ -2633,8 +2702,7 @@ XS(XS__CreateGroundObject);
 XS(XS__CreateGroundObject) {
 	dXSARGS;
 	if (items != 5 && items != 6)
-		Perl_croak(aTHX_
-		           "Usage: quest::creategroundobject(int item_id, float x, float y, float z, float heading, [uint32 decay_time-ms = 300000])");
+		Perl_croak(aTHX_ "Usage: quest::creategroundobject(int item_id, float x, float y, float z, float heading, [uint32 decay_time-ms = 300000])");
 
 	int    item_id = (int) SvIV(ST(0));
 	float  x       = (float) SvNV(ST(1));
@@ -2657,8 +2725,7 @@ XS(XS__CreateGroundObjectFromModel);
 XS(XS__CreateGroundObjectFromModel) {
 	dXSARGS;
 	if (items < 5 || items > 7)
-		Perl_croak(aTHX_
-		           "Usage: quest::creategroundobjectfrommodel(string model_name, float x, float y, float z, float heading, [int object_type], [uint32 decay_time-ms = 300000])");
+		Perl_croak(aTHX_ "Usage: quest::creategroundobjectfrommodel(string model_name, float x, float y, float z, float heading, [int object_type], [uint32 decay_time-ms = 300000])");
 
 	char   *modelname  = (char *) SvPV_nolen(ST(0));
 	float  x           = (float) SvNV(ST(1));
@@ -2683,8 +2750,7 @@ XS(XS__CreateDoor);
 XS(XS__CreateDoor) {
 	dXSARGS;
 	if (items < 5 || items > 7)
-		Perl_croak(aTHX_
-		           "Usage: quest::createdoor(string model_name, float x, float y, float z, float heading, [int object_type = 58], [int size = 100])");
+		Perl_croak(aTHX_ "Usage: quest::createdoor(string model_name, float x, float y, float z, float heading, [int object_type = 58], [int size = 100])");
 
 	char   *modelname  = (char *) SvPV_nolen(ST(0));
 	float  x           = (float) SvNV(ST(1));
@@ -3013,8 +3079,7 @@ XS(XS__MovePCInstance);
 XS(XS__MovePCInstance) {
 	dXSARGS;
 	if (items != 5 && items != 6)
-		Perl_croak(aTHX_
-		           "Usage: quest::MovePCInstance(int zone_id, int instance_id, float x, float y, float z, [float heading])");
+		Perl_croak(aTHX_ "Usage: quest::MovePCInstance(int zone_id, int instance_id, float x, float y, float z, [float heading])");
 
 	int   zone_id    = (int) SvIV(ST(0));
 	int   instanceid = (int) SvIV(ST(1));
@@ -3267,8 +3332,7 @@ XS(XS__wearchange);
 XS(XS__wearchange) {
 	dXSARGS;
 	if (items < 2)
-		Perl_croak(aTHX_
-		           "Usage: quest::wearchange(uint8 slot, uint16 texture_id, [uint32 hero_forge_model_id = 0], [uint32 elite_material_id = 0])");
+		Perl_croak(aTHX_ "Usage: quest::wearchange(uint8 slot, uint16 texture_id, [uint32 hero_forge_model_id = 0], [uint32 elite_material_id = 0])");
 
 	uint8  slot       = (int) SvUV(ST(0));
 	uint16 texture_id = (int) SvUV(ST(1));
@@ -3516,8 +3580,7 @@ XS(XS__crosszonesetentityvariablebynpctypeid) {
 	dXSARGS;
 
 	if (items != 3)
-		Perl_croak(aTHX_
-		           "Usage: quest::crosszonesetentityvariablebynpctypeid(int npc_type_id, string key, string value)");
+		Perl_croak(aTHX_ "Usage: quest::crosszonesetentityvariablebynpctypeid(int npc_type_id, string key, string value)");
 
 	if (items == 3) {
 		uint32     npc_type_id = (uint32) SvIV(ST(0));
@@ -3534,8 +3597,7 @@ XS(XS__crosszonesetentityvariablebyclientname) {
 	dXSARGS;
 
 	if (items != 3)
-		Perl_croak(aTHX_
-		           "Usage: quest::crosszonesetentityvariablebyclientname(string client_name, string key, string value)");
+		Perl_croak(aTHX_ "Usage: quest::crosszonesetentityvariablebyclientname(string client_name, string key, string value)");
 
 	if (items == 3) {
 		const char *client_name = (const char *) SvPV_nolen(ST(0));
@@ -3567,8 +3629,7 @@ XS(XS__worldwidemarquee);
 XS(XS__worldwidemarquee) {
 	dXSARGS;
 	if (items != 6)
-		Perl_croak(aTHX_
-		           "Usage: quest::worldwidemarquee(uint32 color_id, uint32 priority, uint32 fade_in, uint32 fade_out, uint32 duration, string message)");
+		Perl_croak(aTHX_ "Usage: quest::worldwidemarquee(uint32 color_id, uint32 priority, uint32 fade_in, uint32 fade_out, uint32 duration, string message)");
 
 	if (items == 6) {
 		uint32 color_id = (uint32) SvIV(ST(0));
@@ -3583,6 +3644,25 @@ XS(XS__worldwidemarquee) {
 	XSRETURN_EMPTY;
 }
 
+XS(XS__log);
+XS(XS__log) {
+	dXSARGS;
+	if (items != 1 && items != 2) {
+		Perl_croak(aTHX_ "Usage: quest::log(uint8 log_category, string message)");
+	}
+	else {
+		uint8       log_category = (uint8)SvIV(ST(0));
+		std::string log_message = (std::string) SvPV_nolen(ST(1));
+		
+		if (log_category >= Logs::MaxCategoryID) {
+			return;
+		}
+
+		Log(Logs::General, log_category, log_message.c_str());
+	}
+	XSRETURN_EMPTY;
+}
+
 XS(XS__debug);
 XS(XS__debug) {
 	dXSARGS;
@@ -3599,16 +3679,31 @@ XS(XS__debug) {
 			return;
 
 		if (debug_level == Logs::General) {
-			Log(Logs::General, Logs::QuestDebug, log_message);
+			Log(Logs::General, Logs::QuestDebug, log_message.c_str());
 		} else if (debug_level == Logs::Moderate) {
-			Log(Logs::Moderate, Logs::QuestDebug, log_message);
+			Log(Logs::Moderate, Logs::QuestDebug, log_message.c_str());
 		} else if (debug_level == Logs::Detail) {
-			Log(Logs::Detail, Logs::QuestDebug, log_message);
+			Log(Logs::Detail, Logs::QuestDebug, log_message.c_str());
 		}
 	}
 	XSRETURN_EMPTY;
 }
 
+XS(XS__log_combat);
+XS(XS__log_combat) {
+	dXSARGS;
+	if (items != 1) {
+		Perl_croak(aTHX_ "Usage: quest::log_combat(string message)");
+	}
+	else {
+
+		std::string log_message = (std::string) SvPV_nolen(ST(0));
+		Log(Logs::General, Logs::Combat, log_message.c_str());
+	}
+	XSRETURN_EMPTY;
+}
+
+
 XS(XS__UpdateZoneHeader);
 XS(XS__UpdateZoneHeader) {
 	dXSARGS;
@@ -3728,7 +3823,7 @@ EXTERN_C XS(boot_quest) {
 	file[255] = '\0';
 
 	if (items != 1)
-		Log(Logs::General, Logs::Error, "boot_quest does not take any arguments.");
+		LogError("boot_quest does not take any arguments");
 
 	char buf[128];    //shouldent have any function names longer than this.
 
@@ -3849,6 +3944,8 @@ EXTERN_C XS(boot_quest) {
 	newXS(strcpy(buf, "getguildnamebyid"), XS__getguildnamebyid, file);
 	newXS(strcpy(buf, "getlevel"), XS__getlevel, file);
 	newXS(strcpy(buf, "getplayerburiedcorpsecount"), XS__getplayerburiedcorpsecount, file);
+	newXS(strcpy(buf, "getplayercorpsecount"), XS__getplayercorpsecount, file);
+	newXS(strcpy(buf, "getplayercorpsecountbyzoneid"), XS__getplayercorpsecountbyzoneid, file);
 	newXS(strcpy(buf, "gettaskactivitydonecount"), XS__gettaskactivitydonecount, file);
 	newXS(strcpy(buf, "givecash"), XS__givecash, file);
 	newXS(strcpy(buf, "gmmove"), XS__gmmove, file);
@@ -3865,6 +3962,8 @@ EXTERN_C XS(boot_quest) {
 	newXS(strcpy(buf, "itemlink"), XS__itemlink, file);
 	newXS(strcpy(buf, "lasttaskinset"), XS__lasttaskinset, file);
 	newXS(strcpy(buf, "level"), XS__level, file);
+	newXS(strcpy(buf, "log"), XS__log, file);
+	newXS(strcpy(buf, "log_combat"), XS__log_combat, file);
 	newXS(strcpy(buf, "me"), XS__me, file);
 	newXS(strcpy(buf, "modifynpcstat"), XS__ModifyNPCStat, file);
 	newXS(strcpy(buf, "movegrp"), XS__movegrp, file);
diff --git a/zone/embperl.cpp b/zone/embperl.cpp
index bc20bd4ef..c7ebb8060 100644
--- a/zone/embperl.cpp
+++ b/zone/embperl.cpp
@@ -137,15 +137,15 @@ void Embperl::DoInit() {
 	try {
 		init_eval_file();
 	}
-	catch(const char *err)
+	catch(std::string e)
 	{
 		//remember... lasterr() is no good if we crap out here, in construction
-		Log(Logs::General, Logs::Quests, "perl error: %s", err);
+		LogQuests("Perl Error [{}]", e);
 		throw "failed to install eval_file hook";
 	}
 
 #ifdef EMBPERL_IO_CAPTURE
-	Log(Logs::General, Logs::Quests, "Tying perl output to eqemu logs");
+	LogQuests("Tying perl output to eqemu logs");
 	//make a tieable class to capture IO and pass it into EQEMuLog
 	eval_pv(
 		"package EQEmuIO; "
@@ -170,16 +170,16 @@ void Embperl::DoInit() {
 		,FALSE
 	);
 
-	Log(Logs::General, Logs::Quests, "Loading perlemb plugins.");
+	LogQuests("Loading perlemb plugins");
 	try
 	{
 		std::string perl_command;
 		perl_command = "main::eval_file('plugin', '" + Config->PluginPlFile + "');";
 		eval_pv(perl_command.c_str(), FALSE);
 	}
-	catch(const char *err)
+	catch(std::string e)
 	{
-		Log(Logs::General, Logs::Quests, "Warning - %s: %s", Config->PluginPlFile.c_str(), err);
+		LogQuests("Warning [{}]: [{}]", Config->PluginPlFile, e);
 	}
 	try
 	{
@@ -195,9 +195,9 @@ void Embperl::DoInit() {
 			"}";
 		eval_pv(perl_command.c_str(),FALSE);
 	}
-	catch(const char *err)
+	catch(std::string e)
 	{
-		Log(Logs::General, Logs::Quests, "Perl warning: %s", err);
+		LogQuests("Warning [{}]", e);
 	}
 #endif //EMBPERL_PLUGIN
 	in_use = false;
@@ -237,7 +237,7 @@ void Embperl::init_eval_file(void)
 {
 	eval_pv(
 		"our %Cache;"
-		"no warnings;"
+		"no warnings 'all';"
 		"use Symbol qw(delete_package);"
 		"sub eval_file {"
 			"my($package, $filename) = @_;"
@@ -315,7 +315,7 @@ int Embperl::dosub(const char * subname, const std::vector<std::string> * args,
 	{
 		std::string errmsg = "Perl runtime error: ";
 		errmsg += SvPVX(ERRSV);
-		throw errmsg.c_str();
+		throw errmsg;
 	}
 
 	return ret_value;
diff --git a/zone/embperl.h b/zone/embperl.h
index ebd76fa0e..816e9b84a 100644
--- a/zone/embperl.h
+++ b/zone/embperl.h
@@ -25,6 +25,10 @@ Eglin
 #ifndef WIN32
 extern "C" {	//the perl headers dont do this for us...
 #endif
+#if _MSC_VER
+#define __inline__ __inline
+#define __builtin_expect 
+#endif
 #include <perl.h>
 #include <XSUB.h>
 #ifndef WIN32
diff --git a/zone/embxs.cpp b/zone/embxs.cpp
index 3816850db..4571a8f8f 100644
--- a/zone/embxs.cpp
+++ b/zone/embxs.cpp
@@ -68,7 +68,7 @@ EXTERN_C XS(boot_qc)
 	file[255] = '\0';
 
 	if(items != 1)
-		Log(Logs::General, Logs::Error, "boot_qc does not take any arguments.");
+		LogError("boot_qc does not take any arguments");
 	
 	char buf[128];	//shouldent have any function names longer than this.
 	
@@ -92,35 +92,43 @@ XS(XS_EQEmuIO_PRINT)
 //        Perl_croak(aTHX_ "Usage: EQEmuIO::PRINT(@strings)"); 
 
 	int r;
-	for(r = 1; r < items; r++) {
+	for (r = 1; r < items; r++) {
 		char *str = SvPV_nolen(ST(r));
 		char *cur = str;
-		
+
 		/* Strip newlines from log message 'str' */
 		*std::remove(str, str + strlen(str), '\n') = '\0';
 
 		std::string log_string = str;
-		if (log_string.find("did not return a true") != std::string::npos)
-			return;;
+
+		if (log_string.find("did not return a true") != std::string::npos) {
+			return;
+		}
+
+		if (log_string.find("is experimental") != std::string::npos) {
+			return;
+		}
 
 		int i;
 		int pos = 0;
 		int len = 0;
-		for(i = 0; *cur != '\0'; i++, cur++) {
-			if(*cur == '\n') {
-				Log(Logs::General, Logs::Quests, str);
+
+		for (i = 0; *cur != '\0'; i++, cur++) {
+			if (*cur == '\n') {
+				LogQuests("{}", str);
 				len = 0;
-				pos = i+1;
-			} else {
+				pos = i + 1;
+			}
+			else {
 				len++;
 			}
 		}
-		if(len > 0) {
-			Log(Logs::General, Logs::Quests, str);
+		if (!log_string.empty()) {
+			LogQuests("{}", log_string);
 		}
- 	}
- 	
-    XSRETURN_EMPTY; 
+	}
+
+	XSRETURN_EMPTY;
 }
 #endif //EMBPERL_IO_CAPTURE
 
diff --git a/zone/embxs.h b/zone/embxs.h
index 67a37a6da..97e3bb573 100644
--- a/zone/embxs.h
+++ b/zone/embxs.h
@@ -8,6 +8,10 @@
 #ifndef WIN32
 extern "C" {	//the perl headers dont do this for us...
 #endif
+#if _MSC_VER
+#define __inline__ __inline
+#define __builtin_expect 
+#endif
 #include <perl.h>
 #include <XSUB.h>
 #ifndef WIN32
diff --git a/zone/entity.cpp b/zone/entity.cpp
index 0ed696327..b13fb5649 100644
--- a/zone/entity.cpp
+++ b/zone/entity.cpp
@@ -33,7 +33,6 @@
 #include "../common/guilds.h"
 
 #include "guild_mgr.h"
-#include "net.h"
 #include "petitions.h"
 #include "quest_parser_collection.h"
 #include "raids.h"
@@ -56,7 +55,6 @@
 extern Zone *zone;
 extern volatile bool is_zone_loaded;
 extern WorldServer worldserver;
-extern NetConnection net;
 extern uint32 numclients;
 extern PetitionList petition_list;
 
@@ -64,7 +62,8 @@ extern char errorname[32];
 
 Entity::Entity()
 {
-	id = 0;
+	id              = 0;
+	initial_id      = 0;
 	spawn_timestamp = time(nullptr);
 }
 
@@ -76,12 +75,12 @@ Entity::~Entity()
 Client *Entity::CastToClient()
 {
 	if (this == 0x00) {
-		Log(Logs::General, Logs::Error, "CastToClient error (nullptr)");
+		LogError("CastToClient error (nullptr)");
 		return 0;
 	}
 #ifdef _EQDEBUG
 	if (!IsClient()) {
-		Log(Logs::General, Logs::Error, "CastToClient error (not client)");
+		LogError("CastToClient error (not client)");
 		return 0;
 	}
 #endif
@@ -93,7 +92,7 @@ NPC *Entity::CastToNPC()
 {
 #ifdef _EQDEBUG
 	if (!IsNPC()) {
-		Log(Logs::General, Logs::Error, "CastToNPC error (Not NPC)");
+		LogError("CastToNPC error (Not NPC)");
 		return 0;
 	}
 #endif
@@ -300,6 +299,13 @@ const Bot *Entity::CastToBot() const
 #endif
 
 EntityList::EntityList()
+	:
+	object_timer(5000),
+	door_timer(5000),
+	corpse_timer(2000),
+	group_timer(1000),
+	raid_timer(1000),
+	trap_timer(1000)
 {
 	// set up ids between 1 and 1500
 	// neither client or server performs well if you have
@@ -349,7 +355,7 @@ void EntityList::TrapProcess()
 		return;
 
 	if (trap_list.empty()) {
-		net.trap_timer.Disable();
+		trap_timer.Disable();
 		return;
 	}
 
@@ -377,7 +383,7 @@ void EntityList::CheckGroupList (const char *fname, const int fline)
 	{
 		if (*it == nullptr)
 		{
-			Log(Logs::General, Logs::Error, "nullptr group, %s:%i", fname, fline);
+			LogError("nullptr group, [{}]:[{}]", fname, fline);
 		}
 	}
 }
@@ -388,7 +394,7 @@ void EntityList::GroupProcess()
 		return;
 
 	if (group_list.empty()) {
-		net.group_timer.Disable();
+		group_timer.Disable();
 		return;
 	}
 
@@ -412,7 +418,7 @@ void EntityList::RaidProcess()
 		return;
 
 	if (raid_list.empty()) {
-		net.raid_timer.Disable();
+		raid_timer.Disable();
 		return;
 	}
 
@@ -427,7 +433,7 @@ void EntityList::DoorProcess()
 		return;
 #endif
 	if (door_list.empty()) {
-		net.door_timer.Disable();
+		door_timer.Disable();
 		return;
 	}
 
@@ -445,7 +451,7 @@ void EntityList::DoorProcess()
 void EntityList::ObjectProcess()
 {
 	if (object_list.empty()) {
-		net.object_timer.Disable();
+		object_timer.Disable();
 		return;
 	}
 
@@ -464,7 +470,7 @@ void EntityList::ObjectProcess()
 void EntityList::CorpseProcess()
 {
 	if (corpse_list.empty()) {
-		net.corpse_timer.Disable(); // No corpses in list
+		corpse_timer.Disable(); // No corpses in list
 		return;
 	}
 
@@ -535,17 +541,17 @@ void EntityList::MobProcess()
 #ifdef _WINDOWS
 				struct in_addr in;
 				in.s_addr = mob->CastToClient()->GetIP();
-				Log(Logs::General, Logs::Zone_Server, "Dropping client: Process=false, ip=%s port=%u", inet_ntoa(in), mob->CastToClient()->GetPort());
+				LogInfo("Dropping client: Process=false, ip=[{}] port=[{}]", inet_ntoa(in), mob->CastToClient()->GetPort());
 #endif
 				zone->StartShutdownTimer();
 				Group *g = GetGroupByMob(mob);
 				if(g) {
-					Log(Logs::General, Logs::Error, "About to delete a client still in a group.");
+					LogError("About to delete a client still in a group");
 					g->DelMember(mob);
 				}
 				Raid *r = entity_list.GetRaidByClient(mob->CastToClient());
 				if(r) {
-					Log(Logs::General, Logs::Error, "About to delete a client still in a raid.");
+					LogError("About to delete a client still in a raid");
 					r->MemberZoned(mob->CastToClient());
 				}
 				entity_list.RemoveClient(id);
@@ -592,8 +598,7 @@ void EntityList::AddGroup(Group *group)
 
 	uint32 gid = worldserver.NextGroupID();
 	if (gid == 0) {
-		Log(Logs::General, Logs::Error,
-				"Unable to get new group ID from world server. group is going to be broken.");
+		LogError("Unable to get new group ID from world server. group is going to be broken");
 		return;
 	}
 
@@ -607,8 +612,8 @@ void EntityList::AddGroup(Group *group, uint32 gid)
 {
 	group->SetID(gid);
 	group_list.push_back(group);
-	if (!net.group_timer.Enabled())
-		net.group_timer.Start();
+	if (!group_timer.Enabled())
+		group_timer.Start();
 #if EQDEBUG >= 5
 	CheckGroupList(__FILE__, __LINE__);
 #endif
@@ -621,8 +626,7 @@ void EntityList::AddRaid(Raid *raid)
 
 	uint32 gid = worldserver.NextGroupID();
 	if (gid == 0) {
-		Log(Logs::General, Logs::Error,
-				"Unable to get new group ID from world server. group is going to be broken.");
+		LogError("Unable to get new group ID from world server. group is going to be broken");
 		return;
 	}
 
@@ -633,8 +637,8 @@ void EntityList::AddRaid(Raid *raid, uint32 gid)
 {
 	raid->SetID(gid);
 	raid_list.push_back(raid);
-	if (!net.raid_timer.Enabled())
-		net.raid_timer.Start();
+	if (!raid_timer.Enabled())
+		raid_timer.Start();
 }
 
 
@@ -651,8 +655,8 @@ void EntityList::AddCorpse(Corpse *corpse, uint32 in_id)
 	corpse->CalcCorpseName();
 	corpse_list.insert(std::pair<uint16, Corpse *>(corpse->GetID(), corpse));
 
-	if (!net.corpse_timer.Enabled())
-		net.corpse_timer.Start();
+	if (!corpse_timer.Enabled())
+		corpse_timer.Start();
 }
 
 void EntityList::AddNPC(NPC *npc, bool SendSpawnPacket, bool dontqueue)
@@ -754,8 +758,8 @@ void EntityList::AddObject(Object *obj, bool SendSpawnPacket)
 
 	object_list.insert(std::pair<uint16, Object *>(obj->GetID(), obj));
 
-	if (!net.object_timer.Enabled())
-		net.object_timer.Start();
+	if (!object_timer.Enabled())
+		object_timer.Start();
 }
 
 void EntityList::AddDoor(Doors *door)
@@ -763,16 +767,16 @@ void EntityList::AddDoor(Doors *door)
 	door->SetEntityID(GetFreeID());
 	door_list.insert(std::pair<uint16, Doors *>(door->GetEntityID(), door));
 
-	if (!net.door_timer.Enabled())
-		net.door_timer.Start();
+	if (!door_timer.Enabled())
+		door_timer.Start();
 }
 
 void EntityList::AddTrap(Trap *trap)
 {
 	trap->SetID(GetFreeID());
 	trap_list.insert(std::pair<uint16, Trap *>(trap->GetID(), trap));
-	if (!net.trap_timer.Enabled())
-		net.trap_timer.Start();
+	if (!trap_timer.Enabled())
+		trap_timer.Start();
 }
 
 void EntityList::AddBeacon(Beacon *beacon)
@@ -817,7 +821,7 @@ void EntityList::CheckSpawnQueue()
 			auto it = npc_list.find(ns->spawn.spawnId);
 			if (it == npc_list.end()) {
 				// We must of despawned, hope that's the reason!
-				Log(Logs::General, Logs::Error, "Error in EntityList::CheckSpawnQueue: Unable to find NPC for spawnId '%u'", ns->spawn.spawnId);
+				LogError("Error in EntityList::CheckSpawnQueue: Unable to find NPC for spawnId [{}]", ns->spawn.spawnId);
 			}
 			else {
 				NPC *pnpc = it->second;
@@ -1579,41 +1583,73 @@ void EntityList::QueueClientsByXTarget(Mob *sender, const EQApplicationPacket *a
 	}
 }
 
-void EntityList::QueueCloseClients(Mob *sender, const EQApplicationPacket *app,
-		bool ignore_sender, float dist, Mob *SkipThisMob, bool ackreq, eqFilterType filter)
+/**
+ * @param sender
+ * @param app
+ * @param ignore_sender
+ * @param distance
+ * @param skipped_mob
+ * @param is_ack_required
+ * @param filter
+ */
+void EntityList::QueueCloseClients(
+	Mob *sender,
+	const EQApplicationPacket *app,
+	bool ignore_sender,
+	float distance,
+	Mob *skipped_mob,
+	bool is_ack_required,
+	eqFilterType filter
+)
 {
 	if (sender == nullptr) {
 		QueueClients(sender, app, ignore_sender);
 		return;
 	}
 
-	if (dist <= 0)
-		dist = 600;
-	float dist2 = dist * dist; //pow(dist, 2);
+	if (distance <= 0) {
+		distance = 600;
+	}
 
-	auto it = client_list.begin();
-	while (it != client_list.end()) {
-		Client *ent = it->second;
+	float distance_squared = distance * distance;
 
-		if ((!ignore_sender || ent != sender) && (ent != SkipThisMob)) {
-			eqFilterMode filter2 = ent->GetFilter(filter);
-			if(ent->Connected() &&
-				(filter == FilterNone
-				|| filter2 == FilterShow
-				|| (filter2 == FilterShowGroupOnly && (sender == ent ||
-					(ent->GetGroup() && ent->GetGroup()->IsGroupMember(sender))))
-				|| (filter2 == FilterShowSelfOnly && ent == sender))
-			&& (DistanceSquared(ent->GetPosition(), sender->GetPosition()) <= dist2)) {
-				ent->QueuePacket(app, ackreq, Client::CLIENT_CONNECTED);
+	for (auto &e : GetCloseMobList(sender, distance)) {
+		Mob *mob = e.second;
+
+		if (!mob->IsClient()) {
+			continue;
+		}
+
+		Client *client = mob->CastToClient();
+
+		if ((!ignore_sender || client != sender) && (client != skipped_mob)) {
+
+			if (DistanceSquared(client->GetPosition(), sender->GetPosition()) >= distance_squared) {
+				continue;
+			}
+
+			if (!client->Connected()) {
+				continue;
+			}
+
+			eqFilterMode client_filter = client->GetFilter(filter);
+			if (
+				filter == FilterNone || client_filter == FilterShow ||
+				(client_filter == FilterShowGroupOnly &&
+				 (sender == client || (client->GetGroup() && client->GetGroup()->IsGroupMember(sender)))) ||
+				(client_filter == FilterShowSelfOnly && client == sender)
+				) {
+				client->QueuePacket(app, is_ack_required, Client::CLIENT_CONNECTED);
 			}
 		}
-		++it;
 	}
 }
 
 //sender can be null
-void EntityList::QueueClients(Mob *sender, const EQApplicationPacket *app,
-		bool ignore_sender, bool ackreq)
+void EntityList::QueueClients(
+	Mob *sender, const EQApplicationPacket *app,
+	bool ignore_sender, bool ackreq
+)
 {
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
@@ -1671,9 +1707,9 @@ void EntityList::DuelMessage(Mob *winner, Mob *loser, bool flee)
 		//might want some sort of distance check in here?
 		if (cur != winner && cur != loser) {
 			if (flee)
-				cur->Message_StringID(15, DUEL_FLED, winner->GetName(),loser->GetName(),loser->GetName());
+				cur->MessageString(Chat::Yellow, DUEL_FLED, winner->GetName(),loser->GetName(),loser->GetName());
 			else
-				cur->Message_StringID(15, DUEL_FINISHED, winner->GetName(),loser->GetName());
+				cur->MessageString(Chat::Yellow, DUEL_FINISHED, winner->GetName(),loser->GetName());
 		}
 		++it;
 	}
@@ -1713,6 +1749,18 @@ Client *EntityList::GetClientByWID(uint32 iWID)
 	return nullptr;
 }
 
+Client *EntityList::GetClientByLSID(uint32 iLSID)
+{
+	auto it = client_list.begin();
+	while (it != client_list.end()) {
+		if (it->second->LSAccountID() == iLSID) {
+			return it->second;
+		}
+		++it;
+	}
+	return nullptr;
+}
+
 Client *EntityList::GetRandomClient(const glm::vec3& location, float Distance, Client *ExcludeClient)
 {
 	std::vector<Client *> ClientsInRange;
@@ -2059,7 +2107,7 @@ void EntityList::QueueClientsGuildBankItemUpdate(const GuildBankItemUpdate_Struc
 void EntityList::MessageStatus(uint32 to_guild_id, int to_minstatus, uint32 type, const char *message, ...)
 {
 	va_list argptr;
-	char buffer[4096];
+	char    buffer[4096];
 
 	va_start(argptr, message);
 	vsnprintf(buffer, 4096, message, argptr);
@@ -2068,75 +2116,242 @@ void EntityList::MessageStatus(uint32 to_guild_id, int to_minstatus, uint32 type
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
 		Client *client = it->second;
-		if ((to_guild_id == 0 || client->IsInGuild(to_guild_id)) && client->Admin() >= to_minstatus)
+		if ((to_guild_id == 0 || client->IsInGuild(to_guild_id)) && client->Admin() >= to_minstatus) {
 			client->Message(type, buffer);
+		}
 		++it;
 	}
 }
 
-// works much like MessageClose, but with formatted strings
-void EntityList::MessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, uint32 string_id, const char* message1,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9)
+/**
+ * @param sender
+ * @param skipsender
+ * @param dist
+ * @param type
+ * @param string_id
+ * @param message1
+ * @param message2
+ * @param message3
+ * @param message4
+ * @param message5
+ * @param message6
+ * @param message7
+ * @param message8
+ * @param message9
+ */
+void EntityList::MessageCloseString(
+	Mob *sender,
+	bool skipsender,
+	float dist,
+	uint32 type,
+	uint32 string_id,
+	const char *message1,
+	const char *message2,
+	const char *message3,
+	const char *message4,
+	const char *message5,
+	const char *message6,
+	const char *message7,
+	const char *message8,
+	const char *message9
+)
 {
 	Client *c;
-	float dist2 = dist * dist;
+	float  dist2 = dist * dist;
 
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if(c && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || c != sender))
-			c->Message_StringID(type, string_id, message1, message2, message3, message4, message5, message6, message7, message8, message9);
+	for (auto & it : client_list) {
+		c = it.second;
+		if (c && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || c != sender)) {
+			c->MessageString(
+				type,
+				string_id,
+				message1,
+				message2,
+				message3,
+				message4,
+				message5,
+				message6,
+				message7,
+				message8,
+				message9
+			);
+		}
 	}
 }
 
-void EntityList::FilteredMessageClose_StringID(Mob *sender, bool skipsender,
-		float dist, uint32 type, eqFilterType filter, uint32 string_id,
-		const char *message1, const char *message2, const char *message3,
-		const char *message4, const char *message5, const char *message6,
-		const char *message7, const char *message8, const char *message9)
+/**
+ * @param sender
+ * @param skipsender
+ * @param dist
+ * @param type
+ * @param filter
+ * @param string_id
+ * @param message1
+ * @param message2
+ * @param message3
+ * @param message4
+ * @param message5
+ * @param message6
+ * @param message7
+ * @param message8
+ * @param message9
+ */
+void EntityList::FilteredMessageCloseString(
+	Mob *sender, bool skipsender,
+	float dist,
+	uint32 type,
+	eqFilterType filter,
+	uint32 string_id,
+	const char *message1,
+	const char *message2,
+	const char *message3,
+	const char *message4,
+	const char *message5,
+	const char *message6,
+	const char *message7,
+	const char *message8,
+	const char *message9
+)
 {
 	Client *c;
-	float dist2 = dist * dist;
+	float  dist2 = dist * dist;
 
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if (c && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || c != sender))
-			c->FilteredMessage_StringID(sender, type, filter, string_id,
-					message1, message2, message3, message4, message5,
-					message6, message7, message8, message9);
+	for (auto & it : client_list) {
+		c = it.second;
+		if (c && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || c != sender)) {
+			c->FilteredMessageString(
+				sender, type, filter, string_id,
+				message1, message2, message3, message4, message5,
+				message6, message7, message8, message9
+			);
+		}
 	}
 }
 
-void EntityList::Message_StringID(Mob *sender, bool skipsender, uint32 type, uint32 string_id, const char* message1,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9)
+/**
+ *
+ * @param sender
+ * @param skipsender
+ * @param type
+ * @param string_id
+ * @param message1
+ * @param message2
+ * @param message3
+ * @param message4
+ * @param message5
+ * @param message6
+ * @param message7
+ * @param message8
+ * @param message9
+ */
+void EntityList::MessageString(
+	Mob *sender,
+	bool skipsender,
+	uint32 type,
+	uint32 string_id,
+	const char *message1,
+	const char *message2,
+	const char *message3,
+	const char *message4,
+	const char *message5,
+	const char *message6,
+	const char *message7,
+	const char *message8,
+	const char *message9
+)
 {
 	Client *c;
 
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if(c && (!skipsender || c != sender))
-			c->Message_StringID(type, string_id, message1, message2, message3, message4, message5, message6, message7, message8, message9);
+	for (auto & it : client_list) {
+		c = it.second;
+		if (c && (!skipsender || c != sender)) {
+			c->MessageString(
+				type,
+				string_id,
+				message1,
+				message2,
+				message3,
+				message4,
+				message5,
+				message6,
+				message7,
+				message8,
+				message9
+			);
+		}
 	}
 }
 
-void EntityList::FilteredMessage_StringID(Mob *sender, bool skipsender,
-		uint32 type, eqFilterType filter, uint32 string_id,
-		const char *message1, const char *message2, const char *message3,
-		const char *message4, const char *message5, const char *message6,
-		const char *message7, const char *message8, const char *message9)
+/**
+ *
+ * @param sender
+ * @param skipsender
+ * @param type
+ * @param filter
+ * @param string_id
+ * @param message1
+ * @param message2
+ * @param message3
+ * @param message4
+ * @param message5
+ * @param message6
+ * @param message7
+ * @param message8
+ * @param message9
+ */
+void EntityList::FilteredMessageString(
+	Mob *sender,
+	bool skipsender,
+	uint32 type,
+	eqFilterType filter,
+	uint32 string_id,
+	const char *message1,
+	const char *message2,
+	const char *message3,
+	const char *message4,
+	const char *message5,
+	const char *message6,
+	const char *message7,
+	const char *message8,
+	const char *message9
+)
 {
 	Client *c;
 
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if (c && (!skipsender || c != sender))
-			c->FilteredMessage_StringID(sender, type, filter, string_id,
-					message1, message2, message3, message4, message5, message6,
-					message7, message8, message9);
+	for (auto & it : client_list) {
+		c = it.second;
+		if (c && (!skipsender || c != sender)) {
+			c->FilteredMessageString(
+				sender,
+				type,
+				filter,
+				string_id,
+				message1,
+				message2,
+				message3,
+				message4,
+				message5,
+				message6,
+				message7,
+				message8,
+				message9
+			);
+		}
 	}
 }
 
-void EntityList::MessageClose(Mob* sender, bool skipsender, float dist, uint32 type, const char* message, ...)
+/**
+ * @param sender
+ * @param skipsender
+ * @param dist
+ * @param type
+ * @param message
+ * @param ...
+ */
+void EntityList::MessageClose(Mob *sender, bool skipsender, float dist, uint32 type, const char *message, ...)
 {
 	va_list argptr;
-	char buffer[4096];
+	char    buffer[4096];
 
 	va_start(argptr, message);
 	vsnprintf(buffer, 4095, message, argptr);
@@ -2146,16 +2361,26 @@ void EntityList::MessageClose(Mob* sender, bool skipsender, float dist, uint32 t
 
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
-		if (DistanceSquared(it->second->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || it->second != sender))
+		if (DistanceSquared(it->second->GetPosition(), sender->GetPosition()) <= dist2 &&
+			(!skipsender || it->second != sender)) {
 			it->second->Message(type, buffer);
+		}
 		++it;
 	}
 }
 
-void EntityList::FilteredMessageClose(Mob *sender, bool skipsender, float dist, uint32 type, eqFilterType filter, const char *message, ...)
+void EntityList::FilteredMessageClose(
+	Mob *sender,
+	bool skipsender,
+	float dist,
+	uint32 type,
+	eqFilterType filter,
+	const char *message,
+	...
+)
 {
 	va_list argptr;
-	char buffer[4096];
+	char    buffer[4096];
 
 	va_start(argptr, message);
 	vsnprintf(buffer, 4095, message, argptr);
@@ -2165,8 +2390,10 @@ void EntityList::FilteredMessageClose(Mob *sender, bool skipsender, float dist,
 
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
-		if (DistanceSquared(it->second->GetPosition(), sender->GetPosition()) <= dist2 && (!skipsender || it->second != sender))
-			it->second->FilteredMessage(sender, type, filter, buffer);
+		if (DistanceSquared(it->second->GetPosition(), sender->GetPosition()) <= dist2 &&
+			(!skipsender || it->second != sender)) {
+				it->second->FilteredMessage(sender, type, filter, buffer);
+		}
 		++it;
 	}
 }
@@ -2292,43 +2519,51 @@ void EntityList::RemoveAllEncounters()
 	}
 }
 
+/**
+ * @param delete_id
+ * @return
+ */
 bool EntityList::RemoveMob(uint16 delete_id)
 {
-	if (delete_id == 0)
+	if (delete_id == 0) {
 		return true;
+	}
 
 	auto it = mob_list.find(delete_id);
 	if (it != mob_list.end()) {
-
-		RemoveMobFromClientCloseLists(it->second);
-
-		if (npc_list.count(delete_id))
+		if (npc_list.count(delete_id)) {
 			entity_list.RemoveNPC(delete_id);
-		else if (client_list.count(delete_id))
+		}
+		else if (client_list.count(delete_id)) {
 			entity_list.RemoveClient(delete_id);
+		}
 		safe_delete(it->second);
-		if (!corpse_list.count(delete_id))
+		if (!corpse_list.count(delete_id)) {
 			free_ids.push(it->first);
+		}
 		mob_list.erase(it);
 		return true;
 	}
 	return false;
 }
 
-// This is for if the ID is deleted for some reason
+/**
+ * @param delete_mob
+ * @return
+ */
 bool EntityList::RemoveMob(Mob *delete_mob)
 {
-	if (delete_mob == 0)
+	if (delete_mob == 0) {
 		return true;
+	}
 
 	auto it = mob_list.begin();
 	while (it != mob_list.end()) {
 		if (it->second == delete_mob) {
-			RemoveMobFromClientCloseLists(it->second);
-
 			safe_delete(it->second);
-			if (!corpse_list.count(it->first))
+			if (!corpse_list.count(it->first)) {
 				free_ids.push(it->first);
+			}
 			mob_list.erase(it);
 			return true;
 		}
@@ -2337,36 +2572,114 @@ bool EntityList::RemoveMob(Mob *delete_mob)
 	return false;
 }
 
+/**
+ * @param delete_id
+ * @return
+ */
 bool EntityList::RemoveNPC(uint16 delete_id)
 {
 	auto it = npc_list.find(delete_id);
 	if (it != npc_list.end()) {
 		NPC *npc = it->second;
-		// make sure its proximity is removed
 		RemoveProximity(delete_id);
-		// remove from client close lists
-		RemoveMobFromClientCloseLists(npc->CastToMob());
-		// remove from the list
 		npc_list.erase(it);
 
-		// remove from limit list if needed
-		if (npc_limit_list.count(delete_id))
+		if (npc_limit_list.count(delete_id)) {
 			npc_limit_list.erase(delete_id);
+		}
+
 		return true;
 	}
 	return false;
 }
 
-bool EntityList::RemoveMobFromClientCloseLists(Mob *mob)
+/**
+ * @param mob
+ * @return
+ */
+bool EntityList::RemoveMobFromCloseLists(Mob *mob)
 {
-	auto it = client_list.begin();
-	while (it != client_list.end()) {
-		it->second->close_mobs.erase(mob);
+	uint16 entity_id = mob->GetID() > 0 ? mob->GetID() : mob->GetInitialId();
+
+	LogEntityManagement(
+		"Attempting to remove mob [{}] from close lists entity_id ({})",
+		mob->GetCleanName(),
+		entity_id
+	);
+
+	auto it = mob_list.begin();
+	while (it != mob_list.end()) {
+
+		LogEntityManagement(
+			"Removing mob [{}] from [{}] close list entity_id ({})",
+			mob->GetCleanName(),
+			it->second->GetCleanName(),
+			entity_id
+		);
+
+		it->second->close_mobs.erase(entity_id);
 		++it;
 	}
+
 	return false;
 }
 
+/**
+ * @param mob
+ * @return
+ */
+void EntityList::RemoveAuraFromMobs(Mob *aura)
+{
+	LogEntityManagement(
+		"Attempting to remove aura [{}] from mobs entity_id ({})",
+		aura->GetCleanName(),
+		aura->GetID()
+	);
+
+	for (auto &it : mob_list) {
+		auto mob = it.second;
+		mob->RemoveAura(aura->GetID());
+	}
+}
+
+/**
+ * @param close_mobs
+ * @param scanning_mob
+ */
+void EntityList::ScanCloseMobs(std::unordered_map<uint16, Mob *> &close_mobs, Mob *scanning_mob)
+{
+	float scan_range = RuleI(Range, MobCloseScanDistance) * RuleI(Range, MobCloseScanDistance);
+
+	close_mobs.clear();
+
+	for (auto &e : mob_list) {
+		auto mob = e.second;
+
+		if (!mob->IsNPC() && !mob->IsClient()) {
+			continue;
+		}
+
+		if (mob->GetID() <= 0) {
+			continue;
+		}
+
+		float distance = DistanceSquared(scanning_mob->GetPosition(), mob->GetPosition());
+		if (distance <= scan_range) {
+			close_mobs.insert(std::pair<uint16, Mob *>(mob->GetID(), mob));
+		}
+		else if (mob->GetAggroRange() >= scan_range) {
+			close_mobs.insert(std::pair<uint16, Mob *>(mob->GetID(), mob));
+		}
+	}
+
+	LogAIScanClose(
+		"[{}] Scanning Close List | list_size [{}] moving [{}]",
+		scanning_mob->GetCleanName(),
+		close_mobs.size(),
+		scanning_mob->IsMoving() ? "true" : "false"
+	);
+}
+
 bool EntityList::RemoveMerc(uint16 delete_id)
 {
 	auto it = merc_list.find(delete_id);
@@ -2686,7 +2999,7 @@ char *EntityList::MakeNameUnique(char *name)
 			return name;
 		}
 	}
-	Log(Logs::General, Logs::Error, "Fatal error in EntityList::MakeNameUnique: Unable to find unique name for '%s'", name);
+	LogError("Fatal error in EntityList::MakeNameUnique: Unable to find unique name for [{}]", name);
 	char tmp[64] = "!";
 	strn0cpy(&tmp[1], name, sizeof(tmp) - 1);
 	strcpy(name, tmp);
@@ -2711,15 +3024,15 @@ void EntityList::ListNPCCorpses(Client *client)
 	uint32 x = 0;
 
 	auto it = corpse_list.begin();
-	client->Message(0, "NPC Corpses in the zone:");
+	client->Message(Chat::White, "NPC Corpses in the zone:");
 	while (it != corpse_list.end()) {
 		if (it->second->IsNPCCorpse()) {
-			client->Message(0, "  %5d: %s", it->first, it->second->GetName());
+			client->Message(Chat::White, "  %5d: %s", it->first, it->second->GetName());
 			x++;
 		}
 		++it;
 	}
-	client->Message(0, "%d npc corpses listed.", x);
+	client->Message(Chat::White, "%d npc corpses listed.", x);
 }
 
 void EntityList::ListPlayerCorpses(Client *client)
@@ -2727,15 +3040,15 @@ void EntityList::ListPlayerCorpses(Client *client)
 	uint32 x = 0;
 
 	auto it = corpse_list.begin();
-	client->Message(0, "Player Corpses in the zone:");
+	client->Message(Chat::White, "Player Corpses in the zone:");
 	while (it != corpse_list.end()) {
 		if (it->second->IsPlayerCorpse()) {
-			client->Message(0, "  %5d: %s", it->first, it->second->GetName());
+			client->Message(Chat::White, "  %5d: %s", it->first, it->second->GetName());
 			x++;
 		}
 		++it;
 	}
-	client->Message(0, "%d player corpses listed.", x);
+	client->Message(Chat::White, "%d player corpses listed.", x);
 }
 
 // returns the number of corpses deleted. A negative number indicates an error code.
@@ -2762,7 +3075,7 @@ void EntityList::CorpseFix(Client* c)
 		Corpse* corpse = it->second;
 		if (corpse->IsNPCCorpse()) {
 			if (DistanceNoZ(c->GetPosition(), corpse->GetPosition()) < 100) {
-				c->Message(15, "Attempting to fix %s", it->second->GetCleanName());
+				c->Message(Chat::Yellow, "Attempting to fix %s", it->second->GetCleanName());
 				corpse->GMMove(corpse->GetX(), corpse->GetY(), c->GetZ() + 2, 0);
 			}
 		}
@@ -3537,7 +3850,7 @@ void EntityList::LimitAddNPC(NPC *npc)
 	SpawnLimitRecord r;
 
 	uint16 eid = npc->GetID();
-	r.spawngroup_id = npc->GetSp2();
+	r.spawngroup_id = npc->GetSpawnGroupId();
 	r.npc_type = npc->GetNPCTypeID();
 
 	npc_limit_list[eid] = r;
@@ -3732,25 +4045,27 @@ bool Entity::CheckCoordLosNoZLeaps(float cur_x, float cur_y, float cur_z,
 	return false;
 }
 
-void EntityList::QuestJournalledSayClose(Mob *sender, Client *QuestInitiator,
-		float dist, const char* mobname, const char* message)
+void EntityList::QuestJournalledSayClose(Mob *sender, float dist, const char *mobname, const char *message,
+					 Journal::Options &opts)
 {
-	Client *c = nullptr;
-	float dist2 = dist * dist;
+	SerializeBuffer buf(sizeof(SpecialMesgHeader_Struct) + 12 + 64 + 64);
 
-	// Send the message to the quest initiator such that the client will enter it into the NPC Quest Journal
-	if (QuestInitiator) {
-		auto buf = new char[strlen(mobname) + strlen(message) + 10];
-		sprintf(buf, "%s says, '%s'", mobname, message);
-		QuestInitiator->QuestJournalledMessage(mobname, buf);
-		safe_delete_array(buf);
-	}
-	// Use the old method for all other nearby clients
-	for (auto it = client_list.begin(); it != client_list.end(); ++it) {
-		c = it->second;
-		if(c && (c != QuestInitiator) && DistanceSquared(c->GetPosition(), sender->GetPosition()) <= dist2)
-			c->Message_StringID(10, GENERIC_SAY, mobname, message);
-	}
+	buf.WriteInt8(static_cast<int8>(opts.speak_mode));
+	buf.WriteInt8(static_cast<int8>(opts.journal_mode));
+	buf.WriteInt8(opts.language);
+	buf.WriteInt32(opts.message_type);
+	buf.WriteInt32(opts.target_spawn_id);
+	buf.WriteString(mobname);
+	buf.WriteInt32(0); // location, client doesn't seem to do anything with this
+	buf.WriteInt32(0);
+	buf.WriteInt32(0);
+	buf.WriteString(message);
+
+	auto outapp = new EQApplicationPacket(OP_SpecialMesg, buf);
+
+	// client only bothers logging if target spawn ID matches, safe to send to everyone
+	QueueCloseClients(sender, outapp, false, dist);
+	delete outapp;
 }
 
 Corpse *EntityList::GetClosestCorpse(Mob *sender, const char *Name)
@@ -4618,7 +4933,7 @@ void EntityList::ExpeditionWarning(uint32 minutes_left)
 
 	auto it = client_list.begin();
 	while (it != client_list.end()) {
-		it->second->Message_StringID(15, EXPEDITION_MIN_REMAIN, itoa((int)minutes_left));
+		it->second->MessageString(Chat::Yellow, EXPEDITION_MIN_REMAIN, itoa((int)minutes_left));
 		it->second->QueuePacket(outapp);
 		++it;
 	}
@@ -4663,10 +4978,10 @@ void EntityList::GetTargetsForConeArea(Mob *start, float min_radius, float radiu
 			continue;
 		}
 		// check PC/NPC only flag 1 = PCs, 2 = NPCs
-		if (pcnpc == 1 && !ptr->IsClient() && !ptr->IsMerc()) {
+		if (pcnpc == 1 && !ptr->IsClient() && !ptr->IsMerc() && !ptr->IsBot()) {
 			++it;
 			continue;
-		} else if (pcnpc == 2 && (ptr->IsClient() || ptr->IsMerc())) {
+		} else if (pcnpc == 2 && (ptr->IsClient() || ptr->IsMerc() || ptr->IsBot())) {
 			++it;
 			continue;
 		}
@@ -4776,3 +5091,21 @@ void EntityList::ReloadMerchants() {
 		}
 	}
 }
+
+/**
+ * If we have a distance requested that is greater than our scanning distance
+ * then we return the full list
+ *
+ * @param mob
+ * @param distance
+ * @return
+ */
+std::unordered_map<uint16, Mob *> &EntityList::GetCloseMobList(Mob *mob, float distance)
+{
+	if (distance <= RuleI(Range, MobCloseScanDistance)) {
+		return mob->close_mobs;
+	}
+
+	return mob_list;
+}
+
diff --git a/zone/entity.h b/zone/entity.h
index 084cf6f01..505f34963 100644
--- a/zone/entity.h
+++ b/zone/entity.h
@@ -29,6 +29,7 @@
 
 #include "position.h"
 #include "zonedump.h"
+#include "common.h"
 
 class Encounter;
 class Beacon;
@@ -108,6 +109,7 @@ public:
 	const Beacon	*CastToBeacon() const;
 	const Encounter *CastToEncounter() const;
 
+	inline const uint16& GetInitialId() const { return initial_id; }
 	inline const uint16& GetID() const { return id; }
 	inline const time_t& GetSpawnTimeStamp() const { return spawn_timestamp; }
 
@@ -121,10 +123,17 @@ public:
 
 protected:
 	friend class EntityList;
-	inline virtual void SetID(uint16 set_id) { id = set_id; }
+	inline virtual void SetID(uint16 set_id) {
+		id = set_id;
+
+		if (initial_id == 0 && set_id > 0) {
+			initial_id = set_id;
+		}
+	}
 	uint32 pDBAsyncWorkID;
 private:
 	uint16 id;
+	uint16 initial_id;
 	time_t spawn_timestamp;
 };
 
@@ -175,6 +184,7 @@ public:
 	}
 	Client *GetClientByCharID(uint32 iCharID);
 	Client *GetClientByWID(uint32 iWID);
+	Client *GetClientByLSID(uint32 iLSID);
 	Client *GetClient(uint32 ip, uint16 port);
 	Client *GetRandomClient(const glm::vec3& location, float Distance, Client *ExcludeClient = nullptr);
 	Group *GetGroupByMob(Mob* mob);
@@ -282,7 +292,8 @@ public:
 	bool	RemoveTrap(uint16 delete_id);
 	bool	RemoveObject(uint16 delete_id);
 	bool	RemoveProximity(uint16 delete_npc_id);
-	bool	RemoveMobFromClientCloseLists(Mob *mob);
+	bool	RemoveMobFromCloseLists(Mob *mob);
+	void    RemoveAuraFromMobs(Mob *aura);
 	void	RemoveAllMobs();
 	void	RemoveAllClients();
 	void	RemoveAllNPCs();
@@ -319,10 +330,39 @@ public:
 	void	MessageStatus(uint32 to_guilddbid, int to_minstatus, uint32 type, const char* message, ...);
 	void	MessageClose(Mob* sender, bool skipsender, float dist, uint32 type, const char* message, ...);
 	void	FilteredMessageClose(Mob* sender, bool skipsender, float dist, uint32 type, eqFilterType filter, const char* message, ...);
-	void	Message_StringID(Mob *sender, bool skipsender, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
-	void	FilteredMessage_StringID(Mob *sender, bool skipsender, uint32 type, eqFilterType filter, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
-	void	MessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
-	void	FilteredMessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, eqFilterType filter, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
+	void	MessageString(Mob *sender, bool skipsender, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
+	void	FilteredMessageString(Mob *sender, bool skipsender, uint32 type, eqFilterType filter, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0);
+	void	MessageCloseString(
+		Mob *sender,
+		bool skipsender,
+		float dist,
+		uint32 type,
+		uint32 string_id,
+		const char *message1 = 0,
+		const char *message2 = 0,
+		const char *message3 = 0,
+		const char *message4 = 0,
+		const char *message5 = 0,
+		const char *message6 = 0,
+		const char *message7 = 0,
+		const char *message8 = 0,
+		const char *message9 = 0);
+	void	FilteredMessageCloseString(
+		Mob *sender,
+		bool skipsender,
+		float dist,
+		uint32 type,
+		eqFilterType filter,
+		uint32 string_id,
+		const char *message1 = 0,
+		const char *message2 = 0,
+		const char *message3 = 0,
+		const char *message4 = 0,
+		const char *message5 = 0,
+		const char *message6 = 0,
+		const char *message7 = 0,
+		const char *message8 = 0,
+		const char *message9 = 0);
 	void	ChannelMessageFromWorld(const char* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, uint8 lang_skill, const char* message);
 	void	ChannelMessage(Mob* from, uint8 chan_num, uint8 language, const char* message, ...);
 	void	ChannelMessage(Mob* from, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...);
@@ -337,7 +377,7 @@ public:
 	void	SendNimbusEffects(Client *c);
 	void	SendUntargetable(Client *c);
 	void	DuelMessage(Mob* winner, Mob* loser, bool flee);
-	void	QuestJournalledSayClose(Mob *sender, Client *QuestIntiator, float dist, const char* mobname, const char* message);
+	void	QuestJournalledSayClose(Mob *sender, float dist, const char* mobname, const char* message, Journal::Options &opts);
 	void	GroupMessage(uint32 gid, const char *from, const char *message);
 	void	ExpeditionWarning(uint32 minutes_left);
 
@@ -345,7 +385,7 @@ public:
 	void	RemoveFromXTargets(Mob* mob);
 	void	RemoveFromAutoXTargets(Mob* mob);
 	void	ReplaceWithTarget(Mob* pOldMob, Mob*pNewTarget);
-	void	QueueCloseClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, float dist=200, Mob* SkipThisMob = 0, bool ackreq = true,eqFilterType filter=FilterNone);
+	void	QueueCloseClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, float distance=200, Mob* skipped_mob = 0, bool is_ack_required = true, eqFilterType filter=FilterNone);
 	void	QueueClients(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, bool ackreq = true);
 	void	QueueClientsStatus(Mob* sender, const EQApplicationPacket* app, bool ignore_sender = false, uint8 minstatus = 0, uint8 maxstatus = 0);
 	void	QueueClientsGuild(Mob* sender, const EQApplicationPacket* app, bool ignore_sender = false, uint32 guildeqid = 0);
@@ -357,11 +397,24 @@ public:
 	void	QueueToGroupsForNPCHealthAA(Mob* sender, const EQApplicationPacket* app);
 	void	QueueManaged(Mob* sender, const EQApplicationPacket* app, bool ignore_sender=false, bool ackreq = true);
 
-	void	AEAttack(Mob *attacker, float dist, int Hand = EQEmu::invslot::slotPrimary, int count = 0, bool IsFromSpell = false);
-	void	AETaunt(Client *caster, float range=0, int32 bonus_hate=0);
-	void	AESpell(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true, int16 resist_adjust = 0, int *max_targets = nullptr);
-	void	MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true);
-	void	AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true);
+	void AEAttack(
+		Mob *attacker,
+		float distance,
+		int Hand = EQEmu::invslot::slotPrimary,
+		int count = 0,
+		bool is_from_spell = false
+	);
+	void AETaunt(Client *caster, float range = 0, int32 bonus_hate = 0);
+	void AESpell(
+		Mob *caster,
+		Mob *center,
+		uint16 spell_id,
+		bool affect_caster = true,
+		int16 resist_adjust = 0,
+		int *max_targets = nullptr
+	);
+	void MassGroupBuff(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true);
+	void AEBardPulse(Mob *caster, Mob *center, uint16 spell_id, bool affect_caster = true);
 
 	//trap stuff
 	Mob*	GetTrapTrigger(Trap* trap);
@@ -412,11 +465,7 @@ public:
 	bool	LimitCheckBoth(uint32 npc_type, uint32 spawngroup_id, int group_count, int type_count);
 	bool	LimitCheckName(const char* npc_name);
 
-	void	CheckClientAggro(Client *around);
-	Mob*	AICheckNPCtoNPCAggro(Mob* sender, float iAggroRange, float iAssistRange);
 	int		GetHatedCount(Mob *attacker, Mob *exclude, bool inc_gray_con);
-	void	AIYellForHelp(Mob* sender, Mob* attacker);
-	bool	AICheckCloseBeneficialSpells(NPC* caster, uint8 iChance, float iRange, uint32 iSpellTypes);
 	bool	Merc_AICheckCloseBeneficialSpells(Merc* caster, uint8 iChance, float iRange, uint32 iSpellTypes);
 	Mob*	GetTargetForMez(Mob* caster);
 	uint32	CheckNPCsClose(Mob *center);
@@ -464,17 +513,21 @@ public:
 	inline const std::unordered_map<uint16, Object *> &GetObjectList() { return object_list; }
 	inline const std::unordered_map<uint16, Doors *> &GetDoorsList() { return door_list; }
 
+	std::unordered_map<uint16, Mob *> &GetCloseMobList(Mob *mob, float distance = 0);
+
 	void	DepopAll(int NPCTypeID, bool StartSpawnTimer = true);
 
 	uint16 GetFreeID();
 	void RefreshAutoXTargets(Client *c);
 	void RefreshClientXTargets(Client *c);
 	void SendAlternateAdvancementStats();
+	void ScanCloseMobs(std::unordered_map<uint16, Mob *> &close_mobs, Mob *scanning_mob);
 
 	void GetTrapInfo(Client* client);
 	bool IsTrapGroupSpawned(uint32 trap_id, uint8 group);
 	void UpdateAllTraps(bool respawn, bool repopnow = false);
 	void ClearTrapPointers();
+
 protected:
 	friend class Zone;
 	void	Depop(bool StartSpawnTimer = false);
@@ -507,6 +560,13 @@ private:
 	std::list<Area> area_list;
 	std::queue<uint16> free_ids;
 
+	Timer object_timer;
+	Timer door_timer;
+	Timer corpse_timer;
+	Timer group_timer;
+	Timer raid_timer;
+	Timer trap_timer;
+
 	// Please Do Not Declare Any EntityList Class Members After This Comment
 #ifdef BOTS
 	public:
@@ -515,10 +575,13 @@ private:
 		Mob* GetMobByBotID(uint32 botID);
 		Bot* GetBotByBotID(uint32 botID);
 		Bot* GetBotByBotName(std::string botName);
+		Client* GetBotOwnerByBotEntityID(uint16 entityID);
 		std::list<Bot*> GetBotsByBotOwnerCharacterID(uint32 botOwnerCharacterID);
 
 		bool Bot_AICheckCloseBeneficialSpells(Bot* caster, uint8 iChance, float iRange, uint32 iSpellTypes); // TODO: Evaluate this closesly in hopes to eliminate
 		void ShowSpawnWindow(Client* client, int Distance, bool NamedOnly); // TODO: Implement ShowSpawnWindow in the bot class but it needs entity list stuff
+	
+		void ScanCloseClientMobs(std::unordered_map<uint16, Mob*>& close_mobs, Mob* scanning_mob);
 	private:
 		std::list<Bot*> bot_list;
 #endif
diff --git a/zone/event_codes.h b/zone/event_codes.h
index bb623f041..110101cf9 100644
--- a/zone/event_codes.h
+++ b/zone/event_codes.h
@@ -86,6 +86,8 @@ typedef enum {
 	EVENT_SPAWN_ZONE,
 	EVENT_DEATH_ZONE,
 	EVENT_USE_SKILL,
+	EVENT_COMBINE_VALIDATE,
+	EVENT_BOT_COMMAND,
 	_LargestEventID
 } QuestEventID;
 
diff --git a/zone/exp.cpp b/zone/exp.cpp
index 63fbff79a..ed510bbf9 100644
--- a/zone/exp.cpp
+++ b/zone/exp.cpp
@@ -46,7 +46,7 @@ static uint32 ScaleAAXPBasedOnCurrentAATotal(int earnedAA, uint32 add_aaxp)
 	// Are we within the scaling window?
 	if (earnedAA >= aaLimit || earnedAA < aaMinimum)
 	{
-		Log(Logs::Detail, Logs::None, "Not within AA scaling window.");
+		LogDebug("Not within AA scaling window");
 
 		// At or past the limit.  We're done.
 		return add_aaxp;
@@ -333,18 +333,18 @@ void Client::CalculateLeadershipExp(uint32 &add_exp, uint8 conlevel)
 					uint32 mentor_exp = exp * (GetGroup()->GetMentorPercent() / 100.0f);
 					exp -= mentor_exp;
 					mentoree->AddLeadershipEXP(mentor_exp, 0); // ends up rounded down
-					mentoree->Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP);
+					mentoree->MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_EXP);
 				}
 				if (exp > 0)
 				{
 					// possible if you mentor 100% to the other client
 					AddLeadershipEXP(exp, 0); // ends up rounded up if mentored, no idea how live actually does it
-					Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP);
+					MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_EXP);
 				}
 			}
 			else
 			{
-				Message_StringID(MT_Leadership, MAX_GROUP_LEADERSHIP_POINTS);
+				MessageString(Chat::LeaderShip, MAX_GROUP_LEADERSHIP_POINTS);
 			}
 		}
 		else
@@ -357,11 +357,11 @@ void Client::CalculateLeadershipExp(uint32 &add_exp, uint8 conlevel)
 					&& RuleI(Character, KillsPerRaidLeadershipAA) > 0)
 				{
 					AddLeadershipEXP(0, RAID_EXP_PER_POINT / RuleI(Character, KillsPerRaidLeadershipAA));
-					Message_StringID(MT_Leadership, GAIN_RAID_LEADERSHIP_EXP);
+					MessageString(Chat::LeaderShip, GAIN_RAID_LEADERSHIP_EXP);
 				}
 				else
 				{
-					Message_StringID(MT_Leadership, MAX_RAID_LEADERSHIP_POINTS);
+					MessageString(Chat::LeaderShip, MAX_RAID_LEADERSHIP_POINTS);
 				}
 			}
 			else
@@ -378,17 +378,17 @@ void Client::CalculateLeadershipExp(uint32 &add_exp, uint8 conlevel)
 						uint32 mentor_exp = exp * (raid->GetMentorPercent(group_id) / 100.0f);
 						exp -= mentor_exp;
 						mentoree->AddLeadershipEXP(mentor_exp, 0);
-						mentoree->Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP);
+						mentoree->MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_EXP);
 					}
 					if (exp > 0)
 					{
 						AddLeadershipEXP(exp, 0);
-						Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_EXP);
+						MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_EXP);
 					}
 				}
 				else
 				{
-					Message_StringID(MT_Leadership, MAX_GROUP_LEADERSHIP_POINTS);
+					MessageString(Chat::LeaderShip, MAX_GROUP_LEADERSHIP_POINTS);
 				}
 			}
 		}
@@ -514,7 +514,7 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) {
 
 	// AA Sanity Checking for players who set aa exp and deleveled below allowed aa level.
 	if (GetLevel() <= 50 && m_epp.perAA > 0) {
-		Message(15, "You are below the level allowed to gain AA Experience. AA Experience set to 0%");
+		Message(Chat::Yellow, "You are below the level allowed to gain AA Experience. AA Experience set to 0%");
 		aaexp = 0;
 		m_epp.perAA = 0;
 	}
@@ -524,11 +524,11 @@ void Client::AddEXP(uint32 in_add_exp, uint8 conlevel, bool resexp) {
 }
 
 void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
-	Log(Logs::Detail, Logs::None, "Attempting to Set Exp for %s (XP: %u, AAXP: %u, Rez: %s)", this->GetCleanName(), set_exp, set_aaxp, isrezzexp ? "true" : "false");
+	LogDebug("Attempting to Set Exp for [{}] (XP: [{}], AAXP: [{}], Rez: [{}])", this->GetCleanName(), set_exp, set_aaxp, isrezzexp ? "true" : "false");
 
 	auto max_AAXP = GetRequiredAAExperience();
 	if (max_AAXP == 0 || GetEXPForLevel(GetLevel()) == 0xFFFFFFFF) {
-		Message(13, "Error in Client::SetEXP. EXP not set.");
+		Message(Chat::Red, "Error in Client::SetEXP. EXP not set.");
 		return; // Must be invalid class/race
 	}
 	uint32 i = 0;
@@ -564,23 +564,23 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 
 		if (isrezzexp) {
 			if (RuleI(Character, ShowExpValues) > 0) 
-				Message(MT_Experience, "You regain %s experience from resurrection. %s", exp_amount_message.c_str(), exp_percent_message.c_str());
-			else Message_StringID(MT_Experience, REZ_REGAIN);
+				Message(Chat::Experience, "You regain %s experience from resurrection. %s", exp_amount_message.c_str(), exp_percent_message.c_str());
+			else MessageString(Chat::Experience, REZ_REGAIN);
 		} else {
 			if (membercount > 1) {
 				if (RuleI(Character, ShowExpValues) > 0) 
-					Message(MT_Experience, "You have gained %s party experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
-				else Message_StringID(MT_Experience, GAIN_GROUPXP);
+					Message(Chat::Experience, "You have gained %s party experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
+				else MessageString(Chat::Experience, GAIN_GROUPXP);
 			}
 			else if (IsRaidGrouped()) {
 				if (RuleI(Character, ShowExpValues) > 0) 
-					Message(MT_Experience, "You have gained %s raid experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
-				else Message_StringID(MT_Experience, GAIN_RAIDEXP);
+					Message(Chat::Experience, "You have gained %s raid experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
+				else MessageString(Chat::Experience, GAIN_RAIDEXP);
 			} 
 			else {
 				if (RuleI(Character, ShowExpValues) > 0) 
-					Message(MT_Experience, "You have gained %s experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
-				else Message_StringID(MT_Experience, GAIN_XP);				
+					Message(Chat::Experience, "You have gained %s experience! %s", exp_amount_message.c_str(), exp_percent_message.c_str());
+				else MessageString(Chat::Experience, GAIN_XP);
 			}
 		}
 	}
@@ -588,9 +588,9 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 		uint32 exp_lost = m_pp.exp - set_exp;
 		float exp_percent = (float)((float)exp_lost / (float)(GetEXPForLevel(GetLevel() + 1) - GetEXPForLevel(GetLevel())))*(float)100;
 
-		if (RuleI(Character, ShowExpValues) == 1 && exp_lost > 0) Message(15, "You have lost %i experience.", exp_lost);
-		else if (RuleI(Character, ShowExpValues) == 2 && exp_lost > 0) Message(15, "You have lost %i experience. (%.3f%%)", exp_lost, exp_percent);
-		else Message(15, "You have lost experience.");		
+		if (RuleI(Character, ShowExpValues) == 1 && exp_lost > 0) Message(Chat::Yellow, "You have lost %i experience.", exp_lost);
+		else if (RuleI(Character, ShowExpValues) == 2 && exp_lost > 0) Message(Chat::Yellow, "You have lost %i experience. (%.3f%%)", exp_lost, exp_percent);
+		else Message(Chat::Yellow, "You have lost experience.");
 	}
 
 	//check_level represents the level we should be when we have
@@ -643,7 +643,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 
 		//figure out how many AA points we get from the exp were setting
 		m_pp.aapoints = set_aaxp / max_AAXP;
-		Log(Logs::Detail, Logs::None, "Calculating additional AA Points from AAXP for %s: %u / %u = %.1f points", this->GetCleanName(), set_aaxp, max_AAXP, (float)set_aaxp / (float)max_AAXP);
+		LogDebug("Calculating additional AA Points from AAXP for [{}]: [{}] / [{}] = [{}] points", this->GetCleanName(), set_aaxp, max_AAXP, (float)set_aaxp / (float)max_AAXP);
 
 		//get remainder exp points, set in PP below
 		set_aaxp = set_aaxp - (max_AAXP * m_pp.aapoints);
@@ -654,9 +654,9 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 		//figure out how many points were actually gained
 		/*uint32 gained = m_pp.aapoints - last_unspentAA;*/	//unused
 
-		//Message(15, "You have gained %d skill points!!", m_pp.aapoints - last_unspentAA);
+		//Message(Chat::Yellow, "You have gained %d skill points!!", m_pp.aapoints - last_unspentAA);
 		char val1[20]={0};
-		Message_StringID(MT_Experience, GAIN_ABILITY_POINT, ConvertArray(m_pp.aapoints, val1),m_pp.aapoints == 1 ? "" : "(s)");	//You have gained an ability point! You now have %1 ability point%2.
+		MessageString(Chat::Experience, GAIN_ABILITY_POINT, ConvertArray(m_pp.aapoints, val1),m_pp.aapoints == 1 ? "" : "(s)");	//You have gained an ability point! You now have %1 ability point%2.
 		
 		/* QS: PlayerLogAARate */
 		if (RuleB(QueryServ, PlayerLogAARate)){
@@ -665,7 +665,7 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 			QServ->SendQuery(query.c_str());
 		}
 
-		//Message(15, "You now have %d skill points available to spend.", m_pp.aapoints);
+		//Message(Chat::Yellow, "You now have %d skill points available to spend.", m_pp.aapoints);
 	}
 
 	uint8 maxlevel = RuleI(Character, MaxExpLevel) + 1;
@@ -699,18 +699,18 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 		if (level_increase)
 		{
 			if (level_count == 1)
-				Message_StringID(MT_Experience, GAIN_LEVEL, ConvertArray(check_level, val1));
+				MessageString(Chat::Experience, GAIN_LEVEL, ConvertArray(check_level, val1));
 			else
-				Message(15, "Welcome to level %i!", check_level);
+				Message(Chat::Yellow, "Welcome to level %i!", check_level);
 
 			if (check_level == RuleI(Character, DeathItemLossLevel))
-				Message_StringID(15, CORPSE_ITEM_LOST);
+				MessageString(Chat::Yellow, CORPSE_ITEM_LOST);
 
 			if (check_level == RuleI(Character, DeathExpLossLevel))
-				Message_StringID(15, CORPSE_EXP_LOST);
+				MessageString(Chat::Yellow, CORPSE_EXP_LOST);
 		}
 		else
-			Message_StringID(MT_Experience, LOSE_LEVEL, ConvertArray(check_level, val1));
+			MessageString(Chat::Experience, LOSE_LEVEL, ConvertArray(check_level, val1));
 
 #ifdef BOTS
 		uint8 myoldlevel = GetLevel();
@@ -758,14 +758,14 @@ void Client::SetEXP(uint32 set_exp, uint32 set_aaxp, bool isrezzexp) {
 		char val1[20]={0};
 		char val2[20]={0};
 		char val3[20]={0};
-		Message_StringID(MT_Experience, GM_GAINXP, ConvertArray(set_aaxp,val1),ConvertArray(set_exp,val2),ConvertArray(GetEXPForLevel(GetLevel()+1),val3));	//[GM] You have gained %1 AXP and %2 EXP (%3).
+		MessageString(Chat::Experience, GM_GAINXP, ConvertArray(set_aaxp,val1),ConvertArray(set_exp,val2),ConvertArray(GetEXPForLevel(GetLevel()+1),val3));	//[GM] You have gained %1 AXP and %2 EXP (%3).
 	}
 }
 
 void Client::SetLevel(uint8 set_level, bool command)
 {
 	if (GetEXPForLevel(set_level) == 0xFFFFFFFF) {
-		Log(Logs::General, Logs::Error, "Client::SetLevel() GetEXPForLevel(%i) = 0xFFFFFFFF", set_level);
+		LogError("Client::SetLevel() GetEXPForLevel([{}]) = 0xFFFFFFFF", set_level);
 		return;
 	}
 
@@ -812,7 +812,7 @@ void Client::SetLevel(uint8 set_level, bool command)
 	m_pp.level = set_level;
 	if (command){
 		m_pp.exp = GetEXPForLevel(set_level);
-		Message(15, "Welcome to level %i!", set_level);
+		Message(Chat::Yellow, "Welcome to level %i!", set_level);
 		lu->exp = 0;
 	}
 	else {
@@ -823,7 +823,7 @@ void Client::SetLevel(uint8 set_level, bool command)
 	safe_delete(outapp);
 	this->SendAppearancePacket(AT_WhoLevel, set_level); // who level change
 
-	Log(Logs::General, Logs::Normal, "Setting Level for %s to %i", GetName(), set_level);
+	LogInfo("Setting Level for [{}] to [{}]", GetName(), set_level);
 
 	CalcBonuses();
 
@@ -940,7 +940,7 @@ uint32 Client::GetEXPForLevel(uint16 check_level)
 	return finalxp;
 }
 
-void Client::AddLevelBasedExp(uint8 exp_percentage, uint8 max_level) 
+void Client::AddLevelBasedExp(uint8 exp_percentage, uint8 max_level, bool ignore_mods) 
 { 
 	uint32	award;
 	uint32	xp_for_level;
@@ -958,7 +958,7 @@ void Client::AddLevelBasedExp(uint8 exp_percentage, uint8 max_level)
 	xp_for_level = GetEXPForLevel(max_level + 1) - GetEXPForLevel(max_level);
 	award = xp_for_level * exp_percentage / 100; 
 
-	if(RuleB(Zone, LevelBasedEXPMods))
+	if(RuleB(Zone, LevelBasedEXPMods) && !ignore_mods)
 	{
 		if(zone->level_exp_mod[GetLevel()].ExpMod)
 		{
@@ -1077,12 +1077,12 @@ void Client::SetLeadershipEXP(uint32 group_exp, uint32 raid_exp) {
 	while(group_exp >= GROUP_EXP_PER_POINT) {
 		group_exp -= GROUP_EXP_PER_POINT;
 		m_pp.group_leadership_points++;
-		Message_StringID(MT_Leadership, GAIN_GROUP_LEADERSHIP_POINT);
+		MessageString(Chat::LeaderShip, GAIN_GROUP_LEADERSHIP_POINT);
 	}
 	while(raid_exp >= RAID_EXP_PER_POINT) {
 		raid_exp -= RAID_EXP_PER_POINT;
 		m_pp.raid_leadership_points++;
-		Message_StringID(MT_Leadership, GAIN_RAID_LEADERSHIP_POINT);
+		MessageString(Chat::LeaderShip, GAIN_RAID_LEADERSHIP_POINT);
 	}
 
 	m_pp.group_leadership_exp = group_exp;
@@ -1131,15 +1131,16 @@ uint32 Client::GetCharMaxLevelFromQGlobal() {
 	return 0;
 }
 
-uint32 Client::GetCharMaxLevelFromBucket() {
-	uint32 char_id = this->CharacterID();
-	std::string query = StringFormat("SELECT value FROM data_buckets WHERE `key` = '%i-CharMaxLevel'", char_id);
-	auto results = database.QueryDatabase(query);
+uint32 Client::GetCharMaxLevelFromBucket()
+{
+	uint32      char_id = this->CharacterID();
+	std::string query   = StringFormat("SELECT value FROM data_buckets WHERE `key` = '%i-CharMaxLevel'", char_id);
+	auto        results = database.QueryDatabase(query);
 	if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "Data bucket for CharMaxLevel for char ID %i failed.", char_id);
-        return 0;
-    }
-	
+		LogError("Data bucket for CharMaxLevel for char ID [{}] failed", char_id);
+		return 0;
+	}
+
 	if (results.RowCount() > 0) {
 		auto row = results.begin();
 		return atoi(row[0]);
diff --git a/zone/fearpath.cpp b/zone/fearpath.cpp
index 3f14b059a..cedf1d410 100644
--- a/zone/fearpath.cpp
+++ b/zone/fearpath.cpp
@@ -30,65 +30,80 @@ extern Zone* zone;
 #define FEAR_PATHING_DEBUG
 
 //this is called whenever we are damaged to process possible fleeing
-void Mob::CheckFlee() {
+void Mob::CheckFlee()
+{
 
 	// if mob is dead why would you run?
-	if(GetHP() == 0) {
+	if (GetHP() == 0) {
 		return;
 	}
 
 	// if were already fleeing, don't need to check more...
-	if(flee_mode && currently_fleeing) {
+	if (flee_mode && currently_fleeing) {
 		return;
 	}
 
 	//dont bother if we are immune to fleeing
-	if(GetSpecialAbility(IMMUNE_FLEEING) || spellbonuses.ImmuneToFlee) {
+	if (GetSpecialAbility(IMMUNE_FLEEING) || spellbonuses.ImmuneToFlee) {
+		LogFlee("Mob [{}] is immune to fleeing via special ability or spell bonus", GetCleanName());
 		return;
 	}
 
 	// Check if Flee Timer is cleared
-	if(!flee_timer.Check()) {
+	if (!flee_timer.Check()) {
 		return;
 	}
 
-	int hpratio = GetIntHPRatio();
-	int fleeratio = GetSpecialAbility(FLEE_PERCENT); // if a special flee_percent exists
-	Mob *hate_top = GetHateTop();
+	int hp_ratio   = GetIntHPRatio();
+	int flee_ratio = GetSpecialAbility(FLEE_PERCENT); // if a special flee_percent exists
+	Mob *hate_top  = GetHateTop();
+
+	LogFlee("Mob [{}] hp_ratio [{}] flee_ratio [{}]", GetCleanName(), hp_ratio, flee_ratio);
 
 	// Sanity Check for race conditions
-	if(hate_top == nullptr) {
+	if (hate_top == nullptr) {
 		return;
 	}
 
 	// If no special flee_percent check for Gray or Other con rates
-	if(GetLevelCon(hate_top->GetLevel(), GetLevel()) == CON_GRAY && fleeratio == 0 && RuleB(Combat, FleeGray) && GetLevel() <= RuleI(Combat, FleeGrayMaxLevel)) {
-		fleeratio = RuleI(Combat, FleeGrayHPRatio);
-	} else if(fleeratio == 0) {
-		fleeratio = RuleI(Combat, FleeHPRatio );
+	if (GetLevelCon(hate_top->GetLevel(), GetLevel()) == CON_GRAY && flee_ratio == 0 && RuleB(Combat, FleeGray) &&
+		GetLevel() <= RuleI(Combat, FleeGrayMaxLevel)) {
+		flee_ratio = RuleI(Combat, FleeGrayHPRatio);
+		LogFlee("Mob [{}] using combat flee gray hp_ratio [{}] flee_ratio [{}]", GetCleanName(), hp_ratio, flee_ratio);
+	}
+	else if (flee_ratio == 0) {
+		flee_ratio = RuleI(Combat, FleeHPRatio);
+		LogFlee("Mob [{}] using combat flee hp_ratio [{}] flee_ratio [{}]", GetCleanName(), hp_ratio, flee_ratio);
 	}
 
-	// Mob does not have low enough health to flee
-	if(hpratio >= fleeratio) {
+	bool mob_has_low_enough_health_to_flee = hp_ratio >= flee_ratio;
+	if (mob_has_low_enough_health_to_flee) {
+		LogFlee(
+			"Mob [{}] does not have low enough health to flee | hp_ratio [{}] flee_ratio [{}]",
+			GetCleanName(),
+			hp_ratio,
+			flee_ratio
+		);
 		return;
 	}
 
 	// Sanity Check this should never happen...
-	if(!hate_top) {
+	if (!hate_top) {
+		currently_fleeing = true;
 		StartFleeing();
 		return;
 	}
 
 	int other_ratio = hate_top->GetIntHPRatio();
 	// If the Client is nearing death the NPC will not flee and instead try to kill the client.
-	if(other_ratio < 20) {
+	if (other_ratio < 20) {
 		return;
 	}
 
 	// Flee Chance checking based on con.
 	uint32 con = GetLevelCon(hate_top->GetLevel(), GetLevel());
-	int flee_chance;
-	switch(con) {
+	int    flee_chance;
+	switch (con) {
 		//these values are not 100% researched
 		case CON_GRAY:
 			flee_chance = 100;
@@ -107,9 +122,32 @@ void Mob::CheckFlee() {
 			break;
 	}
 
-	// If we got here we are allowed to roll on flee chance if there is not other hated NPC's in the area.
+	LogFlee(
+		"Post con-switch | Mob [{}] con [{}] hp_ratio [{}] flee_ratio [{}] flee_chance [{}]",
+		GetCleanName(),
+		con,
+		hp_ratio,
+		flee_ratio,
+		flee_chance
+	);
+
+	// If we got here we are allowed to roll on flee chance if there is not other hated NPC's in the area.
+	// ALWAYS_FLEE, skip roll
+	// if FleeIfNotAlone is true, we skip alone check
+	// roll chance
+	if (GetSpecialAbility(ALWAYS_FLEE) ||
+		((RuleB(Combat, FleeIfNotAlone) || entity_list.GetHatedCount(hate_top, this, true) == 0) &&
+		 zone->random.Roll(flee_chance))) {
+
+		LogFlee(
+			"Passed all checks to flee | Mob [{}] con [{}] hp_ratio [{}] flee_ratio [{}] flee_chance [{}]",
+			GetCleanName(),
+			con,
+			hp_ratio,
+			flee_ratio,
+			flee_chance
+		);
 
-	if(RuleB(Combat, FleeIfNotAlone) || GetSpecialAbility(ALWAYS_FLEE) || zone->random.Roll(flee_chance) && entity_list.GetHatedCount(hate_top, this, true) == 0) {
 		currently_fleeing = true;
 		StartFleeing();
 	}
@@ -155,7 +193,8 @@ void Mob::ProcessFlee()
 	}
 }
 
-void Mob::CalculateNewFearpoint() {
+void Mob::CalculateNewFearpoint()
+{
 	if (RuleB(Pathing, Fear) && zone->pathing) {
 		auto Node = zone->pathing->GetRandomLocation(glm::vec3(GetX(), GetY(), GetZ()));
 		if (Node.x != 0.0f || Node.y != 0.0f || Node.z != 0.0f) {
@@ -165,9 +204,7 @@ void Mob::CalculateNewFearpoint() {
 			return;
 		}
 
-		Log(Logs::Detail,
-			Logs::Pathing,
-			"No path found to selected node during CalculateNewFearpoint.");
+		LogPathing("No path found to selected node during CalculateNewFearpoint.");
 	}
 }
 
diff --git a/zone/forage.cpp b/zone/forage.cpp
index 3bdb87d7a..24c4641e4 100644
--- a/zone/forage.cpp
+++ b/zone/forage.cpp
@@ -62,17 +62,17 @@ uint32 ZoneDatabase::GetZoneForage(uint32 ZoneID, uint8 skill) {
 		return 0;
 	}
 
-	uint8 index = 0;
-    for (auto row = results.begin(); row != results.end(); ++row, ++index) {
-        if (index >= FORAGE_ITEM_LIMIT)
-            break;
-
-        item[index] = atoi(row[0]);
-        chance[index] = atoi(row[1]) + chancepool;
-        Log(Logs::General, Logs::Error, "Possible Forage: %d with a %d chance", item[index], chance[index]);
-        chancepool = chance[index];
-    }
+	uint8     index = 0;
+	for (auto row   = results.begin(); row != results.end(); ++row, ++index) {
+		if (index >= FORAGE_ITEM_LIMIT) {
+			break;
+		}
 
+		item[index]   = atoi(row[0]);
+		chance[index] = atoi(row[1]) + chancepool;
+		LogError("Possible Forage: [{}] with a [{}] chance", item[index], chance[index]);
+		chancepool = chance[index];
+	}
 
 	if(chancepool == 0 || index < 1)
 		return 0;
@@ -161,14 +161,14 @@ bool Client::CanFish() {
 
 	if (!Pole || !Pole->IsClassCommon() || Pole->GetItem()->ItemType != EQEmu::item::ItemTypeFishingPole) {
 		if (m_inv.HasItemByUse(EQEmu::item::ItemTypeFishingPole, 1, invWhereWorn | invWherePersonal | invWhereBank | invWhereSharedBank | invWhereTrading | invWhereCursor))	//We have a fishing pole somewhere, just not equipped
-			Message_StringID(MT_Skills, FISHING_EQUIP_POLE);	//You need to put your fishing pole in your primary hand.
+			MessageString(Chat::Skills, FISHING_EQUIP_POLE);	//You need to put your fishing pole in your primary hand.
 		else	//We don't have a fishing pole anywhere
-			Message_StringID(MT_Skills, FISHING_NO_POLE);	//You can't fish without a fishing pole, go buy one.
+			MessageString(Chat::Skills, FISHING_NO_POLE);	//You can't fish without a fishing pole, go buy one.
 		return false;
 	}
 
 	if (!Bait || !Bait->IsClassCommon() || Bait->GetItem()->ItemType != EQEmu::item::ItemTypeFishingBait) {
-		Message_StringID(MT_Skills, FISHING_NO_BAIT);	//You can't fish without fishing bait, go buy some.
+		MessageString(Chat::Skills, FISHING_NO_BAIT);	//You can't fish without fishing bait, go buy some.
 		return false;
 	}
 
@@ -190,7 +190,7 @@ bool Client::CanFish() {
 		float bestz = zone->zonemap->FindBestZ(rodPosition, nullptr);
 		float len = m_Position.z - bestz;
 		if(len > LineLength || len < 0.0f) {
-			Message_StringID(MT_Skills, FISHING_LAND);
+			MessageString(Chat::Skills, FISHING_LAND);
 			return false;
 		}
 
@@ -203,7 +203,7 @@ bool Client::CanFish() {
 			bool in_water = zone->watermap->InWater(dest) || zone->watermap->InVWater(dest);
 
 			if (in_lava) {
-				Message_StringID(MT_Skills, FISHING_LAVA);	//Trying to catch a fire elemental or something?
+				MessageString(Chat::Skills, FISHING_LAVA);	//Trying to catch a fire elemental or something?
 				return false;
 			}
 
@@ -212,7 +212,7 @@ bool Client::CanFish() {
 			}
 		}
 
-		Message_StringID(MT_Skills, FISHING_LAND);
+		MessageString(Chat::Skills, FISHING_LAND);
 		return false;
 	}
 	return true;
@@ -223,7 +223,7 @@ void Client::GoFish()
 
 	//TODO: generate a message if we're already fishing
 	/*if (!fishing_timer.Check()) {	//this isn't the right check, may need to add something to the Client class like 'bool is_fishing'
-		Message_StringID(0, ALREADY_FISHING);	//You are already fishing!
+		MessageString(Chat::White, ALREADY_FISHING);	//You are already fishing!
 		return;
 	}*/
 
@@ -293,12 +293,12 @@ void Client::GoFish()
 
 							entity_list.AddNPC(npc);
 
-							Message(MT_Emote,
+							Message(Chat::Emote,
 								"You fish up a little more than you bargained for...");
 						}
 					}
 					else {
-						Message(MT_Emote, "You notice something lurking just below the water's surface...");
+						Message(Chat::Emote, "You notice something lurking just below the water's surface...");
 					}
 				}
 			}
@@ -309,40 +309,42 @@ void Client::GoFish()
 
 		if(food_id == 0) {
 			int index = zone->random.Int(0, MAX_COMMON_FISH_IDS-1);
-			food_id = common_fish_ids[index];
+			food_id = (RuleB(Character, UseNoJunkFishing) ? 13019 : common_fish_ids[index]);
 		}
 
 		const EQEmu::ItemData* food_item = database.GetItem(food_id);
+		if (food_item) {
 
-		if (food_item->ItemType  != EQEmu::item::ItemTypeFood) {
-			Message_StringID(MT_Skills, FISHING_SUCCESS);
-		}
-		else {
-			Message_StringID(MT_Skills, FISHING_SUCCESS_FISH_NAME, food_item->Name);
-		}
-
-		EQEmu::ItemInstance* inst = database.CreateItem(food_item, 1);
-		if(inst != nullptr) {
-			if(CheckLoreConflict(inst->GetItem()))
-			{
-				Message_StringID(0, DUP_LORE);
-				safe_delete(inst);
+			if (food_item->ItemType != EQEmu::item::ItemTypeFood) {
+				MessageString(Chat::Skills, FISHING_SUCCESS);
 			}
-			else
-			{
-				PushItemOnCursor(*inst);
-				SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketLimbo);
-				if(RuleB(TaskSystem, EnableTaskSystem))
-					UpdateTasksForItem(ActivityFish, food_id);
-
-				safe_delete(inst);
-				inst = m_inv.GetItem(EQEmu::invslot::slotCursor);
+			else {
+				MessageString(Chat::Skills, FISHING_SUCCESS_FISH_NAME, food_item->Name);
 			}
 
-			if(inst) {
-				std::vector<EQEmu::Any> args;
-				args.push_back(inst);
-				parse->EventPlayer(EVENT_FISH_SUCCESS, this, "", inst->GetID(), &args);
+			EQEmu::ItemInstance* inst = database.CreateItem(food_item, 1);
+			if (inst != nullptr) {
+				if (CheckLoreConflict(inst->GetItem()))
+				{
+					MessageString(Chat::White, DUP_LORE);
+					safe_delete(inst);
+				}
+				else
+				{
+					PushItemOnCursor(*inst);
+					SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketLimbo);
+					if (RuleB(TaskSystem, EnableTaskSystem))
+						UpdateTasksForItem(ActivityFish, food_id);
+
+					safe_delete(inst);
+					inst = m_inv.GetItem(EQEmu::invslot::slotCursor);
+				}
+
+				if (inst) {
+					std::vector<EQEmu::Any> args;
+					args.push_back(inst);
+					parse->EventPlayer(EVENT_FISH_SUCCESS, this, "", inst->GetID(), &args);
+				}
 			}
 		}
 	}
@@ -351,13 +353,13 @@ void Client::GoFish()
 		//chance to use bait when you dont catch anything...
 		if (zone->random.Int(0, 4) == 1) {
 			DeleteItemInInventory(bslot, 1, true);	//do we need client update?
-			Message_StringID(MT_Skills, FISHING_LOST_BAIT);	//You lost your bait!
+			MessageString(Chat::Skills, FISHING_LOST_BAIT);	//You lost your bait!
 		} else {
 			if (zone->random.Int(0, 15) == 1)	//give about a 1 in 15 chance to spill your beer. we could make this a rule, but it doesn't really seem worth it
 				//TODO: check for & consume an alcoholic beverage from inventory when this triggers, and set it as a rule that's disabled by default
-				Message_StringID(MT_Skills, FISHING_SPILL_BEER);	//You spill your beer while bringing in your line.
+				MessageString(Chat::Skills, FISHING_SPILL_BEER);	//You spill your beer while bringing in your line.
 			else
-				Message_StringID(MT_Skills, FISHING_FAILED);	//You didn't catch anything.
+				MessageString(Chat::Skills, FISHING_FAILED);	//You didn't catch anything.
 		}
 
 		parse->EventPlayer(EVENT_FISH_FAILURE, this, "", 0);
@@ -367,7 +369,7 @@ void Client::GoFish()
 	//this is potentially exploitable in that they can fish
 	//and then swap out items in primary slot... too lazy to fix right now
 	if (zone->random.Int(0, 49) == 1) {
-		Message_StringID(MT_Skills, FISHING_POLE_BROKE);	//Your fishing pole broke!
+		MessageString(Chat::Skills, FISHING_POLE_BROKE);	//Your fishing pole broke!
 		DeleteItemInInventory(EQEmu::invslot::slotPrimary, 0, true);
 	}
 
@@ -413,7 +415,7 @@ void Client::ForageItem(bool guarantee) {
 		const EQEmu::ItemData* food_item = database.GetItem(foragedfood);
 
 		if(!food_item) {
-			Log(Logs::General, Logs::Error, "nullptr returned from database.GetItem in ClientForageItem");
+			LogError("nullptr returned from database.GetItem in ClientForageItem");
 			return;
 		}
 
@@ -434,13 +436,13 @@ void Client::ForageItem(bool guarantee) {
 				break;
 			}
 
-		Message_StringID(MT_Skills, stringid);
+		MessageString(Chat::Skills, stringid);
 		EQEmu::ItemInstance* inst = database.CreateItem(food_item, 1);
 		if(inst != nullptr) {
 			// check to make sure it isn't a foraged lore item
 			if(CheckLoreConflict(inst->GetItem()))
 			{
-				Message_StringID(0, DUP_LORE);
+				MessageString(Chat::White, DUP_LORE);
 				safe_delete(inst);
 			}
 			else {
@@ -462,12 +464,12 @@ void Client::ForageItem(bool guarantee) {
 
 		int ChanceSecondForage = aabonuses.ForageAdditionalItems + itembonuses.ForageAdditionalItems + spellbonuses.ForageAdditionalItems;
 		if(!guarantee && zone->random.Roll(ChanceSecondForage)) {
-			Message_StringID(MT_Skills, FORAGE_MASTERY);
+			MessageString(Chat::Skills, FORAGE_MASTERY);
 			ForageItem(true);
 		}
 
 	} else {
-		Message_StringID(MT_Skills, FORAGE_FAILED);
+		MessageString(Chat::Skills, FORAGE_FAILED);
 		parse->EventPlayer(EVENT_FORAGE_FAILURE, this, "", 0);
 	}
 
diff --git a/zone/global_loot_manager.cpp b/zone/global_loot_manager.cpp
index 8e990c0ac..ccdf88840 100644
--- a/zone/global_loot_manager.cpp
+++ b/zone/global_loot_manager.cpp
@@ -21,14 +21,14 @@ std::vector<int> GlobalLootManager::GetGlobalLootTables(NPC *mob) const
 void GlobalLootManager::ShowZoneGlobalLoot(Client *to) const
 {
 	for (auto &e : m_entries)
-		to->Message(0, " %s : %d table %d", e.GetDescription().c_str(), e.GetID(), e.GetLootTableID());
+		to->Message(Chat::White, " %s : %d table %d", e.GetDescription().c_str(), e.GetID(), e.GetLootTableID());
 }
 
 void GlobalLootManager::ShowNPCGlobalLoot(Client *to, NPC *who) const
 {
 	for (auto &e : m_entries) {
 		if (e.PassesRules(who))
-			to->Message(0, " %s : %d table %d", e.GetDescription().c_str(), e.GetID(), e.GetLootTableID());
+			to->Message(Chat::White, " %s : %d table %d", e.GetDescription().c_str(), e.GetID(), e.GetLootTableID());
 	}
 }
 
diff --git a/zone/groups.cpp b/zone/groups.cpp
index 2f0c5e854..e29deca43 100644
--- a/zone/groups.cpp
+++ b/zone/groups.cpp
@@ -199,7 +199,7 @@ void Group::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinu
 			Client *c = members[i]->CastToClient();
 			//I could not get MoneyOnCorpse to work, so we use this
 			c->AddMoneyToPP(cpsplit, spsplit, gpsplit, ppsplit, true);
-			c->Message(2, msg.c_str());
+			c->Message(Chat::Green, msg.c_str());
 		}
 	}
 }
@@ -835,7 +835,7 @@ void Group::CastGroupSpell(Mob* caster, uint16 spell_id) {
 					caster->SpellOnTarget(spell_id, members[z]->GetPet());
 #endif
 			} else
-				Log(Logs::Detail, Logs::Spells, "Group spell: %s is out of range %f at distance %f from %s", members[z]->GetName(), range, distance, caster->GetName());
+				LogSpells("Group spell: [{}] is out of range [{}] at distance [{}] from [{}]", members[z]->GetName(), range, distance, caster->GetName());
 		}
 	}
 
@@ -874,7 +874,7 @@ void Group::GroupBardPulse(Mob* caster, uint16 spell_id) {
 					members[z]->GetPet()->BardPulse(spell_id, caster);
 #endif
 			} else
-				Log(Logs::Detail, Logs::Spells, "Group bard pulse: %s is out of range %f at distance %f from %s", members[z]->GetName(), range, distance, caster->GetName());
+				LogSpells("Group bard pulse: [{}] is out of range [{}] at distance [{}] from [{}]", members[z]->GetName(), range, distance, caster->GetName());
 		}
 	}
 }
@@ -1177,10 +1177,15 @@ bool Group::LearnMembers() {
 	if (!results.Success())
         return false;
 
-    if (results.RowCount() == 0) {
-        Log(Logs::General, Logs::Error, "Error getting group members for group %lu: %s", (unsigned long)GetID(), results.ErrorMessage().c_str());
-			return false;
-    }
+	if (results.RowCount() == 0) {
+		LogError(
+			"Error getting group members for group [{}]: [{}]",
+			(unsigned long) GetID(),
+			results.ErrorMessage().c_str()
+		);
+
+		return false;
+	}
 
 	int memberIndex = 0;
     for(auto row = results.begin(); row != results.end(); ++row) {
@@ -1207,7 +1212,7 @@ void Group::VerifyGroup() {
 	for (i = 0; i < MAX_GROUP_MEMBERS; i++) {
 		if (membername[i][0] == '\0') {
 #if EQDEBUG >= 7
-	Log(Logs::General, Logs::None, "Group %lu: Verify %d: Empty.\n", (unsigned long)GetID(), i);
+	LogDebug("Group [{}]: Verify [{}]: Empty.\n", (unsigned long)GetID(), i);
 #endif
 			members[i] = nullptr;
 			continue;
@@ -1216,7 +1221,7 @@ void Group::VerifyGroup() {
 		Mob *them = entity_list.GetMob(membername[i]);
 		if(them == nullptr && members[i] != nullptr) {	//they aren't in zone
 #if EQDEBUG >= 6
-		Log(Logs::General, Logs::None, "Member of group %lu named '%s' has disappeared!!", (unsigned long)GetID(), membername[i]);
+		LogDebug("Member of group [{}] named [{}] has disappeared!!", (unsigned long)GetID(), membername[i]);
 #endif
 			membername[i][0] = '\0';
 			members[i] = nullptr;
@@ -1225,18 +1230,18 @@ void Group::VerifyGroup() {
 
 		if(them != nullptr && members[i] != them) {	//our pointer is out of date... not so good.
 #if EQDEBUG >= 5
-		Log(Logs::General, Logs::None, "Member of group %lu named '%s' had an out of date pointer!!", (unsigned long)GetID(), membername[i]);
+		LogDebug("Member of group [{}] named [{}] had an out of date pointer!!", (unsigned long)GetID(), membername[i]);
 #endif
 			members[i] = them;
 			continue;
 		}
 #if EQDEBUG >= 8
-		Log(Logs::General, Logs::None, "Member of group %lu named '%s' is valid.", (unsigned long)GetID(), membername[i]);
+		LogDebug("Member of group [{}] named [{}] is valid", (unsigned long)GetID(), membername[i]);
 #endif
 	}
 }
 
-void Group::GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9, uint32 distance) {
+void Group::GroupMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9, uint32 distance) {
 	uint32 i;
 	for (i = 0; i < MAX_GROUP_MEMBERS; i++) {
 		if(members[i] == nullptr)
@@ -1248,7 +1253,7 @@ void Group::GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, co
 		if(!members[i]->IsClient())
 			continue;
 
-		members[i]->Message_StringID(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, 0);
+		members[i]->MessageString(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, 0);
 	}
 }
 
@@ -1566,7 +1571,7 @@ void Group::DelegateMainTank(const char *NewMainTankName, uint8 toggle)
                                         MainTankName.c_str(), GetID());
         auto results = database.QueryDatabase(query);
 		if (!results.Success())
-			Log(Logs::General, Logs::Error, "Unable to set group main tank: %s\n", results.ErrorMessage().c_str());
+			LogError("Unable to set group main tank: [{}]\n", results.ErrorMessage().c_str());
 	}
 }
 
@@ -1612,7 +1617,7 @@ void Group::DelegateMainAssist(const char *NewMainAssistName, uint8 toggle)
                                         MainAssistName.c_str(), GetID());
         auto results = database.QueryDatabase(query);
 		if (!results.Success())
-			Log(Logs::General, Logs::Error, "Unable to set group main assist: %s\n", results.ErrorMessage().c_str());
+			LogError("Unable to set group main assist: [{}]\n", results.ErrorMessage().c_str());
 
 	}
 }
@@ -1659,7 +1664,7 @@ void Group::DelegatePuller(const char *NewPullerName, uint8 toggle)
                                         PullerName.c_str(), GetID());
         auto results = database.QueryDatabase(query);
 		if (!results.Success())
-			Log(Logs::General, Logs::Error, "Unable to set group main puller: %s\n", results.ErrorMessage().c_str());
+			LogError("Unable to set group main puller: [{}]\n", results.ErrorMessage().c_str());
 
 	}
 
@@ -1680,9 +1685,9 @@ void Group::NotifyMainTank(Client *c, uint8 toggle)
 	if (c->ClientVersion() < EQEmu::versions::ClientVersion::SoD)
 	{
 		if(toggle)
-			c->Message(0, "%s is now Main Tank.", MainTankName.c_str());
+			c->Message(Chat::White, "%s is now Main Tank.", MainTankName.c_str());
 		else
-			c->Message(0, "%s is no longer Main Tank.", MainTankName.c_str());
+			c->Message(Chat::White, "%s is no longer Main Tank.", MainTankName.c_str());
 	}
 	else
 	{
@@ -1775,9 +1780,9 @@ void Group::NotifyPuller(Client *c, uint8 toggle)
 	if (c->ClientVersion() < EQEmu::versions::ClientVersion::SoD)
 	{
 		if(toggle)
-			c->Message(0, "%s is now Puller.", PullerName.c_str());
+			c->Message(Chat::White, "%s is now Puller.", PullerName.c_str());
 		else
-			c->Message(0, "%s is no longer Puller.", PullerName.c_str());
+			c->Message(Chat::White, "%s is no longer Puller.", PullerName.c_str());
 	}
 	else
 	{
@@ -1810,7 +1815,7 @@ void Group::UnDelegateMainTank(const char *OldMainTankName, uint8 toggle)
 		std::string query = StringFormat("UPDATE group_leaders SET maintank = '' WHERE gid = %i LIMIT 1", GetID());
 		auto results = database.QueryDatabase(query);
 		if (!results.Success())
-			Log(Logs::General, Logs::Error, "Unable to clear group main tank: %s\n", results.ErrorMessage().c_str());
+			LogError("Unable to clear group main tank: [{}]\n", results.ErrorMessage().c_str());
 
 		if(!toggle) {
 			for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) {
@@ -1859,7 +1864,7 @@ void Group::UnDelegateMainAssist(const char *OldMainAssistName, uint8 toggle)
 		std::string query = StringFormat("UPDATE group_leaders SET assist = '' WHERE gid = %i LIMIT 1", GetID());
         auto results = database.QueryDatabase(query);
 		if (!results.Success())
-			Log(Logs::General, Logs::Error, "Unable to clear group main assist: %s\n", results.ErrorMessage().c_str());
+			LogError("Unable to clear group main assist: [{}]\n", results.ErrorMessage().c_str());
 
 		if(!toggle)
 		{
@@ -1887,7 +1892,7 @@ void Group::UnDelegatePuller(const char *OldPullerName, uint8 toggle)
 		std::string query = StringFormat("UPDATE group_leaders SET puller = '' WHERE gid = %i LIMIT 1", GetID());
         auto results = database.QueryDatabase(query);
 		if (!results.Success())
-			Log(Logs::General, Logs::Error, "Unable to clear group main puller: %s\n", results.ErrorMessage().c_str());
+			LogError("Unable to clear group main puller: [{}]\n", results.ErrorMessage().c_str());
 
 		if(!toggle) {
 			for(uint32 i = 0; i < MAX_GROUP_MEMBERS; ++i) {
@@ -1970,7 +1975,7 @@ void Group::SetGroupMentor(int percent, char *name)
 			mentoree_name.c_str(), mentor_percent, GetID());
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to set group mentor: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to set group mentor: [{}]\n", results.ErrorMessage().c_str());
 }
 
 void Group::ClearGroupMentor()
@@ -1981,7 +1986,7 @@ void Group::ClearGroupMentor()
 	std::string query = StringFormat("UPDATE group_leaders SET mentoree = '', mentor_percent = 0 WHERE gid = %i LIMIT 1", GetID());
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to clear group mentor: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to clear group mentor: [{}]\n", results.ErrorMessage().c_str());
 }
 
 void Group::NotifyAssistTarget(Client *c)
@@ -2051,7 +2056,7 @@ void Group::DelegateMarkNPC(const char *NewNPCMarkerName)
                                     NewNPCMarkerName, GetID());
     auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to set group mark npc: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to set group mark npc: [{}]\n", results.ErrorMessage().c_str());
 }
 
 void Group::NotifyMarkNPC(Client *c)
@@ -2132,7 +2137,7 @@ void Group::UnDelegateMarkNPC(const char *OldNPCMarkerName)
 	std::string query = StringFormat("UPDATE group_leaders SET marknpc = '' WHERE gid = %i LIMIT 1", GetID());
     auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to clear group marknpc: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to clear group marknpc: [{}]\n", results.ErrorMessage().c_str());
 
 }
 
@@ -2149,7 +2154,7 @@ void Group::SaveGroupLeaderAA()
 	safe_delete_array(queryBuffer);
     auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to store LeadershipAA: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to store LeadershipAA: [{}]\n", results.ErrorMessage().c_str());
 
 }
 
diff --git a/zone/groups.h b/zone/groups.h
index 913a6c169..0d39409e0 100644
--- a/zone/groups.h
+++ b/zone/groups.h
@@ -74,7 +74,7 @@ public:
 	void	GroupBardPulse(Mob* caster,uint16 spellid);
 	void	SplitExp(uint32 exp, Mob* other);
 	void	GroupMessage(Mob* sender,uint8 language,uint8 lang_skill,const char* message);
-	void	GroupMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
+	void	GroupMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
 	uint32	GetTotalGroupDamage(Mob* other);
 	void	SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum, Client *splitter = nullptr);
 	inline	void SetLeader(Mob* newleader){ leader=newleader; };
diff --git a/zone/guild.cpp b/zone/guild.cpp
index bb39c7fc0..166e6edfb 100644
--- a/zone/guild.cpp
+++ b/zone/guild.cpp
@@ -56,7 +56,7 @@ void Client::SendGuildMOTD(bool GetGuildMOTDReply) {
 
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Sending OP_GuildMOTD of length %d", outapp->size);
+	LogGuilds("Sending OP_GuildMOTD of length [{}]", outapp->size);
 
 	FastQueuePacket(&outapp);
 }
@@ -147,10 +147,10 @@ void Client::SendGuildSpawnAppearance() {
 	if (!IsInAGuild()) {
 		// clear guildtag
 		SendAppearancePacket(AT_GuildID, GUILD_NONE);
-		Log(Logs::Detail, Logs::Guilds, "Sending spawn appearance for no guild tag.");
+		LogGuilds("Sending spawn appearance for no guild tag");
 	} else {
 		uint8 rank = guild_mgr.GetDisplayedRank(GuildID(), GuildRank(), CharacterID());
-		Log(Logs::Detail, Logs::Guilds, "Sending spawn appearance for guild %d at rank %d", GuildID(), rank);
+		LogGuilds("Sending spawn appearance for guild [{}] at rank [{}]", GuildID(), rank);
 		SendAppearancePacket(AT_GuildID, GuildID());
 		if (ClientVersion() >= EQEmu::versions::ClientVersion::RoF)
 		{
@@ -174,11 +174,11 @@ void Client::SendGuildList() {
 	//ask the guild manager to build us a nice guild list packet
 	outapp->pBuffer = guild_mgr.MakeGuildList(/*GetName()*/"", outapp->size);
 	if(outapp->pBuffer == nullptr) {
-		Log(Logs::Detail, Logs::Guilds, "Unable to make guild list!");
+		LogGuilds("Unable to make guild list!");
 		return;
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Sending OP_ZoneGuildList of length %d", outapp->size);
+	LogGuilds("Sending OP_ZoneGuildList of length [{}]", outapp->size);
 
 	FastQueuePacket(&outapp);
 }
@@ -195,7 +195,7 @@ void Client::SendGuildMembers() {
 	outapp->pBuffer = data;
 	data = nullptr;
 
-	Log(Logs::Detail, Logs::Guilds, "Sending OP_GuildMemberList of length %d", outapp->size);
+	LogGuilds("Sending OP_GuildMemberList of length [{}]", outapp->size);
 
 	FastQueuePacket(&outapp);
 
@@ -227,7 +227,7 @@ void Client::RefreshGuildInfo()
 
 	CharGuildInfo info;
 	if(!guild_mgr.GetCharInfo(CharacterID(), info)) {
-		Log(Logs::Detail, Logs::Guilds, "Unable to obtain guild char info for %s (%d)", GetName(), CharacterID());
+		LogGuilds("Unable to obtain guild char info for [{}] ([{}])", GetName(), CharacterID());
 		return;
 	}
 
@@ -341,7 +341,7 @@ void Client::SendGuildJoin(GuildJoin_Struct* gj){
 	outgj->rank = gj->rank;
 	outgj->zoneid = gj->zoneid;
 
-	Log(Logs::Detail, Logs::Guilds, "Sending OP_GuildManageAdd for join of length %d", outapp->size);
+	LogGuilds("Sending OP_GuildManageAdd for join of length [{}]", outapp->size);
 
 	FastQueuePacket(&outapp);
 
diff --git a/zone/guild_mgr.cpp b/zone/guild_mgr.cpp
index eafe4b9f5..200f67d90 100644
--- a/zone/guild_mgr.cpp
+++ b/zone/guild_mgr.cpp
@@ -32,7 +32,7 @@ extern WorldServer worldserver;
 extern volatile bool is_zone_loaded;
 
 void ZoneGuildManager::SendGuildRefresh(uint32 guild_id, bool name, bool motd, bool rank, bool relation) {
-	Log(Logs::Detail, Logs::Guilds, "Sending guild refresh for %d to world, changes: name=%d, motd=%d, rank=d, relation=%d", guild_id, name, motd, rank, relation);
+	LogGuilds("Sending guild refresh for [{}] to world, changes: name=[{}], motd=[{}], rank=d, relation=[{}]", guild_id, name, motd, rank, relation);
 	auto pack = new ServerPacket(ServerOP_RefreshGuild, sizeof(ServerGuildRefresh_Struct));
 	ServerGuildRefresh_Struct *s = (ServerGuildRefresh_Struct *) pack->pBuffer;
 	s->guild_id = guild_id;
@@ -46,7 +46,7 @@ void ZoneGuildManager::SendGuildRefresh(uint32 guild_id, bool name, bool motd, b
 
 void ZoneGuildManager::SendCharRefresh(uint32 old_guild_id, uint32 guild_id, uint32 charid) {
 	if(guild_id == 0) {
-		Log(Logs::Detail, Logs::Guilds, "Guild lookup for char %d when sending char refresh.", charid);
+		LogGuilds("Guild lookup for char [{}] when sending char refresh", charid);
 
 		CharGuildInfo gci;
 		if(!GetCharInfo(charid, gci)) {
@@ -56,7 +56,7 @@ void ZoneGuildManager::SendCharRefresh(uint32 old_guild_id, uint32 guild_id, uin
 		}
 	}
 
-	Log(Logs::Detail, Logs::Guilds, "Sending char refresh for %d from guild %d to world", charid, guild_id);
+	LogGuilds("Sending char refresh for [{}] from guild [{}] to world", charid, guild_id);
 
 	auto pack = new ServerPacket(ServerOP_GuildCharRefresh, sizeof(ServerGuildCharRefresh_Struct));
 	ServerGuildCharRefresh_Struct *s = (ServerGuildCharRefresh_Struct *) pack->pBuffer;
@@ -89,7 +89,7 @@ void ZoneGuildManager::SendRankUpdate(uint32 CharID)
 }
 
 void ZoneGuildManager::SendGuildDelete(uint32 guild_id) {
-	Log(Logs::Detail, Logs::Guilds, "Sending guild delete for guild %d to world", guild_id);
+	LogGuilds("Sending guild delete for guild [{}] to world", guild_id);
 	auto pack = new ServerPacket(ServerOP_DeleteGuild, sizeof(ServerGuildID_Struct));
 	ServerGuildID_Struct *s = (ServerGuildID_Struct *) pack->pBuffer;
 	s->guild_id = guild_id;
@@ -189,7 +189,7 @@ uint8 *ZoneGuildManager::MakeGuildMembers(uint32 guild_id, const char *prefix_na
 }
 
 void ZoneGuildManager::ListGuilds(Client *c) const {
-	c->Message(0, "Listing guilds on the server:");
+	c->Message(Chat::White, "Listing guilds on the server:");
 	char leadername[64];
 	std::map<uint32, GuildInfo *>::const_iterator cur, end;
 	cur = m_guilds.begin();
@@ -199,12 +199,12 @@ void ZoneGuildManager::ListGuilds(Client *c) const {
 		leadername[0] = '\0';
 		database.GetCharName(cur->second->leader_char_id, leadername);
 		if (leadername[0] == '\0')
-			c->Message(0, "  Guild #%i <%s>", cur->first, cur->second->name.c_str());
+			c->Message(Chat::White, "  Guild #%i <%s>", cur->first, cur->second->name.c_str());
 		else
-			c->Message(0, "  Guild #%i <%s> Leader: %s", cur->first, cur->second->name.c_str(), leadername);
+			c->Message(Chat::White, "  Guild #%i <%s> Leader: %s", cur->first, cur->second->name.c_str(), leadername);
 		r++;
 	}
-	c->Message(0, "%i guilds listed.", r);
+	c->Message(Chat::White, "%i guilds listed.", r);
 }
 
 
@@ -212,17 +212,17 @@ void ZoneGuildManager::DescribeGuild(Client *c, uint32 guild_id) const {
 	std::map<uint32, GuildInfo *>::const_iterator res;
 	res = m_guilds.find(guild_id);
 	if(res == m_guilds.end()) {
-		c->Message(0, "Guild %d not found.", guild_id);
+		c->Message(Chat::White, "Guild %d not found.", guild_id);
 		return;
 	}
 
 	const GuildInfo *info = res->second;
 
-	c->Message(0, "Guild info DB# %i <%s>", guild_id, info->name.c_str());
+	c->Message(Chat::White, "Guild info DB# %i <%s>", guild_id, info->name.c_str());
 
 	char leadername[64];
 	database.GetCharName(info->leader_char_id, leadername);
-	c->Message(0, "Guild Leader: %s", leadername);
+	c->Message(Chat::White, "Guild Leader: %s", leadername);
 
 	char permbuffer[256];
 	uint8 i;
@@ -232,8 +232,8 @@ void ZoneGuildManager::DescribeGuild(Client *c, uint32 guild_id) const {
 		for(r = 0; r < _MaxGuildAction; r++)
 			permptr += sprintf(permptr, "  %s: %c", GuildActionNames[r], info->ranks[i].permissions[r]?'Y':'N');
 
-		c->Message(0, "Rank %i: %s", i, info->ranks[i].name.c_str());
-		c->Message(0, "Permissions: %s", permbuffer);
+		c->Message(Chat::White, "Rank %i: %s", i, info->ranks[i].name.c_str());
+		c->Message(Chat::White, "Permissions: %s", permbuffer);
 	}
 
 }
@@ -261,12 +261,12 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) {
 	switch(pack->opcode) {
 	case ServerOP_RefreshGuild: {
 		if(pack->size != sizeof(ServerGuildRefresh_Struct)) {
-			Log(Logs::General, Logs::Error, "Received ServerOP_RefreshGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildRefresh_Struct));
+			LogError("Received ServerOP_RefreshGuild of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildRefresh_Struct));
 			return;
 		}
 		ServerGuildRefresh_Struct *s = (ServerGuildRefresh_Struct *) pack->pBuffer;
 
-		Log(Logs::Detail, Logs::Guilds, "Received guild refresh from world for %d, changes: name=%d, motd=%d, rank=%d, relation=%d", s->guild_id, s->name_change, s->motd_change, s->rank_change, s->relation_change);
+		LogGuilds("Received guild refresh from world for [{}], changes: name=[{}], motd=[{}], rank=[{}], relation=[{}]", s->guild_id, s->name_change, s->motd_change, s->rank_change, s->relation_change);
 
 		//reload all the guild details from the database.
 		RefreshGuild(s->guild_id);
@@ -295,12 +295,12 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) {
 
 	case ServerOP_GuildCharRefresh: {
 		if(pack->size != sizeof(ServerGuildCharRefresh_Struct)) {
-			Log(Logs::General, Logs::Error, "Received ServerOP_RefreshGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildCharRefresh_Struct));
+			LogError("Received ServerOP_RefreshGuild of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildCharRefresh_Struct));
 			return;
 		}
 		ServerGuildCharRefresh_Struct *s = (ServerGuildCharRefresh_Struct *) pack->pBuffer;
 
-		Log(Logs::Detail, Logs::Guilds, "Received guild member refresh from world for char %d from guild %d", s->char_id, s->guild_id);
+		LogGuilds("Received guild member refresh from world for char [{}] from guild [{}]", s->char_id, s->guild_id);
 
 		Client *c = entity_list.GetClientByCharID(s->char_id);
 
@@ -338,7 +338,7 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) {
 		{
 			if(pack->size != sizeof(ServerGuildRankUpdate_Struct))
 			{
-				Log(Logs::General, Logs::Error, "Received ServerOP_RankUpdate of incorrect size %d, expected %d",
+				LogError("Received ServerOP_RankUpdate of incorrect size [{}], expected [{}]",
 					pack->size, sizeof(ServerGuildRankUpdate_Struct));
 
 				return;
@@ -364,12 +364,12 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) {
 
 	case ServerOP_DeleteGuild: {
 		if(pack->size != sizeof(ServerGuildID_Struct)) {
-			Log(Logs::General, Logs::Error, "Received ServerOP_DeleteGuild of incorrect size %d, expected %d", pack->size, sizeof(ServerGuildID_Struct));
+			LogError("Received ServerOP_DeleteGuild of incorrect size [{}], expected [{}]", pack->size, sizeof(ServerGuildID_Struct));
 			return;
 		}
 		ServerGuildID_Struct *s = (ServerGuildID_Struct *) pack->pBuffer;
 
-		Log(Logs::Detail, Logs::Guilds, "Received guild delete from world for guild %d", s->guild_id);
+		LogGuilds("Received guild delete from world for guild [{}]", s->guild_id);
 
 		//clear all the guild tags.
 		entity_list.RefreshAllGuildInfo(s->guild_id);
@@ -417,23 +417,22 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack) {
 
 			if (!c || !c->IsInAGuild())
 			{
-				Log(Logs::Detail, Logs::Guilds,"Invalid Client or not in guild. ID=%i", FromID);
+				LogGuilds("Invalid Client or not in guild. ID=[{}]", FromID);
 				break;
 			}
-			Log(Logs::Detail, Logs::Guilds,"Processing ServerOP_OnlineGuildMembersResponse");
+			LogGuilds("Processing ServerOP_OnlineGuildMembersResponse");
 			auto outapp = new EQApplicationPacket(OP_GuildMemberUpdate, sizeof(GuildMemberUpdate_Struct));
 			GuildMemberUpdate_Struct *gmus = (GuildMemberUpdate_Struct*)outapp->pBuffer;
 			char Name[64];
 			gmus->LastSeen = time(nullptr);
 			gmus->InstanceID = 0;
 			gmus->GuildID = c->GuildID();
-			for (int i=0;i<Count;i++)
-			{
+			for (int i = 0; i < Count; i++) {
 				// Just make the packet once and swap out name/zone and send
 				VARSTRUCT_DECODE_STRING(Name, Buffer);
 				strn0cpy(gmus->MemberName, Name, sizeof(gmus->MemberName));
 				gmus->ZoneID = VARSTRUCT_DECODE_TYPE(uint32, Buffer);
-				Log(Logs::Detail, Logs::Guilds,"Sending OP_GuildMemberUpdate to %i. Name=%s ZoneID=%i",FromID,Name,gmus->ZoneID);
+				LogGuilds("Sending OP_GuildMemberUpdate to [{}]. Name=[{}] ZoneID=[{}]", FromID, Name, gmus->ZoneID);
 				c->QueuePacket(outapp);
 			}
 			safe_delete(outapp);
@@ -537,14 +536,14 @@ void ZoneGuildManager::AddMemberApproval(uint32 refid,Client* name)
 	if(tmp != 0)
 	{
 		if(!tmp->AddMemberApproval(name))
-			name->Message(0,"Unable to add to list.");
+			name->Message(Chat::White,"Unable to add to list.");
 		else
 		{
-			name->Message(0,"Added to list.");
+			name->Message(Chat::White,"Added to list.");
 		}
 	}
 	else
-		name->Message(0,"Unable to find guild reference id.");
+		name->Message(Chat::White,"Unable to find guild reference id.");
 }
 
 ZoneGuildManager::~ZoneGuildManager()
@@ -683,7 +682,7 @@ void GuildBankManager::SendGuildBank(Client *c)
 
 	if(Iterator == Banks.end())
 	{
-		Log(Logs::General, Logs::Error, "Unable to find guild bank for guild ID %i", c->GuildID());
+		LogError("Unable to find guild bank for guild ID [{}]", c->GuildID());
 
 		return;
 	}
@@ -856,7 +855,7 @@ bool GuildBankManager::AddItem(uint32 GuildID, uint8 Area, uint32 ItemID, int32
 
 	if(Iterator == Banks.end())
 	{
-		Log(Logs::General, Logs::Error, "Unable to find guild bank for guild ID %i", GuildID);
+		LogError("Unable to find guild bank for guild ID [{}]", GuildID);
 
 		return false;
 	}
@@ -902,7 +901,7 @@ bool GuildBankManager::AddItem(uint32 GuildID, uint8 Area, uint32 ItemID, int32
 
 	if(Slot < 0)
 	{
-		Log(Logs::General, Logs::Error, "No space to add item to the guild bank.");
+		LogError("No space to add item to the guild bank");
 
 		return false;
 	}
@@ -1391,13 +1390,13 @@ bool GuildApproval::ProcessApproval()
 {
 	if(owner && owner->GuildID() != 0)
 	{
-		owner->Message(10,"You are already in a guild! Guild request deleted.");
+		owner->Message(Chat::NPCQuestSay,"You are already in a guild! Guild request deleted.");
 		return false;
 	}
 	if(deletion_timer->Check() || !owner)
 	{
 		if(owner)
-			owner->Message(0,"You took too long! Your guild request has been deleted.");
+			owner->Message(Chat::White,"You took too long! Your guild request has been deleted.");
 		return false;
 	}
 
@@ -1414,7 +1413,7 @@ GuildApproval::GuildApproval(const char* guildname, Client* owner,uint32 id)
 	this->owner = owner;
 	this->refid = id;
 	if(owner)
-		owner->Message(0,"You can now start getting your guild approved, tell your %i members to #guildapprove %i, you have 30 minutes to create your guild.",tmp,GetID());
+		owner->Message(Chat::White,"You can now start getting your guild approved, tell your %i members to #guildapprove %i, you have 30 minutes to create your guild.",tmp,GetID());
 	for(int i=0;i<tmp;i++)
 		members[i] = 0;
 }
@@ -1463,7 +1462,7 @@ void GuildApproval::ApprovedMembers(Client* requestee)
 	for(int i=0;i<tmp;i++)
 	{
 		if(members[i])
-			requestee->Message(0,"%i: %s",i,members[i]->GetName());
+			requestee->Message(Chat::White,"%i: %s",i,members[i]->GetName());
 	}
 }
 
@@ -1484,8 +1483,8 @@ void GuildApproval::GuildApproved()
 	{
 		if(members[i])
 			{
-			owner->Message(0, "%s",members[i]->GetName());
-			owner->Message(0, "%i",members[i]->CharacterID());
+			owner->Message(Chat::White, "%s",members[i]->GetName());
+			owner->Message(Chat::White, "%i",members[i]->CharacterID());
 			guild_mgr.SetGuild(members[i]->CharacterID(),tmpeq,0);
 			size_t len = MBUFFER - strlen(gmembers)+1;
 			strncat(gmembers," ",len);
@@ -1521,7 +1520,7 @@ void GuildApproval::GuildApproved()
 	memcpy(pack->pBuffer, &tmpeq, 4);
 	worldserver.SendPacket(pack);
 	safe_delete(pack);
-	owner->Message(0, "Your guild was created.");
+	owner->Message(Chat::White, "Your guild was created.");
 	owner = 0;
 }
 
diff --git a/zone/hate_list.cpp b/zone/hate_list.cpp
index 242a4c8e3..6b26cba8a 100644
--- a/zone/hate_list.cpp
+++ b/zone/hate_list.cpp
@@ -155,13 +155,18 @@ Mob* HateList::GetDamageTopOnHateList(Mob* hater)
 	return current;
 }
 
-Mob* HateList::GetClosestEntOnHateList(Mob *hater) {
+Mob* HateList::GetClosestEntOnHateList(Mob *hater, bool skip_mezzed) {
 	Mob* close_entity = nullptr;
 	float close_distance = 99999.9f;
 	float this_distance;
 
 	auto iterator = list.begin();
 	while (iterator != list.end()) {
+		if (skip_mezzed && (*iterator)->entity_on_hatelist->IsMezzed()) {
+			++iterator;
+			continue;
+		}
+
 		this_distance = DistanceSquaredNoZ((*iterator)->entity_on_hatelist->GetPosition(), hater->GetPosition());
 		if ((*iterator)->entity_on_hatelist != nullptr && this_distance <= close_distance) {
 			close_distance = this_distance;
@@ -297,7 +302,7 @@ int HateList::GetHateRatio(Mob *top, Mob *other)
 
 // skip is used to ignore a certain mob on the list
 // Currently used for getting 2nd on list for aggro meter
-Mob *HateList::GetEntWithMostHateOnList(Mob *center, Mob *skip)
+Mob *HateList::GetEntWithMostHateOnList(Mob *center, Mob *skip, bool skip_mezzed)
 {
 	// hack fix for zone shutdown crashes on some servers
 	if (!zone->IsLoaded())
@@ -335,6 +340,11 @@ Mob *HateList::GetEntWithMostHateOnList(Mob *center, Mob *skip)
 				continue;
 			}
 
+			if (skip_mezzed && cur->entity_on_hatelist->IsMezzed()) {
+				++iterator;
+				continue;
+			}
+
 			if (cur->entity_on_hatelist->Sanctuary()) {
 				if (hate == -1)
 				{
@@ -465,6 +475,11 @@ Mob *HateList::GetEntWithMostHateOnList(Mob *center, Mob *skip)
 				continue;
 			}
 
+			if (skip_mezzed && cur->entity_on_hatelist->IsMezzed()) {
+				++iterator;
+				continue;
+			}
+
 			if (cur->entity_on_hatelist != nullptr && ((cur->stored_hate_amount > hate) || cur->is_entity_frenzy))
 			{
 				top_hate = cur->entity_on_hatelist;
@@ -480,7 +495,7 @@ Mob *HateList::GetEntWithMostHateOnList(Mob *center, Mob *skip)
 	return nullptr;
 }
 
-Mob *HateList::GetEntWithMostHateOnList(){
+Mob *HateList::GetEntWithMostHateOnList(bool skip_mezzed){
 	Mob* top = nullptr;
 	int64 hate = -1;
 
@@ -490,8 +505,10 @@ Mob *HateList::GetEntWithMostHateOnList(){
 		struct_HateList *cur = (*iterator);
 		if (cur && cur->entity_on_hatelist != nullptr && (cur->stored_hate_amount > hate))
 		{
-			top = cur->entity_on_hatelist;
-			hate = cur->stored_hate_amount;
+			if (!skip_mezzed || !cur->entity_on_hatelist->IsMezzed()) {
+				top = cur->entity_on_hatelist;
+				hate = cur->stored_hate_amount;
+			}
 		}
 		++iterator;
 	}
@@ -499,26 +516,50 @@ Mob *HateList::GetEntWithMostHateOnList(){
 }
 
 
-Mob *HateList::GetRandomEntOnHateList()
+Mob *HateList::GetRandomEntOnHateList(bool skip_mezzed)
 {
 	int count = list.size();
-	if (count == 0) //If we don't have any entries it'll crash getting a random 0, -1 position.
-		return NULL;
+	if (count <= 0) //If we don't have any entries it'll crash getting a random 0, -1 position.
+		return nullptr;
 
 	if (count == 1) //No need to do all that extra work if we only have one hate entry
 	{
-		if (*list.begin()) // Just in case tHateEntry is invalidated somehow...
+		if (*list.begin() && (!skip_mezzed || !(*list.begin())->entity_on_hatelist->IsMezzed())) // Just in case tHateEntry is invalidated somehow...
 			return (*list.begin())->entity_on_hatelist;
 
-		return NULL;
+		return nullptr;
 	}
 
-	auto iterator = list.begin();
-	int random = zone->random.Int(0, count - 1);
-	for (int i = 0; i < random; i++)
-		++iterator;
+	if (skip_mezzed) {
 
-	return (*iterator)->entity_on_hatelist;
+		for (auto iter : list) {
+			if (iter->entity_on_hatelist->IsMezzed()) {
+				--count;
+			}
+		}
+		if (count <= 0) {
+			return nullptr;
+		}
+	}
+
+	int random = zone->random.Int(0, count - 1);
+	int counter = 0;
+
+	for (auto iter : list) {
+
+		if (skip_mezzed && iter->entity_on_hatelist->IsMezzed()) {
+			continue;
+		}
+		if (counter < random) {
+
+			++counter;
+			continue;
+		}
+
+		return iter->entity_on_hatelist;
+	}
+
+	return nullptr;
 }
 
 Mob *HateList::GetEscapingEntOnHateList() {
@@ -608,7 +649,7 @@ void HateList::PrintHateListToClient(Client *c)
 	while (iterator != list.end())
 	{
 		struct_HateList *e = (*iterator);
-		c->Message(0, "- name: %s, damage: %d, hate: %d",
+		c->Message(Chat::White, "- name: %s, damage: %d, hate: %d",
 			(e->entity_on_hatelist && e->entity_on_hatelist->GetName()) ? e->entity_on_hatelist->GetName() : "(null)",
 			e->hatelist_damage, e->stored_hate_amount);
 
diff --git a/zone/hate_list.h b/zone/hate_list.h
index 96d8ed067..44613bdea 100644
--- a/zone/hate_list.h
+++ b/zone/hate_list.h
@@ -41,11 +41,11 @@ public:
 	HateList();
 	~HateList();
 
-	Mob *GetClosestEntOnHateList(Mob *hater);
-	Mob *GetDamageTopOnHateList(Mob *hater);
-	Mob *GetEntWithMostHateOnList(Mob *center, Mob *skip = nullptr);
-	Mob *GetRandomEntOnHateList();
-	Mob *GetEntWithMostHateOnList();
+	Mob *GetClosestEntOnHateList(Mob *hater, bool skip_mezzed = false);
+	Mob *GetDamageTopOnHateList(Mob *hater); // didn't add 'skip_mezzed' due to calls being in ::Death()
+	Mob *GetEntWithMostHateOnList(Mob *center, Mob *skip = nullptr, bool skip_mezzed = false);
+	Mob *GetRandomEntOnHateList(bool skip_mezzed = false);
+	Mob *GetEntWithMostHateOnList(bool skip_mezzed = false);
 	Mob *GetEscapingEntOnHateList(); // returns first eligble entity
 	Mob *GetEscapingEntOnHateList(Mob *center, float range = 0.0f, bool first = false);
 
diff --git a/zone/heal_rotation.cpp b/zone/heal_rotation.cpp
index 489d1ab45..3de331623 100644
--- a/zone/heal_rotation.cpp
+++ b/zone/heal_rotation.cpp
@@ -170,7 +170,7 @@ bool HealRotation::ClearMemberPool()
 	m_active_heal_target = false;
 	
 	if (!ClearTargetPool())
-		Log(Logs::General, Logs::Error, "HealRotation::ClearTargetPool() failed to clear m_target_pool (size: %u)", m_target_pool.size());
+		LogError("HealRotation::ClearTargetPool() failed to clear m_target_pool (size: [{}])", m_target_pool.size());
 
 	auto clear_list = const_cast<const std::list<Bot*>&>(m_member_pool);
 	for (auto member_iter : clear_list)
@@ -871,42 +871,42 @@ void HealRotation::bias_targets()
 	m_casting_target_poke = true;
 
 #if (EQDEBUG >= 12)
-	Log(Logs::General, Logs::Error, "HealRotation::bias_targets() - *** Post-processing state ***");
-	Log(Logs::General, Logs::Error, "HealRotation Settings:");
-	Log(Logs::General, Logs::Error, "HealRotation::m_interval_ms = %u", m_interval_ms);
-	Log(Logs::General, Logs::Error, "HealRotation::m_next_cast_time_ms = %u (current_time: %u, time_diff: %i)", m_next_cast_time_ms, Timer::GetCurrentTime(), ((int32)Timer::GetCurrentTime() - (int32)m_next_cast_time_ms));
-	Log(Logs::General, Logs::Error, "HealRotation::m_next_poke_time_ms = %u (current_time: %u, time_diff: %i)", m_next_poke_time_ms, Timer::GetCurrentTime(), ((int32)Timer::GetCurrentTime() - (int32)m_next_poke_time_ms));
-	Log(Logs::General, Logs::Error, "HealRotation::m_fast_heals = %s", ((m_fast_heals) ? ("true") : ("false")));
-	Log(Logs::General, Logs::Error, "HealRotation::m_adaptive_targeting = %s", ((m_adaptive_targeting) ? ("true") : ("false")));
-	Log(Logs::General, Logs::Error, "HealRotation::m_casting_override = %s", ((m_casting_override) ? ("true") : ("false")));
-	Log(Logs::General, Logs::Error, "HealRotation::m_casting_target_poke = %s", ((m_casting_target_poke) ? ("true") : ("false")));
-	Log(Logs::General, Logs::Error, "HealRotation::m_active_heal_target = %s", ((m_active_heal_target) ? ("true") : ("false")));
-	Log(Logs::General, Logs::Error, "HealRotation::m_is_active = %s", ((m_is_active) ? ("true") : ("false")));
-	Log(Logs::General, Logs::Error, "HealRotation::m_member_list.size() = %i", m_member_pool.size());
-	Log(Logs::General, Logs::Error, "HealRotation::m_cycle_list.size() = %i", m_cycle_pool.size());
-	Log(Logs::General, Logs::Error, "HealRotation::m_target_list.size() = %i", m_target_pool.size());
-	if (m_member_pool.size()) { Log(Logs::General, Logs::Error, "(std::shared_ptr<HealRotation>::use_count() = %i", m_member_pool.front()->MemberOfHealRotation()->use_count()); }
-	else { Log(Logs::General, Logs::Error, "(std::shared_ptr<HealRotation>::use_count() = unknown (0)"); }
-	Log(Logs::General, Logs::Error, "HealRotation Members:");
+	LogError("HealRotation::bias_targets() - *** Post-processing state ***");
+	LogError("HealRotation Settings:");
+	LogError("HealRotation::m_interval_ms = [{}]", m_interval_ms);
+	LogError("HealRotation::m_next_cast_time_ms = [{}] (current_time: [{}], time_diff: [{}])", m_next_cast_time_ms, Timer::GetCurrentTime(), ((int32)Timer::GetCurrentTime() - (int32)m_next_cast_time_ms));
+	LogError("HealRotation::m_next_poke_time_ms = [{}] (current_time: [{}], time_diff: [{}])", m_next_poke_time_ms, Timer::GetCurrentTime(), ((int32)Timer::GetCurrentTime() - (int32)m_next_poke_time_ms));
+	LogError("HealRotation::m_fast_heals = [{}]", ((m_fast_heals) ? ("true") : ("false")));
+	LogError("HealRotation::m_adaptive_targeting = [{}]", ((m_adaptive_targeting) ? ("true") : ("false")));
+	LogError("HealRotation::m_casting_override = [{}]", ((m_casting_override) ? ("true") : ("false")));
+	LogError("HealRotation::m_casting_target_poke = [{}]", ((m_casting_target_poke) ? ("true") : ("false")));
+	LogError("HealRotation::m_active_heal_target = [{}]", ((m_active_heal_target) ? ("true") : ("false")));
+	LogError("HealRotation::m_is_active = [{}]", ((m_is_active) ? ("true") : ("false")));
+	LogError("HealRotation::m_member_list.size() = [{}]", m_member_pool.size());
+	LogError("HealRotation::m_cycle_list.size() = [{}]", m_cycle_pool.size());
+	LogError("HealRotation::m_target_list.size() = [{}]", m_target_pool.size());
+	if (m_member_pool.size()) { LogError("(std::shared_ptr<HealRotation>::use_count() = [{}]", m_member_pool.front()->MemberOfHealRotation()->use_count()); }
+	else { LogError("(std::shared_ptr<HealRotation>::use_count() = unknown (0)"); }
+	LogError("HealRotation Members:");
 	int member_index = 0;
 	for (auto mlist_iter : m_member_pool) {
 		if (!mlist_iter) { continue; }
-		Log(Logs::General, Logs::Error, "(%i) %s (hrcast: %c)", (++member_index), mlist_iter->GetCleanName(), ((mlist_iter->AmICastingForHealRotation())?('T'):('F')));
+		LogError("([{}]) [{}] (hrcast: [{}])", (++member_index), mlist_iter->GetCleanName(), ((mlist_iter->AmICastingForHealRotation())?('T'):('F')));
 	}
-	if (!member_index) { Log(Logs::General, Logs::Error, "(0) None"); }
-	Log(Logs::General, Logs::Error, "HealRotation Cycle:");
+	if (!member_index) { LogError("(0) None"); }
+	LogError("HealRotation Cycle:");
 	int cycle_index = 0;
 	for (auto clist_iter : m_cycle_pool) {
 		if (!clist_iter) { continue; }
-		Log(Logs::General, Logs::Error, "(%i) %s", (++cycle_index), clist_iter->GetCleanName());
+		LogError("([{}]) [{}]", (++cycle_index), clist_iter->GetCleanName());
 	}
-	if (!cycle_index) { Log(Logs::General, Logs::Error, "(0) None"); }
-	Log(Logs::General, Logs::Error, "HealRotation Targets: (sort type: %u)", sort_type);
+	if (!cycle_index) { LogError("(0) None"); }
+	LogError("HealRotation Targets: (sort type: [{}])", sort_type);
 	int target_index = 0;
 
 	for (auto tlist_iter : m_target_pool) {
 		if (!tlist_iter) { continue; }
-		Log(Logs::General, Logs::Error, "(%i) %s (hp: %3.1f%%, at: %u, dontheal: %c, crit(base): %c(%c), safe(base): %c(%c), hcnt(ext): %u(%u), hfreq(ext): %f(%f))",
+		LogError("([{}]) [{}] (hp: [{}], at: [{}], dontheal: [{}], crit(base): [{}]([{}]), safe(base): [{}]([{}]), hcnt(ext): [{}]([{}]), hfreq(ext): [{}]([{}]))",
 			(++target_index), tlist_iter->GetCleanName(),
 			tlist_iter->GetHPRatio(),
 			ClassArmorType(tlist_iter->GetClass()),
@@ -920,7 +920,7 @@ void HealRotation::bias_targets()
 			tlist_iter->HealRotationHealFrequency(),
 			tlist_iter->HealRotationExtendedHealFrequency());
 	}
-	if (!target_index) { Log(Logs::General, Logs::Error, "(0) None (hp: 0.0\%, at: 0, dontheal: F, crit(base): F(F), safe(base): F(F), hcnt(ext): 0(0), hfreq(ext): 0.0(0.0))"); }
+	if (!target_index) { LogError("(0) None (hp: 0.0\%, at: 0, dontheal: F, crit(base): F(F), safe(base): F(F), hcnt(ext): 0(0), hfreq(ext): 0.0(0.0))"); }
 #endif
 }
 
diff --git a/zone/horse.cpp b/zone/horse.cpp
index 6c81b3d21..484b67149 100644
--- a/zone/horse.cpp
+++ b/zone/horse.cpp
@@ -79,8 +79,8 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id) {
 	}
 
 	if (results.RowCount() != 1) {
-        Log(Logs::General, Logs::Error, "No Database entry for mount: %s, check the horses table", fileName);
-        return nullptr;
+		LogError("No Database entry for mount: [{}], check the horses table", fileName);
+		return nullptr;
 	}
 
     auto row = results.begin();
@@ -118,11 +118,11 @@ const NPCType *Horse::BuildHorseType(uint16 spell_id) {
 
 void Client::SummonHorse(uint16 spell_id) {
 	if (GetHorseId() != 0) {
-		Message(13,"You already have a Horse. Get off, Fatbutt!");
+		Message(Chat::Red,"You already have a Horse. Get off, Fatbutt!");
 		return;
 	}
 	if(!Horse::IsHorseSpell(spell_id)) {
-		Log(Logs::General, Logs::Error, "%s tried to summon an unknown horse, spell id %d", GetName(), spell_id);
+		LogError("[{}] tried to summon an unknown horse, spell id [{}]", GetName(), spell_id);
 		return;
 	}
 
diff --git a/zone/inventory.cpp b/zone/inventory.cpp
index ec4f095b0..3ee86df47 100644
--- a/zone/inventory.cpp
+++ b/zone/inventory.cpp
@@ -185,8 +185,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 	// make sure the item exists
 	if(item == nullptr) {
-		Message(13, "Item %u does not exist.", item_id);
-		Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an item with an invalid id.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+		Message(Chat::Red, "Item %u does not exist.", item_id);
+		LogInventory("Player [{}] on account [{}] attempted to create an item with an invalid id.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 			GetName(), account_name, item_id, aug1, aug2, aug3, aug4, aug5, aug6);
 
 		return false;
@@ -194,14 +194,14 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 	// check that there is not a lore conflict between base item and existing inventory
 	else if(CheckLoreConflict(item)) {
 		// DuplicateLoreMessage(item_id);
-		Message(13, "You already have a lore %s (%i) in your inventory.", item->Name, item_id);
+		Message(Chat::Red, "You already have a lore %s (%i) in your inventory.", item->Name, item_id);
 
 		return false;
 	}
 	// check to make sure we are augmenting an augmentable item
 	else if (((!item->IsClassCommon()) || (item->AugType > 0)) && (aug1 | aug2 | aug3 | aug4 | aug5 | aug6)) {
-		Message(13, "You can not augment an augment or a non-common class item.");
-		Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to augment an augment or a non-common class item.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug5: %u)\n",
+		Message(Chat::Red, "You can not augment an augment or a non-common class item.");
+		LogInventory("Player [{}] on account [{}] attempted to augment an augment or a non-common class item.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug5: [{}])\n",
 			GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 		return false;
@@ -214,8 +214,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 	// check to make sure we are a GM if the item is GM-only
 	/*
 	else if(item->MinStatus && ((this->Admin() < item->MinStatus) || (this->Admin() < RuleI(GM, MinStatusToSummonItem)))) {
-		Message(13, "You are not a GM or do not have the status to summon this item.");
-		Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create a GM-only item with a status of %i.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u, MinStatus: %u)\n",
+		Message(Chat::Red, "You are not a GM or do not have the status to summon this item.");
+		LogInventory("Player [{}] on account [{}] attempted to create a GM-only item with a status of [{}].\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}], MinStatus: [{}])\n",
 			GetName(), account_name, this->Admin(), item->ID, aug1, aug2, aug3, aug4, aug5, aug6, item->MinStatus);
 
 		return false;
@@ -237,8 +237,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 		if(augtest == nullptr) {
 			if(augments[iter]) {
-				Message(13, "Augment %u (Aug%i) does not exist.", augments[iter], iter + 1);
-				Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an augment (Aug%i) with an invalid id.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+				Message(Chat::Red, "Augment %u (Aug%i) does not exist.", augments[iter], iter + 1);
+				LogInventory("Player [{}] on account [{}] attempted to create an augment (Aug[{}]) with an invalid id.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 					GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 				return false;
@@ -248,14 +248,14 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 			// check that there is not a lore conflict between augment and existing inventory
 			if(CheckLoreConflict(augtest)) {
 				// DuplicateLoreMessage(augtest->ID);
-				Message(13, "You already have a lore %s (%u) in your inventory.", augtest->Name, augtest->ID);
+				Message(Chat::Red, "You already have a lore %s (%u) in your inventory.", augtest->Name, augtest->ID);
 				
 				return false;
 			}
 			// check that augment is an actual augment
 			else if(augtest->AugType == 0) {
-				Message(13, "%s (%u) (Aug%i) is not an actual augment.", augtest->Name, augtest->ID, iter + 1);
-				Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to use a non-augment item (Aug%i) as an augment.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+				Message(Chat::Red, "%s (%u) (Aug%i) is not an actual augment.", augtest->Name, augtest->ID, iter + 1);
+				LogInventory("Player [{}] on account [{}] attempted to use a non-augment item (Aug[{}]) as an augment.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 					GetName(), account_name, item->ID, (iter + 1), aug1, aug2, aug3, aug4, aug5, aug6);
 				
 				return false;
@@ -266,8 +266,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 			// check to make sure we are a GM if the augment is GM-only
 			/*
 			else if(augtest->MinStatus && ((this->Admin() < augtest->MinStatus) || (this->Admin() < RuleI(GM, MinStatusToSummonItem)))) {
-				Message(13, "You are not a GM or do not have the status to summon this augment.");
-				Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create a GM-only augment (Aug%i) with a status of %i.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, MinStatus: %u)\n",
+				Message(Chat::Red, "You are not a GM or do not have the status to summon this augment.");
+				LogInventory("Player [{}] on account [{}] attempted to create a GM-only augment (Aug[{}]) with a status of [{}].\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], MinStatus: [{}])\n",
 					GetName(), account_name, (iter + 1), this->Admin(), item->ID, aug1, aug2, aug3, aug4, aug5, aug6, item->MinStatus);
 
 				return false;
@@ -277,16 +277,16 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 			// check for augment type allowance
 			if(enforcewear) {
 				if ((item->AugSlotType[iter] == EQEmu::item::AugTypeNone) || !(((uint32)1 << (item->AugSlotType[iter] - 1)) & augtest->AugType)) {
-					Message(13, "Augment %u (Aug%i) is not acceptable wear on Item %u.", augments[iter], iter + 1, item->ID);
-					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to augment an item with an unacceptable augment type (Aug%i).\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+					Message(Chat::Red, "Augment %u (Aug%i) is not acceptable wear on Item %u.", augments[iter], iter + 1, item->ID);
+					LogInventory("Player [{}] on account [{}] attempted to augment an item with an unacceptable augment type (Aug[{}]).\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 						GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 					return false;
 				}
 
 				if(item->AugSlotVisible[iter] == 0) {
-					Message(13, "Item %u has not evolved enough to accept Augment %u (Aug%i).", item->ID, augments[iter], iter + 1);
-					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to augment an unevolved item with augment type (Aug%i).\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+					Message(Chat::Red, "Item %u has not evolved enough to accept Augment %u (Aug%i).", item->ID, augments[iter], iter + 1);
+					LogInventory("Player [{}] on account [{}] attempted to augment an unevolved item with augment type (Aug[{}]).\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 						GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 					return false;
@@ -462,8 +462,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 				}
 
 				if(restrictfail) {
-					Message(13, "Augment %u (Aug%i) is restricted from wear on Item %u.", augments[iter], (iter + 1), item->ID);
-					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to augment an item with a restricted augment (Aug%i).\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+					Message(Chat::Red, "Augment %u (Aug%i) is restricted from wear on Item %u.", augments[iter], (iter + 1), item->ID);
+					LogInventory("Player [{}] on account [{}] attempted to augment an item with a restricted augment (Aug[{}]).\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 						GetName(), account_name, (iter + 1), item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 					return false;
@@ -473,8 +473,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 			if(enforceusable) {
 				// check for class usability
 				if(item->Classes && !(classes &= augtest->Classes)) {
-					Message(13, "Augment %u (Aug%i) will result in an item not usable by any class.", augments[iter], (iter + 1));
-					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an item unusable by any class.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+					Message(Chat::Red, "Augment %u (Aug%i) will result in an item not usable by any class.", augments[iter], (iter + 1));
+					LogInventory("Player [{}] on account [{}] attempted to create an item unusable by any class.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 						GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 					return false;
@@ -482,8 +482,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 				// check for race usability
 				if(item->Races && !(races &= augtest->Races)) {
-					Message(13, "Augment %u (Aug%i) will result in an item not usable by any race.", augments[iter], (iter + 1));
-					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an item unusable by any race.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+					Message(Chat::Red, "Augment %u (Aug%i) will result in an item not usable by any race.", augments[iter], (iter + 1));
+					LogInventory("Player [{}] on account [{}] attempted to create an item unusable by any race.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 						GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 					return false;
@@ -491,8 +491,8 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 				// check for slot usability
 				if(item->Slots && !(slots &= augtest->Slots)) {
-					Message(13, "Augment %u (Aug%i) will result in an item not usable in any slot.", augments[iter], (iter + 1));
-					Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to create an item unusable in any slot.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+					Message(Chat::Red, "Augment %u (Aug%i) will result in an item not usable in any slot.", augments[iter], (iter + 1));
+					LogInventory("Player [{}] on account [{}] attempted to create an item unusable in any slot.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 						GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 					return false;
@@ -517,9 +517,9 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 	EQEmu::ItemInstance* inst = database.CreateItem(item, charges);
 
 	if(inst == nullptr) {
-		Message(13, "An unknown server error has occurred and your item was not created.");
+		Message(Chat::Red, "An unknown server error has occurred and your item was not created.");
 		// this goes to logfile since this is a major error
-		Log(Logs::General, Logs::Error, "Player %s on account %s encountered an unknown item creation error.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+		LogError("Player [{}] on account [{}] encountered an unknown item creation error.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 			GetName(), account_name, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 		return false;
@@ -545,7 +545,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 
 		if(!(slots & ((uint32)1 << slottest))) {
 			Message(0, "This item is not equipable at slot %u - moving to cursor.", to_slot);
-			Log(Logs::Detail, Logs::Inventory, "Player %s on account %s attempted to equip an item unusable in slot %u - moved to cursor.\n(Item: %u, Aug1: %u, Aug2: %u, Aug3: %u, Aug4: %u, Aug5: %u, Aug6: %u)\n",
+			LogInventory("Player [{}] on account [{}] attempted to equip an item unusable in slot [{}] - moved to cursor.\n(Item: [{}], Aug1: [{}], Aug2: [{}], Aug3: [{}], Aug4: [{}], Aug5: [{}], Aug6: [{}])\n",
 				GetName(), account_name, to_slot, item->ID, aug1, aug2, aug3, aug4, aug5, aug6);
 
 			to_slot = EQEmu::invslot::slotCursor;
@@ -582,7 +582,7 @@ bool Client::SummonItem(uint32 item_id, int16 charges, uint32 aug1, uint32 aug2,
 // Drop item from inventory to ground (generally only dropped from SLOT_CURSOR)
 void Client::DropItem(int16 slot_id, bool recurse)
 {
-	Log(Logs::General, Logs::Inventory, "'%s' (char_id: %u) Attempting to drop item from slot %i on the ground",
+	LogInventory("[{}] (char_id: [{}]) Attempting to drop item from slot [{}] on the ground",
 		GetCleanName(), CharacterID(), slot_id);
 	
 	if(GetInv().CheckNoDrop(slot_id, recurse) && RuleI(World, FVNoDropFlag) == 0 ||
@@ -590,20 +590,20 @@ void Client::DropItem(int16 slot_id, bool recurse)
 	{
 		auto invalid_drop = m_inv.GetItem(slot_id);
 		if (!invalid_drop) {
-			Log(Logs::General, Logs::Inventory, "Error in InventoryProfile::CheckNoDrop() - returned 'true' for empty slot");
+			LogInventory("Error in InventoryProfile::CheckNoDrop() - returned 'true' for empty slot");
 		}
 		else {
 			if (LogSys.log_settings[Logs::Inventory].is_category_enabled) {
-				Log(Logs::General, Logs::Inventory, "DropItem() Hack detected - full item parse:");
-				Log(Logs::General, Logs::Inventory, "depth: 0, Item: '%s' (id: %u), IsDroppable: %s",
+				LogInventory("DropItem() Hack detected - full item parse:");
+				LogInventory("depth: 0, Item: [{}] (id: [{}]), IsDroppable: [{}]",
 					(invalid_drop->GetItem() ? invalid_drop->GetItem()->Name : "null data"), invalid_drop->GetID(), (invalid_drop->IsDroppable(false) ? "true" : "false"));
 
 				for (auto iter1 : *invalid_drop->GetContents()) { // depth 1
-					Log(Logs::General, Logs::Inventory, "-depth: 1, Item: '%s' (id: %u), IsDroppable: %s",
+					LogInventory("-depth: 1, Item: [{}] (id: [{}]), IsDroppable: [{}]",
 						(iter1.second->GetItem() ? iter1.second->GetItem()->Name : "null data"), iter1.second->GetID(), (iter1.second->IsDroppable(false) ? "true" : "false"));
 
 					for (auto iter2 : *iter1.second->GetContents()) { // depth 2
-						Log(Logs::General, Logs::Inventory, "--depth: 2, Item: '%s' (id: %u), IsDroppable: %s",
+						LogInventory("--depth: 2, Item: [{}] (id: [{}]), IsDroppable: [{}]",
 							(iter2.second->GetItem() ? iter2.second->GetItem()->Name : "null data"), iter2.second->GetID(), (iter2.second->IsDroppable(false) ? "true" : "false"));
 					}
 				}
@@ -620,39 +620,39 @@ void Client::DropItem(int16 slot_id, bool recurse)
 	EQEmu::ItemInstance *inst = m_inv.PopItem(slot_id);
 	if(inst) {
 		if (LogSys.log_settings[Logs::Inventory].is_category_enabled) {
-			Log(Logs::General, Logs::Inventory, "DropItem() Processing - full item parse:");
-			Log(Logs::General, Logs::Inventory, "depth: 0, Item: '%s' (id: %u), IsDroppable: %s",
+			LogInventory("DropItem() Processing - full item parse:");
+			LogInventory("depth: 0, Item: [{}] (id: [{}]), IsDroppable: [{}]",
 				(inst->GetItem() ? inst->GetItem()->Name : "null data"), inst->GetID(), (inst->IsDroppable(false) ? "true" : "false"));
 
 			if (!inst->IsDroppable(false))
-				Log(Logs::General, Logs::Error, "Non-droppable item being processed for drop by '%s'", GetCleanName());
+				LogError("Non-droppable item being processed for drop by [{}]", GetCleanName());
 
 			for (auto iter1 : *inst->GetContents()) { // depth 1
-				Log(Logs::General, Logs::Inventory, "-depth: 1, Item: '%s' (id: %u), IsDroppable: %s",
+				LogInventory("-depth: 1, Item: [{}] (id: [{}]), IsDroppable: [{}]",
 					(iter1.second->GetItem() ? iter1.second->GetItem()->Name : "null data"), iter1.second->GetID(), (iter1.second->IsDroppable(false) ? "true" : "false"));
 
 				if (!iter1.second->IsDroppable(false))
-					Log(Logs::General, Logs::Error, "Non-droppable item being processed for drop by '%s'", GetCleanName());
+					LogError("Non-droppable item being processed for drop by [{}]", GetCleanName());
 
 				for (auto iter2 : *iter1.second->GetContents()) { // depth 2
-					Log(Logs::General, Logs::Inventory, "--depth: 2, Item: '%s' (id: %u), IsDroppable: %s",
+					LogInventory("--depth: 2, Item: [{}] (id: [{}]), IsDroppable: [{}]",
 						(iter2.second->GetItem() ? iter2.second->GetItem()->Name : "null data"), iter2.second->GetID(), (iter2.second->IsDroppable(false) ? "true" : "false"));
 
 					if (!iter2.second->IsDroppable(false))
-						Log(Logs::General, Logs::Error, "Non-droppable item being processed for drop by '%s'", GetCleanName());
+						LogError("Non-droppable item being processed for drop by [{}]", GetCleanName());
 				}
 			}
 		}
 
 		int i = parse->EventItem(EVENT_DROP_ITEM, this, inst, nullptr, "", slot_id);
 		if(i != 0) {
-			Log(Logs::General, Logs::Inventory, "Item drop handled by [EVENT_DROP_ITEM]");
+			LogInventory("Item drop handled by [EVENT_DROP_ITEM]");
 			safe_delete(inst);
 		}
 	} else {
 		// Item doesn't exist in inventory!
-		Log(Logs::General, Logs::Inventory, "DropItem() - No item found in slot %i", slot_id);
-		Message(13, "Error: Item not found in slot %i", slot_id);
+		LogInventory("DropItem() - No item found in slot [{}]", slot_id);
+		Message(Chat::Red, "Error: Item not found in slot %i", slot_id);
 		return;
 	}
 
@@ -673,7 +673,7 @@ void Client::DropItem(int16 slot_id, bool recurse)
 	entity_list.AddObject(object, true);
 	object->StartDecay();
 
-	Log(Logs::General, Logs::Inventory, "Item drop handled ut assolet");
+	LogInventory("Item drop handled ut assolet");
 	DropItemQS(inst, false);
 
 	safe_delete(inst);
@@ -752,14 +752,14 @@ void Client::DropInst(const EQEmu::ItemInstance* inst)
 {
 	if (!inst) {
 		// Item doesn't exist in inventory!
-		Message(13, "Error: Item not found");
+		Message(Chat::Red, "Error: Item not found");
 		return;
 	}
 
 
 	if (inst->GetItem()->NoDrop == 0)
 	{
-		Message(13, "This item is NODROP. Deleting.");
+		Message(Chat::Red, "This item is NODROP. Deleting.");
 		return;
 	}
 
@@ -851,9 +851,9 @@ void Client::SendCursorBuffer()
 	}
 
 	if (!lore_pass) {
-		Log(Logs::General, Logs::Inventory, "(%s) Duplicate lore items are not allowed - destroying item %s(id:%u) on cursor",
+		LogInventory("([{}]) Duplicate lore items are not allowed - destroying item [{}](id:[{}]) on cursor",
 			GetName(), test_item->Name, test_item->ID);
-		Message_StringID(MT_LootMessages, 290);
+		MessageString(Chat::Loot, 290);
 		parse->EventItem(EVENT_DESTROY_ITEM, this, test_inst, nullptr, "", 0);
 		DeleteItemInInventory(EQEmu::invslot::slotCursor);
 		SendCursorBuffer();
@@ -866,7 +866,7 @@ void Client::SendCursorBuffer()
 // Remove item from inventory
 void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_update, bool update_db) {
 	#if (EQDEBUG >= 5)
-		Log(Logs::General, Logs::None, "DeleteItemInInventory(%i, %i, %s)", slot_id, quantity, (client_update) ? "true":"false");
+		LogDebug("DeleteItemInInventory([{}], [{}], [{}])", slot_id, quantity, (client_update) ? "true":"false");
 	#endif
 
 	// Added 'IsSlotValid(slot_id)' check to both segments of client packet processing.
@@ -986,7 +986,7 @@ void Client::DeleteItemInInventory(int16 slot_id, int8 quantity, bool client_upd
 
 bool Client::PushItemOnCursor(const EQEmu::ItemInstance& inst, bool client_update)
 {
-	Log(Logs::Detail, Logs::Inventory, "Putting item %s (%d) on the cursor", inst.GetItem()->Name, inst.GetItem()->ID);
+	LogInventory("Putting item [{}] ([{}]) on the cursor", inst.GetItem()->Name, inst.GetItem()->ID);
 	m_inv.PushCursor(inst);
 
 	if (client_update) {
@@ -1002,7 +1002,7 @@ bool Client::PushItemOnCursor(const EQEmu::ItemInstance& inst, bool client_updat
 // (Also saves changes back to the database: this may be optimized in the future)
 // client_update: Sends packet to client
 bool Client::PutItemInInventory(int16 slot_id, const EQEmu::ItemInstance& inst, bool client_update) {
-	Log(Logs::Detail, Logs::Inventory, "Putting item %s (%d) into slot %d", inst.GetItem()->Name, inst.GetItem()->ID, slot_id);
+	LogInventory("Putting item [{}] ([{}]) into slot [{}]", inst.GetItem()->Name, inst.GetItem()->ID, slot_id);
 
 	if (slot_id == EQEmu::invslot::slotCursor) { // don't trust macros before conditional statements...
 		return PushItemOnCursor(inst, client_update);
@@ -1031,7 +1031,7 @@ bool Client::PutItemInInventory(int16 slot_id, const EQEmu::ItemInstance& inst,
 
 void Client::PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst, ServerLootItem_Struct** bag_item_data)
 {
-	Log(Logs::Detail, Logs::Inventory, "Putting loot item %s (%d) into slot %d", inst.GetItem()->Name, inst.GetItem()->ID, slot_id);
+	LogInventory("Putting loot item [{}] ([{}]) into slot [{}]", inst.GetItem()->Name, inst.GetItem()->ID, slot_id);
 
 	bool cursor_empty = m_inv.CursorEmpty();
 
@@ -1075,8 +1075,7 @@ void Client::PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst,
 			// Dump bag contents to cursor in the event that owning bag is not the first cursor item
 			// (This assumes that the data passed is correctly associated..no safety checks are implemented)
 			if (slot_id == EQEmu::invslot::slotCursor && !cursor_empty) {
-				Log(Logs::Detail, Logs::Inventory,
-					"Putting bag loot item %s (%d) into slot %d (non-empty cursor override)",
+				LogInventory("Putting bag loot item [{}] ([{}]) into slot [{}] (non-empty cursor override)",
 					inst.GetItem()->Name, inst.GetItem()->ID, EQEmu::invslot::slotCursor);
 
 				PutLootInInventory(EQEmu::invslot::slotCursor, *bagitem);
@@ -1084,8 +1083,7 @@ void Client::PutLootInInventory(int16 slot_id, const EQEmu::ItemInstance &inst,
 			else {
 				auto bag_slot = EQEmu::InventoryProfile::CalcSlotId(slot_id, index);
 
-				Log(Logs::Detail, Logs::Inventory,
-					"Putting bag loot item %s (%d) into slot %d (bag slot %d)",
+				LogInventory("Putting bag loot item [{}] ([{}]) into slot [{}] (bag slot [{}])",
 					inst.GetItem()->Name, inst.GetItem()->ID, bag_slot, index);
 
 				PutLootInInventory(bag_slot, *bagitem);
@@ -1520,16 +1518,16 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	if(!IsValidSlot(src_slot_check)){
 		// SoF+ sends a Unix timestamp (should be int32) for src and dst slots every 10 minutes for some reason.
 		if(src_slot_check < 2147483647)
-			Message(13, "Warning: Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
-		Log(Logs::Detail, Logs::Inventory, "Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
+			Message(Chat::Red, "Warning: Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
+		LogInventory("Invalid slot move from slot [{}] to slot [{}] with [{}] charges!", src_slot_check, dst_slot_check, stack_count_check);
 		return false;
 	}
 
 	if(!IsValidSlot(dst_slot_check)) {
 		// SoF+ sends a Unix timestamp (should be int32) for src and dst slots every 10 minutes for some reason.
 		if(src_slot_check < 2147483647)
-			Message(13, "Warning: Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
-		Log(Logs::Detail, Logs::Inventory, "Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
+			Message(Chat::Red, "Warning: Invalid slot move from slot %u to slot %u with %u charges!", src_slot_check, dst_slot_check, stack_count_check);
+		LogInventory("Invalid slot move from slot [{}] to slot [{}] with [{}] charges!", src_slot_check, dst_slot_check, stack_count_check);
 		return false;
 	}
 
@@ -1553,9 +1551,9 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 			}
 
 			if (!lore_pass) {
-				Log(Logs::General, Logs::Inventory, "(%s) Duplicate lore items are not allowed - destroying item %s(id:%u) on cursor",
+				LogInventory("([{}]) Duplicate lore items are not allowed - destroying item [{}](id:[{}]) on cursor",
 					GetName(), test_item->Name, test_item->ID);
-				Message_StringID(MT_LootMessages, 290);
+				MessageString(Chat::Loot, 290);
 				parse->EventItem(EVENT_DESTROY_ITEM, this, test_inst, nullptr, "", 0);
 				DeleteItemInInventory(EQEmu::invslot::slotCursor, 0, true);
 			}
@@ -1565,7 +1563,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 
 	if (move_in->to_slot == (uint32)INVALID_INDEX) {
 		if (move_in->from_slot == (uint32)EQEmu::invslot::slotCursor) {
-			Log(Logs::Detail, Logs::Inventory, "Client destroyed item from cursor slot %d", move_in->from_slot);
+			LogInventory("Client destroyed item from cursor slot [{}]", move_in->from_slot);
 			if(RuleB(QueryServ, PlayerLogMoves)) { QSSwapItemAuditor(move_in); } // QS Audit
 
 			EQEmu::ItemInstance *inst = m_inv.GetItem(EQEmu::invslot::slotCursor);
@@ -1579,7 +1577,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 			return true; // Item destroyed by client
 		}
 		else {
-			Log(Logs::Detail, Logs::Inventory, "Deleted item from slot %d as a result of an inventory container tradeskill combine.", move_in->from_slot);
+			LogInventory("Deleted item from slot [{}] as a result of an inventory container tradeskill combine", move_in->from_slot);
 			if(RuleB(QueryServ, PlayerLogMoves)) { QSSwapItemAuditor(move_in); } // QS Audit
 			DeleteItemInInventory(move_in->from_slot);
 			return true; // Item deletion
@@ -1608,7 +1606,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 				banker ? banker->GetName() : "UNKNOWN NPC", distance);
 			database.SetMQDetectionFlag(AccountName(), GetName(), hacked_string, zone->GetShortName());
 			safe_delete_array(hacked_string);
-			Kick();	// Kicking player to avoid item loss do to client and server inventories not being sync'd
+			Kick("Inventory desync");	// Kicking player to avoid item loss do to client and server inventories not being sync'd
 			return false;
 		}
 	}
@@ -1619,17 +1617,17 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	EQEmu::ItemInstance* src_inst = m_inv.GetItem(src_slot_id);
 	EQEmu::ItemInstance* dst_inst = m_inv.GetItem(dst_slot_id);
 	if (src_inst){
-		Log(Logs::Detail, Logs::Inventory, "Src slot %d has item %s (%d) with %d charges in it.", src_slot_id, src_inst->GetItem()->Name, src_inst->GetItem()->ID, src_inst->GetCharges());
+		LogInventory("Src slot [{}] has item [{}] ([{}]) with [{}] charges in it", src_slot_id, src_inst->GetItem()->Name, src_inst->GetItem()->ID, src_inst->GetCharges());
 		srcitemid = src_inst->GetItem()->ID;
 		//SetTint(dst_slot_id,src_inst->GetColor());
 		if (src_inst->GetCharges() > 0 && (src_inst->GetCharges() < (int16)move_in->number_in_stack || move_in->number_in_stack > src_inst->GetItem()->StackSize))
 		{
-			Message(13,"Error: Insufficient number in stack.");
+			Message(Chat::Red,"Error: Insufficient number in stack.");
 			return false;
 		}
 	}
 	if (dst_inst) {
-		Log(Logs::Detail, Logs::Inventory, "Dest slot %d has item %s (%d) with %d charges in it.", dst_slot_id, dst_inst->GetItem()->Name, dst_inst->GetItem()->ID, dst_inst->GetCharges());
+		LogInventory("Dest slot [{}] has item [{}] ([{}]) with [{}] charges in it", dst_slot_id, dst_inst->GetItem()->Name, dst_inst->GetItem()->ID, dst_inst->GetCharges());
 		dstitemid = dst_inst->GetItem()->ID;
 	}
 	if (Trader && srcitemid>0){
@@ -1650,7 +1648,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 		}
 		if (srcitemid==17899 || srcbagid==17899 || dstitemid==17899 || dstbagid==17899){
 			this->Trader_EndTrader();
-			this->Message(13,"You cannot move your Trader Satchels, or items inside them, while Trading.");
+			this->Message(Chat::Red,"You cannot move your Trader Satchels, or items inside them, while Trading.");
 		}
 	}
 
@@ -1664,7 +1662,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 			move_in->from_slot = dst_slot_check;
 			move_in->to_slot = src_slot_check;
 			move_in->number_in_stack = dst_inst->GetCharges();
-			if(!SwapItem(move_in)) { Log(Logs::Detail, Logs::Inventory, "Recursive SwapItem call failed due to non-existent destination item (charid: %i, fromslot: %i, toslot: %i)", CharacterID(), src_slot_id, dst_slot_id); }
+			if(!SwapItem(move_in)) { LogInventory("Recursive SwapItem call failed due to non-existent destination item (charid: [{}], fromslot: [{}], toslot: [{}])", CharacterID(), src_slot_id, dst_slot_id); }
 		}
 
 		return false;
@@ -1672,7 +1670,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	//verify shared bank transactions in the database
 	if (src_inst && src_slot_id >= EQEmu::invslot::SHARED_BANK_BEGIN && src_slot_id <= EQEmu::invbag::SHARED_BANK_BAGS_END) {
 		if(!database.VerifyInventory(account_id, src_slot_id, src_inst)) {
-			Log(Logs::General, Logs::Error, "Player %s on account %s was found exploiting the shared bank.\n", GetName(), account_name);
+			LogError("Player [{}] on account [{}] was found exploiting the shared bank.\n", GetName(), account_name);
 			DeleteItemInInventory(dst_slot_id,0,true);
 			return(false);
 		}
@@ -1687,7 +1685,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	}
 	if (dst_inst && dst_slot_id >= EQEmu::invslot::SHARED_BANK_BEGIN && dst_slot_id <= EQEmu::invbag::SHARED_BANK_BAGS_END) {
 		if(!database.VerifyInventory(account_id, dst_slot_id, dst_inst)) {
-			Log(Logs::General, Logs::Error, "Player %s on account %s was found exploting the shared bank.\n", GetName(), account_name);
+			LogError("Player [{}] on account [{}] was found exploting the shared bank.\n", GetName(), account_name);
 			DeleteItemInInventory(src_slot_id,0,true);
 			return(false);
 		}
@@ -1724,7 +1722,7 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 				ndh_item_data.append(StringFormat(", nodrop=%s(%u)", (ndh_item->NoDrop == 0 ? "true" : "false"), ndh_item->NoDrop));
 			}
 		}
-		Log(Logs::General, Logs::Error, "WorldKick() of Player %s(id:%u, acct:%u) due to 'NoDrop Hack' detection >> SlotID:%i, ItemData:'%s'",
+		LogError("WorldKick() of Player [{}](id:[{}], acct:[{}]) due to 'NoDrop Hack' detection >> SlotID:[{}], ItemData:[{}]",
 			GetName(), CharacterID(), AccountID(), src_slot_id, ndh_item_data.c_str());
 		ndh_inst = nullptr;
 
@@ -1822,14 +1820,14 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	// Step 4: Check for entity trade
 	if (dst_slot_id >= EQEmu::invslot::TRADE_BEGIN && dst_slot_id <= EQEmu::invslot::TRADE_END) {
 		if (src_slot_id != EQEmu::invslot::slotCursor) {
-			Kick();
+			Kick("Trade with non-cursor item");
 			return false;
 		}
 		if (with) {
-			Log(Logs::Detail, Logs::Inventory, "Trade item move from slot %d to slot %d (trade with %s)", src_slot_id, dst_slot_id, with->GetName());
+			LogInventory("Trade item move from slot [{}] to slot [{}] (trade with [{}])", src_slot_id, dst_slot_id, with->GetName());
 			// Fill Trade list with items from cursor
 			if (!m_inv[EQEmu::invslot::slotCursor]) {
-				Message(13, "Error: Cursor item not located on server!");
+				Message(Chat::Red, "Error: Cursor item not located on server!");
 				return false;
 			}
 
@@ -1859,18 +1857,18 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 	if (move_in->number_in_stack > 0) {
 		// Determine if charged items can stack
 		if(src_inst && !src_inst->IsStackable()) {
-			Log(Logs::Detail, Logs::Inventory, "Move from %d to %d with stack size %d. %s is not a stackable item. (charname: %s)", src_slot_id, dst_slot_id, move_in->number_in_stack, src_inst->GetItem()->Name, GetName());
+			LogInventory("Move from [{}] to [{}] with stack size [{}]. [{}] is not a stackable item. (charname: [{}])", src_slot_id, dst_slot_id, move_in->number_in_stack, src_inst->GetItem()->Name, GetName());
 			return false;
 		}
 
 		if (dst_inst) {
 			if(src_inst->GetID() != dst_inst->GetID()) {
-				Log(Logs::Detail, Logs::Inventory, "Move from %d to %d with stack size %d. Incompatible item types: %d != %d", src_slot_id, dst_slot_id, move_in->number_in_stack, src_inst->GetID(), dst_inst->GetID());
+				LogInventory("Move from [{}] to [{}] with stack size [{}]. Incompatible item types: [{}] != [{}]", src_slot_id, dst_slot_id, move_in->number_in_stack, src_inst->GetID(), dst_inst->GetID());
 				return(false);
 			}
 			if(dst_inst->GetCharges() < dst_inst->GetItem()->StackSize) {
 				//we have a chance of stacking.
-				Log(Logs::Detail, Logs::Inventory, "Move from %d to %d with stack size %d. dest has %d/%d charges", src_slot_id, dst_slot_id, move_in->number_in_stack, dst_inst->GetCharges(), dst_inst->GetItem()->StackSize);
+				LogInventory("Move from [{}] to [{}] with stack size [{}]. dest has [{}]/[{}] charges", src_slot_id, dst_slot_id, move_in->number_in_stack, dst_inst->GetCharges(), dst_inst->GetItem()->StackSize);
 				// Charges can be emptied into dst
 				uint16 usedcharges = dst_inst->GetItem()->StackSize - dst_inst->GetCharges();
 				if (usedcharges > move_in->number_in_stack)
@@ -1882,15 +1880,15 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 				// Depleted all charges?
 				if (src_inst->GetCharges() < 1)
 				{
-					Log(Logs::Detail, Logs::Inventory, "Dest (%d) now has %d charges, source (%d) was entirely consumed. (%d moved)", dst_slot_id, dst_inst->GetCharges(), src_slot_id, usedcharges);
+					LogInventory("Dest ([{}]) now has [{}] charges, source ([{}]) was entirely consumed. ([{}] moved)", dst_slot_id, dst_inst->GetCharges(), src_slot_id, usedcharges);
 					database.SaveInventory(CharacterID(),nullptr,src_slot_id);
 					m_inv.DeleteItem(src_slot_id);
 					all_to_stack = true;
 				} else {
-					Log(Logs::Detail, Logs::Inventory, "Dest (%d) now has %d charges, source (%d) has %d (%d moved)", dst_slot_id, dst_inst->GetCharges(), src_slot_id, src_inst->GetCharges(), usedcharges);
+					LogInventory("Dest ([{}]) now has [{}] charges, source ([{}]) has [{}] ([{}] moved)", dst_slot_id, dst_inst->GetCharges(), src_slot_id, src_inst->GetCharges(), usedcharges);
 				}
 			} else {
-				Log(Logs::Detail, Logs::Inventory, "Move from %d to %d with stack size %d. Exceeds dest maximum stack size: %d/%d", src_slot_id, dst_slot_id, move_in->number_in_stack, (src_inst->GetCharges()+dst_inst->GetCharges()), dst_inst->GetItem()->StackSize);
+				LogInventory("Move from [{}] to [{}] with stack size [{}]. Exceeds dest maximum stack size: [{}]/[{}]", src_slot_id, dst_slot_id, move_in->number_in_stack, (src_inst->GetCharges()+dst_inst->GetCharges()), dst_inst->GetItem()->StackSize);
 				return false;
 			}
 		}
@@ -1900,12 +1898,12 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 				// Move entire stack
 				EQEmu::InventoryProfile::SwapItemFailState fail_state = EQEmu::InventoryProfile::swapInvalid;
 				if (!m_inv.SwapItem(src_slot_id, dst_slot_id, fail_state)) { return false; }
-				Log(Logs::Detail, Logs::Inventory, "Move entire stack from %d to %d with stack size %d. Dest empty.", src_slot_id, dst_slot_id, move_in->number_in_stack);
+				LogInventory("Move entire stack from [{}] to [{}] with stack size [{}]. Dest empty", src_slot_id, dst_slot_id, move_in->number_in_stack);
 			}
 			else {
 				// Split into two
 				src_inst->SetCharges(src_inst->GetCharges() - move_in->number_in_stack);
-				Log(Logs::Detail, Logs::Inventory, "Split stack of %s (%d) from slot %d to %d with stack size %d. Src keeps %d.", src_inst->GetItem()->Name, src_inst->GetItem()->ID, src_slot_id, dst_slot_id, move_in->number_in_stack, src_inst->GetCharges());
+				LogInventory("Split stack of [{}] ([{}]) from slot [{}] to [{}] with stack size [{}]. Src keeps [{}]", src_inst->GetItem()->Name, src_inst->GetItem()->ID, src_slot_id, dst_slot_id, move_in->number_in_stack, src_inst->GetCharges());
 				EQEmu::ItemInstance* inst = database.CreateItem(src_inst->GetItem(), move_in->number_in_stack);
 				m_inv.PutItem(dst_slot_id, *inst);
 				safe_delete(inst);
@@ -1939,12 +1937,12 @@ bool Client::SwapItem(MoveItem_Struct* move_in) {
 				fail_message = "You are not sufficient level to use this item.";
 			
 			if (fail_message)
-				Message(CC_Red, "%s", fail_message);
+				Message(Chat::Red, "%s", fail_message);
 
 			return false;
 		}
 
-		Log(Logs::Detail, Logs::Inventory, "Moving entire item from slot %d to slot %d", src_slot_id, dst_slot_id);
+		LogInventory("Moving entire item from slot [{}] to slot [{}]", src_slot_id, dst_slot_id);
 
 		if (src_slot_id <= EQEmu::invslot::EQUIPMENT_END) {
 			if(src_inst) {
@@ -2007,8 +2005,8 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 
 	// resync the 'from' and 'to' slots on an as-needed basis
 	// Not as effective as the full process, but less intrusive to gameplay
-	Log(Logs::Detail, Logs::Inventory, "Inventory desyncronization. (charname: %s, source: %i, destination: %i)", GetName(), move_slots->from_slot, move_slots->to_slot);
-	Message(15, "Inventory Desyncronization detected: Resending slot data...");
+	LogInventory("Inventory desyncronization. (charname: [{}], source: [{}], destination: [{}])", GetName(), move_slots->from_slot, move_slots->to_slot);
+	Message(Chat::Yellow, "Inventory Desyncronization detected: Resending slot data...");
 
 	if (move_slots->from_slot >= EQEmu::invslot::EQUIPMENT_BEGIN && move_slots->from_slot <= EQEmu::invbag::CURSOR_BAG_END) {
 		int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot);
@@ -2031,9 +2029,9 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 				safe_delete(outapp);
 			}
 			safe_delete(token_inst);
-			Message(14, "Source slot %i resyncronized.", move_slots->from_slot);
+			Message(Chat::Lime, "Source slot %i resyncronized.", move_slots->from_slot);
 		}
-		else { Message(13, "Could not resyncronize source slot %i.", move_slots->from_slot); }
+		else { Message(Chat::Red, "Could not resyncronize source slot %i.", move_slots->from_slot); }
 	}
 	else {
 		int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot) == INVALID_INDEX) ? move_slots->from_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->from_slot);
@@ -2046,11 +2044,11 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 				SendItemPacket(resync_slot, m_inv[resync_slot], ItemPacketTrade);
 
 				safe_delete(token_inst);
-				Message(14, "Source slot %i resyncronized.", move_slots->from_slot);
+				Message(Chat::Lime, "Source slot %i resyncronized.", move_slots->from_slot);
 			}
-			else { Message(13, "Could not resyncronize source slot %i.", move_slots->from_slot); }
+			else { Message(Chat::Red, "Could not resyncronize source slot %i.", move_slots->from_slot); }
 		}
-		else { Message(13, "Could not resyncronize source slot %i.", move_slots->from_slot); }
+		else { Message(Chat::Red, "Could not resyncronize source slot %i.", move_slots->from_slot); }
 	}
 
 	if (move_slots->to_slot >= EQEmu::invslot::EQUIPMENT_BEGIN && move_slots->to_slot <= EQEmu::invbag::CURSOR_BAG_END) {
@@ -2073,9 +2071,9 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 				safe_delete(outapp);
 			}
 			safe_delete(token_inst);
-			Message(14, "Destination slot %i resyncronized.", move_slots->to_slot);
+			Message(Chat::Lime, "Destination slot %i resyncronized.", move_slots->to_slot);
 		}
-		else { Message(13, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
+		else { Message(Chat::Red, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
 	}
 	else {
 		int16 resync_slot = (EQEmu::InventoryProfile::CalcSlotId(move_slots->to_slot) == INVALID_INDEX) ? move_slots->to_slot : EQEmu::InventoryProfile::CalcSlotId(move_slots->to_slot);
@@ -2088,11 +2086,11 @@ void Client::SwapItemResync(MoveItem_Struct* move_slots) {
 				SendItemPacket(resync_slot, m_inv[resync_slot], ItemPacketTrade);
 
 				safe_delete(token_inst);
-				Message(14, "Destination slot %i resyncronized.", move_slots->to_slot);
+				Message(Chat::Lime, "Destination slot %i resyncronized.", move_slots->to_slot);
 			}
-			else { Message(13, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
+			else { Message(Chat::Red, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
 		}
-		else { Message(13, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
+		else { Message(Chat::Red, "Could not resyncronize destination slot %i.", move_slots->to_slot); }
 	}
 }
 
@@ -2219,7 +2217,7 @@ void Client::DyeArmor(EQEmu::TintProfile* dye){
 				SendWearChange(i);
 			}
 			else{
-				Message(13,"Could not locate A Vial of Prismatic Dye.");
+				Message(Chat::Red,"Could not locate A Vial of Prismatic Dye.");
 				return;
 			}
 		}
@@ -2459,7 +2457,7 @@ static bool CopyBagContents(EQEmu::ItemInstance* new_bag, const EQEmu::ItemInsta
 	for (auto bag_slot = 0; bag_slot < old_bag->GetItem()->BagSlots; ++bag_slot) {
 		if (!old_bag->GetItem(bag_slot)) { continue; }
 		if (old_bag->GetItem(bag_slot)->GetItem()->Size > new_bag->GetItem()->BagSize) {
-			Log(Logs::General, Logs::Inventory, "Copy Bag Contents: Failure due to %s is larger than size capacity of %s (%i > %i)",
+			LogInventory("Copy Bag Contents: Failure due to [{}] is larger than size capacity of [{}] ([{}] > [{}])",
 				old_bag->GetItem(bag_slot)->GetItem()->Name, new_bag->GetItem()->Name, old_bag->GetItem(bag_slot)->GetItem()->Size, new_bag->GetItem()->BagSize);
 			return false;
 		}
@@ -2493,7 +2491,7 @@ void Client::DisenchantSummonedBags(bool client_update)
 		if (!new_inst) { continue; }
 
 		if (CopyBagContents(new_inst, inst)) {
-			Log(Logs::General, Logs::Inventory, "Disenchant Summoned Bags: Replacing %s with %s in slot %i", inst->GetItem()->Name, new_inst->GetItem()->Name, slot_id);
+			LogInventory("Disenchant Summoned Bags: Replacing [{}] with [{}] in slot [{}]", inst->GetItem()->Name, new_inst->GetItem()->Name, slot_id);
 			PutItemInInventory(slot_id, *new_inst, client_update);
 		}
 		safe_delete(new_inst);
@@ -2517,7 +2515,7 @@ void Client::DisenchantSummonedBags(bool client_update)
 		if (!new_inst) { continue; }
 
 		if (CopyBagContents(new_inst, inst)) {
-			Log(Logs::General, Logs::Inventory, "Disenchant Summoned Bags: Replacing %s with %s in slot %i", inst->GetItem()->Name, new_inst->GetItem()->Name, slot_id);
+			LogInventory("Disenchant Summoned Bags: Replacing [{}] with [{}] in slot [{}]", inst->GetItem()->Name, new_inst->GetItem()->Name, slot_id);
 			PutItemInInventory(slot_id, *new_inst, client_update);
 		}
 		safe_delete(new_inst);
@@ -2538,7 +2536,7 @@ void Client::DisenchantSummonedBags(bool client_update)
 		if (!new_inst) { continue; }
 		
 		if (CopyBagContents(new_inst, inst)) {
-			Log(Logs::General, Logs::Inventory, "Disenchant Summoned Bags: Replacing %s with %s in slot %i", inst->GetItem()->Name, new_inst->GetItem()->Name, slot_id);
+			LogInventory("Disenchant Summoned Bags: Replacing [{}] with [{}] in slot [{}]", inst->GetItem()->Name, new_inst->GetItem()->Name, slot_id);
 			PutItemInInventory(slot_id, *new_inst, client_update);
 		}
 		safe_delete(new_inst);
@@ -2559,7 +2557,7 @@ void Client::DisenchantSummonedBags(bool client_update)
 		if (!new_inst) { break; }
 
 		if (CopyBagContents(new_inst, inst)) {
-			Log(Logs::General, Logs::Inventory, "Disenchant Summoned Bags: Replacing %s with %s in slot %i", inst->GetItem()->Name, new_inst->GetItem()->Name, EQEmu::invslot::slotCursor);
+			LogInventory("Disenchant Summoned Bags: Replacing [{}] with [{}] in slot [{}]", inst->GetItem()->Name, new_inst->GetItem()->Name, EQEmu::invslot::slotCursor);
 			std::list<EQEmu::ItemInstance*> local;
 			local.push_front(new_inst);
 			m_inv.PopItem(EQEmu::invslot::slotCursor);
@@ -2598,7 +2596,7 @@ void Client::RemoveNoRent(bool client_update)
 
 		auto inst = m_inv[slot_id];
 		if(inst && !inst->GetItem()->NoRent) {
-			Log(Logs::Detail, Logs::Inventory, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			DeleteItemInInventory(slot_id, 0, client_update);
 		}
 	}
@@ -2609,7 +2607,7 @@ void Client::RemoveNoRent(bool client_update)
 
 		auto inst = m_inv[slot_id];
 		if (inst && !inst->GetItem()->NoRent) {
-			Log(Logs::Detail, Logs::Inventory, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			DeleteItemInInventory(slot_id, 0, client_update);
 		}
 	}
@@ -2621,7 +2619,7 @@ void Client::RemoveNoRent(bool client_update)
 
 		auto inst = m_inv[slot_id];
 		if(inst && !inst->GetItem()->NoRent) {
-			Log(Logs::Detail, Logs::Inventory, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			DeleteItemInInventory(slot_id, 0, client_update);
 		}
 	}
@@ -2632,7 +2630,7 @@ void Client::RemoveNoRent(bool client_update)
 
 		auto inst = m_inv[slot_id];
 		if(inst && !inst->GetItem()->NoRent) {
-			Log(Logs::Detail, Logs::Inventory, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			DeleteItemInInventory(slot_id, 0, false); // Can't delete from client Bank slots
 		}
 	}
@@ -2644,7 +2642,7 @@ void Client::RemoveNoRent(bool client_update)
 
 		auto inst = m_inv[slot_id];
 		if(inst && !inst->GetItem()->NoRent) {
-			Log(Logs::Detail, Logs::Inventory, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			DeleteItemInInventory(slot_id, 0, false); // Can't delete from client Bank Container slots
 		}
 	}
@@ -2652,7 +2650,7 @@ void Client::RemoveNoRent(bool client_update)
 	for (auto slot_id = EQEmu::invslot::SHARED_BANK_BEGIN; slot_id <= EQEmu::invslot::SHARED_BANK_END; ++slot_id) {
 		auto inst = m_inv[slot_id];
 		if(inst && !inst->GetItem()->NoRent) {
-			Log(Logs::Detail, Logs::Inventory, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			DeleteItemInInventory(slot_id, 0, false); // Can't delete from client Shared Bank slots
 		}
 	}
@@ -2660,7 +2658,7 @@ void Client::RemoveNoRent(bool client_update)
 	for (auto slot_id = EQEmu::invbag::SHARED_BANK_BAGS_BEGIN; slot_id <= EQEmu::invbag::SHARED_BANK_BAGS_END; ++slot_id) {
 		auto inst = m_inv[slot_id];
 		if(inst && !inst->GetItem()->NoRent) {
-			Log(Logs::Detail, Logs::Inventory, "NoRent Timer Lapse: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("NoRent Timer Lapse: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			DeleteItemInInventory(slot_id, 0, false); // Can't delete from client Shared Bank Container slots
 		}
 	}
@@ -2678,7 +2676,7 @@ void Client::RemoveNoRent(bool client_update)
 			auto inst = *iter;
 			if (inst == nullptr) { continue; }
 			if (!inst->GetItem()->NoRent) {
-				Log(Logs::Detail, Logs::Inventory, "NoRent Timer Lapse: Deleting %s from `Limbo`", inst->GetItem()->Name);
+				LogInventory("NoRent Timer Lapse: Deleting [{}] from `Limbo`", inst->GetItem()->Name);
 			}
 			else {
 				m_inv.PushCursor(*inst);
@@ -2702,7 +2700,7 @@ void Client::RemoveDuplicateLore(bool client_update)
 		auto inst = m_inv.PopItem(slot_id);
 		if (inst == nullptr) { continue; }
 		if(CheckLoreConflict(inst->GetItem())) {
-			Log(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("Lore Duplication Error: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			database.SaveInventory(character_id, nullptr, slot_id);
 		}
 		else {
@@ -2718,7 +2716,7 @@ void Client::RemoveDuplicateLore(bool client_update)
 		auto inst = m_inv.PopItem(slot_id);
 		if (inst == nullptr) { continue; }
 		if (CheckLoreConflict(inst->GetItem())) {
-			Log(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("Lore Duplication Error: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			database.SaveInventory(character_id, nullptr, slot_id);
 		}
 		else {
@@ -2735,7 +2733,7 @@ void Client::RemoveDuplicateLore(bool client_update)
 		auto inst = m_inv.PopItem(slot_id);
 		if (inst == nullptr) { continue; }
 		if(CheckLoreConflict(inst->GetItem())) {
-			Log(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("Lore Duplication Error: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			database.SaveInventory(character_id, nullptr, slot_id);
 		}
 		else {
@@ -2751,7 +2749,7 @@ void Client::RemoveDuplicateLore(bool client_update)
 		auto inst = m_inv.PopItem(slot_id);
 		if (inst == nullptr) { continue; }
 		if(CheckLoreConflict(inst->GetItem())) {
-			Log(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("Lore Duplication Error: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			database.SaveInventory(character_id, nullptr, slot_id);
 		}
 		else {
@@ -2768,7 +2766,7 @@ void Client::RemoveDuplicateLore(bool client_update)
 		auto inst = m_inv.PopItem(slot_id);
 		if (inst == nullptr) { continue; }
 		if(CheckLoreConflict(inst->GetItem())) {
-			Log(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from slot %i", inst->GetItem()->Name, slot_id);
+			LogInventory("Lore Duplication Error: Deleting [{}] from slot [{}]", inst->GetItem()->Name, slot_id);
 			database.SaveInventory(character_id, nullptr, slot_id);
 		}
 		else {
@@ -2793,7 +2791,7 @@ void Client::RemoveDuplicateLore(bool client_update)
 			auto inst = *iter;
 			if (inst == nullptr) { continue; }
 			if (CheckLoreConflict(inst->GetItem())) {
-				Log(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from `Limbo`", inst->GetItem()->Name);
+				LogInventory("Lore Duplication Error: Deleting [{}] from `Limbo`", inst->GetItem()->Name);
 				safe_delete(inst);
 			}
 			else {
@@ -2812,7 +2810,7 @@ void Client::RemoveDuplicateLore(bool client_update)
 				m_inv.PushCursor(*inst);
 			}
 			else {
-				Log(Logs::Detail, Logs::Inventory, "Lore Duplication Error: Deleting %s from `Limbo`", inst->GetItem()->Name);
+				LogInventory("Lore Duplication Error: Deleting [{}] from `Limbo`", inst->GetItem()->Name);
 			}
 			safe_delete(inst);
 		}
@@ -2830,7 +2828,7 @@ void Client::MoveSlotNotAllowed(bool client_update)
 			auto inst = m_inv.PopItem(slot_id);
 			bool is_arrow = (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow) ? true : false;
 			int16 free_slot_id = m_inv.FindFreeSlot(inst->IsClassBag(), true, inst->GetItem()->Size, is_arrow);
-			Log(Logs::Detail, Logs::Inventory, "Slot Assignment Error: Moving %s from slot %i to %i", inst->GetItem()->Name, slot_id, free_slot_id);
+			LogInventory("Slot Assignment Error: Moving [{}] from slot [{}] to [{}]", inst->GetItem()->Name, slot_id, free_slot_id);
 			PutItemInInventory(free_slot_id, *inst, client_update);
 			database.SaveInventory(character_id, nullptr, slot_id);
 			safe_delete(inst);
@@ -2846,7 +2844,7 @@ void Client::MoveSlotNotAllowed(bool client_update)
 	//		auto inst = m_inv.PopItem(slot_id);
 	//		bool is_arrow = (inst->GetItem()->ItemType == EQEmu::item::ItemTypeArrow) ? true : false;
 	//		int16 free_slot_id = m_inv.FindFreeSlot(inst->IsClassBag(), true, inst->GetItem()->Size, is_arrow);
-	//		Log(Logs::Detail, Logs::Inventory, "Slot Assignment Error: Moving %s from slot %i to %i", inst->GetItem()->Name, slot_id, free_slot_id);
+	//		LogInventory("Slot Assignment Error: Moving [{}] from slot [{}] to [{}]", inst->GetItem()->Name, slot_id, free_slot_id);
 	//		PutItemInInventory(free_slot_id, *inst, client_update);
 	//		database.SaveInventory(character_id, nullptr, slot_id);
 	//		safe_delete(inst);
@@ -3001,7 +2999,7 @@ void Client::CreateBandolier(const EQApplicationPacket *app)
 
 	BandolierCreate_Struct *bs = (BandolierCreate_Struct*)app->pBuffer;
 
-	Log(Logs::Detail, Logs::Inventory, "Char: %s Creating Bandolier Set %i, Set Name: %s", GetName(), bs->Number, bs->Name);
+	LogInventory("Char: [{}] Creating Bandolier Set [{}], Set Name: [{}]", GetName(), bs->Number, bs->Name);
 	strcpy(m_pp.bandoliers[bs->Number].Name, bs->Name);
 
 	const EQEmu::ItemInstance* InvItem = nullptr; 
@@ -3015,13 +3013,13 @@ void Client::CreateBandolier(const EQApplicationPacket *app)
 		InvItem = GetInv()[WeaponSlot];
 		if(InvItem) {
 			BaseItem = InvItem->GetItem();
-			Log(Logs::Detail, Logs::Inventory, "Char: %s adding item %s to slot %i", GetName(),BaseItem->Name, WeaponSlot);
+			LogInventory("Char: [{}] adding item [{}] to slot [{}]", GetName(),BaseItem->Name, WeaponSlot);
 			m_pp.bandoliers[bs->Number].Items[BandolierSlot].ID = BaseItem->ID;
 			m_pp.bandoliers[bs->Number].Items[BandolierSlot].Icon = BaseItem->Icon;
 			database.SaveCharacterBandolier(this->CharacterID(), bs->Number, BandolierSlot, m_pp.bandoliers[bs->Number].Items[BandolierSlot].ID, m_pp.bandoliers[bs->Number].Items[BandolierSlot].Icon, bs->Name);
 		}
 		else {
-			Log(Logs::Detail, Logs::Inventory, "Char: %s no item in slot %i", GetName(), WeaponSlot);
+			LogInventory("Char: [{}] no item in slot [{}]", GetName(), WeaponSlot);
 			m_pp.bandoliers[bs->Number].Items[BandolierSlot].ID = 0;
 			m_pp.bandoliers[bs->Number].Items[BandolierSlot].Icon = 0;
 		}
@@ -3031,7 +3029,7 @@ void Client::CreateBandolier(const EQApplicationPacket *app)
 void Client::RemoveBandolier(const EQApplicationPacket *app)
 {
 	BandolierDelete_Struct *bds = (BandolierDelete_Struct*)app->pBuffer;
-	Log(Logs::Detail, Logs::Inventory, "Char: %s removing set", GetName(), bds->Number);
+	LogInventory("Char: [{}] removing set", GetName(), bds->Number);
 	memset(m_pp.bandoliers[bds->Number].Name, 0, 32);
 	for(int i = bandolierPrimary; i <= bandolierAmmo; i++) {
 		m_pp.bandoliers[bds->Number].Items[i].ID = 0;
@@ -3046,7 +3044,7 @@ void Client::SetBandolier(const EQApplicationPacket *app)
 	// any items currently in the weapon slots to inventory.
 
 	BandolierSet_Struct *bss = (BandolierSet_Struct*)app->pBuffer;
-	Log(Logs::Detail, Logs::Inventory, "Char: %s activating set %i", GetName(), bss->Number);
+	LogInventory("Char: [{}] activating set [{}]", GetName(), bss->Number);
 	int16 slot = 0;
 	int16 WeaponSlot = 0;
 	EQEmu::ItemInstance *BandolierItems[4]; // Temporary holding area for the weapons we pull out of their inventory
@@ -3113,19 +3111,19 @@ void Client::SetBandolier(const EQApplicationPacket *app)
 			else { // The player doesn't have the required weapon with them.
 				BandolierItems[BandolierSlot] = 0;
 				if (slot == INVALID_INDEX) {
-					Log(Logs::Detail, Logs::Inventory, "Character does not have required bandolier item for slot %i", WeaponSlot);
+					LogInventory("Character does not have required bandolier item for slot [{}]", WeaponSlot);
 					EQEmu::ItemInstance *InvItem = m_inv.PopItem(WeaponSlot);
 					if(InvItem) {
 						// If there was an item in that weapon slot, put it in the inventory
-						Log(Logs::Detail, Logs::Inventory, "returning item %s in weapon slot %i to inventory",
+						LogInventory("returning item [{}] in weapon slot [{}] to inventory",
 						InvItem->GetItem()->Name, WeaponSlot);
-						Log(Logs::Detail, Logs::Inventory, "returning item %s in weapon slot %i to inventory", InvItem->GetItem()->Name, WeaponSlot);
+						LogInventory("returning item [{}] in weapon slot [{}] to inventory", InvItem->GetItem()->Name, WeaponSlot);
 						if (MoveItemToInventory(InvItem)) {
 							database.SaveInventory(character_id, 0, WeaponSlot);
-							Log(Logs::General, Logs::Error, "returning item %s in weapon slot %i to inventory", InvItem->GetItem()->Name, WeaponSlot);
+							LogError("returning item [{}] in weapon slot [{}] to inventory", InvItem->GetItem()->Name, WeaponSlot);
 						}
 						else {
-							Log(Logs::General, Logs::Error, "Char: %s, ERROR returning %s to inventory", GetName(), InvItem->GetItem()->Name);
+							LogError("Char: [{}], ERROR returning [{}] to inventory", GetName(), InvItem->GetItem()->Name);
 						}
 						safe_delete(InvItem);
 					}
@@ -3159,7 +3157,7 @@ void Client::SetBandolier(const EQApplicationPacket *app)
 				if(InvItem) {
 					// If there was already an item in that weapon slot that we replaced, find a place to put it
 					if (!MoveItemToInventory(InvItem)) {
-						Log(Logs::General, Logs::Error, "Char: %s, ERROR returning %s to inventory", GetName(), InvItem->GetItem()->Name);
+						LogError("Char: [{}], ERROR returning [{}] to inventory", GetName(), InvItem->GetItem()->Name);
 					}
 					safe_delete(InvItem);
 				}
@@ -3170,13 +3168,13 @@ void Client::SetBandolier(const EQApplicationPacket *app)
 			// put it in the player's inventory.
 			EQEmu::ItemInstance *InvItem = m_inv.PopItem(WeaponSlot);
 			if(InvItem) {
-				Log(Logs::Detail, Logs::Inventory, "Bandolier has no item for slot %i, returning item %s to inventory", WeaponSlot, InvItem->GetItem()->Name);
+				LogInventory("Bandolier has no item for slot [{}], returning item [{}] to inventory", WeaponSlot, InvItem->GetItem()->Name);
 				// If there was an item in that weapon slot, put it in the inventory
 				if (MoveItemToInventory(InvItem)) {
 					database.SaveInventory(character_id, 0, WeaponSlot);
 				}
 				else {
-					Log(Logs::General, Logs::Error, "Char: %s, ERROR returning %s to inventory", GetName(), InvItem->GetItem()->Name);
+					LogError("Char: [{}], ERROR returning [{}] to inventory", GetName(), InvItem->GetItem()->Name);
 				}
 				safe_delete(InvItem);
 			}
@@ -3209,7 +3207,7 @@ bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateC
 		return false;
 	}
 
-	Log(Logs::Detail, Logs::Inventory,"Char: %s Returning %s to inventory", GetName(), ItemToReturn->GetItem()->Name);
+	LogInventory("Char: [{}] Returning [{}] to inventory", GetName(), ItemToReturn->GetItem()->Name);
 
 	uint32 ItemID = ItemToReturn->GetItem()->ID;
 
@@ -3293,7 +3291,7 @@ bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateC
 
 			database.SaveInventory(character_id, m_inv.GetItem(i), i);
 
-			Log(Logs::Detail, Logs::Inventory, "Char: %s Storing in main inventory slot %i", GetName(), i);
+			LogInventory("Char: [{}] Storing in main inventory slot [{}]", GetName(), i);
 
 			return true;
 		}
@@ -3316,7 +3314,7 @@ bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateC
 
 					database.SaveInventory(character_id, m_inv.GetItem(BaseSlotID + BagSlot), BaseSlotID + BagSlot);
 
-					Log(Logs::Detail, Logs::Inventory, "Char: %s Storing in bag slot %i", GetName(), BaseSlotID + BagSlot);
+					LogInventory("Char: [{}] Storing in bag slot [{}]", GetName(), BaseSlotID + BagSlot);
 
 					return true;
 				}
@@ -3326,7 +3324,7 @@ bool Client::MoveItemToInventory(EQEmu::ItemInstance *ItemToReturn, bool UpdateC
 
 	// Store on the cursor
 	//
-	Log(Logs::Detail, Logs::Inventory, "Char: %s No space, putting on the cursor", GetName());
+	LogInventory("Char: [{}] No space, putting on the cursor", GetName());
 
 	PushItemOnCursor(*ItemToReturn, UpdateClient);
 
@@ -3394,10 +3392,10 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool
 		log = true;
 
 	if (log) {
-		Log(Logs::General, Logs::Error, "Client::InterrogateInventory() called for %s by %s with an error state of %s", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));
+		LogError("Client::InterrogateInventory() called for [{}] by [{}] with an error state of [{}]", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));
 	}
 	if (!silent) {
-		requester->Message(1, "--- Inventory Interrogation Report for %s (requested by: %s, error state: %s) ---", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));
+		requester->Message(Chat::Default, "--- Inventory Interrogation Report for %s (requested by: %s, error state: %s) ---", GetName(), requester->GetName(), (error ? "TRUE" : "FALSE"));
 	}
 
 	// call InterrogateInventory_ for report
@@ -3406,21 +3404,21 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool
 	}
 
 	if (error) {
-		Message(13, "An error has been discovered in your inventory!");
-		Message(13, "Do not log out, zone or re-arrange items until this");
-		Message(13, "issue has been resolved or item loss may occur!");
+		Message(Chat::Red, "An error has been discovered in your inventory!");
+		Message(Chat::Red, "Do not log out, zone or re-arrange items until this");
+		Message(Chat::Red, "issue has been resolved or item loss may occur!");
 
 		if (allowtrip)
 			TripInterrogateInvState();
 	}
 
 	if (log) {
-		Log(Logs::General, Logs::Error, "Target interrogate inventory flag: %s", (GetInterrogateInvState() ? "TRUE" : "FALSE"));
-		Log(Logs::Detail, Logs::None, "[CLIENT] Client::InterrogateInventory() -- End");
+		LogError("Target interrogate inventory flag: [{}]", (GetInterrogateInvState() ? "TRUE" : "FALSE"));
+		LogDebug("[CLIENT] Client::InterrogateInventory() -- End");
 	}
 	if (!silent) {
-		requester->Message(1, "Target interrogation flag: %s", (GetInterrogateInvState() ? "TRUE" : "FALSE"));
-		requester->Message(1, "--- End of Interrogation Report ---");
+		requester->Message(Chat::Default, "Target interrogation flag: %s", (GetInterrogateInvState() ? "TRUE" : "FALSE"));
+		requester->Message(Chat::Default, "--- End of Interrogation Report ---");
 	}
 
 	instmap.clear();
@@ -3431,7 +3429,7 @@ bool Client::InterrogateInventory(Client* requester, bool log, bool silent, bool
 void Client::InterrogateInventory_(bool errorcheck, Client* requester, int16 head, int16 index, const EQEmu::ItemInstance* inst, const EQEmu::ItemInstance* parent, bool log, bool silent, bool &error, int depth)
 {
 	if (depth >= 10) {
-		Log(Logs::Detail, Logs::None, "[CLIENT] Client::InterrogateInventory_() - Recursion count has exceeded the maximum allowable (You have a REALLY BIG PROBLEM!!)");
+		LogDebug("[CLIENT] Client::InterrogateInventory_() - Recursion count has exceeded the maximum allowable (You have a REALLY BIG PROBLEM!!)");
 		return;
 	}
 
@@ -3462,11 +3460,11 @@ void Client::InterrogateInventory_(bool errorcheck, Client* requester, int16 hea
 		else { e = ""; }
 
 		if (log) {
-			Log(Logs::General, Logs::Error, "Head: %i, Depth: %i, Instance: %s, Parent: %s%s",
+			LogError("Head: [{}], Depth: [{}], Instance: [{}], Parent: [{}][{}]",
 				head, depth, i.c_str(), p.c_str(), e.c_str());
 		}
 		if (!silent) {
-			requester->Message(6, "%i:%i - inst: %s - parent: %s%s",
+			requester->Message(Chat::Gray, "%i:%i - inst: %s - parent: %s%s",
 				head, depth, i.c_str(), p.c_str(), e.c_str());
 		}
 
diff --git a/zone/loottables.cpp b/zone/loottables.cpp
index e7c9624f1..3b5ae520f 100644
--- a/zone/loottables.cpp
+++ b/zone/loottables.cpp
@@ -240,7 +240,7 @@ void NPC::AddLootDrop(const EQEmu::ItemData *item2, ItemList* itemlist, int16 ch
 
 	auto item = new ServerLootItem_Struct;
 #if EQDEBUG>=11
-		Log(Logs::General, Logs::None, "Adding drop to npc: %s, Item: %i", GetName(), item2->ID);
+		LogDebug("Adding drop to npc: [{}], Item: [{}]", GetName(), item2->ID);
 #endif
 
 	EQApplicationPacket* outapp = nullptr;
@@ -352,7 +352,7 @@ void NPC::AddLootDrop(const EQEmu::ItemData *item2, ItemList* itemlist, int16 ch
 		}
 		else if (foundslot == EQEmu::invslot::slotSecondary
 			&& (GetOwner() != nullptr || (CanThisClassDualWield() && zone->random.Roll(NPC_DW_CHANCE)) || (item2->Damage==0)) &&
-			(item2->IsType1HWeapon() || item2->ItemType == EQEmu::item::ItemTypeShield))
+			(item2->IsType1HWeapon() || item2->ItemType == EQEmu::item::ItemTypeShield || item2->ItemType ==  EQEmu::item::ItemTypeLight))
 		{
 			if (item2->Proc.Effect!=0)
 				CastToMob()->AddProcToWeapon(item2->Proc.Effect, true);
diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp
index 9447c48af..14c009b12 100644
--- a/zone/lua_client.cpp
+++ b/zone/lua_client.cpp
@@ -47,7 +47,7 @@ bool Lua_Client::InZone() {
 
 void Lua_Client::Kick() {
 	Lua_Safe_Call_Void();
-	self->Kick();
+	self->Kick("Lua Quest");
 }
 
 void Lua_Client::Disconnect() {
@@ -1065,6 +1065,11 @@ void Lua_Client::AddLevelBasedExp(int exp_pct, int max_level) {
 	self->AddLevelBasedExp(exp_pct, max_level);
 }
 
+void Lua_Client::AddLevelBasedExp(int exp_pct, int max_level, bool ignore_mods) {
+	Lua_Safe_Call_Void();
+	self->AddLevelBasedExp(exp_pct, max_level, ignore_mods);
+}
+
 void Lua_Client::IncrementAA(int aa) {
 	Lua_Safe_Call_Void();
 	self->IncrementAlternateAdvancementRank(aa);
@@ -1210,6 +1215,16 @@ void Lua_Client::AddAlternateCurrencyValue(uint32 currency, int amount) {
 	self->AddAlternateCurrencyValue(currency, amount, 1);
 }
 
+void Lua_Client::SetAlternateCurrencyValue(uint32 currency, int amount) {
+	Lua_Safe_Call_Void();
+	self->SetAlternateCurrencyValue(currency, amount);
+}
+
+int Lua_Client::GetAlternateCurrencyValue(uint32 currency) {
+	Lua_Safe_Call_Int();
+	return self->GetAlternateCurrencyValue(currency);
+}
+
 void Lua_Client::SendWebLink(const char *site) {
 	Lua_Safe_Call_Void();
 	self->SendWebLink(site);
@@ -1382,7 +1397,7 @@ void Lua_Client::QuestReward(Lua_Mob target, luabind::adl::object reward) {
 	if (luabind::type(cur) != LUA_TNIL) {
 		try {
 			copper = luabind::object_cast<uint32>(cur);
-		} catch (luabind::cast_failed) {
+		} catch (luabind::cast_failed &) {
 		}
 	}
 
@@ -1390,7 +1405,7 @@ void Lua_Client::QuestReward(Lua_Mob target, luabind::adl::object reward) {
 	if (luabind::type(cur) != LUA_TNIL) {
 		try {
 			silver = luabind::object_cast<uint32>(cur);
-		} catch (luabind::cast_failed) {
+		} catch (luabind::cast_failed &) {
 		}
 	}
 
@@ -1398,7 +1413,7 @@ void Lua_Client::QuestReward(Lua_Mob target, luabind::adl::object reward) {
 	if (luabind::type(cur) != LUA_TNIL) {
 		try {
 			gold = luabind::object_cast<uint32>(cur);
-		} catch (luabind::cast_failed) {
+		} catch (luabind::cast_failed &) {
 		}
 	}
 
@@ -1406,7 +1421,7 @@ void Lua_Client::QuestReward(Lua_Mob target, luabind::adl::object reward) {
 	if (luabind::type(cur) != LUA_TNIL) {
 		try {
 			platinum = luabind::object_cast<uint32>(cur);
-		} catch (luabind::cast_failed) {
+		} catch (luabind::cast_failed &) {
 		}
 	}
 
@@ -1414,7 +1429,7 @@ void Lua_Client::QuestReward(Lua_Mob target, luabind::adl::object reward) {
 	if (luabind::type(cur) != LUA_TNIL) {
 		try {
 			itemid = luabind::object_cast<uint32>(cur);
-		} catch (luabind::cast_failed) {
+		} catch (luabind::cast_failed &) {
 		}
 	}
 
@@ -1422,7 +1437,7 @@ void Lua_Client::QuestReward(Lua_Mob target, luabind::adl::object reward) {
 	if (luabind::type(cur) != LUA_TNIL) {
 		try {
 			exp = luabind::object_cast<uint32>(cur);
-		} catch (luabind::cast_failed) {
+		} catch (luabind::cast_failed &) {
 		}
 	}
 
@@ -1430,7 +1445,7 @@ void Lua_Client::QuestReward(Lua_Mob target, luabind::adl::object reward) {
 	if (luabind::type(cur) != LUA_TNIL) {
 		try {
 			faction = luabind::object_cast<bool>(cur);
-		} catch (luabind::cast_failed) {
+		} catch (luabind::cast_failed &) {
 		}
 	}
 
@@ -1516,6 +1531,18 @@ void Lua_Client::SetSecondaryWeaponOrnamentation(uint32 model_id) {
 	self->SetSecondaryWeaponOrnamentation(model_id);
 }
 
+void Lua_Client::SetClientMaxLevel(int value) {
+	Lua_Safe_Call_Void();
+	self->SetClientMaxLevel(value);
+}
+
+int Lua_Client::GetClientMaxLevel() {
+	Lua_Safe_Call_Int();
+	return self->GetClientMaxLevel();
+}
+
+
+
 luabind::scope lua_register_client() {
 	return luabind::class_<Lua_Client, Lua_Mob>("Client")
 		.def(luabind::constructor<>())
@@ -1731,6 +1758,7 @@ luabind::scope lua_register_client() {
 		.def("GetIP", (uint32(Lua_Client::*)(void))&Lua_Client::GetIP)
 		.def("AddLevelBasedExp", (void(Lua_Client::*)(int))&Lua_Client::AddLevelBasedExp)
 		.def("AddLevelBasedExp", (void(Lua_Client::*)(int,int))&Lua_Client::AddLevelBasedExp)
+		.def("AddLevelBasedExp", (void(Lua_Client::*)(int,int,bool))&Lua_Client::AddLevelBasedExp)
 		.def("IncrementAA", (void(Lua_Client::*)(int))&Lua_Client::IncrementAA)
 		.def("GrantAlternateAdvancementAbility", (bool(Lua_Client::*)(int, int))&Lua_Client::GrantAlternateAdvancementAbility)
 		.def("GrantAlternateAdvancementAbility", (bool(Lua_Client::*)(int, int, bool))&Lua_Client::GrantAlternateAdvancementAbility)
@@ -1760,6 +1788,8 @@ luabind::scope lua_register_client() {
 		.def("OpenLFGuildWindow", (void(Lua_Client::*)(void))&Lua_Client::OpenLFGuildWindow)
 		.def("Signal", (void(Lua_Client::*)(uint32))&Lua_Client::Signal)
 		.def("AddAlternateCurrencyValue", (void(Lua_Client::*)(uint32,int))&Lua_Client::AddAlternateCurrencyValue)
+		.def("SetAlternateCurrencyValue", (void(Lua_Client::*)(uint32,int))&Lua_Client::SetAlternateCurrencyValue)
+		.def("GetAlternateCurrencyValue", (int(Lua_Client::*)(uint32))&Lua_Client::GetAlternateCurrencyValue)
 		.def("SendWebLink", (void(Lua_Client::*)(const char *))&Lua_Client::SendWebLink)
 		.def("HasSpellScribed", (bool(Lua_Client::*)(int))&Lua_Client::HasSpellScribed)
 		.def("SetAccountFlag", (void(Lua_Client::*)(std::string,std::string))&Lua_Client::SetAccountFlag)
@@ -1802,7 +1832,9 @@ luabind::scope lua_register_client() {
 		.def("EnableAreaEndRegen", &Lua_Client::EnableAreaEndRegen)
 		.def("DisableAreaEndRegen", &Lua_Client::DisableAreaEndRegen)
 		.def("EnableAreaRegens", &Lua_Client::EnableAreaRegens)
-		.def("DisableAreaRegens", &Lua_Client::DisableAreaRegens);
+		.def("DisableAreaRegens", &Lua_Client::DisableAreaRegens)
+		.def("SetClientMaxLevel", (void(Lua_Client::*)(int))&Lua_Client::SetClientMaxLevel)
+		.def("GetClientMaxLevel", (int(Lua_Client::*)(void))&Lua_Client::GetClientMaxLevel);
 }
 
 luabind::scope lua_register_inventory_where() {
diff --git a/zone/lua_client.h b/zone/lua_client.h
index fee4d31f0..aef0378cb 100644
--- a/zone/lua_client.h
+++ b/zone/lua_client.h
@@ -240,6 +240,7 @@ public:
 	uint32 GetIP();
 	void AddLevelBasedExp(int exp_pct);
 	void AddLevelBasedExp(int exp_pct, int max_level);
+	void AddLevelBasedExp(int exp_pct, int max_level, bool ignore_mods);
 	void IncrementAA(int aa);
 	bool GrantAlternateAdvancementAbility(int aa_id, int points);
 	bool GrantAlternateAdvancementAbility(int aa_id, int points, bool ignore_cost);
@@ -269,6 +270,8 @@ public:
 	void OpenLFGuildWindow();
 	void Signal(uint32 id);
 	void AddAlternateCurrencyValue(uint32 currency, int amount);
+	void SetAlternateCurrencyValue(uint32 currency, int amount);
+	int GetAlternateCurrencyValue(uint32 currency);
 	void SendWebLink(const char *site);
 	bool HasSpellScribed(int spell_id);
 	void SetAccountFlag(std::string flag, std::string val);
@@ -317,6 +320,9 @@ public:
 
 	void SetPrimaryWeaponOrnamentation(uint32 model_id);
 	void SetSecondaryWeaponOrnamentation(uint32 model_id);
+
+	void SetClientMaxLevel(int value);
+	int GetClientMaxLevel();
 };
 
 #endif
diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp
index 9dd1d8c9b..0d1086ad1 100644
--- a/zone/lua_general.cpp
+++ b/zone/lua_general.cpp
@@ -36,6 +36,8 @@ struct BodyTypes { };
 struct Filters { };
 struct MessageTypes { };
 struct Rule { };
+struct Journal_SpeakMode { };
+struct Journal_Mode { };
 
 struct lua_registered_event {
 	std::string encounter_name;
@@ -547,6 +549,14 @@ void lua_summon_all_player_corpses(uint32 char_id, float x, float y, float z, fl
 	quest_manager.summonallplayercorpses(char_id, glm::vec4(x, y, z, h));
 }
 
+int lua_get_player_corpse_count(uint32 char_id) {
+	return database.CountCharacterCorpses(char_id);
+}
+
+int lua_get_player_corpse_count_by_zone_id(uint32 char_id, uint32 zone_id) {
+	return database.CountCharacterCorpsesByZoneID(char_id, zone_id);
+}
+
 int lua_get_player_buried_corpse_count(uint32 char_id) {
 	return quest_manager.getplayerburiedcorpsecount(char_id);
 }
@@ -569,7 +579,7 @@ void lua_task_selector(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				cur_value = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		} else {
 			count = i - 1;
@@ -599,7 +609,7 @@ void lua_enable_task(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				cur_value = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		} else {
 			count = i - 1;
@@ -626,7 +636,7 @@ void lua_disable_task(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				cur_value = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		} else {
 			count = i - 1;
@@ -1154,7 +1164,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				spawn2_id = luabind::object_cast<uint32>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 				return;
 			}
 		} else {
@@ -1165,7 +1175,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				spawngroup_id = luabind::object_cast<uint32>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 				return;
 			}
 		} else {
@@ -1176,7 +1186,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				x = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 				return;
 			}
 		} else {
@@ -1187,7 +1197,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				y = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 				return;
 			}
 		} else {
@@ -1198,7 +1208,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				z = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 				return;
 			}
 		} else {
@@ -1209,7 +1219,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				heading = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 				return;
 			}
 		} else {
@@ -1220,7 +1230,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				respawn = luabind::object_cast<uint32>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 				return;
 			}
 		} else {
@@ -1231,7 +1241,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				variance = luabind::object_cast<uint32>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 				return;
 			}
 		} else {
@@ -1242,7 +1252,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				timeleft = luabind::object_cast<uint32>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -1250,7 +1260,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				grid = luabind::object_cast<uint32>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -1258,7 +1268,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				condition_id = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -1266,7 +1276,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				condition_min_value = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -1274,7 +1284,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				enabled = luabind::object_cast<bool>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -1282,7 +1292,7 @@ void lua_add_spawn_point(luabind::adl::object table) {
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				animation = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -1365,15 +1375,26 @@ double lua_clock() {
 	return static_cast<double>(t) / 1000.0;
 }
 
+void lua_log(int category, std::string message) {
+	if (category < Logs::None || category >= Logs::MaxCategoryID)
+		return;
+
+	Log(Logs::General, static_cast<Logs::LogCategory>(category), message.c_str());
+}
+
 void lua_debug(std::string message) {
-	Log(Logs::General, Logs::QuestDebug, message);
+	Log(Logs::General, Logs::QuestDebug, message.c_str());
 }
 
 void lua_debug(std::string message, int level) {
 	if (level < Logs::General || level > Logs::Detail)
 		return;
 
-	Log(static_cast<Logs::DebugLevel>(level), Logs::QuestDebug, message);
+	Log(static_cast<Logs::DebugLevel>(level), Logs::QuestDebug, message.c_str());
+}
+
+void lua_log_combat(std::string message) {
+	Log(Logs::General, Logs::Combat, message.c_str());
 }
 
 void lua_update_zone_header(std::string type, std::string value) {
@@ -1386,7 +1407,7 @@ void lua_update_zone_header(std::string type, std::string value) {
 		try { \
 			npc_type->name = luabind::object_cast<c_type>(cur); \
 		} \
-		catch(luabind::cast_failed) { \
+		catch(luabind::cast_failed &) { \
 			npc_type->size = default_value; \
 		} \
 	} \
@@ -1402,7 +1423,7 @@ void lua_update_zone_header(std::string type, std::string value) {
 			std::string tmp = luabind::object_cast<std::string>(cur); \
 			strncpy(npc_type->name, tmp.c_str(), str_length); \
 		} \
-		catch(luabind::cast_failed) { \
+		catch(luabind::cast_failed &) { \
 			strncpy(npc_type->name, default_value, str_length); \
 		} \
 	} \
@@ -1650,6 +1671,8 @@ luabind::scope lua_register_general() {
 		luabind::def("toggle_spawn_event", &lua_toggle_spawn_event),
 		luabind::def("summon_buried_player_corpse", &lua_summon_buried_player_corpse),
 		luabind::def("summon_all_player_corpses", &lua_summon_all_player_corpses),
+		luabind::def("get_player_corpse_count", &lua_get_player_corpse_count),
+		luabind::def("get_player_corpse_count_by_zone_id", &lua_get_player_corpse_count_by_zone_id),
 		luabind::def("get_player_buried_corpse_count", &lua_get_player_buried_corpse_count),
 		luabind::def("bury_player_corpse", &lua_bury_player_corpse),
 		luabind::def("task_selector", &lua_task_selector),
@@ -1770,8 +1793,10 @@ luabind::scope lua_register_general() {
 		luabind::def("reloadzonestaticdata", &lua_reloadzonestaticdata),
 		luabind::def("clock", &lua_clock),
 		luabind::def("create_npc", &lua_create_npc),
+		luabind::def("log", (void(*)(int, std::string))&lua_log),
 		luabind::def("debug", (void(*)(std::string))&lua_debug),
-		luabind::def("debug", (void(*)(std::string, int))&lua_debug)
+		luabind::def("debug", (void(*)(std::string, int))&lua_debug),
+		luabind::def("log_combat", (void(*)(std::string))&lua_log_combat)
 	];
 }
 
@@ -1932,12 +1957,34 @@ luabind::scope lua_register_slot() {
 			luabind::value("EquipmentEnd", static_cast<int>(EQEmu::invslot::EQUIPMENT_END)),
 			luabind::value("GeneralBegin", static_cast<int>(EQEmu::invslot::GENERAL_BEGIN)),
 			luabind::value("GeneralEnd", static_cast<int>(EQEmu::invslot::GENERAL_END)),
+			luabind::value("PossessionsBagsBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN)),
+			luabind::value("PossessionsBagsEnd", static_cast<int>(EQEmu::invbag::CURSOR_BAG_END)),
 			luabind::value("GeneralBagsBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN)),
 			luabind::value("GeneralBagsEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_END)),
+			luabind::value("General1BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN)),
+			luabind::value("General1BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 9),
+			luabind::value("General2BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 10),
+			luabind::value("General2BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 19),
+			luabind::value("General3BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 20),
+			luabind::value("General3BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 29),
+			luabind::value("General4BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 30),
+			luabind::value("General4BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 39),
+			luabind::value("General5BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 40),
+			luabind::value("General5BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 49),
+			luabind::value("General6BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 50),
+			luabind::value("General6BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 59),
+			luabind::value("General7BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 60),
+			luabind::value("General7BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 69),
+			luabind::value("General8BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 70),
+			luabind::value("General8BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 79),
+			luabind::value("General9BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 80),
+			luabind::value("General9BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 89),
+			luabind::value("General10BagBegin", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 90),
+			luabind::value("General10BagEnd", static_cast<int>(EQEmu::invbag::GENERAL_BAGS_BEGIN) + 99),
 			luabind::value("CursorBagBegin", static_cast<int>(EQEmu::invbag::CURSOR_BAG_BEGIN)),
 			luabind::value("CursorBagEnd", static_cast<int>(EQEmu::invbag::CURSOR_BAG_END)),
 			luabind::value("Tradeskill", static_cast<int>(EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE)),
-			luabind::value("Augment", static_cast<int>(EQEmu::invslot::SLOT_AUGMENT_GENERIC_RETURN)), // will be revised out
+			luabind::value("Augment", static_cast<int>(EQEmu::invslot::SLOT_AUGMENT_GENERIC_RETURN)),
 			luabind::value("BankBegin", static_cast<int>(EQEmu::invslot::BANK_BEGIN)),
 			luabind::value("BankEnd", static_cast<int>(EQEmu::invslot::BANK_END)),
 			luabind::value("BankBagsBegin", static_cast<int>(EQEmu::invbag::BANK_BAGS_BEGIN)),
@@ -2232,91 +2279,92 @@ luabind::scope lua_register_message_types() {
 	return luabind::class_<MessageTypes>("MT")
 		.enum_("constants")
 		[
-			luabind::value("Say", MT_Say),
-			luabind::value("Tell", MT_Tell),
-			luabind::value("Group", MT_Group),
-			luabind::value("Guild", MT_Guild),
-			luabind::value("OOC", MT_OOC),
-			luabind::value("Auction", MT_Auction),
-			luabind::value("Shout", MT_Shout),
-			luabind::value("Emote", MT_Emote),
-			luabind::value("Spells", MT_Spells),
-			luabind::value("YouHitOther", MT_YouHitOther),
-			luabind::value("OtherHitsYou", MT_OtherHitsYou),
-			luabind::value("YouMissOther", MT_YouMissOther),
-			luabind::value("OtherMissesYou", MT_OtherMissesYou),
-			luabind::value("Broadcasts", MT_Broadcasts),
-			luabind::value("Skills", MT_Skills),
-			luabind::value("Disciplines", MT_Disciplines),
-			luabind::value("Unused1", MT_Unused1),
-			luabind::value("DefaultText", MT_DefaultText),
-			luabind::value("Unused2", MT_Unused2),
-			luabind::value("MerchantOffer", MT_MerchantOffer),
-			luabind::value("MerchantBuySell", MT_MerchantBuySell),
-			luabind::value("YourDeath", MT_YourDeath),
-			luabind::value("OtherDeath", MT_OtherDeath),
-			luabind::value("OtherHits", MT_OtherHits),
-			luabind::value("OtherMisses", MT_OtherMisses),
-			luabind::value("Who", MT_Who),
-			luabind::value("YellForHelp", MT_YellForHelp),
-			luabind::value("NonMelee", MT_NonMelee),
-			luabind::value("WornOff", MT_WornOff),
-			luabind::value("MoneySplit", MT_MoneySplit),
-			luabind::value("LootMessages", MT_LootMessages),
-			luabind::value("DiceRoll", MT_DiceRoll),
-			luabind::value("OtherSpells", MT_OtherSpells),
-			luabind::value("SpellFailure", MT_SpellFailure),
-			luabind::value("Chat", MT_Chat),
-			luabind::value("Channel1", MT_Channel1),
-			luabind::value("Channel2", MT_Channel2),
-			luabind::value("Channel3", MT_Channel3),
-			luabind::value("Channel4", MT_Channel4),
-			luabind::value("Channel5", MT_Channel5),
-			luabind::value("Channel6", MT_Channel6),
-			luabind::value("Channel7", MT_Channel7),
-			luabind::value("Channel8", MT_Channel8),
-			luabind::value("Channel9", MT_Channel9),
-			luabind::value("Channel10", MT_Channel10),
-			luabind::value("CritMelee", MT_CritMelee),
-			luabind::value("SpellCrits", MT_SpellCrits),
-			luabind::value("TooFarAway", MT_TooFarAway),
-			luabind::value("NPCRampage", MT_NPCRampage),
-			luabind::value("NPCFlurry", MT_NPCFlurry),
-			luabind::value("NPCEnrage", MT_NPCEnrage),
-			luabind::value("SayEcho", MT_SayEcho),
-			luabind::value("TellEcho", MT_TellEcho),
-			luabind::value("GroupEcho", MT_GroupEcho),
-			luabind::value("GuildEcho", MT_GuildEcho),
-			luabind::value("OOCEcho", MT_OOCEcho),
-			luabind::value("AuctionEcho", MT_AuctionEcho),
-			luabind::value("ShoutECho", MT_ShoutECho),
-			luabind::value("EmoteEcho", MT_EmoteEcho),
-			luabind::value("Chat1Echo", MT_Chat1Echo),
-			luabind::value("Chat2Echo", MT_Chat2Echo),
-			luabind::value("Chat3Echo", MT_Chat3Echo),
-			luabind::value("Chat4Echo", MT_Chat4Echo),
-			luabind::value("Chat5Echo", MT_Chat5Echo),
-			luabind::value("Chat6Echo", MT_Chat6Echo),
-			luabind::value("Chat7Echo", MT_Chat7Echo),
-			luabind::value("Chat8Echo", MT_Chat8Echo),
-			luabind::value("Chat9Echo", MT_Chat9Echo),
-			luabind::value("Chat10Echo", MT_Chat10Echo),
-			luabind::value("DoTDamage", MT_DoTDamage),
-			luabind::value("ItemLink", MT_ItemLink),
-			luabind::value("RaidSay", MT_RaidSay),
-			luabind::value("MyPet", MT_MyPet),
-			luabind::value("DS", MT_DS),
-			luabind::value("Leadership", MT_Leadership),
-			luabind::value("PetFlurry", MT_PetFlurry),
-			luabind::value("PetCrit", MT_PetCrit),
-			luabind::value("FocusEffect", MT_FocusEffect),
-			luabind::value("Experience", MT_Experience),
-			luabind::value("System", MT_System),
-			luabind::value("PetSpell", MT_PetSpell),
-			luabind::value("PetResponse", MT_PetResponse),
-			luabind::value("ItemSpeech", MT_ItemSpeech),
-			luabind::value("StrikeThrough", MT_StrikeThrough),
-			luabind::value("Stun", MT_Stun)
+			luabind::value("NPCQuestSay", Chat::NPCQuestSay),
+			luabind::value("Say", Chat::Say),
+			luabind::value("Tell", Chat::Tell),
+			luabind::value("Group", Chat::Group),
+			luabind::value("Guild", Chat::Guild),
+			luabind::value("OOC", Chat::OOC),
+			luabind::value("Auction", Chat::Auction),
+			luabind::value("Shout", Chat::Shout),
+			luabind::value("Emote", Chat::Emote),
+			luabind::value("Spells", Chat::Spells),
+			luabind::value("YouHitOther", Chat::YouHitOther),
+			luabind::value("OtherHitsYou", Chat::OtherHitYou),
+			luabind::value("YouMissOther", Chat::YouMissOther),
+			luabind::value("OtherMissesYou", Chat::OtherMissYou),
+			luabind::value("Broadcasts", Chat::Broadcasts),
+			luabind::value("Skills", Chat::Skills),
+			luabind::value("Disciplines", Chat::Disciplines),
+			luabind::value("Unused1", Chat::Unused1),
+			luabind::value("DefaultText", Chat::DefaultText),
+			luabind::value("Unused2", Chat::Unused2),
+			luabind::value("MerchantOffer", Chat::MerchantOffer),
+			luabind::value("MerchantBuySell", Chat::MerchantExchange),
+			luabind::value("YourDeath", Chat::YourDeath),
+			luabind::value("OtherDeath", Chat::OtherDeath),
+			luabind::value("OtherHits", Chat::OtherHitOther),
+			luabind::value("OtherMisses", Chat::OtherMissOther),
+			luabind::value("Who", Chat::Who),
+			luabind::value("YellForHelp", Chat::YellForHelp),
+			luabind::value("NonMelee", Chat::NonMelee),
+			luabind::value("WornOff", Chat::SpellWornOff),
+			luabind::value("MoneySplit", Chat::MoneySplit),
+			luabind::value("LootMessages", Chat::Loot),
+			luabind::value("DiceRoll", Chat::DiceRoll),
+			luabind::value("OtherSpells", Chat::OtherSpells),
+			luabind::value("SpellFailure", Chat::SpellFailure),
+			luabind::value("Chat", Chat::ChatChannel),
+			luabind::value("Channel1", Chat::Chat1),
+			luabind::value("Channel2", Chat::Chat2),
+			luabind::value("Channel3", Chat::Chat3),
+			luabind::value("Channel4", Chat::Chat4),
+			luabind::value("Channel5", Chat::Chat5),
+			luabind::value("Channel6", Chat::Chat6),
+			luabind::value("Channel7", Chat::Chat7),
+			luabind::value("Channel8", Chat::Chat8),
+			luabind::value("Channel9", Chat::Chat9),
+			luabind::value("Channel10", Chat::Chat10),
+			luabind::value("CritMelee", Chat::MeleeCrit),
+			luabind::value("SpellCrits", Chat::SpellCrit),
+			luabind::value("TooFarAway", Chat::TooFarAway),
+			luabind::value("NPCRampage", Chat::NPCRampage),
+			luabind::value("NPCFlurry", Chat::NPCFlurry),
+			luabind::value("NPCEnrage", Chat::NPCEnrage),
+			luabind::value("SayEcho", Chat::EchoSay),
+			luabind::value("TellEcho", Chat::EchoTell),
+			luabind::value("GroupEcho", Chat::EchoGroup),
+			luabind::value("GuildEcho", Chat::EchoGuild),
+			luabind::value("OOCEcho", Chat::EchoOOC),
+			luabind::value("AuctionEcho", Chat::EchoAuction),
+			luabind::value("ShoutECho", Chat::EchoShout),
+			luabind::value("EmoteEcho", Chat::EchoEmote),
+			luabind::value("Chat1Echo", Chat::EchoChat1),
+			luabind::value("Chat2Echo", Chat::EchoChat2),
+			luabind::value("Chat3Echo", Chat::EchoChat3),
+			luabind::value("Chat4Echo", Chat::EchoChat4),
+			luabind::value("Chat5Echo", Chat::EchoChat5),
+			luabind::value("Chat6Echo", Chat::EchoChat6),
+			luabind::value("Chat7Echo", Chat::EchoChat7),
+			luabind::value("Chat8Echo", Chat::EchoChat8),
+			luabind::value("Chat9Echo", Chat::EchoChat9),
+			luabind::value("Chat10Echo", Chat::EchoChat10),
+			luabind::value("DoTDamage", Chat::DotDamage),
+			luabind::value("ItemLink", Chat::ItemLink),
+			luabind::value("RaidSay", Chat::RaidSay),
+			luabind::value("MyPet", Chat::MyPet),
+			luabind::value("DS", Chat::DamageShield),
+			luabind::value("Leadership", Chat::LeaderShip),
+			luabind::value("PetFlurry", Chat::PetFlurry),
+			luabind::value("PetCrit", Chat::PetCritical),
+			luabind::value("FocusEffect", Chat::FocusEffect),
+			luabind::value("Experience", Chat::Experience),
+			luabind::value("System", Chat::System),
+			luabind::value("PetSpell", Chat::PetSpell),
+			luabind::value("PetResponse", Chat::PetResponse),
+			luabind::value("ItemSpeech", Chat::ItemSpeech),
+			luabind::value("StrikeThrough", Chat::StrikeThrough),
+			luabind::value("Stun", Chat::Stun)
 		];
 }
 
@@ -2324,17 +2372,17 @@ luabind::scope lua_register_rules_const() {
 	return luabind::class_<Rule>("Rule")
 		.enum_("constants")
 	[
-#define RULE_INT(cat, rule, default_value) \
+#define RULE_INT(cat, rule, default_value, notes) \
 		luabind::value(#rule, RuleManager::Int__##rule),
 #include "../common/ruletypes.h"
 		luabind::value("_IntRuleCount", RuleManager::_IntRuleCount),
 #undef RULE_INT
-#define RULE_REAL(cat, rule, default_value) \
+#define RULE_REAL(cat, rule, default_value, notes) \
 		luabind::value(#rule, RuleManager::Real__##rule),
 #include "../common/ruletypes.h"
 		luabind::value("_RealRuleCount", RuleManager::_RealRuleCount),
 #undef RULE_REAL
-#define RULE_BOOL(cat, rule, default_value) \
+#define RULE_BOOL(cat, rule, default_value, notes) \
 		luabind::value(#rule, RuleManager::Bool__##rule),
 #include "../common/ruletypes.h"
 		luabind::value("_BoolRuleCount", RuleManager::_BoolRuleCount)
@@ -2362,4 +2410,27 @@ luabind::scope lua_register_ruleb() {
 		];
 }
 
+luabind::scope lua_register_journal_speakmode() {
+	return luabind::class_<Journal_SpeakMode>("SpeakMode")
+		.enum_("constants")
+		[
+			luabind::value("Raw", static_cast<int>(Journal::SpeakMode::Raw)),
+			luabind::value("Say", static_cast<int>(Journal::SpeakMode::Say)),
+			luabind::value("Shout", static_cast<int>(Journal::SpeakMode::Shout)),
+			luabind::value("EmoteAlt", static_cast<int>(Journal::SpeakMode::EmoteAlt)),
+			luabind::value("Emote", static_cast<int>(Journal::SpeakMode::Emote)),
+			luabind::value("Group", static_cast<int>(Journal::SpeakMode::Group))
+		];
+}
+
+luabind::scope lua_register_journal_mode() {
+	return luabind::class_<Journal_Mode>("JournalMode")
+		.enum_("constants")
+		[
+			luabind::value("None", static_cast<int>(Journal::Mode::None)),
+			luabind::value("Log1", static_cast<int>(Journal::Mode::Log1)),
+			luabind::value("Log2", static_cast<int>(Journal::Mode::Log2))
+		];
+}
+
 #endif
diff --git a/zone/lua_general.h b/zone/lua_general.h
index 4c8b7f8d2..d5b741a76 100644
--- a/zone/lua_general.h
+++ b/zone/lua_general.h
@@ -19,6 +19,8 @@ luabind::scope lua_register_rules_const();
 luabind::scope lua_register_rulei();
 luabind::scope lua_register_ruler();
 luabind::scope lua_register_ruleb();
+luabind::scope lua_register_journal_speakmode();
+luabind::scope lua_register_journal_mode();
 
 #endif
 #endif
diff --git a/zone/lua_mob.cpp b/zone/lua_mob.cpp
index 906684dfe..4860ae1e8 100644
--- a/zone/lua_mob.cpp
+++ b/zone/lua_mob.cpp
@@ -113,7 +113,7 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				options.armor_pen_flat = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -121,7 +121,7 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				options.crit_flat = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -129,7 +129,7 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				options.damage_flat = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -137,7 +137,7 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				options.hate_flat = luabind::object_cast<int>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -145,7 +145,7 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				options.armor_pen_percent = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -153,7 +153,7 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				options.crit_percent = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -161,7 +161,7 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				options.damage_percent = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 
@@ -169,7 +169,7 @@ bool Lua_Mob::Attack(Lua_Mob other, int hand, bool from_riposte, bool is_striket
 		if(luabind::type(cur) != LUA_TNIL) {
 			try {
 				options.hate_percent = luabind::object_cast<float>(cur);
-			} catch(luabind::cast_failed) {
+			} catch(luabind::cast_failed &) {
 			}
 		}
 	}
@@ -743,9 +743,9 @@ void Lua_Mob::Message(int type, const char *message) {
 	self->Message(type, message);
 }
 
-void Lua_Mob::Message_StringID(int type, int string_id, uint32 distance) {
+void Lua_Mob::MessageString(int type, int string_id, uint32 distance) {
 	Lua_Safe_Call_Void();
-	self->Message_StringID(type, string_id, distance);
+	self->MessageString(type, string_id, distance);
 }
 
 void Lua_Mob::Say(const char *message) {
@@ -760,7 +760,65 @@ void Lua_Mob::Say(const char* message, int language) {
 
 void Lua_Mob::QuestSay(Lua_Client client, const char *message) {
 	Lua_Safe_Call_Void();
-	self->QuestJournalledSay(client, message);
+	Journal::Options journal_opts;
+	journal_opts.speak_mode = Journal::SpeakMode::Say;
+	journal_opts.journal_mode = RuleB(NPC, EnableNPCQuestJournal) ? Journal::Mode::Log2 : Journal::Mode::None;
+	journal_opts.language = 0;
+	journal_opts.message_type = Chat::NPCQuestSay;
+	journal_opts.target_spawn_id = 0;
+	self->QuestJournalledSay(client, message, journal_opts);
+}
+
+void Lua_Mob::QuestSay(Lua_Client client, const char *message, luabind::adl::object opts) {
+	Lua_Safe_Call_Void();
+
+	Journal::Options journal_opts;
+	// defaults
+	journal_opts.speak_mode = Journal::SpeakMode::Say;
+	journal_opts.journal_mode = Journal::Mode::Log2;
+	journal_opts.language = 0;
+	journal_opts.message_type = Chat::NPCQuestSay;
+	journal_opts.target_spawn_id = 0;
+
+	if (luabind::type(opts) == LUA_TTABLE) {
+		auto cur = opts["speak_mode"];
+		if (luabind::type(cur) != LUA_TNIL) {
+			try {
+				journal_opts.speak_mode = static_cast<Journal::SpeakMode>(luabind::object_cast<int>(cur));
+			} catch (luabind::cast_failed &) {
+			}
+		}
+
+		cur = opts["journal_mode"];
+		if (luabind::type(cur) != LUA_TNIL) {
+			try {
+				journal_opts.journal_mode = static_cast<Journal::Mode>(luabind::object_cast<int>(cur));
+			} catch (luabind::cast_failed &) {
+			}
+		}
+
+		cur = opts["language"];
+		if (luabind::type(cur) != LUA_TNIL) {
+			try {
+				journal_opts.language = luabind::object_cast<int>(cur);
+			} catch (luabind::cast_failed &) {
+			}
+		}
+
+		cur = opts["message_type"];
+		if (luabind::type(cur) != LUA_TNIL) {
+			try {
+				journal_opts.message_type = luabind::object_cast<int>(cur);
+			} catch (luabind::cast_failed &) {
+			}
+		}
+	}
+
+	// if rule disables it, we override provided
+	if (!RuleB(NPC, EnableNPCQuestJournal))
+		journal_opts.journal_mode = Journal::Mode::None;
+
+	self->QuestJournalledSay(client, message, journal_opts);
 }
 
 void Lua_Mob::Shout(const char *message) {
@@ -1510,7 +1568,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			race = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1518,7 +1576,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			gender = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1526,7 +1584,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			texture = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1534,7 +1592,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			helmtexture = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1542,7 +1600,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			haircolor = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1550,7 +1608,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			beardcolor = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1558,7 +1616,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			eyecolor1 = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1566,7 +1624,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			eyecolor2 = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1574,7 +1632,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			hairstyle = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1582,7 +1640,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			luclinface = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1590,7 +1648,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			beard = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1598,7 +1656,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			aa_title = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1606,7 +1664,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			drakkin_heritage = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1614,7 +1672,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			drakkin_tattoo = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1622,7 +1680,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			drakkin_details = luabind::object_cast<int>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -1630,7 +1688,7 @@ void Lua_Mob::SendIllusionPacket(luabind::adl::object illusion) {
 	if(luabind::type(cur) != LUA_TNIL) {
 		try {
 			size = luabind::object_cast<float>(cur);
-		} catch(luabind::cast_failed) {
+		} catch(luabind::cast_failed &) {
 		}
 	}
 
@@ -2328,10 +2386,12 @@ luabind::scope lua_register_mob() {
 		.def("SetCurrentWP", &Lua_Mob::SetCurrentWP)
 		.def("GetSize", &Lua_Mob::GetSize)
 		.def("Message", &Lua_Mob::Message)
-		.def("Message_StringID", &Lua_Mob::Message_StringID)
+		.def("MessageString", &Lua_Mob::MessageString)
+		.def("Message_StringID", &Lua_Mob::MessageString)
 		.def("Say", (void(Lua_Mob::*)(const char*))& Lua_Mob::Say)
 		.def("Say", (void(Lua_Mob::*)(const char*, int))& Lua_Mob::Say)
-		.def("QuestSay", &Lua_Mob::QuestSay)
+		.def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *))&Lua_Mob::QuestSay)
+		.def("QuestSay", (void(Lua_Mob::*)(Lua_Client,const char *,luabind::adl::object))&Lua_Mob::QuestSay)
 		.def("Shout", (void(Lua_Mob::*)(const char*))& Lua_Mob::Shout)
 		.def("Shout", (void(Lua_Mob::*)(const char*, int))& Lua_Mob::Shout)
 		.def("Emote", &Lua_Mob::Emote)
diff --git a/zone/lua_mob.h b/zone/lua_mob.h
index be8eb388f..592ac6243 100644
--- a/zone/lua_mob.h
+++ b/zone/lua_mob.h
@@ -166,10 +166,11 @@ public:
 	void SetCurrentWP(int wp);
 	double GetSize();
 	void Message(int type, const char *message);
-	void Message_StringID(int type, int string_id, uint32 distance);
+	void MessageString(int type, int string_id, uint32 distance);
 	void Say(const char *message);
 	void Say(const char* message, int language);
 	void QuestSay(Lua_Client client, const char *message);
+	void QuestSay(Lua_Client client, const char *message, luabind::adl::object opts);
 	void Shout(const char *message);
 	void Shout(const char* message, int language);
 	void Emote(const char *message);
diff --git a/zone/lua_mod.cpp b/zone/lua_mod.cpp
index a891fb064..8dc77f4f7 100644
--- a/zone/lua_mod.cpp
+++ b/zone/lua_mod.cpp
@@ -1,3 +1,5 @@
+#ifdef LUA_EQEMU
+
 #include "lua.hpp"
 #include <luabind/luabind.hpp>
 #include <luabind/object.hpp>
@@ -629,3 +631,5 @@ void LuaMod::GetExperienceForKill(Client *self, Mob *against, uint32 &returnValu
 		lua_pop(L, n);
 	}
 }
+
+#endif
diff --git a/zone/lua_npc.cpp b/zone/lua_npc.cpp
index cb12bce23..4a8bd12a9 100644
--- a/zone/lua_npc.cpp
+++ b/zone/lua_npc.cpp
@@ -159,7 +159,7 @@ void Lua_NPC::SetSaveWaypoint(int wp) {
 
 void Lua_NPC::SetSp2(int sg2) {
 	Lua_Safe_Call_Void();
-	self->SetSp2(sg2);
+	self->SetSpawnGroupId(sg2);
 }
 
 int Lua_NPC::GetWaypointMax() {
@@ -174,7 +174,7 @@ int Lua_NPC::GetGrid() {
 
 uint32 Lua_NPC::GetSp2() {
 	Lua_Safe_Call_Int();
-	return self->GetSp2();
+	return self->GetSpawnGroupId();
 }
 
 int Lua_NPC::GetNPCFactionID() {
@@ -529,6 +529,24 @@ int Lua_NPC::GetAvoidanceRating()
 	return self->GetAvoidanceRating();
 }
 
+void Lua_NPC::SetSimpleRoamBox(float box_size)
+{
+	Lua_Safe_Call_Void();
+	self->SetSimpleRoamBox(box_size);
+}
+
+void Lua_NPC::SetSimpleRoamBox(float box_size, float move_distance)
+{
+	Lua_Safe_Call_Void();
+	self->SetSimpleRoamBox(box_size, move_distance);
+}
+
+void Lua_NPC::SetSimpleRoamBox(float box_size, float move_distance, int move_delay)
+{
+	Lua_Safe_Call_Void();
+	self->SetSimpleRoamBox(box_size, move_distance, move_delay);
+}
+
 luabind::scope lua_register_npc() {
 	return luabind::class_<Lua_NPC, Lua_Mob>("NPC")
 		.def(luabind::constructor<>())
@@ -614,6 +632,9 @@ luabind::scope lua_register_npc() {
 		.def("GetGuardPointZ", (float(Lua_NPC::*)(void))&Lua_NPC::GetGuardPointZ)
 		.def("SetPrimSkill", (void(Lua_NPC::*)(int))&Lua_NPC::SetPrimSkill)
 		.def("SetSecSkill", (void(Lua_NPC::*)(int))&Lua_NPC::SetSecSkill)
+		.def("SetSimpleRoamBox", (void(Lua_NPC::*)(float))&Lua_NPC::SetSimpleRoamBox)
+		.def("SetSimpleRoamBox", (void(Lua_NPC::*)(float, float))&Lua_NPC::SetSimpleRoamBox)
+		.def("SetSimpleRoamBox", (void(Lua_NPC::*)(float, float, int))&Lua_NPC::SetSimpleRoamBox)
 		.def("GetPrimSkill", (int(Lua_NPC::*)(void))&Lua_NPC::GetPrimSkill)
 		.def("GetSecSkill", (int(Lua_NPC::*)(void))&Lua_NPC::GetSecSkill)
 		.def("GetSwarmOwner", (int(Lua_NPC::*)(void))&Lua_NPC::GetSwarmOwner)
diff --git a/zone/lua_npc.h b/zone/lua_npc.h
index 4c407b3fa..92ad73cd7 100644
--- a/zone/lua_npc.h
+++ b/zone/lua_npc.h
@@ -131,6 +131,9 @@ public:
 	void MerchantCloseShop();
 	int GetRawAC();
 	int GetAvoidanceRating();
+	void SetSimpleRoamBox(float box_size);
+	void SetSimpleRoamBox(float box_size, float move_distance);
+	void SetSimpleRoamBox(float box_size, float move_distance, int move_delay);
 };
 
 #endif
diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp
index dda4b2d23..620ee14d1 100644
--- a/zone/lua_parser.cpp
+++ b/zone/lua_parser.cpp
@@ -123,7 +123,9 @@ const char *LuaEvents[_LargestEventID] = {
 	"event_tick",
 	"event_spawn_zone",
 	"event_death_zone",
-	"event_use_skill"
+	"event_use_skill",
+	"event_combine_validate",
+	"event_bot_command"
 };
 
 extern Zone *zone;
@@ -206,6 +208,8 @@ LuaParser::LuaParser() {
 	PlayerArgumentDispatch[EVENT_RESPAWN] = handle_player_respawn;
 	PlayerArgumentDispatch[EVENT_UNHANDLED_OPCODE] = handle_player_packet;
 	PlayerArgumentDispatch[EVENT_USE_SKILL] = handle_player_use_skill;
+	PlayerArgumentDispatch[EVENT_COMBINE_VALIDATE] = handle_player_combine_validate;
+	PlayerArgumentDispatch[EVENT_BOT_COMMAND] = handle_player_bot_command;
 
 	ItemArgumentDispatch[EVENT_ITEM_CLICK] = handle_item_click;
 	ItemArgumentDispatch[EVENT_ITEM_CLICK_CAST] = handle_item_click;
@@ -1102,7 +1106,9 @@ void LuaParser::MapFunctions(lua_State *L) {
 			lua_register_rules_const(),
 			lua_register_rulei(),
 			lua_register_ruler(),
-			lua_register_ruleb()
+			lua_register_ruleb(),
+			lua_register_journal_speakmode(),
+			lua_register_journal_mode()
 		];
 
 	} catch(std::exception &ex) {
@@ -1298,8 +1304,6 @@ QuestEventID LuaParser::ConvertLuaEvent(QuestEventID evt) {
 	}
 }
 
-#endif
-
 void LuaParser::MeleeMitigation(Mob *self, Mob *attacker, DamageHitInfo &hit, ExtraAttackOptions *opts, bool &ignoreDefault)
 {
 	for (auto &mod : mods_) {
@@ -1372,3 +1376,5 @@ uint32 LuaParser::GetExperienceForKill(Client *self, Mob *against, bool &ignoreD
 	}
 	return retval;
 }
+
+#endif
diff --git a/zone/lua_parser_events.cpp b/zone/lua_parser_events.cpp
index e70c5de9f..3ca9edad7 100644
--- a/zone/lua_parser_events.cpp
+++ b/zone/lua_parser_events.cpp
@@ -514,6 +514,50 @@ void handle_player_use_skill(QuestInterface *parse, lua_State* L, Client* client
 	lua_setfield(L, -2, "skill_level");
 }
 
+void handle_player_combine_validate(QuestInterface* parse, lua_State* L, Client* client, std::string data, uint32 extra_data,
+									std::vector<EQEmu::Any>* extra_pointers) {
+	Seperator sep(data.c_str());
+	lua_pushinteger(L, extra_data);
+	lua_setfield(L, -2, "recipe_id");
+
+	lua_pushstring(L, sep.arg[0]);
+	lua_setfield(L, -2, "validate_type");
+
+	int zone_id = -1;
+	int tradeskill_id = -1;
+	if (strcmp(sep.arg[0], "check_zone") == 0) {
+		zone_id = std::stoi(sep.arg[1]);
+	}
+	else if (strcmp(sep.arg[0], "check_tradeskill") == 0) {
+		tradeskill_id = std::stoi(sep.arg[1]);
+	}
+
+	lua_pushinteger(L, zone_id);
+	lua_setfield(L, -2, "zone_id");
+
+	lua_pushinteger(L, tradeskill_id);
+	lua_setfield(L, -2, "tradeskill_id");
+}
+
+void handle_player_bot_command(QuestInterface* parse, lua_State* L, Client* client, std::string data, uint32 extra_data,
+	std::vector<EQEmu::Any>* extra_pointers) {
+	Seperator sep(data.c_str(), ' ', 10, 100, true);
+	std::string bot_command(sep.arg[0] + 1);
+	lua_pushstring(L, bot_command.c_str());
+	lua_setfield(L, -2, "bot_command");
+
+	luabind::adl::object args = luabind::newtable(L);
+	int max_args = sep.GetMaxArgNum();
+	for (int i = 1; i < max_args; ++i) {
+		if (strlen(sep.arg[i]) > 0) {
+			args[i] = std::string(sep.arg[i]);
+		}
+	}
+
+	args.push(L);
+	lua_setfield(L, -2, "args");
+}
+
 //Item
 void handle_item_click(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data,
 					   std::vector<EQEmu::Any> *extra_pointers) {
diff --git a/zone/lua_parser_events.h b/zone/lua_parser_events.h
index 44ba9b72f..9eeeb11cb 100644
--- a/zone/lua_parser_events.h
+++ b/zone/lua_parser_events.h
@@ -97,6 +97,10 @@ void handle_player_null(QuestInterface *parse, lua_State* L, Client* client, std
 		std::vector<EQEmu::Any> *extra_pointers);
 void handle_player_use_skill(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data,
 		std::vector<EQEmu::Any> *extra_pointers);
+void handle_player_combine_validate(QuestInterface* parse, lua_State* L, Client* client, std::string data, uint32 extra_data,
+		std::vector<EQEmu::Any>* extra_pointers);
+void handle_player_bot_command(QuestInterface *parse, lua_State* L, Client* client, std::string data, uint32 extra_data,
+		std::vector<EQEmu::Any> *extra_pointers);
 
 //Item
 void handle_item_click(QuestInterface *parse, lua_State* L, Client* client, EQEmu::ItemInstance* item, Mob *mob, std::string data, uint32 extra_data,
diff --git a/zone/lua_stat_bonuses.cpp b/zone/lua_stat_bonuses.cpp
index e1fb329cc..d311cf123 100644
--- a/zone/lua_stat_bonuses.cpp
+++ b/zone/lua_stat_bonuses.cpp
@@ -1,3 +1,5 @@
+#ifdef LUA_EQEMU
+
 #include "lua.hpp"
 #include <luabind/luabind.hpp>
 
@@ -333,6 +335,11 @@ int Lua_StatBonuses::Geteffective_casting_level() const {
 	return self->effective_casting_level;
 }
 
+int Lua_StatBonuses::Getadjusted_casting_skill() const {
+	Lua_Safe_Call_Int();
+	return self->adjusted_casting_skill;
+}
+
 int Lua_StatBonuses::Getreflect_chance() const {
 	Lua_Safe_Call_Int();
 	return self->reflect_chance;
@@ -1347,6 +1354,7 @@ luabind::scope lua_register_stat_bonuses() {
 		.def("skillmod", &Lua_StatBonuses::Getskillmod)
 		.def("skillmodmax", &Lua_StatBonuses::Getskillmodmax)
 		.def("effective_casting_level", &Lua_StatBonuses::Geteffective_casting_level)
+		.def("adjusted_casting_skill", &Lua_StatBonuses::Getadjusted_casting_skill)
 		.def("reflect_chance", &Lua_StatBonuses::Getreflect_chance)
 		.def("singingMod", &Lua_StatBonuses::GetsingingMod)
 		.def("Amplification", &Lua_StatBonuses::GetAmplification)
@@ -1536,4 +1544,6 @@ luabind::scope lua_register_stat_bonuses() {
 		.def("Assassinate", &Lua_StatBonuses::GetAssassinate)
 		.def("AssassinateLevel", &Lua_StatBonuses::GetAssassinateLevel)
 		.def("ReduceTradeskillFail", &Lua_StatBonuses::GetReduceTradeskillFail);
-}
\ No newline at end of file
+}
+
+#endif
diff --git a/zone/lua_stat_bonuses.h b/zone/lua_stat_bonuses.h
index 9ad04d681..c65c589a4 100644
--- a/zone/lua_stat_bonuses.h
+++ b/zone/lua_stat_bonuses.h
@@ -91,6 +91,7 @@ public:
 	int32 Getskillmod(int idx) const;
 	int32 Getskillmodmax(int idx) const;
 	int Geteffective_casting_level() const;
+	int Getadjusted_casting_skill() const;
 	int Getreflect_chance() const;
 	uint32 GetsingingMod() const;
 	uint32 GetAmplification() const;
diff --git a/zone/net.cpp b/zone/main.cpp
similarity index 68%
rename from zone/net.cpp
rename to zone/main.cpp
index 4b4859e5e..6d3eee96c 100644
--- a/zone/net.cpp
+++ b/zone/main.cpp
@@ -42,13 +42,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/eqemu_exception.h"
 #include "../common/spdat.h"
 #include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
 
 #include "api_service.h"
 #include "zone_config.h"
 #include "masterentity.h"
 #include "worldserver.h"
-#include "net.h"
 #include "zone.h"
 #include "queryserv.h"
 #include "command.h"
@@ -97,7 +95,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 volatile bool RunLoops = true;
 extern volatile bool is_zone_loaded;
 
-NetConnection net;
 EntityList entity_list;
 WorldServer worldserver;
 uint32 numclients = 0;
@@ -116,6 +113,9 @@ const ZoneConfig *Config;
 double frame_time = 0.0;
 
 void Shutdown();
+void UpdateWindowTitle(char* iNewTitle);
+void CatchSignal(int sig_num);
+
 extern void MapOpcodes();
 
 int main(int argc, char** argv) {
@@ -146,9 +146,9 @@ int main(int argc, char** argv) {
 
 	QServ = new QueryServ;
 
-	Log(Logs::General, Logs::Zone_Server, "Loading server configuration..");
+	LogInfo("Loading server configuration..");
 	if (!ZoneConfig::LoadConfig()) {
-		Log(Logs::General, Logs::Error, "Loading server configuration failed.");
+		LogError("Loading server configuration failed");
 		return 1;
 	}
 	Config = ZoneConfig::get();
@@ -226,14 +226,14 @@ int main(int argc, char** argv) {
 		worldserver.SetLauncherName("NONE");
 	}
 
-	Log(Logs::General, Logs::Zone_Server, "Connecting to MySQL...");
+	LogInfo("Connecting to MySQL... ");
 	if (!database.Connect(
 		Config->DatabaseHost.c_str(),
 		Config->DatabaseUsername.c_str(),
 		Config->DatabasePassword.c_str(),
 		Config->DatabaseDB.c_str(),
 		Config->DatabasePort)) {
-		Log(Logs::General, Logs::Error, "Cannot continue without a database connection.");
+		LogError("Cannot continue without a database connection");
 		return 1;
 	}
 
@@ -256,135 +256,135 @@ int main(int argc, char** argv) {
 	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
 #endif
 
-	Log(Logs::General, Logs::Zone_Server, "CURRENT_VERSION: %s", CURRENT_VERSION);
+	LogInfo("CURRENT_VERSION: {}", CURRENT_VERSION);
 
 	/*
 	* Setup nice signal handlers
 	*/
 	if (signal(SIGINT, CatchSignal) == SIG_ERR) {
-		Log(Logs::General, Logs::Error, "Could not set signal handler");
+		LogError("Could not set signal handler");
 		return 1;
 	}
 	if (signal(SIGTERM, CatchSignal) == SIG_ERR) {
-		Log(Logs::General, Logs::Error, "Could not set signal handler");
+		LogError("Could not set signal handler");
 		return 1;
 	}
 #ifndef WIN32
 	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
-		Log(Logs::General, Logs::Error, "Could not set signal handler");
+		LogError("Could not set signal handler");
 		return 1;
 	}
 #endif
 
-	Log(Logs::General, Logs::Zone_Server, "Mapping Incoming Opcodes");
+	LogInfo("Mapping Incoming Opcodes");
 	MapOpcodes();
 
-	Log(Logs::General, Logs::Zone_Server, "Loading Variables");
+	LogInfo("Loading Variables");
 	database.LoadVariables();
 
 	std::string hotfix_name;
 	if (database.GetVariable("hotfix_name", hotfix_name)) {
 		if (!hotfix_name.empty()) {
-			Log(Logs::General, Logs::Zone_Server, "Current hotfix in use: '%s'", hotfix_name.c_str());
+			LogInfo("Current hotfix in use: [{}]", hotfix_name.c_str());
 		}
 	}
 
-	Log(Logs::General, Logs::Zone_Server, "Loading zone names");
+	LogInfo("Loading zone names");
 	database.LoadZoneNames();
 
-	Log(Logs::General, Logs::Zone_Server, "Loading items");
+	LogInfo("Loading items");
 	if (!database.LoadItems(hotfix_name)) {
-		Log(Logs::General, Logs::Error, "Loading items FAILED!");
-		Log(Logs::General, Logs::Error, "Failed. But ignoring error and going on...");
+		LogError("Loading items failed!");
+		LogError("Failed. But ignoring error and going on..");
 	}
 
-	Log(Logs::General, Logs::Zone_Server, "Loading npc faction lists");
+	LogInfo("Loading npc faction lists");
 	if (!database.LoadNPCFactionLists(hotfix_name)) {
-		Log(Logs::General, Logs::Error, "Loading npcs faction lists FAILED!");
+		LogError("Loading npcs faction lists failed!");
 		return 1;
 	}
-	Log(Logs::General, Logs::Zone_Server, "Loading loot tables");
+	LogInfo("Loading loot tables");
 	if (!database.LoadLoot(hotfix_name)) {
-		Log(Logs::General, Logs::Error, "Loading loot FAILED!");
+		LogError("Loading loot failed!");
 		return 1;
 	}
-	Log(Logs::General, Logs::Zone_Server, "Loading skill caps");
+	LogInfo("Loading skill caps");
 	if (!database.LoadSkillCaps(std::string(hotfix_name))) {
-		Log(Logs::General, Logs::Error, "Loading skill caps FAILED!");
+		LogError("Loading skill caps failed!");
 		return 1;
 	}
 
-	Log(Logs::General, Logs::Zone_Server, "Loading spells");
+	LogInfo("Loading spells");
 	if (!database.LoadSpells(hotfix_name, &SPDAT_RECORDS, &spells)) {
-		Log(Logs::General, Logs::Error, "Loading spells FAILED!");
+		LogError("Loading spells failed!");
 		return 1;
 	}
 
-	Log(Logs::General, Logs::Zone_Server, "Loading base data");
+	LogInfo("Loading base data");
 	if (!database.LoadBaseData(hotfix_name)) {
-		Log(Logs::General, Logs::Error, "Loading base data FAILED!");
+		LogError("Loading base data failed!");
 		return 1;
 	}
 
-	Log(Logs::General, Logs::Zone_Server, "Loading guilds");
+	LogInfo("Loading guilds");
 	guild_mgr.LoadGuilds();
 
-	Log(Logs::General, Logs::Zone_Server, "Loading factions");
+	LogInfo("Loading factions");
 	database.LoadFactionData();
 
-	Log(Logs::General, Logs::Zone_Server, "Loading titles");
+	LogInfo("Loading titles");
 	title_manager.LoadTitles();
 
-	Log(Logs::General, Logs::Zone_Server, "Loading tributes");
+	LogInfo("Loading tributes");
 	database.LoadTributes();
 
-	Log(Logs::General, Logs::Zone_Server, "Loading corpse timers");
+	LogInfo("Loading corpse timers");
 	database.GetDecayTimes(npcCorpseDecayTimes);
 
-	Log(Logs::General, Logs::Zone_Server, "Loading profanity list");
+	LogInfo("Loading profanity list");
 	if (!EQEmu::ProfanityManager::LoadProfanityList(&database))
-		Log(Logs::General, Logs::Error, "Loading profanity list FAILED!");
+		LogError("Loading profanity list failed!");
 
-	Log(Logs::General, Logs::Zone_Server, "Loading commands");
+	LogInfo("Loading commands");
 	int retval = command_init();
 	if (retval<0)
-		Log(Logs::General, Logs::Error, "Command loading FAILED");
+		LogError("Command loading failed");
 	else
-		Log(Logs::General, Logs::Zone_Server, "%d commands loaded", retval);
+		LogInfo("{} commands loaded", retval);
 
 	//rules:
 	{
 		std::string tmp;
 		if (database.GetVariable("RuleSet", tmp)) {
-			Log(Logs::General, Logs::Zone_Server, "Loading rule set '%s'", tmp.c_str());
+			LogInfo("Loading rule set [{}]", tmp.c_str());
 			if (!RuleManager::Instance()->LoadRules(&database, tmp.c_str(), false)) {
-				Log(Logs::General, Logs::Error, "Failed to load ruleset '%s', falling back to defaults.", tmp.c_str());
+				LogError("Failed to load ruleset [{}], falling back to defaults", tmp.c_str());
 			}
 		}
 		else {
 			if (!RuleManager::Instance()->LoadRules(&database, "default", false)) {
-				Log(Logs::General, Logs::Zone_Server, "No rule set configured, using default rules");
+				LogInfo("No rule set configured, using default rules");
 			}
 			else {
-				Log(Logs::General, Logs::Zone_Server, "Loaded default rule set 'default'", tmp.c_str());
+				LogInfo("Loaded default rule set 'default'");
 			}
 		}
 
 		EQEmu::InitializeDynamicLookups();
-		Log(Logs::General, Logs::Zone_Server, "Initialized dynamic dictionary entries");
+		LogInfo("Initialized dynamic dictionary entries");
 	}
 
 #ifdef BOTS
-	Log(Logs::General, Logs::Zone_Server, "Loading bot commands");
+	LogInfo("Loading bot commands");
 	int botretval = bot_command_init();
 	if (botretval<0)
-		Log(Logs::General, Logs::Error, "Bot command loading FAILED");
+		LogError("Bot command loading failed");
 	else
-		Log(Logs::General, Logs::Zone_Server, "%d bot commands loaded", botretval);
+		LogInfo("[{}] bot commands loaded", botretval);
 
-	Log(Logs::General, Logs::Zone_Server, "Loading bot spell casting chances");
+	LogInfo("Loading bot spell casting chances");
 	if (!database.botdb.LoadBotSpellCastingChances())
-		Log(Logs::General, Logs::Error, "Bot spell casting chances loading FAILED");
+		LogError("Bot spell casting chances loading failed");
 #endif
 
 	if (RuleB(TaskSystem, EnableTaskSystem)) {
@@ -408,7 +408,7 @@ int main(int argc, char** argv) {
 #endif
 
 	//now we have our parser, load the quests
-	Log(Logs::General, Logs::Zone_Server, "Loading quests");
+	LogInfo("Loading quests");
 	parse->ReloadQuests();
 
 	worldserver.Connect();
@@ -421,10 +421,10 @@ int main(int argc, char** argv) {
 #endif
 #endif
 	if (!strlen(zone_name) || !strcmp(zone_name, ".")) {
-		Log(Logs::General, Logs::Zone_Server, "Entering sleep mode");
+		LogInfo("Entering sleep mode");
 	}
 	else if (!Zone::Bootup(database.GetZoneID(zone_name), instance_id, true)) {
-		Log(Logs::General, Logs::Error, "Zone Bootup failed :: Zone::Bootup");
+		LogError("Zone Bootup failed :: Zone::Bootup");
 		zone = 0;
 	}
 
@@ -433,15 +433,15 @@ int main(int argc, char** argv) {
 	RegisterAllPatches(stream_identifier);
 
 #ifndef WIN32
-	Log(Logs::Detail, Logs::None, "Main thread running with thread id %d", pthread_self());
+	LogDebug("Main thread running with thread id [{}]", pthread_self());
 #endif
 
-	bool worldwasconnected    = worldserver.Connected();
-	bool eqsf_open            = false;
+	bool worldwasconnected       = worldserver.Connected();
+	bool eqsf_open               = false;
 	bool websocker_server_opened = false;
 
 	Timer quest_timers(100);
-	UpdateWindowTitle();
+	UpdateWindowTitle(nullptr);
 	std::shared_ptr<EQStreamInterface> eqss;
 	EQStreamInterface *eqsi;
 	std::unique_ptr<EQ::Net::EQStreamManager> eqsm;
@@ -460,16 +460,10 @@ int main(int argc, char** argv) {
 		frame_prev = frame_now;
 
 		/**
-		 * Telnet server
+		 * Websocket server
 		 */
 		if (!websocker_server_opened && Config->ZonePort != 0) {
-			Log(
-				Logs::General,
-				Logs::Zone_Server,
-				"Websocket Server listener started (%s:%u).",
-				Config->TelnetIP.c_str(),
-				Config->ZonePort
-			);
+			LogInfo("Websocket Server listener started ([{}]:[{}])", Config->TelnetIP.c_str(), Config->ZonePort);
 			ws_server.reset(new EQ::Net::WebsocketServer(Config->TelnetIP, Config->ZonePort));
 			RegisterApiService(ws_server);
 			websocker_server_opened = true;
@@ -479,7 +473,7 @@ int main(int argc, char** argv) {
 		 * EQStreamManager
 		 */
 		if (!eqsf_open && Config->ZonePort != 0) {
-			Log(Logs::General, Logs::Zone_Server, "Starting EQ Network server on port %d", Config->ZonePort);
+			LogInfo("Starting EQ Network server on port {}", Config->ZonePort);
 
 			EQStreamManagerInterfaceOptions opts(Config->ZonePort, false, RuleB(Network, CompressZoneStream));
 			opts.daybreak_options.resend_delay_ms = RuleI(Network, ResendDelayBaseMS);
@@ -492,7 +486,7 @@ int main(int argc, char** argv) {
 
 			eqsm->OnNewConnection([&stream_identifier](std::shared_ptr<EQ::Net::EQStream> stream) {
 				stream_identifier.AddStream(stream);
-				LogF(Logs::Detail, Logs::World_Server, "New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
+				LogF(Logs::Detail, Logs::WorldServer, "New connection from IP {0}:{1}", stream->GetRemoteIP(), ntohs(stream->GetRemotePort()));
 			});
 		}
 
@@ -504,7 +498,7 @@ int main(int argc, char** argv) {
 			//now that we know what patch they are running, start up their client object
 			struct in_addr	in;
 			in.s_addr = eqsi->GetRemoteIP();
-			Log(Logs::Detail, Logs::World_Server, "New client from %s:%d", inet_ntoa(in), ntohs(eqsi->GetRemotePort()));
+			LogInfo("New client from [{}]:[{}]", inet_ntoa(in), ntohs(eqsi->GetRemotePort()));
 			auto client = new Client(eqsi);
 			entity_list.AddClient(client);
 		}
@@ -521,23 +515,12 @@ int main(int argc, char** argv) {
 
 		if (is_zone_loaded) {
 			{
-				if (net.group_timer.Enabled() && net.group_timer.Check())
-					entity_list.GroupProcess();
-
-				if (net.door_timer.Enabled() && net.door_timer.Check())
-					entity_list.DoorProcess();
-
-				if (net.object_timer.Enabled() && net.object_timer.Check())
-					entity_list.ObjectProcess();
-
-				if (net.corpse_timer.Enabled() && net.corpse_timer.Check())
-					entity_list.CorpseProcess();
-
-				if (net.trap_timer.Enabled() && net.trap_timer.Check())
-					entity_list.TrapProcess();
-
-				if (net.raid_timer.Enabled() && net.raid_timer.Check())
-					entity_list.RaidProcess();
+				entity_list.GroupProcess();
+				entity_list.DoorProcess();
+				entity_list.ObjectProcess();
+				entity_list.CorpseProcess();
+				entity_list.TrapProcess();
+				entity_list.RaidProcess();
 
 				entity_list.Process();
 				entity_list.MobProcess();
@@ -550,8 +533,9 @@ int main(int argc, char** argv) {
 					}
 				}
 
-				if (quest_timers.Check())
+				if (quest_timers.Check()) {
 					quest_manager.Process();
+				}
 
 			}
 		}
@@ -564,29 +548,9 @@ int main(int argc, char** argv) {
 	};
 
 	EQ::Timer process_timer(loop_fn);
-	process_timer.Start(1000, true);
+	process_timer.Start(32, true);
 
-	while (RunLoops) {
-		bool previous_loaded = is_zone_loaded && numclients > 0;
-		EQ::EventLoop::Get().Process();
-
-		bool current_loaded = is_zone_loaded && numclients > 0;
-		if (previous_loaded && !current_loaded) {
-			process_timer.Stop();
-			process_timer.Start(1000, true);
-		}
-		else if (!previous_loaded && current_loaded) {
-			process_timer.Stop();
-			process_timer.Start(32, true);
-		}
-
-		if (current_loaded) {
-			Sleep(1);
-		}
-		else {
-			Sleep(10);
-		}
-	}
+	EQ::EventLoop::Get().Run();
 
 	entity_list.Clear();
 	entity_list.RemoveAllEncounters(); // gotta do it manually or rewrite lots of shit :P
@@ -608,14 +572,14 @@ int main(int argc, char** argv) {
 	bot_command_deinit();
 #endif
 	safe_delete(parse);
-	Log(Logs::General, Logs::Zone_Server, "Proper zone shutdown complete.");
+	LogInfo("Proper zone shutdown complete.");
 	LogSys.CloseFileLogs();
 	return 0;
 }
 
 void CatchSignal(int sig_num) {
 #ifdef _WINDOWS
-	Log(Logs::General, Logs::Zone_Server, "Recieved signal: %i", sig_num);
+	LogInfo("Recieved signal: [{}]", sig_num);
 #endif
 	RunLoops = false;
 }
@@ -624,64 +588,10 @@ void Shutdown()
 {
 	Zone::Shutdown(true);
 	RunLoops = false;
-	Log(Logs::General, Logs::Zone_Server, "Shutting down...");
+	LogInfo("Shutting down...");
 	LogSys.CloseFileLogs();
 }
 
-uint32 NetConnection::GetIP()
-{
-	char name[255 + 1];
-	size_t len = 0;
-	hostent* host = 0;
-
-	if (gethostname(name, len) < 0 || len <= 0)
-	{
-		return 0;
-	}
-
-	host = (hostent*)gethostbyname(name);
-	if (host == 0)
-	{
-		return 0;
-	}
-
-	return inet_addr(host->h_addr);
-}
-
-uint32 NetConnection::GetIP(char* name)
-{
-	hostent* host = 0;
-
-	host = (hostent*)gethostbyname(name);
-	if (host == 0)
-	{
-		return 0;
-	}
-
-	return inet_addr(host->h_addr);
-
-}
-
-NetConnection::NetConnection()
-	:
-	object_timer(5000),
-	door_timer(5000),
-	corpse_timer(2000),
-	group_timer(1000),
-	raid_timer(1000),
-	trap_timer(1000)
-{
-	group_timer.Disable();
-	raid_timer.Disable();
-	corpse_timer.Disable();
-	door_timer.Disable();
-	object_timer.Disable();
-	trap_timer.Disable();
-}
-
-NetConnection::~NetConnection() {
-}
-
 /* Update Window Title with relevant information */
 void UpdateWindowTitle(char* iNewTitle) {
 #ifdef _WINDOWS
diff --git a/zone/map.cpp b/zone/map.cpp
index a63ea6672..dbfa3928e 100644
--- a/zone/map.cpp
+++ b/zone/map.cpp
@@ -223,7 +223,7 @@ Map *Map::LoadMapFile(std::string file) {
 	filename += file;
 	filename += ".map";
 
-	Log(Logs::General, Logs::Status, "Attempting to load Map File '%s'", filename.c_str());
+	LogInfo("Attempting to load Map File [{}]", filename.c_str());
 
 	auto m = new Map();
 	if (m->Load(filename)) {
@@ -238,50 +238,69 @@ Map *Map::LoadMapFile(std::string file) {
 bool Map::Load(std::string filename, bool force_mmf_overwrite)
 {
 	if (LoadMMF(filename, force_mmf_overwrite)) {
-		Log(Logs::General, Logs::Status, "Loaded .MMF Map File in place of '%s'", filename.c_str());
+		LogInfo("Loaded .MMF Map File in place of [{}]", filename.c_str());
 		return true;
 	}
 #else
-bool Map::Load(std::string filename)
+
+/**
+ * @param filename
+ * @return
+ */
+bool Map::Load(const std::string &filename)
 {
 #endif /*USE_MAP_MMFS*/
 
-	FILE *f = fopen(filename.c_str(), "rb");
-	if(f) {
+	FILE *map_file = fopen(filename.c_str(), "rb");
+	if (map_file) {
 		uint32 version;
-		if(fread(&version, sizeof(version), 1, f) != 1) {
-			fclose(f);
+		if (fread(&version, sizeof(version), 1, map_file) != 1) {
+			fclose(map_file);
 			return false;
 		}
-		
-		if(version == 0x01000000) {
-			Log(Logs::General, Logs::Status, "Loaded V1 Map File '%s'", filename.c_str());
-			bool v = LoadV1(f);
-			fclose(f);
+
+		if (version == 0x01000000) {
+			LogInfo("Loaded V1 Map File [{}]", filename.c_str());
+			bool loaded_map_file = LoadV1(map_file);
+			fclose(map_file);
+
+			if (loaded_map_file) {
+				LogInfo("Loaded V1 Map File [{}]", filename.c_str());
+			} else {
+				LogError("Failed to load V1 Map File [{}]", filename.c_str());
+			}
 
 #ifdef USE_MAP_MMFS
 			if (v)
 				return SaveMMF(filename, force_mmf_overwrite);
 #endif /*USE_MAP_MMFS*/
 
-			return v;
-		} else if(version == 0x02000000) {
-			Log(Logs::General, Logs::Status, "Loaded V2 Map File '%s'", filename.c_str());
-			bool v = LoadV2(f);
-			fclose(f);
+			return loaded_map_file;
+		}
+		else if (version == 0x02000000) {
+			LogInfo("Loading V2 Map File [{}]", filename.c_str());
+			bool loaded_map_file = LoadV2(map_file);
+			fclose(map_file);
+
+			if (loaded_map_file) {
+				LogInfo("Loaded V2 Map File [{}]", filename.c_str());
+			} else {
+				LogError("Failed to load V2 Map File [{}]", filename.c_str());
+			}
 
 #ifdef USE_MAP_MMFS
 			if (v)
 				return SaveMMF(filename, force_mmf_overwrite);
 #endif /*USE_MAP_MMFS*/
 
-			return v;
-		} else {
-			fclose(f);
+			return loaded_map_file;
+		}
+		else {
+			fclose(map_file);
 			return false;
 		}
 	}
-	
+
 	return false;
 }
 
@@ -943,53 +962,53 @@ bool Map::LoadMMF(const std::string& map_file_name, bool force_mmf_overwrite)
 	std::string mmf_file_name = map_file_name;
 	strip_map_extension(mmf_file_name);
 	if (!add_mmf_extension(mmf_file_name)) {
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s'", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}]", mmf_file_name.c_str());
 		return false;
 	}
 
 	FILE *f = fopen(mmf_file_name.c_str(), "rb");
 	if (!f) {
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s' - could not open file", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}] - could not open file", mmf_file_name.c_str());
 		return false;
 	}
 
 	uint32 file_version;
 	if (fread(&file_version, sizeof(uint32), 1, f) != 1) {
 		fclose(f);
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s' - f@file_version", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}] - f@file_version", mmf_file_name.c_str());
 		return false;
 	}
 	
 	uint32 rm_buffer_size;
 	if (fread(&rm_buffer_size, sizeof(uint32), 1, f) != 1) {
 		fclose(f);
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s' - f@rm_buffer_size", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}] - f@rm_buffer_size", mmf_file_name.c_str());
 		return false;
 	}
 
 	uint32 rm_buffer_crc32;
 	if (fread(&rm_buffer_crc32, sizeof(uint32), 1, f) != 1) {
 		fclose(f);
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s' - f@rm_buffer_crc32", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}] - f@rm_buffer_crc32", mmf_file_name.c_str());
 		return false;
 	}
 	if (rm_buffer_crc32 != /*crc32_check*/ 0) {
 		fclose(f);
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s' - bad rm_buffer checksum", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}] - bad rm_buffer checksum", mmf_file_name.c_str());
 		return false;
 	}
 
 	uint32 mmf_buffer_size;
 	if (fread(&mmf_buffer_size, sizeof(uint32), 1, f) != 1) {
 		fclose(f);
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s' - f@mmf_buffer_size", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}] - f@mmf_buffer_size", mmf_file_name.c_str());
 		return false;
 	}
 
 	std::vector<char> mmf_buffer(mmf_buffer_size);
 	if (fread(mmf_buffer.data(), mmf_buffer_size, 1, f) != 1) {
 		fclose(f);
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s' - f@mmf_buffer", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}] - f@mmf_buffer", mmf_file_name.c_str());
 		return false;
 	}
 	
@@ -1016,7 +1035,7 @@ bool Map::LoadMMF(const std::string& map_file_name, bool force_mmf_overwrite)
 	if (!imp->rm) {
 		delete imp;
 		imp = nullptr;
-		Log(Logs::General, Logs::Zone_Server, "Failed to load Map MMF file: '%s' - null RaycastMesh", mmf_file_name.c_str());
+		LogInfo("Failed to load Map MMF file: [{}] - null RaycastMesh", mmf_file_name.c_str());
 		return false;
 	}
 
@@ -1026,14 +1045,14 @@ bool Map::LoadMMF(const std::string& map_file_name, bool force_mmf_overwrite)
 bool Map::SaveMMF(const std::string& map_file_name, bool force_mmf_overwrite)
 {
 	if (!imp || !imp->rm) {
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file - No implementation (map_file_name: '%s')", map_file_name.c_str());
+		LogInfo("Failed to save Map MMF file - No implementation (map_file_name: [{}])", map_file_name.c_str());
 		return false;
 	}
 
 	std::string mmf_file_name = map_file_name;
 	strip_map_extension(mmf_file_name);
 	if (!add_mmf_extension(mmf_file_name)) {
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s'", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}]", mmf_file_name.c_str());
 		return false;
 	}
 	
@@ -1047,7 +1066,7 @@ bool Map::SaveMMF(const std::string& map_file_name, bool force_mmf_overwrite)
 	std::vector<char> rm_buffer; // size set in MyRaycastMesh::serialize()
 	serializeRaycastMesh(imp->rm, rm_buffer);
 	if (rm_buffer.empty()) {
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s' - empty RaycastMesh buffer", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}] - empty RaycastMesh buffer", mmf_file_name.c_str());
 		return false;
 	}
 
@@ -1058,13 +1077,13 @@ bool Map::SaveMMF(const std::string& map_file_name, bool force_mmf_overwrite)
 	
 	mmf_buffer_size = DeflateData(rm_buffer.data(), rm_buffer.size(), mmf_buffer.data(), mmf_buffer.size());
 	if (!mmf_buffer_size) {
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s' - null MMF buffer size", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}] - null MMF buffer size", mmf_file_name.c_str());
 		return false;
 	}
 	
 	f = fopen(mmf_file_name.c_str(), "wb");
 	if (!f) {
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s' - could not open file", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}] - could not open file", mmf_file_name.c_str());
 		return false;
 	}
 	
@@ -1072,14 +1091,14 @@ bool Map::SaveMMF(const std::string& map_file_name, bool force_mmf_overwrite)
 	if (fwrite(&file_version, sizeof(uint32), 1, f) != 1) {
 		fclose(f);
 		std::remove(mmf_file_name.c_str());
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s' - f@file_version", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}] - f@file_version", mmf_file_name.c_str());
 		return false;
 	}
 	
 	if (fwrite(&rm_buffer_size, sizeof(uint32), 1, f) != 1) {
 		fclose(f);
 		std::remove(mmf_file_name.c_str());
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s' - f@rm_buffer_size", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}] - f@rm_buffer_size", mmf_file_name.c_str());
 		return false;
 	}
 
@@ -1087,21 +1106,21 @@ bool Map::SaveMMF(const std::string& map_file_name, bool force_mmf_overwrite)
 	if (fwrite(&rm_buffer_crc32, sizeof(uint32), 1, f) != 1) {
 		fclose(f);
 		std::remove(mmf_file_name.c_str());
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s' - f@rm_buffer_crc32", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}] - f@rm_buffer_crc32", mmf_file_name.c_str());
 		return false;
 	}
 
 	if (fwrite(&mmf_buffer_size, sizeof(uint32), 1, f) != 1) {
 		fclose(f);
 		std::remove(mmf_file_name.c_str());
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s' - f@mmf_buffer_size", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}] - f@mmf_buffer_size", mmf_file_name.c_str());
 		return false;
 	}
 	
 	if (fwrite(mmf_buffer.data(), mmf_buffer_size, 1, f) != 1) {
 		fclose(f);
 		std::remove(mmf_file_name.c_str());
-		Log(Logs::General, Logs::Zone_Server, "Failed to save Map MMF file: '%s' - f@mmf_buffer", mmf_file_name.c_str());
+		LogInfo("Failed to save Map MMF file: [{}] - f@mmf_buffer", mmf_file_name.c_str());
 		return false;
 	}
 
diff --git a/zone/map.h b/zone/map.h
index 8a2ec7f68..eefb43f2d 100644
--- a/zone/map.h
+++ b/zone/map.h
@@ -47,7 +47,7 @@ public:
 #ifdef USE_MAP_MMFS
 	bool Load(std::string filename, bool force_mmf_overwrite = false);
 #else
-	bool Load(std::string filename);
+	bool Load(const std::string& filename);
 #endif
 
 	static Map *LoadMapFile(std::string file);
diff --git a/zone/merc.cpp b/zone/merc.cpp
index 7c15fbd65..4e635fe72 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -891,7 +891,7 @@ int32 Merc::CalcMaxMana()
 		break;
 			  }
 	default: {
-		Log(Logs::General, Logs::None, "Invalid Class '%c' in CalcMaxMana", GetCasterClass());
+		LogDebug("Invalid Class [{}] in CalcMaxMana", GetCasterClass());
 		max_mana = 0;
 		break;
 			 }
@@ -912,7 +912,7 @@ int32 Merc::CalcMaxMana()
 	}
 
 #if EQDEBUG >= 11
-	Log(Logs::General, Logs::None, "Merc::CalcMaxMana() called for %s - returning %d", GetName(), max_mana);
+	LogDebug("Merc::CalcMaxMana() called for [{}] - returning [{}]", GetName(), max_mana);
 #endif
 	return max_mana;
 }
@@ -1618,7 +1618,7 @@ void Merc::AI_Process() {
 					{
 						if(zone->random.Roll(flurrychance))
 						{
-							Message_StringID(MT_NPCFlurry, YOU_FLURRY);
+							MessageString(Chat::NPCFlurry, YOU_FLURRY);
 							Attack(GetTarget(), EQEmu::invslot::slotPrimary, false);
 							Attack(GetTarget(), EQEmu::invslot::slotPrimary, false);
 						}
@@ -1637,11 +1637,11 @@ void Merc::AI_Process() {
 				// TODO: Do mercs berserk? Find this out on live...
 				//if (GetClass() == WARRIOR || GetClass() == BERSERKER) {
 				//      if(GetHP() > 0 && !berserk && this->GetHPRatio() < 30) {
-				//              entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_START, GetName());
+				//              entity_list.MessageCloseString(this, false, 200, 0, BERSERK_START, GetName());
 				//              this->berserk = true;
 				//      }
 				//      if (berserk && this->GetHPRatio() > 30) {
-				//              entity_list.MessageClose_StringID(this, false, 200, 0, BERSERK_END, GetName());
+				//              entity_list.MessageCloseString(this, false, 200, 0, BERSERK_END, GetName());
 				//              this->berserk = false;
 				//      }
 				//}
@@ -1688,7 +1688,7 @@ void Merc::AI_Process() {
 			if (AI_movement_timer->Check())
 			{
 				if(!IsRooted()) {
-					Log(Logs::Detail, Logs::AI, "Pursuing %s while engaged.", GetTarget()->GetCleanName());
+					LogAI("Pursuing [{}] while engaged", GetTarget()->GetCleanName());
 					RunTo(GetTarget()->GetX(), GetTarget()->GetY(), GetTarget()->GetZ());
 					return;
 				}
@@ -1807,7 +1807,7 @@ bool Merc::AI_EngagedCastCheck() {
 	{
 		AIautocastspell_timer->Disable();       //prevent the timer from going off AGAIN while we are casting.
 
-		Log(Logs::Detail, Logs::AI, "Merc Engaged autocast check triggered");
+		LogAI("Merc Engaged autocast check triggered");
 
 		int8 mercClass = GetClass();
 
@@ -1862,7 +1862,7 @@ bool Merc::AI_IdleCastCheck() {
 
 	if (AIautocastspell_timer->Check(false)) {
 #if MercAI_DEBUG_Spells >= 25
-		Log(Logs::Detail, Logs::AI, "Merc Non-Engaged autocast check triggered: %s", this->GetCleanName());
+		LogAI("Merc Non-Engaged autocast check triggered: [{}]", this->GetCleanName());
 #endif
 		AIautocastspell_timer->Disable();       //prevent the timer from going off AGAIN while we are casting.
 
@@ -1914,7 +1914,7 @@ bool EntityList::Merc_AICheckCloseBeneficialSpells(Merc* caster, uint8 iChance,
 		// according to Rogean, Live NPCs will just cast through walls/floors, no problem..
 		//
 		// This check was put in to address an idle-mob CPU issue
-		Log(Logs::General, Logs::Error, "Error: detrimental spells requested from AICheckCloseBeneficialSpells!!");
+		LogError("Error: detrimental spells requested from AICheckCloseBeneficialSpells!!");
 		return(false);
 	}
 
@@ -2156,7 +2156,7 @@ bool Merc::AICastSpell(int8 iChance, uint32 iSpellTypes) {
 								if(castedSpell) {
 									char* gmsg = nullptr;
 
-									if(tar != this) {
+									if(tar && tar != this) { // [tar] was implicitly valid at this point..this change is to catch any bad logic
 										//we don't need spam of bots healing themselves
 										MakeAnyLenString(&gmsg, "Casting %s on %s.", spells[selectedMercSpell.spellid].name, tar->GetCleanName());
 										if(gmsg)
@@ -2623,7 +2623,7 @@ int16 Merc::GetFocusEffect(focusType type, uint16 spell_id) {
 			realTotal = CalcFocusEffect(type, UsedFocusID, spell_id);
 
 		if (realTotal != 0 && UsedItem)
-			Message_StringID(MT_Spells, BEGINS_TO_GLOW, UsedItem->Name);
+			MessageString(Chat::Spells, BEGINS_TO_GLOW, UsedItem->Name);
 	}
 
 	//Check if spell focus effect exists for the client.
@@ -4169,7 +4169,7 @@ bool Merc::CheckAETaunt() {
 						if(g) {
 							for(int i = 0; i < g->GroupCount(); i++) {
 								//if(npc->IsOnHatelist(g->members[i]) && g->members[i]->GetTarget() != npc && g->members[i]->IsEngaged()) {
-								if(GetTarget() != npc && g->members[i]->GetTarget() != npc && npc->IsOnHatelist(g->members[i])) {
+								if(GetTarget() != npc && g->members[i] && g->members[i]->GetTarget() != npc && npc->IsOnHatelist(g->members[i])) {
 									result++;
 								}
 							}
@@ -4494,7 +4494,7 @@ bool Merc::Attack(Mob* other, int Hand, bool bRiposte, bool IsStrikethrough, boo
 {
 	if (!other) {
 		SetTarget(nullptr);
-		Log(Logs::General, Logs::Error, "A null Mob object was passed to Merc::Attack() for evaluation!");
+		LogError("A null Mob object was passed to Merc::Attack() for evaluation!");
 		return false;
 	}
 
@@ -5321,10 +5321,10 @@ void Client::UpdateMercTimer()
 			Log(Logs::General, Logs::Mercenaries, "UpdateMercTimer Complete for %s.", GetName());
 
 			// Normal upkeep charge message
-			//Message(7, "You have been charged a mercenary upkeep cost of %i plat, and %i gold and your mercenary upkeep cost timer has been reset to 15 minutes.", upkeep_plat, upkeep_gold, (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
+			//Message(Chat::LightGray, "You have been charged a mercenary upkeep cost of %i plat, and %i gold and your mercenary upkeep cost timer has been reset to 15 minutes.", upkeep_plat, upkeep_gold, (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
 
 			// Message below given when too low level to be charged
-			//Message(7, "Your mercenary waived an upkeep cost of %i plat, and %i gold or %i %s and your mercenary upkeep cost timer has been reset to %i minutes", upkeep_plat, upkeep_gold, 1, "Bayle Marks", (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
+			//Message(Chat::LightGray, "Your mercenary waived an upkeep cost of %i plat, and %i gold or %i %s and your mercenary upkeep cost timer has been reset to %i minutes", upkeep_plat, upkeep_gold, 1, "Bayle Marks", (int)(RuleI(Mercs, UpkeepIntervalMS) / 1000 / 60));
 		}
 	}
 }
@@ -6181,7 +6181,7 @@ void NPC::LoadMercTypes() {
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
 	{
-		Log(Logs::General, Logs::Error, "Error in NPC::LoadMercTypes()");
+		LogError("Error in NPC::LoadMercTypes()");
 		return;
 	}
 
@@ -6214,7 +6214,7 @@ void NPC::LoadMercs() {
 
 	if (!results.Success())
 	{
-		Log(Logs::General, Logs::Error, "Error in NPC::LoadMercTypes()");
+		LogError("Error in NPC::LoadMercTypes()");
 		return;
 	}
 
diff --git a/zone/mob.cpp b/zone/mob.cpp
index b068905a9..71e876938 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -116,7 +116,9 @@ Mob::Mob(
 	m_specialattacks(eSpecialAttacks::None),
 	attack_anim_timer(1000),
 	position_update_melee_push_timer(500),
-	hate_list_cleanup_timer(6000)
+	hate_list_cleanup_timer(6000),
+	mob_scan_close(6000),
+	mob_check_moving_timer(1000)
 {
 	mMovementManager = &MobMovementManager::Get();
 	mMovementManager->AddMob(this);
@@ -128,6 +130,7 @@ Mob::Mob(
 	SetMoving(false);
 	moved            = false;
 	m_RewindLocation = glm::vec3();
+	m_RelativePosition = glm::vec4();
 
 	name[0] = 0;
 	orig_name[0] = 0;
@@ -452,6 +455,12 @@ Mob::Mob(
 	PrimaryAggro = false;
 	AssistAggro = false;
 	npc_assist_cap = 0;
+
+#ifdef BOTS
+	m_manual_follow = false;
+#endif
+
+	mob_scan_close.Trigger();
 }
 
 Mob::~Mob()
@@ -460,35 +469,44 @@ Mob::~Mob()
 
 	AI_Stop();
 	if (GetPet()) {
-		if (GetPet()->Charmed())
+		if (GetPet()->Charmed()) {
 			GetPet()->BuffFadeByEffect(SE_Charm);
-		else
+		}
+		else {
 			SetPet(0);
+		}
 	}
 
 	EQApplicationPacket app;
 	CreateDespawnPacket(&app, !IsCorpse());
-	Corpse* corpse = entity_list.GetCorpseByID(GetID());
-	if(!corpse || (corpse && !corpse->IsPlayerCorpse()))
+	Corpse *corpse = entity_list.GetCorpseByID(GetID());
+	if (!corpse || (corpse && !corpse->IsPlayerCorpse())) {
 		entity_list.QueueClients(this, &app, true);
+	}
 
 	entity_list.RemoveFromTargets(this, true);
 
-	if(trade) {
+	if (trade) {
 		Mob *with = trade->With();
-		if(with && with->IsClient()) {
+		if (with && with->IsClient()) {
 			with->CastToClient()->FinishTrade(with);
 			with->trade->Reset();
 		}
 		delete trade;
 	}
 
-	if(HasTempPetsActive()){
+	if (HasTempPetsActive()) {
 		entity_list.DestroyTempPets(this);
 	}
+	
 	entity_list.UnMarkNPC(GetID());
 	UninitializeBuffSlots();
 
+	entity_list.RemoveMobFromCloseLists(this);
+	entity_list.RemoveAuraFromMobs(this);
+
+	close_mobs.clear();
+
 #ifdef BOTS
 	LeaveHealRotationTargetPool();
 #endif
@@ -593,7 +611,7 @@ int Mob::_GetWalkSpeed() const {
 	runspeedcap += itembonuses.IncreaseRunSpeedCap + spellbonuses.IncreaseRunSpeedCap + aabonuses.IncreaseRunSpeedCap;
 	aa_mod += aabonuses.BaseMovementSpeed;
 
-	if (IsClient()) {
+	if (IsClient() && CastToClient()->GetHorseId()) {
 		Mob *horse = entity_list.GetMob(CastToClient()->GetHorseId());
 		if (horse) {
 			speed_mod = horse->GetBaseRunspeed();
@@ -651,7 +669,7 @@ int Mob::_GetRunSpeed() const {
 		{
 			speed_mod = 325;
 		}
-		else
+		else if (CastToClient()->GetHorseId())
 		{
 			Mob* horse = entity_list.GetMob(CastToClient()->GetHorseId());
 			if(horse)
@@ -1128,7 +1146,10 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
 	UpdateActiveLight();
 	ns->spawn.light		= m_Light.Type[EQEmu::lightsource::LightActive];
 
-	ns->spawn.showhelm = (helmtexture && helmtexture != 0xFF) ? 1 : 0;
+	if (IsNPC() && race == ERUDITE)
+		ns->spawn.showhelm = 1;
+	else
+		ns->spawn.showhelm = (helmtexture && helmtexture != 0xFF) ? 1 : 0;
 
 	ns->spawn.invis		= (invisible || hidden) ? 1 : 0;	// TODO: load this before spawning players
 	ns->spawn.NPC		= IsClient() ? 0 : 1;
@@ -1205,7 +1226,7 @@ void Mob::FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho)
 		// Changing the second string made no visible difference
 		sprintf(ns->spawn.DestructibleName2, "%s", ns->spawn.name);
 		// Putting a string in the final one that was previously empty had no visible effect.
-		sprintf(ns->spawn.DestructibleString, "");
+		ns->spawn.DestructibleString[0] = '\0';
 
 		// Sets damage appearance level of the object.
 		ns->spawn.DestructibleAppearance = luclinface; // Was 0x00000000
@@ -1319,7 +1340,7 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
 			 * This is to prevent excessive packet sending under trains/fast combat
 			 */
 			if (this->CastToClient()->hp_self_update_throttle_timer.Check() || force_update_all) {
-				Log(Logs::General, Logs::HP_Update,
+				Log(Logs::General, Logs::HPUpdate,
 					"Mob::SendHPUpdate :: Update HP of self (%s) HP: %i last: %i skip_self: %s",
 					this->GetCleanName(),
 					current_hp,
@@ -1350,17 +1371,17 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
 		}
 	}
 
-	int8 current_hp_percent = static_cast<int8>(max_hp == 0 ? 0 : static_cast<int>(current_hp * 100 / max_hp));
+	auto current_hp_percent = GetIntHPRatio();
 
 	Log(Logs::General,
-		Logs::HP_Update,
+		Logs::HPUpdate,
 		"Mob::SendHPUpdate :: SendHPUpdate %s HP is %i last %i",
 		this->GetCleanName(),
 		current_hp_percent,
 		last_hp_percent);
 
 	if (current_hp_percent == last_hp_percent && !force_update_all) {
-		Log(Logs::General, Logs::HP_Update, "Mob::SendHPUpdate :: Same HP - skipping update");
+		Log(Logs::General, Logs::HPUpdate, "Mob::SendHPUpdate :: Same HP - skipping update");
 		ResetHPUpdateTimer();
 		return;
 	}
@@ -1370,7 +1391,7 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
 			this->CastToClient()->SendHPUpdateMarquee();
 		}
 
-		Log(Logs::General, Logs::HP_Update, "Mob::SendHPUpdate :: HP Changed - Send update");
+		Log(Logs::General, Logs::HPUpdate, "Mob::SendHPUpdate :: HP Changed - Send update");
 
 		last_hp_percent = current_hp_percent;
 	}
@@ -1432,6 +1453,25 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
 		}
 	}
 
+#ifdef BOTS
+	if (GetOwner() && GetOwner()->IsBot() && GetOwner()->CastToBot()->GetBotOwner() && GetOwner()->CastToBot()->GetBotOwner()->IsClient()) {
+		auto bot_owner = GetOwner()->CastToBot()->GetBotOwner()->CastToClient();
+		if (bot_owner) {
+			bot_owner->QueuePacket(&hp_packet, false);
+			group = entity_list.GetGroupByClient(bot_owner);
+
+			if (group) {
+				group->SendHPPacketsFrom(this);
+			}
+
+			Raid *raid = entity_list.GetRaidByClient(bot_owner);
+			if (raid) {
+				raid->SendHPManaEndPacketsFrom(this);
+			}
+		}
+	}
+#endif
+
 	if (GetPet() && GetPet()->IsClient()) {
 		GetPet()->CastToClient()->QueuePacket(&hp_packet, false);
 	}
@@ -1471,17 +1511,23 @@ void Mob::SendHPUpdate(bool skip_self /*= false*/, bool force_update_all /*= fal
 	}
 }
 
-void Mob::StopMoving() {
+void Mob::StopMoving()
+{
 	StopNavigation();
-	if (moved)
+
+	if (moved) {
 		moved = false;
+	}
 }
 
-void Mob::StopMoving(float new_heading) {
+void Mob::StopMoving(float new_heading)
+{
 	StopNavigation();
 	RotateTo(new_heading);
-	if (moved)
+
+	if (moved) {
 		moved = false;
+	}
 }
 
 void Mob::SentPositionPacket(float dx, float dy, float dz, float dh, int anim, bool send_to_self)
@@ -1548,39 +1594,39 @@ void Mob::ShowStats(Client* client)
 	}
 	else if (IsCorpse()) {
 		if (IsPlayerCorpse()) {
-			client->Message(0, "  CharID: %i  PlayerCorpse: %i", CastToCorpse()->GetCharID(), CastToCorpse()->GetCorpseDBID());
+			client->Message(Chat::White, "  CharID: %i  PlayerCorpse: %i", CastToCorpse()->GetCharID(), CastToCorpse()->GetCorpseDBID());
 		}
 		else {
-			client->Message(0, "  NPCCorpse", GetID());
+			client->Message(Chat::White, "  NPCCorpse", GetID());
 		}
 	}
 	else {
-		client->Message(0, "  Level: %i  AC: %i  Class: %i  Size: %1.1f  Haste: %i", GetLevel(), ACSum(), GetClass(), GetSize(), GetHaste());
-		client->Message(0, "  HP: %i  Max HP: %i",GetHP(), GetMaxHP());
-		client->Message(0, "  Mana: %i  Max Mana: %i", GetMana(), GetMaxMana());
-		client->Message(0, "  Total ATK: %i  Worn/Spell ATK (Cap %i): %i", GetATK(), RuleI(Character, ItemATKCap), GetATKBonus());
-		client->Message(0, "  STR: %i  STA: %i  DEX: %i  AGI: %i  INT: %i  WIS: %i  CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
-		client->Message(0, "  MR: %i  PR: %i  FR: %i  CR: %i  DR: %i Corruption: %i PhR: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup(), GetPhR());
-		client->Message(0, "  Race: %i  BaseRace: %i  Texture: %i  HelmTexture: %i  Gender: %i  BaseGender: %i", GetRace(), GetBaseRace(), GetTexture(), GetHelmTexture(), GetGender(), GetBaseGender());
+		client->Message(Chat::White, "  Level: %i  AC: %i  Class: %i  Size: %1.1f  Haste: %i", GetLevel(), ACSum(), GetClass(), GetSize(), GetHaste());
+		client->Message(Chat::White, "  HP: %i  Max HP: %i",GetHP(), GetMaxHP());
+		client->Message(Chat::White, "  Mana: %i  Max Mana: %i", GetMana(), GetMaxMana());
+		client->Message(Chat::White, "  Total ATK: %i  Worn/Spell ATK (Cap %i): %i", GetATK(), RuleI(Character, ItemATKCap), GetATKBonus());
+		client->Message(Chat::White, "  STR: %i  STA: %i  DEX: %i  AGI: %i  INT: %i  WIS: %i  CHA: %i", GetSTR(), GetSTA(), GetDEX(), GetAGI(), GetINT(), GetWIS(), GetCHA());
+		client->Message(Chat::White, "  MR: %i  PR: %i  FR: %i  CR: %i  DR: %i Corruption: %i PhR: %i", GetMR(), GetPR(), GetFR(), GetCR(), GetDR(), GetCorrup(), GetPhR());
+		client->Message(Chat::White, "  Race: %i  BaseRace: %i  Texture: %i  HelmTexture: %i  Gender: %i  BaseGender: %i", GetRace(), GetBaseRace(), GetTexture(), GetHelmTexture(), GetGender(), GetBaseGender());
 		if (client->Admin() >= 100)
-			client->Message(0, "  EntityID: %i  PetID: %i  OwnerID: %i AIControlled: %i Targetted: %i", GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted);
+			client->Message(Chat::White, "  EntityID: %i  PetID: %i  OwnerID: %i AIControlled: %i Targetted: %i", GetID(), GetPetID(), GetOwnerID(), IsAIControlled(), targeted);
 
 		if (IsNPC()) {
 			NPC *n = CastToNPC();
 			uint32 spawngroupid = 0;
 			if(n->respawn2 != 0)
 				spawngroupid = n->respawn2->SpawnGroupID();
-			client->Message(0, "  NPCID: %u  SpawnGroupID: %u Grid: %i LootTable: %u FactionID: %i SpellsID: %u ", GetNPCTypeID(),spawngroupid, n->GetGrid(), n->GetLoottableID(), n->GetNPCFactionID(), n->GetNPCSpellsID());
-			client->Message(0, "  Accuracy: %i MerchantID: %i EmoteID: %i Runspeed: %.3f Walkspeed: %.3f", n->GetAccuracyRating(), n->MerchantType, n->GetEmoteID(), static_cast<float>(0.025f * n->GetRunspeed()), static_cast<float>(0.025f * n->GetWalkspeed()));
+			client->Message(Chat::White, "  NPCID: %u  SpawnGroupID: %u Grid: %i LootTable: %u FactionID: %i SpellsID: %u ", GetNPCTypeID(),spawngroupid, n->GetGrid(), n->GetLoottableID(), n->GetNPCFactionID(), n->GetNPCSpellsID());
+			client->Message(Chat::White, "  Accuracy: %i MerchantID: %i EmoteID: %i Runspeed: %.3f Walkspeed: %.3f", n->GetAccuracyRating(), n->MerchantType, n->GetEmoteID(), static_cast<float>(0.025f * n->GetRunspeed()), static_cast<float>(0.025f * n->GetWalkspeed()));
 			n->QueryLoot(client);
 		}
 		if (IsAIControlled()) {
-			client->Message(0, "  AggroRange: %1.0f  AssistRange: %1.0f", GetAggroRange(), GetAssistRange());
+			client->Message(Chat::White, "  AggroRange: %1.0f  AssistRange: %1.0f", GetAggroRange(), GetAssistRange());
 		}
 
-		client->Message(0, "  compute_tohit: %i TotalToHit: %i", compute_tohit(EQEmu::skills::SkillHandtoHand), GetTotalToHit(EQEmu::skills::SkillHandtoHand, 0));
-		client->Message(0, "  compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense());
-		client->Message(0, "  offense: %i mitigation ac: %i", offense(EQEmu::skills::SkillHandtoHand), GetMitigationAC());
+		client->Message(Chat::White, "  compute_tohit: %i TotalToHit: %i", compute_tohit(EQEmu::skills::SkillHandtoHand), GetTotalToHit(EQEmu::skills::SkillHandtoHand, 0));
+		client->Message(Chat::White, "  compute_defense: %i TotalDefense: %i", compute_defense(), GetTotalDefense());
+		client->Message(Chat::White, "  offense: %i mitigation ac: %i", offense(EQEmu::skills::SkillHandtoHand), GetMitigationAC());
 	}
 }
 
@@ -1617,33 +1663,33 @@ void Mob::DoAnim(const int animnum, int type, bool ackreq, eqFilterType filter)
 void Mob::ShowBuffs(Client* client) {
 	if(SPDAT_RECORDS <= 0)
 		return;
-	client->Message(0, "Buffs on: %s", this->GetName());
+	client->Message(Chat::White, "Buffs on: %s", this->GetName());
 	uint32 i;
 	uint32 buff_count = GetMaxTotalSlots();
 	for (i=0; i < buff_count; i++) {
 		if (buffs[i].spellid != SPELL_UNKNOWN) {
 			if (spells[buffs[i].spellid].buffdurationformula == DF_Permanent)
-				client->Message(0, "  %i: %s: Permanent", i, spells[buffs[i].spellid].name);
+				client->Message(Chat::White, "  %i: %s: Permanent", i, spells[buffs[i].spellid].name);
 			else
-				client->Message(0, "  %i: %s: %i tics left", i, spells[buffs[i].spellid].name, buffs[i].ticsremaining);
+				client->Message(Chat::White, "  %i: %s: %i tics left", i, spells[buffs[i].spellid].name, buffs[i].ticsremaining);
 
 		}
 	}
 	if (IsClient()){
-		client->Message(0, "itembonuses:");
-		client->Message(0, "Atk:%i Ac:%i HP(%i):%i Mana:%i", itembonuses.ATK, itembonuses.AC, itembonuses.HPRegen, itembonuses.HP, itembonuses.Mana);
-		client->Message(0, "Str:%i Sta:%i Dex:%i Agi:%i Int:%i Wis:%i Cha:%i",
+		client->Message(Chat::White, "itembonuses:");
+		client->Message(Chat::White, "Atk:%i Ac:%i HP(%i):%i Mana:%i", itembonuses.ATK, itembonuses.AC, itembonuses.HPRegen, itembonuses.HP, itembonuses.Mana);
+		client->Message(Chat::White, "Str:%i Sta:%i Dex:%i Agi:%i Int:%i Wis:%i Cha:%i",
 			itembonuses.STR,itembonuses.STA,itembonuses.DEX,itembonuses.AGI,itembonuses.INT,itembonuses.WIS,itembonuses.CHA);
-		client->Message(0, "SvMagic:%i SvFire:%i SvCold:%i SvPoison:%i SvDisease:%i",
+		client->Message(Chat::White, "SvMagic:%i SvFire:%i SvCold:%i SvPoison:%i SvDisease:%i",
 				itembonuses.MR,itembonuses.FR,itembonuses.CR,itembonuses.PR,itembonuses.DR);
-		client->Message(0, "DmgShield:%i Haste:%i", itembonuses.DamageShield, itembonuses.haste );
-		client->Message(0, "spellbonuses:");
-		client->Message(0, "Atk:%i Ac:%i HP(%i):%i Mana:%i", spellbonuses.ATK, spellbonuses.AC, spellbonuses.HPRegen, spellbonuses.HP, spellbonuses.Mana);
-		client->Message(0, "Str:%i Sta:%i Dex:%i Agi:%i Int:%i Wis:%i Cha:%i",
+		client->Message(Chat::White, "DmgShield:%i Haste:%i", itembonuses.DamageShield, itembonuses.haste );
+		client->Message(Chat::White, "spellbonuses:");
+		client->Message(Chat::White, "Atk:%i Ac:%i HP(%i):%i Mana:%i", spellbonuses.ATK, spellbonuses.AC, spellbonuses.HPRegen, spellbonuses.HP, spellbonuses.Mana);
+		client->Message(Chat::White, "Str:%i Sta:%i Dex:%i Agi:%i Int:%i Wis:%i Cha:%i",
 			spellbonuses.STR,spellbonuses.STA,spellbonuses.DEX,spellbonuses.AGI,spellbonuses.INT,spellbonuses.WIS,spellbonuses.CHA);
-		client->Message(0, "SvMagic:%i SvFire:%i SvCold:%i SvPoison:%i SvDisease:%i",
+		client->Message(Chat::White, "SvMagic:%i SvFire:%i SvCold:%i SvPoison:%i SvDisease:%i",
 				spellbonuses.MR,spellbonuses.FR,spellbonuses.CR,spellbonuses.PR,spellbonuses.DR);
-		client->Message(0, "DmgShield:%i Haste:%i", spellbonuses.DamageShield, spellbonuses.haste );
+		client->Message(Chat::White, "DmgShield:%i Haste:%i", spellbonuses.DamageShield, spellbonuses.haste );
 	}
 }
 
@@ -1651,15 +1697,15 @@ void Mob::ShowBuffList(Client* client) {
 	if(SPDAT_RECORDS <= 0)
 		return;
 
-	client->Message(0, "Buffs on: %s", this->GetCleanName());
+	client->Message(Chat::White, "Buffs on: %s", this->GetCleanName());
 	uint32 i;
 	uint32 buff_count = GetMaxTotalSlots();
 	for (i = 0; i < buff_count; i++) {
 		if (buffs[i].spellid != SPELL_UNKNOWN) {
 			if (spells[buffs[i].spellid].buffdurationformula == DF_Permanent)
-				client->Message(0, "  %i: %s: Permanent", i, spells[buffs[i].spellid].name);
+				client->Message(Chat::White, "  %i: %s: Permanent", i, spells[buffs[i].spellid].name);
 			else
-				client->Message(0, "  %i: %s: %i tics left", i, spells[buffs[i].spellid].name, buffs[i].ticsremaining);
+				client->Message(Chat::White, "  %i: %s: %i tics left", i, spells[buffs[i].spellid].name, buffs[i].ticsremaining);
 		}
 	}
 }
@@ -1708,7 +1754,11 @@ void Mob::SendIllusionPacket(
 	uint32 new_drakkin_tattoo;
 	uint32 new_drakkin_details;
 
-	race = (in_race) ? in_race : GetBaseRace();
+	race = in_race;
+	if (race == 0)
+		{
+		race = (use_model) ? use_model : GetBaseRace();
+		}
 
 	if (in_gender != 0xFF)
 		{
@@ -1818,9 +1868,7 @@ void Mob::SendIllusionPacket(
 	/* Refresh armor and tints after send illusion packet */
 	this->SendArmorAppearance();
 
-	Log(Logs::Detail,
-		Logs::Spells,
-		"Illusion: Race = %i, Gender = %i, Texture = %i, HelmTexture = %i, HairColor = %i, BeardColor = %i, EyeColor1 = %i, EyeColor2 = %i, HairStyle = %i, Face = %i, DrakkinHeritage = %i, DrakkinTattoo = %i, DrakkinDetails = %i, Size = %f",
+	LogSpells("Illusion: Race = [{}], Gender = [{}], Texture = [{}], HelmTexture = [{}], HairColor = [{}], BeardColor = [{}], EyeColor1 = [{}], EyeColor2 = [{}], HairStyle = [{}], Face = [{}], DrakkinHeritage = [{}], DrakkinTattoo = [{}], DrakkinDetails = [{}], Size = [{}]",
 		race,
 		gender,
 		new_texture,
@@ -2664,6 +2712,27 @@ bool Mob::PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, fl
 	return Result;
 }
 
+bool Mob::PlotPositionOnArcInFrontOfTarget(Mob* target, float& x_dest, float& y_dest, float& z_dest, float distance, float min_deg, float max_deg)
+{
+
+
+	return false;
+}
+
+bool Mob::PlotPositionOnArcBehindTarget(Mob* target, float& x_dest, float& y_dest, float& z_dest, float distance)
+{
+
+
+	return false;
+}
+
+bool Mob::PlotPositionBehindMeFacingTarget(Mob* target, float& x_dest, float& y_dest, float& z_dest, float min_dist, float max_dist)
+{
+
+
+	return false;
+}
+
 bool Mob::HateSummon() {
 	// check if mob has ability to summon
 	// 97% is the offical % that summoning starts on live, not 94
@@ -2706,7 +2775,7 @@ bool Mob::HateSummon() {
 	if(target)
 	{
 		if(summon_level == 1) {
-			entity_list.MessageClose(this, true, 500, MT_Say, "%s says,'You will not evade me, %s!' ", GetCleanName(), target->GetCleanName() );
+			entity_list.MessageClose(this, true, 500, Chat::Say, "%s says 'You will not evade me, %s!' ", GetCleanName(), target->GetCleanName() );
 
 			if (target->IsClient())
 				target->CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), m_Position.x, m_Position.y, m_Position.z, target->GetHeading(), 0, SummonPC);
@@ -2715,7 +2784,7 @@ bool Mob::HateSummon() {
 
 			return true;
 		} else if(summon_level == 2) {
-			entity_list.MessageClose(this, true, 500, MT_Say, "%s says,'You will not evade me, %s!'", GetCleanName(), target->GetCleanName());
+			entity_list.MessageClose(this, true, 500, Chat::Say, "%s says 'You will not evade me, %s!'", GetCleanName(), target->GetCleanName());
 			GMMove(target->GetX(), target->GetY(), target->GetZ());
 		}
 	}
@@ -2786,10 +2855,10 @@ void Mob::WipeHateList()
 	}
 }
 
-uint32 Mob::RandomTimer(int min,int max) {
+uint32 Mob::RandomTimer(int min, int max)
+{
 	int r = 14000;
-	if(min != 0 && max != 0 && min < max)
-	{
+	if (min != 0 && max != 0 && min < max) {
 		r = zone->random.Int(min, max);
 	}
 	return r;
@@ -2832,7 +2901,7 @@ void Mob::Say(const char *format, ...)
 		talker = this;
 	}
 
-	entity_list.MessageClose_StringID(
+	entity_list.MessageCloseString(
 		talker, false, 200, 10,
 		GENERIC_SAY, GetCleanName(), buf
 	);
@@ -2841,48 +2910,50 @@ void Mob::Say(const char *format, ...)
 //
 // this is like the above, but the first parameter is a string id
 //
-void Mob::Say_StringID(uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
+void Mob::SayString(uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
 {
 	char string_id_str[10];
 
 	snprintf(string_id_str, 10, "%d", string_id);
 
-	entity_list.MessageClose_StringID(this, false, 200, 10,
+	entity_list.MessageCloseString(
+		this, false, 200, 10,
 		GENERIC_STRINGID_SAY, GetCleanName(), string_id_str, message3, message4, message5,
 		message6, message7, message8, message9
 	);
 }
 
-void Mob::Say_StringID(uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
+void Mob::SayString(uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
 {
 	char string_id_str[10];
 
 	snprintf(string_id_str, 10, "%d", string_id);
 
-	entity_list.MessageClose_StringID(this, false, 200, type,
+	entity_list.MessageCloseString(
+		this, false, 200, type,
 		GENERIC_STRINGID_SAY, GetCleanName(), string_id_str, message3, message4, message5,
 		message6, message7, message8, message9
 	);
 }
 
-void Mob::SayTo_StringID(Client *to, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
+void Mob::SayString(Client *to, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
 {
 	if (!to)
 		return;
 
 	auto string_id_str = std::to_string(string_id);
 
-	to->Message_StringID(10, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
+	to->MessageString(Chat::NPCQuestSay, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
 }
 
-void Mob::SayTo_StringID(Client *to, uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
+void Mob::SayString(Client *to, uint32 type, uint32 string_id, const char *message3, const char *message4, const char *message5, const char *message6, const char *message7, const char *message8, const char *message9)
 {
 	if (!to)
 		return;
 
 	auto string_id_str = std::to_string(string_id);
 
-	to->Message_StringID(type, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
+	to->MessageString(type, GENERIC_STRINGID_SAY, GetCleanName(), string_id_str.c_str(), message3, message4, message5, message6, message7, message8, message9);
 }
 
 void Mob::Shout(const char *format, ...)
@@ -2894,7 +2965,7 @@ void Mob::Shout(const char *format, ...)
 	vsnprintf(buf, 1000, format, ap);
 	va_end(ap);
 
-	entity_list.Message_StringID(this, false, MT_Shout,
+	entity_list.MessageString(this, false, Chat::Shout,
 		GENERIC_SHOUT, GetCleanName(), buf);
 }
 
@@ -2907,13 +2978,19 @@ void Mob::Emote(const char *format, ...)
 	vsnprintf(buf, 1000, format, ap);
 	va_end(ap);
 
-	entity_list.MessageClose_StringID(this, false, 200, 10,
-		GENERIC_EMOTE, GetCleanName(), buf);
+	entity_list.MessageCloseString(
+		this, false, 200, 10,
+		GENERIC_EMOTE, GetCleanName(), buf
+	);
 }
 
-void Mob::QuestJournalledSay(Client *QuestInitiator, const char *str)
+void Mob::QuestJournalledSay(Client *QuestInitiator, const char *str, Journal::Options &opts)
 {
-		entity_list.QuestJournalledSayClose(this, QuestInitiator, 200, GetCleanName(), str);
+	// just in case
+	if (opts.target_spawn_id == 0 && QuestInitiator)
+		opts.target_spawn_id = QuestInitiator->GetID();
+
+	entity_list.QuestJournalledSayClose(this, 200, GetCleanName(), str, opts);
 }
 
 const char *Mob::GetCleanName()
@@ -3033,7 +3110,7 @@ void Mob::ExecWeaponProc(const EQEmu::ItemInstance *inst, uint16 spell_id, Mob *
 	if(!IsValidSpell(spell_id)) { // Check for a valid spell otherwise it will crash through the function
 		if(IsClient()){
 			Message(0, "Invalid spell proc %u", spell_id);
-			Log(Logs::Detail, Logs::Spells, "Player %s, Weapon Procced invalid spell %u", this->GetName(), spell_id);
+			LogSpells("Player [{}], Weapon Procced invalid spell [{}]", this->GetName(), spell_id);
 		}
 		return;
 	}
@@ -3148,6 +3225,10 @@ void Mob::SetTarget(Mob *mob)
 		if (this->CastToClient()->admin > 200) {
 			this->DisplayInfo(mob);
 		}
+
+#ifdef BOTS
+		CastToClient()->SetBotPrecombat(false); // Any change in target will nullify this flag (target == mob checked above)
+#endif
 	}
 
 	if (IsPet() && GetOwner() && GetOwner()->IsClient()) {
@@ -3562,7 +3643,7 @@ void Mob::TryTwincast(Mob *caster, Mob *target, uint32 spell_id)
 		{
 			if(zone->random.Roll(focus))
 			{
-				Message(MT_Spells,"You twincast %s!",spells[spell_id].name);
+				Message(Chat::Spells,"You twincast %s!", spells[spell_id].name);
 				SpellFinished(spell_id, target, EQEmu::spells::CastingSlot::Item, 0, -1, spells[spell_id].ResistDiff);
 			}
 		}
@@ -4382,10 +4463,11 @@ void Mob::DoKnockback(Mob *caster, uint32 pushback, uint32 pushup)
 		spu->delta_y	= FloatToEQ13(static_cast<float>(new_y));
 		spu->delta_z	= FloatToEQ13(static_cast<float>(pushup));
 		spu->heading	= FloatToEQ12(GetHeading());
-		spu->padding0002	=0;
-		spu->padding0006	=7;
-		spu->padding0014	=0x7f;
-		spu->padding0018	=0x5df27;
+		// for ref: these were not passed on to other 5 clients while on Titanium standard (change to RoF2 standard: 11/16/2019)
+		//eq->padding0002 = 0;
+		//eq->padding0006 = 0x7;
+		//eq->padding0014 = 0x7F;
+		//eq->padding0018 = 0x5dF27;
 		spu->animation = 0;
 		spu->delta_heading = FloatToEQ10(0);
 		outapp_push->priority = 6;
@@ -4599,7 +4681,7 @@ void Mob::MeleeLifeTap(int32 damage) {
 	if(lifetap_amt && damage > 0){
 
 		lifetap_amt = damage * lifetap_amt / 100;
-		Log(Logs::Detail, Logs::Combat, "Melee lifetap healing for %d damage.", damage);
+		LogCombat("Melee lifetap healing for [{}] damage", damage);
 
 		if (lifetap_amt > 0)
 			HealDamage(lifetap_amt); //Heal self for modified damage amount.
@@ -4765,7 +4847,24 @@ void Mob::RemoveNimbusEffect(int effectid)
 }
 
 bool Mob::IsBoat() const {
-	return (race == 72 || race == 73 || race == 114 || race == 404 || race == 550 || race == 551 || race == 552);
+
+	return (
+		race == RACE_SHIP_72 ||
+		race == RACE_LAUNCH_73 ||
+		race == RACE_GHOST_SHIP_114 ||
+		race == RACE_SHIP_404 ||
+		race == RACE_MERCHANT_SHIP_550 ||
+		race == RACE_PIRATE_SHIP_551 ||
+		race == RACE_GHOST_SHIP_552
+	);
+}
+
+bool Mob::IsControllableBoat() const {
+
+	return (
+		race == RACE_BOAT_141 ||
+		race == RACE_ROWBOAT_502
+	);
 }
 
 void Mob::SetBodyType(bodyType new_body, bool overwrite_orig) {
@@ -4880,16 +4979,16 @@ void Mob::SlowMitigation(Mob* caster)
 	if (GetSlowMitigation() && caster && caster->IsClient())
 	{
 		if ((GetSlowMitigation() > 0) && (GetSlowMitigation() < 26))
-			caster->Message_StringID(MT_SpellFailure, SLOW_MOSTLY_SUCCESSFUL);
+			caster->MessageString(Chat::SpellFailure, SLOW_MOSTLY_SUCCESSFUL);
 
 		else if ((GetSlowMitigation() >= 26) && (GetSlowMitigation() < 74))
-			caster->Message_StringID(MT_SpellFailure, SLOW_PARTIALLY_SUCCESSFUL);
+			caster->MessageString(Chat::SpellFailure, SLOW_PARTIALLY_SUCCESSFUL);
 
 		else if ((GetSlowMitigation() >= 74) && (GetSlowMitigation() < 101))
-			caster->Message_StringID(MT_SpellFailure, SLOW_SLIGHTLY_SUCCESSFUL);
+			caster->MessageString(Chat::SpellFailure, SLOW_SLIGHTLY_SUCCESSFUL);
 
 		else if (GetSlowMitigation() > 100)
-			caster->Message_StringID(MT_SpellFailure, SPELL_OPPOSITE_EFFECT);
+			caster->MessageString(Chat::SpellFailure, SPELL_OPPOSITE_EFFECT);
 	}
 }
 
diff --git a/zone/mob.h b/zone/mob.h
index ea71017c7..d48f47e6d 100644
--- a/zone/mob.h
+++ b/zone/mob.h
@@ -1,3 +1,4 @@
+
 /*	EQEMu: Everquest Server Emulator
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemu.org)
 
@@ -169,6 +170,10 @@ public:
 
 	void DisplayInfo(Mob *mob);
 
+	std::unordered_map<uint16, Mob *> close_mobs;
+	Timer mob_scan_close;
+	Timer mob_check_moving_timer;
+
 	//Somewhat sorted: needs documenting!
 
 	//Attack
@@ -449,6 +454,7 @@ public:
 	virtual inline uint16 GetDeity() const { return deity; }
 	virtual EQEmu::deity::DeityTypeBit GetDeityBit() { return EQEmu::deity::ConvertDeityTypeToDeityTypeBit((EQEmu::deity::DeityType)deity); }
 	inline uint16 GetRace() const { return race; }
+	inline uint16 GetModel() const { return (use_model == 0) ? race : use_model; }
 	inline uint8 GetGender() const { return gender; }
 	inline uint8 GetTexture() const { return texture; }
 	inline uint8 GetHelmTexture() const { return helmtexture; }
@@ -489,8 +495,8 @@ public:
 	inline Mob* GetTarget() const { return target; }
 	virtual void SetTarget(Mob* mob);
 	inline bool HasTargetReflection() const { return (target && target != this && target->target == this); }
-	virtual inline float GetHPRatio() const { return max_hp == 0 ? 0 : ((float)current_hp/max_hp*100); }
-	virtual inline int GetIntHPRatio() const { return max_hp == 0 ? 0 : static_cast<int>(current_hp * 100 / max_hp); }
+	virtual inline float GetHPRatio() const { return max_hp == 0 ? 0 : ((float) current_hp / max_hp * 100); }
+	virtual inline int GetIntHPRatio() const { return max_hp == 0 ? 0 : static_cast<int>(GetHPRatio()); }
 	inline int32 GetAC() const { return AC; }
 	inline virtual int32 GetATK() const { return ATK + itembonuses.ATK + spellbonuses.ATK; }
 	inline virtual int32 GetATKBonus() const { return itembonuses.ATK + spellbonuses.ATK; }
@@ -561,10 +567,17 @@ public:
 	inline const float GetY() const { return m_Position.y; }
 	inline const float GetZ() const { return m_Position.z; }
 	inline const float GetHeading() const { return m_Position.w; }
+	inline const glm::vec4& GetRelativePosition() const { return m_RelativePosition; }
+	inline void SetRelativePosition(const float x, const float y, const float z) { m_RelativePosition.x = x; m_RelativePosition.y = y; m_RelativePosition.z = z; }
+	inline const float GetRelativeX() const { return m_RelativePosition.x; }
+	inline const float GetRelativeY() const { return m_RelativePosition.y; }
+	inline const float GetRelativeZ() const { return m_RelativePosition.z; }
+	inline const float GetRelativeHeading() const { return m_RelativePosition.w; }
 	inline const float GetSize() const { return size; }
 	inline const float GetBaseSize() const { return base_size; }
 	inline const GravityBehavior GetFlyMode() const { return flymode; }
 	bool IsBoat() const;
+	bool IsControllableBoat() const;
 
 	//Group
 	virtual bool HasRaid() = 0;
@@ -593,8 +606,8 @@ public:
 	void MakeSpawnUpdateNoDelta(PlayerPositionUpdateServer_Struct* spu);
 	void MakeSpawnUpdate(PlayerPositionUpdateServer_Struct* spu);
 	void SentPositionPacket(float dx, float dy, float dz, float dh, int anim, bool send_to_self = false);
-	void StopMoving();
-	void StopMoving(float new_heading);
+	virtual void StopMoving();
+	virtual void StopMoving(float new_heading);
 	void SetSpawned() { spawned = true; };
 	bool Spawned() { return spawned; };
 	virtual bool ShouldISpawnFor(Client *c) { return true; }
@@ -611,8 +624,7 @@ public:
 
 	//AI
 	static uint32 GetLevelCon(uint8 mylevel, uint8 iOtherLevel);
-	inline uint32 GetLevelCon(uint8 iOtherLevel) const {
-		return this ? GetLevelCon(GetLevel(), iOtherLevel) : CON_GRAY; }
+	inline uint32 GetLevelCon(uint8 iOtherLevel) const { return GetLevelCon(GetLevel(), iOtherLevel); }
 	virtual void AddToHateList(Mob* other, uint32 hate = 0, int32 damage = 0, bool iYellForHelp = true,
 		bool bFrenzy = false, bool iBuffTic = false, uint16 spell_id = SPELL_UNKNOWN, bool pet_comand = false);
 	bool RemoveFromHateList(Mob* mob);
@@ -676,8 +688,10 @@ public:
 	void ShowStats(Client* client);
 	void ShowBuffs(Client* client);
 	void ShowBuffList(Client* client);
-	bool PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, float &z_dest,
-		bool lookForAftArc = true);
+	bool PlotPositionAroundTarget(Mob* target, float &x_dest, float &y_dest, float &z_dest, bool lookForAftArc = true);
+	bool PlotPositionOnArcInFrontOfTarget(Mob *target, float &x_dest, float &y_dest, float &z_dest, float distance, float min_deg = 5.0f, float max_deg = 150.0f);
+	bool PlotPositionOnArcBehindTarget(Mob *target, float &x_dest, float &y_dest, float &z_dest, float distance);
+	bool PlotPositionBehindMeFacingTarget(Mob *target, float &x_dest, float &y_dest, float &z_dest, float min_dist = 1.0f, float max_dist = 5.0f);
 
 	// aura functions
 	void MakeAura(uint16 spell_id);
@@ -722,29 +736,29 @@ public:
 	inline void SetRareSpawn(bool in) { rare_spawn = in; }
 
 	virtual void Message(uint32 type, const char* message, ...) { }
-	virtual void Message_StringID(uint32 type, uint32 string_id, uint32 distance = 0) { }
-	virtual void Message_StringID(uint32 type, uint32 string_id, const char* message, const char* message2 = 0,
+	virtual void MessageString(uint32 type, uint32 string_id, uint32 distance = 0) { }
+	virtual void MessageString(uint32 type, uint32 string_id, const char* message, const char* message2 = 0,
 		const char* message3 = 0, const char* message4 = 0, const char* message5 = 0, const char* message6 = 0,
 		const char* message7 = 0, const char* message8 = 0, const char* message9 = 0, uint32 distance = 0) { }
-	virtual void FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id) { }
-	virtual void FilteredMessage_StringID(Mob *sender, uint32 type, eqFilterType filter,
+	virtual void FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter, uint32 string_id) { }
+	virtual void FilteredMessageString(Mob *sender, uint32 type, eqFilterType filter,
 			uint32 string_id, const char *message1, const char *message2 = nullptr,
 			const char *message3 = nullptr, const char *message4 = nullptr,
 			const char *message5 = nullptr, const char *message6 = nullptr,
 			const char *message7 = nullptr, const char *message8 = nullptr,
 			const char *message9 = nullptr) { }
 	void Say(const char *format, ...);
-	void Say_StringID(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
+	void SayString(uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
 		const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
-	void Say_StringID(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
+	void SayString(uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
 		const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
-	void SayTo_StringID(Client *to, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
+	void SayString(Client *to, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
 		const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
-	void SayTo_StringID(Client *to, uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
+	void SayString(Client *to, uint32 type, uint32 string_id, const char *message3 = 0, const char *message4 = 0, const char *message5 = 0,
 		const char *message6 = 0, const char *message7 = 0, const char *message8 = 0, const char *message9 = 0);
 	void Shout(const char *format, ...);
 	void Emote(const char *format, ...);
-	void QuestJournalledSay(Client *QuestInitiator, const char *str);
+	void QuestJournalledSay(Client *QuestInitiator, const char *str, Journal::Options &opts);
 	int32 GetItemStat(uint32 itemid, const char *identifier);
 
 	int16 CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, bool best_focus=false);
@@ -759,7 +773,7 @@ public:
 	virtual void UnStun();
 	inline void Silence(bool newval) { silenced = newval; }
 	inline void Amnesia(bool newval) { amnesiad = newval; }
-	void TemporaryPets(uint16 spell_id, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false);
+	void TemporaryPets(uint16 spell_id, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false, uint16 *controlled_pet_id = nullptr);
 	void TypesTemporaryPets(uint32 typesid, Mob *target, const char *name_override = nullptr, uint32 duration_override = 0, bool followme=true, bool sticktarg=false);
 	void WakeTheDead(uint16 spell_id, Mob *target, uint32 duration);
 	void Spin();
@@ -958,7 +972,7 @@ public:
 	void SetEntityVariable(const char *id, const char *m_var);
 	bool EntityVariableExists(const char *id);
 
-	void AI_Event_Engaged(Mob* attacker, bool iYellForHelp = true);
+	void AI_Event_Engaged(Mob* attacker, bool yell_for_help = true);
 	void AI_Event_NoLongerEngaged();
 
 	FACTION_VALUE GetSpecialFactionCon(Mob* iOther);
@@ -1178,8 +1192,8 @@ public:
 	int32 GetManaRegen() const;
 
 
-	// Bots HealRotation methods
 #ifdef BOTS
+	// Bots HealRotation methods
 	bool IsHealRotationTarget() { return (m_target_of_heal_rotation.use_count() && m_target_of_heal_rotation.get()); }
 	bool JoinHealRotationTargetPool(std::shared_ptr<HealRotation>* heal_rotation);
 	bool LeaveHealRotationTargetPool();
@@ -1190,6 +1204,11 @@ public:
 	float HealRotationExtendedHealFrequency();
 
 	const std::shared_ptr<HealRotation>* TargetOfHealRotation() const { return &m_target_of_heal_rotation; }
+
+
+	// not Bots HealRotation methods
+	void SetManualFollow(bool flag) { m_manual_follow = flag; }
+	bool GetManualFollow() const { return m_manual_follow; }
 #endif
 
 protected:
@@ -1295,6 +1314,7 @@ protected:
 	uint32 npctype_id;
 
 	glm::vec4 m_Position;
+	glm::vec4 m_RelativePosition;
 	int animation; // this is really what MQ2 calls SpeedRun just packed like (int)(SpeedRun * 40.0f)
 	float base_size;
 	float size;
@@ -1467,8 +1487,8 @@ protected:
 	eStandingPetOrder pStandingPetOrder;
 	uint32 minLastFightingDelayMoving;
 	uint32 maxLastFightingDelayMoving;
-	float pAggroRange;
-	float pAssistRange;
+	float pAggroRange = 0;
+	float pAssistRange = 0;
 	std::unique_ptr<Timer> AI_think_timer;
 	std::unique_ptr<Timer> AI_movement_timer;
 	std::unique_ptr<Timer> AI_target_check_timer;
@@ -1570,6 +1590,8 @@ private:
 
 #ifdef BOTS
 	std::shared_ptr<HealRotation> m_target_of_heal_rotation;
+
+	bool m_manual_follow;
 #endif
 
 };
diff --git a/zone/mob_ai.cpp b/zone/mob_ai.cpp
index 0df05254e..525948bb2 100644
--- a/zone/mob_ai.cpp
+++ b/zone/mob_ai.cpp
@@ -127,7 +127,7 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes, bool bInnates
 				) {
 
 #if MobAI_DEBUG_Spells >= 21
-				Log(Logs::Detail, Logs::AI, "Mob::AICastSpell: Casting: spellid=%u, tar=%s, dist2[%f]<=%f, mana_cost[%i]<=%i, cancast[%u]<=%u, type=%u",
+				LogAI("Mob::AICastSpell: Casting: spellid=[{}], tar=[{}], dist2[[{}]]<=[{}], mana_cost[[{}]]<=[{}], cancast[[{}]]<=[{}], type=[{}]",
 					AIspells[i].spellid, tar->GetName(), dist2, (spells[AIspells[i].spellid].range * spells[AIspells[i].spellid].range), mana_cost, GetMana(), AIspells[i].time_cancast, Timer::GetCurrentTime(), AIspells[i].type);
 #endif
 
@@ -360,7 +360,7 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes, bool bInnates
 			}
 #if MobAI_DEBUG_Spells >= 21
 			else {
-				Log(Logs::Detail, Logs::AI, "Mob::AICastSpell: NotCasting: spellid=%u, tar=%s, dist2[%f]<=%f, mana_cost[%i]<=%i, cancast[%u]<=%u, type=%u",
+				LogAI("Mob::AICastSpell: NotCasting: spellid=[{}], tar=[{}], dist2[[{}]]<=[{}], mana_cost[[{}]]<=[{}], cancast[[{}]]<=[{}], type=[{}]",
 					AIspells[i].spellid, tar->GetName(), dist2, (spells[AIspells[i].spellid].range * spells[AIspells[i].spellid].range), mana_cost, GetMana(), AIspells[i].time_cancast, Timer::GetCurrentTime(), AIspells[i].type);
 			}
 #endif
@@ -371,66 +371,13 @@ bool NPC::AICastSpell(Mob* tar, uint8 iChance, uint32 iSpellTypes, bool bInnates
 
 bool NPC::AIDoSpellCast(uint8 i, Mob* tar, int32 mana_cost, uint32* oDontDoAgainBefore) {
 #if MobAI_DEBUG_Spells >= 1
-	Log(Logs::Detail, Logs::AI, "Mob::AIDoSpellCast: spellid = %u, tar = %s, mana = %i, Name: '%s'", AIspells[i].spellid, tar->GetName(), mana_cost, spells[AIspells[i].spellid].name);
+	LogAI("Mob::AIDoSpellCast: spellid = [{}], tar = [{}], mana = [{}], Name: [{}]", AIspells[i].spellid, tar->GetName(), mana_cost, spells[AIspells[i].spellid].name);
 #endif
 	casting_spell_AIindex = i;
 
 	return CastSpell(AIspells[i].spellid, tar->GetID(), EQEmu::spells::CastingSlot::Gem2, AIspells[i].manacost == -2 ? 0 : -1, mana_cost, oDontDoAgainBefore, -1, -1, 0, &(AIspells[i].resist_adjust));
 }
 
-bool EntityList::AICheckCloseBeneficialSpells(NPC* caster, uint8 iChance, float iRange, uint32 iSpellTypes) {
-	if((iSpellTypes & SPELL_TYPES_DETRIMENTAL) != 0) {
-		//according to live, you can buff and heal through walls...
-		//now with PCs, this only applies if you can TARGET the target, but
-		// according to Rogean, Live NPCs will just cast through walls/floors, no problem..
-		//
-		// This check was put in to address an idle-mob CPU issue
-		Log(Logs::General, Logs::Error, "Error: detrimental spells requested from AICheckCloseBeneficialSpells!!");
-		return(false);
-	}
-
-	if(!caster)
-		return false;
-
-	if(caster->AI_HasSpells() == false)
-		return false;
-
-	if(caster->GetSpecialAbility(NPC_NO_BUFFHEAL_FRIENDS))
-		return false;
-
-	if (iChance < 100) {
-		uint8 tmp = zone->random.Int(0, 99);
-		if (tmp >= iChance)
-			return false;
-	}
-	if (caster->GetPrimaryFaction() == 0 )
-		return(false); // well, if we dont have a faction set, we're gonna be indiff to everybody
-
-	float iRange2 = iRange*iRange;
-
-	//Only iterate through NPCs
-	for (auto it = npc_list.begin(); it != npc_list.end(); ++it) {
-		NPC* mob = it->second;
-	
-		if (mob->GetReverseFactionCon(caster) >= FACTION_KINDLY) {
-			continue;
-		}
-
-		if (DistanceSquared(caster->GetPosition(), mob->GetPosition()) > iRange2) {
-			continue;
-		}
-
-		if ((iSpellTypes & SpellType_Buff) && !RuleB(NPC, BuffFriends)) {
-			if (mob != caster)
-				iSpellTypes = SpellType_Heal;
-		}
-
-		if (caster->AICastSpell(mob, 100, iSpellTypes))
-			return true;
-	}
-	return false;
-}
-
 void Mob::AI_Init()
 {
 	pAIControlled = false;
@@ -578,7 +525,7 @@ void NPC::AI_Stop() {
 
 void Client::AI_Stop() {
 	Mob::AI_Stop();
-	this->Message_StringID(13,PLAYER_REGAIN);
+	this->MessageString(Chat::Red,PLAYER_REGAIN);
 
 	auto app = new EQApplicationPacket(OP_Charm, sizeof(Charm_Struct));
 	Charm_Struct *ps = (Charm_Struct*)app->pBuffer;
@@ -1138,6 +1085,17 @@ void Mob::AI_Process() {
 			return;
 		}
 
+		if (target->IsMezzed() && IsPet()) {
+
+			auto pet_owner = GetOwner();
+			if (pet_owner && pet_owner->IsClient()) {
+				pet_owner->MessageString(Chat::NPCQuestSay, CANNOT_WAKE, GetCleanName(), target->GetCleanName());
+			}
+
+			RemoveFromHateList(target);
+			return;
+		}
+
 #ifdef BOTS
 		if (IsPet() && GetOwner() && GetOwner()->IsBot() && target == GetOwner())
 		{
@@ -1356,7 +1314,7 @@ void Mob::AI_Process() {
 				}
 				else if (AI_movement_timer->Check() && target) {
 					if (!IsRooted()) {
-						Log(Logs::Detail, Logs::AI, "Pursuing %s while engaged.", target->GetName());
+						LogAI("Pursuing [{}] while engaged", target->GetName());
 						RunTo(target->GetX(), target->GetY(), target->GetZ());
 
 					}
@@ -1404,12 +1362,19 @@ void Mob::AI_Process() {
 		}
 		else if (zone->CanDoCombat() && CastToNPC()->WillAggroNPCs() && AI_scan_area_timer->Check()) {
 
-			/*
-			* NPC to NPC aggro checking, npc needs npc_aggro flag
-			*/
-			Mob *temp_target = entity_list.AICheckNPCtoNPCAggro(this, GetAggroRange(), GetAssistRange());
-			if (temp_target) {
-				AddToHateList(temp_target);
+			/**
+			 * NPC to NPC aggro (npc_aggro flag set)
+			 */
+			for (auto &close_mob : close_mobs) {
+				Mob *mob = close_mob.second;
+
+				if (mob->IsClient()) {
+					continue;
+				}
+
+				if (this->CheckWillAggro(mob)) {
+					this->AddToHateList(mob);
+				}
 			}
 
 			AI_scan_area_timer->Disable();
@@ -1579,7 +1544,25 @@ void NPC::AI_DoMovement() {
 
 		if (GetCWP() == EQEmu::WaypointStatus::RoamBoxPauseInProgress && !IsMoving()) {
 			// We have arrived
-			time_until_can_move = Timer::GetCurrentTime() + RandomTimer(roambox_min_delay, roambox_delay);
+
+			int roambox_move_delay = EQEmu::ClampLower(GetRoamboxDelay(), GetRoamboxMinDelay());
+			int move_delay_max     = (roambox_move_delay > 0 ? roambox_move_delay : (int) GetRoamboxMinDelay() * 4);
+			int random_timer       = RandomTimer(
+				GetRoamboxMinDelay(),
+				move_delay_max
+			);
+
+			Log(
+				Logs::Detail,
+				Logs::NPCRoamBox, "(%s) Timer calc | random_timer [%i] roambox_move_delay [%i] move_min [%i] move_max [%i]",
+				this->GetCleanName(),
+				random_timer,
+				roambox_move_delay,
+				(int) GetRoamboxMinDelay(),
+				move_delay_max
+			);
+
+			time_until_can_move = Timer::GetCurrentTime() + random_timer;
 			SetCurrentWP(0);
 			return;
 		}
@@ -1636,25 +1619,51 @@ void NPC::AI_DoMovement() {
 				}
 			}
 
-			roambox_destination_z = 0;
-			/*
-			if (zone->zonemap) {
-				roambox_destination_z = FindGroundZ(roambox_destination_x, roambox_destination_y, this->GetZOffset());
-			}
-				*/
+			PathfinderOptions opts;
+			opts.smooth_path = true;
+			opts.step_size   = RuleR(Pathing, NavmeshStepSize);
+			opts.offset      = GetZOffset();
+			opts.flags       = PathingNotDisabled ^ PathingZoneLine;
 
-			Log(Logs::Detail,
+			auto partial = false;
+			auto stuck   = false;
+			auto route   = zone->pathing->FindPath(
+				glm::vec3(GetX(), GetY(), GetZ()),
+				glm::vec3(
+					roambox_destination_x,
+					roambox_destination_y,
+					GetGroundZ(roambox_destination_x, roambox_destination_y)
+				),
+				partial,
+				stuck,
+				opts
+			);
+
+			if (route.empty()) {
+				Log(
+					Logs::Detail,
+					Logs::NPCRoamBox, "(%s) We don't have a path route... exiting...",
+					this->GetCleanName()
+				);
+				return;
+			}
+
+			roambox_destination_z = 0;
+
+			Log(
+				Logs::General,
 				Logs::NPCRoamBox,
-				"Calculate | NPC: %s distance %.3f | min_x %.3f | max_x %.3f | final_x %.3f | min_y %.3f | max_y %.3f | final_y %.3f",
+				"NPC (%s) distance [%.0f] X (min/max) [%.0f / %.0f] Y (min/max) [%.0f / %.0f] | Dest x/y/z [%.0f / %.0f / %.0f]",
 				this->GetCleanName(),
 				roambox_distance,
 				roambox_min_x,
 				roambox_max_x,
-				roambox_destination_x,
 				roambox_min_y,
 				roambox_max_y,
-				roambox_destination_y);
-			Log(Logs::Detail, Logs::NPCRoamBox, "Dest Z is (%f)", roambox_destination_z);
+				roambox_destination_x,
+				roambox_destination_y,
+				roambox_destination_z
+			);
 
 			SetCurrentWP(EQEmu::WaypointStatus::RoamBoxPauseInProgress);
 			NavigateTo(roambox_destination_x, roambox_destination_y, roambox_destination_z);
@@ -1667,9 +1676,9 @@ void NPC::AI_DoMovement() {
 			pause_timer_complete = true;
 			AI_walking_timer->Disable();
 		}
-		
+
 		int32 gridno = CastToNPC()->GetGrid();
-		
+
 		if (gridno > 0 || cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) {
 			if (pause_timer_complete == true) { // time to pause at wp is over
 				AI_SetupNextWaypoint();
@@ -1677,15 +1686,13 @@ void NPC::AI_DoMovement() {
 			else if (!(AI_walking_timer->Enabled())) {    // currently moving
 				bool doMove = true;
 				if(IsPositionEqual(glm::vec2(m_CurrentWayPoint.x, m_CurrentWayPoint.y), glm::vec2(GetX(), GetY()))) {
-					Log(Logs::Detail,
-						Logs::AI,
-						"We have reached waypoint %d (%.3f,%.3f,%.3f) on grid %d",
+					LogAI("We have reached waypoint [{}] ({},{},{}) on grid [{}]",
 						cur_wp,
 						GetX(),
 						GetY(),
 						GetZ(),
 						GetGrid());
-		
+
 					SetWaypointPause();
 					SetAppearance(eaStanding, false);
 					if (cur_wp_pause > 0) {
@@ -1731,7 +1738,7 @@ void NPC::AI_DoMovement() {
 		else if (gridno < 0) {    // this mob is under quest control
 			if (pause_timer_complete == true) { // time to pause has ended
 				SetGrid(0 - GetGrid()); // revert to AI control
-				Log(Logs::Detail, Logs::Pathing, "Quest pathing is finished. Resuming on grid %d", GetGrid());
+				LogPathing("Quest pathing is finished. Resuming on grid [{}]", GetGrid());
 		
 				SetAppearance(eaStanding, false);
 		
@@ -1746,12 +1753,7 @@ void NPC::AI_DoMovement() {
 		if (at_gp) {
 
 			if (moved) {
-				Log(Logs::Detail,
-					Logs::AI,
-					"Reached guard point (%.3f,%.3f,%.3f)",
-					m_GuardPoint.x,
-					m_GuardPoint.y,
-					m_GuardPoint.z);
+				LogAI("Reached guard point ({},{},{})", m_GuardPoint.x, m_GuardPoint.y, m_GuardPoint.z);
 
 				ClearFeignMemory();
 				moved = false;
@@ -1799,10 +1801,10 @@ void NPC::AI_SetupNextWaypoint() {
 	}
 	else {
 		pause_timer_complete = false;
-		Log(Logs::Detail, Logs::Pathing, "We are departing waypoint %d.", cur_wp);
+		LogPathing("We are departing waypoint [{}]", cur_wp);
 		//if we were under quest control (with no grid), we are done now..
 		if (cur_wp == EQEmu::WaypointStatus::QuestControlNoGrid) {
-			Log(Logs::Detail, Logs::Pathing, "Non-grid quest mob has reached its quest ordered waypoint. Leaving pathing mode.");
+			LogPathing("Non-grid quest mob has reached its quest ordered waypoint. Leaving pathing mode");
 			roamer = false;
 			cur_wp = 0;
 		}
@@ -1829,47 +1831,46 @@ void NPC::AI_SetupNextWaypoint() {
 	}
 }
 
-// Note: Mob that caused this may not get added to the hate list until after this function call completes
-void Mob::AI_Event_Engaged(Mob* attacker, bool iYellForHelp) {
-	if (!IsAIControlled())
+/**
+ * @param attacker
+ * @param yell_for_help
+ */
+void Mob::AI_Event_Engaged(Mob *attacker, bool yell_for_help)
+{
+	if (!IsAIControlled()) {
 		return;
+	}
 
 	SetAppearance(eaStanding);
 
-	/*
-		Kick off auto cast timer
-	*/
-	if (this->IsNPC())
-		this->CastToNPC()->AIautocastspell_timer->Start(300, false);
+	if (IsNPC()) {
+		CastToNPC()->AIautocastspell_timer->Start(300, false);
 
-	if (iYellForHelp) {
-		if(IsPet()) {
-			GetOwner()->AI_Event_Engaged(attacker, iYellForHelp);
-		} else if (!HasAssistAggro() && NPCAssistCap() < RuleI(Combat, NPCAssistCap)) {
-			entity_list.AIYellForHelp(this, attacker);
-			if (NPCAssistCap() > 0 && !assist_cap_timer.Enabled())
-				assist_cap_timer.Start(RuleI(Combat, NPCAssistCapTimer));
+		if (yell_for_help) {
+			if (IsPet()) {
+				GetOwner()->AI_Event_Engaged(attacker, yell_for_help);
+			}
+			else if (!HasAssistAggro() && NPCAssistCap() < RuleI(Combat, NPCAssistCap)) {
+				CastToNPC()->AIYellForHelp(this, attacker);
+				if (NPCAssistCap() > 0 && !assist_cap_timer.Enabled()) {
+					assist_cap_timer.Start(RuleI(Combat, NPCAssistCapTimer));
+				}
+			}
 		}
-	}
 
-	if(IsNPC())
-	{
-		if(CastToNPC()->GetGrid() > 0)
-		{
+		if (CastToNPC()->GetGrid() > 0) {
 			DistractedFromGrid = true;
 		}
-		if(attacker && !attacker->IsCorpse())
-		{
+		if (attacker && !attacker->IsCorpse()) {
 			//Because sometimes the AIYellForHelp triggers another engaged and then immediately a not engaged
 			//if the target dies before it goes off
-			if(attacker->GetHP() > 0)
-			{
-				if(!CastToNPC()->GetCombatEvent() && GetHP() > 0)
-				{
+			if (attacker->GetHP() > 0) {
+				if (!CastToNPC()->GetCombatEvent() && GetHP() > 0) {
 					parse->EventNPC(EVENT_COMBAT, CastToNPC(), attacker, "1", 0);
 					uint16 emoteid = GetEmoteID();
-					if(emoteid != 0)
-						CastToNPC()->DoNPCEmote(ENTERCOMBAT,emoteid);
+					if (emoteid != 0) {
+						CastToNPC()->DoNPCEmote(ENTERCOMBAT, emoteid);
+					}
 					CastToNPC()->SetCombatEvent(true);
 				}
 			}
@@ -1939,7 +1940,7 @@ bool NPC::AI_EngagedCastCheck() {
 	if (AIautocastspell_timer->Check(false)) {
 		AIautocastspell_timer->Disable();	//prevent the timer from going off AGAIN while we are casting.
 
-		Log(Logs::Detail, Logs::AI, "Engaged autocast check triggered. Trying to cast healing spells then maybe offensive spells.");
+		LogAI("Engaged autocast check triggered. Trying to cast healing spells then maybe offensive spells");
 
 		// first try innate (spam) spells
 		if(!AICastSpell(GetTarget(), 0, SpellType_Nuke | SpellType_Lifetap | SpellType_DOT | SpellType_Dispel | SpellType_Mez | SpellType_Slow | SpellType_Debuff | SpellType_Charm | SpellType_Root, true)) {
@@ -1948,7 +1949,7 @@ bool NPC::AI_EngagedCastCheck() {
 				// try casting a heal or gate
 				if (!AICastSpell(this, AISpellVar.engaged_beneficial_self_chance, SpellType_Heal | SpellType_Escape | SpellType_InCombatBuff)) {
 					// try casting a heal on nearby
-					if (!entity_list.AICheckCloseBeneficialSpells(this, AISpellVar.engaged_beneficial_other_chance, MobAISpellRange, SpellType_Heal)) {
+					if (!AICheckCloseBeneficialSpells(this, AISpellVar.engaged_beneficial_other_chance, MobAISpellRange, SpellType_Heal)) {
 						//nobody to heal, try some detrimental spells.
 						if(!AICastSpell(GetTarget(), AISpellVar.engaged_detrimental_chance, SpellType_Nuke | SpellType_Lifetap | SpellType_DOT | SpellType_Dispel | SpellType_Mez | SpellType_Slow | SpellType_Debuff | SpellType_Charm | SpellType_Root)) {
 							//no spell to cast, try again soon.
@@ -1968,7 +1969,7 @@ bool NPC::AI_PursueCastCheck() {
 	if (AIautocastspell_timer->Check(false)) {
 		AIautocastspell_timer->Disable();	//prevent the timer from going off AGAIN while we are casting.
 
-		Log(Logs::Detail, Logs::AI, "Engaged (pursuing) autocast check triggered. Trying to cast offensive spells.");
+		LogAI("Engaged (pursuing) autocast check triggered. Trying to cast offensive spells");
 		// checking innate (spam) spells first
 		if(!AICastSpell(GetTarget(), AISpellVar.pursue_detrimental_chance, SpellType_Root | SpellType_Nuke | SpellType_Lifetap | SpellType_Snare | SpellType_DOT | SpellType_Dispel | SpellType_Mez | SpellType_Slow | SpellType_Debuff, true)) {
 			if(!AICastSpell(GetTarget(), AISpellVar.pursue_detrimental_chance, SpellType_Root | SpellType_Nuke | SpellType_Lifetap | SpellType_Snare | SpellType_DOT | SpellType_Dispel | SpellType_Mez | SpellType_Slow | SpellType_Debuff)) {
@@ -1985,12 +1986,12 @@ bool NPC::AI_IdleCastCheck() {
 	if (AIautocastspell_timer->Check(false)) {
 		AIautocastspell_timer->Disable();	//prevent the timer from going off AGAIN while we are casting.
 		if (!AICastSpell(this, AISpellVar.idle_beneficial_chance, SpellType_Heal | SpellType_Buff | SpellType_Pet)) {
-			if(!entity_list.AICheckCloseBeneficialSpells(this, 33, MobAISpellRange, SpellType_Heal | SpellType_Buff)) {
+			if(!AICheckCloseBeneficialSpells(this, 33, MobAISpellRange, SpellType_Heal | SpellType_Buff)) {
 				//if we didnt cast any spells, our autocast timer just resets to the
 				//last duration it was set to... try to put up a more reasonable timer...
 				AIautocastspell_timer->Start(RandomTimer(AISpellVar.idle_no_sp_recast_min, AISpellVar.idle_no_sp_recast_max), false);
 
-				Log(Logs::Moderate, Logs::Spells, "Triggering AI_IdleCastCheck :: Mob %s - Min : %u Max : %u", this->GetCleanName(), AISpellVar.idle_no_sp_recast_min, AISpellVar.idle_no_sp_recast_max);
+				LogSpells("Triggering AI_IdleCastCheck :: Mob [{}] - Min : [{}] Max : [{}]", this->GetCleanName(), AISpellVar.idle_no_sp_recast_min, AISpellVar.idle_no_sp_recast_max);
 
 			}	//else, spell casting finishing will reset the timer.
 		}	//else, spell casting finishing will reset the timer.
@@ -2029,14 +2030,14 @@ void Mob::StartEnrage()
 
 	// start the timer. need to call IsEnraged frequently since we dont have callback timers :-/
 	bEnraged = true;
-	entity_list.MessageClose_StringID(this, true, 200, MT_NPCEnrage, NPC_ENRAGE_START, GetCleanName());
+	entity_list.MessageCloseString(this, true, 200, Chat::NPCEnrage, NPC_ENRAGE_START, GetCleanName());
 }
 
 void Mob::ProcessEnrage(){
 	if(IsEnraged()){
 		Timer *timer = GetSpecialAbilityTimer(SPECATK_ENRAGE);
 		if(timer && timer->Check()){
-			entity_list.MessageClose_StringID(this, true, 200, MT_NPCEnrage, NPC_ENRAGE_END, GetCleanName());
+			entity_list.MessageCloseString(this, true, 200, Chat::NPCEnrage, NPC_ENRAGE_END, GetCleanName());
 
 			int enraged_cooldown = GetSpecialAbilityParam(SPECATK_ENRAGE, 2);
 			enraged_cooldown = enraged_cooldown > 0 ? enraged_cooldown : EnragedTimer;
@@ -2057,9 +2058,23 @@ bool Mob::Flurry(ExtraAttackOptions *opts)
 	Mob *target = GetTarget();
 	if (target) {
 		if (!IsPet()) {
-			entity_list.MessageClose_StringID(this, true, 200, MT_NPCFlurry, NPC_FLURRY, GetCleanName(), target->GetCleanName());
+			entity_list.MessageCloseString(
+				this,
+				true,
+				200,
+				Chat::NPCFlurry,
+				NPC_FLURRY,
+				GetCleanName(),
+				target->GetCleanName());
 		} else {
-			entity_list.MessageClose_StringID(this, true, 200, MT_PetFlurry, NPC_FLURRY, GetCleanName(), target->GetCleanName());
+			entity_list.MessageCloseString(
+				this,
+				true,
+				200,
+				Chat::PetFlurry,
+				NPC_FLURRY,
+				GetCleanName(),
+				target->GetCleanName());
 		}
 
 		int num_attacks = GetSpecialAbilityParam(SPECATK_FLURRY, 1);
@@ -2096,9 +2111,9 @@ bool Mob::Rampage(ExtraAttackOptions *opts)
 {
 	int index_hit = 0;
 	if (!IsPet())
-		entity_list.MessageClose_StringID(this, true, 200, MT_NPCRampage, NPC_RAMPAGE, GetCleanName());
+		entity_list.MessageCloseString(this, true, 200, Chat::NPCRampage, NPC_RAMPAGE, GetCleanName());
 	else
-		entity_list.MessageClose_StringID(this, true, 200, MT_PetFlurry, NPC_RAMPAGE, GetCleanName());
+		entity_list.MessageCloseString(this, true, 200, Chat::PetFlurry, NPC_RAMPAGE, GetCleanName());
 
 	int rampage_targets = GetSpecialAbilityParam(SPECATK_RAMPAGE, 1);
 	if (rampage_targets == 0) // if set to 0 or not set in the DB
@@ -2153,9 +2168,9 @@ void Mob::AreaRampage(ExtraAttackOptions *opts)
 {
 	int index_hit = 0;
 	if (!IsPet()) { // do not know every pet AA so thought it safer to add this
-		entity_list.MessageClose_StringID(this, true, 200, MT_NPCRampage, AE_RAMPAGE, GetCleanName());
+		entity_list.MessageCloseString(this, true, 200, Chat::NPCRampage, AE_RAMPAGE, GetCleanName());
 	} else {
-		entity_list.MessageClose_StringID(this, true, 200, MT_PetFlurry, AE_RAMPAGE, GetCleanName());
+		entity_list.MessageCloseString(this, true, 200, Chat::PetFlurry, AE_RAMPAGE, GetCleanName());
 	}
 
 	int rampage_targets = GetSpecialAbilityParam(SPECATK_AREA_RAMPAGE, 1);
@@ -2449,21 +2464,21 @@ bool NPC::AI_AddNPCSpells(uint32 iDBSpellsID) {
 	else {
 		debug_msg.append(" (not found)");
 	}
-	Log(Logs::Detail, Logs::AI, "%s", debug_msg.c_str());
+	LogAI("[{}]", debug_msg.c_str());
 
 #ifdef MobAI_DEBUG_Spells >= 25
 	if (parentlist) {
 		for (const auto &iter : parentlist->entries) {
-			Log(Logs::Detail, Logs::AI, "(%i) %s", iter.spellid, spells[iter.spellid].name);
+			LogAI("([{}]) [{}]", iter.spellid, spells[iter.spellid].name);
 		}
 	}
-	Log(Logs::Detail, Logs::AI, "fin (parent list)");
+	LogAI("fin (parent list)");
 	if (spell_list) {
 		for (const auto &iter : spell_list->entries) {
-			Log(Logs::Detail, Logs::AI, "(%i) %s", iter.spellid, spells[iter.spellid].name);
+			LogAI("([{}]) [{}]", iter.spellid, spells[iter.spellid].name);
 		}
 	}
-	Log(Logs::Detail, Logs::AI, "fin (spell list)");
+	LogAI("fin (spell list)");
 #endif
 
 #endif
@@ -2624,7 +2639,7 @@ bool NPC::AI_AddNPCSpellsEffects(uint32 iDBSpellsEffectsID) {
 	else {
 		debug_msg.append(" (not found)");
 	}
-	Log(Logs::Detail, Logs::AI, "%s", debug_msg.c_str());
+	LogAI("[{}]", debug_msg.c_str());
 #endif
 
 	if (parentlist) {
@@ -2744,7 +2759,7 @@ void NPC::AISpellsList(Client *c)
 		return;
 
 	for (auto it = AIspells.begin(); it != AIspells.end(); ++it)
-		c->Message(0, "%s (%d): Type %d, Priority %d, Recast Delay %d, Resist Adjust %d, Min HP %d, Max HP %d",
+		c->Message(Chat::White, "%s (%d): Type %d, Priority %d, Recast Delay %d, Resist Adjust %d, Min HP %d, Max HP %d",
 				spells[it->spellid].name, it->spellid, it->type, it->priority, it->recast_delay, it->resist_adjust, it->min_hp, it->max_hp);
 
 	return;
diff --git a/zone/mob_info.cpp b/zone/mob_info.cpp
index 174a00330..edac37768 100644
--- a/zone/mob_info.cpp
+++ b/zone/mob_info.cpp
@@ -278,7 +278,7 @@ inline std::string GetMobAttributeByString(Mob *mob, const std::string &attribut
 			return std::to_string((int)npc->GetWalkspeed());
 		}
 		if (attribute == "spawngroup") {
-			return std::to_string(npc->GetSp2());
+			return std::to_string(npc->GetSpawnGroupId());
 		}
 		if (attribute == "grid") {
 			return std::to_string(npc->GetGrid());
@@ -624,7 +624,7 @@ inline void NPCCommandsMenu(Client* client, NPC* npc)
 
 	if (menu_commands.length() > 0) {
 		std::string dev_menu = "[" + EQEmu::SayLinkEngine::GenerateQuestSaylink("#devtools", false, "DevTools") + "] ";;
-		client->Message(0, "| %s [Show Commands] %s", dev_menu.c_str(), menu_commands.c_str());
+		client->Message(Chat::White, "| %s [Show Commands] %s", dev_menu.c_str(), menu_commands.c_str());
 	}
 }
 
diff --git a/zone/mob_movement_manager.cpp b/zone/mob_movement_manager.cpp
index 1fcc19187..5e40dfeee 100644
--- a/zone/mob_movement_manager.cpp
+++ b/zone/mob_movement_manager.cpp
@@ -14,40 +14,41 @@
 #include <stdlib.h>
 
 extern double frame_time;
-extern Zone *zone;
+extern Zone   *zone;
 
-class IMovementCommand
-{
+class IMovementCommand {
 public:
 	IMovementCommand() = default;
 	virtual ~IMovementCommand() = default;
-	virtual bool Process(MobMovementManager *mgr, Mob *m) = 0;
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob) = 0;
 	virtual bool Started() const = 0;
 };
 
-class RotateToCommand : public IMovementCommand
-{
+class RotateToCommand : public IMovementCommand {
 public:
-	RotateToCommand(double rotate_to, double dir, MobMovementMode mode) {
-		m_rotate_to = rotate_to;
-		m_rotate_to_dir = dir;
-		m_rotate_to_mode = mode;
-		m_started = false;
+	RotateToCommand(double rotate_to, double dir, MobMovementMode mob_movement_mode)
+	{
+		m_rotate_to      = rotate_to;
+		m_rotate_to_dir  = dir;
+		m_rotate_to_mode = mob_movement_mode;
+		m_started        = false;
 	}
 
-	virtual ~RotateToCommand() {
+	virtual ~RotateToCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		auto rotate_to_speed = m_rotate_to_mode == MovementRunning ? 200.0 :  16.0; //todo: get this from mob
+		auto rotate_to_speed = m_rotate_to_mode == MovementRunning ? 200.0 : 16.0; //todo: get this from mob
 
-		auto from = FixHeading(m->GetHeading());
-		auto to = FixHeading(m_rotate_to);
+		auto from = FixHeading(mob->GetHeading());
+		auto to   = FixHeading(m_rotate_to);
 		auto diff = to - from;
 
 		while (diff < -256.0) {
@@ -62,265 +63,282 @@ public:
 
 		if (!m_started) {
 			m_started = true;
-			m->SetMoving(true);
-		
+			mob->SetMoving(true);
+
 			if (dist > 15.0f && rotate_to_speed > 0.0 && rotate_to_speed <= 25.0) { //send basic rotation
-				mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, m_rotate_to_dir * rotate_to_speed, 0, ClientRangeClose);
+				mob_movement_manager->SendCommandToClients(
+					mob,
+					0.0,
+					0.0,
+					0.0,
+					m_rotate_to_dir * rotate_to_speed,
+					0,
+					ClientRangeClose
+				);
 			}
 		}
-		
+
 		auto td = rotate_to_speed * 19.0 * frame_time;
-		
+
 		if (td >= dist) {
-			m->SetHeading(to);
-			m->SetMoving(false);
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
+			mob->SetHeading(to);
+			mob->SetMoving(false);
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
 			return true;
 		}
-		
+
 		from += td * m_rotate_to_dir;
-		m->SetHeading(FixHeading(from));
+		mob->SetHeading(FixHeading(from));
 		return false;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return m_started;
 	}
 
 private:
-	double m_rotate_to;
-	double m_rotate_to_dir;
+	double          m_rotate_to;
+	double          m_rotate_to_dir;
 	MobMovementMode m_rotate_to_mode;
-	bool m_started;
+	bool            m_started;
 };
 
-class MoveToCommand : public IMovementCommand
-{
+class MoveToCommand : public IMovementCommand {
 public:
-	MoveToCommand(float x, float y, float z, MobMovementMode mode) {
+	MoveToCommand(float x, float y, float z, MobMovementMode mob_movement_mode)
+	{
 		m_distance_moved_since_correction = 0.0;
-		m_move_to_x = x;
-		m_move_to_y = y;
-		m_move_to_z = z;
-		m_move_to_mode = mode;
-		m_last_sent_time = 0.0;
-		m_last_sent_speed = 0;
-		m_started = false;
-		m_total_h_dist = 0.0;
-		m_total_v_dist = 0.0;
+		m_move_to_x                       = x;
+		m_move_to_y                       = y;
+		m_move_to_z                       = z;
+		m_move_to_mode                    = mob_movement_mode;
+		m_last_sent_time                  = 0.0;
+		m_last_sent_speed                 = 0;
+		m_started                         = false;
+		m_total_h_dist                    = 0.0;
+		m_total_v_dist                    = 0.0;
 	}
 
-	virtual ~MoveToCommand() {
+	virtual ~MoveToCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	/**
+	 * @param mob_movement_manager
+	 * @param mob
+	 * @return
+	 */
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
 		//Send a movement packet when you start moving		
-		double current_time = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-		int current_speed = 0;
+		double current_time  = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
+		int    current_speed = 0;
 
 		if (m_move_to_mode == MovementRunning) {
-			if (m->IsFeared()) {
-				current_speed = m->GetFearSpeed();
+			if (mob->IsFeared()) {
+				current_speed = mob->GetFearSpeed();
 			}
 			else {
-				current_speed = m->GetRunspeed();
+				current_speed = mob->GetRunspeed();
 			}
 		}
 		else {
-			current_speed = m->GetWalkspeed();
+			current_speed = mob->GetWalkspeed();
 		}
 
 		if (!m_started) {
 			m_started = true;
 			//rotate to the point
-			m->SetMoving(true);
-			m->SetHeading(m->CalculateHeadingToTarget(m_move_to_x, m_move_to_y));
+			mob->SetMoving(true);
+			mob->SetHeading(mob->CalculateHeadingToTarget(m_move_to_x, m_move_to_y));
 
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			m_total_h_dist = DistanceNoZ(m->GetPosition(), glm::vec4(m_move_to_x, m_move_to_y, 0.0f, 0.0f));
-			m_total_v_dist = m_move_to_z - m->GetZ();
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			m_total_h_dist    = DistanceNoZ(mob->GetPosition(), glm::vec4(m_move_to_x, m_move_to_y, 0.0f, 0.0f));
+			m_total_v_dist    = m_move_to_z - mob->GetZ();
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
 		//When speed changes
 		if (current_speed != m_last_sent_speed) {
 			if (RuleB(Map, FixZWhenPathing)) {
-				m->FixZ();
+				mob->FixZ();
 			}
 
 			m_distance_moved_since_correction = 0.0;
 
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
 		//If x seconds have passed without sending an update.
 		if (current_time - m_last_sent_time >= 5.0) {
 			if (RuleB(Map, FixZWhenPathing)) {
-				m->FixZ();
+				mob->FixZ();
 			}
 
 			m_distance_moved_since_correction = 0.0;
 
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
-		auto &p = m->GetPosition();
+		auto      &p  = mob->GetPosition();
 		glm::vec2 tar(m_move_to_x, m_move_to_y);
 		glm::vec2 pos(p.x, p.y);
-		double len = glm::distance(pos, tar);
+		double    len = glm::distance(pos, tar);
 		if (len == 0) {
 			return true;
 		}
 
-		m->SetMoved(true);
+		mob->SetMoved(true);
 
-		glm::vec2 dir = tar - pos;
-		glm::vec2 ndir = glm::normalize(dir);
-		double distance_moved = frame_time * current_speed * 0.4f * 1.45f;
+		glm::vec2 dir            = tar - pos;
+		glm::vec2 ndir           = glm::normalize(dir);
+		double    distance_moved = frame_time * current_speed * 0.4f * 1.45f;
 
-		if (distance_moved > len) {		
-			if (m->IsNPC()) {
-				entity_list.ProcessMove(m->CastToNPC(), m_move_to_x, m_move_to_y, m_move_to_z);
+		if (distance_moved > len) {
+			if (mob->IsNPC()) {
+				entity_list.ProcessMove(mob->CastToNPC(), m_move_to_x, m_move_to_y, m_move_to_z);
 			}
 
-			m->SetPosition(m_move_to_x, m_move_to_y, m_move_to_z);
-		
+			mob->SetPosition(m_move_to_x, m_move_to_y, m_move_to_z);
+
 			if (RuleB(Map, FixZWhenPathing)) {
-				m->FixZ();
+				mob->FixZ();
 			}
 			return true;
 		}
 		else {
 			glm::vec2 npos = pos + (ndir * static_cast<float>(distance_moved));
-			
+
 			len -= distance_moved;
 			double total_distance_traveled = m_total_h_dist - len;
-			double start_z = m_move_to_z - m_total_v_dist;
-			double z_at_pos = start_z + (m_total_v_dist * (total_distance_traveled / m_total_h_dist));
+			double start_z                 = m_move_to_z - m_total_v_dist;
+			double z_at_pos                = start_z + (m_total_v_dist * (total_distance_traveled / m_total_h_dist));
 
-			if (m->IsNPC()) {
-				entity_list.ProcessMove(m->CastToNPC(), npos.x, npos.y, z_at_pos);
+			if (mob->IsNPC()) {
+				entity_list.ProcessMove(mob->CastToNPC(), npos.x, npos.y, z_at_pos);
 			}
 
-			m->SetPosition(npos.x, npos.y, z_at_pos);
+			mob->SetPosition(npos.x, npos.y, z_at_pos);
 
 
 			if (RuleB(Map, FixZWhenPathing)) {
 				m_distance_moved_since_correction += distance_moved;
 				if (m_distance_moved_since_correction > RuleR(Map, DistanceCanTravelBeforeAdjustment)) {
 					m_distance_moved_since_correction = 0.0;
-					m->FixZ();
+					mob->FixZ();
 				}
 			}
 		}
-		
+
 		return false;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return m_started;
 	}
 
 protected:
-	double m_distance_moved_since_correction;
-	double m_move_to_x;
-	double m_move_to_y;
-	double m_move_to_z;
+	double          m_distance_moved_since_correction;
+	double          m_move_to_x;
+	double          m_move_to_y;
+	double          m_move_to_z;
 	MobMovementMode m_move_to_mode;
-	bool m_started;
+	bool            m_started;
 
 	double m_last_sent_time;
-	int m_last_sent_speed;
+	int    m_last_sent_speed;
 	double m_total_h_dist;
 	double m_total_v_dist;
 };
 
-class SwimToCommand : public MoveToCommand
-{
+class SwimToCommand : public MoveToCommand {
 public:
-	SwimToCommand(float x, float y, float z, MobMovementMode mode) : MoveToCommand(x, y, z, mode) {
+	SwimToCommand(float x, float y, float z, MobMovementMode mob_movement_mode) : MoveToCommand(x, y, z, mob_movement_mode)
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m)
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
 	{
-		if (!m->IsAIControlled()) {
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		//Send a movement packet when you start moving		
-		double current_time = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-		int current_speed = 0;
+		//Send a movement packet when you start moving
+		double current_time  = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
+		int    current_speed = 0;
 
 		if (m_move_to_mode == MovementRunning) {
-			if (m->IsFeared()) {
-				current_speed = m->GetFearSpeed();
+			if (mob->IsFeared()) {
+				current_speed = mob->GetFearSpeed();
 			}
 			else {
-				current_speed = m->GetRunspeed();
+				current_speed = mob->GetRunspeed();
 			}
 		}
 		else {
-			current_speed = m->GetWalkspeed();
+			current_speed = mob->GetWalkspeed();
 		}
 
 		if (!m_started) {
 			m_started = true;
 			//rotate to the point
-			m->SetMoving(true);
-			m->SetHeading(m->CalculateHeadingToTarget(m_move_to_x, m_move_to_y));
+			mob->SetMoving(true);
+			mob->SetHeading(mob->CalculateHeadingToTarget(m_move_to_x, m_move_to_y));
 
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			m_total_h_dist = DistanceNoZ(m->GetPosition(), glm::vec4(m_move_to_x, m_move_to_y, 0.0f, 0.0f));
-			m_total_v_dist = m_move_to_z - m->GetZ();
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			m_total_h_dist    = DistanceNoZ(mob->GetPosition(), glm::vec4(m_move_to_x, m_move_to_y, 0.0f, 0.0f));
+			m_total_v_dist    = m_move_to_z - mob->GetZ();
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
 		//When speed changes
 		if (current_speed != m_last_sent_speed) {
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
 		//If x seconds have passed without sending an update.
 		if (current_time - m_last_sent_time >= 1.5) {
 			m_last_sent_speed = current_speed;
-			m_last_sent_time = current_time;
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
+			m_last_sent_time  = current_time;
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, current_speed, ClientRangeCloseMedium);
 		}
 
-		auto &p = m->GetPosition();
+		auto      &p  = mob->GetPosition();
 		glm::vec2 tar(m_move_to_x, m_move_to_y);
 		glm::vec2 pos(p.x, p.y);
-		double len = glm::distance(pos, tar);
+		double    len = glm::distance(pos, tar);
 		if (len == 0) {
 			return true;
 		}
 
-		m->SetMoved(true);
+		mob->SetMoved(true);
 
-		glm::vec2 dir = tar - pos;
-		glm::vec2 ndir = glm::normalize(dir);
-		double distance_moved = frame_time * current_speed * 0.4f * 1.45f;
+		glm::vec2 dir            = tar - pos;
+		glm::vec2 ndir           = glm::normalize(dir);
+		double    distance_moved = frame_time * current_speed * 0.4f * 1.45f;
 
 		if (distance_moved > len) {
-			if (m->IsNPC()) {
-				entity_list.ProcessMove(m->CastToNPC(), m_move_to_x, m_move_to_y, m_move_to_z);
+			if (mob->IsNPC()) {
+				entity_list.ProcessMove(mob->CastToNPC(), m_move_to_x, m_move_to_y, m_move_to_z);
 			}
 
-			m->SetPosition(m_move_to_x, m_move_to_y, m_move_to_z);
+			mob->SetPosition(m_move_to_x, m_move_to_y, m_move_to_z);
 			return true;
 		}
 		else {
@@ -328,51 +346,54 @@ public:
 
 			len -= distance_moved;
 			double total_distance_traveled = m_total_h_dist - len;
-			double start_z = m_move_to_z - m_total_v_dist;
-			double z_at_pos = start_z + (m_total_v_dist * (total_distance_traveled / m_total_h_dist));
+			double start_z                 = m_move_to_z - m_total_v_dist;
+			double z_at_pos                = start_z + (m_total_v_dist * (total_distance_traveled / m_total_h_dist));
 
-			if (m->IsNPC()) {
-				entity_list.ProcessMove(m->CastToNPC(), npos.x, npos.y, z_at_pos);
+			if (mob->IsNPC()) {
+				entity_list.ProcessMove(mob->CastToNPC(), npos.x, npos.y, z_at_pos);
 			}
 
-			m->SetPosition(npos.x, npos.y, z_at_pos);
+			mob->SetPosition(npos.x, npos.y, z_at_pos);
 		}
 
 		return false;
 	}
 };
 
-class TeleportToCommand : public IMovementCommand
-{
+class TeleportToCommand : public IMovementCommand {
 public:
-	TeleportToCommand(float x, float y, float z, float heading) {
-		m_teleport_to_x = x;
-		m_teleport_to_y = y;
-		m_teleport_to_z = z;
+	TeleportToCommand(float x, float y, float z, float heading)
+	{
+		m_teleport_to_x       = x;
+		m_teleport_to_y       = y;
+		m_teleport_to_z       = z;
 		m_teleport_to_heading = heading;
 	}
 
-	virtual ~TeleportToCommand() {
+	virtual ~TeleportToCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		if (m->IsNPC()) {
-			entity_list.ProcessMove(m->CastToNPC(), m_teleport_to_x, m_teleport_to_y, m_teleport_to_z);
+		if (mob->IsNPC()) {
+			entity_list.ProcessMove(mob->CastToNPC(), m_teleport_to_x, m_teleport_to_y, m_teleport_to_z);
 		}
 
-		m->SetPosition(m_teleport_to_x, m_teleport_to_y, m_teleport_to_z);
-		m->SetHeading(mgr->FixHeading(m_teleport_to_heading));
-		mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeAny);
+		mob->SetPosition(m_teleport_to_x, m_teleport_to_y, m_teleport_to_z);
+		mob->SetHeading(mob_movement_manager->FixHeading(m_teleport_to_heading));
+		mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeAny);
 
 		return true;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return false;
 	}
 
@@ -384,93 +405,99 @@ private:
 	double m_teleport_to_heading;
 };
 
-class StopMovingCommand : public IMovementCommand
-{
+class StopMovingCommand : public IMovementCommand {
 public:
-	StopMovingCommand() {
+	StopMovingCommand()
+	{
 	}
 
-	virtual ~StopMovingCommand() {
+	virtual ~StopMovingCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		if (m->IsMoving()) {
-			m->SetMoving(false);
+		if (mob->IsMoving()) {
+			mob->SetMoving(false);
 			if (RuleB(Map, FixZWhenPathing)) {
-				m->FixZ();
+				mob->FixZ();
 			}
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
 		}
 		return true;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return false;
 	}
 };
 
-class EvadeCombatCommand : public IMovementCommand
-{
+class EvadeCombatCommand : public IMovementCommand {
 public:
-	EvadeCombatCommand() {
+	EvadeCombatCommand()
+	{
 	}
 
-	virtual ~EvadeCombatCommand() {
+	virtual ~EvadeCombatCommand()
+	{
 
 	}
 
-	virtual bool Process(MobMovementManager *mgr, Mob *m) {
-		if (!m->IsAIControlled()) {
+	virtual bool Process(MobMovementManager *mob_movement_manager, Mob *mob)
+	{
+		if (!mob->IsAIControlled()) {
 			return true;
 		}
 
-		if (m->IsMoving()) {
-			m->SetMoving(false);
-			mgr->SendCommandToClients(m, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
+		if (mob->IsMoving()) {
+			mob->SetMoving(false);
+			mob_movement_manager->SendCommandToClients(mob, 0.0, 0.0, 0.0, 0.0, 0, ClientRangeCloseMedium);
 		}
 
-		m->BuffFadeAll();
-		m->WipeHateList();
-		m->Heal();
+		mob->BuffFadeAll();
+		mob->WipeHateList();
+		mob->Heal();
 
 		return true;
 	}
 
-	virtual bool Started() const {
+	virtual bool Started() const
+	{
 		return false;
 	}
 };
 
-struct MovementStats
-{
-	MovementStats() {
-		LastResetTime = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-		TotalSent = 0ULL;
+struct MovementStats {
+	MovementStats()
+	{
+		LastResetTime     = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
+		TotalSent         = 0ULL;
 		TotalSentMovement = 0ULL;
 		TotalSentPosition = 0ULL;
-		TotalSentHeading = 0ULL;
+		TotalSentHeading  = 0ULL;
 	}
 
-	double LastResetTime;
+	double   LastResetTime;
 	uint64_t TotalSent;
 	uint64_t TotalSentMovement;
 	uint64_t TotalSentPosition;
 	uint64_t TotalSentHeading;
 };
 
-struct NavigateTo
-{
-	NavigateTo() {
-		navigate_to_x = 0.0;
-		navigate_to_y = 0.0;
-		navigate_to_z = 0.0;
+struct NavigateTo {
+	NavigateTo()
+	{
+		navigate_to_x       = 0.0;
+		navigate_to_y       = 0.0;
+		navigate_to_z       = 0.0;
 		navigate_to_heading = 0.0;
-		last_set_time = 0.0;
+		last_set_time       = 0.0;
 	}
 
 	double navigate_to_x;
@@ -480,13 +507,13 @@ struct NavigateTo
 	double last_set_time;
 };
 
-struct MobMovementEntry
-{
+struct MobMovementEntry {
 	std::deque<std::unique_ptr<IMovementCommand>> Commands;
-	NavigateTo NavTo;
+	NavigateTo                                    NavTo;
 };
 
-void AdjustRoute(std::list<IPathfinder::IPathNode> &nodes, Mob *who) {
+void AdjustRoute(std::list<IPathfinder::IPathNode> &nodes, Mob *who)
+{
 	if (!zone->HasMap() || !zone->HasWaterMap()) {
 		return;
 	}
@@ -494,7 +521,7 @@ void AdjustRoute(std::list<IPathfinder::IPathNode> &nodes, Mob *who) {
 	auto offset = who->GetZOffset();
 
 	for (auto &node : nodes) {
-		if(!zone->watermap->InLiquid(node.pos)) {
+		if (!zone->watermap->InLiquid(node.pos)) {
 			auto best_z = zone->zonemap->FindBestZ(node.pos, nullptr);
 			if (best_z != BEST_Z_INVALID) {
 				node.pos.z = best_z + offset;
@@ -503,11 +530,10 @@ void AdjustRoute(std::list<IPathfinder::IPathNode> &nodes, Mob *who) {
 	}
 }
 
-struct MobMovementManager::Implementation
-{
-	std::map<Mob*, MobMovementEntry> Entries;
-	std::vector<Client*> Clients;
-	MovementStats Stats;
+struct MobMovementManager::Implementation {
+	std::map<Mob *, MobMovementEntry> Entries;
+	std::vector<Client *>             Clients;
+	MovementStats                     Stats;
 };
 
 MobMovementManager::MobMovementManager()
@@ -522,12 +548,12 @@ MobMovementManager::~MobMovementManager()
 void MobMovementManager::Process()
 {
 	for (auto &iter : _impl->Entries) {
-		auto &ent = iter.second;
+		auto &ent      = iter.second;
 		auto &commands = ent.Commands;
 
 		while (true != commands.empty()) {
 			auto &cmd = commands.front();
-			auto r = cmd->Process(this, iter.first);
+			auto r    = cmd->Process(this, iter.first);
 
 			if (true != r) {
 				break;
@@ -538,35 +564,52 @@ void MobMovementManager::Process()
 	}
 }
 
-void MobMovementManager::AddMob(Mob *m)
+/**
+ * @param mob
+ */
+void MobMovementManager::AddMob(Mob *mob)
 {
-	_impl->Entries.insert(std::make_pair(m, MobMovementEntry()));
+	_impl->Entries.insert(std::make_pair(mob, MobMovementEntry()));
 }
 
-void MobMovementManager::RemoveMob(Mob *m)
+/**
+ * @param mob
+ */
+void MobMovementManager::RemoveMob(Mob *mob)
 {
-	_impl->Entries.erase(m);
+	_impl->Entries.erase(mob);
 }
 
-void MobMovementManager::AddClient(Client *c)
+/**
+ * @param client
+ */
+void MobMovementManager::AddClient(Client *client)
 {
-	_impl->Clients.push_back(c);
+	_impl->Clients.push_back(client);
 }
 
-void MobMovementManager::RemoveClient(Client *c)
+/**
+ * @param client
+ */
+void MobMovementManager::RemoveClient(Client *client)
 {
 	auto iter = _impl->Clients.begin();
 	while (iter != _impl->Clients.end()) {
-		if (c == *iter) {
+		if (client == *iter) {
 			_impl->Clients.erase(iter);
 			return;
 		}
-	
+
 		++iter;
 	}
 }
 
-void MobMovementManager::RotateTo(Mob *who, float to, MobMovementMode mode)
+/**
+ * @param who
+ * @param to
+ * @param mob_movement_mode
+ */
+void MobMovementManager::RotateTo(Mob *who, float to, MobMovementMode mob_movement_mode)
 {
 	auto iter = _impl->Entries.find(who);
 	auto &ent = (*iter);
@@ -574,20 +617,34 @@ void MobMovementManager::RotateTo(Mob *who, float to, MobMovementMode mode)
 	if (true != ent.second.Commands.empty()) {
 		return;
 	}
-	
-	PushRotateTo(ent.second, who, to, mode);
+
+	PushRotateTo(ent.second, who, to, mob_movement_mode);
 }
 
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param heading
+ */
 void MobMovementManager::Teleport(Mob *who, float x, float y, float z, float heading)
 {
 	auto iter = _impl->Entries.find(who);
 	auto &ent = (*iter);
-	
+
 	ent.second.Commands.clear();
 
 	PushTeleportTo(ent.second, x, y, z, heading);
 }
 
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mode
+ */
 void MobMovementManager::NavigateTo(Mob *who, float x, float y, float z, MobMovementMode mode)
 {
 	if (IsPositionEqualWithinCertainZ(glm::vec3(x, y, z), glm::vec3(who->GetX(), who->GetY(), who->GetZ()), 6.0f)) {
@@ -601,8 +658,13 @@ void MobMovementManager::NavigateTo(Mob *who, float x, float y, float z, MobMove
 	double current_time = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
 	if ((current_time - nav.last_set_time) > 0.5) {
 		//Can potentially recalc
-	
-		auto within = IsPositionWithinSimpleCylinder(glm::vec3(x, y, z), glm::vec3(nav.navigate_to_x, nav.navigate_to_y, nav.navigate_to_z), 1.5f, 6.0f);
+
+		auto within        = IsPositionWithinSimpleCylinder(
+			glm::vec3(x, y, z),
+			glm::vec3(nav.navigate_to_x, nav.navigate_to_y, nav.navigate_to_z),
+			1.5f,
+			6.0f
+		);
 		auto heading_match = IsHeadingEqual(0.0, nav.navigate_to_heading);
 
 		if (false == within || false == heading_match || ent.second.Commands.size() == 0) {
@@ -610,23 +672,27 @@ void MobMovementManager::NavigateTo(Mob *who, float x, float y, float z, MobMove
 
 			//Path is no longer valid, calculate a new path
 			UpdatePath(who, x, y, z, mode);
-			nav.navigate_to_x = x;
-			nav.navigate_to_y = y;
-			nav.navigate_to_z = z;
+			nav.navigate_to_x       = x;
+			nav.navigate_to_y       = y;
+			nav.navigate_to_z       = z;
 			nav.navigate_to_heading = 0.0;
-			nav.last_set_time = current_time;
+			nav.last_set_time       = current_time;
 		}
 	}
 }
 
-void MobMovementManager::StopNavigation(Mob *who) {
+/**
+ * @param who
+ */
+void MobMovementManager::StopNavigation(Mob *who)
+{
 	auto iter = _impl->Entries.find(who);
 	auto &ent = (*iter);
 	auto &nav = ent.second.NavTo;
 
-	nav.navigate_to_x = 0.0;
-	nav.navigate_to_y = 0.0;
-	nav.navigate_to_z = 0.0;
+	nav.navigate_to_x       = 0.0;
+	nav.navigate_to_y       = 0.0;
+	nav.navigate_to_z       = 0.0;
 	nav.navigate_to_heading = 0.0;
 
 	if (true == ent.second.Commands.empty()) {
@@ -643,24 +709,53 @@ void MobMovementManager::StopNavigation(Mob *who) {
 	PushStopMoving(ent.second);
 }
 
-void MobMovementManager::SendCommandToClients(Mob *m, float dx, float dy, float dz, float dh, int anim, ClientRange range)
+/**
+ * @param mob
+ * @param delta_x
+ * @param delta_y
+ * @param delta_z
+ * @param delta_heading
+ * @param anim
+ * @param range
+ * @param single_client
+ */
+void MobMovementManager::SendCommandToClients(
+	Mob *mob,
+	float delta_x,
+	float delta_y,
+	float delta_z,
+	float delta_heading,
+	int anim,
+	ClientRange range,
+	Client* single_client,
+	Client* ignore_client
+)
 {
 	if (range == ClientRangeNone) {
 		return;
 	}
 
 	EQApplicationPacket outapp(OP_ClientUpdate, sizeof(PlayerPositionUpdateServer_Struct));
-	PlayerPositionUpdateServer_Struct *spu = (PlayerPositionUpdateServer_Struct*)outapp.pBuffer;
-	FillCommandStruct(spu, m, dx, dy, dz, dh, anim);
+	auto                *spu = (PlayerPositionUpdateServer_Struct *) outapp.pBuffer;
+
+	FillCommandStruct(spu, mob, delta_x, delta_y, delta_z, delta_heading, anim);
 
 	if (range == ClientRangeAny) {
 		for (auto &c : _impl->Clients) {
+			if (single_client && c != single_client) {
+				continue;
+			}
+
+			if (ignore_client && c == ignore_client) {
+				continue;
+			}
+
 			_impl->Stats.TotalSent++;
 
 			if (anim != 0) {
 				_impl->Stats.TotalSentMovement++;
 			}
-			else if (dh != 0) {
+			else if (delta_heading != 0) {
 				_impl->Stats.TotalSentHeading++;
 			}
 			else {
@@ -672,26 +767,34 @@ void MobMovementManager::SendCommandToClients(Mob *m, float dx, float dy, float
 	}
 	else {
 		float short_range = RuleR(Pathing, ShortMovementUpdateRange);
-		float long_range = zone->GetMaxMovementUpdateRange();
+		float long_range  = zone->GetNpcPositionUpdateDistance();
 
 		for (auto &c : _impl->Clients) {
-			float dist = c->CalculateDistance(m->GetX(), m->GetY(), m->GetZ());
+			if (single_client && c != single_client) {
+				continue;
+			}
+
+			if (ignore_client && c == ignore_client) {
+				continue;
+			}
+
+			float distance = c->CalculateDistance(mob->GetX(), mob->GetY(), mob->GetZ());
 
 			bool match = false;
 			if (range & ClientRangeClose) {
-				if (dist < short_range) {
+				if (distance < short_range) {
 					match = true;
 				}
 			}
 
 			if (!match && range & ClientRangeMedium) {
-				if (dist >= short_range && dist < long_range) {
+				if (distance >= short_range && distance < long_range) {
 					match = true;
 				}
 			}
 
 			if (!match && range & ClientRangeLong) {
-				if (dist >= long_range) {
+				if (distance >= long_range) {
 					match = true;
 				}
 			}
@@ -702,7 +805,7 @@ void MobMovementManager::SendCommandToClients(Mob *m, float dx, float dy, float
 				if (anim != 0) {
 					_impl->Stats.TotalSentMovement++;
 				}
-				else if (dh != 0) {
+				else if (delta_heading != 0) {
 					_impl->Stats.TotalSentHeading++;
 				}
 				else {
@@ -715,6 +818,10 @@ void MobMovementManager::SendCommandToClients(Mob *m, float dx, float dy, float
 	}
 }
 
+/**
+ * @param in
+ * @return
+ */
 float MobMovementManager::FixHeading(float in)
 {
 	auto h = in;
@@ -729,83 +836,139 @@ float MobMovementManager::FixHeading(float in)
 	return h;
 }
 
-void MobMovementManager::DumpStats(Client *to)
+/**
+ * @param client
+ */
+void MobMovementManager::DumpStats(Client *client)
 {
 	auto current_time = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-	auto total_time = current_time - _impl->Stats.LastResetTime;
+	auto total_time   = current_time - _impl->Stats.LastResetTime;
 
-	to->Message(MT_System, "Dumping Movement Stats:");
-	to->Message(MT_System, "Total Sent: %u (%.2f / sec)", _impl->Stats.TotalSent, static_cast<double>(_impl->Stats.TotalSent) / total_time);
-	to->Message(MT_System, "Total Heading: %u (%.2f / sec)", _impl->Stats.TotalSentHeading, static_cast<double>(_impl->Stats.TotalSentHeading) / total_time);
-	to->Message(MT_System, "Total Movement: %u (%.2f / sec)", _impl->Stats.TotalSentMovement, static_cast<double>(_impl->Stats.TotalSentMovement) / total_time);
-	to->Message(MT_System, "Total Position: %u (%.2f / sec)", _impl->Stats.TotalSentPosition, static_cast<double>(_impl->Stats.TotalSentPosition) / total_time);
+	client->Message(Chat::System, "Dumping Movement Stats:");
+	client->Message(
+		Chat::System,
+		"Total Sent: %u (%.2f / sec)",
+		_impl->Stats.TotalSent,
+		static_cast<double>(_impl->Stats.TotalSent) / total_time
+	);
+	client->Message(
+		Chat::System,
+		"Total Heading: %u (%.2f / sec)",
+		_impl->Stats.TotalSentHeading,
+		static_cast<double>(_impl->Stats.TotalSentHeading) / total_time
+	);
+	client->Message(
+		Chat::System,
+		"Total Movement: %u (%.2f / sec)",
+		_impl->Stats.TotalSentMovement,
+		static_cast<double>(_impl->Stats.TotalSentMovement) / total_time
+	);
+	client->Message(
+		Chat::System,
+		"Total Position: %u (%.2f / sec)",
+		_impl->Stats.TotalSentPosition,
+		static_cast<double>(_impl->Stats.TotalSentPosition) / total_time
+	);
 }
 
 void MobMovementManager::ClearStats()
 {
-	_impl->Stats.LastResetTime = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
-	_impl->Stats.TotalSent = 0;
-	_impl->Stats.TotalSentHeading = 0;
+	_impl->Stats.LastResetTime     = static_cast<double>(Timer::GetCurrentTime()) / 1000.0;
+	_impl->Stats.TotalSent         = 0;
+	_impl->Stats.TotalSentHeading  = 0;
 	_impl->Stats.TotalSentMovement = 0;
 	_impl->Stats.TotalSentPosition = 0;
 }
 
-void MobMovementManager::FillCommandStruct(PlayerPositionUpdateServer_Struct *spu, Mob *m, float dx, float dy, float dz, float dh, int anim)
+/**
+ * @param position_update
+ * @param mob
+ * @param delta_x
+ * @param delta_y
+ * @param delta_z
+ * @param delta_heading
+ * @param anim
+ */
+void MobMovementManager::FillCommandStruct(
+	PlayerPositionUpdateServer_Struct *position_update,
+	Mob *mob,
+	float delta_x,
+	float delta_y,
+	float delta_z,
+	float delta_heading,
+	int anim
+)
 {
-	memset(spu, 0x00, sizeof(PlayerPositionUpdateServer_Struct));
-	spu->spawn_id = m->GetID();
-	spu->x_pos = FloatToEQ19(m->GetX());
-	spu->y_pos = FloatToEQ19(m->GetY());
-	spu->z_pos = FloatToEQ19(m->GetZ());
-	spu->heading = FloatToEQ12(m->GetHeading());
-	spu->delta_x = FloatToEQ13(dx);
-	spu->delta_y = FloatToEQ13(dy);
-	spu->delta_z = FloatToEQ13(dz);
-	spu->delta_heading = FloatToEQ10(dh);
-	spu->animation = (m->IsBot() ? (int)((float)anim / 1.785714f) : anim);
+	memset(position_update, 0x00, sizeof(PlayerPositionUpdateServer_Struct));
+	position_update->spawn_id      = mob->GetID();
+	position_update->x_pos         = FloatToEQ19(mob->GetX());
+	position_update->y_pos         = FloatToEQ19(mob->GetY());
+	position_update->z_pos         = FloatToEQ19(mob->GetZ());
+	position_update->heading       = FloatToEQ12(mob->GetHeading());
+	position_update->delta_x       = FloatToEQ13(delta_x);
+	position_update->delta_y       = FloatToEQ13(delta_y);
+	position_update->delta_z       = FloatToEQ13(delta_z);
+	position_update->delta_heading = FloatToEQ10(delta_heading);
+	position_update->animation     = (mob->IsBot() ? (int) ((float) anim / 1.785714f) : anim);
 }
 
-void MobMovementManager::UpdatePath(Mob *who, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mob_movement_mode
+ */
+void MobMovementManager::UpdatePath(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode)
 {
 	if (!zone->HasMap() || !zone->HasWaterMap()) {
 		auto iter = _impl->Entries.find(who);
 		auto &ent = (*iter);
-	
-		PushMoveTo(ent.second, x, y, z, mode);
+
+		PushMoveTo(ent.second, x, y, z, mob_movement_mode);
 		PushStopMoving(ent.second);
 		return;
 	}
-	
+
 	if (who->IsBoat()) {
-		UpdatePathBoat(who, x, y, z, mode);
-	} else if (who->IsUnderwaterOnly()) {
-		UpdatePathUnderwater(who, x, y, z, mode);
+		UpdatePathBoat(who, x, y, z, mob_movement_mode);
+	}
+	else if (who->IsUnderwaterOnly()) {
+		UpdatePathUnderwater(who, x, y, z, mob_movement_mode);
 	}
 	else {
-		UpdatePathGround(who, x, y, z, mode);
+		UpdatePathGround(who, x, y, z, mob_movement_mode);
 	}
 }
 
-void MobMovementManager::UpdatePathGround(Mob * who, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mode
+ */
+void MobMovementManager::UpdatePathGround(Mob *who, float x, float y, float z, MobMovementMode mode)
 {
 	PathfinderOptions opts;
 	opts.smooth_path = true;
-	opts.step_size = RuleR(Pathing, NavmeshStepSize);
-	opts.offset = who->GetZOffset();
-	opts.flags = PathingNotDisabled ^ PathingZoneLine;
+	opts.step_size   = RuleR(Pathing, NavmeshStepSize);
+	opts.offset      = who->GetZOffset();
+	opts.flags       = PathingNotDisabled ^ PathingZoneLine;
 
 	//This is probably pointless since the nav mesh tool currently sets zonelines to disabled anyway
 	auto partial = false;
-	auto stuck = false;
-	auto route = zone->pathing->FindPath(
+	auto stuck   = false;
+	auto route   = zone->pathing->FindPath(
 		glm::vec3(who->GetX(), who->GetY(), who->GetZ()),
 		glm::vec3(x, y, z),
 		partial,
 		stuck,
-		opts);
+		opts
+	);
 
 	auto eiter = _impl->Entries.find(who);
-	auto &ent = (*eiter);
+	auto &ent  = (*eiter);
 
 	if (route.size() == 0) {
 		HandleStuckBehavior(who, x, y, z, mode);
@@ -813,31 +976,26 @@ void MobMovementManager::UpdatePathGround(Mob * who, float x, float y, float z,
 	}
 
 	AdjustRoute(route, who);
-	   
-	
-	
+
 	//avoid doing any processing if the mob is stuck to allow normal stuck code to work.
-	if (!stuck)
-	{
+	if (!stuck) {
 
 		//there are times when the routes returned are no differen than where the mob is currently standing. What basically happens
-		//is a mob will get 'stuck' in such a way that it should be moving but the 'moving' place is the exact same spot it is at. 
-		//this is a problem and creates an area of ground that if a mob gets to, will stay there forever. If socal this creates a 
-		//"Ball of Death" (tm). This code tries to prevent this by simply warping the mob to the requested x/y. Better to have a warp than 
+		//is a mob will get 'stuck' in such a way that it should be moving but the 'moving' place is the exact same spot it is at.
+		//this is a problem and creates an area of ground that if a mob gets to, will stay there forever. If socal this creates a
+		//"Ball of Death" (tm). This code tries to prevent this by simply warping the mob to the requested x/y. Better to have a warp than
 		//have stuck mobs.
 
-		auto routeNode = route.begin();
+		auto routeNode   = route.begin();
 		bool noValidPath = true;
 		while (routeNode != route.end() && noValidPath == true) {
 			auto &currentNode = (*routeNode);
 
-			if (routeNode == route.end())
-			{
+			if (routeNode == route.end()) {
 				continue;
 			}
 
-			if (!(currentNode.pos.x == who->GetX() && currentNode.pos.y == who->GetY()))
-			{
+			if (!(currentNode.pos.x == who->GetX() && currentNode.pos.y == who->GetY())) {
 				//if one of the nodes to move to, is not our current node, pass it.
 				noValidPath = false;
 				break;
@@ -847,47 +1005,62 @@ void MobMovementManager::UpdatePathGround(Mob * who, float x, float y, float z,
 
 		}
 
-		if (noValidPath)
-		{
+		if (noValidPath) {
 			//we are 'stuck' in a path, lets just get out of this by 'teleporting' to the next position.
-			PushTeleportTo(ent.second, x, y, z,
-				CalculateHeadingAngleBetweenPositions(who->GetX(), who->GetY(), x, y));
+			PushTeleportTo(
+				ent.second,
+				x,
+				y,
+				z,
+				CalculateHeadingAngleBetweenPositions(who->GetX(), who->GetY(), x, y)
+			);
+
 			return;
 		}
 
 	}
-	
+
 	auto iter = route.begin();
+
 	glm::vec3 previous_pos(who->GetX(), who->GetY(), who->GetZ());
+
 	bool first_node = true;
-
-
 	while (iter != route.end()) {
 		auto &current_node = (*iter);
-	
+
 		iter++;
-	
+
 		if (iter == route.end()) {
 			continue;
 		}
-	
+
 		previous_pos = current_node.pos;
 		auto &next_node = (*iter);
-	
+
 		if (first_node) {
-	
+
 			if (mode == MovementWalking) {
 				auto h = who->CalculateHeadingToTarget(next_node.pos.x, next_node.pos.y);
 				PushRotateTo(ent.second, who, h, mode);
 			}
-	
+
 			first_node = false;
 		}
-	
+
 		//move to / teleport to node + 1
 		if (next_node.teleport && next_node.pos.x != 0.0f && next_node.pos.y != 0.0f) {
-			PushTeleportTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z,
-				CalculateHeadingAngleBetweenPositions(current_node.pos.x, current_node.pos.y, next_node.pos.x, next_node.pos.y));
+			PushTeleportTo(
+				ent.second,
+				next_node.pos.x,
+				next_node.pos.y,
+				next_node.pos.z,
+				CalculateHeadingAngleBetweenPositions(
+					current_node.pos.x,
+					current_node.pos.y,
+					next_node.pos.x,
+					next_node.pos.y
+				)
+			);
 		}
 		else {
 			if (zone->watermap->InLiquid(previous_pos)) {
@@ -907,41 +1080,50 @@ void MobMovementManager::UpdatePathGround(Mob * who, float x, float y, float z,
 	}
 }
 
-void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param movement_mode
+ */
+void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float z, MobMovementMode movement_mode)
 {
 	auto eiter = _impl->Entries.find(who);
-	auto &ent = (*eiter);
-	if (zone->watermap->InLiquid(who->GetPosition()) && zone->watermap->InLiquid(glm::vec3(x, y, z)) && zone->zonemap->CheckLoS(who->GetPosition(), glm::vec3(x, y, z))) {
-		PushSwimTo(ent.second, x, y, z, mode);
+	auto &ent  = (*eiter);
+	if (zone->watermap->InLiquid(who->GetPosition()) && zone->watermap->InLiquid(glm::vec3(x, y, z)) &&
+		zone->zonemap->CheckLoS(who->GetPosition(), glm::vec3(x, y, z))) {
+		PushSwimTo(ent.second, x, y, z, movement_mode);
 		PushStopMoving(ent.second);
 		return;
 	}
 
 	PathfinderOptions opts;
 	opts.smooth_path = true;
-	opts.step_size = RuleR(Pathing, NavmeshStepSize);
-	opts.offset = who->GetZOffset();
-	opts.flags = PathingNotDisabled ^ PathingZoneLine;
+	opts.step_size   = RuleR(Pathing, NavmeshStepSize);
+	opts.offset      = who->GetZOffset();
+	opts.flags       = PathingNotDisabled ^ PathingZoneLine;
 
 	auto partial = false;
-	auto stuck = false;
-	auto route = zone->pathing->FindPath(
+	auto stuck   = false;
+	auto route   = zone->pathing->FindPath(
 		glm::vec3(who->GetX(), who->GetY(), who->GetZ()),
 		glm::vec3(x, y, z),
 		partial,
 		stuck,
-		opts);
+		opts
+	);
 
 	if (route.size() == 0) {
-		HandleStuckBehavior(who, x, y, z, mode);
+		HandleStuckBehavior(who, x, y, z, movement_mode);
 		return;
 	}
 
 	AdjustRoute(route, who);
 
-	auto iter = route.begin();
+	auto      iter       = route.begin();
 	glm::vec3 previous_pos(who->GetX(), who->GetY(), who->GetZ());
-	bool first_node = true;
+	bool      first_node = true;
 
 	while (iter != route.end()) {
 		auto &current_node = (*iter);
@@ -961,7 +1143,7 @@ void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float
 	}
 
 	if (route.size() == 0) {
-		HandleStuckBehavior(who, x, y, z, mode);
+		HandleStuckBehavior(who, x, y, z, movement_mode);
 		return;
 	}
 
@@ -981,9 +1163,9 @@ void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float
 
 		if (first_node) {
 
-			if (mode == MovementWalking) {
+			if (movement_mode == MovementWalking) {
 				auto h = who->CalculateHeadingToTarget(next_node.pos.x, next_node.pos.y);
-				PushRotateTo(ent.second, who, h, mode);
+				PushRotateTo(ent.second, who, h, movement_mode);
 			}
 
 			first_node = false;
@@ -991,47 +1173,87 @@ void MobMovementManager::UpdatePathUnderwater(Mob *who, float x, float y, float
 
 		//move to / teleport to node + 1
 		if (next_node.teleport && next_node.pos.x != 0.0f && next_node.pos.y != 0.0f) {
-			PushTeleportTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z,
-				CalculateHeadingAngleBetweenPositions(current_node.pos.x, current_node.pos.y, next_node.pos.x, next_node.pos.y));
+			PushTeleportTo(
+				ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z,
+				CalculateHeadingAngleBetweenPositions(
+					current_node.pos.x,
+					current_node.pos.y,
+					next_node.pos.x,
+					next_node.pos.y
+				));
 		}
 		else {
-			PushSwimTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z, mode);
+			PushSwimTo(ent.second, next_node.pos.x, next_node.pos.y, next_node.pos.z, movement_mode);
 		}
 	}
 
 	if (stuck) {
-		HandleStuckBehavior(who, x, y, z, mode);
+		HandleStuckBehavior(who, x, y, z, movement_mode);
 	}
 	else {
 		PushStopMoving(ent.second);
 	}
 }
 
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mode
+ */
 void MobMovementManager::UpdatePathBoat(Mob *who, float x, float y, float z, MobMovementMode mode)
 {
 	auto eiter = _impl->Entries.find(who);
-	auto &ent = (*eiter);
+	auto &ent  = (*eiter);
 
 	PushSwimTo(ent.second, x, y, z, mode);
 	PushStopMoving(ent.second);
 }
 
+/**
+ * @param ent
+ * @param x
+ * @param y
+ * @param z
+ * @param heading
+ */
 void MobMovementManager::PushTeleportTo(MobMovementEntry &ent, float x, float y, float z, float heading)
 {
 	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new TeleportToCommand(x, y, z, heading)));
 }
 
-void MobMovementManager::PushMoveTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param ent
+ * @param x
+ * @param y
+ * @param z
+ * @param mob_movement_mode
+ */
+void MobMovementManager::PushMoveTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mob_movement_mode)
 {
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new MoveToCommand(x, y, z, mode)));
+	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new MoveToCommand(x, y, z, mob_movement_mode)));
 }
 
-void MobMovementManager::PushSwimTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param ent
+ * @param x
+ * @param y
+ * @param z
+ * @param mob_movement_mode
+ */
+void MobMovementManager::PushSwimTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mob_movement_mode)
 {
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new SwimToCommand(x, y, z, mode)));
+	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new SwimToCommand(x, y, z, mob_movement_mode)));
 }
 
-void MobMovementManager::PushRotateTo(MobMovementEntry &ent, Mob *who, float to, MobMovementMode mode)
+/**
+ * @param ent
+ * @param who
+ * @param to
+ * @param mob_movement_mode
+ */
+void MobMovementManager::PushRotateTo(MobMovementEntry &ent, Mob *who, float to, MobMovementMode mob_movement_mode)
 {
 	auto from = FixHeading(who->GetHeading());
 	to = FixHeading(to);
@@ -1050,46 +1272,59 @@ void MobMovementManager::PushRotateTo(MobMovementEntry &ent, Mob *who, float to,
 		diff -= 512.0;
 	}
 
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new RotateToCommand(to, diff > 0 ? 1.0 : -1.0, mode)));
+	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new RotateToCommand(to, diff > 0 ? 1.0 : -1.0, mob_movement_mode)));
 }
 
-void MobMovementManager::PushStopMoving(MobMovementEntry &ent)
+/**
+ * @param mob_movement_entry
+ */
+void MobMovementManager::PushStopMoving(MobMovementEntry &mob_movement_entry)
 {
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new StopMovingCommand()));
+	mob_movement_entry.Commands.push_back(std::unique_ptr<IMovementCommand>(new StopMovingCommand()));
 }
 
-void MobMovementManager::PushEvadeCombat(MobMovementEntry &ent)
+/**
+ * @param mob_movement_entry
+ */
+void MobMovementManager::PushEvadeCombat(MobMovementEntry &mob_movement_entry)
 {
-	ent.Commands.push_back(std::unique_ptr<IMovementCommand>(new EvadeCombatCommand()));
+	mob_movement_entry.Commands.push_back(std::unique_ptr<IMovementCommand>(new EvadeCombatCommand()));
 }
 
-void MobMovementManager::HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mode)
+/**
+ * @param who
+ * @param x
+ * @param y
+ * @param z
+ * @param mob_movement_mode
+ */
+void MobMovementManager::HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode)
 {
-	auto sb = who->GetStuckBehavior();
+	auto             sb       = who->GetStuckBehavior();
 	MobStuckBehavior behavior = RunToTarget;
 
 	if (sb >= 0 && sb < MaxStuckBehavior) {
-		behavior = (MobStuckBehavior)sb;
+		behavior = (MobStuckBehavior) sb;
 	}
 
 	auto eiter = _impl->Entries.find(who);
-	auto &ent = (*eiter);
+	auto &ent  = (*eiter);
 
 	switch (sb) {
-	case RunToTarget:
-		PushMoveTo(ent.second, x, y, z, mode);
-		PushStopMoving(ent.second);
-		break;
-	case WarpToTarget:
-		PushTeleportTo(ent.second, x, y, z, 0.0f);
-		PushStopMoving(ent.second);
-		break;
-	case TakeNoAction:
-		PushStopMoving(ent.second);
-		break;
-	case EvadeCombat:
-		//PushEvadeCombat(ent.second);
-		PushStopMoving(ent.second);
-		break;
+		case RunToTarget:
+			PushMoveTo(ent.second, x, y, z, mob_movement_mode);
+			PushStopMoving(ent.second);
+			break;
+		case WarpToTarget:
+			PushTeleportTo(ent.second, x, y, z, 0.0f);
+			PushStopMoving(ent.second);
+			break;
+		case TakeNoAction:
+			PushStopMoving(ent.second);
+			break;
+		case EvadeCombat:
+			//PushEvadeCombat(ent.second);
+			PushStopMoving(ent.second);
+			break;
 	}
 }
diff --git a/zone/mob_movement_manager.h b/zone/mob_movement_manager.h
index d9b2e7845..ff7e08436 100644
--- a/zone/mob_movement_manager.h
+++ b/zone/mob_movement_manager.h
@@ -41,18 +41,30 @@ class MobMovementManager
 public:
 	~MobMovementManager();
 	void Process();
-	void AddMob(Mob *m);
-	void RemoveMob(Mob *m);
-	void AddClient(Client *c);
-	void RemoveClient(Client *c);
+	void AddMob(Mob *mob);
+	void RemoveMob(Mob *mob);
+	void AddClient(Client *client);
+	void RemoveClient(Client *client);
 
-	void RotateTo(Mob *who, float to, MobMovementMode mode = MovementRunning);
+	void RotateTo(Mob *who, float to, MobMovementMode mob_movement_mode = MovementRunning);
 	void Teleport(Mob *who, float x, float y, float z, float heading);
 	void NavigateTo(Mob *who, float x, float y, float z, MobMovementMode mode = MovementRunning);
 	void StopNavigation(Mob *who);
-	void SendCommandToClients(Mob *m, float dx, float dy, float dz, float dh, int anim, ClientRange range);
+
+	void SendCommandToClients(
+		Mob *mob,
+		float delta_x,
+		float delta_y,
+		float delta_z,
+		float delta_heading,
+		int anim,
+		ClientRange range,
+		Client* single_client = nullptr,
+		Client* ignore_client = nullptr
+	);
+
 	float FixHeading(float in);
-	void DumpStats(Client *to);
+	void DumpStats(Client *client);
 	void ClearStats();
 
 	static MobMovementManager &Get() {
@@ -65,18 +77,18 @@ private:
 	MobMovementManager(const MobMovementManager&);
 	MobMovementManager& operator=(const MobMovementManager&);
 
-	void FillCommandStruct(PlayerPositionUpdateServer_Struct *spu, Mob *m, float dx, float dy, float dz, float dh, int anim);
-	void UpdatePath(Mob *who, float x, float y, float z, MobMovementMode mode);
+	void FillCommandStruct(PlayerPositionUpdateServer_Struct *position_update, Mob *mob, float delta_x, float delta_y, float delta_z, float delta_heading, int anim);
+	void UpdatePath(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode);
 	void UpdatePathGround(Mob *who, float x, float y, float z, MobMovementMode mode);
-	void UpdatePathUnderwater(Mob *who, float x, float y, float z, MobMovementMode mode);
+	void UpdatePathUnderwater(Mob *who, float x, float y, float z, MobMovementMode movement_mode);
 	void UpdatePathBoat(Mob *who, float x, float y, float z, MobMovementMode mode);
 	void PushTeleportTo(MobMovementEntry &ent, float x, float y, float z, float heading);
-	void PushMoveTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mode);
-	void PushSwimTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mode);
-	void PushRotateTo(MobMovementEntry &ent, Mob *who, float to, MobMovementMode mode);
-	void PushStopMoving(MobMovementEntry &ent);
-	void PushEvadeCombat(MobMovementEntry &ent);
-	void HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mode);
+	void PushMoveTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mob_movement_mode);
+	void PushSwimTo(MobMovementEntry &ent, float x, float y, float z, MobMovementMode mob_movement_mode);
+	void PushRotateTo(MobMovementEntry &ent, Mob *who, float to, MobMovementMode mob_movement_mode);
+	void PushStopMoving(MobMovementEntry &mob_movement_entry);
+	void PushEvadeCombat(MobMovementEntry &mob_movement_entry);
+	void HandleStuckBehavior(Mob *who, float x, float y, float z, MobMovementMode mob_movement_mode);
 
 	struct Implementation;
 	std::unique_ptr<Implementation> _impl;
diff --git a/zone/net.h b/zone/net.h
deleted file mode 100644
index 4d44b6058..000000000
--- a/zone/net.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2002 EQEMu Development Team (http://eqemu.org)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifdef _WINDOWS
-	#include <winsock2.h>
-	#include <windows.h>
-#else
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <arpa/inet.h>
-	#include <unistd.h>
-	#include <netdb.h>
-#endif
-
-#include "../common/types.h"
-#include "../common/timer.h"
-void CatchSignal(int);
-void UpdateWindowTitle(char* iNewTitle = 0);
-
-class NetConnection
-{
-public:
-	~NetConnection();
-	NetConnection();
-
-	uint32	GetIP();
-	uint32	GetIP(char* name);
-	Timer object_timer;
-	Timer door_timer;
-	Timer corpse_timer;
-	Timer group_timer;
-	Timer raid_timer;
-	Timer trap_timer;
-};
diff --git a/zone/npc.cpp b/zone/npc.cpp
index 60e6f73c4..ed5f37bb5 100644
--- a/zone/npc.cpp
+++ b/zone/npc.cpp
@@ -146,33 +146,33 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
 		size = GetRaceGenderDefaultHeight(race, gender);
 	}
 
-	taunting     = false;
-	proximity    = nullptr;
-	copper       = 0;
-	silver       = 0;
-	gold         = 0;
-	platinum     = 0;
-	max_dmg      = npc_type_data->max_dmg;
-	min_dmg      = npc_type_data->min_dmg;
-	attack_count = npc_type_data->attack_count;
-	grid         = 0;
-	wp_m         = 0;
-	max_wp       = 0;
-	save_wp      = 0;
-	spawn_group  = 0;
-	swarmInfoPtr = nullptr;
-	spellscale   = npc_type_data->spellscale;
-	healscale    = npc_type_data->healscale;
-	pAggroRange  = npc_type_data->aggroradius;
-	pAssistRange = npc_type_data->assistradius;
-	findable     = npc_type_data->findable;
-	trackable    = npc_type_data->trackable;
-	MR           = npc_type_data->MR;
-	CR           = npc_type_data->CR;
-	DR           = npc_type_data->DR;
-	FR           = npc_type_data->FR;
-	PR           = npc_type_data->PR;
-	Corrup       = npc_type_data->Corrup;
+	taunting       = false;
+	proximity      = nullptr;
+	copper         = 0;
+	silver         = 0;
+	gold           = 0;
+	platinum       = 0;
+	max_dmg        = npc_type_data->max_dmg;
+	min_dmg        = npc_type_data->min_dmg;
+	attack_count   = npc_type_data->attack_count;
+	grid           = 0;
+	wp_m           = 0;
+	max_wp         = 0;
+	save_wp        = 0;
+	spawn_group_id = 0;
+	swarmInfoPtr   = nullptr;
+	spellscale     = npc_type_data->spellscale;
+	healscale      = npc_type_data->healscale;
+	pAggroRange    = npc_type_data->aggroradius;
+	pAssistRange   = npc_type_data->assistradius;
+	findable       = npc_type_data->findable;
+	trackable      = npc_type_data->trackable;
+	MR             = npc_type_data->MR;
+	CR             = npc_type_data->CR;
+	DR             = npc_type_data->DR;
+	FR             = npc_type_data->FR;
+	PR             = npc_type_data->PR;
+	Corrup         = npc_type_data->Corrup;
 	PhR          = npc_type_data->PhR;
 	STR          = npc_type_data->STR;
 	STA          = npc_type_data->STA;
@@ -209,6 +209,7 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
 	default_accuracy_rating  = npc_type_data->accuracy_rating;
 	default_avoidance_rating = npc_type_data->avoidance_rating;
 	default_atk              = npc_type_data->ATK;
+	strn0cpy(default_special_abilities, npc_type_data->special_abilities, 512);
 
 	// used for when getting charmed, if 0, doesn't swap
 	charm_ac               = npc_type_data->charm_ac;
@@ -306,16 +307,18 @@ NPC::NPC(const NPCType *npc_type_data, Spawn2 *in_respawn, const glm::vec4 &posi
 	// some overrides -- really we need to be able to set skills for mobs in the DB
 	// There are some known low level SHM/BST pets that do not follow this, which supports
 	// the theory of needing to be able to set skills for each mob separately
-	if (moblevel > 50) {
-		skills[EQEmu::skills::SkillDoubleAttack] = 250;
-		skills[EQEmu::skills::SkillDualWield]    = 250;
-	}
-	else if (moblevel > 3) {
-		skills[EQEmu::skills::SkillDoubleAttack] = moblevel * 5;
-		skills[EQEmu::skills::SkillDualWield]    = skills[EQEmu::skills::SkillDoubleAttack];
-	}
-	else {
-		skills[EQEmu::skills::SkillDoubleAttack] = moblevel * 5;
+	if (!IsBot()) {
+		if (moblevel > 50) {
+			skills[EQEmu::skills::SkillDoubleAttack] = 250;
+			skills[EQEmu::skills::SkillDualWield] = 250;
+		}
+		else if (moblevel > 3) {
+			skills[EQEmu::skills::SkillDoubleAttack] = moblevel * 5;
+			skills[EQEmu::skills::SkillDualWield] = skills[EQEmu::skills::SkillDoubleAttack];
+		}
+		else {
+			skills[EQEmu::skills::SkillDoubleAttack] = moblevel * 5;
+		}
 	}
 
 	ldon_trapped       = false;
@@ -611,16 +614,16 @@ void NPC::ClearItemList() {
 
 void NPC::QueryLoot(Client* to)
 {
-	to->Message(0, "| # Current Loot (%s) LootTableID: %i", GetName(), GetLoottableID());
+	to->Message(Chat::White, "| # Current Loot (%s) LootTableID: %i", GetName(), GetLoottableID());
 
 	int item_count = 0;
 	for (auto cur  = itemlist.begin(); cur != itemlist.end(); ++cur, ++item_count) {
 		if (!(*cur)) {
-			Log(Logs::General, Logs::Error, "NPC::QueryLoot() - ItemList error, null item");
+			LogError("NPC::QueryLoot() - ItemList error, null item");
 			continue;
 		}
 		if (!(*cur)->item_id || !database.GetItem((*cur)->item_id)) {
-			Log(Logs::General, Logs::Error, "NPC::QueryLoot() - Database error, invalid item");
+			LogError("NPC::QueryLoot() - Database error, invalid item");
 			continue;
 		}
 
@@ -639,7 +642,7 @@ void NPC::QueryLoot(Client* to)
 		);
 	}
 
-	to->Message(0, "| %i Platinum %i Gold %i Silver %i Copper", platinum, gold, silver, copper);
+	to->Message(Chat::White, "| %i Platinum %i Gold %i Silver %i Copper", platinum, gold, silver, copper);
 }
 
 void NPC::AddCash(uint16 in_copper, uint16 in_silver, uint16 in_gold, uint16 in_platinum) {
@@ -701,6 +704,24 @@ bool NPC::Process()
 
 	SpellProcess();
 
+	if (mob_scan_close.Check()) {
+
+		entity_list.ScanCloseMobs(close_mobs, this);
+
+		if (moving) {
+			mob_scan_close.Disable();
+			mob_scan_close.Start(RandomTimer(3000, 6000));
+		}
+		else {
+			mob_scan_close.Disable();
+			mob_scan_close.Start(RandomTimer(6000, 60000));
+		}
+	}
+
+	if (mob_check_moving_timer.Check() && moving) {
+		mob_scan_close.Trigger();
+	}
+
 	if (tic_timer.Check()) {
 		parse->EventNPC(EVENT_TICK, this, nullptr, "", 0);
 		BuffProcess();
@@ -848,7 +869,7 @@ bool NPC::Process()
 
 	if (assist_timer.Check() && IsEngaged() && !Charmed() && !HasAssistAggro() &&
 	    NPCAssistCap() < RuleI(Combat, NPCAssistCap)) {
-		entity_list.AIYellForHelp(this, GetTarget());
+		AIYellForHelp(this, GetTarget());
 		if (NPCAssistCap() > 0 && !assist_cap_timer.Enabled())
 			assist_cap_timer.Start(RuleI(Combat, NPCAssistCapTimer));
 	}
@@ -1190,25 +1211,30 @@ NPC* NPC::SpawnNPC(const char* spawncommand, const glm::vec4& position, Client*
 
 		if (client) {
 			// Notify client of spawn data
-			client->Message(0, "New spawn:");
-			client->Message(0, "Name: %s", npc->name);
-			client->Message(0, "Race: %u", npc->race);
-			client->Message(0, "Level: %u", npc->level);
-			client->Message(0, "Material: %u", npc->texture);
-			client->Message(0, "Current/Max HP: %i", npc->max_hp);
-			client->Message(0, "Gender: %u", npc->gender);
-			client->Message(0, "Class: %u", npc->class_);
-			client->Message(0, "Weapon Item Number: %u/%u", npc->d_melee_texture1, npc->d_melee_texture2);
-			client->Message(0, "MerchantID: %u", npc->MerchantType);
-			client->Message(0, "Bodytype: %u", npc->bodytype);
+			client->Message(Chat::White, "New spawn:");
+			client->Message(Chat::White, "Name: %s", npc->name);
+			client->Message(Chat::White, "Race: %u", npc->race);
+			client->Message(Chat::White, "Level: %u", npc->level);
+			client->Message(Chat::White, "Material: %u", npc->texture);
+			client->Message(Chat::White, "Current/Max HP: %i", npc->max_hp);
+			client->Message(Chat::White, "Gender: %u", npc->gender);
+			client->Message(Chat::White, "Class: %u", npc->class_);
+			client->Message(Chat::White, "Weapon Item Number: %u/%u", npc->d_melee_texture1, npc->d_melee_texture2);
+			client->Message(Chat::White, "MerchantID: %u", npc->MerchantType);
+			client->Message(Chat::White, "Bodytype: %u", npc->bodytype);
 		}
 
 		return npc;
 	}
 }
 
-uint32 ZoneDatabase::CreateNewNPCCommand(const char *zone, uint32 zone_version, Client *client, NPC *spawn,
-					 uint32 extra)
+uint32 ZoneDatabase::CreateNewNPCCommand(
+	const char *zone,
+	uint32 zone_version,
+	Client *client,
+	NPC *spawn,
+	uint32 extra
+)
 {
 	uint32 npc_type_id = 0;
 
@@ -1216,18 +1242,25 @@ uint32 ZoneDatabase::CreateNewNPCCommand(const char *zone, uint32 zone_version,
 		// Set an npc_type ID within the standard range for the current zone if possible (zone_id * 1000)
 		int starting_npc_id = client->GetZoneID() * 1000;
 
-		std::string query = StringFormat("SELECT MAX(id) FROM npc_types WHERE id >= %i AND id < %i",
-						 starting_npc_id, starting_npc_id + 1000);
+		std::string query = StringFormat(
+			"SELECT MAX(id) FROM npc_types WHERE id >= %i AND id < %i",
+			starting_npc_id,
+			starting_npc_id + 1000
+		);
+
 		auto results = QueryDatabase(query);
 		if (results.Success()) {
 			if (results.RowCount() != 0) {
 				auto row = results.begin();
 				npc_type_id = atoi(row[0]) + 1;
 				// Prevent the npc_type id from exceeding the range for this zone
-				if (npc_type_id >= (starting_npc_id + 1000))
+				if (npc_type_id >= (starting_npc_id + 1000)) {
 					npc_type_id = 0;
-			} else // No npc_type IDs set in this range yet
+				}
+			}
+			else { // No npc_type IDs set in this range yet
 				npc_type_id = starting_npc_id;
+			}
 		}
 	}
 
@@ -1270,7 +1303,7 @@ uint32 ZoneDatabase::CreateNewNPCCommand(const char *zone, uint32 zone_version,
 	}
 	uint32 spawngroupid = results.LastInsertedID();
 
-	spawn->SetSp2(spawngroupid);
+	spawn->SetSpawnGroupId(spawngroupid);
 	spawn->SetNPCTypeID(npc_type_id);
 
 	query = StringFormat("INSERT INTO spawn2 (zone, version, x, y, z, respawntime, heading, spawngroupID) "
@@ -1292,13 +1325,23 @@ uint32 ZoneDatabase::CreateNewNPCCommand(const char *zone, uint32 zone_version,
 	return true;
 }
 
-uint32 ZoneDatabase::AddNewNPCSpawnGroupCommand(const char *zone, uint32 zone_version, Client *client, NPC *spawn,
-						uint32 respawnTime)
+uint32 ZoneDatabase::AddNewNPCSpawnGroupCommand(
+	const char *zone,
+	uint32 zone_version,
+	Client *client,
+	NPC *spawn,
+	uint32 respawnTime
+)
 {
 	uint32 last_insert_id = 0;
 
-	std::string query = StringFormat("INSERT INTO spawngroup (name) VALUES('%s%s%i')", zone, spawn->GetName(),
-					 Timer::GetCurrentTime());
+	std::string query = fmt::format(
+		"INSERT INTO spawngroup (name) VALUES('{}{}{}')",
+		zone,
+		EscapeString(spawn->GetName()),
+		Timer::GetCurrentTime()
+	);
+
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return 0;
@@ -1306,13 +1349,16 @@ uint32 ZoneDatabase::AddNewNPCSpawnGroupCommand(const char *zone, uint32 zone_ve
 	last_insert_id = results.LastInsertedID();
 
 	uint32 respawntime = 0;
-	uint32 spawnid = 0;
-	if (respawnTime)
+	uint32 spawnid     = 0;
+	if (respawnTime) {
 		respawntime = respawnTime;
-	else if (spawn->respawn2 && spawn->respawn2->RespawnTimer() != 0)
+	}
+	else if (spawn->respawn2 && spawn->respawn2->RespawnTimer() != 0) {
 		respawntime = spawn->respawn2->RespawnTimer();
-	else
+	}
+	else {
 		respawntime = 1200;
+	}
 
 	query = StringFormat("INSERT INTO spawn2 (zone, version, x, y, z, respawntime, heading, spawngroupID) "
 			     "VALUES('%s', %u, %f, %f, %f, %i, %f, %i)",
@@ -1355,7 +1401,7 @@ uint32 ZoneDatabase::DeleteSpawnLeaveInNPCTypeTable(const char *zone, Client *cl
 
 	std::string query = StringFormat("SELECT id, spawngroupID FROM spawn2 WHERE "
 					 "zone='%s' AND spawngroupID=%i",
-					 zone, spawn->GetSp2());
+					 zone, spawn->GetSpawnGroupId());
 	auto results = QueryDatabase(query);
 	if (!results.Success())
 		return 0;
@@ -1396,7 +1442,7 @@ uint32 ZoneDatabase::DeleteSpawnRemoveFromNPCTypeTable(const char *zone, uint32
 
 	std::string query = StringFormat("SELECT id, spawngroupID FROM spawn2 WHERE zone = '%s' "
 					 "AND (version = %u OR version = -1) AND spawngroupID = %i",
-					 zone, zone_version, spawn->GetSp2());
+					 zone, zone_version, spawn->GetSpawnGroupId());
 	auto results = QueryDatabase(query);
 	if (!results.Success())
 		return 0;
@@ -1471,7 +1517,7 @@ uint32 ZoneDatabase::AddNPCTypes(const char *zone, uint32 zone_version, Client *
 	npc_type_id = results.LastInsertedID();
 
 	if (client)
-		client->Message(0, "%s npc_type ID %i created successfully!", numberlessName, npc_type_id);
+		client->Message(Chat::White, "%s npc_type ID %i created successfully!", numberlessName, npc_type_id);
 
 	return 1;
 }
@@ -1577,7 +1623,7 @@ void NPC::PickPocket(Client* thief)
 	//make sure were allowed to target them:
 	int over_level = GetLevel();
 	if(over_level > (thief->GetLevel() + THIEF_PICKPOCKET_OVER)) {
-		thief->Message(13, "You are too inexperienced to pick pocket this target");
+		thief->Message(Chat::Red, "You are too inexperienced to pick pocket this target");
 		thief->SendPickPocketResponse(this, 0, PickPocketFailed);
 		//should we check aggro
 		return;
@@ -1587,7 +1633,7 @@ void NPC::PickPocket(Client* thief)
 		if (zone->CanDoCombat())
 			AddToHateList(thief, 50);
 		Say("Stop thief!");
-		thief->Message(13, "You are noticed trying to steal!");
+		thief->Message(Chat::Red, "You are noticed trying to steal!");
 		thief->SendPickPocketResponse(this, 0, PickPocketFailed);
 		return;
 	}
@@ -1694,7 +1740,7 @@ void NPC::PickPocket(Client* thief)
 		return;
 	}
 
-	thief->Message(0, "This target's pockets are empty");
+	thief->Message(Chat::White, "This target's pockets are empty");
 	thief->SendPickPocketResponse(this, 0, PickPocketFailed);
 }
 
@@ -1744,17 +1790,17 @@ void NPC::Disarm(Client* client, int chance) {
 				SendWearChange(matslot);
 			if ((CastToMob()->GetBodyType() == BT_Humanoid || CastToMob()->GetBodyType() == BT_Summoned) && eslot == EQEmu::invslot::slotPrimary)
 				Say("Ahh! My weapon!");
-			client->Message_StringID(MT_Skills, DISARM_SUCCESS, this->GetCleanName());
+			client->MessageString(Chat::Skills, DISARM_SUCCESS, this->GetCleanName());
 			if (chance != 1000)
 				client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 4);
 			return;
 		}
-		client->Message_StringID(MT_Skills, DISARM_FAILED);
+		client->MessageString(Chat::Skills, DISARM_FAILED);
 		if (chance != 1000)
 			client->CheckIncreaseSkill(EQEmu::skills::SkillDisarm, nullptr, 2);
 		return;
 	}
-	client->Message_StringID(MT_Skills, DISARM_FAILED);
+	client->MessageString(Chat::Skills, DISARM_FAILED);
 }
 
 void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool remove) {
@@ -1902,7 +1948,7 @@ void Mob::NPCSpecialAttacks(const char* parse, int permtag, bool reset, bool rem
 	{
 		if(database.SetSpecialAttkFlag(this->GetNPCTypeID(), orig_parse))
 		{
-			Log(Logs::General, Logs::Normal, "NPCTypeID: %i flagged to '%s' for Special Attacks.\n",this->GetNPCTypeID(),orig_parse);
+			LogInfo("NPCTypeID: [{}] flagged to [{}] for Special Attacks.\n",this->GetNPCTypeID(),orig_parse);
 		}
 	}
 }
@@ -2152,7 +2198,7 @@ void NPC::ModifyNPCStat(const char *identifier, const char *new_value)
 	std::string variable_key = StringFormat("modify_stat_%s", id.c_str());
 	SetEntityVariable(variable_key.c_str(), new_value);
 
-	Log(Logs::Detail, Logs::NPCScaling, "NPC::ModifyNPCStat key: %s val: %s ", variable_key.c_str(), new_value);
+	LogNPCScaling("NPC::ModifyNPCStat key: [{}] val: [{}] ", variable_key.c_str(), new_value);
 
 	if (id == "ac") {
 		AC = atoi(val.c_str());
@@ -2592,7 +2638,7 @@ void NPC::DoNPCEmote(uint8 event_, uint16 emoteid)
 		else if(nes->type == 2)
 			this->Shout("%s",nes->text);
 		else if(nes->type == 3)
-			entity_list.MessageClose_StringID(this, true, 200, 10, GENERIC_STRING, nes->text);
+			entity_list.MessageCloseString(this, true, 200, 10, GENERIC_STRING, nes->text);
 		else
 			this->Say("%s",nes->text);
 	}
@@ -2838,39 +2884,61 @@ void NPC::DepopSwarmPets()
 	}
 }
 
-void NPC::ModifyStatsOnCharm(bool bRemoved)
+void NPC::ModifyStatsOnCharm(bool is_charm_removed)
 {
-	if (bRemoved) {
-		if (charm_ac)
+	if (is_charm_removed) {
+		if (charm_ac) {
 			AC = default_ac;
-		if (charm_attack_delay)
+		}
+		if (charm_attack_delay) {
 			attack_delay = default_attack_delay;
-		if (charm_accuracy_rating)
+		}
+		if (charm_accuracy_rating) {
 			accuracy_rating = default_accuracy_rating;
-		if (charm_avoidance_rating)
+		}
+		if (charm_avoidance_rating) {
 			avoidance_rating = default_avoidance_rating;
-		if (charm_atk)
+		}
+		if (charm_atk) {
 			ATK = default_atk;
+		}
 		if (charm_min_dmg || charm_max_dmg) {
 			base_damage = round((default_max_dmg - default_min_dmg) / 1.9);
-			min_damage = default_min_dmg - round(base_damage / 10.0);
+			min_damage  = default_min_dmg - round(base_damage / 10.0);
 		}
-	} else {
-		if (charm_ac)
-			AC = charm_ac;
-		if (charm_attack_delay)
-			attack_delay = charm_attack_delay;
-		if (charm_accuracy_rating)
-			accuracy_rating = charm_accuracy_rating;
-		if (charm_avoidance_rating)
-			avoidance_rating = charm_avoidance_rating;
-		if (charm_atk)
-			ATK = charm_atk;
-		if (charm_min_dmg || charm_max_dmg) {
-			base_damage = round((charm_max_dmg - charm_min_dmg) / 1.9);
-			min_damage = charm_min_dmg - round(base_damage / 10.0);
+		if (RuleB(Spells, CharmDisablesSpecialAbilities)) {
+			ProcessSpecialAbilities(default_special_abilities);
 		}
+
+		SetAttackTimer();
+		CalcAC();
+
+		return;
 	}
+
+	if (charm_ac) {
+		AC = charm_ac;
+	}
+	if (charm_attack_delay) {
+		attack_delay = charm_attack_delay;
+	}
+	if (charm_accuracy_rating) {
+		accuracy_rating = charm_accuracy_rating;
+	}
+	if (charm_avoidance_rating) {
+		avoidance_rating = charm_avoidance_rating;
+	}
+	if (charm_atk) {
+		ATK = charm_atk;
+	}
+	if (charm_min_dmg || charm_max_dmg) {
+		base_damage = round((charm_max_dmg - charm_min_dmg) / 1.9);
+		min_damage  = charm_min_dmg - round(base_damage / 10.0);
+	}
+	if (RuleB(Spells, CharmDisablesSpecialAbilities)) {
+		ClearSpecialAbilities();
+	}
+
 	// the rest of the stats aren't cached, so lets just do these two instead of full CalcBonuses()
 	SetAttackTimer();
 	CalcAC();
@@ -2924,3 +2992,207 @@ bool NPC::IsProximitySet()
 
 	return false;
 }
+
+/**
+ * @param box_size
+ * @param move_distance
+ * @param move_delay
+ */
+void NPC::SetSimpleRoamBox(float box_size, float move_distance, int move_delay)
+{
+	AI_SetRoambox(
+		(move_distance != 0 ? move_distance : box_size / 2),
+		GetX() + box_size,
+		GetX() - box_size,
+		GetY() + box_size,
+		GetY() - box_size,
+		move_delay
+	);
+}
+
+/**
+ * @param caster
+ * @param chance
+ * @param cast_range
+ * @param spell_types
+ * @return
+ */
+bool NPC::AICheckCloseBeneficialSpells(
+	NPC *caster,
+	uint8 chance,
+	float cast_range,
+	uint32 spell_types
+)
+{
+	if((spell_types & SPELL_TYPES_DETRIMENTAL) != 0) {
+		LogError("Detrimental spells requested from AICheckCloseBeneficialSpells!");
+		return false;
+	}
+
+	if (!caster) {
+		return false;
+	}
+
+	if (!caster->AI_HasSpells()) {
+		return false;
+	}
+
+	if (caster->GetSpecialAbility(NPC_NO_BUFFHEAL_FRIENDS)) {
+		return false;
+	}
+
+	if (chance < 100) {
+		uint8 tmp = zone->random.Int(0, 99);
+		if (tmp >= chance) {
+			return false;
+		}
+	}
+
+	/**
+	 * Indifferent
+	 */
+	if (caster->GetPrimaryFaction() == 0) {
+		return false;
+	}
+
+	/**
+	 * Check through close range mobs
+	 */
+	for (auto & close_mob : entity_list.GetCloseMobList(caster, cast_range)) {
+		Mob *mob = close_mob.second;
+
+		if (mob->IsClient()) {
+			continue;
+		}
+
+		float distance = Distance(mob->GetPosition(), caster->GetPosition());
+		if (distance > cast_range) {
+			continue;
+		}
+
+		LogAICastBeneficialClose(
+			"NPC [{}] Distance [{}] Cast Range [{}] Caster [{}]",
+			mob->GetCleanName(),
+			distance,
+			cast_range,
+			caster->GetCleanName()
+		);
+
+		if (mob->GetReverseFactionCon(caster) >= FACTION_KINDLY) {
+			continue;
+		}
+
+		if ((spell_types & SpellType_Buff) && !RuleB(NPC, BuffFriends)) {
+			if (mob != caster) {
+				spell_types = SpellType_Heal;
+			}
+		}
+
+		if (caster->AICastSpell(mob, 100, spell_types)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * @param sender
+ * @param attacker
+ */
+void NPC::AIYellForHelp(Mob *sender, Mob *attacker)
+{
+	if (!sender || !attacker) {
+		return;
+	}
+
+	/**
+	 * If we dont have a faction set, we're gonna be indiff to everybody
+	 */
+	if (sender->GetPrimaryFaction() == 0) {
+		return;
+	}
+
+	if (sender->HasAssistAggro())
+		return;
+
+	LogAIYellForHelp(
+		"NPC [{}] ID [{}] is starting to scan",
+		GetCleanName(),
+		GetID()
+	);
+
+	for (auto &close_mob : entity_list.GetCloseMobList(sender)) {
+		Mob   *mob     = close_mob.second;
+		float distance = DistanceSquared(m_Position, mob->GetPosition());
+
+		if (mob->IsClient()) {
+			continue;
+		}
+
+		float assist_range = (mob->GetAssistRange() * mob->GetAssistRange());
+		if (distance > assist_range) {
+			continue;
+		}
+
+		LogAIYellForHelpDetail(
+			"NPC [{}] ID [{}] is scanning - checking against NPC [{}] range [{}] dist [{}] in_range [{}]",
+			GetCleanName(),
+			GetID(),
+			mob->GetCleanName(),
+			assist_range,
+			distance,
+			(distance < assist_range)
+		);
+
+		if (mob->CheckAggro(attacker)) {
+			continue;
+		}
+
+		if (sender->NPCAssistCap() >= RuleI(Combat, NPCAssistCap)) {
+			break;
+		}
+
+		if (
+			mob != sender
+			&& mob != attacker
+			&& mob->GetPrimaryFaction() != 0
+			&& !mob->IsEngaged()
+			&& ((!mob->IsPet()) || (mob->IsPet() && mob->GetOwner() && !mob->GetOwner()->IsClient()))
+			) {
+
+			/**
+			 * if they are in range, make sure we are not green...
+			 * then jump in if they are our friend
+			 */
+			if (mob->GetLevel() >= 50 || attacker->GetLevelCon(mob->GetLevel()) != CON_GRAY) {
+				bool use_primary_faction = false;
+				if (mob->GetPrimaryFaction() == sender->CastToNPC()->GetPrimaryFaction()) {
+					const NPCFactionList *cf = database.GetNPCFactionEntry(mob->CastToNPC()->GetNPCFactionID());
+					if (cf) {
+						if (cf->assistprimaryfaction != 0) {
+							use_primary_faction = true;
+						}
+					}
+				}
+
+				if (use_primary_faction || sender->GetReverseFactionCon(mob) <= FACTION_AMIABLE) {
+					//attacking someone on same faction, or a friend
+					//Father Nitwit: make sure we can see them.
+					if (mob->CheckLosFN(sender)) {
+						mob->AddToHateList(attacker, 25, 0, false);
+						sender->AddAssistCap();
+
+						LogAIYellForHelpDetail(
+							"NPC [{}] is assisting [{}] against target [{}]",
+							mob->GetCleanName(),
+							this->GetCleanName(),
+							attacker->GetCleanName()
+						);
+					}
+				}
+			}
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/zone/npc.h b/zone/npc.h
index 1957b8e63..84ab8b4ef 100644
--- a/zone/npc.h
+++ b/zone/npc.h
@@ -143,6 +143,9 @@ public:
 	virtual bool	AI_IdleCastCheck();
 	virtual void	AI_Event_SpellCastFinished(bool iCastSucceeded, uint16 slot);
 
+	bool AICheckCloseBeneficialSpells(NPC* caster, uint8 chance, float cast_range, uint32 spell_types);
+	void AIYellForHelp(Mob* sender, Mob* attacker);
+
 	void LevelScale();
 
 	virtual void SetTarget(Mob* mob);
@@ -214,13 +217,13 @@ public:
 
 	virtual int32 CalcMaxMana();
 	void SetGrid(int32 grid_){ grid=grid_; }
-	void SetSp2(uint32 sg2){ spawn_group=sg2; }
+	void SetSpawnGroupId(uint32 sg2){ spawn_group_id =sg2; }
 	void SetWaypointMax(uint16 wp_){ wp_m=wp_; }
 	void SetSaveWaypoint(uint16 wp_){ save_wp=wp_; }
 
 	uint16 GetWaypointMax() const { return wp_m; }
 	int32 GetGrid() const { return grid; }
-	uint32 GetSp2() const { return spawn_group; }
+	uint32 GetSpawnGroupId() const { return spawn_group_id; }
 	uint32 GetSpawnPointID() const;
 
 	glm::vec4 const GetSpawnPoint() const { return m_SpawnPoint; }
@@ -294,7 +297,7 @@ public:
 	int32 GetNPCHPRegen() const { return hp_regen + itembonuses.HPRegen + spellbonuses.HPRegen; }
 	inline const char* GetAmmoIDfile() const { return ammo_idfile; }
 
-	void ModifyStatsOnCharm(bool bRemoved);
+	void ModifyStatsOnCharm(bool is_charm_removed);
 
 	//waypoint crap
 	int					GetMaxWp() const { return max_wp; }
@@ -453,6 +456,8 @@ public:
 
 	bool IgnoreDespawn() { return ignore_despawn; }
 
+	void SetSimpleRoamBox(float box_size, float move_distance = 0, int move_delay = 0);
+
 	float GetRoamboxMaxX() const;
 	float GetRoamboxMaxY() const;
 	float GetRoamboxMinX() const;
@@ -478,13 +483,13 @@ protected:
 	friend class EntityList;
 	friend class Aura;
 	std::list<struct NPCFaction*> faction_list;
-	uint32	copper;
-	uint32	silver;
-	uint32	gold;
-	uint32	platinum;
-	int32	grid;
-	uint32	spawn_group;
-	uint16	wp_m;
+	uint32                        copper;
+	uint32                        silver;
+	uint32                        gold;
+	uint32                        platinum;
+	int32                         grid;
+	uint32                        spawn_group_id;
+	uint16                        wp_m;
 
 	int32	npc_faction_id;
 	int32	primary_faction;
@@ -539,6 +544,7 @@ protected:
 	int default_accuracy_rating;
 	int default_avoidance_rating;
 	int default_atk;
+	char default_special_abilities[512];
 
 	// when charmed, switch to these
 	int charm_ac;
diff --git a/zone/npc_scale_manager.cpp b/zone/npc_scale_manager.cpp
index 5daabcb16..ed65674fb 100644
--- a/zone/npc_scale_manager.cpp
+++ b/zone/npc_scale_manager.cpp
@@ -24,10 +24,11 @@
 /**
  * @param npc 
  */
-void NpcScaleManager::ScaleNPC(NPC * npc)
+void NpcScaleManager::ScaleNPC(NPC *npc)
 {
-	if (npc->IsSkipAutoScale())
+	if (npc->IsSkipAutoScale()) {
 		return;
+	}
 
 	int8 npc_type       = GetNPCScalingType(npc);
 	int  npc_level      = npc->GetLevel();
@@ -36,7 +37,8 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
 	global_npc_scale scale_data = GetGlobalScaleDataForTypeLevel(npc_type, npc_level);
 
 	if (!scale_data.level) {
-		Log(Logs::General, Logs::NPCScaling, "NPC: %s - scaling data not found for type: %i level: %i",
+		LogNPCScaling(
+			"NPC: [{}] - scaling data not found for type: [{}] level: [{}]",
 			npc->GetCleanName(),
 			npc_type,
 			npc_level
@@ -109,11 +111,7 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
 			int32 class_level_damage_mod = GetClassLevelDamageMod(npc->GetLevel(), npc->GetClass());
 			min_dmg = (min_dmg * class_level_damage_mod) / 220;
 
-			Log(Logs::Moderate,
-				Logs::NPCScaling,
-				"ClassLevelDamageMod::min_dmg base: %i calc: %i",
-				scale_data.min_dmg,
-				min_dmg);
+			LogNPCScaling("ClassLevelDamageMod::min_dmg base: [{}] calc: [{}]", scale_data.min_dmg, min_dmg);
 		}
 
 		npc->ModifyNPCStat("min_hit", std::to_string(min_dmg).c_str());
@@ -124,17 +122,12 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
 			int32 class_level_damage_mod = GetClassLevelDamageMod(npc->GetLevel(), npc->GetClass());
 			max_dmg = (scale_data.max_dmg * class_level_damage_mod) / 220;
 
-			Log(Logs::Moderate,
-				Logs::NPCScaling,
-				"ClassLevelDamageMod::max_dmg base: %i calc: %i",
-				scale_data.max_dmg,
-				max_dmg
-			);
+			LogNPCScaling("ClassLevelDamageMod::max_dmg base: [{}] calc: [{}]", scale_data.max_dmg, max_dmg);
 		}
 
 		npc->ModifyNPCStat("max_hit", std::to_string(max_dmg).c_str());
 	}
-	if (npc->GetHPRegen() == 0) {
+	if (npc->GetHPRegen() == 0 && is_auto_scaled) {
 		npc->ModifyNPCStat("hp_regen", std::to_string(scale_data.hp_regen_rate).c_str());
 	}
 	if (npc->GetAttackDelay() == 0) {
@@ -160,14 +153,14 @@ void NpcScaleManager::ScaleNPC(NPC * npc)
 			}
 		}
 
-		Log(Logs::General,
-			Logs::NPCScaling,
-			"(%s) level: %i type: %i Auto: %s Setting: %s",
+		LogNPCScaling(
+			"([{}]) level: [{}] type: [{}] Auto: [{}] Setting: [{}]",
 			npc->GetCleanName(),
 			npc_level,
 			npc_type,
 			(is_auto_scaled ? "true" : "false"),
-			scale_log.c_str());
+			scale_log.c_str()
+		);
 	}
 }
 
@@ -249,7 +242,7 @@ bool NpcScaleManager::LoadScaleData()
 		);
 	}
 
-	Log(Logs::General, Logs::NPCScaling, "Global Base Scaling Data Loaded...");
+	LogNPCScaling("Global Base Scaling Data Loaded");
 
 	return true;
 }
@@ -426,7 +419,7 @@ int8 NpcScaleManager::GetNPCScalingType(NPC *&npc)
 	if (npc->IsRareSpawn() || npc_name.find('#') != std::string::npos || isupper(npc_name[0])) {
 		return 1;
 	}
-	
+
 	return 0;
 }
 
@@ -489,10 +482,8 @@ bool NpcScaleManager::ApplyGlobalBaseScalingToNPCStatically(NPC *&npc)
 	global_npc_scale scale_data = GetGlobalScaleDataForTypeLevel(npc_type, npc_level);
 
 	if (!scale_data.level) {
-		Log(
-			Logs::General,
-			Logs::NPCScaling,
-			"NpcScaleManager::ApplyGlobalBaseScalingToNPCStatically NPC: %s - scaling data not found for type: %i level: %i",
+		LogNPCScaling(
+			"NpcScaleManager::ApplyGlobalBaseScalingToNPCStatically NPC: [{}] - scaling data not found for type: [{}] level: [{}]",
 			npc->GetCleanName(),
 			npc_type,
 			npc_level
@@ -577,10 +568,8 @@ bool NpcScaleManager::ApplyGlobalBaseScalingToNPCDynamically(NPC *&npc)
 	global_npc_scale scale_data = GetGlobalScaleDataForTypeLevel(npc_type, npc_level);
 
 	if (!scale_data.level) {
-		Log(
-			Logs::General,
-			Logs::NPCScaling,
-			"NpcScaleManager::ApplyGlobalBaseScalingToNPCDynamically NPC: %s - scaling data not found for type: %i level: %i",
+		LogNPCScaling(
+			"NpcScaleManager::ApplyGlobalBaseScalingToNPCDynamically NPC: [{}] - scaling data not found for type: [{}] level: [{}]",
 			npc->GetCleanName(),
 			npc_type,
 			npc_level
diff --git a/zone/object.cpp b/zone/object.cpp
index 4306c6642..4fbaef1c3 100644
--- a/zone/object.cpp
+++ b/zone/object.cpp
@@ -339,7 +339,7 @@ const EQEmu::ItemInstance* Object::GetItem(uint8 index) {
 void Object::PutItem(uint8 index, const EQEmu::ItemInstance* inst)
 {
 	if (index > 9) {
-		Log(Logs::General, Logs::Error, "Object::PutItem: Invalid index specified (%i)", index);
+		LogError("Object::PutItem: Invalid index specified ([{}])", index);
 		return;
 	}
 
@@ -443,6 +443,14 @@ bool Object::Process(){
 	if(m_ground_spawn && respawn_timer.Check()){
 		RandomSpawn(true);
 	}
+
+	if (user != nullptr && !entity_list.GetClientByCharID(user->CharacterID())) {
+		m_inuse = false;
+		last_user = user;
+		user->SetTradeskillObject(nullptr);
+		user = nullptr;
+	}
+
 	return true;
 }
 
@@ -465,7 +473,7 @@ void Object::RandomSpawn(bool send_packet) {
 		} 
 	}
 
-	Log(Logs::Detail, Logs::Zone_Server, "Object::RandomSpawn(%s): %d (%.2f, %.2f, %.2f)", m_data.object_name, m_inst->GetID(), m_data.x, m_data.y, m_data.z);
+	LogInfo("Object::RandomSpawn([{}]): [{}] ([{}], [{}], [{}])", m_data.object_name, m_inst->GetID(), m_data.x, m_data.y, m_data.z);
 	
 	respawn_timer.Disable();
 
@@ -554,7 +562,6 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object)
 		ClickObjectAction_Struct* coa = (ClickObjectAction_Struct*)outapp->pBuffer;
 
 		//TODO: there is prolly a better way to do this.
-		m_inuse = true;
 		coa->type = m_type;
 		coa->unknown16 = 0x0a;
 
@@ -572,16 +579,10 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object)
 
 			if (sender->ClientVersion() >= EQEmu::versions::ClientVersion::RoF) {
 				coa->drop_id = 0xFFFFFFFF;
-				sender->Message(0, "Someone else is using that. Try again later.");
+				sender->Message(Chat::White, "Someone else is using that. Try again later.");
 			}
 		}
 
-		if(sender->IsLooting())
-		{
-			coa->open = 0x00;
-			user = sender;
-		}
-
 		sender->QueuePacket(outapp);
 		safe_delete(outapp);
 
@@ -590,6 +591,7 @@ bool Object::HandleClick(Client* sender, const ClickObject_Struct* click_object)
 			return(false);
 
 		// Starting to use this object
+		m_inuse = true;
 		sender->SetTradeskillObject(this);
 
 		user = sender;
@@ -645,7 +647,7 @@ uint32 ZoneDatabase::AddObject(uint32 type, uint32 icon, const Object_Struct& ob
     safe_delete_array(object_name);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Unable to insert object: %s", results.ErrorMessage().c_str());
+		LogError("Unable to insert object: [{}]", results.ErrorMessage().c_str());
 		return 0;
 	}
 
@@ -684,7 +686,7 @@ void ZoneDatabase::UpdateObject(uint32 id, uint32 type, uint32 icon, const Objec
     safe_delete_array(object_name);
     auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Unable to update object: %s", results.ErrorMessage().c_str());
+		LogError("Unable to update object: [{}]", results.ErrorMessage().c_str());
 		return;
 	}
 
@@ -728,7 +730,7 @@ void ZoneDatabase::DeleteObject(uint32 id)
 	std::string query = StringFormat("DELETE FROM object WHERE id = %i", id);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Unable to delete object: %s", results.ErrorMessage().c_str());
+		LogError("Unable to delete object: [{}]", results.ErrorMessage().c_str());
 	}
 }
 
diff --git a/zone/oldcode.cpp b/zone/oldcode.cpp
deleted file mode 100644
index 600e8ad5c..000000000
--- a/zone/oldcode.cpp
+++ /dev/null
@@ -1,1851 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#include "../common/debug.h"
-#include <iostream>
-using namespace std;
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <signal.h>
-#include <time.h>
-	#ifdef _CRTDBG_MAP_ALLOC
-		#undef new
-	#endif
-#include <fstream>
-	#ifdef _CRTDBG_MAP_ALLOC
-		#define new new(_NORMAL_BLOCK, __FILE__, __LINE__)
-	#endif
-using namespace std;
-#ifdef WIN32
-#include <conio.h>
-#define snprintf	_snprintf
-#define vsnprintf	_vsnprintf
-#define strncasecmp	_strnicmp
-#define strcasecmp	_stricmp
-#endif
-
-bool spells_loaded = false;
-volatile bool RunLoops = true;
-extern volatile bool ZoneLoaded;
-#ifdef SHAREMEM
-	#include "../common/EMuShareMem.h"
-	extern LoadEMuShareMemDLL EMuShareMemDLL;
-	#ifndef WIN32
-		#include <sys/types.h>
-		#include <sys/ipc.h>
-		#include <sys/sem.h>
-		#include <sys/shm.h>
-#ifndef FREEBSD
-	union semun {
-		int val;
-		struct semid_ds *buf;
-		ushort *array;
-		struct seminfo *__buf;
-		void *__pad;
-	};
-#endif
-	#endif
-#endif
-
-
-
-
-#include "../common/queue.h"
-#include "../common/timer.h"
-#include "../common/eq_stream.h"
-#include "../common/eq_packet_structs.h"
-#include "../common/mutex.h"
-#include "../common/version.h"
-#include "../common/files.h"
-#include "../common/eqemu_error.h"
-#include "../common/packet_dump_file.h"
-
-#include "masterentity.h"
-#include "worldserver.h"
-#include "net.h"
-#include "spdat.h"
-#include "zone.h"
-#include "command.h"
-#include "parser.h"
-#include "embparser.h"
-
-
-#ifndef NEW_LoadSPDat
-void LoadSPDat(SPDat_Spell_Struct** SpellsPointer) {
-	//FILE *fp;
-	//cout << "Beginning Spells memset." << endl;
-	int u;
-	//for (u = 0; u < SPDAT_RECORDS; u++)
-	//{	//cout << u << ' ';
-	memset((char*) &spells,0,sizeof(SPDat_Spell_Struct)*SPDAT_RECORDS);
-	//}
-	//cout << "Memset finished\n";
-	char temp=' ';
-	int tempid=0;
-	char token[64]="";
-	int a = 0;
-	char sep='^';
-	LogFile->write(EQEMuLog::Normal, "If this is the last message you see, you forgot to move spells_en.txt from your EQ dir to this dir.");
-
-#ifdef FREEBSD
-#error ifstreams seem to break BSD...
-#endif
-	ifstream in;in.open(SPELLS_FILE);
-
-	if(!in.is_open()){
-		LogFile->write(EQEMuLog::Error, "File '%s' not found in same directory as zone.exe, spell loading FAILED!", SPELLS_FILE);
-		return;
-	}
-	//while(!in.eof())
-	//{in >> temp;}
-	//for(int x =0; x< spellsen_size; x++)
-	//	memset((char*) &spells[x],0,sizeof(SPDat_Spell_Struct));
-	while(tempid <= SPDAT_RECORDS-1)
-	{
-		//if(tempid>3490)
-		//{
-		//	cout << "BLEH";
-		//	getch();
-		//}
-
-		//in.getline(&temp, 624);
-		in.get(temp);
-		while(chrcmpI(&temp, &sep))
-		{
-			strncat(token,&temp,1);
-			a++;//cout << temp<< ' ';
-			in.get(temp);
-		}
-		tempid=atoi(token);
-		if(tempid>=SPDAT_RECORDS)
-			break;
-		//cout << "TempID: " << tempid << endl;
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		strncpy(spells[tempid].name,token,a);
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-		//cout << spells[tempid].name << '^';
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		strncpy(spells[tempid].player_1,token,a);
-		//cout << spells[tempid].player_1 << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		strncpy(spells[tempid].teleport_zone,token,a);
-		//cout << spells[tempid].teleport_zone << '^';
-		a=0;
-
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		strncpy(spells[tempid].you_cast,token,a);
-		//cout << spells[tempid].you_cast << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		strncpy(spells[tempid].other_casts,token,a);
-		//cout << spells[tempid].other_casts << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		strncpy(spells[tempid].cast_on_you,token,a);
-		//cout << spells[tempid].cast_on_you << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		strncpy(spells[tempid].cast_on_other,token,a);
-		//cout << spells[tempid].cast_on_other << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		strncpy(spells[tempid].spell_fades,token,a);
-		//cout << spells[tempid].spell_fades << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			in.get(temp);
-		}
-		spells[tempid].range=atof(token);
-		//cout << spells[tempid].range << '^';
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].aoerange=atof(token);
-		//cout << spells[tempid].aoerange << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].pushback=atof(token);
-		//cout << spells[tempid].pushback << '^';
-		a=0;
-
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].pushup=atof(token);
-		//cout << spells[tempid].pushup << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].cast_time=atoi(token);
-
-		//cout << spells[tempid].cast_time << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].recovery_time=atoi(token);
-		//cout << spells[tempid].recovery_time << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].recast_time=atoi(token);
-		//cout << spells[tempid].recast_time << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].buffdurationformula=atoi(token);
-		//cout << spells[tempid].buffdurationformula << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].buffduration=atoi(token);
-		//cout << spells[tempid].buffduration << '^';
-
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].ImpactDuration=atoi(token);
-		//cout << spells[tempid].ImpactDuration<< '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].mana=atoi(token);
-		//cout << spells[tempid].mana << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		int y;
-		for(y=0; y< 12;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-				strncat(token,&temp,1);
-				a++;
-				in.get(temp);
-			}
-			spells[tempid].base[y]=atoi(token);
-			//cout << spells[tempid].base[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-
-
-		}
-		for(y=0; y< 12;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-				strncat(token,&temp,1);
-				a++;
-				in.get(temp);
-			}
-			spells[tempid].max[y]=atoi(token);
-			//cout << spells[tempid].max[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-
-		}
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].icon=atoi(token);
-		//cout << spells[tempid].icon << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].memicon=atoi(token);
-		//cout << spells[tempid].memicon << '^';
-
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		for(y=0; y< 4;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-				strncat(token,&temp,1);
-				a++;
-				in.get(temp);
-			}
-			spells[tempid].components[y]=atoi(token);
-			//cout << spells[tempid].components[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-
-		}
-		for(y=0; y< 4;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-				strncat(token,&temp,1);
-				a++;
-				in.get(temp);
-			}
-			spells[tempid].component_counts[y]=atoi(token);//atoi(token);
-			//cout << spells[tempid].component_counts[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-		}
-		for(y=0; y< 4;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-				strncat(token,&temp,1);
-				a++;
-				in.get(temp);
-			}
-			spells[tempid].NoexpendReagent[y]=atoi(token); //NoExpend Reagent
-			//cout << spells[tempid].NoexpendReagent[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-
-		}
-		for(y=0; y< 12;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-				strncat(token,&temp,1);
-				a++;
-				in.get(temp);
-			}
-			spells[tempid].formula[y]=atoi(token);
-			//cout << spells[tempid].formula[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-
-		}
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-
-		spells[tempid].LightType=atoi(token);
-		//cout << spells[tempid].LightType << '^';
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].goodEffect=atoi(token);
-		//cout << spells[tempid].goodEffect << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].Activated=atoi(token);
-		//cout << spells[tempid].Activated << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].resisttype=atoi(token);
-		//cout << spells[tempid].resisttype << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		for(y=0; y< 12;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-				strncat(token,&temp,1);
-				a++;
-				in.get(temp);
-			}
-			spells[tempid].effectid[y]=atoi(token);
-			//cout << spells[tempid].effectid[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-
-		}
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].targettype=atoi(token);
-		//cout << spells[tempid].targettype << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].basediff=atoi(token);
-		//cout << spells[tempid].basediff<< '^';
-		a=0;
-		for(u=0;u<64;u++)
-
-			token[u]=(char)0;
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].skill=atoi(token);
-		//cout << spells[tempid].skill << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].zonetype=atoi(token);
-		//cout << spells[tempid].zonetype << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].EnvironmentType=atoi(token);
-		//cout << spells[tempid].EnvironmentType << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-
-			in.get(temp);
-		}
-		spells[tempid].TimeOfDay=atoi(token);
-		//cout << spells[tempid].TimeOfDay << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		for(y=0; y< 15;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-				strncat(token,&temp,1);
-				a++;
-				in.get(temp);
-			}
-			spells[tempid].classes[y]= atoi(token);
-			//cout << spells[tempid].classes[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-
-		} //cout << "end class";
-			/*for(y=0; y< 3;y++)
-			{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-			}
-			spells[tempid].unknown1[y]=atoi(token);
-			cout << spells[tempid].unknown1[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-			}
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-			}
-			spells[tempid].unknown2=atoi(token);
-			cout << spells[tempid].unknown2 << '^';
-			a=0;
-			for(u=0;u<64;u++)
-			token[u]=(char)0;
-		*/
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].CastingAnim=atoi(token);
-		//cout << spells[tempid].CastingAnim << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].TargetAnim=atoi(token);
-		//cout << spells[tempid].TargetAnim << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].TravelType=atoi(token);
-		//cout << spells[tempid].TravelType << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-		{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-		}
-		spells[tempid].SpellAffectIndex=atoi(token);
-		//cout << spells[tempid].SpellAffectIndex << '^';
-
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		for(y=0; y< 23;y++)
-		{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-			}
-			spells[tempid].Spacing2[y]=atoi(token);
-			//cout << spells[tempid].base[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-				token[u]=(char)0;
-		}
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-			{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-			}
-		spells[tempid].ResistDiff=atoi(token);
-			//cout << spells[tempid].ResistDiff << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		in.get(temp);
-		for(y=0; y< 2;y++)
-			{
-			in.get(temp);
-			while(chrcmpI(&temp,&sep))
-			{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-			}
-			spells[tempid].Spacing3[y]=atoi(token);
-			//cout << spells[tempid].base[y] << '^';
-			a=0;
-			for(u=0;u<64;u++)
-			token[u]=(char)0;
-			}
-
-		in.get(temp);
-		while(chrcmpI(&temp,&sep))
-			{
-			strncat(token,&temp,1);
-			a++;
-			in.get(temp);
-			}
-		spells[tempid].RecourseLink = atoi(token);
-			//cout << spells[tempid].RecourseLink << '^';
-		a=0;
-		for(u=0;u<64;u++)
-			token[u]=(char)0;
-
-		while(temp!='\n')
-			in.get(temp);
-
-		//cout << endl;
-		if(tempid==SPDAT_RECORDS-1) break;
-	}
-	//for(u=0;u< SPDAT_RECORDS;u++)
-	// cout << u << ' ' << spells[u].name << '^';
-
-	spells_loaded = true;
-	cout << "Spells loaded.\n";
-	in.close();
-
-}
-#endif
-
-
-/*void EntityList::SendAATimer(uint32 charid,UseAA_Struct* uaa){
-	Client* client2=this->GetClientByCharID(charid);
-	if(!client2){
-		LogFile->write(EQEMuLog::Error, "Error in SendAATimer: Couldnt find character!");
-		return;
-	}
-	client2->SendAATimer(uaa);
-}
-
-void ZoneDatabase::UpdateAndDeleteAATimers(uint32 charid){
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	char *query2 = 0;
-
-	if (!RunQuery(query, MakeAnyLenString(&query, "delete from aa_timers where charid=%i and UNIX_TIMESTAMP(now())>=end",charid), errbuf)) {
-		LogFile->write(EQEMuLog::Error, "UpdateAATimers query '%s' %s", query, errbuf);
-	}
-	if (!RunQuery(query2, MakeAnyLenString(&query2, "update aa_timers set end=end-(UNIX_TIMESTAMP(now())-begin),begin=UNIX_TIMESTAMP(now()) where charid=%i",charid), errbuf)) {
-		LogFile->write(EQEMuLog::Error, "UpdateAATimers query '%s' %s", query2, errbuf);
-	}
-	safe_delete_array(query);
-	safe_delete_array(query2);
-}
-
-void ZoneDatabase::UpdateTimersClientConnected(uint32 charid){
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	if (!RunQuery(query, MakeAnyLenString(&query, "update aa_timers set end=(UNIX_TIMESTAMP(now())+(end-begin)),begin=UNIX_TIMESTAMP(now()) where charid=%i",charid), errbuf)) {
-		LogFile->write(EQEMuLog::Error, "UpdateAATimers query '%s' %s", query, errbuf);
-	}
-	safe_delete_array(query);
-}
-
-void ZoneDatabase::GetAATimers(uint32 charid){
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT ability,begin,end from aa_timers WHERE charid=%i", charid), errbuf, &result)) {
-		while( ( row = mysql_fetch_row(result) ) ){
-			UseAA_Struct* uaa=new UseAA_Struct();
-			uaa->ability=atoi(row[0]);
-			uaa->begin=atoi(row[1]);
-			uaa->end=atoi(row[2]);
-			entity_list.SendAATimer(charid,uaa);
-			safe_delete(uaa);
-		}
-		mysql_free_result(result);
-	}
-	else {
-		LogFile->write(EQEMuLog::Error, "Database::GetAATimers query '%s' %s", query, errbuf);
-	}
-	safe_delete_array(query);
-}
-
-uint32 ZoneDatabase::GetTimerRemaining(uint32 charid,uint32 ability){
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	uint32 remain=0;
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT end-begin from aa_timers WHERE charid=%i and ability=%i", charid,ability), errbuf, &result)) {
-		if((row=mysql_fetch_row(result))){
-			remain=atoi(row[0]);
-		}
-		mysql_free_result(result);
-	}
-	else {
-		LogFile->write(EQEMuLog::Error, "Database::GetTimerRemaining query '%s' %s", query, errbuf);
-	}
-	safe_delete_array(query);
-	return remain;
-}
-
-void ZoneDatabase::UpdateAATimers(uint32 charid,uint32 endtime,uint32 begintime,uint32 ability){
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	if(begintime==0){
-		if (!RunQuery(query, MakeAnyLenString(&query, "replace into aa_timers (charid,end,begin,ability) values(%i,UNIX_TIMESTAMP(now())+%i,UNIX_TIMESTAMP(now()),%i)",charid,endtime,ability), errbuf)) {
-			LogFile->write(EQEMuLog::Error, "UpdateAATimers query '%s' %s", query, errbuf);
-		}
-	}
-	else{
-		if (!RunQuery(query, MakeAnyLenString(&query, "replace into aa_timers (charid,end,begin,ability) values(%i,%i,%i,%i)",charid,endtime,begintime,ability), errbuf)) {
-			LogFile->write(EQEMuLog::Error, "UpdateAATimers query '%s' %s", query, errbuf);
-		}
-	}
-	safe_delete_array(query);
-}*/
-
-/*
-uint16 Client::GetCombinedAC_TEST() {
-	int ac1;
-
-	ac1 = GetRawItemAC();
-	if (m_pp.class_ != WIZARD && m_pp.class_ != MAGICIAN && m_pp.class_ != NECROMANCER && m_pp.class_ != ENCHANTER) {
-		ac1 = ac1*4/3;
-	}
-	ac1 += GetSkill(DEFENSE)/3;
-	if (GetAGI() > 70) {
-		ac1 += GetAGI()/20;
-	}
-
-	int ac2;
-
-	ac2 = GetRawItemAC();
-	if (m_pp.class_ != WIZARD && m_pp.class_ != MAGICIAN && m_pp.class_ != NECROMANCER && m_pp.class_ != ENCHANTER) {
-		ac2 = ac2*4/3;
-	}
-	ac2 += GetSkill(DEFENSE)*400/255;
-
-	int combined_ac = (ac1+ac2)*1000/847;
-	return combined_ac;
-	float combined_ac = ((float)ac1+(float)ac2)*1000.0f/847.0f;
-	return (uint16) combined_ac;//*10.0f)-10;
-}
-*/
-
-
-/*bool Client::GetIncreaseSpellDurationItem(uint16 &spell_id, char *itemname)
-{
-	for (int i=0; i<22; i++) {
-		const ItemInst* inst = m_inv[i];
-		if (!inst || !inst->IsType(ItemTypeCommon))
-			continue;
-
-		const Item_Struct* item = inst->GetItem();
-		if (item->FocusId && (item->FocusId != 0xFFFF)) {
-			if (IsIncreaseDurationSpell(item->FocusId)) {
-				spell_id = item->FocusId;
-				if (itemname)
-					strcpy(itemname, item->Name);
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-bool Client::GetReduceManaCostItem(uint16 &spell_id, char *itemname)
-{
-	for (int i=0; i<22; i++) {
-		const ItemInst* inst = m_inv[i];
-		if (!inst || !inst->IsType(ItemTypeCommon))
-			continue;
-
-		const Item_Struct* item = inst->GetItem();
-		if (item->FocusId && (item->FocusId != 0xFFFF)) {
-			if (IsReduceManaSpell(item->FocusId)) {
-				spell_id = item->FocusId;
-				if (itemname)
-					strcpy(itemname, item->Name);
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-bool Client::GetReduceCastTimeItem(uint16 &spell_id, char *itemname)
-{
-	for (int i=0; i<22; i++) {
-		const ItemInst* inst = m_inv[i];
-		if (!inst || !inst->IsType(ItemTypeCommon))
-			continue;
-
-		const Item_Struct* item = inst->GetItem();
-		if (item->FocusId && (item->FocusId != 0xFFFF)) {
-			if (IsReduceCastTimeSpell(item->FocusId)) {
-				spell_id = item->FocusId;
-				if (itemname)
-					strcpy(itemname, item->Name);
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-bool Client::GetExtendedRangeItem(uint16 &spell_id, char *itemname)
-{
-	for (int i=0; i<22; i++) {
-		const ItemInst* inst = m_inv[i];
-		if (!inst || !inst->IsType(ItemTypeCommon))
-			continue;
-
-		const Item_Struct* item = inst->GetItem();
-		if (item->FocusId && (item->FocusId != 0xFFFF)) {
-			if (IsExtRangeSpell(item->FocusId)) {
-				spell_id = item->FocusId;
-				if (itemname)
-					strcpy(itemname, item->Name);
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-bool Client::GetImprovedHealingItem(uint16 &spell_id, char *itemname)
-{
-	for (int i=0; i<22; i++) {
-		const ItemInst* inst = m_inv[i];
-		if (!inst || !inst->IsType(ItemTypeCommon))
-			continue;
-
-		const Item_Struct* item = inst->GetItem();
-		if (item->FocusId && (item->FocusId != 0xFFFF)) {
-			if (IsImprovedHealingSpell(item->FocusId)) {
-				spell_id = item->FocusId;
-				if (itemname)
-					strcpy(itemname, item->Name);
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-bool Client::GetImprovedDamageItem(uint16 &spell_id, char *itemname)
-{
-	for (int i=0; i<22; i++) {
-		const ItemInst* inst = m_inv[i];
-		if (!inst || !inst->IsType(ItemTypeCommon))
-			continue;
-
-		const Item_Struct* item = inst->GetItem();
-		if (item->FocusId && (item->FocusId != 0xFFFF)) {
-			if (IsImprovedDamageSpell(item->FocusId)) {
-				spell_id = item->FocusId;
-				if (itemname)
-					strcpy(itemname, item->Name);
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
-int32 Client::GenericFocus(uint16 spell_id, uint16 modspellid)
-{
-	int modifier = 100, i;
-	const SPDat_Spell_Struct &spell = spells[spell_id];
-	const SPDat_Spell_Struct &modspell = spells[modspellid];
-
-	for (i = 0; i < EFFECT_COUNT; i++)
-	{
-		if(IsBlankSpellEffect(modspellid, i))
-			continue;
-		switch( spells[modspellid].effectid[i] )
-		{
-			case SE_LimitMaxLevel:
-				if (spell.classes[(GetClass()%17) - 1] > modspell.base[i])
-					return 100;
-				break;
-			case SE_LimitMinLevel:
-				if (spell.classes[(GetClass()%17) - 1] < modspell.base[i])
-					return 100;
-				break;
-			case SE_IncreaseRange:
-				modifier += modspell.base[i];
-				break;
-			case SE_IncreaseSpellHaste:
-				modifier -= modspell.base[i];
-				break;
-			case SE_IncreaseSpellDuration:
-				modifier += modspell.base[i];
-				break;
-			case SE_LimitSpell:
-				// negative sign means exclude
-				// positive sign means include
-				if (modspell.base[i] < 0)
-				{
-					if (modspell.base[i] * (-1) == spell_id)
-						return 100;
-				}
-				else
-				{
-					if (spells[modspellid].base[i] != spell_id)
-						return 100;
-				}
-				break;
-			case SE_LimitEffect:
-				switch( spells[modspellid].base[i] )
-				{
-					case -147:
-						if (IsPercentalHealSpell(spell_id))
-							return 100;
-						break;
-					case -101:
-						if (IsCHDurationSpell(spell_id))
-							return 100;
-						break;
-					case -40:
-						if (IsInvulnerabilitySpell(spell_id))
-							return 100;
-						break;
-					case -32:
-						if (IsSummonItemSpell(spell_id))
-							return 100;
-						break;
-					case 0:
-						if (!IsEffectHitpointsSpell(spell_id))
-							return 100;
-						break;
-					case 33:
-						if (!IsSummonPetSpell(spell_id))
-							return 100;
-						break;
-					case 36:
-						if (!IsPoisonCounterSpell(spell_id))
-							return 100;
-						break;
-					case 71:
-						if (!IsSummonSkeletonSpell(spell_id))
-							return 100;
-						break;
-					default:
-						LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown limit effect %d", spells[modspellid].base[i]);
-				}
-				break;
-			case SE_LimitCastTime:
-				if (modspell.base[i] > (int16)spell.cast_time)
-					return 100;
-				break;
-			case SE_LimitSpellType:
-				switch( spells[modspellid].base[i] )
-				{
-					case 0:
-						if (!IsDetrimentalSpell(spell_id))
-							return 100;
-						break;
-					case 1:
-						if (!IsBeneficialSpell(spell_id))
-							return 100;
-						break;
-					default:
-						LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown limit spelltype %d", spells[modspellid].base[i]);
-				}
-				break;
-			case SE_LimitMinDur:
-				if (modspell.base[i] > CalcBuffDuration_formula(GetLevel(), spell.buffdurationformula, spell.buffduration))
-					return 100;
-				break;
-			case SE_ImprovedDamage:
-			case SE_ImprovedHeal:
-				modifier += modspell.base[i];
-				break;
-			case SE_ReduceManaCost:
-				modifier -= modspell.base[i];
-				break;
-			default:
-				LogFile->write(EQEMuLog::Normal, "GenericFocus: unknown effectid %d", modspell.effectid[i]);
-		}
-	}
-
-	return modifier;
-}
-*/
-
-
-
-/*void Client::Discipline(ClientDiscipline_Struct* disc_in, Mob* tar) {
-Message(0, "Disc packet id=%d, %x,%x,%x", disc_in->disc_id, disc_in->unknown3[0], disc_in->unknown3[1], disc_in->unknown3[2]);
-	if (!p_timers.Expired(&database, pTimerDisciplineReuse)) {
-		char val1[20]={0};
-		char val2[20]={0};
-		uint32 remain = p_timers.GetRemainingTime(pTimerDisciplineReuse);
-		Message_StringID(0,DISCIPLINE_CANUSEIN,ConvertArray((remain)/60,val1),ConvertArray(remain%60,val2));
-		//Message(0,"You can use a new discipline in %i minutes %i seconds.", (disc_timer.GetRemainingTime()/1000)/60,	disc_timer.GetRemainingTime()/1000%60);
-		return;
-	}
-
-	//reuse times are a little messes up, they should scale down somehow
-	//as you gain in levels, but im not sure how, so its just a lvl 60 bonus right now
-
-	//should change this to check classes better.
-
-	//both in seconds, converted at the end.
-	uint32 duration = 0;
-	uint32 reuse = 0;
-
-	switch(disc_in->disc_id){
-	// Shared?
-	case discResistant: { // Resistant
-		// 1 minute duration
-		// 1 hour reuse
-		// +3 to +10 to resists
-		if (GetLevel()<=29)
-			return;
-		duration = 60;
-		reuse = 60*60;
-		entity_list.MessageClose(this, false, 100, 0, "%s has become more resistant!", GetName());
-		break;
-	}
-	case discFearless: { // Fearless
-		// 11 second duration
-		// 1 hour reuse
-		// 100% fear immunity
-		if (GetLevel()<=39)
-			return;
-		duration = 11;
-		reuse = 60*60;
-		entity_list.MessageClose_StringID(this, false, 100, 0, DISCIPLINE_FEARLESS, GetName());
-		//entity_list.MessageClose(this, false, 100, 0, "%s becomes fearless!", GetName());
-		break;
-	}
-	case discWhirlwind: { // Counterattack/Whirlwind/Furious
-		// warrior level 56
-		// rogue/monk level 53
-		// 9 second duration
-		// 1 hour reuse
-		if ((GetClass() == WARRIOR && GetLevel() <= 56)
-			||(GetLevel() <= 53)
-			) return;
-		duration = 9;
-		reuse = 60*60;
-		entity_list.MessageClose(this, false, 100, 0, "%s\'s face becomes twisted with fury!", GetName());
-		break;
-	}
-	case discFellstrike: { // Duelist/Innerflame/Fellstrike
-		// monk level 56
-		// rogue level 59
-		// warrior level 58
-		// 12 second duration
-		// 30 minute reuse
-		// min 4*base hand/weapon damage
-		if ((GetClass() == MONK && GetLevel() <= 55)
-			||(GetClass() == WARRIOR && GetLevel() <= 58)
-			||(GetClass() == ROGUE && GetLevel() <= 59)
-			) return;
-		duration = 12;
-		reuse = 60*30;
-		entity_list.MessageClose(this, false, 100, 0, "%s\'s muscles bulge with force of will!", GetName());
-		break;
-	}
-	case discBlindingSpeed: { // Blindingspeed/Hundredfist
-		// rogue level 58
-		// monk level 57
-		// 15 second duration
-		// 30 minute reuse
-		if ((GetClass() == MONK && GetLevel() <= 58)
-			||(GetClass() == ROGUE && GetLevel() <= 57)
-			) return;
-		//disc_timer.Start(1000*60*30);
-		//disc_elapse.Start(1000*15);
-		duration = 15;
-		reuse = 60*30;
-		Message(0, "This discipline not implemented..");
-		break;
-	}
-	case discDeadeye: { // Deadeye/Charge
-		// warrior level 53
-		// rogue level 54
-		// 14 second duration
-		// 30 minute reuse
-		if ((GetClass() == WARRIOR && GetLevel() <= 53)
-			||(GetClass() == ROGUE && GetLevel() <= 54)
-			) return;
-		duration = 14;
-		reuse = 60*30;
-		entity_list.MessageClose(this, false, 100, 0, "%s feels unstopable!", GetName());
-		break;
-	}
-	// Warrior
-	case discEvasive: { // Evasive
-		// level 52
-		// 3 minute duration
-		// 15 minute reuse
-		// +35% avoidance
-		// -15% out
-		duration = 3*60;
-		reuse = 15*60;
-		break;
-	}
-	case discMightystrike: { // Mightystrike
-		// level 54
-		// 10 second duration
-		// 1 hour reuse
-		// Auto crit
-		duration = 10;
-		reuse = 60*60;
-		break;
-	}
-	case discDefensive: { // Defensive
-		// level 55
-		// 3 minute duration
-		// 15 minute reuse, 10 after 60
-		// +35% mitigation
-		// -15% out
-		duration = 3*60;
-		if(level > 59)
-			reuse = 10*60;
-		else
-			reuse = 15*60;
-		break;
-	}
-	case discPrecise: { // Precise
-		// level 57
-		// 3 minute duration
-		// 30 minute reuse
-		// -15% avoidance
-		// +35% out
-		duration = 3*60;
-		reuse = 30*60;
-		break;
-	}
-	case discAggressive: { // Aggressive
-		// level 60
-		// 3 minute duration
-		// 27 minute reuse
-		// -15% mitigation
-		// +35% out
-		duration = 3*60;
-		reuse = 27*60;
-		break;
-	}
-	// Monk
-	case discStonestance: { // Stonestance
-		// level 51
-		duration = 12;
-		if(level > 59)
-			reuse = 3*60;
-		else
-			reuse = 12*60;
-		break;
-	}
-	case discThunderkick: { // Thunderkick
-		// level 52
-		if(level > 59)
-			reuse = 1*60;
-		else
-			reuse = 7*60;
-		duration = 5*60;		//hack for now, checked in combat and expired once used.
-		break;
-	}
-	case discVoidance: { // Voidance
-		// level 54
-		if(level > 59)
-			reuse = 54*60;
-		else
-			reuse = 60*60;
-		duration = 8;
-		break;
-	}
-	case discSilentfist: { // Silentfist
-		// level 59
-		// 6-7 minute reuse
-		// Dragon punch damage bonus
-		// Chance to stun
-		if(level > 59)
-			reuse = 6*60;
-		else
-			reuse = 7*60;
-		duration = 5*60;		//hack for now, checked in combat and expired once used.
-		break;
-	}
-	case discAshenhand: { // Ashenhand
-		// level 60
-		// 72 minute reuse
-		// Eagle Strike damage bonus
-		// Chance to slay
-		reuse = 72*60;
-		duration = 5*60;		//hack for now, checked in combat and expired once used.
-		break;
-	}
-	// Rogue
-	case discNimble: { // Nimble
-		// level 55
-		// 12 second duration
-		// 30 minute reuse
-		// Auto dodge
-		if(level > 59)
-			reuse = 25*60;
-		else
-			reuse = 30*60;
-		duration = 12;
-		break;
-	}
-	case discKinesthetics: { // Kinesthetics
-		// level 57
-		// 18 second duration
-		// 30,27 minute reuse
-		// Auto dualwield
-		// Auto double attack
-		if(level > 59)
-			reuse = 27*60;
-		else
-			reuse = 30*60;
-		duration = 18;
-		break;
-	}
-	// Paladin
-	case discHolyforge: { // Holyforge
-		// level 55
-		// 2 minute duration
-		// 72 minute reuse
-		// Crit/Crip undead
-		// +15% to crit chance
-		if(level > 59)
-			reuse = 65*60;
-		else
-			reuse = 72*60;
-		duration = 5*60;
-		break;
-	}
-	case discSanctification: { // Sanctification
-		// level 60
-		// 10 second duration
-		// 72 minute reuse
-		// Spell immunity
-		reuse = 72*60;
-		duration = 15;
-		break;
-	}
-	// Ranger
-	case discTrueshot: { // Trueshot
-		// level 55
-		// 2 minute duration
-		// 72 minute reuse
-		// Max to two times max bow damage
-		// +15% to hit
-		if(level > 59)
-			reuse = 67*60;
-		else
-			reuse = 72*60;
-		duration = 2*60;
-		break;
-	}
-	case discWeaponshield: { // Weaponshield
-		// level 60
-		// 15 second duration
-		// 72 minute reuse
-		// auto parry
-		reuse = 72*60;
-		duration = 20;
-		break;
-	}
-	// Bard
-	case discDeftdance: { // Deftdance
-		// level 55
-		// 10 second duration
-		// 72 minute reuse
-		// auto dodge
-		// auto dualwield
-		if(level > 59)
-			reuse = 67*60;
-		else
-			reuse = 72*60;
-		duration = 10;
-		break;
-	}
-	case discPuretone: { // Puretone
-		// level 60
-		// 2 minute duration
-		// 72 minute reuse
-		// Auto instrument
-		reuse = 72*60;
-		duration = 4*60;
-		break;
-	}
-	// Shadow knight
-	case discUnholyAura: { // Unholy
-		// level 55
-		// 72 minute reuse
-		// +25% to harmtouch
-		// -300 to resist
-		if(level > 59)
-			reuse = 67*60;
-		else
-			reuse = 72*60;
-		duration = 5*60;		//hack for now, checked in combat and expired once used.
-		break;
-	}
-	case discLeechCurse: { // Leech curse
-		// level 60
-		// 15 second duration
-		// 72 minute reuse
-		// Heal self for each point of melee damage done
-		reuse = 72*60;
-		duration = 15;
-		break;
-	}
-	// Default
-	case 0:{ // Timer request
-		break;
-	}
-	default:
-		LogFile->write(EQEMuLog::Error, "Unknown Discipline requested by client: %s class: %i Disciline:%i", GetName(), class_,disc_in->disc_id);
-		return;
-	}
-
-	if(reuse != 0) {
-		p_timers.Start(pTimerDisciplineReuse, reuse);
-		//nonpersistent timer for the 'discipline ready' message
-		disc_timer.Start(1000*reuse);
-	}
-	if(duration != 0)
-		disc_elapse.Start(1000*duration);
-
-	disc_inuse = disc_in->disc_id;
-}*/
-
-#if 0	// solar: this is old code
-/*void EntityList::AESpell(Mob* caster, Mob* center, float dist, uint16 spell_id, bool group)
-{
-	LinkedListIterator<Mob*> iterator(mob_list);
-	iterator.Reset();
-	while(iterator.MoreElements()) {
-		Mob* mob = iterator.GetData();
-		if (group){
-				// Client casting group spell with out target group buffs enabled
-				// Skip non group members
-				if (caster->IsClient()
-					&& !caster->CastToClient()->TGB()
-					&& GetGroupByMob(mob) != 0
-					&& !GetGroupByMob(mob)->IsGroupMember(caster)
-					) {
-					LogFile->write(EQEMuLog::Debug, "Group spell skipping %s", mob->GetName());
-						iterator.Advance();
-						continue;
-				}
-				// Client casting group spell with target group buffs enabled
-				else if (caster->IsClient()
-						&& caster->CastToClient()->TGB()
-						&& GetGroupByMob(mob) != 0
-						&& GetGroupByMob(mob)->IsGroupMember(caster)
-						){
-						LogFile->write(EQEMuLog::Debug, "Group spell TGB on %s's Group", mob->GetName());
-						GetGroupByMob(mob)->CastGroupSpell(caster, spell_id);
-						iterator.Advance();
-						continue;
-				}
-				else if (caster->IsClient()
-						&& caster->CastToClient()->TGB()
-						&& GetGroupByMob(mob) == 0
-						&& mob == center
-						){
-						LogFile->write(EQEMuLog::Debug, "Group spell TGB on %s", mob->GetName());
-						caster->SpellOnTarget(spell_id, mob);
-						return;
-				}
-		}
-		if (
-			mob->DistNoZ(*center) <= dist
-			&& !(mob->IsClient() && mob->CastToClient()->GMHideMe())
-			&& !mob->IsCorpse()
-			) {
-			//cout << "AE Spell Hit: t=" << iterator.GetData()->GetName() << ", d=" << iterator.GetData()->CastToMob()->DistNoRoot(center) << ", x=" << iterator.GetData()->CastToMob()->GetX() << ", y=" << iterator.GetData()->CastToMob()->GetY() << endl;
-			if (caster == mob) {
-				// Caster gets the first hit, already handled in spells.cpp
-			}
-		#ifdef IPC
-			else if(caster->IsNPC() && !caster->CastToNPC()->IsInteractive()) {
-		#else
-			else if(caster->IsNPC()) {
-		#endif
-			// Npc
-				if (caster->IsAttackAllowed(mob) && spells[spell_id].targettype != ST_AEBard) {
-					caster->SpellOnTarget(spell_id, mob);
-				}
-				else if (mob->IsAIControlled() && spells[spell_id].targettype == ST_AEBard) {
-					caster->SpellOnTarget(spell_id, mob);
-				}
-				else {
-				}
-			}
-		#ifdef IPC
-			else if(caster->IsNPC() && caster->CastToNPC()->IsInteractive()) {
-				// Interactive npc
-				if (caster->IsAttackAllowed(mob) && spells[spell_id].targettype != ST_AEBard && spells[spell_id].targettype != ST_GroupTeleport) {
-					caster->SpellOnTarget(spell_id, mob);
-				}
-				else if (!mob->IsAIControlled() && (spells[spell_id].targettype == ST_AEBard||group) && mob->CastToClient()->GetPVP() == caster->CastToClient()->GetPVP()) {
-						if (group && GetGroupByMob(mob) != GetGroupByMob(caster)) {
-								iterator.Advance();
-								continue;
-					}
-				caster->SpellOnTarget(spell_id, mob);
-				}
-				else {
-				}
-			}
-		#endif
-			else if (caster->IsClient() && !(caster->CastToClient()->IsBecomeNPC())) {
-				// Client
-				if (caster->IsAttackAllowed(mob) && spells[spell_id].targettype != ST_AEBard){
-					caster->SpellOnTarget(spell_id, mob);
-				}
-				else if(spells[spell_id].targettype == ST_GroupTeleport && mob->IsClient() && mob->isgrouped && caster->isgrouped && entity_list.GetGroupByMob(caster))
-				{
-					Group* caster_group = entity_list.GetGroupByMob(caster);
-					if(caster_group != 0 && caster_group->IsGroupMember(mob))
-						caster->SpellOnTarget(spell_id,mob);
-				}
-				else if (mob->IsClient() && (spells[spell_id].targettype == ST_AEBard||group) && mob->CastToClient()->GetPVP() == caster->CastToClient()->GetPVP()) {
-					if (group && GetGroupByMob(mob) != GetGroupByMob(caster)) {
-						iterator.Advance();
-						continue;
-					}
-					else if (mob->IsClient() && spells[spell_id].targettype == ST_AEBard && mob->CastToClient()->GetPVP() == caster->CastToClient()->GetPVP())
-						caster->SpellOnTarget(spell_id, mob);
-				#ifdef IPC
-					else if (mob->IsNPC() && mob->CastToNPC()->IsInteractive()) {
-						if (group && GetGroupByMob(mob) != GetGroupByMob(caster))
-							continue;
-						caster->SpellOnTarget(spell_id, mob);
-					}
-				#endif
-				}
-			}
-			else if (caster->IsClient()) {
-				// Client BecomeNPC
-				caster->SpellOnTarget(spell_id, mob);
-			}
-		}
-		iterator.Advance();
-	}
-}*/
-#endif	// solar: old code
-
-/*#if 0
-// Queries the loottable: adds item & coin to the npc
-void ZoneDatabase::AddLootTableToNPC(uint32 loottable_id, ItemList* itemlist, uint32* copper, uint32* silver, uint32* gold, uint32* plat) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-	*copper = 0;
-	*silver = 0;
-	*gold = 0;
-	*plat = 0;
-
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT id, mincash, maxcash, avgcoin FROM loottable WHERE id=%i", loottable_id), errbuf, &result)) {
-		safe_delete_array(query);
-		if (mysql_num_rows(result) == 1) {
-			row = mysql_fetch_row(result);
-			uint32 mincash = atoi(row[1]);
-			uint32 maxcash = atoi(row[2]);
-			if (mincash > maxcash) {
-				cerr << "Error in loottable #" << row[0] << ": mincash > maxcash" << endl;
-			}
-			else if (maxcash != 0) {
-				uint32 cash = 0;
-				if (mincash == maxcash)
-					cash = mincash;
-				else
-					cash = (rand() % (maxcash - mincash)) + mincash;
-				if (cash != 0) {
-					uint32 coinavg = atoi(row[3]);
-					if (coinavg != 0) {
-						uint32 mincoin = (uint32) (coinavg * 0.75 + 1);
-						uint32 maxcoin = (uint32) (coinavg * 1.25 + 1);
-						*copper = (rand() % (maxcoin - mincoin)) + mincoin - 1;
-						*silver = (rand() % (maxcoin - mincoin)) + mincoin - 1;
-						*gold = (rand() % (maxcoin - mincoin)) + mincoin - 1;
-						cash -= *copper;
-						cash -= *silver * 10;
-						cash -= *gold * 10;
-					}
-					*plat = cash / 1000;
-					cash -= *plat * 1000;
-					uint32 gold2 = cash / 100;
-					cash -= gold2 * 100;
-					uint32 silver2 = cash / 10;
-					cash -= silver2 * 10;
-					*gold += gold2;
-					*silver += silver2;
-					*copper += cash;
-				}
-			}
-		}
-		else {
-			mysql_free_result(result);
-			return;
-		}
-		mysql_free_result(result);
-	}
-	else
-	{
-		cerr << "Error in AddLootTableToNPC get coin query '" << query << "' " << errbuf << endl;
-		safe_delete_array(query);
-		return;
-	}
-
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT loottable_id, lootdrop_id, multiplier, probability FROM loottable_entries WHERE loottable_id=%i", loottable_id), errbuf, &result)) {
-		safe_delete_array(query);
-		while ((row = mysql_fetch_row(result))) {
-			int multiplier = atoi(row[2]);
-			for (int i = 1; i <= multiplier; i++) {
-				if ( ((rand()%1)*100) < atoi(row[3])) {
-					AddLootDropToNPC(atoi(row[1]), itemlist);
-				}
-			}
-		}
-		mysql_free_result(result);
-	}
-	else {
-		cerr << "Error in AddLootTableToNPC get items query '" << query << "' " << errbuf << endl;
-		safe_delete_array(query);
-		return;
-	}
-
-	return;
-}
-
-// Called by AddLootTableToNPC
-// maxdrops = size of the array npcd
-void ZoneDatabase::AddLootDropToNPC(uint32 lootdrop_id, ItemList* itemlist) {
-	char errbuf[MYSQL_ERRMSG_SIZE];
-	char *query = 0;
-	MYSQL_RES *result;
-	MYSQL_ROW row;
-
-// This is Wiz's updated Pool Looting functionality. Eventually, the database format should be moved over to use this
-// or implemented to support both methods. (A unique identifier in lootable_entries indicates to roll for a pool item
-// in another table.
-#ifdef POOLLOOTING
-	uint32 chancepool = 0;
-	uint32 items[50];
-	uint32 itemchance[50];
-	uint16 itemcharges[50];
-	uint8 i = 0;
-
-	for (int m=0;m < 50;m++)
-	{
-		items[m]=0;
-		itemchance[m]=0;
-		itemcharges[m]=0;
-	}
-
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT lootdrop_id, item_id, item_charges, equip_item, chance FROM lootdrop_entries WHERE lootdrop_id=%i order by chance desc", lootdrop_id), errbuf, &result))
-	{
-		safe_delete_array(query);
-		while (row = mysql_fetch_row(result))
-		{
-			items[i] = atoi(row[1]);
-			itemchance[i] = atoi(row[4]) + chancepool;
-			itemcharges[i] = atoi(row[2]);
-			chancepool += atoi(row[4]);
-			i++;
-		}
-		uint32 res;
-		i = 0;
-
-		if (chancepool!=0) //avoid divide by zero if some mobs have 0 for chancepool
-		{
-			res = rand()%chancepool;
-		}
-		else
-		{
-			res = 0;
-		}
-
-		while (items[i] != 0)
-		{
-			if (res <= itemchance[i])
-				break;
-			else
-				i++;
-		}
-		const Item_Struct* dbitem = database.GetItem(items[i]);
-		if (dbitem == 0)
-		{
-			LogFile->write(EQEMuLog::Error, "AddLootDropToNPC: dbitem=0, item#=%i, lootdrop_id=%i", items[i], lootdrop_id);
-		}
-		else
-		{
-			//cout << "Adding item to Mob" << endl;
-			ServerLootItem_Struct* item = new ServerLootItem_Struct;
-			item->item_id = dbitem->ItemNumber;
-			item->charges = itemcharges[i];
-			item->equipSlot = 0;
-			(*itemlist).Append(item);
-		}
-		mysql_free_result(result);
-	}
-#else
-	if (RunQuery(query, MakeAnyLenString(&query, "SELECT lootdrop_id, item_id, item_charges, equip_item, chance FROM lootdrop_entries WHERE lootdrop_id=%i order by chance desc", lootdrop_id), errbuf, &result))
-	{
-		safe_delete_array(query);
-		while ((row = mysql_fetch_row(result)))
-		{
-			uint8 LootDropMod=1; // place holder till I put it in a database variable to make it configurable.
-			if( (rand()%100) < ((atoi(row[4]) * LootDropMod)) )
-			{
-				uint32 itemid = atoi(row[1]);
-				const Item_Struct* dbitem = database.GetItem(itemid);
-				if (dbitem == 0)
-				{
-					LogFile->write(EQEMuLog::Error, "AddLootDropToNPC: dbitem=0, item#=%i, lootdrop_id=%i", itemid, lootdrop_id);
-				}
-				else
-				{
-					printf("Adding item: %i",item->ItemNumber);
-					ServerLootItem_Struct* item = new ServerLootItem_Struct;
-					item->item_id = dbitem->item_id;
-					item->charges = atoi(row[2]);
-					item->equipSlot = 0;
-					(*itemlist).Append(item);
-				}
-
-				//mysql_free_result(result);
-				//return;
-			}
-		}
-		mysql_free_result(result);
-	}
-#endif
-	else
-	{
-		LogFile->write(EQEMuLog::Error, "Error in AddLootDropToNPC query '%s' %s", query, errbuf);
-		safe_delete_array(query);
-		return;
-	}
-
-	return;
-}
-#endif*/
diff --git a/zone/oldcode.h b/zone/oldcode.h
deleted file mode 100644
index 6decf7f76..000000000
--- a/zone/oldcode.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*	EQEMu: Everquest Server Emulator
-	Copyright (C) 2001-2004 EQEMu Development Team (http://eqemu.org)
-
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; version 2 of the License.
-
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY except by those people which sell it, which
-	are required to give you total support for your newly bought product;
-	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with this program; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-*/
-#ifndef OLDCODE_H
-#define OLDCODE_H
-
-#endif
-
diff --git a/zone/pathfinder_nav_mesh.cpp b/zone/pathfinder_nav_mesh.cpp
index 090afa920..5be10b64f 100644
--- a/zone/pathfinder_nav_mesh.cpp
+++ b/zone/pathfinder_nav_mesh.cpp
@@ -355,7 +355,7 @@ void PathfinderNavmesh::DebugCommand(Client *c, const Seperator *sep)
 {
 	if (sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help"))
 	{
-		c->Message(0, "#path show: Plots a path from the user to their target.");
+		c->Message(Chat::White, "#path show: Plots a path from the user to their target.");
 		return;
 	}
 
@@ -475,7 +475,7 @@ void PathfinderNavmesh::Load(const std::string &path)
 			m_impl->nav_mesh->addTile(data, data_size, DT_TILE_FREE_DATA, tile_ref, 0);
 		}
 
-		Log(Logs::General, Logs::Status, "Loaded Navmesh V%u file %s", version, path.c_str());
+		LogInfo("Loaded Navmesh V[{}] file [{}]", version, path.c_str());
 	}
 }
 
diff --git a/zone/pathfinder_waypoint.cpp b/zone/pathfinder_waypoint.cpp
index 58ad5afea..58dcd1582 100644
--- a/zone/pathfinder_waypoint.cpp
+++ b/zone/pathfinder_waypoint.cpp
@@ -200,9 +200,9 @@ void PathfinderWaypoint::DebugCommand(Client *c, const Seperator *sep)
 {
 	if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help"))
 	{
-		c->Message(0, "Syntax: #path shownodes: Spawns a npc to represent every npc node.");
-		c->Message(0, "#path show: Plots a path from the user to their target.");
-		c->Message(0, "#path info node_id: Gives information about node info (requires shownode target).");
+		c->Message(Chat::White, "Syntax: #path shownodes: Spawns a npc to represent every npc node.");
+		c->Message(Chat::White, "#path show: Plots a path from the user to their target.");
+		c->Message(Chat::White, "#path info node_id: Gives information about node info (requires shownode target).");
 		return;
 	}
 	
@@ -251,14 +251,14 @@ void PathfinderWaypoint::Load(const std::string &filename) {
 	
 		if (strncmp(Magic, "EQEMUPATH", 9))
 		{
-			Log(Logs::General, Logs::Error, "Bad Magic String in .path file.");
+			LogError("Bad Magic String in .path file");
 			fclose(f);
 			return;
 		}
 	
 		fread(&Head, sizeof(Head), 1, f);
 	
-		Log(Logs::General, Logs::Status, "Path File Header: Version %ld, PathNodes %ld",
+		LogInfo("Path File Header: Version [{}], PathNodes [{}]",
 			(long)Head.version, (long)Head.PathNodeCount);
 	
 		if (Head.version == 2)
@@ -271,7 +271,7 @@ void PathfinderWaypoint::Load(const std::string &filename) {
 			return;
 		}
 		else {
-			Log(Logs::General, Logs::Error, "Unsupported path file version.");
+			LogError("Unsupported path file version");
 			fclose(f);
 			return;
 		}
@@ -306,7 +306,7 @@ void PathfinderWaypoint::LoadV2(FILE *f, const PathFileHeader &header)
 			auto &node = m_impl->Nodes[i];
 			if (PathNodes[i].Neighbours[j].id > MaxNodeID)
 			{
-				Log(Logs::General, Logs::Error, "Path Node %i, Neighbour %i (%i) out of range.", i, j, PathNodes[i].Neighbours[j].id);
+				LogError("Path Node [{}], Neighbour [{}] ([{}]) out of range", i, j, PathNodes[i].Neighbours[j].id);
 				m_impl->PathFileValid = false;
 			}
 	
@@ -425,11 +425,11 @@ void PathfinderWaypoint::NodeInfo(Client *c)
 		return;
 	}
 
-	c->Message(0, "Pathing node: %i at (%.2f, %.2f, %.2f) with bestz %.2f",
+	c->Message(Chat::White, "Pathing node: %i at (%.2f, %.2f, %.2f) with bestz %.2f",
 		node->id, node->v.x, node->v.y, node->v.z, node->bestz);
 
 	for (auto &edge : node->edges) {
-		c->Message(0, "id: %i, distance: %.2f, door id: %i, is teleport: %i",
+		c->Message(Chat::White, "id: %i, distance: %.2f, door id: %i, is teleport: %i",
 			edge.first,
 			edge.second.distance,
 			edge.second.door_id,
diff --git a/zone/pathing.cpp b/zone/pathing.cpp
index 79b7900d2..ee5f0138a 100644
--- a/zone/pathing.cpp
+++ b/zone/pathing.cpp
@@ -30,7 +30,7 @@ void CullPoints(std::vector<FindPerson_Point> &points) {
 
 			if (zone->zonemap->CheckLoS(glm::vec3(p.x, p.y, p.z), glm::vec3(p2.x, p2.y, p2.z))) {
 				points.erase(points.begin() + i + 1);
-				Log(Logs::General, Logs::Status, "Culled find path point %u, connecting %u->%u instead.", i + 1, i, i + 2);
+				LogInfo("Culled find path point [{}], connecting [{}]->[{}] instead", i + 1, i, i + 2);
 			}
 			else {
 				break;
@@ -50,7 +50,7 @@ void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) {
 		auto points = EQEmu::any_cast<std::vector<FindPerson_Point>>(result);
 		if (points.size() < 2) {
 			if (Admin() > 10) {
-				Message(MT_System, "Too few points");
+				Message(Chat::System, "Too few points");
 			}
 		
 			EQApplicationPacket outapp(OP_FindPersonReply, 0);
@@ -60,7 +60,7 @@ void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) {
 		
 		if (points.size() > 36) {
 			if (Admin() > 10) {
-				Message(MT_System, "Too many points %u", points.size());
+				Message(Chat::System, "Too many points %u", points.size());
 			}
 		
 			EQApplicationPacket outapp(OP_FindPersonReply, 0);
@@ -69,7 +69,7 @@ void Client::SendPathPacket(const std::vector<FindPerson_Point> &points) {
 		}
 		
 		if (Admin() > 10) {
-			Message(MT_System, "Total points %u", points.size());
+			Message(Chat::System, "Total points %u", points.size());
 		}
 		
 		int len = sizeof(FindPersonResult_Struct) + (points.size() + 1) * sizeof(FindPerson_Point);
diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp
index be1bf2a8e..2390dea3a 100644
--- a/zone/perl_client.cpp
+++ b/zone/perl_client.cpp
@@ -174,7 +174,7 @@ XS(XS_Client_Kick) {
 		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
-		THIS->Kick();
+		THIS->Kick("Perl Quest");
 	}
 	XSRETURN_EMPTY;
 }
@@ -961,8 +961,7 @@ XS(XS_Client_SetEXP); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_SetEXP) {
 	dXSARGS;
 	if (items < 3 || items > 4)
-		Perl_croak(aTHX_
-		           "Usage: Client::SetEXP(THIS, uint32 experience_points, uint32 aa_experience_points, [bool resexp=false])");
+		Perl_croak(aTHX_ "Usage: Client::SetEXP(THIS, uint32 experience_points, uint32 aa_experience_points, [bool resexp=false])");
 	{
 		Client *THIS;
 		uint32 set_exp  = (uint32) SvUV(ST(1));
@@ -992,8 +991,7 @@ XS(XS_Client_SetBindPoint); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_SetBindPoint) {
 	dXSARGS;
 	if (items < 1 || items > 6)
-		Perl_croak(aTHX_
-		           "Usage: Client::SetBindPoint(THIS, int to_zone = -1, int to_instance = 0, float new_x = 0.0f, float new_y = 0.0f, float new_z = 0.0f)");
+		Perl_croak(aTHX_ "Usage: Client::SetBindPoint(THIS, int to_zone = -1, int to_instance = 0, float new_x = 0.0f, float new_y = 0.0f, float new_z = 0.0f)");
 	{
 		Client *THIS;
 		int   to_zone;
@@ -1231,22 +1229,18 @@ XS(XS_Client_MovePC) {
 			THIS->MovePC(zoneID, x, y, z, heading);
 		} else {
 			if (THIS->IsMerc()) {
-				Log(Logs::Detail, Logs::None,
-				    "[CLIENT] Perl(XS_Client_MovePC) attempted to process a type Merc reference");
+				LogDebug("[CLIENT] Perl(XS_Client_MovePC) attempted to process a type Merc reference");
 			}
 #ifdef BOTS
 			else if (THIS->IsBot()) {
-				Log(Logs::Detail, Logs::None,
-					"[CLIENT] Perl(XS_Client_MovePC) attempted to process a type Bot reference");
+				LogDebug("[CLIENT] Perl(XS_Client_MovePC) attempted to process a type Bot reference");
 			}
 #endif
 			else if (THIS->IsNPC()) {
-				Log(Logs::Detail, Logs::None,
-				    "[CLIENT] Perl(XS_Client_MovePC) attempted to process a type NPC reference");
+				LogDebug("[CLIENT] Perl(XS_Client_MovePC) attempted to process a type NPC reference");
 			}
 			else {
-				Log(Logs::Detail, Logs::None,
-				    "[CLIENT] Perl(XS_Client_MovePC) attempted to process an Unknown type reference");
+				LogDebug("[CLIENT] Perl(XS_Client_MovePC) attempted to process an Unknown type reference");
 			}
 
 			Perl_croak(aTHX_ "THIS is not of type Client");
@@ -1260,8 +1254,7 @@ XS(XS_Client_MovePCInstance); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_MovePCInstance) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: Client::MovePCInstance(THIS, uint32 zone_id, uint32 instance_id, float x, float y, float z, float heading)");
+		Perl_croak(aTHX_ "Usage: Client::MovePCInstance(THIS, uint32 zone_id, uint32 instance_id, float x, float y, float z, float heading)");
 	{
 		Client *THIS;
 		uint32 zoneID     = (uint32) SvUV(ST(1));
@@ -1283,22 +1276,18 @@ XS(XS_Client_MovePCInstance) {
 			THIS->MovePC(zoneID, instanceID, x, y, z, heading);
 		} else {
 			if (THIS->IsMerc()) {
-				Log(Logs::Detail, Logs::None,
-				    "[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type Merc reference");
+				LogDebug("[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type Merc reference");
 			}
 #ifdef BOTS
 			else if (THIS->IsBot()) {
-				Log(Logs::Detail, Logs::None,
-					"[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type Bot reference");
+				LogDebug("[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type Bot reference");
 			}
 #endif
 			else if (THIS->IsNPC()) {
-				Log(Logs::Detail, Logs::None,
-				    "[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type NPC reference");
+				LogDebug("[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process a type NPC reference");
 			}
 			else {
-				Log(Logs::Detail, Logs::None,
-				    "[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process an Unknown type reference");
+				LogDebug("[CLIENT] Perl(XS_Client_MovePCInstance) attempted to process an Unknown type reference");
 			}
 
 			Perl_croak(aTHX_ "THIS is not of type Client");
@@ -1335,8 +1324,7 @@ XS(XS_Client_GetFactionLevel); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_GetFactionLevel) {
 	dXSARGS;
 	if (items != 8)
-		Perl_croak(aTHX_
-		           "Usage: Client::GetFactionLevel(THIS, uint32 character_id, uint32 npc_id, uint32 player_race_id, uint32 player_class_id, uint32 player_deity_id, uint32 player_faction_id, Mob*)");
+		Perl_croak(aTHX_ "Usage: Client::GetFactionLevel(THIS, uint32 character_id, uint32 npc_id, uint32 player_race_id, uint32 player_class_id, uint32 player_deity_id, uint32 player_faction_id, Mob*)");
 	{
 		Client *THIS;
 		FACTION_VALUE RETVAL;
@@ -1376,8 +1364,7 @@ XS(XS_Client_SetFactionLevel); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_SetFactionLevel) {
 	dXSARGS;
 	if (items != 6)
-		Perl_croak(aTHX_
-		           "Usage: Client::SetFactionLevel(THIS, uint32 character_id, uint32 npc_id, uint8 character_class, uint8 character_race, uint8 character_deity)");
+		Perl_croak(aTHX_ "Usage: Client::SetFactionLevel(THIS, uint32 character_id, uint32 npc_id, uint8 character_class, uint8 character_race, uint8 character_deity)");
 	{
 		Client *THIS;
 		uint32 char_id    = (uint32) SvUV(ST(1));
@@ -1403,8 +1390,7 @@ XS(XS_Client_SetFactionLevel2); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_SetFactionLevel2) {
 	dXSARGS;
 	if (items < 7 || items > 8)
-		Perl_croak(aTHX_
-		           "Usage: Client::SetFactionLevel2(THIS, uint32 character_id, int32 faction_id, uint8 character_class, uint8 character_race, uint8 character_deity, int32 value, uint8 temp)");
+		Perl_croak(aTHX_ "Usage: Client::SetFactionLevel2(THIS, uint32 character_id, int32 faction_id, uint8 character_class, uint8 character_race, uint8 character_deity, int32 value, uint8 temp)");
 	{
 		Client *THIS;
 		uint32 char_id    = (uint32) SvUV(ST(1));
@@ -1724,8 +1710,7 @@ XS(XS_Client_AddMoneyToPP); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_AddMoneyToPP) {
 	dXSARGS;
 	if (items != 6)
-		Perl_croak(aTHX_
-		           "Usage: Client::AddMoneyToPP(THIS, uint32 copper, uint32 silver, uint32 gold, uint32 platinum, bool update_client)");
+		Perl_croak(aTHX_ "Usage: Client::AddMoneyToPP(THIS, uint32 copper, uint32 silver, uint32 gold, uint32 platinum, bool update_client)");
 	{
 		Client *THIS;
 		uint32 copper       = (uint32) SvUV(ST(1));
@@ -3095,8 +3080,7 @@ XS(XS_Client_DeleteItemInInventory); /* prototype to pass -Wmissing-prototypes *
 XS(XS_Client_DeleteItemInInventory) {
 	dXSARGS;
 	if (items < 2 || items > 4)
-		Perl_croak(aTHX_
-		           "Usage: Client::DeleteItemInInventory(THIS, int16 slot_id, [int8 quantity = 0], [bool client_update = false])");
+		Perl_croak(aTHX_ "Usage: Client::DeleteItemInInventory(THIS, int16 slot_id, [int8 quantity = 0], [bool client_update = false])");
 	{
 		Client *THIS;
 		int16  slot_id = (int16) SvIV(ST(1));
@@ -3132,8 +3116,7 @@ XS(XS_Client_SummonItem); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_SummonItem) {
 	dXSARGS;
 	if (items < 2 || items > 10)
-		Perl_croak(aTHX_
-		           "Usage: Client::SummonItem(THIS, uint32 item_id, [int16 charges = -1], [bool attune = false], [uint32 aug1 = 0], [uint32 aug2 = 0], [uint32 aug3 = 0], [uint32 aug4 = 0], [uint32 aug5 = 0], [uint16 slot_id = cursor])");
+		Perl_croak(aTHX_ "Usage: Client::SummonItem(THIS, uint32 item_id, [int16 charges = -1], [bool attune = false], [uint32 aug1 = 0], [uint32 aug2 = 0], [uint32 aug3 = 0], [uint32 aug4 = 0], [uint32 aug5 = 0], [uint16 slot_id = cursor])");
 	{
 		Client *THIS;
 		uint32 item_id = (uint32) SvUV(ST(1));
@@ -4785,12 +4768,13 @@ XS(XS_Client_GetIP) {
 XS(XS_Client_AddLevelBasedExp);
 XS(XS_Client_AddLevelBasedExp) {
 	dXSARGS;
-	if (items < 2 || items > 3)
-		Perl_croak(aTHX_ "Usage: Client::AddLevelBasedExp(THIS, uint8 exp_percentage, uint8 max_level = 0)");
+	if (items < 2 || items > 4)
+		Perl_croak(aTHX_ "Usage: Client::AddLevelBasedExp(THIS, uint8 exp_percentage, uint8 max_level = 0, bool ignore_mods = false)");
 	{
 		Client *THIS;
 		uint8 exp_percentage = (uint8) SvUV(ST(1));
 		uint8 max_level      = 0;
+		bool ignore_mods	 = false;
 
 		if (sv_derived_from(ST(0), "Client")) {
 			IV tmp = SvIV((SV *) SvRV(ST(0)));
@@ -4802,8 +4786,11 @@ XS(XS_Client_AddLevelBasedExp) {
 
 		if (items > 2)
 			max_level = (uint8) SvUV(ST(2));
+		
+		if (items > 3)
+			ignore_mods = (bool) SvTRUE(ST(3));
 
-		THIS->AddLevelBasedExp(exp_percentage, max_level);
+		THIS->AddLevelBasedExp(exp_percentage, max_level, ignore_mods);
 	}
 	XSRETURN_EMPTY;
 }
@@ -4834,8 +4821,7 @@ XS(XS_Client_GrantAlternateAdvancementAbility); /* prototype to pass -Wmissing-p
 XS(XS_Client_GrantAlternateAdvancementAbility) {
 	dXSARGS;
 	if (items < 3 || items > 4)
-		Perl_croak(aTHX_
-		           "Usage: Client::GrantAlternateAdvancementAbility(THIS, int aa_id, int points, [bool ignore_cost = false])");
+		Perl_croak(aTHX_ "Usage: Client::GrantAlternateAdvancementAbility(THIS, int aa_id, int points, [bool ignore_cost = false])");
 	{
 		Client *THIS;
 		bool RETVAL;
@@ -4992,8 +4978,7 @@ XS(XS_Client_UpdateTaskActivity); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_UpdateTaskActivity) {
 	dXSARGS;
 	if (items < 4)
-		Perl_croak(aTHX_
-		           "Usage: Client::UpdateTaskActivity(THIS, int task_id, int activity_id, int count, [bool ignore_quest_update = false])");
+		Perl_croak(aTHX_ "Usage: Client::UpdateTaskActivity(THIS, int task_id, int activity_id, int count, [bool ignore_quest_update = false])");
 	{
 		bool ignore_quest_update = false;
 
@@ -5052,8 +5037,7 @@ XS(XS_Client_AssignTask); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_AssignTask) {
 	dXSARGS;
 	if (items != 3 && items != 4)
-		Perl_croak(aTHX_
-		           "Usage: Client::AssignTask(THIS, int task_id, int npc_id, [bool enforce_level_requirement = false])");
+		Perl_croak(aTHX_ "Usage: Client::AssignTask(THIS, int task_id, int npc_id, [bool enforce_level_requirement = false])");
 	{
 		Client *THIS;
 		int  TaskID                    = (int) SvIV(ST(1));
@@ -5562,6 +5546,55 @@ XS(XS_Client_AddAlternateCurrencyValue) {
 	XSRETURN_EMPTY;
 }
 
+XS(XS_Client_SetAlternateCurrencyValue); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_SetAlternateCurrencyValue) {
+	dXSARGS;
+	if (items != 3)
+		Perl_croak(aTHX_ "Usage: Client::SetAlternateCurrencyValue(THIS, uint32 currency_id, int32 amount)");
+	{
+		Client *THIS;
+		uint32 currency_id = (uint32) SvUV(ST(1));
+		int32  amount      = (int32) SvUV(ST(2));
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Client *, tmp);
+		} else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->SetAlternateCurrencyValue(currency_id, amount);
+	}
+	XSRETURN_EMPTY;
+}
+
+XS(XS_Client_GetAlternateCurrencyValue); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_GetAlternateCurrencyValue) {
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: Client::GetAlternateCurrencyValue(THIS, uint32 currency_id)");
+	{
+		Client *THIS;
+		uint32 currency_id = (uint32) SvUV(ST(1));
+		int32  RETVAL 	   = 0;
+		dXSTARG;
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Client *, tmp);
+		} else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		RETVAL = THIS->GetAlternateCurrencyValue(currency_id);
+		XSprePUSH;
+		PUSHi((IV) RETVAL);
+	}
+	XSRETURN(1);
+}
+
 XS(XS_Client_SendWebLink); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_SendWebLink) {
 	dXSARGS;
@@ -5915,8 +5948,7 @@ XS(XS_Client_SendMarqueeMessage); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_SendMarqueeMessage) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: Client::SendMarqueeMessage(THIS, uint32 type, uint32 priority, uint32 fade_in, uint32 fade_out, uint32 duration, string msg)");
+		Perl_croak(aTHX_ "Usage: Client::SendMarqueeMessage(THIS, uint32 type, uint32 priority, uint32 fade_in, uint32 fade_out, uint32 duration, string msg)");
 	{
 		Client *THIS;
 		uint32      type     = (uint32) SvUV(ST(1));
@@ -6095,8 +6127,7 @@ XS(XS_Client_QuestReward); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_QuestReward) {
 	dXSARGS;
 	if (items < 1 || items > 9)
-		Perl_croak(aTHX_
-		           "Usage: Client::QuestReward(THIS, int32 mob, int32 copper, int32 silver, int32 gold, int32 platinum, int32 item_id, int32 exp, [bool faction = false])");
+		Perl_croak(aTHX_ "Usage: Client::QuestReward(THIS, int32 mob, int32 copper, int32 silver, int32 gold, int32 platinum, int32 item_id, int32 exp, [bool faction = false])");
 	{
 		Client *THIS;
 		Mob    *mob = nullptr;
@@ -6196,8 +6227,7 @@ XS(XS_Client_Popup2); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Client_Popup2) {
 	dXSARGS;
 	if (items < 3 || items > 10)
-		Perl_croak(aTHX_
-		           "Usage: Client::SendFullPopup(THIS, string title, string text, uint32 popup_id, uint32 negative_id, uint32 buttons, uint32 duration, string button_name_0, string button_name_1, uint32 sound_controls)");
+		Perl_croak(aTHX_ "Usage: Client::SendFullPopup(THIS, string title, string text, uint32 popup_id, uint32 negative_id, uint32 buttons, uint32 duration, string button_name_0, string button_name_1, uint32 sound_controls)");
 	{
 		Client *THIS;
 		char   *Title = (char *) SvPV_nolen(ST(1));
@@ -6287,6 +6317,56 @@ XS(XS_Client_SetSecondaryWeaponOrnamentation)
 	XSRETURN_EMPTY;
 }
 
+XS(XS_Client_SetClientMaxLevel); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_SetClientMaxLevel) {
+	dXSARGS;
+	if (items != 2)
+		Perl_croak(aTHX_ "Usage: Client::SetClientMaxLevel(THIS, int in_level)");
+	{
+		Client* THIS;
+		int in_level = (int)SvUV(ST(1));
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV*)SvRV(ST(0)));
+			THIS = INT2PTR(Client*, tmp);
+		}
+		else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->SetClientMaxLevel(in_level);
+	}
+	XSRETURN_EMPTY;
+}
+
+XS(XS_Client_GetClientMaxLevel); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_GetClientMaxLevel) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: Client::GetClientMaxLevel(THIS)");
+	{
+		Client* THIS;
+		int RETVAL;
+		dXSTARG;
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV*)SvRV(ST(0)));
+			THIS = INT2PTR(Client*, tmp);
+		}
+		else
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		RETVAL = THIS->GetClientMaxLevel();
+		XSprePUSH;
+		PUSHu((UV)RETVAL);
+	}
+	XSRETURN(1);
+}
+
+
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -6313,7 +6393,7 @@ XS(boot_Client) {
 	newXSproto(strcpy(buf, "AddAlternateCurrencyValue"), XS_Client_AddAlternateCurrencyValue, file, "$$$");
 	newXSproto(strcpy(buf, "AddCrystals"), XS_Client_AddCrystals, file, "$$");
 	newXSproto(strcpy(buf, "AddEXP"), XS_Client_AddEXP, file, "$$;$$");
-	newXSproto(strcpy(buf, "AddLevelBasedExp"), XS_Client_AddLevelBasedExp, file, "$$;$");
+	newXSproto(strcpy(buf, "AddLevelBasedExp"), XS_Client_AddLevelBasedExp, file, "$$;$$");
 	newXSproto(strcpy(buf, "AddMoneyToPP"), XS_Client_AddMoneyToPP, file, "$$$$$$");
 	newXSproto(strcpy(buf, "AddPVPPoints"), XS_Client_AddPVPPoints, file, "$$");
 	newXSproto(strcpy(buf, "AddSkill"), XS_Client_AddSkill, file, "$$$");
@@ -6350,6 +6430,7 @@ XS(boot_Client) {
 	newXSproto(strcpy(buf, "GetAccountFlag"), XS_Client_GetAccountFlag, file, "$$");
 	newXSproto(strcpy(buf, "GetAggroCount"), XS_Client_GetAggroCount, file, "$");
 	newXSproto(strcpy(buf, "GetAllMoney"), XS_Client_GetAllMoney, file, "$");
+	newXSproto(strcpy(buf, "GetAlternateCurrencyValue"), XS_Client_GetAlternateCurrencyValue, file, "$$");
 	newXSproto(strcpy(buf, "GetAnon"), XS_Client_GetAnon, file, "$");
 	newXSproto(strcpy(buf, "GetAugmentAt"), XS_Client_GetAugmentAt, file, "$$$");
 	newXSproto(strcpy(buf, "GetAugmentIDAt"), XS_Client_GetAugmentIDAt, file, "$$$");
@@ -6369,6 +6450,7 @@ XS(boot_Client) {
 	newXSproto(strcpy(buf, "GetBindZoneID"), XS_Client_GetBindZoneID, file, "$$");
 	newXSproto(strcpy(buf, "GetCarriedMoney"), XS_Client_GetCarriedMoney, file, "$");
 	newXSproto(strcpy(buf, "GetCharacterFactionLevel"), XS_Client_GetCharacterFactionLevel, file, "$$");
+	newXSproto(strcpy(buf, "GetClientMaxLevel"), XS_Client_GetClientMaxLevel, file, "$");
 	newXSproto(strcpy(buf, "GetClientVersion"), XS_Client_GetClientVersion, file, "$");
 	newXSproto(strcpy(buf, "GetClientVersionBit"), XS_Client_GetClientVersionBit, file, "$");
 	newXSproto(strcpy(buf, "GetCorpseCount"), XS_Client_GetCorpseCount, file, "$");
@@ -6487,6 +6569,7 @@ XS(boot_Client) {
 	newXSproto(strcpy(buf, "SetAAPoints"), XS_Client_SetAAPoints, file, "$$");
 	newXSproto(strcpy(buf, "SetAATitle"), XS_Client_SetAATitle, file, "$$;$");
 	newXSproto(strcpy(buf, "SetAccountFlag"), XS_Client_SetAccountFlag, file, "$$");
+	newXSproto(strcpy(buf, "SetAlternateCurrencyValue"), XS_Client_SetAlternateCurrencyValue, file, "$$$");
 	newXSproto(strcpy(buf, "SetBaseClass"), XS_Client_SetBaseClass, file, "$$");
 	newXSproto(strcpy(buf, "SetBaseGender"), XS_Client_SetBaseGender, file, "$$");
 	newXSproto(strcpy(buf, "SetBaseRace"), XS_Client_SetBaseRace, file, "$$");
@@ -6494,6 +6577,7 @@ XS(boot_Client) {
 	newXSproto(strcpy(buf, "SetBecomeNPCLevel"), XS_Client_SetBecomeNPCLevel, file, "$$");
 	newXSproto(strcpy(buf, "SetBindPoint"), XS_Client_SetBindPoint, file, "$;$$$$$");
 	newXSproto(strcpy(buf, "SetConsumption"), XS_Client_SetConsumption, file, "$$$");
+	newXSproto(strcpy(buf, "SetClientMaxLevel"), XS_Client_SetClientMaxLevel, file, "$$");
 	newXSproto(strcpy(buf, "SetCustomItemData"), XS_Client_SetCustomItemData, file, "$$$$");
 	newXSproto(strcpy(buf, "SetDeity"), XS_Client_SetDeity, file, "$$");
 	newXSproto(strcpy(buf, "SetDueling"), XS_Client_SetDueling, file, "$$");
diff --git a/zone/perl_entity.cpp b/zone/perl_entity.cpp
index 58e25b263..0f7fe21c7 100644
--- a/zone/perl_entity.cpp
+++ b/zone/perl_entity.cpp
@@ -1222,8 +1222,7 @@ XS(XS_EntityList_MessageStatus); /* prototype to pass -Wmissing-prototypes */
 XS(XS_EntityList_MessageStatus) {
 	dXSARGS;
 	if (items < 5)
-		Perl_croak(aTHX_
-		           "Usage: EntityList::MessageStatus(THIS, uint32 guild_id, uint32 emote_color_type, string message)");
+		Perl_croak(aTHX_ "Usage: EntityList::MessageStatus(THIS, uint32 guild_id, uint32 emote_color_type, string message)");
 	{
 		EntityList *THIS;
 		uint32     to_guilddbid = (uint32) SvUV(ST(1));
@@ -1248,8 +1247,7 @@ XS(XS_EntityList_MessageClose); /* prototype to pass -Wmissing-prototypes */
 XS(XS_EntityList_MessageClose) {
 	dXSARGS;
 	if (items < 6)
-		Perl_croak(aTHX_
-		           "Usage: EntityList::MessageClose(THIS, Mob* sender, bool skip_sender, float distance, uint32 emote_color_type, string message)");
+		Perl_croak(aTHX_ "Usage: EntityList::MessageClose(THIS, Mob* sender, bool skip_sender, float distance, uint32 emote_color_type, string message)");
 	{
 		EntityList *THIS;
 		Mob        *sender;
@@ -1682,8 +1680,7 @@ XS(XS_EntityList_MessageGroup); /* prototype to pass -Wmissing-prototypes */
 XS(XS_EntityList_MessageGroup) {
 	dXSARGS;
 	if (items < 5)
-		Perl_croak(aTHX_
-		           "Usage: EntityList::MessageGroup(THIS, Mob* sender, bool skip_close, uint32 emote_color_type, string message)");
+		Perl_croak(aTHX_ "Usage: EntityList::MessageGroup(THIS, Mob* sender, bool skip_close, uint32 emote_color_type, string message)");
 	{
 		EntityList *THIS;
 		Mob        *sender;
@@ -1716,8 +1713,7 @@ XS(XS_EntityList_GetRandomClient); /* prototype to pass -Wmissing-prototypes */
 XS(XS_EntityList_GetRandomClient) {
 	dXSARGS;
 	if ((items < 5) || (items > 6))
-		Perl_croak(aTHX_
-		           "Usage: EntityList::GetRandomClient(THIS, float x, float y, float z, float distance, [Client* exclude_client = nullptr])");
+		Perl_croak(aTHX_ "Usage: EntityList::GetRandomClient(THIS, float x, float y, float z, float distance, [Client* exclude_client = nullptr])");
 	{
 		EntityList *THIS;
 		Client     *RETVAL, *c = nullptr;
diff --git a/zone/perl_groups.cpp b/zone/perl_groups.cpp
index 33ed9689d..c23246b4a 100644
--- a/zone/perl_groups.cpp
+++ b/zone/perl_groups.cpp
@@ -486,8 +486,7 @@ XS(XS_Group_TeleportGroup); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Group_TeleportGroup) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: Group::TeleportGroup(THIS, Mob* sender, uint32 zone_id, float x, float y, float z, float heading)");
+		Perl_croak(aTHX_ "Usage: Group::TeleportGroup(THIS, Mob* sender, uint32 zone_id, float x, float y, float z, float heading)");
 	{
 		Group  *THIS;
 		Mob    *sender;
diff --git a/zone/perl_mob.cpp b/zone/perl_mob.cpp
index 5dd4ce5be..cf6ef4be7 100644
--- a/zone/perl_mob.cpp
+++ b/zone/perl_mob.cpp
@@ -95,6 +95,31 @@ XS(XS_Mob_IsNPC) {
 	XSRETURN(1);
 }
 
+XS(XS_Mob_IsBot); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Mob_IsBot) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: Mob::IsBot(THIS)");
+	{
+		Mob* THIS;
+		bool RETVAL;
+
+		if (sv_derived_from(ST(0), "Mob")) {
+			IV tmp = SvIV((SV*)SvRV(ST(0)));
+			THIS = INT2PTR(Mob*, tmp);
+		}
+		else
+			Perl_croak(aTHX_ "THIS is not of type Mob");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		RETVAL = THIS->IsBot();
+		ST(0) = boolSV(RETVAL);
+		sv_2mortal(ST(0));
+	}
+	XSRETURN(1);
+}
+
 XS(XS_Mob_IsMob); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_IsMob) {
 	dXSARGS;
@@ -794,8 +819,7 @@ XS(XS_Mob_Attack); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_Attack) {
 	dXSARGS;
 	if (items < 2 || items > 4)
-		Perl_croak(aTHX_
-		           "Usage: Mob::Attack(THIS, Mob* other, [int hand = 13 [prim|sec]], [bool from_riposte = false])");
+		Perl_croak(aTHX_ "Usage: Mob::Attack(THIS, Mob* other, [int hand = 13 [prim|sec]], [bool from_riposte = false])");
 	{
 		Mob *THIS;
 		bool RETVAL;
@@ -842,8 +866,7 @@ XS(XS_Mob_Damage); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_Damage) {
 	dXSARGS;
 	if (items < 5 || items > 8)
-		Perl_croak(aTHX_
-		           "Usage: Mob::Damage(THIS, Mob* from, int32 damage, uint16 spell_id, int attack_skill, [bool avoidable = true], [int8 buffslot = -1], [bool buff_tic = false])");
+		Perl_croak(aTHX_ "Usage: Mob::Damage(THIS, Mob* from, int32 damage, uint16 spell_id, int attack_skill, [bool avoidable = true], [int8 buffslot = -1], [bool buff_tic = false])");
 	{
 		Mob *THIS;
 		Mob *from;
@@ -1447,8 +1470,7 @@ XS(XS_Mob_MakeTempPet); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_MakeTempPet) {
 	dXSARGS;
 	if (items < 2 || items > 6)
-		Perl_croak(aTHX_
-		           "Usage: Mob::MakeTempPet(THIS, uint16 spell_id, [string name = nullptr], [uint32 duration = 0], [Mob* target = nullptr], [bool sticktarg = 0])");
+		Perl_croak(aTHX_ "Usage: Mob::MakeTempPet(THIS, uint16 spell_id, [string name = nullptr], [uint32 duration = 0], [Mob* target = nullptr], [bool sticktarg = 0])");
 	{
 		Mob *THIS;
 		uint16 spell_id = (uint16) SvUV(ST(1));
@@ -1498,8 +1520,7 @@ XS(XS_Mob_TypesTempPet); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_TypesTempPet) {
 	dXSARGS;
 	if (items < 2 || items > 7)
-		Perl_croak(aTHX_
-		           "Usage: Mob::TypesTempPet(THIS, uint32 type_id, [string name = nullptr], [uint32 duration = 0], [bool follow = 0], [Mob* target = nullptr], [bool stick_targ = 0])");
+		Perl_croak(aTHX_ "Usage: Mob::TypesTempPet(THIS, uint32 type_id, [string name = nullptr], [uint32 duration = 0], [bool follow = 0], [Mob* target = nullptr], [bool stick_targ = 0])");
 	{
 		Mob *THIS;
 		uint32 typesid = (uint32) SvUV(ST(1));
@@ -3680,8 +3701,7 @@ XS(XS_Mob_Message_StringID); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_Message_StringID) {
 	dXSARGS;
 	if (items < 3 || items > 4)
-		Perl_croak(aTHX_
-		           "Usage: Mob::Message_StringID(THIS, uint32 emote_color_type, uint32 string_id, [uint32 distance = 0])");
+		Perl_croak(aTHX_ "Usage: Mob::Message_StringID(THIS, uint32 emote_color_type, uint32 string_id, [uint32 distance = 0])");
 	{
 		Mob *THIS;
 		uint32 type      = (uint32) SvUV(ST(1));
@@ -3702,7 +3722,7 @@ XS(XS_Mob_Message_StringID) {
 			distance = (uint32) SvUV(ST(3));
 		}
 
-		THIS->Message_StringID(type, string_id, distance);
+		THIS->MessageString(type, string_id, distance);
 	}
 	XSRETURN_EMPTY;
 }
@@ -3805,8 +3825,7 @@ XS(XS_Mob_CastSpell); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_CastSpell) {
 	dXSARGS;
 	if (items < 3 || items > 7)
-		Perl_croak(aTHX_
-		           "Usage: Mob::CastSpell(THIS, uint16 spell_id, uint16 target_id, [int slot = 22], [int32 cast_time = -1], [int32 mana_cost = -1], [int16 resist_adjust = 0])");
+		Perl_croak(aTHX_ "Usage: Mob::CastSpell(THIS, uint16 spell_id, uint16 target_id, [int slot = 22], [int32 cast_time = -1], [int32 mana_cost = -1], [int16 resist_adjust = 0])");
 	{
 		Mob *THIS;
 		uint16             spell_id  = (uint16) SvUV(ST(1));
@@ -3862,8 +3881,7 @@ XS(XS_Mob_SpellFinished); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_SpellFinished) {
 	dXSARGS;
 	if (items < 2 || items > 5)
-		Perl_croak(aTHX_
-		           "Usage: Mob::SpellFinished(uint16 spell_id, [Mob* spell_target = this], [uint16 mana_cost = 0], [uint16 resist_diff = 0])");
+		Perl_croak(aTHX_ "Usage: Mob::SpellFinished(uint16 spell_id, [Mob* spell_target = this], [uint16 mana_cost = 0], [uint16 resist_diff = 0])");
 	{
 		Mob *THIS;
 		uint16 spell_id = (uint16) SvUV(ST(1));
@@ -4045,8 +4063,7 @@ XS(XS_Mob_CanBuffStack); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_CanBuffStack) {
 	dXSARGS;
 	if (items < 3 || items > 4)
-		Perl_croak(aTHX_
-		           "Usage: Mob::CanBuffStack(THIS, uint16 spell_id, uint8 caster_level, [bool fail_if_overwritten = false])");
+		Perl_croak(aTHX_ "Usage: Mob::CanBuffStack(THIS, uint16 spell_id, uint8 caster_level, [bool fail_if_overwritten = false])");
 	{
 		Mob *THIS;
 		int    RETVAL;
@@ -5044,8 +5061,7 @@ XS(XS_Mob_AddToHateList); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_AddToHateList) {
 	dXSARGS;
 	if (items < 2 || items > 7)
-		Perl_croak(aTHX_
-		           "Usage: Mob::AddToHateList(THIS, Mob* other, [int32 hate = 0], [int32 damage = 0], [bool yell_for_help = true], [bool frenzy = false], [bool buff_tic = false])");
+		Perl_croak(aTHX_ "Usage: Mob::AddToHateList(THIS, Mob* other, [int32 hate = 0], [int32 damage = 0], [bool yell_for_help = true], [bool frenzy = false], [bool buff_tic = false])");
 	{
 		Mob *THIS;
 		Mob *other;
@@ -5609,8 +5625,7 @@ XS(XS_Mob_NavigateTo); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_NavigateTo) {
 	dXSARGS;
 	if (items < 4 || items > 5)
-		Perl_croak(aTHX_
-		           "Usage: Mob::NavigateTo(THIS, float x, float y, float z)");
+		Perl_croak(aTHX_ "Usage: Mob::NavigateTo(THIS, float x, float y, float z)");
 	{
 		Mob *THIS;
 		float x     = (float) SvNV(ST(1));
@@ -5735,8 +5750,7 @@ XS(XS_Mob_NPCSpecialAttacks); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_NPCSpecialAttacks) {
 	dXSARGS;
 	if (items < 3 || items > 5)
-		Perl_croak(aTHX_
-		           "Usage: Mob::NPCSpecialAttacks(THIS, string abilities_string, int perm_tag, [bool reset = true], [bool remove = true])");
+		Perl_croak(aTHX_ "Usage: Mob::NPCSpecialAttacks(THIS, string abilities_string, int perm_tag, [bool reset = true], [bool remove = true])");
 	{
 		Mob  *THIS;
 		char *parse = (char *) SvPV_nolen(ST(1));
@@ -6476,8 +6490,7 @@ XS(XS_Mob_DoSpecialAttackDamage); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_DoSpecialAttackDamage) {
 	dXSARGS;
 	if (items < 4 || items > 6)
-		Perl_croak(aTHX_
-		           "Usage: Mob::DoSpecialAttackDamage(THIS, Mob* target, int skill, int32 max_damage, [int32 min_damage = 1], [int32 hate_override = -11])");
+		Perl_croak(aTHX_ "Usage: Mob::DoSpecialAttackDamage(THIS, Mob* target, int skill, int32 max_damage, [int32 min_damage = 1], [int32 hate_override = -11])");
 	{
 		Mob *THIS;
 		Mob *target;
@@ -6620,8 +6633,7 @@ XS(XS_Mob_ProjectileAnim); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_ProjectileAnim) {
 	dXSARGS;
 	if (items < 3 || items > 9)
-		Perl_croak(aTHX_
-		           "Usage: Mob::ProjectileAnim(THIS, Mob* mob, int item_id, [bool is_arrow = false], [float speed = 0], [float angle = 0], [float tilt = 0], [float arc = 0])");
+		Perl_croak(aTHX_ "Usage: Mob::ProjectileAnim(THIS, Mob* mob, int item_id, [bool is_arrow = false], [float speed = 0], [float angle = 0], [float tilt = 0], [float arc = 0])");
 
 	{
 		Mob *THIS;
@@ -6703,8 +6715,7 @@ XS(XS_Mob_SendAppearanceEffect); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_SendAppearanceEffect) {
 	dXSARGS;
 	if (items < 2 || items > 7)
-		Perl_croak(aTHX_
-		           "Usage: Mob::SendAppearanceEffect(THIS, int32 param_1, [int32 param_2 = 0], [int32 param_3 = 0], [int32 param_4 = 0], [int32 param_5 = 0], [Client* single_client_to_send_to = null])");
+		Perl_croak(aTHX_ "Usage: Mob::SendAppearanceEffect(THIS, int32 param_1, [int32 param_2 = 0], [int32 param_3 = 0], [int32 param_4 = 0], [int32 param_5 = 0], [Client* single_client_to_send_to = null])");
 	{
 		Mob *THIS;
 		int32 parm1 = (int32) SvIV(ST(1));
@@ -6833,8 +6844,7 @@ XS(XS_Mob_SendIllusion); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_SendIllusion) {
 	dXSARGS;
 	if (items < 2 || items > 14)
-		Perl_croak(aTHX_
-		           "Usage: Mob::SendIllusion(THIS, uint16 race, [uint8 gender = 0xFF], [uint8 texture  face = 0xFF], [uint8 hairstyle = 0xFF], [uint8 hair_color = 0xFF], [uint8 beard = 0xFF], [uint8 beard_color =FF], [uint32 drakkin_tattoo = 0xFFFFFFFF], [uint32 drakkin_details = 0xFFFFFFFF], [float size = -1])");
+		Perl_croak(aTHX_ "Usage: Mob::SendIllusion(THIS, uint16 race, [uint8 gender = 0xFF], [uint8 texture  face = 0xFF], [uint8 hairstyle = 0xFF], [uint8 hair_color = 0xFF], [uint8 beard = 0xFF], [uint8 beard_color =FF], [uint32 drakkin_tattoo = 0xFFFFFFFF], [uint32 drakkin_details = 0xFFFFFFFF], [float size = -1])");
 	{
 		Mob *THIS;
 		uint16 race             = (uint16) SvIV(ST(1));
@@ -6882,8 +6892,7 @@ XS(XS_Mob_CameraEffect); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_CameraEffect) {
 	dXSARGS;
 	if (items < 2 || items > 5)
-		Perl_croak(aTHX_
-		           "Usage: Mob::CameraEffect(THIS, uint32 duration, [uint32 intensity = 0], [Client* single_client = nullptr], [bool is_world_wide = false])");
+		Perl_croak(aTHX_ "Usage: Mob::CameraEffect(THIS, uint32 duration, [uint32 intensity = 0], [Client* single_client = nullptr], [bool is_world_wide = false])");
 	{
 		Mob *THIS;
 		uint32 duration  = (uint32) SvUV(ST(1));
@@ -6925,8 +6934,7 @@ XS(XS_Mob_SpellEffect); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_SpellEffect) {
 	dXSARGS;
 	if (items < 2 || items > 8)
-		Perl_croak(aTHX_
-		           "Usage: Mob::SpellEffect(THIS, uint32 effect, [uint32 duration = 5000], [uint32 finish_delay = 0], [bool zone_wide = false], [uint32 unk20 = 3000], [bool perm_effect = false], [Client* single_client])");
+		Perl_croak(aTHX_ "Usage: Mob::SpellEffect(THIS, uint32 effect, [uint32 duration = 5000], [uint32 finish_delay = 0], [bool zone_wide = false], [uint32 unk20 = 3000], [bool perm_effect = false], [Client* single_client])");
 	{
 		Mob *THIS;
 		uint32 effect       = (uint32) SvUV(ST(1));
@@ -7054,8 +7062,7 @@ XS(XS_Mob_SetGlobal);
 XS(XS_Mob_SetGlobal) {
 	dXSARGS;
 	if (items < 5 || items > 6)
-		Perl_croak(aTHX_
-		           "Usage: SetGlobal(THIS, string var_name, string new_value, int options, string duration, [Mob* other = nullptr])");
+		Perl_croak(aTHX_ "Usage: SetGlobal(THIS, string var_name, string new_value, int options, string duration, [Mob* other = nullptr])");
 	{
 		Mob  *THIS;
 		char *varname  = (char *) SvPV_nolen(ST(1));
@@ -7091,8 +7098,7 @@ XS(XS_Mob_TarGlobal);
 XS(XS_Mob_TarGlobal) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: TarGlobal(THIS, string var_name, string value, string duration, int npc_id, int character_id, int zone_id)");
+		Perl_croak(aTHX_ "Usage: TarGlobal(THIS, string var_name, string value, string duration, int npc_id, int character_id, int zone_id)");
 	{
 		Mob  *THIS;
 		char *varname  = (char *) SvPV_nolen(ST(1));
@@ -7141,8 +7147,7 @@ XS(XS_Mob_SetSlotTint); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_SetSlotTint) {
 	dXSARGS;
 	if (items != 5)
-		Perl_croak(aTHX_
-		           "Usage: Mob::SetSlotTint(THIS, uint8 material_slot, uint8 red_tint, uint8 green_tint, uint8 blue_tint)");
+		Perl_croak(aTHX_ "Usage: Mob::SetSlotTint(THIS, uint8 material_slot, uint8 red_tint, uint8 green_tint, uint8 blue_tint)");
 	{
 		Mob *THIS;
 		uint8 material_slot = (uint8) SvIV(ST(1));
@@ -7167,8 +7172,7 @@ XS(XS_Mob_WearChange); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_WearChange) {
 	dXSARGS;
 	if (items < 3 || items > 4)
-		Perl_croak(aTHX_
-		           "Usage: Mob::WearChange(THIS, uint8 material_slot, uint16 texture, [uint32 color = 0, uint32 hero_forge_model = 0])");
+		Perl_croak(aTHX_ "Usage: Mob::WearChange(THIS, uint8 material_slot, uint16 texture, [uint32 color = 0, uint32 hero_forge_model = 0])");
 	{
 		Mob *THIS;
 		uint8  material_slot    = (uint8) SvIV(ST(1));
@@ -7598,8 +7602,7 @@ XS(XS_Mob_DoMeleeSkillAttackDmg); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_DoMeleeSkillAttackDmg) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: Mob::DoMeleeSkillAttackDmg(THIS, Mob* target, uint16 weapon_damage, int skill, int16 chance_mod, int16 focus, uint8 can_riposte)");
+		Perl_croak(aTHX_ "Usage: Mob::DoMeleeSkillAttackDmg(THIS, Mob* target, uint16 weapon_damage, int skill, int16 chance_mod, int16 focus, uint8 can_riposte)");
 	{
 		Mob *THIS;
 		Mob *target;
@@ -7634,8 +7637,7 @@ XS(XS_Mob_DoArcheryAttackDmg); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_DoArcheryAttackDmg) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: Mob::DoArcheryAttackDmg(THIS, Mob* target, [range_weapon_item_instance = nullptr], [ammo_item_instance = nullptr], uint16 weapon_damage, int16 chance_mod, int16 focus)");
+		Perl_croak(aTHX_ "Usage: Mob::DoArcheryAttackDmg(THIS, Mob* target, [range_weapon_item_instance = nullptr], [ammo_item_instance = nullptr], uint16 weapon_damage, int16 chance_mod, int16 focus)");
 	{
 		Mob                 *THIS;
 		Mob                 *target;
@@ -7670,8 +7672,7 @@ XS(XS_Mob_DoThrowingAttackDmg); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Mob_DoThrowingAttackDmg) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: Mob::DoThrowingAttackDmg(THIS, Mob* target, [range_weapon_item_instance = nullptr], [ammo_item_instance = nullptr], uint16 weapon_damage, int16 chance_mod, int16 focus)");
+		Perl_croak(aTHX_ "Usage: Mob::DoThrowingAttackDmg(THIS, Mob* target, [range_weapon_item_instance = nullptr], [ammo_item_instance = nullptr], uint16 weapon_damage, int16 chance_mod, int16 focus)");
 	{
 		Mob                 *THIS;
 		Mob                 *target;
@@ -8588,6 +8589,7 @@ XS(boot_Mob) {
 
 	newXSproto(strcpy(buf, "IsClient"), XS_Mob_IsClient, file, "$");
 	newXSproto(strcpy(buf, "IsNPC"), XS_Mob_IsNPC, file, "$");
+	newXSproto(strcpy(buf, "IsBot"), XS_Mob_IsBot, file, "$");
 	newXSproto(strcpy(buf, "IsMob"), XS_Mob_IsMob, file, "$");
 	newXSproto(strcpy(buf, "IsCorpse"), XS_Mob_IsCorpse, file, "$");
 	newXSproto(strcpy(buf, "IsPlayerCorpse"), XS_Mob_IsPlayerCorpse, file, "$");
diff --git a/zone/perl_npc.cpp b/zone/perl_npc.cpp
index 8c68af734..2dae9e776 100644
--- a/zone/perl_npc.cpp
+++ b/zone/perl_npc.cpp
@@ -97,8 +97,7 @@ XS(XS_NPC_AddItem); /* prototype to pass -Wmissing-prototypes */
 XS(XS_NPC_AddItem) {
 	dXSARGS;
 	if (items < 2 || items > 10)
-		Perl_croak(aTHX_
-		           "Usage: NPC::AddItem(THIS, uint32 item_id, [uint16 charges = 0], [bool equip_item = true], [uint32 aug1 = 0], [uint32 aug2 = 0], [uint32 aug3 = 0], [uint32 aug4 = 0], [uint32 aug5 = 0], [uint32 aug6 = 0])");
+		Perl_croak(aTHX_ "Usage: NPC::AddItem(THIS, uint32 item_id, [uint16 charges = 0], [bool equip_item = true], [uint32 aug1 = 0], [uint32 aug2 = 0], [uint32 aug3 = 0], [uint32 aug4 = 0], [uint32 aug5 = 0], [uint32 aug6 = 0])");
 	{
 		NPC    *THIS;
 		uint32 itemid    = (uint32) SvUV(ST(1));
@@ -571,7 +570,7 @@ XS(XS_NPC_SetSp2) {
 		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
-		THIS->SetSp2(sg2);
+		THIS->SetSpawnGroupId(sg2);
 	}
 	XSRETURN_EMPTY;
 }
@@ -644,7 +643,7 @@ XS(XS_NPC_GetSp2) {
 		if (THIS == nullptr)
 			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
 
-		RETVAL = THIS->GetSp2();
+		RETVAL = THIS->GetSpawnGroupId();
 		XSprePUSH;
 		PUSHu((UV) RETVAL);
 	}
@@ -1283,8 +1282,7 @@ XS(XS_NPC_MoveTo); /* prototype to pass -Wmissing-prototypes */
 XS(XS_NPC_MoveTo) {
 	dXSARGS;
 	if (items != 4 && items != 5 && items != 6)
-		Perl_croak(aTHX_
-		           "Usage: NPC::MoveTo(THIS, float x, float y, float z, [float heading], [bool save_guard_location = false])");
+		Perl_croak(aTHX_ "Usage: NPC::MoveTo(THIS, float x, float y, float z, [float heading], [bool save_guard_location = false])");
 	{
 		NPC   *THIS;
 		float mtx = (float) SvNV(ST(1));
@@ -1391,8 +1389,7 @@ XS(XS_NPC_AI_SetRoambox); /* prototype to pass -Wmissing-prototypes */
 XS(XS_NPC_AI_SetRoambox) {
 	dXSARGS;
 	if (items < 6 || items > 8)
-		Perl_croak(aTHX_
-		           "Usage: NPC::AI_SetRoambox(THIS, float distance, float max_x, float min_x, float max_y, float min_y, [uint32 max_delay = 2500], [uint32 min_delay = 2500])");
+		Perl_croak(aTHX_ "Usage: NPC::AI_SetRoambox(THIS, float distance, float max_x, float min_x, float max_y, float min_y, [uint32 max_delay = 2500], [uint32 min_delay = 2500])");
 	{
 		NPC    *THIS;
 		float  iDist = (float) SvNV(ST(1));
@@ -1852,8 +1849,7 @@ XS(XS_NPC_AddSpellToNPCList); /* prototype to pass -Wmissing-prototypes */
 XS(XS_NPC_AddSpellToNPCList) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: NPC::AddAISpell(THIS, int priority, int spell_id, int type, int mana_cost, int recast_delay, int resist_adjust)");
+		Perl_croak(aTHX_ "Usage: NPC::AddAISpell(THIS, int priority, int spell_id, int type, int mana_cost, int recast_delay, int resist_adjust)");
 	{
 		NPC *THIS;
 		int priority      = (int) SvIV(ST(1));
@@ -2167,6 +2163,48 @@ XS(XS_NPC_GetScore) {
 	XSRETURN(1);
 }
 
+XS(XS_NPC_MerchantOpenShop);
+XS(XS_NPC_MerchantOpenShop) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: NPC::MerchantOpenShop(THIS)");
+	{
+		NPC *THIS;
+		dXSTARG;
+		if (sv_derived_from(ST(0), "NPC")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(NPC *, tmp);
+		} else
+			Perl_croak(aTHX_ "THIS is not of type NPC");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->MerchantOpenShop();
+	}
+	XSRETURN_EMPTY;
+}
+
+XS(XS_NPC_MerchantCloseShop);
+XS(XS_NPC_MerchantCloseShop) {
+	dXSARGS;
+	if (items != 1)
+		Perl_croak(aTHX_ "Usage: NPC::MerchantCloseShop(THIS)");
+	{
+		NPC *THIS;
+		dXSTARG;
+		if (sv_derived_from(ST(0), "NPC")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(NPC *, tmp);
+		} else
+			Perl_croak(aTHX_ "THIS is not of type NPC");
+		if (THIS == nullptr)
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+
+		THIS->MerchantCloseShop();
+	}
+	XSRETURN_EMPTY;
+}
+
 XS(XS_NPC_AddMeleeProc);
 XS(XS_NPC_AddMeleeProc) {
 	dXSARGS;
@@ -2377,6 +2415,42 @@ XS(XS_NPC_GetCombatState) {
 	XSRETURN(1);
 }
 
+XS(XS_NPC_SetSimpleRoamBox); /* prototype to pass -Wmissing-prototypes */
+XS(XS_NPC_SetSimpleRoamBox) {
+	dXSARGS;
+	if (items < 2)
+		Perl_croak(aTHX_ "Usage: NPC::SetSimpleRoamBox(THIS, box_size, move_distance, move_delay)");
+	{
+		NPC *THIS;
+
+		auto  box_size      = (float) SvNV(ST(1));
+		float move_distance = 0;
+		int   move_delay    = 0;
+
+		if (items >= 3) {
+			move_distance = (float) SvNV(ST(2));
+		}
+
+		if (items >= 4) {
+			move_delay = (int) SvIV(ST(3));
+		}
+
+		if (sv_derived_from(ST(0), "NPC")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(NPC *, tmp);
+		}
+		else {
+			Perl_croak(aTHX_ "THIS is not of type NPC");
+		}
+		if (THIS == nullptr) {
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+		}
+
+		THIS->SetSimpleRoamBox(box_size, move_distance, move_delay);
+	}
+	XSRETURN_EMPTY;
+}
+
 #ifdef __cplusplus
 extern "C"
 #endif
@@ -2479,6 +2553,8 @@ XS(boot_NPC) {
 	newXSproto(strcpy(buf, "GetAvoidanceRating"), XS_NPC_GetAvoidanceRating, file, "$");
 	newXSproto(strcpy(buf, "GetSpawnKillCount"), XS_NPC_GetSpawnKillCount, file, "$");
 	newXSproto(strcpy(buf, "GetScore"), XS_NPC_GetScore, file, "$");
+	newXSproto(strcpy(buf, "MerchantOpenShop"), XS_NPC_MerchantOpenShop, file, "$");
+	newXSproto(strcpy(buf, "MerchantCloseShop"), XS_NPC_MerchantCloseShop, file, "$");
 	newXSproto(strcpy(buf, "AddMeleeProc"), XS_NPC_AddMeleeProc, file, "$$$");
 	newXSproto(strcpy(buf, "AddRangedProc"), XS_NPC_AddRangedProc, file, "$$$");
 	newXSproto(strcpy(buf, "AddDefensiveProc"), XS_NPC_AddDefensiveProc, file, "$$$");
@@ -2488,6 +2564,7 @@ XS(boot_NPC) {
 	newXSproto(strcpy(buf, "ChangeLastName"), XS_NPC_ChangeLastName, file, "$:$");
 	newXSproto(strcpy(buf, "ClearLastName"), XS_NPC_ClearLastName, file, "$");
 	newXSproto(strcpy(buf, "GetCombatState"), XS_NPC_GetCombatState, file, "$");
+	newXSproto(strcpy(buf, "SetSimpleRoamBox"), XS_NPC_SetSimpleRoamBox, file, "$$;$$");
 	XSRETURN_YES;
 }
 
diff --git a/zone/perl_raids.cpp b/zone/perl_raids.cpp
index f5b91448e..72672de4e 100644
--- a/zone/perl_raids.cpp
+++ b/zone/perl_raids.cpp
@@ -420,8 +420,7 @@ XS(XS_Raid_TeleportGroup); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Raid_TeleportGroup) {
 	dXSARGS;
 	if (items != 8)
-		Perl_croak(aTHX_
-		           "Usage: Raid::TeleportGroup(THIS, Mob* sender, uint32 zone_id, float x, float y, float z, float heading, uint32 group_id)");
+		Perl_croak(aTHX_ "Usage: Raid::TeleportGroup(THIS, Mob* sender, uint32 zone_id, float x, float y, float z, float heading, uint32 group_id)");
 	{
 		Raid   *THIS;
 		Mob    *sender;
@@ -457,8 +456,7 @@ XS(XS_Raid_TeleportRaid); /* prototype to pass -Wmissing-prototypes */
 XS(XS_Raid_TeleportRaid) {
 	dXSARGS;
 	if (items != 7)
-		Perl_croak(aTHX_
-		           "Usage: Raid::TeleportRaid(THIS, Mob* sender, uint32 zone_id, float x, float y, float z, float heading)");
+		Perl_croak(aTHX_ "Usage: Raid::TeleportRaid(THIS, Mob* sender, uint32 zone_id, float x, float y, float z, float heading)");
 	{
 		Raid   *THIS;
 		Mob    *sender;
diff --git a/zone/petitions.cpp b/zone/petitions.cpp
index 4ba73332d..112a630e4 100644
--- a/zone/petitions.cpp
+++ b/zone/petitions.cpp
@@ -252,7 +252,7 @@ void ZoneDatabase::InsertPetitionToDB(Petition* wpet)
 	}
 
 #if EQDEBUG >= 5
-		Log(Logs::General, Logs::None, "New petition created");
+		LogDebug("New petition created");
 #endif
 
 }
diff --git a/zone/pets.cpp b/zone/pets.cpp
index ab1f13bce..b4897940a 100644
--- a/zone/pets.cpp
+++ b/zone/pets.cpp
@@ -199,7 +199,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
 		}
 #ifdef BOTS
 		else if (this->IsBot())
-			act_power = CastToBot()->GetBotFocusEffect(Bot::BotfocusPetPower, spell_id);
+			act_power = CastToBot()->GetBotFocusEffect(focusPetPower, spell_id);
 #endif
 	}
 	else if (petpower > 0)
@@ -212,16 +212,16 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
 	//lookup our pets table record for this type
 	PetRecord record;
 	if(!database.GetPoweredPetEntry(pettype, act_power, &record)) {
-		Message(13, "Unable to find data for pet %s", pettype);
-		Log(Logs::General, Logs::Error, "Unable to find data for pet %s, check pets table.", pettype);
+		Message(Chat::Red, "Unable to find data for pet %s", pettype);
+		LogError("Unable to find data for pet [{}], check pets table", pettype);
 		return;
 	}
 
 	//find the NPC data for the specified NPC type
 	const NPCType *base = database.LoadNPCTypesData(record.npc_type);
 	if(base == nullptr) {
-		Message(13, "Unable to load NPC data for pet %s", pettype);
-		Log(Logs::General, Logs::Error, "Unable to load NPC data for pet %s (NPC ID %d), check pets and npc_types tables.", pettype, record.npc_type);
+		Message(Chat::Red, "Unable to load NPC data for pet %s", pettype);
+		LogError("Unable to load NPC data for pet [{}] (NPC ID [{}]), check pets and npc_types tables", pettype, record.npc_type);
 		return;
 	}
 
@@ -374,7 +374,7 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
 			npc_type->helmtexture = monster->helmtexture;
 			npc_type->herosforgemodel = monster->herosforgemodel;
 		} else
-			Log(Logs::General, Logs::Error, "Error loading NPC data for monster summoning pet (NPC ID %d)", monsterid);
+			LogError("Error loading NPC data for monster summoning pet (NPC ID [{}])", monsterid);
 
 	}
 
@@ -665,7 +665,7 @@ bool ZoneDatabase::GetBasePetItems(int32 equipmentset, uint32 *items) {
 
 		if (results.RowCount() != 1) {
 			// invalid set reference, it doesn't exist
-			Log(Logs::General, Logs::Error, "Error in GetBasePetItems equipment set '%d' does not exist", curset);
+			LogError("Error in GetBasePetItems equipment set [{}] does not exist", curset);
 			return false;
 		}
 
diff --git a/zone/queryserv.cpp b/zone/queryserv.cpp
index 691943a7c..6e8b57423 100644
--- a/zone/queryserv.cpp
+++ b/zone/queryserv.cpp
@@ -21,7 +21,6 @@ Copyright (C) 2001-2014 EQEMu Development Team (http://eqemulator.net)
 #include "../common/string_util.h"
 #include "queryserv.h"
 #include "worldserver.h"
-#include "net.h"
 
 
 extern WorldServer worldserver;
diff --git a/zone/quest_interface.h b/zone/quest_interface.h
index 36ca9458f..63310efae 100644
--- a/zone/quest_interface.h
+++ b/zone/quest_interface.h
@@ -84,7 +84,9 @@ public:
 		err.insert(err.end(), errors_.begin(), errors_.end());
 	}
 
-	virtual void AddError(std::string error) { 
+	virtual void AddError(std::string error) {
+		LogQuests("{}", error);
+
 		errors_.push_back(error);
 		if(errors_.size() > 30) {
 			errors_.pop_front();
diff --git a/zone/quest_parser_collection.cpp b/zone/quest_parser_collection.cpp
index 5604647f7..c3d38ce4f 100644
--- a/zone/quest_parser_collection.cpp
+++ b/zone/quest_parser_collection.cpp
@@ -1050,7 +1050,7 @@ int QuestParserCollection::DispatchEventSpell(QuestEventID evt, NPC* npc, Client
 
 void QuestParserCollection::LoadPerlEventExportSettings(PerlEventExportSettings* perl_event_export_settings) {
 	
-	Log(Logs::General, Logs::Zone_Server, "Loading Perl Event Export Settings...");
+	LogInfo("Loading Perl Event Export Settings...");
 
 	/* Write Defaults First (All Enabled) */
 	for (int i = 0; i < _LargestEventID; i++){
diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
index 42cb39503..bea136e28 100644
--- a/zone/questmgr.cpp
+++ b/zone/questmgr.cpp
@@ -154,30 +154,17 @@ void QuestManager::echo(int colour, const char *str) {
 	entity_list.MessageClose(initiator, false, 200, colour, str);
 }
 
-void QuestManager::say(const char *str) {
+void QuestManager::say(const char *str, Journal::Options &opts) {
 	QuestManagerCurrentQuestVars();
 	if (!owner) {
-		Log(Logs::General, Logs::Quests, "QuestManager::say called with nullptr owner. Probably syntax error in quest file.");
+		LogQuests("QuestManager::say called with nullptr owner. Probably syntax error in quest file");
 		return;
 	}
 	else {
-		if(RuleB(NPC, EnableNPCQuestJournal) && initiator) {
-			owner->QuestJournalledSay(initiator, str);
-		}
-		else {
-			owner->Say(str);
-		}
-	}
-}
-
-void QuestManager::say(const char *str, uint8 language) {
-	QuestManagerCurrentQuestVars();
-	if (!owner) {
-		Log(Logs::General, Logs::Quests, "QuestManager::say called with nullptr owner. Probably syntax error in quest file.");
-		return;
-	}
-	else {
-		entity_list.ChannelMessage(owner, 8, language, str);
+		// if there is no initiator we still want stuff to work (timers, signals, waypoints, etc)
+		if (!RuleB(NPC, EnableNPCQuestJournal) || initiator == nullptr)
+			opts.journal_mode = Journal::Mode::None;
+		owner->QuestJournalledSay(initiator, str, opts);
 	}
 }
 
@@ -247,59 +234,57 @@ Mob* QuestManager::unique_spawn(int npc_type, int grid, int unused, const glm::v
 	return nullptr;
 }
 
-Mob* QuestManager::spawn_from_spawn2(uint32 spawn2_id)
+Mob *QuestManager::spawn_from_spawn2(uint32 spawn2_id)
 {
-	LinkedListIterator<Spawn2*> iterator(zone->spawn2_list);
+	LinkedListIterator<Spawn2 *> iterator(zone->spawn2_list);
 	iterator.Reset();
 	Spawn2 *found_spawn = nullptr;
 
-	while(iterator.MoreElements())
-	{
-		Spawn2* cur = iterator.GetData();
+	while (iterator.MoreElements()) {
+		Spawn2 *cur = iterator.GetData();
 		iterator.Advance();
-		if(cur->GetID() == spawn2_id)
-		{
+		if (cur->GetID() == spawn2_id) {
 			found_spawn = cur;
 			break;
 		}
 	}
 
-	if(found_spawn)
-	{
-		SpawnGroup* sg = zone->spawn_group_list.GetSpawnGroup(found_spawn->SpawnGroupID());
-		if(!sg)
-		{
-			database.LoadSpawnGroupsByID(found_spawn->SpawnGroupID(),&zone->spawn_group_list);
-			sg = zone->spawn_group_list.GetSpawnGroup(found_spawn->SpawnGroupID());
-			if(!sg)
-			{
-				return nullptr;
-			}
-		}
-		uint32 npcid = sg->GetNPCType();
-		if(npcid == 0)
-		{
-			return nullptr;
-		}
-
-		const NPCType* tmp = database.LoadNPCTypesData(npcid);
-		if(!tmp)
-		{
-			return nullptr;
-		}
-
-		if(tmp->unique_spawn_by_name)
-		{
-			if(!entity_list.LimitCheckName(tmp->name))
-			{
+	if (found_spawn) {
+		SpawnGroup *spawn_group = zone->spawn_group_list.GetSpawnGroup(found_spawn->SpawnGroupID());
+		if (!spawn_group) {
+			database.LoadSpawnGroupsByID(found_spawn->SpawnGroupID(), &zone->spawn_group_list);
+			spawn_group = zone->spawn_group_list.GetSpawnGroup(found_spawn->SpawnGroupID());
+			if (!spawn_group) {
 				return nullptr;
 			}
 		}
 
-		if(tmp->spawn_limit > 0)
-		{
-			if(!entity_list.LimitCheckType(npcid, tmp->spawn_limit))
-			{
+		uint16 condition_value=1;
+		uint16 condition_id=found_spawn->GetSpawnCondition();
+
+		if (condition_id > 0) {
+			condition_value = zone->spawn_conditions.GetCondition(zone->GetShortName(), zone->GetInstanceID(), condition_id);
+		}
+
+		uint32 npcid = spawn_group->GetNPCType(condition_value);
+
+		if (npcid == 0) {
+			return nullptr;
+		}
+
+		const NPCType *tmp = database.LoadNPCTypesData(npcid);
+		if (!tmp) {
+			return nullptr;
+		}
+
+		if (tmp->unique_spawn_by_name) {
+			if (!entity_list.LimitCheckName(tmp->name)) {
+				return nullptr;
+			}
+		}
+
+		if (tmp->spawn_limit > 0) {
+			if (!entity_list.LimitCheckType(npcid, tmp->spawn_limit)) {
 				return nullptr;
 			}
 		}
@@ -307,21 +292,35 @@ Mob* QuestManager::spawn_from_spawn2(uint32 spawn2_id)
 		database.UpdateRespawnTime(spawn2_id, zone->GetInstanceID(), 0);
 		found_spawn->SetCurrentNPCID(npcid);
 
-        auto position = glm::vec4(found_spawn->GetX(), found_spawn->GetY(), found_spawn->GetZ(), found_spawn->GetHeading());
+		auto position = glm::vec4(
+			found_spawn->GetX(),
+			found_spawn->GetY(),
+			found_spawn->GetZ(),
+			found_spawn->GetHeading()
+		);
+
 		auto npc = new NPC(tmp, found_spawn, position, GravityBehavior::Water);
 
 		found_spawn->SetNPCPointer(npc);
 		npc->AddLootTable();
-		if (npc->DropsGlobalLoot())
+		if (npc->DropsGlobalLoot()) {
 			npc->CheckGlobalLootTables();
-		npc->SetSp2(found_spawn->SpawnGroupID());
+		}
+		npc->SetSpawnGroupId(found_spawn->SpawnGroupID());
 		entity_list.AddNPC(npc);
 		entity_list.LimitAddNPC(npc);
 
-		if (sg->roamdist && sg->roambox[0] && sg->roambox[1] && sg->roambox[2] && sg->roambox[3] && sg->delay &&
-			sg->min_delay)
-			npc->AI_SetRoambox(sg->roamdist, sg->roambox[0], sg->roambox[1], sg->roambox[2], sg->roambox[3],
-					   sg->delay, sg->min_delay);
+		if (spawn_group->roamdist > 0) {
+			npc->AI_SetRoambox(
+				spawn_group->roamdist,
+				spawn_group->roambox[0],
+				spawn_group->roambox[1],
+				spawn_group->roambox[2],
+				spawn_group->roambox[3],
+				spawn_group->delay,
+				spawn_group->min_delay
+			);
+		}
 		if (zone->InstantGrids()) {
 			found_spawn->LoadGrid();
 		}
@@ -568,7 +567,7 @@ void QuestManager::pausetimer(const char *timer_name) {
 	{
 		if (pcur->owner && pcur->owner == owner && pcur->name == timer_name)
 		{
-			Log(Logs::General, Logs::Quests, "Timer %s is already paused for %s. Returning...", timer_name, owner->GetName());
+			LogQuests("Timer [{}] is already paused for [{}]. Returning", timer_name, owner->GetName());
 			return;
 		}
 		++pcur;
@@ -590,7 +589,7 @@ void QuestManager::pausetimer(const char *timer_name) {
 	pt.name = timername;
 	pt.owner = owner;
 	pt.time = milliseconds;
-	Log(Logs::General, Logs::Quests, "Pausing timer %s for %s with %d ms remaining.", timer_name, owner->GetName(), milliseconds);
+	LogQuests("Pausing timer [{}] for [{}] with [{}] ms remaining", timer_name, owner->GetName(), milliseconds);
 	PTimerList.push_back(pt);
 }
 
@@ -616,7 +615,7 @@ void QuestManager::resumetimer(const char *timer_name) {
 
 	if (milliseconds == 0)
 	{
-		Log(Logs::General, Logs::Quests, "Paused timer %s not found or has expired. Returning...", timer_name);
+		LogQuests("Paused timer [{}] not found or has expired. Returning", timer_name);
 		return;
 	}
 
@@ -627,14 +626,14 @@ void QuestManager::resumetimer(const char *timer_name) {
 		{
 			cur->Timer_.Enable();
 			cur->Timer_.Start(milliseconds, false);
-			Log(Logs::General, Logs::Quests, "Resuming timer %s for %s with %d ms remaining.", timer_name, owner->GetName(), milliseconds);
+			LogQuests("Resuming timer [{}] for [{}] with [{}] ms remaining", timer_name, owner->GetName(), milliseconds);
 			return;
 		}
 		++cur;
 	}
 
 	QTimerList.push_back(QuestTimer(milliseconds, owner, timer_name));
-	Log(Logs::General, Logs::Quests, "Creating a new timer and resuming %s for %s with %d ms remaining.", timer_name, owner->GetName(), milliseconds);
+	LogQuests("Creating a new timer and resuming [{}] for [{}] with [{}] ms remaining", timer_name, owner->GetName(), milliseconds);
 
 }
 
@@ -659,7 +658,7 @@ bool QuestManager::ispausedtimer(const char *timer_name) {
 void QuestManager::emote(const char *str) {
 	QuestManagerCurrentQuestVars();
 	if (!owner) {
-		Log(Logs::General, Logs::Quests, "QuestManager::emote called with nullptr owner. Probably syntax error in quest file.");
+		LogQuests("QuestManager::emote called with nullptr owner. Probably syntax error in quest file");
 		return;
 	}
 	else {
@@ -670,7 +669,7 @@ void QuestManager::emote(const char *str) {
 void QuestManager::shout(const char *str) {
 	QuestManagerCurrentQuestVars();
 	if (!owner) {
-		Log(Logs::General, Logs::Quests, "QuestManager::shout called with nullptr owner. Probably syntax error in quest file.");
+		LogQuests("QuestManager::shout called with nullptr owner. Probably syntax error in quest file");
 		return;
 	}
 	else {
@@ -681,7 +680,7 @@ void QuestManager::shout(const char *str) {
 void QuestManager::shout2(const char *str) {
 	QuestManagerCurrentQuestVars();
 	if (!owner) {
-		Log(Logs::General, Logs::Quests, "QuestManager::shout2 called with nullptr owner. Probably syntax error in quest file.");
+		LogQuests("QuestManager::shout2 called with nullptr owner. Probably syntax error in quest file");
 		return;
 	}
 	else {
@@ -700,7 +699,7 @@ void QuestManager::gmsay(const char *str, uint32 color, bool send_to_world, uint
 void QuestManager::depop(int npc_type) {
 	QuestManagerCurrentQuestVars();
 	if (!owner || !owner->IsNPC()) {
-		Log(Logs::General, Logs::Quests, "QuestManager::depop called with nullptr owner or non-NPC owner. Probably syntax error in quest file.");
+		LogQuests("QuestManager::depop called with nullptr owner or non-NPC owner. Probably syntax error in quest file");
 		return;
 	}
 	else {
@@ -730,7 +729,7 @@ void QuestManager::depop(int npc_type) {
 void QuestManager::depop_withtimer(int npc_type) {
 	QuestManagerCurrentQuestVars();
 	if (!owner || !owner->IsNPC()) {
-		Log(Logs::General, Logs::Quests, "QuestManager::depop_withtimer called with nullptr owner or non-NPC owner. Probably syntax error in quest file.");
+		LogQuests("QuestManager::depop_withtimer called with nullptr owner or non-NPC owner. Probably syntax error in quest file");
 		return;
 	}
 	else {
@@ -757,7 +756,7 @@ void QuestManager::depopall(int npc_type) {
 		entity_list.DepopAll(npc_type);
 	}
 	else {
-		Log(Logs::General, Logs::Quests, "QuestManager::depopall called with nullptr owner, non-NPC owner, or invalid NPC Type ID. Probably syntax error in quest file.");
+		LogQuests("QuestManager::depopall called with nullptr owner, non-NPC owner, or invalid NPC Type ID. Probably syntax error in quest file");
 	}
 }
 
@@ -766,7 +765,7 @@ void QuestManager::depopzone(bool StartSpawnTimer) {
 		zone->Depop(StartSpawnTimer);
 	}
 	else {
-		Log(Logs::General, Logs::Quests, "QuestManager::depopzone called with nullptr zone. Probably syntax error in quest file.");
+		LogQuests("QuestManager::depopzone called with nullptr zone. Probably syntax error in quest file");
 	}
 }
 
@@ -775,7 +774,7 @@ void QuestManager::repopzone() {
 		zone->Repop();
 	}
 	else {
-		Log(Logs::General, Logs::Quests, "QuestManager::repopzone called with nullptr zone. Probably syntax error in quest file.");
+		LogQuests("QuestManager::repopzone called with nullptr zone. Probably syntax error in quest file");
 	}
 }
 
@@ -818,13 +817,13 @@ void QuestManager::changedeity(int diety_id) {
 		if(initiator->IsClient())
 		{
 			initiator->SetDeity(diety_id);
-			initiator->Message(15,"Your Deity has been changed/set to: %i", diety_id);
+			initiator->Message(Chat::Yellow,"Your Deity has been changed/set to: %i", diety_id);
 			initiator->Save(1);
-			initiator->Kick();
+			initiator->Kick("Deity change by QuestManager");
 		}
 		else
 		{
-			initiator->Message(15,"Error changing Deity");
+			initiator->Message(Chat::Yellow,"Error changing Deity");
 		}
 	}
 }
@@ -940,11 +939,11 @@ void QuestManager::surname(const char *name) {
 		if(initiator->IsClient())
 		{
 			initiator->ChangeLastName(name);
-			initiator->Message(15,"Your surname has been changed/set to: %s", name);
+			initiator->Message(Chat::Yellow,"Your surname has been changed/set to: %s", name);
 		}
 		else
 		{
-			initiator->Message(15,"Error changing/setting surname");
+			initiator->Message(Chat::Yellow,"Error changing/setting surname");
 		}
 	}
 }
@@ -954,7 +953,7 @@ void QuestManager::permaclass(int class_id) {
 	//Makes the client the class specified
 	initiator->SetBaseClass(class_id);
 	initiator->Save(2);
-	initiator->Kick();
+	initiator->Kick("Base class change by QuestManager");
 }
 
 void QuestManager::permarace(int race_id) {
@@ -962,7 +961,7 @@ void QuestManager::permarace(int race_id) {
 	//Makes the client the race specified
 	initiator->SetBaseRace(race_id);
 	initiator->Save(2);
-	initiator->Kick();
+	initiator->Kick("Base race change by QuestManager");
 }
 
 void QuestManager::permagender(int gender_id) {
@@ -970,7 +969,7 @@ void QuestManager::permagender(int gender_id) {
 	//Makes the client the gender specified
 	initiator->SetBaseGender(gender_id);
 	initiator->Save(2);
-	initiator->Kick();
+	initiator->Kick("Base gender change by QuestManager");
 }
 
 uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) {
@@ -997,11 +996,11 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) {
 			break;
 		}
 		if (spell_id < 0 || spell_id >= SPDAT_RECORDS) {
-			initiator->Message(13, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
+			initiator->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
 			return count;
 		}
 		if (book_slot < 0 || book_slot >= EQEmu::spells::SPELLBOOK_SIZE) {
-			initiator->Message(13, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE);
+			initiator->Message(Chat::Red, "FATAL ERROR: Book slot out-of-range (slot: %i, min: 0, max: %i)", book_slot, EQEmu::spells::SPELLBOOK_SIZE);
 			return count;
 		}
 
@@ -1019,7 +1018,7 @@ uint16 QuestManager::scribespells(uint8 max_level, uint8 min_level) {
 
 			uint16 spell_id_ = (uint16)spell_id;
 			if ((spell_id_ != spell_id) || (spell_id != spell_id_)) {
-				initiator->Message(13, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
+				initiator->Message(Chat::Red, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
 				return count;
 			}
 
@@ -1070,7 +1069,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 
 	for( ; spell_id < SPDAT_RECORDS; ++spell_id) {
 		if (spell_id < 0 || spell_id >= SPDAT_RECORDS) {
-			initiator->Message(13, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
+			initiator->Message(Chat::Red, "FATAL ERROR: Spell id out-of-range (id: %i, min: 0, max: %i)", spell_id, SPDAT_RECORDS);
 			return count;
 		}
 
@@ -1088,7 +1087,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 
 			uint16 spell_id_ = (uint16)spell_id;
 			if ((spell_id_ != spell_id) || (spell_id != spell_id_)) {
-				initiator->Message(13, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
+				initiator->Message(Chat::Red, "FATAL ERROR: Type conversion data loss with spell_id (%i != %u)", spell_id, spell_id_);
 				return count;
 			}
 
@@ -1097,7 +1096,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 
 			for (uint32 r = 0; r < MAX_PP_DISCIPLINES; r++) {
 				if (initiator->GetPP().disciplines.values[r] == spell_id_) {
-					initiator->Message(13, "You already know this discipline.");
+					initiator->Message(Chat::Red, "You already know this discipline.");
 					break; // continue the 1st loop
 				}
 				else if (initiator->GetPP().disciplines.values[r] == 0) {
@@ -1108,7 +1107,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 							initiator->GetPP().disciplines.values[r] = spell_id_;
 							database.SaveCharacterDisc(char_id, r, spell_id_);
 							change = true;
-							initiator->Message(0, "You have learned a new discipline!");
+							initiator->Message(Chat::White, "You have learned a new discipline!");
 							++count; // success counter
 						}
 						break; // continue the 1st loop
@@ -1120,7 +1119,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 							initiator->GetPP().disciplines.values[r] = spell_id_;
 							database.SaveCharacterDisc(char_id, r, spell_id_);
 							change = true;
-							initiator->Message(0, "You have learned a new discipline!");
+							initiator->Message(Chat::White, "You have learned a new discipline!");
 							++count;
 						}
 						break;
@@ -1129,7 +1128,7 @@ uint16 QuestManager::traindiscs(uint8 max_level, uint8 min_level) {
 						initiator->GetPP().disciplines.values[r] = spell_id_;
 						database.SaveCharacterDisc(char_id, r, spell_id_);
 						change = true;;
-						initiator->Message(0, "You have learned a new discipline!");
+						initiator->Message(Chat::White, "You have learned a new discipline!");
 						++count; // success counter
 						break; // continue the 1st loop
 					}
@@ -1201,7 +1200,7 @@ void QuestManager::givecash(int copper, int silver, int gold, int platinum) {
 		}
 		tmp += " pieces.";
 		if (initiator)
-			initiator->Message(MT_OOC, tmp.c_str());
+			initiator->Message(Chat::OOC, tmp.c_str());
 	}
 }
 
@@ -1422,7 +1421,7 @@ void QuestManager::itemlink(int item_id) {
 		linker.SetLinkType(EQEmu::saylink::SayLinkItemData);
 		linker.SetItemData(item);
 
-		initiator->Message(0, "%s tells you, %s", owner->GetCleanName(), linker.GenerateLink().c_str());
+		initiator->Message(Chat::White, "%s tells you, %s", owner->GetCleanName(), linker.GenerateLink().c_str());
 	}
 }
 
@@ -1835,7 +1834,7 @@ void QuestManager::showgrid(int grid) {
                                     "ORDER BY `number`", grid, zone->GetZoneID());
     auto results = database.QueryDatabase(query);
     if (!results.Success()) {
-        Log(Logs::General, Logs::Quests, "Error loading grid %d for showgrid(): %s", grid, results.ErrorMessage().c_str());
+        LogQuests("Error loading grid [{}] for showgrid(): [{}]", grid, results.ErrorMessage().c_str());
 		return;
     }
 
@@ -1911,6 +1910,21 @@ bool QuestManager::summonallplayercorpses(uint32 char_id, const glm::vec4& posit
 	return true;
 }
 
+int QuestManager::getplayercorpsecount(uint32 char_id) {
+	if (char_id > 0) {
+		return database.CountCharacterCorpses(char_id);
+	}
+	return 0;
+	
+}
+
+int QuestManager::getplayercorpsecountbyzoneid(uint32 char_id, uint32 zone_id) {
+	if (char_id > 0 && zone_id > 0) {
+		return database.CountCharacterCorpsesByZoneID(char_id, zone_id);
+	}
+	return 0;
+}
+
 uint32 QuestManager::getplayerburiedcorpsecount(uint32 char_id) {
 	uint32 Result = 0;
 
@@ -2175,18 +2189,18 @@ bool QuestManager::createBot(const char *name, const char *lastname, uint8 level
 	{
 		if(Bot::SpawnedBotCount(initiator->CharacterID()) >= MaxBotCreate)
 		{
-			initiator->Message(15,"You have the maximum number of bots allowed.");
+			initiator->Message(Chat::Yellow,"You have the maximum number of bots allowed.");
 			return false;
 		}
 
 		std::string test_name = name;
 		bool available_flag = false;
 		if(!database.botdb.QueryNameAvailablity(test_name, available_flag)) {
-			initiator->Message(0, "%s for '%s'", BotDatabase::fail::QueryNameAvailablity(), (char*)name);
+			initiator->Message(Chat::White, "%s for '%s'", BotDatabase::fail::QueryNameAvailablity(), (char*)name);
 			return false;
 		}
 		if (!available_flag) {
-			initiator->Message(0, "The name %s is already being used or is invalid. Please choose a different name.", (char*)name);
+			initiator->Message(Chat::White, "The name %s is already being used or is invalid. Please choose a different name.", (char*)name);
 			return false;
 		}
 
@@ -2195,23 +2209,23 @@ bool QuestManager::createBot(const char *name, const char *lastname, uint8 level
 		if(NewBot)
 		{
 			if(!NewBot->IsValidRaceClassCombo()) {
-				initiator->Message(0, "That Race/Class combination cannot be created.");
+				initiator->Message(Chat::White, "That Race/Class combination cannot be created.");
 				return false;
 			}
 
 			if(!NewBot->IsValidName()) {
-				initiator->Message(0, "%s has invalid characters. You can use only the A-Z, a-z and _ characters in a bot name.", NewBot->GetCleanName());
+				initiator->Message(Chat::White, "%s has invalid characters. You can use only the A-Z, a-z and _ characters in a bot name.", NewBot->GetCleanName());
 				return false;
 			}
 
 			// Now that all validation is complete, we can save our newly created bot
 			if(!NewBot->Save())
 			{
-				initiator->Message(0, "Unable to save %s as a bot.", NewBot->GetCleanName());
+				initiator->Message(Chat::White, "Unable to save %s as a bot.", NewBot->GetCleanName());
 			}
 			else
 			{
-				initiator->Message(0, "%s saved as bot %u.", NewBot->GetCleanName(), NewBot->GetBotID());
+				initiator->Message(Chat::White, "%s saved as bot %u.", NewBot->GetCleanName(), NewBot->GetBotID());
 				return true;
 			}
 		}
@@ -2668,13 +2682,13 @@ uint16 QuestManager::CreateInstance(const char *zone, int16 version, uint32 dura
 		uint16 id = 0;
 		if(!database.GetUnusedInstanceID(id))
 		{
-			initiator->Message(13, "Server was unable to find a free instance id.");
+			initiator->Message(Chat::Red, "Server was unable to find a free instance id.");
 			return 0;
 		}
 
 		if(!database.CreateInstance(id, zone_id, version, duration))
 		{
-			initiator->Message(13, "Server was unable to create a new instance.");
+			initiator->Message(Chat::Red, "Server was unable to create a new instance.");
 			return 0;
 		}
 		return id;
@@ -2787,9 +2801,9 @@ void QuestManager::RemoveFromInstance(uint16 instance_id)
 	if (initiator)
 	{
 		if (database.RemoveClientFromInstance(instance_id, initiator->CharacterID()))
-			initiator->Message(MT_Say, "Removed client from instance.");
+			initiator->Message(Chat::Say, "Removed client from instance.");
 		else
-			initiator->Message(MT_Say, "Failed to remove client from instance.");
+			initiator->Message(Chat::Say, "Failed to remove client from instance.");
 	}
 }
 
@@ -2805,11 +2819,11 @@ void QuestManager::RemoveAllFromInstance(uint16 instance_id)
 		std::list<uint32> charid_list;
 
 		if (database.RemoveClientsFromInstance(instance_id))
-			initiator->Message(MT_Say, "Removed all players from instance.");
+			initiator->Message(Chat::Say, "Removed all players from instance.");
 		else
 		{
 			database.GetCharactersInInstance(instance_id, charid_list);
-			initiator->Message(MT_Say, "Failed to remove %i player(s) from instance.", charid_list.size()); // once the expedition system is in, this message it not relevant
+			initiator->Message(Chat::Say, "Failed to remove %i player(s) from instance.", charid_list.size()); // once the expedition system is in, this message it not relevant
 		}
 	}
 }
@@ -2988,7 +3002,7 @@ void QuestManager::voicetell(const char *str, int macronum, int racenum, int gen
 			safe_delete(outapp);
 		}
 		else
-			Log(Logs::General, Logs::Quests, "QuestManager::voicetell from %s. Client %s not found.", owner->GetName(), str);
+			LogQuests("QuestManager::voicetell from [{}]. Client [{}] not found", owner->GetName(), str);
 	}
 }
 
diff --git a/zone/questmgr.h b/zone/questmgr.h
index 6517872d8..5ad551c43 100644
--- a/zone/questmgr.h
+++ b/zone/questmgr.h
@@ -62,8 +62,7 @@ public:
 
 	//quest functions
 	void echo(int colour, const char *str);
-	void say(const char *str);
-	void say(const char *str, uint8 language);
+	void say(const char *str, Journal::Options &opts);
 	void me(const char *str);
 	void summonitem(uint32 itemid, int16 charges = -1);
 	void write(const char *file, const char *str);
@@ -173,6 +172,8 @@ public:
 	bool summonburiedplayercorpse(uint32 char_id, const glm::vec4& position);
 	bool summonallplayercorpses(uint32 char_id, const glm::vec4& position);
 	uint32 getplayerburiedcorpsecount(uint32 char_id);
+	int getplayercorpsecount(uint32 char_id);
+	int getplayercorpsecountbyzoneid(uint32 char_id, uint32 zone_id);
 	bool buryplayercorpse(uint32 char_id);
 	void forcedooropen(uint32 doorid, bool altmode);
 	void forcedoorclose(uint32 doorid, bool altmode);
diff --git a/zone/raids.cpp b/zone/raids.cpp
index e4c5b3552..7a153864d 100644
--- a/zone/raids.cpp
+++ b/zone/raids.cpp
@@ -103,7 +103,7 @@ void Raid::AddMember(Client *c, uint32 group, bool rleader, bool groupleader, bo
     auto results = database.QueryDatabase(query);
 
 	if(!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error inserting into raid members: %s", results.ErrorMessage().c_str());
+		LogError("Error inserting into raid members: [{}]", results.ErrorMessage().c_str());
 	}
 
 	LearnMembers();
@@ -266,12 +266,12 @@ void Raid::SetRaidLeader(const char *wasLead, const char *name)
 	std::string query = StringFormat("UPDATE raid_members SET israidleader = 0 WHERE name = '%s'", wasLead);
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Set Raid Leader error: %s\n", results.ErrorMessage().c_str());
+		LogError("Set Raid Leader error: [{}]\n", results.ErrorMessage().c_str());
 
 	query = StringFormat("UPDATE raid_members SET israidleader = 1 WHERE name = '%s'", name);
 	results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Set Raid Leader error: %s\n", results.ErrorMessage().c_str());
+		LogError("Set Raid Leader error: [{}]\n", results.ErrorMessage().c_str());
 
 	strn0cpy(leadername, name, 64);
 
@@ -304,7 +304,7 @@ void Raid::SaveGroupLeaderAA(uint32 gid)
 	safe_delete_array(queryBuffer);
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to store LeadershipAA: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to store LeadershipAA: [{}]\n", results.ErrorMessage().c_str());
 }
 
 void Raid::SaveRaidLeaderAA()
@@ -318,7 +318,7 @@ void Raid::SaveRaidLeaderAA()
 	safe_delete_array(queryBuffer);
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to store LeadershipAA: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to store LeadershipAA: [{}]\n", results.ErrorMessage().c_str());
 }
 
 void Raid::UpdateGroupAAs(uint32 gid)
@@ -547,7 +547,7 @@ void Raid::CastGroupSpell(Mob* caster, uint16 spellid, uint32 gid)
 #endif
 				}
 				else{
-					Log(Logs::Detail, Logs::Spells, "Raid spell: %s is out of range %f at distance %f from %s", members[x].member->GetName(), range, distance, caster->GetName());
+					LogSpells("Raid spell: [{}] is out of range [{}] at distance [{}] from [{}]", members[x].member->GetName(), range, distance, caster->GetName());
 				}
 			}
 		}
@@ -813,7 +813,7 @@ void Raid::SplitMoney(uint32 copper, uint32 silver, uint32 gold, uint32 platinum
 		//I could not get MoneyOnCorpse to work, so we use this
 		members[i].member->AddMoneyToPP(cpsplit, spsplit, gpsplit, ppsplit, true);
 
-		members[i].member->Message(2, msg.c_str());
+		members[i].member->Message(Chat::Green, msg.c_str());
 		}
 	}
 }
@@ -848,7 +848,7 @@ void Raid::GroupBardPulse(Mob* caster, uint16 spellid, uint32 gid){
 						members[z].member->GetPet()->BardPulse(spellid, caster);
 #endif
 				} else
-					Log(Logs::Detail, Logs::Spells, "Group bard pulse: %s is out of range %f at distance %f from %s", members[z].member->GetName(), range, distance, caster->GetName());
+					LogSpells("Group bard pulse: [{}] is out of range [{}] at distance [{}] from [{}]", members[z].member->GetName(), range, distance, caster->GetName());
 			}
 		}
 	}
@@ -1455,10 +1455,14 @@ void Raid::GetRaidDetails()
     if (!results.Success())
         return;
 
-    if (results.RowCount() == 0) {
-        Log(Logs::General, Logs::Error, "Error getting raid details for raid %lu: %s", (unsigned long)GetID(), results.ErrorMessage().c_str());
-        return;
-    }
+	if (results.RowCount() == 0) {
+		LogError(
+			"Error getting raid details for raid [{}]: [{}]",
+			(unsigned long) GetID(),
+			results.ErrorMessage().c_str()
+		);
+		return;
+	}
 
     auto row = results.begin();
 
@@ -1488,7 +1492,7 @@ bool Raid::LearnMembers()
         return false;
 
 	if(results.RowCount() == 0) {
-        Log(Logs::General, Logs::Error, "Error getting raid members for raid %lu: %s", (unsigned long)GetID(), results.ErrorMessage().c_str());
+		LogError("Error getting raid members for raid [{}]: [{}]", (unsigned long)GetID(), results.ErrorMessage().c_str());
         disbandCheck = true;
         return false;
     }
@@ -1712,12 +1716,12 @@ const char *Raid::GetClientNameByIndex(uint8 index)
 	return members[index].membername;
 }
 
-void Raid::RaidMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9, uint32 distance) {
+void Raid::RaidMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2,const char* message3,const char* message4,const char* message5,const char* message6,const char* message7,const char* message8,const char* message9, uint32 distance) {
 	uint32 i;
 	for (i = 0; i < MAX_RAID_MEMBERS; i++) {
 		if(members[i].member) {
 			if(members[i].member != sender)
-				members[i].member->Message_StringID(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, distance);
+				members[i].member->MessageString(type, string_id, message, message2, message3, message4, message5, message6, message7, message8, message9, distance);
 		}
 	}
 }
@@ -1750,7 +1754,7 @@ void Raid::SetGroupMentor(uint32 group_id, int percent, char *name)
 			name, percent, group_id, GetID());
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to set raid group mentor: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to set raid group mentor: [{}]\n", results.ErrorMessage().c_str());
 }
 
 void Raid::ClearGroupMentor(uint32 group_id)
@@ -1765,7 +1769,7 @@ void Raid::ClearGroupMentor(uint32 group_id)
 			group_id, GetID());
 	auto results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Unable to clear raid group mentor: %s\n", results.ErrorMessage().c_str());
+		LogError("Unable to clear raid group mentor: [{}]\n", results.ErrorMessage().c_str());
 }
 
 // there isn't a nice place to add this in another function, unlike groups
diff --git a/zone/raids.h b/zone/raids.h
index 26f5a0880..260ae6c71 100644
--- a/zone/raids.h
+++ b/zone/raids.h
@@ -152,7 +152,7 @@ public:
 
 	//Actual Implementation Stuff
 
-	void	RaidMessage_StringID(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
+	void	RaidMessageString(Mob* sender, uint32 type, uint32 string_id, const char* message,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0, uint32 distance = 0);
 	void	CastGroupSpell(Mob* caster,uint16 spellid, uint32 gid);
 	void	SplitExp(uint32 exp, Mob* other);
 	uint32	GetTotalRaidDamage(Mob* other);
diff --git a/zone/spawn2.cpp b/zone/spawn2.cpp
index e004faa4a..e6d265813 100644
--- a/zone/spawn2.cpp
+++ b/zone/spawn2.cpp
@@ -154,17 +154,13 @@ bool Spawn2::Process() {
 	if (timer.Check()) {
 		timer.Disable();
 
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Timer has triggered", spawn2_id);
+		LogSpawns("Spawn2 [{}]: Timer has triggered", spawn2_id);
 
 		//first check our spawn condition, if this isnt active
 		//then we reset the timer and try again next time.
 		if (condition_id != SC_AlwaysEnabled
 			&& !zone->spawn_conditions.Check(condition_id, condition_min_value)) {
-			Log(Logs::Detail,
-				Logs::Spawns,
-				"Spawn2 %d: spawning prevented by spawn condition %d",
-				spawn2_id,
-				condition_id);
+			LogSpawns("Spawn2 [{}]: spawning prevented by spawn condition [{}]", spawn2_id, condition_id);
 			Reset();
 			return (true);
 		}
@@ -175,23 +171,21 @@ bool Spawn2::Process() {
 		}
 
 		if (spawn_group == nullptr) {
-			Log(Logs::Detail,
-				Logs::Spawns,
-				"Spawn2 %d: Unable to locate spawn group %d. Disabling.",
-				spawn2_id,
-				spawngroup_id_);
+			LogSpawns("Spawn2 [{}]: Unable to locate spawn group [{}]. Disabling", spawn2_id, spawngroup_id_);
 
 			return false;
 		}
 
+		uint16 condition_value=1;
+
+		if (condition_id > 0) {
+			condition_value = zone->spawn_conditions.GetCondition(zone->GetShortName(), zone->GetInstanceID(), condition_id);
+		}
+
 		//have the spawn group pick an NPC for us
-		uint32 npcid = spawn_group->GetNPCType();
+		uint32 npcid = spawn_group->GetNPCType(condition_value);
 		if (npcid == 0) {
-			Log(Logs::Detail,
-				Logs::Spawns,
-				"Spawn2 %d: Spawn group %d did not yeild an NPC! not spawning.",
-				spawn2_id,
-				spawngroup_id_);
+			LogSpawns("Spawn2 [{}]: Spawn group [{}] did not yeild an NPC! not spawning", spawn2_id, spawngroup_id_);
 
 			Reset();    //try again later (why?)
 			return (true);
@@ -200,24 +194,14 @@ bool Spawn2::Process() {
 		//try to find our NPC type.
 		const NPCType *tmp = database.LoadNPCTypesData(npcid);
 		if (tmp == nullptr) {
-			Log(Logs::Detail,
-				Logs::Spawns,
-				"Spawn2 %d: Spawn group %d yeilded an invalid NPC type %d",
-				spawn2_id,
-				spawngroup_id_,
-				npcid);
+			LogSpawns("Spawn2 [{}]: Spawn group [{}] yeilded an invalid NPC type [{}]", spawn2_id, spawngroup_id_, npcid);
 			Reset();    //try again later
 			return (true);
 		}
 
 		if (tmp->unique_spawn_by_name) {
 			if (!entity_list.LimitCheckName(tmp->name)) {
-				Log(Logs::Detail,
-					Logs::Spawns,
-					"Spawn2 %d: Spawn group %d yeilded NPC type %d, which is unique and one already exists.",
-					spawn2_id,
-					spawngroup_id_,
-					npcid);
+				LogSpawns("Spawn2 [{}]: Spawn group [{}] yeilded NPC type [{}], which is unique and one already exists", spawn2_id, spawngroup_id_, npcid);
 				timer.Start(5000);    //try again in five seconds.
 				return (true);
 			}
@@ -225,13 +209,7 @@ bool Spawn2::Process() {
 
 		if (tmp->spawn_limit > 0) {
 			if (!entity_list.LimitCheckType(npcid, tmp->spawn_limit)) {
-				Log(Logs::Detail,
-					Logs::Spawns,
-					"Spawn2 %d: Spawn group %d yeilded NPC type %d, which is over its spawn limit (%d)",
-					spawn2_id,
-					spawngroup_id_,
-					npcid,
-					tmp->spawn_limit);
+				LogSpawns("Spawn2 [{}]: Spawn group [{}] yeilded NPC type [{}], which is over its spawn limit ([{}])", spawn2_id, spawngroup_id_, npcid, tmp->spawn_limit);
 				timer.Start(5000);    //try again in five seconds.
 				return (true);
 			}
@@ -264,7 +242,7 @@ bool Spawn2::Process() {
 		if (npc->DropsGlobalLoot()) {
 			npc->CheckGlobalLootTables();
 		}
-		npc->SetSp2(spawngroup_id_);
+		npc->SetSpawnGroupId(spawngroup_id_);
 		npc->SaveGuardPointAnim(anim);
 		npc->SetAppearance((EmuAppearance) anim);
 		entity_list.AddNPC(npc);
@@ -274,9 +252,7 @@ bool Spawn2::Process() {
 		/**
 		 * Roambox init
 		 */
-		if (spawn_group->roamdist && spawn_group->roambox[0] && spawn_group->roambox[1] && spawn_group->roambox[2] &&
-			spawn_group->roambox[3] && spawn_group->delay && spawn_group->min_delay) {
-
+		if (spawn_group->roamdist > 0) {
 			npc->AI_SetRoambox(
 				spawn_group->roamdist,
 				spawn_group->roambox[0],
@@ -289,30 +265,28 @@ bool Spawn2::Process() {
 		}
 
 		if (zone->InstantGrids()) {
-			Log(Logs::Detail,
-				Logs::Spawns,
-				"Spawn2 %d: Group %d spawned %s (%d) at (%.3f, %.3f, %.3f).",
+			LogSpawns("Spawn2 [{}]: Group [{}] spawned [{}] ([{}]) at ([{}], [{}], [{}])",
 				spawn2_id,
 				spawngroup_id_,
 				npc->GetName(),
 				npcid,
 				x,
 				y,
-				z);
+				z
+			);
 
 			LoadGrid();
 		}
 		else {
-			Log(Logs::Detail,
-				Logs::Spawns,
-				"Spawn2 %d: Group %d spawned %s (%d) at (%.3f, %.3f, %.3f). Grid loading delayed.",
+			LogSpawns("Spawn2 [{}]: Group [{}] spawned [{}] ([{}]) at ([{}], [{}], [{}]). Grid loading delayed",
 				spawn2_id,
 				spawngroup_id_,
 				tmp->name,
 				npcid,
 				x,
 				y,
-				z);
+				z
+			);
 		}
 	}
 
@@ -338,7 +312,7 @@ void Spawn2::LoadGrid() {
 	//dont set an NPC's grid until its loaded for them.
 	npcthis->SetGrid(grid_);
 	npcthis->AssignWaypoints(grid_);
-	Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Loading grid %d for %s", spawn2_id, grid_, npcthis->GetName());
+	LogSpawns("Spawn2 [{}]: Loading grid [{}] for [{}]", spawn2_id, grid_, npcthis->GetName());
 }
 
 /*
@@ -348,21 +322,21 @@ void Spawn2::LoadGrid() {
 void Spawn2::Reset() {
 	timer.Start(resetTimer());
 	npcthis = nullptr;
-	Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Spawn reset, repop in %d ms", spawn2_id, timer.GetRemainingTime());
+	LogSpawns("Spawn2 [{}]: Spawn reset, repop in [{}] ms", spawn2_id, timer.GetRemainingTime());
 }
 
 void Spawn2::Depop() {
 	timer.Disable();
-	Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Spawn reset, repop disabled", spawn2_id);
+	LogSpawns("Spawn2 [{}]: Spawn reset, repop disabled", spawn2_id);
 	npcthis = nullptr;
 }
 
 void Spawn2::Repop(uint32 delay) {
 	if (delay == 0) {
 		timer.Trigger();
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Spawn reset, repop immediately.", spawn2_id);
+		LogSpawns("Spawn2 [{}]: Spawn reset, repop immediately", spawn2_id);
 	} else {
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Spawn reset for repop, repop in %d ms", spawn2_id, delay);
+		LogSpawns("Spawn2 [{}]: Spawn reset for repop, repop in [{}] ms", spawn2_id, delay);
 		timer.Start(delay);
 	}
 	npcthis = nullptr;
@@ -407,7 +381,7 @@ void Spawn2::ForceDespawn()
 		cur = despawnTimer(dtimer);
 	}
 
-	Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Spawn group %d set despawn timer to %d ms.", spawn2_id, spawngroup_id_, cur);
+	LogSpawns("Spawn2 [{}]: Spawn group [{}] set despawn timer to [{}] ms", spawn2_id, spawngroup_id_, cur);
 	timer.Start(cur);
 }
 
@@ -428,7 +402,7 @@ void Spawn2::DeathReset(bool realdeath)
 	if(spawn2_id)
 	{
 		database.UpdateRespawnTime(spawn2_id, zone->GetInstanceID(), (cur/1000));
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Spawn reset by death, repop in %d ms", spawn2_id, timer.GetRemainingTime());
+		LogSpawns("Spawn2 [{}]: Spawn reset by death, repop in [{}] ms", spawn2_id, timer.GetRemainingTime());
 		//store it to database too
 	}
 }
@@ -713,12 +687,12 @@ void Spawn2::SpawnConditionChanged(const SpawnCondition &c, int16 old_value) {
 	if(GetSpawnCondition() != c.condition_id)
 		return;
 
-	Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Notified that our spawn condition %d has changed from %d to %d. Our min value is %d.", spawn2_id, c.condition_id, old_value, c.value, condition_min_value);
+	LogSpawns("Spawn2 [{}]: Notified that our spawn condition [{}] has changed from [{}] to [{}]. Our min value is [{}]", spawn2_id, c.condition_id, old_value, c.value, condition_min_value);
 
 	bool old_state = (old_value >= condition_min_value);
 	bool new_state = (c.value >= condition_min_value);
 	if(old_state == new_state) {
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Our threshold for this condition was not crossed. Doing nothing.", spawn2_id);
+		LogSpawns("Spawn2 [{}]: Our threshold for this condition was not crossed. Doing nothing", spawn2_id);
 		return;	//no change
 	}
 
@@ -726,50 +700,50 @@ void Spawn2::SpawnConditionChanged(const SpawnCondition &c, int16 old_value) {
 	switch(c.on_change) {
 	case SpawnCondition::DoNothing:
 		//that was easy.
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Our condition is now %s. Taking no action on existing spawn.", spawn2_id, new_state?"enabled":"disabled");
+		LogSpawns("Spawn2 [{}]: Our condition is now [{}]. Taking no action on existing spawn", spawn2_id, new_state?"enabled":"disabled");
 		break;
 	case SpawnCondition::DoDepop:
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Our condition is now %s. Depoping our mob.", spawn2_id, new_state?"enabled":"disabled");
+		LogSpawns("Spawn2 [{}]: Our condition is now [{}]. Depoping our mob", spawn2_id, new_state?"enabled":"disabled");
 		if(npcthis != nullptr)
 			npcthis->Depop(false);	//remove the current mob
 		Reset();	//reset our spawn timer
 		break;
 	case SpawnCondition::DoRepop:
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Our condition is now %s. Forcing a repop.", spawn2_id, new_state?"enabled":"disabled");
+		LogSpawns("Spawn2 [{}]: Our condition is now [{}]. Forcing a repop", spawn2_id, new_state?"enabled":"disabled");
 		if(npcthis != nullptr)
 			npcthis->Depop(false);	//remove the current mob
 		Repop();	//repop
 		break;
 	case SpawnCondition::DoRepopIfReady:
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Our condition is now %s. Forcing a repop if repsawn timer is expired.", spawn2_id, new_state?"enabled":"disabled");
+		LogSpawns("Spawn2 [{}]: Our condition is now [{}]. Forcing a repop if repsawn timer is expired", spawn2_id, new_state?"enabled":"disabled");
 		if(npcthis != nullptr) {
-			Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Our npcthis is currently not null. The zone thinks it is %s. Forcing a depop.", spawn2_id, npcthis->GetName());
+			LogSpawns("Spawn2 [{}]: Our npcthis is currently not null. The zone thinks it is [{}]. Forcing a depop", spawn2_id, npcthis->GetName());
 			npcthis->Depop(false);	//remove the current mob
 			npcthis = nullptr;
 		}
 		if(new_state) { // only get repawn timer remaining when the SpawnCondition is enabled.
 			timer_remaining = database.GetSpawnTimeLeft(spawn2_id,zone->GetInstanceID());
-			Log(Logs::Detail, Logs::Spawns,"Spawn2 %d: Our condition is now %s. The respawn timer_remaining is %d. Forcing a repop if it is <= 0.", spawn2_id, new_state?"enabled":"disabled", timer_remaining);
+			LogSpawns("Spawn2 [{}]: Our condition is now [{}]. The respawn timer_remaining is [{}]. Forcing a repop if it is <= 0", spawn2_id, new_state?"enabled":"disabled", timer_remaining);
 			if(timer_remaining <= 0)
 				Repop();
 		} else {
-			Log(Logs::Detail, Logs::Spawns,"Spawn2 %d: Our condition is now %s. Not checking respawn timer.", spawn2_id, new_state?"enabled":"disabled");
+			LogSpawns("Spawn2 [{}]: Our condition is now [{}]. Not checking respawn timer", spawn2_id, new_state?"enabled":"disabled");
 		}
 		break;
 	default:
 		if(c.on_change < SpawnCondition::DoSignalMin) {
-			Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Our condition is now %s. Invalid on-change action %d.", spawn2_id, new_state?"enabled":"disabled", c.on_change);
+			LogSpawns("Spawn2 [{}]: Our condition is now [{}]. Invalid on-change action [{}]", spawn2_id, new_state?"enabled":"disabled", c.on_change);
 			return;	//unknown onchange action
 		}
 		int signal_id = c.on_change - SpawnCondition::DoSignalMin;
-		Log(Logs::Detail, Logs::Spawns, "Spawn2 %d: Our condition is now %s. Signaling our mob with %d.", spawn2_id, new_state?"enabled":"disabled", signal_id);
+		LogSpawns("Spawn2 [{}]: Our condition is now [{}]. Signaling our mob with [{}]", spawn2_id, new_state?"enabled":"disabled", signal_id);
 		if(npcthis != nullptr)
 			npcthis->SignalNPC(signal_id);
 	}
 }
 
 void Zone::SpawnConditionChanged(const SpawnCondition &c, int16 old_value) {
-	Log(Logs::Detail, Logs::Spawns, "Zone notified that spawn condition %d has changed from %d to %d. Notifying all spawn points.", c.condition_id, old_value, c.value);
+	LogSpawns("Zone notified that spawn condition [{}] has changed from [{}] to [{}]. Notifying all spawn points", c.condition_id, old_value, c.value);
 
 	LinkedListIterator<Spawn2*> iterator(spawn2_list);
 
@@ -839,7 +813,7 @@ void SpawnConditionManager::Process() {
 					EQTime::AddMinutes(cevent.period, &cevent.next);
 					std::string t;
 					EQTime::ToString(&cevent.next, t);
-					Log(Logs::Detail, Logs::Spawns, "Event %d: Will trigger again in %d EQ minutes at %s.", cevent.id, cevent.period, t.c_str());
+					LogSpawns("Event [{}]: Will trigger again in [{}] EQ minutes at [{}]", cevent.id, cevent.period, t.c_str());
 					//save the next event time in the DB
 					UpdateDBEvent(cevent);
 					//find the next closest event timer.
@@ -858,7 +832,7 @@ void SpawnConditionManager::ExecEvent(SpawnEvent &event, bool send_update) {
 	std::map<uint16, SpawnCondition>::iterator condi;
 	condi = spawn_conditions.find(event.condition_id);
 	if(condi == spawn_conditions.end()) {
-		Log(Logs::Detail, Logs::Spawns, "Event %d: Unable to find condition %d to execute on.", event.id, event.condition_id);
+		LogSpawns("Event [{}]: Unable to find condition [{}] to execute on", event.id, event.condition_id);
 		return;	//unable to find the spawn condition to operate on
 	}
 
@@ -866,7 +840,7 @@ void SpawnConditionManager::ExecEvent(SpawnEvent &event, bool send_update) {
 	zone->zone_time.GetCurrentEQTimeOfDay(&tod);
 	if(event.strict && (event.next.hour != tod.hour || event.next.day != tod.day || event.next.month != tod.month || event.next.year != tod.year))
 	{
-		Log(Logs::Detail, Logs::Spawns, "Event %d: Unable to execute. Condition is strict, and event time has already passed.", event.id);
+		LogSpawns("Event [{}]: Unable to execute. Condition is strict, and event time has already passed", event.id);
 		return;
 	}
 
@@ -878,26 +852,26 @@ void SpawnConditionManager::ExecEvent(SpawnEvent &event, bool send_update) {
 	switch(event.action) {
 	case SpawnEvent::ActionSet:
 		new_value = event.argument;
-		Log(Logs::Detail, Logs::Spawns, "Event %d: Executing. Setting condition %d to %d.", event.id, event.condition_id, event.argument);
+		LogSpawns("Event [{}]: Executing. Setting condition [{}] to [{}]", event.id, event.condition_id, event.argument);
 		break;
 	case SpawnEvent::ActionAdd:
 		new_value += event.argument;
-		Log(Logs::Detail, Logs::Spawns, "Event %d: Executing. Adding %d to condition %d, yeilding %d.", event.id, event.argument, event.condition_id, new_value);
+		LogSpawns("Event [{}]: Executing. Adding [{}] to condition [{}], yielding [{}]", event.id, event.argument, event.condition_id, new_value);
 		break;
 	case SpawnEvent::ActionSubtract:
 		new_value -= event.argument;
-		Log(Logs::Detail, Logs::Spawns, "Event %d: Executing. Subtracting %d from condition %d, yeilding %d.", event.id, event.argument, event.condition_id, new_value);
+		LogSpawns("Event [{}]: Executing. Subtracting [{}] from condition [{}], yielding [{}]", event.id, event.argument, event.condition_id, new_value);
 		break;
 	case SpawnEvent::ActionMultiply:
 		new_value *= event.argument;
-		Log(Logs::Detail, Logs::Spawns, "Event %d: Executing. Multiplying condition %d by %d, yeilding %d.", event.id, event.condition_id, event.argument, new_value);
+		LogSpawns("Event [{}]: Executing. Multiplying condition [{}] by [{}], yielding [{}]", event.id, event.condition_id, event.argument, new_value);
 		break;
 	case SpawnEvent::ActionDivide:
 		new_value /= event.argument;
-		Log(Logs::Detail, Logs::Spawns, "Event %d: Executing. Dividing condition %d by %d, yeilding %d.", event.id, event.condition_id, event.argument, new_value);
+		LogSpawns("Event [{}]: Executing. Dividing condition [{}] by [{}], yielding [{}]", event.id, event.condition_id, event.argument, new_value);
 		break;
 	default:
-		Log(Logs::Detail, Logs::Spawns, "Event %d: Invalid event action type %d", event.id, event.action);
+		LogSpawns("Event [{}]: Invalid event action type [{}]", event.id, event.action);
 		return;
 	}
 
@@ -967,7 +941,7 @@ bool SpawnConditionManager::LoadDBEvent(uint32 event_id, SpawnEvent &event, std:
     std::string timeAsString;
     EQTime::ToString(&event.next, timeAsString);
 
-    Log(Logs::Detail, Logs::Spawns, "(LoadDBEvent) Loaded %s spawn event %d on condition %d with period %d, action %d, argument %d, strict %d. Will trigger at %s", event.enabled? "enabled": "disabled", event.id, event.condition_id, event.period, event.action, event.argument, event.strict, timeAsString.c_str());
+  LogSpawns("(LoadDBEvent) Loaded [{}] spawn event [{}] on condition [{}] with period [{}], action [{}], argument [{}], strict [{}]. Will trigger at [{}]", event.enabled? "enabled": "disabled", event.id, event.condition_id, event.period, event.action, event.argument, event.strict, timeAsString.c_str());
 
 	return true;
 }
@@ -994,7 +968,7 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in
         cond.on_change = (SpawnCondition::OnChange) atoi(row[1]);
         spawn_conditions[cond.condition_id] = cond;
 
-        Log(Logs::Detail, Logs::Spawns, "Loaded spawn condition %d with value %d and on_change %d", cond.condition_id, cond.value, cond.on_change);
+    LogSpawns("Loaded spawn condition [{}] with value [{}] and on_change [{}]", cond.condition_id, cond.value, cond.on_change);
     }
 
 	//load values
@@ -1023,33 +997,42 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in
 		return false;
     }
 
-    for (auto row = results.begin(); row != results.end(); ++row) {
-        SpawnEvent event;
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		SpawnEvent event;
 
-        event.id = atoi(row[0]);
-        event.condition_id = atoi(row[1]);
-        event.period = atoi(row[2]);
+		event.id           = atoi(row[0]);
+		event.condition_id = atoi(row[1]);
+		event.period       = atoi(row[2]);
 
-        if(event.period == 0) {
-            Log(Logs::General, Logs::Error, "Refusing to load spawn event #%d because it has a period of 0\n", event.id);
-            continue;
-        }
+		if (event.period == 0) {
+			LogError("Refusing to load spawn event #[{}] because it has a period of 0\n", event.id);
+			continue;
+		}
 
-        event.next.minute = atoi(row[3]);
-        event.next.hour = atoi(row[4]);
-        event.next.day = atoi(row[5]);
-        event.next.month = atoi(row[6]);
-        event.next.year = atoi(row[7]);
+		event.next.minute = atoi(row[3]);
+		event.next.hour   = atoi(row[4]);
+		event.next.day    = atoi(row[5]);
+		event.next.month  = atoi(row[6]);
+		event.next.year   = atoi(row[7]);
 
-        event.enabled = atoi(row[8])==0?false:true;
-        event.action = (SpawnEvent::Action) atoi(row[9]);
-        event.argument = atoi(row[10]);
-        event.strict = atoi(row[11])==0?false:true;
+		event.enabled  = atoi(row[8]) == 0 ? false : true;
+		event.action   = (SpawnEvent::Action) atoi(row[9]);
+		event.argument = atoi(row[10]);
+		event.strict   = atoi(row[11]) == 0 ? false : true;
 
-        spawn_events.push_back(event);
+		spawn_events.push_back(event);
 
-        Log(Logs::Detail, Logs::Spawns, "(LoadSpawnConditions) Loaded %s spawn event %d on condition %d with period %d, action %d, argument %d, strict %d", event.enabled? "enabled": "disabled", event.id, event.condition_id, event.period, event.action, event.argument, event.strict);
-    }
+		LogSpawns(
+			"(LoadSpawnConditions) Loaded [{}] spawn event [{}] on condition [{}] with period [{}], action [{}], argument [{}], strict [{}]",
+			event.enabled ? "enabled" : "disabled",
+			event.id,
+			event.condition_id,
+			event.period,
+			event.action,
+			event.argument,
+			event.strict
+		);
+	}
 
 	//now we need to catch up on events that happened while we were away
 	//and use them to alter just the condition variables.
@@ -1081,31 +1064,33 @@ bool SpawnConditionManager::LoadSpawnConditions(const char* zone_name, uint32 in
 		if(!cevent.enabled)
             continue;
 
-        //watch for special case of all 0s, which means to reset next to now
-        if(cevent.next.year == 0 && cevent.next.month == 0 && cevent.next.day == 0 && cevent.next.hour == 0 && cevent.next.minute == 0) {
-            Log(Logs::Detail, Logs::Spawns, "Initial next trigger time set for spawn event %d", cevent.id);
-            memcpy(&cevent.next, &tod, sizeof(cevent.next));
-            //add one period
-            EQTime::AddMinutes(cevent.period, &cevent.next);
-            //save it in the db.
-            UpdateDBEvent(cevent);
-            continue;	//were done with this event.
-        }
+		//watch for special case of all 0s, which means to reset next to now
+		if (cevent.next.year == 0 && cevent.next.month == 0 && cevent.next.day == 0 && cevent.next.hour == 0 &&
+			cevent.next.minute == 0) {
+			LogSpawns("Initial next trigger time set for spawn event [{}]", cevent.id);
+			memcpy(&cevent.next, &tod, sizeof(cevent.next));
+			//add one period
+			EQTime::AddMinutes(cevent.period, &cevent.next);
+			//save it in the db.
+			UpdateDBEvent(cevent);
+			continue;    //were done with this event.
+		}
 
-        bool ran = false;
-        while(EQTime::IsTimeBefore(&tod, &cevent.next)) {
-            Log(Logs::Detail, Logs::Spawns, "Catch up triggering on event %d", cevent.id);
-            //this event has been triggered.
-            //execute the event
-            if(!cevent.strict || StrictCheck)
-                ExecEvent(cevent, false);
+		bool ran = false;
+		while (EQTime::IsTimeBefore(&tod, &cevent.next)) {
+			LogSpawns("Catch up triggering on event [{}]", cevent.id);
+			//this event has been triggered.
+			//execute the event
+			if (!cevent.strict || StrictCheck) {
+				ExecEvent(cevent, false);
+			}
 
-            //add the period of the event to the trigger time
-            EQTime::AddMinutes(cevent.period, &cevent.next);
-            ran = true;
-        }
+			//add the period of the event to the trigger time
+			EQTime::AddMinutes(cevent.period, &cevent.next);
+			ran = true;
+		}
 
-        //only write it out if the event actually ran
+		//only write it out if the event actually ran
         if(ran)
             UpdateDBEvent(cevent); //save the event in the DB
 	}
@@ -1137,10 +1122,10 @@ void SpawnConditionManager::FindNearestEvent() {
 		}
 	}
 	if (next_id == -1) {
-		Log(Logs::Detail, Logs::Spawns, "No spawn events enabled. Disabling next event.");
+		LogSpawns("No spawn events enabled. Disabling next event");
 	}
 	else {
-		Log(Logs::Detail, Logs::Spawns, "Next event determined to be event %d", next_id);
+		LogSpawns("Next event determined to be event [{}]", next_id);
 	}
 }
 
@@ -1153,14 +1138,14 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance
 		std::map<uint16, SpawnCondition>::iterator condi;
 		condi = spawn_conditions.find(condition_id);
 		if(condi == spawn_conditions.end()) {
-			Log(Logs::Detail, Logs::Spawns, "Condition update received from world for %d, but we do not have that conditon.", condition_id);
+			LogSpawns("Condition update received from world for [{}], but we do not have that conditon", condition_id);
 			return;	//unable to find the spawn condition
 		}
 
 		SpawnCondition &cond = condi->second;
 
 		if(cond.value == new_value) {
-			Log(Logs::Detail, Logs::Spawns, "Condition update received from world for %d with value %d, which is what we already have.", condition_id, new_value);
+			LogSpawns("Condition update received from world for [{}] with value [{}], which is what we already have", condition_id, new_value);
 			return;
 		}
 
@@ -1169,7 +1154,7 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance
 		//set our local value
 		cond.value = new_value;
 
-		Log(Logs::Detail, Logs::Spawns, "Condition update received from world for %d with value %d", condition_id, new_value);
+		LogSpawns("Condition update received from world for [{}] with value [{}]", condition_id, new_value);
 
 		//now we have to test each spawn point to see if it changed.
 		zone->SpawnConditionChanged(cond, old_value);
@@ -1180,14 +1165,14 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance
 		std::map<uint16, SpawnCondition>::iterator condi;
 		condi = spawn_conditions.find(condition_id);
 		if(condi == spawn_conditions.end()) {
-			Log(Logs::Detail, Logs::Spawns, "Local Condition update requested for %d, but we do not have that conditon.", condition_id);
+			LogSpawns("Local Condition update requested for [{}], but we do not have that conditon", condition_id);
 			return;	//unable to find the spawn condition
 		}
 
 		SpawnCondition &cond = condi->second;
 
 		if(cond.value == new_value) {
-			Log(Logs::Detail, Logs::Spawns, "Local Condition update requested for %d with value %d, which is what we already have.", condition_id, new_value);
+			LogSpawns("Local Condition update requested for [{}] with value [{}], which is what we already have", condition_id, new_value);
 			return;
 		}
 
@@ -1198,7 +1183,7 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance
 		//save it in the DB too
 		UpdateDBCondition(zone_short, instance_id, condition_id, new_value);
 
-		Log(Logs::Detail, Logs::Spawns, "Local Condition update requested for %d with value %d", condition_id, new_value);
+		LogSpawns("Local Condition update requested for [{}] with value [{}]", condition_id, new_value);
 
 		//now we have to test each spawn point to see if it changed.
 		zone->SpawnConditionChanged(cond, old_value);
@@ -1208,7 +1193,7 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance
 		//this is a remote spawn condition, update the DB and send
 		//an update packet to the zone if its up
 
-		Log(Logs::Detail, Logs::Spawns, "Remote spawn condition %d set to %d. Updating DB and notifying world.", condition_id, new_value);
+		LogSpawns("Remote spawn condition [{}] set to [{}]. Updating DB and notifying world", condition_id, new_value);
 
 		UpdateDBCondition(zone_short, instance_id, condition_id, new_value);
 
@@ -1228,7 +1213,7 @@ void SpawnConditionManager::SetCondition(const char *zone_short, uint32 instance
 void SpawnConditionManager::ReloadEvent(uint32 event_id) {
 	std::string zone_short_name;
 
-	Log(Logs::Detail, Logs::Spawns, "Requested to reload event %d from the database.", event_id);
+	LogSpawns("Requested to reload event [{}] from the database", event_id);
 
 	//first look for the event in our local event list
 	std::vector<SpawnEvent>::iterator cur,end;
@@ -1241,7 +1226,7 @@ void SpawnConditionManager::ReloadEvent(uint32 event_id) {
 			//load the event into the old event slot
 			if(!LoadDBEvent(event_id, cevent, zone_short_name)) {
 				//unable to find the event in the database...
-				Log(Logs::Detail, Logs::Spawns, "Failed to reload event %d from the database.", event_id);
+				LogSpawns("Failed to reload event [{}] from the database", event_id);
 				return;
 			}
 			//sync up our nearest event
@@ -1254,7 +1239,7 @@ void SpawnConditionManager::ReloadEvent(uint32 event_id) {
 	SpawnEvent e;
 	if(!LoadDBEvent(event_id, e, zone_short_name)) {
 		//unable to find the event in the database...
-		Log(Logs::Detail, Logs::Spawns, "Failed to reload event %d from the database.", event_id);
+		LogSpawns("Failed to reload event [{}] from the database", event_id);
 		return;
 	}
 
@@ -1271,7 +1256,7 @@ void SpawnConditionManager::ReloadEvent(uint32 event_id) {
 
 void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool strict, bool reset_base) {
 
-	Log(Logs::Detail, Logs::Spawns, "Request to %s spawn event %d %sresetting trigger time", enabled?"enable":"disable", event_id, reset_base?"":"without ");
+	LogSpawns("Request to [{}] spawn event [{}] [{}]resetting trigger time", enabled?"enable":"disable", event_id, reset_base?"":"without ");
 
 	//first look for the event in our local event list
 	std::vector<SpawnEvent>::iterator cur,end;
@@ -1286,13 +1271,13 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool stri
 				cevent.enabled = enabled;
 				cevent.strict = strict;
 				if(reset_base) {
-					Log(Logs::Detail, Logs::Spawns, "Spawn event %d located in this zone. State set. Trigger time reset (period %d).", event_id, cevent.period);
+					LogSpawns("Spawn event [{}] located in this zone. State set. Trigger time reset (period [{}])", event_id, cevent.period);
 					//start with the time now
 					zone->zone_time.GetCurrentEQTimeOfDay(&cevent.next);
 					//advance the next time by our period
 					EQTime::AddMinutes(cevent.period, &cevent.next);
 				} else {
-					Log(Logs::Detail, Logs::Spawns, "Spawn event %d located in this zone. State changed.", event_id);
+					LogSpawns("Spawn event [{}] located in this zone. State changed", event_id);
 				}
 
 				//save the event in the DB
@@ -1301,7 +1286,7 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool stri
 				//sync up our nearest event
 				FindNearestEvent();
 			} else {
-				Log(Logs::Detail, Logs::Spawns, "Spawn event %d located in this zone but no change was needed.", event_id);
+				LogSpawns("Spawn event [{}] located in this zone but no change was needed", event_id);
 			}
 			//even if we dont change anything, we still found it
 			return;
@@ -1320,24 +1305,24 @@ void SpawnConditionManager::ToggleEvent(uint32 event_id, bool enabled, bool stri
 	SpawnEvent e;
 	std::string zone_short_name;
 	if(!LoadDBEvent(event_id, e, zone_short_name)) {
-		Log(Logs::Detail, Logs::Spawns, "Unable to find spawn event %d in the database.", event_id);
+		LogSpawns("Unable to find spawn event [{}] in the database", event_id);
 		//unable to find the event in the database...
 		return;
 	}
 	if(e.enabled == enabled && !reset_base) {
-		Log(Logs::Detail, Logs::Spawns, "Spawn event %d is not located in this zone but no change was needed.", event_id);
+		LogSpawns("Spawn event [{}] is not located in this zone but no change was needed", event_id);
 		return;	//no changes.
 	}
 
 	e.enabled = enabled;
 	if(reset_base) {
-		Log(Logs::Detail, Logs::Spawns, "Spawn event %d is in zone %s. State set. Trigger time reset (period %d). Notifying world.", event_id, zone_short_name.c_str(), e.period);
+		LogSpawns("Spawn event [{}] is in zone [{}]. State set. Trigger time reset (period [{}]). Notifying world", event_id, zone_short_name.c_str(), e.period);
 		//start with the time now
 		zone->zone_time.GetCurrentEQTimeOfDay(&e.next);
 		//advance the next time by our period
 		EQTime::AddMinutes(e.period, &e.next);
 	} else {
-		Log(Logs::Detail, Logs::Spawns, "Spawn event %d is in zone %s. State changed. Notifying world.", event_id, zone_short_name.c_str(), e.period);
+		LogSpawns("Spawn event [{}] is in zone [{}]. State changed. Notifying world", event_id, zone_short_name.c_str(), e.period);
 	}
 	//save the event in the DB
 	UpdateDBEvent(e);
@@ -1362,7 +1347,7 @@ int16 SpawnConditionManager::GetCondition(const char *zone_short, uint32 instanc
 		condi = spawn_conditions.find(condition_id);
 		if(condi == spawn_conditions.end())
 		{
-			Log(Logs::Detail, Logs::Spawns, "Unable to find local condition %d in Get request.", condition_id);
+			LogSpawns("Unable to find local condition [{}] in Get request", condition_id);
 			return(0);	//unable to find the spawn condition
 		}
 
@@ -1371,20 +1356,22 @@ int16 SpawnConditionManager::GetCondition(const char *zone_short, uint32 instanc
 	}
 
 	//this is a remote spawn condition, grab it from the DB
-    //load spawn conditions
-    std::string query = StringFormat("SELECT value FROM spawn_condition_values "
-                                    "WHERE zone = '%s' AND instance_id = %u AND id = %d",
-                                    zone_short, instance_id, condition_id);
-    auto results = database.QueryDatabase(query);
-    if (!results.Success()) {
-        Log(Logs::Detail, Logs::Spawns, "Unable to query remote condition %d from zone %s in Get request.", condition_id, zone_short);
-		return 0;	//dunno a better thing to do...
-    }
+	//load spawn conditions
+	std::string query   = StringFormat(
+		"SELECT value FROM spawn_condition_values "
+		"WHERE zone = '%s' AND instance_id = %u AND id = %d",
+		zone_short, instance_id, condition_id
+	);
+	auto        results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		LogSpawns("Unable to query remote condition [{}] from zone [{}] in Get request", condition_id, zone_short);
+		return 0;    //dunno a better thing to do...
+	}
 
-    if (results.RowCount() == 0) {
-        Log(Logs::Detail, Logs::Spawns, "Unable to load remote condition %d from zone %s in Get request.", condition_id, zone_short);
-		return 0;	//dunno a better thing to do...
-    }
+	if (results.RowCount() == 0) {
+		LogSpawns("Unable to load remote condition [{}] from zone [{}] in Get request", condition_id, zone_short);
+		return 0;    //dunno a better thing to do...
+	}
 
     auto row = results.begin();
 
diff --git a/zone/spawngroup.cpp b/zone/spawngroup.cpp
index 7cb5cd803..cc3735386 100644
--- a/zone/spawngroup.cpp
+++ b/zone/spawngroup.cpp
@@ -16,8 +16,8 @@
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 */
 
+#include <fmt/format.h>
 #include "../common/global_define.h"
-#include "../common/string_util.h"
 #include "../common/types.h"
 
 #include "entity.h"
@@ -26,209 +26,356 @@
 #include "zonedb.h"
 
 extern EntityList entity_list;
-extern Zone* zone;
+extern Zone       *zone;
 
-SpawnEntry::SpawnEntry( uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit ) {
-	NPCType = in_NPCType;
-	chance = in_chance;
-	npc_spawn_limit = in_npc_spawn_limit;
+SpawnEntry::SpawnEntry(uint32 in_NPCType, int in_chance, uint16 in_filter, uint8 in_npc_spawn_limit)
+{
+	NPCType                = in_NPCType;
+	chance                 = in_chance;
+	condition_value_filter = in_filter;
+	npc_spawn_limit        = in_npc_spawn_limit;
 }
 
-SpawnGroup::SpawnGroup( uint32 in_id, char* name, int in_group_spawn_limit, float dist, float maxx, float minx, float maxy, float miny, int delay_in, int despawn_in, uint32 despawn_timer_in, int min_delay_in ) {
+SpawnGroup::SpawnGroup(
+	uint32 in_id,
+	char *name,
+	int in_group_spawn_limit,
+	float dist,
+	float maxx,
+	float minx,
+	float maxy,
+	float miny,
+	int delay_in,
+	int despawn_in,
+	uint32 despawn_timer_in,
+	int min_delay_in
+)
+{
 	id = in_id;
-	strn0cpy( name_, name, 120);
+	strn0cpy(name_, name, 120);
 	group_spawn_limit = in_group_spawn_limit;
-	roambox[0]=maxx;
-	roambox[1]=minx;
-	roambox[2]=maxy;
-	roambox[3]=miny;
-	roamdist=dist;
-	min_delay=min_delay_in;
-	delay=delay_in;
-	despawn=despawn_in;
-	despawn_timer=despawn_timer_in;
+	roambox[0] = maxx;
+	roambox[1] = minx;
+	roambox[2] = maxy;
+	roambox[3] = miny;
+	roamdist      = dist;
+	min_delay     = min_delay_in;
+	delay         = delay_in;
+	despawn       = despawn_in;
+	despawn_timer = despawn_timer_in;
 }
 
-uint32 SpawnGroup::GetNPCType() {
-#if EQDEBUG >= 10
-	Log(Logs::General, Logs::None, "SpawnGroup[%08x]::GetNPCType()", (uint32) this);
-#endif
-	int npcType = 0;
+uint32 SpawnGroup::GetNPCType(uint16 in_filter)
+{
+	int npcType     = 0;
 	int totalchance = 0;
 
-	if(!entity_list.LimitCheckGroup(id, group_spawn_limit))
-		return(0);
+	if (!entity_list.LimitCheckGroup(id, group_spawn_limit)) {
+		return (0);
+	}
 
-	std::list<SpawnEntry*>::iterator cur,end;
-	std::list<SpawnEntry*> possible;
+	std::list<SpawnEntry *>::iterator cur, end;
+	std::list<SpawnEntry *>           possible;
 	cur = list_.begin();
 	end = list_.end();
-	for(; cur != end; ++cur) {
+	for (; cur != end; ++cur) {
 		SpawnEntry *se = *cur;
 
-		if(!entity_list.LimitCheckType(se->NPCType, se->npc_spawn_limit))
+		if (!entity_list.LimitCheckType(se->NPCType, se->npc_spawn_limit)) {
+			continue;
+		}
+
+		if (se->condition_value_filter != in_filter)
 			continue;
 
 		totalchance += se->chance;
 		possible.push_back(se);
 	}
-	if(totalchance == 0)
+	if (totalchance == 0) {
 		return 0;
-
+	}
 
 	int32 roll = 0;
-	roll = zone->random.Int(0, totalchance-1);
+	roll = zone->random.Int(0, totalchance - 1);
 
 	cur = possible.begin();
 	end = possible.end();
-	for(; cur != end; ++cur) {
+	for (; cur != end; ++cur) {
 		SpawnEntry *se = *cur;
 		if (roll < se->chance) {
 			npcType = se->NPCType;
 			break;
-		} else {
+		}
+		else {
 			roll -= se->chance;
 		}
 	}
 	return npcType;
 }
 
-void SpawnGroup::AddSpawnEntry( SpawnEntry* newEntry ) {
-	list_.push_back( newEntry );
+void SpawnGroup::AddSpawnEntry(SpawnEntry *newEntry)
+{
+	list_.push_back(newEntry);
 }
 
-SpawnGroup::~SpawnGroup() {
-	std::list<SpawnEntry*>::iterator cur,end;
+SpawnGroup::~SpawnGroup()
+{
+	std::list<SpawnEntry *>::iterator cur, end;
 	cur = list_.begin();
 	end = list_.end();
-	for(; cur != end; ++cur) {
-		SpawnEntry* tmp = *cur;
+	for (; cur != end; ++cur) {
+		SpawnEntry *tmp = *cur;
 		safe_delete(tmp);
 	}
 	list_.clear();
 }
 
-SpawnGroupList::~SpawnGroupList() {
-	std::map<uint32, SpawnGroup*>::iterator cur,end;
-	cur = groups.begin();
-	end = groups.end();
-	for(; cur != end; ++cur) {
-		SpawnGroup* tmp = cur->second;
+SpawnGroupList::~SpawnGroupList()
+{
+	std::map<uint32, SpawnGroup *>::iterator cur, end;
+	cur = m_spawn_groups.begin();
+	end = m_spawn_groups.end();
+	for (; cur != end; ++cur) {
+		SpawnGroup *tmp = cur->second;
 		safe_delete(tmp);
 	}
-	groups.clear();
+	m_spawn_groups.clear();
 }
 
-void SpawnGroupList::AddSpawnGroup(SpawnGroup* newGroup) {
-	if(newGroup == nullptr)
+void SpawnGroupList::AddSpawnGroup(SpawnGroup *new_group)
+{
+	if (new_group == nullptr) {
 		return;
-	groups[newGroup->id] = newGroup;
+	}
+
+	m_spawn_groups[new_group->id] = new_group;
 }
 
-SpawnGroup* SpawnGroupList::GetSpawnGroup(uint32 in_id) {
-	if(groups.count(in_id) != 1)
+SpawnGroup *SpawnGroupList::GetSpawnGroup(uint32 in_id)
+{
+	if (m_spawn_groups.count(in_id) != 1) {
 		return nullptr;
-	return(groups[in_id]);
+	}
+
+	return (m_spawn_groups[in_id]);
 }
 
-bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id) {
-	if(groups.count(in_id) != 1)
-		return(false);
+bool SpawnGroupList::RemoveSpawnGroup(uint32 in_id)
+{
+	if (m_spawn_groups.count(in_id) != 1) {
+		return (false);
+	}
 
-	groups.erase(in_id);
-	return(true);
+	m_spawn_groups.erase(in_id);
+
+	return (true);
+}
+
+void SpawnGroupList::ReloadSpawnGroups()
+{
+	ClearSpawnGroups();
+	database.LoadSpawnGroups(zone->GetShortName(), zone->GetInstanceVersion(), &zone->spawn_group_list);
+}
+
+void SpawnGroupList::ClearSpawnGroups()
+{
+	m_spawn_groups.clear();
 }
 
 bool ZoneDatabase::LoadSpawnGroups(const char *zone_name, uint16 version, SpawnGroupList *spawn_group_list)
 {
-	std::string query = StringFormat("SELECT DISTINCT(spawngroupID), spawngroup.name, spawngroup.spawn_limit, "
-					 "spawngroup.dist, spawngroup.max_x, spawngroup.min_x, "
-					 "spawngroup.max_y, spawngroup.min_y, spawngroup.delay, "
-					 "spawngroup.despawn, spawngroup.despawn_timer, spawngroup.mindelay "
-					 "FROM spawn2, spawngroup WHERE spawn2.spawngroupID = spawngroup.ID "
-					 "AND spawn2.version = %u and zone = '%s'",
-					 version, zone_name);
+	std::string query = fmt::format(
+		SQL(
+			SELECT
+			DISTINCT(spawngroupID),
+			spawngroup.name,
+			spawngroup.spawn_limit,
+			spawngroup.dist,
+			spawngroup.max_x,
+			spawngroup.min_x,
+			spawngroup.max_y,
+			spawngroup.min_y,
+			spawngroup.delay,
+			spawngroup.despawn,
+			spawngroup.despawn_timer,
+			spawngroup.mindelay
+				FROM
+				spawn2,
+			spawngroup
+				WHERE
+				spawn2.spawngroupID = spawngroup.ID
+				AND
+				spawn2.version = {} and zone = '{}'
+		),
+		version,
+		zone_name
+	);
+
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
 		return false;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto newSpawnGroup = new SpawnGroup(atoi(row[0]), row[1], atoi(row[2]), atof(row[3]), atof(row[4]),
-						    atof(row[5]), atof(row[6]), atof(row[7]), atoi(row[8]),
-						    atoi(row[9]), atoi(row[10]), atoi(row[11]));
-		spawn_group_list->AddSpawnGroup(newSpawnGroup);
+		auto new_spawn_group = new SpawnGroup(
+			atoi(row[0]),
+			row[1],
+			atoi(row[2]),
+			atof(row[3]),
+			atof(row[4]),
+			atof(row[5]),
+			atof(row[6]),
+			atof(row[7]),
+			atoi(row[8]),
+			atoi(row[9]),
+			atoi(row[10]),
+			atoi(row[11])
+		);
+
+		spawn_group_list->AddSpawnGroup(new_spawn_group);
 	}
 
-	query = StringFormat("SELECT DISTINCT spawnentry.spawngroupID, npcid, chance, "
-			     "npc_types.spawn_limit AS sl "
-			     "FROM spawnentry, spawn2, npc_types "
-			     "WHERE spawnentry.npcID=npc_types.id "
-			     "AND spawnentry.spawngroupID = spawn2.spawngroupID "
-			     "AND zone = '%s'",
-			     zone_name);
+	query = fmt::format(
+		SQL(
+			SELECT
+				DISTINCT
+			spawnentry.spawngroupID,
+			npcid,
+			chance,
+			condition_value_filter,
+			npc_types.spawn_limit
+				AS sl
+				FROM
+				spawnentry,
+			spawn2,
+			npc_types
+				WHERE
+				spawnentry.npcID = npc_types.id
+				AND
+				spawnentry.spawngroupID = spawn2.spawngroupID
+				AND
+				zone = '{}'),
+		zone_name
+	);
+
 	results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error2 in PopulateZoneLists query '%'", query.c_str());
 		return false;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto newSpawnEntry = new SpawnEntry(atoi(row[1]), atoi(row[2]), row[3] ? atoi(row[3]) : 0);
-		SpawnGroup *sg = spawn_group_list->GetSpawnGroup(atoi(row[0]));
+		auto new_spawn_entry = new SpawnEntry(
+			atoi(row[1]),
+			atoi(row[2]),
+			atoi(row[3]),
+			(row[4] ? atoi(row[4]) : 0)
+		);
 
-		if (!sg) {
-			safe_delete(newSpawnEntry);
+		SpawnGroup *spawn_group = spawn_group_list->GetSpawnGroup(atoi(row[0]));
+
+		if (!spawn_group) {
+			safe_delete(new_spawn_entry);
 			continue;
 		}
 
-		sg->AddSpawnEntry(newSpawnEntry);
+		spawn_group->AddSpawnEntry(new_spawn_entry);
 	}
 
 	return true;
 }
 
-bool ZoneDatabase::LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList *spawn_group_list)
+/**
+ * @param spawn_group_id
+ * @param spawn_group_list
+ * @return
+ */
+bool ZoneDatabase::LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList *spawn_group_list)
 {
-	std::string query = StringFormat("SELECT DISTINCT(spawngroup.id), spawngroup.name, spawngroup.spawn_limit, "
-					 "spawngroup.dist, spawngroup.max_x, spawngroup.min_x, "
-					 "spawngroup.max_y, spawngroup.min_y, spawngroup.delay, "
-					 "spawngroup.despawn, spawngroup.despawn_timer, spawngroup.mindelay "
-					 "FROM spawngroup WHERE spawngroup.ID = '%i'",
-					 spawngroupid);
+	std::string query = fmt::format(
+		SQL(
+			SELECT DISTINCT
+			(spawngroup.id),
+			spawngroup.name,
+			spawngroup.spawn_limit,
+			spawngroup.dist,
+			spawngroup.max_x,
+			spawngroup.min_x,
+			spawngroup.max_y,
+			spawngroup.min_y,
+			spawngroup.delay,
+			spawngroup.despawn,
+			spawngroup.despawn_timer,
+			spawngroup.mindelay
+				FROM
+					spawngroup
+				WHERE
+				spawngroup.ID = '{}'
+		),
+		spawn_group_id
+	);
+
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error2 in PopulateZoneLists query %s", query.c_str());
 		return false;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto newSpawnGroup = new SpawnGroup(atoi(row[0]), row[1], atoi(row[2]), atof(row[3]), atof(row[4]),
-						    atof(row[5]), atof(row[6]), atof(row[7]), atoi(row[8]),
-						    atoi(row[9]), atoi(row[10]), atoi(row[11]));
-		spawn_group_list->AddSpawnGroup(newSpawnGroup);
+		auto new_spawn_group = new SpawnGroup(
+			atoi(row[0]),
+			row[1],
+			atoi(row[2]),
+			atof(row[3]),
+			atof(row[4]),
+			atof(row[5]),
+			atof(row[6]),
+			atof(row[7]),
+			atoi(row[8]),
+			atoi(row[9]),
+			atoi(row[10]),
+			atoi(row[11])
+		);
+
+		spawn_group_list->AddSpawnGroup(new_spawn_group);
 	}
 
-	query = StringFormat("SELECT DISTINCT(spawnentry.spawngroupID), spawnentry.npcid, "
-			     "spawnentry.chance, spawngroup.spawn_limit FROM spawnentry, spawngroup "
-			     "WHERE spawnentry.spawngroupID = '%i' AND spawngroup.spawn_limit = '0' "
-			     "ORDER BY chance",
-			     spawngroupid);
+	query   = fmt::format(
+		SQL(
+			SELECT DISTINCT
+			(spawnentry.spawngroupID),
+			spawnentry.npcid,
+			spawnentry.chance,
+			spawnentry.condition_value_filter,
+			spawngroup.spawn_limit
+				FROM
+				spawnentry,
+			spawngroup
+				WHERE
+				spawnentry.spawngroupID = '{}'
+				AND spawngroup.spawn_limit = '0'
+				ORDER BY chance),
+		spawn_group_id
+	);
+
 	results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error3 in PopulateZoneLists query '%s'", query.c_str());
 		return false;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		auto newSpawnEntry = new SpawnEntry(atoi(row[1]), atoi(row[2]), row[3] ? atoi(row[3]) : 0);
-		SpawnGroup *sg = spawn_group_list->GetSpawnGroup(atoi(row[0]));
-		if (!sg) {
-			safe_delete(newSpawnEntry);
+		auto new_spawn_entry = new SpawnEntry(
+			atoi(row[1]),
+			atoi(row[2]),
+			atoi(row[3]),
+			(row[4] ? atoi(row[4]) : 0)
+		);
+
+		SpawnGroup *spawn_group = spawn_group_list->GetSpawnGroup(atoi(row[0]));
+		if (!spawn_group) {
+			safe_delete(new_spawn_entry);
 			continue;
 		}
 
-		sg->AddSpawnEntry(newSpawnEntry);
+		spawn_group->AddSpawnEntry(new_spawn_entry);
 	}
 
 	return true;
diff --git a/zone/spawngroup.h b/zone/spawngroup.h
index b5f6d18cf..2a4c1af6c 100644
--- a/zone/spawngroup.h
+++ b/zone/spawngroup.h
@@ -23,50 +23,64 @@
 #include <map>
 #include <list>
 
-class SpawnEntry
-{
+class SpawnEntry {
 public:
-	SpawnEntry(uint32 in_NPCType, int in_chance, uint8 in_npc_spawn_limit );
-	~SpawnEntry() { }
+	SpawnEntry(uint32 in_NPCType, int in_chance, uint16 in_filter, uint8 in_npc_spawn_limit);
+	~SpawnEntry() {}
 	uint32 NPCType;
-	int chance;
+	int    chance;
+	uint16 condition_value_filter;
 
 	//this is a cached value from npc_types, for speed
 	uint8 npc_spawn_limit; //max # of this entry which can be spawned in this zone
 };
 
-class SpawnGroup
-{
+class SpawnGroup {
 public:
-	SpawnGroup(uint32 in_id, char* name, int in_group_spawn_limit, float dist, float maxx, float minx, float maxy, float miny, int delay_in, int despawn_in, uint32 despawn_timer_in, int min_delay_in );
+	SpawnGroup(
+		uint32 in_id,
+		char *name,
+		int in_group_spawn_limit,
+		float dist,
+		float maxx,
+		float minx,
+		float maxy,
+		float miny,
+		int delay_in,
+		int despawn_in,
+		uint32 despawn_timer_in,
+		int min_delay_in
+	);
+
 	~SpawnGroup();
-	uint32 GetNPCType();
-	void AddSpawnEntry( SpawnEntry* newEntry );
+	uint32 GetNPCType(uint16 condition_value_filter=1);
+	void AddSpawnEntry(SpawnEntry *newEntry);
 	uint32 id;
-	float roamdist;
-	float roambox[4];
-	int min_delay;
-	int delay;
-	int despawn;
+	float  roamdist;
+	float  roambox[4];
+	int    min_delay;
+	int    delay;
+	int    despawn;
 	uint32 despawn_timer;
 private:
 	char name_[120];
-	std::list<SpawnEntry*> list_;
+	std::list<SpawnEntry *> list_;
 	uint8 group_spawn_limit; //max # of this entry which can be spawned by this group
 };
 
-class SpawnGroupList
-{
+class SpawnGroupList {
 public:
-	SpawnGroupList() { }
+	SpawnGroupList() {}
 	~SpawnGroupList();
 
-	void AddSpawnGroup(SpawnGroup* newGroup);
-	SpawnGroup* GetSpawnGroup(uint32 id);
+	void AddSpawnGroup(SpawnGroup *new_group);
+	SpawnGroup *GetSpawnGroup(uint32 id);
 	bool RemoveSpawnGroup(uint32 in_id);
+	void ClearSpawnGroups();
+	void ReloadSpawnGroups();
 private:
 	//LinkedList<SpawnGroup*> list_;
-	std::map<uint32, SpawnGroup*> groups;
+	std::map<uint32, SpawnGroup *> m_spawn_groups;
 };
 
 #endif
diff --git a/zone/special_attacks.cpp b/zone/special_attacks.cpp
index bcffa4077..b7cdebf02 100644
--- a/zone/special_attacks.cpp
+++ b/zone/special_attacks.cpp
@@ -177,7 +177,7 @@ void Mob::DoSpecialAttackDamage(Mob *who, EQEmu::skills::SkillType skill, int32
 				auto fbash = GetFuriousBash(itm->Focus.Effect);
 				hate = hate * (100 + fbash) / 100;
 				if (fbash)
-					Message_StringID(MT_Spells, GLOWS_RED, itm->Name);
+					MessageString(Chat::Spells, GLOWS_RED, itm->Name);
 			}
 		}
 	}
@@ -283,7 +283,7 @@ void Client::OPCombatAbility(const CombatAbility_Struct *ca_atk)
 		return;
 
 	if (!p_timers.Expired(&database, timer, false)) {
-		Message(13, "Ability recovery time not yet met.");
+		Message(Chat::Red, "Ability recovery time not yet met.");
 		return;
 	}
 
@@ -530,7 +530,7 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) {
 	if(IsClient()) {
 		const EQEmu::ItemInstance *wpn = CastToClient()->GetInv().GetItem(EQEmu::invslot::slotPrimary);
 		if (!wpn || (wpn->GetItem()->ItemType != EQEmu::item::ItemType1HPiercing)){
-			Message_StringID(13, BACKSTAB_WEAPON);
+			MessageString(Chat::Red, BACKSTAB_WEAPON);
 			return;
 		}
 	}
@@ -551,7 +551,7 @@ void Mob::TryBackstab(Mob *other, int ReuseTime) {
 
 	if (bIsBehind || bCanFrontalBS || (IsNPC() && CanFacestab())) { // Player is behind other OR can do Frontal Backstab
 		if (bCanFrontalBS && IsClient()) // I don't think there is any message ...
-			CastToClient()->Message(0,"Your fierce attack is executed with such grace, your target did not see it coming!");
+			CastToClient()->Message(Chat::White,"Your fierce attack is executed with such grace, your target did not see it coming!");
 
 		RogueBackstab(other,false,ReuseTime);
 		if (level > 54) {
@@ -631,7 +631,7 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) {
 	//make sure the attack and ranged timers are up
 	//if the ranged timer is disabled, then they have no ranged weapon and shouldent be attacking anyhow
 	if(!CanDoubleAttack && ((attack_timer.Enabled() && !attack_timer.Check(false)) || (ranged_timer.Enabled() && !ranged_timer.Check()))) {
-		Log(Logs::Detail, Logs::Combat, "Throwing attack canceled. Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
+		LogCombat("Throwing attack canceled. Timer not up. Attack [{}], ranged [{}]", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
 		// The server and client timers are not exact matches currently, so this would spam too often if enabled
 		//Message(0, "Error: Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
 		return;
@@ -643,12 +643,12 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) {
 	const EQEmu::ItemInstance* Ammo = m_inv[EQEmu::invslot::slotAmmo];
 
 	if (!RangeWeapon || !RangeWeapon->IsClassCommon()) {
-		Log(Logs::Detail, Logs::Combat, "Ranged attack canceled. Missing or invalid ranged weapon (%d) in slot %d", GetItemIDAt(EQEmu::invslot::slotRange), EQEmu::invslot::slotRange);
+		LogCombat("Ranged attack canceled. Missing or invalid ranged weapon ([{}]) in slot [{}]", GetItemIDAt(EQEmu::invslot::slotRange), EQEmu::invslot::slotRange);
 		Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have no bow!", GetItemIDAt(EQEmu::invslot::slotRange));
 		return;
 	}
 	if (!Ammo || !Ammo->IsClassCommon()) {
-		Log(Logs::Detail, Logs::Combat, "Ranged attack canceled. Missing or invalid ammo item (%d) in slot %d", GetItemIDAt(EQEmu::invslot::slotAmmo), EQEmu::invslot::slotAmmo);
+		LogCombat("Ranged attack canceled. Missing or invalid ammo item ([{}]) in slot [{}]", GetItemIDAt(EQEmu::invslot::slotAmmo), EQEmu::invslot::slotAmmo);
 		Message(0, "Error: Ammo: GetItem(%i)==0, you have no ammo!", GetItemIDAt(EQEmu::invslot::slotAmmo));
 		return;
 	}
@@ -657,17 +657,17 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) {
 	const EQEmu::ItemData* AmmoItem = Ammo->GetItem();
 
 	if (RangeItem->ItemType != EQEmu::item::ItemTypeBow) {
-		Log(Logs::Detail, Logs::Combat, "Ranged attack canceled. Ranged item is not a bow. type %d.", RangeItem->ItemType);
+		LogCombat("Ranged attack canceled. Ranged item is not a bow. type [{}]", RangeItem->ItemType);
 		Message(0, "Error: Rangeweapon: Item %d is not a bow.", RangeWeapon->GetID());
 		return;
 	}
 	if (AmmoItem->ItemType != EQEmu::item::ItemTypeArrow) {
-		Log(Logs::Detail, Logs::Combat, "Ranged attack canceled. Ammo item is not an arrow. type %d.", AmmoItem->ItemType);
+		LogCombat("Ranged attack canceled. Ammo item is not an arrow. type [{}]", AmmoItem->ItemType);
 		Message(0, "Error: Ammo: type %d != %d, you have the wrong type of ammo!", AmmoItem->ItemType, EQEmu::item::ItemTypeArrow);
 		return;
 	}
 
-	Log(Logs::Detail, Logs::Combat, "Shooting %s with bow %s (%d) and arrow %s (%d)", other->GetName(), RangeItem->Name, RangeItem->ID, AmmoItem->Name, AmmoItem->ID);
+	LogCombat("Shooting [{}] with bow [{}] ([{}]) and arrow [{}] ([{}])", other->GetName(), RangeItem->Name, RangeItem->ID, AmmoItem->Name, AmmoItem->ID);
 
 	//look for ammo in inventory if we only have 1 left...
 	if(Ammo->GetCharges() == 1) {
@@ -694,7 +694,7 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) {
 					Ammo = baginst;
 					ammo_slot = m_inv.CalcSlotId(r, i);
 					found = true;
-					Log(Logs::Detail, Logs::Combat, "Using ammo from quiver stack at slot %d. %d in stack.", ammo_slot, Ammo->GetCharges());
+					LogCombat("Using ammo from quiver stack at slot [{}]. [{}] in stack", ammo_slot, Ammo->GetCharges());
 					break;
 				}
 			}
@@ -709,22 +709,22 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) {
 			if (aslot != INVALID_INDEX) {
 				ammo_slot = aslot;
 				Ammo = m_inv[aslot];
-				Log(Logs::Detail, Logs::Combat, "Using ammo from inventory stack at slot %d. %d in stack.", ammo_slot, Ammo->GetCharges());
+				LogCombat("Using ammo from inventory stack at slot [{}]. [{}] in stack", ammo_slot, Ammo->GetCharges());
 			}
 		}
 	}
 
 	float range = RangeItem->Range + AmmoItem->Range + GetRangeDistTargetSizeMod(GetTarget());
-	Log(Logs::Detail, Logs::Combat, "Calculated bow range to be %.1f", range);
+	LogCombat("Calculated bow range to be [{}]", range);
 	range *= range;
 	float dist = DistanceSquared(m_Position, other->GetPosition());
 	if(dist > range) {
-		Log(Logs::Detail, Logs::Combat, "Ranged attack out of range... client should catch this. (%f > %f).\n", dist, range);
-		Message_StringID(13,TARGET_OUT_OF_RANGE);//Client enforces range and sends the message, this is a backup just incase.
+		LogCombat("Ranged attack out of range client should catch this. ([{}] > [{}]).\n", dist, range);
+		MessageString(Chat::Red,TARGET_OUT_OF_RANGE);//Client enforces range and sends the message, this is a backup just incase.
 		return;
 	}
 	else if(dist < (RuleI(Combat, MinRangedAttackDist)*RuleI(Combat, MinRangedAttackDist))){
-		Message_StringID(15,RANGED_TOO_CLOSE);//Client enforces range and sends the message, this is a backup just incase.
+		MessageString(Chat::Yellow,RANGED_TOO_CLOSE);//Client enforces range and sends the message, this is a backup just incase.
 		return;
 	}
 
@@ -747,9 +747,9 @@ void Client::RangedAttack(Mob* other, bool CanDoubleAttack) {
 
 	if (RangeItem->ExpendableArrow || !ChanceAvoidConsume || (ChanceAvoidConsume < 100 && zone->random.Int(0,99) > ChanceAvoidConsume)){
 		DeleteItemInInventory(ammo_slot, 1, true);
-		Log(Logs::Detail, Logs::Combat, "Consumed one arrow from slot %d", ammo_slot);
+		LogCombat("Consumed one arrow from slot [{}]", ammo_slot);
 	} else {
-		Log(Logs::Detail, Logs::Combat, "Endless Quiver prevented ammo consumption.");
+		LogCombat("Endless Quiver prevented ammo consumption");
 	}
 
 	CheckIncreaseSkill(EQEmu::skills::SkillArchery, GetTarget(), -15);
@@ -808,7 +808,7 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon,
 		SendItemAnimation(other, AmmoItem, EQEmu::skills::SkillArchery);
 	}
 
-	Log(Logs::Detail, Logs::Combat, "Ranged attack hit %s.", other->GetName());
+	LogCombat("Ranged attack hit [{}]", other->GetName());
 
 	uint32 hate = 0;
 	int TotalDmg = 0;
@@ -840,12 +840,10 @@ void Mob::DoArcheryAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon,
 		hate = ((WDmg + ADmg));
 
 		if (RuleB(Combat, ProjectileDmgOnImpact)) {
-			Log(Logs::Detail, Logs::Combat, "Bow and Arrow DMG %d, Max Damage %d.", WDmg,
-				MaxDmg);
+			LogCombat("Bow and Arrow DMG [{}], Max Damage [{}]", WDmg, MaxDmg);
 		}
 		else {
-			Log(Logs::Detail, Logs::Combat, "Bow DMG %d, Arrow DMG %d, Max Damage %d.", WDmg,
-				ADmg, MaxDmg);
+			LogCombat("Bow DMG [{}], Arrow DMG [{}], Max Damage [{}]", WDmg, ADmg, MaxDmg);
 		}
 
 		if (MaxDmg == 0)
@@ -1087,7 +1085,7 @@ void NPC::RangedAttack(Mob* other)
 	//make sure the attack and ranged timers are up
 	//if the ranged timer is disabled, then they have no ranged weapon and shouldent be attacking anyhow
 	if((attack_timer.Enabled() && !attack_timer.Check(false)) || (ranged_timer.Enabled() && !ranged_timer.Check())){
-		Log(Logs::Detail, Logs::Combat, "Archery canceled. Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
+		LogCombat("Archery canceled. Timer not up. Attack [{}], ranged [{}]", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
 		return;
 	}
 
@@ -1223,7 +1221,7 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51
 	//make sure the attack and ranged timers are up
 	//if the ranged timer is disabled, then they have no ranged weapon and shouldent be attacking anyhow
 	if((!CanDoubleAttack && (attack_timer.Enabled() && !attack_timer.Check(false)) || (ranged_timer.Enabled() && !ranged_timer.Check()))) {
-		Log(Logs::Detail, Logs::Combat, "Throwing attack canceled. Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
+		LogCombat("Throwing attack canceled. Timer not up. Attack [{}], ranged [{}]", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
 		// The server and client timers are not exact matches currently, so this would spam too often if enabled
 		//Message(0, "Error: Timer not up. Attack %d, ranged %d", attack_timer.GetRemainingTime(), ranged_timer.GetRemainingTime());
 		return;
@@ -1233,19 +1231,19 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51
 	const EQEmu::ItemInstance* RangeWeapon = m_inv[EQEmu::invslot::slotRange];
 
 	if (!RangeWeapon || !RangeWeapon->IsClassCommon()) {
-		Log(Logs::Detail, Logs::Combat, "Ranged attack canceled. Missing or invalid ranged weapon (%d) in slot %d", GetItemIDAt(EQEmu::invslot::slotRange), EQEmu::invslot::slotRange);
+		LogCombat("Ranged attack canceled. Missing or invalid ranged weapon ([{}]) in slot [{}]", GetItemIDAt(EQEmu::invslot::slotRange), EQEmu::invslot::slotRange);
 		Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have nothing to throw!", GetItemIDAt(EQEmu::invslot::slotRange));
 		return;
 	}
 
 	const EQEmu::ItemData* item = RangeWeapon->GetItem();
 	if (item->ItemType != EQEmu::item::ItemTypeLargeThrowing && item->ItemType != EQEmu::item::ItemTypeSmallThrowing) {
-		Log(Logs::Detail, Logs::Combat, "Ranged attack canceled. Ranged item %d is not a throwing weapon. type %d.", item->ItemType);
+		LogCombat("Ranged attack canceled. Ranged item [{}] is not a throwing weapon. type [{}]", item->ItemType);
 		Message(0, "Error: Rangeweapon: GetItem(%i)==0, you have nothing useful to throw!", GetItemIDAt(EQEmu::invslot::slotRange));
 		return;
 	}
 
-	Log(Logs::Detail, Logs::Combat, "Throwing %s (%d) at %s", item->Name, item->ID, other->GetName());
+	LogCombat("Throwing [{}] ([{}]) at [{}]", item->Name, item->ID, other->GetName());
 
 	if(RangeWeapon->GetCharges() == 1) {
 		//first check ammo
@@ -1254,7 +1252,7 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51
 			//more in the ammo slot, use it
 			RangeWeapon = AmmoItem;
 			ammo_slot = EQEmu::invslot::slotAmmo;
-			Log(Logs::Detail, Logs::Combat, "Using ammo from ammo slot, stack at slot %d. %d in stack.", ammo_slot, RangeWeapon->GetCharges());
+			LogCombat("Using ammo from ammo slot, stack at slot [{}]. [{}] in stack", ammo_slot, RangeWeapon->GetCharges());
 		} else {
 			//look through our inventory for more
 			int32 aslot = m_inv.HasItem(item->ID, 1, invWherePersonal);
@@ -1262,22 +1260,22 @@ void Client::ThrowingAttack(Mob* other, bool CanDoubleAttack) { //old was 51
 				//the item wont change, but the instance does, not that it matters
 				ammo_slot = aslot;
 				RangeWeapon = m_inv[aslot];
-				Log(Logs::Detail, Logs::Combat, "Using ammo from inventory slot, stack at slot %d. %d in stack.", ammo_slot, RangeWeapon->GetCharges());
+				LogCombat("Using ammo from inventory slot, stack at slot [{}]. [{}] in stack", ammo_slot, RangeWeapon->GetCharges());
 			}
 		}
 	}
 
 	float range = item->Range + GetRangeDistTargetSizeMod(other);
-	Log(Logs::Detail, Logs::Combat, "Calculated bow range to be %.1f", range);
+	LogCombat("Calculated bow range to be [{}]", range);
 	range *= range;
 	float dist = DistanceSquared(m_Position, other->GetPosition());
 	if(dist > range) {
-		Log(Logs::Detail, Logs::Combat, "Throwing attack out of range... client should catch this. (%f > %f).\n", dist, range);
-		Message_StringID(13,TARGET_OUT_OF_RANGE);//Client enforces range and sends the message, this is a backup just incase.
+		LogCombat("Throwing attack out of range client should catch this. ([{}] > [{}]).\n", dist, range);
+		MessageString(Chat::Red,TARGET_OUT_OF_RANGE);//Client enforces range and sends the message, this is a backup just incase.
 		return;
 	}
 	else if(dist < (RuleI(Combat, MinRangedAttackDist)*RuleI(Combat, MinRangedAttackDist))){
-		Message_StringID(15,RANGED_TOO_CLOSE);//Client enforces range and sends the message, this is a backup just incase.
+		MessageString(Chat::Yellow,RANGED_TOO_CLOSE);//Client enforces range and sends the message, this is a backup just incase.
 		return;
 	}
 
@@ -1339,7 +1337,7 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon
 		SendItemAnimation(other, AmmoItem, EQEmu::skills::SkillThrowing);
 	}
 
-	Log(Logs::Detail, Logs::Combat, "Throwing attack hit %s.", other->GetName());
+	LogCombat("Throwing attack hit [{}]", other->GetName());
 
 	int WDmg = 0;
 
@@ -1377,7 +1375,7 @@ void Mob::DoThrowingAttackDmg(Mob *other, const EQEmu::ItemInstance *RangeWeapon
 		DoAttack(other, my_hit);
 		TotalDmg = my_hit.damage_done;
 
-		Log(Logs::Detail, Logs::Combat, "Item DMG %d. Hit for damage %d", WDmg, TotalDmg);
+		LogCombat("Item DMG [{}]. Hit for damage [{}]", WDmg, TotalDmg);
 	} else {
 		TotalDmg = DMG_INVULNERABLE;
 	}
@@ -1566,7 +1564,7 @@ void NPC::DoClassAttacks(Mob *target) {
 	//general stuff, for all classes....
 	//only gets used when their primary ability get used too
 	if (taunting && HasOwner() && target->IsNPC() && target->GetBodyType() != BT_Undead && taunt_time) {
-		this->GetOwner()->Message_StringID(MT_PetResponse, PET_TAUNTING);
+		this->GetOwner()->MessageString(Chat::PetResponse, PET_TAUNTING);
 		Taunt(target->CastToNPC(), false);
 	}
 
@@ -1898,7 +1896,7 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell,
 	// Support for how taunt worked pre 2000 on LIVE - Can not taunt NPC over your level.
 	if ((RuleB(Combat, TauntOverLevel) == false) && (level_difference < 0) ||
 	    who->GetSpecialAbility(IMMUNE_TAUNT)) {
-		Message_StringID(MT_SpellFailure, FAILED_TAUNT);
+		MessageString(Chat::SpellFailure, FAILED_TAUNT);
 		return;
 	}
 
@@ -1953,12 +1951,12 @@ void Mob::Taunt(NPC *who, bool always_succeed, int chance_bonus, bool FromSpell,
 			}
 
 			if (who->CanTalk())
-				who->Say_StringID(SUCCESSFUL_TAUNT, GetCleanName());
+				who->SayString(SUCCESSFUL_TAUNT, GetCleanName());
 		} else {
-			Message_StringID(MT_SpellFailure, FAILED_TAUNT);
+			MessageString(Chat::SpellFailure, FAILED_TAUNT);
 		}
 	} else {
-		Message_StringID(MT_SpellFailure, FAILED_TAUNT);
+		MessageString(Chat::SpellFailure, FAILED_TAUNT);
 	}
 
 	if (HasSkillProcs())
@@ -2003,10 +2001,10 @@ void Mob::InstillDoubt(Mob *who) {
 		SpellOnTarget(229, who, false, true, -2000);
 		//is there a success message?
 	} else {
-		Message_StringID(4,NOT_SCARING);
+		MessageString(Chat::LightBlue,NOT_SCARING);
 		//Idea from WR:
 		/* if (target->IsNPC() && zone->random.Int(0,99) < 10 ) {
-			entity_list.MessageClose(target, false, 50, MT_NPCRampage, "%s lashes out in anger!",target->GetName());
+			entity_list.MessageClose(target, false, 50, Chat::NPCRampage, "%s lashes out in anger!",target->GetName());
 			//should we actually do this? and the range is completely made up, unconfirmed
 			entity_list.AEAttack(target, 50);
 		}*/
@@ -2033,8 +2031,9 @@ int Mob::TryHeadShot(Mob *defender, EQEmu::skills::SkillType skillInUse)
 				chance = chance * norm / 100;
 			chance += aabonuses.HeadShot[0] + spellbonuses.HeadShot[0] + itembonuses.HeadShot[0];
 			if (zone->random.Int(1, 1000) <= chance) {
-				entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, FATAL_BOW_SHOT,
-								  GetName());
+				entity_list.MessageCloseString(
+					this, false, 200, Chat::MeleeCrit, FATAL_BOW_SHOT,
+					GetName());
 				return HeadShot_Dmg;
 			}
 		}
@@ -2078,8 +2077,9 @@ int Mob::TryAssassinate(Mob *defender, EQEmu::skills::SkillType skillInUse)
 
 		if (Assassinate_Dmg && Assassinate_Level && (defender->GetLevel() <= Assassinate_Level)) {
 			if (zone->random.Int(1, 1000) <= chance) {
-				entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, ASSASSINATES,
-								  GetName());
+				entity_list.MessageCloseString(
+					this, false, 200, Chat::MeleeCrit, ASSASSINATES,
+					GetName());
 				return Assassinate_Dmg;
 			}
 		}
diff --git a/zone/spell_effects.cpp b/zone/spell_effects.cpp
index e4c0badd5..693222e9f 100644
--- a/zone/spell_effects.cpp
+++ b/zone/spell_effects.cpp
@@ -387,7 +387,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							TryTriggerOnValueAmount(false, true);
 #ifdef SPELL_EFFECT_SPAM
 						if (caster)
-							caster->Message(0, "You have gained %+i mana!", effect_value);
+							caster->Message(Chat::White, "You have gained %+i mana!", effect_value);
 #endif
 					}
 				}
@@ -471,7 +471,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					if(zone->random.Roll(RuleI(Spells, SuccorFailChance))) { //2% Fail chance by default
 
 						if(IsClient()) {
-							CastToClient()->Message_StringID(MT_SpellFailure,SUCCOR_FAIL);
+							CastToClient()->MessageString(Chat::SpellFailure,SUCCOR_FAIL);
 						}
 						break;
 					}
@@ -489,7 +489,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 
 					if(!target_zone) {
 #ifdef SPELL_EFFECT_SPAM
-						Log(Logs::General, Logs::None, "Succor/Evacuation Spell In Same Zone.");
+						LogDebug("Succor/Evacuation Spell In Same Zone");
 #endif
 							if(IsClient())
 								CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), x, y, z, heading, 0, EvacToSafeCoords);
@@ -498,7 +498,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					}
 					else {
 #ifdef SPELL_EFFECT_SPAM
-						Log(Logs::General, Logs::None, "Succor/Evacuation Spell To Another Zone.");
+						LogDebug("Succor/Evacuation Spell To Another Zone");
 #endif
 						if(IsClient())
 							CastToClient()->MovePC(target_zone, x, y, z, heading);
@@ -638,11 +638,11 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 								CastToClient()->SummonItem(13073, fcharges);
 							}
 							else{
-								Message(13, "You can only transmute flesh to bone.");
+								Message(Chat::Red, "You can only transmute flesh to bone.");
 							}
 						}
 					else{
-						Message(13, "You can only transmute flesh to bone.");
+						Message(Chat::Red, "You can only transmute flesh to bone.");
 					}
 				}
 				break;
@@ -703,14 +703,14 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 						(caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))))
 				{
 					if (caster)
-						caster->Message_StringID(MT_SpellFailure, IMMUNE_STUN);
+						caster->MessageString(Chat::SpellFailure, IMMUNE_STUN);
 				} else {
 					int stun_resist = itembonuses.StunResist+spellbonuses.StunResist;
 					if (IsClient())
 						stun_resist += aabonuses.StunResist;
 
 					if (stun_resist <= 0 || zone->random.Int(0,99) >= stun_resist) {
-						Log(Logs::Detail, Logs::Combat, "Stunned. We had %d percent resist chance.", stun_resist);
+						LogCombat("Stunned. We had [{}] percent resist chance", stun_resist);
 
 						if (caster && caster->IsClient())
 							effect_value += effect_value*caster->GetFocusEffect(focusFcStunTimeMod, spell_id)/100;
@@ -718,9 +718,9 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 						Stun(effect_value);
 					} else {
 						if (IsClient())
-							Message_StringID(MT_Stun, SHAKE_OFF_STUN);
+							MessageString(Chat::Stun, SHAKE_OFF_STUN);
 
-						Log(Logs::Detail, Logs::Combat, "Stun Resisted. We had %d percent resist chance.", stun_resist);
+						LogCombat("Stun Resisted. We had [{}] percent resist chance", stun_resist);
 					}
 				}
 				break;
@@ -745,19 +745,19 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				WipeHateList();
 
 				if (IsClient() && caster->IsClient()) {
-					caster->Message(0, "Unable to cast charm on a fellow player.");
+					caster->Message(Chat::White, "Unable to cast charm on a fellow player.");
 					BuffFadeByEffect(SE_Charm);
 					break;
 				} else if(IsCorpse()) {
-					caster->Message(0, "Unable to cast charm on a corpse.");
+					caster->Message(Chat::White, "Unable to cast charm on a corpse.");
 					BuffFadeByEffect(SE_Charm);
 					break;
 				} else if(caster->GetPet() != nullptr && caster->IsClient()) {
-					caster->Message(0, "You cannot charm something when you already have a pet.");
+					caster->Message(Chat::White, "You cannot charm something when you already have a pet.");
 					BuffFadeByEffect(SE_Charm);
 					break;
 				} else if(GetOwner()) {
-					caster->Message(0, "You cannot charm someone else's pet!");
+					caster->Message(Chat::White, "You cannot charm someone else's pet!");
 					BuffFadeByEffect(SE_Charm);
 					break;
 				}
@@ -847,14 +847,14 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 
 						if(ClosestMob)
 						{
-							Message_StringID(MT_Spells, MessageID);
+							MessageString(Chat::Spells, MessageID);
 							SetHeading(CalculateHeadingToTarget(ClosestMob->GetX(), ClosestMob->GetY()));
 							SetTarget(ClosestMob);
 							CastToClient()->SendTargetCommand(ClosestMob->GetID());
 							SentPositionPacket(0.0f, 0.0f, 0.0f, 0.0f, 0, true);
 						}
 						else
-							Message_StringID(clientMessageError, SENSE_NOTHING);
+							MessageString(Chat::Red, SENSE_NOTHING);
 					}
 				}
 				break;
@@ -939,14 +939,14 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					{
 						if(!zone->CanBind())
 						{
-							Message_StringID(MT_SpellFailure, CANNOT_BIND);
+							MessageString(Chat::SpellFailure, CANNOT_BIND);
 							break;
 						}
 						if(!zone->IsCity())
 						{
 							if(caster != this)
 							{
-								Message_StringID(MT_SpellFailure, CANNOT_BIND);
+								MessageString(Chat::SpellFailure, CANNOT_BIND);
 								break;
 							}
 							else
@@ -1039,7 +1039,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					if(zone->random.Roll(effect_value))
 						Gate(spells[spell_id].base2[i] - 1);
 					else if (caster)
-						caster->Message_StringID(MT_SpellFailure,GATE_FAIL);
+						caster->MessageString(Chat::SpellFailure,GATE_FAIL);
 				}
 				break;
 			}
@@ -1051,7 +1051,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 #endif
 				if(GetSpecialAbility(UNDISPELLABLE)){
 					if (caster)
-						caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
+						caster->MessageString(Chat::SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
 					break;
 				}
 
@@ -1077,7 +1077,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 #endif
 				if(GetSpecialAbility(UNDISPELLABLE)){
 					if (caster)
-						caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
+						caster->MessageString(Chat::SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
 					break;
 				}
 
@@ -1103,7 +1103,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 #endif
 				if(GetSpecialAbility(UNDISPELLABLE)){
 					if (caster)
-						caster->Message_StringID(MT_SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
+						caster->MessageString(Chat::SpellFailure, SPELL_NO_EFFECT, spells[spell_id].name);
 					break;
 				}
 
@@ -1155,7 +1155,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				snprintf(effect_desc, _EDLEN, "Summon Item: %s (id %d)", itemname, spell.base[i]);
 #endif
 				if (!item) {
-					Message(13, "Unable to summon item %d. Item not found.", spell.base[i]);
+					Message(Chat::Red, "Unable to summon item %d. Item not found.", spell.base[i]);
 				} else if (IsClient()) {
 					Client *c = CastToClient();
 					if (c->CheckLoreConflict(item)) {
@@ -1194,10 +1194,10 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 
 				if (!SummonedItem || !SummonedItem->IsClassBag()) {
 					if (caster)
-						caster->Message(13, "SE_SummonItemIntoBag but no bag has been summoned!");
+						caster->Message(Chat::Red, "SE_SummonItemIntoBag but no bag has been summoned!");
 				} else if ((slot = SummonedItem->FirstOpenSlot()) == 0xff) {
 					if (caster)
-						caster->Message(13, "SE_SummonItemIntoBag but no room in summoned bag!");
+						caster->Message(Chat::Red, "SE_SummonItemIntoBag but no room in summoned bag!");
 				} else if (IsClient()) {
 					if (CastToClient()->CheckLoreConflict(item)) {
 						CastToClient()->DuplicateLoreMessage(spell.base[i]);
@@ -1235,7 +1235,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 #endif
 				if(GetPet())
 				{
-					Message_StringID(MT_Shout, ONLY_ONE_PET);
+					MessageString(Chat::Shout, ONLY_ONE_PET);
 				}
 				else
 				{
@@ -1516,7 +1516,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					{
 						WipeHateList();
 					}
-					Message(13, "Your mind fogs. Who are my friends? Who are my enemies?... it was all so clear a moment ago...");
+					Message(Chat::Red, "Your mind fogs. Who are my friends? Who are my enemies?... it was all so clear a moment ago...");
 				}
 				break;
 			}
@@ -1537,7 +1537,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					&& caster && (!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity)))))
 				{
 					if (caster)
-						caster->Message_StringID(MT_Shout, IMMUNE_STUN);
+						caster->MessageString(Chat::Shout, IMMUNE_STUN);
 				}
 				else
 				{
@@ -1561,7 +1561,11 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					char eye_name[64];
 					snprintf(eye_name, sizeof(eye_name), "Eye_of_%s", caster->GetCleanName());
 					int duration = CalcBuffDuration(caster, this, spell_id) * 6;
-					caster->TemporaryPets(spell_id, nullptr, eye_name, duration);
+					uint16 eye_id=0;
+					caster->TemporaryPets(spell_id, nullptr, eye_name, duration, false, false, &eye_id);
+					if (eye_id != 0) {
+						caster->CastToClient()->SetControlledMobId(eye_id);
+					}
 				}
 				break;
 			}
@@ -1627,7 +1631,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 
 					if (zone->random.Int(0, 99) > spells[spell_id].base[i]) {
 						CastToClient()->SetFeigned(false);
-						entity_list.MessageClose_StringID(this, false, 200, 10, STRING_FEIGNFAILED, GetName());
+						entity_list.MessageCloseString(this, false, 200, 10, STRING_FEIGNFAILED, GetName());
 					} else {
 						CastToClient()->SetFeigned(true);
 					}
@@ -1644,12 +1648,12 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				{
 					if(caster == this)
 					{
-						Message_StringID(MT_Spells,
+						MessageString(Chat::Spells,
 							SENTINEL_TRIG_YOU);
 					}
 					else
 					{
-						caster->Message_StringID(MT_Spells,
+						caster->MessageString(Chat::Spells,
 							SENTINEL_TRIG_OTHER, GetCleanName());
 					}
 				}
@@ -1678,7 +1682,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 				if (IsCorpse() && CastToCorpse()->IsPlayerCorpse()) {
 
 					if(caster)
-						Log(Logs::Detail, Logs::Spells, " corpse being rezzed using spell %i by %s",
+						LogSpells(" corpse being rezzed using spell [{}] by [{}]",
 							spell_id, caster->GetName());
 
 					CastToCorpse()->CastRezz(spell_id, caster);
@@ -1757,7 +1761,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					Group* group = entity_list.GetGroupByClient(TargetClient);
 					if(group) {
 						if(!group->IsGroupMember(TargetClient)) {
-							Message(13, "Your target must be a group member for this spell.");
+							Message(Chat::Red, "Your target must be a group member for this spell.");
 							break;
 						}
 					}
@@ -1770,13 +1774,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							if(gid < 11)
 							{
 								if(r->GetGroup(TargetClient->GetName()) != gid) {
-									Message(13, "Your target must be a group member for this spell.");
+									Message(Chat::Red, "Your target must be a group member for this spell.");
 									break;
 								}
 							}
 						} else {
 							if(TargetClient != this->CastToClient()) {
-								Message(13, "Your target must be a group member for this spell.");
+								Message(Chat::Red, "Your target must be a group member for this spell.");
 								break;
 							}
 						}
@@ -1790,32 +1794,84 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							Corpse *corpse = entity_list.GetCorpseByOwner(TargetClient);
 							if(corpse) {
 								if(TargetClient == this->CastToClient())
-									Message_StringID(4, SUMMONING_CORPSE, TargetClient->CastToMob()->GetCleanName());
+									MessageString(Chat::LightBlue, SUMMONING_CORPSE, TargetClient->CastToMob()->GetCleanName());
 								else
-									Message_StringID(4, SUMMONING_CORPSE_OTHER, TargetClient->CastToMob()->GetCleanName());
+									MessageString(Chat::LightBlue, SUMMONING_CORPSE_OTHER, TargetClient->CastToMob()->GetCleanName());
 
 								corpse->Summon(CastToClient(), true, true);
 							}
 							else {
 								// No corpse found in the zone
-								Message_StringID(4, CORPSE_CANT_SENSE);
+								MessageString(Chat::LightBlue, CORPSE_CANT_SENSE);
 							}
 						}
 						else if (caster) {
 							char level[4];
 							ConvertArray(effect_value, level);
-							caster->Message_StringID(MT_SpellFailure, 
+							caster->MessageString(Chat::SpellFailure,
 								SPELL_LEVEL_REQ, level);
 						}
 					}
 					else {
-						Message_StringID(4, TARGET_NOT_FOUND);
-						Log(Logs::General, Logs::Error, "%s attempted to cast spell id %u with spell effect SE_SummonCorpse, but could not cast target into a Client object.", GetCleanName(), spell_id);
+						MessageString(Chat::LightBlue, TARGET_NOT_FOUND);
+						LogError("[{}] attempted to cast spell id [{}] with spell effect SE_SummonCorpse, but could not cast target into a Client object", GetCleanName(), spell_id);
 					}
 				}
 
 				break;
 			}
+			case SE_SummonCorpseZone:
+			{
+				if (IsClient()) {
+					Client* client_target = this->CastToClient();
+					if (client_target->IsGrouped()) {
+						Group* group = client_target->GetGroup();
+						if (!group->IsGroupMember(caster)) {
+							if (caster != this) {
+								caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE);	
+								break;
+							}
+						}
+					} else if (caster) {
+						if (caster->IsRaidGrouped()) {
+							Raid *raid = caster->GetRaid();
+							uint32 group_id = raid->GetGroup(caster->GetName());
+							if (group_id > 0 && group_id < MAX_RAID_GROUPS) {
+								if (raid->GetGroup(client_target->GetName()) != group_id) {
+									caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE);
+									break;
+								}
+							}
+						} else {
+							if (caster != this) {
+								caster->MessageString(Chat::Red, SUMMON_ONLY_GROUP_CORPSE);
+								break;
+							}
+						}
+					}
+					
+					if (client_target) {
+						if (database.CountCharacterCorpses(client_target->CharacterID()) == 0) {
+							if (caster == this) {
+								Message(Chat::Yellow, "You have no corpses to summon.");
+							} else {
+								caster->Message(Chat::Yellow, "%s has no corpses to summon.", client_target->GetCleanName());
+							}
+						} else {
+							if (caster == this) {
+								Message(Chat::Spells, "Summoning your corpses.");
+							} else {
+								caster->MessageString(Chat::Spells, SUMMONING_CORPSE_ZONE, client_target->GetCleanName());
+							}
+							client_target->SummonAllCorpses(client_target->GetPosition());
+						}
+					} else {
+						MessageString(Chat::Spells, TARGET_NOT_FOUND);
+						LogError("[{}] attempted to cast spell id [{}] with spell effect SE_SummonCorpseZone, but could not cast target into a Client object", GetCleanName(), spell_id);
+					}
+				}
+				break;
+			}
 			case SE_AddMeleeProc:
 			case SE_WeaponProc:
 			{
@@ -1937,7 +1993,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							continue;
 						if (effect_value >= static_cast<int>(buffs[j].counters)) {
 							if (caster) {
-								caster->Message(MT_Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
+								caster->Message(Chat::Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
 								caster->CastOnCurer(buffs[j].spellid);
 								CastOnCure(buffs[j].spellid);
 							}
@@ -1971,7 +2027,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 						if (effect_value >= static_cast<int>(buffs[j].counters))
 						{
 							if (caster) {
-								caster->Message(MT_Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
+								caster->Message(Chat::Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
 								caster->CastOnCurer(buffs[j].spellid);
 								CastOnCure(buffs[j].spellid);
 							}
@@ -2007,7 +2063,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 						if (effect_value >= static_cast<int>(buffs[j].counters))
 						{
 							if (caster) {
-								caster->Message(MT_Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
+								caster->Message(Chat::Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
 								caster->CastOnCurer(buffs[j].spellid);
 								CastOnCure(buffs[j].spellid);
 							}
@@ -2042,7 +2098,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 							continue;
 						if (effect_value >= static_cast<int>(buffs[j].counters)) {
 							if (caster) {
-								caster->Message(MT_Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
+								caster->Message(Chat::Spells,"You have cured your target of %s!",spells[buffs[j].spellid].name);
 								caster->CastOnCurer(buffs[j].spellid);
 								CastOnCure(buffs[j].spellid);
 							}
@@ -2068,7 +2124,7 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					if(GetLevel() <= 52)
 						CastToNPC()->Depop(true);
 					else
-						Message(13, "Your target is too high level to be affected by this spell.");
+						Message(Chat::Red, "Your target is too high level to be affected by this spell.");
 				}
 				break;
 			}
@@ -2115,10 +2171,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 					CastToClient()->MovePC(zone->GetZoneID(), zone->GetInstanceID(), caster->GetX(),
 							       caster->GetY(), caster->GetZ(), caster->GetHeading(), 2,
 							       SummonPC);
-					Message(15, "You have been summoned!");
-					entity_list.ClearAggro(this);
+					Message(Chat::Yellow, "You have been summoned!");
+					// only for beneficial spells like Call of the Hero
+					// This clear probably isn't actually needed, but need to investigate more
+					if (IsBeneficialSpell(spell_id))
+						entity_list.ClearAggro(this);
 				} else
-					caster->Message(13, "This spell can only be cast on players.");
+					caster->Message(Chat::Red, "This spell can only be cast on players.");
 
 				break;
 			}
@@ -2725,13 +2784,13 @@ bool Mob::SpellEffect(Mob* caster, uint16 spell_id, float partial, int level_ove
 			case SE_MassGroupBuff:{
 
 				SetMGB(true);
-				Message_StringID(MT_Disciplines, MGB_STRING);
+				MessageString(Chat::Disciplines, MGB_STRING);
 				break;
 			}
 
 			case SE_IllusionOther: {
 				SetProjectIllusion(true);
-				Message(10, "The power of your next illusion spell will flow to your grouped target in your place.");
+				Message(Chat::NPCQuestSay, "The power of your next illusion spell will flow to your grouped target in your place.");
 				break;
 			}
 
@@ -3057,7 +3116,7 @@ int Mob::CalcSpellEffectValue(uint16 spell_id, int effect_id, int caster_level,
 		int oval = effect_value;
 		int mod = ApplySpellEffectiveness(spell_id, instrument_mod, true, caster_id);
 		effect_value = effect_value * mod / 10;
-		Log(Logs::Detail, Logs::Spells, "Effect value %d altered with bard modifier of %d to yeild %d",
+		LogSpells("Effect value [{}] altered with bard modifier of [{}] to yeild [{}]",
 			oval, mod, effect_value);
 	}
 
@@ -3120,7 +3179,7 @@ snare has both of them negative, yet their range should work the same:
 		updownsign = 1;
 	}
 
-	Log(Logs::Detail, Logs::Spells, "CSEV: spell %d, formula %d, base %d, max %d, lvl %d. Up/Down %d",
+	LogSpells("CSEV: spell [{}], formula [{}], base [{}], max [{}], lvl [{}]. Up/Down [{}]",
 		spell_id, formula, base, max, caster_level, updownsign);
 
 	switch(formula)
@@ -3342,7 +3401,7 @@ snare has both of them negative, yet their range should work the same:
 				result = ubase * (caster_level * (formula - 2000) + 1);
 			}
 			else
-				Log(Logs::General, Logs::None, "Unknown spell effect value forumula %d", formula);
+				LogDebug("Unknown spell effect value forumula [{}]", formula);
 		}
 	}
 
@@ -3367,7 +3426,7 @@ snare has both of them negative, yet their range should work the same:
 	if (base < 0 && result > 0)
 		result *= -1;
 
-	Log(Logs::Detail, Logs::Spells, "Result: %d (orig %d), cap %d %s", result, oresult, max, (base < 0 && result > 0)?"Inverted due to negative base":"");
+	LogSpells("Result: [{}] (orig [{}]), cap [{}] [{}]", result, oresult, max, (base < 0 && result > 0)?"Inverted due to negative base":"");
 
 	return result;
 }
@@ -3394,12 +3453,12 @@ void Mob::BuffProcess()
 					--buffs[buffs_i].ticsremaining;
 
 					if (buffs[buffs_i].ticsremaining < 0) {
-						Log(Logs::Detail, Logs::Spells, "Buff %d in slot %d has expired. Fading.", buffs[buffs_i].spellid, buffs_i);
+						LogSpells("Buff [{}] in slot [{}] has expired. Fading", buffs[buffs_i].spellid, buffs_i);
 						BuffFadeBySlot(buffs_i);
 					}
 					else
 					{
-						Log(Logs::Detail, Logs::Spells, "Buff %d in slot %d has %d tics remaining.", buffs[buffs_i].spellid, buffs_i, buffs[buffs_i].ticsremaining);
+						LogSpells("Buff [{}] in slot [{}] has [{}] tics remaining", buffs[buffs_i].spellid, buffs_i, buffs[buffs_i].ticsremaining);
 					}
 				}
 				else if (IsClient() && !(CastToClient()->ClientVersionBit() & EQEmu::versions::maskSoFAndLater))
@@ -3572,7 +3631,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster)
 				if (IsAIControlled()) {
 					WipeHateList();
 				}
-				Message(13, "Your mind fogs. Who are my friends? Who are my enemies?... it was all so "
+				Message(Chat::Red, "Your mind fogs. Who are my friends? Who are my enemies?... it was all so "
 					    "clear a moment ago...");
 			}
 			break;
@@ -3643,7 +3702,7 @@ void Mob::DoBuffTic(const Buffs_Struct &buff, int slot, Mob *caster)
 		case SE_Invisibility2:
 		case SE_InvisVsUndead2: {
 			if (buff.ticsremaining <= 3 && buff.ticsremaining > 1) {
-				Message_StringID(MT_Spells, INVIS_BEGIN_BREAK);
+				MessageString(Chat::Spells, INVIS_BEGIN_BREAK);
 			}
 			break;
 		}
@@ -3730,7 +3789,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
 	if (IsClient() && !CastToClient()->IsDead())
 		CastToClient()->MakeBuffFadePacket(buffs[slot].spellid, slot);
 
-	Log(Logs::Detail, Logs::Spells, "Fading buff %d from slot %d", buffs[slot].spellid, slot);
+	LogSpells("Fading buff [{}] from slot [{}]", buffs[slot].spellid, slot);
 
 	if(spells[buffs[slot].spellid].viral_targets > 0) {
 		bool last_virus = true;
@@ -4004,10 +4063,9 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
 				break;
 			}
 
-			case SE_ImmuneFleeing:
-			{
-				if(RuleB(Combat, EnableFearPathing)){
-					if(flee_mode) {
+			case SE_ImmuneFleeing: {
+				if (RuleB(Combat, EnableFearPathing)) {
+					if (flee_mode) {
 						currently_fleeing = true;
 						CheckFlee();
 						break;
@@ -4036,6 +4094,15 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
 					SetLevel(GetOrigLevel());
 				break;
 			}
+
+			case SE_EyeOfZomm:
+			{
+				if (IsClient())
+					{
+					CastToClient()->SetControlledMobId(0);
+					}
+			}
+					
 		}
 	}
 
@@ -4047,7 +4114,7 @@ void Mob::BuffFadeBySlot(int slot, bool iRecalcBonuses)
 		if(p->IsPet())
 			notify = p->GetOwner();
 		if(p) {
-			notify->Message_StringID(MT_WornOff, SPELL_WORN_OFF_OF,
+			notify->MessageString(Chat::SpellWornOff, SPELL_WORN_OFF_OF,
 				spells[buffs[slot].spellid].name, GetCleanName());
 		}
 	}
@@ -4709,7 +4776,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
 					return 0;
 				break;
 			default:
-				Log(Logs::General, Logs::Normal, "CalcFocusEffect: unknown limit spelltype %d",
+				LogInfo("CalcFocusEffect: unknown limit spelltype [{}]",
 					focus_spell.base[i]);
 			}
 			break;
@@ -5087,7 +5154,7 @@ int16 Mob::CalcFocusEffect(focusType type, uint16 focus_id, uint16 spell_id, boo
 		// this spits up a lot of garbage when calculating spell focuses
 		// since they have all kinds of extra effects on them.
 		default:
-			Log(Logs::General, Logs::Normal, "CalcFocusEffect: unknown effectid %d",
+			LogInfo("CalcFocusEffect: unknown effectid [{}]",
 				focus_spell.effectid[i]);
 #endif
 		}
@@ -5406,7 +5473,7 @@ int16 Client::GetFocusEffect(focusType type, uint16 spell_id)
 			default:
 				break;
 			}
-			Message_StringID(MT_Spells, string_id, UsedItem->Name);
+			MessageString(Chat::Spells, string_id, UsedItem->Name);
 		}
 	}
 
@@ -5646,11 +5713,24 @@ void Mob::CheckNumHitsRemaining(NumHit type, int32 buff_slot, uint16 spell_id)
 	bool bDepleted = false;
 	int buff_max = GetMaxTotalSlots();
 
+#ifdef BOTS
+	std::string buff_name;
+	size_t buff_counter = 0;
+	bool buff_update = false;
+#endif
+
 	//Spell specific procs [Type 7,10,11]
 	if (IsValidSpell(spell_id)) {
 		for (int d = 0; d < buff_max; d++) {
 			if (buffs[d].spellid == spell_id && buffs[d].numhits > 0 &&
 			    spells[buffs[d].spellid].numhitstype == static_cast<int>(type)) {
+
+#ifdef BOTS
+				buff_name = spells[buffs[d].spellid].name;
+				buff_counter = (buffs[d].numhits - 1);
+				buff_update = true;
+#endif
+
 				if (--buffs[d].numhits == 0) {
 					CastOnNumHitFade(buffs[d].spellid);
 					if (!TryFadeEffect(d))
@@ -5663,6 +5743,13 @@ void Mob::CheckNumHitsRemaining(NumHit type, int32 buff_slot, uint16 spell_id)
 	} else if (type == NumHit::MatchingSpells) {
 		if (buff_slot >= 0) {
 			if (--buffs[buff_slot].numhits == 0) {
+
+#ifdef BOTS
+				buff_name = spells[buffs[buff_slot].spellid].name;
+				buff_counter = (buffs[buff_slot].numhits - 1);
+				buff_update = true;
+#endif
+
 				CastOnNumHitFade(buffs[buff_slot].spellid);
 				if (!TryFadeEffect(buff_slot))
 					BuffFadeBySlot(buff_slot , true);
@@ -5675,6 +5762,13 @@ void Mob::CheckNumHitsRemaining(NumHit type, int32 buff_slot, uint16 spell_id)
 					continue;
 
 				if (IsValidSpell(buffs[d].spellid) && m_spellHitsLeft[d] == buffs[d].spellid) {
+
+#ifdef BOTS
+					buff_name = spells[buffs[d].spellid].name;
+					buff_counter = (buffs[d].numhits - 1);
+					buff_update = true;
+#endif
+
 					if (--buffs[d].numhits == 0) {
 						CastOnNumHitFade(buffs[d].spellid);
 						m_spellHitsLeft[d] = 0;
@@ -5690,6 +5784,13 @@ void Mob::CheckNumHitsRemaining(NumHit type, int32 buff_slot, uint16 spell_id)
 		for (int d = 0; d < buff_max; d++) {
 			if (IsValidSpell(buffs[d].spellid) && buffs[d].numhits > 0 &&
 			    spells[buffs[d].spellid].numhitstype == static_cast<int>(type)) {
+
+#ifdef BOTS
+				buff_name = spells[buffs[d].spellid].name;
+				buff_counter = (buffs[d].numhits - 1);
+				buff_update = true;
+#endif
+
 				if (--buffs[d].numhits == 0) {
 					CastOnNumHitFade(buffs[d].spellid);
 					if (!TryFadeEffect(d))
@@ -5700,6 +5801,28 @@ void Mob::CheckNumHitsRemaining(NumHit type, int32 buff_slot, uint16 spell_id)
 			}
 		}
 	}
+
+#ifdef BOTS
+	if (IsBot() && buff_update) {
+		auto bot_owner = entity_list.GetBotOwnerByBotEntityID(GetID());
+		if (bot_owner && bot_owner->GetBotOption(Client::booBuffCounter)) {
+			bot_owner->CastToClient()->SendMarqueeMessage(
+				Chat::Yellow,
+				510,
+				0,
+				1000,
+				3000,
+				StringFormat(
+					"%s has [%u] hit%s remaining on '%s'",
+					GetCleanName(),
+					buff_counter,
+					(buff_counter == 1 ? "" : "s"),
+					buff_name.c_str()
+				)
+			);
+		}
+	}
+#endif
 }
 
 //for some stupid reason SK procs return theirs one base off...
@@ -5814,9 +5937,15 @@ bool Mob::TryDeathSave() {
 				Message(263, "The gods have healed you for %i points of damage.", HealAmt);
 
 				if(spellbonuses.DeathSave[0] == 2)
-					entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DIVINE_INTERVENTION, GetCleanName());
+					entity_list.MessageCloseString(
+						this,
+						false,
+						200,
+						Chat::MeleeCrit,
+						DIVINE_INTERVENTION,
+						GetCleanName());
 				else
-					entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DEATH_PACT, GetCleanName());
+					entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, DEATH_PACT, GetCleanName());
 
 				SendHPUpdate();
 				BuffFadeBySlot(buffSlot);
@@ -5847,9 +5976,15 @@ bool Mob::TryDeathSave() {
 					Message(263, "The gods have healed you for %i points of damage.", HealAmt);
 
 					if(spellbonuses.DeathSave[0] == 2)
-						entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DIVINE_INTERVENTION, GetCleanName());
+						entity_list.MessageCloseString(
+							this,
+							false,
+							200,
+							Chat::MeleeCrit,
+							DIVINE_INTERVENTION,
+							GetCleanName());
 					else
-						entity_list.MessageClose_StringID(this, false, 200, MT_CritMelee, DEATH_PACT, GetCleanName());
+						entity_list.MessageCloseString(this, false, 200, Chat::MeleeCrit, DEATH_PACT, GetCleanName());
 
 					SendHPUpdate();
 					BuffFadeBySlot(buffSlot);
@@ -6802,11 +6937,11 @@ void Client::BreakFeignDeathWhenCastOn(bool IsResisted)
 			chance *= 2;
 
 		if(chance && (zone->random.Roll(chance))){
-			Message_StringID(MT_SpellFailure,FD_CAST_ON_NO_BREAK);
+			MessageString(Chat::SpellFailure,FD_CAST_ON_NO_BREAK);
 			return;
 		}
 	
 		SetFeigned(false);
-		Message_StringID(MT_SpellFailure,FD_CAST_ON);
+		MessageString(Chat::SpellFailure,FD_CAST_ON);
 	}
 }
diff --git a/zone/spells.cpp b/zone/spells.cpp
index 8b1a08d19..a1e926a1c 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -158,7 +158,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	uint32 timer, uint32 timer_duration, int16 *resist_adjust,
 	uint32 aa_id)
 {
-	Log(Logs::Detail, Logs::Spells, "CastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item slot %d",
+	LogSpells("CastSpell called for spell [{}] ([{}]) on entity [{}], slot [{}], time [{}], mana [{}], from item slot [{}]",
 		(IsValidSpell(spell_id))?spells[spell_id].name:"UNKNOWN SPELL", spell_id, target_id, static_cast<int>(slot), cast_time, mana_cost, (item_slot==0xFFFFFFFF)?999:item_slot);
 
 	if(casting_spell_id == spell_id)
@@ -177,12 +177,12 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		(IsAmnesiad() && IsDiscipline(spell_id))
 	)
 	{
-		Log(Logs::Detail, Logs::Spells, "Spell casting canceled: not able to cast now. Valid? %d, casting %d, waiting? %d, spellend? %d, stunned? %d, feared? %d, mezed? %d, silenced? %d, amnesiad? %d",
+		LogSpells("Spell casting canceled: not able to cast now. Valid? [{}], casting [{}], waiting? [{}], spellend? [{}], stunned? [{}], feared? [{}], mezed? [{}], silenced? [{}], amnesiad? [{}]",
 			IsValidSpell(spell_id), casting_spell_id, delaytimer, spellend_timer.Enabled(), IsStunned(), IsFeared(), IsMezzed(), IsSilenced(), IsAmnesiad() );
 		if(IsSilenced() && !IsDiscipline(spell_id))
-			Message_StringID(13, SILENCED_STRING);
+			MessageString(Chat::Red, SILENCED_STRING);
 		if(IsAmnesiad() && IsDiscipline(spell_id))
-			Message_StringID(13, MELEE_SILENCE);
+			MessageString(Chat::Red, MELEE_SILENCE);
 		if(IsClient())
 			CastToClient()->SendSpellBarEnable(spell_id);
 		if(casting_spell_id && IsNPC())
@@ -197,7 +197,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		int chance = CastToClient()->GetFocusEffect(focusFcMute, spell_id);//Client only
 
 		if (zone->random.Roll(chance)) {
-			Message_StringID(13, SILENCED_STRING);
+			MessageString(Chat::Red, SILENCED_STRING);
 			if(IsClient())
 				CastToClient()->SendSpellBarEnable(spell_id);
 			return(false);
@@ -205,7 +205,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	}
 
 	if(IsDetrimentalSpell(spell_id) && !zone->CanDoCombat()){
-		Message_StringID(13, SPELL_WOULDNT_HOLD);
+		MessageString(Chat::Red, SPELL_WOULDNT_HOLD);
 		if(IsClient())
 			CastToClient()->SendSpellBarEnable(spell_id);
 		if(casting_spell_id && IsNPC())
@@ -215,7 +215,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 
 	//cannot cast under divine aura
 	if(DivineAura()) {
-		Log(Logs::Detail, Logs::Spells, "Spell casting canceled: cannot cast while Divine Aura is in effect.");
+		LogSpells("Spell casting canceled: cannot cast while Divine Aura is in effect");
 		InterruptSpell(173, 0x121, false);
 		return(false);
 	}
@@ -237,7 +237,7 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	}
 
 	if (HasActiveSong() && IsBardSong(spell_id)) {
-		Log(Logs::Detail, Logs::Spells, "Casting a new song while singing a song. Killing old song %d.", bardsong);
+		LogSpells("Casting a new song while singing a song. Killing old song [{}]", bardsong);
 		//Note: this does NOT tell the client
 		_StopSong();
 	}
@@ -252,19 +252,19 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 			if ((itm->GetItem()->Click.Type == EQEmu::item::ItemEffectEquipClick) && !(itm->GetItem()->Classes & bitmask)) {
 				if (CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoF) {
 					// They are casting a spell from an item that requires equipping but shouldn't let them equip it
-					Log(Logs::General, Logs::Error, "HACKER: %s (account: %s) attempted to click an equip-only effect on item %s (id: %d) which they shouldn't be able to equip!",
+					LogError("HACKER: [{}] (account: [{}]) attempted to click an equip-only effect on item [{}] (id: [{}]) which they shouldn't be able to equip!",
 						CastToClient()->GetCleanName(), CastToClient()->AccountName(), itm->GetItem()->Name, itm->GetItem()->ID);
 					database.SetHackerFlag(CastToClient()->AccountName(), CastToClient()->GetCleanName(), "Clicking equip-only item with an invalid class");
 				}
 				else {
-					Message_StringID(13, MUST_EQUIP_ITEM);
+					MessageString(Chat::Red, MUST_EQUIP_ITEM);
 				}
 				return(false);
 			}
 			if ((itm->GetItem()->Click.Type == EQEmu::item::ItemEffectClick2) && !(itm->GetItem()->Classes & bitmask)) {
 				if (CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoF) {
 					// They are casting a spell from an item that they don't meet the race/class requirements to cast
-					Log(Logs::General, Logs::Error, "HACKER: %s (account: %s) attempted to click a race/class restricted effect on item %s (id: %d) which they shouldn't be able to click!",
+					LogError("HACKER: [{}] (account: [{}]) attempted to click a race/class restricted effect on item [{}] (id: [{}]) which they shouldn't be able to click!",
 						CastToClient()->GetCleanName(), CastToClient()->AccountName(), itm->GetItem()->Name, itm->GetItem()->ID);
 					database.SetHackerFlag(CastToClient()->AccountName(), CastToClient()->GetCleanName(), "Clicking race/class restricted item with an invalid class");
 				}
@@ -272,11 +272,11 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 					if (CastToClient()->ClientVersion() >= EQEmu::versions::ClientVersion::RoF)
 					{
 						// Line 181 in eqstr_us.txt was changed in RoF+
-						Message(15, "Your race, class, or deity cannot use this item.");
+						Message(Chat::Yellow, "Your race, class, or deity cannot use this item.");
 					}
 					else
 					{
-						Message_StringID(13, CANNOT_USE_ITEM);
+						MessageString(Chat::Red, CANNOT_USE_ITEM);
 					}
 				}
 				return(false);
@@ -285,11 +285,11 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		if (itm && (itm->GetItem()->Click.Type == EQEmu::item::ItemEffectEquipClick) && item_slot > EQEmu::invslot::EQUIPMENT_END){
 			if (CastToClient()->ClientVersion() < EQEmu::versions::ClientVersion::SoF) {
 				// They are attempting to cast a must equip clicky without having it equipped
-				Log(Logs::General, Logs::Error, "HACKER: %s (account: %s) attempted to click an equip-only effect on item %s (id: %d) without equiping it!", CastToClient()->GetCleanName(), CastToClient()->AccountName(), itm->GetItem()->Name, itm->GetItem()->ID);
+				LogError("HACKER: [{}] (account: [{}]) attempted to click an equip-only effect on item [{}] (id: [{}]) without equiping it!", CastToClient()->GetCleanName(), CastToClient()->AccountName(), itm->GetItem()->Name, itm->GetItem()->ID);
 				database.SetHackerFlag(CastToClient()->AccountName(), CastToClient()->GetCleanName(), "Clicking equip-only item without equiping it");
 			}
 			else {
-				Message_StringID(13, MUST_EQUIP_ITEM);
+				MessageString(Chat::Red, MUST_EQUIP_ITEM);
 			}
 			return(false);
 		}
@@ -298,7 +298,8 @@ bool Mob::CastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	if(IsClient()) {
 		char temp[64];
 		sprintf(temp, "%d", spell_id);
-		parse->EventPlayer(EVENT_CAST_BEGIN, CastToClient(), temp, 0);
+		if (parse->EventPlayer(EVENT_CAST_BEGIN, CastToClient(), temp, 0) != 0)
+			return false;
 	} else if(IsNPC()) {
 		char temp[64];
 		sprintf(temp, "%d", spell_id);
@@ -343,7 +344,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 
 	const SPDat_Spell_Struct &spell = spells[spell_id];
 
-	Log(Logs::Detail, Logs::Spells, "DoCastSpell called for spell %s (%d) on entity %d, slot %d, time %d, mana %d, from item %d",
+	LogSpells("DoCastSpell called for spell [{}] ([{}]) on entity [{}], slot [{}], time [{}], mana [{}], from item [{}]",
 		spell.name, spell_id, target_id, static_cast<int>(slot), cast_time, mana_cost, item_slot==0xFFFFFFFF?999:item_slot);
 
 	casting_spell_id = spell_id;
@@ -363,28 +364,30 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		int fizzle_msg = IsBardSong(spell_id) ? MISS_NOTE : SPELL_FIZZLE;
 
 		uint32 use_mana = ((spells[spell_id].mana) / 4);
-		Log(Logs::Detail, Logs::Spells, "Spell casting canceled: fizzled. %d mana has been consumed", use_mana);
+		LogSpells("Spell casting canceled: fizzled. [{}] mana has been consumed", use_mana);
 
 		// fizzle 1/4 the mana away
 		Mob::SetMana(GetMana() - use_mana); // We send StopCasting which will update mana
 		StopCasting();
 
-		Message_StringID(MT_SpellFailure, fizzle_msg);
+		MessageString(Chat::SpellFailure, fizzle_msg);
 
-		/* Song Failure Messages */
-		entity_list.FilteredMessageClose_StringID(
-			this, /* Sender */
-			true, /* Skip Sender */
-			RuleI(Range, SpellMessages), 
-			MT_SpellFailure, /* Type: 289 */
-			(IsClient() ? FilterPCSpells : FilterNPCSpells), /* FilterType: 8 or 9 depending on client/npc */
-			(fizzle_msg == MISS_NOTE ? MISSED_NOTE_OTHER : SPELL_FIZZLE_OTHER), 
+		/**
+		 * Song Failure message
+		 */
+		entity_list.FilteredMessageCloseString(
+			this,
+			true,
+			RuleI(Range, SpellMessages),
+			Chat::SpellFailure,
+			(IsClient() ? FilterPCSpells : FilterNPCSpells),
+			(fizzle_msg == MISS_NOTE ? MISSED_NOTE_OTHER : SPELL_FIZZLE_OTHER),
 			/* 
 				MessageFormat: You miss a note, bringing your song to a close! (if missed note)
 				MessageFormat: A missed note brings %1's song to a close!
 				MessageFormat: %1's spell fizzles!
 			*/
-			GetName() /* Message1 */
+			GetName()
 		);
 
 		TryTriggerOnValueAmount(false, true);
@@ -392,7 +395,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	}
 
 	SaveSpellLoc();
-	Log(Logs::Detail, Logs::Spells, "Casting %d Started at (%.3f,%.3f,%.3f)", spell_id, m_SpellLocation.x, m_SpellLocation.y, m_SpellLocation.z);
+	LogSpells("Casting [{}] Started at ({},{},{})", spell_id, m_SpellLocation.x, m_SpellLocation.y, m_SpellLocation.z);
 
 	// if this spell doesn't require a target, or if it's an optional target
 	// and a target wasn't provided, then it's us; unless TGB is on and this
@@ -405,7 +408,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 		spell.targettype == ST_Beam ||
 		spell.targettype == ST_TargetOptional) && target_id == 0)
 	{
-		Log(Logs::Detail, Logs::Spells, "Spell %d auto-targeted the caster. Group? %d, target type %d", spell_id, IsGroupSpell(spell_id), spell.targettype);
+		LogSpells("Spell [{}] auto-targeted the caster. Group? [{}], target type [{}]", spell_id, IsGroupSpell(spell_id), spell.targettype);
 		target_id = GetID();
 	}
 
@@ -422,10 +425,10 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 
 	// we checked for spells not requiring targets above
 	if(target_id == 0) {
-		Log(Logs::Detail, Logs::Spells, "Spell Error: no target. spell=%d", spell_id);
+		LogSpells("Spell Error: no target. spell=[{}]", spell_id);
 		if(IsClient()) {
 			//clients produce messages... npcs should not for this case
-			Message_StringID(13, SPELL_NEED_TAR);
+			MessageString(Chat::Red, SPELL_NEED_TAR);
 			InterruptSpell();
 		} else {
 			InterruptSpell(0, 0, 0);	//the 0 args should cause no messages
@@ -455,10 +458,10 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 			{
 				mana_cost = 0;
 			} else {
-				Log(Logs::Detail, Logs::Spells, "Spell Error not enough mana spell=%d mymana=%d cost=%d\n", spell_id, my_curmana, mana_cost);
+				LogSpells("Spell Error not enough mana spell=[{}] mymana=[{}] cost=[{}]\n", spell_id, my_curmana, mana_cost);
 				if(IsClient()) {
 					//clients produce messages... npcs should not for this case
-					Message_StringID(13, INSUFFICIENT_MANA);
+					MessageString(Chat::Red, INSUFFICIENT_MANA);
 					InterruptSpell();
 				} else {
 					InterruptSpell(0, 0, 0);	//the 0 args should cause no messages
@@ -476,7 +479,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 
 	casting_spell_resist_adjust = resist_adjust;
 
-	Log(Logs::Detail, Logs::Spells, "Spell %d: Casting time %d (orig %d), mana cost %d",
+	LogSpells("Spell [{}]: Casting time [{}] (orig [{}]), mana cost [{}]",
 			spell_id, cast_time, orgcasttime, mana_cost);
 
 	// now tell the people in the area -- we ALWAYS want to send this, even instant cast spells.
@@ -515,7 +518,7 @@ bool Mob::DoCastSpell(uint16 spell_id, uint16 target_id, CastingSlot slot,
 	if (IsClient() && slot == CastingSlot::Item && item_slot != 0xFFFFFFFF) {
 		auto item = CastToClient()->GetInv().GetItem(item_slot);
 		if (item && item->GetItem())
-			Message_StringID(MT_Spells, BEGINS_TO_GLOW, item->GetItem()->Name);
+			MessageString(Chat::Spells, BEGINS_TO_GLOW, item->GetItem()->Name);
 	}
 
 	if (!DoCastingChecks()) {
@@ -570,30 +573,30 @@ bool Mob::DoCastingChecks()
 	if (RuleB(Spells, BuffLevelRestrictions)) {
 		// casting_spell_targetid is guaranteed to be what we went, check for ST_Self for now should work though
 		if (spell_target && spells[spell_id].targettype != ST_Self && !spell_target->CheckSpellLevelRestriction(spell_id)) {
-			Log(Logs::Detail, Logs::Spells, "Spell %d failed: recipient did not meet the level restrictions", spell_id);
+			LogSpells("Spell [{}] failed: recipient did not meet the level restrictions", spell_id);
 			if (!IsBardSong(spell_id))
-				Message_StringID(MT_SpellFailure, SPELL_TOO_POWERFUL);
+				MessageString(Chat::SpellFailure, SPELL_TOO_POWERFUL);
 			return false;
 		}
 	}
 
 	if (spells[spell_id].zonetype == 1 && !zone->CanCastOutdoor()) {
-		Message_StringID(13, CAST_OUTDOORS);
+		MessageString(Chat::Red, CAST_OUTDOORS);
 		return false;
 	}
 
 	if (IsEffectInSpell(spell_id, SE_Levitate) && !zone->CanLevitate()) {
-		Message(13, "You can't levitate in this zone.");
+		Message(Chat::Red, "You can't levitate in this zone.");
 		return false;
 	}
 
 	if(zone->IsSpellBlocked(spell_id, glm::vec3(GetPosition()))) {
 		const char *msg = zone->GetSpellBlockedMessage(spell_id, glm::vec3(GetPosition()));
 		if (msg) {
-			Message(13, msg);
+			Message(Chat::Red, msg);
 			return false;
 		} else {
-			Message(13, "You can't cast this spell here.");
+			Message(Chat::Red, "You can't cast this spell here.");
 			return false;
 		}
 	}
@@ -677,7 +680,7 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){
 			if (GetRawSkill(EQEmu::skills::SkillPercussionInstruments) > 0)	// no skill increases if not trained in the instrument
 				CheckIncreaseSkill(EQEmu::skills::SkillPercussionInstruments, nullptr, -15);
 			else
-				Message_StringID(13,NO_INSTRUMENT_SKILL);	// tell the client that they need instrument training
+				MessageString(Chat::Red,NO_INSTRUMENT_SKILL);	// tell the client that they need instrument training
 		}
 		else
 			CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15);
@@ -687,7 +690,7 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){
 			if (GetRawSkill(EQEmu::skills::SkillStringedInstruments) > 0)
 				CheckIncreaseSkill(EQEmu::skills::SkillStringedInstruments, nullptr, -15);
 			else
-				Message_StringID(13,NO_INSTRUMENT_SKILL);
+				MessageString(Chat::Red,NO_INSTRUMENT_SKILL);
 		}
 		else
 			CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15);
@@ -697,7 +700,7 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){
 			if (GetRawSkill(EQEmu::skills::SkillWindInstruments) > 0)
 				CheckIncreaseSkill(EQEmu::skills::SkillWindInstruments, nullptr, -15);
 			else
-				Message_StringID(13,NO_INSTRUMENT_SKILL);
+				MessageString(Chat::Red,NO_INSTRUMENT_SKILL);
 		}
 		else
 			CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15);
@@ -707,7 +710,7 @@ void Client::CheckSongSkillIncrease(uint16 spell_id){
 			if (GetRawSkill(EQEmu::skills::SkillBrassInstruments) > 0)
 				CheckIncreaseSkill(EQEmu::skills::SkillBrassInstruments, nullptr, -15);
 			else
-				Message_StringID(13,NO_INSTRUMENT_SKILL);
+				MessageString(Chat::Red,NO_INSTRUMENT_SKILL);
 		}
 		else
 			CheckIncreaseSkill(EQEmu::skills::SkillSinging, nullptr, -15);
@@ -754,6 +757,8 @@ bool Client::CheckFizzle(uint16 spell_id)
 
 	act_skill = GetSkill(spells[spell_id].skill);
 	act_skill += GetLevel(); // maximum of whatever the client can cheat
+	act_skill += itembonuses.adjusted_casting_skill + spellbonuses.adjusted_casting_skill + aabonuses.adjusted_casting_skill;
+	LogSpells("Adjusted casting skill: [{}]+[{}]+[{}]+[{}]+[{}]=[{}]", GetSkill(spells[spell_id].skill), GetLevel(), itembonuses.adjusted_casting_skill, spellbonuses.adjusted_casting_skill, aabonuses.adjusted_casting_skill, act_skill);
 
 	//spell specialization
 	float specialize = GetSpecializeSkillValue(spell_id);
@@ -805,7 +810,7 @@ bool Client::CheckFizzle(uint16 spell_id)
 
 	float fizzle_roll = zone->random.Real(0, 100);
 
-	Log(Logs::Detail, Logs::Spells, "Check Fizzle %s  spell %d  fizzlechance: %0.2f%%   diff: %0.2f  roll: %0.2f", GetName(), spell_id, fizzlechance, diff, fizzle_roll);
+	LogSpells("Check Fizzle [{}] spell [{}] fizzlechance: [{}]  diff: [{}] roll: [{}]", GetName(), spell_id, fizzlechance, diff, fizzle_roll);
 
 	if(fizzle_roll > fizzlechance)
 		return(true);
@@ -858,13 +863,13 @@ void Mob::InterruptSpell(uint16 message, uint16 color, uint16 spellid)
 	}
 
 	if(casting_spell_aa_id && IsClient()) { //Rest AA Timer on failed cast
-		CastToClient()->Message_StringID(MT_SpellFailure, ABILITY_FAILED);
+		CastToClient()->MessageString(Chat::SpellFailure, ABILITY_FAILED);
 		CastToClient()->ResetAlternateAdvancementTimer(casting_spell_aa_id);
 	}
 
 	ZeroCastingVars();	// resets all the state keeping stuff
 
-	Log(Logs::Detail, Logs::Spells, "Spell %d has been interrupted.", spellid);
+	LogSpells("Spell [{}] has been interrupted", spellid);
 
 	if(!spellid)
 		return;
@@ -937,7 +942,7 @@ void Mob::StopCasting()
 	if (IsClient()) {
 		auto c = CastToClient();
 		if (casting_spell_aa_id) { //Rest AA Timer on failed cast
-			c->Message_StringID(MT_SpellFailure, ABILITY_FAILED);
+			c->MessageString(Chat::SpellFailure, ABILITY_FAILED);
 			c->ResetAlternateAdvancementTimer(casting_spell_aa_id);
 		}
 
@@ -962,12 +967,13 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 							uint16 mana_used, uint32 inventory_slot, int16 resist_adjust)
 {
 	bool IsFromItem = false;
+	EQEmu::ItemInstance *item = nullptr;
 
 	if(IsClient() && slot != CastingSlot::Item && slot != CastingSlot::PotionBelt && spells[spell_id].recast_time > 1000) { // 10 is item
 		if(!CastToClient()->GetPTimers().Expired(&database, pTimerSpellStart + spell_id, false)) {
 			//should we issue a message or send them a spell gem packet?
-			Message_StringID(13, SPELL_RECAST);
-			Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: spell reuse timer not expired", spell_id);
+			MessageString(Chat::Red, SPELL_RECAST);
+			LogSpells("Casting of [{}] canceled: spell reuse timer not expired", spell_id);
 			StopCasting();
 			return;
 		}
@@ -976,12 +982,12 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	if(IsClient() && (slot == CastingSlot::Item || slot == CastingSlot::PotionBelt))
 	{
 		IsFromItem = true;
-		EQEmu::ItemInstance *itm = CastToClient()->GetInv().GetItem(inventory_slot);
-		if(itm && itm->GetItem()->RecastDelay > 0)
+		item = CastToClient()->GetInv().GetItem(inventory_slot);
+		if(item && item->GetItem()->RecastDelay > 0)
 		{
-			if(!CastToClient()->GetPTimers().Expired(&database, (pTimerItemStart + itm->GetItem()->RecastType), false)) {
-				Message_StringID(13, SPELL_RECAST);
-				Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: item spell reuse timer not expired", spell_id);
+			if(!CastToClient()->GetPTimers().Expired(&database, (pTimerItemStart + item->GetItem()->RecastType), false)) {
+				MessageString(Chat::Red, SPELL_RECAST);
+				LogSpells("Casting of [{}] canceled: item spell reuse timer not expired", spell_id);
 				StopCasting();
 				return;
 			}
@@ -990,7 +996,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 
 	if(!IsValidSpell(spell_id))
 	{
-		Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: invalid spell id", spell_id);
+		LogSpells("Casting of [{}] canceled: invalid spell id", spell_id);
 		InterruptSpell();
 		return;
 	}
@@ -1001,8 +1007,8 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	{
 		if(delaytimer)
 		{
-			Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: recast too quickly", spell_id);
-			Message(13, "You are unable to focus.");
+			LogSpells("Casting of [{}] canceled: recast too quickly", spell_id);
+			Message(Chat::Red, "You are unable to focus.");
 			InterruptSpell();
 			return;
 		}
@@ -1011,8 +1017,8 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	// make sure they aren't somehow casting 2 timed spells at once
 	if (casting_spell_id != spell_id)
 	{
-		Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: already casting", spell_id);
-		Message_StringID(13,ALREADY_CASTING);
+		LogSpells("Casting of [{}] canceled: already casting", spell_id);
+		MessageString(Chat::Red,ALREADY_CASTING);
 		InterruptSpell();
 		return;
 	}
@@ -1026,7 +1032,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	{
 		if (IsBardSong(spell_id)) {
 			if(spells[spell_id].buffduration == 0xFFFF) {
-				Log(Logs::Detail, Logs::Spells, "Bard song %d not applying bard logic because duration. dur=%d, recast=%d", spells[spell_id].buffduration);
+				LogSpells("Bard song [{}] not applying bard logic because duration. dur=[{}], recast=[{}]", spells[spell_id].buffduration);
 			} else {
 				// So long recast bard songs need special bard logic, although the effects don't repulse like other songs
 				// This is basically a hack to get that effect
@@ -1042,7 +1048,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						bardsong_target_id = spell_target->GetID();
 					bardsong_timer.Start(6000);
 				}
-				Log(Logs::Detail, Logs::Spells, "Bard song %d started: slot %d, target id %d", bardsong, bardsong_slot, bardsong_target_id);
+				LogSpells("Bard song [{}] started: slot [{}], target id [{}]", bardsong, (int) bardsong_slot, bardsong_target_id);
 				bard_song_mode = true;
 			}
 		}
@@ -1121,17 +1127,23 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 				}
 			}
 
-			Log(Logs::Detail, Logs::Spells, "Checking Interruption: spell x: %f  spell y: %f  cur x: %f  cur y: %f channelchance %f channeling skill %d\n", GetSpellX(), GetSpellY(), GetX(), GetY(), channelchance, GetSkill(EQEmu::skills::SkillChanneling));
+			LogSpells("Checking Interruption: spell x: [{}] spell y: [{}] cur x: [{}] cur y: [{}] channelchance [{}] channeling skill [{}]\n", GetSpellX(), GetSpellY(), GetX(), GetY(), channelchance, GetSkill(EQEmu::skills::SkillChanneling));
 
 			if(!spells[spell_id].uninterruptable && zone->random.Real(0, 100) > channelchance) {
-				Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: interrupted.", spell_id);
+				LogSpells("Casting of [{}] canceled: interrupted", spell_id);
 				InterruptSpell();
 				return;
 			}
 			// if we got here, we regained concentration
 			regain_conc = true;
-			Message_StringID(MT_Spells,REGAIN_AND_CONTINUE);
-			entity_list.MessageClose_StringID(this, true, RuleI(Range, SpellMessages), MT_Spells, OTHER_REGAIN_CAST, this->GetCleanName());
+			MessageString(Chat::Spells, REGAIN_AND_CONTINUE);
+			entity_list.MessageCloseString(
+				this,
+				true,
+				RuleI(Range, SpellMessages),
+				Chat::Spells,
+				OTHER_REGAIN_CAST,
+				this->GetCleanName());
 		}
 	}
 
@@ -1139,11 +1151,17 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	// first check for component reduction
 	if(IsClient()) {
 		int reg_focus = CastToClient()->GetFocusEffect(focusReagentCost,spell_id);//Client only
-		if(zone->random.Roll(reg_focus)) {
-			Log(Logs::Detail, Logs::Spells, "Spell %d: Reagent focus item prevented reagent consumption (%d chance)", spell_id, reg_focus);
+		/* it seems something causes some items not to consume reagents, it's not click type or temp flag
+		 * it maybe cast time being instant, which I had a hard time disproving, so lets do that
+		 * Items that might prove this wrong: Mystic Cloak (1057), Moss Mask (1400), and a bunch others
+		 */
+		if (item && item->GetItem() && item->GetItem()->CastTime == 0) {
+			LogSpells("Spell [{}]: Casted from instant clicky, prevent reagent consumption", spell_id);
+		} else if(zone->random.Roll(reg_focus)) {
+			LogSpells("Spell [{}]: Reagent focus item prevented reagent consumption ([{}] chance)", spell_id, reg_focus);
 		} else {
 			if(reg_focus > 0)
-				Log(Logs::Detail, Logs::Spells, "Spell %d: Reagent focus item failed to prevent reagent consumption (%d chance)", spell_id, reg_focus);
+				LogSpells("Spell [{}]: Reagent focus item failed to prevent reagent consumption ([{}] chance)", spell_id, reg_focus);
 			Client *c = this->CastToClient();
 			int component, component_count, inv_slot_id;
 			bool missingreags = false;
@@ -1167,7 +1185,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						case 13000:
 							if(itembonuses.percussionMod == 0) {			// check for the appropriate instrument type
 								HasInstrument = false;
-								c->Message_StringID(13, SONG_NEEDS_DRUM);	// send an error message if missing
+								c->MessageString(Chat::Red, SONG_NEEDS_DRUM);	// send an error message if missing
 							}
 							break;
 
@@ -1175,7 +1193,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						case 13001:
 							if(itembonuses.windMod == 0) {
 								HasInstrument = false;
-								c->Message_StringID(13, SONG_NEEDS_WIND);
+								c->MessageString(Chat::Red, SONG_NEEDS_WIND);
 							}
 							break;
 
@@ -1183,7 +1201,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						case 13011:
 							if(itembonuses.stringedMod == 0) {
 								HasInstrument = false;
-								c->Message_StringID(13, SONG_NEEDS_STRINGS);
+								c->MessageString(Chat::Red, SONG_NEEDS_STRINGS);
 							}
 							break;
 
@@ -1191,18 +1209,18 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						case 13012:
 							if(itembonuses.brassMod == 0) {
 								HasInstrument = false;
-								c->Message_StringID(13, SONG_NEEDS_BRASS);
+								c->MessageString(Chat::Red, SONG_NEEDS_BRASS);
 							}
 							break;
 
 						default:	// some non-instrument component. Let it go, but record it in the log
-							Log(Logs::Detail, Logs::Spells, "Something odd happened: Song %d required component %d", spell_id, component);
+							LogSpells("Something odd happened: Song [{}] required component [{}]", spell_id, component);
 					}
 
 					if(!HasInstrument) {	// if the instrument is missing, log it and interrupt the song
-						Log(Logs::Detail, Logs::Spells, "Song %d: Canceled. Missing required instrument %d", spell_id, component);
+						LogSpells("Song [{}]: Canceled. Missing required instrument [{}]", spell_id, component);
 						if(c->GetGM())
-							c->Message(0, "Your GM status allows you to finish casting even though you're missing a required instrument.");
+							c->Message(Chat::White, "Your GM status allows you to finish casting even though you're missing a required instrument.");
 						else {
 							InterruptSpell();
 							return;
@@ -1219,19 +1237,19 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 					{
 						if (!missingreags)
 						{
-							c->Message_StringID(13, MISSING_SPELL_COMP);
+							c->MessageString(Chat::Red, MISSING_SPELL_COMP);
 							missingreags=true;
 						}
 
 						const EQEmu::ItemData *item = database.GetItem(component);
 						if(item) {
-							c->Message_StringID(13, MISSING_SPELL_COMP_ITEM, item->Name);
-							Log(Logs::Detail, Logs::Spells, "Spell %d: Canceled. Missing required reagent %s (%d)", spell_id, item->Name, component);
+							c->MessageString(Chat::Red, MISSING_SPELL_COMP_ITEM, item->Name);
+							LogSpells("Spell [{}]: Canceled. Missing required reagent [{}] ([{}])", spell_id, item->Name, component);
 						}
 						else {
 							char TempItemName[64];
 							strcpy((char*)&TempItemName, "UNKNOWN");
-							Log(Logs::Detail, Logs::Spells, "Spell %d: Canceled. Missing required reagent %s (%d)", spell_id, TempItemName, component);
+							LogSpells("Spell [{}]: Canceled. Missing required reagent [{}] ([{}])", spell_id, TempItemName, component);
 						}
 					}
 				} // end bard/not bard ifs
@@ -1239,7 +1257,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 
 			if (missingreags) {
 				if(c->GetGM())
-					c->Message(0, "Your GM status allows you to finish casting even though you're missing required components.");
+					c->Message(Chat::White, "Your GM status allows you to finish casting even though you're missing required components.");
 				else {
 					InterruptSpell();
 					return;
@@ -1257,7 +1275,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 					if (component == -1 || noexpend == component)
 						continue;
 					component_count = spells[spell_id].component_counts[t_count];
-					Log(Logs::Detail, Logs::Spells, "Spell %d: Consuming %d of spell component item id %d", spell_id, component_count, component);
+					LogSpells("Spell [{}]: Consuming [{}] of spell component item id [{}]", spell_id, component_count, component);
 					// Components found, Deleting
 					// now we go looking for and deleting the items one by one
 					for(int s = 0; s < component_count; s++)
@@ -1269,7 +1287,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 						}
 						else
 						{	// some kind of error in the code if this happens
-							c->Message(13, "ERROR: reagent item disappeared while processing?");
+							c->Message(Chat::Red, "ERROR: reagent item disappeared while processing?");
 						}
 					}
 				}
@@ -1287,17 +1305,16 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 		&& inventory_slot != 0xFFFFFFFF)	// 10 is an item
 	{
 		bool fromaug = false;
-		const EQEmu::ItemInstance* inst = CastToClient()->GetInv()[inventory_slot];
 		EQEmu::ItemData* augitem = nullptr;
 		uint32 recastdelay = 0;
 		uint32 recasttype = 0;
 
 		while (true) {
-			if (inst == nullptr)
+			if (item == nullptr)
 				break;
 
 			for (int r = EQEmu::invaug::SOCKET_BEGIN; r <= EQEmu::invaug::SOCKET_END; r++) {
-				const EQEmu::ItemInstance* aug_i = inst->GetAugment(r);
+				const EQEmu::ItemInstance* aug_i = item->GetAugment(r);
 
 				if (!aug_i)
 					continue;
@@ -1321,8 +1338,8 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 		if(IsClient() && fromaug && recastdelay > 0)
 		{
 			if(!CastToClient()->GetPTimers().Expired(&database, (pTimerItemStart + recasttype), false)) {
-				Message_StringID(13, SPELL_RECAST);
-				Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: item spell reuse timer not expired", spell_id);
+				MessageString(Chat::Red, SPELL_RECAST);
+				LogSpells("Casting of [{}] canceled: item spell reuse timer not expired", spell_id);
 				StopCasting();
 				return;
 			}
@@ -1335,24 +1352,24 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 			}
 		}
 
-		if (inst && inst->IsClassCommon() && (inst->GetItem()->Click.Effect == spell_id) && inst->GetCharges() || fromaug)
+		if (item && item->IsClassCommon() && (item->GetItem()->Click.Effect == spell_id) && item->GetCharges() || fromaug)
 		{
-			//const ItemData* item = inst->GetItem();
-			int16 charges = inst->GetItem()->MaxCharges;
+			//const ItemData* item = item->GetItem();
+			int16 charges = item->GetItem()->MaxCharges;
 
 			if(fromaug) { charges = -1; } //Don't destroy the parent item
 
 			if(charges > -1) {	// charged item, expend a charge
-				Log(Logs::Detail, Logs::Spells, "Spell %d: Consuming a charge from item %s (%d) which had %d/%d charges.", spell_id, inst->GetItem()->Name, inst->GetItem()->ID, inst->GetCharges(), inst->GetItem()->MaxCharges);
+				LogSpells("Spell [{}]: Consuming a charge from item [{}] ([{}]) which had [{}]/[{}] charges", spell_id, item->GetItem()->Name, item->GetItem()->ID, item->GetCharges(), item->GetItem()->MaxCharges);
 				DeleteChargeFromSlot = inventory_slot;
 			} else {
-				Log(Logs::Detail, Logs::Spells, "Spell %d: Cast from unlimited charge item %s (%d) (%d charges)", spell_id, inst->GetItem()->Name, inst->GetItem()->ID, inst->GetItem()->MaxCharges);
+				LogSpells("Spell [{}]: Cast from unlimited charge item [{}] ([{}]) ([{}] charges)", spell_id, item->GetItem()->Name, item->GetItem()->ID, item->GetItem()->MaxCharges);
 			}
 		}
 		else
 		{
-			Log(Logs::Detail, Logs::Spells, "Item used to cast spell %d was missing from inventory slot %d after casting!", spell_id, inventory_slot);
-			Message(13, "Casting Error: Active casting item not found in inventory slot %i", inventory_slot);
+			LogSpells("Item used to cast spell [{}] was missing from inventory slot [{}] after casting!", spell_id, inventory_slot);
+			Message(Chat::Red, "Casting Error: Active casting item not found in inventory slot %i", inventory_slot);
 			InterruptSpell();
 			return;
 		}
@@ -1361,7 +1378,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	// we're done casting, now try to apply the spell
 	if( !SpellFinished(spell_id, spell_target, slot, mana_used, inventory_slot, resist_adjust) )
 	{
-		Log(Logs::Detail, Logs::Spells, "Casting of %d canceled: SpellFinished returned false.", spell_id);
+		LogSpells("Casting of [{}] canceled: SpellFinished returned false", spell_id);
 		// most of the cases we return false have a message already or are logic errors that shouldn't happen
 		// if there are issues I guess we can do something else, but this should work
 		StopCasting();
@@ -1404,7 +1421,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 				c->SetLinkedSpellReuseTimer(spells[spell_id].EndurTimerIndex, spells[spell_id].recast_time / 1000);
 			c->MemorizeSpell(static_cast<uint32>(slot), spell_id, memSpellSpellbar);
 		}
-		Log(Logs::Detail, Logs::Spells, "Bard song %d should be started", spell_id);
+		LogSpells("Bard song [{}] should be started", spell_id);
 	}
 	else
 	{
@@ -1442,7 +1459,7 @@ void Mob::CastedSpellFinished(uint16 spell_id, uint32 target_id, CastingSlot slo
 	delaytimer = true;
 	spellend_timer.Start(10, true);
 
-	Log(Logs::Detail, Logs::Spells, "Spell casting of %d is finished.", spell_id);
+	LogSpells("Spell casting of [{}] is finished", spell_id);
 
 }
 
@@ -1489,7 +1506,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		&& (IsGrouped() // still self only if not grouped
 		|| IsRaidGrouped())
 		&& (HasProjectIllusion())){
-			Log(Logs::Detail, Logs::AA, "Project Illusion overwrote target caster: %s spell id: %d was ON", GetName(), spell_id);
+			LogAA("Project Illusion overwrote target caster: [{}] spell id: [{}] was ON", GetName(), spell_id);
 			targetType = ST_GroupClientAndPet;
 	}
 
@@ -1499,7 +1516,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		targetType = ST_Target;
 
 	if (spell_target && !spell_target->PassCastRestriction(true, spells[spell_id].CastRestriction)){
-		Message_StringID(13,SPELL_NEED_TAR);
+		MessageString(Chat::Red,SPELL_NEED_TAR);
 		return false;
 	}
 
@@ -1509,7 +1526,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if (spell_target &&
 			    ((spell_target->IsNPC() && spell_target->IsEngaged()) ||
 			     (spell_target->IsClient() && spell_target->CastToClient()->GetAggroCount()))) {
-				Message_StringID(13, SPELL_NO_EFFECT); // Unsure correct string
+				MessageString(Chat::Red, SPELL_NO_EFFECT); // Unsure correct string
 				return false;
 			}
 		}
@@ -1517,9 +1534,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		else if (IsBeneficialSpell(spell_id)) {
 			if ((IsNPC() && IsEngaged()) || (IsClient() && CastToClient()->GetAggroCount())) {
 				if (IsDiscipline(spell_id))
-					Message_StringID(13, NO_ABILITY_IN_COMBAT);
+					MessageString(Chat::Red, NO_ABILITY_IN_COMBAT);
 				else
-					Message_StringID(13, NO_CAST_IN_COMBAT);
+					MessageString(Chat::Red, NO_CAST_IN_COMBAT);
 
 				return false;
 			}
@@ -1532,7 +1549,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if (spell_target &&
 			    ((spell_target->IsNPC() && !spell_target->IsEngaged()) ||
 			     (spell_target->IsClient() && !spell_target->CastToClient()->GetAggroCount()))) {
-				Message_StringID(13, SPELL_NO_EFFECT); // Unsure correct string
+				MessageString(Chat::Red, SPELL_NO_EFFECT); // Unsure correct string
 				return false;
 			}
 		}
@@ -1540,9 +1557,9 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		else if (IsBeneficialSpell(spell_id)) {
 			if ((IsNPC() && !IsEngaged()) || (IsClient() && !CastToClient()->GetAggroCount())) {
 				if (IsDiscipline(spell_id))
-					Message_StringID(13, NO_ABILITY_OUT_OF_COMBAT);
+					MessageString(Chat::Red, NO_ABILITY_OUT_OF_COMBAT);
 				else
-					Message_StringID(13, NO_CAST_OUT_OF_COMBAT);
+					MessageString(Chat::Red, NO_CAST_OUT_OF_COMBAT);
 
 				return false;
 			}
@@ -1577,11 +1594,11 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			)
 			{
 				//invalid target
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target of body type %d (undead)", spell_id, mob_body);
+				LogSpells("Spell [{}] canceled: invalid target of body type [{}] (undead)", spell_id, mob_body);
 				if(!spell_target)
-					Message_StringID(13,SPELL_NEED_TAR);
+					MessageString(Chat::Red,SPELL_NEED_TAR);
 				else
-					Message_StringID(13,CANNOT_AFFECT_NPC);
+					MessageString(Chat::Red,CANNOT_AFFECT_NPC);
 				return false;
 			}
 			CastAction = SingleTarget;
@@ -1592,8 +1609,8 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if(!spell_target || (mob_body != BT_Summoned && mob_body != BT_Summoned2 && mob_body != BT_Summoned3))
 			{
 				//invalid target
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target of body type %d (summoned)", spell_id, mob_body);
-				Message_StringID(13,SPELL_NEED_TAR);
+				LogSpells("Spell [{}] canceled: invalid target of body type [{}] (summoned)", spell_id, mob_body);
+				MessageString(Chat::Red,SPELL_NEED_TAR);
 				return false;
 			}
 			CastAction = SingleTarget;
@@ -1605,10 +1622,10 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if(!spell_target || (spell_target != GetPet()) ||
 				(mob_body != BT_Summoned && mob_body != BT_Summoned2 && mob_body != BT_Summoned3 && mob_body != BT_Animal))
 			{
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target of body type %d (summoned pet)",
+				LogSpells("Spell [{}] canceled: invalid target of body type [{}] (summoned pet)",
 							spell_id, mob_body);
 
-				Message_StringID(13, SPELL_NEED_TAR);
+				MessageString(Chat::Red, SPELL_NEED_TAR);
 
 				return false;
 			}
@@ -1630,11 +1647,11 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			if(!spell_target || mob_body != target_bt)
 			{
 				//invalid target
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target of body type %d (want body Type %d)", spell_id, mob_body, target_bt);
+				LogSpells("Spell [{}] canceled: invalid target of body type [{}] (want body Type [{}])", spell_id, mob_body, target_bt);
 				if(!spell_target)
-					Message_StringID(13,SPELL_NEED_TAR);
+					MessageString(Chat::Red,SPELL_NEED_TAR);
 				else
-					Message_StringID(13,CANNOT_AFFECT_NPC);
+					MessageString(Chat::Red,CANNOT_AFFECT_NPC);
 				return false;
 			}
 			CastAction = SingleTarget;
@@ -1648,23 +1665,23 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			{
 				if(!spell_target)
 				{
-					Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (ldon object)", spell_id);
-					Message_StringID(13,SPELL_NEED_TAR);
+					LogSpells("Spell [{}] canceled: invalid target (ldon object)", spell_id);
+					MessageString(Chat::Red,SPELL_NEED_TAR);
 					return false;
 				}
 				else
 				{
 					if(!spell_target->IsNPC())
 					{
-						Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (normal)", spell_id);
-						Message_StringID(13,SPELL_NEED_TAR);
+						LogSpells("Spell [{}] canceled: invalid target (normal)", spell_id);
+						MessageString(Chat::Red,SPELL_NEED_TAR);
 						return false;
 					}
 
 					if(spell_target->GetClass() != LDON_TREASURE)
 					{
-						Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (normal)", spell_id);
-						Message_StringID(13,SPELL_NEED_TAR);
+						LogSpells("Spell [{}] canceled: invalid target (normal)", spell_id);
+						MessageString(Chat::Red,SPELL_NEED_TAR);
 						return false;
 					}
 				}
@@ -1672,8 +1689,8 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 
 			if(!spell_target)
 			{
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (normal)", spell_id);
-				Message_StringID(13,SPELL_NEED_TAR);
+				LogSpells("Spell [{}] canceled: invalid target (normal)", spell_id);
+				MessageString(Chat::Red,SPELL_NEED_TAR);
 				return false;	// can't cast these unless we have a target
 			}
 			CastAction = SingleTarget;
@@ -1684,12 +1701,12 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		{
 			if(!spell_target || !spell_target->IsPlayerCorpse())
 			{
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (corpse)", spell_id);
+				LogSpells("Spell [{}] canceled: invalid target (corpse)", spell_id);
 				uint32 message = ONLY_ON_CORPSES;
 				if(!spell_target) message = SPELL_NEED_TAR;
 				else if(!spell_target->IsCorpse()) message = ONLY_ON_CORPSES;
 				else if(!spell_target->IsPlayerCorpse()) message = CORPSE_NOT_VALID;
-				Message_StringID(13, message);
+				MessageString(Chat::Red, message);
 				return false;
 			}
 			CastAction = SingleTarget;
@@ -1700,8 +1717,8 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			spell_target = GetPet();
 			if(!spell_target)
 			{
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (no pet)", spell_id);
-				Message_StringID(13,NO_PET);
+				LogSpells("Spell [{}] canceled: invalid target (no pet)", spell_id);
+				MessageString(Chat::Red,NO_PET);
 				return false;	// can't cast these unless we have a target
 			}
 			CastAction = SingleTarget;
@@ -1771,8 +1788,8 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		{
 			if(!spell_target)
 			{
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (AOE)", spell_id);
-				Message_StringID(13,SPELL_NEED_TAR);
+				LogSpells("Spell [{}] canceled: invalid target (AOE)", spell_id);
+				MessageString(Chat::Red,SPELL_NEED_TAR);
 				return false;
 			}
 			ae_center = spell_target;
@@ -1797,7 +1814,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 			}
 
 			if (spell_target && spell_target->IsPet() && spells[spell_id].targettype == ST_GroupNoPets){
-				Message_StringID(13,NO_CAST_ON_PET);
+				MessageString(Chat::Red,NO_CAST_ON_PET);
 				return false;
 			}
 
@@ -1808,8 +1825,8 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 		{
 			if(!spell_target)
 			{
-				Log(Logs::Detail, Logs::Spells, "Spell %d canceled: invalid target (Group Required: Single Target)", spell_id);
-				Message_StringID(13,SPELL_NEED_TAR);
+				LogSpells("Spell [{}] canceled: invalid target (Group Required: Single Target)", spell_id);
+				MessageString(Chat::Red,SPELL_NEED_TAR);
 				return false;
 			}
 
@@ -1925,15 +1942,15 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 
 					if(group_id_caster == 0 || group_id_target == 0)
 					{
-						Log(Logs::Detail, Logs::Spells, "Spell %d canceled: Attempted to cast a Single Target Group spell on a ungrouped member.", spell_id);
-						Message_StringID(13, TARGET_GROUP_MEMBER);
+						LogSpells("Spell [{}] canceled: Attempted to cast a Single Target Group spell on a ungrouped member", spell_id);
+						MessageString(Chat::Red, TARGET_GROUP_MEMBER);
 						return false;
 					}
 
 					if(group_id_caster != group_id_target)
 					{
-						Log(Logs::Detail, Logs::Spells, "Spell %d canceled: Attempted to cast a Single Target Group spell on a ungrouped member.", spell_id);
-						Message_StringID(13, TARGET_GROUP_MEMBER);
+						LogSpells("Spell [{}] canceled: Attempted to cast a Single Target Group spell on a ungrouped member", spell_id);
+						MessageString(Chat::Red, TARGET_GROUP_MEMBER);
 						return false;
 					}
 
@@ -2003,7 +2020,7 @@ bool Mob::DetermineSpellTargets(uint16 spell_id, Mob *&spell_target, Mob *&ae_ce
 
 		default:
 		{
-			Log(Logs::Detail, Logs::Spells, "I dont know Target Type: %d   Spell: (%d) %s", spells[spell_id].targettype, spell_id, spells[spell_id].name);
+			LogSpells("I dont know Target Type: [{}]  Spell: ([{}]) [{}]", spells[spell_id].targettype, spell_id, spells[spell_id].name);
 			Message(0, "I dont know Target Type: %d   Spell: (%d) %s", spells[spell_id].targettype, spell_id, spells[spell_id].name);
 			CastAction = CastActUnknown;
 			break;
@@ -2027,7 +2044,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 	if( spells[spell_id].zonetype == 1 && !zone->CanCastOutdoor()){
 		if(IsClient()){
 				if(!CastToClient()->GetGM()){
-					Message_StringID(13, CAST_OUTDOORS);
+					MessageString(Chat::Red, CAST_OUTDOORS);
 					return false;
 				}
 			}
@@ -2036,7 +2053,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 	if(IsEffectInSpell(spell_id, SE_Levitate) && !zone->CanLevitate()){
 			if(IsClient()){
 				if(!CastToClient()->GetGM()){
-					Message(13, "You can't levitate in this zone.");
+					Message(Chat::Red, "You can't levitate in this zone.");
 					return false;
 				}
 			}
@@ -2047,11 +2064,11 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		if(zone->IsSpellBlocked(spell_id, glm::vec3(GetPosition()))){
 			const char *msg = zone->GetSpellBlockedMessage(spell_id, glm::vec3(GetPosition()));
 			if(msg){
-				Message(13, msg);
+				Message(Chat::Red, msg);
 				return false;
 			}
 			else{
-				Message(13, "You can't cast this spell here.");
+				Message(Chat::Red, "You can't cast this spell here.");
 				return false;
 			}
 
@@ -2060,7 +2077,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 
 	if (IsClient() && CastToClient()->GetGM()){
 		if (zone->IsSpellBlocked(spell_id, glm::vec3(GetPosition()))){
-			Log(Logs::Detail, Logs::Spells, "GM Cast Blocked Spell: %s (ID %i)", GetSpellName(spell_id), spell_id);
+			LogSpells("GM Cast Blocked Spell: [{}] (ID [{}])", GetSpellName(spell_id), spell_id);
 		}
 	}
 
@@ -2088,7 +2105,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 	if(!DetermineSpellTargets(spell_id, spell_target, ae_center, CastAction, slot, isproc))
 		return(false);
 
-	Log(Logs::Detail, Logs::Spells, "Spell %d: target type %d, target %s, AE center %s", spell_id, CastAction, spell_target?spell_target->GetName():"NONE", ae_center?ae_center->GetName():"NONE");
+	LogSpells("Spell [{}]: target type [{}], target [{}], AE center [{}]", spell_id, CastAction, spell_target?spell_target->GetName():"NONE", ae_center?ae_center->GetName():"NONE");
 
 	// if a spell has the AEDuration flag, it becomes an AE on target
 	// spell that's recast every 2500 msec for AEDuration msec. There are
@@ -2099,7 +2116,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		Mob *beacon_loc = spell_target ? spell_target : this;
 		auto beacon = new Beacon(beacon_loc, spells[spell_id].AEDuration);
 		entity_list.AddBeacon(beacon);
-		Log(Logs::Detail, Logs::Spells, "Spell %d: AE duration beacon created, entity id %d", spell_id, beacon->GetName());
+		LogSpells("Spell [{}]: AE duration beacon created, entity id [{}]", spell_id, beacon->GetName());
 		spell_target = nullptr;
 		ae_center = beacon;
 		CastAction = AECaster;
@@ -2108,15 +2125,15 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 	// check line of sight to target if it's a detrimental spell
 	if(!spells[spell_id].npc_no_los && spell_target && IsDetrimentalSpell(spell_id) && !CheckLosFN(spell_target) && !IsHarmonySpell(spell_id) && spells[spell_id].targettype != ST_TargetOptional)
 	{
-		Log(Logs::Detail, Logs::Spells, "Spell %d: cannot see target %s", spell_id, spell_target->GetName());
-		Message_StringID(13,CANT_SEE_TARGET);
+		LogSpells("Spell [{}]: cannot see target [{}]", spell_id, spell_target->GetName());
+		MessageString(Chat::Red,CANT_SEE_TARGET);
 		return false;
 	}
 
 	// check to see if target is a caster mob before performing a mana tap
 	if(spell_target && IsManaTapSpell(spell_id)) {
 		if(spell_target->GetCasterClass() == 'N') {
-			Message_StringID(13, TARGET_NO_MANA);
+			MessageString(Chat::Red, TARGET_NO_MANA);
 			return false;
 		}
 	}
@@ -2139,14 +2156,14 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		float min_range2 = spells[spell_id].min_range * spells[spell_id].min_range;
 		if(dist2 > range2) {
 			//target is out of range.
-			Log(Logs::Detail, Logs::Spells, "Spell %d: Spell target is out of range (squared: %f > %f)", spell_id, dist2, range2);
-			Message_StringID(13, TARGET_OUT_OF_RANGE);
+			LogSpells("Spell [{}]: Spell target is out of range (squared: [{}] > [{}])", spell_id, dist2, range2);
+			MessageString(Chat::Red, TARGET_OUT_OF_RANGE);
 			return(false);
 		}
 		else if (dist2 < min_range2){
 			//target is too close range.
-			Log(Logs::Detail, Logs::Spells, "Spell %d: Spell target is too close (squared: %f < %f)", spell_id, dist2, min_range2);
-			Message_StringID(13, TARGET_TOO_CLOSE);
+			LogSpells("Spell [{}]: Spell target is too close (squared: [{}] < [{}])", spell_id, dist2, min_range2);
+			MessageString(Chat::Red, TARGET_TOO_CLOSE);
 			return(false);
 		}
 
@@ -2160,14 +2177,14 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		float min_range2 = spells[spell_id].min_range * spells[spell_id].min_range;
 		if(dist2 > range2) {
 			//target is out of range.
-			Log(Logs::Detail, Logs::Spells, "Spell %d: Spell target is out of range (squared: %f > %f)", spell_id, dist2, range2);
-			Message_StringID(13, TARGET_OUT_OF_RANGE);
+			LogSpells("Spell [{}]: Spell target is out of range (squared: [{}] > [{}])", spell_id, dist2, range2);
+			MessageString(Chat::Red, TARGET_OUT_OF_RANGE);
 			return(false);
 		}
 		else if (dist2 < min_range2){
 			//target is too close range.
-			Log(Logs::Detail, Logs::Spells, "Spell %d: Spell target is too close (squared: %f < %f)", spell_id, dist2, min_range2);
-			Message_StringID(13, TARGET_TOO_CLOSE);
+			LogSpells("Spell [{}]: Spell target is too close (squared: [{}] < [{}])", spell_id, dist2, min_range2);
+			MessageString(Chat::Red, TARGET_TOO_CLOSE);
 			return(false);
 		}
 
@@ -2196,7 +2213,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 #endif //BOTS
 
 			if(spell_target == nullptr) {
-				Log(Logs::Detail, Logs::Spells, "Spell %d: Targeted spell, but we have no target", spell_id);
+				LogSpells("Spell [{}]: Targeted spell, but we have no target", spell_id);
 				return(false);
 			}
 			if (isproc) {
@@ -2220,11 +2237,11 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 			if(IsPlayerIllusionSpell(spell_id)
 			&& IsClient()
 			&& (HasProjectIllusion())){
-				Log(Logs::Detail, Logs::AA, "Effect Project Illusion for %s on spell id: %d was ON", GetName(), spell_id);
+				LogAA("Effect Project Illusion for [{}] on spell id: [{}] was ON", GetName(), spell_id);
 				SetProjectIllusion(false);
 			}
 			else{
-				Log(Logs::Detail, Logs::AA, "Effect Project Illusion for %s on spell id: %d was OFF", GetName(), spell_id);
+				LogAA("Effect Project Illusion for [{}] on spell id: [{}] was OFF", GetName(), spell_id);
 			}
 			break;
 		}
@@ -2392,7 +2409,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		// clamp if we some how got focused above our current mana
 		if (GetMana() < mana_used)
 			mana_used = GetMana();
-		Log(Logs::Detail, Logs::Spells, "Spell %d: consuming %d mana", spell_id, mana_used);
+		LogSpells("Spell [{}]: consuming [{}] mana", spell_id, mana_used);
 		if (!DoHPToManaCovert(mana_used)) {
 			SetMana(GetMana() - mana_used);
 			TryTriggerOnValueAmount(false, true);
@@ -2425,7 +2442,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 		{
 			//aa new todo: aa expendable charges here
 			CastToClient()->GetPTimers().Start(casting_spell_timer, casting_spell_timer_duration);
-			Log(Logs::Detail, Logs::Spells, "Spell %d: Setting custom reuse timer %d to %d", spell_id, casting_spell_timer, casting_spell_timer_duration);
+			LogSpells("Spell [{}]: Setting custom reuse timer [{}] to [{}]", spell_id, casting_spell_timer, casting_spell_timer_duration);
 		}
 		else if(spells[spell_id].recast_time > 1000 && !spells[spell_id].IsDisciplineBuff) {
 			int recast = spells[spell_id].recast_time/1000;
@@ -2441,7 +2458,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 			if(reduction)
 				recast -= reduction;
 
-			Log(Logs::Detail, Logs::Spells, "Spell %d: Setting long reuse timer to %d s (orig %d)", spell_id, recast, spells[spell_id].recast_time);
+			LogSpells("Spell [{}]: Setting long reuse timer to [{}] s (orig [{}])", spell_id, recast, spells[spell_id].recast_time);
 			CastToClient()->GetPTimers().Start(pTimerSpellStart + spell_id, recast);
 		}
 	}
@@ -2483,7 +2500,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slot) {
 	if(slot == CastingSlot::Item) {
 		//bard songs should never come from items...
-		Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: Supposidly cast from an item. Killing song.", spell_id);
+		LogSpells("Bard Song Pulse [{}]: Supposidly cast from an item. Killing song", spell_id);
 		return(false);
 	}
 
@@ -2491,12 +2508,12 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 	Mob *ae_center = nullptr;
 	CastAction_type CastAction;
 	if(!DetermineSpellTargets(spell_id, spell_target, ae_center, CastAction, slot)) {
-		Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: was unable to determine target. Stopping.", spell_id);
+		LogSpells("Bard Song Pulse [{}]: was unable to determine target. Stopping", spell_id);
 		return(false);
 	}
 
 	if(ae_center != nullptr && ae_center->IsBeacon()) {
-		Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: Unsupported Beacon NPC AE spell", spell_id);
+		LogSpells("Bard Song Pulse [{}]: Unsupported Beacon NPC AE spell", spell_id);
 		return(false);
 	}
 
@@ -2505,19 +2522,19 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 	if(mana_used > 0) {
 		if(mana_used > GetMana()) {
 			//ran out of mana... this calls StopSong() for us
-			Log(Logs::Detail, Logs::Spells, "Ran out of mana while singing song %d", spell_id);
+			LogSpells("Ran out of mana while singing song [{}]", spell_id);
 			return(false);
 		}
 
-		Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: consuming %d mana (have %d)", spell_id, mana_used, GetMana());
+		LogSpells("Bard Song Pulse [{}]: consuming [{}] mana (have [{}])", spell_id, mana_used, GetMana());
 		SetMana(GetMana() - mana_used);
 	}
 
 	// check line of sight to target if it's a detrimental spell
 	if(spell_target && IsDetrimentalSpell(spell_id) && !CheckLosFN(spell_target))
 	{
-		Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: cannot see target %s", spell_target->GetName());
-		Message_StringID(13, CANT_SEE_TARGET);
+		LogSpells("Bard Song Pulse [{}]: cannot see target [{}]", spell_target->GetName());
+		MessageString(Chat::Red, CANT_SEE_TARGET);
 		return(false);
 	}
 
@@ -2531,8 +2548,8 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 		float range2 = range * range;
 		if(dist2 > range2) {
 			//target is out of range.
-			Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: Spell target is out of range (squared: %f > %f)", spell_id, dist2, range2);
-			Message_StringID(13, TARGET_OUT_OF_RANGE);
+			LogSpells("Bard Song Pulse [{}]: Spell target is out of range (squared: [{}] > [{}])", spell_id, dist2, range2);
+			MessageString(Chat::Red, TARGET_OUT_OF_RANGE);
 			return(false);
 		}
 	}
@@ -2547,10 +2564,10 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 		case SingleTarget:
 		{
 			if(spell_target == nullptr) {
-				Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: Targeted spell, but we have no target", spell_id);
+				LogSpells("Bard Song Pulse [{}]: Targeted spell, but we have no target", spell_id);
 				return(false);
 			}
-			Log(Logs::Detail, Logs::Spells, "Bard Song Pulse: Targeted. spell %d, target %s", spell_id, spell_target->GetName());
+			LogSpells("Bard Song Pulse: Targeted. spell [{}], target [{}]", spell_id, spell_target->GetName());
 			spell_target->BardPulse(spell_id, this);
 			break;
 		}
@@ -2568,7 +2585,7 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 		{
 			// we can't cast an AE spell without something to center it on
 			if(ae_center == nullptr) {
-				Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: AE Targeted spell, but we have no target", spell_id);
+				LogSpells("Bard Song Pulse [{}]: AE Targeted spell, but we have no target", spell_id);
 				return(false);
 			}
 
@@ -2576,9 +2593,9 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 			if(spell_target) {	// this must be an AETarget spell
 				// affect the target too
 				spell_target->BardPulse(spell_id, this);
-				Log(Logs::Detail, Logs::Spells, "Bard Song Pulse: spell %d, AE target %s", spell_id, spell_target->GetName());
+				LogSpells("Bard Song Pulse: spell [{}], AE target [{}]", spell_id, spell_target->GetName());
 			} else {
-				Log(Logs::Detail, Logs::Spells, "Bard Song Pulse: spell %d, AE with no target", spell_id);
+				LogSpells("Bard Song Pulse: spell [{}], AE with no target", spell_id);
 			}
 			bool affect_caster = !IsNPC();	//NPC AE spells do not affect the NPC caster
 			entity_list.AEBardPulse(this, ae_center, spell_id, affect_caster);
@@ -2588,13 +2605,13 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 		case GroupSpell:
 		{
 			if(spell_target->IsGrouped()) {
-				Log(Logs::Detail, Logs::Spells, "Bard Song Pulse: spell %d, Group targeting group of %s", spell_id, spell_target->GetName());
+				LogSpells("Bard Song Pulse: spell [{}], Group targeting group of [{}]", spell_id, spell_target->GetName());
 				Group *target_group = entity_list.GetGroupByMob(spell_target);
 				if(target_group)
 					target_group->GroupBardPulse(this, spell_id);
 			}
 			else if(spell_target->IsRaidGrouped() && spell_target->IsClient()) {
-				Log(Logs::Detail, Logs::Spells, "Bard Song Pulse: spell %d, Raid group targeting raid group of %s", spell_id, spell_target->GetName());
+				LogSpells("Bard Song Pulse: spell [{}], Raid group targeting raid group of [{}]", spell_id, spell_target->GetName());
 				Raid *r = entity_list.GetRaidByClient(spell_target->CastToClient());
 				if(r){
 					uint32 gid = r->GetGroup(spell_target->GetName());
@@ -2611,7 +2628,7 @@ bool Mob::ApplyNextBardPulse(uint16 spell_id, Mob *spell_target, CastingSlot slo
 				}
 			}
 			else {
-				Log(Logs::Detail, Logs::Spells, "Bard Song Pulse: spell %d, Group target without group. Affecting caster.", spell_id);
+				LogSpells("Bard Song Pulse: spell [{}], Group target without group. Affecting caster", spell_id);
 				BardPulse(spell_id, this);
 #ifdef GROUP_BUFF_PETS
 				if (GetPet() && HasPetAffinity() && !GetPet()->IsCharmed())
@@ -2637,13 +2654,13 @@ void Mob::BardPulse(uint16 spell_id, Mob *caster) {
 		if(buffs[buffs_i].spellid != spell_id)
 			continue;
 		if(buffs[buffs_i].casterid != caster->GetID()) {
-			Log(Logs::Detail, Logs::Spells, "Bard Pulse for %d: found buff from caster %d and we are pulsing for %d... are there two bards playing the same song???", spell_id, buffs[buffs_i].casterid, caster->GetID());
+			LogSpells("Bard Pulse for [{}]: found buff from caster [{}] and we are pulsing for [{}] are there two bards playing the same song???", spell_id, buffs[buffs_i].casterid, caster->GetID());
 			return;
 		}
 		//extend the spell if it will expire before the next pulse
 		if(buffs[buffs_i].ticsremaining <= 3) {
 			buffs[buffs_i].ticsremaining += 3;
-			Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: extending duration in slot %d to %d tics", spell_id, buffs_i, buffs[buffs_i].ticsremaining);
+			LogSpells("Bard Song Pulse [{}]: extending duration in slot [{}] to [{}] tics", spell_id, buffs_i, buffs[buffs_i].ticsremaining);
 		}
 
 		//should we send this buff update to the client... seems like it would
@@ -2693,7 +2710,7 @@ void Mob::BardPulse(uint16 spell_id, Mob *caster) {
 		//we are done...
 		return;
 	}
-	Log(Logs::Detail, Logs::Spells, "Bard Song Pulse %d: Buff not found, reapplying spell.", spell_id);
+	LogSpells("Bard Song Pulse [{}]: Buff not found, reapplying spell", spell_id);
 	//this spell is not affecting this mob, apply it.
 	caster->SpellOnTarget(spell_id, this);
 }
@@ -2739,7 +2756,7 @@ int Mob::CalcBuffDuration(Mob *caster, Mob *target, uint16 spell_id, int32 caste
 
 	res = mod_buff_duration(res, caster, target, spell_id);
 
-	Log(Logs::Detail, Logs::Spells, "Spell %d: Casting level %d, formula %d, base_duration %d: result %d",
+	LogSpells("Spell [{}]: Casting level [{}], formula [{}], base_duration [{}]: result [{}]",
 		spell_id, castlevel, formula, duration, res);
 
 	return res;
@@ -2830,24 +2847,24 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 	int blocked_effect, blocked_below_value, blocked_slot;
 	int overwrite_effect, overwrite_below_value, overwrite_slot;
 
-	Log(Logs::Detail, Logs::Spells, "Check Stacking on old %s (%d) @ lvl %d (by %s) vs. new %s (%d) @ lvl %d (by %s)", sp1.name, spellid1, caster_level1, (caster1==nullptr)?"Nobody":caster1->GetName(), sp2.name, spellid2, caster_level2, (caster2==nullptr)?"Nobody":caster2->GetName());
+	LogSpells("Check Stacking on old [{}] ([{}]) @ lvl [{}] (by [{}]) vs. new [{}] ([{}]) @ lvl [{}] (by [{}])", sp1.name, spellid1, caster_level1, (caster1==nullptr)?"Nobody":caster1->GetName(), sp2.name, spellid2, caster_level2, (caster2==nullptr)?"Nobody":caster2->GetName());
 
 	if (spellid1 == spellid2 ) {
 		if (!IsStackableDot(spellid1) && !IsEffectInSpell(spellid1, SE_ManaBurn)) { // mana burn spells we need to use the stacking command blocks live actually checks those first, we should probably rework to that too
 			if (caster_level1 > caster_level2) { // cur buff higher level than new
 				if (IsEffectInSpell(spellid1, SE_ImprovedTaunt)) {
-					Log(Logs::Detail, Logs::Spells, "SE_ImprovedTaunt level exception, overwriting.");
+					LogSpells("SE_ImprovedTaunt level exception, overwriting");
 					return 1;
 				} else {
-					Log(Logs::Detail, Logs::Spells, "Spells the same but existing is higher level, stopping.");
+					LogSpells("Spells the same but existing is higher level, stopping");
 					return -1;
 				}
 			} else {
-				Log(Logs::Detail, Logs::Spells, "Spells the same but newer is higher or equal level, overwriting.");
+				LogSpells("Spells the same but newer is higher or equal level, overwriting");
 				return 1;
 			}
 		} else if (spellid1 == 2751) {
-			Log(Logs::Detail, Logs::Spells, "Blocking spell because manaburn does not stack with itself.");
+			LogSpells("Blocking spell because manaburn does not stack with itself");
 			return -1;
 		}
 	}
@@ -2862,7 +2879,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 	{
 		if(!IsDetrimentalSpell(spellid1) && !IsDetrimentalSpell(spellid2))
 		{
-			Log(Logs::Detail, Logs::Spells, "%s and %s are beneficial, and one is a bard song, no action needs to be taken", sp1.name, sp2.name);
+			LogSpells("[{}] and [{}] are beneficial, and one is a bard song, no action needs to be taken", sp1.name, sp2.name);
 			return (0);
 		}
 	}
@@ -2877,7 +2894,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 			}
 		}
 	} else if (IsEffectInSpell(spellid1, SE_ManaBurn)) {
-		Log(Logs::Detail, Logs::Spells, "We have a Mana Burn spell that is the same, they won't stack");
+		LogSpells("We have a Mana Burn spell that is the same, they won't stack");
 		return -1;
 	}
 
@@ -2891,7 +2908,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 
 			if (spellbonuses.Screech == 1) {
 				if (effect2 == SE_Screech && sp2.base[i] == -1) {
-					Message_StringID(MT_SpellFailure, SCREECH_BUFF_BLOCK, sp2.name);
+					MessageString(Chat::SpellFailure, SCREECH_BUFF_BLOCK, sp2.name);
 					return -1;
 				}
 			}
@@ -2935,16 +2952,16 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 				{
 					sp1_value = CalcSpellEffectValue(spellid1, overwrite_slot, caster_level1);
 
-					Log(Logs::Detail, Logs::Spells, "%s (%d) overwrites existing spell if effect %d on slot %d is below %d. Old spell has value %d on that slot/effect. %s.",
+					LogSpells("[{}] ([{}]) overwrites existing spell if effect [{}] on slot [{}] is below [{}]. Old spell has value [{}] on that slot/effect. [{}]",
 						sp2.name, spellid2, overwrite_effect, overwrite_slot, overwrite_below_value, sp1_value, (sp1_value < overwrite_below_value)?"Overwriting":"Not overwriting");
 
 					if(sp1_value < overwrite_below_value)
 					{
-						Log(Logs::Detail, Logs::Spells, "Overwrite spell because sp1_value < overwrite_below_value");
+						LogSpells("Overwrite spell because sp1_value < overwrite_below_value");
 						return 1;			// overwrite spell if its value is less
 					}
 				} else {
-					Log(Logs::Detail, Logs::Spells, "%s (%d) overwrites existing spell if effect %d on slot %d is below %d, but we do not have that effect on that slot. Ignored.",
+					LogSpells("[{}] ([{}]) overwrites existing spell if effect [{}] on slot [{}] is below [{}], but we do not have that effect on that slot. Ignored",
 						sp2.name, spellid2, overwrite_effect, overwrite_slot, overwrite_below_value);
 
 				}
@@ -2958,22 +2975,22 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 				{
 					sp2_value = CalcSpellEffectValue(spellid2, blocked_slot, caster_level2);
 
-					Log(Logs::Detail, Logs::Spells, "%s (%d) blocks effect %d on slot %d below %d. New spell has value %d on that slot/effect. %s.",
+					LogSpells("[{}] ([{}]) blocks effect [{}] on slot [{}] below [{}]. New spell has value [{}] on that slot/effect. [{}]",
 						sp1.name, spellid1, blocked_effect, blocked_slot, blocked_below_value, sp2_value, (sp2_value < blocked_below_value)?"Blocked":"Not blocked");
 
 					if (sp2_value < blocked_below_value)
 					{
-						Log(Logs::Detail, Logs::Spells, "Blocking spell because sp2_Value < blocked_below_value");
+						LogSpells("Blocking spell because sp2_Value < blocked_below_value");
 						return -1;		//blocked
 					}
 				} else {
-					Log(Logs::Detail, Logs::Spells, "%s (%d) blocks effect %d on slot %d below %d, but we do not have that effect on that slot. Ignored.",
+					LogSpells("[{}] ([{}]) blocks effect [{}] on slot [{}] below [{}], but we do not have that effect on that slot. Ignored",
 						sp1.name, spellid1, blocked_effect, blocked_slot, blocked_below_value);
 				}
 			}
 		}
 	} else {
-		Log(Logs::Detail, Logs::Spells, "%s (%d) and %s (%d) appear to be in the same line, skipping Stacking Overwrite/Blocking checks",
+		LogSpells("[{}] ([{}]) and [{}] ([{}]) appear to be in the same line, skipping Stacking Overwrite/Blocking checks",
 				sp1.name, spellid1, sp2.name, spellid2);
 	}
 
@@ -3026,13 +3043,13 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 		*/
 		if(IsNPC() && caster1 && caster2 && caster1 != caster2) {
 			if(effect1 == SE_CurrentHP && sp1_detrimental && sp2_detrimental) {
-				Log(Logs::Detail, Logs::Spells, "Both casters exist and are not the same, the effect is a detrimental dot, moving on");
+				LogSpells("Both casters exist and are not the same, the effect is a detrimental dot, moving on");
 				continue;
 			}
 		}
 
 		if(effect1 == SE_CompleteHeal){ //SE_CompleteHeal never stacks or overwrites ever, always block.
-			Log(Logs::Detail, Logs::Spells, "Blocking spell because complete heal never stacks or overwries");
+			LogSpells("Blocking spell because complete heal never stacks or overwries");
 			return (-1);
 		}
 
@@ -3041,7 +3058,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 		and the effect is a dot we can go ahead and stack it
 		*/
 		if(effect1 == SE_CurrentHP && spellid1 != spellid2 && sp1_detrimental && sp2_detrimental) {
-			Log(Logs::Detail, Logs::Spells, "The spells are not the same and it is a detrimental dot, passing");
+			LogSpells("The spells are not the same and it is a detrimental dot, passing");
 			continue;
 		}
 
@@ -3066,7 +3083,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 			sp2_value = 0 - sp2_value;
 
 		if(sp2_value < sp1_value) {
-			Log(Logs::Detail, Logs::Spells, "Spell %s (value %d) is not as good as %s (value %d). Rejecting %s.",
+			LogSpells("Spell [{}] (value [{}]) is not as good as [{}] (value [{}]). Rejecting [{}]",
 				sp2.name, sp2_value, sp1.name, sp1_value, sp2.name);
 			return -1;	// can't stack
 		}
@@ -3075,7 +3092,7 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 		//we dont return here... a better value on this one effect dosent mean they are
 		//all better...
 
-		Log(Logs::Detail, Logs::Spells, "Spell %s (value %d) is not as good as %s (value %d). We will overwrite %s if there are no other conflicts.",
+		LogSpells("Spell [{}] (value [{}]) is not as good as [{}] (value [{}]). We will overwrite [{}] if there are no other conflicts",
 			sp1.name, sp1_value, sp2.name, sp2_value, sp1.name);
 		will_overwrite = true;
 	}
@@ -3084,15 +3101,15 @@ int Mob::CheckStackConflict(uint16 spellid1, int caster_level1, uint16 spellid2,
 	//so now we see if this new spell is any better, or if its not related at all
 	if(will_overwrite) {
 		if (values_equal && effect_match && !IsGroupSpell(spellid2) && IsGroupSpell(spellid1)) {
-			Log(Logs::Detail, Logs::Spells, "%s (%d) appears to be the single target version of %s (%d), rejecting",
+			LogSpells("[{}] ([{}]) appears to be the single target version of [{}] ([{}]), rejecting",
 					sp2.name, spellid2, sp1.name, spellid1);
 			return -1;
 		}
-		Log(Logs::Detail, Logs::Spells, "Stacking code decided that %s should overwrite %s.", sp2.name, sp1.name);
+		LogSpells("Stacking code decided that [{}] should overwrite [{}]", sp2.name, sp1.name);
 		return(1);
 	}
 
-	Log(Logs::Detail, Logs::Spells, "Stacking code decided that %s is not affected by %s.", sp2.name, sp1.name);
+	LogSpells("Stacking code decided that [{}] is not affected by [{}]", sp2.name, sp1.name);
 	return 0;
 }
 
@@ -3185,11 +3202,11 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
 	}
 
 	if (duration == 0) {
-		Log(Logs::Detail, Logs::Spells, "Buff %d failed to add because its duration came back as 0.", spell_id);
+		LogSpells("Buff [{}] failed to add because its duration came back as 0", spell_id);
 		return -2;	// no duration? this isn't a buff
 	}
 
-	Log(Logs::Detail, Logs::Spells, "Trying to add buff %d cast by %s (cast level %d) with duration %d",
+	LogSpells("Trying to add buff [{}] cast by [{}] (cast level [{}]) with duration [{}]",
 		spell_id, caster?caster->GetName():"UNKNOWN", caster_level, duration);
 
 	// first we loop through everything checking that the spell
@@ -3209,15 +3226,15 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
 			ret = CheckStackConflict(curbuf.spellid, curbuf.casterlevel, spell_id,
 					caster_level, entity_list.GetMobID(curbuf.casterid), caster, buffslot);
 			if (ret == -1) {	// stop the spell
-				Log(Logs::Detail, Logs::Spells, "Adding buff %d failed: stacking prevented by spell %d in slot %d with caster level %d",
+				LogSpells("Adding buff [{}] failed: stacking prevented by spell [{}] in slot [{}] with caster level [{}]",
 						spell_id, curbuf.spellid, buffslot, curbuf.casterlevel);
 				if (caster && caster->IsClient() && RuleB(Client, UseLiveBlockedMessage)) {
-					caster->Message(13, "Your %s did not take hold on %s. (Blocked by %s.)", spells[spell_id].name, this->GetName(), spells[curbuf.spellid].name);
+					caster->Message(Chat::Red, "Your %s did not take hold on %s. (Blocked by %s.)", spells[spell_id].name, this->GetName(), spells[curbuf.spellid].name);
 				}
 				return -1;
 			}
 			if (ret == 1) {	// set a flag to indicate that there will be overwriting
-				Log(Logs::Detail, Logs::Spells, "Adding buff %d will overwrite spell %d in slot %d with caster level %d",
+				LogSpells("Adding buff [{}] will overwrite spell [{}] in slot [{}] with caster level [{}]",
 						spell_id, curbuf.spellid, buffslot, curbuf.casterlevel);
 				// If this is the first buff it would override, use its slot
 				if (!will_overwrite && !IsDisciplineBuff(spell_id))
@@ -3241,7 +3258,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
 			for (buffslot = 0; buffslot < buff_count; buffslot++) {
 				const Buffs_Struct &curbuf = buffs[buffslot];
 				if (IsBeneficialSpell(curbuf.spellid)) {
-					Log(Logs::Detail, Logs::Spells, "No slot for detrimental buff %d, so we are overwriting a beneficial buff %d in slot %d",
+					LogSpells("No slot for detrimental buff [{}], so we are overwriting a beneficial buff [{}] in slot [{}]",
 							spell_id, curbuf.spellid, buffslot);
 					BuffFadeBySlot(buffslot, false);
 					emptyslot = buffslot;
@@ -3249,11 +3266,11 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
 				}
 			}
 			if(emptyslot == -1) {
-				Log(Logs::Detail, Logs::Spells, "Unable to find a buff slot for detrimental buff %d", spell_id);
+				LogSpells("Unable to find a buff slot for detrimental buff [{}]", spell_id);
 				return -1;
 			}
 		} else {
-			Log(Logs::Detail, Logs::Spells, "Unable to find a buff slot for beneficial buff %d", spell_id);
+			LogSpells("Unable to find a buff slot for beneficial buff [{}]", spell_id);
 			return -1;
 		}
 	}
@@ -3305,7 +3322,7 @@ int Mob::AddBuff(Mob *caster, uint16 spell_id, int duration, int32 level_overrid
 			buffs[emptyslot].UpdateClient = true;
 	}
 
-	Log(Logs::Detail, Logs::Spells, "Buff %d added to slot %d with caster level %d", spell_id, emptyslot, caster_level);
+	LogSpells("Buff [{}] added to slot [{}] with caster level [{}]", spell_id, emptyslot, caster_level);
 	if (IsPet() && GetOwner() && GetOwner()->IsClient())
 		SendPetBuffsToClient();
 
@@ -3347,7 +3364,7 @@ int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite)
 {
 	int i, ret, firstfree = -2;
 
-	Log(Logs::Detail, Logs::AI, "Checking if buff %d cast at level %d can stack on me.%s", spellid, caster_level, iFailIfOverwrite?" failing if we would overwrite something":"");
+	LogAI("Checking if buff [{}] cast at level [{}] can stack on me.[{}]", spellid, caster_level, iFailIfOverwrite?" failing if we would overwrite something":"");
 
 	int buff_count = GetMaxTotalSlots();
 	for (i=0; i < buff_count; i++)
@@ -3371,7 +3388,7 @@ int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite)
 		if(ret == 1) {
 			// should overwrite current slot
 			if(iFailIfOverwrite) {
-				Log(Logs::Detail, Logs::AI, "Buff %d would overwrite %d in slot %d, reporting stack failure", spellid, curbuf.spellid, i);
+				LogAI("Buff [{}] would overwrite [{}] in slot [{}], reporting stack failure", spellid, curbuf.spellid, i);
 				return(-1);
 			}
 			if(firstfree == -2)
@@ -3379,12 +3396,12 @@ int Mob::CanBuffStack(uint16 spellid, uint8 caster_level, bool iFailIfOverwrite)
 		}
 		if(ret == -1) {
 			
-			Log(Logs::Detail, Logs::AI, "Buff %d would conflict with %d in slot %d, reporting stack failure", spellid, curbuf.spellid, i);
+			LogAI("Buff [{}] would conflict with [{}] in slot [{}], reporting stack failure", spellid, curbuf.spellid, i);
 			return -1;	// stop the spell, can't stack it
 		}
 	}
 
-	Log(Logs::Detail, Logs::AI, "Reporting that buff %d could successfully be placed into slot %d", spellid, firstfree);
+	LogAI("Reporting that buff [{}] could successfully be placed into slot [{}]", spellid, firstfree);
 
 	return firstfree;
 }
@@ -3412,8 +3429,8 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	// well we can't cast a spell on target without a target
 	if(!spelltar)
 	{
-		Log(Logs::Detail, Logs::Spells, "Unable to apply spell %d without a target", spell_id);
-		Message(13, "SOT: You must have a target for this spell.");
+		LogSpells("Unable to apply spell [{}] without a target", spell_id);
+		Message(Chat::Red, "SOT: You must have a target for this spell.");
 		return false;
 	}
 
@@ -3422,7 +3439,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 
 	if(IsDetrimentalSpell(spell_id) && !IsAttackAllowed(spelltar, true) && !IsResurrectionEffects(spell_id)) {
 		if(!IsClient() || !CastToClient()->GetGM()) {
-			Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
+			MessageString(Chat::SpellFailure, SPELL_NO_HOLD);
 			return false;
 		}
 	}
@@ -3438,15 +3455,15 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	// 1 = PCs, 2 = NPCs
 	if (spells[spell_id].pcnpc_only_flag && spells[spell_id].targettype != ST_AETargetHateList &&
 	    spells[spell_id].targettype != ST_HateList) {
-		if (spells[spell_id].pcnpc_only_flag == 1 && !spelltar->IsClient() && !spelltar->IsMerc())
+		if (spells[spell_id].pcnpc_only_flag == 1 && !spelltar->IsClient() && !spelltar->IsMerc() && !spelltar->IsBot())
 			return false;
-		else if (spells[spell_id].pcnpc_only_flag == 2 && (spelltar->IsClient() || spelltar->IsMerc()))
+		else if (spells[spell_id].pcnpc_only_flag == 2 && (spelltar->IsClient() || spelltar->IsMerc() || spelltar->IsBot()))
 			return false;
 	}
 
 	uint16 caster_level = level_override > 0 ? level_override : GetCasterLevel(spell_id);
 
-	Log(Logs::Detail, Logs::Spells, "Casting spell %d on %s with effective caster level %d", spell_id, spelltar->GetName(), caster_level);
+	LogSpells("Casting spell [{}] on [{}] with effective caster level [{}]", spell_id, spelltar->GetName(), caster_level);
 
 	// Actual cast action - this causes the caster animation and the particles
 	// around the target
@@ -3537,7 +3554,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	if (RuleB(Spells, EnableBlockedBuffs)) {
 		// We return true here since the caster's client should act like normal
 		if (spelltar->IsBlockedBuff(spell_id)) {
-			Log(Logs::Detail, Logs::Spells, "Spell %i not applied to %s as it is a Blocked Buff.",
+			LogSpells("Spell [{}] not applied to [{}] as it is a Blocked Buff",
 					spell_id, spelltar->GetName());
 			safe_delete(action_packet);
 			return true;
@@ -3545,7 +3562,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 
 		if (spelltar->IsPet() && spelltar->GetOwner() &&
 				spelltar->GetOwner()->IsBlockedPetBuff(spell_id)) {
-			Log(Logs::Detail, Logs::Spells, "Spell %i not applied to %s (%s's pet) as it is a Pet Blocked Buff.",
+			LogSpells("Spell [{}] not applied to [{}] ([{}]'s pet) as it is a Pet Blocked Buff",
 					spell_id, spelltar->GetName(), spelltar->GetOwner()->GetName());
 			safe_delete(action_packet);
 			return true;
@@ -3554,7 +3571,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 
 	// invuln mobs can't be affected by any spells, good or bad
 	if(spelltar->GetInvul() || spelltar->DivineAura()) {
-		Log(Logs::Detail, Logs::Spells, "Casting spell %d on %s aborted: they are invulnerable.", spell_id, spelltar->GetName());
+		LogSpells("Casting spell [{}] on [{}] aborted: they are invulnerable", spell_id, spelltar->GetName());
 		safe_delete(action_packet);
 		return false;
 	}
@@ -3565,17 +3582,17 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 		if (RuleB(Pets, UnTargetableSwarmPet)) {
 			if (spelltar->IsNPC()) {
 				if (!spelltar->CastToNPC()->GetSwarmOwner()) {
-					Log(Logs::Detail, Logs::Spells, "Casting spell %d on %s aborted: they are untargetable", spell_id, spelltar->GetName());
+					LogSpells("Casting spell [{}] on [{}] aborted: they are untargetable", spell_id, spelltar->GetName());
 					safe_delete(action_packet);
 					return(false);
 				}
 			} else {
-				Log(Logs::Detail, Logs::Spells, "Casting spell %d on %s aborted: they are untargetable", spell_id, spelltar->GetName());
+				LogSpells("Casting spell [{}] on [{}] aborted: they are untargetable", spell_id, spelltar->GetName());
 				safe_delete(action_packet);
 				return(false);
 			}
 		} else {
-			Log(Logs::Detail, Logs::Spells, "Casting spell %d on %s aborted: they are untargetable", spell_id, spelltar->GetName());
+			LogSpells("Casting spell [{}] on [{}] aborted: they are untargetable", spell_id, spelltar->GetName());
 			safe_delete(action_packet);
 			return(false);
 		}
@@ -3587,7 +3604,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	{
 		if(spelltar->invisible)
 		{
-			spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
+			spelltar->MessageString(Chat::SpellFailure, ALREADY_INVIS, GetCleanName());
 			safe_delete(action_packet);
 			return false;
 		}
@@ -3597,7 +3614,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	{
 		if(spelltar->invisible_undead)
 		{
-			spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
+			spelltar->MessageString(Chat::SpellFailure, ALREADY_INVIS, GetCleanName());
 			safe_delete(action_packet);
 			return false;
 		}
@@ -3607,7 +3624,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	{
 		if(spelltar->invisible_animals)
 		{
-			spelltar->Message_StringID(MT_SpellFailure, ALREADY_INVIS, GetCleanName());
+			spelltar->MessageString(Chat::SpellFailure, ALREADY_INVIS, GetCleanName());
 			safe_delete(action_packet);
 			return false;
 		}
@@ -3684,10 +3701,10 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 				{
 					if(spells[spell_id].targettype == ST_AEBard) {
 						//if it was a beneficial AE bard song don't spam the window that it would not hold
-						Log(Logs::Detail, Logs::Spells, "Beneficial ae bard song %d can't take hold %s -> %s, IBA? %d", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar));
+						LogSpells("Beneficial ae bard song [{}] can't take hold [{}] -> [{}], IBA? [{}]", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar));
 					} else {
-						Log(Logs::Detail, Logs::Spells, "Beneficial spell %d can't take hold %s -> %s, IBA? %d", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar));
-						Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
+						LogSpells("Beneficial spell [{}] can't take hold [{}] -> [{}], IBA? [{}]", spell_id, GetName(), spelltar->GetName(), IsBeneficialAllowed(spelltar));
+						MessageString(Chat::SpellFailure, SPELL_NO_HOLD);
 					}
 					safe_delete(action_packet);
 					return false;
@@ -3696,8 +3713,8 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 		}
 		else if	( !IsAttackAllowed(spelltar, true) && !IsResurrectionEffects(spell_id)) // Detrimental spells - PVP check
 		{
-			Log(Logs::Detail, Logs::Spells, "Detrimental spell %d can't take hold %s -> %s", spell_id, GetName(), spelltar->GetName());
-			spelltar->Message_StringID(MT_SpellFailure, YOU_ARE_PROTECTED, GetCleanName());
+			LogSpells("Detrimental spell [{}] can't take hold [{}] -> [{}]", spell_id, GetName(), spelltar->GetName());
+			spelltar->MessageString(Chat::SpellFailure, YOU_ARE_PROTECTED, GetCleanName());
 			safe_delete(action_packet);
 			return false;
 		}
@@ -3710,7 +3727,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	if(spelltar->IsImmuneToSpell(spell_id, this))
 	{
 		//the above call does the message to the client if needed
-		Log(Logs::Detail, Logs::Spells, "Spell %d can't take hold due to immunity %s -> %s", spell_id, GetName(), spelltar->GetName());
+		LogSpells("Spell [{}] can't take hold due to immunity [{}] -> [{}]", spell_id, GetName(), spelltar->GetName());
 		safe_delete(action_packet);
 		return false;
 	}
@@ -3734,7 +3751,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 				focus = CalcFocusEffect(focusBlockNextSpell, buffs[b].spellid, spell_id);
 				if(focus) {
 					CheckNumHitsRemaining(NumHit::MatchingSpells, b);
-					Message_StringID(MT_SpellFailure, SPELL_WOULDNT_HOLD);
+					MessageString(Chat::SpellFailure, SPELL_WOULDNT_HOLD);
 					safe_delete(action_packet);
 					return false;
 				}
@@ -3783,18 +3800,18 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 		if (reflect_chance) {
 
 			if (RuleB(Spells, ReflectMessagesClose)) {
-				entity_list.MessageClose_StringID(
+				entity_list.MessageCloseString(
 					this, /* Sender */
 					false, /* Skip Sender */
 					RuleI(Range, SpellMessages), /* Range */
-					MT_Spells, /* Type */
+					Chat::Spells, /* Type */
 					SPELL_REFLECT, /* String ID */
 					GetCleanName(), /* Message 1 */
 					spelltar->GetCleanName() /* Message 2 */
 				);
 			}
 			else {
-				Message_StringID(MT_Spells, SPELL_REFLECT, GetCleanName(), spelltar->GetCleanName());
+				MessageString(Chat::Spells, SPELL_REFLECT, GetCleanName(), spelltar->GetCleanName());
 			}
 
 			CheckNumHitsRemaining(NumHit::ReflectSpell);
@@ -3823,15 +3840,15 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 		{
 			if(spell_effectiveness == 0 || !IsPartialCapableSpell(spell_id) )
 			{
-				Log(Logs::Detail, Logs::Spells, "Spell %d was completely resisted by %s", spell_id, spelltar->GetName());
+				LogSpells("Spell [{}] was completely resisted by [{}]", spell_id, spelltar->GetName());
 
 				if (spells[spell_id].resisttype == RESIST_PHYSICAL){
-					Message_StringID(MT_SpellFailure, PHYSICAL_RESIST_FAIL,spells[spell_id].name);
-					spelltar->Message_StringID(MT_SpellFailure, YOU_RESIST, spells[spell_id].name);
+					MessageString(Chat::SpellFailure, PHYSICAL_RESIST_FAIL,spells[spell_id].name);
+					spelltar->MessageString(Chat::SpellFailure, YOU_RESIST, spells[spell_id].name);
 				}
 				else {
-					Message_StringID(MT_SpellFailure, TARGET_RESISTED, spells[spell_id].name);
-					spelltar->Message_StringID(MT_SpellFailure, YOU_RESIST, spells[spell_id].name);
+					MessageString(Chat::SpellFailure, TARGET_RESISTED, spells[spell_id].name);
+					spelltar->MessageString(Chat::SpellFailure, YOU_RESIST, spells[spell_id].name);
 				}
 
 				if (spelltar->IsAIControlled()) {
@@ -3875,7 +3892,7 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 
 	if (spelltar->IsAIControlled() && IsDetrimentalSpell(spell_id) && !IsHarmonySpell(spell_id)) {
 		int32 aggro_amount = CheckAggroAmount(spell_id, spelltar, isproc);
-		Log(Logs::Detail, Logs::Spells, "Spell %d cast on %s generated %d hate", spell_id,
+		LogSpells("Spell [{}] cast on [{}] generated [{}] hate", spell_id,
 			spelltar->GetName(), aggro_amount);
 		if (aggro_amount > 0) {
 			spelltar->AddToHateList(this, aggro_amount);
@@ -3894,9 +3911,9 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	// make sure spelltar is high enough level for the buff
 	if(RuleB(Spells, BuffLevelRestrictions) && !spelltar->CheckSpellLevelRestriction(spell_id))
 	{
-		Log(Logs::Detail, Logs::Spells, "Spell %d failed: recipient did not meet the level restrictions", spell_id);
+		LogSpells("Spell [{}] failed: recipient did not meet the level restrictions", spell_id);
 		if(!IsBardSong(spell_id))
-			Message_StringID(MT_SpellFailure, SPELL_TOO_POWERFUL);
+			MessageString(Chat::SpellFailure, SPELL_TOO_POWERFUL);
 		safe_delete(action_packet);
 		return false;
 	}
@@ -3906,9 +3923,9 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	{
 		// if SpellEffect returned false there's a problem applying the
 		// spell. It's most likely a buff that can't stack.
-		Log(Logs::Detail, Logs::Spells, "Spell %d could not apply its effects %s -> %s\n", spell_id, GetName(), spelltar->GetName());
+		LogSpells("Spell [{}] could not apply its effects [{}] -> [{}]\n", spell_id, GetName(), spelltar->GetName());
 		if(casting_spell_aa_id)
-			Message_StringID(MT_SpellFailure, SPELL_NO_HOLD);
+			MessageString(Chat::SpellFailure, SPELL_NO_HOLD);
 		safe_delete(action_packet);
 		return false;
 	}
@@ -3977,25 +3994,25 @@ bool Mob::SpellOnTarget(uint16 spell_id, Mob *spelltar, bool reflect, bool use_r
 	safe_delete(action_packet);
 	safe_delete(message_packet);
 
-	Log(Logs::Detail, Logs::Spells, "Cast of %d by %s on %s complete successfully.", spell_id, GetName(), spelltar->GetName());
+	LogSpells("Cast of [{}] by [{}] on [{}] complete successfully", spell_id, GetName(), spelltar->GetName());
 
 	return true;
 }
 
 void Corpse::CastRezz(uint16 spellid, Mob* Caster)
 {
-	Log(Logs::Detail, Logs::Spells, "Corpse::CastRezz spellid %i, Rezzed() is %i, rezzexp is %i", spellid,IsRezzed(),rez_experience);
+	LogSpells("Corpse::CastRezz spellid [{}], Rezzed() is [{}], rezzexp is [{}]", spellid,IsRezzed(),rez_experience);
 
 	if(IsRezzed()){
 		if(Caster && Caster->IsClient())
-			Caster->Message(13,"This character has already been resurrected.");
+			Caster->Message(Chat::Red,"This character has already been resurrected.");
 
 		return;
 	}
 	/*
 	if(!can_rez) {
 		if(Caster && Caster->IsClient())
-			Caster->Message_StringID(0, CORPSE_TOO_OLD);
+			Caster->MessageString(Chat::White, CORPSE_TOO_OLD);
 		return;
 	}
 	*/
@@ -4211,7 +4228,7 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	//this spell like 10 times, this could easily be consolidated
 	//into one loop through with a switch statement.
 
-	Log(Logs::Detail, Logs::Spells, "Checking to see if we are immune to spell %d cast by %s", spell_id, caster->GetName());
+	LogSpells("Checking to see if we are immune to spell [{}] cast by [{}]", spell_id, caster->GetName());
 
 	if(!IsValidSpell(spell_id))
 		return true;
@@ -4222,8 +4239,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	if(IsMezSpell(spell_id))
 	{
 		if(GetSpecialAbility(UNMEZABLE)) {
-			Log(Logs::Detail, Logs::Spells, "We are immune to Mez spells.");
-			caster->Message_StringID(MT_SpellFailure, CANNOT_MEZ);
+			LogSpells("We are immune to Mez spells");
+			caster->MessageString(Chat::SpellFailure, CANNOT_MEZ);
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if(aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4240,8 +4257,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		if((GetLevel() > spells[spell_id].max[effect_index]) &&
 			(!caster->IsNPC() || (caster->IsNPC() && !RuleB(Spells, NPCIgnoreBaseImmunity))))
 		{
-			Log(Logs::Detail, Logs::Spells, "Our level (%d) is higher than the limit of this Mez spell (%d)", GetLevel(), spells[spell_id].max[effect_index]);
-			caster->Message_StringID(MT_SpellFailure, CANNOT_MEZ_WITH_SPELL);
+			LogSpells("Our level ([{}]) is higher than the limit of this Mez spell ([{}])", GetLevel(), spells[spell_id].max[effect_index]);
+			caster->MessageString(Chat::SpellFailure, CANNOT_MEZ_WITH_SPELL);
 			AddToHateList(caster, 1,0,true,false,false,spell_id);
 			return true;
 		}
@@ -4250,8 +4267,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	// slow and haste spells
 	if(GetSpecialAbility(UNSLOWABLE) && IsEffectInSpell(spell_id, SE_AttackSpeed))
 	{
-		Log(Logs::Detail, Logs::Spells, "We are immune to Slow spells.");
-		caster->Message_StringID(CC_Red, IMMUNE_ATKSPEED);
+		LogSpells("We are immune to Slow spells");
+		caster->MessageString(Chat::Red, IMMUNE_ATKSPEED);
 		int32 aggro = caster->CheckAggroAmount(spell_id, this);
 		if(aggro > 0) {
 			AddToHateList(caster, aggro);
@@ -4266,8 +4283,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	{
 		effect_index = GetSpellEffectIndex(spell_id, SE_Fear);
 		if(GetSpecialAbility(UNFEARABLE)) {
-			Log(Logs::Detail, Logs::Spells, "We are immune to Fear spells.");
-			caster->Message_StringID(CC_Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
+			LogSpells("We are immune to Fear spells");
+			caster->MessageString(Chat::Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if(aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4277,14 +4294,14 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 			return true;
 		} else if(IsClient() && caster->IsClient() && (caster->CastToClient()->GetGM() == false))
 		{
-			Log(Logs::Detail, Logs::Spells, "Clients cannot fear eachother!");
-			caster->Message_StringID(CC_Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
+			LogSpells("Clients cannot fear eachother!");
+			caster->MessageString(Chat::Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
 			return true;
 		}
 		else if(GetLevel() > spells[spell_id].max[effect_index] && spells[spell_id].max[effect_index] != 0)
 		{
-			Log(Logs::Detail, Logs::Spells, "Level is %d, cannot be feared by this spell.", GetLevel());
-			caster->Message_StringID(MT_Shout, FEAR_TOO_HIGH);
+			LogSpells("Level is [{}], cannot be feared by this spell", GetLevel());
+			caster->MessageString(Chat::Shout, FEAR_TOO_HIGH);
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if (aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4295,9 +4312,9 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 		}
 		else if (CheckAATimer(aaTimerWarcry))
 		{
-			Message(13, "Your are immune to fear.");
-			Log(Logs::Detail, Logs::Spells, "Clients has WarCry effect, immune to fear!");
-			caster->Message_StringID(CC_Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
+			Message(Chat::Red, "Your are immune to fear.");
+			LogSpells("Clients has WarCry effect, immune to fear!");
+			caster->MessageString(Chat::Red, IMMUNE_FEAR);	// need to verify message type, not in MQ2Cast for easy look up
 			return true;
 		}
 	}
@@ -4306,8 +4323,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	{
 		if(GetSpecialAbility(UNCHARMABLE))
 		{
-			Log(Logs::Detail, Logs::Spells, "We are immune to Charm spells.");
-			caster->Message_StringID(CC_Red, CANNOT_CHARM);	// need to verify message type, not in MQ2Cast for easy look up
+			LogSpells("We are immune to Charm spells");
+			caster->MessageString(Chat::Red, CANNOT_CHARM);	// need to verify message type, not in MQ2Cast for easy look up
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if(aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4319,8 +4336,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 
 		if(this == caster)
 		{
-			Log(Logs::Detail, Logs::Spells, "You are immune to your own charms.");
-			caster->Message(CC_Red, "You cannot charm yourself.");	// need to look up message?
+			LogSpells("You are immune to your own charms");
+			caster->Message(Chat::Red, "You cannot charm yourself.");	// need to look up message?
 			return true;
 		}
 
@@ -4332,8 +4349,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 			assert(effect_index >= 0);
 			if(GetLevel() > spells[spell_id].max[effect_index] && spells[spell_id].max[effect_index] != 0)
 			{
-				Log(Logs::Detail, Logs::Spells, "Our level (%d) is higher than the limit of this Charm spell (%d)", GetLevel(), spells[spell_id].max[effect_index]);
-				caster->Message_StringID(CC_Red, CANNOT_CHARM_YET);	// need to verify message type, not in MQ2Cast for easy look up<Paste>
+				LogSpells("Our level ([{}]) is higher than the limit of this Charm spell ([{}])", GetLevel(), spells[spell_id].max[effect_index]);
+				caster->MessageString(Chat::Red, CANNOT_CHARM_YET);	// need to verify message type, not in MQ2Cast for easy look up<Paste>
 				AddToHateList(caster, 1,0,true,false,false,spell_id);
 				return true;
 			}
@@ -4347,8 +4364,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	)
 	{
 		if(GetSpecialAbility(UNSNAREABLE)) {
-			Log(Logs::Detail, Logs::Spells, "We are immune to Snare spells.");
-			caster->Message_StringID(CC_Red, IMMUNE_MOVEMENT);
+			LogSpells("We are immune to Snare spells");
+			caster->MessageString(Chat::Red, IMMUNE_MOVEMENT);
 			int32 aggro = caster->CheckAggroAmount(spell_id, this);
 			if(aggro > 0) {
 				AddToHateList(caster, aggro);
@@ -4363,8 +4380,8 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	{
 		if(this == caster)
 		{
-			Log(Logs::Detail, Logs::Spells, "You cannot lifetap yourself.");
-			caster->Message_StringID(MT_SpellFailure, CANT_DRAIN_SELF);
+			LogSpells("You cannot lifetap yourself");
+			caster->MessageString(Chat::SpellFailure, CANT_DRAIN_SELF);
 			return true;
 		}
 	}
@@ -4373,13 +4390,13 @@ bool Mob::IsImmuneToSpell(uint16 spell_id, Mob *caster)
 	{
 		if(this == caster)
 		{
-			Log(Logs::Detail, Logs::Spells, "You cannot sacrifice yourself.");
-			caster->Message_StringID(MT_SpellFailure, CANNOT_SAC_SELF);
+			LogSpells("You cannot sacrifice yourself");
+			caster->MessageString(Chat::SpellFailure, CANNOT_SAC_SELF);
 			return true;
 		}
 	}
 
-	Log(Logs::Detail, Logs::Spells, "No immunities to spell %d found.", spell_id);
+	LogSpells("No immunities to spell [{}] found", spell_id);
 
 	return false;
 }
@@ -4446,7 +4463,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use
 
 	if(GetSpecialAbility(IMMUNE_MAGIC))
 	{
-		Log(Logs::Detail, Logs::Spells, "We are immune to magic, so we fully resist the spell %d", spell_id);
+		LogSpells("We are immune to magic, so we fully resist the spell [{}]", spell_id);
 		return(0);
 	}
 
@@ -4467,7 +4484,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use
 		int fear_resist_bonuses = CalcFearResistChance();
 		if(zone->random.Roll(fear_resist_bonuses))
 		{
-			Log(Logs::Detail, Logs::Spells, "Resisted spell in fear resistance, had %d chance to resist", fear_resist_bonuses);
+			LogSpells("Resisted spell in fear resistance, had [{}] chance to resist", fear_resist_bonuses);
 			return 0;
 		}
 	}
@@ -4485,7 +4502,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use
 		int resist_bonuses = CalcResistChanceBonus();
 		if(resist_bonuses && zone->random.Roll(resist_bonuses))
 		{
-			Log(Logs::Detail, Logs::Spells, "Resisted spell in sanctification, had %d chance to resist", resist_bonuses);
+			LogSpells("Resisted spell in sanctification, had [{}] chance to resist", resist_bonuses);
 			return 0;
 		}
 	}
@@ -4493,7 +4510,7 @@ float Mob::ResistSpell(uint8 resist_type, uint16 spell_id, Mob *caster, bool use
 	//Get the resist chance for the target
 	if(resist_type == RESIST_NONE || spells[spell_id].no_resist)
 	{
-		Log(Logs::Detail, Logs::Spells, "Spell was unresistable");
+		LogSpells("Spell was unresistable");
 		return 100;
 	}
 
@@ -4782,24 +4799,32 @@ int16 Mob::CalcFearResistChance()
 	return resistchance;
 }
 
-float Mob::GetAOERange(uint16 spell_id) {
-	float range;
+/**
+ * @param spell_id
+ * @return
+ */
+float Mob::GetAOERange(uint16 spell_id)
+{
+	float range = spells[spell_id].aoerange;
 
-	range = spells[spell_id].aoerange;
-	if(range == 0)	//for TGB spells, they prolly do not have an aoe range
+	/**
+	 * For TGB
+	 */
+	if (range == 0) {
 		range = spells[spell_id].range;
-	if(range == 0)
-		range = 10;	//something....
-
-	if(IsBardSong(spell_id) && IsBeneficialSpell(spell_id)) {
-		//Live AA - Extended Notes, SionachiesCrescendo
-		float song_bonus = static_cast<float>(aabonuses.SongRange + spellbonuses.SongRange + itembonuses.SongRange);
-		range += range*song_bonus /100.0f;
 	}
 
-	range = GetActSpellRange(spell_id, range);
+	if (range == 0) {
+		range = 10;
+	}
 
-	return(range);
+	if (IsBardSong(spell_id) && IsBeneficialSpell(spell_id)) {
+		//Live AA - Extended Notes, SionachiesCrescendo
+		float song_bonus = static_cast<float>(aabonuses.SongRange + spellbonuses.SongRange + itembonuses.SongRange);
+		range += range * song_bonus / 100.0f;
+	}
+
+	return GetActSpellRange(spell_id, range);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -4992,7 +5017,7 @@ void Client::MakeBuffFadePacket(uint16 spell_id, int slot_id, bool send_message)
 		const char *fadetext = spells[spell_id].spell_fades;
 		outapp = new EQApplicationPacket(OP_ColoredText, sizeof(ColoredText_Struct) + strlen(fadetext));
 		ColoredText_Struct *bfm = (ColoredText_Struct *) outapp->pBuffer;
-		bfm->color = MT_Spells;
+		bfm->color = Chat::Spells;
 		memcpy(bfm->msg, fadetext, strlen(fadetext));
 		QueuePacket(outapp);
 		safe_delete(outapp);
@@ -5011,7 +5036,7 @@ void Client::MemSpell(uint16 spell_id, int slot, bool update_client)
 	}
 
 	m_pp.mem_spells[slot] = spell_id;
-	Log(Logs::Detail, Logs::Spells, "Spell %d memorized into slot %d", spell_id, slot);
+	LogSpells("Spell [{}] memorized into slot [{}]", spell_id, slot);
 
 	database.SaveCharacterMemorizedSpell(this->CharacterID(), m_pp.mem_spells[slot], slot);
 
@@ -5026,7 +5051,7 @@ void Client::UnmemSpell(int slot, bool update_client)
 	if(slot > EQEmu::spells::SPELL_GEM_COUNT || slot < 0)
 		return;
 
-	Log(Logs::Detail, Logs::Spells, "Spell %d forgotten from slot %d", m_pp.mem_spells[slot], slot);
+	LogSpells("Spell [{}] forgotten from slot [{}]", m_pp.mem_spells[slot], slot);
 	m_pp.mem_spells[slot] = 0xFFFFFFFF;
 
 	database.DeleteCharacterMemorizedSpell(this->CharacterID(), m_pp.mem_spells[slot], slot);
@@ -5086,7 +5111,7 @@ void Client::ScribeSpell(uint16 spell_id, int slot, bool update_client)
 
 	m_pp.spell_book[slot] = spell_id;
 	database.SaveCharacterSpell(this->CharacterID(), spell_id, slot);
-	Log(Logs::Detail, Logs::Spells, "Spell %d scribed into spell book slot %d", spell_id, slot);
+	LogSpells("Spell [{}] scribed into spell book slot [{}]", spell_id, slot);
 
 	if(update_client)
 	{
@@ -5099,7 +5124,7 @@ void Client::UnscribeSpell(int slot, bool update_client)
 	if(slot >= EQEmu::spells::SPELLBOOK_SIZE || slot < 0)
 		return;
 
-	Log(Logs::Detail, Logs::Spells, "Spell %d erased from spell book slot %d", m_pp.spell_book[slot], slot);
+	LogSpells("Spell [{}] erased from spell book slot [{}]", m_pp.spell_book[slot], slot);
 	m_pp.spell_book[slot] = 0xFFFFFFFF;
 
 	database.DeleteCharacterSpell(this->CharacterID(), m_pp.spell_book[slot], slot);
@@ -5128,7 +5153,7 @@ void Client::UntrainDisc(int slot, bool update_client)
 	if(slot >= MAX_PP_DISCIPLINES || slot < 0)
 		return;
 
-	Log(Logs::Detail, Logs::Spells, "Discipline %d untrained from slot %d", m_pp.disciplines.values[slot], slot);
+	LogSpells("Discipline [{}] untrained from slot [{}]", m_pp.disciplines.values[slot], slot);
 	m_pp.disciplines.values[slot] = 0;
 	database.DeleteCharacterDisc(this->CharacterID(), slot);
 
@@ -5189,28 +5214,50 @@ bool Client::SpellGlobalCheck(uint16 spell_id, uint32 char_id) {
 
     query = StringFormat("SELECT value FROM quest_globals "
                         "WHERE charid = %i AND name = '%s'",
-                        char_id, spell_global_name.c_str());
-    results = database.QueryDatabase(query);
-    if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "Spell ID %i query of spell_globals with Name: '%s' Value: '%i' failed", spell_id, spell_global_name.c_str(), spell_global_value);
-        return false;
-    }
+						 char_id, spell_global_name.c_str());
+	results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		LogError(
+			"Spell ID [{}] query of spell_globals with Name: [{}] Value: [{}] failed",
+			spell_id,
+			spell_global_name.c_str(),
+			spell_global_value
+		);
 
-    if (results.RowCount() != 1) {
-        Log(Logs::General, Logs::Error, "Char ID: %i does not have the Qglobal Name: '%s' for Spell ID %i", char_id, spell_global_name.c_str(), spell_id);
-        return false;
-    }
+		return false;
+	}
 
-    row = results.begin();
-    global_value = atoi(row[0]);
-    if (global_value == spell_global_value)
-        return true; // If the values match from both tables, allow the spell to be scribed
-    else if (global_value > spell_global_value)
-        return true; // Check if the qglobal value is greater than the require spellglobal value
+	if (results.RowCount() != 1) {
+		LogError(
+			"Char ID: [{}] does not have the Qglobal Name: [{}] for Spell ID [{}]",
+			char_id,
+			spell_global_name.c_str(),
+			spell_id
+		);
 
-    // If no matching result found in qglobals, don't scribe this spell
-    Log(Logs::General, Logs::Error, "Char ID: %i Spell_globals Name: '%s' Value: '%i' did not match QGlobal Value: '%i' for Spell ID %i", char_id, spell_global_name.c_str(), spell_global_value, global_value, spell_id);
-    return false;
+		return false;
+	}
+
+	row          = results.begin();
+	global_value = atoi(row[0]);
+	if (global_value == spell_global_value) {
+		return true; // If the values match from both tables, allow the spell to be scribed
+	}
+	else if (global_value > spell_global_value) {
+		return true;
+	} // Check if the qglobal value is greater than the require spellglobal value
+
+	// If no matching result found in qglobals, don't scribe this spell
+	LogError(
+		"Char ID: [{}] SpellGlobals Name: [{}] Value: [{}] did not match QGlobal Value: [{}] for Spell ID [{}]",
+		char_id,
+		spell_global_name.c_str(),
+		spell_global_value,
+		global_value,
+		spell_id
+	);
+
+	return false;
 }
 
 bool Client::SpellBucketCheck(uint16 spell_id, uint32 char_id) {
@@ -5230,18 +5277,30 @@ bool Client::SpellBucketCheck(uint16 spell_id, uint32 char_id) {
 	spell_bucket_value = atoi(row[1]);
 	if (spell_bucket_name.empty())
 		return true;
-	
-	query = StringFormat("SELECT value FROM data_buckets WHERE `key` = '%i-%s'", char_id, spell_bucket_name.c_str());
+
+	query   = StringFormat("SELECT value FROM data_buckets WHERE `key` = '%i-%s'", char_id, spell_bucket_name.c_str());
 	results = database.QueryDatabase(query);
 	if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "Spell bucket %s for spell ID %i for char ID %i failed.", spell_bucket_name.c_str(), spell_id, char_id);
-        return false;
-    }
+		LogError(
+			"Spell bucket [{}] for spell ID [{}] for char ID [{}] failed",
+			spell_bucket_name.c_str(),
+			spell_id,
+			char_id
+		);
 
-    if (results.RowCount() != 1) {
-        Log(Logs::General, Logs::Error, "Spell bucket %s does not exist for spell ID %i for char ID %i.", spell_bucket_name.c_str(), spell_id, char_id);
-        return false;
-    }
+		return false;
+	}
+
+	if (results.RowCount() != 1) {
+		LogError(
+			"Spell bucket [{}] does not exist for spell ID [{}] for char ID [{}]",
+			spell_bucket_name.c_str(),
+			spell_id,
+			char_id
+		);
+
+		return false;
+	}
 
     row = results.begin();
 
@@ -5253,7 +5312,7 @@ bool Client::SpellBucketCheck(uint16 spell_id, uint32 char_id) {
         return true; // Check if the data bucket value is greater than the required spell bucket value
 
     // If no matching result found in spell buckets, don't scribe this spell
-    Log(Logs::General, Logs::Error, "Spell bucket %s for spell ID %i for char ID %i did not match value %i.",  spell_bucket_name.c_str(), spell_id, char_id, spell_bucket_value);
+  LogError("Spell bucket [{}] for spell ID [{}] for char ID [{}] did not match value [{}]", spell_bucket_name.c_str(), spell_id, char_id, spell_bucket_value);
     return false;
 }
 
@@ -5342,24 +5401,42 @@ bool Mob::AddProcToWeapon(uint16 spell_id, bool bPerma, uint16 iChance, uint16 b
 				PermaProcs[i].chance = iChance;
 				PermaProcs[i].base_spellID = base_spell_id;
 				PermaProcs[i].level_override = level_override;
-				Log(Logs::Detail, Logs::Spells, "Added permanent proc spell %d with chance %d to slot %d", spell_id, iChance, i);
+				LogSpells("Added permanent proc spell [{}] with chance [{}] to slot [{}]", spell_id, iChance, i);
 
 				return true;
 			}
 		}
-		Log(Logs::Detail, Logs::Spells, "Too many perma procs for %s", GetName());
+		LogSpells("Too many perma procs for [{}]", GetName());
 	} else {
+		// If its a poison proc, replace any existing one if present.
+		if (base_spell_id == POISON_PROC) {
+			for (i = 0; i < MAX_PROCS; i++) {
+				// If we already have a poison proc active replace it and return
+				if (SpellProcs[i].base_spellID == POISON_PROC) {
+					SpellProcs[i].spellID = spell_id;
+					SpellProcs[i].chance = iChance;
+					SpellProcs[i].level_override = level_override;
+					Log(Logs::Detail, Logs::Spells, "Replaced poison-granted proc spell %d with chance %d to slot %d", spell_id, iChance, i);
+					return true;
+				}
+			}
+		}
+
+		// If we get here it either wasn't poison (which can only use 1 slot)
+		// or it is poison and no poison procs are currently present.
+		// Find a slot and use it as normal.
+
 		for (i = 0; i < MAX_PROCS; i++) {
 			if (SpellProcs[i].spellID == SPELL_UNKNOWN) {
 				SpellProcs[i].spellID = spell_id;
 				SpellProcs[i].chance = iChance;
 				SpellProcs[i].base_spellID = base_spell_id;;
 				SpellProcs[i].level_override = level_override;
-				Log(Logs::Detail, Logs::Spells, "Added spell-granted proc spell %d with chance %d to slot %d", spell_id, iChance, i);
+				LogSpells("Added [{}]-granted proc spell [{}] with chance [{}] to slot [{}]", (base_spell_id == POISON_PROC) ? "poison" : "spell", spell_id, iChance, i);
 				return true;
 			}
 		}
-		Log(Logs::Detail, Logs::Spells, "Too many procs for %s", GetName());
+		LogSpells("Too many procs for [{}]", GetName());
 	}
 	return false;
 }
@@ -5371,7 +5448,7 @@ bool Mob::RemoveProcFromWeapon(uint16 spell_id, bool bAll) {
 			SpellProcs[i].chance = 0;
 			SpellProcs[i].base_spellID = SPELL_UNKNOWN;
 			SpellProcs[i].level_override = -1;
-			Log(Logs::Detail, Logs::Spells, "Removed proc %d from slot %d", spell_id, i);
+			LogSpells("Removed proc [{}] from slot [{}]", spell_id, i);
 		}
 	}
 	return true;
@@ -5388,7 +5465,7 @@ bool Mob::AddDefensiveProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id
 			DefensiveProcs[i].spellID = spell_id;
 			DefensiveProcs[i].chance = iChance;
 			DefensiveProcs[i].base_spellID = base_spell_id;
-			Log(Logs::Detail, Logs::Spells, "Added spell-granted defensive proc spell %d with chance %d to slot %d", spell_id, iChance, i);
+			LogSpells("Added spell-granted defensive proc spell [{}] with chance [{}] to slot [{}]", spell_id, iChance, i);
 			return true;
 		}
 	}
@@ -5403,7 +5480,7 @@ bool Mob::RemoveDefensiveProc(uint16 spell_id, bool bAll)
 			DefensiveProcs[i].spellID = SPELL_UNKNOWN;
 			DefensiveProcs[i].chance = 0;
 			DefensiveProcs[i].base_spellID = SPELL_UNKNOWN;
-			Log(Logs::Detail, Logs::Spells, "Removed defensive proc %d from slot %d", spell_id, i);
+			LogSpells("Removed defensive proc [{}] from slot [{}]", spell_id, i);
 		}
 	}
 	return true;
@@ -5420,7 +5497,7 @@ bool Mob::AddRangedProc(uint16 spell_id, uint16 iChance, uint16 base_spell_id)
 			RangedProcs[i].spellID = spell_id;
 			RangedProcs[i].chance = iChance;
 			RangedProcs[i].base_spellID = base_spell_id;
-			Log(Logs::Detail, Logs::Spells, "Added spell-granted ranged proc spell %d with chance %d to slot %d", spell_id, iChance, i);
+			LogSpells("Added spell-granted ranged proc spell [{}] with chance [{}] to slot [{}]", spell_id, iChance, i);
 			return true;
 		}
 	}
@@ -5435,7 +5512,7 @@ bool Mob::RemoveRangedProc(uint16 spell_id, bool bAll)
 			RangedProcs[i].spellID = SPELL_UNKNOWN;
 			RangedProcs[i].chance = 0;
 			RangedProcs[i].base_spellID = SPELL_UNKNOWN;;
-			Log(Logs::Detail, Logs::Spells, "Removed ranged proc %d from slot %d", spell_id, i);
+			LogSpells("Removed ranged proc [{}] from slot [{}]", spell_id, i);
 		}
 	}
 	return true;
@@ -5466,7 +5543,7 @@ bool Mob::UseBardSpellLogic(uint16 spell_id, int slot)
 int Mob::GetCasterLevel(uint16 spell_id) {
 	int level = GetLevel();
 	level += itembonuses.effective_casting_level + spellbonuses.effective_casting_level + aabonuses.effective_casting_level;
-	Log(Logs::Detail, Logs::Spells, "Determined effective casting level %d+%d+%d=%d", GetLevel(), spellbonuses.effective_casting_level, itembonuses.effective_casting_level, level);
+	LogSpells("Determined effective casting level [{}]+[{}]+[{}]=[{}]", GetLevel(), spellbonuses.effective_casting_level, itembonuses.effective_casting_level, level);
 	return std::max(1, level);
 }
 
@@ -5902,7 +5979,7 @@ void Client::SetLinkedSpellReuseTimer(uint32 timer_id, uint32 duration)
 {
 	if (timer_id > 19)
 		return;
-	Log(Logs::Detail, Logs::Spells, "Setting Linked Spell Reuse %d for %d", timer_id, duration);
+	LogSpells("Setting Linked Spell Reuse [{}] for [{}]", timer_id, duration);
 	GetPTimers().Start(pTimerLinkedSpellReuseStart + timer_id, duration);
 	auto outapp = new EQApplicationPacket(OP_LinkedReuse, sizeof(LinkedSpellReuseTimer_Struct));
 	auto lr = (LinkedSpellReuseTimer_Struct *)outapp->pBuffer;
diff --git a/zone/string_ids.h b/zone/string_ids.h
index acab3df22..0948d13a8 100644
--- a/zone/string_ids.h
+++ b/zone/string_ids.h
@@ -65,6 +65,7 @@
 #define SILENCED_STRING				207		//You *CANNOT* cast spells, you have been silenced!
 #define CANNOT_AFFECT_PC			210		//That spell can not affect this target PC.
 #define SPELL_NEED_TAR				214		//You must first select a target for this spell!
+#define SUMMON_ONLY_GROUP_CORPSE	215		//You must first target a living group member whose corpse you wish to summon.
 #define ONLY_ON_CORPSES				221		//This spell only works on corpses.
 #define CANT_DRAIN_SELF				224		//You can't drain yourself!
 #define CORPSE_NOT_VALID			230		//This corpse is not valid.
@@ -169,6 +170,7 @@
 #define PVP_ON						552		//You are now player kill and follow the ways of Discord.
 #define GENERIC_STRINGID_SAY		554		//%1 says '%T2'
 #define CANNOT_WAKE					555		//%1 tells you, 'I am unable to wake %2, master.'
+#define SUMMONING_CORPSE_ZONE		596		//Summoning %1's corpse(s).
 #define PET_HOLD_SET_ON				698		//The pet hold mode has been set to on.
 #define PET_HOLD_SET_OFF			699		//The pet hold mode has been set to off.
 #define PET_FOCUS_SET_ON			700		//The pet focus mode has been set to on.
diff --git a/zone/tasks.cpp b/zone/tasks.cpp
index 7761747f9..778a556e3 100644
--- a/zone/tasks.cpp
+++ b/zone/tasks.cpp
@@ -54,31 +54,34 @@ TaskManager::~TaskManager() {
 	}
 }
 
-bool TaskManager::LoadTaskSets() {
+bool TaskManager::LoadTaskSets()
+{
 
 	// Clear all task sets in memory. Done so we can reload them on the fly if required by just calling
 	// this method again.
-	for(int i=0; i<MAXTASKSETS; i++)
+	for (int i = 0; i < MAXTASKSETS; i++)
 		TaskSets[i].clear();
 
-    std::string query = StringFormat("SELECT `id`, `taskid` from `tasksets` "
-                                    "WHERE `id` > 0 AND `id` < %i "
-                                    "AND `taskid` >= 0 AND `taskid` < %i "
-                                    "ORDER BY `id`, `taskid` ASC",
-                                    MAXTASKSETS, MAXTASKS);
-    auto results = database.QueryDatabase(query);
-    if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadTaskSets: %s", results.ErrorMessage().c_str());
+	std::string query   = StringFormat(
+		"SELECT `id`, `taskid` from `tasksets` "
+		"WHERE `id` > 0 AND `id` < %i "
+		"AND `taskid` >= 0 AND `taskid` < %i "
+		"ORDER BY `id`, `taskid` ASC",
+		MAXTASKSETS, MAXTASKS
+	);
+	auto        results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		LogError("Error in TaskManager::LoadTaskSets: [{}]", results.ErrorMessage().c_str());
 		return false;
-    }
+	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-        int taskSet = atoi(row[0]);
-        int taskID = atoi(row[1]);
+		int taskSet = atoi(row[0]);
+		int taskID  = atoi(row[1]);
 
-        TaskSets[taskSet].push_back(taskID);
-        Log(Logs::General, Logs::Tasks, "[GLOBALLOAD] Adding TaskID %4i to TaskSet %4i", taskID, taskSet);
-    }
+		TaskSets[taskSet].push_back(taskID);
+		Log(Logs::General, Logs::Tasks, "[GLOBALLOAD] Adding TaskID %4i to TaskSet %4i", taskID, taskSet);
+	}
 
 	return true;
 }
@@ -130,7 +133,7 @@ bool TaskManager::LoadTasks(int singleTask)
 
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
+		LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str());
 		return false;
 	}
 
@@ -139,8 +142,7 @@ bool TaskManager::LoadTasks(int singleTask)
 
 		if ((taskID <= 0) || (taskID >= MAXTASKS)) {
 			// This shouldn't happen, as the SELECT is bounded by MAXTASKS
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Task ID %i out of range while loading tasks from database", taskID);
+			LogError("[TASKS]Task ID [{}] out of range while loading tasks from database", taskID);
 			continue;
 		}
 
@@ -188,7 +190,7 @@ bool TaskManager::LoadTasks(int singleTask)
 				 singleTask, MAXACTIVITIESPERTASK);
 	results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
+		LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str());
 		return false;
 	}
 
@@ -200,16 +202,12 @@ bool TaskManager::LoadTasks(int singleTask)
 
 		if ((taskID <= 0) || (taskID >= MAXTASKS) || (activityID < 0) || (activityID >= MAXACTIVITIESPERTASK)) {
 			// This shouldn't happen, as the SELECT is bounded by MAXTASKS
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Task or Activity ID (%i, %i) out of range while loading "
-			    "activities from database",
-			    taskID, activityID);
+			LogError("[TASKS]Task or Activity ID ([{}], [{}]) out of range while loading activities from database", taskID, activityID);
 			continue;
 		}
 
 		if (Tasks[taskID] == nullptr) {
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Activity for non-existent task (%i, %i) while loading activities from database",
+			LogError("[TASKS]Activity for non-existent task ([{}], [{}]) while loading activities from database",
 			    taskID, activityID);
 			continue;
 		}
@@ -227,8 +225,7 @@ bool TaskManager::LoadTasks(int singleTask)
 		// ERR_NOTASK errors.
 		// Change to (activityID != (Tasks[taskID]->ActivityCount + 1)) to index from 1
 		if (activityID != Tasks[taskID]->ActivityCount) {
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Activities for Task %i are not sequential starting at 0. Not loading task.", taskID,
+			LogError("[TASKS]Activities for Task [{}] are not sequential starting at 0. Not loading task", taskID,
 			    activityID);
 			Tasks[taskID] = nullptr;
 			continue;
@@ -318,7 +315,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state)
 				    state->ActiveTasks[task].AcceptedTime);
 				auto results = database.QueryDatabase(query);
 				if (!results.Success()) {
-					Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
+					LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str());
 				} else {
 					state->ActiveTasks[task].Updated = false;
 				}
@@ -362,7 +359,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state)
 			auto results = database.QueryDatabase(query);
 
 			if (!results.Success()) {
-				Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
+				LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str());
 				continue;
 			}
 
@@ -398,7 +395,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state)
 		    StringFormat(completedTaskQuery, characterID, state->CompletedTasks[i].CompletedTime, taskID, -1);
 		auto results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
+			LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str());
 			continue;
 		}
 
@@ -416,7 +413,7 @@ bool TaskManager::SaveClientState(Client *c, ClientTaskState *state)
 					     taskID, j);
 			results = database.QueryDatabase(query);
 			if (!results.Success())
-				Log(Logs::General, Logs::Error, ERR_MYSQLERROR, results.ErrorMessage().c_str());
+				LogError(ERR_MYSQLERROR, results.ErrorMessage().c_str());
 		}
 	}
 
@@ -467,7 +464,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 					 characterID);
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load Tasks: %s",
+		LogError("[TASKS]Error in TaskManager::LoadClientState load Tasks: [{}]",
 		    results.ErrorMessage().c_str());
 		return false;
 	}
@@ -478,21 +475,19 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 		TaskType type = static_cast<TaskType>(atoi(row[2]));
 
 		if ((taskID < 0) || (taskID >= MAXTASKS)) {
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Task ID %i out of range while loading character tasks from database", taskID);
+			LogError("[TASKS]Task ID [{}] out of range while loading character tasks from database", taskID);
 			continue;
 		}
 
 		auto task_info = state->GetClientTaskInfo(type, slot);
 
 		if (task_info == nullptr) {
-			Log(Logs::General, Logs::Error,
-			    "[TASKS] Slot %i out of range while loading character tasks from database", slot);
+			LogError("[TASKS] Slot [{}] out of range while loading character tasks from database", slot);
 			continue;
 		}
 
 		if (task_info->TaskID != TASKSLOTEMPTY) {
-			Log(Logs::General, Logs::Error, "[TASKS] Slot %i for Task %is is already occupied.", slot,
+			LogError("[TASKS] Slot [{}] for Task [{}]s is already occupied", slot,
 			    taskID);
 			continue;
 		}
@@ -526,7 +521,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 			     characterID);
 	results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load Activities: %s",
+		LogError("[TASKS]Error in TaskManager::LoadClientState load Activities: [{}]",
 		    results.ErrorMessage().c_str());
 		return false;
 	}
@@ -534,15 +529,13 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		int taskID = atoi(row[0]);
 		if ((taskID < 0) || (taskID >= MAXTASKS)) {
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Task ID %i out of range while loading character activities from database", taskID);
+			LogError("[TASKS]Task ID [{}] out of range while loading character activities from database", taskID);
 			continue;
 		}
 
 		int activityID = atoi(row[1]);
 		if ((activityID < 0) || (activityID >= MAXACTIVITIESPERTASK)) {
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Activity ID %i out of range while loading character activities from database",
+			LogError("[TASKS]Activity ID [{}] out of range while loading character activities from database",
 			    activityID);
 			continue;
 		}
@@ -559,8 +552,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 					task_info = &state->ActiveQuests[i];
 
 		if (task_info == nullptr) {
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Activity %i found for task %i which client does not have.", activityID, taskID);
+			LogError("[TASKS]Activity [{}] found for task [{}] which client does not have", activityID, taskID);
 			continue;
 		}
 
@@ -588,8 +580,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 				     characterID);
 		results = database.QueryDatabase(query);
 		if (!results.Success()) {
-			Log(Logs::General, Logs::Error,
-			    "[TASKS]Error in TaskManager::LoadClientState load completed tasks: %s",
+			LogError("[TASKS]Error in TaskManager::LoadClientState load completed tasks: [{}]",
 			    results.ErrorMessage().c_str());
 			return false;
 		}
@@ -606,8 +597,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 
 			int taskID = atoi(row[0]);
 			if ((taskID <= 0) || (taskID >= MAXTASKS)) {
-				Log(Logs::General, Logs::Error,
-				    "[TASKS]Task ID %i out of range while loading completed tasks from database",
+				LogError("[TASKS]Task ID [{}] out of range while loading completed tasks from database",
 				    taskID);
 				continue;
 			}
@@ -618,8 +608,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 			// completed.
 			int activityID = atoi(row[1]);
 			if ((activityID < -1) || (activityID >= MAXACTIVITIESPERTASK)) {
-				Log(Logs::General, Logs::Error,
-				    "[TASKS]Activity ID %i out of range while loading completed tasks from database",
+				LogError("[TASKS]Activity ID [{}] out of range while loading completed tasks from database",
 				    activityID);
 				continue;
 			}
@@ -660,7 +649,7 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 			     characterID, MAXTASKS);
 	results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "[TASKS]Error in TaskManager::LoadClientState load enabled tasks: %s",
+		LogError("[TASKS]Error in TaskManager::LoadClientState load enabled tasks: [{}]",
 		    results.ErrorMessage().c_str());
 	} else {
 		for (auto row = results.begin(); row != results.end(); ++row) {
@@ -678,12 +667,12 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 		if (taskID == TASKSLOTEMPTY)
 			continue;
 		if (!Tasks[taskID]) {
-			c->Message(13,
+			c->Message(Chat::Red,
 				   "Active Task Slot %i, references a task (%i), that does not exist. "
 				   "Removing from memory. Contact a GM to resolve this.",
 				   i, taskID);
 
-			Log(Logs::General, Logs::Error, "[TASKS]Character %i has task %i which does not exist.",
+			LogError("[TASKS]Character [{}] has task [{}] which does not exist",
 			    characterID, taskID);
 			state->ActiveTasks[i].TaskID = TASKSLOTEMPTY;
 			continue;
@@ -691,14 +680,12 @@ bool TaskManager::LoadClientState(Client *c, ClientTaskState *state)
 		for (int j = 0; j < Tasks[taskID]->ActivityCount; j++) {
 
 			if (state->ActiveTasks[i].Activity[j].ActivityID != j) {
-				c->Message(13,
+				c->Message(Chat::Red,
 					   "Active Task %i, %s. Activity count does not match expected value."
 					   "Removing from memory. Contact a GM to resolve this.",
 					   taskID, Tasks[taskID]->Title.c_str());
 
-				Log(Logs::General, Logs::Error,
-				    "[TASKS]Fatal error in character %i task state. Activity %i for "
-				    "Task %i either missing from client state or from task.",
+				LogError("[TASKS]Fatal error in character [{}] task state. Activity [{}] for Task [{}] either missing from client state or from task",
 				    characterID, j, taskID);
 				state->ActiveTasks[i].TaskID = TASKSLOTEMPTY;
 				break;
@@ -1001,7 +988,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i
 		return;
 
 	if (TaskSets[TaskSetID].empty()) {
-		mob->SayTo_StringID(c, CC_Yellow, MAX_ACTIVE_TASKS, c->GetName()); // I think this is suppose to be yellow
+		mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // I think this is suppose to be yellow
 		return;
 	}
 
@@ -1033,7 +1020,7 @@ void TaskManager::TaskSetSelector(Client *c, ClientTaskState *state, Mob *mob, i
 	if (TaskListIndex > 0) {
 		SendTaskSelector(c, mob, TaskListIndex, TaskList);
 	} else {
-		mob->SayTo_StringID(c, CC_Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
+		mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
 	}
 
 	return;
@@ -1065,7 +1052,7 @@ void TaskManager::TaskQuestSetSelector(Client *c, ClientTaskState *state, Mob *m
 	if (TaskListIndex > 0) {
 		SendTaskSelector(c, mob, TaskListIndex, TaskList);
 	} else {
-		mob->SayTo_StringID(c, CC_Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
+		mob->SayString(c, Chat::Yellow, MAX_ACTIVE_TASKS, c->GetName()); // check color, I think this might be only for (Shared) Tasks, w/e -- think should be yellow
 	}
 
 	return;
@@ -1266,18 +1253,18 @@ void TaskManager::ExplainTask(Client*c, int TaskID) {
 	if(!c) return;
 
 	if((TaskID<=0) || (TaskID>=MAXTASKS)) {
-		c->Message(0, "TaskID out-of-range.");
+		c->Message(Chat::White, "TaskID out-of-range.");
 		return;
 	}
 
 	if(Tasks[TaskID] == nullptr) {
-		c->Message(0, "Task does not exist.");
+		c->Message(Chat::White, "Task does not exist.");
 		return;
 	}
 
 	char Explanation[1000], *ptr;
-	c->Message(0, "Task %4i: Title: %s", TaskID, Tasks[TaskID]->Description.c_str());
-	c->Message(0, "%3i Activities", Tasks[TaskID]->ActivityCount);
+	c->Message(Chat::White, "Task %4i: Title: %s", TaskID, Tasks[TaskID]->Description.c_str());
+	c->Message(Chat::White, "%3i Activities", Tasks[TaskID]->ActivityCount);
 	ptr = Explanation;
 	for(int i=0; i<Tasks[TaskID]->ActivityCount; i++) {
 
@@ -1936,7 +1923,7 @@ void ClientTaskState::IncrementDoneCount(Client *c, TaskInformation *Task, int T
 		// Send the updated task/activity list to the client
 		taskmanager->SendSingleActiveTaskToClient(c, *info, TaskComplete, false);
 		// Inform the client the task has been updated, both by a chat message
-		c->Message(0, "Your task '%s' has been updated.", Task->Title.c_str());
+		c->Message(Chat::White, "Your task '%s' has been updated.", Task->Title.c_str());
 
 		if(Task->Activity[ActivityID].GoalMethod != METHODQUEST) {
 			if (!ignore_quest_update){
@@ -2001,7 +1988,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) {
 				c->SummonItem(Task->RewardID);
 				Item = database.GetItem(Task->RewardID);
 				if(Item)
-					c->Message(15, "You receive %s as a reward.", Item->Name);
+					c->Message(Chat::Yellow, "You receive %s as a reward.", Item->Name);
 			}
 			break;
 		}
@@ -2012,7 +1999,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) {
 				c->SummonItem(RewardList[i]);
 				Item = database.GetItem(RewardList[i]);
 				if(Item)
-					c->Message(15, "You receive %s as a reward.", Item->Name);
+					c->Message(Chat::Yellow, "You receive %s as a reward.", Item->Name);
 			}
 			break;
 		}
@@ -2024,7 +2011,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) {
 	}
 
 	if (!Task->completion_emote.empty())
-		c->SendColoredText(CC_Yellow, Task->completion_emote); // unsure if they use this packet or color, should work
+		c->SendColoredText(Chat::Yellow, Task->completion_emote); // unsure if they use this packet or color, should work
 
 	// just use normal NPC faction ID stuff
 	if (Task->faction_reward)
@@ -2081,7 +2068,7 @@ void ClientTaskState::RewardTask(Client *c, TaskInformation *Task) {
 			CashMessage += " copper";
 		}
 		CashMessage += " pieces.";
-		c->Message(15,CashMessage.c_str());
+		c->Message(Chat::Yellow,CashMessage.c_str());
 	}
 	int32 EXPReward = Task->XPReward;
 	if(EXPReward > 0) {
@@ -2306,12 +2293,12 @@ void ClientTaskState::ResetTaskActivity(Client *c, int TaskID, int ActivityID)
 
 void ClientTaskState::ShowClientTasks(Client *c)
 {
-	c->Message(0, "Task Information:");
+	c->Message(Chat::White, "Task Information:");
 	if (ActiveTask.TaskID != TASKSLOTEMPTY) {
-		c->Message(0, "Task: %i %s", ActiveTask.TaskID, taskmanager->Tasks[ActiveTask.TaskID]->Title.c_str());
-		c->Message(0, "  Description: [%s]\n", taskmanager->Tasks[ActiveTask.TaskID]->Description.c_str());
+		c->Message(Chat::White, "Task: %i %s", ActiveTask.TaskID, taskmanager->Tasks[ActiveTask.TaskID]->Title.c_str());
+		c->Message(Chat::White, "  Description: [%s]\n", taskmanager->Tasks[ActiveTask.TaskID]->Description.c_str());
 		for (int j = 0; j < taskmanager->GetActivityCount(ActiveTask.TaskID); j++) {
-			c->Message(0, "  Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)",
+			c->Message(Chat::White, "  Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)",
 				   ActiveTask.Activity[j].ActivityID, ActiveTask.Activity[j].DoneCount,
 				   ActiveTask.Activity[j].State);
 		}
@@ -2321,11 +2308,11 @@ void ClientTaskState::ShowClientTasks(Client *c)
 		if (ActiveQuests[i].TaskID == TASKSLOTEMPTY)
 			continue;
 
-		c->Message(0, "Quest: %i %s", ActiveQuests[i].TaskID,
+		c->Message(Chat::White, "Quest: %i %s", ActiveQuests[i].TaskID,
 			   taskmanager->Tasks[ActiveQuests[i].TaskID]->Title.c_str());
-		c->Message(0, "  Description: [%s]\n", taskmanager->Tasks[ActiveQuests[i].TaskID]->Description.c_str());
+		c->Message(Chat::White, "  Description: [%s]\n", taskmanager->Tasks[ActiveQuests[i].TaskID]->Description.c_str());
 		for (int j = 0; j < taskmanager->GetActivityCount(ActiveQuests[i].TaskID); j++) {
-			c->Message(0, "  Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)",
+			c->Message(Chat::White, "  Activity: %2d, DoneCount: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)",
 				   ActiveQuests[i].Activity[j].ActivityID, ActiveQuests[i].Activity[j].DoneCount,
 				   ActiveQuests[i].Activity[j].State);
 		}
@@ -3171,7 +3158,7 @@ void ClientTaskState::RemoveTask(Client *c, int sequenceNumber, TaskType type)
 					 characterID, task_id);
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "[TASKS] Error in CientTaskState::CancelTask %s",
+		LogError("[TASKS] Error in CientTaskState::CancelTask [{}]",
 		    results.ErrorMessage().c_str());
 		return;
 	}
@@ -3181,7 +3168,7 @@ void ClientTaskState::RemoveTask(Client *c, int sequenceNumber, TaskType type)
 			     task_id, static_cast<int>(type));
 	results = database.QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "[TASKS] Error in CientTaskState::CancelTask %s",
+		LogError("[TASKS] Error in CientTaskState::CancelTask [{}]",
 		    results.ErrorMessage().c_str());
 
 	Log(Logs::General, Logs::Tasks, "[UPDATE] CancelTask: %s", query.c_str());
@@ -3204,14 +3191,14 @@ void ClientTaskState::RemoveTask(Client *c, int sequenceNumber, TaskType type)
 void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enforce_level_requirement)
 {
 	if (!taskmanager || TaskID < 0 || TaskID >= MAXTASKS) {
-		c->Message(13, "Task system not functioning, or TaskID %i out of range.", TaskID);
+		c->Message(Chat::Red, "Task system not functioning, or TaskID %i out of range.", TaskID);
 		return;
 	}
 
 	auto task = taskmanager->Tasks[TaskID];
 
 	if (task == nullptr) {
-		c->Message(13, "Invalid TaskID %i", TaskID);
+		c->Message(Chat::Red, "Invalid TaskID %i", TaskID);
 		return;
 	}
 
@@ -3235,7 +3222,7 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
 	}
 
 	if (max_tasks) {
-		c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
+		c->Message(Chat::Red, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
 		return;
 	}
 
@@ -3243,14 +3230,14 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
 	if (task->type == TaskType::Quest) {
 		for (int i = 0; i < MAXACTIVEQUESTS; i++) {
 			if (ActiveQuests[i].TaskID == TaskID) {
-				c->Message(13, "You have already been assigned this task.");
+				c->Message(Chat::Red, "You have already been assigned this task.");
 				return;
 			}
 		}
 	}
 
 	if (enforce_level_requirement && !taskmanager->AppropriateLevel(TaskID, c->GetLevel())) {
-		c->Message(13, "You are outside the level range of this task.");
+		c->Message(Chat::Red, "You are outside the level range of this task.");
 		return;
 	}
 
@@ -3287,7 +3274,7 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
 
 	// This shouldn't happen unless there is a bug in the handling of ActiveTaskCount somewhere
 	if (active_slot == nullptr) {
-		c->Message(13, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
+		c->Message(Chat::Red, "You already have the maximum allowable number of active tasks (%i)", MAXACTIVEQUESTS);
 		return;
 	}
 
@@ -3309,14 +3296,14 @@ void ClientTaskState::AcceptNewTask(Client *c, int TaskID, int NPCID, bool enfor
 		ActiveTaskCount++;
 
 	taskmanager->SendSingleActiveTaskToClient(c, *active_slot, false, true);
-	c->Message(0, "You have been assigned the task '%s'.", taskmanager->Tasks[TaskID]->Title.c_str());
+	c->Message(Chat::White, "You have been assigned the task '%s'.", taskmanager->Tasks[TaskID]->Title.c_str());
 
 	std::string buf = std::to_string(TaskID);
 
 	NPC *npc = entity_list.GetID(NPCID)->CastToNPC();
 	if(!npc) {
-		c->Message(clientMessageYellow, "Task Giver ID is %i", NPCID);
-		c->Message(clientMessageError, "Unable to find NPC to send EVENT_TASKACCEPTED to. Report this bug.");
+		c->Message(Chat::Yellow, "Task Giver ID is %i", NPCID);
+		c->Message(Chat::Red, "Unable to find NPC to send EVENT_TASKACCEPTED to. Report this bug.");
 		return;
 	}
 
diff --git a/zone/titles.cpp b/zone/titles.cpp
index 033edd144..7b4537b88 100644
--- a/zone/titles.cpp
+++ b/zone/titles.cpp
@@ -349,7 +349,7 @@ void Client::EnableTitle(int titleSet) {
                                     CharacterID(), titleSet);
     auto results = database.QueryDatabase(query);
 	if(!results.Success())
-		Log(Logs::General, Logs::Error, "Error in EnableTitle query for titleset %i and charid %i", titleSet, CharacterID());
+		LogError("Error in EnableTitle query for titleset [{}] and charid [{}]", titleSet, CharacterID());
 
 }
 
diff --git a/zone/tradeskills.cpp b/zone/tradeskills.cpp
index 72cb51795..b4451119f 100644
--- a/zone/tradeskills.cpp
+++ b/zone/tradeskills.cpp
@@ -42,7 +42,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 {
 	if (!user || !in_augment)
 	{
-		Log(Logs::General, Logs::Error, "Client or AugmentItem_Struct not set in Object::HandleAugmentation");
+		LogError("Client or AugmentItem_Struct not set in Object::HandleAugmentation");
 		return;
 	}
 
@@ -80,7 +80,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 
 				if (itemsFound != 2)
 				{
-					user->Message(13, "Error: Too many/few items in augmentation container.");
+					user->Message(Chat::Red, "Error: Too many/few items in augmentation container.");
 					return;
 				}
 			}
@@ -89,8 +89,8 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 
 	if(!container)
 	{
-		Log(Logs::General, Logs::Error, "Player tried to augment an item without a container set.");
-		user->Message(13, "Error: This item is not a container!");
+		LogError("Player tried to augment an item without a container set");
+		user->Message(Chat::Red, "Error: This item is not a container!");
 		return;
 	}
 
@@ -115,7 +115,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		{
 			// Either 2 augmentable items found or none found
 			// This should never occur due to client restrictions, but prevent in case of a hack
-			user->Message(13, "Error: Must be 1 augmentable item in the sealer");
+			user->Message(Chat::Red, "Error: Must be 1 augmentable item in the sealer");
 			return;
 		}
 	}
@@ -124,11 +124,11 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		// This happens if the augment button is clicked more than once quickly while augmenting
 		if (!container->GetItem(0))
 		{
-			user->Message(13, "Error: No item in slot 0 of sealer");
+			user->Message(Chat::Red, "Error: No item in slot 0 of sealer");
 		}
 		if (!container->GetItem(1))
 		{
-			user->Message(13, "Error: No item in slot 1 of sealer");
+			user->Message(Chat::Red, "Error: No item in slot 1 of sealer");
 		}
 		return;
 	}
@@ -160,7 +160,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		}
 		else
 		{
-			user->Message(13, "Error: No available slot for augment");
+			user->Message(Chat::Red, "Error: No available slot for augment");
 		}
 	}
 	else
@@ -169,8 +169,8 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		bool isSolvent = auged_with->GetItem()->ItemType == EQEmu::item::ItemTypeAugmentationSolvent;
 		if (!isSolvent && auged_with->GetItem()->ItemType != EQEmu::item::ItemTypeAugmentationDistiller)
 		{
-			Log(Logs::General, Logs::Error, "Player tried to remove an augment without a solvent or distiller.");
-			user->Message(13, "Error: Missing an augmentation solvent or distiller for removing this augment.");
+			LogError("Player tried to remove an augment without a solvent or distiller");
+			user->Message(Chat::Red, "Error: Missing an augmentation solvent or distiller for removing this augment.");
 
 			return;
 		}
@@ -179,8 +179,8 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 		if (aug) {
 			if (!isSolvent && auged_with->GetItem()->ID != aug->GetItem()->AugDistiller)
 			{
-				Log(Logs::General, Logs::Error, "Player tried to safely remove an augment with the wrong distiller (item %u vs expected %u).", auged_with->GetItem()->ID, aug->GetItem()->AugDistiller);
-				user->Message(13, "Error: Wrong augmentation distiller for safely removing this augment.");
+				LogError("Player tried to safely remove an augment with the wrong distiller (item [{}] vs expected [{}])", auged_with->GetItem()->ID, aug->GetItem()->AugDistiller);
+				user->Message(Chat::Red, "Error: Wrong augmentation distiller for safely removing this augment.");
 				return;
 			}
 			std::vector<EQEmu::Any> args;
@@ -252,7 +252,7 @@ void Object::HandleAugmentation(Client* user, const AugmentItem_Struct* in_augme
 void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Object *worldo)
 {
 	if (!user || !in_combine) {
-		Log(Logs::General, Logs::Error, "Client or NewCombine_Struct not set in Object::HandleCombine");
+		LogError("Client or NewCombine_Struct not set in Object::HandleCombine");
 		return;
 	}
 
@@ -266,7 +266,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 
 	if (in_combine->container_slot == EQEmu::invslot::SLOT_TRADESKILL_EXPERIMENT_COMBINE) {
 		if(!worldo) {
-			user->Message(13, "Error: Server is not aware of the tradeskill container you are attempting to use");
+			user->Message(Chat::Red, "Error: Server is not aware of the tradeskill container you are attempting to use");
 			return;
 		}
 		c_type = worldo->m_type;
@@ -291,7 +291,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	}
 
 	if (!inst || !inst->IsType(EQEmu::item::ItemClassBag)) {
-		user->Message(13, "Error: Server does not recognize specified tradeskill container");
+		user->Message(Chat::Red, "Error: Server does not recognize specified tradeskill container");
 		return;
 	}
 
@@ -304,12 +304,12 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 			user->DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true);
 			container->Clear();
 			user->SummonItem(new_weapon->ID, inst->GetCharges(), inst->GetAugmentItemID(0), inst->GetAugmentItemID(1), inst->GetAugmentItemID(2), inst->GetAugmentItemID(3), inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), inst->IsAttuned(), EQEmu::invslot::slotCursor, container->GetItem()->Icon, atoi(container->GetItem()->IDFile + 2));
-			user->Message_StringID(4, TRANSFORM_COMPLETE, inst->GetItem()->Name);
+			user->MessageString(Chat::LightBlue, TRANSFORM_COMPLETE, inst->GetItem()->Name);
 			if (RuleB(Inventory, DeleteTransformationMold))
 				user->DeleteItemInInventory(in_combine->container_slot, 0, true);
 		}
 		else if (inst) {
-			user->Message_StringID(4, TRANSFORM_FAILED, inst->GetItem()->Name);
+			user->MessageString(Chat::LightBlue, TRANSFORM_FAILED, inst->GetItem()->Name);
 		}
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
@@ -324,10 +324,10 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 			user->DeleteItemInInventory(EQEmu::InventoryProfile::CalcSlotId(in_combine->container_slot, 0), 0, true);
 			container->Clear();
 			user->SummonItem(new_weapon->ID, inst->GetCharges(), inst->GetAugmentItemID(0), inst->GetAugmentItemID(1), inst->GetAugmentItemID(2), inst->GetAugmentItemID(3), inst->GetAugmentItemID(4), inst->GetAugmentItemID(5), inst->IsAttuned(), EQEmu::invslot::slotCursor, 0, 0);
-			user->Message_StringID(4, TRANSFORM_COMPLETE, inst->GetItem()->Name);
+			user->MessageString(Chat::LightBlue, TRANSFORM_COMPLETE, inst->GetItem()->Name);
 		}
 		else if (inst) {
-			user->Message_StringID(4, DETRANSFORM_FAILED, inst->GetItem()->Name);
+			user->MessageString(Chat::LightBlue, DETRANSFORM_FAILED, inst->GetItem()->Name);
 		}
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
@@ -337,7 +337,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 
 	DBTradeskillRecipe_Struct spec;
 	if (!database.GetTradeRecipe(container, c_type, some_id, user->CharacterID(), &spec)) {
-		user->Message_StringID(MT_Emote,TRADESKILL_NOCOMBINE);
+		user->MessageString(Chat::Emote,TRADESKILL_NOCOMBINE);
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
@@ -352,7 +352,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	// bit 6 (0x20): unlisted recipe flag
 	if ((spec.must_learn&0xF) == 1 && !spec.has_learnt) {
 		// Made up message for the client. Just giving a DNC is the other option.
-		user->Message(4, "You need to learn how to combine these first.");
+		user->Message(Chat::LightBlue, "You need to learn how to combine these first.");
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
@@ -361,7 +361,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	// Character does not have the required skill.
 	if(spec.skill_needed > 0 && user->GetSkill(spec.tradeskill) < spec.skill_needed ) {
 		// Notify client.
-		user->Message(4, "You are not skilled enough.");
+		user->Message(Chat::LightBlue, "You are not skilled enough.");
 		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
@@ -371,27 +371,36 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	//changing from a switch to string of if's since we don't need to iterate through all of the skills in the SkillType enum
 	if (spec.tradeskill == EQEmu::skills::SkillAlchemy) {
 		if (user_pp.class_ != SHAMAN) {
-			user->Message(13, "This tradeskill can only be performed by a shaman.");
+			user->Message(Chat::Red, "This tradeskill can only be performed by a shaman.");
 			return;
 		}
 		else if (user_pp.level < MIN_LEVEL_ALCHEMY) {
-			user->Message(13, "You cannot perform alchemy until you reach level %i.", MIN_LEVEL_ALCHEMY);
+			user->Message(Chat::Red, "You cannot perform alchemy until you reach level %i.", MIN_LEVEL_ALCHEMY);
 			return;
 		}
 	}
 	else if (spec.tradeskill == EQEmu::skills::SkillTinkering) {
 		if (user_pp.race != GNOME) {
-			user->Message(13, "Only gnomes can tinker.");
+			user->Message(Chat::Red, "Only gnomes can tinker.");
 			return;
 		}
 	}
 	else if (spec.tradeskill == EQEmu::skills::SkillMakePoison) {
 		if (user_pp.class_ != ROGUE) {
-			user->Message(13, "Only rogues can mix poisons.");
+			user->Message(Chat::Red, "Only rogues can mix poisons.");
 			return;
 		}
 	}
 
+	// final check for any additional quest requirements .. "check_zone" in this case - exported as variable [validate_type]
+	if (parse->EventPlayer(EVENT_COMBINE_VALIDATE, user, fmt::format("check_zone {}", zone->GetZoneID()), spec.recipe_id) != 0) {
+		user->Message(Chat::Emote, "You cannot make this combine because the location requirement has not been met.");
+		auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
+		user->QueuePacket(outapp);
+		safe_delete(outapp);
+		return;
+	}
+
 	// Send acknowledgement packets to client
 	auto outapp = new EQApplicationPacket(OP_TradeSkillCombine, 0);
 	user->QueuePacket(outapp);
@@ -422,7 +431,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	// Update Made count
 	if (success) {
 		if (!spec.has_learnt && ((spec.must_learn&0x10) != 0x10)) {
-			user->Message_StringID(4, TRADESKILL_LEARN_RECIPE, spec.name.c_str());
+			user->MessageString(Chat::LightBlue, TRADESKILL_LEARN_RECIPE, spec.name.c_str());
 		}
 		database.UpdateRecipeMadecount(spec.recipe_id, user->CharacterID(), spec.madecount+1);
 	}
@@ -433,7 +442,7 @@ void Object::HandleCombine(Client* user, const NewCombine_Struct* in_combine, Ob
 	if(success && spec.replace_container) {
 		if(worldcontainer){
 			//should report this error, but we dont have the recipe ID, so its not very useful
-			Log(Logs::General, Logs::Error, "Replace container combine executed in a world container.");
+			LogError("Replace container combine executed in a world container");
 		}
 		else
 			user->DeleteItemInInventory(in_combine->container_slot, 0, true);
@@ -459,7 +468,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
 	//ask the database for the recipe to make sure it exists...
 	DBTradeskillRecipe_Struct spec;
 	if (!database.GetTradeRecipe(rac->recipe_id, rac->object_type, rac->some_id, user->CharacterID(), &spec)) {
-		Log(Logs::General, Logs::Error, "Unknown recipe for HandleAutoCombine: %u\n", rac->recipe_id);
+		LogError("Unknown recipe for HandleAutoCombine: [{}]\n", rac->recipe_id);
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
 		return;
@@ -469,7 +478,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
 	// This shouldn't happen.
 	if ((spec.must_learn&0xf) && !spec.has_learnt) {
 		// Made up message for the client. Just giving a DNC is the other option.
-		user->Message(4, "You need to learn how to combine these first.");
+		user->Message(Chat::LightBlue, "You need to learn how to combine these first.");
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
 		return;
@@ -488,14 +497,14 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
 	}
 
 	if(results.RowCount() < 1) {
-		Log(Logs::General, Logs::Error, "Error in HandleAutoCombine: no components returned");
+		LogError("Error in HandleAutoCombine: no components returned");
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
 		return;
 	}
 
 	if(results.RowCount() > 10) {
-		Log(Logs::General, Logs::Error, "Error in HandleAutoCombine: too many components returned (%u)", results.RowCount());
+		LogError("Error in HandleAutoCombine: too many components returned ([{}])", results.RowCount());
 		user->QueuePacket(outapp);
 		safe_delete(outapp);
 		return;
@@ -540,13 +549,13 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
 
 		safe_delete(outapp);
 
-		user->Message_StringID(MT_Skills, TRADESKILL_MISSING_COMPONENTS);
+		user->MessageString(Chat::Skills, TRADESKILL_MISSING_COMPONENTS);
 
 		for (auto it = MissingItems.begin(); it != MissingItems.end(); ++it) {
 			const EQEmu::ItemData* item = database.GetItem(*it);
 
 			if(item)
-				user->Message_StringID(MT_Skills, TRADESKILL_MISSING_ITEM, item->Name);
+				user->MessageString(Chat::Skills, TRADESKILL_MISSING_ITEM, item->Name);
 		}
 
 		return;
@@ -593,7 +602,7 @@ void Object::HandleAutoCombine(Client* user, const RecipeAutoCombine_Struct* rac
 
 	if (success) {
 		if (!spec.has_learnt && ((spec.must_learn & 0x10) != 0x10)) {
-			user->Message_StringID(4, TRADESKILL_LEARN_RECIPE, spec.name.c_str());
+			user->MessageString(Chat::LightBlue, TRADESKILL_LEARN_RECIPE, spec.name.c_str());
 		}
 		database.UpdateRecipeMadecount(spec.recipe_id, user->CharacterID(), spec.madecount+1);
 	}
@@ -706,7 +715,7 @@ void Client::TradeskillSearchResults(const std::string &query, unsigned long obj
 		return; //search gave no results... not an error
 
 	if(results.ColumnCount() != 6) {
-		Log(Logs::General, Logs::Error, "Error in TradeskillSearchResults query '%s': Invalid column count in result", query.c_str());
+		LogError("Error in TradeskillSearchResults query [{}]: Invalid column count in result", query.c_str());
 		return;
 	}
 
@@ -756,12 +765,12 @@ void Client::SendTradeskillDetails(uint32 recipe_id) {
 	}
 
 	if(results.RowCount() < 1) {
-		Log(Logs::General, Logs::Error, "Error in SendTradeskillDetails: no components returned");
+		LogError("Error in SendTradeskillDetails: no components returned");
 		return;
 	}
 
 	if(results.RowCount() > 10) {
-		Log(Logs::General, Logs::Error, "Error in SendTradeskillDetails: too many components returned (%u)", results.RowCount());
+		LogError("Error in SendTradeskillDetails: too many components returned ([{}])", results.RowCount());
 		return;
 	}
 
@@ -940,7 +949,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 	//handle caps
 	if(spec->nofail) {
 		chance = 100;	//cannot fail.
-		Log(Logs::Detail, Logs::Tradeskills, "...This combine cannot fail.");
+		LogTradeskills("This combine cannot fail");
 	} else if(over_trivial >= 0) {
 		// At reaching trivial the chance goes to 95% going up an additional
 		// percent for every 40 skillpoints above the trivial.
@@ -951,7 +960,7 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 		// above critical still stands.
 		// Mastery modifier is: 10%/25%/50% for rank one/two/three
 		chance = 95.0f + (float(user_skill - spec->trivial) / 40.0f);
-		Message_StringID(MT_Emote, TRADESKILL_TRIVIAL);
+		MessageString(Chat::Emote, TRADESKILL_TRIVIAL);
 	} else if(chance < 5) {
 		// Minimum chance is always 5
 		chance = 5;
@@ -960,8 +969,8 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 		chance = 95;
 	}
 
-	Log(Logs::Detail, Logs::Tradeskills, "...Current skill: %d , Trivial: %d , Success chance: %f percent", user_skill , spec->trivial , chance);
-	Log(Logs::Detail, Logs::Tradeskills, "...Bonusstat: %d , INT: %d , WIS: %d , DEX: %d , STR: %d", bonusstat , GetINT() , GetWIS() , GetDEX() , GetSTR());
+	LogTradeskills("Current skill: [{}] , Trivial: [{}] , Success chance: [{}] percent", user_skill , spec->trivial , chance);
+	LogTradeskills("Bonusstat: [{}] , INT: [{}] , WIS: [{}] , DEX: [{}] , STR: [{}]", bonusstat , GetINT() , GetWIS() , GetDEX() , GetSTR());
 
 	float res = zone->random.Real(0, 99);
 	int aa_chance = 0;
@@ -973,32 +982,56 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 	chance = mod_tradeskill_chance(chance, spec);
 
 	if (((spec->tradeskill==75) || GetGM() || (chance > res)) || zone->random.Roll(aa_chance)) {
+
 		success_modifier = 1;
 
-		if(over_trivial < 0)
+		if (over_trivial < 0) {
 			CheckIncreaseTradeskill(bonusstat, stat_modifier, skillup_modifier, success_modifier, spec->tradeskill);
+		}
 
-		Message_StringID(4, TRADESKILL_SUCCEED, spec->name.c_str());
+		MessageString(Chat::LightBlue, TRADESKILL_SUCCEED, spec->name.c_str());
 
-		Log(Logs::Detail, Logs::Tradeskills, "Tradeskill success");
+		LogTradeskills("Tradeskill success");
 
 		itr = spec->onsuccess.begin();
 		while(itr != spec->onsuccess.end() && !spec->quest) {
-			//should we check this crap?
+
 			SummonItem(itr->first, itr->second);
 			item = database.GetItem(itr->first);
-			if (this->GetGroup()) {
-				entity_list.MessageGroup(this, true, MT_Skills, "%s has successfully fashioned %s!", GetName(), item->Name);
+			if (item) {
+				if (GetGroup()) {
+					entity_list.MessageGroup(this, true, Chat::Skills, "%s has successfully fashioned %s!", GetName(), item->Name);
+				}
+			}
+			else {
+				Log(
+					Logs::General,
+					Logs::Tradeskills,
+					StringFormat(
+						"Failure (null item pointer [id: %u, qty: %u]) :: recipe_id:%i tskillid:%i trivial:%i chance:%4.2f  in zoneid:%i instid:%i",
+						itr->first,
+						itr->second,
+						spec->recipe_id,
+						spec->tradeskill,
+						spec->trivial,
+						chance,
+						this->GetZoneID(),
+						this->GetInstanceID()
+					).c_str()
+				);
 			}
 
 			/* QS: Player_Log_Trade_Skill_Events */
-			if (RuleB(QueryServ, PlayerLogTradeSkillEvents)){
+			if (RuleB(QueryServ, PlayerLogTradeSkillEvents)) {
+
 				std::string event_desc = StringFormat("Success :: fashioned recipe_id:%i tskillid:%i trivial:%i chance:%4.2f  in zoneid:%i instid:%i", spec->recipe_id, spec->tradeskill, spec->trivial, chance, this->GetZoneID(), this->GetInstanceID());
 				QServ->PlayerLogEvent(Player_Log_Trade_Skill_Events, this->CharacterID(), event_desc);
 			}
 
-			if(RuleB(TaskSystem, EnableTaskSystem))
+			if (RuleB(TaskSystem, EnableTaskSystem)) {
 				UpdateTasksForItem(ActivityTradeSkill, itr->first, itr->second);
+			}
+
 			++itr;
 		}
 		return(true);
@@ -1010,12 +1043,12 @@ bool Client::TradeskillExecute(DBTradeskillRecipe_Struct *spec) {
 		if(over_trivial < 0)
 			CheckIncreaseTradeskill(bonusstat, stat_modifier, skillup_modifier, success_modifier, spec->tradeskill);
 
-		Message_StringID(MT_Emote,TRADESKILL_FAILED);
+		MessageString(Chat::Emote,TRADESKILL_FAILED);
 
-		Log(Logs::Detail, Logs::Tradeskills, "Tradeskill failed");
+		LogTradeskills("Tradeskill failed");
 			if (this->GetGroup())
 		{
-			entity_list.MessageGroup(this,true,MT_Skills,"%s was unsuccessful in %s tradeskill attempt.",GetName(),this->GetGender() == 0 ? "his" : this->GetGender() == 1 ? "her" : "its");
+			entity_list.MessageGroup(this, true, Chat::Skills,"%s was unsuccessful in %s tradeskill attempt.",GetName(),this->GetGender() == 0 ? "his" : this->GetGender() == 1 ? "her" : "its");
 
 		}
 
@@ -1091,9 +1124,9 @@ void Client::CheckIncreaseTradeskill(int16 bonusstat, int16 stat_modifier, float
 			NotifyNewTitlesAvailable();
 	}
 
-	Log(Logs::Detail, Logs::Tradeskills, "...skillup_modifier: %f , success_modifier: %d , stat modifier: %d", skillup_modifier , success_modifier , stat_modifier);
-	Log(Logs::Detail, Logs::Tradeskills, "...Stage1 chance was: %f percent", chance_stage1);
-	Log(Logs::Detail, Logs::Tradeskills, "...Stage2 chance was: %f percent. 0 percent means stage1 failed", chance_stage2);
+	LogTradeskills("skillup_modifier: [{}] , success_modifier: [{}] , stat modifier: [{}]", skillup_modifier , success_modifier , stat_modifier);
+	LogTradeskills("Stage1 chance was: [{}] percent", chance_stage1);
+	LogTradeskills("Stage2 chance was: [{}] percent. 0 percent means stage1 failed", chance_stage2);
 }
 
 bool ZoneDatabase::GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_type, uint32 some_id,
@@ -1146,8 +1179,8 @@ bool ZoneDatabase::GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_
                                     buf2.c_str(), containers.c_str(), count, sum);
     auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error in GetTradeRecipe search, query: %s", query.c_str());
-		Log(Logs::General, Logs::Error, "Error in GetTradeRecipe search, error: %s", results.ErrorMessage().c_str());
+		LogError("Error in GetTradeRecipe search, query: [{}]", query.c_str());
+		LogError("Error in GetTradeRecipe search, error: [{}]", results.ErrorMessage().c_str());
 		return false;
 	}
 
@@ -1168,7 +1201,7 @@ bool ZoneDatabase::GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_
 
             //length limit on buf2
             if(index == 214) { //Maximum number of recipe matches (19 * 215 = 4096)
-                Log(Logs::General, Logs::Error, "GetTradeRecipe warning: Too many matches. Unable to search all recipe entries. Searched %u of %u possible entries.", index + 1, results.RowCount());
+        LogError("GetTradeRecipe warning: Too many matches. Unable to search all recipe entries. Searched [{}] of [{}] possible entries", index + 1, results.RowCount());
                 break;
             }
         }
@@ -1180,8 +1213,8 @@ bool ZoneDatabase::GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_
                             "AND sum(tre.item_id * tre.componentcount) = %u", buf2.c_str(), count, sum);
 		results = QueryDatabase(query);
         if (!results.Success()) {
-            Log(Logs::General, Logs::Error, "Error in GetTradeRecipe, re-query: %s", query.c_str());
-            Log(Logs::General, Logs::Error, "Error in GetTradeRecipe, error: %s", results.ErrorMessage().c_str());
+      LogError("Error in GetTradeRecipe, re-query: [{}]", query.c_str());
+      LogError("Error in GetTradeRecipe, error: [{}]", results.ErrorMessage().c_str());
             return false;
         }
     }
@@ -1189,36 +1222,45 @@ bool ZoneDatabase::GetTradeRecipe(const EQEmu::ItemInstance* container, uint8 c_
     if (results.RowCount() < 1)
         return false;
 
-	if(results.RowCount() > 1) {
+	if (results.RowCount() > 1) {
 		//The recipe is not unique, so we need to compare the container were using.
 		uint32 containerId = 0;
 
-		if(some_id) //Standard container
+		if (some_id) { //Standard container
 			containerId = some_id;
-		else if(c_type)//World container
+		}
+		else if (c_type) {//World container
 			containerId = c_type;
-		else //Invalid container
+		}
+		else { //Invalid container
 			return false;
+		}
 
-		query = StringFormat("SELECT tre.recipe_id "
-                            "FROM tradeskill_recipe_entries AS tre "
-                            "WHERE tre.recipe_id IN (%s) "
-                            "AND tre.item_id = %u;", buf2.c_str(), containerId);
-        results = QueryDatabase(query);
+		query   = StringFormat(
+			"SELECT tre.recipe_id "
+			"FROM tradeskill_recipe_entries AS tre "
+			"WHERE tre.recipe_id IN (%s) "
+			"AND tre.item_id = %u;", buf2.c_str(), containerId
+		);
+		results = QueryDatabase(query);
 		if (!results.Success()) {
-			Log(Logs::General, Logs::Error, "Error in GetTradeRecipe, re-query: %s", query.c_str());
-			Log(Logs::General, Logs::Error, "Error in GetTradeRecipe, error: %s", results.ErrorMessage().c_str());
+			LogError("Error in GetTradeRecipe, re-query: [{}]", query.c_str());
+			LogError("Error in GetTradeRecipe, error: [{}]", results.ErrorMessage().c_str());
 			return false;
 		}
 
-		if(results.RowCount() == 0) { //Recipe contents matched more than 1 recipe, but not in this container
-			Log(Logs::General, Logs::Error, "Combine error: Incorrect container is being used!");
+		if (results.RowCount() == 0) { //Recipe contents matched more than 1 recipe, but not in this container
+			LogError("Combine error: Incorrect container is being used!");
 			return false;
 		}
 
-		if (results.RowCount() > 1) //Recipe contents matched more than 1 recipe in this container
-			Log(Logs::General, Logs::Error, "Combine error: Recipe is not unique! %u matches found for container %u. Continuing with first recipe match.", results.RowCount(), containerId);
-
+		if (results.RowCount() > 1) { //Recipe contents matched more than 1 recipe in this container
+			LogError(
+				"Combine error: Recipe is not unique! [{}] matches found for container [{}]. Continuing with first recipe match",
+				results.RowCount(),
+				containerId
+			);
+		}
 	}
 
 	auto row = results.begin();
@@ -1288,8 +1330,8 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id
                                     char_id, (unsigned long)recipe_id, containers.c_str());
     auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error in GetTradeRecipe, query: %s", query.c_str());
-		Log(Logs::General, Logs::Error, "Error in GetTradeRecipe, error: %s", results.ErrorMessage().c_str());
+		LogError("Error in GetTradeRecipe, query: [{}]", query.c_str());
+		LogError("Error in GetTradeRecipe, error: [{}]", results.ErrorMessage().c_str());
 		return false;
 	}
 
@@ -1324,7 +1366,7 @@ bool ZoneDatabase::GetTradeRecipe(uint32 recipe_id, uint8 c_type, uint32 some_id
 	}
 
 	if(results.RowCount() < 1 && !spec->quest) {
-		Log(Logs::General, Logs::Error, "Error in GetTradeRecept success: no success items returned");
+		LogError("Error in GetTradeRecept success: no success items returned");
 		return false;
 	}
 
@@ -1391,7 +1433,7 @@ void Client::LearnRecipe(uint32 recipeID)
 	}
 
 	if (results.RowCount() != 1) {
-		Log(Logs::General, Logs::Normal, "Client::LearnRecipe - RecipeID: %d had %d occurences.", recipeID, results.RowCount());
+		LogInfo("Client::LearnRecipe - RecipeID: [{}] had [{}] occurences", recipeID, results.RowCount());
 		return;
 	}
 
@@ -1404,7 +1446,7 @@ void Client::LearnRecipe(uint32 recipeID)
     if (row[1] != nullptr)
         return;
 
-    Message_StringID(4, TRADESKILL_LEARN_RECIPE, row[0]);
+    MessageString(Chat::LightBlue, TRADESKILL_LEARN_RECIPE, row[0]);
     // Actually learn the recipe now
 	query = StringFormat("INSERT INTO char_recipe_list "
                         "SET recipe_id = %u, char_id = %u, madecount = 0 "
diff --git a/zone/trading.cpp b/zone/trading.cpp
index 154fdf148..1618e7770 100644
--- a/zone/trading.cpp
+++ b/zone/trading.cpp
@@ -87,7 +87,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
 
 	if (!owner || !owner->IsClient()) {
 		// This should never happen
-		Log(Logs::General, Logs::None, "Programming error: NPC's should not call Trade::AddEntity()");
+		LogDebug("Programming error: NPC's should not call Trade::AddEntity()");
 		return;
 	}
 
@@ -102,7 +102,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
 	EQEmu::ItemInstance* inst = client->GetInv().GetItem(EQEmu::invslot::slotCursor);
 
 	if (!inst) {
-		client->Message(13, "Error: Could not find item on your cursor!");
+		client->Message(Chat::Red, "Error: Could not find item on your cursor!");
 		return;
 	}
 
@@ -112,7 +112,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
 	// (it just didn't handle partial stack move actions)
 	if (stack_size > 0) {
 		if (!inst->IsStackable() || !inst2 || !inst2->GetItem() || (inst->GetID() != inst2->GetID()) || (stack_size > inst->GetCharges())) {
-			client->Kick();
+			client->Kick("Error stacking item in trade");
 			return;
 		}
 
@@ -127,7 +127,7 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
 			inst2->SetCharges(stack_size + inst2->GetCharges());
 		}
 
-		Log(Logs::Detail, Logs::Trading, "%s added partial item '%s' stack (qty: %i) to trade slot %i", owner->GetName(), inst->GetItem()->Name, stack_size, trade_slot_id);
+		LogTrading("[{}] added partial item [{}] stack (qty: [{}]) to trade slot [{}]", owner->GetName(), inst->GetItem()->Name, stack_size, trade_slot_id);
 
 		if (_stack_size > 0)
 			inst->SetCharges(_stack_size);
@@ -138,13 +138,13 @@ void Trade::AddEntity(uint16 trade_slot_id, uint32 stack_size) {
 	}
 	else {
 		if (inst2 && inst2->GetID()) {
-			client->Kick();
+			client->Kick("Attempting to add null item to trade");
 			return;
 		}
 
 		SendItemData(inst, trade_slot_id);
 
-		Log(Logs::Detail, Logs::Trading, "%s added item '%s' to trade slot %i", owner->GetName(), inst->GetItem()->Name, trade_slot_id);
+		LogTrading("[{}] added item [{}] to trade slot [{}]", owner->GetName(), inst->GetItem()->Name, trade_slot_id);
 
 		client->PutItemInInventory(trade_slot_id, *inst);
 		client->DeleteItemInInventory(EQEmu::invslot::slotCursor);
@@ -297,7 +297,7 @@ void Trade::LogTrade()
 void Trade::DumpTrade()
 {
 	Mob* with = With();
-	Log(Logs::Detail, Logs::Trading, "Dumping trade data: '%s' in TradeState %i with '%s'",
+	LogTrading("Dumping trade data: [{}] in TradeState [{}] with [{}]",
 		this->owner->GetName(), state, ((with==nullptr)?"(null)":with->GetName()));
 
 	if (!owner->IsClient())
@@ -308,7 +308,7 @@ void Trade::DumpTrade()
 		const EQEmu::ItemInstance* inst = trader->GetInv().GetItem(i);
 
 		if (inst) {
-			Log(Logs::Detail, Logs::Trading, "Item %i (Charges=%i, Slot=%i, IsBag=%s)",
+			LogTrading("Item [{}] (Charges=[{}], Slot=[{}], IsBag=[{}])",
 				inst->GetItem()->ID, inst->GetCharges(),
 				i, ((inst->IsClassBag()) ? "True" : "False"));
 
@@ -316,7 +316,7 @@ void Trade::DumpTrade()
 				for (uint8 j = EQEmu::invbag::SLOT_BEGIN; j <= EQEmu::invbag::SLOT_END; j++) {
 					inst = trader->GetInv().GetItem(i, j);
 					if (inst) {
-						Log(Logs::Detail, Logs::Trading, "\tBagItem %i (Charges=%i, Slot=%i)",
+						LogTrading("\tBagItem [{}] (Charges=[{}], Slot=[{}])",
 							inst->GetItem()->ID, inst->GetCharges(),
 							EQEmu::InventoryProfile::CalcSlotId(i, j));
 					}
@@ -325,7 +325,7 @@ void Trade::DumpTrade()
 		}
 	}
 
-	Log(Logs::Detail, Logs::Trading, "\tpp:%i, gp:%i, sp:%i, cp:%i", pp, gp, sp, cp);
+	LogTrading("\tpp:[{}], gp:[{}], sp:[{}], cp:[{}]", pp, gp, sp, cp);
 }
 
 
@@ -369,7 +369,7 @@ void Client::ResetTrade() {
 					break;
 
 				if (partial_inst->GetID() != inst->GetID()) {
-					Log(Logs::Detail, Logs::None, "[CLIENT] Client::ResetTrade() - an incompatible location reference was returned by Inventory::FindFreeSlotForTradeItem()");
+					LogDebug("[CLIENT] Client::ResetTrade() - an incompatible location reference was returned by Inventory::FindFreeSlotForTradeItem()");
 
 					break;
 				}
@@ -459,7 +459,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 		bool qs_log = false;
 
 		if(other) {
-			Log(Logs::Detail, Logs::Trading, "Finishing trade with client %s", other->GetName());
+			LogTrading("Finishing trade with client [{}]", other->GetName());
 
 			this->AddMoneyToPP(other->trade->cp, other->trade->sp, other->trade->gp, other->trade->pp, true);
 
@@ -492,7 +492,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 				const EQEmu::ItemInstance* inst = m_inv[trade_slot];
 
 				if (inst && inst->IsClassBag()) {
-					Log(Logs::Detail, Logs::Trading, "Giving container %s (%d) in slot %d to %s", inst->GetItem()->Name, inst->GetItem()->ID, trade_slot, other->GetName());
+					LogTrading("Giving container [{}] ([{}]) in slot [{}] to [{}]", inst->GetItem()->Name, inst->GetItem()->ID, trade_slot, other->GetName());
 
 					// TODO: need to check bag items/augments for no drop..everything for attuned...
 					if (inst->GetItem()->NoDrop != 0 || Admin() >= RuleI(Character, MinStatusForNoDropExemptions) || RuleI(World, FVNoDropFlag) == 1 || other == this) {
@@ -500,7 +500,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 
 						if (free_slot != INVALID_INDEX) {
 							if (other->PutItemInInventory(free_slot, *inst, true)) {
-								Log(Logs::Detail, Logs::Trading, "Container %s (%d) successfully transferred, deleting from trade slot.", inst->GetItem()->Name, inst->GetItem()->ID);
+								LogTrading("Container [{}] ([{}]) successfully transferred, deleting from trade slot", inst->GetItem()->Name, inst->GetItem()->ID);
 								if (qs_log) {
 									auto detail = new QSTradeItems_Struct;
 
@@ -552,17 +552,17 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 								}
 							}
 							else {
-								Log(Logs::Detail, Logs::Trading, "Transfer of container %s (%d) to %s failed, returning to giver.", inst->GetItem()->Name, inst->GetItem()->ID, other->GetName());
+								LogTrading("Transfer of container [{}] ([{}]) to [{}] failed, returning to giver", inst->GetItem()->Name, inst->GetItem()->ID, other->GetName());
 								PushItemOnCursor(*inst, true);
 							}
 						}
 						else {
-							Log(Logs::Detail, Logs::Trading, "%s's inventory is full, returning container %s (%d) to giver.", other->GetName(), inst->GetItem()->Name, inst->GetItem()->ID);
+							LogTrading("[{}]'s inventory is full, returning container [{}] ([{}]) to giver", other->GetName(), inst->GetItem()->Name, inst->GetItem()->ID);
 							PushItemOnCursor(*inst, true);
 						}
 					}
 					else {
-						Log(Logs::Detail, Logs::Trading, "Container %s (%d) is NoDrop, returning to giver.", inst->GetItem()->Name, inst->GetItem()->ID);
+						LogTrading("Container [{}] ([{}]) is NoDrop, returning to giver", inst->GetItem()->Name, inst->GetItem()->ID);
 						PushItemOnCursor(*inst, true);
 					}
 
@@ -588,7 +588,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 							break;
 
 						if (partial_inst->GetID() != inst->GetID()) {
-							Log(Logs::Detail, Logs::Trading, "[CLIENT] Client::ResetTrade() - an incompatible location reference was returned by Inventory::FindFreeSlotForTradeItem()");
+							LogTrading("[CLIENT] Client::ResetTrade() - an incompatible location reference was returned by Inventory::FindFreeSlotForTradeItem()");
 							break;
 						}
 
@@ -606,10 +606,10 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 							inst->SetCharges(0);
 						}
 
-						Log(Logs::Detail, Logs::Trading, "Transferring partial stack %s (%d) in slot %d to %s", inst->GetItem()->Name, inst->GetItem()->ID, trade_slot, other->GetName());
+						LogTrading("Transferring partial stack [{}] ([{}]) in slot [{}] to [{}]", inst->GetItem()->Name, inst->GetItem()->ID, trade_slot, other->GetName());
 
 						if (other->PutItemInInventory(partial_slot, *partial_inst, true)) {
-							Log(Logs::Detail, Logs::Trading, "Partial stack %s (%d) successfully transferred, deleting %i charges from trade slot.",
+							LogTrading("Partial stack [{}] ([{}]) successfully transferred, deleting [{}] charges from trade slot",
 								inst->GetItem()->Name, inst->GetItem()->ID, (old_charges - inst->GetCharges()));
 							if (qs_log) {
 								auto detail = new QSTradeItems_Struct;
@@ -635,7 +635,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 							}
 						}
 						else {
-							Log(Logs::Detail, Logs::Trading, "Transfer of partial stack %s (%d) to %s failed, returning %i charges to trade slot.",
+							LogTrading("Transfer of partial stack [{}] ([{}]) to [{}] failed, returning [{}] charges to trade slot",
 								inst->GetItem()->Name, inst->GetItem()->ID, other->GetName(), (old_charges - inst->GetCharges()));
 
 							inst->SetCharges(old_charges);
@@ -710,7 +710,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 				const EQEmu::ItemInstance* inst = m_inv[trade_slot];
 
 				if (inst) {
-					Log(Logs::Detail, Logs::Trading, "Giving item %s (%d) in slot %d to %s", inst->GetItem()->Name, inst->GetItem()->ID, trade_slot, other->GetName());
+					LogTrading("Giving item [{}] ([{}]) in slot [{}] to [{}]", inst->GetItem()->Name, inst->GetItem()->ID, trade_slot, other->GetName());
 
 					// TODO: need to check bag items/augments for no drop..everything for attuned...
 					if (inst->GetItem()->NoDrop != 0 || Admin() >= RuleI(Character, MinStatusForNoDropExemptions) || RuleI(World, FVNoDropFlag) == 1 || other == this) {
@@ -718,7 +718,7 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 
 						if (free_slot != INVALID_INDEX) {
 							if (other->PutItemInInventory(free_slot, *inst, true)) {
-								Log(Logs::Detail, Logs::Trading, "Item %s (%d) successfully transferred, deleting from trade slot.", inst->GetItem()->Name, inst->GetItem()->ID);
+								LogTrading("Item [{}] ([{}]) successfully transferred, deleting from trade slot", inst->GetItem()->Name, inst->GetItem()->ID);
 								if (qs_log) {
 									auto detail = new QSTradeItems_Struct;
 
@@ -771,17 +771,17 @@ void Client::FinishTrade(Mob* tradingWith, bool finalizer, void* event_entry, st
 								}
 							}
 							else {
-								Log(Logs::Detail, Logs::Trading, "Transfer of Item %s (%d) to %s failed, returning to giver.", inst->GetItem()->Name, inst->GetItem()->ID, other->GetName());
+								LogTrading("Transfer of Item [{}] ([{}]) to [{}] failed, returning to giver", inst->GetItem()->Name, inst->GetItem()->ID, other->GetName());
 								PushItemOnCursor(*inst, true);
 							}
 						}
 						else {
-							Log(Logs::Detail, Logs::Trading, "%s's inventory is full, returning item %s (%d) to giver.", other->GetName(), inst->GetItem()->Name, inst->GetItem()->ID);
+							LogTrading("[{}]'s inventory is full, returning item [{}] ([{}]) to giver", other->GetName(), inst->GetItem()->Name, inst->GetItem()->ID);
 							PushItemOnCursor(*inst, true);
 						}
 					}
 					else {
-						Log(Logs::Detail, Logs::Trading, "Item %s (%d) is NoDrop, returning to giver.", inst->GetItem()->Name, inst->GetItem()->ID);
+						LogTrading("Item [{}] ([{}]) is NoDrop, returning to giver", inst->GetItem()->Name, inst->GetItem()->ID);
 						PushItemOnCursor(*inst, true);
 					}
 
@@ -1110,7 +1110,7 @@ void Client::Trader_EndTrader() {
 			tdis->Unknown000 = 0;
 			tdis->TraderID = Customer->GetID();
 			tdis->Unknown012 = 0;
-			Customer->Message(13, "The Trader is no longer open for business");
+			Customer->Message(Chat::Red, "The Trader is no longer open for business");
 
 			for(int i = 0; i < 80; i++) {
 				if(gis->Items[i] != 0) {
@@ -1178,7 +1178,7 @@ void Client::SendTraderItem(uint32 ItemID, uint16 Quantity) {
 	const EQEmu::ItemData* item = database.GetItem(ItemID);
 
 	if(!item){
-		Log(Logs::Detail, Logs::Trading, "Bogus item deleted in Client::SendTraderItem!\n");
+		LogTrading("Bogus item deleted in Client::SendTraderItem!\n");
 		return;
 	}
 
@@ -1237,10 +1237,8 @@ void Client::BulkSendTraderInventory(uint32 char_id) {
 				safe_delete(inst);
 			}
 			else
-				Log(Logs::Detail, Logs::Trading, "Client::BulkSendTraderInventory nullptr inst pointer");
+				LogTrading("Client::BulkSendTraderInventory nullptr inst pointer");
 		}
-		else
-			Log(Logs::Detail, Logs::Trading, "Client::BulkSendTraderInventory nullptr item pointer or item is NODROP %8X",item);
 	}
 	safe_delete(TraderItems);
 }
@@ -1263,7 +1261,7 @@ uint32 Client::FindTraderItemSerialNumber(int32 ItemID) {
 			}
 		}
 	}
-	Log(Logs::Detail, Logs::Trading, "Client::FindTraderItemSerialNumber Couldn't find item! Item ID %i", ItemID);
+	LogTrading("Client::FindTraderItemSerialNumber Couldn't find item! Item ID [{}]", ItemID);
 
 	return 0;
 }
@@ -1286,7 +1284,7 @@ EQEmu::ItemInstance* Client::FindTraderItemBySerialNumber(int32 SerialNumber){
 			}
 		}
 	}
-	Log(Logs::Detail, Logs::Trading, "Client::FindTraderItemBySerialNumber Couldn't find item! Serial No. was %i", SerialNumber);
+	LogTrading("Client::FindTraderItemBySerialNumber Couldn't find item! Serial No. was [{}]", SerialNumber);
 
 	return nullptr;
 }
@@ -1348,7 +1346,7 @@ uint16 Client::FindTraderItem(int32 SerialNumber, uint16 Quantity){
 			}
 		}
 	}
-	Log(Logs::Detail, Logs::Trading, "Could NOT find a match for Item: %i with a quantity of: %i on Trader: %s\n",
+	LogTrading("Could NOT find a match for Item: [{}] with a quantity of: [{}] on Trader: [{}]\n",
 					SerialNumber , Quantity, this->GetName());
 
 	return 0;
@@ -1359,7 +1357,7 @@ void Client::NukeTraderItem(uint16 Slot,int16 Charges,uint16 Quantity,Client* Cu
 	if(!Customer)
 		return;
 
-	Log(Logs::Detail, Logs::Trading, "NukeTraderItem(Slot %i, Charges %i, Quantity %i", Slot, Charges, Quantity);
+	LogTrading("NukeTraderItem(Slot [{}], Charges [{}], Quantity [{}]", Slot, Charges, Quantity);
 
 	if(Quantity < Charges)
 	{
@@ -1446,7 +1444,7 @@ void Client::FindAndNukeTraderItem(int32 SerialNumber, uint16 Quantity, Client*
 
 		if (!item)
 		{
-			Log(Logs::Detail, Logs::Trading, "Could not find Item: %i on Trader: %s", SerialNumber, Quantity, this->GetName());
+			LogTrading("Could not find Item: [{}] on Trader: [{}]", SerialNumber, Quantity, this->GetName());
 			return;
 		}
 
@@ -1457,7 +1455,7 @@ void Client::FindAndNukeTraderItem(int32 SerialNumber, uint16 Quantity, Client*
 		if (!Stackable)
 			Quantity = (Charges > 0) ? Charges : 1;
 
-		Log(Logs::Detail, Logs::Trading, "FindAndNuke %s, Charges %i, Quantity %i", item->GetItem()->Name, Charges, Quantity);
+		LogTrading("FindAndNuke [{}], Charges [{}], Quantity [{}]", item->GetItem()->Name, Charges, Quantity);
 
 		if (Charges <= Quantity || (Charges <= 0 && Quantity==1) || !Stackable)
 		{
@@ -1499,7 +1497,7 @@ void Client::FindAndNukeTraderItem(int32 SerialNumber, uint16 Quantity, Client*
 
 		}
 	}
-	Log(Logs::Detail, Logs::Trading, "Could NOT find a match for Item: %i with a quantity of: %i on Trader: %s\n",SerialNumber,
+	LogTrading("Could NOT find a match for Item: [{}] with a quantity of: [{}] on Trader: [{}]\n",SerialNumber,
 					Quantity,this->GetName());
 }
 
@@ -1599,7 +1597,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic
 	BuyItem = Trader->FindTraderItemBySerialNumber(tbs->ItemID);
 
 	if(!BuyItem) {
-		Log(Logs::Detail, Logs::Trading, "Unable to find item on trader.");
+		LogTrading("Unable to find item on trader");
 		TradeRequestFailed(app);
 		safe_delete(outapp);
 		return;
@@ -1607,7 +1605,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic
 
 	tbs->Price = BuyItem->GetPrice();
 
-	Log(Logs::Detail, Logs::Trading, "Buyitem: Name: %s, IsStackable: %i, Requested Quantity: %i, Charges on Item %i",
+	LogTrading("Buyitem: Name: [{}], IsStackable: [{}], Requested Quantity: [{}], Charges on Item [{}]",
 					BuyItem->GetItem()->Name, BuyItem->IsStackable(), tbs->Quantity, BuyItem->GetCharges());
 	// If the item is not stackable, then we can only be buying one of them.
 	if(!BuyItem->IsStackable())
@@ -1625,13 +1623,12 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic
 			outtbs->Quantity = tbs->Quantity;
 	}
 
-	Log(Logs::Detail, Logs::Trading, "Actual quantity that will be traded is %i", outtbs->Quantity);
+	LogTrading("Actual quantity that will be traded is [{}]", outtbs->Quantity);
 
 	if((tbs->Price * outtbs->Quantity) <= 0) {
-		Message(13, "Internal error. Aborting trade. Please report this to the ServerOP. Error code is 1");
-		Trader->Message(13, "Internal error. Aborting trade. Please report this to the ServerOP. Error code is 1");
-		Log(Logs::General, Logs::Error, "Bazaar: Zero price transaction between %s and %s aborted."
-						"Item: %s, Charges: %i, TBS: Qty %i, Price: %i",
+		Message(Chat::Red, "Internal error. Aborting trade. Please report this to the ServerOP. Error code is 1");
+		Trader->Message(Chat::Red, "Internal error. Aborting trade. Please report this to the ServerOP. Error code is 1");
+		LogError("Bazaar: Zero price transaction between [{}] and [{}] aborted. Item: [{}], Charges: [{}], TBS: Qty [{}], Price: [{}]",
 						GetName(), Trader->GetName(),
 						BuyItem->GetItem()->Name, BuyItem->GetCharges(), tbs->Quantity, tbs->Price);
 		TradeRequestFailed(app);
@@ -1642,7 +1639,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic
 	uint64 TotalTransactionValue = static_cast<uint64>(tbs->Price) * static_cast<uint64>(outtbs->Quantity);
 
 	if(TotalTransactionValue > MAX_TRANSACTION_VALUE) {
-		Message(13, "That would exceed the single transaction limit of %u platinum.", MAX_TRANSACTION_VALUE / 1000);
+		Message(Chat::Red, "That would exceed the single transaction limit of %u platinum.", MAX_TRANSACTION_VALUE / 1000);
 		TradeRequestFailed(app);
 		safe_delete(outapp);
 		return;
@@ -1668,7 +1665,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic
 		return;
 	}
 
-	Log(Logs::Detail, Logs::Trading, "Customer Paid: %d in Copper", TotalCost);
+	LogTrading("Customer Paid: [{}] in Copper", TotalCost);
 
 	uint32 platinum = TotalCost / 1000;
 	TotalCost -= (platinum * 1000);
@@ -1680,7 +1677,7 @@ void Client::BuyTraderItem(TraderBuy_Struct* tbs, Client* Trader, const EQApplic
 
 	Trader->AddMoneyToPP(copper, silver, gold, platinum, true);
 
-	Log(Logs::Detail, Logs::Trading, "Trader Received: %d Platinum, %d Gold, %d Silver, %d Copper", platinum, gold, silver, copper);
+	LogTrading("Trader Received: [{}] Platinum, [{}] Gold, [{}] Silver, [{}] Copper", platinum, gold, silver, copper);
 
 	ReturnTraderReq(app, outtbs->Quantity, ItemID);
 
@@ -1754,7 +1751,7 @@ void Client::SendBazaarWelcome()
 		return;
 
 	auto row = results.begin();
-	Message(10, "There are %i Buyers waiting to purchase your loot. Type /barter to search for them, "
+	Message(Chat::NPCQuestSay, "There are %i Buyers waiting to purchase your loot. Type /barter to search for them, "
 				"or use /buyer to set up your own Buy Lines.", atoi(row[0]));
 }
 
@@ -1939,13 +1936,13 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
 		return;
     }
 
-    Log(Logs::Detail, Logs::Trading, "SRCH: %s", query.c_str());
+  LogTrading("SRCH: [{}]", query.c_str());
 
     int Size = 0;
     uint32 ID = 0;
 
     if (results.RowCount() == static_cast<unsigned long>(RuleI(Bazaar, MaxSearchResults)))
-			Message(15, "Your search reached the limit of %i results. Please narrow your search down by selecting more options.",
+			Message(Chat::Yellow, "Your search reached the limit of %i results. Please narrow your search down by selecting more options.",
 					RuleI(Bazaar, MaxSearchResults));
 
     if(results.RowCount() == 0) {
@@ -1984,7 +1981,7 @@ void Client::SendBazaarResults(uint32 TraderID, uint32 Class_, uint32 Race, uint
 		    ID = Trader2->GetID();
 		    VARSTRUCT_ENCODE_TYPE(uint32, bufptr, ID);
 	    } else {
-		    Log(Logs::Detail, Logs::Trading, "Unable to find trader: %i\n", atoi(row[1]));
+		  LogTrading("Unable to find trader: [{}]\n", atoi(row[1]));
 		    VARSTRUCT_ENCODE_TYPE(uint32, bufptr, 0);
 	    }
 	    Cost = atoi(row[5]);
@@ -2057,7 +2054,7 @@ static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Stru
 
 	if(!inst) return;
 
-	Customer->Message(13, "The Trader has put up %s for sale.", item->Name);
+	Customer->Message(Chat::Red, "The Trader has put up %s for sale.", item->Name);
 
 	for(int i = 0; i < 80; i++) {
 
@@ -2074,7 +2071,7 @@ static void UpdateTraderCustomerItemsAdded(uint32 CustomerID, TraderCharges_Stru
 			if(inst->IsStackable())
 				inst->SetMerchantCount(gis->Charges[i]);
 
-			Log(Logs::Detail, Logs::Trading, "Sending price update for %s, Serial No. %i with %i charges",
+			LogTrading("Sending price update for [{}], Serial No. [{}] with [{}] charges",
 							item->Name, gis->SerialNumber[i], gis->Charges[i]);
 
 			Customer->SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor?
@@ -2105,7 +2102,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St
 		tdis->Unknown000 = 0;
 		tdis->TraderID = Customer->GetID();
 		tdis->Unknown012 = 0;
-		Customer->Message(13, "The Trader has withdrawn the %s from sale.", item->Name);
+		Customer->Message(Chat::Red, "The Trader has withdrawn the %s from sale.", item->Name);
 
 		for(int i = 0; i < 80; i++) {
 
@@ -2120,7 +2117,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St
 					tdis->ItemID = gis->SerialNumber[i];
 				}
 				tdis->ItemID = gis->SerialNumber[i];
-				Log(Logs::Detail, Logs::Trading, "Telling customer to remove item %i with %i charges and S/N %i",
+				LogTrading("Telling customer to remove item [{}] with [{}] charges and S/N [{}]",
 								ItemID, Charges, gis->SerialNumber[i]);
 
 
@@ -2132,7 +2129,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St
 		return;
 	}
 
-	Log(Logs::Detail, Logs::Trading, "Sending price updates to customer %s", Customer->GetName());
+	LogTrading("Sending price updates to customer [{}]", Customer->GetName());
 
 	EQEmu::ItemInstance* inst = database.CreateItem(item);
 
@@ -2147,7 +2144,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St
 		inst->SetMerchantCount(Charges);
 
 	// Let the customer know the price in the window has suddenly just changed on them.
-	Customer->Message(13, "The Trader has changed the price of %s.", item->Name);
+	Customer->Message(Chat::Red, "The Trader has changed the price of %s.", item->Name);
 
 	for(int i = 0; i < 80; i++) {
 		if((gis->ItemID[i] != ItemID) ||
@@ -2158,7 +2155,7 @@ static void UpdateTraderCustomerPriceChanged(uint32 CustomerID, TraderCharges_St
 
 		inst->SetMerchantSlot(gis->SerialNumber[i]);
 
-		Log(Logs::Detail, Logs::Trading, "Sending price update for %s, Serial No. %i with %i charges",
+		LogTrading("Sending price update for [{}], Serial No. [{}] with [{}] charges",
 						item->Name, gis->SerialNumber[i], gis->Charges[i]);
 
 		Customer->SendItemPacket(EQEmu::invslot::slotCursor, inst, ItemPacketMerchant); // MainCursor??
@@ -2174,7 +2171,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 	//
 	TraderPriceUpdate_Struct* tpus = (TraderPriceUpdate_Struct*)app->pBuffer;
 
-	Log(Logs::Detail, Logs::Trading, "Received Price Update for %s, Item Serial No. %i, New Price %i",
+	LogTrading("Received Price Update for [{}], Item Serial No. [{}], New Price [{}]",
 					GetName(), tpus->SerialNumber, tpus->NewPrice);
 
 	// Pull the items this Trader currently has for sale from the trader table.
@@ -2182,7 +2179,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 	TraderCharges_Struct* gis = database.LoadTraderItemWithCharges(CharacterID());
 
 	if(!gis) {
-		Log(Logs::Detail, Logs::None, "[CLIENT] Error retrieving Trader items details to update price.");
+		LogDebug("[CLIENT] Error retrieving Trader items details to update price");
 		return;
 	}
 
@@ -2202,7 +2199,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 		if((gis->ItemID[i] > 0) && (gis->SerialNumber[i] == tpus->SerialNumber)) {
 			// We found the item that the Trader wants to change the price of (or add back up for sale).
 			//
-			Log(Logs::Detail, Logs::Trading, "ItemID is %i, Charges is %i", gis->ItemID[i], gis->Charges[i]);
+			LogTrading("ItemID is [{}], Charges is [{}]", gis->ItemID[i], gis->Charges[i]);
 
 			IDOfItemToUpdate = gis->ItemID[i];
 
@@ -2228,7 +2225,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 			return ;
 		}
 
-		Log(Logs::Detail, Logs::Trading, "Unable to find item to update price for. Rechecking trader satchels");
+		LogTrading("Unable to find item to update price for. Rechecking trader satchels");
 
 		// Find what is in their Trader Satchels
 		GetItems_Struct* newgis=GetTraderItems();
@@ -2241,7 +2238,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 
 			if((newgis->Items[i] > 0) && (newgis->SerialNumber[i] == tpus->SerialNumber)) {
 
-				Log(Logs::Detail, Logs::Trading, "Found new Item to Add, ItemID is %i, Charges is %i", newgis->Items[i],
+				LogTrading("Found new Item to Add, ItemID is [{}], Charges is [{}]", newgis->Items[i],
 								newgis->Charges[i]);
 
 				IDOfItemToAdd = newgis->Items[i];
@@ -2259,7 +2256,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 
 		if(!IDOfItemToAdd || !item) {
 
-			Log(Logs::Detail, Logs::Trading, "Item not found in Trader Satchels either.");
+			LogTrading("Item not found in Trader Satchels either");
 			tpus->SubAction = BazaarPriceChange_Fail;
 			QueuePacket(app);
 			Trader_EndTrader();
@@ -2286,7 +2283,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 			}
 
 			if(SameItemWithDifferingCharges)
-				Message(13, "Warning: You have more than one %s with different charges. They have all been added for sale "
+				Message(Chat::Red, "Warning: You have more than one %s with different charges. They have all been added for sale "
 						"at the same price.", item->Name);
 		}
 
@@ -2304,7 +2301,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 				gis->SerialNumber[i] = newgis->SerialNumber[i];
 				gis->ItemCost[i] = tpus->NewPrice;
 
-				Log(Logs::Detail, Logs::Trading, "Adding new item for %s. ItemID %i, SerialNumber %i, Charges %i, Price: %i, Slot %i",
+				LogTrading("Adding new item for [{}]. ItemID [{}], SerialNumber [{}], Charges [{}], Price: [{}], Slot [{}]",
 							GetName(), newgis->Items[i], newgis->SerialNumber[i], newgis->Charges[i],
 							tpus->NewPrice, i);
 			}
@@ -2333,8 +2330,8 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 		tpus->SubAction = BazaarPriceChange_Fail;
 		QueuePacket(app);
 		Trader_EndTrader();
-		Message(13, "You must remove the item from sale before you can increase the price while a customer is browsing.");
-		Message(13, "Click 'Begin Trader' to restart Trader mode with the increased price for this item.");
+		Message(Chat::Red, "You must remove the item from sale before you can increase the price while a customer is browsing.");
+		Message(Chat::Red, "Click 'Begin Trader' to restart Trader mode with the increased price for this item.");
 		safe_delete(gis);
 		return;
 	}
@@ -2350,7 +2347,7 @@ void Client::HandleTraderPriceUpdate(const EQApplicationPacket *app) {
 	QueuePacket(app);
 
 	if(OldPrice == tpus->NewPrice) {
-		Log(Logs::Detail, Logs::Trading, "The new price is the same as the old one.");
+		LogTrading("The new price is the same as the old one");
 		safe_delete(gis);
 		return;
 	}
@@ -2371,7 +2368,7 @@ void Client::SendBuyerResults(char* searchString, uint32 searchID) {
 
 	// This method is called when a potential seller in the /barter window searches for matching buyers
 	//
-	Log(Logs::Detail, Logs::None, "[CLIENT] Client::SendBuyerResults %s\n", searchString);
+	LogDebug("[CLIENT] Client::SendBuyerResults [{}]\n", searchString);
 
 	auto escSearchString = new char[strlen(searchString) * 2 + 1];
 	database.DoEscapeString(escSearchString, searchString, strlen(searchString));
@@ -2387,11 +2384,11 @@ void Client::SendBuyerResults(char* searchString, uint32 searchID) {
     int numberOfRows = results.RowCount();
 
     if(numberOfRows == RuleI(Bazaar, MaxBarterSearchResults))
-        Message(15, "Your search found too many results; some are not displayed.");
+        Message(Chat::Yellow, "Your search found too many results; some are not displayed.");
     else if(strlen(searchString) == 0)
-        Message(10, "There are %i Buy Lines.", numberOfRows);
+        Message(Chat::NPCQuestSay, "There are %i Buy Lines.", numberOfRows);
     else
-        Message(10, "There are %i Buy Lines that match the search string '%s'.", numberOfRows, searchString);
+        Message(Chat::NPCQuestSay, "There are %i Buy Lines that match the search string '%s'.", numberOfRows, searchString);
 
     if(numberOfRows == 0)
         return;
@@ -2466,7 +2463,7 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) {
 	if(!Buyer) {
 		bir->Approval = 0; // Tell the client that the Buyer is unavailable
 		QueuePacket(app);
-		Message(13, "The Buyer has gone away.");
+		Message(Chat::Red, "The Buyer has gone away.");
 		return;
 	}
 
@@ -2475,14 +2472,14 @@ void Client::ShowBuyLines(const EQApplicationPacket *app) {
 	QueuePacket(app);
 
 	if(bir->Approval == 0) {
-		Message_StringID(clientMessageYellow, TRADER_BUSY);
+		MessageString(Chat::Yellow, TRADER_BUSY);
 		return;
 	}
 
 	const char *WelcomeMessagePointer = Buyer->GetBuyerWelcomeMessage();
 
 	if(strlen(WelcomeMessagePointer) > 0)
-		Message(10, "%s greets you, '%s'.", Buyer->GetName(), WelcomeMessagePointer);
+		Message(Chat::NPCQuestSay, "%s greets you, '%s'.", Buyer->GetName(), WelcomeMessagePointer);
 
 	auto outapp = new EQApplicationPacket(OP_Barter, sizeof(BuyerBrowsing_Struct));
 
@@ -2563,7 +2560,7 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 	if(!item || !Quantity || !Price || !QtyBuyerWants) return;
 
 	if (m_inv.HasItem(ItemID, Quantity, invWhereWorn | invWherePersonal | invWhereCursor) == INVALID_INDEX) {
-		Message(13, "You do not have %i %s on you.", Quantity, item->Name);
+		Message(Chat::Red, "You do not have %i %s on you.", Quantity, item->Name);
 		return;
 	}
 
@@ -2571,37 +2568,37 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 	Client *Buyer = entity_list.GetClientByID(BuyerID);
 
 	if(!Buyer || !Buyer->IsBuyer()) {
-		Message(13, "The Buyer has gone away.");
+		Message(Chat::Red, "The Buyer has gone away.");
 		return;
 	}
 
 	// For Stackable items, HasSpaceForItem will try check if there is space to stack with existing stacks in
 	// the buyer inventory.
 	if(!(Buyer->GetInv().HasSpaceForItem(item, Quantity))) {
-		Message(13, "The Buyer does not have space for %i %s", Quantity, item->Name);
+		Message(Chat::Red, "The Buyer does not have space for %i %s", Quantity, item->Name);
 		return;
 	}
 
 	if((static_cast<uint64>(Quantity) * static_cast<uint64>(Price)) > MAX_TRANSACTION_VALUE) {
-		Message(13, "That would exceed the single transaction limit of %u platinum.", MAX_TRANSACTION_VALUE / 1000);
+		Message(Chat::Red, "That would exceed the single transaction limit of %u platinum.", MAX_TRANSACTION_VALUE / 1000);
 		return;
 	}
 
 	if(!Buyer->HasMoney(Quantity * Price)) {
-		Message(13, "The Buyer does not have sufficient money to purchase that quantity of %s.", item->Name);
-		Buyer->Message(13, "%s tried to sell you %i %s, but you have insufficient funds.", GetName(), Quantity, item->Name);
+		Message(Chat::Red, "The Buyer does not have sufficient money to purchase that quantity of %s.", item->Name);
+		Buyer->Message(Chat::Red, "%s tried to sell you %i %s, but you have insufficient funds.", GetName(), Quantity, item->Name);
 		return;
 	}
 
 	if(Buyer->CheckLoreConflict(item)) {
-		Message(13, "That item is LORE and the Buyer already has one.");
-		Buyer->Message(13, "%s tried to sell you %s but this item is LORE and you already have one.",
+		Message(Chat::Red, "That item is LORE and the Buyer already has one.");
+		Buyer->Message(Chat::Red, "%s tried to sell you %s but this item is LORE and you already have one.",
 					GetName(), item->Name);
 		return;
 	}
 
 	if(item->NoDrop == 0) {
-		Message(13, "That item is NODROP.");
+		Message(Chat::Red, "That item is NODROP.");
 		return;
 	}
 
@@ -2619,16 +2616,16 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 					Quantity = i;
 					break;
 				}
-				Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-				Message(13, "Internal error while processing transaction.");
+				LogError("Unexpected error while moving item from seller to buyer");
+				Message(Chat::Red, "Internal error while processing transaction.");
 				return;
 			}
 
 			EQEmu::ItemInstance* ItemToTransfer = m_inv.PopItem(SellerSlot);
 
 			if(!ItemToTransfer || !Buyer->MoveItemToInventory(ItemToTransfer, true)) {
-				Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-				Message(13, "Internal error while processing transaction.");
+				LogError("Unexpected error while moving item from seller to buyer");
+				Message(Chat::Red, "Internal error while processing transaction.");
 
 				if(ItemToTransfer)
 					safe_delete(ItemToTransfer);
@@ -2665,16 +2662,16 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 			int16 SellerSlot = m_inv.HasItem(ItemID, 1, invWhereWorn|invWherePersonal|invWhereCursor);
 
 			if (SellerSlot == INVALID_INDEX) {
-				Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-				Message(13, "Internal error while processing transaction.");
+				LogError("Unexpected error while moving item from seller to buyer");
+				Message(Chat::Red, "Internal error while processing transaction.");
 				return;
 			}
 
 			EQEmu::ItemInstance* ItemToTransfer = m_inv.PopItem(SellerSlot);
 
 			if(!ItemToTransfer) {
-				Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-				Message(13, "Internal error while processing transaction.");
+				LogError("Unexpected error while moving item from seller to buyer");
+				Message(Chat::Red, "Internal error while processing transaction.");
 				return;
 			}
 
@@ -2685,8 +2682,8 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 				QuantityMoved += ItemToTransfer->GetCharges();
 
 				if(!Buyer->MoveItemToInventory(ItemToTransfer, true)) {
-					Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-					Message(13, "Internal error while processing transaction.");
+					LogError("Unexpected error while moving item from seller to buyer");
+					Message(Chat::Red, "Internal error while processing transaction.");
 					safe_delete(ItemToTransfer);
 					return;
 				}
@@ -2720,8 +2717,8 @@ void Client::SellToBuyer(const EQApplicationPacket *app) {
 				ItemToTransfer->SetCharges(QuantityToRemoveFromStack);
 
 				if(!Buyer->MoveItemToInventory(ItemToTransfer, true)) {
-					Log(Logs::General, Logs::Error, "Unexpected error while moving item from seller to buyer.");
-					Message(13, "Internal error while processing transaction.");
+					LogError("Unexpected error while moving item from seller to buyer");
+					Message(Chat::Red, "Internal error while processing transaction.");
 					safe_delete(ItemToTransfer);
 					return;
 				}
@@ -2955,29 +2952,29 @@ void Client::UpdateBuyLine(const EQApplicationPacket *app) {
 
 	bool LoreConflict = CheckLoreConflict(item);
 
-	Log(Logs::Detail, Logs::Trading, "UpdateBuyLine: Char: %s BuySlot: %i ItemID %i %s Quantity %i Toggle: %i Price %i ItemCount %i LoreConflict %i",
+	LogTrading("UpdateBuyLine: Char: [{}] BuySlot: [{}] ItemID [{}] [{}] Quantity [{}] Toggle: [{}] Price [{}] ItemCount [{}] LoreConflict [{}]",
 					GetName(), BuySlot, ItemID, item->Name, Quantity, ToggleOnOff, Price, ItemCount, LoreConflict);
 
 	if((item->NoDrop != 0) && !LoreConflict && (Quantity > 0) && HasMoney(Quantity * Price) && ToggleOnOff && (ItemCount == 0)) {
-		Log(Logs::Detail, Logs::Trading, "Adding to database");
+		LogTrading("Adding to database");
 		database.AddBuyLine(CharacterID(), BuySlot, ItemID, ItemName, Quantity, Price);
 		QueuePacket(app);
 	}
 	else {
 		if(ItemCount > 0)
-			Message(13, "Buy line %s disabled as Item Compensation is not currently supported.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled as Item Compensation is not currently supported.", ItemName);
 
 		else if(Quantity <= 0)
-			Message(13, "Buy line %s disabled as the quantity is invalid.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled as the quantity is invalid.", ItemName);
 
 		else if(LoreConflict)
-			Message(13, "Buy line %s disabled as the item is LORE and you have one already.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled as the item is LORE and you have one already.", ItemName);
 
 		else if(item->NoDrop == 0)
-			Message(13, "Buy line %s disabled as the item is NODROP.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled as the item is NODROP.", ItemName);
 
 		else if(ToggleOnOff)
-			Message(13, "Buy line %s disabled due to insufficient funds.", ItemName);
+			Message(Chat::Red, "Buy line %s disabled due to insufficient funds.", ItemName);
 
 		else
 			database.RemoveBuyLine(CharacterID(), BuySlot);
@@ -3047,7 +3044,7 @@ void Client::BuyerItemSearch(const EQApplicationPacket *app) {
 			break;
 	}
 	if (Count == MAX_BUYER_ITEMSEARCH_RESULTS)
-		Message(15, "Your search returned more than %i results. Only the first %i are displayed.",
+		Message(Chat::Yellow, "Your search returned more than %i results. Only the first %i are displayed.",
 				MAX_BUYER_ITEMSEARCH_RESULTS, MAX_BUYER_ITEMSEARCH_RESULTS);
 
 	bisr->Action = Barter_BuyerSearch;
diff --git a/zone/trap.cpp b/zone/trap.cpp
index 29314f568..7027f3e28 100644
--- a/zone/trap.cpp
+++ b/zone/trap.cpp
@@ -373,13 +373,13 @@ void EntityList::GetTrapInfo(Client* client)
 		if (cur->IsTrap())
 		{
 			bool isset = (cur->chkarea_timer.Enabled() && !cur->reset_timer.Enabled());
-			client->Message(CC_Default, " Trap: (%d) found at %0.2f,%0.2f,%0.2f. Times Triggered: %d Is Active: %d Group: %d Message: %s", cur->trap_id, cur->m_Position.x, cur->m_Position.y, cur->m_Position.z, cur->times_triggered, isset, cur->group, cur->message.c_str());
+			client->Message(Chat::Default, " Trap: (%d) found at %0.2f,%0.2f,%0.2f. Times Triggered: %d Is Active: %d Group: %d Message: %s", cur->trap_id, cur->m_Position.x, cur->m_Position.y, cur->m_Position.z, cur->times_triggered, isset, cur->group, cur->message.c_str());
 			++count;
 		}
 		++it;
 	}
 
-	client->Message(CC_Default, "%d traps found.", count);
+	client->Message(Chat::Default, "%d traps found.", count);
 }
 
 void EntityList::ClearTrapPointers()
diff --git a/zone/tribute.cpp b/zone/tribute.cpp
index ce1eb5f6d..3e80f5446 100644
--- a/zone/tribute.cpp
+++ b/zone/tribute.cpp
@@ -93,7 +93,7 @@ void Client::ToggleTribute(bool enabled) {
 		}
 
 		if(cost > m_pp.tribute_points) {
-			Message(13, "You do not have enough tribute points to activate your tribute!");
+			Message(Chat::Red, "You do not have enough tribute points to activate your tribute!");
 			ToggleTribute(false);
 			return;
 		}
@@ -220,7 +220,7 @@ void Client::ChangeTributeSettings(TributeInfo_Struct *t) {
 
 void Client::SendTributeDetails(uint32 client_id, uint32 tribute_id) {
 	if(tribute_list.count(tribute_id) != 1) {
-		Log(Logs::General, Logs::Error, "Details request for invalid tribute %lu", (unsigned long)tribute_id);
+		LogError("Details request for invalid tribute [{}]", (unsigned long)tribute_id);
 		return;
 	}
 	TributeData &td = tribute_list[tribute_id];
@@ -250,7 +250,7 @@ int32 Client::TributeItem(uint32 slot, uint32 quantity) {
 	pts = mod_tribute_item_value(pts, m_inv[slot]);
 
 	if(pts < 1) {
-		Message(13, "This item is worthless for favor.");
+		Message(Chat::Red, "This item is worthless for favor.");
 		return(0);
 	}
 
@@ -277,7 +277,7 @@ int32 Client::TributeItem(uint32 slot, uint32 quantity) {
 //returns the number of points received from the tribute
 int32 Client::TributeMoney(uint32 platinum) {
 	if(!TakeMoneyFromPP(platinum * 1000)) {
-		Message(13, "You do not have that much money!");
+		Message(Chat::Red, "You do not have that much money!");
 		return(0);
 	}
 
@@ -409,28 +409,28 @@ bool ZoneDatabase::LoadTributes() {
 		return false;
 	}
 
-    for (auto row = results.begin(); row != results.end(); ++row) {
-        uint32 id = atoul(row[0]);
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		uint32 id = atoul(row[0]);
 
-        if(tribute_list.count(id) != 1) {
-            Log(Logs::General, Logs::Error, "Error in LoadTributes: unknown tribute %lu in tribute_levels", (unsigned long)id);
-            continue;
-        }
+		if (tribute_list.count(id) != 1) {
+			LogError("Error in LoadTributes: unknown tribute [{}] in tribute_levels", (unsigned long) id);
+			continue;
+		}
 
-        TributeData &cur = tribute_list[id];
+		TributeData &cur = tribute_list[id];
 
-        if(cur.tier_count >= MAX_TRIBUTE_TIERS) {
-            Log(Logs::General, Logs::Error, "Error in LoadTributes: on tribute %lu: more tiers defined than permitted", (unsigned long)id);
-            continue;
-        }
+		if (cur.tier_count >= MAX_TRIBUTE_TIERS) {
+			LogError("Error in LoadTributes: on tribute [{}]: more tiers defined than permitted", (unsigned long) id);
+			continue;
+		}
 
-        TributeLevel_Struct &s = cur.tiers[cur.tier_count];
+		TributeLevel_Struct &s = cur.tiers[cur.tier_count];
 
-        s.level = atoul(row[1]);
-        s.cost = atoul(row[2]);
-        s.tribute_item_id = atoul(row[3]);
-        cur.tier_count++;
-    }
+		s.level           = atoul(row[1]);
+		s.cost            = atoul(row[2]);
+		s.tribute_item_id = atoul(row[3]);
+		cur.tier_count++;
+	}
 
 	return true;
 }
diff --git a/zone/tune.cpp b/zone/tune.cpp
index c0510f94a..22ca90375 100644
--- a/zone/tune.cpp
+++ b/zone/tune.cpp
@@ -203,11 +203,11 @@ void Mob::Tune_FindACByPctMitigation(Mob* defender, Mob *attacker, float pct_mit
 				Message(0, "#Tune - [WARNING] Mitigation can not be further decreased due to minium hit value (%i).",minhit);
 
 			if (defender->IsNPC()){
-				Message(7, "#Tune - Recommended NPC AC ADJUSTMENT ( %i ) on ' %s ' for an average mitigation of (+ %.0f) pct from attacker ' %s '.",add_ac,defender->GetCleanName(), pct_mitigation, attacker->GetCleanName());
+				Message(Chat::LightGray, "#Tune - Recommended NPC AC ADJUSTMENT ( %i ) on ' %s ' for an average mitigation of (+ %.0f) pct from attacker ' %s '.",add_ac,defender->GetCleanName(), pct_mitigation, attacker->GetCleanName());
 				Message(0, "#SET: [NPC Attack STAT] = [%i]",add_ac + defender->CastToNPC()->GetRawAC());
 			}
 			if (defender->IsClient()){
-				Message(7, "#Tune - Recommended CLIENT AC ADJUSTMENT ( %i ) on ' %s ' for an average mitigation of (+ %.0f) pct from attacker ' %s '.",add_ac,defender->GetCleanName(), pct_mitigation, attacker->GetCleanName());
+				Message(Chat::LightGray, "#Tune - Recommended CLIENT AC ADJUSTMENT ( %i ) on ' %s ' for an average mitigation of (+ %.0f) pct from attacker ' %s '.",add_ac,defender->GetCleanName(), pct_mitigation, attacker->GetCleanName());
 				Message(0, "#Modify (+/-): [Client AC STAT/SE_AC(1)] [%i]",add_ac);
 			}
 
@@ -249,9 +249,9 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 
 	if (Msg){
 		
-		GM->Message(0, "######### Melee Mitigation Report: Start [Detail Level %i]#########", Msg);
-		GM->Message(0, "#ATTACKER: %s", attacker->GetCleanName());
-		GM->Message(0, "#DEFENDER: %s", defender->GetCleanName());
+		GM->Message(Chat::White, "######### Melee Mitigation Report: Start [Detail Level %i]#########", Msg);
+		GM->Message(Chat::White, "#ATTACKER: %s", attacker->GetCleanName());
+		GM->Message(Chat::White, "#DEFENDER: %s", defender->GetCleanName());
 	}
 
 	if (RuleB(Combat, UseIntervalAC)) {
@@ -264,16 +264,16 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 		float weight = 0.0;
 
 		if (Msg >= 2){
-			GM->Message(0, " "); 
-			GM->Message(0, "### Calculate Mitigation Rating ###"); 
+			GM->Message(Chat::White, " ");
+			GM->Message(Chat::White, "### Calculate Mitigation Rating ###");
 			if (aabonuses.CombatStability)
-				GM->Message(0, "# %i #### DEFENDER SE_CombatStability(259) AA Bonus", aabonuses.CombatStability);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_CombatStability(259) AA Bonus", aabonuses.CombatStability);
 			if (spellbonuses.CombatStability)
-				GM->Message(0, "# %i #### DEFENDER SE_CombatStability(259) Spell Bonus", spellbonuses.CombatStability);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_CombatStability(259) Spell Bonus", spellbonuses.CombatStability);
 			if (itembonuses.CombatStability)
-				GM->Message(0, "# %i #### DEFENDER SE_CombatStability(259) Worn Bonus", itembonuses.CombatStability);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_CombatStability(259) Worn Bonus", itembonuses.CombatStability);
 
-			GM->Message(0, "# %.2f #### DEFENDER Base Soft Cap", softcap);
+			GM->Message(Chat::White, "# %.2f #### DEFENDER Base Soft Cap", softcap);
 		}
 
 		float monkweight = RuleI(Combat, MonkACBonusWeight);
@@ -287,11 +287,11 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 				armor = ac_override;
 			
 			if (Msg >=2 ){
-				GM->Message(0, "# %i #### DEFENDER AC Equiped/Worn Bonus", itembonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER SE_ArmorClass(1) AA Bonus", aabonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER SE_ArmorClass(1) Spell Bonus", spellbonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER Shield AC", shield_ac);
-				GM->Message(0, "# %i #### DEFENDER Total Client Armor - NO shield", armor);
+				GM->Message(Chat::White, "# %i #### DEFENDER AC Equiped/Worn Bonus", itembonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_ArmorClass(1) AA Bonus", aabonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_ArmorClass(1) Spell Bonus", spellbonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER Shield AC", shield_ac);
+				GM->Message(Chat::White, "# %i #### DEFENDER Total Client Armor - NO shield", armor);
 			}
 			
 		} else if (IsNPC()) {
@@ -301,9 +301,9 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 				armor = ac_override;
 
 			if (Msg >=2 ){
-				GM->Message(0, "# %i #### DEFENDER AC Equiped/Worn Bonus", itembonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER SE_ArmorClass(1) Spell Bonus", spellbonuses.AC);
-				GM->Message(0, "# %i #### DEFENDER NPC AC Stat", CastToNPC()->GetRawAC());
+				GM->Message(Chat::White, "# %i #### DEFENDER AC Equiped/Worn Bonus", itembonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_ArmorClass(1) Spell Bonus", spellbonuses.AC);
+				GM->Message(Chat::White, "# %i #### DEFENDER NPC AC Stat", CastToNPC()->GetRawAC());
 			}
 
 			int PetACBonus = 0;
@@ -311,7 +311,7 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 			if (!IsPet()){
 				armor = (armor / RuleR(Combat, NPCACFactor));
 				if (Msg >=2 )
-					GM->Message(0, "# %i #### DEFENDER NPC Armor after RuleR(Combat, NPCACFactor) %.2f", armor, RuleR(Combat, NPCACFactor));
+					GM->Message(Chat::White, "# %i #### DEFENDER NPC Armor after RuleR(Combat, NPCACFactor) %.2f", armor, RuleR(Combat, NPCACFactor));
 			}
 
 			Mob *owner = nullptr;
@@ -325,18 +325,18 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 
 				if (Msg >=2 ){
 				if (owner->aabonuses.PetMeleeMitigation)
-					GM->Message(0, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) AA Bonus", owner->aabonuses.PetMeleeMitigation);
+					GM->Message(Chat::White, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) AA Bonus", owner->aabonuses.PetMeleeMitigation);
 				if (owner->spellbonuses.PetMeleeMitigation)
-					GM->Message(0, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) Spell Bonus",owner->spellbonuses.PetMeleeMitigation);
+					GM->Message(Chat::White, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) Spell Bonus",owner->spellbonuses.PetMeleeMitigation);
 				if (owner->itembonuses.PetMeleeMitigation)
-					GM->Message(0, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) Worn Bonus", owner->itembonuses.PetMeleeMitigation);
+					GM->Message(Chat::White, "# %i #### DEFENDER Pet Owner SE_PetMeleeMitigation(379) Worn Bonus", owner->itembonuses.PetMeleeMitigation);
 				}
 			}
 
 			armor += spellbonuses.AC + itembonuses.AC + PetACBonus + 1;
 
 			if (Msg >= 2)
-				GM->Message(0, "# %i #### DEFENDER NPC Total Base Armor",armor);
+				GM->Message(Chat::White, "# %i #### DEFENDER NPC Total Base Armor",armor);
 		}
 
 		if (opts) {
@@ -405,38 +405,38 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 			
 			armor = softcap + softcap_armor;
 			if (Msg >= 2)
-				GM->Message(0, "# %i #### DEFENDER Final Armor [Soft Cap %i Soft Cap Armor %i]",armor, softcap,softcap_armor);
+				GM->Message(Chat::White, "# %i #### DEFENDER Final Armor [Soft Cap %i Soft Cap Armor %i]",armor, softcap,softcap_armor);
 		}
 		int tmp_armor = armor;
 		if (GetClass() == WIZARD || GetClass() == MAGICIAN ||
 				GetClass() == NECROMANCER || GetClass() == ENCHANTER){
 			mitigation_rating = ((GetSkill(EQEmu::skills::SkillDefense) + itembonuses.HeroicAGI / 10) / 4.0) + armor + 1;
 			if (Msg >= 2)
-				GM->Message(0, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI);
+				GM->Message(Chat::White, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI);
 		}
 		else{
 			mitigation_rating = ((GetSkill(EQEmu::skills::SkillDefense) + itembonuses.HeroicAGI / 10) / 3.0) + (armor * 1.333333) + 1;
 			if (Msg >= 2)
-				GM->Message(0, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI);
+				GM->Message(Chat::White, "# + %.2f #### DEFENDER Armor Bonus [Defense Skill %i Heroic Agi %i]", mitigation_rating - tmp_armor, GetSkill(EQEmu::skills::SkillDefense), itembonuses.HeroicAGI);
 
 		}
 		mitigation_rating *= 0.847;
 
 		if (Msg >= 1)
-			GM->Message(0, "# %.2f #### DEFENDER Final Mitigation Rating", mitigation_rating);
+			GM->Message(Chat::White, "# %.2f #### DEFENDER Final Mitigation Rating", mitigation_rating);
 
 		
 		if (Msg >= 2){
-			GM->Message(0, " ");
-			GM->Message(0, "### Mitigation Bonus Effects ###"); 
+			GM->Message(Chat::White, " ");
+			GM->Message(Chat::White, "### Mitigation Bonus Effects ###");
 			if (itembonuses.MeleeMitigation)
-				GM->Message(0, "# %i #### DEFENDER Item Mod2 Shielding", itembonuses.MeleeMitigation);
+				GM->Message(Chat::White, "# %i #### DEFENDER Item Mod2 Shielding", itembonuses.MeleeMitigation);
 			if (aabonuses.MeleeMitigationEffect)
-				GM->Message(0, "# %i #### DEFENDER SE_MeleeMitigation(168) AA Bonus", aabonuses.MeleeMitigationEffect);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_MeleeMitigation(168) AA Bonus", aabonuses.MeleeMitigationEffect);
 			if (spellbonuses.MeleeMitigationEffect)
-				GM->Message(0, "# %i #### DEFENDER SE_MeleeMitigation(168) Spell Bonus", spellbonuses.MeleeMitigationEffect);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_MeleeMitigation(168) Spell Bonus", spellbonuses.MeleeMitigationEffect);
 			if (itembonuses.MeleeMitigationEffect)
-				GM->Message(0, "# %i #### DEFENDER SE_MeleeMitigation(168) Worn Bonus", itembonuses.MeleeMitigationEffect);
+				GM->Message(Chat::White, "# %i #### DEFENDER SE_MeleeMitigation(168) Worn Bonus", itembonuses.MeleeMitigationEffect);
 		}
 
 		mitigation_rating = mod_mitigation_rating(mitigation_rating, attacker);
@@ -458,31 +458,31 @@ int32 Mob::Tune_MeleeMitigation(Mob* GM, Mob *attacker, int32 damage, int32 minh
 		attack_rating = attacker->mod_attack_rating(attack_rating, this);
 
 		if (Msg >= 2){
-			GM->Message(0, " "); 
-			GM->Message(0, "### Calculate Attack Rating ###"); 
+			GM->Message(Chat::White, " ");
+			GM->Message(Chat::White, "### Calculate Attack Rating ###");
 			if (attacker->IsClient()){
-				GM->Message(0, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER SE_ATK(2) AA Bonus", attacker->aabonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER Leadership Bonus", attacker->CastToClient()->GroupLeadershipAAOffenseEnhancement());
-				GM->Message(0, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
-				GM->Message(0, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR());
-				GM->Message(0, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense));
+				GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER SE_ATK(2) AA Bonus", attacker->aabonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER Leadership Bonus", attacker->CastToClient()->GroupLeadershipAAOffenseEnhancement());
+				GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
+				GM->Message(Chat::White, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR());
+				GM->Message(Chat::White, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense));
 			}
 				
 			else{
-				GM->Message(0, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK);
-				GM->Message(0, "# %i #### ATTACKER NPC ATK Stat", attacker->CastToNPC()->ATK);
-				GM->Message(0, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR());
-				GM->Message(0, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense));
+				GM->Message(Chat::White, "# %i #### ATTACKER Worn/Equip ATK Bonus", attacker->itembonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER SE_ATK(2) spell Bonus", attacker->spellbonuses.ATK);
+				GM->Message(Chat::White, "# %i #### ATTACKER NPC ATK Stat", attacker->CastToNPC()->ATK);
+				GM->Message(Chat::White, "# %.2f #### ATTACKER Strength Stat ATK Bonus [Stat Amt: %i]", ((attacker->GetSTR()-66) * 0.9),attacker->GetSTR());
+				GM->Message(Chat::White, "# %.2f #### ATTACKER Offensive Skill ATK Bonus [Stat Amt: %i]", (attacker->GetSkill(EQEmu::skills::SkillOffense)*1.345), attacker->GetSkill(EQEmu::skills::SkillOffense));
 			}
 		}
 
 		if (Msg >= 1){
-			GM->Message(0, "# %.2f #### ATTACKER Final Attack Rating", attack_rating);
-			GM->Message(0, "######### Melee Mitigation Report: Complete #########", Msg);
+			GM->Message(Chat::White, "# %.2f #### ATTACKER Final Attack Rating", attack_rating);
+			GM->Message(Chat::White, "######### Melee Mitigation Report: Complete #########", Msg);
 		}
 
 
@@ -693,7 +693,7 @@ void Mob::Tune_FindAccuaryByHitChance(Mob* defender, Mob *attacker, float hit_ch
 		tmp_hit_chance = Tune_CheckHitChance(defender, attacker, skillinuse, EQEmu::invslot::slotPrimary, 0, false, 0, avoid_override, add_acc);
 
 		if (Msg >= 3)
-			Message(15, "#Tune - Processing... [%i] [ACCURACY %i] Hit Chance %.2f ",j,add_acc,tmp_hit_chance);
+			Message(Chat::Yellow, "#Tune - Processing... [%i] [ACCURACY %i] Hit Chance %.2f ",j,add_acc,tmp_hit_chance);
 
 		if (interval > 0 && tmp_hit_chance >= hit_chance){
 			end = true;
@@ -727,8 +727,8 @@ void Mob::Tune_FindAccuaryByHitChance(Mob* defender, Mob *attacker, float hit_ch
 		add_acc = add_acc + interval;
 	}
 
-	Message(7, "#Tune - Error: Unable to find desired result for (%.0f) pct - Increase interval (%i) AND/OR max loop value (%i) and run again.", hit_chance, interval, max_loop);
-	Message(7, "#Tune - Parse ended at ACCURACY ADJUSTMENTT ( %i ) at hit chance of (%.0f) / (%.0f) pct.",add_acc,tmp_hit_chance / hit_chance);
+	Message(Chat::LightGray, "#Tune - Error: Unable to find desired result for (%.0f) pct - Increase interval (%i) AND/OR max loop value (%i) and run again.", hit_chance, interval, max_loop);
+	Message(Chat::LightGray, "#Tune - Parse ended at ACCURACY ADJUSTMENTT ( %i ) at hit chance of (%.0f) / (%.0f) pct.",add_acc,tmp_hit_chance / hit_chance);
 }
 
 void Mob::Tune_FindAvoidanceByHitChance(Mob* defender, Mob *attacker, float hit_chance, int interval, int max_loop, int acc_override, int Msg)
diff --git a/zone/water_map.cpp b/zone/water_map.cpp
index 9c51e3056..ec5575f24 100644
--- a/zone/water_map.cpp
+++ b/zone/water_map.cpp
@@ -10,34 +10,58 @@
 #include <stdio.h>
 #include <string.h>
 
+/**
+ * @param name
+ * @return
+ */
+inline bool file_exists(const std::string& name) {
+	std::ifstream f(name.c_str());
+	return f.good();
+}
+
+/**
+ * @param zone_name
+ * @return
+ */
 WaterMap* WaterMap::LoadWaterMapfile(std::string zone_name) {
 	std::transform(zone_name.begin(), zone_name.end(), zone_name.begin(), ::tolower);
-		
-	std::string file_path = Config->MapDir + "water/" + zone_name + std::string(".wtr");
-	Log(Logs::General, Logs::Debug, "Attempting to load water map with path %s", file_path.c_str());
+
+	std::string filename;
+	if (file_exists("maps")) {
+		filename = "maps";
+	}
+	else if (file_exists("Maps")) {
+		filename = "Maps";
+	}
+	else {
+		filename = Config->MapDir;
+	}
+
+	std::string file_path = filename + "/water/" + zone_name + std::string(".wtr");
+	LogDebug("Attempting to load water map with path [{}]", file_path.c_str());
 	FILE *f = fopen(file_path.c_str(), "rb");
 	if(f) {
 		char magic[10];
 		uint32 version;
 		if(fread(magic, 10, 1, f) != 1) {
-			Log(Logs::General, Logs::Debug, "Failed to load water map, error reading magic string in header.");
+			LogDebug("Failed to load water map, error reading magic string in header");
 			fclose(f);
 			return nullptr;
 		}
 		
 		if(strncmp(magic, "EQEMUWATER", 10)) {
-			Log(Logs::General, Logs::Debug, "Failed to load water map, bad magic string in header.");
+			LogDebug("Failed to load water map, bad magic string in header");
 			fclose(f);
 			return nullptr;
 		}
 		
 		if(fread(&version, sizeof(version), 1, f) != 1) {
-			Log(Logs::General, Logs::Debug, "Failed to load water map, error reading version.");
+			LogDebug("Failed to load water map, error reading version");
 			fclose(f);
 			return nullptr;
 		}
 		
-		Log(Logs::General, Logs::Debug, "Attempting to V%u load water map %s.", version, file_path.c_str());
+		LogDebug("Attempting to V[{}] load water map [{}]", version, file_path.c_str());
 		if(version == 1) {
 			auto wm = new WaterMapV1();
 			if(!wm->Load(f)) {
@@ -45,7 +69,7 @@ WaterMap* WaterMap::LoadWaterMapfile(std::string zone_name) {
 				wm = nullptr;
 			}
 
-			Log(Logs::General, Logs::Status, "Loaded Water Map V%u file %s", version, file_path.c_str());
+			LogInfo("Loaded Water Map V[{}] file [{}]", version, file_path.c_str());
 
 			fclose(f);
 			return wm;
@@ -56,17 +80,17 @@ WaterMap* WaterMap::LoadWaterMapfile(std::string zone_name) {
 				wm = nullptr;
 			}
 
-			Log(Logs::General, Logs::Status, "Loaded Water Map V%u file %s", version, file_path.c_str());
+			LogInfo("Loaded Water Map V[{}] file [{}]", version, file_path.c_str());
 
 			fclose(f);
 			return wm;
 		} else {
-			Log(Logs::General, Logs::Debug, "Failed to load water map, unsupported version V%u.", version);
+			LogDebug("Failed to load water map, unsupported version V[{}]", version);
 			fclose(f);
 			return nullptr;
 		}
 	}
 	
-	Log(Logs::General, Logs::Debug, "Failed to load water map, could not open file for reading %s.", file_path.c_str());
+	LogDebug("Failed to load water map, could not open file for reading [{}]", file_path.c_str());
 	return nullptr;
 }
diff --git a/zone/waypoints.cpp b/zone/waypoints.cpp
index fb0a85490..b6033744c 100644
--- a/zone/waypoints.cpp
+++ b/zone/waypoints.cpp
@@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/string_util.h"
 #include "../common/misc_functions.h"
 #include "../common/eqemu_logsys.h"
-#include "../common/eqemu_logsys_fmt.h"
 
 #include "map.h"
 #include "npc.h"
@@ -57,7 +56,16 @@ void NPC::AI_SetRoambox(float max_distance, float roam_distance_variance, uint32
 	);
 }
 
-void NPC::AI_SetRoambox(float distance, float max_x, float min_x, float max_y, float min_y, uint32 delay, uint32 min_delay) {
+void NPC::AI_SetRoambox(
+	float distance,
+	float max_x,
+	float min_x,
+	float max_y,
+	float min_y,
+	uint32 delay,
+	uint32 min_delay
+)
+{
 	roambox_distance      = distance;
 	roambox_max_x         = max_x;
 	roambox_min_x         = min_x;
@@ -70,18 +78,18 @@ void NPC::AI_SetRoambox(float distance, float max_x, float min_x, float max_y, f
 
 void NPC::DisplayWaypointInfo(Client *c) {
 
-	c->Message(0, "Mob is on grid %d, in spawn group %d, on waypoint %d/%d",
-		GetGrid(),
-		GetSp2(),
-		GetCurWp(),
-		GetMaxWp());
+	c->Message(Chat::White, "Mob is on grid %d, in spawn group %d, on waypoint %d/%d",
+			   GetGrid(),
+			   GetSpawnGroupId(),
+			   GetCurWp(),
+			   GetMaxWp());
 
 
 	std::vector<wplist>::iterator cur, end;
 	cur = Waypoints.begin();
 	end = Waypoints.end();
 	for (; cur != end; ++cur) {
-		c->Message(0, "Waypoint %d: (%.2f,%.2f,%.2f,%.2f) pause %d",
+		c->Message(Chat::White, "Waypoint %d: (%.2f,%.2f,%.2f,%.2f) pause %d",
 			cur->index,
 			cur->x,
 			cur->y,
@@ -96,7 +104,7 @@ void NPC::StopWandering()
 	roamer = false;
 	CastToNPC()->SetGrid(0);
 	StopNavigation();
-	Log(Logs::Detail, Logs::Pathing, "Stop Wandering requested.");
+	LogPathing("Stop Wandering requested");
 	return;
 }
 
@@ -115,16 +123,16 @@ void NPC::ResumeWandering()
 				cur_wp = save_wp;
 				UpdateWaypoint(cur_wp);	// have him head to last destination from here
 			}
-			Log(Logs::Detail, Logs::Pathing, "Resume Wandering requested. Grid %d, wp %d", GetGrid(), cur_wp);
+			LogPathing("Resume Wandering requested. Grid [{}], wp [{}]", GetGrid(), cur_wp);
 		}
 		else if (AI_walking_timer->Enabled())
 		{	// we are at a waypoint paused normally
-			Log(Logs::Detail, Logs::Pathing, "Resume Wandering on timed pause. Grid %d, wp %d", GetGrid(), cur_wp);
+			LogPathing("Resume Wandering on timed pause. Grid [{}], wp [{}]", GetGrid(), cur_wp);
 			AI_walking_timer->Trigger();	// disable timer to end pause now
 		}
 		else
 		{
-			Log(Logs::General, Logs::Error, "NPC not paused - can't resume wandering: %lu", (unsigned long)GetNPCTypeID());
+			LogError("NPC not paused - can't resume wandering: [{}]", (unsigned long)GetNPCTypeID());
 			return;
 		}
 
@@ -139,7 +147,7 @@ void NPC::ResumeWandering()
 	}
 	else
 	{
-		Log(Logs::General, Logs::Error, "NPC not on grid - can't resume wandering: %lu", (unsigned long)GetNPCTypeID());
+		LogError("NPC not on grid - can't resume wandering: [{}]", (unsigned long)GetNPCTypeID());
 	}
 	return;
 }
@@ -151,7 +159,7 @@ void NPC::PauseWandering(int pausetime)
 	if (GetGrid() != 0) {
 		moving = false;
 		DistractedFromGrid = true;
-		Log(Logs::Detail, Logs::Pathing, "Paused Wandering requested. Grid %d. Resuming in %d ms (0=not until told)", GetGrid(), pausetime);
+		LogPathing("Paused Wandering requested. Grid [{}]. Resuming in [{}] seconds (0=not until told)", GetGrid(), pausetime);
 		StopNavigation();
 		if (pausetime < 1) {	// negative grid number stops him dead in his tracks until ResumeWandering()
 			SetGrid(0 - GetGrid());
@@ -161,7 +169,7 @@ void NPC::PauseWandering(int pausetime)
 		}
 	}
 	else {
-		Log(Logs::General, Logs::Error, "NPC not on grid - can't pause wandering: %lu", (unsigned long)GetNPCTypeID());
+		LogError("NPC not on grid - can't pause wandering: [{}]", (unsigned long)GetNPCTypeID());
 	}
 	return;
 }
@@ -171,19 +179,14 @@ void NPC::MoveTo(const glm::vec4 &position, bool saveguardspot)
 	if (IsNPC() && GetGrid() != 0) {    // he is on a grid
 		if (GetGrid() < 0) {    // currently stopped by a quest command
 			SetGrid(0 - GetGrid());    // get him moving again
-			Log(Logs::Detail,
-				Logs::AI,
-				"MoveTo during quest wandering. Canceling quest wandering and going back to grid %d when MoveTo is done.",
-				GetGrid());
+			LogAI("MoveTo during quest wandering. Canceling quest wandering and going back to grid [{}] when MoveTo is done", GetGrid());
 		}
 		AI_walking_timer->Disable();    // disable timer in case he is paused at a wp
 		if (cur_wp >= 0) {    // we've not already done a MoveTo()
 			save_wp = cur_wp;    // save the current waypoint
 			cur_wp  = EQEmu::WaypointStatus::QuestControlGrid;
 		}
-		Log(Logs::Detail,
-			Logs::AI,
-			"MoveTo %s, pausing regular grid wandering. Grid %d, save_wp %d",
+		LogAI("MoveTo [{}], pausing regular grid wandering. Grid [{}], save_wp [{}]",
 			to_string(static_cast<glm::vec3>(position)).c_str(),
 			-GetGrid(),
 			save_wp);
@@ -192,7 +195,7 @@ void NPC::MoveTo(const glm::vec4 &position, bool saveguardspot)
 		roamer  = true;
 		save_wp = 0;
 		cur_wp  = EQEmu::WaypointStatus::QuestControlNoGrid;
-		Log(Logs::Detail, Logs::AI, "MoveTo %s without a grid.", to_string(static_cast<glm::vec3>(position)).c_str());
+		LogAI("MoveTo [{}] without a grid", to_string(static_cast<glm::vec3>(position)).c_str());
 	}
 
 	glm::vec3 dest(position);
@@ -210,10 +213,7 @@ void NPC::MoveTo(const glm::vec4 &position, bool saveguardspot)
 		if (m_GuardPoint.w == -1)
 			m_GuardPoint.w = this->CalculateHeadingToTarget(position.x, position.y);
 
-		Log(Logs::Detail,
-			Logs::AI,
-			"Setting guard position to %s",
-			to_string(static_cast<glm::vec3>(m_GuardPoint)).c_str());
+		LogAI("Setting guard position to [{}]", to_string(static_cast<glm::vec3>(m_GuardPoint)).c_str());
 	}
 
 	cur_wp_pause        = 0;
@@ -226,7 +226,7 @@ void NPC::MoveTo(const glm::vec4 &position, bool saveguardspot)
 void NPC::UpdateWaypoint(int wp_index)
 {
 	if (wp_index >= static_cast<int>(Waypoints.size())) {
-		Log(Logs::Detail, Logs::AI, "Update to waypoint %d failed. Not found.", wp_index);
+		LogAI("Update to waypoint [{}] failed. Not found", wp_index);
 		return;
 	}
 	std::vector<wplist>::iterator cur;
@@ -235,7 +235,7 @@ void NPC::UpdateWaypoint(int wp_index)
 
 	m_CurrentWayPoint = glm::vec4(cur->x, cur->y, cur->z, cur->heading);
 	cur_wp_pause = cur->pause;
-	Log(Logs::Detail, Logs::AI, "Next waypoint %d: (%.3f, %.3f, %.3f, %.3f)", wp_index, m_CurrentWayPoint.x, m_CurrentWayPoint.y, m_CurrentWayPoint.z, m_CurrentWayPoint.w);
+	LogAI("Next waypoint [{}]: ({}, {}, {}, {})", wp_index, m_CurrentWayPoint.x, m_CurrentWayPoint.y, m_CurrentWayPoint.z, m_CurrentWayPoint.w);
 
 }
 
@@ -423,7 +423,7 @@ void NPC::SaveGuardSpot(const glm::vec4 &pos)
 
 	if (m_GuardPoint.w == 0)
 		m_GuardPoint.w = 0.0001;		//hack to make IsGuarding simpler
-	LogF(Logs::Detail, Logs::AI, "Setting guard position to {0}", to_string(static_cast<glm::vec3>(m_GuardPoint)));
+	LogAI("Setting guard position to {0}", to_string(static_cast<glm::vec3>(m_GuardPoint)));
 }
 
 void NPC::NextGuardPosition() {
@@ -557,7 +557,7 @@ void Mob::SendTo(float new_x, float new_y, float new_z) {
 	m_Position.x = new_x;
 	m_Position.y = new_y;
 	m_Position.z = new_z;
-	Log(Logs::Detail, Logs::AI, "Sent To (%.3f, %.3f, %.3f)", new_x, new_y, new_z);
+	LogAI("Sent To ({}, {}, {})", new_x, new_y, new_z);
 
 	if (flymode == GravityBehavior::Flying)
 		return;
@@ -573,7 +573,7 @@ void Mob::SendTo(float new_x, float new_y, float new_z) {
 
 			float newz = zone->zonemap->FindBestZ(dest, nullptr);
 
-			Log(Logs::Detail, Logs::AI, "BestZ returned %4.3f at %4.3f, %4.3f, %4.3f", newz, m_Position.x, m_Position.y, m_Position.z);
+			LogAI("BestZ returned {} at {}, {}, {}", newz, m_Position.x, m_Position.y, m_Position.z);
 
 			if ((newz > -2000) && std::abs(newz - dest.z) < RuleR(Map, FixPathingZMaxDeltaSendTo)) // Sanity check.
 				m_Position.z = newz + 1;
@@ -601,7 +601,7 @@ void Mob::SendToFixZ(float new_x, float new_y, float new_z) {
 
 			float newz = zone->zonemap->FindBestZ(dest, nullptr);
 
-			Log(Logs::Moderate, Logs::Pathing, "BestZ returned %4.3f at %4.3f, %4.3f, %4.3f", newz, m_Position.x, m_Position.y, m_Position.z);
+			LogPathing("BestZ returned [{}] at [{}], [{}], [{}]", newz, m_Position.x, m_Position.y, m_Position.z);
 
 			if ((newz > -2000) && std::abs(newz - dest.z) < RuleR(Map, FixPathingZMaxDeltaSendTo)) // Sanity check.
 				m_Position.z = newz + 1;
@@ -637,9 +637,7 @@ float Mob::GetFixedZ(const glm::vec3 &destination, int32 z_find_offset) {
 
 		auto duration = timer.elapsed();
 
-		Log(Logs::Moderate,
-			Logs::FixZ,
-			"Mob::GetFixedZ() (%s) returned %4.3f at %4.3f, %4.3f, %4.3f - Took %lf",
+		LogFixZ("Mob::GetFixedZ() ([{}]) returned [{}] at [{}], [{}], [{}] - Took [{}]",
 			this->GetCleanName(),
 			new_z,
 			destination.x,
@@ -682,11 +680,7 @@ void Mob::FixZ(int32 z_find_offset /*= 5*/, bool fix_client_z /*= false*/) {
 			this->SendAppearanceEffect(103, 0, 0, 0, 0);
 		}
 
-		Log(Logs::General,
-			Logs::FixZ,
-			"%s is failing to find Z %f",
-			this->GetCleanName(),
-			std::abs(m_Position.z - new_z));
+		LogFixZ("[{}] is failing to find Z [{}]", this->GetCleanName(), std::abs(m_Position.z - new_z));
 	}
 }
 
@@ -895,7 +889,7 @@ void ZoneDatabase::AssignGrid(Client *client, int grid, int spawn2id) {
 		return;
 	}
 
-	client->Message(0, "Grid assign: spawn2 id = %d updated", spawn2id);
+	client->Message(Chat::White, "Grid assign: spawn2 id = %d updated", spawn2id);
 }
 
 
diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp
index 94be0eb14..a5180963d 100644
--- a/zone/worldserver.cpp
+++ b/zone/worldserver.cpp
@@ -44,7 +44,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "quest_parser_collection.h"
 #include "guild_mgr.h"
 #include "mob.h"
-#include "net.h"
 #include "petitions.h"
 #include "raids.h"
 #include "string_ids.h"
@@ -59,7 +58,6 @@ extern Zone* zone;
 extern volatile bool is_zone_loaded;
 extern void CatchSignal(int);
 extern WorldServer worldserver;
-extern NetConnection net;
 extern PetitionList petition_list;
 extern uint32 numclients;
 extern volatile bool RunLoops;
@@ -85,6 +83,8 @@ void WorldServer::Connect()
 	});
 
 	m_connection->OnMessage(std::bind(&WorldServer::HandleMessage, this, std::placeholders::_1, std::placeholders::_2));
+
+	m_keepalive.reset(new EQ::Timer(2500, true, std::bind(&WorldServer::OnKeepAlive, this, std::placeholders::_1)));
 }
 
 bool WorldServer::SendPacket(ServerPacket *pack)
@@ -191,7 +191,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		if (pack->size != sizeof(ServerConnectInfo))
 			break;
 		ServerConnectInfo* sci = (ServerConnectInfo*)pack->pBuffer;
-		Log(Logs::Detail, Logs::Zone_Server, "World assigned Port: %d for this zone.", sci->port);
+		LogInfo("World assigned Port: [{}] for this zone", sci->port);
 		ZoneConfig::SetZonePort(sci->port);
 		break;
 	}
@@ -211,7 +211,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 					else if (scm->queued == 2) // tell queue was full
 						client->Tell_StringID(QUEUE_TELL_FULL, scm->to, scm->message);
 					else if (scm->queued == 3) // person was offline
-						client->Message_StringID(MT_TellEcho, TOLD_NOT_ONLINE, scm->to);
+						client->MessageString(Chat::EchoTell, TOLD_NOT_ONLINE, scm->to);
 					else // normal tell echo "You told Soanso, 'something'"
 							// tell echo doesn't use language, so it looks normal to you even if nobody can understand your tells
 						client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, 0, 100, scm->message);
@@ -374,15 +374,15 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 			switch (ztz->response)
 			{
 			case -2: {
-				entity->CastToClient()->Message(13, "You do not own the required locations to enter this zone.");
+				entity->CastToClient()->Message(Chat::Red, "You do not own the required locations to enter this zone.");
 				break;
 			}
 			case -1: {
-				entity->CastToClient()->Message(13, "The zone is currently full, please try again later.");
+				entity->CastToClient()->Message(Chat::Red, "The zone is currently full, please try again later.");
 				break;
 			}
 			case 0: {
-				entity->CastToClient()->Message(13, "All zone servers are taken at this time, please try again later.");
+				entity->CastToClient()->Message(Chat::Red, "All zone servers are taken at this time, please try again later.");
 				break;
 			}
 			}
@@ -414,7 +414,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 			Client* client = entity_list.GetClientByID(wars->id);
 			if (client) {
 				if (pack->size == 64)//no results
-					client->Message_StringID(0, WHOALL_NO_RESULTS);
+					client->MessageString(Chat::White, WHOALL_NO_RESULTS);
 				else {
 					auto outapp = new EQApplicationPacket(OP_WhoAllResponse, pack->size);
 					memcpy(outapp->pBuffer, pack->pBuffer, pack->size);
@@ -423,12 +423,12 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				}
 			}
 			else {
-				Log(Logs::Detail, Logs::None, "[CLIENT] id=%i, playerineqstring=%i, playersinzonestring=%i. Dumping WhoAllReturnStruct:",
+				LogDebug("[CLIENT] id=[{}], playerineqstring=[{}], playersinzonestring=[{}]. Dumping WhoAllReturnStruct:",
 					wars->id, wars->playerineqstring, wars->playersinzonestring);
 			}
 		}
 		else
-			Log(Logs::General, Logs::Error, "WhoAllReturnStruct: Could not get return struct!");
+			LogError("WhoAllReturnStruct: Could not get return struct!");
 		break;
 	}
 	case ServerOP_EmoteMessage: {
@@ -534,7 +534,15 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		ServerZoneIncomingClient_Struct* szic = (ServerZoneIncomingClient_Struct*)pack->pBuffer;
 		if (is_zone_loaded) {
 			SetZoneData(zone->GetZoneID(), zone->GetInstanceID());
+
 			if (szic->zoneid == zone->GetZoneID()) {
+				auto client = entity_list.GetClientByLSID(szic->lsid);
+				if (client) {
+					client->Kick("Dropped by world CLE subsystem");
+					client->Save();
+				}
+
+				zone->RemoveAuth(szic->lsid);
 				zone->AddAuth(szic);
 				// This packet also doubles as "incoming client" notification, lets not shut down before they get here
 				zone->StartShutdownTimer(AUTHENTICATION_TIMEOUT * 1000);
@@ -547,13 +555,30 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		}
 		break;
 	}
+	case ServerOP_DropClient: {
+		if (pack->size != sizeof(ServerZoneDropClient_Struct)) {
+			break;
+		}
+
+		ServerZoneDropClient_Struct* drop = (ServerZoneDropClient_Struct*)pack->pBuffer;
+		if (zone) {
+			zone->RemoveAuth(drop->lsid);
+
+			auto client = entity_list.GetClientByLSID(drop->lsid);
+			if (client) {
+				client->Kick("Dropped by world CLE subsystem");
+				client->Save();
+			}
+		}
+		break;
+	}
 	case ServerOP_ZonePlayer: {
 		ServerZonePlayer_Struct* szp = (ServerZonePlayer_Struct*)pack->pBuffer;
 		Client* client = entity_list.GetClientByName(szp->name);
 		printf("Zoning %s to %s(%u) - %u\n", client != nullptr ? client->GetCleanName() : "Unknown", szp->zone, database.GetZoneID(szp->zone), szp->instance_id);
 		if (client != 0) {
 			if (strcasecmp(szp->adminname, szp->name) == 0)
-				client->Message(0, "Zoning to: %s", szp->zone);
+				client->Message(Chat::White, "Zoning to: %s", szp->zone);
 			else if (client->GetAnon() == 1 && client->Admin() > szp->adminrank)
 				break;
 			else {
@@ -722,7 +747,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				//pendingrezexp is the amount of XP on the corpse. Setting it to a value >= 0
 				//also serves to inform Client::OPRezzAnswer to expect a packet.
 				client->SetPendingRezzData(srs->exp, srs->dbid, srs->rez.spellid, srs->rez.corpse_name);
-				Log(Logs::Detail, Logs::Spells, "OP_RezzRequest in zone %s for %s, spellid:%i",
+				LogSpells("OP_RezzRequest in zone [{}] for [{}], spellid:[{}]",
 					zone->GetShortName(), client->GetName(), srs->rez.spellid);
 				auto outapp = new EQApplicationPacket(OP_RezzRequest,
 					sizeof(Resurrect_Struct));
@@ -737,10 +762,10 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 			// to the zone that the corpse is in.
 			Corpse* corpse = entity_list.GetCorpseByName(srs->rez.corpse_name);
 			if (corpse && corpse->IsCorpse()) {
-				Log(Logs::Detail, Logs::Spells, "OP_RezzComplete received in zone %s for corpse %s",
+				LogSpells("OP_RezzComplete received in zone [{}] for corpse [{}]",
 					zone->GetShortName(), srs->rez.corpse_name);
 
-				Log(Logs::Detail, Logs::Spells, "Found corpse. Marking corpse as rezzed if needed.");
+				LogSpells("Found corpse. Marking corpse as rezzed if needed");
 				// I don't know why Rezzed is not set to true in CompleteRezz().
 				if (!IsEffectInSpell(srs->rez.spellid, SE_SummonToCorpse)) {
 					corpse->IsRezzed(true);
@@ -758,7 +783,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		Client* c = entity_list.GetClientByName(Rezzer);
 
 		if (c)
-			c->Message_StringID(MT_WornOff, REZZ_ALREADY_PENDING);
+			c->MessageString(Chat::SpellWornOff, REZZ_ALREADY_PENDING);
 
 		break;
 	}
@@ -769,7 +794,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 	}
 	case ServerOP_SyncWorldTime: {
 		if (zone != 0 && !zone->is_zone_time_localized) {
-			Log(Logs::Moderate, Logs::Zone_Server, "%s Received Message SyncWorldTime", __FUNCTION__);
+			LogInfo("[{}] Received Message SyncWorldTime", __FUNCTION__);
 
 			eqTimeOfDay* newtime = (eqTimeOfDay*)pack->pBuffer;
 			zone->zone_time.SetCurrentEQTimeOfDay(newtime->start_eqtime, newtime->start_realtime);
@@ -791,18 +816,18 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				(eq_time.hour >= 13) ? "pm" : "am"
 				);
 
-			Log(Logs::General, Logs::Zone_Server, "Time Broadcast Packet: %s", time_message);
+			LogInfo("Time Broadcast Packet: {}", time_message);
 			zone->SetZoneHasCurrentTime(true);
 
 		}
 		if (zone && zone->is_zone_time_localized) {
-			Log(Logs::General, Logs::Zone_Server, "Received request to sync time from world, but our time is localized currently");
+			LogInfo("Received request to sync time from world, but our time is localized currently");
 		}
 		break;
 	}
 	case ServerOP_RefreshCensorship: {
 		if (!EQEmu::ProfanityManager::LoadProfanityList(&database))
-			Log(Logs::General, Logs::Error, "Received request to refresh the profanity list..but, the action failed");
+			LogError("Received request to refresh the profanity list..but, the action failed");
 		break;
 	}
 	case ServerOP_ChangeWID: {
@@ -885,7 +910,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 				entity_list.AddGroup(group);
 
 				if (group->GetID() == 0) {
-					Inviter->Message(13, "Unable to get new group id. Cannot create group.");
+					Inviter->Message(Chat::Red, "Unable to get new group id. Cannot create group.");
 					break;
 				}
 
@@ -1411,7 +1436,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		if (NewCorpse)
 			NewCorpse->Spawn();
 		else
-			Log(Logs::General, Logs::Error, "Unable to load player corpse id %u for zone %s.", s->player_corpse_id, zone->GetShortName());
+			LogError("Unable to load player corpse id [{}] for zone [{}]", s->player_corpse_id, zone->GetShortName());
 
 		break;
 	}
@@ -1460,7 +1485,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer;
 		Client* client = entity_list.GetClientByName(s->ownername);
 		if (client) {
-			client->Message_StringID(0, s->message_string_id);
+			client->MessageString(Chat::White, s->message_string_id);
 		}
 		break;
 	}
@@ -1704,7 +1729,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		if (c)
 		{
 			c->ClearPendingAdventureDoorClick();
-			c->Message_StringID(13, 5141);
+			c->MessageString(Chat::Red, 5141);
 		}
 		break;
 	}
@@ -1726,7 +1751,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		if (c)
 		{
 			c->ClearPendingAdventureLeave();
-			c->Message(13, "You cannot leave this adventure at this time.");
+			c->Message(Chat::Red, "You cannot leave this adventure at this time.");
 		}
 		break;
 	}
@@ -1781,8 +1806,8 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 		worldserver.SendEmoteMessage(
 			0, 0, 100, 15,
 			"Rules reloaded for Zone: '%s' Instance ID: %u",
-			zone->GetLongName(),
-			zone->GetInstanceID()
+			(zone ? zone->GetLongName() : StringFormat("Null zone pointer [pid]:[%i]", getpid()).c_str()),
+			(zone ? zone->GetInstanceID() : 0xFFFFFFFFF)
 		);
 		RuleManager::Instance()->LoadRules(&database, RuleManager::Instance()->GetActiveRuleset(), true);
 		break;
@@ -1917,34 +1942,34 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
 	case ServerOP_ChangeSharedMem:
 	{
 		std::string hotfix_name = std::string((char*)pack->pBuffer);
-		Log(Logs::General, Logs::Zone_Server, "Loading items");
+		LogInfo("Loading items");
 		if (!database.LoadItems(hotfix_name)) {
-			Log(Logs::General, Logs::Error, "Loading items FAILED!");
+			LogError("Loading items failed!");
 		}
 
-		Log(Logs::General, Logs::Zone_Server, "Loading npc faction lists");
+		LogInfo("Loading npc faction lists");
 		if (!database.LoadNPCFactionLists(hotfix_name)) {
-			Log(Logs::General, Logs::Error, "Loading npcs faction lists FAILED!");
+			LogError("Loading npcs faction lists failed!");
 		}
 
-		Log(Logs::General, Logs::Zone_Server, "Loading loot tables");
+		LogInfo("Loading loot tables");
 		if (!database.LoadLoot(hotfix_name)) {
-			Log(Logs::General, Logs::Error, "Loading loot FAILED!");
+			LogError("Loading loot failed!");
 		}
 
-		Log(Logs::General, Logs::Zone_Server, "Loading skill caps");
+		LogInfo("Loading skill caps");
 		if (!database.LoadSkillCaps(std::string(hotfix_name))) {
-			Log(Logs::General, Logs::Error, "Loading skill caps FAILED!");
+			LogError("Loading skill caps failed!");
 		}
 
-		Log(Logs::General, Logs::Zone_Server, "Loading spells");
+		LogInfo("Loading spells");
 		if (!database.LoadSpells(hotfix_name, &SPDAT_RECORDS, &spells)) {
-			Log(Logs::General, Logs::Error, "Loading spells FAILED!");
+			LogError("Loading spells failed!");
 		}
 
-		Log(Logs::General, Logs::Zone_Server, "Loading base data");
+		LogInfo("Loading base data");
 		if (!database.LoadBaseData(hotfix_name)) {
-			Log(Logs::General, Logs::Error, "Loading base data FAILED!");
+			LogError("Loading base data failed!");
 		}
 		break;
 	}
@@ -2078,7 +2103,7 @@ bool WorldServer::SendVoiceMacro(Client* From, uint32 Type, char* Target, uint32
 
 bool WorldServer::RezzPlayer(EQApplicationPacket* rpack, uint32 rezzexp, uint32 dbid, uint16 opcode)
 {
-	Log(Logs::Detail, Logs::Spells, "WorldServer::RezzPlayer rezzexp is %i (0 is normal for RezzComplete", rezzexp);
+	LogSpells("WorldServer::RezzPlayer rezzexp is [{}] (0 is normal for RezzComplete", rezzexp);
 	auto pack = new ServerPacket(ServerOP_RezzPlayer, sizeof(RezzPlayer_Struct));
 	RezzPlayer_Struct* sem = (RezzPlayer_Struct*)pack->pBuffer;
 	sem->rezzopcode = opcode;
@@ -2087,9 +2112,9 @@ bool WorldServer::RezzPlayer(EQApplicationPacket* rpack, uint32 rezzexp, uint32
 	sem->dbid = dbid;
 	bool ret = SendPacket(pack);
 	if (ret)
-		Log(Logs::Detail, Logs::Spells, "Sending player rezz packet to world spellid:%i", sem->rez.spellid);
+		LogSpells("Sending player rezz packet to world spellid:[{}]", sem->rez.spellid);
 	else
-		Log(Logs::Detail, Logs::Spells, "NOT Sending player rezz packet to world");
+		LogSpells("NOT Sending player rezz packet to world");
 
 	safe_delete(pack);
 	return ret;
@@ -2165,7 +2190,7 @@ uint32 WorldServer::NextGroupID() {
 	if (cur_groupid >= last_groupid) {
 		//this is an error... This means that 50 groups were created before
 		//1 packet could make the zone->world->zone trip... so let it error.
-		Log(Logs::General, Logs::Error, "Ran out of group IDs before the server sent us more.");
+		LogError("Ran out of group IDs before the server sent us more");
 		return(0);
 	}
 	if (cur_groupid > (last_groupid - /*50*/995)) {
@@ -2327,3 +2352,9 @@ void WorldServer::RequestTellQueue(const char *who)
 	safe_delete(pack);
 	return;
 }
+
+void WorldServer::OnKeepAlive(EQ::Timer *t)
+{
+	ServerPacket pack(ServerOP_KeepAlive, 0);
+	SendPacket(&pack);
+}
diff --git a/zone/worldserver.h b/zone/worldserver.h
index 4c1b9ab12..1eee0b948 100644
--- a/zone/worldserver.h
+++ b/zone/worldserver.h
@@ -72,7 +72,10 @@ private:
 	uint32 cur_groupid;
 	uint32 last_groupid;
 
+	void OnKeepAlive(EQ::Timer *t);
+
 	std::unique_ptr<EQ::Net::ServertalkClient> m_connection;
+	std::unique_ptr<EQ::Timer> m_keepalive;
 };
 #endif
 
diff --git a/zone/zone.cpp b/zone/zone.cpp
index 88b0253a2..b88ddd071 100755
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -39,7 +39,6 @@
 
 #include "guild_mgr.h"
 #include "map.h"
-#include "net.h"
 #include "npc.h"
 #include "object.h"
 #include "pathfinder_null.h"
@@ -55,6 +54,7 @@
 #include "zone_config.h"
 #include "mob_movement_manager.h"
 #include "npc_scale_manager.h"
+#include "../common/data_verification.h"
 
 #include <time.h>
 #include <ctime>
@@ -67,7 +67,6 @@
 #endif
 
 extern bool staticzone;
-extern NetConnection net;
 extern PetitionList petition_list;
 extern QuestParserCollection* parse;
 extern uint32 numclients;
@@ -80,6 +79,8 @@ Mutex MZoneShutdown;
 volatile bool is_zone_loaded = false;
 Zone* zone = 0;
 
+void UpdateWindowTitle(char* iNewTitle);
+
 bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 	const char* zonename = database.GetZoneName(iZoneID);
 
@@ -91,7 +92,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Booting %s (%d:%d)", zonename, iZoneID, iInstanceID);
+	LogInfo("Booting [{}] ([{}]:[{}])", zonename, iZoneID, iInstanceID);
 
 	numclients = 0;
 	zone = new Zone(iZoneID, iInstanceID, zonename);
@@ -116,13 +117,13 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 					log_levels[i]=0; //set to zero on a bogue char
 			}
 			zone->loglevelvar = log_levels[0];
-			Log(Logs::General, Logs::Status, "General logging level: %i", zone->loglevelvar);
+			LogInfo("General logging level: [{}]", zone->loglevelvar);
 			zone->merchantvar = log_levels[1];
-			Log(Logs::General, Logs::Status, "Merchant logging level: %i", zone->merchantvar);
+			LogInfo("Merchant logging level: [{}]", zone->merchantvar);
 			zone->tradevar = log_levels[2];
-			Log(Logs::General, Logs::Status, "Trade logging level: %i", zone->tradevar);
+			LogInfo("Trade logging level: [{}]", zone->tradevar);
 			zone->lootvar = log_levels[3];
-			Log(Logs::General, Logs::Status, "Loot logging level: %i", zone->lootvar);
+			LogInfo("Loot logging level: [{}]", zone->lootvar);
 		}
 		else {
 			zone->loglevelvar = uint8(tmp_i); //continue supporting only command logging (for now)
@@ -143,10 +144,10 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 		delete pack;
 	}
 
-	Log(Logs::General, Logs::Normal, "---- Zone server %s, listening on port:%i ----", zonename, ZoneConfig::get()->ZonePort);
-	Log(Logs::General, Logs::Status, "Zone Bootup: %s (%i: %i)", zonename, iZoneID, iInstanceID);
+	LogInfo("---- Zone server [{}], listening on port:[{}] ----", zonename, ZoneConfig::get()->ZonePort);
+	LogInfo("Zone Bootup: [{}] ([{}]: [{}])", zonename, iZoneID, iInstanceID);
 	parse->Init();
-	UpdateWindowTitle();
+	UpdateWindowTitle(nullptr);
 	zone->GetTimeSync();
 
 	zone->RequestUCSServerStatus();
@@ -175,12 +176,12 @@ bool Zone::LoadZoneObjects()
 			 zoneid, instanceversion);
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error Loading Objects from DB: %s",
+		LogError("Error Loading Objects from DB: [{}]",
 			results.ErrorMessage().c_str());
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loading Objects from DB...");
+	LogInfo("Loading Objects from DB");
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		if (atoi(row[9]) == 0) {
 			// Type == 0 - Static Object
@@ -299,7 +300,7 @@ bool Zone::LoadGroundSpawns() {
 
 	memset(&groundspawn, 0, sizeof(groundspawn));
 	int gsindex=0;
-	Log(Logs::General, Logs::Status, "Loading Ground Spawns from DB...");
+	LogInfo("Loading Ground Spawns from DB");
 	database.LoadGroundSpawns(zoneid, GetInstanceVersion(), &groundspawn);
 	uint32 ix=0;
 	char* name = nullptr;
@@ -418,7 +419,7 @@ uint32 Zone::GetTempMerchantQuantity(uint32 NPCID, uint32 Slot) {
 }
 
 void Zone::LoadTempMerchantData() {
-	Log(Logs::General, Logs::Status, "Loading Temporary Merchant Lists...");
+	LogInfo("Loading Temporary Merchant Lists");
 	std::string query = StringFormat(
 		"SELECT								   "
 		"DISTINCT ml.npcid,					   "
@@ -488,7 +489,7 @@ void Zone::LoadNewMerchantData(uint32 merchantid) {
 }
 
 void Zone::GetMerchantDataForZoneLoad() {
-	Log(Logs::General, Logs::Status, "Loading Merchant Lists...");
+	LogInfo("Loading Merchant Lists");
 	std::string query = StringFormat(												   
 		"SELECT																		   "
 		"DISTINCT ml.merchantid,													   "
@@ -511,7 +512,7 @@ void Zone::GetMerchantDataForZoneLoad() {
 	std::map<uint32, std::list<MerchantList> >::iterator cur;
 	uint32 npcid = 0;
 	if (results.RowCount() == 0) {
-		Log(Logs::General, Logs::None, "No Merchant Data found for %s.", GetShortName());
+		LogDebug("No Merchant Data found for [{}]", GetShortName());
 		return;
 	}
 	for (auto row = results.begin(); row != results.end(); ++row) {
@@ -559,18 +560,18 @@ void Zone::LoadMercTemplates(){
 	merc_templates.clear();
     std::string query = "SELECT `class_id`, `proficiency_id`, `stance_id`, `isdefault` FROM "
                         "`merc_stance_entries` ORDER BY `class_id`, `proficiency_id`, `stance_id`";
-    auto results = database.QueryDatabase(query);
+	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error in ZoneDatabase::LoadMercTemplates()");
+		LogError("Error in ZoneDatabase::LoadMercTemplates()");
 	}
 	else {
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			MercStanceInfo tempMercStanceInfo;
 
-			tempMercStanceInfo.ClassID = atoi(row[0]);
+			tempMercStanceInfo.ClassID       = atoi(row[0]);
 			tempMercStanceInfo.ProficiencyID = atoi(row[1]);
-			tempMercStanceInfo.StanceID = atoi(row[2]);
-			tempMercStanceInfo.IsDefault = atoi(row[3]);
+			tempMercStanceInfo.StanceID      = atoi(row[2]);
+			tempMercStanceInfo.IsDefault     = atoi(row[3]);
 
 			merc_stances.push_back(tempMercStanceInfo);
 		}
@@ -582,11 +583,11 @@ void Zone::LoadMercTemplates(){
             "AS CostFormula, MTem.clientversion, MTem.merc_npc_type_id "
             "FROM merc_types MTyp, merc_templates MTem, merc_subtypes MS "
             "WHERE MTem.merc_type_id = MTyp.merc_type_id AND MTem.merc_subtype_id = MS.merc_subtype_id "
-            "ORDER BY MTyp.race_id, MS.class_id, MTyp.proficiency_id;";
-    results = database.QueryDatabase(query);
-    if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "Error in ZoneDatabase::LoadMercTemplates()");
-        return;
+			"ORDER BY MTyp.race_id, MS.class_id, MTyp.proficiency_id;";
+	results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		LogError("Error in ZoneDatabase::LoadMercTemplates()");
+		return;
 	}
 
     for (auto row = results.begin(); row != results.end(); ++row) {
@@ -629,7 +630,7 @@ void Zone::LoadLevelEXPMods(){
     const std::string query = "SELECT level, exp_mod, aa_exp_mod FROM level_exp_mods";
     auto results = database.QueryDatabase(query);
     if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "Error in ZoneDatabase::LoadEXPLevelMods()");
+    LogError("Error in ZoneDatabase::LoadEXPLevelMods()");
         return;
     }
 
@@ -651,11 +652,11 @@ void Zone::LoadMercSpells(){
                             "FROM merc_spell_lists msl, merc_spell_list_entries msle "
                             "WHERE msle.merc_spell_list_id = msl.merc_spell_list_id "
                             "ORDER BY msl.class_id, msl.proficiency_id, msle.spell_type, msle.minlevel, msle.slot;";
-    auto results = database.QueryDatabase(query);
-    if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "Error in Zone::LoadMercSpells()");
-        return;
-    }
+	auto results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		LogError("Error in Zone::LoadMercSpells()");
+		return;
+	}
 
     for (auto row = results.begin(); row != results.end(); ++row) {
         uint32 classid;
@@ -682,68 +683,75 @@ bool Zone::IsLoaded() {
 	return is_zone_loaded;
 }
 
-void Zone::Shutdown(bool quite)
+void Zone::Shutdown(bool quiet)
 {
-	if (!is_zone_loaded)
+	if (!is_zone_loaded) {
 		return;
+	}
 
 	entity_list.StopMobAI();
 
-	std::map<uint32,NPCType *>::iterator itr;
-	while(!zone->npctable.empty()) {
-		itr=zone->npctable.begin();
+	std::map<uint32, NPCType *>::iterator itr;
+	while (!zone->npctable.empty()) {
+		itr = zone->npctable.begin();
 		delete itr->second;
 		zone->npctable.erase(itr);
 	}
 
-	while(!zone->merctable.empty()) {
-		itr=zone->merctable.begin();
+	while (!zone->merctable.empty()) {
+		itr = zone->merctable.begin();
 		delete itr->second;
 		zone->merctable.erase(itr);
 	}
 
 	zone->adventure_entry_list_flavor.clear();
 
-	std::map<uint32,LDoNTrapTemplate*>::iterator itr4;
-	while(!zone->ldon_trap_list.empty())
-	{
+	std::map<uint32, LDoNTrapTemplate *>::iterator itr4;
+	while (!zone->ldon_trap_list.empty()) {
 		itr4 = zone->ldon_trap_list.begin();
 		delete itr4->second;
 		zone->ldon_trap_list.erase(itr4);
 	}
 	zone->ldon_trap_entry_list.clear();
 
-	Log(Logs::General, Logs::Status, "Zone Shutdown: %s (%i)", zone->GetShortName(), zone->GetZoneID());
+	LogInfo("Zone Shutdown: [{}] ([{}])", zone->GetShortName(), zone->GetZoneID());
 	petition_list.ClearPetitions();
 	zone->SetZoneHasCurrentTime(false);
-	if (!quite)
-		Log(Logs::General, Logs::Normal, "Zone shutdown: going to sleep");
+	if (!quiet) {
+		LogInfo("Zone Shutdown: Going to sleep");
+	}
+
 	is_zone_loaded = false;
 
 	zone->ResetAuth();
 	safe_delete(zone);
 	entity_list.ClearAreas();
 	parse->ReloadQuests(true);
-	UpdateWindowTitle();
+	UpdateWindowTitle(nullptr);
 
 	LogSys.CloseFileLogs();
+
+	if (RuleB(Zone, KillProcessOnDynamicShutdown)) {
+		LogInfo("[KillProcessOnDynamicShutdown] Shutting down");
+		std::exit(EXIT_SUCCESS);
+	}
 }
 
 void Zone::LoadZoneDoors(const char* zone, int16 version)
 {
-	Log(Logs::General, Logs::Status, "Loading doors for %s ...", zone);
+	LogInfo("Loading doors for [{}] ", zone);
 
 	uint32 maxid;
 	int32 count = database.GetDoorsCount(&maxid, zone, version);
 	if(count < 1) {
-		Log(Logs::General, Logs::Status, "... No doors loaded.");
+		LogInfo("No doors loaded");
 		return;
 	}
 
 	auto dlist = new Door[count];
 
 	if(!database.LoadDoors(count, dlist, zone, version)) {
-		Log(Logs::General, Logs::Error, "... Failed to load doors.");
+		LogError("Failed to load doors");
 		delete[] dlist;
 		return;
 	}
@@ -804,14 +812,14 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 	database.GetZoneLongName(short_name, &long_name, file_name, &m_SafePoint.x, &m_SafePoint.y, &m_SafePoint.z, &pgraveyard_id, &pMaxClients);
 	if(graveyard_id() > 0)
 	{
-		Log(Logs::General, Logs::None, "Graveyard ID is %i.", graveyard_id());
+		LogDebug("Graveyard ID is [{}]", graveyard_id());
 		bool GraveYardLoaded = database.GetZoneGraveyard(graveyard_id(), &pgraveyard_zoneid, &m_Graveyard.x, &m_Graveyard.y, &m_Graveyard.z, &m_Graveyard.w);
 		
 		if (GraveYardLoaded) {
-			Log(Logs::General, Logs::None, "Loaded a graveyard for zone %s: graveyard zoneid is %u at %s.", short_name, graveyard_zoneid(), to_string(m_Graveyard).c_str());
+			LogDebug("Loaded a graveyard for zone [{}]: graveyard zoneid is [{}] at [{}]", short_name, graveyard_zoneid(), to_string(m_Graveyard).c_str());
 		}
 		else {
-			Log(Logs::General, Logs::Error, "Unable to load the graveyard id %i for zone %s.", graveyard_id(), short_name);
+			LogError("Unable to load the graveyard id [{}] for zone [{}]", graveyard_id(), short_name);
 		}
 	}
 	if (long_name == 0) {
@@ -820,12 +828,12 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 	autoshutdown_timer.Start(AUTHENTICATION_TIMEOUT * 1000, false);
 	Weather_Timer = new Timer(60000);
 	Weather_Timer->Start();
-	Log(Logs::General, Logs::None, "The next weather check for zone: %s will be in %i seconds.", short_name, Weather_Timer->GetRemainingTime()/1000);
-	zone_weather = 0;
-	weather_intensity = 0;
-	blocked_spells = nullptr;
-	totalBS = 0;
-	zone_has_current_time = false;
+	LogDebug("The next weather check for zone: [{}] will be in [{}] seconds", short_name, Weather_Timer->GetRemainingTime()/1000);
+	zone_weather              = 0;
+	weather_intensity         = 0;
+	blocked_spells            = nullptr;
+	zone_total_blocked_spells = 0;
+	zone_has_current_time     = false;
 
 	Instance_Shutdown_Timer = nullptr;
 	bool is_perma = false;
@@ -864,6 +872,8 @@ Zone::Zone(uint32 in_zoneid, uint32 in_instanceid, const char* in_short_name)
 	m_last_ucss_update = 0;
 
 	mMovementManager = &MobMovementManager::Get();
+
+	SetNpcPositionUpdateDistance(0);
 }
 
 Zone::~Zone() {
@@ -912,64 +922,64 @@ bool Zone::Init(bool iStaticZone) {
 	zone->watermap = WaterMap::LoadWaterMapfile(zone->map_name);
 	zone->pathing  = IPathfinder::Load(zone->map_name);
 
-	Log(Logs::General, Logs::Status, "Loading spawn conditions...");
+	LogInfo("Loading spawn conditions");
 	if(!spawn_conditions.LoadSpawnConditions(short_name, instanceid)) {
-		Log(Logs::General, Logs::Error, "Loading spawn conditions failed, continuing without them.");
+		LogError("Loading spawn conditions failed, continuing without them");
 	}
 
-	Log(Logs::General, Logs::Status, "Loading static zone points...");
+	LogInfo("Loading static zone points");
 	if (!database.LoadStaticZonePoints(&zone_point_list, short_name, GetInstanceVersion())) {
-		Log(Logs::General, Logs::Error, "Loading static zone points failed.");
+		LogError("Loading static zone points failed");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loading spawn groups...");
+	LogInfo("Loading spawn groups");
 	if (!database.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) {
-		Log(Logs::General, Logs::Error, "Loading spawn groups failed.");
+		LogError("Loading spawn groups failed");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loading spawn2 points...");
+	LogInfo("Loading spawn2 points");
 	if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion()))
 	{
-		Log(Logs::General, Logs::Error, "Loading spawn2 points failed.");
+		LogError("Loading spawn2 points failed");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loading player corpses...");
+	LogInfo("Loading player corpses");
 	if (!database.LoadCharacterCorpses(zoneid, instanceid)) {
-		Log(Logs::General, Logs::Error, "Loading player corpses failed.");
+		LogError("Loading player corpses failed");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loading traps...");
+	LogInfo("Loading traps");
 	if (!database.LoadTraps(short_name, GetInstanceVersion()))
 	{
-		Log(Logs::General, Logs::Error, "Loading traps failed.");
+		LogError("Loading traps failed");
 		return false;
 	}
 
-	Log(Logs::General, Logs::Status, "Loading adventure flavor text...");
+	LogInfo("Loading adventure flavor text");
 	LoadAdventureFlavor();
 
-	Log(Logs::General, Logs::Status, "Loading ground spawns...");
+	LogInfo("Loading ground spawns");
 	if (!LoadGroundSpawns())
 	{
-		Log(Logs::General, Logs::Error, "Loading ground spawns failed. continuing.");
+		LogError("Loading ground spawns failed. continuing");
 	}
 
-	Log(Logs::General, Logs::Status, "Loading World Objects from DB...");
+	LogInfo("Loading World Objects from DB");
 	if (!LoadZoneObjects())
 	{
-		Log(Logs::General, Logs::Error, "Loading World Objects failed. continuing.");
+		LogError("Loading World Objects failed. continuing");
 	}
 
-	Log(Logs::General, Logs::Status, "Flushing old respawn timers...");
+	LogInfo("Flushing old respawn timers");
 	database.QueryDatabase("DELETE FROM `respawn_times` WHERE (`start` + `duration`) < UNIX_TIMESTAMP(NOW())");
 
 	//load up the zone's doors (prints inside)
 	zone->LoadZoneDoors(zone->GetShortName(), zone->GetInstanceVersion());
-	zone->LoadBlockedSpells(zone->GetZoneID());
+	zone->LoadZoneBlockedSpells(zone->GetZoneID());
 
 	//clear trader items if we are loading the bazaar
 	if(strncasecmp(short_name,"bazaar",6)==0) {
@@ -1005,10 +1015,10 @@ bool Zone::Init(bool iStaticZone) {
 	petition_list.ClearPetitions();
 	petition_list.ReadDatabase();
 
-	Log(Logs::General, Logs::Status, "Loading timezone data...");
+	LogInfo("Loading timezone data");
 	zone->zone_time.setEQTimeZone(database.GetZoneTZ(zoneid, GetInstanceVersion()));
 
-	Log(Logs::General, Logs::Status, "Init Finished: ZoneID = %d, Time Offset = %d", zoneid, zone->zone_time.getEQTimeZone());
+	LogInfo("Init Finished: ZoneID = [{}], Time Offset = [{}]", zoneid, zone->zone_time.getEQTimeZone());
 
 	LoadTickItems();
 
@@ -1019,32 +1029,32 @@ bool Zone::Init(bool iStaticZone) {
 }
 
 void Zone::ReloadStaticData() {
-	Log(Logs::General, Logs::Status, "Reloading Zone Static Data...");
+	LogInfo("Reloading Zone Static Data");
 
-	Log(Logs::General, Logs::Status, "Reloading static zone points...");
+	LogInfo("Reloading static zone points");
 	zone_point_list.Clear();
 	if (!database.LoadStaticZonePoints(&zone_point_list, GetShortName(), GetInstanceVersion())) {
-		Log(Logs::General, Logs::Error, "Loading static zone points failed.");
+		LogError("Loading static zone points failed");
 	}
 
-	Log(Logs::General, Logs::Status, "Reloading traps...");
+	LogInfo("Reloading traps");
 	entity_list.RemoveAllTraps();
 	if (!database.LoadTraps(GetShortName(), GetInstanceVersion()))
 	{
-		Log(Logs::General, Logs::Error, "Reloading traps failed.");
+		LogError("Reloading traps failed");
 	}
 
-	Log(Logs::General, Logs::Status, "Reloading ground spawns...");
+	LogInfo("Reloading ground spawns");
 	if (!LoadGroundSpawns())
 	{
-		Log(Logs::General, Logs::Error, "Reloading ground spawns failed. continuing.");
+		LogError("Reloading ground spawns failed. continuing");
 	}
 
 	entity_list.RemoveAllObjects();
-	Log(Logs::General, Logs::Status, "Reloading World Objects from DB...");
+	LogInfo("Reloading World Objects from DB");
 	if (!LoadZoneObjects())
 	{
-		Log(Logs::General, Logs::Error, "Reloading World Objects failed. continuing.");
+		LogError("Reloading World Objects failed. continuing");
 	}
 
 	entity_list.RemoveAllDoors();
@@ -1060,7 +1070,7 @@ void Zone::ReloadStaticData() {
 	if (!LoadZoneCFG(zone->GetShortName(), zone->GetInstanceVersion())) // try loading the zone name...
 		LoadZoneCFG(zone->GetFileName(), zone->GetInstanceVersion()); // if that fails, try the file name, then load defaults
 
-	Log(Logs::General, Logs::Status, "Zone Static Data Reloaded.");
+	LogInfo("Zone Static Data Reloaded");
 }
 
 bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id)
@@ -1079,7 +1089,7 @@ bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id)
 			if(!database.GetZoneCFG(database.GetZoneID(filename), 0, &newzone_data, can_bind, can_combat, can_levitate, 
 				can_castoutdoor, is_city, is_hotzone, allow_mercs, max_movement_update_range, zone_type, default_ruleset, &map_name))
 				{
-				Log(Logs::General, Logs::Error, "Error loading the Zone Config.");
+				LogError("Error loading the Zone Config");
 				return false;
 				}
 		}
@@ -1090,7 +1100,7 @@ bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id)
 	strcpy(newzone_data.zone_long_name, GetLongName());
 	strcpy(newzone_data.zone_short_name2, GetShortName());
 
-	Log(Logs::General, Logs::Status, "Successfully loaded Zone Config.");
+	LogInfo("Successfully loaded Zone Config");
 	return true;
 }
 
@@ -1106,6 +1116,7 @@ void Zone::AddAuth(ServerZoneIncomingClient_Struct* szic) {
 	zca->accid = szic->accid;
 	zca->admin = szic->admin;
 	zca->charid = szic->charid;
+	zca->lsid = szic->lsid;
 	zca->tellsoff = szic->tellsoff;
 	strn0cpy(zca->charname, szic->charname, sizeof(zca->charname));
 	strn0cpy(zca->lskey, szic->lskey, sizeof(zca->lskey));
@@ -1113,16 +1124,31 @@ void Zone::AddAuth(ServerZoneIncomingClient_Struct* szic) {
 	client_auth_list.Insert(zca);
 }
 
-void Zone::RemoveAuth(const char* iCharName)
+void Zone::RemoveAuth(const char* iCharName, const char* iLSKey)
 {
 	LinkedListIterator<ZoneClientAuth_Struct*> iterator(client_auth_list);
 
 	iterator.Reset();
 	while (iterator.MoreElements()) {
 		ZoneClientAuth_Struct* zca = iterator.GetData();
-		if (strcasecmp(zca->charname, iCharName) == 0) {
-		iterator.RemoveCurrent();
-		return;
+		if (strcasecmp(zca->charname, iCharName) == 0 && strcasecmp(zca->lskey, iLSKey) == 0) {
+			iterator.RemoveCurrent();
+			return;
+		}
+		iterator.Advance();
+	}
+}
+
+void Zone::RemoveAuth(uint32 lsid)
+{
+	LinkedListIterator<ZoneClientAuth_Struct*> iterator(client_auth_list);
+
+	iterator.Reset();
+	while (iterator.MoreElements()) {
+		ZoneClientAuth_Struct* zca = iterator.GetData();
+		if (zca->lsid == lsid) {
+			iterator.RemoveCurrent();
+			continue;
 		}
 		iterator.Advance();
 	}
@@ -1178,13 +1204,13 @@ uint32 Zone::CountAuth() {
 bool Zone::Process() {
 	spawn_conditions.Process();
 
-	if(spawn2_timer.Check()) {
+	if (spawn2_timer.Check()) {
 
-		LinkedListIterator<Spawn2*> iterator(spawn2_list);
+		LinkedListIterator<Spawn2 *> iterator(spawn2_list);
 
 		EQEmu::InventoryProfile::CleanDirty();
 
-		Log(Logs::Detail, Logs::Spawns, "Running Zone::Process -> Spawn2::Process");
+		LogSpawns("Running Zone::Process -> Spawn2::Process");
 
 		iterator.Reset();
 		while (iterator.MoreElements()) {
@@ -1196,10 +1222,15 @@ bool Zone::Process() {
 			}
 		}
 
-		if(adv_data && !did_adventure_actions)
+		if (adv_data && !did_adventure_actions) {
 			DoAdventureActions();
+		}
 
+		if (GetNpcPositionUpdateDistance() == 0) {
+			CalculateNpcUpdateDistanceSpread();
+		}
 	}
+
 	if(initgrids_timer.Check()) {
 		//delayed grid loading stuff.
 		initgrids_timer.Disable();
@@ -1399,11 +1430,11 @@ void Zone::ChangeWeather()
 			weathertimer = weatherTimerRule*1000;
 			Weather_Timer->Start(weathertimer);
 		}
-		Log(Logs::General, Logs::None, "The next weather check for zone: %s will be in %i seconds.", zone->GetShortName(), Weather_Timer->GetRemainingTime()/1000);
+		LogDebug("The next weather check for zone: [{}] will be in [{}] seconds", zone->GetShortName(), Weather_Timer->GetRemainingTime()/1000);
 	}
 	else
 	{
-		Log(Logs::General, Logs::None, "The weather for zone: %s has changed. Old weather was = %i. New weather is = %i The next check will be in %i seconds. Rain chance: %i, Rain duration: %i, Snow chance %i, Snow duration: %i", zone->GetShortName(), tmpOldWeather, zone_weather,Weather_Timer->GetRemainingTime()/1000,rainchance,rainduration,snowchance,snowduration);
+		LogDebug("The weather for zone: [{}] has changed. Old weather was = [{}]. New weather is = [{}] The next check will be in [{}] seconds. Rain chance: [{}], Rain duration: [{}], Snow chance [{}], Snow duration: [{}]", zone->GetShortName(), tmpOldWeather, zone_weather,Weather_Timer->GetRemainingTime()/1000,rainchance,rainduration,snowchance,snowduration);
 		this->weatherSend();
 		if (zone->weather_intensity == 0)
 		{
@@ -1434,16 +1465,12 @@ void Zone::StartShutdownTimer(uint32 set_time) {
 		if (set_time == (RuleI(Zone, AutoShutdownDelay))) {
 			set_time = static_cast<uint32>(database.getZoneShutDownDelay(GetZoneID(), GetInstanceVersion()));
 		}
+
 		autoshutdown_timer.SetTimer(set_time);
-		Log(Logs::General, Logs::Zone_Server, "Zone::StartShutdownTimer set to %u", set_time);
+		LogDebug("Zone::StartShutdownTimer set to {}", set_time);
 	}
 
-	Log(Logs::Detail, Logs::Zone_Server,
-	    "Zone::StartShutdownTimer trigger - set_time: %u remaining_time: %u diff: %i",
-	    set_time,
-	    autoshutdown_timer.GetRemainingTime(),
-	    (set_time - autoshutdown_timer.GetRemainingTime())
-	);
+	LogDebug("Zone::StartShutdownTimer trigger - set_time: [{}] remaining_time: [{}] diff: [{}]", set_time, autoshutdown_timer.GetRemainingTime(), (set_time - autoshutdown_timer.GetRemainingTime()));
 }
 
 bool Zone::Depop(bool StartSpawnTimer) {
@@ -1461,6 +1488,8 @@ bool Zone::Depop(bool StartSpawnTimer) {
 	// clear spell cache
 	database.ClearNPCSpells();
 
+	zone->spawn_group_list.ReloadSpawnGroups();
+
 	return true;
 }
 
@@ -1502,7 +1531,7 @@ void Zone::RepopClose(const glm::vec4& client_position, uint32 repop_distance)
 	quest_manager.ClearAllTimers();
 
 	if (!database.PopulateZoneSpawnListClose(zoneid, spawn2_list, GetInstanceVersion(), client_position, repop_distance))
-		Log(Logs::General, Logs::None, "Error in Zone::Repop: database.PopulateZoneSpawnList failed");
+		LogDebug("Error in Zone::Repop: database.PopulateZoneSpawnList failed");
 
 	initgrids_timer.Start();
 
@@ -1530,7 +1559,7 @@ void Zone::Repop(uint32 delay)
 	quest_manager.ClearAllTimers();
 
 	if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion(), delay))
-		Log(Logs::General, Logs::None, "Error in Zone::Repop: database.PopulateZoneSpawnList failed");
+		LogDebug("Error in Zone::Repop: database.PopulateZoneSpawnList failed");
 
 	initgrids_timer.Start();
 
@@ -1580,7 +1609,7 @@ void Zone::SetTime(uint8 hour, uint8 minute, bool update_world /*= true*/)
 
 		/* By Default we update worlds time, but we can optionally no update world which updates the rest of the zone servers */
 		if (update_world){
-			Log(Logs::General, Logs::Zone_Server, "Setting master time on world server to: %d:%d (%d)\n", hour, minute, (int)eq_time_of_day->start_realtime);
+			LogInfo("Setting master time on world server to: {}:{} ({})\n", hour, minute, (int)eq_time_of_day->start_realtime);
 			worldserver.SendPacket(pack);
 
 			/* Set Time Localization Flag */
@@ -1589,7 +1618,7 @@ void Zone::SetTime(uint8 hour, uint8 minute, bool update_world /*= true*/)
 		/* When we don't update world, we are localizing ourselves, we become disjointed from normal syncs and set time locally */
 		else{
 
-			Log(Logs::General, Logs::Zone_Server, "Setting zone localized time...");
+			LogInfo("Setting zone localized time...");
 
 			zone->zone_time.SetCurrentEQTimeOfDay(eq_time_of_day->start_eqtime, eq_time_of_day->start_realtime);
 			auto outapp = new EQApplicationPacket(OP_TimeOfDay, sizeof(TimeOfDay_Struct));
@@ -1642,8 +1671,8 @@ ZonePoint* Zone::GetClosestZonePoint(const glm::vec3& location, uint32 to, Clien
 	if ((zone->HasWaterMap() && !zone->watermap->InZoneLine(glm::vec3(client->GetPosition()))) || (!zone->HasWaterMap() && closest_dist > 400.0f && closest_dist < max_distance2))
 	{
 		//TODO cheat detection
-		Log(Logs::General, Logs::Status, "WARNING: Closest zone point for zone id %d is %f, you might need to update your zone_points table if you dont arrive at the right spot.", to, closest_dist);
-		Log(Logs::General, Logs::Status, "<Real Zone Points>. %s", to_string(location).c_str());
+		LogInfo("WARNING: Closest zone point for zone id [{}] is [{}], you might need to update your zone_points table if you dont arrive at the right spot", to, closest_dist);
+		LogInfo("<Real Zone Points>. [{}]", to_string(location).c_str());
 	}
 
 	if(closest_dist > max_distance2)
@@ -1746,14 +1775,14 @@ void Zone::SpawnStatus(Mob* client) {
 	while(iterator.MoreElements())
 	{
 		if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF)
-			client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
+			client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
 		else
-			client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
+			client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
 
 		x++;
 		iterator.Advance();
 	}
-	client->Message(0, "%i spawns listed.", x);
+	client->Message(Chat::White, "%i spawns listed.", x);
 }
 
 void Zone::ShowEnabledSpawnStatus(Mob* client)
@@ -1768,7 +1797,7 @@ void Zone::ShowEnabledSpawnStatus(Mob* client)
 	{
 		if (iterator.GetData()->timer.GetRemainingTime() != 0xFFFFFFFF)
 		{
-			client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
+			client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
 			iEnabledCount++;
 		}
 
@@ -1776,7 +1805,7 @@ void Zone::ShowEnabledSpawnStatus(Mob* client)
 		iterator.Advance();
 	}
 
-	client->Message(0, "%i of %i spawns listed.", iEnabledCount, x);
+	client->Message(Chat::White, "%i of %i spawns listed.", iEnabledCount, x);
 }
 
 void Zone::ShowDisabledSpawnStatus(Mob* client)
@@ -1791,7 +1820,7 @@ void Zone::ShowDisabledSpawnStatus(Mob* client)
 	{
 		if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF)
 		{
-			client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
+			client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
 			iDisabledCount++;
 		}
 
@@ -1799,7 +1828,7 @@ void Zone::ShowDisabledSpawnStatus(Mob* client)
 		iterator.Advance();
 	}
 
-	client->Message(0, "%i of %i spawns listed.", iDisabledCount, x);
+	client->Message(Chat::White, "%i of %i spawns listed.", iDisabledCount, x);
 }
 
 void Zone::ShowSpawnStatusByID(Mob* client, uint32 spawnid)
@@ -1815,9 +1844,9 @@ void Zone::ShowSpawnStatusByID(Mob* client, uint32 spawnid)
 		if (iterator.GetData()->GetID() == spawnid)
 		{
 			if (iterator.GetData()->timer.GetRemainingTime() == 0xFFFFFFFF)
-				client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
+				client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: disabled", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ());
 			else
-				client->Message(0, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
+				client->Message(Chat::White, "  %d: %1.1f, %1.1f, %1.1f: %1.2f", iterator.GetData()->GetID(), iterator.GetData()->GetX(), iterator.GetData()->GetY(), iterator.GetData()->GetZ(), (float)iterator.GetData()->timer.GetRemainingTime() / 1000);
 
 			iSpawnIDCount++;
 
@@ -1829,9 +1858,9 @@ void Zone::ShowSpawnStatusByID(Mob* client, uint32 spawnid)
 	}
 
 	if(iSpawnIDCount > 0)
-		client->Message(0, "%i of %i spawns listed.", iSpawnIDCount, x);
+		client->Message(Chat::White, "%i of %i spawns listed.", iSpawnIDCount, x);
 	else
-		client->Message(0, "No matching spawn id was found in this zone.");
+		client->Message(Chat::White, "No matching spawn id was found in this zone.");
 }
 
 bool ZoneDatabase::GetDecayTimes(npcDecayTimes_Struct *npcCorpseDecayTimes)
@@ -1854,17 +1883,21 @@ bool ZoneDatabase::GetDecayTimes(npcDecayTimes_Struct *npcCorpseDecayTimes)
 	return true;
 }
 
-void Zone::weatherSend(Client* client)
+void Zone::weatherSend(Client *client)
 {
 	auto outapp = new EQApplicationPacket(OP_Weather, 8);
-	if(zone_weather>0)
-		outapp->pBuffer[0] = zone_weather-1;
-	if(zone_weather>0)
+	if (zone_weather > 0) {
+		outapp->pBuffer[0] = zone_weather - 1;
+	}
+	if (zone_weather > 0) {
 		outapp->pBuffer[4] = zone->weather_intensity;
-	if (client)
+	}
+	if (client) {
 		client->QueuePacket(outapp);
-	else
+	}
+	else {
 		entity_list.QueueClients(0, outapp);
+	}
 	safe_delete(outapp);
 }
 
@@ -1882,16 +1915,14 @@ void Zone::SetGraveyard(uint32 zoneid, const glm::vec4& graveyardPosition) {
 	m_Graveyard = graveyardPosition;
 }
 
-void Zone::LoadBlockedSpells(uint32 zoneid)
+void Zone::LoadZoneBlockedSpells(uint32 zone_id)
 {
-	if(!blocked_spells)
-	{
-		totalBS = database.GetBlockedSpellsCount(zoneid);
-		if(totalBS > 0){
-			blocked_spells = new ZoneSpellsBlocked[totalBS];
-			if(!database.LoadBlockedSpells(totalBS, blocked_spells, zoneid))
-			{
-				Log(Logs::General, Logs::Error, "... Failed to load blocked spells.");
+	if (!blocked_spells) {
+		zone_total_blocked_spells = database.GetBlockedSpellsCount(zone_id);
+		if (zone_total_blocked_spells > 0) {
+			blocked_spells = new ZoneSpellsBlocked[zone_total_blocked_spells];
+			if (!database.LoadBlockedSpells(zone_total_blocked_spells, blocked_spells, zone_id)) {
+				LogError(" Failed to load blocked spells");
 				ClearBlockedSpells();
 			}
 		}
@@ -1900,102 +1931,88 @@ void Zone::LoadBlockedSpells(uint32 zoneid)
 
 void Zone::ClearBlockedSpells()
 {
-	if(blocked_spells){
+	if (blocked_spells) {
 		safe_delete_array(blocked_spells);
-		totalBS = 0;
+		zone_total_blocked_spells = 0;
 	}
 }
 
-bool Zone::IsSpellBlocked(uint32 spell_id, const glm::vec3& location)
+bool Zone::IsSpellBlocked(uint32 spell_id, const glm::vec3 &location)
 {
-	if (blocked_spells)
-	{
+	if (blocked_spells) {
 		bool exception = false;
 		bool block_all = false;
-		for (int x = 0; x < totalBS; x++)
-		{
-			if (blocked_spells[x].spellid == spell_id)
-			{
+
+		for (int x = 0; x < GetZoneTotalBlockedSpells(); x++) {
+			if (blocked_spells[x].spellid == spell_id) {
 				exception = true;
 			}
 
-			if (blocked_spells[x].spellid == 0)
-			{
+			if (blocked_spells[x].spellid == 0) {
 				block_all = true;
 			}
 		}
 
-		for (int x = 0; x < totalBS; x++)
-		{
-			// If spellid is 0, block all spells in the zone
-			if (block_all)
-			{
-				// If the same zone has entries other than spellid 0, they act as exceptions and are allowed
-				if (exception)
-				{
-					return false;
-				}
-				else
-				{
-					return true;
-				}
-			}
-			else
-			{
-				if (spell_id != blocked_spells[x].spellid)
-				{
-					continue;
-				}
+		// If all spells are blocked and this is an exception, it is not blocked
+		if (block_all && exception) {
+			return false;
+		}
 
-				switch (blocked_spells[x].type)
-				{
-					case 1:
-					{
+		for (int x = 0; x < GetZoneTotalBlockedSpells(); x++) {
+			// Spellid of 0 matches all spells
+			if (0 != blocked_spells[x].spellid && spell_id != blocked_spells[x].spellid) {
+				continue;
+			}
+
+			switch (blocked_spells[x].type) {
+				case ZoneBlockedSpellTypes::ZoneWide: {
+					return true;
+					break;
+				}
+				case ZoneBlockedSpellTypes::Region: {
+					if (IsWithinAxisAlignedBox(
+						location,
+						blocked_spells[x].m_Location - blocked_spells[x].m_Difference,
+						blocked_spells[x].m_Location + blocked_spells[x].m_Difference
+					)) {
 						return true;
-						break;
-					}
-					case 2:
-					{
-						if (IsWithinAxisAlignedBox(location, blocked_spells[x].m_Location - blocked_spells[x].m_Difference, blocked_spells[x].m_Location + blocked_spells[x].m_Difference))
-							return true;
-						break;
-					}
-					default:
-					{
-						continue;
-						break;
 					}
+					break;
+				}
+				default: {
+					continue;
+					break;
 				}
 			}
 		}
 	}
+
 	return false;
 }
 
-const char* Zone::GetSpellBlockedMessage(uint32 spell_id, const glm::vec3& location)
+const char *Zone::GetSpellBlockedMessage(uint32 spell_id, const glm::vec3 &location)
 {
-	if(blocked_spells)
-	{
-		for(int x = 0; x < totalBS; x++)
-		{
-			if(spell_id != blocked_spells[x].spellid && blocked_spells[x].spellid != 0)
+	if (blocked_spells) {
+		for (int x = 0; x < GetZoneTotalBlockedSpells(); x++) {
+			if (spell_id != blocked_spells[x].spellid && blocked_spells[x].spellid != 0) {
 				continue;
-
-			switch(blocked_spells[x].type)
-			{
-				case 1:
-				{
+			}
+			switch (blocked_spells[x].type) {
+				case ZoneBlockedSpellTypes::ZoneWide: {
 					return blocked_spells[x].message;
 					break;
 				}
-				case 2:
-				{
-					if(IsWithinAxisAlignedBox(location, blocked_spells[x].m_Location - blocked_spells[x].m_Difference, blocked_spells[x].m_Location + blocked_spells[x].m_Difference))
+				case ZoneBlockedSpellTypes::Region: {
+					if (IsWithinAxisAlignedBox(
+						location,
+						blocked_spells[x].m_Location - blocked_spells[x].m_Difference,
+						blocked_spells[x].m_Location + blocked_spells[x].m_Difference
+					)) {
 						return blocked_spells[x].message;
+					}
 					break;
 				}
-				default:
-				{
+				default: {
 					continue;
 					break;
 				}
@@ -2015,21 +2032,21 @@ void Zone::SetInstanceTimer(uint32 new_duration)
 
 void Zone::LoadLDoNTraps()
 {
-	const std::string query = "SELECT id, type, spell_id, skill, locked FROM ldon_trap_templates";
-    auto results = database.QueryDatabase(query);
-    if (!results.Success()) {
+	const std::string query   = "SELECT id, type, spell_id, skill, locked FROM ldon_trap_templates";
+	auto              results = database.QueryDatabase(query);
+	if (!results.Success()) {
 		return;
-    }
+	}
 
-    for (auto row = results.begin();row != results.end(); ++row) {
-	    auto lt = new LDoNTrapTemplate;
-	    lt->id = atoi(row[0]);
-	    lt->type = (LDoNChestTypes)atoi(row[1]);
-	    lt->spell_id = atoi(row[2]);
-	    lt->skill = atoi(row[3]);
-	    lt->locked = atoi(row[4]);
-	    ldon_trap_list[lt->id] = lt;
-    }
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		auto lt = new LDoNTrapTemplate;
+		lt->id       = atoi(row[0]);
+		lt->type     = (LDoNChestTypes) atoi(row[1]);
+		lt->spell_id = atoi(row[2]);
+		lt->skill    = atoi(row[3]);
+		lt->locked   = atoi(row[4]);
+		ldon_trap_list[lt->id] = lt;
+	}
 
 }
 
@@ -2349,3 +2366,59 @@ void Zone::SetUCSServerAvailable(bool ucss_available, uint32 update_timestamp) {
 	if (m_last_ucss_update < update_timestamp)
 		m_ucss_available = ucss_available;
 }
+
+int Zone::GetNpcPositionUpdateDistance() const
+{
+	return npc_position_update_distance;
+}
+
+void Zone::SetNpcPositionUpdateDistance(int in_npc_position_update_distance)
+{
+	Zone::npc_position_update_distance = in_npc_position_update_distance;
+}
+
+void Zone::CalculateNpcUpdateDistanceSpread()
+{
+	float max_x = 0;
+	float max_y = 0;
+	float min_x = 0;
+	float min_y = 0;
+
+	auto &mob_list = entity_list.GetMobList();
+
+	for (auto &it : mob_list) {
+		Mob *entity = it.second;
+		if (!entity->IsNPC()) {
+			continue;
+		}
+
+		if (entity->GetX() <= min_x) {
+			min_x = entity->GetX();
+		}
+
+		if (entity->GetY() <= min_y) {
+			min_y = entity->GetY();
+		}
+
+		if (entity->GetX() >= max_x) {
+			max_x = entity->GetX();
+		}
+
+		if (entity->GetY() >= max_y) {
+			max_y = entity->GetY();
+		}
+	}
+
+	int x_spread        = int(abs(max_x - min_x));
+	int y_spread        = int(abs(max_y - min_y));
+	int combined_spread = int(abs((x_spread + y_spread) / 2));
+	int update_distance = EQEmu::ClampLower(int(combined_spread / 4), int(zone->GetMaxMovementUpdateRange()));
+
+	SetNpcPositionUpdateDistance(update_distance);
+
+	Log(Logs::General, Logs::Debug,
+		"NPC update spread distance set to [%i] combined_spread [%i]",
+		update_distance,
+		combined_spread
+	);
+}
diff --git a/zone/zone.h b/zone/zone.h
index e86fdc339..4ed017627 100755
--- a/zone/zone.h
+++ b/zone/zone.h
@@ -52,6 +52,7 @@ struct ZoneClientAuth_Struct {
 	uint32 accid;
 	int16  admin;
 	uint32 charid;
+	uint32 lsid;
 	bool   tellsoff;
 	char   charname[64];
 	char   lskey[30];
@@ -83,7 +84,7 @@ class MobMovementManager;
 class Zone {
 public:
 	static bool Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone = false);
-	static void Shutdown(bool quite = false);
+	static void Shutdown(bool quiet = false);
 
 	Zone(uint32 in_zoneid, uint32 in_instanceid, const char *in_short_name);
 	~Zone();
@@ -125,6 +126,9 @@ public:
 	bool Process();
 	bool SaveZoneCFG();
 
+	int GetNpcPositionUpdateDistance() const;
+	void SetNpcPositionUpdateDistance(int in_npc_position_update_distance);
+
 	char *adv_data;
 
 	const char *GetSpellBlockedMessage(uint32 spell_id, const glm::vec3 &location);
@@ -158,7 +162,7 @@ public:
 	inline void SetZoneHasCurrentTime(bool time) { zone_has_current_time = time; }
 	inline void ShowNPCGlobalLoot(Client *to, NPC *who) { m_global_loot.ShowNPCGlobalLoot(to, who); }
 	inline void ShowZoneGlobalLoot(Client *to) { m_global_loot.ShowZoneGlobalLoot(to); }
-	int GetTotalBlockedSpells() { return totalBS; }
+	int GetZoneTotalBlockedSpells() { return zone_total_blocked_spells; }
 	int SaveTempItem(uint32 merchantid, uint32 npcid, uint32 item, int32 charges, bool sold = false);
 	int32 MobsAggroCount() { return aggroedmobs; }
 
@@ -218,6 +222,7 @@ public:
 	void ChangeWeather();
 	void ClearBlockedSpells();
 	void ClearNPCTypeCache(int id);
+	void CalculateNpcUpdateDistanceSpread();
 	void DelAggroMob() { aggroedmobs--; }
 	void DeleteQGlobal(std::string name, uint32 npcID, uint32 charID, uint32 zoneID);
 	void Despawn(uint32 spawngroupID);
@@ -229,7 +234,7 @@ public:
 	void LoadAdventureFlavor();
 	void LoadAlternateAdvancement();
 	void LoadAlternateCurrencies();
-	void LoadBlockedSpells(uint32 zoneid);
+	void LoadZoneBlockedSpells(uint32 zone_id);
 	void LoadLDoNTrapEntries();
 	void LoadLDoNTraps();
 	void LoadLevelEXPMods();
@@ -243,7 +248,8 @@ public:
 	void LoadZoneDoors(const char *zone, int16 version);
 	void ReloadStaticData();
 	void ReloadWorld(uint32 Option);
-	void RemoveAuth(const char *iCharName);
+	void RemoveAuth(const char *iCharName, const char *iLSKey);
+	void RemoveAuth(uint32 lsid);
 	void Repop(uint32 delay = 0);
 	void RepopClose(const glm::vec4 &client_position, uint32 repop_distance);
 	void RequestUCSServerStatus();
@@ -288,7 +294,7 @@ public:
 		 */
 		find_replace(message, std::string("%"), std::string("."));
 
-		if (message.find("\n") != std::string::npos) {
+		if (message.find('\n') != std::string::npos) {
 			auto message_split = SplitString(message, '\n');
 			entity_list.MessageStatus(
 				0,
@@ -342,7 +348,8 @@ private:
 	glm::vec3 m_SafePoint;
 	glm::vec4 m_Graveyard;
 	int       default_ruleset;
-	int       totalBS;
+	int       zone_total_blocked_spells;
+	int       npc_position_update_distance;
 	int32     aggroedmobs;
 	uint8     zone_type;
 	uint16    instanceversion;
diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index e2825da5a..d5346877d 100755
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -15,6 +15,7 @@
 
 #include <ctime>
 #include <iostream>
+#include <fmt/format.h>
 
 extern Zone* zone;
 
@@ -204,7 +205,7 @@ bool ZoneDatabase::GetZoneCFG(
 
 	//not in the DB yet:
 	zone_data->gravity = atof(row[56]);
-	Log(Logs::General, Logs::Debug, "Zone Gravity is %f", zone_data->gravity);
+	LogDebug("Zone Gravity is [{}]", zone_data->gravity);
 	allow_mercs = true;
 
 	zone_data->FastRegenHP = atoi(row[57]);
@@ -681,17 +682,20 @@ void ZoneDatabase::GetEventLogs(const char* name,char* target,uint32 account_id,
 void ZoneDatabase::LoadWorldContainer(uint32 parentid, EQEmu::ItemInstance* container)
 {
 	if (!container) {
-		Log(Logs::General, Logs::Error, "Programming error: LoadWorldContainer passed nullptr pointer");
+		LogError("Programming error: LoadWorldContainer passed nullptr pointer");
 		return;
 	}
 
-	std::string query = StringFormat("SELECT bagidx, itemid, charges, augslot1, augslot2, augslot3, augslot4, augslot5, augslot6 "
-                                    "FROM object_contents WHERE parentid = %i", parentid);
-    auto results = QueryDatabase(query);
-    if (!results.Success()) {
-        Log(Logs::General, Logs::Error, "Error in DB::LoadWorldContainer: %s", results.ErrorMessage().c_str());
-        return;
-    }
+	std::string query   = StringFormat(
+		"SELECT bagidx, itemid, charges, augslot1, augslot2, augslot3, augslot4, augslot5, augslot6 "
+		"FROM object_contents WHERE parentid = %i", parentid
+	);
+
+	auto        results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogError("Error in DB::LoadWorldContainer: [{}]", results.ErrorMessage().c_str());
+		return;
+	}
 
     for (auto row = results.begin(); row != results.end(); ++row) {
         uint8 index = (uint8)atoi(row[0]);
@@ -754,7 +758,7 @@ void ZoneDatabase::SaveWorldContainer(uint32 zone_id, uint32 parent_id, const EQ
 										augslot[0], augslot[1], augslot[2], augslot[3], augslot[4], augslot[5]);
         auto results = QueryDatabase(query);
         if (!results.Success())
-            Log(Logs::General, Logs::Error, "Error in ZoneDatabase::SaveWorldContainer: %s", results.ErrorMessage().c_str());
+      LogError("Error in ZoneDatabase::SaveWorldContainer: [{}]", results.ErrorMessage().c_str());
 
     }
 
@@ -766,7 +770,7 @@ void ZoneDatabase::DeleteWorldContainer(uint32 parent_id, uint32 zone_id)
 	std::string query = StringFormat("DELETE FROM object_contents WHERE parentid = %i AND zoneid = %i", parent_id, zone_id);
     auto results = QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::General, Logs::Error, "Error in ZoneDatabase::DeleteWorldContainer: %s", results.ErrorMessage().c_str());
+		LogError("Error in ZoneDatabase::DeleteWorldContainer: [{}]", results.ErrorMessage().c_str());
 
 }
 
@@ -778,14 +782,14 @@ Trader_Struct* ZoneDatabase::LoadTraderItem(uint32 char_id)
 	std::string query = StringFormat("SELECT * FROM trader WHERE char_id = %i ORDER BY slot_id LIMIT 80", char_id);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::Detail, Logs::Trading, "Failed to load trader information!\n");
+		LogTrading("Failed to load trader information!\n");
 		return loadti;
 	}
 
 	loadti->Code = BazaarTrader_ShowItems;
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		if (atoi(row[5]) >= 80 || atoi(row[4]) < 0) {
-			Log(Logs::Detail, Logs::Trading, "Bad Slot number when trying to load trader information!\n");
+			LogTrading("Bad Slot number when trying to load trader information!\n");
 			continue;
 		}
 
@@ -803,13 +807,13 @@ TraderCharges_Struct* ZoneDatabase::LoadTraderItemWithCharges(uint32 char_id)
 	std::string query = StringFormat("SELECT * FROM trader WHERE char_id=%i ORDER BY slot_id LIMIT 80", char_id);
 	auto results = QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::Detail, Logs::Trading, "Failed to load trader information!\n");
+		LogTrading("Failed to load trader information!\n");
 		return loadti;
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
 		if (atoi(row[5]) >= 80 || atoi(row[5]) < 0) {
-			Log(Logs::Detail, Logs::Trading, "Bad Slot number when trying to load trader information!\n");
+			LogTrading("Bad Slot number when trying to load trader information!\n");
 			continue;
 		}
 
@@ -829,7 +833,7 @@ EQEmu::ItemInstance* ZoneDatabase::LoadSingleTraderItem(uint32 CharID, int Seria
         return nullptr;
 
 	if (results.RowCount() == 0) {
-        Log(Logs::Detail, Logs::Trading, "Bad result from query\n"); fflush(stdout);
+    LogTrading("Bad result from query\n"); fflush(stdout);
         return nullptr;
     }
 
@@ -842,7 +846,7 @@ EQEmu::ItemInstance* ZoneDatabase::LoadSingleTraderItem(uint32 CharID, int Seria
 	const EQEmu::ItemData *item = database.GetItem(ItemID);
 
 	if(!item) {
-		Log(Logs::Detail, Logs::Trading, "Unable to create item\n");
+		LogTrading("Unable to create item\n");
 		fflush(stdout);
 		return nullptr;
 	}
@@ -852,7 +856,7 @@ EQEmu::ItemInstance* ZoneDatabase::LoadSingleTraderItem(uint32 CharID, int Seria
 
     EQEmu::ItemInstance* inst = database.CreateItem(item);
 	if(!inst) {
-		Log(Logs::Detail, Logs::Trading, "Unable to create item instance\n");
+		LogTrading("Unable to create item instance\n");
 		fflush(stdout);
 		return nullptr;
 	}
@@ -874,25 +878,24 @@ void ZoneDatabase::SaveTraderItem(uint32 CharID, uint32 ItemID, uint32 SerialNum
                                     CharID, ItemID, SerialNumber, Charges, ItemCost, Slot);
     auto results = QueryDatabase(query);
     if (!results.Success())
-        Log(Logs::Detail, Logs::None, "[CLIENT] Failed to save trader item: %i for char_id: %i, the error was: %s\n", ItemID, CharID, results.ErrorMessage().c_str());
+        LogDebug("[CLIENT] Failed to save trader item: [{}] for char_id: [{}], the error was: [{}]\n", ItemID, CharID, results.ErrorMessage().c_str());
 
 }
 
 void ZoneDatabase::UpdateTraderItemCharges(int CharID, uint32 SerialNumber, int32 Charges) {
-	Log(Logs::Detail, Logs::Trading, "ZoneDatabase::UpdateTraderItemCharges(%i, %i, %i)", CharID, SerialNumber, Charges);
+	LogTrading("ZoneDatabase::UpdateTraderItemCharges([{}], [{}], [{}])", CharID, SerialNumber, Charges);
 
 	std::string query = StringFormat("UPDATE trader SET charges = %i WHERE char_id = %i AND serialnumber = %i",
                                     Charges, CharID, SerialNumber);
     auto results = QueryDatabase(query);
     if (!results.Success())
-		Log(Logs::Detail, Logs::None, "[CLIENT] Failed to update charges for trader item: %i for char_id: %i, the error was: %s\n",
-                                SerialNumber, CharID, results.ErrorMessage().c_str());
+		LogDebug("[CLIENT] Failed to update charges for trader item: [{}] for char_id: [{}], the error was: [{}]\n", SerialNumber, CharID, results.ErrorMessage().c_str());
 
 }
 
 void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charges, uint32 NewPrice) {
 
-	Log(Logs::Detail, Logs::Trading, "ZoneDatabase::UpdateTraderPrice(%i, %i, %i, %i)", CharID, ItemID, Charges, NewPrice);
+	LogTrading("ZoneDatabase::UpdateTraderPrice([{}], [{}], [{}], [{}])", CharID, ItemID, Charges, NewPrice);
 
 	const EQEmu::ItemData *item = database.GetItem(ItemID);
 
@@ -900,12 +903,12 @@ void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charg
 		return;
 
 	if(NewPrice == 0) {
-		Log(Logs::Detail, Logs::Trading, "Removing Trader items from the DB for CharID %i, ItemID %i", CharID, ItemID);
+		LogTrading("Removing Trader items from the DB for CharID [{}], ItemID [{}]", CharID, ItemID);
 
         std::string query = StringFormat("DELETE FROM trader WHERE char_id = %i AND item_id = %i",CharID, ItemID);
         auto results = QueryDatabase(query);
         if (!results.Success())
-			Log(Logs::Detail, Logs::None, "[CLIENT] Failed to remove trader item(s): %i for char_id: %i, the error was: %s\n", ItemID, CharID, results.ErrorMessage().c_str());
+			LogDebug("[CLIENT] Failed to remove trader item(s): [{}] for char_id: [{}], the error was: [{}]\n", ItemID, CharID, results.ErrorMessage().c_str());
 
 		return;
 	}
@@ -916,7 +919,7 @@ void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charg
                                         NewPrice, CharID, ItemID, Charges);
         auto results = QueryDatabase(query);
         if (!results.Success())
-            Log(Logs::Detail, Logs::None, "[CLIENT] Failed to update price for trader item: %i for char_id: %i, the error was: %s\n", ItemID, CharID, results.ErrorMessage().c_str());
+            LogDebug("[CLIENT] Failed to update price for trader item: [{}] for char_id: [{}], the error was: [{}]\n", ItemID, CharID, results.ErrorMessage().c_str());
 
         return;
     }
@@ -926,7 +929,7 @@ void ZoneDatabase::UpdateTraderItemPrice(int CharID, uint32 ItemID, uint32 Charg
                                     NewPrice, CharID, ItemID);
     auto results = QueryDatabase(query);
     if (!results.Success())
-            Log(Logs::Detail, Logs::None, "[CLIENT] Failed to update price for trader item: %i for char_id: %i, the error was: %s\n", ItemID, CharID, results.ErrorMessage().c_str());
+            LogDebug("[CLIENT] Failed to update price for trader item: [{}] for char_id: [{}], the error was: [{}]\n", ItemID, CharID, results.ErrorMessage().c_str());
 }
 
 void ZoneDatabase::DeleteTraderItem(uint32 char_id){
@@ -935,7 +938,7 @@ void ZoneDatabase::DeleteTraderItem(uint32 char_id){
         const std::string query = "DELETE FROM trader";
         auto results = QueryDatabase(query);
 		if (!results.Success())
-			Log(Logs::Detail, Logs::None, "[CLIENT] Failed to delete all trader items data, the error was: %s\n", results.ErrorMessage().c_str());
+			LogDebug("[CLIENT] Failed to delete all trader items data, the error was: [{}]\n", results.ErrorMessage().c_str());
 
         return;
 	}
@@ -943,7 +946,7 @@ void ZoneDatabase::DeleteTraderItem(uint32 char_id){
 	std::string query = StringFormat("DELETE FROM trader WHERE char_id = %i", char_id);
 	auto results = QueryDatabase(query);
     if (!results.Success())
-        Log(Logs::Detail, Logs::None, "[CLIENT] Failed to delete trader item data for char_id: %i, the error was: %s\n", char_id, results.ErrorMessage().c_str());
+        LogDebug("[CLIENT] Failed to delete trader item data for char_id: [{}], the error was: [{}]\n", char_id, results.ErrorMessage().c_str());
 
 }
 void ZoneDatabase::DeleteTraderItem(uint32 CharID,uint16 SlotID) {
@@ -951,7 +954,7 @@ void ZoneDatabase::DeleteTraderItem(uint32 CharID,uint16 SlotID) {
 	std::string query = StringFormat("DELETE FROM trader WHERE char_id = %i And slot_id = %i", CharID, SlotID);
 	auto results = QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::Detail, Logs::None, "[CLIENT] Failed to delete trader item data for char_id: %i, the error was: %s\n",CharID, results.ErrorMessage().c_str());
+		LogDebug("[CLIENT] Failed to delete trader item data for char_id: [{}], the error was: [{}]\n",CharID, results.ErrorMessage().c_str());
 }
 
 void ZoneDatabase::DeleteBuyLines(uint32 CharID) {
@@ -960,7 +963,7 @@ void ZoneDatabase::DeleteBuyLines(uint32 CharID) {
         const std::string query = "DELETE FROM buyer";
 		auto results = QueryDatabase(query);
         if (!results.Success())
-			Log(Logs::Detail, Logs::None, "[CLIENT] Failed to delete all buyer items data, the error was: %s\n",results.ErrorMessage().c_str());
+			LogDebug("[CLIENT] Failed to delete all buyer items data, the error was: [{}]\n",results.ErrorMessage().c_str());
 
         return;
 	}
@@ -968,7 +971,7 @@ void ZoneDatabase::DeleteBuyLines(uint32 CharID) {
     std::string query = StringFormat("DELETE FROM buyer WHERE charid = %i", CharID);
 	auto results = QueryDatabase(query);
 	if (!results.Success())
-			Log(Logs::Detail, Logs::None, "[CLIENT] Failed to delete buyer item data for charid: %i, the error was: %s\n",CharID,results.ErrorMessage().c_str());
+			LogDebug("[CLIENT] Failed to delete buyer item data for charid: [{}], the error was: [{}]\n",CharID,results.ErrorMessage().c_str());
 
 }
 
@@ -977,7 +980,7 @@ void ZoneDatabase::AddBuyLine(uint32 CharID, uint32 BuySlot, uint32 ItemID, cons
                                     CharID, BuySlot, ItemID, ItemName, Quantity, Price);
     auto results = QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::Detail, Logs::None, "[CLIENT] Failed to save buline item: %i for char_id: %i, the error was: %s\n", ItemID, CharID, results.ErrorMessage().c_str());
+		LogDebug("[CLIENT] Failed to save buline item: [{}] for char_id: [{}], the error was: [{}]\n", ItemID, CharID, results.ErrorMessage().c_str());
 
 }
 
@@ -985,7 +988,7 @@ void ZoneDatabase::RemoveBuyLine(uint32 CharID, uint32 BuySlot) {
 	std::string query = StringFormat("DELETE FROM buyer WHERE charid = %i AND buyslot = %i", CharID, BuySlot);
     auto results = QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::Detail, Logs::None, "[CLIENT] Failed to delete buyslot %i for charid: %i, the error was: %s\n", BuySlot, CharID, results.ErrorMessage().c_str());
+		LogDebug("[CLIENT] Failed to delete buyslot [{}] for charid: [{}], the error was: [{}]\n", BuySlot, CharID, results.ErrorMessage().c_str());
 
 }
 
@@ -998,7 +1001,7 @@ void ZoneDatabase::UpdateBuyLine(uint32 CharID, uint32 BuySlot, uint32 Quantity)
 	std::string query = StringFormat("UPDATE buyer SET quantity = %i WHERE charid = %i AND buyslot = %i", Quantity, CharID, BuySlot);
     auto results = QueryDatabase(query);
 	if (!results.Success())
-		Log(Logs::Detail, Logs::None, "[CLIENT] Failed to update quantity in buyslot %i for charid: %i, the error was: %s\n", BuySlot, CharID, results.ErrorMessage().c_str());
+		LogDebug("[CLIENT] Failed to update quantity in buyslot [{}] for charid: [{}], the error was: [{}]\n", BuySlot, CharID, results.ErrorMessage().c_str());
 
 }
 
@@ -1509,7 +1512,7 @@ bool ZoneDatabase::LoadCharacterBindPoint(uint32 character_id, PlayerProfile_Str
 
 bool ZoneDatabase::SaveCharacterLanguage(uint32 character_id, uint32 lang_id, uint32 value){
 	std::string query = StringFormat("REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)", character_id, lang_id, value); QueryDatabase(query);
-	Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterLanguage for character ID: %i, lang_id:%u value:%u done", character_id, lang_id, value);
+	LogDebug("ZoneDatabase::SaveCharacterLanguage for character ID: [{}], lang_id:[{}] value:[{}] done", character_id, lang_id, value);
 	return true;
 }
 
@@ -1521,13 +1524,12 @@ bool ZoneDatabase::SaveCharacterBindPoint(uint32 character_id, const BindStruct
 			 "%u, %u, %f, %f, %f, %f, %i)",
 			 character_id, bind.zoneId, bind.instance_id, bind.x, bind.y, bind.z, bind.heading, bind_num);
 
-	Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterBindPoint for character ID: %i zone_id: %u "
-					   "instance_id: %u position: %f %f %f %f bind_num: %u",
+	LogDebug("ZoneDatabase::SaveCharacterBindPoint for character ID: [{}] zone_id: [{}] instance_id: [{}] position: [{}] [{}] [{}] [{}] bind_num: [{}]",
 		character_id, bind.zoneId, bind.instance_id, bind.x, bind.y, bind.z, bind.heading, bind_num);
 
 	auto results = QueryDatabase(query);
 	if (!results.RowsAffected())
-		Log(Logs::General, Logs::None, "ERROR Bind Home Save: %s. %s", results.ErrorMessage().c_str(),
+		LogDebug("ERROR Bind Home Save: [{}]. [{}]", results.ErrorMessage().c_str(),
 			query.c_str());
 
 	return true;
@@ -1539,20 +1541,20 @@ bool ZoneDatabase::SaveCharacterMaterialColor(uint32 character_id, uint32 slot_i
 	uint8 blue = (color & 0x000000FF);
 
 	std::string query = StringFormat("REPLACE INTO `character_material` (id, slot, red, green, blue, color, use_tint) VALUES (%u, %u, %u, %u, %u, %u, 255)", character_id, slot_id, red, green, blue, color); auto results = QueryDatabase(query);
-	Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterMaterialColor for character ID: %i, slot_id: %u color: %u done", character_id, slot_id, color);
+	LogDebug("ZoneDatabase::SaveCharacterMaterialColor for character ID: [{}], slot_id: [{}] color: [{}] done", character_id, slot_id, color);
 	return true;
 }
 
 bool ZoneDatabase::SaveCharacterSkill(uint32 character_id, uint32 skill_id, uint32 value){
 	std::string query = StringFormat("REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)", character_id, skill_id, value); auto results = QueryDatabase(query);
-	Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterSkill for character ID: %i, skill_id:%u value:%u done", character_id, skill_id, value);
+	LogDebug("ZoneDatabase::SaveCharacterSkill for character ID: [{}], skill_id:[{}] value:[{}] done", character_id, skill_id, value);
 	return true;
 }
 
 bool ZoneDatabase::SaveCharacterDisc(uint32 character_id, uint32 slot_id, uint32 disc_id){
 	std::string query = StringFormat("REPLACE INTO `character_disciplines` (id, slot_id, disc_id) VALUES (%u, %u, %u)", character_id, slot_id, disc_id);
 	auto results = QueryDatabase(query);
-	Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterDisc for character ID: %i, slot:%u disc_id:%u done", character_id, slot_id, disc_id);
+	LogDebug("ZoneDatabase::SaveCharacterDisc for character ID: [{}], slot:[{}] disc_id:[{}] done", character_id, slot_id, disc_id);
 	return true;
 }
 
@@ -1564,7 +1566,7 @@ bool ZoneDatabase::SaveCharacterTribute(uint32 character_id, PlayerProfile_Struc
 		if (pp->tributes[i].tribute >= 0 && pp->tributes[i].tribute != TRIBUTE_NONE){
 			std::string query = StringFormat("REPLACE INTO `character_tribute` (id, tier, tribute) VALUES (%u, %u, %u)", character_id, pp->tributes[i].tier, pp->tributes[i].tribute);
 			QueryDatabase(query);
-			Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterTribute for character ID: %i, tier:%u tribute:%u done", character_id, pp->tributes[i].tier, pp->tributes[i].tribute);
+			LogDebug("ZoneDatabase::SaveCharacterTribute for character ID: [{}], tier:[{}] tribute:[{}] done", character_id, pp->tributes[i].tier, pp->tributes[i].tribute);
 		}
 	}
 	return true;
@@ -1576,7 +1578,7 @@ bool ZoneDatabase::SaveCharacterBandolier(uint32 character_id, uint8 bandolier_i
 	DoEscapeString(bandolier_name_esc, bandolier_name, strlen(bandolier_name));
 	std::string query = StringFormat("REPLACE INTO `character_bandolier` (id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name) VALUES (%u, %u, %u, %u, %u,'%s')", character_id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name_esc);
 	auto results = QueryDatabase(query);
-	Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterBandolier for character ID: %i, bandolier_id: %u, bandolier_slot: %u item_id: %u, icon:%u band_name:%s  done", character_id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name);
+	LogDebug("ZoneDatabase::SaveCharacterBandolier for character ID: [{}], bandolier_id: [{}], bandolier_slot: [{}] item_id: [{}], icon:[{}] band_name:[{}]  done", character_id, bandolier_id, bandolier_slot, item_id, icon, bandolier_name);
 	return true;
 }
 
@@ -1903,7 +1905,7 @@ bool ZoneDatabase::SaveCharacterData(uint32 character_id, uint32 account_id, Pla
 		mail_key.c_str()
 	);
 	auto results = database.QueryDatabase(query);
-	Log(Logs::General, Logs::None, "ZoneDatabase::SaveCharacterData %i, done... Took %f seconds", character_id, ((float)(std::clock() - t)) / CLOCKS_PER_SEC);
+	LogDebug("ZoneDatabase::SaveCharacterData [{}], done Took [{}] seconds", character_id, ((float)(std::clock() - t)) / CLOCKS_PER_SEC);
 	return true;
 }
 
@@ -1944,7 +1946,7 @@ bool ZoneDatabase::SaveCharacterCurrency(uint32 character_id, PlayerProfile_Stru
 		pp->currentEbonCrystals,
 		pp->careerEbonCrystals);
 	auto results = database.QueryDatabase(query);
-	Log(Logs::General, Logs::None, "Saving Currency for character ID: %i, done", character_id);
+	LogDebug("Saving Currency for character ID: [{}], done", character_id);
 	return true;
 }
 
@@ -1953,7 +1955,7 @@ bool ZoneDatabase::SaveCharacterAA(uint32 character_id, uint32 aa_id, uint32 cur
 		" VALUES (%u, %u, %u, %u)",
 		character_id, aa_id, current_level, charges);
 	auto results = QueryDatabase(rquery);
-	Log(Logs::General, Logs::None, "Saving AA for character ID: %u, aa_id: %u current_level: %u", character_id, aa_id, current_level);
+	LogDebug("Saving AA for character ID: [{}], aa_id: [{}] current_level: [{}]", character_id, aa_id, current_level);
 	return true;
 }
 
@@ -2078,7 +2080,7 @@ bool ZoneDatabase::SaveCharacterInvSnapshot(uint32 character_id) {
 		character_id
 	);
 	auto results = database.QueryDatabase(query);
-	Log(Logs::Moderate, Logs::Inventory, "ZoneDatabase::SaveCharacterInventorySnapshot %i (%s)", character_id, (results.Success() ? "pass" : "fail"));
+	LogInventory("ZoneDatabase::SaveCharacterInventorySnapshot [{}] ([{}])", character_id, (results.Success() ? "pass" : "fail"));
 	return results.Success();
 }
 
@@ -2295,7 +2297,7 @@ bool ZoneDatabase::RestoreCharacterInvSnapshot(uint32 character_id, uint32 times
 	// we should know what we're doing by the time we call this function..but,
 	// this is to prevent inventory deletions where no timestamp entries exists
 	if (!ValidateCharacterInvSnapshotTimestamp(character_id, timestamp)) {
-		Log(Logs::General, Logs::Error, "ZoneDatabase::RestoreCharacterInvSnapshot() called for id: %u without valid snapshot entries @ %u", character_id, timestamp);
+		LogError("ZoneDatabase::RestoreCharacterInvSnapshot() called for id: [{}] without valid snapshot entries @ [{}]", character_id, timestamp);
 		return false;
 	}
 
@@ -2360,7 +2362,7 @@ bool ZoneDatabase::RestoreCharacterInvSnapshot(uint32 character_id, uint32 times
 	);
 	results = database.QueryDatabase(query);
 
-	Log(Logs::General, Logs::Inventory, "ZoneDatabase::RestoreCharacterInvSnapshot() %s snapshot for %u @ %u",
+	LogInventory("ZoneDatabase::RestoreCharacterInvSnapshot() [{}] snapshot for [{}] @ [{}]",
 		(results.Success() ? "restored" : "failed to restore"), character_id, timestamp);
 
 	return results.Success();
@@ -2379,7 +2381,7 @@ const NPCType *ZoneDatabase::LoadNPCTypesData(uint32 npc_type_id, bool bulk_load
 	std::string where_condition = "";
 
 	if (bulk_load) {
-		Log(Logs::General, Logs::Debug, "Performing bulk NPC Types load");
+		LogDebug("Performing bulk NPC Types load");
 		where_condition = StringFormat(
 			"INNER JOIN spawnentry ON npc_types.id = spawnentry.npcID "
 			"INNER JOIN spawn2 ON spawnentry.spawngroupID = spawn2.spawngroupID "
@@ -3061,10 +3063,10 @@ bool ZoneDatabase::SaveMerc(Merc *merc) {
 
 		auto results = database.QueryDatabase(query);
 		if(!results.Success()) {
-			owner->Message(13, results.ErrorMessage().c_str());
+			owner->Message(Chat::Red, results.ErrorMessage().c_str());
 			return false;
 		} else if (results.RowsAffected() != 1) {
-			owner->Message(13, "Unable to save merc to the database.");
+			owner->Message(Chat::Red, "Unable to save merc to the database.");
 			return false;
 		}
 
@@ -3095,10 +3097,10 @@ bool ZoneDatabase::SaveMerc(Merc *merc) {
 
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		owner->Message(13, results.ErrorMessage().c_str());
+		owner->Message(Chat::Red, results.ErrorMessage().c_str());
 		return false;
 	} else if (results.RowsAffected() != 1) {
-		owner->Message(13, "Unable to save merc to the database.");
+		owner->Message(Chat::Red, "Unable to save merc to the database.");
 		return false;
 	}
 
@@ -3113,12 +3115,12 @@ void ZoneDatabase::SaveMercBuffs(Merc *merc) {
 	Buffs_Struct *buffs = merc->GetBuffs();
 
 	// Remove any existing buff saves
-    std::string query = StringFormat("DELETE FROM merc_buffs WHERE MercId = %u", merc->GetMercID());
-    auto results = database.QueryDatabase(query);
-    if(!results.Success()) {
-        Log(Logs::General, Logs::Error, "Error While Deleting Merc Buffs before save: %s", results.ErrorMessage().c_str());
-        return;
-    }
+	std::string query   = StringFormat("DELETE FROM merc_buffs WHERE MercId = %u", merc->GetMercID());
+	auto        results = database.QueryDatabase(query);
+	if (!results.Success()) {
+		LogError("Error While Deleting Merc Buffs before save: [{}]", results.ErrorMessage().c_str());
+		return;
+	}
 
 	for (int buffCount = 0; buffCount <= BUFF_COUNT; buffCount++) {
 		if(buffs[buffCount].spellid == 0 || buffs[buffCount].spellid == SPELL_UNKNOWN)
@@ -3142,7 +3144,7 @@ void ZoneDatabase::SaveMercBuffs(Merc *merc) {
                             buffs[buffCount].caston_z, buffs[buffCount].ExtraDIChance);
         results = database.QueryDatabase(query);
         if(!results.Success()) {
-            Log(Logs::General, Logs::Error, "Error Saving Merc Buffs: %s", results.ErrorMessage().c_str());
+      LogError("Error Saving Merc Buffs: [{}]", results.ErrorMessage().c_str());
             break;
         }
 	}
@@ -3161,7 +3163,7 @@ void ZoneDatabase::LoadMercBuffs(Merc *merc) {
                                     merc->GetMercID());
     auto results = database.QueryDatabase(query);
 	if(!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error Loading Merc Buffs: %s", results.ErrorMessage().c_str());
+		LogError("Error Loading Merc Buffs: [{}]", results.ErrorMessage().c_str());
 		return;
 	}
 
@@ -3206,7 +3208,7 @@ void ZoneDatabase::LoadMercBuffs(Merc *merc) {
 	query = StringFormat("DELETE FROM merc_buffs WHERE MercId = %u", merc->GetMercID());
     results = database.QueryDatabase(query);
     if(!results.Success())
-        Log(Logs::General, Logs::Error, "Error Loading Merc Buffs: %s", results.ErrorMessage().c_str());
+    LogError("Error Loading Merc Buffs: [{}]", results.ErrorMessage().c_str());
 
 }
 
@@ -3222,14 +3224,14 @@ bool ZoneDatabase::DeleteMerc(uint32 merc_id) {
 	auto results = database.QueryDatabase(query);
 	if(!results.Success())
 	{
-		Log(Logs::General, Logs::Error, "Error Deleting Merc Buffs: %s", results.ErrorMessage().c_str());
+		LogError("Error Deleting Merc Buffs: [{}]", results.ErrorMessage().c_str());
 	}
 
 	query = StringFormat("DELETE FROM mercs WHERE MercID = '%u'", merc_id);
 	results = database.QueryDatabase(query);
 	if(!results.Success())
 	{
-		Log(Logs::General, Logs::Error, "Error Deleting Merc: %s", results.ErrorMessage().c_str());
+		LogError("Error Deleting Merc: [{}]", results.ErrorMessage().c_str());
 		return false;
 	}
 
@@ -3247,7 +3249,7 @@ void ZoneDatabase::LoadMercEquipment(Merc *merc) {
                                     merc->GetLevel(), merc->GetLevel());
     auto results = database.QueryDatabase(query);
 	if(!results.Success()) {
-		Log(Logs::General, Logs::Error, "Error Loading Merc Inventory: %s", results.ErrorMessage().c_str());
+		LogError("Error Loading Merc Inventory: [{}]", results.ErrorMessage().c_str());
 		return;
 	}
 
@@ -3458,7 +3460,7 @@ int32 ZoneDatabase::GetBlockedSpellsCount(uint32 zoneid)
 
 bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked* into, uint32 zoneid)
 {
-	Log(Logs::General, Logs::Status, "Loading Blocked Spells from database...");
+	LogInfo("Loading Blocked Spells from database");
 
 	std::string query = StringFormat("SELECT id, spellid, type, x, y, z, x_diff, y_diff, z_diff, message "
                                     "FROM blocked_spells WHERE zoneid = %d ORDER BY id ASC", zoneid);
@@ -3544,10 +3546,10 @@ void ZoneDatabase::ListAllInstances(Client* client, uint32 charid)
 
     char name[64];
     database.GetCharName(charid, name);
-    client->Message(0, "%s is part of the following instances:", name);
+    client->Message(Chat::White, "%s is part of the following instances:", name);
 
     for (auto row = results.begin(); row != results.end(); ++row) {
-        client->Message(0, "%s - id: %lu, version: %lu", database.GetZoneName(atoi(row[1])),
+        client->Message(Chat::White, "%s - id: %lu, version: %lu", database.GetZoneName(atoi(row[1])),
 				(unsigned long)atoi(row[0]), (unsigned long)atoi(row[2]));
     }
 }
@@ -4072,60 +4074,113 @@ bool ZoneDatabase::SetCharacterFactionLevel(uint32 char_id, int32 faction_id, in
 
 bool ZoneDatabase::LoadFactionData()
 {
-	std::string query = "SELECT MAX(id) FROM faction_list";
-	auto results = QueryDatabase(query);
-	if (!results.Success()) {
+	std::string query("SELECT MAX(`id`) FROM `faction_list`");
+
+	auto faction_max_results = QueryDatabase(query);
+	if (!faction_max_results.Success() || faction_max_results.RowCount() == 0) {
 		return false;
 	}
 
-    if (results.RowCount() == 0)
-        return false;
+    auto fmr_row = faction_max_results.begin();
 
-    auto row = results.begin();
+	max_faction = atoul(fmr_row[0]);
+	faction_array = new Faction *[max_faction + 1];
 
-	max_faction = row[0] ? atoi(row[0]) : 0;
-    faction_array = new Faction*[max_faction+1];
-    for(unsigned int index=0; index<max_faction; index++)
-        faction_array[index] = nullptr;
+	memset(faction_array, 0, (sizeof(Faction*) * (max_faction + 1)));
+	
+	std::vector<size_t> faction_ids;
+	
+	// load factions
+    query = "SELECT `id`, `name`, `base` FROM `faction_list`";
 
-    query = "SELECT id, name, base FROM faction_list";
-    results = QueryDatabase(query);
-    if (!results.Success()) {
+    auto faction_results = QueryDatabase(query);
+    if (!faction_results.Success()) {
         return false;
     }
 
-    for (row = results.begin(); row != results.end(); ++row) {
-        uint32 index = atoi(row[0]);
+	for (auto fr_row : faction_results) {
+
+		uint32 index = atoul(fr_row[0]);
+		if (index > max_faction) {
+			Log(Logs::General, Logs::Error, "Faction '%u' is out-of-bounds for faction array size!", index);
+			continue;
+		}
+
+		// this should never hit since `id` is keyed..but, it alleviates any risk of lost pointers
+		if (faction_array[index] != nullptr) {
+			Log(Logs::General, Logs::Error, "Faction '%u' has already been assigned! (Duplicate Entry)", index);
+			continue;
+		}
+
 		faction_array[index] = new Faction;
-		strn0cpy(faction_array[index]->name, row[1], 50);
-		faction_array[index]->base = atoi(row[2]);
+		strn0cpy(faction_array[index]->name, fr_row[1], 50);
+		faction_array[index]->base = atoi(fr_row[2]);
 		faction_array[index]->min = MIN_PERSONAL_FACTION;
 		faction_array[index]->max = MAX_PERSONAL_FACTION;
+		
+		faction_ids.push_back(index);
+	}
 
-		// Load in the mimimum and maximum faction that can be earned for this faction
-		query = StringFormat("SELECT `min` , `max` FROM `faction_base_data` WHERE client_faction_id = %u", index);
-		auto baseResults = QueryDatabase(query);
-		if (!baseResults.Success() || baseResults.RowCount() == 0) {
-			Log(Logs::General, Logs::General, "Faction %d has no base data", (int)index);
-		}
-		else {
-			for (auto modRow = baseResults.begin(); modRow != baseResults.end(); ++modRow) {
-				faction_array[index]->min = atoi(modRow[0]);
-				faction_array[index]->max = atoi(modRow[1]);
-				Log(Logs::General, Logs::None, "Min(%d), Max(%d) for faction (%u)",faction_array[index]->min, faction_array[index]->max, index);
+	LogInfo("[{}] Faction(s) loaded...", faction_ids.size());
+
+	const std::string faction_id_criteria(implode(",", std::pair<char, char>('\'', '\''), faction_ids));
+
+	// load faction mins/maxes
+	query = fmt::format("SELECT `client_faction_id`, `min`, `max` FROM `faction_base_data` WHERE `client_faction_id` IN ({})", faction_id_criteria);
+
+	auto base_results = QueryDatabase(query);
+	if (base_results.Success()) {
+
+		for (auto br_row : base_results) {
+
+			uint32 index = atoul(br_row[0]);
+			if (index > max_faction) {
+				LogError("Faction [{}] is out-of-bounds for faction array size in Base adjustment!", index);
+				continue;
 			}
+
+			if (faction_array[index] == nullptr) {
+				LogError("Faction [{}] does not exist for Base adjustment!", index);
+				continue;
+			}
+
+			faction_array[index]->min = atoi(br_row[1]);
+			faction_array[index]->max = atoi(br_row[2]);
 		}
 
-		// Load in modifiers to the faction based on characters race, class and diety.
-		query = StringFormat("SELECT `mod`, `mod_name` FROM `faction_list_mod` WHERE faction_id = %u", index);
-		auto modResults = QueryDatabase(query);
-		if (!modResults.Success())
-			continue;
+		LogInfo("[{}] Faction Base(s) loaded...", base_results.RowCount());
+	}
+	else {
+		LogInfo("Unable to load Faction Base data...");
+	}
+	
+	// load race, class and diety modifiers
+	query = fmt::format("SELECT `faction_id`, `mod`, `mod_name` FROM `faction_list_mod` WHERE `faction_id` IN ({})", faction_id_criteria);
 
-		for (auto modRow = modResults.begin(); modRow != modResults.end(); ++modRow) {
-			faction_array[index]->mods[modRow[1]] = atoi(modRow[0]);
+	auto modifier_results = QueryDatabase(query);
+	if (modifier_results.Success()) {
+
+		for (auto mr_row : modifier_results) {
+
+			uint32 index = atoul(mr_row[0]);
+			if (index > max_faction) {
+				Log(Logs::General, Logs::Error, "Faction '%u' is out-of-bounds for faction array size in Modifier adjustment!", index);
+				continue;
+			}
+
+			if (faction_array[index] == nullptr) {
+				Log(Logs::General, Logs::Error, "Faction '%u' does not exist for Modifier adjustment!", index);
+				continue;
+			}
+
+			faction_array[index]->mods[mr_row[2]] = atoi(mr_row[1]);
 		}
-    }
+
+		LogInfo("[{}] Faction Modifier(s) loaded", modifier_results.RowCount());
+	}
+	else {
+		LogError("Unable to load Faction Modifier data");
+	}
 
 	return true;
 }
@@ -4602,11 +4657,11 @@ Corpse* ZoneDatabase::SummonBuriedCharacterCorpses(uint32 char_id, uint32 dest_z
 		if (!corpse)
             continue;
 
-        entity_list.AddCorpse(corpse);
-        corpse->SetDecayTimer(RuleI(Character, CorpseDecayTimeMS));
-        corpse->Spawn();
-        if (!UnburyCharacterCorpse(corpse->GetCorpseDBID(), dest_zone_id, dest_instance_id, position))
-            Log(Logs::General, Logs::Error, "Unable to unbury a summoned player corpse for character id %u.", char_id);
+		entity_list.AddCorpse(corpse);
+		corpse->SetDecayTimer(RuleI(Character, CorpseDecayTimeMS));
+		corpse->Spawn();
+		if (!UnburyCharacterCorpse(corpse->GetCorpseDBID(), dest_zone_id, dest_instance_id, position))
+			LogError("Unable to unbury a summoned player corpse for character id [{}]", char_id);
 	}
 
 	return corpse;
@@ -4645,13 +4700,54 @@ bool ZoneDatabase::SummonAllCharacterCorpses(uint32 char_id, uint32 dest_zone_id
 			++CorpseCount;
 		}
 		else{
-			Log(Logs::General, Logs::Error, "Unable to construct a player corpse for character id %u.", char_id);
+			LogError("Unable to construct a player corpse for character id [{}]", char_id);
 		}
 	}
 
 	return (CorpseCount > 0);
 }
 
+int ZoneDatabase::CountCharacterCorpses(uint32 char_id) {
+	std::string query = fmt::format(
+		SQL(
+			SELECT
+			COUNT(*)
+			FROM
+			character_corpses
+			WHERE
+			charid = '{}'
+		),
+		char_id
+	);
+	auto results = QueryDatabase(query);
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		return atoi(row[0]);
+	}
+	return 0;
+}
+
+int ZoneDatabase::CountCharacterCorpsesByZoneID(uint32 char_id, uint32 zone_id) {
+	std::string query = fmt::format(
+		SQL(
+			SELECT
+			COUNT(*)
+			FROM
+			character_corpses
+			WHERE
+			charid = '{}'
+			AND
+			zone_id = '{}'
+		),
+		char_id,
+		zone_id
+	);
+	auto results = QueryDatabase(query);
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		return atoi(row[0]);
+	}
+	return 0;
+}
+
 bool ZoneDatabase::UnburyCharacterCorpse(uint32 db_id, uint32 new_zone_id, uint16 new_instance_id, const glm::vec4& position) {
 	std::string query = StringFormat("UPDATE `character_corpses` "
                                     "SET `is_buried` = 0, `zone_id` = %u, `instance_id` = %u, "
diff --git a/zone/zonedb.h b/zone/zonedb.h
index f2103715a..f28ac5ec4 100644
--- a/zone/zonedb.h
+++ b/zone/zonedb.h
@@ -356,6 +356,8 @@ public:
 	bool		DeleteCharacterCorpse(uint32 dbid);
 	bool		SummonAllCharacterCorpses(uint32 char_id, uint32 dest_zoneid, uint16 dest_instanceid, const glm::vec4& position);
 	bool		SummonAllGraveyardCorpses(uint32 cur_zoneid, uint32 dest_zoneid, uint16 dest_instanceid, const glm::vec4& position);
+	int			CountCharacterCorpses(uint32 char_id);
+	int			CountCharacterCorpsesByZoneID(uint32 char_id, uint32 zone_id);
 	bool		UnburyCharacterCorpse(uint32 dbid, uint32 new_zoneid, uint16 dest_instanceid, const glm::vec4& position);
 	bool		LoadCharacterCorpses(uint32 iZoneID, uint16 iInstanceID);
 	bool		DeleteGraveyard(uint32 zone_id, uint32 graveyard_id);
@@ -409,7 +411,7 @@ public:
 
 	/* Spawns and Spawn Points  */
 	bool		LoadSpawnGroups(const char* zone_name, uint16 version, SpawnGroupList* spawn_group_list);
-	bool		LoadSpawnGroupsByID(int spawngroupid, SpawnGroupList* spawn_group_list);
+	bool		LoadSpawnGroupsByID(int spawn_group_id, SpawnGroupList* spawn_group_list);
 	bool		PopulateZoneSpawnList(uint32 zoneid, LinkedList<Spawn2*> &spawn2_list, int16 version, uint32 repopdelay = 0);
 	bool		PopulateZoneSpawnListClose(uint32 zoneid, LinkedList<Spawn2*> &spawn2_list, int16 version, const glm::vec4& client_position, uint32 repop_distance);
 	Spawn2*		LoadSpawn2(LinkedList<Spawn2*> &spawn2_list, uint32 spawn2id, uint32 timeleft);
diff --git a/zone/zonedump.h b/zone/zonedump.h
index 302d4ee25..6010c9480 100644
--- a/zone/zonedump.h
+++ b/zone/zonedump.h
@@ -44,7 +44,7 @@ struct NPCType
 	uint16	race;
 	uint8	class_;
 	uint8	bodytype;	// added for targettype support
-	uint8	deity;		//not loaded from DB
+	uint32	deity;		//not loaded from DB
 	uint8	level;
 	uint32	npc_id;
 	uint8	texture;
diff --git a/zone/zoning.cpp b/zone/zoning.cpp
index dbe9346b7..8eaa05c5a 100644
--- a/zone/zoning.cpp
+++ b/zone/zoning.cpp
@@ -44,12 +44,12 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 
 	bZoning = true;
 	if (app->size != sizeof(ZoneChange_Struct)) {
-		Log(Logs::General, Logs::None, "Wrong size: OP_ZoneChange, size=%d, expected %d", app->size, sizeof(ZoneChange_Struct));
+		LogDebug("Wrong size: OP_ZoneChange, size=[{}], expected [{}]", app->size, sizeof(ZoneChange_Struct));
 		return;
 	}
 
 #if EQDEBUG >= 5
-	Log(Logs::General, Logs::None, "Zone request from %s", GetName());
+	LogDebug("Zone request from [{}]", GetName());
 	DumpPacket(app);
 #endif
 	ZoneChange_Struct* zc=(ZoneChange_Struct*)app->pBuffer;
@@ -96,8 +96,8 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 				//that can be a valid un-zolicited zone request?
 
 				//Todo cheat detection
-				Message(13, "Invalid unsolicited zone request.");
-				Log(Logs::General, Logs::Error, "Zoning %s: Invalid unsolicited zone request to zone id '%d'.", GetName(), target_zone_id);
+				Message(Chat::Red, "Invalid unsolicited zone request.");
+				LogError("Zoning [{}]: Invalid unsolicited zone request to zone id [{}]", GetName(), target_zone_id);
 				SendZoneCancel(zc);
 				return;
 			}
@@ -129,7 +129,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 			//if we didnt get a zone point, or its to a different zone,
 			//then we assume this is invalid.
 			if(!zone_point || zone_point->target_zone_id != target_zone_id) {
-				Log(Logs::General, Logs::Error, "Zoning %s: Invalid unsolicited zone request to zone id '%d'.", GetName(), target_zone_id);
+				LogError("Zoning [{}]: Invalid unsolicited zone request to zone id [{}]", GetName(), target_zone_id);
 				//todo cheat detection
 				SendZoneCancel(zc);
 				return;
@@ -142,14 +142,14 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 		//make sure we are in it and it's unexpired.
 		if(!database.VerifyInstanceAlive(target_instance_id, CharacterID()))
 		{
-			Message(13, "Instance ID was expired or you were not in it.");
+			Message(Chat::Red, "Instance ID was expired or you were not in it.");
 			SendZoneCancel(zc);
 			return;
 		}
 
 		if(!database.VerifyZoneInstance(target_zone_id, target_instance_id))
 		{
-			Message(13, "Instance ID was %u does not go with zone id %u", target_instance_id, target_zone_id);
+			Message(Chat::Red, "Instance ID was %u does not go with zone id %u", target_instance_id, target_zone_id);
 			SendZoneCancel(zc);
 			return;
 		}
@@ -159,8 +159,8 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 	const char *target_zone_name = database.GetZoneName(target_zone_id);
 	if(target_zone_name == nullptr) {
 		//invalid zone...
-		Message(13, "Invalid target zone ID.");
-		Log(Logs::General, Logs::Error, "Zoning %s: Unable to get zone name for zone id '%d'.", GetName(), target_zone_id);
+		Message(Chat::Red, "Invalid target zone ID.");
+		LogError("Zoning [{}]: Unable to get zone name for zone id [{}]", GetName(), target_zone_id);
 		SendZoneCancel(zc);
 		return;
 	}
@@ -172,8 +172,8 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 	char flag_needed[128];
 	if(!database.GetSafePoints(target_zone_name, database.GetInstanceVersion(target_instance_id), &safe_x, &safe_y, &safe_z, &minstatus, &minlevel, flag_needed)) {
 		//invalid zone...
-		Message(13, "Invalid target zone while getting safe points.");
-		Log(Logs::General, Logs::Error, "Zoning %s: Unable to get safe coordinates for zone '%s'.", GetName(), target_zone_name);
+		Message(Chat::Red, "Invalid target zone while getting safe points.");
+		LogError("Zoning [{}]: Unable to get safe coordinates for zone [{}]", GetName(), target_zone_name);
 		SendZoneCancel(zc);
 		return;
 	}
@@ -193,7 +193,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 	switch(zone_mode) {
 	case EvacToSafeCoords:
 	case ZoneToSafeCoords:
-		Log(Logs::General, Logs::None, "Zoning %s to safe coords (%f,%f,%f) in %s (%d)", GetName(), safe_x, safe_y, safe_z, target_zone_name, target_zone_id);
+		LogDebug("Zoning [{}] to safe coords ([{}],[{}],[{}]) in [{}] ([{}])", GetName(), safe_x, safe_y, safe_z, target_zone_name, target_zone_id);
 		dest_x = safe_x;
 		dest_y = safe_y;
 		dest_z = safe_z;
@@ -253,7 +253,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 
 		//could not find a valid reason for them to be zoning, stop it.
 		//todo cheat detection
-		Log(Logs::General, Logs::Error, "Zoning %s: Invalid unsolicited zone request to zone id '%s'. Not near a zone point.", GetName(), target_zone_name);
+		LogError("Zoning [{}]: Invalid unsolicited zone request to zone id [{}]. Not near a zone point", GetName(), target_zone_name);
 		SendZoneCancel(zc);
 		return;
 	default:
@@ -277,7 +277,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 		//the flag needed string is not empty, meaning a flag is required.
 		if(Admin() < minStatusToIgnoreZoneFlags && !HasZoneFlag(target_zone_id))
 		{
-			Message(13, "You do not have the flag to enter %s.", target_zone_name);
+			Message(Chat::Red, "You do not have the flag to enter %s.", target_zone_name);
 			myerror = ZONE_ERROR_NOEXPERIENCE;
 		}
 	}
@@ -288,7 +288,7 @@ void Client::Handle_OP_ZoneChange(const EQApplicationPacket *app) {
 		//we have successfully zoned
 		DoZoneSuccess(zc, target_zone_id, target_instance_id, dest_x, dest_y, dest_z, dest_h, ignorerestrictions);
 	} else {
-		Log(Logs::General, Logs::Error, "Zoning %s: Rules prevent this char from zoning into '%s'", GetName(), target_zone_name);
+		LogError("Zoning [{}]: Rules prevent this char from zoning into [{}]", GetName(), target_zone_name);
 		SendZoneError(zc, myerror);
 	}
 }
@@ -313,7 +313,7 @@ void Client::SendZoneCancel(ZoneChange_Struct *zc) {
 
 void Client::SendZoneError(ZoneChange_Struct *zc, int8 err)
 {
-	Log(Logs::General, Logs::Error, "Zone %i is not available because target wasn't found or character insufficent level", zc->zoneID);
+	LogError("Zone [{}] is not available because target wasn't found or character insufficent level", zc->zoneID);
 
 	EQApplicationPacket *outapp = nullptr;
 	outapp = new EQApplicationPacket(OP_ZoneChange, sizeof(ZoneChange_Struct));
@@ -348,7 +348,7 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc
 	if(this->GetPet())
 		entity_list.RemoveFromHateLists(this->GetPet());
 
-	Log(Logs::General, Logs::Status, "Zoning '%s' to: %s (%i) - (%i) x=%f, y=%f, z=%f", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z);
+	LogInfo("Zoning [{}] to: [{}] ([{}]) - ([{}]) x [{}] y [{}] z [{}]", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z);
 
 	//set the player's coordinates in the new zone so they have them
 	//when they zone into it
@@ -453,7 +453,7 @@ void Client::ProcessMovePC(uint32 zoneID, uint32 instance_id, float x, float y,
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		case GMSummon:
-			Message(15, "You have been summoned by a GM!");
+			Message(Chat::Yellow, "You have been summoned by a GM!");
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		case ZoneToBindPoint:
@@ -463,15 +463,15 @@ void Client::ProcessMovePC(uint32 zoneID, uint32 instance_id, float x, float y,
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		case SummonPC:
-			Message(15, "You have been summoned!");
+			Message(Chat::Yellow, "You have been summoned!");
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		case Rewind:
-			Message(15, "Rewinding to previous location.");
+			Message(Chat::Yellow, "Rewinding to previous location.");
 			ZonePC(zoneID, instance_id, x, y, z, heading, ignorerestrictions, zm);
 			break;
 		default:
-			Log(Logs::General, Logs::Error, "Client::ProcessMovePC received a reguest to perform an unsupported client zone operation.");
+			LogError("Client::ProcessMovePC received a reguest to perform an unsupported client zone operation");
 			break;
 	}
 }
@@ -486,7 +486,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 	database.GetZoneLongName(pShortZoneName, &pZoneName);
 
 	if(!pZoneName) {
-		Message(13, "Invalid zone number specified");
+		Message(Chat::Red, "Invalid zone number specified");
 		safe_delete_array(pZoneName);
 		return;
 	}
@@ -530,7 +530,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			heading = m_pp.binds[0].heading;
 
 			zonesummon_ignorerestrictions = 1;
-			Log(Logs::General, Logs::None, "Player %s has died and will be zoned to bind point in zone: %s at LOC x=%f, y=%f, z=%f, heading=%f", 
+			LogDebug("Player [{}] has died and will be zoned to bind point in zone: [{}] at LOC x=[{}], y=[{}], z=[{}], heading=[{}]", 
 					GetName(), pZoneName, m_pp.binds[0].x, m_pp.binds[0].y, m_pp.binds[0].z, m_pp.binds[0].heading);
 			break;
 		case SummonPC:
@@ -539,7 +539,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			SetHeading(heading);
 			break;
 		case Rewind:
-			Log(Logs::General, Logs::None, "%s has requested a /rewind from %f, %f, %f, to %f, %f, %f in %s", GetName(), 
+			LogDebug("[{}] has requested a /rewind from [{}], [{}], [{}], to [{}], [{}], [{}] in [{}]", GetName(), 
 					m_Position.x, m_Position.y, m_Position.z, 
 					m_RewindLocation.x, m_RewindLocation.y, m_RewindLocation.z, zone->GetShortName());
 			m_ZoneSummonLocation = glm::vec3(x, y, z);
@@ -547,7 +547,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			SetHeading(heading);
 			break;
 		default:
-			Log(Logs::General, Logs::Error, "Client::ZonePC() received a reguest to perform an unsupported client zone operation.");
+			LogError("Client::ZonePC() received a reguest to perform an unsupported client zone operation");
 			ReadyToZone = false;
 			break;
 	}
@@ -560,7 +560,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			Entity* entity = entity_list.GetID(entity_id_being_looted);
 			if (entity == 0)
 			{
-				Message(13, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
+				Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (ent = 0)");
 				if (ClientVersion() >= EQEmu::versions::ClientVersion::SoD)
 					Corpse::SendEndLootErrorPacket(this);
 				else
@@ -568,7 +568,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			}
 			else if (!entity->IsCorpse())
 			{
-				Message(13, "Error: OP_EndLootRequest: Corpse not found (!entity->IsCorpse())");
+				Message(Chat::Red, "Error: OP_EndLootRequest: Corpse not found (!entity->IsCorpse())");
 				Corpse::SendLootReqErrorPacket(this);
 			}
 			else
@@ -683,7 +683,7 @@ void Client::ZonePC(uint32 zoneID, uint32 instance_id, float x, float y, float z
 			safe_delete(outapp);
 		}
 
-		Log(Logs::Detail, Logs::None, "Player %s has requested a zoning to LOC x=%f, y=%f, z=%f, heading=%f in zoneid=%i", GetName(), x, y, z, heading, zoneID);
+		LogDebug("Player [{}] has requested a zoning to LOC x=[{}], y=[{}], z=[{}], heading=[{}] in zoneid=[{}]", GetName(), x, y, z, heading, zoneID);
 		//Clear zonesummon variables if we're zoning to our own zone
 		//Client wont generate a zone change packet to the server in this case so
 		//They aren't needed and it keeps behavior on next zone attempt from being undefined.
@@ -723,7 +723,7 @@ void Client::Gate(uint8 bindnum) {
 }
 
 void NPC::Gate(uint8 bindnum) {
-	entity_list.MessageClose_StringID(this, true, RuleI(Range, SpellMessages), MT_Spells, GATES, GetCleanName());
+	entity_list.MessageCloseString(this, true, RuleI(Range, SpellMessages), Chat::Spells, GATES, GetCleanName());
 
 	Mob::Gate(bindnum);
 }
@@ -777,7 +777,7 @@ void Client::SetZoneFlag(uint32 zone_id) {
 	std::string query = StringFormat("INSERT INTO zone_flags (charID,zoneID) VALUES(%d,%d)", CharacterID(), zone_id);
 	auto results = database.QueryDatabase(query);
 	if(!results.Success())
-		Log(Logs::General, Logs::Error, "MySQL Error while trying to set zone flag for %s: %s", GetName(), results.ErrorMessage().c_str());
+		LogError("MySQL Error while trying to set zone flag for [{}]: [{}]", GetName(), results.ErrorMessage().c_str());
 }
 
 void Client::ClearZoneFlag(uint32 zone_id) {
@@ -790,7 +790,7 @@ void Client::ClearZoneFlag(uint32 zone_id) {
 	std::string query = StringFormat("DELETE FROM zone_flags WHERE charID=%d AND zoneID=%d", CharacterID(), zone_id);
 	auto results = database.QueryDatabase(query);
 	if(!results.Success())
-		Log(Logs::General, Logs::Error, "MySQL Error while trying to clear zone flag for %s: %s", GetName(), results.ErrorMessage().c_str());
+		LogError("MySQL Error while trying to clear zone flag for [{}]: [{}]", GetName(), results.ErrorMessage().c_str());
 
 }
 
@@ -800,7 +800,7 @@ void Client::LoadZoneFlags() {
 	std::string query = StringFormat("SELECT zoneID from zone_flags WHERE charID=%d", CharacterID());
 	auto results = database.QueryDatabase(query);
 	if (!results.Success()) {
-		Log(Logs::General, Logs::Error, "MySQL Error while trying to load zone flags for %s: %s", GetName(), results.ErrorMessage().c_str());
+		LogError("MySQL Error while trying to load zone flags for [{}]: [{}]", GetName(), results.ErrorMessage().c_str());
 		return;
 	}
 
@@ -814,7 +814,7 @@ bool Client::HasZoneFlag(uint32 zone_id) const {
 
 void Client::SendZoneFlagInfo(Client *to) const {
 	if(zone_flags.empty()) {
-		to->Message(0, "%s has no zone flags.", GetName());
+		to->Message(Chat::White, "%s has no zone flags.", GetName());
 		return;
 	}
 
@@ -823,7 +823,7 @@ void Client::SendZoneFlagInfo(Client *to) const {
 	end = zone_flags.end();
 	char empty[1] = { '\0' };
 
-	to->Message(0, "Flags for %s:", GetName());
+	to->Message(Chat::White, "Flags for %s:", GetName());
 
 	for(; cur != end; ++cur) {
 		uint32 zoneid = *cur;
@@ -843,7 +843,7 @@ void Client::SendZoneFlagInfo(Client *to) const {
 			strcpy(flag_name, "(ERROR GETTING NAME)");
 		}
 
-		to->Message(0, "Has Flag %s for zone %s (%d,%s)", flag_name, long_name, zoneid, short_name);
+		to->Message(Chat::White, "Has Flag %s for zone %s (%d,%s)", flag_name, long_name, zoneid, short_name);
 		if(long_name != empty)
 			delete[] long_name;
 	}
@@ -863,23 +863,23 @@ bool Client::CanBeInZone() {
 	char flag_needed[128];
 	if(!database.GetSafePoints(zone->GetShortName(), zone->GetInstanceVersion(), &safe_x, &safe_y, &safe_z, &minstatus, &minlevel, flag_needed)) {
 		//this should not happen...
-		Log(Logs::Detail, Logs::None, "[CLIENT] Unable to query zone info for ourself '%s'", zone->GetShortName());
+		LogDebug("[CLIENT] Unable to query zone info for ourself [{}]", zone->GetShortName());
 		return(false);
 	}
 
 	if(GetLevel() < minlevel) {
-		Log(Logs::Detail, Logs::None, "[CLIENT] Character does not meet min level requirement (%d < %d)!", GetLevel(), minlevel);
+		LogDebug("[CLIENT] Character does not meet min level requirement ([{}] < [{}])!", GetLevel(), minlevel);
 		return(false);
 	}
 	if(Admin() < minstatus) {
-		Log(Logs::Detail, Logs::None, "[CLIENT] Character does not meet min status requirement (%d < %d)!", Admin(), minstatus);
+		LogDebug("[CLIENT] Character does not meet min status requirement ([{}] < [{}])!", Admin(), minstatus);
 		return(false);
 	}
 
 	if(flag_needed[0] != '\0') {
 		//the flag needed string is not empty, meaning a flag is required.
 		if(Admin() < minStatusToIgnoreZoneFlags && !HasZoneFlag(zone->GetZoneID())) {
-			Log(Logs::Detail, Logs::None, "[CLIENT] Character does not have the flag to be in this zone (%s)!", flag_needed);
+			LogDebug("[CLIENT] Character does not have the flag to be in this zone ([{}])!", flag_needed);
 			return(false);
 		}
 	}