Add opcode and repo

2026-05-31 13:16:39 +00:00 · 2025-02-16 22:33:15 -08:00
455 changed files with 23946 additions and 31693 deletions
@@ -1,804 +1,3 @@
 ## [23.10.3] 9/16/2025
 ### Hotfix
 * Hotfix crashes occurring in #4987. @Akkadius 2025-09-17
 ## [23.10.2] 9/16/2025
 ### Hotfix
 * Revert #4996 as it was causing critical issues with spells that needs to be further investigated. @Akkadius 2025-09-17
 ## [23.10.1] 9/16/2025
 ### Hotfix
 * Fixed Mail Key Bug ([#5015](https://github.com/EQEmu/Server/pull/5015)) @Kinglykrab 2025-09-16
 ## [23.10.0] 9/15/2025
 ### Build
 * Fix Linking with GCC ([#4969](https://github.com/EQEmu/Server/pull/4969)) @solar984 2025-08-03
 ### Code
 * Add #npcedit npc_tint_id Help Message ([#4982](https://github.com/EQEmu/Server/pull/4982)) @Kinglykrab 2025-08-17
 * Cleanup #show ip_lookup Message ([#5005](https://github.com/EQEmu/Server/pull/5005)) @Kinglykrab 2025-08-30
 * Fix #set race 0 Message ([#5004](https://github.com/EQEmu/Server/pull/5004)) @Kinglykrab 2025-08-30
 * Fix Issues with Strings::Commify and Mob::SendStatsWindow ([#4984](https://github.com/EQEmu/Server/pull/4984)) @Kinglykrab 2025-08-17
 * Remove Attributions ([#4988](https://github.com/EQEmu/Server/pull/4988)) @KimLS 2025-08-16
 * Remove Unused errorname Variable ([#5001](https://github.com/EQEmu/Server/pull/5001)) @Kinglykrab 2025-08-29
 ### Commands
 * Add #find account Subcommand ([#4981](https://github.com/EQEmu/Server/pull/4981)) @Kinglykrab 2025-08-17
 * Add #show keyring Subcommand ([#4973](https://github.com/EQEmu/Server/pull/4973)) @Kinglykrab 2025-08-03
 * Add #task complete Saylink to #task show ([#4985](https://github.com/EQEmu/Server/pull/4985)) @Kinglykrab 2025-08-17
 ### Constants
 * Change Race Changes to Race Namespace ([#5000](https://github.com/EQEmu/Server/pull/5000)) @Kinglykrab 2025-08-30
 * Convert SE Defines to SpellEffect Namespace ([#4999](https://github.com/EQEmu/Server/pull/4999)) @Kinglykrab 2025-08-30
 ### Database
 * Add `heal_amount` to `character_stats_record` ([#4986](https://github.com/EQEmu/Server/pull/4986)) @Kinglykrab 2025-08-17
 ### Fixes
 * Fix #show recipe uint16 Cap ([#4978](https://github.com/EQEmu/Server/pull/4978)) @Kinglykrab 2025-08-11
 * Fix Race 474 for Titanium ([#4979](https://github.com/EQEmu/Server/pull/4979)) @regneq 2025-08-11
 * Fix Recipe Inspect Bug ([#4994](https://github.com/EQEmu/Server/pull/4994)) @Kinglykrab 2025-08-30
 * Fix Several Evolving Item Bugs ([#4992](https://github.com/EQEmu/Server/pull/4992)) @neckkola 2025-09-08
 * Fix Task Reloading ([#5002](https://github.com/EQEmu/Server/pull/5002)) @Kinglykrab 2025-08-29
 ### Loginserver
 * Fix Legacy World When Using Local DB ([#4970](https://github.com/EQEmu/Server/pull/4970)) @solar984 2025-08-03
 ### Pets
 * Add Pet Constants and Methods ([#4987](https://github.com/EQEmu/Server/pull/4987)) @Kinglykrab 2025-08-17
 ### Quest API
 * Add EVENT_CHARM_START and EVENT_CHARM_END ([#5013](https://github.com/EQEmu/Server/pull/5013)) @Kinglykrab 2025-09-15
 * Add GetKeyRing() to Perl/Lua ([#4980](https://github.com/EQEmu/Server/pull/4980)) @Kinglykrab 2025-08-17
 * Add GetNPCTintIndex() to Perl/Lua ([#4983](https://github.com/EQEmu/Server/pull/4983)) @Kinglykrab 2025-08-17
 * Add GetTimers() and GetPausedTimers() to Perl/Lua ([#4965](https://github.com/EQEmu/Server/pull/4965)) @Kinglykrab 2025-08-03
 * Add Identifiers to Get/Modify NPC Stat Methods ([#5012](https://github.com/EQEmu/Server/pull/5012)) @Kinglykrab 2025-09-15
 ### Repositories
 * Convert Character Inspect Messages to Repositories ([#4997](https://github.com/EQEmu/Server/pull/4997)) @Kinglykrab 2025-08-30
 * Convert Damage Shield Types to Repositories ([#4995](https://github.com/EQEmu/Server/pull/4995)) @Kinglykrab 2025-08-30
 * Convert Item Loading to Repositories ([#4998](https://github.com/EQEmu/Server/pull/4998)) @Kinglykrab 2025-08-30
 * Convert Mail Key to Repositories ([#5007](https://github.com/EQEmu/Server/pull/5007)) @Kinglykrab 2025-09-15
 * Convert Shared Bank Platinum to Repositories ([#5006](https://github.com/EQEmu/Server/pull/5006)) @Kinglykrab 2025-09-02
 * Convert Spell Loading to Repositories ([#4996](https://github.com/EQEmu/Server/pull/4996)) @Kinglykrab 2025-08-30
 * Convert Total Time Played to Repositories ([#5008](https://github.com/EQEmu/Server/pull/5008)) @Kinglykrab 2025-09-15
 ## [23.9.1] 8/2/2025
 ### Hotfix
 * Fix Quest Ownership Edge Case ([#4977](https://github.com/EQEmu/Server/pull/4977)) @Kinglykrab 2025-08-02
 ## [23.9.0] 8/2/2025
 ### Bots
 * Fix FinishBuffing rule ([#4961](https://github.com/EQEmu/Server/pull/4961)) @nytmyr 2025-07-01
 * Fix ^cast resurrects ([#4958](https://github.com/EQEmu/Server/pull/4958)) @nytmyr 2025-06-29
 ### Build
 * Fix Linking with GCC ([#4969](https://github.com/EQEmu/Server/pull/4969)) @solar984 2025-08-03
 * More Build Speed Improvements ([#4959](https://github.com/EQEmu/Server/pull/4959)) @Akkadius 2025-06-30
 ### Commands
 * Add #show keyring Subcommand ([#4973](https://github.com/EQEmu/Server/pull/4973)) @Kinglykrab 2025-08-03
 ### Database
 * Add Indexes to NPC's Spawns Loot ([#4972](https://github.com/EQEmu/Server/pull/4972)) @Akkadius 2025-07-30
 ### Feature
 * Zone Scripting ([#4908](https://github.com/EQEmu/Server/pull/4908)) @Kinglykrab 2025-07-10
 ### Fixes
 * Add a missing Froglok starting area for Titanium Startzone. ([#4962](https://github.com/EQEmu/Server/pull/4962)) @regneq 2025-07-04
 * Fix Hero's Forge Ingame and Character Select ([#4966](https://github.com/EQEmu/Server/pull/4966)) @Kinglykrab 2025-07-30
 * Show player count on the server list status. ([#4971](https://github.com/EQEmu/Server/pull/4971)) @regneq 2025-07-30
 ### Loginserver
 * Fix Legacy World When Using Local DB ([#4970](https://github.com/EQEmu/Server/pull/4970)) @solar984 2025-08-03
 ### Performance
 * Clear Wearchange Deduplication Cache ([#4960](https://github.com/EQEmu/Server/pull/4960)) @Akkadius 2025-06-30
 ### Quest API
 * Add GetMemberRole() to Perl/Lua ([#4963](https://github.com/EQEmu/Server/pull/4963)) @Barathos 2025-07-10
 * Add GetTimers() and GetPausedTimers() to Perl/Lua ([#4965](https://github.com/EQEmu/Server/pull/4965)) @Kinglykrab 2025-08-03
 ## [23.8.1] 6/28/2025
 ### Crash Fix
 * Fix Possible Crashes with Raid Methods ([#4955](https://github.com/EQEmu/Server/pull/4955)) @Kinglykrab 2025-06-26
 ### Databuckets
 * Revert Caching Changes of #4917 ([#4957](https://github.com/EQEmu/Server/pull/4957)) @Akkadius 2025-06-28
 ### Fixes
 * Fix FindCharacter Using content_db ([#4956](https://github.com/EQEmu/Server/pull/4956)) @Kinglykrab 2025-06-26
 * Fix Hero Forge on Character Select ([#4954](https://github.com/EQEmu/Server/pull/4954)) @Kinglykrab 2025-06-26
 ## [23.8.0] 6/25/2025
 ### API
 * Add wwmarquee <type> <message> ([#4919](https://github.com/EQEmu/Server/pull/4919)) @Akkadius 2025-06-23
 ### Build
 * Significantly Improve Build Times Using Unity Builds ([#4948](https://github.com/EQEmu/Server/pull/4948)) @Akkadius 2025-06-22
 ### Code
 * AdventureManager Global to Singleton Cleanup ([#4931](https://github.com/EQEmu/Server/pull/4931)) @Kinglykrab 2025-06-25
 * Cleanup Strings Header ([#4950](https://github.com/EQEmu/Server/pull/4950)) @Akkadius 2025-06-22
 * ClientList Global to Singleton Cleanup ([#4942](https://github.com/EQEmu/Server/pull/4942)) @Kinglykrab 2025-06-25
 * DatabaseUpdate Global to Singleton Cleanup ([#4943](https://github.com/EQEmu/Server/pull/4943)) @Kinglykrab 2025-06-25
 * DiscordManager Global to Singleton Cleanup ([#4926](https://github.com/EQEmu/Server/pull/4926)) @Kinglykrab 2025-06-25
 * EQ::Random Global to Singleton Cleanup ([#4936](https://github.com/EQEmu/Server/pull/4936)) @Kinglykrab 2025-06-22
 * EQEmuLogSys Global to Singleton Cleanup ([#4925](https://github.com/EQEmu/Server/pull/4925)) @Akkadius 2025-06-25
 * EvolvingItemsManager Global to Singleton Cleanup ([#4929](https://github.com/EQEmu/Server/pull/4929)) @Kinglykrab 2025-06-25
 * LFGuildManager Global to Singleton Cleanup ([#4927](https://github.com/EQEmu/Server/pull/4927)) @Kinglykrab 2025-06-25
 * LoginServerList Global to Singleton Cleanup ([#4941](https://github.com/EQEmu/Server/pull/4941)) @Kinglykrab 2025-06-25
 * Optimize PCH Config (Faster Builds) ([#4951](https://github.com/EQEmu/Server/pull/4951)) @Akkadius 2025-06-22
 * PCH Cleanup ([#4952](https://github.com/EQEmu/Server/pull/4952)) @Akkadius 2025-06-25
 * PathManager Global to Singleton Cleanup ([#4924](https://github.com/EQEmu/Server/pull/4924)) @Akkadius 2025-06-22
 * PetitionList Global to Singleton Cleanup ([#4944](https://github.com/EQEmu/Server/pull/4944)) @Kinglykrab 2025-06-25
 * PlayerEventLogs Global to Singleton Cleanup ([#4928](https://github.com/EQEmu/Server/pull/4928)) @Kinglykrab 2025-06-25
 * QueryServConnection Global to Singleton Cleanup ([#4938](https://github.com/EQEmu/Server/pull/4938)) @Kinglykrab 2025-06-25
 * Remove Lua Rule Constants ([#4949](https://github.com/EQEmu/Server/pull/4949)) @Akkadius 2025-06-22
 * Remove Regex Compile Bloat ([#4947](https://github.com/EQEmu/Server/pull/4947)) @Akkadius 2025-06-22
 * Remove Unused MZoneShutdown Mutex ([#4946](https://github.com/EQEmu/Server/pull/4946)) @Kinglykrab 2025-06-22
 * SharedTaskManager Global to Singleton Cleanup ([#4930](https://github.com/EQEmu/Server/pull/4930)) @Kinglykrab 2025-06-25
 * SkillCaps Global to Singleton Cleanup ([#4933](https://github.com/EQEmu/Server/pull/4933)) @Kinglykrab 2025-06-22
 * TaskManager Global to Singleton Cleanup ([#4945](https://github.com/EQEmu/Server/pull/4945)) @Kinglykrab 2025-06-22
 * UCSConnection Global to Singleton Cleanup ([#4937](https://github.com/EQEmu/Server/pull/4937)) @Kinglykrab 2025-06-25
 * WebInterfaceList Global to Singleton Cleanup ([#4935](https://github.com/EQEmu/Server/pull/4935)) @Kinglykrab 2025-06-25
 * WorldContentServer Global to Singleton Cleanup ([#4939](https://github.com/EQEmu/Server/pull/4939)) @Kinglykrab 2025-06-25
 * WorldEventScheduler and ZoneEventScheduler Global to Singleton Cleanup ([#4932](https://github.com/EQEmu/Server/pull/4932)) @Kinglykrab 2025-06-25
 * ZSList Global to Singleton Cleanup ([#4940](https://github.com/EQEmu/Server/pull/4940)) @Kinglykrab 2025-06-25
 * ZoneStore Global to Singleton Cleanup ([#4934](https://github.com/EQEmu/Server/pull/4934)) @Kinglykrab 2025-06-23
 ### Corpses
 * Add corpse entity variables to DB ([#4911](https://github.com/EQEmu/Server/pull/4911)) @fryguy503 2025-06-25
 ### Databuckets
 * Move Databuckets to Common ([#4918](https://github.com/EQEmu/Server/pull/4918)) @Akkadius 2025-06-16
 * Nested Caching ([#4917](https://github.com/EQEmu/Server/pull/4917)) @Akkadius 2025-06-25
 ### Doors
 * Fix door saving for versions ([#4905](https://github.com/EQEmu/Server/pull/4905)) @nytmyr 2025-06-09
 ### Fixes
 * Bulk Send Corpses after Idle State ([#4910](https://github.com/EQEmu/Server/pull/4910)) @Akkadius 2025-06-09
 * Fix ClientList Singleton Shortcomings of #4942  @Akkadius 2025-06-25
 * Fix breaking changes to Titanium, SoF, SoD patches causes by big bags update ([#4922](https://github.com/EQEmu/Server/pull/4922)) @regneq 2025-06-25
 ### Logs
 * Fix output for tasks in logs ([#4907](https://github.com/EQEmu/Server/pull/4907)) @joligario 2025-06-09
 ### Performance
 * Auto Idle / AFK ([#4903](https://github.com/EQEmu/Server/pull/4903)) @Akkadius 2025-05-22
 * Wearchange Packet Send Deduplication ([#4916](https://github.com/EQEmu/Server/pull/4916)) @Akkadius 2025-06-25
 ### Player Event Logs
 * Don't Clear Event Data on ETL Events ([#4913](https://github.com/EQEmu/Server/pull/4913)) @Akkadius 2025-06-25
 ### Player Events
 * Don't Write Empty Data ([#4912](https://github.com/EQEmu/Server/pull/4912)) @Akkadius 2025-06-25
 * Zone Fetch Settings from QS if Enabled ([#4915](https://github.com/EQEmu/Server/pull/4915)) @Akkadius 2025-06-25
 ### Quest API
 * Add CompleteTask and UncompleteTask methods to Perl/Lua ([#4921](https://github.com/EQEmu/Server/pull/4921)) @Barathos 2025-06-25
 * Lua Client Scoped EnableTitleSets ([#4914](https://github.com/EQEmu/Server/pull/4914)) @fryguy503 2025-06-25
 ### Quests
 * Support Multiple Quest, Plugin, and Lua Module Paths ([#4906](https://github.com/EQEmu/Server/pull/4906)) @Akkadius 2025-06-09
 ### World API
 * Input Validation ([#4904](https://github.com/EQEmu/Server/pull/4904)) @Akkadius 2025-05-22
 ## [23.7.0] 5/19/2025
 ### CLI
 * Add custom database version output ([#4901](https://github.com/EQEmu/Server/pull/4901)) @joligario 2025-05-18
 * Fix MySQL check in database dumper ([#4897](https://github.com/EQEmu/Server/pull/4897)) @joligario 2025-05-16
 ### Commands
 * Add #zonevariable Command ([#4882](https://github.com/EQEmu/Server/pull/4882)) @Kinglykrab 2025-05-15
 ### Database
 * Add Custom Database Migrations for Operators ([#4892](https://github.com/EQEmu/Server/pull/4892)) @Akkadius 2025-05-16
 * Remove Transaction Wrapped Character Save ([#4894](https://github.com/EQEmu/Server/pull/4894)) @Akkadius 2025-05-16
 ### Fixes
 * Deadlock on failed #copycharacter commands ([#4887](https://github.com/EQEmu/Server/pull/4887)) @Akkadius 2025-05-16
 ### Logging
 * Auto Update Log Category Names ([#4890](https://github.com/EQEmu/Server/pull/4890)) @Akkadius 2025-05-16
 ### Netcode
 * Resend Logic Adjustments ([#4900](https://github.com/EQEmu/Server/pull/4900)) @Akkadius 2025-05-18
 ### Player Events
 * Add rule to ignore configured GM commands ([#4888](https://github.com/EQEmu/Server/pull/4888)) @Akkadius 2025-05-16
 ### Rules
 * Auto Update Rule Notes from Source ([#4891](https://github.com/EQEmu/Server/pull/4891)) @Akkadius 2025-05-16
 ### World
 * Fix Rarer Reload Deadlock ([#4893](https://github.com/EQEmu/Server/pull/4893)) @Akkadius 2025-05-16
 ### Zone State
 * Load New Spawn2 Data When Present ([#4889](https://github.com/EQEmu/Server/pull/4889)) @Akkadius 2025-05-16
 ## [23.6.0] 5/14/2025
 ### Bots
 * Correct ^pull logic and add checks for Enchanter pets ([#4827](https://github.com/EQEmu/Server/pull/4827)) @nytmyr 2025-05-15
 * Fix creation limit, spawn limit, level requirement checks ([#4868](https://github.com/EQEmu/Server/pull/4868)) @nytmyr 2025-05-15
 * Move all spell_id instances to uint16 ([#4876](https://github.com/EQEmu/Server/pull/4876)) @nytmyr 2025-05-15
 * Prevent non-taunters from potentially fleeing mob on TargetReflection ([#4859](https://github.com/EQEmu/Server/pull/4859)) @nytmyr 2025-04-28
 ### CLI
 * ETL Settings Output ([#4873](https://github.com/EQEmu/Server/pull/4873)) @joligario 2025-05-15
 ### Code
 * Fix typo in QueryNameAvailablity ([#4869](https://github.com/EQEmu/Server/pull/4869)) @nytmyr 2025-04-28
 ### Crash
 * Fix crash bug with pbae and quest scripts spawning mobs ([#4884](https://github.com/EQEmu/Server/pull/4884)) @carolus21rex 2025-05-15
 ### Feature
 * Add Character:TradeskillUpMinChance rule ([#4867](https://github.com/EQEmu/Server/pull/4867)) @zrix-eq 2025-05-15
 * Enable spawn attribute for NPCTintID ([#4871](https://github.com/EQEmu/Server/pull/4871)) @neckkola 2025-05-15
 ### Fixes
 * Add trader/buyer cleanup actions ([#4843](https://github.com/EQEmu/Server/pull/4843)) @neckkola 2025-05-15
 * Fix #copycharacter command ([#4860](https://github.com/EQEmu/Server/pull/4860)) @nytmyr 2025-04-28
 * Fix Crash with #task ([#4874](https://github.com/EQEmu/Server/pull/4874)) @Kinglykrab 2025-04-30
 * Fix Object Name Init, User Refs, and Client Sync on Close ([#4861](https://github.com/EQEmu/Server/pull/4861)) @zimp-wow 2025-05-15
 * Fix breaking change to UF patches caused by Big Bags update ([#4883](https://github.com/EQEmu/Server/pull/4883)) @hbingram 2025-05-15
 * Prevent Ranged Attack from being triggered at arbitrary rate ([#4879](https://github.com/EQEmu/Server/pull/4879)) @catapultam-habeo 2025-05-15
 ### Performance
 * Store Player Title Sets in Client Memory ([#4836](https://github.com/EQEmu/Server/pull/4836)) @Kinglykrab 2025-05-15
 ### Quest API
 * Add Last Login and First Login Flags to EVENT_CONNECT ([#4866](https://github.com/EQEmu/Server/pull/4866)) @Kinglykrab 2025-05-15
 ## [23.5.0] 4/10/2025
 ### API
 * World API Optimizations ([#4850](https://github.com/EQEmu/Server/pull/4850)) @Akkadius 2025-04-10
 ### Bots
 * Add valid state checks to ^clickitem ([#4830](https://github.com/EQEmu/Server/pull/4830)) @nytmyr 2025-04-10
 * Flag all buffs with SE_DamageShield as Damage Shield ([#4833](https://github.com/EQEmu/Server/pull/4833)) @nytmyr 2025-04-10
 * Positioning rewrite ([#4856](https://github.com/EQEmu/Server/pull/4856)) @nytmyr 2025-04-10
 * Restore old buff overwrite blocking ([#4832](https://github.com/EQEmu/Server/pull/4832)) @nytmyr 2025-04-10
 ### Bugfix
 * Load zone variables before encounter_load. ([#4846](https://github.com/EQEmu/Server/pull/4846)) @zimp-wow 2025-04-10
 * Prevent depops from blocking new spawns. ([#4841](https://github.com/EQEmu/Server/pull/4841)) @zimp-wow 2025-04-10
 * Prevent final shutdown from persisting incomplete state. ([#4849](https://github.com/EQEmu/Server/pull/4849)) @zimp-wow 2025-04-10
 ### Code
 * Remove queryserv dump flag ([#4842](https://github.com/EQEmu/Server/pull/4842)) @joligario 2025-04-10
 * Update link for legacy EQEmu loginserver account setup ([#4826](https://github.com/EQEmu/Server/pull/4826)) @joligario 2025-04-10
 ### Crash
 * Fix rarer exception crash issue in PlayerEventLogs::ProcessBatchQueue ([#4835](https://github.com/EQEmu/Server/pull/4835)) @Akkadius 2025-04-03
 ### Database
 * Fix manifest for `helmtexture` in `horses` table ([#4852](https://github.com/EQEmu/Server/pull/4852)) @joligario 2025-04-10
 ### Feature
 * Add rule to consume command text from any channel ([#4839](https://github.com/EQEmu/Server/pull/4839)) @catapultam-habeo 2025-04-10
 ### Fixes
 * Add the bazaar search limit to query ([#4829](https://github.com/EQEmu/Server/pull/4829)) @neckkola 2025-04-10
 * Backfill expire_at (not sure why this didn't make it in there to begin with)  @Akkadius 2025-03-31
 * Bazaar Search window not working in a DZ ([#4828](https://github.com/EQEmu/Server/pull/4828)) @neckkola 2025-04-10
 * Databuckets Account Cache Loading ([#4855](https://github.com/EQEmu/Server/pull/4855)) @Akkadius 2025-04-10
 * Fix missing timer_name check on Mob::StopTimer ([#4840](https://github.com/EQEmu/Server/pull/4840)) @zimp-wow 2025-04-04
 * FixHeading Infinite Loop Fix ([#4854](https://github.com/EQEmu/Server/pull/4854)) @KimLS 2025-04-10
 * Make sure we don't expire default value instances  @Akkadius 2025-03-31
 * Regression in World SendEmoteMessageRaw ([#4837](https://github.com/EQEmu/Server/pull/4837)) @Akkadius 2025-04-03
 * Remove QS Tables From Export  @Akkadius 2025-04-10
 * Zone State Spawn2 Location Restore ([#4844](https://github.com/EQEmu/Server/pull/4844)) @Akkadius 2025-04-10
 ### Netcode
 * Fix Stale Client Edge Case ([#4853](https://github.com/EQEmu/Server/pull/4853)) @Akkadius 2025-04-10
 ### Performance
 * Character Save Optimizations ([#4851](https://github.com/EQEmu/Server/pull/4851)) @Akkadius 2025-04-10
 * Network Ring Buffers ([#4857](https://github.com/EQEmu/Server/pull/4857)) @Akkadius 2025-04-10
 * Pre-Compute CLE Server Lists ([#4838](https://github.com/EQEmu/Server/pull/4838)) @Akkadius 2025-04-10
 ### Spells
 * Fear resistance effects edge case fixes and support for SPA 102 as an AA ([#4848](https://github.com/EQEmu/Server/pull/4848)) @KayenEQ 2025-04-10
 * Update to SPA 180 SE_ResistSpellChance to not block unresistable spells. ([#4847](https://github.com/EQEmu/Server/pull/4847)) @KayenEQ 2025-04-10
 * Update to SPA 378 SE_SpellEffectResistChance ([#4845](https://github.com/EQEmu/Server/pull/4845)) @KayenEQ 2025-04-10
 ## [23.4.0] 3/30/2025
 ### API
 * Expose Zoneserver Compile Metadata ([#4815](https://github.com/EQEmu/Server/pull/4815)) @Akkadius 2025-03-29
 ### Bots
 * Charmed Pets were breaking Mob respawns ([#4780](https://github.com/EQEmu/Server/pull/4780)) @nytmyr 2025-03-16
 * Enraged positioning ([#4789](https://github.com/EQEmu/Server/pull/4789)) @nytmyr 2025-03-29
 * Fix IsValidSpellTypeBySpellID to account for all types ([#4764](https://github.com/EQEmu/Server/pull/4764)) @nytmyr 2025-03-19
 * Fix Rule ZonesWithSpawnLimits/ZonesWithForcedSpawnLimits errors ([#4791](https://github.com/EQEmu/Server/pull/4791)) @nytmyr 2025-03-29
 * Fix rule Bots:FinishBuffing ([#4788](https://github.com/EQEmu/Server/pull/4788)) @nytmyr 2025-03-29
 * Line of Sight and Mez optimizations and cleanup ([#4746](https://github.com/EQEmu/Server/pull/4746)) @nytmyr 2025-03-29
 * Prevent bot pets from despawning on #repop ([#4790](https://github.com/EQEmu/Server/pull/4790)) @nytmyr 2025-03-29
 ### Code
 * Control flow defaults missed in recent bot updates ([#4817](https://github.com/EQEmu/Server/pull/4817)) @joligario 2025-03-30
 * Remove Extraneous Time Type in ShowZoneData ([#4806](https://github.com/EQEmu/Server/pull/4806)) @Kinglykrab 2025-03-29
 * Remove Unused Command Methods ([#4805](https://github.com/EQEmu/Server/pull/4805)) @Kinglykrab 2025-03-29
 * UCS Member Count ([#4819](https://github.com/EQEmu/Server/pull/4819)) @joligario 2025-03-30
 ### Commands
 * Add #show zone_variables ([#4812](https://github.com/EQEmu/Server/pull/4812)) @Akkadius 2025-03-29
 * Add Instance Support to #zoneshutdown ([#4807](https://github.com/EQEmu/Server/pull/4807)) @Kinglykrab 2025-03-29
 ### Crash
 * Fix Rarer World Crash with Player Event Thread Processor ([#4800](https://github.com/EQEmu/Server/pull/4800)) @Akkadius 2025-03-29
 * Fix Repop Race Condition Crash ([#4814](https://github.com/EQEmu/Server/pull/4814)) @Akkadius 2025-03-29
 ### Database
 * Fix Respawn Times Table ([#4802](https://github.com/EQEmu/Server/pull/4802)) @Akkadius 2025-03-29
 * Wrap PurgeExpiredInstances in a Transaction ([#4824](https://github.com/EQEmu/Server/pull/4824)) @Akkadius 2025-03-30
 ### Feature
 * Implement /changename & related script bindings. Clean up #set name ([#4770](https://github.com/EQEmu/Server/pull/4770)) @catapultam-habeo 2025-03-20
 ### Fixes
 * AllowFVNoDrop Flag trades ([#4809](https://github.com/EQEmu/Server/pull/4809)) @neckkola 2025-03-27
 * Fix Instance Creation Race Condition ([#4803](https://github.com/EQEmu/Server/pull/4803)) @Akkadius 2025-03-29
 * Fix zone crash when attempting to add a disappearing client to hate list. ([#4782](https://github.com/EQEmu/Server/pull/4782)) @zimp-wow 2025-03-19
 * Globally Reloading Quests when not loaded ([#4813](https://github.com/EQEmu/Server/pull/4813)) @Akkadius 2025-03-29
 * Instance DZ Creation ([#4823](https://github.com/EQEmu/Server/pull/4823)) @Akkadius 2025-03-30
 * Zone State Entity Variable Load Pre-Spawn ([#4785](https://github.com/EQEmu/Server/pull/4785)) @Akkadius 2025-03-19
 * Zone State Position Fix ([#4784](https://github.com/EQEmu/Server/pull/4784)) @Akkadius 2025-03-19
 * Zone State Variables Load First ([#4798](https://github.com/EQEmu/Server/pull/4798)) @Akkadius 2025-03-29
 * Zone state edge case with 0 hp ([#4787](https://github.com/EQEmu/Server/pull/4787)) @Akkadius 2025-03-29
 ### Instance
 * Clear Respawn Timers on Creation ([#4801](https://github.com/EQEmu/Server/pull/4801)) @Akkadius 2025-03-29
 ### Instances
 * Add `expire_at` Column ([#4820](https://github.com/EQEmu/Server/pull/4820)) @Akkadius 2025-03-30
 ### Performance
 * Add several database indexes ([#4811](https://github.com/EQEmu/Server/pull/4811)) @Akkadius 2025-03-29
 * Have World Send Smarter Guild Updates ([#4796](https://github.com/EQEmu/Server/pull/4796)) @Akkadius 2025-03-29
 * Improve Character Select DB Performance ([#4799](https://github.com/EQEmu/Server/pull/4799)) @Akkadius 2025-03-29
 * Reduce Adventure S2S chatter ([#4793](https://github.com/EQEmu/Server/pull/4793)) @Akkadius 2025-03-29
 * Reduce CorpseOwnerOnline S2S Chatter to World ([#4795](https://github.com/EQEmu/Server/pull/4795)) @Akkadius 2025-03-29
 * Reduce LFGuild Chatter ([#4794](https://github.com/EQEmu/Server/pull/4794)) @Akkadius 2025-03-29
 * Reduce UpdateWho S2S Chatter to World ([#4792](https://github.com/EQEmu/Server/pull/4792)) @Akkadius 2025-03-29
 * Send Smarter Emote Packets ([#4818](https://github.com/EQEmu/Server/pull/4818)) @Akkadius 2025-03-30
 ### Quest API
 * Add Support for NPC ID and NPC Name Specificity ([#4781](https://github.com/EQEmu/Server/pull/4781)) @Kinglykrab 2025-03-19
 ### Reload
 * Add Reload for Maps / Navs ([#4816](https://github.com/EQEmu/Server/pull/4816)) @Akkadius 2025-03-29
 ### Zone
 * Zone State Automated Testing and Improvements ([#4808](https://github.com/EQEmu/Server/pull/4808)) @Akkadius 2025-03-30
 * Zone State Improvements Part 3 ([#4773](https://github.com/EQEmu/Server/pull/4773)) @Akkadius 2025-03-13
 ## [23.3.4] 3/14/2025
 ### Fixes
 * Add check for simultaneous direct vendor and parcel Trader/Buyer Purchase ([#4778](https://github.com/EQEmu/Server/pull/4778)) @neckkola 2025-03-14
 * Fix for rare circumstance where NPC's would have 0 health on restore @Akkadius
 ## [23.3.3] 3/13/2025
 ### Database
 * Add indexes for data_buckets and zone_state_spawns ([#4771](https://github.com/EQEmu/Server/pull/4771)) @Akkadius 2025-03-11
 ### Fixes
 * Update GuildBank to correctly handle items with charges equal to zero ([#4774](https://github.com/EQEmu/Server/pull/4774)) @neckkola 2025-03-13
 ### Networking
 * Fix "port in use" error ([#4772](https://github.com/EQEmu/Server/pull/4772)) @Akkadius 2025-03-12
 ### Zone
 * Zone State Improvements Part 3 ([#4773](https://github.com/EQEmu/Server/pull/4773)) @Akkadius 2025-03-13
 ## [23.3.2] 3/11/2025
 ### DynamicZones
 * Bulk request dz member statuses on zone boot ([#4769](https://github.com/EQEmu/Server/pull/4769)) @hgtw 2025-03-11
 ### Zone
 * Zone State Improvements (Continued) ([#4768](https://github.com/EQEmu/Server/pull/4768)) @Akkadius 2025-03-11
 ## [23.3.0] 3/8/2025
 ### Bots
 * Fix buffs not overwriting lesser buffs ([#4756](https://github.com/EQEmu/Server/pull/4756)) @nytmyr 2025-03-06
 * Fix taunting bots positioning ([#4754](https://github.com/EQEmu/Server/pull/4754)) @nytmyr 2025-03-06
 * Move commanded spell map to zone ([#4755](https://github.com/EQEmu/Server/pull/4755)) @nytmyr 2025-03-06
 ### Code
 * Fix typo in GM tradeskill combine message ([#4762](https://github.com/EQEmu/Server/pull/4762)) @nytmyr 2025-03-08
 ### Crash
 * Bot aura crash fix ([#4752](https://github.com/EQEmu/Server/pull/4752)) @nytmyr 2025-03-06
 ### Databuckets
 * Nested Databuckets Protections and Improvements ([#4748](https://github.com/EQEmu/Server/pull/4748)) @Akkadius 2025-03-04
 ### Feature
 * Add Rule for dealing with augments when an item evolves ([#4758](https://github.com/EQEmu/Server/pull/4758)) @neckkola 2025-03-08
 * Allow assigning Helm Texture independently of Body Texture for Horses ([#4759](https://github.com/EQEmu/Server/pull/4759)) @catapultam-habeo 2025-03-08
 ### Fixes
 * Add crash checks for certain PlayerEventLogs ([#4761](https://github.com/EQEmu/Server/pull/4761)) @neckkola 2025-03-07
 * Correct incorrectly calculated stat caps with Heroic Stats ([#4760](https://github.com/EQEmu/Server/pull/4760)) @catapultam-habeo 2025-03-08
 * Fix sigabort crash from invalid JSON  @Akkadius 2025-03-03
 * Forgot to push up some changes for test output  @Akkadius 2025-03-04
 * Parcel Delivery Updates for two edge cases ([#4753](https://github.com/EQEmu/Server/pull/4753)) @neckkola 2025-03-06
 * Remove one port check in world  @Akkadius 2025-03-03
 * Zero out currentnpcid whenever spawn is reset. ([#4763](https://github.com/EQEmu/Server/pull/4763)) @zimp-wow 2025-03-08
 ### Logging
 * Convert JSON Error to Data Buckets Logging Category ([#4747](https://github.com/EQEmu/Server/pull/4747)) @Kinglykrab 2025-03-04
 ### Pets
 * Fix renamed pets loading as blank names ([#4751](https://github.com/EQEmu/Server/pull/4751)) @nytmyr 2025-03-05
 ### Rules
 * Fix EvolvingItems:PercentOfRaidExperience Description ([#4757](https://github.com/EQEmu/Server/pull/4757)) @Kinglykrab 2025-03-07
 ### Tests
 * Cleanup Hand-in Tests ([#4749](https://github.com/EQEmu/Server/pull/4749)) @Akkadius 2025-03-04
 ### Zone
 * Make zone controller less likely to be visible, immune to all forms of combat ([#4750](https://github.com/EQEmu/Server/pull/4750)) @Akkadius 2025-03-06
 * State Save Improvements ([#4765](https://github.com/EQEmu/Server/pull/4765)) @Akkadius 2025-03-08
 ## [23.2.0] 3/3/2025
 ### Crash
 * Database SetMutex crash fix ([#4741](https://github.com/EQEmu/Server/pull/4741)) @Akkadius 2025-03-03
 * Fix Aura process crash with bots ([#4743](https://github.com/EQEmu/Server/pull/4743)) @Akkadius 2025-03-03
 * Fix crash in add loot code path ([#4745](https://github.com/EQEmu/Server/pull/4745)) @Akkadius 2025-03-03
 * Fix world repop crash ([#4742](https://github.com/EQEmu/Server/pull/4742)) @Akkadius 2025-03-03
 * Potential crash fix in scan close mobs ([#4744](https://github.com/EQEmu/Server/pull/4744)) @Akkadius 2025-03-03
 ### Fixes
 * Cleanup zone buckets on instance purge. ([#4739](https://github.com/EQEmu/Server/pull/4739)) @zimp-wow 2025-03-02
 * Fix an error causing Endurance Regen to not be applied by items. ([#4738](https://github.com/EQEmu/Server/pull/4738)) @catapultam-habeo 2025-03-02
 ### World
 * Check if port in use to avoid double booting mistakes ([#4740](https://github.com/EQEmu/Server/pull/4740)) @Akkadius 2025-03-03
 ## [23.1.0] 3/1/2025
 ### Bots
 * Fix unresponsive bots in groups upon group wipe ([#4712](https://github.com/EQEmu/Server/pull/4712)) @nytmyr 2025-02-28
 ### Code
 * More login <-> world code cleanup ([#4724](https://github.com/EQEmu/Server/pull/4724)) @Akkadius 2025-02-28
 ### Crash
 * Check for directory existence before traversing in CheckForCompatibleQuestPlugins ([#4730](https://github.com/EQEmu/Server/pull/4730)) @Akkadius 2025-03-02
 * Fix filesystem crash / exception in DatabaseDumpService::RemoveCredentialsFile() ([#4731](https://github.com/EQEmu/Server/pull/4731)) @Akkadius 2025-03-01
 * Fix large file size crash in File::GetContents for windows ([#4735](https://github.com/EQEmu/Server/pull/4735)) @Akkadius 2025-03-02
 * Fix reload concurrency crash when ran from Spire ([#4733](https://github.com/EQEmu/Server/pull/4733)) @Akkadius 2025-03-02
 * Validate item in SE_SummonItemIntoBag ([#4734](https://github.com/EQEmu/Server/pull/4734)) @Akkadius 2025-03-02
 * World CLI validation ([#4728](https://github.com/EQEmu/Server/pull/4728)) @Akkadius 2025-03-01
 ### Database
 * Remove force_interactive from big bag updates ([#4727](https://github.com/EQEmu/Server/pull/4727)) @Akkadius 2025-03-01
 ### Feature
 * Add a rule for spells to bypass stacking rules ([#4716](https://github.com/EQEmu/Server/pull/4716)) @catapultam-habeo 2025-02-28
 * Evolving items Additions ([#4725](https://github.com/EQEmu/Server/pull/4725)) @neckkola 2025-03-01
 ### Fixes
 * Add character_pet_name to player tables schema  @Akkadius 2025-03-02
 * Add client packets to questmanager:setguild ([#4732](https://github.com/EQEmu/Server/pull/4732)) @neckkola 2025-03-01
 * Clear m_completed_shared_tasks before reloading  @Akkadius 2025-02-24
 * Fix AA Reset Error Message ([#4720](https://github.com/EQEmu/Server/pull/4720)) @Kinglykrab 2025-02-28
 * Fix Issue with Suffixes/Prefixes ([#4723](https://github.com/EQEmu/Server/pull/4723)) @Kinglykrab 2025-02-28
 * Fix Trading Items to Bot Pets ([#4721](https://github.com/EQEmu/Server/pull/4721)) @MortimerGreenwald 2025-02-28
 * Refactor ApplyItemBonuses to fix double-counting of ATK and recommended levels not correctly applying ([#4713](https://github.com/EQEmu/Server/pull/4713)) @catapultam-habeo 2025-03-01
 ### Loginserver
 * Minor cleanup ([#4729](https://github.com/EQEmu/Server/pull/4729)) @Akkadius 2025-03-01
 ### Quest API
 * Add Key Ring Methods to Perl and Lua ([#4719](https://github.com/EQEmu/Server/pull/4719)) @Kinglykrab 2025-02-28
 * Implement eq.handin() and quest::handin() ([#4718](https://github.com/EQEmu/Server/pull/4718)) @Akkadius 2025-02-28
 ### Tasks
 * Extend IsTaskCompleted to also be aware of shared task completion ([#4714](https://github.com/EQEmu/Server/pull/4714)) @Akkadius 2025-02-24
 ### Zone
 * Implement Zone State Saving on Shutdown ([#4715](https://github.com/EQEmu/Server/pull/4715)) @Akkadius 2025-02-28
 ### Zone State
 * Wrap all serialization/deserialization in try/catch ([#4726](https://github.com/EQEmu/Server/pull/4726)) @Akkadius 2025-03-01
 ## [23.0.2] 2/21/2025
 ### Bots
 * Add checks to ensure bots and pets do not engage on ^pull ([#4708](https://github.com/EQEmu/Server/pull/4708)) @nytmyr 2025-02-22
 * Improve positioning ([#4709](https://github.com/EQEmu/Server/pull/4709)) @nytmyr 2025-02-22
 * Prevent medding in combat if any mob has bot targeted ([#4707](https://github.com/EQEmu/Server/pull/4707)) @nytmyr 2025-02-22
 ### Client Mod
 * Adds a hacked fast camp rule for GMs ([#4697](https://github.com/EQEmu/Server/pull/4697)) @KimLS 2025-02-20
 ### Fixes
 * Fix Lua Zone ID Exports ([#4700](https://github.com/EQEmu/Server/pull/4700)) @Kinglykrab 2025-02-22
 * Fix bad Mob reference in QuestManager::resumetimer() ([#4710](https://github.com/EQEmu/Server/pull/4710)) @zimp-wow 2025-02-22
 * Fix cursor load on zone ([#4704](https://github.com/EQEmu/Server/pull/4704)) @nytmyr 2025-02-22
 * Fix infinite loop in QuestManager::stoptimer() ([#4703](https://github.com/EQEmu/Server/pull/4703)) @zimp-wow 2025-02-21
 ### Quest API
 * Add GetSpawn() to Perl and Lua ([#4702](https://github.com/EQEmu/Server/pull/4702)) @Kinglykrab 2025-02-22
 ## [23.0.1] 2/20/2025
 ### Fixes
 * Player event ordering merge fix ([#4699](https://github.com/EQEmu/Server/pull/4699)) @Akkadius 2025-02-20
 ### Quest API
 * Add DisableRespawnTimers to Perl and Lua ([#4691](https://github.com/EQEmu/Server/pull/4691)) @Kinglykrab 2025-02-20
 ## [23.0.0] 2/19/2025
 ### Bots
 * Add AEHateLine to HateLine ParentType ([#4678](https://github.com/EQEmu/Server/pull/4678)) @nytmyr 2025-02-15
 * Add IsInRaidOrGroup checks to ^attack and ^pull ([#4654](https://github.com/EQEmu/Server/pull/4654)) @nytmyr 2025-02-07
 * Add missing stance options ([#4681](https://github.com/EQEmu/Server/pull/4681)) @nytmyr 2025-02-15
 * Bot Overhaul ([#4580](https://github.com/EQEmu/Server/pull/4580)) @nytmyr 2025-02-03
 * Command Cleanup ([#4676](https://github.com/EQEmu/Server/pull/4676)) @nytmyr 2025-02-15
 * Correct camp count on ^camp ([#4650](https://github.com/EQEmu/Server/pull/4650)) @nytmyr 2025-02-06
 * Correct helper message for forced casts ([#4656](https://github.com/EQEmu/Server/pull/4656)) @nytmyr 2025-02-07
 * Crash fixes related to GetNumberNeedingHealedInGroup ([#4684](https://github.com/EQEmu/Server/pull/4684)) @nytmyr 2025-02-15
 * Fix AE range calculation ([#4683](https://github.com/EQEmu/Server/pull/4683)) @nytmyr 2025-02-15
 * Fix Bards not casting ([#4638](https://github.com/EQEmu/Server/pull/4638)) @nytmyr 2025-02-03
 * Fix a couple potential crashes with GetNumberNeedingHealedInGroup ([#4652](https://github.com/EQEmu/Server/pull/4652)) @nytmyr 2025-02-07
 * Fix crash related to GetTempSpellType() ([#4649](https://github.com/EQEmu/Server/pull/4649)) @nytmyr 2025-02-06
 * Fix pets causing aggro ([#4677](https://github.com/EQEmu/Server/pull/4677)) @nytmyr 2025-02-15
 * Fix spell priority commands ([#4660](https://github.com/EQEmu/Server/pull/4660)) @nytmyr 2025-02-08
 * Fix typo in positioning ([#4659](https://github.com/EQEmu/Server/pull/4659)) @nytmyr 2025-02-08
 * Move BotGetSpellsByType to cache ([#4655](https://github.com/EQEmu/Server/pull/4655)) @nytmyr 2025-02-07
 * Prevents casting on ineligible targets due to target type, stacking, etc. ([#4680](https://github.com/EQEmu/Server/pull/4680)) @nytmyr 2025-02-15
 * Sanity checks for spell type updates ([#4641](https://github.com/EQEmu/Server/pull/4641)) @nytmyr 2025-02-05
 ### Bug
 * Item Purchase Offset when multiple buyers are buying at the same time. ([#4628](https://github.com/EQEmu/Server/pull/4628)) @fryguy503 2025-02-06
 ### CI
 * Fix database race condition ([#4646](https://github.com/EQEmu/Server/pull/4646)) @Akkadius 2025-02-06
 ### Client Mod
 * Adds a hacked fast camp rule for GMs ([#4697](https://github.com/EQEmu/Server/pull/4697)) @KimLS 2025-02-20
 ### Code
 * Bot RaidGroupSay ([#4653](https://github.com/EQEmu/Server/pull/4653)) @nytmyr 2025-02-07
 * Cleanup logic in cursor bag check ([#4642](https://github.com/EQEmu/Server/pull/4642)) @nytmyr 2025-02-04
 * Use Repositories for Titles ([#4608](https://github.com/EQEmu/Server/pull/4608)) @Kinglykrab 2025-02-07
 ### Commands
 * Fix #goto not accepting proper heading ([#4685](https://github.com/EQEmu/Server/pull/4685)) @nytmyr 2025-02-15
 * Fix Illusion Block ([#4666](https://github.com/EQEmu/Server/pull/4666)) @nytmyr 2025-02-12
 ### Crash
 * Fix raid/group crash regression ([#4671](https://github.com/EQEmu/Server/pull/4671)) @Akkadius 2025-02-12
 * Fix zone crash caused by NPC::MoveTo ([#4639](https://github.com/EQEmu/Server/pull/4639)) @catapultam-habeo 2025-02-03
 ### Databuckets
 * Add Zone Scoped Databuckets ([#4690](https://github.com/EQEmu/Server/pull/4690)) @Akkadius 2025-02-18
 ### Expeditions
 * Move expedition code into DynamicZone ([#4672](https://github.com/EQEmu/Server/pull/4672)) @hgtw 2025-02-16
 ### Feature
 * Add Support for Tradeskill Recipe Inspect ([#4648](https://github.com/EQEmu/Server/pull/4648)) @Kinglykrab 2025-02-06
 * Add rule to allow /changepetname to function without being enabled by scripts.  @catapultam-habeo 2025-02-05
 * GuildBank Updates ([#4674](https://github.com/EQEmu/Server/pull/4674)) @neckkola 2025-02-15
 * Implement Big Bags ([#4606](https://github.com/EQEmu/Server/pull/4606)) @Kinglykrab 2025-02-03
 ### Fixes
 * #rq and #reload quest alias ([#4694](https://github.com/EQEmu/Server/pull/4694)) @Akkadius 2025-02-18
 * Always spawn zone controller first ([#4669](https://github.com/EQEmu/Server/pull/4669)) @Akkadius 2025-02-12
 * Big Bag Cleanup ([#4643](https://github.com/EQEmu/Server/pull/4643)) @fryguy503 2025-02-05
 * Big Bag additional fixes ([#4644](https://github.com/EQEmu/Server/pull/4644)) @fryguy503 2025-02-05
 * Change logging level for no items found in a bazaar search to reduce spam logs. ([#4675](https://github.com/EQEmu/Server/pull/4675)) @neckkola 2025-02-13
 * Find Zone - Expansion Settings ([#4692](https://github.com/EQEmu/Server/pull/4692)) @MortimerGreenwald 2025-02-18
 * Fix Beastlord Warder Size Modifier ([#4665](https://github.com/EQEmu/Server/pull/4665)) @Kinglykrab 2025-02-12
 * Fix CI since hand-ins are merged  @Akkadius 2025-02-03
 * Fix Illusion Fade Texture Bug ([#4673](https://github.com/EQEmu/Server/pull/4673)) @Kinglykrab 2025-02-14
 * Fix Item Discovery ([#4663](https://github.com/EQEmu/Server/pull/4663)) @Kinglykrab 2025-02-10
 * Fix ST_GroupNoPets and ST_GroupClientAndPet ([#4667](https://github.com/EQEmu/Server/pull/4667)) @nytmyr 2025-02-10
 * Fix SendStatsWindow Mod2 Value Display ([#4658](https://github.com/EQEmu/Server/pull/4658)) @Kinglykrab 2025-02-07
 * Fix Tradeskill Queries ([#4661](https://github.com/EQEmu/Server/pull/4661)) @Kinglykrab 2025-02-09
 * Fix error in update manifest ([#4637](https://github.com/EQEmu/Server/pull/4637)) @nytmyr 2025-02-03
 * Fix issue with getting an unset nested databucket ([#4693](https://github.com/EQEmu/Server/pull/4693)) @Akkadius 2025-02-19
 * Fix non-error in player_event_logs ([#4695](https://github.com/EQEmu/Server/pull/4695)) @Akkadius 2025-02-18
 * GMMove Update Edge Case With Clients ([#4686](https://github.com/EQEmu/Server/pull/4686)) @Akkadius 2025-02-15
 * Item Handins to Pets ([#4687](https://github.com/EQEmu/Server/pull/4687)) @Akkadius 2025-02-15
 * Parcel Delivery Updates ([#4688](https://github.com/EQEmu/Server/pull/4688)) @neckkola 2025-02-16
 * Prevent zone from loading ETL ID's on bootup ([#4696](https://github.com/EQEmu/Server/pull/4696)) @Akkadius 2025-02-18
 * Update pre big bag corpse slot_id's to support big bags ([#4679](https://github.com/EQEmu/Server/pull/4679)) @nytmyr 2025-02-15
 ### Inventory
 * Fix cursor bag saving to invalid slot_ids ([#4640](https://github.com/EQEmu/Server/pull/4640)) @nytmyr 2025-02-04
 ### Items
 * Overhaul Item Hand-in System ([#4593](https://github.com/EQEmu/Server/pull/4593)) @Akkadius 2025-02-03
 ### Loginserver
 * Fix iterator crash ([#4670](https://github.com/EQEmu/Server/pull/4670)) @Akkadius 2025-02-12
 * Modernize codebase ([#4647](https://github.com/EQEmu/Server/pull/4647)) @Akkadius 2025-02-06
 ### NPC Handins
 * Fix MultiQuest Handins ([#4651](https://github.com/EQEmu/Server/pull/4651)) @Akkadius 2025-02-07
 ### Performance
 * Server Reload Overhaul ([#4689](https://github.com/EQEmu/Server/pull/4689)) @Akkadius 2025-02-18
 ### Player Event Logs
 * Migrate and Deprecate QS Legacy Logging ([#4542](https://github.com/EQEmu/Server/pull/4542)) @neckkola 2025-02-05
 ### Quest API
 * Add Bandolier Methods ([#4635](https://github.com/EQEmu/Server/pull/4635)) @Kinglykrab 2025-02-03
 * Add Potion Belt Methods ([#4634](https://github.com/EQEmu/Server/pull/4634)) @Kinglykrab 2025-02-04
 * Add Zone Support to Perl and Lua ([#4662](https://github.com/EQEmu/Server/pull/4662)) @Kinglykrab 2025-02-09
 ### Spells
 * Add all types to checks for max_targets_allowed rule for AEs ([#4682](https://github.com/EQEmu/Server/pull/4682)) @nytmyr 2025-02-15
 ## [22.62.2] 2/1/2025
 ### Fixes
@@ -42,7 +42,6 @@ IF(USE_MAP_MMFS)
 ENDIF (USE_MAP_MMFS)
 IF(MSVC)
 	add_compile_options(/bigobj)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
 	ADD_DEFINITIONS(-DCRASH_LOGGING)
@@ -363,8 +362,6 @@ MESSAGE(STATUS "**************************************************")
 #setup server libs and headers
 SET(SERVER_LIBS common ${DATABASE_LIBRARY_LIBS} ${ZLIB_LIBRARY_LIBS} ${Boost_LIBRARIES} uv_a fmt RecastNavigation::Detour)
 set(FMT_HEADER_ONLY OFF)
 INCLUDE_DIRECTORIES(SYSTEM "${DATABASE_LIBRARY_INCLUDE}")
 INCLUDE_DIRECTORIES(SYSTEM "${ZLIB_LIBRARY_INCLUDE}")
 INCLUDE_DIRECTORIES(SYSTEM "${Boost_INCLUDE_DIRS}")
@@ -1,150 +1,83 @@
-<h1 align="center">EQEmulator Server Platform</h1>
+# EQEmulator Core Server
-
+| Drone (Linux x64) | Drone (Windows x64)   |
-<p align="center">
+|:---:|:---:|
- <img src="https://github.com/user-attachments/assets/11942e15-b512-402d-a619-0543c7f1151e" style="border-radius: 10px">
+|[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |
 </p>
 <p align="center">
 <b>EQEmulator - A Fan-Made Project Honoring a Legendary MMORPG</b>
 </p>
 <p align="center">
 <a href="https://github.com/eqemu/server/graphs/contributors"><img src="https://img.shields.io/github/contributors/eqemu/server" alt="Contributors"></a>
 <a href="https://discord.gg/QHsm7CD"><img src="https://img.shields.io/discord/212663220849213441?label=Discord&amp;logo=discord&amp;color=7289DA" alt="Discord"></a>
 <a href="https://docs.eqemu.io"><img src="https://img.shields.io/badge/docs-MkDocs%20Powered-blueviolet" alt="Docs"></a>
 <a href="./LICENSE"><img src="https://img.shields.io/github/license/EQEmu/Server" alt="License"></a> 
 <a href="https://github.com/eqemu/server/releases"><img src="https://img.shields.io/github/v/release/eqemu/server" alt="Latest Release"></a>
 <a href="https://github.com/EQEmu/Server/releases"><img src="https://img.shields.io/github/release-date/EQEmu/Server" alt="Release Date"></a>
 <img src="https://img.shields.io/github/downloads/eqemu/server/total.svg" alt="Github All Releases"></a>
 <a href="http://drone.akkadius.com/EQEmu/Server"><img src="http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg" alt="Build Status"></a> 
 <img src="https://img.shields.io/github/issues-pr-closed/eqemu/server" alt="GitHub Issues or Pull Requests">
 <img src="https://img.shields.io/docker/pulls/akkadius/eqemu-server" alt="Docker Pulls">
 <a href="http://drone.akkadius.com/EQEmu/Server"><img src="http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg" alt="Build Status"></a> <img src="https://jb.gg/badges/official-plastic.svg" alt="Official"> 
 </p>
 ***
-<p align="center">
+**EQEmulator is a custom completely from-scratch open source server implementation for EverQuest built mostly on C++**
-EQEmulator is a <b>passion-driven</b>, <b>open source server emulator</b> project dedicated to preserving and celebrating the legacy of a groundbreaking classic MMORPG.
+ * MySQL/MariaDB is used as the database engine (over 200+ tables)
-</p>
+ * Perl and LUA are both supported scripting languages for NPC/Player/Quest oriented events
 * Open source database (Project EQ) has content up to expansion OoW (included in server installs)
  * Game server environments and databases can be heavily customized to create all new experiences
 * Hundreds of Quests/events created and maintained by Project EQ
-<p align="center">
+## Server Installs
-For over two decades and continuing, EQEmulator has served as a <strong>fan tribute</strong>, providing tools and technology that allow players to explore, customize, and experience the legendary game's iconic gameplay in new ways. This project exists solely out of <strong>deep admiration</strong> for the original developers, artists, designers, and visionaries who created one of the most influential online worlds of all time.
+| |Windows|Linux|
-</p>
+|:---:|:---:|:---:|
 |**Install Count**|![Windows Install Count](http://analytics.akkadius.com/?install_count&windows_count)|![Linux Install Count](http://analytics.akkadius.com/?install_count&linux_count)| 
 ### > Windows 
-<p align="center">
+* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-windows/)
 We do not claim ownership of the original game or its assets. <strong>All credit and respect belong to the original creators and Daybreak Game Company</strong>, whose work continues to inspire generations of players and developers alike.
 </p>
-<p align="center">
+### > Debian/Ubuntu/CentOS/Fedora
 EQEmulator has for over 20 years and always will be a <strong>fan-based, non-commercial open-source effort</strong> made by players, for players—preserving the legacy of the game while empowering community-driven creativity, learning and joy that the game and its creators has so strongly inspired in us all.
 </p>
-***
+* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-linux/)
-<h3 align="center">
+* You can use curl or wget to kick off the installer (whichever your OS has)
- Technical Overview & Reverse Engineering Effort
+> curl -O https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh install.sh && chmod 755 install.sh && ./install.sh
 </h1>
-<p align="center">EQEmulator represents <strong>over two decades of collaborative reverse engineering</strong>, building the server from the ground up without access to the original source code. This effort was achieved entirely through <strong>community-driven analysis, network protocol decoding, and in-game behavioral research</strong>.</p>
+> wget --no-check-certificate https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh -O install.sh && chmod 755 install.sh && ./install.sh 
-<h1 align="center">
+## Supported Clients
 💡 How We Did It
 </h1>
 <p align="center">
 <img src="https://github.com/user-attachments/assets/b6b48cf7-f64a-4497-9750-71f442a3d132" height="300px">
 </p>
 <p align="center">
 <strong>Reverse Engineering</strong> 
 Every system, packet, opcode, and game mechanic has been reconstructed through countless hours of live packet sniffing, client disassembly, and in-game experimentation by dedicated contributors over the years.
 </p>
 <p align="center">
 No proprietary code or server sources were ever used.
 </p>
 <p align="center">
 All implementations are the result of clean-room engineering.
 </p>
 <h1 align="center">
 🛠️ Technology Stack
 </h1>
 <p align="center">
 <img src="https://github.com/user-attachments/assets/df5ea809-86c5-439d-a8fa-651fb04ba477" style="border-radius: 10px">
 </p>
 **C++ Core Engine**
 * High-performance networking and gameplay logic built in C++
 * Cross-platform support for Linux and Windows
 **MySQL / MariaDB Backend**
 * Fully structured schema with over 200+ tables
 * Supports content customization, expansions, and custom worlds
 **Scripting Engine**
 * Native support for **Perl** and **Lua** scripting
 * Powerfully extendable for quests, NPC behaviors, and custom events
 **Open Source Content Database**
 * Includes ProjectEQ’s world data up through *Dragons of Norrath*
 * 100% customizable to create entirely new game worlds
 <h1 align="center">
 🚀 Why It Matters
 </h1>
 <p align="center">🧬 EQEmulator stands as a <strong>technical preservation project</strong>, ensuring that the magic of classic and custom servers lives on for future generations of players, tinkerers, and game designers.
 </p>
 > We humbly acknowledge and thank the original developers for creating one of the most influential online experiences in gaming history.
 <h1 align="center">
 🧑‍💻🖥️ Supported Clients
 </h1>
 |Titanium Edition|Secrets of Faydwer|Seeds of Destruction|Underfoot|Rain of Fear|
 |:---:|:---:|:---:|:---:|:---:|
 |<img src="http://i.imgur.com/hrwDxoM.jpg" height="150">|<img src="http://i.imgur.com/cRDW5tn.png" height="150">|<img src="http://i.imgur.com/V48kuVn.jpg" height="150">|<img src="http://i.imgur.com/IJQ0XMa.jpg" height="150">|<img src="http://i.imgur.com/OMpHkKa.png" height="100">|
-## 📚 Resources
+## Bug Reports <img src="http://i.imgur.com/daf1Vjw.png" height="20">
 * Please use the [issue tracker](https://github.com/EQEmu/Server/issues) provided by GitHub to send us bug
 reports or feature requests.
 * The [EQEmu Forums](http://www.eqemulator.org/forums/) are also a place to submit and get help with bugs.
-| Resource             | Badges                                                                                                                                                    | Link                                                                                              |
+## Contributions <img src="http://image.flaticon.com/icons/png/512/25/25231.png" width="20">
 |---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
 | **EQEmulator Docs**  | [![Docs](https://img.shields.io/badge/docs-MkDocs%20Powered-blueviolet)](https://docs.eqemu.io)                                                             | [docs.eqemu.io](https://docs.eqemu.io/)                                                           |
 | **Discord Community**| [![Discord](https://img.shields.io/discord/212663220849213441?label=Discord&logo=discord&color=7289DA)](https://discord.gg/QHsm7CD)                         | [Join Discord](https://discord.gg/QHsm7CD)                                                        |
 | **Latest Release**   | [![Latest Release](https://img.shields.io/github/v/release/eqemu/server)](https://github.com/eqemu/server/releases) <br> [![Release Date](https://img.shields.io/github/release-date/EQEmu/Server)](https://github.com/EQEmu/Server/releases) <br> [![All Releases](https://img.shields.io/github/downloads/eqemu/server/total.svg)](https://github.com/eqemu/server/releases) | [View Releases](https://github.com/eqemu/server/releases)                                         |
 | **License**          | [![License](https://img.shields.io/github/license/EQEmu/Server)](./LICENSE)                                                                                | [View License](./LICENSE)                                                                        |
 | **Build Status**     | [![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)                                     | [View Build Status](http://drone.akkadius.com/EQEmu/Server)                                       |
 | **Docker Pulls**     | [![Docker Pulls](https://img.shields.io/docker/pulls/akkadius/eqemu-server)](https://hub.docker.com/r/akkadius/eqemu-server)                                | [Docker Hub](https://hub.docker.com/r/akkadius/eqemu-server)                                      |
 | **Contributions**    | [![GitHub PRs](https://img.shields.io/github/issues-pr-closed/eqemu/server)](https://github.com/eqemu/server/pulls?q=is%3Apr+is%3Aclosed)                   | [Closed PRs & Issues](https://github.com/eqemu/server/pulls?q=is%3Apr+is%3Aclosed)                |
-## 🛠️ Getting Started
+* The preferred way to contribute is to fork the repo and submit a pull request on
 GitHub. If you need help with your changes, you can always post on the forums or
 try Discord. You can also post unified diffs (`git diff` should do the trick) on the
 [Server Code Submissions](http://www.eqemulator.org/forums/forumdisplay.php?f=669)
 forum, although pull requests will be much quicker and easier on all parties.
-If you want to set up your own EQEmulator server, please refer to the current [server installation guides](https://docs.eqemu.io/#server-installation). We've had 100,000s of players and developers use our guides to set up their own servers, and we hope you will too!
+## Contact <img src="http://gamerescape.com/wp-content/uploads/2015/06/discord.png" height="20">
-## 🗂️ Related Repositories
+ - Discord Channel: https://discord.gg/QHsm7CD
 - **User Discord Channel**: `#general`
 - **Developer Discord Channel**: `#eqemucoders`
-| Repository         | Description                                                                      |
+## Resources
-|--------------------|----------------------------------------------------------------------------------|
+- [EQEmulator Forums](http://www.eqemulator.org/forums)
-| [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)  | Official quests and event scripts for ProjectEQ                       |
+- [EQEmulator Wiki](https://docs.eqemu.io/)
 | [Maps](https://github.com/Akkadius/EQEmuMaps)                     | EQEmu-compatible zone maps                                            |
 | [Installer Resources](https://github.com/Akkadius/EQEmuInstall)   | Scripts and assets for setting up EQEmu servers                       |
 | [Zone Utilities](https://github.com/EQEmu/zone-utilities)         | Utilities for parsing, rendering, and manipulating EQ zone files      |
 ## Related Repositories
 * [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)
 * [Maps](https://github.com/Akkadius/EQEmuMaps)
 * [Installer Resources](https://github.com/Akkadius/EQEmuInstall)
 * [Zone Utilities](https://github.com/EQEmu/zone-utilities) - Various utilities and libraries for parsing, rendering and manipulating EQ Zone files.
 ## Other License Info
 * The server code and utilities are released under **GPLv3**
 * We also include some small libraries for convienence that may be under different licensing
  * SocketLib - GPL LibXML
  * zlib - zlib license
  * MariaDB/MySQL - GPL
  * 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>
@@ -38,6 +38,13 @@
 #include "../../common/skill_caps.h"
 #include "../../common/evolving_items.h"
 EQEmuLogSys          LogSys;
 WorldContentService  content_service;
 ZoneStore            zone_store;
 PathManager          path;
 PlayerEventLogs      player_event_logs;
 EvolvingItemsManager evolving_items_manager;
 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);
 void ExportBaseData(SharedDatabase *db);
@@ -46,10 +53,10 @@ void ExportDBStrings(SharedDatabase *db);
 int main(int argc, char **argv)
 {
 	RegisterExecutablePlatform(ExePlatformClientExport);
-	EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
+	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();
-	PathManager::Instance()->Init();
+	path.LoadPaths();
 	LogInfo("Client Files Export Utility");
 	if (!EQEmuConfig::LoadConfig()) {
@@ -92,8 +99,8 @@ int main(int argc, char **argv)
 		content_db.SetMySQL(database);
 	}
-	EQEmuLogSys::Instance()->SetDatabase(&database)
+	LogSys.SetDatabase(&database)
-		->SetLogPath(PathManager::Instance()->GetLogPath())
+		->SetLogPath(path.GetLogPath())
 		->LoadLogDatabaseSettings()
 		->StartFileLogs();
@@ -122,14 +129,14 @@ int main(int argc, char **argv)
 	ExportBaseData(&content_db);
 	ExportDBStrings(&database);
-	EQEmuLogSys::Instance()->CloseFileLogs();
+	LogSys.CloseFileLogs();
 	return 0;
 }
 void ExportSpells(SharedDatabase* db)
 {
-	std::ofstream file(fmt::format("{}/export/spells_us.txt", PathManager::Instance()->GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/spells_us.txt", path.GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/spells_us.txt to write, skipping.");
 		return;
@@ -148,7 +155,7 @@ void ExportSpells(SharedDatabase* db)
 void ExportSkillCaps(SharedDatabase* db)
 {
-	std::ofstream file(fmt::format("{}/export/SkillCaps.txt", PathManager::Instance()->GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/SkillCaps.txt", path.GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/SkillCaps.txt to write, skipping.");
 		return;
@@ -167,7 +174,7 @@ void ExportSkillCaps(SharedDatabase* db)
 void ExportBaseData(SharedDatabase *db)
 {
-	std::ofstream file(fmt::format("{}/export/BaseData.txt", PathManager::Instance()->GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/BaseData.txt", path.GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/BaseData.txt to write, skipping.");
 		return;
@@ -186,7 +193,7 @@ void ExportBaseData(SharedDatabase *db)
 void ExportDBStrings(SharedDatabase *db)
 {
-	std::ofstream file(fmt::format("{}/export/dbstr_us.txt", PathManager::Instance()->GetServerPath()));
+	std::ofstream file(fmt::format("{}/export/dbstr_us.txt", path.GetServerPath()));
 	if (!file || !file.is_open()) {
 		LogError("Unable to open export/dbstr_us.txt to write, skipping.");
 		return;
@@ -32,6 +32,13 @@
 #include "../../common/events/player_event_logs.h"
 #include "../../common/evolving_items.h"
 EQEmuLogSys          LogSys;
 WorldContentService  content_service;
 ZoneStore            zone_store;
 PathManager          path;
 PlayerEventLogs      player_event_logs;
 EvolvingItemsManager evolving_items_manager;
 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
 void ImportBaseData(SharedDatabase *db);
@@ -39,10 +46,10 @@ void ImportDBStrings(SharedDatabase *db);
 int main(int argc, char **argv) {
 	RegisterExecutablePlatform(ExePlatformClientImport);
-	EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
+	LogSys.LoadLogSettingsDefaults();
 	set_exception_handler();
-	PathManager::Instance()->Init();
+	path.LoadPaths();
 	LogInfo("Client Files Import Utility");
 	if(!EQEmuConfig::LoadConfig()) {
@@ -85,8 +92,8 @@ int main(int argc, char **argv) {
 		content_db.SetMySQL(database);
 	}
-	EQEmuLogSys::Instance()->SetDatabase(&database)
+	LogSys.SetDatabase(&database)
-		->SetLogPath(PathManager::Instance()->GetLogPath())
+		->SetLogPath(path.GetLogPath())
 		->LoadLogDatabaseSettings()
 		->StartFileLogs();
@@ -95,7 +102,7 @@ int main(int argc, char **argv) {
 	ImportBaseData(&content_db);
 	ImportDBStrings(&database);
-	EQEmuLogSys::Instance()->CloseFileLogs();
+	LogSys.CloseFileLogs();
 	return 0;
 }
@@ -131,7 +138,7 @@ bool IsStringField(int i) {
 void ImportSpells(SharedDatabase *db) {
 	LogInfo("Importing Spells");
-	std::string file = fmt::format("{}/import/spells_us.txt", PathManager::Instance()->GetServerPath());
+	std::string file = fmt::format("{}/import/spells_us.txt", path.GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);
@@ -221,7 +228,7 @@ void ImportSpells(SharedDatabase *db) {
 void ImportSkillCaps(SharedDatabase *db) {
 	LogInfo("Importing Skill Caps");
-	std::string file = fmt::format("{}/import/SkillCaps.txt", PathManager::Instance()->GetServerPath());
+	std::string file = fmt::format("{}/import/SkillCaps.txt", path.GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);
@@ -258,7 +265,7 @@ void ImportBaseData(SharedDatabase *db)
 {
 	LogInfo("Importing Base Data");
-	const std::string& file_name = fmt::format("{}/import/BaseData.txt", PathManager::Instance()->GetServerPath());
+	const std::string& file_name = fmt::format("{}/import/BaseData.txt", path.GetServerPath());
 	const auto& file_contents = File::GetContents(file_name);
 	if (!file_contents.error.empty()) {
@@ -298,7 +305,7 @@ void ImportBaseData(SharedDatabase *db)
 void ImportDBStrings(SharedDatabase *db) {
 	LogInfo("Importing DB Strings");
-	std::string file = fmt::format("{}/import/dbstr_us.txt", PathManager::Instance()->GetServerPath());
+	std::string file = fmt::format("{}/import/dbstr_us.txt", path.GetServerPath());
 	FILE *f = fopen(file.c_str(), "r");
 	if(!f) {
 		LogError("Unable to open {} to read, skipping.", file);
@@ -17,13 +17,11 @@ SET(common_sources
    database.cpp
    database_instances.cpp
    database/database_update_manifest.cpp
    database/database_update_manifest_custom.cpp
    database/database_update_manifest_bots.cpp
    database/database_update.cpp
    dbcore.cpp
    deity.cpp
    dynamic_zone_base.cpp
    dynamic_zone_lockout.cpp
    emu_constants.cpp
    emu_limits.cpp
    emu_opcodes.cpp
@@ -42,6 +40,7 @@ SET(common_sources
    events/player_event_logs.cpp
    events/player_event_discord_formatter.cpp
    evolving_items.cpp
    expedition_lockout_timer.cpp
    extprofile.cpp
    discord/discord_manager.cpp
    faction.cpp
@@ -104,9 +103,9 @@ SET(common_sources
    net/console_server.cpp
    net/console_server_connection.cpp
    net/crc32.cpp
    net/daybreak_connection.cpp
    net/eqstream.cpp
    net/packet.cpp
    net/reliable_stream_connection.cpp
    net/servertalk_client_connection.cpp
    net/servertalk_legacy_client_connection.cpp
    net/servertalk_server.cpp
@@ -214,14 +213,16 @@ SET(repositories
    repositories/base/base_discovered_items_repository.h
    repositories/base/base_doors_repository.h
    repositories/base/base_dynamic_zones_repository.h
    repositories/base/base_dynamic_zone_lockouts_repository.h
    repositories/base/base_dynamic_zone_members_repository.h
    repositories/base/base_dynamic_zone_templates_repository.h
    repositories/base/base_expeditions_repository.h
    repositories/base/base_expedition_lockouts_repository.h
    repositories/base/base_faction_association_repository.h
    repositories/base/base_faction_base_data_repository.h
    repositories/base/base_faction_list_repository.h
    repositories/base/base_faction_list_mod_repository.h
    repositories/base/base_faction_values_repository.h
 	repositories/base/base_find_location_repository.h
    repositories/base/base_fishing_repository.h
    repositories/base/base_forage_repository.h
    repositories/base/base_friends_repository.h
@@ -410,14 +411,16 @@ SET(repositories
    repositories/discovered_items_repository.h
    repositories/doors_repository.h
    repositories/dynamic_zones_repository.h
    repositories/dynamic_zone_lockouts_repository.h
    repositories/dynamic_zone_members_repository.h
    repositories/dynamic_zone_templates_repository.h
    repositories/expeditions_repository.h
    repositories/expedition_lockouts_repository.h
    repositories/faction_association_repository.h
    repositories/faction_base_data_repository.h
    repositories/faction_list_repository.h
    repositories/faction_list_mod_repository.h
    repositories/faction_values_repository.h
 	repositories/find_location_repository.h
    repositories/fishing_repository.h
    repositories/forage_repository.h
    repositories/friends_repository.h
@@ -560,7 +563,6 @@ SET(common_headers
    discord/discord.h
    discord/discord_manager.h
    dynamic_zone_base.h
    dynamic_zone_lockout.h
    emu_constants.h
    emu_limits.h
    emu_opcodes.h
@@ -587,6 +589,7 @@ SET(common_headers
    events/player_events.h
    event_sub.h
    evolving_items.h
    expedition_lockout_timer.h
    extprofile.h
    faction.h
    file.h
@@ -603,6 +606,7 @@ SET(common_headers
    ipc_mutex.h
    ip_util.h
    item_data.h
    item_fieldlist.h
    item_instance.h
    json_config.h
    light_source.h
@@ -645,7 +649,6 @@ SET(common_headers
    server_event_scheduler.h
    serverinfo.h
    servertalk.h
    server_reload_types.h
    shared_tasks.h
    shareddb.h
    skills.h
@@ -670,20 +673,18 @@ SET(common_headers
    net/console_server.h
    net/console_server_connection.h
    net/crc32.h
    net/daybreak_connection.h
    net/daybreak_structs.h
    net/dns.h
    net/endian.h
    net/eqstream.h
    net/packet.h
    net/reliable_stream_connection.h
    net/reliable_stream_pooling.h
    net/reliable_stream_structs.h
    net/servertalk_client_connection.h
    net/servertalk_legacy_client_connection.h
    net/servertalk_common.h
    net/servertalk_server.h
    net/servertalk_server_connection.h
    net/tcp_connection.h
    net/tcp_connection_pooling.h
    net/tcp_server.h
    net/websocket_server.h
    net/websocket_server_connection.h
@@ -742,6 +743,9 @@ SOURCE_GROUP(Net FILES
    net/console_server_connection.h
    net/crc32.cpp
    net/crc32.h
    net/daybreak_connection.cpp
    net/daybreak_connection.h
    net/daybreak_structs.h
    net/dns.h
    net/endian.h
    net/eqmq.cpp
@@ -750,10 +754,6 @@ SOURCE_GROUP(Net FILES
    net/eqstream.h
    net/packet.cpp
    net/packet.h
    net/reliable_stream_connection.cpp
    net/reliable_stream_connection.h
    net/reliable_stream_pooling.h
    net/reliable_stream_structs.h
    net/servertalk_client_connection.cpp
    net/servertalk_client_connection.h
    net/servertalk_legacy_client_connection.cpp
@@ -765,7 +765,6 @@ SOURCE_GROUP(Net FILES
    net/servertalk_server_connection.h
    net/tcp_connection.cpp
    net/tcp_connection.h
    net/tcp_connection_pooling.h
    net/tcp_server.cpp
    net/tcp_server.h
    net/websocket_server.cpp
@@ -840,8 +839,8 @@ IF (UNIX)
    SET_SOURCE_FILES_PROPERTIES("patches/sod.cpp" "patches/sof.cpp" "patches/rof.cpp" "patches/rof2.cpp" "patches/uf.cpp" PROPERTIES COMPILE_FLAGS -O0)
 ENDIF (UNIX)
-IF (EQEMU_BUILD_PCH)
+IF (WIN32 AND EQEMU_BUILD_PCH)
-    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/std-pch.h)
+    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
 ENDIF ()
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
@@ -279,8 +279,7 @@ Bazaar::GetSearchResults(
 		trader_items_ids,
 		std::string(search.item_name),
 		field_criteria_items,
-		where_criteria_items,
+		where_criteria_items
 		search.max_results
 	);
 	if (item_results.empty()) {
@@ -27,7 +27,7 @@ WorldContentService *WorldContentService::SetExpansionContext()
 	// pull expansion from rules
 	int expansion = RuleI(Expansion, CurrentExpansion);
 	if (expansion >= Expansion::Classic && expansion <= Expansion::MaxId) {
-		WorldContentService::Instance()->SetCurrentExpansion(expansion);
+		content_service.SetCurrentExpansion(expansion);
 	}
 	LogInfo(
@@ -41,12 +41,12 @@ WorldContentService *WorldContentService::SetExpansionContext()
 std::string WorldContentService::GetCurrentExpansionName()
 {
-	if (WorldContentService::Instance()->GetCurrentExpansion() == Expansion::EXPANSION_ALL) {
+	if (content_service.GetCurrentExpansion() == Expansion::EXPANSION_ALL) {
 		return "All Expansions";
 	}
 	if (current_expansion >= Expansion::Classic && current_expansion <= Expansion::MaxId) {
-		return Expansion::ExpansionName[WorldContentService::Instance()->GetCurrentExpansion()];
+		return Expansion::ExpansionName[content_service.GetCurrentExpansion()];
 	}
 	return "Unknown Expansion";
@@ -185,7 +185,7 @@ void WorldContentService::ReloadContentFlags()
 	SetContentFlags(set_content_flags);
 	LoadStaticGlobalZoneInstances();
-	ZoneStore::Instance()->LoadZones(*m_content_database);
+	zone_store.LoadZones(*m_content_database);
 }
 Database *WorldContentService::GetDatabase() const
@@ -291,7 +291,7 @@ WorldContentService *WorldContentService::LoadStaticGlobalZoneInstances()
 //   instance_list table entry for lavastorm has version = 1, is_global = 1, never_expires = 1
 WorldContentService::FindZoneResult WorldContentService::FindZone(uint32 zone_id, uint32 instance_id)
 {
-	for (const auto &z: ZoneStore::Instance()->GetZones()) {
+	for (const auto &z: zone_store.GetZones()) {
 		for (auto &i: m_zone_static_instances) {
 			if (
 				z.zoneidnumber == zone_id &&
@@ -181,12 +181,6 @@ public:
 	FindZoneResult FindZone(uint32 zone_id, uint32 instance_id);
 	bool IsInPublicStaticInstance(uint32 instance_id);
 	static WorldContentService* Instance()
 	{
 		static WorldContentService instance;
 		return &instance;
 	}
 private:
 	int current_expansion{};
 	std::vector<ContentFlagsRepository::ContentFlags> content_flags;
@@ -200,4 +194,6 @@ private:
 	std::vector<InstanceListRepository::InstanceList> m_zone_static_instances;
 };
 extern WorldContentService content_service;
 #endif //EQEMU_WORLD_CONTENT_SERVICE_H
@@ -27,8 +27,6 @@ void SendCrashReport(const std::string &crash_report)
 //		"http://localhost:3010/api/v1/analytics/server-crash-report", // development
 	};
 	EQEmuLogSys* log = EQEmuLogSys::Instance();
 	auto      config = EQEmuConfig::get();
 	for (auto &e: endpoints) {
 		uri u(e);
@@ -70,12 +68,12 @@ void SendCrashReport(const std::string &crash_report)
 		p["cpus"]              = cpus.size();
 		p["origination_info"]  = "";
-		if (!log->origination_info.zone_short_name.empty()) {
+		if (!LogSys.origination_info.zone_short_name.empty()) {
 			p["origination_info"] = fmt::format(
 				"{} ({}) instance_id [{}]",
-				log->origination_info.zone_short_name,
+				LogSys.origination_info.zone_short_name,
-				log->origination_info.zone_long_name,
+				LogSys.origination_info.zone_long_name,
-				log->origination_info.instance_id
+				LogSys.origination_info.instance_id
 			);
 		}
@@ -296,7 +294,7 @@ void print_trace()
 		SendCrashReport(crash_report);
 	}
-	EQEmuLogSys::Instance()->CloseFileLogs();
+	LogSys.CloseFileLogs();
 	exit(1);
 }
@@ -245,7 +245,7 @@ uint32 Database::CreateAccount(
 		e.password = password;
 	}
-	LogInfo("Account attempting to be created loginserver [{}] name [{}] status [{}]", loginserver, name, status);
+	LogInfo("Account Attempting to be created: [{}:{}] status: {}", loginserver, name, status);
 	e = AccountRepository::InsertOne(*this, e);
@@ -708,20 +708,6 @@ const std::string Database::GetNPCNameByID(uint32 npc_id)
 	return e.id ? e.name : std::string();
 }
 template<typename InputIterator, typename OutputIterator>
 inline auto CleanMobName(InputIterator first, InputIterator last, OutputIterator result)
 {
 	for (; first != last; ++first) {
 		if (*first == '_') {
 			*result = ' ';
 		}
 		else if (isalpha(*first) || *first == '`') {
 			*result = *first;
 		}
 	}
 	return result;
 }
 const std::string Database::GetCleanNPCNameByID(uint32 npc_id)
 {
 	const auto& e = NpcTypesRepository::FindOne(*this, npc_id);
@@ -969,29 +955,6 @@ bool Database::UpdateName(const std::string& old_name, const std::string& new_na
 	return CharacterDataRepository::UpdateOne(*this, e);
 }
 bool Database::UpdateNameByID(const int character_id, const std::string& new_name)
 {
 	LogInfo("Renaming [{}] to [{}]", character_id, new_name);
 	auto l = CharacterDataRepository::GetWhere(
 		*this,
 		fmt::format(
 			"`id` = {}",
 			character_id
 		)
 	);
 	if (l.empty()) {
 		return false;
 	}
 	auto& e = l.front();
 	e.name = new_name;
 	return CharacterDataRepository::UpdateOne(*this, e);
 }
 bool Database::IsNameUsed(const std::string& name)
 {
 	if (RuleB(Bots, Enabled)) {
@@ -1019,20 +982,6 @@ bool Database::IsNameUsed(const std::string& name)
 	return !character_data.empty();
 }
 // Players cannot have the same name as a pet vanity name, or memory corruption occurs.
 bool Database::IsPetNameUsed(const std::string& name)
 {
 	const auto& pet_name_data = CharacterPetNameRepository::GetWhere(
 		*this,
 		fmt::format(
 			"`name` = '{}'",
 			Strings::Escape(name)
 		)
 	);
 	return !pet_name_data.empty();
 }
 uint32 Database::GetServerType()
 {
 	const auto& l = VariablesRepository::GetWhere(*this, "`varname` = 'ServerType' LIMIT 1");
@@ -1109,11 +1058,11 @@ void Database::SetLFP(uint32 character_id, bool is_lfp)
 	CharacterDataRepository::UpdateOne(*this, e);
 }
-void Database::SetLoginFlags(uint32 character_id, bool is_lfp, bool is_lfg, uint8 ingame)
+void Database::SetLoginFlags(uint32 character_id, bool is_lfp, bool is_lfg, uint8 first_logon)
 {
 	auto e = CharacterDataRepository::FindOne(*this, character_id);
-	e.ingame = ingame;
+	e.firstlogon = first_logon;
 	e.lfg        = is_lfg ? 1 : 0;
 	e.lfp        = is_lfp ? 1 : 0;
@@ -1129,11 +1078,11 @@ void Database::SetLFG(uint32 character_id, bool is_lfg)
 	CharacterDataRepository::UpdateOne(*this, e);
 }
-void Database::SetIngame(uint32 character_id, uint8 ingame)
+void Database::SetFirstLogon(uint32 character_id, uint8 first_logon)
 {
 	auto e = CharacterDataRepository::FindOne(*this, character_id);
-	e.ingame = ingame;
+	e.firstlogon = first_logon;
 	CharacterDataRepository::UpdateOne(*this, e);
 }
@@ -1934,7 +1883,6 @@ bool Database::CopyCharacter(
 	std::vector<std::string> tables_to_zero_id = {
 		"keyring",
 		"data_buckets",
 		"character_evolving_items",
 		"character_instance_safereturns",
 		"character_expedition_lockouts",
 		"character_instance_lockouts",
@@ -1966,12 +1914,6 @@ bool Database::CopyCharacter(
 			)
 		);
 		if (!results.Success()) {
 			LogError("Transaction failed [{}] rolling back", results.ErrorMessage());
 			TransactionRollback();
 			return false;
 		}
 		std::vector<std::string> columns      = {};
 		int                      column_count = 0;
@@ -1990,12 +1932,6 @@ bool Database::CopyCharacter(
 			)
 		);
 		if (!results.Success()) {
 			LogError("Transaction failed [{}] rolling back", results.ErrorMessage());
 			TransactionRollback();
 			return false;
 		}
 		std::vector<std::vector<std::string>> new_rows;
 		for (auto row : results) {
@@ -2063,18 +1999,13 @@ bool Database::CopyCharacter(
 			LogInfo("Copying table [{}] rows [{}]", table_name, Strings::Commify(rows_copied));
 			if (!insert.ErrorMessage().empty()) {
 				LogError("Error copying table [{}] [{}]", table_name, insert.ErrorMessage());
 				TransactionRollback();
 				return false;
 			}
 		}
 	}
-	auto r = TransactionCommit();
+	TransactionCommit();
 	if (!r.Success()) {
 		LogError("Transaction failed [{}] rolling back", r.ErrorMessage());
 		return false;
 	}
 	LogInfo(
 		"Character [{}] copied to [{}] total rows [{}]",
@@ -2244,7 +2175,7 @@ void Database::PurgeCharacterParcels()
 		pel.event_data = ss.str();
 		pel.created_at = std::time(nullptr);
-		PlayerEventLogs::Instance()->AddToQueue(pel);
+		player_event_logs.AddToQueue(pel);
 		ss.str("");
 		ss.clear();
@@ -103,7 +103,6 @@ public:
 	bool ReserveName(uint32 account_id, const std::string& name);
 	bool SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp);
 	bool UpdateName(const std::string& old_name, const std::string& new_name);
 	bool UpdateNameByID(const int character_id, const std::string& new_name);
 	bool CopyCharacter(
 		const std::string& source_character_name,
 		const std::string& destination_character_name,
@@ -117,7 +116,6 @@ public:
 	bool CheckGMIPs(const std::string& login_ip, uint32 account_id);
 	bool CheckNameFilter(const std::string& name, bool surname = false);
 	bool IsNameUsed(const std::string& name);
 	bool IsPetNameUsed(const std::string& name);
 	uint32 GetAccountIDByChar(const std::string& name, uint32* character_id = 0);
 	uint32 GetAccountIDByChar(uint32 character_id);
@@ -141,7 +139,6 @@ public:
 	bool CheckInstanceExpired(uint16 instance_id);
 	bool CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version, uint32 duration);
 	bool GetUnusedInstanceID(uint16& instance_id);
 	bool TryGetUnusedInstanceID(uint16& instance_id);
 	bool IsGlobalInstance(uint16 instance_id);
 	bool RemoveClientFromInstance(uint16 instance_id, uint32 char_id);
 	bool RemoveClientsFromInstance(uint16 instance_id);
@@ -263,7 +260,7 @@ public:
 	bool SaveTime(int8 minute, int8 hour, int8 day, int8 month, int16 year);
 	void ClearMerchantTemp();
 	void ClearPTimers(uint32 character_id);
-	void SetIngame(uint32 character_id, uint8 ingame);
+	void SetFirstLogon(uint32 character_id, uint8 first_logon);
 	void SetLFG(uint32 character_id, bool is_lfg);
 	void SetLFP(uint32 character_id, bool is_lfp);
 	void SetLoginFlags(uint32 character_id, bool is_lfp, bool is_lfg, uint8 first_logon);
@@ -50,7 +50,7 @@ bool DatabaseDumpService::IsMySQLInstalled()
 {
 	std::string version_output = GetMySQLVersion();
-	return version_output.find("mysql") != std::string::npos && (version_output.find("Ver") != std::string::npos || version_output.find("from") != std::string::npos);
+	return version_output.find("mysql") != std::string::npos && version_output.find("Ver") != std::string::npos;
 }
 /**
@@ -204,7 +204,7 @@ void DatabaseDumpService::DatabaseDump()
 	}
 	if (IsDumpOutputToConsole()) {
-		EQEmuLogSys::Instance()->SilenceConsoleLogging();
+		LogSys.SilenceConsoleLogging();
 	}
 	LogInfo("MySQL installed [{}]", GetMySQLVersion());
@@ -324,7 +324,7 @@ void DatabaseDumpService::DatabaseDump()
 	}
 	if (!IsDumpOutputToConsole()) {
-		EQEmuLogSys::Instance()->LoadLogSettingsDefaults();
+		LogSys.LoadLogSettingsDefaults();
 	}
 	if (!pipe_file.empty()) {
@@ -596,13 +596,8 @@ void DatabaseDumpService::BuildCredentialsFile()
 void DatabaseDumpService::RemoveCredentialsFile()
 {
 	if (File::Exists(CREDENTIALS_FILE)) {
 		try {
 		std::filesystem::remove(CREDENTIALS_FILE);
 	}
 		catch (std::exception &e) {
 			LogError("std::filesystem::remove err [{}]", e.what());
 		}
 	}
 }
 bool DatabaseDumpService::IsDumpStaticInstanceData()
@@ -65,6 +65,7 @@ private:
 	bool        dump_system_tables          = false;
 	bool        dump_content_tables         = false;
 	bool        dump_player_tables          = false;
 	bool        dump_query_server_tables    = false;
 	bool        dump_login_server_tables    = false;
 	bool        dump_with_no_data           = false;
 	bool        dump_table_lock             = false;
@@ -7,7 +7,6 @@
 #include "../http/httplib.h"
 #include "database_update_manifest.cpp"
 #include "database_update_manifest_custom.cpp"
 #include "database_update_manifest_bots.cpp"
 #include "database_dump_service.h"
@@ -15,7 +14,7 @@ constexpr int BREAK_LENGTH = 70;
 DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
 {
-	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version`, `custom_version` FROM `db_version` LIMIT 1");
+	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version` FROM `db_version` LIMIT 1");
 	if (!results.Success() || !results.RowCount()) {
 		LogError("Failed to read from [db_version] table!");
 		return DatabaseVersion{};
@@ -26,7 +25,6 @@ DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
 	return DatabaseVersion{
 		.server_database_version = Strings::ToInt(r[0]),
 		.bots_database_version = Strings::ToInt(r[1]),
 		.custom_database_version = Strings::ToInt(r[2]),
 	};
 }
@@ -35,7 +33,6 @@ DatabaseVersion DatabaseUpdate::GetBinaryDatabaseVersions()
 	return DatabaseVersion{
 		.server_database_version = CURRENT_BINARY_DATABASE_VERSION,
 		.bots_database_version = (RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0),
 		.custom_database_version = CUSTOM_BINARY_DATABASE_VERSION,
 	};
 }
@@ -46,7 +43,6 @@ constexpr int LOOK_BACK_AMOUNT = 10;
 // this check will take action
 void DatabaseUpdate::CheckDbUpdates()
 {
 	InjectCustomVersionColumn();
 	InjectBotsVersionColumn();
 	auto v = GetDatabaseVersions();
 	auto b = GetBinaryDatabaseVersions();
@@ -63,15 +59,6 @@ void DatabaseUpdate::CheckDbUpdates()
 		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `version` = {}", b.server_database_version));
 	}
 	if (UpdateManifest(manifest_entries_custom, v.custom_database_version, b.custom_database_version)) {
 		LogInfo(
 			"Updates ran successfully, setting database version to [{}] from [{}]",
 			b.custom_database_version,
 			v.custom_database_version
 		);
 		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `custom_version` = {}", b.custom_database_version));
 	}
 	if (b.bots_database_version > 0) {
 		if (UpdateManifest(bot_manifest_entries, v.bots_database_version, b.bots_database_version)) {
 			LogInfo(
@@ -154,7 +141,7 @@ bool DatabaseUpdate::UpdateManifest(
 	std::vector<int> missing_migrations = {};
 	if (version_low != version_high) {
-		EQEmuLogSys::Instance()->DisableMySQLErrorLogs();
+		LogSys.DisableMySQLErrorLogs();
 		bool force_interactive = false;
 		for (int version = version_low + 1; version <= version_high; ++version) {
 			for (auto &e: entries) {
@@ -184,7 +171,7 @@ bool DatabaseUpdate::UpdateManifest(
 				}
 			}
 		}
-		EQEmuLogSys::Instance()->EnableMySQLErrorLogs();
+		LogSys.EnableMySQLErrorLogs();
 		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
 		if (!missing_migrations.empty() && m_skip_backup) {
@@ -357,16 +344,6 @@ bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 		);
 	}
 	if (b.custom_database_version > 0) {
 		LogInfo(
 			"{:>8} | database [{}] binary [{}] {}",
 			"Custom",
 			v.custom_database_version,
 			b.custom_database_version,
 			(v.custom_database_version == b.custom_database_version) ? "up to date" : "checking updates"
 		);
 	}
 	LogInfo("{:>8} | [server.auto_database_updates] [<green>true]", "Config");
 	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
@@ -376,10 +353,7 @@ bool DatabaseUpdate::CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b)
 	// bots database version is optional, if not enabled then it is always up-to-date
 	bool bots_up_to_date   = RuleB(Bots, Enabled) ? v.bots_database_version >= b.bots_database_version : true;
-	// custom database version is optional, if not enabled then it is always up-to-date
+	return server_up_to_date && bots_up_to_date;
 	bool custom_up_to_date = v.custom_database_version >= b.custom_database_version;
 	return server_up_to_date && bots_up_to_date && custom_up_to_date;
 }
 // checks to see if there are pending updates
@@ -399,12 +373,3 @@ void DatabaseUpdate::InjectBotsVersionColumn()
 		m_database->QueryDatabase("ALTER TABLE db_version ADD bots_version int(11) DEFAULT '0' AFTER version");
 	}
 }
 void DatabaseUpdate::InjectCustomVersionColumn()
 {
 	auto results = m_database->QueryDatabase("SHOW COLUMNS FROM `db_version` LIKE 'custom_version'");
 	if (!results.Success() || results.RowCount() == 0) {
 		LogInfo("Adding custom_version column to db_version table");
 		m_database->QueryDatabase("ALTER TABLE `db_version` ADD COLUMN `custom_version` INT(11) UNSIGNED NOT NULL DEFAULT 0");
 	}
 }
@@ -17,7 +17,6 @@ struct ManifestEntry {
 struct DatabaseVersion {
 	int server_database_version;
 	int bots_database_version;
 	int custom_database_version;
 };
 class DatabaseUpdate {
@@ -33,20 +32,12 @@ public:
 	DatabaseUpdate *SetContentDatabase(Database *db);
 	DatabaseUpdate *SetSkipBackup(bool skip);
 	bool HasPendingUpdates();
 	static DatabaseUpdate* Instance()
 	{
 		static DatabaseUpdate instance;
 		return &instance;
 	}
 private:
 	bool m_skip_backup = false;
 	Database *m_database;
 	Database *m_content_database;
 	static bool CheckVersionsUpToDate(DatabaseVersion v, DatabaseVersion b);
 	void InjectBotsVersionColumn();
 	void InjectCustomVersionColumn();
 };
@@ -6417,7 +6417,7 @@ ADD COLUMN `guid` bigint(20) UNSIGNED NOT NULL DEFAULT 0 AFTER `ornament_hero_mo
 ADD PRIMARY KEY (`account_id`, `slot_id`);
 )",
 		.content_schema_update = false,
-		.force_interactive = false
+		.force_interactive = true
 	},
 	ManifestEntry{
 		.version = 9298,
@@ -6481,7 +6481,7 @@ UPDATE `sharedbank` SET `slot_id` = ((`slot_id` - 2531) + 11010) WHERE `slot_id`
 UPDATE `sharedbank` SET `slot_id` = ((`slot_id` - 2541) + 11210) WHERE `slot_id` BETWEEN 2541 AND 2550; -- Shared Bank Bag 2
 )",
 		.content_schema_update = false,
-		.force_interactive = false
+		.force_interactive = true
 	},
 	ManifestEntry{
 		.version = 9299,
@@ -6770,422 +6770,7 @@ SET `aliases` =
 WHERE `command` = 'illusionblock'
 AND `aliases` NOT LIKE '%ib%';
 )",
-	},
+	}
 	ManifestEntry{
 		.version = 9303,
 		.description = "2025_02_13_corpse_slot_fix.sql",
 		.check = "SELECT * FROM `character_corpse_items` WHERE `equip_slot` BETWEEN 251 AND 350",
 		.condition = "not_empty",
 		.match = "",
 		.sql = R"(
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 251) + 4010) WHERE `equip_slot` BETWEEN 251 AND 260; -- Bag 1
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 261) + 4210) WHERE `equip_slot` BETWEEN 261 AND 270; -- Bag 2
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 271) + 4410) WHERE `equip_slot` BETWEEN 271 AND 280; -- Bag 3
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 281) + 4610) WHERE `equip_slot` BETWEEN 281 AND 290; -- Bag 4
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 291) + 4810) WHERE `equip_slot` BETWEEN 291 AND 300; -- Bag 5
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 301) + 5010) WHERE `equip_slot` BETWEEN 301 AND 310; -- Bag 6
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 311) + 5210) WHERE `equip_slot` BETWEEN 311 AND 320; -- Bag 7
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 321) + 5410) WHERE `equip_slot` BETWEEN 321 AND 330; -- Bag 8
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 331) + 5610) WHERE `equip_slot` BETWEEN 331 AND 340; -- Bag 9
 UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 341) + 5810) WHERE `equip_slot` BETWEEN 341 AND 350; -- Bag 10
 )",
 	},
 	ManifestEntry{
 		.version     = 9304,
 		.description = "2024_12_01_update_guild_bank",
 		.check       = "SHOW COLUMNS FROM `guild_bank` LIKE 'augment_one_id'",
 		.condition   = "empty",
 		.match       = "",
 		.sql         = R"(
 ALTER TABLE `guild_bank`
 	DROP INDEX `guildid`,
 	CHANGE COLUMN `guildid` `guild_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `id`,
 	CHANGE COLUMN `itemid` `item_id` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `slot`,
 	CHANGE COLUMN `whofor` `who_for` VARCHAR(64) NULL DEFAULT NULL COLLATE 'utf8_general_ci' AFTER `permissions`,
 	ADD COLUMN `augment_one_id` INT UNSIGNED NULL DEFAULT '0' AFTER `item_id`,
 	ADD COLUMN `augment_two_id` INT UNSIGNED NULL DEFAULT '0' AFTER `augment_one_id`,
 	ADD COLUMN `augment_three_id` INT UNSIGNED NULL DEFAULT '0' AFTER `augment_two_id`,
 	ADD COLUMN `augment_four_id` INT UNSIGNED NULL DEFAULT '0' AFTER `augment_three_id`,
 	ADD COLUMN `augment_five_id` INT UNSIGNED NULL DEFAULT '0' AFTER `augment_four_id`,
 	ADD COLUMN `augment_six_id` INT UNSIGNED NULL DEFAULT '0' AFTER `augment_five_id`,
 	CHANGE COLUMN `qty` `quantity` INT(10) NOT NULL DEFAULT '0' AFTER `augment_six_id`;
 ALTER TABLE `guild_bank`
 	ADD INDEX `guild_id` (`guild_id`);
 )"
 	},
 	ManifestEntry{
 		.version = 9305,
 		.description = "2024_12_01_expedition_dz_merge.sql",
 		.check = "SHOW COLUMNS FROM `dynamic_zones` LIKE 'is_locked'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `dynamic_zones`
 	ADD COLUMN `is_locked` TINYINT NOT NULL DEFAULT '0' AFTER `has_zone_in`,
 	ADD COLUMN `add_replay` TINYINT NOT NULL DEFAULT '1' AFTER `is_locked`;
 ALTER TABLE `expedition_lockouts`
 	CHANGE COLUMN `expedition_id` `dynamic_zone_id` INT(10) UNSIGNED NOT NULL AFTER `id`,
 	DROP INDEX `expedition_id_event_name`,
 	ADD UNIQUE INDEX `dz_id_event_name` (`dynamic_zone_id`, `event_name`) USING BTREE;
 UPDATE expedition_lockouts lockouts
 	INNER JOIN expeditions ON lockouts.dynamic_zone_id = expeditions.id
 	SET lockouts.dynamic_zone_id = expeditions.dynamic_zone_id;
 DROP TABLE `expeditions`;
 RENAME TABLE `expedition_lockouts` TO `dynamic_zone_lockouts`;
 )"
 	},
 	ManifestEntry{
 		.version = 9306,
 		.description = "2025_02_16_data_buckets_zone_id_instance_id.sql",
 		.check       = "SHOW COLUMNS FROM `data_buckets` LIKE 'zone_id'",
 		.condition   = "empty",
 		.match = "",
 		.sql = R"(
 -- Drop old indexes if exists
 DROP INDEX IF EXISTS `keys` ON `data_buckets`;
 DROP INDEX IF EXISTS `idx_npc_expires` ON `data_buckets`;
 DROP INDEX IF EXISTS `idx_bot_expires` ON `data_buckets`;
 -- Add zone_id, instance_id
 ALTER TABLE `data_buckets`
 	MODIFY COLUMN `npc_id` int(11) NOT NULL DEFAULT 0 AFTER `character_id`,
 	MODIFY COLUMN `bot_id` int(11) NOT NULL DEFAULT 0 AFTER `npc_id`,
 	ADD COLUMN `zone_id` smallint(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `bot_id`,
 	ADD COLUMN `instance_id` smallint(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `zone_id`;
 ALTER TABLE `data_buckets`
 	MODIFY COLUMN `account_id` bigint(11) UNSIGNED NULL DEFAULT 0 AFTER `expires`,
 	MODIFY COLUMN `character_id` bigint(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `account_id`,
 	MODIFY COLUMN `npc_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `character_id`,
 	MODIFY COLUMN `bot_id` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `npc_id`;
 -- Create optimized unique index with `key` first
 CREATE UNIQUE INDEX `keys` ON data_buckets (`key`, character_id, npc_id, bot_id, account_id, zone_id, instance_id);
 -- Create indexes for just instance_id (instance deletion)
 CREATE INDEX idx_instance_id ON data_buckets (instance_id);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version     = 9307,
 		.description = "2025_02_17_zone_state_spawns.sql",
 		.check       = "SHOW TABLES LIKE 'zone_state_spawns'",
 		.condition   = "empty",
 		.match       = "",
 		.sql         = R"(
 CREATE TABLE `zone_state_spawns` (
  `id` bigint(20) NOT NULL AUTO_INCREMENT,
  `zone_id` int(11) unsigned DEFAULT NULL,
  `instance_id` int(11) unsigned DEFAULT NULL,
  `is_corpse` tinyint(11) DEFAULT 0,
  `decay_in_seconds` int(11) DEFAULT 0,
  `npc_id` int(10) unsigned DEFAULT NULL,
  `spawn2_id` int(10) unsigned NOT NULL,
  `spawngroup_id` int(10) unsigned NOT NULL,
  `x` float NOT NULL,
  `y` float NOT NULL,
  `z` float NOT NULL,
  `heading` float NOT NULL,
  `respawn_time` int(10) unsigned NOT NULL,
  `variance` int(10) unsigned NOT NULL,
  `grid` int(10) unsigned DEFAULT 0,
  `current_waypoint` int(11) DEFAULT 0,
  `path_when_zone_idle` smallint(6) DEFAULT 0,
  `condition_id` smallint(5) unsigned DEFAULT 0,
  `condition_min_value` smallint(6) DEFAULT 0,
  `enabled` smallint(6) DEFAULT 1,
  `anim` smallint(5) unsigned DEFAULT 0,
  `loot_data` text DEFAULT NULL,
  `entity_variables` text DEFAULT NULL,
  `buffs` text DEFAULT NULL,
  `hp` bigint(20) DEFAULT 0,
  `mana` bigint(20) DEFAULT 0,
  `endurance` bigint(20) DEFAULT 0,
  `created_at` datetime DEFAULT NULL,
  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9308,
 		.description = "2025_03_29_add_multivalue_support_to_evolving_subtype.sql",
 		.check = "SHOW COLUMNS FROM `items_evolving_details` LIKE 'sub_type'",
 		.condition = "missing",
 		.match = "varchar(200)",
 		.sql = R"(
 ALTER TABLE `items_evolving_details`
 	CHANGE COLUMN `sub_type` `sub_type` VARCHAR(200) NULL DEFAULT '0' AFTER `type`;
 )",
 		.content_schema_update = true
 	},
 	// this one got missed being added to PEQ dumps so adding it again so it gets added when folks take a new release
 	ManifestEntry{
 		.version = 9309,
 		.description = "2025_03_1_create_pet_names_table_if_not_exist.sql",
 		.check = "SHOW TABLES LIKE 'character_pet_name'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 CREATE TABLE `character_pet_name` (
    `character_id` INT(11) NOT NULL PRIMARY KEY,
    `name` VARCHAR(64) NOT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 )",
 	},
 	ManifestEntry{
 		.version = 9310,
 		.description = "2025_03_7_expand_horse_def.sql",
 		.check = "SHOW COLUMNS FROM `horses` LIKE 'helmtexture'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `horses`
 	ADD COLUMN `helmtexture` TINYINT(2) NOT NULL DEFAULT -1 AFTER `texture`;
 )",
 		.content_schema_update = true
 	},
 	ManifestEntry{
 		.version = 9311,
 		.description = "2025_03_09_add_zone_state_is_zone_field.sql",
 		.check = "SHOW COLUMNS FROM `zone_state_spawns` LIKE 'is_zone'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `zone_state_spawns`
 	ADD COLUMN `is_zone` tinyint(11) NULL DEFAULT 0 AFTER `is_corpse`;
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9312,
 		.description = "2025_03_11_data_bucket_indexes.sql",
 		.check = "SHOW INDEX FROM data_buckets",
 		.condition = "missing",
 		.match = "idx_zone_instance_expires",
 		.sql = R"(
 DROP INDEX IF EXISTS `idx_zone_instance_expires` ON `data_buckets`;
 DROP INDEX IF EXISTS `idx_character_expires` ON `data_buckets`;
 DROP INDEX IF EXISTS `idx_bot_expires` ON `data_buckets`;
 ALTER TABLE data_buckets ADD INDEX idx_zone_instance_expires (zone_id, instance_id, expires);
 ALTER TABLE data_buckets ADD INDEX idx_character_expires (character_id, expires);
 ALTER TABLE data_buckets ADD INDEX idx_bot_expires (bot_id, expires);
 )",
 	.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9313,
 		.description = "2025_03_11_zone_state_spawns.sql",
 		.check = "SHOW INDEX FROM zone_state_spawns",
 		.condition = "missing",
 		.match = "idx_zone_instance",
 		.sql = R"(
 ALTER TABLE zone_state_spawns ADD INDEX idx_zone_instance (zone_id, instance_id);
 )",
 	.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9314,
 		.description = "2025_03_12_zone_state_spawns_one_time_truncate.sql",
 		.check = "SELECT * FROM db_version WHERE version >= 9314",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 TRUNCATE TABLE zone_state_spawns;
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9315,
 		.description = "2025_03_29_character_tribute_index.sql",
 		.check = "SHOW INDEX FROM character_tribute",
 		.condition = "missing",
 		.match = "idx_character_id",
 		.sql = R"(
 ALTER TABLE character_tribute ADD INDEX idx_character_id (character_id);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9316,
 		.description = "2025_03_29_player_titlesets_index.sql",
 		.check = "SHOW INDEX FROM player_titlesets",
 		.condition = "missing",
 		.match = "idx_char_id",
 		.sql = R"(
 ALTER TABLE player_titlesets ADD INDEX idx_char_id (char_id);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9317,
 		.description = "2025_03_29_respawn_times_instance_index.sql",
 		.check = "SHOW INDEX FROM respawn_times",
 		.condition = "missing",
 		.match = "idx_instance_id",
 		.sql = R"(
 ALTER TABLE respawn_times ADD INDEX idx_instance_id (instance_id);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9318,
 		.description = "2025_03_29_zone_state_spawns_instance_index.sql",
 		.check = "SHOW INDEX FROM zone_state_spawns",
 		.condition = "missing",
 		.match = "idx_instance_id",
 		.sql = R"(
 ALTER TABLE zone_state_spawns ADD INDEX idx_instance_id (instance_id);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9319,
 		.description = "2025_03_29_data_buckets_expires_index.sql",
 		.check = "SHOW INDEX FROM data_buckets",
 		.condition = "missing",
 		.match = "idx_expires",
 		.sql = R"(
 CREATE INDEX idx_expires ON data_buckets (expires);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9320,
 		.description = "2025_03_23_add_respawn_times_expire_at.sql",
 		.check = "SHOW COLUMNS FROM `respawn_times` LIKE 'expire_at'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `respawn_times`
 ADD COLUMN `expire_at` int(11) UNSIGNED NULL DEFAULT 0 AFTER `duration`;
 UPDATE respawn_times set expire_at = `start` + `duration`; -- backfill existing data
 CREATE INDEX `idx_expire_at` ON `respawn_times` (`expire_at`);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9321,
 		.description = "2025_03_30_instance_list_add_expire_at.sql",
 		.check = "SHOW COLUMNS FROM `instance_list` LIKE 'expire_at'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `instance_list`
 ADD COLUMN `expire_at` bigint(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `duration`;
 UPDATE instance_list set expire_at = `start_time` + `duration`; -- backfill existing data
 CREATE INDEX `idx_expire_at` ON `instance_list` (`expire_at`);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9322,
 		.description = "2025_04_24_add_npc_tint_id.sql",
 		.check = "SHOW COLUMNS FROM `npc_types` LIKE 'npc_tint_id'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `npc_types`
 	ADD COLUMN `npc_tint_id` SMALLINT UNSIGNED NULL DEFAULT '0' AFTER `multiquest_enabled`;
 )",
 		.content_schema_update = true
 	},
 	ManifestEntry{
 		.version = 9323,
 		.description = "2025_04_16_character_data_first_login.sql",
 		.check = "SHOW COLUMNS FROM `character_data` LIKE 'first_login'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `character_data`
 CHANGE COLUMN `firstlogon` `ingame` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 AFTER `xtargets`,
 ADD COLUMN `first_login` int(11) UNSIGNED NOT NULL DEFAULT 0 AFTER `xtargets`;
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9324,
 		.description = "2025_06_11_player_event_logs_table.sql",
 		.check = "SHOW CREATE TABLE `player_event_logs`",
 		.condition = "missing",
 		.match = "COMPRESS",
 		.sql = R"(
 ALTER TABLE player_event_logs ROW_FORMAT=COMPRESSED;
 CREATE INDEX idx_event_type_char_id ON player_event_logs (event_type_id, character_id);
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9325,
 		.description = "2025_06_10_character_corpses_entity_variables.sql",
 		.check = "SHOW COLUMNS FROM `character_corpses` LIKE 'entity_variables'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `character_corpses`
 ADD COLUMN `entity_variables` TEXT DEFAULT NULL AFTER `rezzable`;
 )",
 		.content_schema_update = false
 	},
 	ManifestEntry{
 		.version = 9326,
 		.description = "2025_07_27_add_indexes_npc_spawns_loot.sql",
 		.check = "SHOW INDEX FROM npc_types",
 		.condition = "missing",
 		.match = "idx_npc_types_loottable_id",
 		.sql = R"(
 ALTER TABLE npc_types
    ADD INDEX idx_npc_types_loottable_id (loottable_id);
 ALTER TABLE spawnentry
    ADD INDEX idx_spawnentry_spawngroup_id (spawngroupID),
    ADD INDEX idx_spawnentry_npc_id (npcID);
 ALTER TABLE lootdrop_entries
    ADD INDEX idx_lootdrop_entries_lootdrop_id (lootdrop_id),
    ADD INDEX idx_lootdrop_entries_item_id (item_id);
 ALTER TABLE loottable_entries
    ADD INDEX idx_loottable_entries_lootdrop_id (lootdrop_id),
    ADD INDEX idx_loottable_entries_loottable_id (loottable_id);
 )",
 		.content_schema_update = true
 	},
 	ManifestEntry{
 		.version = 9327,
 		.description = "2025_08_13_character_stats_record_heal_amount.sql",
 		.check = "SHOW COLUMNS FROM `character_stats_record` LIKE 'heal_amount'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `character_stats_record`
 ADD COLUMN `heal_amount` int(11) NULL DEFAULT 0 AFTER `spell_damage`;
 )"
 	},
 	ManifestEntry{
 		.version = 9328,
 		.description = "2025_08_22_character_parcel_updates.sql",
 		.check = "SHOW COLUMNS FROM `character_parcels` LIKE 'evolve_amount'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 ALTER TABLE `character_parcels`
 	ADD COLUMN `evolve_amount` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `quantity`;
 ALTER TABLE `character_parcels_containers`
 	ADD COLUMN `evolve_amount` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `quantity`;
 )",
 		.content_schema_update = false
 	},
 // -- template; copy/paste this when you need to create a new entry
 //	ManifestEntry{
 //		.version = 9228,
@@ -1,55 +0,0 @@
 #include "database_update.h"
 std::vector<ManifestEntry> manifest_entries_custom = {
 	ManifestEntry{
 		.version = 1,
 		.description = "2025_05_16_new_database_check_test",
 		.check = "SHOW TABLES LIKE 'new_table'",
 		.condition = "empty",
 		.match = "",
 		.sql = R"(
 CREATE TABLE `new_table`  (
  `id` int NOT NULL AUTO_INCREMENT,
  PRIMARY KEY (`id`)
 );
 )",
 		.content_schema_update = false,
 	},
 // Used for testing
 //	ManifestEntry{
 //		.version = 9229,
 //		.description = "new_database_check_test",
 //		.check = "SHOW TABLES LIKE 'new_table'",
 //		.condition = "empty",
 //		.match = "",
 //		.sql = R"(
 //CREATE TABLE `new_table`  (
 //  `id` int NOT NULL AUTO_INCREMENT,
 //  PRIMARY KEY (`id`)
 //);
 //CREATE TABLE `new_table1`  (
 //  `id` int NOT NULL AUTO_INCREMENT,
 //  PRIMARY KEY (`id`)
 //);
 //CREATE TABLE `new_table2`  (
 //  `id` int NOT NULL AUTO_INCREMENT,
 //  PRIMARY KEY (`id`)
 //);
 //CREATE TABLE `new_table3`  (
 //  `id` int NOT NULL AUTO_INCREMENT,
 //  PRIMARY KEY (`id`)
 //);
 //)",
 //	}
 };
 // see struct definitions for what each field does
 // struct ManifestEntry {
 // 	int         version{};     // database version of the migration
 // 	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
 // 	std::string check{};       // query that checks against the condition
 // 	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
 // 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
 // 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
 // };
@@ -30,8 +30,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include "../common/repositories/respawn_times_repository.h"
 #include "../common/repositories/spawn_condition_values_repository.h"
 #include "repositories/spawn2_disabled_repository.h"
-#include "repositories/data_buckets_repository.h"
+
-#include "repositories/zone_state_spawns_repository.h"
+
 #include "database.h"
 #include <iomanip>
@@ -128,35 +128,11 @@ bool Database::CreateInstance(uint16 instance_id, uint32 zone_id, uint32 version
 	e.version = version;
 	e.start_time = std::time(nullptr);
 	e.duration = duration;
 	e.expire_at = e.start_time + duration;
-	RespawnTimesRepository::ClearInstanceTimers(*this, e.id);
+	return InstanceListRepository::InsertOne(*this, e).id;
 	InstanceListRepository::ReplaceOne(*this, e);
 	return instance_id > 0 && e.id;
 }
 bool Database::GetUnusedInstanceID(uint16 &instance_id)
 {
 	// attempt to get an unused instance id
 	for (int a = 0; a < 10; a++) {
 		uint16 attempted_id = 0;
 		if (TryGetUnusedInstanceID(attempted_id)) {
 			auto i = InstanceListRepository::NewEntity();
 			i.id    = attempted_id;
 			i.notes = "Prefetching";
 			auto n = InstanceListRepository::InsertOne(*this, i);
 			if (n.id > 0) {
 				instance_id = n.id;
 				return true;
 			}
 		}
 	}
 	instance_id = 0;
 	return false;
 }
 bool Database::TryGetUnusedInstanceID(uint16 &instance_id)
 {
 	uint32 max_reserved_instance_id = RuleI(Instances, ReservedInstances);
 	uint32 max_instance_id          = 32000;
@@ -503,10 +479,6 @@ void Database::DeleteInstance(uint16 instance_id)
 	DynamicZoneMembersRepository::DeleteByInstance(*this, instance_id);
 	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
 	CharacterCorpsesRepository::BuryInstance(*this, instance_id);
 	DataBucketsRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));
 	if (RuleB(Zone, StateSavingOnShutdown)) {
 		ZoneStateSpawnsRepository::DeleteWhere(*this, fmt::format("`instance_id` = {}", instance_id));
 	}
 }
 void Database::FlagInstanceByGroupLeader(uint32 zone_id, int16 version, uint32 character_id, uint32 group_id)
@@ -561,12 +533,14 @@ void Database::GetCharactersInInstance(uint16 instance_id, std::list<uint32> &ch
 void Database::PurgeExpiredInstances()
 {
 	/**
 	 * Delay purging by a day so that we can continue using adjacent free instance id's
 	 * from the table without risking the chance we immediately re-allocate a zone that freshly expired but
 	 * has not been fully de-allocated
 	 */
 	auto l = InstanceListRepository::GetWhere(
 		*this,
-		fmt::format(
+		"(start_time + duration) <= (UNIX_TIMESTAMP() - 86400) AND never_expires = 0"
 			"expire_at <= (UNIX_TIMESTAMP() - {}) and expire_at != 0 AND never_expires = 0",
 			RuleI(Instances, ExpireOffsetTimeSeconds)
 		)
 	);
 	if (l.empty()) {
 		return;
@@ -577,24 +551,16 @@ void Database::PurgeExpiredInstances()
 		instance_ids.emplace_back(std::to_string(e.id));
 	}
-	const auto ids = Strings::Implode(",", instance_ids);
+	const auto imploded_instance_ids = Strings::Implode(",", instance_ids);
-	TransactionBegin();
+	InstanceListRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
-	InstanceListRepository::DeleteWhere(*this, fmt::format("id IN ({})", ids));
+	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
-	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id IN ({})", ids));
+	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
-	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
+	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
-	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
+	CharacterCorpsesRepository::BuryInstances(*this, imploded_instance_ids);
-	CharacterCorpsesRepository::BuryInstances(*this, ids);
+	DynamicZoneMembersRepository::DeleteByManyInstances(*this, imploded_instance_ids);
-	DynamicZoneMembersRepository::DeleteByManyInstances(*this, ids);
+	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
-	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
+	Spawn2DisabledRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
 	Spawn2DisabledRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
 	DataBucketsRepository::DeleteWhere(*this, fmt::format("instance_id != 0 and instance_id IN ({})", ids));
 	if (RuleB(Zone, StateSavingOnShutdown)) {
 		ZoneStateSpawnsRepository::DeleteWhere(*this, fmt::format("`instance_id` IN ({})", ids));
 	}
 	TransactionCommit();
 	LogInfo("Purged [{}] expired instances", l.size());
 }
 void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
@@ -606,7 +572,6 @@ void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
 	i.start_time = std::time(nullptr);
 	i.duration = new_duration;
 	i.expire_at = i.start_time + i.duration;
 	InstanceListRepository::UpdateOne(*this, i);
 }
@@ -80,7 +80,7 @@ namespace DatabaseSchema {
 			{"guild_members",                  "char_id"},
 			{"guilds",                         "id"},
 			{"instance_list_player",           "id"},
-			{"inventory",                      "character_id"},
+			{"inventory",                      "charid"},
 			{"inventory_snapshots",            "charid"},
 			{"keyring",                        "char_id"},
 			{"mail",                           "charid"},
@@ -139,7 +139,6 @@ namespace DatabaseSchema {
 			"character_pet_buffs",
 			"character_pet_info",
 			"character_pet_inventory",
 			"character_pet_name",
 			"character_peqzone_flags",
 			"character_potionbelt",
 			"character_skills",
@@ -312,9 +311,10 @@ namespace DatabaseSchema {
 			"completed_shared_task_members",
 			"completed_shared_tasks",
 			"discord_webhooks",
 			"dynamic_zone_lockouts",
 			"dynamic_zone_members",
 			"dynamic_zones",
 			"expedition_lockouts",
 			"expeditions",
 			"gm_ips",
 			"group_id",
 			"group_leaders",
@@ -351,7 +351,6 @@ namespace DatabaseSchema {
 			"shared_task_dynamic_zones",
 			"shared_task_members",
 			"shared_tasks",
 			"zone_state_spawns",
 		};
 	}
@@ -160,7 +160,7 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 		(uint32) mysql_insert_id(mysql)
 	);
-	if (EQEmuLogSys::Instance()->log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
+	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
 		if ((strncasecmp(query, "select", 6) == 0)) {
 			LogMySQLQuery(
 				"{0} -- ({1} row{2} returned) ({3}s)",
@@ -189,9 +189,9 @@ void DBcore::TransactionBegin()
 	QueryDatabase("START TRANSACTION");
 }
-MySQLRequestResult DBcore::TransactionCommit()
+void DBcore::TransactionCommit()
 {
-	return QueryDatabase("COMMIT");
+	QueryDatabase("COMMIT");
 }
 void DBcore::TransactionRollback()
@@ -302,9 +302,7 @@ std::string DBcore::Escape(const std::string& s)
 void DBcore::SetMutex(Mutex *mutex)
 {
 	if (m_mutex && m_mutex != mutex) {
 	safe_delete(m_mutex);
 	}
 	DBcore::m_mutex = mutex;
 }
@@ -32,7 +32,7 @@ public:
 	MySQLRequestResult QueryDatabase(const std::string& query, bool retryOnFailureOnce = true);
 	MySQLRequestResult QueryDatabaseMulti(const std::string &query);
 	void TransactionBegin();
-	MySQLRequestResult TransactionCommit();
+	void TransactionCommit();
 	void TransactionRollback();
 	std::string Escape(const std::string& s);
 	uint32 DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen);
@@ -4,6 +4,7 @@
 #include <string>
 #include "../types.h"
 #include "../http/httplib.h"
 #include "../repositories/player_event_logs_repository.h"
 #include "../events/player_events.h"
@@ -26,7 +26,7 @@ void DiscordManager::ProcessMessageQueue()
 			continue;
 		}
-		auto        webhook  = EQEmuLogSys::Instance()->GetDiscordWebhooks()[q.first];
+		auto        webhook  = LogSys.GetDiscordWebhooks()[q.first];
 		std::string message;
 		for (auto &m: q.second) {
@@ -68,7 +68,7 @@ void DiscordManager::ProcessMessageQueue()
 void DiscordManager::QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e)
 {
-	auto w = PlayerEventLogs::Instance()->GetDiscordWebhookUrlFromEventType(e.player_event_log.event_type_id);
+	auto w = player_event_logs.GetDiscordWebhookUrlFromEventType(e.player_event_log.event_type_id);
 	if (!w.empty()) {
 		Discord::SendPlayerEventMessage(e, w);
 	}
@@ -13,12 +13,6 @@ public:
 	void QueueWebhookMessage(uint32 webhook_id, const std::string& message);
 	void ProcessMessageQueue();
 	void QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e);
 	static DiscordManager* Instance()
 	{
 		static DiscordManager instance;
 		return &instance;
 	}
 private:
 	std::mutex webhook_queue_lock{};
 	std::map<uint32, std::vector<std::string>> webhook_message_queue{};
@@ -1,13 +1,11 @@
 #include "dynamic_zone_base.h"
 #include "database.h"
 #include "eqemu_logsys.h"
 #include "repositories/instance_list_repository.h"
 #include "repositories/instance_list_player_repository.h"
 #include "rulesys.h"
 #include "servertalk.h"
 #include "util/uuid.h"
 #include "repositories/character_expedition_lockouts_repository.h"
 #include "repositories/dynamic_zone_lockouts_repository.h"
 #include "repositories/instance_list_repository.h"
 #include "repositories/instance_list_player_repository.h"
 DynamicZoneBase::DynamicZoneBase(DynamicZonesRepository::DynamicZoneInstance&& entry)
 {
@@ -58,16 +56,15 @@ uint32_t DynamicZoneBase::CreateInstance()
 	insert_instance.start_time = static_cast<int>(std::chrono::system_clock::to_time_t(m_start_time));
 	insert_instance.duration = static_cast<int>(m_duration.count());
 	insert_instance.never_expires = m_never_expires;
 	insert_instance.expire_at = insert_instance.start_time + insert_instance.duration;
-	auto instance = InstanceListRepository::ReplaceOne(GetDatabase(), insert_instance);
+	auto instance = InstanceListRepository::InsertOne(GetDatabase(), insert_instance);
-	if (!instance)
+	if (instance.id == 0)
 	{
 		LogDynamicZones("Failed to create instance [{}] for zone [{}]", unused_instance_id, m_zone_id);
 		return 0;
 	}
-	m_instance_id = unused_instance_id;
+	m_instance_id = instance.id;
 	return m_instance_id;
 }
@@ -96,15 +93,13 @@ void DynamicZoneBase::LoadRepositoryResult(DynamicZonesRepository::DynamicZoneIn
 	m_zonein.y           = dz_entry.zone_in_y;
 	m_zonein.z           = dz_entry.zone_in_z;
 	m_zonein.heading     = dz_entry.zone_in_heading;
-	m_has_zonein         = dz_entry.has_zone_in != 0;
+	m_has_zonein         = (dz_entry.has_zone_in != 0);
 	m_is_locked          = dz_entry.is_locked;
 	m_add_replay         = dz_entry.add_replay;
 	// instance_list portion
 	m_zone_id            = dz_entry.zone;
 	m_zone_version       = dz_entry.version;
 	m_start_time         = std::chrono::system_clock::from_time_t(dz_entry.start_time);
 	m_duration           = std::chrono::seconds(dz_entry.duration);
-	m_never_expires      = dz_entry.never_expires != 0;
+	m_never_expires      = (dz_entry.never_expires != 0);
 	m_expire_time        = m_start_time + m_duration;
 }
@@ -124,40 +119,37 @@ void DynamicZoneBase::AddMemberFromRepositoryResult(
 uint32_t DynamicZoneBase::SaveToDatabase()
 {
 	LogDynamicZonesDetail("Saving dz instance [{}] to database", m_instance_id);
-	if (m_instance_id == 0)
+
 	if (m_instance_id != 0)
 	{
-		return 0;
+		auto insert_dz = DynamicZonesRepository::NewEntity();
 		insert_dz.uuid                = m_uuid;
 		insert_dz.name                = m_name;
 		insert_dz.leader_id           = m_leader.id;
 		insert_dz.min_players         = m_min_players;
 		insert_dz.max_players         = m_max_players;
 		insert_dz.instance_id         = m_instance_id,
 		insert_dz.type                = static_cast<int>(m_type);
 		insert_dz.dz_switch_id        = m_dz_switch_id;
 		insert_dz.compass_zone_id     = m_compass.zone_id;
 		insert_dz.compass_x           = m_compass.x;
 		insert_dz.compass_y           = m_compass.y;
 		insert_dz.compass_z           = m_compass.z;
 		insert_dz.safe_return_zone_id = m_safereturn.zone_id;
 		insert_dz.safe_return_x       = m_safereturn.x;
 		insert_dz.safe_return_y       = m_safereturn.y;
 		insert_dz.safe_return_z       = m_safereturn.z;
 		insert_dz.safe_return_heading = m_safereturn.heading;
 		insert_dz.zone_in_x           = m_zonein.x;
 		insert_dz.zone_in_y           = m_zonein.y;
 		insert_dz.zone_in_z           = m_zonein.z;
 		insert_dz.zone_in_heading     = m_zonein.heading;
 		insert_dz.has_zone_in         = m_has_zonein;
 		auto inserted_dz = DynamicZonesRepository::InsertOne(GetDatabase(), insert_dz);
 		return inserted_dz.id;
 	}
-
+	return 0;
 	auto dz = DynamicZonesRepository::NewEntity();
 	dz.uuid                = m_uuid;
 	dz.name                = m_name;
 	dz.leader_id           = m_leader.id;
 	dz.min_players         = m_min_players;
 	dz.max_players         = m_max_players;
 	dz.instance_id         = static_cast<int32_t>(m_instance_id),
 	dz.type                = static_cast<uint8_t>(m_type);
 	dz.dz_switch_id        = m_dz_switch_id;
 	dz.compass_zone_id     = m_compass.zone_id;
 	dz.compass_x           = m_compass.x;
 	dz.compass_y           = m_compass.y;
 	dz.compass_z           = m_compass.z;
 	dz.safe_return_zone_id = m_safereturn.zone_id;
 	dz.safe_return_x       = m_safereturn.x;
 	dz.safe_return_y       = m_safereturn.y;
 	dz.safe_return_z       = m_safereturn.z;
 	dz.safe_return_heading = m_safereturn.heading;
 	dz.zone_in_x           = m_zonein.x;
 	dz.zone_in_y           = m_zonein.y;
 	dz.zone_in_z           = m_zonein.z;
 	dz.zone_in_heading     = m_zonein.heading;
 	dz.has_zone_in         = static_cast<uint8_t>(m_has_zonein);
 	dz.is_locked           = static_cast<int8_t>(m_is_locked);
 	dz.add_replay          = static_cast<int8_t>(m_add_replay);
 	dz = DynamicZonesRepository::InsertOne(GetDatabase(), std::move(dz));
 	return dz.id;
 }
 bool DynamicZoneBase::AddMember(const DynamicZoneMember& add_member)
@@ -204,9 +196,10 @@ bool DynamicZoneBase::RemoveMember(const DynamicZoneMember& remove_member)
 	return true;
 }
-bool DynamicZoneBase::SwapMember(const DynamicZoneMember& add_member, const std::string& remove_name)
+bool DynamicZoneBase::SwapMember(
 	const DynamicZoneMember& add_member, const std::string& remove_char_name)
 {
-	auto remove_member = GetMemberData(remove_name);
+	auto remove_member = GetMemberData(remove_char_name);
 	if (!add_member.IsValid() || !remove_member.IsValid())
 	{
 		return false;
@@ -237,18 +230,9 @@ void DynamicZoneBase::RemoveAllMembers()
 void DynamicZoneBase::SaveMembers(const std::vector<DynamicZoneMember>& members)
 {
 	if (members.empty())
 	{
 		return;
 	}
 	LogDynamicZonesDetail("Saving [{}] member(s) for dz [{}]", members.size(), m_id);
 	m_members = members;
 	if (m_members.size() > m_max_players)
 	{
 		m_members.resize(m_max_players);
 	}
 	// the lower level instance_list_players needs to be kept updated as well
 	std::vector<DynamicZoneMembersRepository::DynamicZoneMembers> insert_members;
@@ -258,12 +242,12 @@ void DynamicZoneBase::SaveMembers(const std::vector<DynamicZoneMember>& members)
 		DynamicZoneMembersRepository::DynamicZoneMembers member_entry{};
 		member_entry.dynamic_zone_id = m_id;
 		member_entry.character_id = member.id;
-		insert_members.push_back(member_entry);
+		insert_members.emplace_back(member_entry);
-		InstanceListPlayerRepository::InstanceListPlayer player_entry{};
+		InstanceListPlayerRepository::InstanceListPlayer player_entry;
-		player_entry.id = m_instance_id;
+		player_entry.id = static_cast<int>(m_instance_id);
-		player_entry.charid = member.id;
+		player_entry.charid = static_cast<int>(member.id);
-		insert_players.push_back(player_entry);
+		insert_players.emplace_back(player_entry);
 	}
 	DynamicZoneMembersRepository::InsertOrUpdateMany(GetDatabase(), insert_members);
@@ -355,44 +339,6 @@ void DynamicZoneBase::SetLeader(const DynamicZoneMember& new_leader, bool update
 	}
 }
 void DynamicZoneBase::SetLocked(bool lock, bool update_db, DzLockMsg lock_msg, uint32_t color)
 {
 	m_is_locked = lock;
 	if (update_db)
 	{
 		DynamicZonesRepository::UpdateLocked(GetDatabase(), m_id, lock);
 		ServerPacket pack(ServerOP_DzLock, sizeof(ServerDzLock_Struct));
 		auto buf = reinterpret_cast<ServerDzLock_Struct*>(pack.pBuffer);
 		buf->dz_id = GetID();
 		buf->sender_zone_id = GetCurrentZoneID();
 		buf->sender_instance_id = GetCurrentInstanceID();
 		buf->lock = m_is_locked;
 		buf->lock_msg = static_cast<uint8_t>(lock_msg);
 		buf->color = color;
 		SendServerPacket(&pack);
 	}
 }
 void DynamicZoneBase::SetReplayOnJoin(bool enabled, bool update_db)
 {
 	m_add_replay = enabled;
 	if (update_db)
 	{
 		DynamicZonesRepository::UpdateReplayOnJoin(GetDatabase(), m_id, enabled);
 		ServerPacket pack(ServerOP_DzReplayOnJoin, sizeof(ServerDzBool_Struct));
 		auto buf = reinterpret_cast<ServerDzBool_Struct*>(pack.pBuffer);
 		buf->dz_id = GetID();
 		buf->sender_zone_id = GetCurrentZoneID();
 		buf->sender_instance_id = GetCurrentInstanceID();
 		buf->enabled = enabled;
 		SendServerPacket(&pack);
 	}
 }
 uint32_t DynamicZoneBase::GetSecondsRemaining() const
 {
 	auto remaining = std::chrono::duration_cast<std::chrono::seconds>(GetDurationRemaining()).count();
@@ -532,13 +478,13 @@ void DynamicZoneBase::RemoveInternalMember(uint32_t character_id)
 	), m_members.end());
 }
-bool DynamicZoneBase::HasMember(uint32_t character_id) const
+bool DynamicZoneBase::HasMember(uint32_t character_id)
 {
 	return std::any_of(m_members.begin(), m_members.end(),
 		[&](const DynamicZoneMember& member) { return member.id == character_id; });
 }
-bool DynamicZoneBase::HasMember(const std::string& character_name) const
+bool DynamicZoneBase::HasMember(const std::string& character_name)
 {
 	return std::any_of(m_members.begin(), m_members.end(),
 		[&](const DynamicZoneMember& member) {
@@ -644,34 +590,35 @@ std::string DynamicZoneBase::GetDynamicZoneTypeName(DynamicZoneType dz_type)
 	}
 }
-std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerPacket(uint16_t zone_id, uint16_t instance_id)
+EQ::Net::DynamicPacket DynamicZoneBase::GetSerializedDzPacket()
 {
-	std::ostringstream ss = GetSerialized();
+	EQ::Net::DynamicPacket dyn_pack;
-	std::string_view sv = ss.view();
+	dyn_pack.PutSerialize(0, *this);
-	auto pack_size = sizeof(ServerDzCreate_Struct) + sv.size();
+	LogDynamicZonesDetail("Serialized server dz size [{}]", dyn_pack.Length());
 	return dyn_pack;
 }
 std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerDzCreatePacket(
 	uint16_t origin_zone_id, uint16_t origin_instance_id)
 {
 	EQ::Net::DynamicPacket dyn_pack = GetSerializedDzPacket();
 	auto pack_size = sizeof(ServerDzCreateSerialized_Struct) + dyn_pack.Length();
 	auto pack = std::make_unique<ServerPacket>(ServerOP_DzCreated, static_cast<uint32_t>(pack_size));
-	auto buf = reinterpret_cast<ServerDzCreate_Struct*>(pack->pBuffer);
+	auto buf = reinterpret_cast<ServerDzCreateSerialized_Struct*>(pack->pBuffer);
-	buf->origin_zone_id = zone_id;
+	buf->origin_zone_id = origin_zone_id;
-	buf->origin_instance_id = instance_id;
+	buf->origin_instance_id = origin_instance_id;
-	buf->dz_id = GetID();
+	buf->cereal_size = static_cast<uint32_t>(dyn_pack.Length());
-	buf->cereal_size = static_cast<uint32_t>(sv.size());
+	memcpy(buf->cereal_data, dyn_pack.Data(), dyn_pack.Length());
 	memcpy(buf->cereal_data, sv.data(), sv.size());
 	return pack;
 }
-std::ostringstream DynamicZoneBase::GetSerialized()
+void DynamicZoneBase::LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_size)
 {
-	std::ostringstream ss;
+	LogDynamicZonesDetail("Deserializing server dz size [{}]", cereal_size);
-	cereal::BinaryOutputArchive archive(ss);
+	EQ::Util::MemoryStreamReader ss(cereal_data, cereal_size);
 	archive(*this);
 	return ss;
 }
 void DynamicZoneBase::Unserialize(std::span<char> buf)
 {
 	EQ::Util::MemoryStreamReader ss(buf.data(), buf.size());
 	cereal::BinaryInputArchive archive(ss);
 	archive(*this);
 }
@@ -700,180 +647,3 @@ void DynamicZoneBase::LoadTemplate(const DynamicZoneTemplatesRepository::Dynamic
 	m_zonein.z           = dz_template.zone_in_z;
 	m_zonein.heading     = dz_template.zone_in_h;
 }
 std::vector<uint32_t> DynamicZoneBase::GetMemberIds()
 {
 	std::vector<uint32_t> ids;
 	ids.reserve(m_members.size());
 	for (const auto& member : m_members)
 	{
 		ids.push_back(member.id);
 	}
 	return ids;
 }
 bool DynamicZoneBase::HasLockout(const std::string& event)
 {
 	return std::ranges::any_of(m_lockouts, [&](const auto& l) { return l.IsEvent(event); });
 }
 bool DynamicZoneBase::HasReplayLockout()
 {
 	return HasLockout(DzLockout::ReplayTimer);
 }
 void DynamicZoneBase::AddLockout(const std::string& event, uint32_t seconds)
 {
 	auto lockout = DzLockout::Create(m_name, event, seconds, m_uuid);
 	AddLockout(lockout);
 }
 void DynamicZoneBase::AddLockout(const DzLockout& lockout, bool members_only)
 {
 	if (!members_only)
 	{
 		DynamicZoneLockoutsRepository::InsertLockouts(GetDatabase(), GetID(), { lockout });
 	}
 	CharacterExpeditionLockoutsRepository::InsertLockout(GetDatabase(), GetMemberIds(), lockout);
 	HandleLockoutUpdate(lockout, false, members_only);
 	SendServerPacket(CreateLockoutPacket(lockout, false, members_only).get());
 }
 void DynamicZoneBase::AddLockoutDuration(const std::string& event, int seconds, bool members_only)
 {
 	auto lockout = DzLockout::Create(m_name, event, std::max(0, seconds), m_uuid);
 	// lockout has unsigned duration, pass original seconds to support reducing existing timers
 	int secs = static_cast<int>(seconds * RuleR(Expedition, LockoutDurationMultiplier));
 	CharacterExpeditionLockoutsRepository::AddLockoutDuration(GetDatabase(), GetMemberIds(), lockout, secs);
 	HandleLockoutDuration(lockout, seconds, members_only, true);
 	SendServerPacket(CreateLockoutDurationPacket(lockout, seconds, members_only).get());
 }
 void DynamicZoneBase::UpdateLockoutDuration(const std::string& event, uint32_t seconds, bool members_only)
 {
 	// some live expeditions update existing lockout timers during progression
 	auto it = std::ranges::find_if(m_lockouts, [&](const auto& l) { return l.IsEvent(event); });
 	if (it != m_lockouts.end())
 	{
 		seconds = static_cast<uint32_t>(seconds * RuleR(Expedition, LockoutDurationMultiplier));
 		DzLockout lockout(m_uuid, m_name, event, it->GetStartTime() + seconds, seconds);
 		AddLockout(lockout, members_only);
 	}
 }
 void DynamicZoneBase::RemoveLockout(const std::string& event)
 {
 	DynamicZoneLockoutsRepository::DeleteWhere(GetDatabase(), fmt::format(
 		"dynamic_zone_id = {} AND event_name = '{}'", GetID(), Strings::Escape(event)));
 	CharacterExpeditionLockoutsRepository::DeleteWhere(GetDatabase(), fmt::format(
 		"character_id IN ({}) AND expedition_name = '{}' AND event_name = '{}'",
 		fmt::join(GetMemberIds(), ","), Strings::Escape(m_name), Strings::Escape(event)));
 	DzLockout lockout{m_uuid, m_name, event, 0, 0};
 	HandleLockoutUpdate(lockout, true, false);
 	SendServerPacket(CreateLockoutPacket(lockout, true).get());
 }
 void DynamicZoneBase::HandleLockoutUpdate(const DzLockout& lockout, bool remove, bool members_only)
 {
 	if (!members_only)
 	{
 		std::erase_if(m_lockouts, [&](const auto& l) { return l.IsEvent(lockout.Event()); });
 		if (!remove)
 		{
 			m_lockouts.push_back(lockout);
 		}
 	}
 }
 void DynamicZoneBase::HandleLockoutDuration(const DzLockout& lockout, int seconds, bool members_only, bool insert_db)
 {
 	if (!members_only)
 	{
 		auto it = std::ranges::find_if(m_lockouts, [&](const auto& l) { return l.IsEvent(lockout.Event()); });
 		if (it != m_lockouts.end())
 		{
 			it->AddLockoutTime(seconds);
 		}
 		else
 		{
 			it = m_lockouts.insert(m_lockouts.end(), lockout);
 		}
 		if (insert_db)
 		{
 			DynamicZoneLockoutsRepository::InsertLockouts(GetDatabase(), GetID(), { *it });
 		}
 	}
 }
 std::unique_ptr<ServerPacket> DynamicZoneBase::CreateLockoutPacket(const DzLockout& lockout, bool remove, bool members_only) const
 {
 	uint32_t pack_size = sizeof(ServerDzLockout_Struct);
 	auto pack = std::make_unique<ServerPacket>(ServerOP_DzLockout, pack_size);
 	auto buf = reinterpret_cast<ServerDzLockout_Struct*>(pack->pBuffer);
 	buf->dz_id = GetID();
 	buf->expire_time = lockout.GetExpireTime();
 	buf->duration = lockout.GetDuration();
 	buf->sender_zone_id = GetCurrentZoneID();
 	buf->sender_instance_id = GetCurrentInstanceID();
 	buf->remove = remove;
 	buf->members_only = members_only;
 	strn0cpy(buf->event_name, lockout.Event().c_str(), sizeof(buf->event_name));
 	return pack;
 }
 std::unique_ptr<ServerPacket> DynamicZoneBase::CreateLockoutDurationPacket(const DzLockout& lockout, int seconds, bool members_only) const
 {
 	uint32_t pack_size = sizeof(ServerDzLockout_Struct);
 	auto pack = std::make_unique<ServerPacket>(ServerOP_DzLockoutDuration, pack_size);
 	auto buf = reinterpret_cast<ServerDzLockout_Struct*>(pack->pBuffer);
 	buf->dz_id = GetID();
 	buf->expire_time = lockout.GetExpireTime();
 	buf->duration = lockout.GetDuration();
 	buf->sender_zone_id = GetCurrentZoneID();
 	buf->sender_instance_id = GetCurrentInstanceID();
 	buf->members_only = members_only;
 	buf->seconds = seconds;
 	strn0cpy(buf->event_name, lockout.Event().c_str(), sizeof(buf->event_name));
 	return pack;
 }
 void DynamicZoneBase::SyncCharacterLockouts(uint32_t char_id, std::vector<DzLockout>& lockouts)
 {
 	// adds missing event lockouts to client for this expedition and updates
 	// client timers that are both shorter and from another expedition
 	bool modified = false;
 	for (const auto& lockout : m_lockouts)
 	{
 		if (lockout.IsReplay() || lockout.IsExpired() || lockout.UUID() != m_uuid)
 		{
 			continue;
 		}
 		auto it = std::find_if(lockouts.begin(), lockouts.end(), [&](const DzLockout& l) { return l.IsSame(lockout); });
 		if (it == lockouts.end())
 		{
 			modified = true;
 			lockouts.push_back(lockout); // insert missing
 		}
 		else if (it->GetSecondsRemaining() < lockout.GetSecondsRemaining() && it->UUID() != m_uuid)
 		{
 			// only update lockout timer not uuid so loot event apis still work
 			modified = true;
 			it->SetDuration(lockout.GetDuration());
 			it->SetExpireTime(lockout.GetExpireTime());
 		}
 	}
 	if (modified)
 	{
 		CharacterExpeditionLockoutsRepository::InsertLockouts(GetDatabase(), char_id, lockouts);
 	}
 }
@@ -1,8 +1,8 @@
 #ifndef COMMON_DYNAMIC_ZONE_BASE_H
 #define COMMON_DYNAMIC_ZONE_BASE_H
 #include "dynamic_zone_lockout.h"
 #include "eq_constants.h"
 #include "net/packet.h"
 #include "repositories/dynamic_zones_repository.h"
 #include "repositories/dynamic_zone_members_repository.h"
 #include "repositories/dynamic_zone_templates_repository.h"
@@ -10,40 +10,12 @@
 #include <chrono>
 #include <cstdint>
 #include <memory>
 #include <span>
 #include <string>
 #include <vector>
 class Database;
 class ServerPacket;
 // message string 8312 added in September 08 2020 Test patch (used by both dz and shared tasks)
 inline constexpr char DzNotAllAdded[] = "Not all players in your {0} were added to the {1}. The {1} can take a maximum of {2} players, and your {0} has {3}.";
 enum class DzLockMsg : uint8_t
 {
 	None = 0, Close, Begin
 };
 enum class DynamicZoneType
 {
 	None = 0,
 	Expedition,
 	Tutorial,
 	Task,
 	Mission, // Shared Task
 	Quest
 };
 enum class DynamicZoneMemberStatus
 {
 	Unknown = 0,
 	Online,
 	Offline,
 	InDynamicZone,
 	LinkDead
 };
 struct DynamicZoneMember
 {
 	uint32_t id = 0;
@@ -121,7 +93,6 @@ public:
 	const std::string& GetName() const { return m_name; }
 	const std::string& GetUUID() const { return m_uuid; }
 	const DynamicZoneMember& GetLeader() const { return m_leader; }
 	const std::vector<DzLockout>& GetLockouts() const { return m_lockouts; }
 	const std::vector<DynamicZoneMember>& GetMembers() const { return m_members; }
 	const DynamicZoneLocation& GetCompassLocation() const { return m_compass; }
 	const DynamicZoneLocation& GetSafeReturnLocation() const { return m_safereturn; }
@@ -133,34 +104,31 @@ public:
 	uint32_t GetDatabaseMemberCount();
 	DynamicZoneMember GetMemberData(uint32_t character_id);
 	DynamicZoneMember GetMemberData(const std::string& character_name);
-	std::vector<uint32_t> GetMemberIds();
+	EQ::Net::DynamicPacket GetSerializedDzPacket();
 	std::ostringstream GetSerialized();
 	bool HasDatabaseMember(uint32_t character_id);
-	bool HasMember(uint32_t character_id) const;
+	bool HasMember(uint32_t character_id);
-	bool HasMember(const std::string& character_name) const;
+	bool HasMember(const std::string& character_name);
 	bool HasMembers() const { return !m_members.empty(); }
 	bool HasZoneInLocation() const { return m_has_zonein; }
 	bool IsExpedition() const { return m_type == DynamicZoneType::Expedition; }
 	bool IsExpired() const { return m_expire_time < std::chrono::system_clock::now(); }
 	bool IsInstanceID(uint32_t instance_id) const { return (m_instance_id != 0 && m_instance_id == instance_id); }
 	bool IsLocked() const { return m_is_locked; }
 	bool IsValid() const { return m_instance_id != 0; }
 	bool IsSameDz(uint32_t zone_id, uint32_t instance_id) const { return zone_id == m_zone_id && instance_id == m_instance_id; }
 	void LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_size);
 	void LoadTemplate(const DynamicZoneTemplatesRepository::DynamicZoneTemplates& dz_template);
 	void RemoveAllMembers();
 	bool RemoveMember(uint32_t character_id);
 	bool RemoveMember(const std::string& character_name);
 	bool RemoveMember(const DynamicZoneMember& remove_member);
 	void SaveMembers(const std::vector<DynamicZoneMember>& members);
 	void SetCompass(const DynamicZoneLocation& location, bool update_db = false);
 	void SetCompass(uint32_t zone_id, float x, float y, float z, bool update_db = false);
 	void SetDuration(uint32_t seconds) { m_duration = std::chrono::seconds(seconds); }
 	void SetLeader(const DynamicZoneMember& leader, bool update_db = false);
 	void SetLocked(bool lock, bool update_db = false, DzLockMsg lock_msg = DzLockMsg::None, uint32_t color = Chat::Yellow);
 	void SetMaxPlayers(uint32_t max_players) { m_max_players = max_players; }
 	void SetMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status);
 	void SetMinPlayers(uint32_t min_players) { m_min_players = min_players; }
 	void SetName(const std::string& name) { m_name = name; }
 	void SetReplayOnJoin(bool enabled, bool update_db = false);
 	void SetSafeReturn(const DynamicZoneLocation& location, bool update_db = false);
 	void SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading, bool update_db = false);
 	void SetSwitchID(int dz_switch_id, bool update_db = false);
@@ -168,48 +136,34 @@ public:
 	void SetUUID(std::string uuid) { m_uuid = std::move(uuid); }
 	void SetZoneInLocation(const DynamicZoneLocation& location, bool update_db = false);
 	void SetZoneInLocation(float x, float y, float z, float heading, bool update_db = false);
-	bool SwapMember(const DynamicZoneMember& add_member, const std::string& remove_name);
+	bool SwapMember(const DynamicZoneMember& add_member, const std::string& remove_char_name);
 	void AddLockout(const std::string& event, uint32_t seconds);
 	void AddLockoutDuration(const std::string& event, int seconds, bool members_only = true);
 	bool HasLockout(const std::string& event);
 	bool HasReplayLockout();
 	void RemoveLockout(const std::string& event);
 	void SyncCharacterLockouts(uint32_t char_id, std::vector<DzLockout>& lockouts);
 	void UpdateLockoutDuration(const std::string& event, uint32_t seconds, bool members_only = true);
 protected:
-	virtual uint16_t GetCurrentInstanceID() const { return 0; }
+	virtual uint16_t GetCurrentInstanceID() { return 0; }
-	virtual uint16_t GetCurrentZoneID() const { return 0; }
+	virtual uint16_t GetCurrentZoneID() { return 0; }
 	virtual Database& GetDatabase() = 0;
 	virtual void HandleLockoutDuration(const DzLockout& lockout, int seconds, bool members_only, bool insert_db);
 	virtual void HandleLockoutUpdate(const DzLockout& lockout, bool remove, bool members_only);
 	virtual void ProcessCompassChange(const DynamicZoneLocation& location) { m_compass = location; }
 	virtual void ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed);
-	virtual bool ProcessMemberStatusChange(uint32_t character_id, DynamicZoneMemberStatus status);
+	virtual bool ProcessMemberStatusChange(uint32_t member_id, DynamicZoneMemberStatus status);
-	virtual void ProcessRemoveAllMembers() { m_members.clear(); }
+	virtual void ProcessRemoveAllMembers(bool silent = false) { m_members.clear(); }
 	virtual void ProcessSetSwitchID(int dz_switch_id) { m_dz_switch_id = dz_switch_id; }
 	virtual bool SendServerPacket(ServerPacket* packet) = 0;
 	void AddLockout(const DzLockout& lockout, bool members_only = false);
 	void AddInternalMember(const DynamicZoneMember& member);
 	uint32_t Create();
 	uint32_t CreateInstance();
 	void LoadRepositoryResult(DynamicZonesRepository::DynamicZoneInstance&& dz_entry);
 	void RemoveInternalMember(uint32_t character_id);
 	void SaveMembers(const std::vector<DynamicZoneMember>& members);
 	uint32_t SaveToDatabase();
 	bool SetInternalMemberStatus(uint32_t character_id, DynamicZoneMemberStatus status);
-	std::unique_ptr<ServerPacket> CreateServerPacket(uint16_t zone_id, uint16_t instance_id);
+	std::unique_ptr<ServerPacket> CreateServerDzCreatePacket(uint16_t origin_zone_id, uint16_t origin_instance_id);
 	std::unique_ptr<ServerPacket> CreateServerDzLocationPacket(uint16_t server_opcode, const DynamicZoneLocation& location);
 	std::unique_ptr<ServerPacket> CreateServerDzSwitchIDPacket();
 	std::unique_ptr<ServerPacket> CreateServerMemberAddRemovePacket(const DynamicZoneMember& member, bool removed);
 	std::unique_ptr<ServerPacket> CreateServerMemberStatusPacket(uint32_t character_id, DynamicZoneMemberStatus status);
 	std::unique_ptr<ServerPacket> CreateServerMemberSwapPacket(const DynamicZoneMember& remove_member, const DynamicZoneMember& add_member);
 	std::unique_ptr<ServerPacket> CreateServerRemoveAllMembersPacket();
 	std::unique_ptr<ServerPacket> CreateLockoutPacket(const DzLockout& lockout, bool remove, bool members_only = false) const;
 	std::unique_ptr<ServerPacket> CreateLockoutDurationPacket(const DzLockout& lockout, int seconds, bool members_only = false) const;
 	uint32_t m_id = 0;
 	uint32_t m_zone_id = 0;
@@ -221,8 +175,6 @@ protected:
 	bool m_never_expires = false;
 	bool m_has_zonein = false;
 	bool m_has_member_statuses = false;
 	bool m_is_locked = false;
 	bool m_add_replay = true;
 	std::string m_name;
 	std::string m_uuid;
 	DynamicZoneMember m_leader;
@@ -230,15 +182,12 @@ protected:
 	DynamicZoneLocation m_compass;
 	DynamicZoneLocation m_safereturn;
 	DynamicZoneLocation m_zonein;
-	std::chrono::seconds m_duration = {};
+	std::chrono::seconds m_duration;
 	std::chrono::time_point<std::chrono::system_clock> m_start_time;
 	std::chrono::time_point<std::chrono::system_clock> m_expire_time;
 	std::vector<DynamicZoneMember> m_members;
 	std::vector<DzLockout> m_lockouts;
 public:
 	void Unserialize(std::span<char> buf);
 	template<class Archive>
 	void serialize(Archive& archive)
 	{
@@ -253,8 +202,6 @@ public:
 			m_never_expires,
 			m_has_zonein,
 			m_has_member_statuses,
 			m_is_locked,
 			m_add_replay,
 			m_name,
 			m_uuid,
 			m_leader,
@@ -265,8 +212,7 @@ public:
 			m_duration,
 			m_start_time,
 			m_expire_time,
-			m_members,
+			m_members
 			m_lockouts
 		);
 	}
 };
@@ -1,92 +0,0 @@
 #include "dynamic_zone_lockout.h"
 #include "strings.h"
 #include "rulesys.h"
 #include "util/uuid.h"
 #include <fmt/format.h>
 #include <cereal/types/chrono.hpp>
 DzLockout::DzLockout(std::string uuid, std::string expedition, std::string event, uint64_t expire_time, uint32_t duration)
 	: m_uuid(std::move(uuid))
 	, m_name(std::move(expedition))
 	, m_event(std::move(event))
 	, m_expire_time(std::chrono::system_clock::from_time_t(expire_time))
 	, m_duration(duration)
 {
 	m_is_replay = m_event == ReplayTimer;
 }
 DzLockout::DzLockout(std::string_view name, BaseDynamicZoneLockoutsRepository::DynamicZoneLockouts&& lockout)
 	: m_uuid(std::move(lockout.from_expedition_uuid))
 	, m_name(name)
 	, m_event(std::move(lockout.event_name))
 	, m_expire_time(std::chrono::system_clock::from_time_t(lockout.expire_time))
 	, m_duration(lockout.duration)
 {
 	m_is_replay = m_event == ReplayTimer;
 }
 DzLockout DzLockout::Create(const std::string& expedition, const std::string& event, uint32_t seconds, std::string uuid)
 {
 	seconds = static_cast<uint32_t>(seconds * RuleR(Expedition, LockoutDurationMultiplier));
 	if (uuid.empty())
 	{
 		uuid = EQ::Util::UUID::Generate().ToString();
 	}
 	DzLockout lockout{uuid, expedition, event, 0, seconds};
 	lockout.Reset(); // sets expire time
 	return lockout;
 }
 uint32_t DzLockout::GetSecondsRemaining() const
 {
 	auto now = std::chrono::system_clock::now();
 	if (m_expire_time > now)
 	{
 		auto remaining = m_expire_time - now;
 		return static_cast<uint32_t>(std::chrono::duration_cast<std::chrono::seconds>(remaining).count());
 	}
 	return 0;
 }
 DzLockout::TimeStrings DzLockout::GetTimeRemainingStrs() const
 {
 	auto seconds = GetSecondsRemaining();
 	return DzLockout::TimeStrings{
 		fmt::format_int(seconds / 86400).str(),     // days
 		fmt::format_int(seconds / 3600 % 24).str(), // hours
 		fmt::format_int(seconds / 60 % 60).str(),   // minutes
 		fmt::format_int(seconds % 60).str()         // seconds
 	};
 }
 bool DzLockout::IsSame(const DzLockout& other) const
 {
 	return other.IsSame(m_name, m_event);
 }
 bool DzLockout::IsSame(const std::string& expedition, const std::string& event) const
 {
 	return m_name == expedition && m_event == event;
 }
 void DzLockout::AddLockoutTime(int seconds)
 {
 	seconds = static_cast<int>(seconds * RuleR(Expedition, LockoutDurationMultiplier));
 	auto new_duration = std::max(0, static_cast<int>(m_duration.count()) + seconds);
 	auto start_time = m_expire_time - m_duration;
 	m_duration = std::chrono::seconds(new_duration);
 	m_expire_time = start_time + m_duration;
 }
 template <typename T>
 void DzLockout::serialize(T& archive)
 {
 	archive(m_is_replay, m_uuid, m_name, m_event, m_duration, m_expire_time);
 }
 template void DzLockout::serialize(cereal::BinaryOutputArchive&);
 template void DzLockout::serialize(cereal::BinaryInputArchive&);
@@ -1,56 +0,0 @@
 #pragma once
 #include <chrono>
 #include <string>
 #include "repositories/base/base_dynamic_zone_lockouts_repository.h"
 class DzLockout
 {
 public:
 	DzLockout() = default;
 	DzLockout(std::string uuid, std::string expedition, std::string event, uint64_t expire_time, uint32_t duration);
 	DzLockout(std::string_view name, BaseDynamicZoneLockoutsRepository::DynamicZoneLockouts&& lockout);
 	static constexpr char ReplayTimer[] = "Replay Timer";
 	static DzLockout Create(const std::string& expedition, const std::string& event, uint32_t seconds, std::string uuid = {});
 	struct TimeStrings
 	{
 		std::string days;
 		std::string hours;
 		std::string mins;
 		std::string secs;
 	};
 	void AddLockoutTime(int seconds);
 	uint32_t GetDuration() const { return static_cast<uint32_t>(m_duration.count()); }
 	uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
 	uint64_t GetStartTime() const { return std::chrono::system_clock::to_time_t(m_expire_time - m_duration); }
 	uint32_t GetSecondsRemaining() const;
 	TimeStrings GetTimeRemainingStrs() const;
 	const std::string& DzName() const { return m_name; }
 	const std::string& Event() const { return m_event; }
 	const std::string& UUID() const { return m_uuid; }
 	bool IsEvent(std::string_view event) const { return m_event == event; }
 	bool IsExpired() const { return GetSecondsRemaining() == 0; }
 	bool IsReplay() const { return m_is_replay; }
 	bool IsSame(const DzLockout& other) const;
 	bool IsSame(const std::string& expedition, const std::string& event) const;
 	bool IsUUID(const std::string& uuid) const { return uuid == m_uuid; }
 	void Reset() { m_expire_time = std::chrono::system_clock::now() + m_duration; }
 	void SetDuration(uint32_t seconds) { m_duration = std::chrono::seconds(seconds); }
 	void SetExpireTime(uint64_t expire_time) { m_expire_time = std::chrono::system_clock::from_time_t(expire_time); }
 	void SetUUID(const std::string& uuid) { m_uuid = uuid; }
 	template <typename T>
 	void serialize(T& archive);
 private:
 	bool m_is_replay = false;
 	std::string m_uuid; // dz received in
 	std::string m_name;
 	std::string m_event;
 	std::chrono::seconds m_duration = {};
 	std::chrono::time_point<std::chrono::system_clock> m_expire_time;
 };
@@ -451,23 +451,3 @@ bool LDoNTheme::IsValid(uint32 theme_id)
 {
 	return ldon_theme_names.find(theme_id) != ldon_theme_names.end();
 }
 std::string PetCommand::GetName(uint8 pet_command)
 {
 	return IsValid(pet_command) ? pet_commands[pet_command] : "UNKNOWN PET COMMAND";
 }
 bool PetCommand::IsValid(uint8 pet_command)
 {
 	return pet_commands.find(pet_command) != pet_commands.end();
 }
 std::string PetType::GetName(uint8 pet_type)
 {
 	return IsValid(pet_type) ? pet_types[pet_type] : "UNKNOWN PET TYPE";
 }
 bool PetType::IsValid(uint8 pet_type)
 {
 	return pet_types.find(pet_type) != pet_types.end();
 }
@@ -130,8 +130,6 @@ namespace EQ
 		using RoF2::invtype::MAIL_SIZE;
 		using RoF2::invtype::GUILD_TROPHY_TRIBUTE_SIZE;
 		using RoF2::invtype::KRONO_SIZE;
 		using RoF2::invtype::GUILD_BANK_MAIN_SIZE;
 		using RoF2::invtype::GUILD_BANK_DEPOSIT_SIZE;
 		using RoF2::invtype::OTHER_SIZE;
 		using RoF2::invtype::TRADE_NPC_SIZE;
@@ -792,131 +790,4 @@ namespace BookType {
 	constexpr uint8 ItemInfo = 2;
 }
 namespace PetButton {
 	constexpr uint8 Sit         = 0;
 	constexpr uint8 Stop        = 1;
 	constexpr uint8 Regroup     = 2;
 	constexpr uint8 Follow      = 3;
 	constexpr uint8 Guard       = 4;
 	constexpr uint8 Taunt       = 5;
 	constexpr uint8 Hold        = 6;
 	constexpr uint8 GreaterHold = 7;
 	constexpr uint8 Focus       = 8;
 	constexpr uint8 SpellHold   = 9;
 }
 namespace PetButtonState {
 	constexpr uint8 Off = 0;
 	constexpr uint8 On  = 1;
 }
 namespace PetCommand {
 	constexpr uint8 HealthReport   = 0;  // /pet health or Pet Window
 	constexpr uint8 Leader         = 1;  // /pet leader or Pet Window
 	constexpr uint8 Attack         = 2;  // /pet attack or Pet Window
 	constexpr uint8 QAttack        = 3;  // /pet qattack or Pet Window
 	constexpr uint8 FollowMe       = 4;  // /pet follow or Pet Window
 	constexpr uint8 GuardHere      = 5;  // /pet guard or Pet Window
 	constexpr uint8 Sit            = 6;  // /pet sit or Pet Window
 	constexpr uint8 SitDown        = 7;  // /pet sit on
 	constexpr uint8 StandUp        = 8;  // /pet sit off
 	constexpr uint8 Stop           = 9;  // /pet stop or Pet Window - Not implemented
 	constexpr uint8 StopOn         = 10; // /pet stop on - Not implemented
 	constexpr uint8 StopOff        = 11; // /pet stop off - Not implemented
 	constexpr uint8 Taunt          = 12; // /pet taunt or Pet Window
 	constexpr uint8 TauntOn        = 13; // /pet taunt on
 	constexpr uint8 TauntOff       = 14; // /pet taunt off
 	constexpr uint8 Hold           = 15; // /pet hold or Pet Window, won't add to hate list unless attacking
 	constexpr uint8 HoldOn         = 16; // /pet hold on
 	constexpr uint8 HoldOff        = 17; // /pet hold off
 	constexpr uint8 GreaterHold    = 18; // /pet ghold, will never add to hate list unless told to
 	constexpr uint8 GreaterHoldOn  = 19; // /pet ghold on
 	constexpr uint8 GreaterHoldOff = 20; // /pet ghold off
 	constexpr uint8 SpellHold      = 21; // /pet no cast or /pet spellhold or Pet Window
 	constexpr uint8 SpellHoldOn    = 22; // /pet spellhold on
 	constexpr uint8 SpellHoldOff   = 23; // /pet spellhold off
 	constexpr uint8 Focus          = 24; // /pet focus or Pet Window
 	constexpr uint8 FocusOn        = 25; // /pet focus on
 	constexpr uint8 FocusOff       = 26; // /pet focus off
 	constexpr uint8 Feign          = 27; // /pet feign
 	constexpr uint8 BackOff        = 28; // /pet back off
 	constexpr uint8 GetLost        = 29; // /pet get lost
 	constexpr uint8 GuardMe        = 30; // Same as /pet follow, but different message in older clients
 	constexpr uint8 Regroup        = 31; // /pet regroup, acts like classic hold
 	constexpr uint8 RegroupOn      = 32; // /pet regroup on
 	constexpr uint8 RegroupOff     = 33; // /pet regroup off
 	constexpr uint8 Max            = 34;
 	static std::map<uint8, std::string> pet_commands = {
 		{ PetCommand::HealthReport,   "Health Report" },
 		{ PetCommand::Leader,         "Leader" },
 		{ PetCommand::Attack,         "Attack" },
 		{ PetCommand::QAttack,        "QAttack" },
 		{ PetCommand::FollowMe,       "Follow Me" },
 		{ PetCommand::GuardHere,      "Guard Here" },
 		{ PetCommand::Sit,            "Sit" },
 		{ PetCommand::SitDown,        "Sit Down" },
 		{ PetCommand::StandUp,        "Stand Up" },
 		{ PetCommand::Stop,           "Stop" },
 		{ PetCommand::StopOn,         "Stop On" },
 		{ PetCommand::StopOff,        "Stop Off" },
 		{ PetCommand::Taunt,          "Taunt" },
 		{ PetCommand::TauntOn,        "Taunt On" },
 		{ PetCommand::TauntOff,       "Taunt Off" },
 		{ PetCommand::Hold,           "Hold" },
 		{ PetCommand::HoldOn,         "Hold On" },
 		{ PetCommand::HoldOff,        "Hold Off" },
 		{ PetCommand::GreaterHold,    "Greater Hold" },
 		{ PetCommand::GreaterHoldOn,  "Greater Hold On" },
 		{ PetCommand::GreaterHoldOff, "Greater Hold Off" },
 		{ PetCommand::SpellHold,      "Spell Hold" },
 		{ PetCommand::SpellHoldOn,    "Spell Hold On" },
 		{ PetCommand::SpellHoldOff,   "Spell Hold Off" },
 		{ PetCommand::Focus,          "Focus" },
 		{ PetCommand::FocusOn,        "Focus On" },
 		{ PetCommand::FocusOff,       "Focus Off" },
 		{ PetCommand::Feign,          "Feign" },
 		{ PetCommand::BackOff,        "Back Off" },
 		{ PetCommand::GetLost,        "Get Lost" },
 		{ PetCommand::GuardMe,        "Guard Me" },
 		{ PetCommand::Regroup,        "Regroup" },
 		{ PetCommand::RegroupOn,      "Regroup On" },
 		{ PetCommand::RegroupOff,     "Regroup Off" },
 		{ PetCommand::Max,            "Max" }
 	};
 	std::string GetName(uint8 pet_command);
 	bool IsValid(uint8 pet_command);
 }
 namespace PetOrder {
 	constexpr uint8 Follow = 0;
 	constexpr uint8 Sit    = 1;
 	constexpr uint8 Guard  = 2;
 	constexpr uint8 Feign  = 3;
 }
 namespace PetType {
 	constexpr uint8 Familiar   = 0;
 	constexpr uint8 Animation  = 1;
 	constexpr uint8 Normal     = 2;
 	constexpr uint8 Charmed    = 3;
 	constexpr uint8 Follow     = 4;
 	constexpr uint8 TargetLock = 5;
 	constexpr uint8 None       = 255;
 	static std::map<uint8, std::string> pet_types = {
 		{ PetType::Familiar, "Familiar" },
 		{ PetType::Animation, "Animation" },
 		{ PetType::Normal, "Normal" },
 		{ PetType::Charmed, "Charmed" },
 		{ PetType::Follow, "Follow" },
 		{ PetType::TargetLock, "Target Lock" },
 		{ PetType::None, "None" }
 	};
 	std::string GetName(uint8 pet_type);
 	bool IsValid(uint8 pet_type);
 }
 #endif /*COMMON_EMU_CONSTANTS_H*/
@@ -287,8 +287,6 @@ N(OP_InstillDoubt),
 N(OP_InterruptCast),
 N(OP_InvokeChangePetName),
 N(OP_InvokeChangePetNameImmediate),
 N(OP_InvokeNameChangeImmediate),
 N(OP_InvokeNameChangeLazy),
 N(OP_ItemLinkClick),
 N(OP_ItemLinkResponse),
 N(OP_ItemLinkText),
@@ -475,6 +473,7 @@ N(OP_SendAATable),
 N(OP_SendCharInfo),
 N(OP_SendExpZonein),
 N(OP_SendFindableNPCs),
 N(OP_SendFindableLocations),
 N(OP_SendGuildTributes),
 N(OP_SendLoginInfo),
 N(OP_SendMaxCharacters),
@@ -974,6 +974,25 @@ namespace ZoneBlockedSpellTypes {
 	const uint8 Region   = 2;
 };
 enum class DynamicZoneType
 {
 	None = 0,
 	Expedition,
 	Tutorial,
 	Task,
 	Mission, // Shared Task
 	Quest
 };
 enum class DynamicZoneMemberStatus : uint8_t
 {
 	Unknown = 0,
 	Online,
 	Offline,
 	InDynamicZone,
 	LinkDead
 };
 enum StartZoneIndex {
    Odus = 0,
    Qeynos,
@@ -988,8 +1007,7 @@ enum StartZoneIndex {
    Felwithe,
    Akanon,
    Cabilis,
-    SharVahl,
+    SharVahl
    RatheMtn
 };
 enum FVNoDropFlagRule
@@ -173,7 +173,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL,
 			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL,
 			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL,
-			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL
+			ClientUnknown::INULL
 		),
 		ClientUnknown::INULL,
@@ -200,7 +200,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			Client62::INULL, Client62::INULL, Client62::INULL,
 			Client62::INULL, Client62::INULL, Client62::INULL,
 			Client62::INULL, Client62::INULL, Client62::INULL,
-			Client62::INULL, Client62::INULL, Client62::INULL
+			Client62::INULL
 		),
 		Client62::INULL,
@@ -227,7 +227,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			Titanium::invtype::VIEW_MOD_PC_SIZE,	Titanium::invtype::VIEW_MOD_BANK_SIZE,	Titanium::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			Titanium::invtype::VIEW_MOD_LIMBO_SIZE,	Titanium::invtype::ALT_STORAGE_SIZE,	Titanium::invtype::ARCHIVED_SIZE,
 			Titanium::INULL,						Titanium::INULL,						Titanium::INULL,
-			Titanium::INULL,						Titanium::INULL,						Titanium::invtype::OTHER_SIZE
+			Titanium::invtype::OTHER_SIZE
 		),
 		Titanium::invslot::EQUIPMENT_BITMASK,
@@ -254,7 +254,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			SoF::invtype::VIEW_MOD_PC_SIZE,		SoF::invtype::VIEW_MOD_BANK_SIZE,	SoF::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			SoF::invtype::VIEW_MOD_LIMBO_SIZE,	SoF::invtype::ALT_STORAGE_SIZE,		SoF::invtype::ARCHIVED_SIZE,
 			SoF::INULL,							SoF::INULL,							SoF::INULL,
-			SoF::INULL,							SoF::INULL,							SoF::invtype::OTHER_SIZE
+			SoF::invtype::OTHER_SIZE
 		),
 		SoF::invslot::EQUIPMENT_BITMASK,
@@ -281,7 +281,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			SoD::invtype::VIEW_MOD_PC_SIZE,		SoD::invtype::VIEW_MOD_BANK_SIZE,	SoD::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			SoD::invtype::VIEW_MOD_LIMBO_SIZE,	SoD::invtype::ALT_STORAGE_SIZE,		SoD::invtype::ARCHIVED_SIZE,
 			SoD::INULL,							SoD::INULL,							SoD::INULL,
-			SoD::INULL,							SoD::INULL,							SoD::invtype::OTHER_SIZE
+			SoD::invtype::OTHER_SIZE
 		),
 		SoD::invslot::EQUIPMENT_BITMASK,
@@ -308,7 +308,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			UF::invtype::VIEW_MOD_PC_SIZE,		UF::invtype::VIEW_MOD_BANK_SIZE,	UF::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			UF::invtype::VIEW_MOD_LIMBO_SIZE,	UF::invtype::ALT_STORAGE_SIZE,		UF::invtype::ARCHIVED_SIZE,
 			UF::INULL,							UF::INULL,							UF::INULL,
-			UF::INULL,							UF::INULL,							UF::invtype::OTHER_SIZE
+			UF::invtype::OTHER_SIZE
 		),
 		UF::invslot::EQUIPMENT_BITMASK,
@@ -335,7 +335,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			RoF::invtype::VIEW_MOD_PC_SIZE,		RoF::invtype::VIEW_MOD_BANK_SIZE,			RoF::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			RoF::invtype::VIEW_MOD_LIMBO_SIZE,	RoF::invtype::ALT_STORAGE_SIZE,				RoF::invtype::ARCHIVED_SIZE,
 			RoF::invtype::MAIL_SIZE,			RoF::invtype::GUILD_TROPHY_TRIBUTE_SIZE,	RoF::INULL,
-			RoF::INULL,RoF::INULL,RoF::invtype::OTHER_SIZE
+			RoF::invtype::OTHER_SIZE
 		),
 		RoF::invslot::EQUIPMENT_BITMASK,
@@ -362,7 +362,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			RoF2::invtype::VIEW_MOD_PC_SIZE,	RoF2::invtype::VIEW_MOD_BANK_SIZE,			RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			RoF2::invtype::VIEW_MOD_LIMBO_SIZE,	RoF2::invtype::ALT_STORAGE_SIZE,			RoF2::invtype::ARCHIVED_SIZE,
 			RoF2::invtype::MAIL_SIZE,			RoF2::invtype::GUILD_TROPHY_TRIBUTE_SIZE,	RoF2::invtype::KRONO_SIZE,
-			RoF2::invtype::GUILD_BANK_MAIN_SIZE,RoF2::invtype::GUILD_BANK_DEPOSIT_SIZE,     RoF2::invtype::OTHER_SIZE
+			RoF2::invtype::OTHER_SIZE
 		),
 		RoF2::invslot::EQUIPMENT_BITMASK,
@@ -389,7 +389,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			EntityLimits::NPC::INULL,				EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL,
 			EntityLimits::NPC::INULL,				EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL,
 			EntityLimits::NPC::INULL,				EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL,
-			EntityLimits::NPC::INULL,	EntityLimits::NPC::INULL,EntityLimits::NPC::INULL
+			EntityLimits::NPC::INULL
 		),
 		EntityLimits::NPC::INULL,
@@ -416,7 +416,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			EntityLimits::NPCMerchant::INULL,								EntityLimits::NPCMerchant::INULL,	EntityLimits::NPCMerchant::INULL,
 			EntityLimits::NPCMerchant::INULL,								EntityLimits::NPCMerchant::INULL,	EntityLimits::NPCMerchant::INULL,
 			EntityLimits::NPCMerchant::INULL,								EntityLimits::NPCMerchant::INULL,	EntityLimits::NPCMerchant::INULL,
-			EntityLimits::NPCMerchant::INULL,								EntityLimits::NPCMerchant::INULL,   EntityLimits::NPCMerchant::INULL
+			EntityLimits::NPCMerchant::INULL
 		),
 		EntityLimits::NPCMerchant::INULL,
@@ -443,7 +443,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			EntityLimits::Merc::INULL,										EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL,
 			EntityLimits::Merc::INULL,										EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL,
 			EntityLimits::Merc::INULL,										EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL,
-			EntityLimits::Merc::INULL,										EntityLimits::Merc::INULL,	EntityLimits::Merc::INULL
+			EntityLimits::Merc::INULL
 		),
 		EntityLimits::Merc::INULL,
@@ -470,7 +470,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			EntityLimits::Bot::INULL,										EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL,
 			EntityLimits::Bot::INULL,										EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL,
 			EntityLimits::Bot::INULL,										EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL,
-			EntityLimits::Bot::INULL,										EntityLimits::Bot::INULL,	EntityLimits::Bot::INULL
+			EntityLimits::Bot::INULL
 		),
 		EntityLimits::Bot::invslot::EQUIPMENT_BITMASK,
@@ -497,7 +497,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			EntityLimits::ClientPet::INULL,									EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL,
 			EntityLimits::ClientPet::INULL,									EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL,
 			EntityLimits::ClientPet::INULL,									EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL,
-			EntityLimits::ClientPet::INULL,									EntityLimits::ClientPet::INULL,	EntityLimits::ClientPet::INULL
+			EntityLimits::ClientPet::INULL
 		),
 		EntityLimits::ClientPet::INULL,
@@ -524,7 +524,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			EntityLimits::NPCPet::INULL,									EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL,
 			EntityLimits::NPCPet::INULL,									EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL,
 			EntityLimits::NPCPet::INULL,									EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL,
-			EntityLimits::NPCPet::INULL,									EntityLimits::NPCPet::INULL,	EntityLimits::NPCPet::INULL
+			EntityLimits::NPCPet::INULL
 		),
 		EntityLimits::NPCPet::INULL,
@@ -551,7 +551,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			EntityLimits::MercPet::INULL,									EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL,
 			EntityLimits::MercPet::INULL,									EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL,
 			EntityLimits::MercPet::INULL,									EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL,
-			EntityLimits::MercPet::INULL,									EntityLimits::MercPet::INULL,	EntityLimits::MercPet::INULL
+			EntityLimits::MercPet::INULL
 		),
 		EntityLimits::MercPet::INULL,
@@ -578,7 +578,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			EntityLimits::BotPet::INULL,									EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL,
 			EntityLimits::BotPet::INULL,									EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL,
 			EntityLimits::BotPet::INULL,									EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL,
-			EntityLimits::BotPet::INULL,									EntityLimits::BotPet::INULL,	EntityLimits::BotPet::INULL
+			EntityLimits::BotPet::INULL
 		),
 		EntityLimits::BotPet::INULL,
@@ -605,7 +605,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			Titanium::invtype::VIEW_MOD_PC_SIZE,	Titanium::invtype::VIEW_MOD_BANK_SIZE,	Titanium::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			Titanium::invtype::VIEW_MOD_LIMBO_SIZE,	Titanium::INULL,						Titanium::INULL,
 			Titanium::INULL,						Titanium::INULL,						Titanium::INULL,
-			Titanium::INULL,						Titanium::INULL,						Titanium::INULL
+			Titanium::INULL
 		),
 		Titanium::INULL,
@@ -632,7 +632,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			SoF::invtype::VIEW_MOD_PC_SIZE,		SoF::invtype::VIEW_MOD_BANK_SIZE,	SoF::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			SoF::invtype::VIEW_MOD_LIMBO_SIZE,	SoF::INULL,							SoF::INULL,
 			SoF::INULL,							SoF::INULL,							SoF::INULL,
-			SoF::INULL,							SoF::INULL,							SoF::INULL
+			SoF::INULL
 		),
 		SoF::INULL,
@@ -659,7 +659,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			SoD::invtype::VIEW_MOD_PC_SIZE,		SoD::invtype::VIEW_MOD_BANK_SIZE,	SoD::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			SoD::invtype::VIEW_MOD_LIMBO_SIZE,	SoD::INULL,							SoD::INULL,
 			SoD::INULL,							SoD::INULL,							SoD::INULL,
-			SoD::INULL,							SoD::INULL,							SoD::INULL
+			SoD::INULL
 		),
 		SoD::INULL,
@@ -686,7 +686,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			UF::invtype::VIEW_MOD_PC_SIZE,		UF::invtype::VIEW_MOD_BANK_SIZE,	UF::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			UF::invtype::VIEW_MOD_LIMBO_SIZE,	UF::INULL,							UF::INULL,
 			UF::INULL,							UF::INULL,							UF::INULL,
-			UF::INULL,							UF::INULL,							UF::INULL
+			UF::INULL
 		),
 		UF::INULL,
@@ -713,7 +713,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			RoF::invtype::VIEW_MOD_PC_SIZE,		RoF::invtype::VIEW_MOD_BANK_SIZE,	RoF::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			RoF::invtype::VIEW_MOD_LIMBO_SIZE,	RoF::INULL,							RoF::INULL,
 			RoF::INULL,							RoF::INULL,							RoF::INULL,
-			RoF::INULL,							RoF::INULL,							RoF::INULL
+			RoF::INULL
 		),
 		RoF::INULL,
@@ -740,7 +740,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			RoF2::invtype::VIEW_MOD_PC_SIZE,	RoF2::invtype::VIEW_MOD_BANK_SIZE,	RoF2::invtype::VIEW_MOD_SHARED_BANK_SIZE,
 			RoF2::invtype::VIEW_MOD_LIMBO_SIZE,	RoF2::INULL,						RoF2::INULL,
 			RoF2::INULL,						RoF2::INULL,						RoF2::INULL,
-			RoF2::INULL,						RoF2::INULL,						RoF2::INULL
+			RoF2::INULL
 		),
 		RoF2::INULL,
@@ -87,7 +87,7 @@ namespace EQ
 				int16 ViewMODPC,	ViewMODBank,		ViewMODSharedBank;
 				int16 ViewMODLimbo,	AltStorage,			Archived;
 				int16 Mail,			GuildTrophyTribute,	Krono;
-				int16 GuildBankMain,GuildBankDeposit,   Other;
+				int16 Other;
 				InventoryTypeSize_Struct(
 					int16 Possessions,	int16 Bank,					int16 SharedBank,
@@ -98,7 +98,7 @@ namespace EQ
 					int16 ViewMODPC,	int16 ViewMODBank,			int16 ViewMODSharedBank,
 					int16 ViewMODLimbo,	int16 AltStorage,			int16 Archived,
 					int16 Mail,			int16 GuildTrophyTribute,	int16 Krono,
-					int16 GuildBankMain,int16 GuildBankDeposit,     int16 Other
+					int16 Other
 				) :
 					Possessions(Possessions),	Bank(Bank),								SharedBank(SharedBank),
 					Trade(Trade),				World(World),							Limbo(Limbo),
@@ -108,7 +108,7 @@ namespace EQ
 					ViewMODPC(ViewMODPC),		ViewMODBank(ViewMODBank),				ViewMODSharedBank(ViewMODSharedBank),
 					ViewMODLimbo(ViewMODLimbo),	AltStorage(AltStorage),					Archived(Archived),
 					Mail(Mail),					GuildTrophyTribute(GuildTrophyTribute),	Krono(Krono),
-					GuildBankMain(GuildBankMain), GuildBankDeposit(GuildBankDeposit),   Other(Other)
+					Other(Other)
 				{ }
 			};
@@ -19,17 +19,17 @@
 #ifndef EQ_PACKET_STRUCTS_H
 #define EQ_PACKET_STRUCTS_H
-#include <list>
+#include "types.h"
 #include <string.h>
 #include <string>
 #include <list>
 #include <time.h>
 #include "../cereal/include/cereal/archives/binary.hpp"
 #include "../cereal/include/cereal/types/string.hpp"
 #include "../cereal/include/cereal/types/vector.hpp"
 #include "../common/version.h"
 #include "emu_constants.h"
 #include "textures.h"
-#include "types.h"
+#include "../cereal/include/cereal/archives/binary.hpp"
 #include "../cereal/include/cereal/types/string.hpp"
 #include "../cereal/include/cereal/types/vector.hpp"
 static const uint32 BUFF_COUNT = 42;
 static const uint32 PET_BUFF_COUNT = 30;
@@ -47,7 +47,7 @@ static const uint32 ADVANCED_LORE_LENGTH = 8192;
 */
 #pragma pack(1)
-struct LoginInfo {
+struct LoginInfo_Struct {
 /*000*/	char	login_info[64];
 /*064*/	uint8	unknown064[124];
 /*188*/	uint8	zoning;			// 01 if zoning, 00 if not
@@ -324,8 +324,6 @@ union
 	bool guild_show;
 	bool trader;
 	bool buyer;
 	bool untargetable;
 	uint32 npc_tint_id;
 };
 struct PlayerState_Struct {
@@ -5531,55 +5529,46 @@ struct GuildBankWithdrawItem_Struct
 struct GuildBankItemUpdate_Struct
 {
-	void Init(
+	void Init(uint32 inAction, uint32 inUnknown004, uint16 inSlotID, uint16 inArea, uint16 inUnknown012, uint32 inItemID, uint32 inIcon, uint32 inQuantity,
-		uint32 inAction,
+			uint32 inPermissions, uint32 inAllowMerge, bool inUseable)
 		uint32 inUnknown004,
 		uint16 inSlotID,
 		uint16 inArea,
 		uint16 inUnknown012,
 		uint32 inItemID,
 		uint32 inIcon,
 		uint32 inQuantity,
 		uint32 inPermissions,
 		uint32 inAllowMerge,
 		bool   inUseable)
 	{
-		action       = inAction;
+		Action = inAction;
-		unknown004   = inUnknown004;
+		Unknown004 = inUnknown004;
-		slot_id      = inSlotID;
+		SlotID = inSlotID;
-		area         = inArea;
+		Area = inArea;
-		display      = inUnknown012;
+		Unknown012 = inUnknown012;
-		item_id      = inItemID;
+		ItemID = inItemID;
-		icon_id      = inIcon;
+		Icon = inIcon;
-		quantity     = inQuantity;
+		Quantity = inQuantity;
-		permissions  = inPermissions;
+		Permissions = inPermissions;
-		allow_merge  = inAllowMerge;
+		AllowMerge = inAllowMerge;
-		is_useable   = inUseable;
+		Useable = inUseable;
-		item_name[0] = '\0';
+		ItemName[0] = '\0';
-		donator[0]   = '\0';
+		Donator[0] = '\0';
-		who_for[0]   = '\0';
+		WhoFor[0] = '\0';
 	};
-/*000*/	uint32	action;
+/*000*/	uint32	Action;
-/*004*/	uint32	unknown004;
+/*004*/	uint32	Unknown004;
-/*008*/	uint16	slot_id;
+/*008*/	uint16	SlotID;
-/*010*/	uint16	area;
+/*010*/	uint16	Area;
-/*012*/	uint32	display;
+/*012*/	uint32	Unknown012;
-/*016*/	uint32	item_id;
+/*016*/	uint32	ItemID;
-/*020*/	uint32	icon_id;
+/*020*/	uint32	Icon;
-/*024*/	uint32	quantity;
+/*024*/	uint32	Quantity;
-/*028*/	uint32	permissions;
+/*028*/	uint32	Permissions;
-/*032*/	uint8	allow_merge;
+/*032*/	uint8	AllowMerge;
-/*033*/	uint8	is_useable;	// Used in conjunction with the Public-if-useable permission.
+/*033*/	uint8	Useable;	// Used in conjunction with the Public-if-useable permission.
-/*034*/	char	item_name[64];
+/*034*/	char	ItemName[64];
-/*098*/	char	donator[64];
+/*098*/	char	Donator[64];
-/*162*/ char	who_for[64];
+/*162*/ char	WhoFor[64];
-/*226*/	uint16	unknown226;
+/*226*/	uint16	Unknown226;
 };
 // newer clients (RoF+) send a list that contains 240 entries
 // The packets don't actually use all 64 chars in the strings, but we'll just overallocate for these
-struct GuildBankItemListEntry_Struct {
+struct GuildBankItemListEntry_Struct
 {
 	uint8 vaild;
 	uint32 permissions;
 	char whofor[64];
@@ -5834,28 +5823,21 @@ struct ChangeSize_Struct
 /*16*/
 };
 enum ChangeNameResponse : int {
 	Denied      = 0,  // 5167: "You have requested an invalid name or a Customer Service Representative has denied your name request. Please try another name."
 	Accepted    = 1,  // 5976: "Your request for a name change was successful."
 	Timeout     = -1, // 5977: "Your request for a name change has timed out. Please try again later."
 	ServerError = -2, // 5978: "The server had an error while processing your name request. Please try again later."
 	RateLimited = -3, // 5979: "You must wait longer before submitting another name request. Please try again in a few minutes."
 	Ineligible  = -4, // 5980: "Your character is not eligible for a name change."
 	Pending     = -5  // 5193: "You already have a name change pending. Please wait until it is fully processed before attempting another name change."
 };
 struct AltChangeName_Struct {
 /*00*/ char new_name[64];
 /*40*/ char old_name[64];
 /*80*/ int  response_code;
 };
 struct ChangePetName_Struct {
 /*00*/ char new_pet_name[64];
 /*40*/ char pet_owner_name[64];
 /*80*/ int  response_code;
 };
 enum ChangePetNameResponse : int {
 	Denied      = 0,        // 5167 You have requested an invalid name or a Customer Service Representative has denied your name request.  Please try another name.
 	Accepted    = 1,        // 5976 Your request for a name change was successful.
 	Timeout     = -3,        // 5979 You must wait longer before submitting another name request. Please try again in a few minutes.
 	NotEligible = -4,    // 5980 Your character is not eligible for a name change.
 	Pending     = -5,        // 5193 You already have a name change pending.  Please wait until it is fully processed before attempting another name change.
 	Unhandled   = -1
 };
 // New OpCode/Struct for SoD+
 struct GroupMakeLeader_Struct
 {
@@ -545,13 +545,13 @@ void EQStream::SendPacket(uint16 opcode, EQApplicationPacket *p)
 	uint32 chunksize, used;
 	uint32 length;
-	if (EQEmuLogSys::Instance()->log_settings[Logs::Server_Client_Packet].is_category_enabled == 1){
+	if (LogSys.log_settings[Logs::Server_Client_Packet].is_category_enabled == 1){
 		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());
 		}
 	}
-	if (EQEmuLogSys::Instance()->log_settings[Logs::Server_Client_Packet_With_Dump].is_category_enabled == 1){
+	if (LogSys.log_settings[Logs::Server_Client_Packet_With_Dump].is_category_enabled == 1){
 		if (p->GetOpcode() != OP_SpecialMesg){
 			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());
 		}
@@ -6,7 +6,7 @@
 #include <string>
 #include "emu_versions.h"
 #include "eq_packet.h"
-#include "net/reliable_stream_connection.h"
+#include "net/daybreak_connection.h"
 typedef enum {
 	ESTABLISHED,
@@ -33,18 +33,18 @@ struct EQStreamManagerInterfaceOptions
 		//Login I had trouble getting to recognize compression at all
 		//but that might be because it was still a bit buggy when i was testing that.
 		if (compressed) {
-			reliable_stream_options.encode_passes[0] = EQ::Net::EncodeCompression;
+			daybreak_options.encode_passes[0] = EQ::Net::EncodeCompression;
 		}
 		else if (encoded) {
-			reliable_stream_options.encode_passes[0] = EQ::Net::EncodeXOR;
+			daybreak_options.encode_passes[0] = EQ::Net::EncodeXOR;
 		}
-		reliable_stream_options.port = port;
+		daybreak_options.port = port;
 	}
 	int opcode_size;
 	bool track_opcode_stats;
-	EQ::Net::ReliableStreamConnectionManagerOptions reliable_stream_options;
+	EQ::Net::DaybreakConnectionManagerOptions daybreak_options;
 };
 class EQStreamManagerInterface
@@ -80,7 +80,7 @@ public:
 	struct Stats
 	{
-		EQ::Net::ReliableStreamConnectionStats ReliableStreamStats;
+		EQ::Net::DaybreakConnectionStats DaybreakStats;
 		int RecvCount[_maxEmuOpcode];
 		int SentCount[_maxEmuOpcode];
 	};
@@ -177,21 +177,6 @@ void EQEmuConfig::parse_config()
 	SharedMemDir = _root["server"]["directories"].get("shared_memory", "shared/").asString();
 	LogDir       = _root["server"]["directories"].get("logs", "logs/").asString();
 	auto load_paths = [&](const std::string& key, std::vector<std::string>& target) {
 		const auto& paths = _root["server"]["directories"][key];
 		if (paths.isArray()) {
 			for (const auto& dir : paths) {
 				if (dir.isString()) {
 					target.push_back(dir.asString());
 				}
 			}
 		}
 	};
 	load_paths("quest_paths", m_quest_directories);
 	load_paths("plugin_paths", m_plugin_directories);
 	load_paths("lua_module_paths", m_lua_module_directories);
 	/**
 	 * Logs
 	 */
@@ -436,11 +421,11 @@ void EQEmuConfig::CheckUcsConfigConversion()
 		LogInfo("Migrating old [eqemu_config] UCS configuration to new configuration");
 		std::string config_file_path = std::filesystem::path{
-			PathManager::Instance()->GetServerPath() + "/eqemu_config.json"
+			path.GetServerPath() + "/eqemu_config.json"
 		}.string();
 		std::string config_file_bak_path = std::filesystem::path{
-			PathManager::Instance()->GetServerPath() + "/eqemu_config.ucs-migrate-json.bak"
+			path.GetServerPath() + "/eqemu_config.ucs-migrate-json.bak"
 		}.string();
 		// copy eqemu_config.json to eqemu_config.json.bak
@@ -120,22 +120,6 @@ class EQEmuConfig
 		const std::string &GetUCSHost() const;
 		uint16 GetUCSPort() const;
 		std::vector<std::string> GetQuestDirectories() const
 		{
 			return m_quest_directories;
 		}
 		std::vector<std::string> GetPluginsDirectories() const
 		{
 			return m_plugin_directories;
 		}
 		std::vector<std::string> GetLuaModuleDirectories() const
 		{
 			return m_lua_module_directories;
 		}
 //	uint16 DynamicCount;
 //	map<string,uint16> StaticZones;
@@ -149,11 +133,6 @@ class EQEmuConfig
 		Json::Value _root;
 		static std::string ConfigFile;
 		std::vector<std::string> m_quest_directories = {};
 		std::vector<std::string> m_plugin_directories = {};
 		std::vector<std::string> m_lua_module_directories = {};
 	protected:
 		void parse_config();
 		EQEmuConfig()
@@ -191,7 +170,7 @@ class EQEmuConfig
 			std::string file = fmt::format(
 				"{}/{}",
-				(file_path.empty() ? PathManager::Instance()->GetServerPath() : file_path),
+				(file_path.empty() ? path.GetServerPath() : file_path),
 				EQEmuConfig::ConfigFile
 			);
@@ -537,9 +537,9 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 {
 	EQEmuLogSys::CloseFileLogs();
-	if (!File::Exists(PathManager::Instance()->GetLogPath())) {
+	if (!File::Exists(path.GetLogPath())) {
-		LogInfo("Logs directory not found, creating [{}]", PathManager::Instance()->GetLogPath());
+		LogInfo("Logs directory not found, creating [{}]", path.GetLogPath());
-		File::Makedir(PathManager::Instance()->GetLogPath());
+		File::Makedir(path.GetLogPath());
 	}
 	/**
@@ -614,7 +614,7 @@ void EQEmuLogSys::EnableConsoleLogging()
 	std::copy(std::begin(pre_silence_settings), std::end(pre_silence_settings), std::begin(log_settings));
 }
-EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings(bool silent_load)
+EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 {
 	InjectTablesIfNotExist();
@@ -656,7 +656,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings(bool silent_load)
 		// 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[c.log_category_id].log_to_file > 0) {
-			m_file_logs_enabled = true;
+			LogSys.m_file_logs_enabled = true;
 		}
 		db_categories.emplace_back(c.log_category_id);
@@ -682,33 +682,14 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings(bool silent_load)
 		if (is_missing_in_database && !is_deprecated_category) {
 			LogInfo("Automatically adding new log category [{}] ({})", Logs::LogCategoryName[i], i);
-			auto e = LogsysCategoriesRepository::NewEntity();
+			auto new_category = LogsysCategoriesRepository::NewEntity();
-			e.log_category_id          = i;
+			new_category.log_category_id          = i;
-			e.log_category_description = Strings::Escape(Logs::LogCategoryName[i]);
+			new_category.log_category_description = Strings::Escape(Logs::LogCategoryName[i]);
-			e.log_to_console           = log_settings[i].log_to_console;
+			new_category.log_to_console           = log_settings[i].log_to_console;
-			e.log_to_gmsay             = log_settings[i].log_to_gmsay;
+			new_category.log_to_gmsay             = log_settings[i].log_to_gmsay;
-			e.log_to_file              = log_settings[i].log_to_file;
+			new_category.log_to_file              = log_settings[i].log_to_file;
-			e.log_to_discord           = log_settings[i].log_to_discord;
+			new_category.log_to_discord           = log_settings[i].log_to_discord;
-			db_categories_to_add.emplace_back(e);
+			db_categories_to_add.emplace_back(new_category);
 		}
 		// look to see if the category name is different in the database
 		auto it = std::find_if(
 			categories.begin(),
 			categories.end(),
 			[i](const auto &c) { return c.log_category_id == i; }
 		);
 		if (it != categories.end()) {
 			if (it->log_category_description != Logs::LogCategoryName[i]) {
 				LogInfo(
 					"Updating log category [{}] ({}) to new name [{}]",
 					it->log_category_description,
 					i,
 					Logs::LogCategoryName[i]
 				);
 				it->log_category_description = Logs::LogCategoryName[i];
 				LogsysCategoriesRepository::ReplaceOne(*m_database, *it);
 			}
 		}
 	}
@@ -718,10 +699,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings(bool silent_load)
 		return this;
 	}
 	if (silent_load) {
 		SilenceConsoleLogging();
 	}
 	LogInfo("Loaded [{}] log categories", categories.size());
 	auto webhooks = DiscordWebhooksRepository::GetWhere(*m_database, fmt::format("id < {}", MAX_DISCORD_WEBHOOK_ID));
@@ -739,10 +716,6 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings(bool silent_load)
 	log_settings[Logs::Info].log_to_file     = static_cast<uint8>(Logs::General);
 	log_settings[Logs::Info].log_to_console  = static_cast<uint8>(Logs::General);
 	if (silent_load) {
 		SilenceConsoleLogging();
 	}
 	return this;
 }
@@ -74,7 +74,7 @@ namespace Logs {
 		Spawns,
 		Spells,
 		Status, // deprecated
-		TCPConnection, // deprecated
+		TCPConnection,
 		Tasks,
 		Tradeskills,
 		Trading,
@@ -149,9 +149,6 @@ namespace Logs {
 		BotSpellChecks,
 		BotSpellTypeChecks,
 		NpcHandin,
 		ZoneState,
 		NetClient,
 		NetTCP,
 		MaxCategoryID /* Don't Remove this */
 	};
@@ -185,7 +182,7 @@ namespace Logs {
 		"Spawns",
 		"Spells",
 		"Status (Deprecated)",
-		"TCP Connection (Deprecated)",
+		"TCP Connection",
 		"Tasks",
 		"Tradeskills",
 		"Trading",
@@ -194,8 +191,8 @@ namespace Logs {
 		"Web Interface (Deprecated)",
 		"World Server (Deprecated)",
 		"Zone Server (Deprecated)",
-		"MySQL Error",
+		"QueryErr",
-		"MySQL Query",
+		"Query",
 		"Mercenaries",
 		"Quest Debug",
 		"Legacy Packet Logging (Deprecated)",
@@ -211,15 +208,15 @@ namespace Logs {
 		"Traps",
 		"NPC Roam Box",
 		"NPC Scaling",
-		"Mob Appearance",
+		"MobAppearance",
 		"Info",
 		"Warning",
 		"Critical (Deprecated)",
 		"Emergency (Deprecated)",
 		"Alert (Deprecated)",
 		"Notice (Deprecated)",
-		"AI Scan Close",
+		"AI Scan",
-		"AI Yell For Help",
+		"AI Yell",
 		"AI CastBeneficial",
 		"AOE Cast",
 		"Entity Management",
@@ -237,7 +234,7 @@ namespace Logs {
 		"DialogueWindow",
 		"HTTP",
 		"Saylink",
-		"Checksum Verification",
+		"ChecksumVer",
 		"CombatRecord",
 		"Hate",
 		"Discord",
@@ -259,13 +256,12 @@ namespace Logs {
 		"Bot Settings",
 		"Bot Spell Checks",
 		"Bot Spell Type Checks",
-		"NpcHandin",
+		"NpcHandin"
 		"ZoneState",
 		"Net Server <-> Client",
 		"Net TCP"
 	};
 }
 #include "eqemu_logsys_log_aliases.h"
 class Database;
 constexpr uint16 MAX_DISCORD_WEBHOOK_ID = 300;
@@ -281,13 +277,7 @@ public:
 	 */
 	void CloseFileLogs();
 	EQEmuLogSys *LoadLogSettingsDefaults();
-	EQEmuLogSys *LoadLogDatabaseSettings(bool silent_load = false);
+	EQEmuLogSys *LoadLogDatabaseSettings();
 	static EQEmuLogSys *Instance()
 	{
 		static EQEmuLogSys instance;
 		return &instance;
 	}
 	/**
 	 * @param directory_name
@@ -354,7 +344,7 @@ public:
 	/**
 	 * Internally used memory reference for all log settings per category
 	 * These are loaded via DB and have defaults loaded in LoadLogSettingsDefaults
-	 * Database loaded via EQEmuLogSys::Instance()->SetDatabase(&database)->LoadLogDatabaseSettings();
+	 * Database loaded via LogSys.SetDatabase(&database)->LoadLogDatabaseSettings();
 	*/
 	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};
@@ -438,7 +428,7 @@ private:
 	void InjectTablesIfNotExist();
 };
-#include "eqemu_logsys_log_aliases.h"
+extern EQEmuLogSys LogSys;
 /**
 template<typename... Args>
@@ -460,7 +450,7 @@ void OutF(
 #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()); \
+    ls.Out(debug_level, log_category, file, func, line, fmt::format(formatStr, ##__VA_ARGS__).c_str()); \
 } while(0)
 #endif
@@ -716,7 +716,7 @@ std::string PlayerEventDiscordFormatter::FormatNPCHandinEvent(
 			);
 			for (int i = 0; i < h.augment_ids.size(); i++) {
-				if (!h.augment_names[i].empty()) {
+				if (!Strings::EqualFold(h.augment_names[i], "None")) {
 					const uint8 slot_id = (i + 1);
 					handin_items_info += fmt::format(
 						"Augment {}: {} ({})\n",
@@ -741,7 +741,7 @@ std::string PlayerEventDiscordFormatter::FormatNPCHandinEvent(
 			);
 			for (int i = 0; i < r.augment_ids.size(); i++) {
-				if (!r.augment_names[i].empty()) {
+				if (!Strings::EqualFold(r.augment_names[i], "None")) {
 					const uint8 slot_id = (i + 1);
 					return_items_info += fmt::format(
 						"Augment {}: {} ({})\n",
@@ -15,9 +15,9 @@ const uint32 PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL = 60 * 60 * 1000; // 1
 // general initialization routine
 void PlayerEventLogs::Init()
 {
 	m_process_batch_events_timer.SetTimer(RuleI(Logging, BatchPlayerEventProcessIntervalSeconds) * 1000);
 	m_process_retention_truncation_timer.SetTimer(PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL);
 	m_database_ping_timer.SetTimer(10 * 1000); // 10 seconds
 	ValidateDatabaseConnection();
@@ -82,12 +82,13 @@ void PlayerEventLogs::Init()
 		PlayerEventLogSettingsRepository::ReplaceMany(*m_database, settings_to_insert);
 	}
 	LoadEtlIds();
 	bool processing_in_world = !RuleB(Logging, PlayerEventsQSProcess) && IsWorld();
 	bool processing_in_qs    = RuleB(Logging, PlayerEventsQSProcess) && IsQueryServ();
 	// on initial boot process truncation
 	if (processing_in_world || processing_in_qs) {
 		LoadEtlIds();
 		ProcessRetentionTruncation();
 	}
 }
@@ -181,26 +182,16 @@ void PlayerEventLogs::ProcessBatchQueue()
 	// Helper to deserialize event data
 	auto Deserialize = [](const std::string &data, auto &out) {
 		if (!Strings::IsValidJson(data)) {
 			return;
 		}
 		// cpp exceptions are terrible, don't ever use them
 		try {
 		std::stringstream        ss(data);
 		cereal::JSONInputArchive ar(ss);
 		out.serialize(ar);
 		}
 		catch (const std::exception &e) {}
 	};
 	// Helper to assign ETL table ID
 	auto                                                                                                          AssignEtlId      = [&](
-		PlayerEventLogsRepository::PlayerEventLogs& r,
+		PlayerEventLogsRepository::PlayerEventLogs &r,
 		PlayerEvent::EventType type
-	)
+	) {
 	{
 		if (m_etl_settings.contains(type)) {
 			r.etl_table_id = m_etl_settings.at(type).next_id++;
 		}
@@ -408,9 +399,10 @@ void PlayerEventLogs::ProcessBatchQueue()
 			auto it = event_processors.find(static_cast<PlayerEvent::EventType>(r.event_type_id));
 			if (it != event_processors.end()) {
 				it->second(r);  // Call the appropriate lambda
 				r.event_data = "{}"; // Clear event data
 			}
 			else {
-				LogPlayerEventsDetail("Non-Implemented ETL routing [{}]", r.event_type_id);
+				LogError("Non-Implemented ETL routing [{}]", r.event_type_id);
 			}
 		}
 	}
@@ -509,7 +501,7 @@ bool PlayerEventLogs::IsEventDiscordEnabled(int32_t event_type_id)
 	}
 	// ensure there is a matching webhook to begin with
-	if (!EQEmuLogSys::Instance()->GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
+	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
 		return true;
 	}
@@ -529,27 +521,13 @@ std::string PlayerEventLogs::GetDiscordWebhookUrlFromEventType(int32_t event_typ
 	}
 	// ensure there is a matching webhook to begin with
-	if (!EQEmuLogSys::Instance()->GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
+	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
-		return EQEmuLogSys::Instance()->GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url;
+		return LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url;
 	}
 	return "";
 }
 void PlayerEventLogs::LoadPlayerEventSettingsFromQS(
 	const std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings> &settings
 )
 {
 	for (const auto &e : settings) {
 		if (e.id >= PlayerEvent::MAX || e.id < 0) {
 			continue;
 		}
 		m_settings[e.id] = e;
 	}
 	LogInfo("Applied [{}] player event log settings from QS", settings.size());
 }
 // GM_COMMAND           | [x] Implemented Formatter
 // ZONING               | [x] Implemented Formatter
 // AA_GAIN              | [x] Implemented Formatter
@@ -931,10 +909,6 @@ std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::Playe
 // general process function, used in world or QS depending on rule Logging:PlayerEventsQSProcess
 void PlayerEventLogs::Process()
 {
 	if (m_database_ping_timer.Check()) {
 		m_database->ping();
 	}
 	if (m_process_batch_events_timer.Check() ||
 		m_record_batch_queue.size() >= RuleI(Logging, BatchPlayerEventProcessChunkSize)) {
 		ProcessBatchQueue();
@@ -73,12 +73,10 @@ public:
 		return BuildPlayerEventPacket(c);
 	}
-	[[nodiscard]] const PlayerEventLogSettingsRepository::PlayerEventLogSettings * GetSettings() const;
+	[[nodiscard]] const PlayerEventLogSettingsRepository::PlayerEventLogSettings *GetSettings() const;
 	bool IsEventDiscordEnabled(int32_t event_type_id);
 	std::string GetDiscordWebhookUrlFromEventType(int32_t event_type_id);
 	void LoadPlayerEventSettingsFromQS(const std::vector<PlayerEventLogSettingsRepository::PlayerEventLogSettings>& settings);
 	static std::string GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e);
 	struct EtlQueues {
@@ -96,12 +94,6 @@ public:
 		std::vector<PlayerEventAaPurchaseRepository::PlayerEventAaPurchase>             aa_purchase;
 	};
 	static PlayerEventLogs* Instance()
 	{
 		static PlayerEventLogs instance;
 		return &instance;
 	}
 private:
 	struct EtlSettings {
 		bool        enabled;
@@ -121,7 +113,6 @@ private:
 	std::map<PlayerEvent::EventType, EtlSettings>  m_etl_settings{};
 	// timers
 	Timer m_database_ping_timer; // database ping timer
 	Timer m_process_batch_events_timer; // events processing timer
 	Timer m_process_retention_truncation_timer; // timer for truncating events based on retention settings
@@ -135,4 +126,6 @@ public:
 	std::map<PlayerEvent::EventType, EtlSettings> &GetEtlSettings() { return m_etl_settings;}
 };
 extern PlayerEventLogs player_event_logs;
 #endif //EQEMU_PLAYER_EVENT_LOGS_H
@@ -21,8 +21,8 @@ void EvolvingItemsManager::LoadEvolvingItems() const
 		results.begin(),
 		results.end(),
 		std::inserter(
-			EvolvingItemsManager::Instance()->GetEvolvingItemsCache(),
+			evolving_items_manager.GetEvolvingItemsCache(),
-			EvolvingItemsManager::Instance()->GetEvolvingItemsCache().end()
+			evolving_items_manager.GetEvolvingItemsCache().end()
 		),
 		[](const ItemsEvolvingDetailsRepository::ItemsEvolvingDetails &x) {
 			return std::make_pair(x.item_id, x);
@@ -42,22 +42,18 @@ void EvolvingItemsManager::SetContentDatabase(Database *db)
 double EvolvingItemsManager::CalculateProgression(const uint64 current_amount, const uint32 item_id)
 {
-	if (!EvolvingItemsManager::Instance()->GetEvolvingItemsCache().contains(item_id)) {
+	if (!evolving_items_manager.GetEvolvingItemsCache().contains(item_id)) {
 		return 0;
 	}
-	return EvolvingItemsManager::Instance()->GetEvolvingItemsCache().at(item_id).required_amount > 0
+	return evolving_items_manager.GetEvolvingItemsCache().at(item_id).required_amount > 0
 		? static_cast<double>(current_amount)
-		  / static_cast<double>(EvolvingItemsManager::Instance()->GetEvolvingItemsCache().at(item_id).required_amount) * 100
+		  / static_cast<double>(evolving_items_manager.GetEvolvingItemsCache().at(item_id).required_amount) * 100
 		: 0;
 }
 void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_id, const EQ::ItemInstance &inst) const
 {
 	if (!inst) {
 		return;
 	}
 	inst.SetEvolveEquipped(false);
 	if (inst.IsEvolving() && slot_id <= EQ::invslot::EQUIPMENT_END && slot_id >= EQ::invslot::EQUIPMENT_BEGIN) {
 		inst.SetEvolveEquipped(true);
@@ -73,11 +69,7 @@ void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_
 		e.character_id  = char_id;
 		e.item_id       = inst.GetID();
 		e.equipped      = inst.GetEvolveEquipped();
-		e.final_item_id = EvolvingItemsManager::Instance()->GetFinalItemID(inst);
+		e.final_item_id = evolving_items_manager.GetFinalItemID(inst);
 		if (inst.GetEvolveCurrentAmount() > 0) {
 			e.current_amount = inst.GetEvolveCurrentAmount();
 			inst.CalculateEvolveProgression();
 		}
 		auto r = CharacterEvolvingItemsRepository::InsertOne(*m_db, e);
 		e.id   = r.id;
@@ -95,25 +87,21 @@ void EvolvingItemsManager::DoLootChecks(const uint32 char_id, const uint16 slot_
 uint32 EvolvingItemsManager::GetFinalItemID(const EQ::ItemInstance &inst) const
 {
 	if (!inst) {
 		return 0;
 	}
 	const auto start_iterator = std::ranges::find_if(
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cbegin(),
+		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cend(),
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
 		[&](const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a) {
 			return a.second.item_evo_id == inst.GetEvolveLoreID();
 		}
 	);
-	if (start_iterator == std::end(EvolvingItemsManager::Instance()->GetEvolvingItemsCache())) {
+	if (start_iterator == std::end(evolving_items_manager.GetEvolvingItemsCache())) {
 		return 0;
 	}
 	const auto final_id = std::ranges::max_element(
 		start_iterator,
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cend(),
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
 		[&](
 		const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a,
 		const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &b
@@ -128,22 +116,18 @@ uint32 EvolvingItemsManager::GetFinalItemID(const EQ::ItemInstance &inst) const
 uint32 EvolvingItemsManager::GetNextEvolveItemID(const EQ::ItemInstance &inst) const
 {
 	if (!inst) {
 		return 0;
 	}
 	int8 const current_level = inst.GetEvolveLvl();
 	const auto iterator = std::ranges::find_if(
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cbegin(),
+		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cend(),
+		evolving_items_manager.GetEvolvingItemsCache().cend(),
 		[&](const std::pair<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> &a) {
 			return a.second.item_evo_id == inst.GetEvolveLoreID() &&
 			       a.second.item_evolve_level == current_level + 1;
 		}
 	);
-	if (iterator == std::end(EvolvingItemsManager::Instance()->GetEvolvingItemsCache())) {
+	if (iterator == std::end(evolving_items_manager.GetEvolvingItemsCache())) {
 		return 0;
 	}
@@ -207,10 +191,6 @@ uint64 EvolvingItemsManager::GetTotalEarnedXP(const EQ::ItemInstance &inst)
 EvolveGetNextItem EvolvingItemsManager::GetNextItemByXP(const EQ::ItemInstance &inst_in, const int64 in_xp)
 {
 	EvolveGetNextItem ets{};
 	if (!inst_in) {
 		return ets;
 	}
 	const auto        evolve_items   = GetEvolveIDItems(inst_in.GetEvolveLoreID());
 	uint32            max_transfer_level = 0;
 	int64             xp                  = in_xp;
@@ -255,12 +235,9 @@ EvolveTransfer EvolvingItemsManager::DetermineTransferResults(
 )
 {
 	EvolveTransfer ets{};
 	if (!inst_from || !inst_to) {
 		return ets;
 	}
-	auto evolving_details_inst_from = EvolvingItemsManager::Instance()->GetEvolveItemDetails(inst_from.GetID());
+	auto evolving_details_inst_from = evolving_items_manager.GetEvolveItemDetails(inst_from.GetID());
-	auto evolving_details_inst_to   = EvolvingItemsManager::Instance()->GetEvolveItemDetails(inst_to.GetID());
+	auto evolving_details_inst_to   = evolving_items_manager.GetEvolveItemDetails(inst_to.GetID());
 	if (!evolving_details_inst_from.id || !evolving_details_inst_to.id) {
 		return ets;
@@ -276,10 +253,10 @@ EvolveTransfer EvolvingItemsManager::DetermineTransferResults(
 			compatibility = 30;
 		}
-		xp           = EvolvingItemsManager::Instance()->GetTotalEarnedXP(inst_from) * compatibility / 100;
+		xp           = evolving_items_manager.GetTotalEarnedXP(inst_from) * compatibility / 100;
-		auto results = EvolvingItemsManager::Instance()->GetNextItemByXP(inst_to, xp);
+		auto results = evolving_items_manager.GetNextItemByXP(inst_to, xp);
-		ets.item_from_id             = EvolvingItemsManager::Instance()->GetFirstItemInLoreGroup(inst_from.GetEvolveLoreID());
+		ets.item_from_id             = evolving_items_manager.GetFirstItemInLoreGroup(inst_from.GetEvolveLoreID());
 		ets.item_from_current_amount = results.from_current_amount;
 		ets.item_to_id               = results.new_item_id;
 		ets.item_to_current_amount   = results.new_current_amount;
@@ -318,10 +295,6 @@ uint32 EvolvingItemsManager::GetFirstItemInLoreGroupByItemID(const uint32 item_i
 void EvolvingItemsManager::LoadPlayerEvent(const EQ::ItemInstance &inst, PlayerEvent::EvolveItem &e)
 {
 	if (!inst) {
 		return;
 	}
 	e.item_id     = inst.GetID();
 	e.item_name   = inst.GetItem() ? inst.GetItem()->Name : std::string();
 	e.level       = inst.GetEvolveLvl();
@@ -53,18 +53,15 @@ public:
 	ItemsEvolvingDetailsRepository::ItemsEvolvingDetails GetEvolveItemDetails(uint64 id);
 	EvolveTransfer DetermineTransferResults(const EQ::ItemInstance& inst_from, const EQ::ItemInstance& inst_to);
 	EvolveGetNextItem GetNextItemByXP(const EQ::ItemInstance &inst_in, int64 in_xp);
-	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails>& GetEvolvingItemsCache() { return m_evolving_items_cache; }
+	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails>& GetEvolvingItemsCache() { return evolving_items_cache; }
 	std::vector<ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> GetEvolveIDItems(uint32 evolve_id);
 	static EvolvingItemsManager* Instance()
 	{
 		static EvolvingItemsManager instance;
 		return &instance;
 	}
 private:
-	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> m_evolving_items_cache;
+	std::map<uint32, ItemsEvolvingDetailsRepository::ItemsEvolvingDetails> evolving_items_cache;
 	Database *                                                             m_db;
 	Database *                                                             m_content_db;
 };
 extern EvolvingItemsManager evolving_items_manager;
 #endif //EVOLVING_H
@@ -0,0 +1,101 @@
 /**
 * EQEmulator: Everquest Server Emulator
 * Copyright (C) 2001-2020 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 "expedition_lockout_timer.h"
 #include "../common/strings.h"
 #include "../common/rulesys.h"
 #include "../common/util/uuid.h"
 #include <fmt/format.h>
 const char* const DZ_REPLAY_TIMER_NAME = "Replay Timer"; // see December 14, 2016 patch notes
 ExpeditionLockoutTimer::ExpeditionLockoutTimer(
 	std::string expedition_uuid, std::string expedition_name,
 	std::string event_name, uint64_t expire_time, uint32_t duration
 ) :
 	m_expedition_uuid{std::move(expedition_uuid)},
 	m_expedition_name{std::move(expedition_name)},
 	m_event_name{std::move(event_name)},
 	m_expire_time(std::chrono::system_clock::from_time_t(expire_time)),
 	m_duration(duration)
 {
 	if (m_event_name == DZ_REPLAY_TIMER_NAME)
 	{
 		m_is_replay_timer = true;
 	}
 }
 ExpeditionLockoutTimer ExpeditionLockoutTimer::CreateLockout(
 	const std::string& expedition_name, const std::string& event_name, uint32_t seconds, std::string uuid)
 {
 	seconds = static_cast<uint32_t>(seconds * RuleR(Expedition, LockoutDurationMultiplier));
 	if (uuid.empty())
 	{
 		uuid = EQ::Util::UUID::Generate().ToString();
 	}
 	ExpeditionLockoutTimer lockout{uuid, expedition_name, event_name, 0, seconds};
 	lockout.Reset(); // sets expire time
 	return lockout;
 }
 uint32_t ExpeditionLockoutTimer::GetSecondsRemaining() const
 {
 	auto now = std::chrono::system_clock::now();
 	if (m_expire_time > now)
 	{
 		auto remaining = m_expire_time - now;
 		return static_cast<uint32_t>(std::chrono::duration_cast<std::chrono::seconds>(remaining).count());
 	}
 	return 0;
 }
 ExpeditionLockoutTimer::DaysHoursMinutes ExpeditionLockoutTimer::GetDaysHoursMinutesRemaining() const
 {
 	auto seconds = GetSecondsRemaining();
 	return ExpeditionLockoutTimer::DaysHoursMinutes{
 		fmt::format_int(seconds / 86400).str(),       // days
 		fmt::format_int((seconds / 3600) % 24).str(), // hours
 		fmt::format_int((seconds / 60) % 60).str()    // minutes
 	};
 }
 bool ExpeditionLockoutTimer::IsSameLockout(const ExpeditionLockoutTimer& compare_lockout) const
 {
 	return compare_lockout.IsSameLockout(GetExpeditionName(), GetEventName());
 }
 bool ExpeditionLockoutTimer::IsSameLockout(
 	const std::string& expedition_name, const std::string& event_name) const
 {
 	return GetExpeditionName() == expedition_name && GetEventName() == event_name;
 }
 void ExpeditionLockoutTimer::AddLockoutTime(int seconds)
 {
 	seconds = static_cast<uint32_t>(seconds * RuleR(Expedition, LockoutDurationMultiplier));
 	auto new_duration = std::max(0, static_cast<int>(m_duration.count()) + seconds);
 	auto start_time = m_expire_time - m_duration;
 	m_duration = std::chrono::seconds(new_duration);
 	m_expire_time = start_time + m_duration;
 }
@@ -0,0 +1,76 @@
 /**
 * EQEmulator: Everquest Server Emulator
 * Copyright (C) 2001-2020 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 EXPEDITION_LOCKOUT_TIMER_H
 #define EXPEDITION_LOCKOUT_TIMER_H
 #include <chrono>
 #include <string>
 extern const char* const DZ_REPLAY_TIMER_NAME;
 class ExpeditionLockoutTimer
 {
 public:
 	ExpeditionLockoutTimer() = default;
 	ExpeditionLockoutTimer(
 		std::string expedition_uuid, std::string expedition_name,
 		std::string event_name, uint64_t expire_time, uint32_t duration);
 	static ExpeditionLockoutTimer CreateLockout(
 		const std::string& expedition_name, const std::string& event_name,
 		uint32_t seconds, std::string uuid = {});
 	struct DaysHoursMinutes
 	{
 		std::string days;
 		std::string hours;
 		std::string mins;
 	};
 	void AddLockoutTime(int seconds);
 	uint32_t GetDuration() const { return static_cast<uint32_t>(m_duration.count()); }
 	uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
 	uint64_t GetStartTime() const { return std::chrono::system_clock::to_time_t(m_expire_time - m_duration); }
 	uint32_t GetSecondsRemaining() const;
 	DaysHoursMinutes GetDaysHoursMinutesRemaining() const;
 	const std::string& GetExpeditionName() const { return m_expedition_name; }
 	const std::string& GetExpeditionUUID() const { return m_expedition_uuid; }
 	const std::string& GetEventName() const { return m_event_name; }
 	bool IsExpired() const { return GetSecondsRemaining() == 0; }
 	bool IsFromExpedition(const std::string& uuid) const { return uuid == m_expedition_uuid; }
 	bool IsReplayTimer() const { return m_is_replay_timer; }
 	bool IsSameLockout(const ExpeditionLockoutTimer& compare_lockout) const;
 	bool IsSameLockout(const std::string& expedition_name, const std::string& event_name) const;
 	void Reset() { m_expire_time = std::chrono::system_clock::now() + m_duration; }
 	void SetDuration(uint32_t seconds) { m_duration = std::chrono::seconds(seconds); }
 	void SetExpireTime(uint64_t expire_time) { m_expire_time = std::chrono::system_clock::from_time_t(expire_time); }
 	void SetUUID(const std::string& uuid) { m_expedition_uuid = uuid; }
 private:
 	bool m_is_replay_timer = false;
 	std::string m_expedition_uuid; // expedition received in
 	std::string m_expedition_name;
 	std::string m_event_name;
 	std::chrono::seconds m_duration;
 	std::chrono::time_point<std::chrono::system_clock> m_expire_time;
 };
 #endif
@@ -95,12 +95,12 @@ bool IsOfEqualRace(int r1, int r2)
 	}
 	// TODO: add more values
 	switch (r1) {
-		case Race::DarkElf:
+		case DARK_ELF:
 			if (r2 == Race::NeriakCitizen) {
 				return true;
 			}
 			break;
-		case Race::Barbarian:
+		case BARBARIAN:
 			if (r2 == Race::HalasCitizen) {
 				return true;
 			}
@@ -116,49 +116,49 @@ bool IsOfIndiffRace(int r1, int r2)
 	}
 	// TODO: add more values
 	switch (r1) {
-		case Race::DarkElf:
+		case DARK_ELF:
-		case Race::Ogre:
+		case OGRE:
-		case Race::Troll:
+		case TROLL:
-			if (r2 == Race::Ogre || r2 == Race::Troll || r2 == Race::DarkElf) {
+			if (r2 == OGRE || r2 == TROLL || r2 == DARK_ELF) {
 				return true;
 			}
 			break;
-		case Race::Human:
+		case HUMAN:
-		case Race::Barbarian:
+		case BARBARIAN:
-		case Race::HalfElf:
+		case HALF_ELF:
-		case Race::Gnome:
+		case GNOME:
-		case Race::Halfling:
+		case HALFLING:
-		case Race::WoodElf:
+		case WOOD_ELF:
-			if (r2 == Race::Human ||
+			if (r2 == HUMAN ||
-			    r2 == Race::Barbarian ||
+			    r2 == BARBARIAN ||
-			    r2 == Race::Erudite ||
+			    r2 == ERUDITE ||
-			    r2 == Race::HalfElf ||
+			    r2 == HALF_ELF ||
-			    r2 == Race::Gnome ||
+			    r2 == GNOME ||
-			    r2 == Race::Halfling ||
+			    r2 == HALFLING ||
-			    r2 == Race::Dwarf ||
+			    r2 == DWARF ||
-			    r2 == Race::HighElf ||
+			    r2 == HIGH_ELF ||
-			    r2 == Race::WoodElf) {
+			    r2 == WOOD_ELF) {
 				return true;
 			}
 			break;
-		case Race::Erudite:
+		case ERUDITE:
-			if (r2 == Race::Human || r2 == Race::HalfElf) {
+			if (r2 == HUMAN || r2 == HALF_ELF) {
 				return true;
 			}
 			break;
-		case Race::Dwarf:
+		case DWARF:
-			if (r2 == Race::Halfling || r2 == Race::Gnome) {
+			if (r2 == HALFLING || r2 == GNOME) {
 				return true;
 			}
 			break;
-		case Race::HighElf:
+		case HIGH_ELF:
-			if (r2 == Race::WoodElf) {
+			if (r2 == WOOD_ELF) {
 				return true;
 			}
 			break;
-		case Race::VahShir:
+		case VAHSHIR:
 			return true;
-		case Race::Iksar:
+		case IKSAR:
 			return false;
 	}
 	return false;
@@ -39,7 +39,6 @@
 #include <filesystem>
 #include <iostream>
 #include <sys/stat.h>
 #include <vector>
 namespace fs = std::filesystem;
@@ -91,21 +90,23 @@ std::string File::GetCwd()
 FileContentsResult File::GetContents(const std::string &file_name)
 {
-	std::ifstream f(file_name, std::ios::in | std::ios::binary);
+	std::string   error;
-	if (!f) {
+	std::ifstream f;
-		return { .error = fmt::format("Couldn't open file [{}]", file_name) };
+	f.open(file_name);
-	}
+	std::string line;
 	constexpr size_t CHUNK_SIZE = 4096;  // Read 4KB chunks
 	std::string lines;
-	std::vector<char> buffer(CHUNK_SIZE);
+	if (f.is_open()) {
-
+		while (f) {
-	while (f.read(buffer.data(), CHUNK_SIZE) || f.gcount() > 0) {
+			std::getline(f, line);
-		lines.append(buffer.data(), f.gcount());
+			lines += line + "\n";
 		}
 	}
 	else {
 		error = fmt::format("Couldn't open file [{}]", file_name);
 	}
 	return FileContentsResult{
 		.contents = lines,
-		.error = {}
+		.error = error,
 	};
 }
@@ -547,54 +547,52 @@ uint32 BaseGuildManager::UpdateDbCreateGuild(std::string name, uint32 leader)
 bool BaseGuildManager::UpdateDbDeleteGuild(uint32 guild_id, bool local_delete, bool db_delete)
 {
 	auto const where_filter = fmt::format("guild_id = {}", guild_id);
 	auto const bank_items   = GuildBankRepository::GetWhere(*m_db, where_filter);
 	if (local_delete) {
 		auto where_filter = fmt::format("guildid = {}", guild_id);
 		auto bank_items   = GuildBankRepository::GetWhere(*m_db, where_filter);
 		if (!bank_items.empty()) {
 			LogError(
-				"Attempt to delete guild id [{}] that still has [{}] items in the bank. Please remove them and try "
+				"Attempt to delete guild id [{}] that still has [{}] items in the bank. Please remove them and try again.",
 				"again.",
 				guild_id,
 				bank_items.size()
 			);
 			LogGuilds(
-				"Attempt to delete guild id [{}] that still has [{}] items in the bank. Please remove them and try "
+				"Attempt to delete guild id [{}] that still has [{}] items in the bank. Please remove them and try again.",
 				"again.",
 				guild_id,
 				bank_items.size()
 			);
 			return false;
 		}
-
+		else {
-		auto res = m_guilds.find(guild_id);
+			std::map<uint32, GuildInfo *>::iterator res;
 			res = m_guilds.find(guild_id);
 			if (res != m_guilds.end()) {
-			safe_delete(res->second);
+				delete res->second;
 				m_guilds.erase(res);
 				LogGuilds("Deleted guild [{}] from memory", guild_id);
-			// Does this need to be sent to world?
+				//Does this need to be sent to world?
 			}
 		}
 	}
 	if (db_delete) {
 		auto where_filter = fmt::format("guildid = {}", guild_id);
 		auto bank_items   = GuildBankRepository::GetWhere(*m_db, where_filter);
 		if (!bank_items.empty()) {
 			LogError(
-				"Attempt to delete guild id [{}] that still has [{}] items in the bank. Please remove them and try "
+				"Attempt to delete guild id [{}] that still has [{}] items in the bank. Please remove them and try again.",
 				"again.",
 				guild_id,
 				bank_items.size()
 			);
 			LogGuilds(
-				"Attempt to delete guild id [{}] that still has [{}] items in the bank. Please remove them and try "
+				"Attempt to delete guild id [{}] that still has [{}] items in the bank. Please remove them and try again.",
 				"again.",
 				guild_id,
 				bank_items.size()
 			);
 			return false;
 		}
-
+		else {
 			auto where_filter = fmt::format("guild_id = {}", guild_id);
 			GuildTributesRepository::DeleteOne(*m_db, guild_id);
 			GuildsRepository::DeleteOne(*m_db, guild_id);
 			GuildRanksRepository::DeleteWhere(*m_db, where_filter);
@@ -602,7 +600,7 @@ bool BaseGuildManager::UpdateDbDeleteGuild(uint32 guild_id, bool local_delete, b
 			GuildMembersRepository::DeleteWhere(*m_db, where_filter);
 			LogGuilds("Deleted guild [{}] from the database", guild_id);
 		}
-
+	}
 	return true;
 }
@@ -2028,57 +2028,3 @@ int16 EQ::InventoryProfile::_HasEvolvingItem(ItemInstQueue &iqueue, uint64 evolv
 	return INVALID_INDEX;
 }
 int16 EQ::InventoryProfile::FindFirstFreeSlotThatFitsItemWithStacking(ItemInstance *item_inst) const
 {
 	auto item_data = item_inst->GetItem();
 	if (!item_data) {
 		return INVALID_INDEX;
 	}
 	for (int16 i = invslot::GENERAL_BEGIN; i <= invslot::GENERAL_END; i++) {
 		auto const inv_item = GetItem(i);
 		if (!inv_item) {
 			// Found available slot in personal inventory
 			// Anything will fit here
 			return i;
 		}
 		if (item_data->IsClassBag() && item_inst->IsNoneEmptyContainer()) {
 			// If the inbound item is a bag with items, it cannot be stored within a bag
 			// Move to next potential slot
 			continue;
 		}
 		if (inv_item->GetID() == item_data->ID && item_data->Stackable) {
 			if (item_inst->GetCharges() + inv_item->GetCharges() <= item_data->StackSize) {
 				// Found a personal inventory slot that has room for a stackable addition
 				return i;
 			}
 		}
 		if (inv_item->IsClassBag() && CanItemFitInContainer(item_data, inv_item->GetItem())) {
 			int16 const base_slot_id = CalcSlotId(i, invbag::SLOT_BEGIN);
 			uint8 const bag_size     = inv_item->GetItem()->BagSlots;
 			uint8 const item_size    = item_data->Size;
 			for (uint8 bag_slot = invbag::SLOT_BEGIN; bag_slot < bag_size; bag_slot++) {
 				auto bag_item = GetItem(base_slot_id + bag_slot);
 				if (!bag_item) {
 					// Found available slot within bag that will hold inbound item
 					return base_slot_id + bag_slot;
 				}
 				if (bag_item && item_data->Stackable && bag_item->GetID() == item_data->ID) {
 					if (item_inst->GetCharges() + bag_item->GetCharges() <= item_data->StackSize) {
 						// Found a bag slot has room for a stackable addition
 						return base_slot_id + bag_slot;
 					}
 				}
 			}
 		}
 	}
 	return INVALID_INDEX;
 }
@@ -179,7 +179,6 @@ namespace EQ
 		int16 FindFreeSlot(bool for_bag, bool try_cursor, uint8 min_size = 0, bool is_arrow = false);
 		int16 FindFreeSlotForTradeItem(const ItemInstance* inst, int16 general_start = invslot::GENERAL_BEGIN, uint8 bag_start = invbag::SLOT_BEGIN);
 		int16 FindFirstFreeSlotThatFitsItem(const EQ::ItemData *inst);
 		int16 FindFirstFreeSlotThatFitsItemWithStacking(ItemInstance *inst) const;
 		// Calculate slot_id for an item within a bag
 		static int16 CalcSlotId(int16 slot_id); // Calc parent bag's slot_id
@@ -259,84 +259,3 @@ bool IpUtil::IsIPAddress(const std::string &ip_address)
 }
 #include <iostream>
 #ifdef _WIN32
 #include <winsock2.h>
    #pragma comment(lib, "ws2_32.lib") // Link against Winsock library
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <unistd.h>
 #endif
 #include <iostream>
 #include <string>
 #ifdef _WIN32
 #include <winsock2.h>
    #include <ws2tcpip.h>  // For inet_pton
    #pragma comment(lib, "ws2_32.lib") // Link against Winsock library
 #else
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>  // For inet_pton
 #include <unistd.h>
 #endif
 bool IpUtil::IsPortInUse(const std::string& ip, int port) {
 	bool in_use = false;
 #ifdef _WIN32
 	WSADATA wsaData;
    if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0) {
        std::cerr << "WSAStartup failed\n";
        return true; // Assume in use on failure
    }
 #endif
 	int sock = socket(AF_INET, SOCK_STREAM, 0);
 	if (sock < 0) {
 #ifdef _WIN32
 		WSACleanup();
 #endif
 		return true; // Assume in use on failure
 	}
 #ifdef _WIN32
 	int opt = 1;
 	setsockopt(sock, SOL_SOCKET, SO_EXCLUSIVEADDRUSE, (char*)&opt, sizeof(opt)); // Windows-specific
 #else
 	int opt = 1;
 	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); // Linux/macOS
 #endif
 	sockaddr_in addr{};
 	addr.sin_family = AF_INET;
 	addr.sin_port = htons(port);
 	// Convert IP address from string to binary format
 	if (inet_pton(AF_INET, ip.c_str(), &addr.sin_addr) <= 0) {
 		std::cerr << "Invalid IP address format: " << ip << std::endl;
 #ifdef _WIN32
 		closesocket(sock);
        WSACleanup();
 #else
 		close(sock);
 #endif
 		return true; // Assume in use on failure
 	}
 	if (bind(sock, (struct sockaddr*)&addr, sizeof(addr)) < 0) {
 		in_use = true; // Bind failed, port is in use
 	}
 #ifdef _WIN32
 	closesocket(sock);
    WSACleanup();
 #else
 	close(sock);
 #endif
 	return in_use;
 }
@@ -37,7 +37,6 @@ public:
 		int port
 	);
 	static bool IsIPAddress(const std::string &ip_address);
 	static bool IsPortInUse(const std::string& ip, int port);
 };
@@ -55,7 +55,7 @@ namespace EQ {
 			EQ_EXCEPT("IPC Mutex", "Could not create mutex.");
 		}
 #else
-		std::string final_name = fmt::format("{}/{}.lock", PathManager::Instance()->GetSharedMemoryPath(), name);
+		std::string final_name = fmt::format("{}/{}.lock", path.GetSharedMemoryPath(), name);
 #ifdef __DARWIN
 #if __DARWIN_C_LEVEL < 200809L
@@ -438,7 +438,7 @@ namespace EQ
 		//uint32	Unk054 {};
 		int16	MaxCharges {};		// Maximum charges items can hold: -1 if not a chargeable item
 		uint8	ItemType {};		// Item Type/Skill (itemClass* from above)
-		int32	SubType {};		// Some items have sub types that can be used for other things (unbreakable fishing poles, SpellEffect::FFItemClass)
+		int32	SubType {};		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
 		uint8	Material {};		// Item material type
 		uint32	HerosForgeModel {};// Hero's Forge Armor Model Type (2-13?)
 		float	SellRate {};		// Sell rate
@@ -0,0 +1,206 @@
 /*
 These fields must be in the order of how they are serialized!
 */
 F(itemclass)
 F(name)
 F(lore)
 F(idfile)
 F(id)
 F(weight)
 F(norent)
 F(nodrop)
 F(size)
 F(slots)
 F(price)
 F(icon)
 F(UNK012)
 F(UNK013)
 F(benefitflag)
 F(tradeskills)
 F(cr)
 F(dr)
 F(pr)
 F(mr)
 F(fr)
 F(astr)
 F(asta)
 F(aagi)
 F(adex)
 F(acha)
 F(aint)
 F(awis)
 F(hp)
 F(mana)
 F(ac)
 F(deity)
 F(skillmodvalue)
 F(UNK033)
 F(skillmodmax)
 F(skillmodtype)
 F(banedmgrace)
 F(banedmgamt)
 F(banedmgbody)
 F(magic)
 F(casttime_)
 F(reqlevel)
 F(bardtype)
 F(bardvalue)
 F(light)
 F(delay)
 F(reclevel)
 F(recskill)
 F(elemdmgtype)
 F(elemdmgamt)
 F(range)
 F(damage)
 F(color)
 F(classes)
 F(races)
 F(UNK054)
 F(maxcharges)
 F(itemtype)
 F(material)
 F(herosforgemodel)
 F(sellrate)
 F(UNK059)
 F(casttime)
 F(elitematerial)
 F(procrate)
 F(combateffects)
 F(shielding)
 F(stunresist)
 F(strikethrough)
 F(extradmgskill)
 F(extradmgamt)
 F(spellshield)
 F(avoidance)
 F(accuracy)
 F(charmfileid)
 F(factionmod1)
 F(factionmod2)
 F(factionmod3)
 F(factionmod4)
 F(factionamt1)
 F(factionamt2)
 F(factionamt3)
 F(factionamt4)
 F(charmfile)
 F(augtype)
 F(augslot1type)
 F(augslot1visible)
 F(augslot2type)
 F(augslot2visible)
 F(augslot3type)
 F(augslot3visible)
 F(augslot4type)
 F(augslot4visible)
 F(augslot5type)
 F(augslot5visible)
 F(augslot6type)
 F(augslot6visible)
 F(ldontheme)
 F(ldonprice)
 F(ldonsold)
 F(bagtype)
 F(bagslots)
 F(bagsize)
 F(bagwr)
 F(book)
 F(booktype)
 F(filename)
 F(banedmgraceamt)
 F(augrestrict)
 F(loregroup)
 F(pendingloreflag)
 F(artifactflag)
 F(summonedflag)
 F(favor)
 F(fvnodrop)
 F(endur)
 F(dotshielding)
 F(attack)
 F(regen)
 F(manaregen)
 F(enduranceregen)
 F(haste)
 F(damageshield)
 F(recastdelay)
 F(recasttype)
 F(guildfavor)
 F(augdistiller)
 F(UNK123)
 F(UNK124)
 F(attuneable)
 F(nopet)
 F(UNK127)
 F(pointtype)
 F(potionbelt)
 F(potionbeltslots)
 F(stacksize)
 F(notransfer)
 F(stackable)
 F(UNK134)
 F(clickeffect)
 F(clicktype)
 F(clicklevel)
 F(clicklevel2)
 F(proceffect)
 F(proctype)
 F(proclevel)
 F(proclevel2)
 F(worneffect)
 F(worntype)
 F(wornlevel)
 F(wornlevel2)
 F(focuseffect)
 F(focustype)
 F(focuslevel)
 F(focuslevel2)
 F(scrolleffect)
 F(scrolltype)
 F(scrolllevel)
 F(scrolllevel2)
 F(bardeffect)
 F(bardeffecttype)
 F(bardlevel2)
 F(bardlevel)
 F(questitemflag)
 F(svcorruption)
 F(purity)
 F(evoitem)
 F(evoid)
 F(evolvinglevel)
 F(evomax)
 F(backstabdmg)
 F(dsmitigation)
 F(heroic_str)
 F(heroic_int)
 F(heroic_wis)
 F(heroic_agi)
 F(heroic_dex)
 F(heroic_sta)
 F(heroic_cha)
 F(heroic_mr)
 F(heroic_fr)
 F(heroic_cr)
 F(heroic_dr)
 F(heroic_pr)
 F(heroic_svcorrup)
 F(healamt)
 F(spelldmg)
 F(ldonsellbackrate)
 F(scriptfileid)
 F(expendablearrow)
 F(clairvoyance)
 F(clickname)
 F(procname)
 F(wornname)
 F(focusname)
 F(scrollname)
 F(subtype)
@@ -574,7 +574,7 @@ EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAugment() const
 uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const
 {
 	// Not a Hero Forge item.
-	if (m_ornament_hero_model == 0) {
+	if (m_ornament_hero_model == 0 || material_slot < 0) {
 		return 0;
 	}
@@ -906,34 +906,26 @@ bool EQ::ItemInstance::IsSlotAllowed(int16 slot_id) const {
 bool EQ::ItemInstance::IsDroppable(bool recurse) const
 {
-	if (!m_item) {
+	if (!m_item)
 		return false;
 	}
 	/*if (m_ornamentidfile) // not implemented
 		return false;*/
-	if (m_attuned) {
+	if (m_attuned)
 		return false;
-	}
+	/*if (m_item->FVNoDrop != 0) // not implemented
-
+		return false;*/
-	if (RuleI(World, FVNoDropFlag) == FVNoDropFlagRule::Enabled && m_item->FVNoDrop == 0) {
+	if (m_item->NoDrop == 0)
 		return true;
 	}
 	if (m_item->NoDrop == 0) {
 		return false;
 	}
 	if (recurse) {
-		for (auto iter: m_contents) {
+		for (auto iter : m_contents) {
-			if (!iter.second) {
+			if (!iter.second)
 				continue;
 			}
-			if (!iter.second->IsDroppable(recurse)) {
+			if (!iter.second->IsDroppable(recurse))
 				return false;
 		}
 	}
 	}
 	return true;
 }
@@ -1799,7 +1791,7 @@ std::vector<std::string> EQ::ItemInstance::GetAugmentNames() const
 	for (uint8 slot_id = invaug::SOCKET_BEGIN; slot_id <= invaug::SOCKET_END; slot_id++) {
 		const auto augment = GetAugment(slot_id);
-		augment_names.push_back(augment ? augment->GetItem()->Name : "");
+		augment_names.push_back(augment ? augment->GetItem()->Name : "None");
 	}
 	return augment_names;
@@ -335,7 +335,7 @@ namespace EQ
 		void             SetEvolveAddToCurrentAmount(const uint64 in) const { m_evolving_details.current_amount += in; }
 		void             SetEvolveFinalItemID(const uint32 in) const { m_evolving_details.final_item_id = in; }
 		bool             TransferOwnership(Database& db, const uint32 to_char_id) const;
-		void             CalculateEvolveProgression() const { m_evolving_details.progression = EvolvingItemsManager::Instance()->CalculateProgression(GetEvolveCurrentAmount(), GetID()); }
+		void             CalculateEvolveProgression() const { m_evolving_details.progression = evolving_items_manager.CalculateProgression(GetEvolveCurrentAmount(), GetID()); }
 	protected:
 		//////////////////////////
@@ -25,7 +25,6 @@ struct LootItem {
 	uint16      trivial_max_level;
 	uint16      npc_min_level;
 	uint16      npc_max_level;
 	uint32      lootdrop_id; // required for zone state referencing
 };
 typedef std::list<LootItem*> LootItems;
@@ -2,8 +2,7 @@
 #include "../random.h"
 #include "packet.h"
-#include "reliable_stream_structs.h"
+#include "daybreak_structs.h"
 #include "reliable_stream_pooling.h"
 #include <uv.h>
 #include <chrono>
 #include <functional>
@@ -16,7 +15,7 @@ namespace EQ
 {
 	namespace Net
 	{
-		enum ReliableStreamProtocolOpcode
+		enum DaybreakProtocolOpcode
 		{
 			OP_Padding = 0x00,
 			OP_SessionRequest = 0x01,
@@ -55,7 +54,7 @@ namespace EQ
 			StatusDisconnected
 		};
-		enum ReliableStreamEncodeType
+		enum DaybreakEncodeType
 		{
 			EncodeNone = 0,
 			EncodeCompression = 1,
@@ -72,9 +71,9 @@ namespace EQ
 		typedef std::chrono::steady_clock::time_point Timestamp;
 		typedef std::chrono::steady_clock Clock;
-		struct ReliableStreamConnectionStats
+		struct DaybreakConnectionStats
 		{
-			ReliableStreamConnectionStats() {
+			DaybreakConnectionStats() {
 				recv_bytes = 0;
 				sent_bytes = 0;
 				recv_packets = 0;
@@ -134,14 +133,14 @@ namespace EQ
 			uint64_t bytes_before_encode;
 		};
-		class ReliableStreamConnectionManager;
+		class DaybreakConnectionManager;
-		class ReliableStreamConnection;
+		class DaybreakConnection;
-		class ReliableStreamConnection
+		class DaybreakConnection
 		{
 		public:
-			ReliableStreamConnection(ReliableStreamConnectionManager *owner, const ReliableStreamConnect &connect, const std::string &endpoint, int port);
+			DaybreakConnection(DaybreakConnectionManager *owner, const DaybreakConnect &connect, const std::string &endpoint, int port);
-			ReliableStreamConnection(ReliableStreamConnectionManager *owner, const std::string &endpoint, int port);
+			DaybreakConnection(DaybreakConnectionManager *owner, const std::string &endpoint, int port);
-			~ReliableStreamConnection();
+			~DaybreakConnection();
 			const std::string& RemoteEndpoint() const { return m_endpoint; }
 			int RemotePort() const { return m_port; }
@@ -151,23 +150,23 @@ namespace EQ
 			void QueuePacket(Packet &p, int stream);
 			void QueuePacket(Packet &p, int stream, bool reliable);
-			ReliableStreamConnectionStats GetStats();
+			DaybreakConnectionStats GetStats();
 			void ResetStats();
 			size_t GetRollingPing() const { return m_rolling_ping; }
 			DbProtocolStatus GetStatus() const { return m_status; }
-			const ReliableStreamEncodeType* GetEncodePasses() const { return m_encode_passes; }
+			const DaybreakEncodeType* GetEncodePasses() const { return m_encode_passes; }
-			const ReliableStreamConnectionManager* GetManager() const { return m_owner; }
+			const DaybreakConnectionManager* GetManager() const { return m_owner; }
-			ReliableStreamConnectionManager* GetManager() { return m_owner; }
+			DaybreakConnectionManager* GetManager() { return m_owner; }
 		private:
-			ReliableStreamConnectionManager *m_owner;
+			DaybreakConnectionManager *m_owner;
 			std::string m_endpoint;
 			int m_port;
 			uint32_t m_connect_code;
 			uint32_t m_encode_key;
 			uint32_t m_max_packet_size;
 			uint32_t m_crc_bytes;
-			ReliableStreamEncodeType m_encode_passes[2];
+			DaybreakEncodeType m_encode_passes[2];
 			Timestamp m_last_send;
 			Timestamp m_last_recv;
@@ -176,7 +175,7 @@ namespace EQ
 			std::list<DynamicPacket> m_buffered_packets;
 			size_t m_buffered_packets_length;
 			std::unique_ptr<char[]> m_combined;
-			ReliableStreamConnectionStats m_stats;
+			DaybreakConnectionStats m_stats;
 			Timestamp m_last_session_stats;
 			size_t m_rolling_ping;
 			Timestamp m_close_time;
@@ -186,9 +185,8 @@ namespace EQ
 			size_t m_resend_packets_sent = 0;
 			size_t m_resend_bytes_sent = 0;
 			bool m_acked_since_last_resend = false;
 			Timestamp m_last_ack;
-			struct ReliableStreamSentPacket
+			struct DaybreakSentPacket
 			{
 				DynamicPacket packet;
 				Timestamp last_sent;
@@ -197,9 +195,9 @@ namespace EQ
 				size_t resend_delay;
 			};
-			struct ReliableStream
+			struct DaybreakStream
 			{
-				ReliableStream() {
+				DaybreakStream() {
 					sequence_in = 0;
 					sequence_out = 0;
 					fragment_current_bytes = 0;
@@ -214,11 +212,11 @@ namespace EQ
 				uint32_t fragment_current_bytes;
 				uint32_t fragment_total_bytes;
-				std::map<uint16_t, ReliableStreamSentPacket> sent_packets;
+				std::map<uint16_t, DaybreakSentPacket> sent_packets;
 			};
-			ReliableStream m_streams[4];
+			DaybreakStream m_streams[4];
-			std::weak_ptr<ReliableStreamConnection> m_self;
+			std::weak_ptr<DaybreakConnection> m_self;
 			void Process();
 			void ProcessPacket(Packet &p);
@@ -251,12 +249,12 @@ namespace EQ
 			void FlushBuffer();
 			SequenceOrder CompareSequence(uint16_t expected, uint16_t actual) const;
-			friend class ReliableStreamConnectionManager;
+			friend class DaybreakConnectionManager;
 		};
-		struct ReliableStreamConnectionManagerOptions
+		struct DaybreakConnectionManagerOptions
 		{
-			ReliableStreamConnectionManagerOptions() {
+			DaybreakConnectionManagerOptions() {
 				max_connection_count = 0;
 				keepalive_delay_ms = 9000;
 				resend_delay_ms = 30;
@@ -268,8 +266,8 @@ namespace EQ
 				connect_stale_ms = 5000;
 				crc_length = 2;
 				max_packet_size = 512;
-				encode_passes[0] = ReliableStreamEncodeType::EncodeNone;
+				encode_passes[0] = DaybreakEncodeType::EncodeNone;
-				encode_passes[1] = ReliableStreamEncodeType::EncodeNone;
+				encode_passes[1] = DaybreakEncodeType::EncodeNone;
 				port = 0;
 				hold_size = 512;
 				hold_length_ms = 50;
@@ -299,28 +297,28 @@ namespace EQ
 			double tic_rate_hertz;
 			size_t resend_timeout;
 			size_t connection_close_time;
-			ReliableStreamEncodeType encode_passes[2];
+			DaybreakEncodeType encode_passes[2];
 			int port;
 			double outgoing_data_rate;
 		};
-		class ReliableStreamConnectionManager
+		class DaybreakConnectionManager
 		{
 		public:
-			ReliableStreamConnectionManager();
+			DaybreakConnectionManager();
-			ReliableStreamConnectionManager(const ReliableStreamConnectionManagerOptions &opts);
+			DaybreakConnectionManager(const DaybreakConnectionManagerOptions &opts);
-			~ReliableStreamConnectionManager();
+			~DaybreakConnectionManager();
 			void Connect(const std::string &addr, int port);
 			void Process();
 			void UpdateDataBudget();
 			void ProcessResend();
-			void OnNewConnection(std::function<void(std::shared_ptr<ReliableStreamConnection>)> func) { m_on_new_connection = func; }
+			void OnNewConnection(std::function<void(std::shared_ptr<DaybreakConnection>)> func) { m_on_new_connection = func; }
-			void OnConnectionStateChange(std::function<void(std::shared_ptr<ReliableStreamConnection>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; }
+			void OnConnectionStateChange(std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; }
-			void OnPacketRecv(std::function<void(std::shared_ptr<ReliableStreamConnection>, const Packet &)> func) { m_on_packet_recv = func; }
+			void OnPacketRecv(std::function<void(std::shared_ptr<DaybreakConnection>, const Packet &)> func) { m_on_packet_recv = func; }
 			void OnErrorMessage(std::function<void(const std::string&)> func) { m_on_error_message = func; }
-			ReliableStreamConnectionManagerOptions& GetOptions() { return m_options; }
+			DaybreakConnectionManagerOptions& GetOptions() { return m_options; }
 		private:
 			void Attach(uv_loop_t *loop);
 			void Detach();
@@ -329,18 +327,18 @@ namespace EQ
 			uv_timer_t m_timer;
 			uv_udp_t m_socket;
 			uv_loop_t *m_attached;
-			ReliableStreamConnectionManagerOptions m_options;
+			DaybreakConnectionManagerOptions m_options;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>)> m_on_new_connection;
+			std::function<void(std::shared_ptr<DaybreakConnection>)> m_on_new_connection;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
+			std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>, const Packet&)> m_on_packet_recv;
+			std::function<void(std::shared_ptr<DaybreakConnection>, const Packet&)> m_on_packet_recv;
 			std::function<void(const std::string&)> m_on_error_message;
-			std::map<std::pair<std::string, int>, std::shared_ptr<ReliableStreamConnection>> m_connections;
+			std::map<std::pair<std::string, int>, std::shared_ptr<DaybreakConnection>> m_connections;
 			void ProcessPacket(const std::string &endpoint, int port, const char *data, size_t size);
-			std::shared_ptr<ReliableStreamConnection> FindConnectionByEndpoint(std::string addr, int port);
+			std::shared_ptr<DaybreakConnection> FindConnectionByEndpoint(std::string addr, int port);
 			void SendDisconnect(const std::string &addr, int port);
-			friend class ReliableStreamConnection;
+			friend class DaybreakConnection;
 		};
 	}
 }
@@ -8,7 +8,7 @@ namespace EQ
 {
 	namespace Net
 	{
-		struct ReliableStreamHeader
+		struct DaybreakHeader
 		{
 			static size_t size() { return 2; }
 			uint8_t zero;
@@ -22,7 +22,7 @@ namespace EQ
 			}
 		};
-		struct ReliableStreamConnect
+		struct DaybreakConnect
 		{
 			static size_t size() { return 14; }
 			uint8_t zero;
@@ -42,7 +42,7 @@ namespace EQ
 			}
 		};
-		struct ReliableStreamConnectReply
+		struct DaybreakConnectReply
 		{
 			static size_t size() { return 17; }
 			uint8_t zero;
@@ -68,7 +68,7 @@ namespace EQ
 			}
 		};
-		struct ReliableStreamDisconnect
+		struct DaybreakDisconnect
 		{
 			static size_t size() { return 8; }
 			uint8_t zero;
@@ -84,7 +84,7 @@ namespace EQ
 			}
 		};
-		struct ReliableStreamReliableHeader
+		struct DaybreakReliableHeader
 		{
 			static size_t size() { return 4; }
 			uint8_t zero;
@@ -100,10 +100,10 @@ namespace EQ
 			}
 		};
-		struct ReliableStreamReliableFragmentHeader
+		struct DaybreakReliableFragmentHeader
 		{
-			static size_t size() { return 4 + ReliableStreamReliableHeader::size(); }
+			static size_t size() { return 4 + DaybreakReliableHeader::size(); }
-			ReliableStreamReliableHeader reliable;
+			DaybreakReliableHeader reliable;
 			uint32_t total_size;
 			template <class Archive>
@@ -114,7 +114,7 @@ namespace EQ
 			}
 		};
-		struct ReliableStreamSessionStatRequest
+		struct DaybreakSessionStatRequest
 		{
 			static size_t size() { return 40; }
 			uint8_t zero;
@@ -144,7 +144,7 @@ namespace EQ
 			}
 		};
-		struct ReliableStreamSessionStatResponse
+		struct DaybreakSessionStatResponse
 		{
 			static size_t size() { return 40; }
 			uint8_t zero;
@@ -171,4 +171,3 @@ namespace EQ
 		};
 	}
 }
@@ -1,11 +1,11 @@
 #include "eqstream.h"
 #include "../eqemu_logsys.h"
-EQ::Net::EQStreamManager::EQStreamManager(const EQStreamManagerInterfaceOptions &options) : EQStreamManagerInterface(options), m_reliable_stream(options.reliable_stream_options)
+EQ::Net::EQStreamManager::EQStreamManager(const EQStreamManagerInterfaceOptions &options) : EQStreamManagerInterface(options), m_daybreak(options.daybreak_options)
 {
-	m_reliable_stream.OnNewConnection(std::bind(&EQStreamManager::ReliableStreamNewConnection, this, std::placeholders::_1));
+	m_daybreak.OnNewConnection(std::bind(&EQStreamManager::DaybreakNewConnection, this, std::placeholders::_1));
-	m_reliable_stream.OnConnectionStateChange(std::bind(&EQStreamManager::ReliableStreamConnectionStateChange, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+	m_daybreak.OnConnectionStateChange(std::bind(&EQStreamManager::DaybreakConnectionStateChange, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
-	m_reliable_stream.OnPacketRecv(std::bind(&EQStreamManager::ReliableStreamPacketRecv, this, std::placeholders::_1, std::placeholders::_2));
+	m_daybreak.OnPacketRecv(std::bind(&EQStreamManager::DaybreakPacketRecv, this, std::placeholders::_1, std::placeholders::_2));
 }
 EQ::Net::EQStreamManager::~EQStreamManager()
@@ -15,11 +15,11 @@ EQ::Net::EQStreamManager::~EQStreamManager()
 void EQ::Net::EQStreamManager::SetOptions(const EQStreamManagerInterfaceOptions &options)
 {
 	m_options = options;
-	auto &opts = m_reliable_stream.GetOptions();
+	auto &opts = m_daybreak.GetOptions();
-	opts = options.reliable_stream_options;
+	opts = options.daybreak_options;
 }
-void EQ::Net::EQStreamManager::ReliableStreamNewConnection(std::shared_ptr<ReliableStreamConnection> connection)
+void EQ::Net::EQStreamManager::DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection)
 {
 	std::shared_ptr<EQStream> stream(new EQStream(this, connection));
 	m_streams.emplace(std::make_pair(connection, stream));
@@ -28,7 +28,7 @@ void EQ::Net::EQStreamManager::ReliableStreamNewConnection(std::shared_ptr<Relia
 	}
 }
-void EQ::Net::EQStreamManager::ReliableStreamConnectionStateChange(std::shared_ptr<ReliableStreamConnection> connection, DbProtocolStatus from, DbProtocolStatus to)
+void EQ::Net::EQStreamManager::DaybreakConnectionStateChange(std::shared_ptr<DaybreakConnection> connection, DbProtocolStatus from, DbProtocolStatus to)
 {
 	auto iter = m_streams.find(connection);
 	if (iter != m_streams.end()) {
@@ -42,7 +42,7 @@ void EQ::Net::EQStreamManager::ReliableStreamConnectionStateChange(std::shared_p
 	}
 }
-void EQ::Net::EQStreamManager::ReliableStreamPacketRecv(std::shared_ptr<ReliableStreamConnection> connection, const Packet &p)
+void EQ::Net::EQStreamManager::DaybreakPacketRecv(std::shared_ptr<DaybreakConnection> connection, const Packet &p)
 {
 	auto iter = m_streams.find(connection);
 	if (iter != m_streams.end()) {
@@ -53,7 +53,7 @@ void EQ::Net::EQStreamManager::ReliableStreamPacketRecv(std::shared_ptr<Reliable
 	}
 }
-EQ::Net::EQStream::EQStream(EQStreamManagerInterface *owner, std::shared_ptr<ReliableStreamConnection> connection)
+EQ::Net::EQStream::EQStream(EQStreamManagerInterface *owner, std::shared_ptr<DaybreakConnection> connection)
 {
 	m_owner = owner;
 	m_connection = connection;
@@ -71,7 +71,7 @@ void EQ::Net::EQStream::QueuePacket(const EQApplicationPacket *p, bool ack_req)
 		OpcodeManager::EmuToName(p->GetOpcode()),
 		(*m_opcode_manager)->EmuToEQ(p->GetOpcode()),
 		p->Size(),
-		(EQEmuLogSys::Instance()->IsLogEnabled(Logs::Detail, Logs::PacketServerClient) ? DumpPacketToString(p) : "")
+		(LogSys.IsLogEnabled(Logs::Detail, Logs::PacketServerClient) ? DumpPacketToString(p) : "")
 	);
 	if (m_opcode_manager && *m_opcode_manager) {
@@ -235,7 +235,7 @@ EQStreamState EQ::Net::EQStream::GetState() {
 EQ::Net::EQStream::Stats EQ::Net::EQStream::GetStats() const
 {
 	Stats ret;
-	ret.ReliableStreamStats = m_connection->GetStats();
+	ret.DaybreakStats = m_connection->GetStats();
 	for (int i = 0; i < _maxEmuOpcode; ++i) {
 		ret.RecvCount[i] = 0;
@@ -3,7 +3,7 @@
 #include "../eq_packet.h"
 #include "../eq_stream_intf.h"
 #include "../opcodemgr.h"
-#include "reliable_stream_connection.h"
+#include "daybreak_connection.h"
 #include <vector>
 #include <deque>
 #include <unordered_map>
@@ -23,21 +23,21 @@ namespace EQ
 			void OnNewConnection(std::function<void(std::shared_ptr<EQStream>)> func) { m_on_new_connection = func; }
 			void OnConnectionStateChange(std::function<void(std::shared_ptr<EQStream>, DbProtocolStatus, DbProtocolStatus)> func) { m_on_connection_state_change = func; }
 		private:
-			ReliableStreamConnectionManager m_reliable_stream;
+			DaybreakConnectionManager m_daybreak;
 			std::function<void(std::shared_ptr<EQStream>)> m_on_new_connection;
 			std::function<void(std::shared_ptr<EQStream>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
-			std::map<std::shared_ptr<ReliableStreamConnection>, std::shared_ptr<EQStream>> m_streams;
+			std::map<std::shared_ptr<DaybreakConnection>, std::shared_ptr<EQStream>> m_streams;
-			void ReliableStreamNewConnection(std::shared_ptr<ReliableStreamConnection> connection);
+			void DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection);
-			void ReliableStreamConnectionStateChange(std::shared_ptr<ReliableStreamConnection> connection, DbProtocolStatus from, DbProtocolStatus to);
+			void DaybreakConnectionStateChange(std::shared_ptr<DaybreakConnection> connection, DbProtocolStatus from, DbProtocolStatus to);
-			void ReliableStreamPacketRecv(std::shared_ptr<ReliableStreamConnection> connection, const Packet &p);
+			void DaybreakPacketRecv(std::shared_ptr<DaybreakConnection> connection, const Packet &p);
 			friend class EQStream;
 		};
 		class EQStream : public EQStreamInterface
 		{
 		public:
-			EQStream(EQStreamManagerInterface *parent, std::shared_ptr<ReliableStreamConnection> connection);
+			EQStream(EQStreamManagerInterface *parent, std::shared_ptr<DaybreakConnection> connection);
 			~EQStream();
 			virtual void QueuePacket(const EQApplicationPacket *p, bool ack_req = true);
@@ -67,7 +67,7 @@ namespace EQ
 			virtual EQStreamManagerInterface* GetManager() const;
 		private:
 			EQStreamManagerInterface *m_owner;
-			std::shared_ptr<ReliableStreamConnection> m_connection;
+			std::shared_ptr<DaybreakConnection> m_connection;
 			OpcodeManager **m_opcode_manager;
 			std::deque<std::unique_ptr<EQ::Net::Packet>> m_packet_queue;
 			std::unordered_map<int, int> m_packet_recv_count;
@@ -1,123 +0,0 @@
 #pragma once
 #include <optional>
 #include <atomic>
 #include <memory>
 #include <array>
 #include <vector>
 #include <mutex>
 #include <iostream>
 #include "../eqemu_logsys.h"
 #include <uv.h>
 constexpr size_t UDP_BUFFER_SIZE = 512;
 struct EmbeddedContext {
 	size_t pool_index;
 	class SendBufferPool* pool;
 };
 class SendBufferPool {
 public:
 	explicit SendBufferPool(size_t initial_capacity = 64)
 		: m_capacity(initial_capacity), m_head(0)
 	{
 		LogNetClient("[SendBufferPool] Initializing with capacity [{}]", (int)m_capacity);
 		m_pool.reserve(m_capacity);
 		m_locks = std::make_unique<std::atomic_bool[]>(m_capacity);
 		for (size_t i = 0; i < m_capacity; ++i) {
 			auto* req = new PooledUdpSend();
 			req->context.pool_index = i;
 			req->context.pool = this;
 			req->uv_req.data = &req->context;
 			m_pool.emplace_back(std::unique_ptr<PooledUdpSend>(req));
 			m_locks[i].store(false, std::memory_order_relaxed);
 		}
 	}
 	std::optional<std::tuple<uv_udp_send_t*, char*, EmbeddedContext*>> acquire() {
 		size_t cap = m_capacity.load(std::memory_order_acquire);
 		for (size_t i = 0; i < cap; ++i) {
 			size_t index = m_head.fetch_add(1, std::memory_order_relaxed) % cap;
 			bool expected = false;
 			if (m_locks[index].compare_exchange_strong(expected, true)) {
 				auto* req = m_pool[index].get();
 				LogNetClientDetail("[SendBufferPool] Acquired [{}]", index);
 				return std::make_tuple(&req->uv_req, req->buffer.data(), &req->context);
 			}
 		}
 		LogNetClient("[SendBufferPool] Growing from [{}] to [{}]", cap, cap * 2);
 		grow();
 		return acquireAfterGrowth();
 	}
 	void release(EmbeddedContext* ctx) {
 		if (!ctx || ctx->pool != this || ctx->pool_index >= m_capacity.load(std::memory_order_acquire)) {
 			LogNetClient("[SendBufferPool] Invalid context release [{}]", ctx ? ctx->pool_index : -1);
 			return;
 		}
 		m_locks[ctx->pool_index].store(false, std::memory_order_release);
 		LogNetClientDetail("[SendBufferPool] Released [{}]", ctx->pool_index);
 	}
 private:
 	struct PooledUdpSend {
 		uv_udp_send_t                     uv_req;
 		std::array<char, UDP_BUFFER_SIZE> buffer;
 		EmbeddedContext                   context;
 	};
 	std::vector<std::unique_ptr<PooledUdpSend>> m_pool;
 	std::unique_ptr<std::atomic_bool[]> m_locks;
 	std::atomic<size_t> m_capacity;
 	std::atomic<size_t> m_head;
 	std::mutex m_grow_mutex;
 	void grow() {
 		std::lock_guard<std::mutex> lock(m_grow_mutex);
 		size_t old_cap = m_capacity.load(std::memory_order_acquire);
 		size_t new_cap = old_cap * 2;
 		m_pool.reserve(new_cap);
 		for (size_t i = old_cap; i < new_cap; ++i) {
 			auto* req = new PooledUdpSend();
 			req->context.pool_index = i;
 			req->context.pool = this;
 			req->uv_req.data = &req->context;
 			m_pool.emplace_back(std::unique_ptr<PooledUdpSend>(req));
 		}
 		auto new_locks = std::make_unique<std::atomic_bool[]>(new_cap);
 		for (size_t i = 0; i < old_cap; ++i) {
 			new_locks[i].store(m_locks[i].load(std::memory_order_acquire));
 		}
 		for (size_t i = old_cap; i < new_cap; ++i) {
 			new_locks[i].store(false, std::memory_order_relaxed);
 		}
 		m_locks = std::move(new_locks);
 		m_capacity.store(new_cap, std::memory_order_release);
 		LogNetClient("[SendBufferPool] Grew to [{}] from [{}]", new_cap, old_cap);
 	}
 	std::optional<std::tuple<uv_udp_send_t*, char*, EmbeddedContext*>> acquireAfterGrowth() {
 		size_t cap = m_capacity.load(std::memory_order_acquire);
 		for (size_t i = 0; i < cap; ++i) {
 			size_t index = m_head.fetch_add(1, std::memory_order_relaxed) % cap;
 			bool expected = false;
 			if (m_locks[index].compare_exchange_strong(expected, true)) {
 				auto* req = m_pool[index].get();
 				LogNetClient("[SendBufferPool] Acquired after grow [{}]", index);
 				return std::make_tuple(&req->uv_req, req->buffer.data(), &req->context);
 			}
 		}
 		return std::nullopt;
 	}
 };
@@ -62,15 +62,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) {
-			LogNetTCP("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;
 		}
-		LogNetTCP("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) {
-			LogNetTCP("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();
 		});
@@ -58,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) {
-			LogNetTCP("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;
 		}
-		LogNetTCP("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) {
-			LogNetTCP("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();
 		});
@@ -25,7 +25,7 @@ void EQ::Net::ServertalkServerConnection::Send(uint16_t opcode, EQ::Net::Packet
 			return;
 		if (opcode == ServerOP_UsertoWorldReq) {
-			auto req_in = (UsertoWorldRequest*)p.Data();
+			auto req_in = (UsertoWorldRequest_Struct*)p.Data();
 			EQ::Net::DynamicPacket req;
 			size_t i = 0;
@@ -45,7 +45,7 @@ void EQ::Net::ServertalkServerConnection::Send(uint16_t opcode, EQ::Net::Packet
 		}
 		if (opcode == ServerOP_LSClientAuth) {
-			auto req_in = (ClientAuth*)p.Data();
+			auto req_in = (ClientAuth_Struct*)p.Data();
 			EQ::Net::DynamicPacket req;
 			size_t i = 0;
@@ -54,7 +54,7 @@ void EQ::Net::ServertalkServerConnection::Send(uint16_t opcode, EQ::Net::Packet
 			req.PutData(i, req_in->key, 30); i += 30;
 			req.PutUInt8(i, req_in->lsadmin); i += 1;
 			req.PutUInt16(i, req_in->is_world_admin); i += 2;
-			req.PutUInt32(i, req_in->ip_address); i += 4;
+			req.PutUInt32(i, req_in->ip); i += 4;
 			req.PutUInt8(i, req_in->is_client_from_local_network); i += 1;
 			EQ::Net::DynamicPacket out;
@@ -319,7 +319,7 @@ void EQ::Net::ServertalkServerConnection::ProcessMessage(EQ::Net::Packet &p)
 			size_t message_len = length;
 			EQ::Net::StaticPacket packet(&data[0], message_len);
-			const auto is_detail_enabled = EQEmuLogSys::Instance()->IsLogEnabled(Logs::Detail, Logs::PacketServerToServer);
+			const auto is_detail_enabled = LogSys.IsLogEnabled(Logs::Detail, Logs::PacketServerToServer);
 			if (opcode != ServerOP_KeepAlive || is_detail_enabled) {
 				LogPacketServerToServer(
 					"[{:#06x}] Size [{}] {}",
@@ -1,8 +1,5 @@
 #include "tcp_connection.h"
 #include "../event/event_loop.h"
 #include <iostream>
 WriteReqPool tcp_write_pool;
 void on_close_handle(uv_handle_t* handle) {
 	delete (uv_tcp_t *)handle;
@@ -67,37 +64,36 @@ void EQ::Net::TCPConnection::Connect(const std::string &addr, int port, bool ipv
 	});
 }
-void EQ::Net::TCPConnection::Start()
+void EQ::Net::TCPConnection::Start() {
-{
+	uv_read_start((uv_stream_t*)m_socket, [](uv_handle_t* handle, size_t suggested_size, uv_buf_t* buf) {
 	uv_read_start(
 		(uv_stream_t *) m_socket, [](uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf) {
 			if (suggested_size > 65536) {
 		buf->base = new char[suggested_size];
 		buf->len = suggested_size;
-				return;
+	}, [](uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) {
 			}
-			static thread_local char temp_buf[65536];
+		TCPConnection *connection = (TCPConnection*)stream->data;
 			buf->base = temp_buf;
 			buf->len  = 65536;
 		}, [](uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) {
 			auto *connection = (TCPConnection *) stream->data;
 		if (nread > 0) {
 			connection->Read(buf->base, nread);
 			if (buf->base) {
 				delete[] buf->base;
 			}
 		}
 		else if (nread == UV_EOF) {
 			connection->Disconnect();
 			if (buf->base) {
 				delete[] buf->base;
 			}
 		}
 		else if (nread < 0) {
 			connection->Disconnect();
 			}
-			if (buf->len > 65536) {
+			if (buf->base) {
-				delete [] buf->base;
+				delete[] buf->base;
 			}
 		}
-	);
+	});
 }
 void EQ::Net::TCPConnection::OnRead(std::function<void(TCPConnection*, const unsigned char*, size_t)> cb)
@@ -134,92 +130,43 @@ void EQ::Net::TCPConnection::Read(const char *data, size_t count)
 	}
 }
-void EQ::Net::TCPConnection::Write(const char* data, size_t count) {
+void EQ::Net::TCPConnection::Write(const char *data, size_t count)
-	if (!m_socket || !data || count == 0) {
+{
-		std::cerr << "TCPConnection::Write - Invalid socket or data\n";
+	if (!m_socket) {
 		return;
 	}
-	if (count <= TCP_BUFFER_SIZE) {
+	struct WriteBaton
-		// Fast path: use pooled request with embedded buffer
+	{
-		auto req_opt = tcp_write_pool.acquire();
+		TCPConnection *connection;
-		if (!req_opt) {
+		char *buffer;
-			std::cerr << "TCPConnection::Write - Out of write requests\n";
+	};
 			return;
 		}
-		TCPWriteReq* write_req = *req_opt;
+	WriteBaton *baton = new WriteBaton;
 	baton->connection = this;
 	baton->buffer = new char[count];
-		// Fill buffer and set context
+	uv_write_t *write_req = new uv_write_t;
-		memcpy(write_req->buffer.data(), data, count);
+	memset(write_req, 0, sizeof(uv_write_t));
-		write_req->connection = this;
+	write_req->data = baton;
-		write_req->magic = 0xC0FFEE;
+	uv_buf_t send_buffers[1];
-		uv_buf_t buf = uv_buf_init(write_req->buffer.data(), static_cast<unsigned int>(count));
+	memcpy(baton->buffer, data, count);
 	send_buffers[0] = uv_buf_init(baton->buffer, count);
-		int result = uv_write(
+	uv_write(write_req, (uv_stream_t*)m_socket, send_buffers, 1, [](uv_write_t* req, int status) {
-			&write_req->req,
+		WriteBaton *baton = (WriteBaton*)req->data;
-			reinterpret_cast<uv_stream_t*>(m_socket),
+		delete[] baton->buffer;
 			&buf,
 			1,
 			[](uv_write_t* req, int status) {
 				auto* full_req = reinterpret_cast<TCPWriteReq*>(req);
 				if (full_req->magic != 0xC0FFEE) {
 					std::cerr << "uv_write callback - invalid magic, skipping release\n";
 					return;
 				}
 				tcp_write_pool.release(full_req);
 				if (status < 0 && full_req->connection) {
 					std::cerr << "uv_write failed: " << uv_strerror(status) << std::endl;
 					full_req->connection->Disconnect();
 				}
 			}
 		);
 		if (result < 0) {
 			std::cerr << "uv_write() failed immediately: " << uv_strerror(result) << std::endl;
 			tcp_write_pool.release(write_req);
 		}
 	} else {
 		// Slow path: allocate heap buffer for large write
 		LogNetTCP("[TCPConnection] Large write of [{}] bytes, using heap buffer", count);
 		char* heap_buffer = new char[count];
 		memcpy(heap_buffer, data, count);
 		uv_write_t* write_req = new uv_write_t;
 		write_req->data = heap_buffer;
 		uv_buf_t buf = uv_buf_init(heap_buffer, static_cast<unsigned int>(count));
 		int result = uv_write(
 			write_req,
 			reinterpret_cast<uv_stream_t*>(m_socket),
 			&buf,
 			1,
 			[](uv_write_t* req, int status) {
 				char* data = static_cast<char*>(req->data);
 				delete[] data;
 		delete req;
 		if (status < 0) {
-					std::cerr << "uv_write (large) failed: " << uv_strerror(status) << std::endl;
+			baton->connection->Disconnect();
 		}
 			}
 		);
-		if (result < 0) {
+		delete baton;
-			std::cerr << "uv_write() (large) failed immediately: " << uv_strerror(result) << std::endl;
+	});
 			delete[] heap_buffer;
 			delete write_req;
 		}
 	}
 }
 std::string EQ::Net::TCPConnection::LocalIP() const
 {
 	sockaddr_storage addr;
@@ -1,6 +1,5 @@
 #pragma once
 #include "tcp_connection_pooling.h"
 #include <functional>
 #include <string>
 #include <memory>
@@ -1,125 +0,0 @@
 #pragma once
 #include "../eqemu_logsys.h"
 #include <vector>
 #include <array>
 #include <atomic>
 #include <memory>
 #include <optional>
 #include <mutex>
 #include <uv.h>
 #include <iostream>
 namespace EQ { namespace Net { class TCPConnection; } }
 constexpr size_t TCP_BUFFER_SIZE = 8192;
 struct TCPWriteReq {
 	uv_write_t req{};
 	std::array<char, TCP_BUFFER_SIZE> buffer{};
 	size_t buffer_index{};
 	EQ::Net::TCPConnection* connection{};
 	uint32_t magic = 0xC0FFEE;
 };
 class WriteReqPool {
 public:
 	explicit WriteReqPool(size_t initial_capacity = 512)
 		: m_capacity(initial_capacity), m_head(0) {
 		initialize_pool(m_capacity);
 	}
 	std::optional<TCPWriteReq*> acquire() {
 		size_t cap = m_capacity.load(std::memory_order_acquire);
 		for (size_t i = 0; i < cap; ++i) {
 			size_t index = m_head.fetch_add(1, std::memory_order_relaxed) % cap;
 			bool expected = false;
 			if (m_locks[index].compare_exchange_strong(expected, true, std::memory_order_acquire)) {
 				LogNetTCPDetail("[WriteReqPool] Acquired buffer index [{}]", index);
 				return m_reqs[index].get();
 			}
 		}
 		LogNetTCP("[WriteReqPool] Growing from [{}] to [{}]", cap, cap * 2);
 		grow();
 		return acquireAfterGrow();
 	}
 	void release(TCPWriteReq* req) {
 		if (!req) return;
 		const size_t index = req->buffer_index;
 		const size_t cap = m_capacity.load(std::memory_order_acquire);
 		if (index >= cap || m_reqs[index].get() != req) {
 			std::cerr << "WriteReqPool::release - Invalid or stale pointer (index=" << index << ")\n";
 			return;
 		}
 		m_locks[index].store(false, std::memory_order_release);
 		LogNetTCPDetail("[WriteReqPool] Released buffer index [{}]", index);
 	}
 private:
 	std::vector<std::unique_ptr<TCPWriteReq>> m_reqs;
 	std::unique_ptr<std::atomic_bool[]> m_locks;
 	std::atomic<size_t> m_capacity;
 	std::atomic<size_t> m_head;
 	std::mutex m_grow_mutex;
 	void initialize_pool(size_t count) {
 		m_reqs.reserve(count);
 		m_locks = std::make_unique<std::atomic_bool[]>(count);
 		for (size_t i = 0; i < count; ++i) {
 			auto req = std::make_unique<TCPWriteReq>();
 			req->buffer_index = i;
 			req->req.data = req.get(); // optional: for use in libuv callbacks
 			m_locks[i].store(false, std::memory_order_relaxed);
 			m_reqs.emplace_back(std::move(req));
 		}
 		m_capacity.store(count, std::memory_order_release);
 	}
 	void grow() {
 		std::lock_guard<std::mutex> lock(m_grow_mutex);
 		const size_t old_cap = m_capacity.load(std::memory_order_acquire);
 		const size_t new_cap = old_cap * 2;
 		m_reqs.reserve(new_cap);
 		for (size_t i = old_cap; i < new_cap; ++i) {
 			auto req = std::make_unique<TCPWriteReq>();
 			req->buffer_index = i;
 			req->req.data = req.get(); // optional
 			m_reqs.emplace_back(std::move(req));
 		}
 		auto new_locks = std::make_unique<std::atomic_bool[]>(new_cap);
 		for (size_t i = 0; i < old_cap; ++i) {
 			new_locks[i].store(m_locks[i].load(std::memory_order_acquire));
 		}
 		for (size_t i = old_cap; i < new_cap; ++i) {
 			new_locks[i].store(false, std::memory_order_relaxed);
 		}
 		m_locks = std::move(new_locks);
 		m_capacity.store(new_cap, std::memory_order_release);
 	}
 	std::optional<TCPWriteReq*> acquireAfterGrow() {
 		const size_t cap = m_capacity.load(std::memory_order_acquire);
 		for (size_t i = 0; i < cap; ++i) {
 			bool expected = false;
 			if (m_locks[i].compare_exchange_strong(expected, true, std::memory_order_acquire)) {
 				LogNetTCP("[WriteReqPool] Acquired buffer index [{}] after grow", i);
 				return m_reqs[i].get();
 			}
 		}
 		return std::nullopt;
 	}
 };
@@ -78,7 +78,7 @@ namespace RoF
 	{
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
@@ -117,7 +117,7 @@ namespace RoF
 		//we need to go to every stream and replace it's manager.
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -1213,22 +1213,22 @@ namespace RoF
 		case 1: { // GuildBankItemUpdate
 			auto emu = (GuildBankItemUpdate_Struct *)in->pBuffer;
 			auto eq = (structs::GuildBankItemUpdate_Struct *)outapp->pBuffer;
-			eq->action = 0;
+			eq->Action = 0;
-			OUT(unknown004);
+			OUT(Unknown004);
-			eq->unknown008 = 0;
+			eq->Unknown08 = 0;
-			OUT(slot_id);
+			OUT(SlotID);
-			OUT(area);
+			OUT(Area);
-			OUT(display);
+			OUT(Unknown012);
-			OUT(item_id);
+			OUT(ItemID);
-			OUT(icon_id);
+			OUT(Icon);
-			OUT(quantity);
+			OUT(Quantity);
-			OUT(permissions);
+			OUT(Permissions);
-			OUT(allow_merge);
+			OUT(AllowMerge);
-			OUT(is_useable);
+			OUT(Useable);
-			OUT_str(item_name);
+			OUT_str(ItemName);
-			OUT_str(donator);
+			OUT_str(Donator);
-			OUT_str(who_for);
+			OUT_str(WhoFor);
-			OUT(unknown226);
+			OUT(Unknown226);
 			break;
 		}
 		default:
@@ -81,7 +81,7 @@ namespace RoF2
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
@@ -123,7 +123,7 @@ namespace RoF2
 		//we need to go to every stream and replace it's manager.
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -1743,19 +1743,22 @@ namespace RoF2
 		case 1: { // GuildBankItemUpdate
 			auto emu = (GuildBankItemUpdate_Struct *)in->pBuffer;
 			auto eq = (structs::GuildBankItemUpdate_Struct *)outapp->pBuffer;
-			eq->action = 0;
+			eq->Action = 0;
-			OUT(display);
+			OUT(Unknown004);
-			OUT(slot_id);
+			eq->Unknown08 = 0;
-			OUT(area);
+			OUT(SlotID);
-			OUT(item_id);
+			OUT(Area);
-			OUT(icon_id);
+			OUT(Unknown012);
-			OUT(quantity);
+			OUT(ItemID);
-			OUT(permissions);
+			OUT(Icon);
-			OUT(allow_merge);
+			OUT(Quantity);
-			OUT(is_useable);
+			OUT(Permissions);
-			OUT_str(item_name);
+			OUT(AllowMerge);
-			OUT_str(donator);
+			OUT(Useable);
-			OUT_str(who_for);
+			OUT_str(ItemName);
 			OUT_str(Donator);
 			OUT_str(WhoFor);
 			OUT(Unknown226);
 			break;
 		}
 		default:
@@ -4688,7 +4691,7 @@ namespace RoF2
 			Bitfields->linkdead               = 0;
 			Bitfields->showhelm               = emu->showhelm;
 			Bitfields->trader                 = emu->trader ? 1 : 0;
-			Bitfields->targetable             = emu->NPC ? emu->untargetable : 1;
+			Bitfields->targetable             = 1;
 			Bitfields->targetable_with_hotkey = emu->targetable_with_hotkey ? 1 : 0;
 			Bitfields->showname               = ShowName;
@@ -4841,7 +4844,7 @@ namespace RoF2
 			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0); // FindBits MQ2 name
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->PlayerState);
-			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->npc_tint_id); // NpcTintIndex
+			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // NpcTintIndex
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // PrimaryTintIndex
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0); // SecondaryTintIndex
 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // These do something with OP_WeaponEquip1
@@ -6481,7 +6484,7 @@ namespace RoF2
 		hdr.scaled_value   = (inst->IsScaling() ? (inst->GetExp() / 100) : 0);
 		hdr.instance_id    = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : inst->GetSerialNumber());
 		hdr.parcel_item_id = packet_type == ItemPacketParcel ? inst->GetID() : 0;
-		if (item->EvolvingItem && packet_type != ItemPacketParcel && packet_type != ItemPacketMerchant) {
+		if (item->EvolvingItem) {
 			hdr.instance_id    = inst->GetEvolveUniqueID() & 0xFFFFFFFF; //lower dword
 			hdr.parcel_item_id = inst->GetEvolveUniqueID() >> 32;        //upper dword
 		}
@@ -6500,7 +6503,6 @@ namespace RoF2
 		if (item->EvolvingItem > 0) {
 			RoF2::structs::EvolvingItem_Struct evotop;
 			inst->CalculateEvolveProgression();
 			evotop.final_item_id    = inst->GetEvolveFinalItemID();
 			evotop.evolve_level     = item->EvolvingLevel;
@@ -101,8 +101,6 @@ namespace RoF2
 		const int16 MAIL_SIZE                 = 0;//unknown
 		const int16 GUILD_TROPHY_TRIBUTE_SIZE = 0;//unknown
 		const int16 KRONO_SIZE                = 0;//unknown
 		const int16 GUILD_BANK_MAIN_SIZE      = 200;
 		const int16 GUILD_BANK_DEPOSIT_SIZE   = 40;
 		const int16 OTHER_SIZE                = 0;//unknown
 		const int16 TRADE_NPC_SIZE = 4; // defined by implication
@@ -1965,39 +1965,41 @@ struct GuildBankWithdrawItem_Struct
 struct GuildBankItemUpdate_Struct
 {
-	void Init(uint32 inAction, uint32 inUnknown004, uint16 inSlotID, uint16 inArea, uint16 inUnknown016, uint32 inItemID, uint32 inIcon, uint32 inQuantity,
+	void Init(uint32 inAction, uint32 inUnknown004, uint16 inSlotID, uint16 inArea, uint16 inUnknown012, uint32 inItemID, uint32 inIcon, uint32 inQuantity,
 			uint32 inPermissions, uint32 inAllowMerge, bool inUseable)
 	{
-		action       = inAction;
+		Action = inAction;
-		slot_id      = inSlotID;
+		Unknown004 = inUnknown004;
-		area         = inArea;
+		SlotID = inSlotID;
-		display      = inUnknown016;
+		Area = inArea;
-		item_id      = inItemID;
+		Unknown012 = inUnknown012;
-		icon_id      = inIcon;
+		ItemID = inItemID;
-		quantity     = inQuantity;
+		Icon = inIcon;
-		permissions  = inPermissions;
+		Quantity = inQuantity;
-		allow_merge  = inAllowMerge;
+		Permissions = inPermissions;
-		is_useable   = inUseable;
+		AllowMerge = inAllowMerge;
-		item_name[0] = '\0';
+		Useable = inUseable;
-		donator[0]   = '\0';
+		ItemName[0] = '\0';
-		who_for[0]   = '\0';
+		Donator[0] = '\0';
 		WhoFor[0] = '\0';
 	};
-/*000*/	uint32	action;
+/*000*/	uint32	Action;
-/*004*/	uint32	not_used004;  //disassemble of client did not use this
+/*004*/	uint32	Unknown004;
-/*008*/	uint32	not_used008;  //disassemble of client did not use this
+/*008*/	uint32	Unknown08;
-/*012*/	uint16	slot_id;
+/*012*/	uint16	SlotID;
-/*014*/	uint16	area;
+/*014*/	uint16	Area;
-/*016*/	uint32	display;
+/*016*/	uint32	Unknown012;
-/*020*/	uint32	item_id;
+/*020*/	uint32	ItemID;
-/*024*/	uint32	icon_id;
+/*024*/	uint32	Icon;
-/*028*/	uint32	quantity;
+/*028*/	uint32	Quantity;
-/*032*/	uint32	permissions;
+/*032*/	uint32	Permissions;
-/*036*/	uint8	allow_merge;
+/*036*/	uint8	AllowMerge;
-/*037*/	uint8	is_useable;	// Used in conjunction with the Public-if-useable permission.
+/*037*/	uint8	Useable;	// Used in conjunction with the Public-if-useable permission.
-/*038*/	char	item_name[64];
+/*038*/	char	ItemName[64];
-/*102*/	char	donator[64];
+/*102*/	char	Donator[64];
-/*166*/ char	who_for[64];
+/*166*/ char	WhoFor[64];
 /*230*/	uint16	Unknown226;
 };
 struct GuildBankClear_Struct
@@ -1946,38 +1946,38 @@ struct GuildBankItemUpdate_Struct
 	void Init(uint32 inAction, uint32 inUnknown004, uint16 inSlotID, uint16 inArea, uint16 inUnknown012, uint32 inItemID, uint32 inIcon, uint32 inQuantity,
 			uint32 inPermissions, uint32 inAllowMerge, bool inUseable)
 	{
-		action       = inAction;
+		Action = inAction;
-		unknown004   = inUnknown004;
+		Unknown004 = inUnknown004;
-		slot_id      = inSlotID;
+		SlotID = inSlotID;
-		area         = inArea;
+		Area = inArea;
-		display      = inUnknown012;
+		Unknown012 = inUnknown012;
-		item_id      = inItemID;
+		ItemID = inItemID;
-		icon_id      = inIcon;
+		Icon = inIcon;
-		quantity     = inQuantity;
+		Quantity = inQuantity;
-		permissions  = inPermissions;
+		Permissions = inPermissions;
-		allow_merge  = inAllowMerge;
+		AllowMerge = inAllowMerge;
-		is_useable   = inUseable;
+		Useable = inUseable;
-		item_name[0] = '\0';
+		ItemName[0] = '\0';
-		donator[0]   = '\0';
+		Donator[0] = '\0';
-		who_for[0]   = '\0';
+		WhoFor[0] = '\0';
 	};
-/*000*/	uint32	action;
+/*000*/	uint32	Action;
-/*004*/	uint32	unknown004;
+/*004*/	uint32	Unknown004;
-/*008*/	uint32	unknown008;
+/*008*/	uint32	Unknown08;
-/*012*/	uint16	slot_id;
+/*012*/	uint16	SlotID;
-/*014*/	uint16	area;
+/*014*/	uint16	Area;
-/*016*/	uint32	display;
+/*016*/	uint32	Unknown012;
-/*020*/	uint32	item_id;
+/*020*/	uint32	ItemID;
-/*024*/	uint32	icon_id;
+/*024*/	uint32	Icon;
-/*028*/	uint32	quantity;
+/*028*/	uint32	Quantity;
-/*032*/	uint32	permissions;
+/*032*/	uint32	Permissions;
-/*036*/	uint8	allow_merge;
+/*036*/	uint8	AllowMerge;
-/*037*/	uint8	is_useable;	// Used in conjunction with the Public-if-useable permission.
+/*037*/	uint8	Useable;	// Used in conjunction with the Public-if-useable permission.
-/*038*/	char	item_name[64];
+/*038*/	char	ItemName[64];
-/*102*/	char	donator[64];
+/*102*/	char	Donator[64];
-/*166*/ char	who_for[64];
+/*166*/ char	WhoFor[64];
-/*230*/	uint16	unknown226;
+/*230*/	uint16	Unknown226;
 };
 struct GuildBankClear_Struct
@@ -72,7 +72,7 @@ namespace SoD
 	{
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
@@ -113,7 +113,7 @@ namespace SoD
 		//we need to go to every stream and replace it's manager.
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -3966,12 +3966,12 @@ namespace SoD
 			SoDSlot = serverSlot - 2;
 		}
-		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));;
+			SoDSlot = serverSlot + 11;
 		}
 		else if (serverSlot <= EQ::invbag::CURSOR_BAG_END && serverSlot >= EQ::invbag::CURSOR_BAG_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			SoDSlot = serverSlot - 9;
 		}
 		else if (serverSlot <= EQ::invslot::TRIBUTE_END && serverSlot >= EQ::invslot::TRIBUTE_BEGIN) {
@@ -3991,7 +3991,7 @@ namespace SoD
 		}
 		else if (serverSlot <= EQ::invbag::BANK_BAGS_END && serverSlot >= EQ::invbag::BANK_BAGS_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));;
+			SoDSlot = serverSlot + 1;
 		}
 		else if (serverSlot <= EQ::invslot::SHARED_BANK_END && serverSlot >= EQ::invslot::SHARED_BANK_BEGIN) {
@@ -3999,7 +3999,7 @@ namespace SoD
 		}
 		else if (serverSlot <= EQ::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::SHARED_BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			SoDSlot = serverSlot + 1;
 		}
 		else if (serverSlot <= EQ::invslot::TRADE_END && serverSlot >= EQ::invslot::TRADE_BEGIN) {
@@ -4007,7 +4007,7 @@ namespace SoD
 		}
 		else if (serverSlot <= EQ::invbag::TRADE_BAGS_END && serverSlot >= EQ::invbag::TRADE_BAGS_BEGIN) {
-			SoDSlot = serverSlot - (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::TRADE_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			SoDSlot = serverSlot;
 		}
 		else if (serverSlot <= EQ::invslot::WORLD_END && serverSlot >= EQ::invslot::WORLD_BEGIN) {
@@ -4049,11 +4049,11 @@ namespace SoD
 		}
 		else if (sod_slot <= invbag::GENERAL_BAGS_END && sod_slot >= invbag::GENERAL_BAGS_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sod_slot - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = sod_slot - 11;
 		}
 		else if (sod_slot <= invbag::CURSOR_BAG_END && sod_slot >= invbag::CURSOR_BAG_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			server_slot = sod_slot + 9;
 		}
 		else if (sod_slot <= invslot::TRIBUTE_END && sod_slot >= invslot::TRIBUTE_BEGIN) {
@@ -4073,7 +4073,7 @@ namespace SoD
 		}
 		else if (sod_slot <= invbag::BANK_BAGS_END && sod_slot >= invbag::BANK_BAGS_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sod_slot - invbag::BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = sod_slot - 1;
 		}
 		else if (sod_slot <= invslot::SHARED_BANK_END && sod_slot >= invslot::SHARED_BANK_BEGIN) {
@@ -4081,7 +4081,7 @@ namespace SoD
 		}
 		else if (sod_slot <= invbag::SHARED_BANK_BAGS_END && sod_slot >= invbag::SHARED_BANK_BAGS_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sod_slot - invbag::SHARED_BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = sod_slot - 1;
 		}
 		else if (sod_slot <= invslot::TRADE_END && sod_slot >= invslot::TRADE_BEGIN) {
@@ -4089,7 +4089,7 @@ namespace SoD
 		}
 		else if (sod_slot <= invbag::TRADE_BAGS_END && sod_slot >= invbag::TRADE_BAGS_BEGIN) {
-			server_slot = sod_slot + (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sod_slot - invbag::TRADE_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = sod_slot;
 		}
 		else if (sod_slot <= invslot::WORLD_END && sod_slot >= invslot::WORLD_BEGIN) {
@@ -71,7 +71,7 @@ namespace SoF
 	{
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
@@ -110,7 +110,7 @@ namespace SoF
 		//we need to go to every stream and replace it's manager.
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -3355,12 +3355,12 @@ namespace SoF
 			sof_slot = server_slot - 2;
 		}
-		else if (server_slot <= EQ::invbag::GENERAL_BAGS_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));;
+			sof_slot = server_slot + 11;
 		}
 		else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::CURSOR_BAG_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			sof_slot = server_slot - 9;
 		}
 		else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) {
@@ -3380,7 +3380,7 @@ namespace SoF
 		}
 		else if (server_slot <= EQ::invbag::BANK_BAGS_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			sof_slot = server_slot + 1;
 		}
 		else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) {
@@ -3388,7 +3388,7 @@ namespace SoF
 		}
 		else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END && server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::SHARED_BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			sof_slot = server_slot + 1;
 		}
 		else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) {
@@ -3396,7 +3396,7 @@ namespace SoF
 		}
 		else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) {
-			sof_slot = server_slot - (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::TRADE_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			sof_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) {
@@ -3442,11 +3442,11 @@ namespace SoF
 		}
 		else if (sof_slot <= invbag::GENERAL_BAGS_END && sof_slot >= invbag::GENERAL_BAGS_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sof_slot - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT));;
+			server_slot = sof_slot - 11;
 		}
 		else if (sof_slot <= invbag::CURSOR_BAG_END && sof_slot >= invbag::CURSOR_BAG_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			server_slot = sof_slot + 9;
 		}
 		else if (sof_slot <= invslot::TRIBUTE_END && sof_slot >= invslot::TRIBUTE_BEGIN) {
@@ -3466,7 +3466,7 @@ namespace SoF
 		}
 		else if (sof_slot <= invbag::BANK_BAGS_END && sof_slot >= invbag::BANK_BAGS_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sof_slot - invbag::BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));;
+			server_slot = sof_slot - 1;
 		}
 		else if (sof_slot <= invslot::SHARED_BANK_END && sof_slot >= invslot::SHARED_BANK_BEGIN) {
@@ -3474,7 +3474,7 @@ namespace SoF
 		}
 		else if (sof_slot <= invbag::SHARED_BANK_BAGS_END && sof_slot >= invbag::SHARED_BANK_BAGS_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sof_slot - invbag::SHARED_BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));;
+			server_slot = sof_slot - 1;
 		}
 		else if (sof_slot <= invslot::TRADE_END && sof_slot >= invslot::TRADE_BEGIN) {
@@ -3482,7 +3482,7 @@ namespace SoF
 		}
 		else if (sof_slot <= invbag::TRADE_BAGS_END && sof_slot >= invbag::TRADE_BAGS_BEGIN) {
-			server_slot = sof_slot + (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((sof_slot - invbag::TRADE_BAGS_BEGIN) / invbag::SLOT_COUNT));;
+			server_slot = sof_slot;
 		}
 		else if (sof_slot <= invslot::WORLD_END && sof_slot >= invslot::WORLD_BEGIN) {
@@ -73,7 +73,7 @@ namespace Titanium
 		auto Config = EQEmuConfig::get();
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
@@ -114,7 +114,7 @@ namespace Titanium
 		//we need to go to every stream and replace it's manager.
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -1059,7 +1059,7 @@ namespace Titanium
 		OUT(spawnid);
 		OUT_str(charname);
-		if (emu->race > 474)
+		if (emu->race > 473)
 			eq->race = 1;
 		else
 			OUT(race);
@@ -1840,7 +1840,7 @@ namespace Titanium
 			emu_cse = (CharacterSelectEntry_Struct *)emu_ptr;
 			eq->Race[char_index] = emu_cse->Race;
-			if (eq->Race[char_index] > 474)
+			if (eq->Race[char_index] > 473)
 				eq->Race[char_index] = 1;
 			for (int index = 0; index < EQ::textures::materialCount; ++index) {
@@ -2421,7 +2421,7 @@ namespace Titanium
 			strcpy(eq->title, emu->title);
 			//		eq->unknown0274 = emu->unknown0274;
 			eq->helm = emu->helm;
-			if (emu->race > 474)
+			if (emu->race > 473)
 				eq->race = 1;
 			else
 				eq->race = emu->race;
@@ -3596,12 +3596,12 @@ namespace Titanium
 		else if (server_slot == (EQ::invslot::POSSESSIONS_COUNT + EQ::invslot::slotAmmo)) {
 			titanium_slot = server_slot - 4;
 		}
-		else if (server_slot <= EQ::invbag::GENERAL_BAGS_END &&
+		else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END &&
 				 server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invbag::CURSOR_BAG_END && server_slot >= EQ::invbag::CURSOR_BAG_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			titanium_slot = server_slot - 20;
 		}
 		else if (server_slot <= EQ::invslot::TRIBUTE_END && server_slot >= EQ::invslot::TRIBUTE_BEGIN) {
 			titanium_slot = server_slot;
@@ -3616,21 +3616,21 @@ namespace Titanium
 		else if (server_slot <= EQ::invslot::BANK_END && server_slot >= EQ::invslot::BANK_BEGIN) {
 			titanium_slot = server_slot;
 		}
-		else if (server_slot <= EQ::invbag::BANK_BAGS_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
+		else if (server_slot <= EQ::invbag::BANK_BAGS_16_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invslot::SHARED_BANK_END && server_slot >= EQ::invslot::SHARED_BANK_BEGIN) {
 			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invbag::SHARED_BANK_BAGS_END &&
 				 server_slot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::SHARED_BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invslot::TRADE_END && server_slot >= EQ::invslot::TRADE_BEGIN) {
 			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invbag::TRADE_BAGS_END && server_slot >= EQ::invbag::TRADE_BAGS_BEGIN) {
-			titanium_slot = server_slot - (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((server_slot - EQ::invbag::TRADE_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT));
+			titanium_slot = server_slot;
 		}
 		else if (server_slot <= EQ::invslot::WORLD_END && server_slot >= EQ::invslot::WORLD_BEGIN) {
 			titanium_slot = server_slot;
@@ -3687,10 +3687,10 @@ namespace Titanium
 			server_slot = titanium_slot + 4;
 		}
 		else if (titanium_slot <= invbag::GENERAL_BAGS_END && titanium_slot >= invbag::GENERAL_BAGS_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((titanium_slot - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invbag::CURSOR_BAG_END && titanium_slot >= invbag::CURSOR_BAG_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN);
+			server_slot = titanium_slot + 20;
 		}
 		else if (titanium_slot <= invslot::TRIBUTE_END && titanium_slot >= invslot::TRIBUTE_BEGIN) {
 			server_slot = titanium_slot;
@@ -3705,19 +3705,19 @@ namespace Titanium
 			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invbag::BANK_BAGS_END && titanium_slot >= invbag::BANK_BAGS_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((titanium_slot - invbag::BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invslot::SHARED_BANK_END && titanium_slot >= invslot::SHARED_BANK_BEGIN) {
 			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invbag::SHARED_BANK_BAGS_END && titanium_slot >= invbag::SHARED_BANK_BAGS_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((titanium_slot - invbag::SHARED_BANK_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invslot::TRADE_END && titanium_slot >= invslot::TRADE_BEGIN) {
 			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invbag::TRADE_BAGS_END && titanium_slot >= invbag::TRADE_BAGS_BEGIN) {
-			server_slot = titanium_slot + (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((titanium_slot - invbag::TRADE_BAGS_BEGIN) / invbag::SLOT_COUNT));
+			server_slot = titanium_slot;
 		}
 		else if (titanium_slot <= invslot::WORLD_END && titanium_slot >= invslot::WORLD_BEGIN) {
 			server_slot = titanium_slot;
@@ -76,7 +76,7 @@ namespace UF
 	{
 		//create our opcode manager if we havent already
 		if (opcodes == nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			//load up the opcode manager.
 			//TODO: figure out how to support shared memory with multiple patches...
 			opcodes = new RegularOpcodeManager();
@@ -117,7 +117,7 @@ namespace UF
 		//we need to go to every stream and replace it's manager.
 		if (opcodes != nullptr) {
-			std::string opfile = fmt::format("{}/patch_{}.conf", PathManager::Instance()->GetPatchPath(), name);
+			std::string opfile = fmt::format("{}/patch_{}.conf", path.GetPatchPath(), name);
 			if (!opcodes->ReloadOpcodes(opfile.c_str())) {
 				LogNetcode("[OPCODES] Error reloading opcodes file [{}] for patch [{}]", opfile.c_str(), name);
 				return;
@@ -4908,12 +4908,12 @@ namespace UF
 			UFSlot = serverSlot - 2;
 		}
-		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
-			UFSlot = serverSlot - (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN)/*3748*/ - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::GENERAL_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT)); // + 11;
+			UFSlot = serverSlot + 11;
 		}
 		else if (serverSlot <= EQ::invbag::CURSOR_BAG_END && serverSlot >= EQ::invbag::CURSOR_BAG_BEGIN) {
-			UFSlot = serverSlot - (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN)/*5668*/; // - 9;
+			UFSlot = serverSlot - 9;
 		}
 		else if (serverSlot <= EQ::invslot::TRIBUTE_END && serverSlot >= EQ::invslot::TRIBUTE_BEGIN) {
@@ -4933,7 +4933,7 @@ namespace UF
 		}
 		else if (serverSlot <= EQ::invbag::BANK_BAGS_END && serverSlot >= EQ::invbag::BANK_BAGS_BEGIN) {
-			UFSlot = serverSlot - (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT)); // + 1;
+			UFSlot = serverSlot + 1;
 		}
 		else if (serverSlot <= EQ::invslot::SHARED_BANK_END && serverSlot >= EQ::invslot::SHARED_BANK_BEGIN) {
@@ -4941,7 +4941,7 @@ namespace UF
 		}
 		else if (serverSlot <= EQ::invbag::SHARED_BANK_BAGS_END && serverSlot >= EQ::invbag::SHARED_BANK_BAGS_BEGIN) {
-			UFSlot = serverSlot - (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::SHARED_BANK_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT)); // + 1;
+			UFSlot = serverSlot + 1;
 		}
 		else if (serverSlot <= EQ::invslot::TRADE_END && serverSlot >= EQ::invslot::TRADE_BEGIN) {
@@ -4949,7 +4949,7 @@ namespace UF
 		}
 		else if (serverSlot <= EQ::invbag::TRADE_BAGS_END && serverSlot >= EQ::invbag::TRADE_BAGS_BEGIN) {
-			UFSlot = serverSlot - (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) - ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((serverSlot - EQ::invbag::TRADE_BAGS_BEGIN) / EQ::invbag::SLOT_COUNT)); // + 0;
+			UFSlot = serverSlot;
 		}
 		else if (serverSlot <= EQ::invslot::WORLD_END && serverSlot >= EQ::invslot::WORLD_BEGIN) {
@@ -4991,11 +4991,11 @@ namespace UF
 		}
 		else if (ufSlot <= invbag::GENERAL_BAGS_END && ufSlot >= invbag::GENERAL_BAGS_BEGIN) {
-			ServerSlot = ufSlot + (EQ::invbag::GENERAL_BAGS_BEGIN - invbag::GENERAL_BAGS_BEGIN)/*3748*/ + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((ufSlot - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT)); // - 11;
+			ServerSlot = ufSlot - 11;
 		}
 		else if (ufSlot <= invbag::CURSOR_BAG_END && ufSlot >= invbag::CURSOR_BAG_BEGIN) {
-			ServerSlot = ufSlot + (EQ::invbag::CURSOR_BAG_BEGIN - invbag::CURSOR_BAG_BEGIN)/*5668*/; // + 9;
+			ServerSlot = ufSlot + 9;
 		}
 		else if (ufSlot <= invslot::TRIBUTE_END && ufSlot >= invslot::TRIBUTE_BEGIN) {
@@ -5015,7 +5015,7 @@ namespace UF
 		}
 		else if (ufSlot <= invbag::BANK_BAGS_END && ufSlot >= invbag::BANK_BAGS_BEGIN) {
-			ServerSlot = ufSlot + (EQ::invbag::BANK_BAGS_BEGIN - invbag::BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((ufSlot - invbag::BANK_BAGS_BEGIN) / invbag::SLOT_COUNT)); // - 1;
+			ServerSlot = ufSlot - 1;
 		}
 		else if (ufSlot <= invslot::SHARED_BANK_END && ufSlot >= invslot::SHARED_BANK_BEGIN) {
@@ -5023,7 +5023,7 @@ namespace UF
 		}
 		else if (ufSlot <= invbag::SHARED_BANK_BAGS_END && ufSlot >= invbag::SHARED_BANK_BAGS_BEGIN) {
-			ServerSlot = ufSlot + (EQ::invbag::SHARED_BANK_BAGS_BEGIN - invbag::SHARED_BANK_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((ufSlot - invbag::SHARED_BANK_BAGS_BEGIN) / invbag::SLOT_COUNT)); // - 1;
+			ServerSlot = ufSlot - 1;
 		}
 		else if (ufSlot <= invslot::TRADE_END && ufSlot >= invslot::TRADE_BEGIN) {
@@ -5031,7 +5031,7 @@ namespace UF
 		}
 		else if (ufSlot <= invbag::TRADE_BAGS_END && ufSlot >= invbag::TRADE_BAGS_BEGIN) {
-			ServerSlot = ufSlot + (EQ::invbag::TRADE_BAGS_BEGIN - invbag::TRADE_BAGS_BEGIN) + ((EQ::invbag::SLOT_COUNT - invbag::SLOT_COUNT) * ((ufSlot - invbag::TRADE_BAGS_BEGIN) / invbag::SLOT_COUNT)); // - 0;
+			ServerSlot = ufSlot;
 		}
 		else if (ufSlot <= invslot::WORLD_END && ufSlot >= invslot::WORLD_BEGIN) {
@@ -8,7 +8,7 @@
 namespace fs = std::filesystem;
-void PathManager::Init()
+void PathManager::LoadPaths()
 {
 	m_server_path = File::FindEqemuConfigPath();
@@ -48,23 +48,10 @@ void PathManager::Init()
 		return dir;
 	};
 	auto load_many_paths_fallback = [&](const std::vector<std::string>& dirs, const std::string& fallback, std::vector<std::string>& target) {
 		target.clear();
 		if (!dirs.empty()) {
 			for (const auto& path : dirs) {
 				target.push_back(resolve_path(path));
 			}
 		} else {
 			target.push_back(resolve_path(fallback));
 		}
 	};
 	load_many_paths_fallback(c->GetQuestDirectories(), c->QuestDir, m_quests_paths);
 	load_many_paths_fallback(c->GetPluginsDirectories(), c->PluginDir, m_plugin_paths);
 	load_many_paths_fallback(c->GetLuaModuleDirectories(), c->LuaModuleDir, m_lua_module_paths);
 	// resolve all paths
 	m_maps_path          = resolve_path(c->MapDir, {"maps", "Maps"});
 	m_quests_path        = resolve_path(c->QuestDir);
 	m_plugins_path       = resolve_path(c->PluginDir);
 	m_lua_modules_path   = resolve_path(c->LuaModuleDir);
 	m_lua_mods_path      = resolve_path("mods");
 	m_patch_path         = resolve_path(c->PatchDir);
 	m_opcode_path        = resolve_path(c->OpcodeDir);
@@ -75,10 +62,13 @@ void PathManager::Init()
 	std::vector<std::pair<std::string, std::string>> paths = {
 		{"server", m_server_path},
 		{"logs", m_log_path},
 		{"maps", m_maps_path},
 		{"lua mods", m_lua_mods_path},
 		{"lua_modules", m_lua_modules_path},
 		{"maps", m_maps_path},
 		{"patches", m_patch_path},
 		{"opcode", m_opcode_path},
 		{"plugins", m_plugins_path},
 		{"quests", m_quests_path},
 		{"shared_memory", m_shared_memory_path}
 	};
@@ -86,24 +76,13 @@ void PathManager::Init()
 	constexpr int path_width   = 0;
 	constexpr int break_length = 70;
-	LogInfo("Loading server paths");
+	std::cout << std::endl;
 	LogInfo("{}", Strings::Repeat("-", break_length));
 	for (const auto& [name, in_path] : paths) {
 		if (!in_path.empty()) {
 			LogInfo("{:>{}} > [{:<{}}]", name, name_width, in_path, path_width);
 		}
 	}
 	auto log_paths = [&](const std::string& label, const std::vector<std::string>& paths) {
 		if (!paths.empty()) {
 			LogInfo("{:>{}} > [{:<{}}]", label, name_width - 1, Strings::Join(paths, ";"), path_width);
 		}
 	};
 	log_paths("quests", m_quests_paths);
 	log_paths("plugins", m_plugin_paths);
 	log_paths("lua_modules", m_lua_module_paths);
 	LogInfo("{}", Strings::Repeat("-", break_length));
 }
@@ -117,26 +96,21 @@ const std::string &PathManager::GetMapsPath() const
 	return m_maps_path;
 }
 const std::string &PathManager::GetQuestsPath() const
 {
 	return m_quests_path;
 }
 const std::string &PathManager::GetPluginsPath() const
 {
 	return m_plugins_path;
 }
 const std::string &PathManager::GetSharedMemoryPath() const
 {
 	return m_shared_memory_path;
 }
 std::vector<std::string> PathManager::GetQuestPaths() const
 {
 	return m_quests_paths;
 }
 std::vector<std::string> PathManager::GetPluginPaths() const
 {
 	return m_plugin_paths;
 }
 std::vector<std::string> PathManager::GetLuaModulePaths() const
 {
 	return m_lua_module_paths;
 }
 const std::string &PathManager::GetLogPath() const
 {
 	return m_log_path;
@@ -152,6 +126,11 @@ const std::string &PathManager::GetOpcodePath() const
 	return m_opcode_path;
 }
 const std::string &PathManager::GetLuaModulesPath() const
 {
 	return m_lua_modules_path;
 }
 const std::string &PathManager::GetLuaModsPath() const
 {
 	return m_lua_mods_path;
@@ -3,17 +3,10 @@
 #include <string>
 #include <vector>
 class PathManager {
 public:
-	void Init();
+	void LoadPaths();
 	static PathManager *Instance()
 	{
 		static PathManager instance;
 		return &instance;
 	}
 	[[nodiscard]] const std::string &GetLogPath() const;
 	[[nodiscard]] const std::string &GetLuaModsPath() const;
@@ -21,27 +14,24 @@ public:
 	[[nodiscard]] const std::string &GetMapsPath() const;
 	[[nodiscard]] const std::string &GetPatchPath() const;
 	[[nodiscard]] const std::string &GetOpcodePath() const;
 	[[nodiscard]] const std::string &GetPluginsPath() const;
 	[[nodiscard]] const std::string &GetQuestsPath() const;
 	[[nodiscard]] const std::string &GetServerPath() const;
 	[[nodiscard]] const std::string &GetSharedMemoryPath() const;
 	[[nodiscard]] std::vector<std::string> GetQuestPaths() const;
 	[[nodiscard]] std::vector<std::string> GetPluginPaths() const;
 	[[nodiscard]] std::vector<std::string> GetLuaModulePaths() const;
 private:
 	std::string m_log_path;
 	std::string m_lua_mods_path;
 	std::string m_lua_modules_path;
 	std::string m_maps_path;
 	std::string m_patch_path;
 	std::string m_opcode_path;
 	std::string m_plugins_path;
 	std::string m_quests_path;
 	std::vector<std::string> m_quests_paths;
 	std::vector<std::string> m_plugin_paths;
 	std::vector<std::string> m_lua_module_paths;
 private:
 	std::string m_server_path;
 	std::string m_shared_memory_path;
 };
 extern PathManager path;
 #endif //EQEMU_PATH_MANAGER_H
@@ -1,9 +0,0 @@
 #pragma once
 #include "../types.h"
 #include "../database.h"
 #include "../strings.h"
 #include "../eqemu_logsys.h"
 #include "../eqemu_logsys_log_aliases.h"
 #include "../features.h"
 #include "../global_define.h"
@@ -0,0 +1,34 @@
 // types
 #include <limits>
 #include <string>
 #include <cctype>
 #include <sstream>
 // containers
 #include <iterator>
 #include <set>
 #include <unordered_set>
 #include <map>
 #include <unordered_map>
 #include <list>
 #include <vector>
 // utilities
 #include <iostream>
 #include <cassert>
 #include <cmath>
 #include <memory>
 #include <functional>
 #include <algorithm>
 #include <utility>
 #include <tuple>
 #include <fstream>
 #include <cstdio>
 // fmt
 #include <fmt/format.h>
 // lua
 #include "lua.hpp"
 #include <luabind/luabind.hpp>
 #include <luabind/object.hpp>
@@ -1,14 +0,0 @@
 #pragma once
 // Lightweight, widely used
 #include <string>
 #include <vector>
 #include <map>
 #include <unordered_map>
 #include <memory>
 #include <limits>
 #include <cstdint>
 #include <cassert>
 // fmt
 #include <fmt/format.h>
@@ -1,7 +1,6 @@
 #include <string>
 #include <memory>
 #include "process.h"
 #include <fmt/format.h>
 std::string Process::execute(const std::string &cmd)
 {
@@ -21,7 +21,103 @@
 #include "../common/types.h"
 #include <string>
 namespace Gender {
 	constexpr uint8 Male   = 0;
 	constexpr uint8 Female = 1;
 	constexpr uint8 Neuter = 2;
 }
 //theres a big list straight from the client below.
 #define HUMAN 1
 #define BARBARIAN 2
 #define ERUDITE 3
 #define WOOD_ELF 4
 #define HIGH_ELF 5
 #define DARK_ELF 6
 #define HALF_ELF 7
 #define DWARF 8
 #define TROLL 9
 #define OGRE 10
 #define HALFLING 11
 #define GNOME 12
 #define WEREWOLF 14
 #define WOLF 42
 #define BEAR 43
 #define SKELETON 60
 #define TIGER 63
 #define ELEMENTAL 75
 #define ALLIGATOR 91
 #define OGGOK_CITIZEN 93
 #define EYE_OF_ZOMM 108
 #define WOLF_ELEMENTAL 120
 #define INVISIBLE_MAN 127
 #define IKSAR 128
 #define VAHSHIR 130
 #define CONTROLLED_BOAT 141
 #define MINOR_ILL_OBJ 142
 #define TREE 143
 #define IKSAR_SKELETON 161
 #define FROGLOK 330
 // TODO: check all clients for (BYTE) usage of '/who all' class and remove FROGLOK2, if possible (330 - 74 = 256 .. WORD->BYTE conversion loss...)
 #define FROGLOK2 74	// Not sure why /who all reports race as 74 for frogloks
 #define FAIRY 473
 #define DRAKKIN 522 // 32768
 #define EMU_RACE_NPC 131069 // was 65533
 #define EMU_RACE_PET 131070 // was 65534
 #define EMU_RACE_UNKNOWN 131071 // was 65535
 // player race values
 #define PLAYER_RACE_UNKNOWN 0
 #define PLAYER_RACE_HUMAN 1
 #define PLAYER_RACE_BARBARIAN 2
 #define PLAYER_RACE_ERUDITE 3
 #define PLAYER_RACE_WOOD_ELF 4
 #define PLAYER_RACE_HIGH_ELF 5
 #define PLAYER_RACE_DARK_ELF 6
 #define PLAYER_RACE_HALF_ELF 7
 #define PLAYER_RACE_DWARF 8
 #define PLAYER_RACE_TROLL 9
 #define PLAYER_RACE_OGRE 10
 #define PLAYER_RACE_HALFLING 11
 #define PLAYER_RACE_GNOME 12
 #define PLAYER_RACE_IKSAR 13
 #define PLAYER_RACE_VAHSHIR 14
 #define PLAYER_RACE_FROGLOK 15
 #define PLAYER_RACE_DRAKKIN 16
 #define PLAYER_RACE_COUNT 16
 #define PLAYER_RACE_EMU_NPC 17
 #define PLAYER_RACE_EMU_PET 18
 #define PLAYER_RACE_EMU_COUNT 19
 // player race bits
 #define PLAYER_RACE_UNKNOWN_BIT 0
 #define PLAYER_RACE_HUMAN_BIT 1
 #define PLAYER_RACE_BARBARIAN_BIT 2
 #define PLAYER_RACE_ERUDITE_BIT 4
 #define PLAYER_RACE_WOOD_ELF_BIT 8
 #define PLAYER_RACE_HIGH_ELF_BIT 16
 #define PLAYER_RACE_DARK_ELF_BIT 32
 #define PLAYER_RACE_HALF_ELF_BIT 64
 #define PLAYER_RACE_DWARF_BIT 128
 #define PLAYER_RACE_TROLL_BIT 256
 #define PLAYER_RACE_OGRE_BIT 512
 #define PLAYER_RACE_HALFLING_BIT 1024
 #define PLAYER_RACE_GNOME_BIT 2048
 #define PLAYER_RACE_IKSAR_BIT 4096
 #define PLAYER_RACE_VAHSHIR_BIT 8192
 #define PLAYER_RACE_FROGLOK_BIT 16384
 #define PLAYER_RACE_DRAKKIN_BIT 32768
 #define PLAYER_RACE_ALL_MASK 65535
 const char* GetRaceIDName(uint16 race_id);
 const char* GetPlayerRaceName(uint32 player_race_value);
 const char* GetGenderName(uint32 gender_id);
 bool IsPlayerRace(uint16 race_id);
@@ -31,13 +127,25 @@ uint32 GetPlayerRaceValue(uint16 race_id);
 uint16 GetPlayerRaceBit(uint16 race_id);
 uint16 GetRaceIDFromPlayerRaceValue(uint32 player_race_value);
 uint16 GetRaceIDFromPlayerRaceBit(uint32 player_race_bit);
 float GetRaceGenderDefaultHeight(int race, int gender);
-namespace Gender {
+// player race-/gender-based model feature validators
-	constexpr uint8 Male   = 0;
+namespace PlayerAppearance
-	constexpr uint8 Female = 1;
+{
-	constexpr uint8 Neuter = 2;
+	bool IsValidBeard(uint16 race_id, uint8 gender_id, uint8 beard_value, bool use_luclin = true);
 	bool IsValidBeardColor(uint16 race_id, uint8 gender_id, uint8 beard_color_value, bool use_luclin = true);
 	bool IsValidDetail(uint16 race_id, uint8 gender_id, uint32 detail_value, bool use_luclin = true);
 	bool IsValidEyeColor(uint16 race_id, uint8 gender_id, uint8 eye_color_value, bool use_luclin = true);
 	bool IsValidFace(uint16 race_id, uint8 gender_id, uint8 face_value, bool use_luclin = true);
 	bool IsValidHair(uint16 race_id, uint8 gender_id, uint8 hair_value, bool use_luclin = true);
 	bool IsValidHairColor(uint16 race_id, uint8 gender_id, uint8 hair_color_value, bool use_luclin = true);
 	bool IsValidHead(uint16 race_id, uint8 gender_id, uint8 head_value, bool use_luclin = true);
 	bool IsValidHeritage(uint16 race_id, uint8 gender_id, uint32 heritage_value, bool use_luclin = true);
 	bool IsValidTattoo(uint16 race_id, uint8 gender_id, uint32 tattoo_value, bool use_luclin = true);
 	bool IsValidTexture(uint16 race_id, uint8 gender_id, uint8 texture_value, bool use_luclin = true);
 	bool IsValidWoad(uint16 race_id, uint8 gender_id, uint8 woad_value, bool use_luclin = true);
 }
 namespace Race {
@@ -776,92 +884,8 @@ namespace Race {
 	constexpr uint16 Pegasus3                 = 732;
 	constexpr uint16 InteractiveObject        = 2250;
 	constexpr uint16 Node                     = 2254;
 }
-namespace RaceBitmask {
+	constexpr uint16 ALL_RACES_BITMASK = 65535;
 	constexpr uint16 Unknown   = 0;
 	constexpr uint16 Human     = 1;
 	constexpr uint16 Barbarian = 2;
 	constexpr uint16 Erudite   = 4;
 	constexpr uint16 WoodElf   = 8;
 	constexpr uint16 HighElf   = 16;
 	constexpr uint16 DarkElf   = 32;
 	constexpr uint16 HalfElf   = 64;
 	constexpr uint16 Dwarf     = 128;
 	constexpr uint16 Troll     = 256;
 	constexpr uint16 Ogre      = 512;
 	constexpr uint16 Halfling  = 1024;
 	constexpr uint16 Gnome     = 2048;
 	constexpr uint16 Iksar     = 4096;
 	constexpr uint16 VahShir   = 8192;
 	constexpr uint16 Froglok   = 16384;
 	constexpr uint16 Drakkin   = 32768;
 	constexpr uint16 All       = 65535;
 }
 namespace RaceIndex {
 	constexpr uint16 Human     = 1;
 	constexpr uint16 Barbarian = 2;
 	constexpr uint16 Erudite   = 3;
 	constexpr uint16 WoodElf   = 4;
 	constexpr uint16 HighElf   = 5;
 	constexpr uint16 DarkElf   = 6;
 	constexpr uint16 HalfElf   = 7;
 	constexpr uint16 Dwarf     = 8;
 	constexpr uint16 Troll     = 9;
 	constexpr uint16 Ogre      = 10;
 	constexpr uint16 Halfling  = 11;
 	constexpr uint16 Gnome     = 12;
 	constexpr uint16 Iksar     = 13;
 	constexpr uint16 VahShir   = 14;
 	constexpr uint16 Froglok   = 15;
 	constexpr uint16 Drakkin   = 16;
 }
 namespace RaceAppearance {
 	bool IsValidBeard(uint16 race_id, uint8 gender_id, uint8 beard_value, bool use_luclin = true);
 	bool IsValidBeardColor(uint16 race_id, uint8 gender_id, uint8 beard_color_value, bool use_luclin = true);
 	bool IsValidDetail(uint16 race_id, uint8 gender_id, uint32 detail_value, bool use_luclin = true);
 	bool IsValidEyeColor(uint16 race_id, uint8 gender_id, uint8 eye_color_value, bool use_luclin = true);
 	bool IsValidFace(uint16 race_id, uint8 gender_id, uint8 face_value, bool use_luclin = true);
 	bool IsValidHair(uint16 race_id, uint8 gender_id, uint8 hair_value, bool use_luclin = true);
 	bool IsValidHairColor(uint16 race_id, uint8 gender_id, uint8 hair_color_value, bool use_luclin = true);
 	bool IsValidHeritage(uint16 race_id, uint8 gender_id, uint32 heritage_value, bool use_luclin = true);
 	bool IsValidTattoo(uint16 race_id, uint8 gender_id, uint32 tattoo_value, bool use_luclin = true);
 	bool IsValidWoad(uint16 race_id, uint8 gender_id, uint8 woad_value, bool use_luclin = true);
 	constexpr int HumanMale       = (Race::Human << 8) | Gender::Male;
 	constexpr int HumanFemale     = (Race::Human << 8) | Gender::Female;
 	constexpr int BarbarianMale   = (Race::Barbarian << 8) | Gender::Male;
 	constexpr int BarbarianFemale = (Race::Barbarian << 8) | Gender::Female;
 	constexpr int EruditeMale     = (Race::Erudite << 8) | Gender::Male;
 	constexpr int EruditeFemale   = (Race::Erudite << 8) | Gender::Female;
 	constexpr int WoodElfMale     = (Race::WoodElf << 8) | Gender::Male;
 	constexpr int WoodElfFemale   = (Race::WoodElf << 8) | Gender::Female;
 	constexpr int HighElfMale     = (Race::HighElf << 8) | Gender::Male;
 	constexpr int HighElfFemale   = (Race::HighElf << 8) | Gender::Female;
 	constexpr int DarkElfMale     = (Race::DarkElf << 8) | Gender::Male;
 	constexpr int DarkElfFemale   = (Race::DarkElf << 8) | Gender::Female;
 	constexpr int HalfElfMale     = (Race::HalfElf << 8) | Gender::Male;
 	constexpr int HalfElfFemale   = (Race::HalfElf << 8) | Gender::Female;
 	constexpr int DwarfMale       = (Race::Dwarf << 8) | Gender::Male;
 	constexpr int DwarfFemale     = (Race::Dwarf << 8) | Gender::Female;
 	constexpr int TrollMale       = (Race::Troll << 8) | Gender::Male;
 	constexpr int TrollFemale     = (Race::Troll << 8) | Gender::Female;
 	constexpr int OgreMale        = (Race::Ogre << 8) | Gender::Male;
 	constexpr int OgreFemale      = (Race::Ogre << 8) | Gender::Female;
 	constexpr int HalflingMale    = (Race::Halfling << 8) | Gender::Male;
 	constexpr int HalflingFemale  = (Race::Halfling << 8) | Gender::Female;
 	constexpr int GnomeMale       = (Race::Gnome << 8) | Gender::Male;
 	constexpr int GnomeFemale     = (Race::Gnome << 8) | Gender::Female;
 	constexpr int IksarMale       = (Race::Iksar << 8) | Gender::Male;
 	constexpr int IksarFemale     = (Race::Iksar << 8) | Gender::Female;
 	constexpr int VahShirMale     = (Race::VahShir << 8) | Gender::Male;
 	constexpr int VahShirFemale   = (Race::VahShir << 8) | Gender::Female;
 	constexpr int FroglokMale     = (Race::Froglok2 << 8) | Gender::Male;
 	constexpr int FroglokFemale   = (Race::Froglok2 << 8) | Gender::Female;
 	constexpr int DrakkinMale     = (Race::Drakkin << 8) | Gender::Male;
 	constexpr int DrakkinFemale   = (Race::Drakkin << 8) | Gender::Female;
 }
 #endif
@@ -116,12 +116,6 @@ namespace EQ {
 			Reseed();
 		}
 		static Random* Instance()
 		{
 			static Random instance;
 			return &instance;
 		}
 	private:
 #ifndef BIASED_INT_DIST
 		typedef std::uniform_int_distribution<int>::param_type int_param_t;
@@ -70,7 +70,6 @@ public:
 		uint32_t    gm_exp;
 		uint32_t    killed_by;
 		uint8_t     rezzable;
 		std::string entity_variables;
 	};
 	static std::string PrimaryKey()
@@ -132,7 +131,6 @@ public:
 			"gm_exp",
 			"killed_by",
 			"rezzable",
 			"entity_variables",
 		};
 	}
@@ -190,7 +188,6 @@ public:
 			"gm_exp",
 			"killed_by",
 			"rezzable",
 			"entity_variables",
 		};
 	}
@@ -282,7 +279,6 @@ public:
 		e.gm_exp           = 0;
 		e.killed_by        = 0;
 		e.rezzable         = 0;
 		e.entity_variables = "";
 		return e;
 	}
@@ -370,7 +366,6 @@ public:
 			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
 			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
 			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
 			e.entity_variables = row[51] ? row[51] : "";
 			return e;
 		}
@@ -454,7 +449,6 @@ public:
 		v.push_back(columns[48] + " = " + std::to_string(e.gm_exp));
 		v.push_back(columns[49] + " = " + std::to_string(e.killed_by));
 		v.push_back(columns[50] + " = " + std::to_string(e.rezzable));
 		v.push_back(columns[51] + " = '" + Strings::Escape(e.entity_variables) + "'");
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -527,7 +521,6 @@ public:
 		v.push_back(std::to_string(e.gm_exp));
 		v.push_back(std::to_string(e.killed_by));
 		v.push_back(std::to_string(e.rezzable));
 		v.push_back("'" + Strings::Escape(e.entity_variables) + "'");
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -608,7 +601,6 @@ public:
 			v.push_back(std::to_string(e.gm_exp));
 			v.push_back(std::to_string(e.killed_by));
 			v.push_back(std::to_string(e.rezzable));
 			v.push_back("'" + Strings::Escape(e.entity_variables) + "'");
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -693,7 +685,6 @@ public:
 			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
 			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
 			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
 			e.entity_variables = row[51] ? row[51] : "";
 			all_entries.push_back(e);
 		}
@@ -769,7 +760,6 @@ public:
 			e.gm_exp           = row[48] ? static_cast<uint32_t>(strtoul(row[48], nullptr, 10)) : 0;
 			e.killed_by        = row[49] ? static_cast<uint32_t>(strtoul(row[49], nullptr, 10)) : 0;
 			e.rezzable         = row[50] ? static_cast<uint8_t>(strtoul(row[50], nullptr, 10)) : 0;
 			e.entity_variables = row[51] ? row[51] : "";
 			all_entries.push_back(e);
 		}
@@ -895,7 +885,6 @@ public:
 		v.push_back(std::to_string(e.gm_exp));
 		v.push_back(std::to_string(e.killed_by));
 		v.push_back(std::to_string(e.rezzable));
 		v.push_back("'" + Strings::Escape(e.entity_variables) + "'");
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -969,7 +958,6 @@ public:
 			v.push_back(std::to_string(e.gm_exp));
 			v.push_back(std::to_string(e.killed_by));
 			v.push_back(std::to_string(e.rezzable));
 			v.push_back("'" + Strings::Escape(e.entity_variables) + "'");
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -115,8 +115,7 @@ public:
 		uint8_t     lfg;
 		std::string mailkey;
 		uint8_t     xtargets;
-		uint8_t     ingame;
+		int8_t      firstlogon;
 		uint32_t    first_login;
 		uint32_t    e_aa_effects;
 		uint32_t    e_percent_to_aa;
 		uint32_t    e_expended_aa_spent;
@@ -231,8 +230,7 @@ public:
 			"lfg",
 			"mailkey",
 			"xtargets",
-			"ingame",
+			"firstlogon",
 			"first_login",
 			"e_aa_effects",
 			"e_percent_to_aa",
 			"e_expended_aa_spent",
@@ -343,8 +341,7 @@ public:
 			"lfg",
 			"mailkey",
 			"xtargets",
-			"ingame",
+			"firstlogon",
 			"first_login",
 			"e_aa_effects",
 			"e_percent_to_aa",
 			"e_expended_aa_spent",
@@ -489,8 +486,7 @@ public:
 		e.lfg                     = 0;
 		e.mailkey                 = "";
 		e.xtargets                = 5;
-		e.ingame                  = 0;
+		e.firstlogon              = 0;
 		e.first_login             = 0;
 		e.e_aa_effects            = 0;
 		e.e_percent_to_aa         = 0;
 		e.e_expended_aa_spent     = 0;
@@ -631,16 +627,15 @@ public:
 			e.lfg                     = row[93] ? static_cast<uint8_t>(strtoul(row[93], nullptr, 10)) : 0;
 			e.mailkey                 = row[94] ? row[94] : "";
 			e.xtargets                = row[95] ? static_cast<uint8_t>(strtoul(row[95], nullptr, 10)) : 5;
-			e.ingame                  = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 0;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
-			e.first_login             = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
-			e.e_aa_effects            = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
-			e.e_percent_to_aa         = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
-			e.e_expended_aa_spent     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
-			e.aa_points_spent_old     = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
-			e.aa_points_old           = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
-			e.e_last_invsnapshot      = row[103] ? static_cast<uint32_t>(strtoul(row[103], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
-			e.deleted_at              = strtoll(row[104] ? row[104] : "-1", nullptr, 10);
+			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], nullptr, 10)) : 0;
 			e.illusion_block          = row[105] ? static_cast<uint8_t>(strtoul(row[105], nullptr, 10)) : 0;
 			return e;
 		}
@@ -769,16 +764,15 @@ public:
 		v.push_back(columns[93] + " = " + std::to_string(e.lfg));
 		v.push_back(columns[94] + " = '" + Strings::Escape(e.mailkey) + "'");
 		v.push_back(columns[95] + " = " + std::to_string(e.xtargets));
-		v.push_back(columns[96] + " = " + std::to_string(e.ingame));
+		v.push_back(columns[96] + " = " + std::to_string(e.firstlogon));
-		v.push_back(columns[97] + " = " + std::to_string(e.first_login));
+		v.push_back(columns[97] + " = " + std::to_string(e.e_aa_effects));
-		v.push_back(columns[98] + " = " + std::to_string(e.e_aa_effects));
+		v.push_back(columns[98] + " = " + std::to_string(e.e_percent_to_aa));
-		v.push_back(columns[99] + " = " + std::to_string(e.e_percent_to_aa));
+		v.push_back(columns[99] + " = " + std::to_string(e.e_expended_aa_spent));
-		v.push_back(columns[100] + " = " + std::to_string(e.e_expended_aa_spent));
+		v.push_back(columns[100] + " = " + std::to_string(e.aa_points_spent_old));
-		v.push_back(columns[101] + " = " + std::to_string(e.aa_points_spent_old));
+		v.push_back(columns[101] + " = " + std::to_string(e.aa_points_old));
-		v.push_back(columns[102] + " = " + std::to_string(e.aa_points_old));
+		v.push_back(columns[102] + " = " + std::to_string(e.e_last_invsnapshot));
-		v.push_back(columns[103] + " = " + std::to_string(e.e_last_invsnapshot));
+		v.push_back(columns[103] + " = FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-		v.push_back(columns[104] + " = FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
+		v.push_back(columns[104] + " = " + std::to_string(e.illusion_block));
 		v.push_back(columns[105] + " = " + std::to_string(e.illusion_block));
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -896,8 +890,7 @@ public:
 		v.push_back(std::to_string(e.lfg));
 		v.push_back("'" + Strings::Escape(e.mailkey) + "'");
 		v.push_back(std::to_string(e.xtargets));
-		v.push_back(std::to_string(e.ingame));
+		v.push_back(std::to_string(e.firstlogon));
 		v.push_back(std::to_string(e.first_login));
 		v.push_back(std::to_string(e.e_aa_effects));
 		v.push_back(std::to_string(e.e_percent_to_aa));
 		v.push_back(std::to_string(e.e_expended_aa_spent));
@@ -1031,8 +1024,7 @@ public:
 			v.push_back(std::to_string(e.lfg));
 			v.push_back("'" + Strings::Escape(e.mailkey) + "'");
 			v.push_back(std::to_string(e.xtargets));
-			v.push_back(std::to_string(e.ingame));
+			v.push_back(std::to_string(e.firstlogon));
 			v.push_back(std::to_string(e.first_login));
 			v.push_back(std::to_string(e.e_aa_effects));
 			v.push_back(std::to_string(e.e_percent_to_aa));
 			v.push_back(std::to_string(e.e_expended_aa_spent));
@@ -1170,16 +1162,15 @@ public:
 			e.lfg                     = row[93] ? static_cast<uint8_t>(strtoul(row[93], nullptr, 10)) : 0;
 			e.mailkey                 = row[94] ? row[94] : "";
 			e.xtargets                = row[95] ? static_cast<uint8_t>(strtoul(row[95], nullptr, 10)) : 5;
-			e.ingame                  = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 0;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
-			e.first_login             = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
-			e.e_aa_effects            = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
-			e.e_percent_to_aa         = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
-			e.e_expended_aa_spent     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
-			e.aa_points_spent_old     = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
-			e.aa_points_old           = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
-			e.e_last_invsnapshot      = row[103] ? static_cast<uint32_t>(strtoul(row[103], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
-			e.deleted_at              = strtoll(row[104] ? row[104] : "-1", nullptr, 10);
+			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], nullptr, 10)) : 0;
 			e.illusion_block          = row[105] ? static_cast<uint8_t>(strtoul(row[105], nullptr, 10)) : 0;
 			all_entries.push_back(e);
 		}
@@ -1300,16 +1291,15 @@ public:
 			e.lfg                     = row[93] ? static_cast<uint8_t>(strtoul(row[93], nullptr, 10)) : 0;
 			e.mailkey                 = row[94] ? row[94] : "";
 			e.xtargets                = row[95] ? static_cast<uint8_t>(strtoul(row[95], nullptr, 10)) : 5;
-			e.ingame                  = row[96] ? static_cast<uint8_t>(strtoul(row[96], nullptr, 10)) : 0;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
-			e.first_login             = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
-			e.e_aa_effects            = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
-			e.e_percent_to_aa         = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
-			e.e_expended_aa_spent     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
-			e.aa_points_spent_old     = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
-			e.aa_points_old           = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
-			e.e_last_invsnapshot      = row[103] ? static_cast<uint32_t>(strtoul(row[103], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
-			e.deleted_at              = strtoll(row[104] ? row[104] : "-1", nullptr, 10);
+			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], nullptr, 10)) : 0;
 			e.illusion_block          = row[105] ? static_cast<uint8_t>(strtoul(row[105], nullptr, 10)) : 0;
 			all_entries.push_back(e);
 		}
@@ -1480,8 +1470,7 @@ public:
 		v.push_back(std::to_string(e.lfg));
 		v.push_back("'" + Strings::Escape(e.mailkey) + "'");
 		v.push_back(std::to_string(e.xtargets));
-		v.push_back(std::to_string(e.ingame));
+		v.push_back(std::to_string(e.firstlogon));
 		v.push_back(std::to_string(e.first_login));
 		v.push_back(std::to_string(e.e_aa_effects));
 		v.push_back(std::to_string(e.e_percent_to_aa));
 		v.push_back(std::to_string(e.e_expended_aa_spent));
@@ -1608,8 +1597,7 @@ public:
 			v.push_back(std::to_string(e.lfg));
 			v.push_back("'" + Strings::Escape(e.mailkey) + "'");
 			v.push_back(std::to_string(e.xtargets));
-			v.push_back(std::to_string(e.ingame));
+			v.push_back(std::to_string(e.firstlogon));
 			v.push_back(std::to_string(e.first_login));
 			v.push_back(std::to_string(e.e_aa_effects));
 			v.push_back(std::to_string(e.e_percent_to_aa));
 			v.push_back(std::to_string(e.e_expended_aa_spent));
@@ -30,7 +30,6 @@ public:
 		uint32_t aug_slot_5;
 		uint32_t aug_slot_6;
 		uint32_t quantity;
 		uint32_t evolve_amount;
 	};
 	static std::string PrimaryKey()
@@ -52,7 +51,6 @@ public:
 			"aug_slot_5",
 			"aug_slot_6",
 			"quantity",
 			"evolve_amount",
 		};
 	}
@@ -70,7 +68,6 @@ public:
 			"aug_slot_5",
 			"aug_slot_6",
 			"quantity",
 			"evolve_amount",
 		};
 	}
@@ -122,7 +119,6 @@ public:
 		e.aug_slot_5 = 0;
 		e.aug_slot_6 = 0;
 		e.quantity   = 0;
 		e.evolve_amount = 0;
 		return e;
 	}
@@ -170,7 +166,6 @@ public:
 			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
 			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
 			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
 			return e;
 		}
@@ -214,7 +209,6 @@ public:
 		v.push_back(columns[8] + " = " + std::to_string(e.aug_slot_5));
 		v.push_back(columns[9] + " = " + std::to_string(e.aug_slot_6));
 		v.push_back(columns[10] + " = " + std::to_string(e.quantity));
 		v.push_back(columns[11] + " = " + std::to_string(e.evolve_amount));
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -247,7 +241,6 @@ public:
 		v.push_back(std::to_string(e.aug_slot_5));
 		v.push_back(std::to_string(e.aug_slot_6));
 		v.push_back(std::to_string(e.quantity));
 		v.push_back(std::to_string(e.evolve_amount));
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -288,7 +281,6 @@ public:
 			v.push_back(std::to_string(e.aug_slot_5));
 			v.push_back(std::to_string(e.aug_slot_6));
 			v.push_back(std::to_string(e.quantity));
 			v.push_back(std::to_string(e.evolve_amount));
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -333,7 +325,6 @@ public:
 			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
 			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
 			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
 			all_entries.push_back(e);
 		}
@@ -369,7 +360,6 @@ public:
 			e.aug_slot_5 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.aug_slot_6 = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
 			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
 			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
 			all_entries.push_back(e);
 		}
@@ -455,7 +445,6 @@ public:
 		v.push_back(std::to_string(e.aug_slot_5));
 		v.push_back(std::to_string(e.aug_slot_6));
 		v.push_back(std::to_string(e.quantity));
 		v.push_back(std::to_string(e.evolve_amount));
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -489,7 +478,6 @@ public:
 			v.push_back(std::to_string(e.aug_slot_5));
 			v.push_back(std::to_string(e.aug_slot_6));
 			v.push_back(std::to_string(e.quantity));
 			v.push_back(std::to_string(e.evolve_amount));
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -30,7 +30,6 @@ public:
 		uint32_t    aug_slot_6;
 		uint32_t    slot_id;
 		uint32_t    quantity;
 		uint32_t    evolve_amount;
 		std::string from_name;
 		std::string note;
 		time_t      sent_date;
@@ -55,7 +54,6 @@ public:
 			"aug_slot_6",
 			"slot_id",
 			"quantity",
 			"evolve_amount",
 			"from_name",
 			"note",
 			"sent_date",
@@ -76,7 +74,6 @@ public:
 			"aug_slot_6",
 			"slot_id",
 			"quantity",
 			"evolve_amount",
 			"from_name",
 			"note",
 			"UNIX_TIMESTAMP(sent_date)",
@@ -131,7 +128,6 @@ public:
 		e.aug_slot_6 = 0;
 		e.slot_id    = 0;
 		e.quantity   = 0;
 		e.evolve_amount = 0;
 		e.from_name  = "";
 		e.note       = "";
 		e.sent_date  = 0;
@@ -182,10 +178,9 @@ public:
 			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
 			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
-			e.from_name     = row[12] ? row[12] : "";
+			e.note       = row[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
 			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
 			return e;
 		}
@@ -229,10 +224,9 @@ public:
 		v.push_back(columns[8] + " = " + std::to_string(e.aug_slot_6));
 		v.push_back(columns[9] + " = " + std::to_string(e.slot_id));
 		v.push_back(columns[10] + " = " + std::to_string(e.quantity));
-		v.push_back(columns[11] + " = " + std::to_string(e.evolve_amount));
+		v.push_back(columns[11] + " = '" + Strings::Escape(e.from_name) + "'");
-		v.push_back(columns[12] + " = '" + Strings::Escape(e.from_name) + "'");
+		v.push_back(columns[12] + " = '" + Strings::Escape(e.note) + "'");
-		v.push_back(columns[13] + " = '" + Strings::Escape(e.note) + "'");
+		v.push_back(columns[13] + " = FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
 		v.push_back(columns[14] + " = FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -265,7 +259,6 @@ public:
 		v.push_back(std::to_string(e.aug_slot_6));
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.quantity));
 		v.push_back(std::to_string(e.evolve_amount));
 		v.push_back("'" + Strings::Escape(e.from_name) + "'");
 		v.push_back("'" + Strings::Escape(e.note) + "'");
 		v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
@@ -309,7 +302,6 @@ public:
 			v.push_back(std::to_string(e.aug_slot_6));
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.quantity));
 			v.push_back(std::to_string(e.evolve_amount));
 			v.push_back("'" + Strings::Escape(e.from_name) + "'");
 			v.push_back("'" + Strings::Escape(e.note) + "'");
 			v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
@@ -357,10 +349,9 @@ public:
 			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
 			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
-			e.from_name     = row[12] ? row[12] : "";
+			e.note       = row[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
 			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
 			all_entries.push_back(e);
 		}
@@ -396,10 +387,9 @@ public:
 			e.aug_slot_6 = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.slot_id    = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
 			e.quantity   = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
-			e.evolve_amount = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
+			e.from_name  = row[11] ? row[11] : "";
-			e.from_name     = row[12] ? row[12] : "";
+			e.note       = row[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);
 			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
 			all_entries.push_back(e);
 		}
@@ -485,7 +475,6 @@ public:
 		v.push_back(std::to_string(e.aug_slot_6));
 		v.push_back(std::to_string(e.slot_id));
 		v.push_back(std::to_string(e.quantity));
 		v.push_back(std::to_string(e.evolve_amount));
 		v.push_back("'" + Strings::Escape(e.from_name) + "'");
 		v.push_back("'" + Strings::Escape(e.note) + "'");
 		v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
@@ -522,7 +511,6 @@ public:
 			v.push_back(std::to_string(e.aug_slot_6));
 			v.push_back(std::to_string(e.slot_id));
 			v.push_back(std::to_string(e.quantity));
 			v.push_back(std::to_string(e.evolve_amount));
 			v.push_back("'" + Strings::Escape(e.from_name) + "'");
 			v.push_back("'" + Strings::Escape(e.note) + "'");
 			v.push_back("FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
@@ -70,7 +70,6 @@ public:
 		int32_t     endurance_regen;
 		int32_t     shielding;
 		int32_t     spell_damage;
 		int32_t     heal_amount;
 		int32_t     spell_shielding;
 		int32_t     strikethrough;
 		int32_t     stun_resist;
@@ -155,7 +154,6 @@ public:
 			"endurance_regen",
 			"shielding",
 			"spell_damage",
 			"heal_amount",
 			"spell_shielding",
 			"strikethrough",
 			"stun_resist",
@@ -236,7 +234,6 @@ public:
 			"endurance_regen",
 			"shielding",
 			"spell_damage",
 			"heal_amount",
 			"spell_shielding",
 			"strikethrough",
 			"stun_resist",
@@ -351,7 +348,6 @@ public:
 		e.endurance_regen          = 0;
 		e.shielding                = 0;
 		e.spell_damage             = 0;
 		e.heal_amount              = 0;
 		e.spell_shielding          = 0;
 		e.strikethrough            = 0;
 		e.stun_resist              = 0;
@@ -462,30 +458,29 @@ public:
 			e.endurance_regen          = row[48] ? static_cast<int32_t>(atoi(row[48])) : 0;
 			e.shielding                = row[49] ? static_cast<int32_t>(atoi(row[49])) : 0;
 			e.spell_damage             = row[50] ? static_cast<int32_t>(atoi(row[50])) : 0;
-			e.heal_amount              = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
-			e.spell_shielding          = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
-			e.strikethrough            = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
-			e.stun_resist              = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
-			e.wind                     = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
-			e.brass                    = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
-			e.percussion               = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
-			e.singing                  = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
-			e.alchemy                  = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
-			e.tailoring                = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
-			e.fletching                = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
-			e.brewing                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
-			e.pottery                  = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
-			e.research                 = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
-			e.fishing                  = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
-			e.tinkering                = row[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
 			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
 			return e;
 		}
@@ -570,30 +565,29 @@ public:
 		v.push_back(columns[48] + " = " + std::to_string(e.endurance_regen));
 		v.push_back(columns[49] + " = " + std::to_string(e.shielding));
 		v.push_back(columns[50] + " = " + std::to_string(e.spell_damage));
-		v.push_back(columns[51] + " = " + std::to_string(e.heal_amount));
+		v.push_back(columns[51] + " = " + std::to_string(e.spell_shielding));
-		v.push_back(columns[52] + " = " + std::to_string(e.spell_shielding));
+		v.push_back(columns[52] + " = " + std::to_string(e.strikethrough));
-		v.push_back(columns[53] + " = " + std::to_string(e.strikethrough));
+		v.push_back(columns[53] + " = " + std::to_string(e.stun_resist));
-		v.push_back(columns[54] + " = " + std::to_string(e.stun_resist));
+		v.push_back(columns[54] + " = " + std::to_string(e.backstab));
-		v.push_back(columns[55] + " = " + std::to_string(e.backstab));
+		v.push_back(columns[55] + " = " + std::to_string(e.wind));
-		v.push_back(columns[56] + " = " + std::to_string(e.wind));
+		v.push_back(columns[56] + " = " + std::to_string(e.brass));
-		v.push_back(columns[57] + " = " + std::to_string(e.brass));
+		v.push_back(columns[57] + " = " + std::to_string(e.string));
-		v.push_back(columns[58] + " = " + std::to_string(e.string));
+		v.push_back(columns[58] + " = " + std::to_string(e.percussion));
-		v.push_back(columns[59] + " = " + std::to_string(e.percussion));
+		v.push_back(columns[59] + " = " + std::to_string(e.singing));
-		v.push_back(columns[60] + " = " + std::to_string(e.singing));
+		v.push_back(columns[60] + " = " + std::to_string(e.baking));
-		v.push_back(columns[61] + " = " + std::to_string(e.baking));
+		v.push_back(columns[61] + " = " + std::to_string(e.alchemy));
-		v.push_back(columns[62] + " = " + std::to_string(e.alchemy));
+		v.push_back(columns[62] + " = " + std::to_string(e.tailoring));
-		v.push_back(columns[63] + " = " + std::to_string(e.tailoring));
+		v.push_back(columns[63] + " = " + std::to_string(e.blacksmithing));
-		v.push_back(columns[64] + " = " + std::to_string(e.blacksmithing));
+		v.push_back(columns[64] + " = " + std::to_string(e.fletching));
-		v.push_back(columns[65] + " = " + std::to_string(e.fletching));
+		v.push_back(columns[65] + " = " + std::to_string(e.brewing));
-		v.push_back(columns[66] + " = " + std::to_string(e.brewing));
+		v.push_back(columns[66] + " = " + std::to_string(e.jewelry));
-		v.push_back(columns[67] + " = " + std::to_string(e.jewelry));
+		v.push_back(columns[67] + " = " + std::to_string(e.pottery));
-		v.push_back(columns[68] + " = " + std::to_string(e.pottery));
+		v.push_back(columns[68] + " = " + std::to_string(e.research));
-		v.push_back(columns[69] + " = " + std::to_string(e.research));
+		v.push_back(columns[69] + " = " + std::to_string(e.alcohol));
-		v.push_back(columns[70] + " = " + std::to_string(e.alcohol));
+		v.push_back(columns[70] + " = " + std::to_string(e.fishing));
-		v.push_back(columns[71] + " = " + std::to_string(e.fishing));
+		v.push_back(columns[71] + " = " + std::to_string(e.tinkering));
-		v.push_back(columns[72] + " = " + std::to_string(e.tinkering));
+		v.push_back(columns[72] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-		v.push_back(columns[73] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
+		v.push_back(columns[73] + " = FROM_UNIXTIME(" + (e.updated_at > 0 ? std::to_string(e.updated_at) : "null") + ")");
 		v.push_back(columns[74] + " = FROM_UNIXTIME(" + (e.updated_at > 0 ? std::to_string(e.updated_at) : "null") + ")");
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -666,7 +660,6 @@ public:
 		v.push_back(std::to_string(e.endurance_regen));
 		v.push_back(std::to_string(e.shielding));
 		v.push_back(std::to_string(e.spell_damage));
 		v.push_back(std::to_string(e.heal_amount));
 		v.push_back(std::to_string(e.spell_shielding));
 		v.push_back(std::to_string(e.strikethrough));
 		v.push_back(std::to_string(e.stun_resist));
@@ -770,7 +763,6 @@ public:
 			v.push_back(std::to_string(e.endurance_regen));
 			v.push_back(std::to_string(e.shielding));
 			v.push_back(std::to_string(e.spell_damage));
 			v.push_back(std::to_string(e.heal_amount));
 			v.push_back(std::to_string(e.spell_shielding));
 			v.push_back(std::to_string(e.strikethrough));
 			v.push_back(std::to_string(e.stun_resist));
@@ -878,30 +870,29 @@ public:
 			e.endurance_regen          = row[48] ? static_cast<int32_t>(atoi(row[48])) : 0;
 			e.shielding                = row[49] ? static_cast<int32_t>(atoi(row[49])) : 0;
 			e.spell_damage             = row[50] ? static_cast<int32_t>(atoi(row[50])) : 0;
-			e.heal_amount              = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
-			e.spell_shielding          = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
-			e.strikethrough            = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
-			e.stun_resist              = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
-			e.wind                     = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
-			e.brass                    = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
-			e.percussion               = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
-			e.singing                  = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
-			e.alchemy                  = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
-			e.tailoring                = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
-			e.fletching                = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
-			e.brewing                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
-			e.pottery                  = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
-			e.research                 = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
-			e.fishing                  = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
-			e.tinkering                = row[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
 			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
 			all_entries.push_back(e);
 		}
@@ -977,30 +968,29 @@ public:
 			e.endurance_regen          = row[48] ? static_cast<int32_t>(atoi(row[48])) : 0;
 			e.shielding                = row[49] ? static_cast<int32_t>(atoi(row[49])) : 0;
 			e.spell_damage             = row[50] ? static_cast<int32_t>(atoi(row[50])) : 0;
-			e.heal_amount              = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
-			e.spell_shielding          = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
-			e.strikethrough            = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
-			e.stun_resist              = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
-			e.wind                     = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
-			e.brass                    = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
-			e.percussion               = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
-			e.singing                  = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
-			e.alchemy                  = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
-			e.tailoring                = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
-			e.fletching                = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
-			e.brewing                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
-			e.pottery                  = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
-			e.research                 = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
-			e.fishing                  = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
-			e.tinkering                = row[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
 			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
 			all_entries.push_back(e);
 		}
@@ -1126,7 +1116,6 @@ public:
 		v.push_back(std::to_string(e.endurance_regen));
 		v.push_back(std::to_string(e.shielding));
 		v.push_back(std::to_string(e.spell_damage));
 		v.push_back(std::to_string(e.heal_amount));
 		v.push_back(std::to_string(e.spell_shielding));
 		v.push_back(std::to_string(e.strikethrough));
 		v.push_back(std::to_string(e.stun_resist));
@@ -1223,7 +1212,6 @@ public:
 			v.push_back(std::to_string(e.endurance_regen));
 			v.push_back(std::to_string(e.shielding));
 			v.push_back(std::to_string(e.spell_damage));
 			v.push_back(std::to_string(e.heal_amount));
 			v.push_back(std::to_string(e.spell_shielding));
 			v.push_back(std::to_string(e.strikethrough));
 			v.push_back(std::to_string(e.stun_resist));
@@ -23,12 +23,10 @@ public:
 		std::string key_;
 		std::string value;
 		uint32_t    expires;
-		uint64_t    account_id;
+		int64_t     account_id;
-		uint64_t    character_id;
+		int64_t     character_id;
-		uint32_t    npc_id;
+		int64_t     npc_id;
-		uint32_t    bot_id;
+		int64_t     bot_id;
 		uint16_t    zone_id;
 		uint16_t    instance_id;
 		// cereal
 		template<class Archive>
@@ -42,9 +40,7 @@ public:
 				CEREAL_NVP(account_id),
 				CEREAL_NVP(character_id),
 				CEREAL_NVP(npc_id),
-				CEREAL_NVP(bot_id),
+				CEREAL_NVP(bot_id)
 				CEREAL_NVP(zone_id),
 				CEREAL_NVP(instance_id)
 			);
 		}
 	};
@@ -65,8 +61,6 @@ public:
 			"character_id",
 			"npc_id",
 			"bot_id",
 			"zone_id",
 			"instance_id",
 		};
 	}
@@ -81,8 +75,6 @@ public:
 			"character_id",
 			"npc_id",
 			"bot_id",
 			"zone_id",
 			"instance_id",
 		};
 	}
@@ -131,8 +123,6 @@ public:
 		e.character_id = 0;
 		e.npc_id       = 0;
 		e.bot_id       = 0;
 		e.zone_id      = 0;
 		e.instance_id  = 0;
 		return e;
 	}
@@ -173,12 +163,10 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.account_id   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
+			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.character_id = row[5] ? strtoull(row[5], nullptr, 10) : 0;
+			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.npc_id       = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-			e.bot_id       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
 			e.zone_id      = row[8] ? static_cast<uint16_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.instance_id  = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
 			return e;
 		}
@@ -219,8 +207,6 @@ public:
 		v.push_back(columns[5] + " = " + std::to_string(e.character_id));
 		v.push_back(columns[6] + " = " + std::to_string(e.npc_id));
 		v.push_back(columns[7] + " = " + std::to_string(e.bot_id));
 		v.push_back(columns[8] + " = " + std::to_string(e.zone_id));
 		v.push_back(columns[9] + " = " + std::to_string(e.instance_id));
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -250,8 +236,6 @@ public:
 		v.push_back(std::to_string(e.character_id));
 		v.push_back(std::to_string(e.npc_id));
 		v.push_back(std::to_string(e.bot_id));
 		v.push_back(std::to_string(e.zone_id));
 		v.push_back(std::to_string(e.instance_id));
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -289,8 +273,6 @@ public:
 			v.push_back(std::to_string(e.character_id));
 			v.push_back(std::to_string(e.npc_id));
 			v.push_back(std::to_string(e.bot_id));
 			v.push_back(std::to_string(e.zone_id));
 			v.push_back(std::to_string(e.instance_id));
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -328,12 +310,10 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.account_id   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
+			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.character_id = row[5] ? strtoull(row[5], nullptr, 10) : 0;
+			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.npc_id       = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-			e.bot_id       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
 			e.zone_id      = row[8] ? static_cast<uint16_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.instance_id  = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
 			all_entries.push_back(e);
 		}
@@ -362,12 +342,10 @@ public:
 			e.key_         = row[1] ? row[1] : "";
 			e.value        = row[2] ? row[2] : "";
 			e.expires      = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.account_id   = row[4] ? strtoull(row[4], nullptr, 10) : 0;
+			e.account_id   = row[4] ? strtoll(row[4], nullptr, 10) : 0;
-			e.character_id = row[5] ? strtoull(row[5], nullptr, 10) : 0;
+			e.character_id = row[5] ? strtoll(row[5], nullptr, 10) : 0;
-			e.npc_id       = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.npc_id       = row[6] ? strtoll(row[6], nullptr, 10) : 0;
-			e.bot_id       = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			e.bot_id       = row[7] ? strtoll(row[7], nullptr, 10) : 0;
 			e.zone_id      = row[8] ? static_cast<uint16_t>(strtoul(row[8], nullptr, 10)) : 0;
 			e.instance_id  = row[9] ? static_cast<uint16_t>(strtoul(row[9], nullptr, 10)) : 0;
 			all_entries.push_back(e);
 		}
@@ -450,8 +428,6 @@ public:
 		v.push_back(std::to_string(e.character_id));
 		v.push_back(std::to_string(e.npc_id));
 		v.push_back(std::to_string(e.bot_id));
 		v.push_back(std::to_string(e.zone_id));
 		v.push_back(std::to_string(e.instance_id));
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -482,8 +458,6 @@ public:
 			v.push_back(std::to_string(e.character_id));
 			v.push_back(std::to_string(e.npc_id));
 			v.push_back(std::to_string(e.bot_id));
 			v.push_back(std::to_string(e.zone_id));
 			v.push_back(std::to_string(e.instance_id));
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
--- a/Show More
+++ b/Show More