[Bug Fix] Fix Scripted Spawns from spawning before Variables are loaded.

2026-05-24 01:42:29 +00:00 · 2025-03-22 12:57:22 -04:00
374 changed files with 13483 additions and 20422 deletions
@@ -1,471 +1,3 @@
-## [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
@@ -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>
-
-<p align="center">
- <img src="https://github.com/user-attachments/assets/11942e15-b512-402d-a619-0543c7f1151e" style="border-radius: 10px">
-</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>
+# EQEmulator Core Server
+| Drone (Linux x64) | Drone (Windows x64)   |
+|:---:|:---:|
+|[![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 align="center">
-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.
-</p>
+**EQEmulator is a custom completely from-scratch open source server implementation for EverQuest built mostly on C++**
+ * MySQL/MariaDB is used as the database engine (over 200+ tables)
+ * 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">
-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.
-</p>
+## Server Installs
+| |Windows|Linux|
+|:---:|:---:|:---:|
+|**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">
-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>
+* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-windows/)

-<p align="center">
-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>
+### > Debian/Ubuntu/CentOS/Fedora

-***
+* [Install Guide](https://docs.eqemu.io/server/installation/server-installation-linux/)

-<h3 align="center">
- Technical Overview & Reverse Engineering Effort
-</h1>
+* You can use curl or wget to kick off the installer (whichever your OS has)
+> curl -O https://raw.githubusercontent.com/EQEmu/Server/master/utils/scripts/linux_installer/install.sh install.sh && chmod 755 install.sh && ./install.sh

-<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">
- 💡 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>
+## Supported Clients

 |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                                                                                              |
-|---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
-| **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)                |
+## Contributions <img src="http://image.flaticon.com/icons/png/512/25/25231.png" width="20">

-## 🛠️ 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                                                                      |
-|--------------------|----------------------------------------------------------------------------------|
-| [ProjectEQ Quests](https://github.com/ProjectEQ/projecteqquests)  | Official quests and event scripts for ProjectEQ                       |
-| [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      |
+## Resources
+- [EQEmulator Forums](http://www.eqemulator.org/forums)
+- [EQEmulator Wiki](https://docs.eqemu.io/)

+## 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)
-		->SetLogPath(PathManager::Instance()->GetLogPath())
+	LogSys.SetDatabase(&database)
+		->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)
-		->SetLogPath(PathManager::Instance()->GetLogPath())
+	LogSys.SetDatabase(&database)
+		->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,7 +17,6 @@ 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
@@ -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
@@ -603,6 +602,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
@@ -670,20 +670,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 +740,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 +751,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 +762,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 +836,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)
-    TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/std-pch.h)
+IF (WIN32 AND EQEMU_BUILD_PCH)
+    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,
-		search.max_results
+		where_criteria_items
 	);

 	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,
-				log->origination_info.zone_long_name,
-				log->origination_info.instance_id
+				LogSys.origination_info.zone_short_name,
+				LogSys.origination_info.zone_long_name,
+				LogSys.origination_info.instance_id
 			);
 		}

@@ -296,7 +294,7 @@ void print_trace()
 		SendCrashReport(crash_report);
 	}

-	EQEmuLogSys::Instance()->CloseFileLogs();
+	LogSys.CloseFileLogs();

 	exit(1);
 }
@@ -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);
@@ -1109,13 +1095,13 @@ 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.lfg    = is_lfg ? 1 : 0;
-	e.lfp    = is_lfp ? 1 : 0;
+	e.firstlogon = first_logon;
+	e.lfg        = is_lfg ? 1 : 0;
+	e.lfp        = is_lfp ? 1 : 0;

 	CharacterDataRepository::UpdateOne(*this, e);
 }
@@ -1129,11 +1115,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 +1920,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 +1951,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 +1969,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 +2036,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();
-	if (!r.Success()) {
-		LogError("Transaction failed [{}] rolling back", r.ErrorMessage());
-		return false;
-	}
+	TransactionCommit();

 	LogInfo(
 		"Character [{}] copied to [{}] total rows [{}]",
@@ -2244,7 +2212,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();
@@ -141,7 +141,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 +262,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()) {
@@ -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
-	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;
+	return server_up_to_date && bots_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();

 };

@@ -6792,7 +6792,7 @@ UPDATE `character_corpse_items` SET `equip_slot` = ((`equip_slot` - 341) + 5810)
 	},
 	ManifestEntry{
 		.version     = 9304,
-		.description = "2024_12_01_update_guild_bank",
+		.description = "2024_12_01_2024_update_guild_bank",
 		.check       = "SHOW COLUMNS FROM `guild_bank` LIKE 'augment_one_id'",
 		.condition   = "empty",
 		.match       = "",
@@ -6914,7 +6914,7 @@ CREATE TABLE `zone_state_spawns` (
 	},
 	ManifestEntry{
 		.version = 9308,
-		.description = "2025_03_29_add_multivalue_support_to_evolving_subtype.sql",
+		.description = "2025_add_multivalue_support_to_evolving_subtype.sql",
 		.check = "SHOW COLUMNS FROM `items_evolving_details` LIKE 'sub_type'",
 		.condition = "missing",
 		.match = "varchar(200)",
@@ -6942,8 +6942,8 @@ CREATE TABLE `character_pet_name` (
 		.version = 9310,
 		.description = "2025_03_7_expand_horse_def.sql",
 		.check = "SHOW COLUMNS FROM `horses` LIKE 'helmtexture'",
-		.condition = "empty",
-		.match = "",
+		.condition = "missing",
+		.match = "TINYINT(2)",
 		.sql = R"(
 ALTER TABLE `horses`
 	ADD COLUMN `helmtexture` TINYINT(2) NOT NULL DEFAULT -1 AFTER `texture`;
@@ -6986,6 +6986,7 @@ ALTER TABLE data_buckets ADD INDEX idx_bot_expires (bot_id, expires);
 		.match = "idx_zone_instance",
 		.sql = R"(
 ALTER TABLE zone_state_spawns ADD INDEX idx_zone_instance (zone_id, instance_id);
+ALTER TABLE zone_state_spawns ADD INDEX idx_instance_id (instance_id);
 )",
 	.content_schema_update = false
 	},
@@ -6997,192 +6998,6 @@ ALTER TABLE zone_state_spawns ADD INDEX idx_zone_instance (zone_id, instance_id)
 		.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
 	},
@@ -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
-// };
@@ -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);
-	InstanceListRepository::ReplaceOne(*this, e);
-	return instance_id > 0 && e.id;
+	return InstanceListRepository::InsertOne(*this, 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;
@@ -561,12 +537,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(
-			"expire_at <= (UNIX_TIMESTAMP() - {}) and expire_at != 0 AND never_expires = 0",
-			RuleI(Instances, ExpireOffsetTimeSeconds)
-		)
+		"(start_time + duration) <= (UNIX_TIMESTAMP() - 86400) AND never_expires = 0"
 	);
 	if (l.empty()) {
 		return;
@@ -577,24 +555,20 @@ 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 ({})", ids));
-	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id IN ({})", ids));
-	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
-	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
-	CharacterCorpsesRepository::BuryInstances(*this, ids);
-	DynamicZoneMembersRepository::DeleteByManyInstances(*this, ids);
-	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
-	Spawn2DisabledRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", ids));
-	DataBucketsRepository::DeleteWhere(*this, fmt::format("instance_id != 0 and instance_id IN ({})", ids));
+	InstanceListRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
+	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id IN ({})", imploded_instance_ids));
+	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	SpawnConditionValuesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	CharacterCorpsesRepository::BuryInstances(*this, imploded_instance_ids);
+	DynamicZoneMembersRepository::DeleteByManyInstances(*this, imploded_instance_ids);
+	DynamicZonesRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	Spawn2DisabledRepository::DeleteWhere(*this, fmt::format("instance_id IN ({})", imploded_instance_ids));
+	DataBucketsRepository::DeleteWhere(*this, fmt::format("instance_id != 0 and instance_id IN ({})", imploded_instance_ids));
 	if (RuleB(Zone, StateSavingOnShutdown)) {
-		ZoneStateSpawnsRepository::DeleteWhere(*this, fmt::format("`instance_id` IN ({})", ids));
+		ZoneStateSpawnsRepository::DeleteWhere(*this, fmt::format("`instance_id` IN ({})", imploded_instance_ids));
 	}
-	TransactionCommit();
-
-	LogInfo("Purged [{}] expired instances", l.size());
 }

 void Database::SetInstanceDuration(uint16 instance_id, uint32 new_duration)
@@ -606,7 +580,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"},
@@ -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()
@@ -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{};
@@ -58,16 +58,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);
-	if (!instance)
+	auto instance = InstanceListRepository::InsertOne(GetDatabase(), insert_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;
 }
@@ -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();
-}
@@ -792,131 +792,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*/
@@ -988,8 +988,7 @@ enum StartZoneIndex {
    Felwithe,
    Akanon,
    Cabilis,
-    SharVahl,
-    RatheMtn
+    SharVahl
 };

 enum FVNoDropFlagRule
@@ -324,8 +324,6 @@ union
 	bool guild_show;
 	bool trader;
 	bool buyer;
-	bool untargetable;
-	uint32 npc_tint_id;
 };

 struct PlayerState_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())) {
-		LogInfo("Logs directory not found, creating [{}]", PathManager::Instance()->GetLogPath());
-		File::Makedir(PathManager::Instance()->GetLogPath());
+	if (!File::Exists(path.GetLogPath())) {
+		LogInfo("Logs directory not found, creating [{}]", path.GetLogPath());
+		File::Makedir(path.GetLogPath());
 	}

 	/**
@@ -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();
-			e.log_category_id          = i;
-			e.log_category_description = Strings::Escape(Logs::LogCategoryName[i]);
-			e.log_to_console           = log_settings[i].log_to_console;
-			e.log_to_gmsay             = log_settings[i].log_to_gmsay;
-			e.log_to_file              = log_settings[i].log_to_file;
-			e.log_to_discord           = log_settings[i].log_to_discord;
-			db_categories_to_add.emplace_back(e);
-		}
-
-		// 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);
-			}
+			auto new_category = LogsysCategoriesRepository::NewEntity();
+			new_category.log_category_id          = i;
+			new_category.log_category_description = Strings::Escape(Logs::LogCategoryName[i]);
+			new_category.log_to_console           = log_settings[i].log_to_console;
+			new_category.log_to_gmsay             = log_settings[i].log_to_gmsay;
+			new_category.log_to_file              = log_settings[i].log_to_file;
+			new_category.log_to_discord           = log_settings[i].log_to_discord;
+			db_categories_to_add.emplace_back(new_category);
 		}
 	}

@@ -74,7 +74,7 @@ namespace Logs {
 		Spawns,
 		Spells,
 		Status, // deprecated
-		TCPConnection, // deprecated
+		TCPConnection,
 		Tasks,
 		Tradeskills,
 		Trading,
@@ -150,8 +150,6 @@ namespace Logs {
 		BotSpellTypeChecks,
 		NpcHandin,
 		ZoneState,
-		NetClient,
-		NetTCP,
 		MaxCategoryID /* Don't Remove this */
 	};

@@ -185,7 +183,7 @@ namespace Logs {
 		"Spawns",
 		"Spells",
 		"Status (Deprecated)",
-		"TCP Connection (Deprecated)",
+		"TCP Connection",
 		"Tasks",
 		"Tradeskills",
 		"Trading",
@@ -194,8 +192,8 @@ namespace Logs {
 		"Web Interface (Deprecated)",
 		"World Server (Deprecated)",
 		"Zone Server (Deprecated)",
-		"MySQL Error",
-		"MySQL Query",
+		"QueryErr",
+		"Query",
 		"Mercenaries",
 		"Quest Debug",
 		"Legacy Packet Logging (Deprecated)",
@@ -211,15 +209,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 Yell For Help",
+		"AI Scan",
+		"AI Yell",
 		"AI CastBeneficial",
 		"AOE Cast",
 		"Entity Management",
@@ -237,7 +235,7 @@ namespace Logs {
 		"DialogueWindow",
 		"HTTP",
 		"Saylink",
-		"Checksum Verification",
+		"ChecksumVer",
 		"CombatRecord",
 		"Hate",
 		"Discord",
@@ -260,12 +258,12 @@ namespace Logs {
 		"Bot Spell Checks",
 		"Bot Spell Type Checks",
 		"NpcHandin",
-		"ZoneState",
-		"Net Server <-> Client",
-		"Net TCP"
+		"ZoneState"
 	};
 }

+#include "eqemu_logsys_log_aliases.h"
+
 class Database;

 constexpr uint16 MAX_DISCORD_WEBHOOK_ID = 300;
@@ -283,12 +281,6 @@ public:
 	EQEmuLogSys *LoadLogSettingsDefaults();
 	EQEmuLogSys *LoadLogDatabaseSettings(bool silent_load = false);

-	static EQEmuLogSys *Instance()
-	{
-		static EQEmuLogSys instance;
-		return &instance;
-	}
-
 	/**
 	 * @param directory_name
 	 */
@@ -354,7 +346,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 +430,7 @@ private:
 	void InjectTablesIfNotExist();
 };

-#include "eqemu_logsys_log_aliases.h"
+extern EQEmuLogSys LogSys;

 /**
 template<typename... Args>
@@ -460,7 +452,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();

@@ -81,7 +81,7 @@ void PlayerEventLogs::Init()
 	if (!settings_to_insert.empty()) {
 		PlayerEventLogSettingsRepository::ReplaceMany(*m_database, settings_to_insert);
 	}
-
+	
 	bool processing_in_world = !RuleB(Logging, PlayerEventsQSProcess) && IsWorld();
 	bool processing_in_qs    = RuleB(Logging, PlayerEventsQSProcess) && IsQueryServ();

@@ -181,26 +181,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) {}
+		std::stringstream        ss(data);
+		cereal::JSONInputArchive ar(ss);
+		out.serialize(ar);
 	};

 	// Helper to assign ETL table ID
-
-	auto AssignEtlId = [&](
-		PlayerEventLogsRepository::PlayerEventLogs& r,
-		PlayerEvent::EventType                      type
-	)
-	{
+	auto                                                                                                          AssignEtlId      = [&](
+		PlayerEventLogsRepository::PlayerEventLogs &r,
+		PlayerEvent::EventType type
+	) {
 		if (m_etl_settings.contains(type)) {
 			r.etl_table_id = m_etl_settings.at(type).next_id++;
 		}
@@ -408,6 +398,7 @@ 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);
@@ -509,7 +500,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 +520,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()) {
-		return EQEmuLogSys::Instance()->GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url;
+	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
+		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 +908,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,11 +73,9 @@ public:
 		return BuildPlayerEventPacket(c);
 	}

-	[[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);
+	[[nodiscard]] const PlayerEventLogSettingsRepository::PlayerEventLogSettings *GetSettings() const;
+	bool IsEventDiscordEnabled(int32_t event_type_id);
+	std::string GetDiscordWebhookUrlFromEventType(int32_t event_type_id);

 	static std::string GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e);

@@ -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(),
-			EvolvingItemsManager::Instance()->GetEvolvingItemsCache().end()
+			evolving_items_manager.GetEvolvingItemsCache(),
+			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);
-		if (inst.GetEvolveCurrentAmount() > 0) {
-			e.current_amount = inst.GetEvolveCurrentAmount();
-			inst.CalculateEvolveProgression();
-		}
+		e.final_item_id = evolving_items_manager.GetFinalItemID(inst);

 		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(),
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cend(),
+		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
+		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(),
-		EvolvingItemsManager::Instance()->GetEvolvingItemsCache().cend(),
+		evolving_items_manager.GetEvolvingItemsCache().cbegin(),
+		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_to   = EvolvingItemsManager::Instance()->GetEvolveItemDetails(inst_to.GetID());
+	auto evolving_details_inst_from = evolving_items_manager.GetEvolveItemDetails(inst_from.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;
-		auto results = EvolvingItemsManager::Instance()->GetNextItemByXP(inst_to, xp);
+		xp           = evolving_items_manager.GetTotalEarnedXP(inst_from) * compatibility / 100;
+		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
@@ -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 Race::Ogre:
-		case Race::Troll:
-			if (r2 == Race::Ogre || r2 == Race::Troll || r2 == Race::DarkElf) {
+		case DARK_ELF:
+		case OGRE:
+		case TROLL:
+			if (r2 == OGRE || r2 == TROLL || r2 == DARK_ELF) {
 				return true;
 			}
 			break;
-		case Race::Human:
-		case Race::Barbarian:
-		case Race::HalfElf:
-		case Race::Gnome:
-		case Race::Halfling:
-		case Race::WoodElf:
-			if (r2 == Race::Human ||
-			    r2 == Race::Barbarian ||
-			    r2 == Race::Erudite ||
-			    r2 == Race::HalfElf ||
-			    r2 == Race::Gnome ||
-			    r2 == Race::Halfling ||
-			    r2 == Race::Dwarf ||
-			    r2 == Race::HighElf ||
-			    r2 == Race::WoodElf) {
+		case HUMAN:
+		case BARBARIAN:
+		case HALF_ELF:
+		case GNOME:
+		case HALFLING:
+		case WOOD_ELF:
+			if (r2 == HUMAN ||
+			    r2 == BARBARIAN ||
+			    r2 == ERUDITE ||
+			    r2 == HALF_ELF ||
+			    r2 == GNOME ||
+			    r2 == HALFLING ||
+			    r2 == DWARF ||
+			    r2 == HIGH_ELF ||
+			    r2 == WOOD_ELF) {
 				return true;
 			}
 			break;
-		case Race::Erudite:
-			if (r2 == Race::Human || r2 == Race::HalfElf) {
+		case ERUDITE:
+			if (r2 == HUMAN || r2 == HALF_ELF) {
 				return true;
 			}
 			break;
-		case Race::Dwarf:
-			if (r2 == Race::Halfling || r2 == Race::Gnome) {
+		case DWARF:
+			if (r2 == HALFLING || r2 == GNOME) {
 				return true;
 			}
 			break;
-		case Race::HighElf:
-			if (r2 == Race::WoodElf) {
+		case HIGH_ELF:
+			if (r2 == WOOD_ELF) {
 				return true;
 			}
 			break;
-		case Race::VahShir:
+		case VAHSHIR:
 			return true;
-		case Race::Iksar:
+		case IKSAR:
 			return false;
 	}
 	return false;
@@ -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,32 +906,24 @@ 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 (RuleI(World, FVNoDropFlag) == FVNoDropFlagRule::Enabled && m_item->FVNoDrop == 0) {
-		return true;
-	}
-
-	if (m_item->NoDrop == 0) {
+	/*if (m_item->FVNoDrop != 0) // not implemented
+		return false;*/
+	if (m_item->NoDrop == 0)
 		return false;
-	}

 	if (recurse) {
-		for (auto iter: m_contents) {
-			if (!iter.second) {
+		for (auto iter : m_contents) {
+			if (!iter.second)
 				continue;
-			}

-			if (!iter.second->IsDroppable(recurse)) {
+			if (!iter.second->IsDroppable(recurse))
 				return false;
-			}
 		}
 	}

@@ -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:
 		//////////////////////////
@@ -2,8 +2,7 @@

 #include "../random.h"
 #include "packet.h"
-#include "reliable_stream_structs.h"
-#include "reliable_stream_pooling.h"
+#include "daybreak_structs.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 ReliableStreamConnection;
-		class ReliableStreamConnection
+		class DaybreakConnectionManager;
+		class DaybreakConnection;
+		class DaybreakConnection
 		{
 		public:
-			ReliableStreamConnection(ReliableStreamConnectionManager *owner, const ReliableStreamConnect &connect, const std::string &endpoint, int port);
-			ReliableStreamConnection(ReliableStreamConnectionManager *owner, const std::string &endpoint, int port);
-			~ReliableStreamConnection();
+			DaybreakConnection(DaybreakConnectionManager *owner, const DaybreakConnect &connect, const std::string &endpoint, int port);
+			DaybreakConnection(DaybreakConnectionManager *owner, const std::string &endpoint, int port);
+			~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 ReliableStreamConnectionManager* GetManager() const { return m_owner; }
-			ReliableStreamConnectionManager* GetManager() { return m_owner; }
+			const DaybreakEncodeType* GetEncodePasses() const { return m_encode_passes; }
+			const DaybreakConnectionManager* GetManager() const { 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];
-			std::weak_ptr<ReliableStreamConnection> m_self;
+			DaybreakStream m_streams[4];
+			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[1] = ReliableStreamEncodeType::EncodeNone;
+				encode_passes[0] = DaybreakEncodeType::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();
-			ReliableStreamConnectionManager(const ReliableStreamConnectionManagerOptions &opts);
-			~ReliableStreamConnectionManager();
+			DaybreakConnectionManager();
+			DaybreakConnectionManager(const DaybreakConnectionManagerOptions &opts);
+			~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 OnConnectionStateChange(std::function<void(std::shared_ptr<ReliableStreamConnection>, 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 OnNewConnection(std::function<void(std::shared_ptr<DaybreakConnection>)> func) { m_on_new_connection = 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<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;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>)> m_on_new_connection;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
-			std::function<void(std::shared_ptr<ReliableStreamConnection>, const Packet&)> m_on_packet_recv;
+			DaybreakConnectionManagerOptions m_options;
+			std::function<void(std::shared_ptr<DaybreakConnection>)> m_on_new_connection;
+			std::function<void(std::shared_ptr<DaybreakConnection>, DbProtocolStatus, DbProtocolStatus)> m_on_connection_state_change;
+			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(); }
-			ReliableStreamReliableHeader reliable;
+			static size_t size() { return 4 + DaybreakReliableHeader::size(); }
+			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_reliable_stream.OnConnectionStateChange(std::bind(&EQStreamManager::ReliableStreamConnectionStateChange, 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.OnNewConnection(std::bind(&EQStreamManager::DaybreakNewConnection, this, std::placeholders::_1));
+	m_daybreak.OnConnectionStateChange(std::bind(&EQStreamManager::DaybreakConnectionStateChange, this, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3));
+	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();
-	opts = options.reliable_stream_options;
+	auto &opts = m_daybreak.GetOptions();
+	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 ReliableStreamConnectionStateChange(std::shared_ptr<ReliableStreamConnection> connection, DbProtocolStatus from, DbProtocolStatus to);
-			void ReliableStreamPacketRecv(std::shared_ptr<ReliableStreamConnection> connection, const Packet &p);
+			void DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection);
+			void DaybreakConnectionStateChange(std::shared_ptr<DaybreakConnection> connection, DbProtocolStatus from, DbProtocolStatus to);
+			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();
 		});

@@ -131,7 +131,7 @@ void EQ::Net::ServertalkLegacyClient::ProcessReadBuffer()
 		}
 		else {
 			EQ::Net::StaticPacket p(&m_buffer[current + 4], length);
-
+			
 			auto cb = m_message_callbacks.find(opcode);
 			if (cb != m_message_callbacks.end()) {
 				cb->second(opcode, p);
@@ -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()
-{
-	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;
-			}
+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) {
+		buf->base = new char[suggested_size];
+		buf->len = suggested_size;
+	}, [](uv_stream_t* stream, ssize_t nread, const uv_buf_t* buf) {

-			static thread_local char temp_buf[65536];
-			buf->base = temp_buf;
-			buf->len  = 65536;
-		}, [](uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf) {
-			auto *connection = (TCPConnection *) stream->data;
+		TCPConnection *connection = (TCPConnection*)stream->data;

-			if (nread > 0) {
-				connection->Read(buf->base, nread);
-			}
-			else if (nread == UV_EOF) {
-				connection->Disconnect();
-			}
-			else if (nread < 0) {
-				connection->Disconnect();
-			}
+		if (nread > 0) {
+			connection->Read(buf->base, nread);

-			if (buf->len > 65536) {
-				delete [] buf->base;
+			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->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) {
-	if (!m_socket || !data || count == 0) {
-		std::cerr << "TCPConnection::Write - Invalid socket or data\n";
+void EQ::Net::TCPConnection::Write(const char *data, size_t count)
+{
+	if (!m_socket) {
 		return;
 	}

-	if (count <= TCP_BUFFER_SIZE) {
-		// Fast path: use pooled request with embedded buffer
-		auto req_opt = tcp_write_pool.acquire();
-		if (!req_opt) {
-			std::cerr << "TCPConnection::Write - Out of write requests\n";
-			return;
+	struct WriteBaton
+	{
+		TCPConnection *connection;
+		char *buffer;
+	};
+
+	WriteBaton *baton = new WriteBaton;
+	baton->connection = this;
+	baton->buffer = new char[count];
+
+	uv_write_t *write_req = new uv_write_t;
+	memset(write_req, 0, sizeof(uv_write_t));
+	write_req->data = baton;
+	uv_buf_t send_buffers[1];
+
+	memcpy(baton->buffer, data, count);
+	send_buffers[0] = uv_buf_init(baton->buffer, count);
+
+	uv_write(write_req, (uv_stream_t*)m_socket, send_buffers, 1, [](uv_write_t* req, int status) {
+		WriteBaton *baton = (WriteBaton*)req->data;
+		delete[] baton->buffer;
+		delete req;
+
+		if (status < 0) {
+			baton->connection->Disconnect();
 		}

-		TCPWriteReq* write_req = *req_opt;
-
-		// Fill buffer and set context
-		memcpy(write_req->buffer.data(), data, count);
-		write_req->connection = this;
-		write_req->magic = 0xC0FFEE;
-
-		uv_buf_t buf = uv_buf_init(write_req->buffer.data(), static_cast<unsigned int>(count));
-
-		int result = uv_write(
-			&write_req->req,
-			reinterpret_cast<uv_stream_t*>(m_socket),
-			&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;
-				}
-			}
-		);
-
-		if (result < 0) {
-			std::cerr << "uv_write() (large) failed immediately: " << uv_strerror(result) << std::endl;
-			delete[] heap_buffer;
-			delete write_req;
-		}
-	}
+		delete baton;
+	});
 }

-
 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>
@@ -17,7 +16,7 @@ namespace EQ
 			~TCPConnection();

 			static void Connect(const std::string &addr, int port, bool ipv6, std::function<void(std::shared_ptr<TCPConnection>)> cb);
-
+			
 			void Start();
 			void OnRead(std::function<void(TCPConnection*, const unsigned char *, size_t)> cb);
 			void OnDisconnect(std::function<void(TCPConnection*)> cb);
@@ -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;
@@ -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;
@@ -4688,7 +4688,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;

@@ -4839,13 +4839,13 @@ namespace RoF2

 			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, emu->petOwnerId);

-			VARSTRUCT_ENCODE_TYPE(uint8, Buffer, 0);                 // FindBits MQ2 name
+			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);                // PrimaryTintIndex
-			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0);                // SecondaryTintIndex
-			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff);       // These do something with OP_WeaponEquip1
-			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff);       // ^
+			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
+			VARSTRUCT_ENCODE_TYPE(uint32, Buffer, 0xffffffff); // ^

 			if ((emu->NPC == 0) || (emu->race <= Race::Gnome) || (emu->race == Race::Iksar) ||
 					(emu->race == Race::VahShir) || (emu->race == Race::Froglok2) || (emu->race == Race::Drakkin)
@@ -6481,7 +6481,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 +6500,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;
@@ -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) {
-			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));;
+		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+			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) {
-			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));;
+		else if (server_slot <= EQ::invbag::GENERAL_BAGS_8_END && server_slot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+			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) {
-			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));
+		else if (server_slot <= EQ::invbag::BANK_BAGS_16_END && server_slot >= EQ::invbag::BANK_BAGS_BEGIN) {
+			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) {
-			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;
+		else if (serverSlot <= EQ::invbag::GENERAL_BAGS_8_END && serverSlot >= EQ::invbag::GENERAL_BAGS_BEGIN) {
+			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}
 	};

@@ -93,17 +83,6 @@ void PathManager::Init()
 			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();
-
-	static PathManager *Instance()
-	{
-		static PathManager instance;
-		return &instance;
-	}
+	void LoadPaths();

 	[[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_maps_path;
-	std::string              m_patch_path;
-	std::string              m_opcode_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;
+	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::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 {
-	constexpr uint8 Male   = 0;
-	constexpr uint8 Female = 1;
-	constexpr uint8 Neuter = 2;
+// player race-/gender-based model feature validators
+namespace PlayerAppearance
+{
+	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 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;
+	constexpr uint16 ALL_RACES_BITMASK = 65535;
 }

 #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;
-		uint32_t    first_login;
+		int8_t      firstlogon;
 		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",
-			"first_login",
+			"firstlogon",
 			"e_aa_effects",
 			"e_percent_to_aa",
 			"e_expended_aa_spent",
@@ -343,8 +341,7 @@ public:
 			"lfg",
 			"mailkey",
 			"xtargets",
-			"ingame",
-			"first_login",
+			"firstlogon",
 			"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.first_login             = 0;
+		e.firstlogon              = 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.first_login             = 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[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[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[103] ? static_cast<uint32_t>(strtoul(row[103], nullptr, 10)) : 0;
-			e.deleted_at              = strtoll(row[104] ? row[104] : "-1", nullptr, 10);
-			e.illusion_block          = row[105] ? static_cast<uint8_t>(strtoul(row[105], nullptr, 10)) : 0;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
+			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], 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[97] + " = " + std::to_string(e.first_login));
-		v.push_back(columns[98] + " = " + std::to_string(e.e_aa_effects));
-		v.push_back(columns[99] + " = " + std::to_string(e.e_percent_to_aa));
-		v.push_back(columns[100] + " = " + std::to_string(e.e_expended_aa_spent));
-		v.push_back(columns[101] + " = " + std::to_string(e.aa_points_spent_old));
-		v.push_back(columns[102] + " = " + std::to_string(e.aa_points_old));
-		v.push_back(columns[103] + " = " + std::to_string(e.e_last_invsnapshot));
-		v.push_back(columns[104] + " = FROM_UNIXTIME(" + (e.deleted_at > 0 ? std::to_string(e.deleted_at) : "null") + ")");
-		v.push_back(columns[105] + " = " + std::to_string(e.illusion_block));
+		v.push_back(columns[96] + " = " + std::to_string(e.firstlogon));
+		v.push_back(columns[97] + " = " + 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_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_old));
+		v.push_back(columns[102] + " = " + 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] + " = " + 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.first_login));
+		v.push_back(std::to_string(e.firstlogon));
 		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.first_login));
+			v.push_back(std::to_string(e.firstlogon));
 			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.first_login             = 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[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[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[103] ? static_cast<uint32_t>(strtoul(row[103], nullptr, 10)) : 0;
-			e.deleted_at              = strtoll(row[104] ? row[104] : "-1", nullptr, 10);
-			e.illusion_block          = row[105] ? static_cast<uint8_t>(strtoul(row[105], nullptr, 10)) : 0;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
+			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], 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.first_login             = 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[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[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[103] ? static_cast<uint32_t>(strtoul(row[103], nullptr, 10)) : 0;
-			e.deleted_at              = strtoll(row[104] ? row[104] : "-1", nullptr, 10);
-			e.illusion_block          = row[105] ? static_cast<uint8_t>(strtoul(row[105], nullptr, 10)) : 0;
+			e.firstlogon              = row[96] ? static_cast<int8_t>(atoi(row[96])) : 0;
+			e.e_aa_effects            = row[97] ? static_cast<uint32_t>(strtoul(row[97], nullptr, 10)) : 0;
+			e.e_percent_to_aa         = row[98] ? static_cast<uint32_t>(strtoul(row[98], nullptr, 10)) : 0;
+			e.e_expended_aa_spent     = row[99] ? static_cast<uint32_t>(strtoul(row[99], nullptr, 10)) : 0;
+			e.aa_points_spent_old     = row[100] ? static_cast<uint32_t>(strtoul(row[100], nullptr, 10)) : 0;
+			e.aa_points_old           = row[101] ? static_cast<uint32_t>(strtoul(row[101], nullptr, 10)) : 0;
+			e.e_last_invsnapshot      = row[102] ? static_cast<uint32_t>(strtoul(row[102], nullptr, 10)) : 0;
+			e.deleted_at              = strtoll(row[103] ? row[103] : "-1", nullptr, 10);
+			e.illusion_block          = row[104] ? static_cast<uint8_t>(strtoul(row[104], 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.first_login));
+		v.push_back(std::to_string(e.firstlogon));
 		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.first_login));
+			v.push_back(std::to_string(e.firstlogon));
 			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",
 		};
 	}

@@ -111,18 +108,17 @@ public:
 	{
 		CharacterParcelsContainers e{};

-		e.id            = 0;
-		e.parcels_id    = 0;
-		e.slot_id       = 0;
-		e.item_id       = 0;
-		e.aug_slot_1    = 0;
-		e.aug_slot_2    = 0;
-		e.aug_slot_3    = 0;
-		e.aug_slot_4    = 0;
-		e.aug_slot_5    = 0;
-		e.aug_slot_6    = 0;
-		e.quantity      = 0;
-		e.evolve_amount = 0;
+		e.id         = 0;
+		e.parcels_id = 0;
+		e.slot_id    = 0;
+		e.item_id    = 0;
+		e.aug_slot_1 = 0;
+		e.aug_slot_2 = 0;
+		e.aug_slot_3 = 0;
+		e.aug_slot_4 = 0;
+		e.aug_slot_5 = 0;
+		e.aug_slot_6 = 0;
+		e.quantity   = 0;

 		return e;
 	}
@@ -159,18 +155,17 @@ public:
 		if (results.RowCount() == 1) {
 			CharacterParcelsContainers e{};

-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.parcels_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.slot_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			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;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			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;

 			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) + ")");
 		}
@@ -322,18 +314,17 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			CharacterParcelsContainers e{};

-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.parcels_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.slot_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			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;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			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;

 			all_entries.push_back(e);
 		}
@@ -358,18 +349,17 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			CharacterParcelsContainers e{};

-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.parcels_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.slot_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.item_id       = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			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;
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.parcels_id = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.slot_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.item_id    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			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;

 			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)",
@@ -120,21 +117,20 @@ public:
 	{
 		CharacterParcels e{};

-		e.id            = 0;
-		e.char_id       = 0;
-		e.item_id       = 0;
-		e.aug_slot_1    = 0;
-		e.aug_slot_2    = 0;
-		e.aug_slot_3    = 0;
-		e.aug_slot_4    = 0;
-		e.aug_slot_5    = 0;
-		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;
+		e.id         = 0;
+		e.char_id    = 0;
+		e.item_id    = 0;
+		e.aug_slot_1 = 0;
+		e.aug_slot_2 = 0;
+		e.aug_slot_3 = 0;
+		e.aug_slot_4 = 0;
+		e.aug_slot_5 = 0;
+		e.aug_slot_6 = 0;
+		e.slot_id    = 0;
+		e.quantity   = 0;
+		e.from_name  = "";
+		e.note       = "";
+		e.sent_date  = 0;

 		return e;
 	}
@@ -171,21 +167,20 @@ public:
 		if (results.RowCount() == 1) {
 			CharacterParcels e{};

-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			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[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
-			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			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.from_name  = row[11] ? row[11] : "";
+			e.note       = row[12] ? row[12] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-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[12] + " = '" + Strings::Escape(e.from_name) + "'");
-		v.push_back(columns[13] + " = '" + Strings::Escape(e.note) + "'");
-		v.push_back(columns[14] + " = FROM_UNIXTIME(" + (e.sent_date > 0 ? std::to_string(e.sent_date) : "null") + ")");
+		v.push_back(columns[11] + " = '" + Strings::Escape(e.from_name) + "'");
+		v.push_back(columns[12] + " = '" + Strings::Escape(e.note) + "'");
+		v.push_back(columns[13] + " = 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") + ")");
@@ -346,21 +338,20 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			CharacterParcels e{};

-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			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[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
-			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			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.from_name  = row[11] ? row[11] : "";
+			e.note       = row[12] ? row[12] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-1", nullptr, 10);

 			all_entries.push_back(e);
 		}
@@ -385,21 +376,20 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			CharacterParcels e{};

-			e.id            = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
-			e.char_id       = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
-			e.item_id       = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
-			e.aug_slot_1    = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.aug_slot_2    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
-			e.aug_slot_3    = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.aug_slot_4    = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
-			e.aug_slot_5    = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
-			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[12] ? row[12] : "";
-			e.note          = row[13] ? row[13] : "";
-			e.sent_date     = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
+			e.id         = row[0] ? static_cast<uint32_t>(strtoul(row[0], nullptr, 10)) : 0;
+			e.char_id    = row[1] ? static_cast<uint32_t>(strtoul(row[1], nullptr, 10)) : 0;
+			e.item_id    = row[2] ? static_cast<uint32_t>(strtoul(row[2], nullptr, 10)) : 0;
+			e.aug_slot_1 = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
+			e.aug_slot_2 = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
+			e.aug_slot_3 = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
+			e.aug_slot_4 = row[6] ? static_cast<uint32_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.aug_slot_5 = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
+			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.from_name  = row[11] ? row[11] : "";
+			e.note       = row[12] ? row[12] : "";
+			e.sent_date  = strtoll(row[13] ? row[13] : "-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[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[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = 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[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = 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[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = 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[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = 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[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = 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[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = 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[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
-			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-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[52] + " = " + std::to_string(e.spell_shielding));
-		v.push_back(columns[53] + " = " + std::to_string(e.strikethrough));
-		v.push_back(columns[54] + " = " + std::to_string(e.stun_resist));
-		v.push_back(columns[55] + " = " + std::to_string(e.backstab));
-		v.push_back(columns[56] + " = " + std::to_string(e.wind));
-		v.push_back(columns[57] + " = " + std::to_string(e.brass));
-		v.push_back(columns[58] + " = " + std::to_string(e.string));
-		v.push_back(columns[59] + " = " + std::to_string(e.percussion));
-		v.push_back(columns[60] + " = " + std::to_string(e.singing));
-		v.push_back(columns[61] + " = " + std::to_string(e.baking));
-		v.push_back(columns[62] + " = " + std::to_string(e.alchemy));
-		v.push_back(columns[63] + " = " + std::to_string(e.tailoring));
-		v.push_back(columns[64] + " = " + std::to_string(e.blacksmithing));
-		v.push_back(columns[65] + " = " + std::to_string(e.fletching));
-		v.push_back(columns[66] + " = " + std::to_string(e.brewing));
-		v.push_back(columns[67] + " = " + std::to_string(e.jewelry));
-		v.push_back(columns[68] + " = " + std::to_string(e.pottery));
-		v.push_back(columns[69] + " = " + std::to_string(e.research));
-		v.push_back(columns[70] + " = " + std::to_string(e.alcohol));
-		v.push_back(columns[71] + " = " + std::to_string(e.fishing));
-		v.push_back(columns[72] + " = " + std::to_string(e.tinkering));
-		v.push_back(columns[73] + " = FROM_UNIXTIME(" + (e.created_at > 0 ? std::to_string(e.created_at) : "null") + ")");
-		v.push_back(columns[74] + " = FROM_UNIXTIME(" + (e.updated_at > 0 ? std::to_string(e.updated_at) : "null") + ")");
+		v.push_back(columns[51] + " = " + 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.stun_resist));
+		v.push_back(columns[54] + " = " + std::to_string(e.backstab));
+		v.push_back(columns[55] + " = " + std::to_string(e.wind));
+		v.push_back(columns[56] + " = " + std::to_string(e.brass));
+		v.push_back(columns[57] + " = " + std::to_string(e.string));
+		v.push_back(columns[58] + " = " + std::to_string(e.percussion));
+		v.push_back(columns[59] + " = " + std::to_string(e.singing));
+		v.push_back(columns[60] + " = " + std::to_string(e.baking));
+		v.push_back(columns[61] + " = " + std::to_string(e.alchemy));
+		v.push_back(columns[62] + " = " + std::to_string(e.tailoring));
+		v.push_back(columns[63] + " = " + std::to_string(e.blacksmithing));
+		v.push_back(columns[64] + " = " + std::to_string(e.fletching));
+		v.push_back(columns[65] + " = " + std::to_string(e.brewing));
+		v.push_back(columns[66] + " = " + std::to_string(e.jewelry));
+		v.push_back(columns[67] + " = " + std::to_string(e.pottery));
+		v.push_back(columns[68] + " = " + std::to_string(e.research));
+		v.push_back(columns[69] + " = " + std::to_string(e.alcohol));
+		v.push_back(columns[70] + " = " + std::to_string(e.fishing));
+		v.push_back(columns[71] + " = " + 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.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[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[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = 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[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = 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[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = 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[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = 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[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = 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[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = 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[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
-			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-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[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[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
-			e.backstab                 = 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[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
-			e.string                   = 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[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
-			e.baking                   = 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[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
-			e.blacksmithing            = 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[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
-			e.jewelry                  = 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[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
-			e.alcohol                  = 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[72] ? static_cast<int32_t>(atoi(row[72])) : 0;
-			e.created_at               = strtoll(row[73] ? row[73] : "-1", nullptr, 10);
-			e.updated_at               = strtoll(row[74] ? row[74] : "-1", nullptr, 10);
+			e.spell_shielding          = row[51] ? static_cast<int32_t>(atoi(row[51])) : 0;
+			e.strikethrough            = row[52] ? static_cast<int32_t>(atoi(row[52])) : 0;
+			e.stun_resist              = row[53] ? static_cast<int32_t>(atoi(row[53])) : 0;
+			e.backstab                 = row[54] ? static_cast<int32_t>(atoi(row[54])) : 0;
+			e.wind                     = row[55] ? static_cast<int32_t>(atoi(row[55])) : 0;
+			e.brass                    = row[56] ? static_cast<int32_t>(atoi(row[56])) : 0;
+			e.string                   = row[57] ? static_cast<int32_t>(atoi(row[57])) : 0;
+			e.percussion               = row[58] ? static_cast<int32_t>(atoi(row[58])) : 0;
+			e.singing                  = row[59] ? static_cast<int32_t>(atoi(row[59])) : 0;
+			e.baking                   = row[60] ? static_cast<int32_t>(atoi(row[60])) : 0;
+			e.alchemy                  = row[61] ? static_cast<int32_t>(atoi(row[61])) : 0;
+			e.tailoring                = row[62] ? static_cast<int32_t>(atoi(row[62])) : 0;
+			e.blacksmithing            = row[63] ? static_cast<int32_t>(atoi(row[63])) : 0;
+			e.fletching                = row[64] ? static_cast<int32_t>(atoi(row[64])) : 0;
+			e.brewing                  = row[65] ? static_cast<int32_t>(atoi(row[65])) : 0;
+			e.jewelry                  = row[66] ? static_cast<int32_t>(atoi(row[66])) : 0;
+			e.pottery                  = row[67] ? static_cast<int32_t>(atoi(row[67])) : 0;
+			e.research                 = row[68] ? static_cast<int32_t>(atoi(row[68])) : 0;
+			e.alcohol                  = row[69] ? static_cast<int32_t>(atoi(row[69])) : 0;
+			e.fishing                  = row[70] ? static_cast<int32_t>(atoi(row[70])) : 0;
+			e.tinkering                = row[71] ? static_cast<int32_t>(atoi(row[71])) : 0;
+			e.created_at               = strtoll(row[72] ? row[72] : "-1", nullptr, 10);
+			e.updated_at               = strtoll(row[73] ? row[73] : "-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));
@@ -25,7 +25,6 @@ public:
 		uint8_t     is_global;
 		uint32_t    start_time;
 		uint32_t    duration;
-		uint64_t    expire_at;
 		uint8_t     never_expires;
 		std::string notes;
 	};
@@ -44,7 +43,6 @@ public:
 			"is_global",
 			"start_time",
 			"duration",
-			"expire_at",
 			"never_expires",
 			"notes",
 		};
@@ -59,7 +57,6 @@ public:
 			"is_global",
 			"start_time",
 			"duration",
-			"expire_at",
 			"never_expires",
 			"notes",
 		};
@@ -108,7 +105,6 @@ public:
 		e.is_global     = 0;
 		e.start_time    = 0;
 		e.duration      = 0;
-		e.expire_at     = 0;
 		e.never_expires = 0;
 		e.notes         = "";

@@ -153,9 +149,8 @@ public:
 			e.is_global     = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.start_time    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
 			e.duration      = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.expire_at     = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.never_expires = row[7] ? static_cast<uint8_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.notes         = row[8] ? row[8] : "";
+			e.never_expires = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.notes         = row[7] ? row[7] : "";

 			return e;
 		}
@@ -194,9 +189,8 @@ public:
 		v.push_back(columns[3] + " = " + std::to_string(e.is_global));
 		v.push_back(columns[4] + " = " + std::to_string(e.start_time));
 		v.push_back(columns[5] + " = " + std::to_string(e.duration));
-		v.push_back(columns[6] + " = " + std::to_string(e.expire_at));
-		v.push_back(columns[7] + " = " + std::to_string(e.never_expires));
-		v.push_back(columns[8] + " = '" + Strings::Escape(e.notes) + "'");
+		v.push_back(columns[6] + " = " + std::to_string(e.never_expires));
+		v.push_back(columns[7] + " = '" + Strings::Escape(e.notes) + "'");

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -224,7 +218,6 @@ public:
 		v.push_back(std::to_string(e.is_global));
 		v.push_back(std::to_string(e.start_time));
 		v.push_back(std::to_string(e.duration));
-		v.push_back(std::to_string(e.expire_at));
 		v.push_back(std::to_string(e.never_expires));
 		v.push_back("'" + Strings::Escape(e.notes) + "'");

@@ -262,7 +255,6 @@ public:
 			v.push_back(std::to_string(e.is_global));
 			v.push_back(std::to_string(e.start_time));
 			v.push_back(std::to_string(e.duration));
-			v.push_back(std::to_string(e.expire_at));
 			v.push_back(std::to_string(e.never_expires));
 			v.push_back("'" + Strings::Escape(e.notes) + "'");

@@ -304,9 +296,8 @@ public:
 			e.is_global     = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.start_time    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
 			e.duration      = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.expire_at     = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.never_expires = row[7] ? static_cast<uint8_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.notes         = row[8] ? row[8] : "";
+			e.never_expires = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.notes         = row[7] ? row[7] : "";

 			all_entries.push_back(e);
 		}
@@ -337,9 +328,8 @@ public:
 			e.is_global     = row[3] ? static_cast<uint8_t>(strtoul(row[3], nullptr, 10)) : 0;
 			e.start_time    = row[4] ? static_cast<uint32_t>(strtoul(row[4], nullptr, 10)) : 0;
 			e.duration      = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
-			e.expire_at     = row[6] ? strtoull(row[6], nullptr, 10) : 0;
-			e.never_expires = row[7] ? static_cast<uint8_t>(strtoul(row[7], nullptr, 10)) : 0;
-			e.notes         = row[8] ? row[8] : "";
+			e.never_expires = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 0;
+			e.notes         = row[7] ? row[7] : "";

 			all_entries.push_back(e);
 		}
@@ -420,7 +410,6 @@ public:
 		v.push_back(std::to_string(e.is_global));
 		v.push_back(std::to_string(e.start_time));
 		v.push_back(std::to_string(e.duration));
-		v.push_back(std::to_string(e.expire_at));
 		v.push_back(std::to_string(e.never_expires));
 		v.push_back("'" + Strings::Escape(e.notes) + "'");

@@ -451,7 +440,6 @@ public:
 			v.push_back(std::to_string(e.is_global));
 			v.push_back(std::to_string(e.start_time));
 			v.push_back(std::to_string(e.duration));
-			v.push_back(std::to_string(e.expire_at));
 			v.push_back(std::to_string(e.never_expires));
 			v.push_back("'" + Strings::Escape(e.notes) + "'");

@@ -149,7 +149,6 @@ public:
 		uint8_t     keeps_sold_items;
 		uint8_t     is_parcel_merchant;
 		uint8_t     multiquest_enabled;
-		uint16_t    npc_tint_id;
 	};

 	static std::string PrimaryKey()
@@ -290,7 +289,6 @@ public:
 			"keeps_sold_items",
 			"is_parcel_merchant",
 			"multiquest_enabled",
-			"npc_tint_id",
 		};
 	}

@@ -427,7 +425,6 @@ public:
 			"keeps_sold_items",
 			"is_parcel_merchant",
 			"multiquest_enabled",
-			"npc_tint_id",
 		};
 	}

@@ -598,7 +595,6 @@ public:
 		e.keeps_sold_items       = 1;
 		e.is_parcel_merchant     = 0;
 		e.multiquest_enabled     = 0;
-		e.npc_tint_id            = 0;

 		return e;
 	}
@@ -765,7 +761,6 @@ public:
 			e.keeps_sold_items       = row[127] ? static_cast<uint8_t>(strtoul(row[127], nullptr, 10)) : 1;
 			e.is_parcel_merchant     = row[128] ? static_cast<uint8_t>(strtoul(row[128], nullptr, 10)) : 0;
 			e.multiquest_enabled     = row[129] ? static_cast<uint8_t>(strtoul(row[129], nullptr, 10)) : 0;
-			e.npc_tint_id            = row[130] ? static_cast<uint16_t>(strtoul(row[130], nullptr, 10)) : 0;

 			return e;
 		}
@@ -928,7 +923,6 @@ public:
 		v.push_back(columns[127] + " = " + std::to_string(e.keeps_sold_items));
 		v.push_back(columns[128] + " = " + std::to_string(e.is_parcel_merchant));
 		v.push_back(columns[129] + " = " + std::to_string(e.multiquest_enabled));
-		v.push_back(columns[130] + " = " + std::to_string(e.npc_tint_id));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1080,7 +1074,6 @@ public:
 		v.push_back(std::to_string(e.keeps_sold_items));
 		v.push_back(std::to_string(e.is_parcel_merchant));
 		v.push_back(std::to_string(e.multiquest_enabled));
-		v.push_back(std::to_string(e.npc_tint_id));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1240,7 +1233,6 @@ public:
 			v.push_back(std::to_string(e.keeps_sold_items));
 			v.push_back(std::to_string(e.is_parcel_merchant));
 			v.push_back(std::to_string(e.multiquest_enabled));
-			v.push_back(std::to_string(e.npc_tint_id));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -1404,7 +1396,6 @@ public:
 			e.keeps_sold_items       = row[127] ? static_cast<uint8_t>(strtoul(row[127], nullptr, 10)) : 1;
 			e.is_parcel_merchant     = row[128] ? static_cast<uint8_t>(strtoul(row[128], nullptr, 10)) : 0;
 			e.multiquest_enabled     = row[129] ? static_cast<uint8_t>(strtoul(row[129], nullptr, 10)) : 0;
-			e.npc_tint_id            = row[130] ? static_cast<uint16_t>(strtoul(row[130], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -1559,7 +1550,6 @@ public:
 			e.keeps_sold_items       = row[127] ? static_cast<uint8_t>(strtoul(row[127], nullptr, 10)) : 1;
 			e.is_parcel_merchant     = row[128] ? static_cast<uint8_t>(strtoul(row[128], nullptr, 10)) : 0;
 			e.multiquest_enabled     = row[129] ? static_cast<uint8_t>(strtoul(row[129], nullptr, 10)) : 0;
-			e.npc_tint_id            = row[130] ? static_cast<uint16_t>(strtoul(row[130], nullptr, 10)) : 0;

 			all_entries.push_back(e);
 		}
@@ -1764,7 +1754,6 @@ public:
 		v.push_back(std::to_string(e.keeps_sold_items));
 		v.push_back(std::to_string(e.is_parcel_merchant));
 		v.push_back(std::to_string(e.multiquest_enabled));
-		v.push_back(std::to_string(e.npc_tint_id));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -1917,7 +1906,6 @@ public:
 			v.push_back(std::to_string(e.keeps_sold_items));
 			v.push_back(std::to_string(e.is_parcel_merchant));
 			v.push_back(std::to_string(e.multiquest_enabled));
-			v.push_back(std::to_string(e.npc_tint_id));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -15,7 +15,7 @@
 #include "../../database.h"
 #include "../../strings.h"
 #include <ctime>
-#include <cereal/cereal.hpp>
+
 class BasePlayerEventLogSettingsRepository {
 public:
 	struct PlayerEventLogSettings {
@@ -25,20 +25,6 @@ public:
 		int32_t     retention_days;
 		int32_t     discord_webhook_id;
 		uint8_t     etl_enabled;
-
-		// cereal
-		template<class Archive>
-		void serialize(Archive &ar)
-		{
-			ar(
-				CEREAL_NVP(id),
-				CEREAL_NVP(event_name),
-				CEREAL_NVP(event_enabled),
-				CEREAL_NVP(retention_days),
-				CEREAL_NVP(discord_webhook_id),
-				CEREAL_NVP(etl_enabled)
-			);
-		}
 	};

 	static std::string PrimaryKey()
@@ -19,11 +19,10 @@
 class BaseRespawnTimesRepository {
 public:
 	struct RespawnTimes {
-		int32_t  id;
-		int32_t  start;
-		int32_t  duration;
-		uint32_t expire_at;
-		int16_t  instance_id;
+		int32_t id;
+		int32_t start;
+		int32_t duration;
+		int16_t instance_id;
 	};

 	static std::string PrimaryKey()
@@ -37,7 +36,6 @@ public:
 			"id",
 			"start",
 			"duration",
-			"expire_at",
 			"instance_id",
 		};
 	}
@@ -48,7 +46,6 @@ public:
 			"id",
 			"start",
 			"duration",
-			"expire_at",
 			"instance_id",
 		};
 	}
@@ -93,7 +90,6 @@ public:
 		e.id          = 0;
 		e.start       = 0;
 		e.duration    = 0;
-		e.expire_at   = 0;
 		e.instance_id = 0;

 		return e;
@@ -134,8 +130,7 @@ public:
 			e.id          = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.start       = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
 			e.duration    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.expire_at   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.instance_id = row[4] ? static_cast<int16_t>(atoi(row[4])) : 0;
+			e.instance_id = row[3] ? static_cast<int16_t>(atoi(row[3])) : 0;

 			return e;
 		}
@@ -172,8 +167,7 @@ public:
 		v.push_back(columns[0] + " = " + std::to_string(e.id));
 		v.push_back(columns[1] + " = " + std::to_string(e.start));
 		v.push_back(columns[2] + " = " + std::to_string(e.duration));
-		v.push_back(columns[3] + " = " + std::to_string(e.expire_at));
-		v.push_back(columns[4] + " = " + std::to_string(e.instance_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.instance_id));

 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -198,7 +192,6 @@ public:
 		v.push_back(std::to_string(e.id));
 		v.push_back(std::to_string(e.start));
 		v.push_back(std::to_string(e.duration));
-		v.push_back(std::to_string(e.expire_at));
 		v.push_back(std::to_string(e.instance_id));

 		auto results = db.QueryDatabase(
@@ -232,7 +225,6 @@ public:
 			v.push_back(std::to_string(e.id));
 			v.push_back(std::to_string(e.start));
 			v.push_back(std::to_string(e.duration));
-			v.push_back(std::to_string(e.expire_at));
 			v.push_back(std::to_string(e.instance_id));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -270,8 +262,7 @@ public:
 			e.id          = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.start       = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
 			e.duration    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.expire_at   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.instance_id = row[4] ? static_cast<int16_t>(atoi(row[4])) : 0;
+			e.instance_id = row[3] ? static_cast<int16_t>(atoi(row[3])) : 0;

 			all_entries.push_back(e);
 		}
@@ -299,8 +290,7 @@ public:
 			e.id          = row[0] ? static_cast<int32_t>(atoi(row[0])) : 0;
 			e.start       = row[1] ? static_cast<int32_t>(atoi(row[1])) : 0;
 			e.duration    = row[2] ? static_cast<int32_t>(atoi(row[2])) : 0;
-			e.expire_at   = row[3] ? static_cast<uint32_t>(strtoul(row[3], nullptr, 10)) : 0;
-			e.instance_id = row[4] ? static_cast<int16_t>(atoi(row[4])) : 0;
+			e.instance_id = row[3] ? static_cast<int16_t>(atoi(row[3])) : 0;

 			all_entries.push_back(e);
 		}
@@ -378,7 +368,6 @@ public:
 		v.push_back(std::to_string(e.id));
 		v.push_back(std::to_string(e.start));
 		v.push_back(std::to_string(e.duration));
-		v.push_back(std::to_string(e.expire_at));
 		v.push_back(std::to_string(e.instance_id));

 		auto results = db.QueryDatabase(
@@ -405,7 +394,6 @@ public:
 			v.push_back(std::to_string(e.id));
 			v.push_back(std::to_string(e.start));
 			v.push_back(std::to_string(e.duration));
-			v.push_back(std::to_string(e.expire_at));
 			v.push_back(std::to_string(e.instance_id));

 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -106,8 +106,13 @@ public:
 				return false;
 			}

-			auto buy_lines =
-				BaseBuyerBuyLinesRepository::GetWhere(db, fmt::format("`buyer_id` = {}", buyer.front().id));
+			auto buy_lines = BaseBuyerBuyLinesRepository::GetWhere(
+				db,
+				fmt::format("`buyer_id` = '{}'", buyer.front().id)
+			);
+			if (buy_lines.empty()) {
+				return false;
+			}

 			std::vector<std::string> buy_line_ids{};
 			for (auto const &bl: buy_lines) {
@@ -116,65 +121,23 @@ public:

 			DeleteWhere(db, fmt::format("`char_id` = '{}';", char_id));
 			if (buy_line_ids.empty()) {
-				return true;
+				return false;
 			}

 			BaseBuyerBuyLinesRepository::DeleteWhere(
-				db, fmt::format("`id` IN({})", Strings::Implode(", ", buy_line_ids))
+				db,
+				fmt::format("`id` IN({})", Strings::Implode(", ", buy_line_ids))
 			);
 			BaseBuyerTradeItemsRepository::DeleteWhere(
-				db, fmt::format("`buyer_buy_lines_id` IN({})", Strings::Implode(", ", buy_line_ids))
+				db,
+				fmt::format(
+					"`buyer_buy_lines_id` IN({})",
+					Strings::Implode(", ", buy_line_ids))
 			);
 		}

 		return true;
 	}
-
-	static bool DeleteBuyers(Database &db, uint32 char_zone_id, uint32 char_zone_instance_id)
-	{
-		auto buyers = GetWhere(
-			db,
-			fmt::format(
-				"`char_zone_id` = {} AND `char_zone_instance_id` = {}", char_zone_id, char_zone_instance_id
-			)
-		);
-		if (buyers.empty()) {
-			return false;
-		}
-
-		std::vector<std::string> buyer_ids{};
-		std::vector<std::string> buy_line_ids{};
-
-		for (auto const &b: buyers) {
-			buyer_ids.push_back(std::to_string(b.id));
-		}
-
-		auto buy_lines = BaseBuyerBuyLinesRepository::GetWhere(
-			db, fmt::format("`buyer_id` IN({})", Strings::Implode(", ", buyer_ids))
-		);
-
-		if (!buy_lines.empty()) {
-			for (auto const &bl: buy_lines) {
-				buy_line_ids.push_back(std::to_string(bl.id));
-			}
-		}
-
-		DeleteWhere(db, fmt::format("`id` IN({});", Strings::Implode(", ", buyer_ids)));
-		if (buy_line_ids.empty()) {
-			return true;
-		}
-
-		BaseBuyerBuyLinesRepository::DeleteWhere(
-			db,
-			fmt::format("`id` IN({})", Strings::Implode(", ", buy_line_ids))
-		);
-		BaseBuyerTradeItemsRepository::DeleteWhere(
-			db,
-			fmt::format("`buyer_buy_lines_id` IN({})", Strings::Implode(", ", buy_line_ids))
-		);
-
-		return true;
-	}
 };

 #endif //EQEMU_BUYER_REPOSITORY_H
@@ -231,21 +231,6 @@ public:

 		return UpdateOne(db, corpse);
 	}
-
-	static int UpdateEntityVariables(Database& db, uint32 corpse_id, const std::string& json_string)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE `{}` SET `entity_variables` = '{}' WHERE `{}` = {}",
-				TableName(),
-				Strings::Escape(json_string),
-				PrimaryKey(),
-				corpse_id
-			)
-		);
-
-		return results.Success() ? results.RowsAffected() : 0;
-	}
 };

 #endif //EQEMU_CHARACTER_CORPSES_REPOSITORY_H
@@ -167,46 +167,6 @@ public:

 		return zone_player_counts;
 	}
-
-	static std::vector<uint32_t> GetCharacterIDsByAccountID(
-		Database& db,
-		uint32_t  account_id
-	)
-	{
-		std::vector<uint32_t> character_ids;
-
-		auto query = fmt::format(
-			"SELECT id FROM character_data WHERE account_id = {} AND deleted_at IS NULL",
-			account_id
-		);
-
-		auto results = db.QueryDatabase(query);
-		if (results.Success()) {
-			for (auto row : results) {
-				if (row[0]) {
-					character_ids.push_back(static_cast<uint32_t>(std::stoul(row[0])));
-				}
-			}
-		}
-
-		return character_ids;
-	}
-
-	static uint32_t GetTotalTimePlayed(Database& db, uint32_t account_id)
-	{
-		auto query = fmt::format(
-			"SELECT SUM(time_played) FROM `character_data` WHERE `account_id` = {}",
-			account_id
-		);
-
-		auto results = db.QueryDatabase(query);
-		if (!results.Success()) {
-			return 0;
-		}
-
-		auto row = results.begin();
-		return Strings::ToUnsignedInt(row[0]);
-	}
 };

 #endif //EQEMU_CHARACTER_DATA_REPOSITORY_H
@@ -49,7 +49,6 @@ public:
 		// these are the base definitions for command_subsettings and can be over-ridden by the database
 		std::vector<CommandSubsettingsRepository::CommandSubsettings> static_records = {
 			{.parent_command = "find", .sub_command = "aa", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "findaa"},
-			{.parent_command = "find", .sub_command = "account", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "findaccount"},
 			{.parent_command = "find", .sub_command = "body_type", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "findbodytype"},
 			{.parent_command = "find", .sub_command = "bug_category", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "findbugcategory"},
 			{.parent_command = "find", .sub_command = "character", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "findcharacter"},
@@ -143,7 +142,6 @@ public:
 			{.parent_command = "show", .sub_command = "hatelist", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "hatelist"},
 			{.parent_command = "show", .sub_command = "inventory", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "peekinv"},
 			{.parent_command = "show", .sub_command = "ip_lookup", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "iplookup"},
-			{.parent_command = "show", .sub_command = "keyring", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "showkeyring"},
 			{.parent_command = "show", .sub_command = "line_of_sight", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "checklos"},
 			{.parent_command = "show", .sub_command = "network", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "network"},
 			{.parent_command = "show", .sub_command = "network_stats", .access_level = AccountStatus::QuestTroupe, .top_level_aliases = "netstats"},
@@ -14,7 +14,7 @@ namespace ContentFilterCriteria {
 			table_prefix = table_prefix + ".";
 		}

-		int current_expansion_filter_criteria = WorldContentService::Instance()->GetCurrentExpansion();
+		int current_expansion_filter_criteria = content_service.GetCurrentExpansion();
 		if (current_expansion_filter_criteria == Expansion::EXPANSION_ALL) {
 			current_expansion_filter_criteria = Expansion::EXPANSION_FILTER_MAX;
 		}
@@ -33,8 +33,8 @@ namespace ContentFilterCriteria {
 			table_prefix
 		);

-		std::vector<std::string> flags_disabled = WorldContentService::Instance()->GetContentFlagsDisabled();
-		std::vector<std::string> flags_enabled  = WorldContentService::Instance()->GetContentFlagsEnabled();
+		std::vector<std::string> flags_disabled = content_service.GetContentFlagsDisabled();
+		std::vector<std::string> flags_enabled  = content_service.GetContentFlagsEnabled();
 		std::string              flags_in_filter_enabled;
 		std::string              flags_in_filter_disabled;
 		if (!flags_enabled.empty()) {
@@ -7,11 +7,49 @@

 class InstanceListRepository: public BaseInstanceListRepository {
 public:
+
+    /**
+     * This file was auto generated and can be modified and extended upon
+     *
+     * Base repository methods are automatically
+     * generated in the "base" version of this repository. The base repository
+     * is immutable and to be left untouched, while methods in this class
+     * are used as extension methods for more specific persistence-layer
+     * accessors or mutators.
+     *
+     * Base Methods (Subject to be expanded upon in time)
+     *
+     * Note: Not all tables are designed appropriately to fit functionality with all base methods
+     *
+     * InsertOne
+     * UpdateOne
+     * DeleteOne
+     * FindOne
+     * GetWhere(std::string where_filter)
+     * DeleteWhere(std::string where_filter)
+     * InsertMany
+     * All
+     *
+     * Example custom methods in a repository
+     *
+     * InstanceListRepository::GetByZoneAndVersion(int zone_id, int zone_version)
+     * InstanceListRepository::GetWhereNeverExpires()
+     * InstanceListRepository::GetWhereXAndY()
+     * InstanceListRepository::DeleteWhereXAndY()
+     *
+     * Most of the above could be covered by base methods, but if you as a developer
+     * find yourself re-using logic for other parts of the code, its best to just make a
+     * method that can be re-used easily elsewhere especially if it can use a base repository
+     * method and encapsulate filters there
+     */
+
+	// Custom extended repository methods here
+
 	static int UpdateDuration(Database& db, uint16 instance_id, uint32_t new_duration)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"UPDATE `{}` SET `duration` = {}, `expire_at` = (`duration` + `start_time`) WHERE `{}` = {}",
+				"UPDATE `{}` SET `duration` = {} WHERE `{}` = {}",
 				TableName(),
 				new_duration,
 				PrimaryKey(),
@@ -27,7 +65,7 @@ public:
 		auto results = db.QueryDatabase(
 			fmt::format(
 				SQL(
-					SELECT (`expire_at` - UNIX_TIMESTAMP()) AS `remaining` FROM `{}`
+					SELECT ((start_time + duration) - UNIX_TIMESTAMP()) AS `remaining` FROM `{}`
 					WHERE `id` = {}
 				),
 				TableName(),
@@ -8,11 +8,47 @@
 class RespawnTimesRepository: public BaseRespawnTimesRepository {
 public:

+    /**
+     * This file was auto generated and can be modified and extended upon
+     *
+     * Base repository methods are automatically
+     * generated in the "base" version of this repository. The base repository
+     * is immutable and to be left untouched, while methods in this class
+     * are used as extension methods for more specific persistence-layer
+     * accessors or mutators.
+     *
+     * Base Methods (Subject to be expanded upon in time)
+     *
+     * Note: Not all tables are designed appropriately to fit functionality with all base methods
+     *
+     * InsertOne
+     * UpdateOne
+     * DeleteOne
+     * FindOne
+     * GetWhere(std::string where_filter)
+     * DeleteWhere(std::string where_filter)
+     * InsertMany
+     * All
+     *
+     * Example custom methods in a repository
+     *
+     * RespawnTimesRepository::GetByZoneAndVersion(int zone_id, int zone_version)
+     * RespawnTimesRepository::GetWhereNeverExpires()
+     * RespawnTimesRepository::GetWhereXAndY()
+     * RespawnTimesRepository::DeleteWhereXAndY()
+     *
+     * Most of the above could be covered by base methods, but if you as a developer
+     * find yourself re-using logic for other parts of the code, its best to just make a
+     * method that can be re-used easily elsewhere especially if it can use a base repository
+     * method and encapsulate filters there
+     */
+
+	// Custom extended repository methods here
 	static void ClearExpiredRespawnTimers(Database& db)
 	{
 		db.QueryDatabase(
 			fmt::format(
-				"DELETE FROM `{}` WHERE `expire_at` < UNIX_TIMESTAMP(NOW())",
+				"DELETE FROM `{}` WHERE (`start` + `duration`) < UNIX_TIMESTAMP(NOW())",
 				TableName()
 			)
 		);
@@ -41,11 +77,6 @@ public:

 		return ((r.start + r.duration) - time_seconds);
 	}
-
-	static void ClearInstanceTimers(Database &db, int32_t id)
-	{
-		RespawnTimesRepository::DeleteWhere(db, fmt::format("`instance_id` = {}", id));
-	}
 };

 #endif //EQEMU_RESPAWN_TIMES_REPOSITORY_H
@@ -43,47 +43,6 @@ public:
     * method and encapsulate filters there
     */

-	template<typename T1, typename T2, typename T3, typename T4>
-	static std::vector<std::string> join_tuple(
-		const std::string &glue,
-		const std::pair<char, char> &encapsulation,
-		const std::vector<std::tuple<T1, T2, T3, T4>> &src
-	)
-	{
-		if (src.empty()) {
-			return {};
-		}
-
-		std::vector<std::string> output;
-
-		for (const std::tuple<T1, T2, T3, T4> &src_iter: src) {
-
-			output.emplace_back(
-
-				fmt::format(
-					"{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
-					encapsulation.first,
-					std::get<0>(src_iter),
-					encapsulation.second,
-					glue,
-					encapsulation.first,
-					std::get<1>(src_iter),
-					encapsulation.second,
-					glue,
-					encapsulation.first,
-					std::get<2>(src_iter),
-					encapsulation.second,
-					glue,
-					encapsulation.first,
-					std::get<3>(src_iter),
-					encapsulation.second
-				)
-			);
-		}
-
-		return output;
-	}
-
 	// Custom extended repository methods here
 	static std::vector<std::string> GetRuleNames(Database &db, int rule_set_id)
 	{
@@ -128,28 +87,12 @@ public:
 		return v;
 	}

-	template<typename T>
-	static std::string
-	ImplodePair(const std::string &glue, const std::pair<char, char> &encapsulation, const std::vector<T> &src)
-	{
-		if (src.empty()) {
-			return {};
-		}
-		std::ostringstream oss;
-		for (const T &src_iter: src) {
-			oss << encapsulation.first << src_iter << encapsulation.second << glue;
-		}
-		std::string output(oss.str());
-		output.resize(output.size() - glue.size());
-		return output;
-	}
-
 	static bool DeleteOrphanedRules(Database& db, std::vector<std::string>& v)
 	{
 		const auto query = fmt::format(
 			"DELETE FROM {} WHERE rule_name IN ({})",
 			TableName(),
-			ImplodePair(",", std::pair<char, char>('\'', '\''), v)
+			Strings::ImplodePair(",", std::pair<char, char>('\'', '\''), v)
 		);

 		return db.QueryDatabase(query).Success();
@@ -160,7 +103,7 @@ public:
 		const auto query = fmt::format(
 			"REPLACE INTO {} (`ruleset_id`, `rule_name`, `rule_value`, `notes`) VALUES {}",
 			TableName(),
-			ImplodePair(
+			Strings::ImplodePair(
 				",",
 				std::pair<char, char>('(', ')'),
 				join_tuple(",", std::pair<char, char>('\'', '\''), v)
@@ -54,30 +54,17 @@ public:
 	{
 		BulkTraders_Struct                  all_entries{};
 		std::vector<DistinctTraders_Struct> distinct_traders;
-		MySQLRequestResult                  results;

-		if (RuleB(Bazaar, UseAlternateBazaarSearch)) {
-			results = db.QueryDatabase(fmt::format(
-				"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name "
-				"FROM trader AS t "
-				"JOIN character_data AS c ON t.char_id = c.id "
-				"WHERE t.char_zone_instance_id = {} "
-				"ORDER BY t.char_zone_instance_id ASC "
-				"LIMIT {}",
-				char_zone_instance_id,
-				max_results)
-			);
-		}
-		else {
-			results = db.QueryDatabase(fmt::format(
-				"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name "
-				"FROM trader AS t "
-				"JOIN character_data AS c ON t.char_id = c.id "
-				"ORDER BY t.char_zone_instance_id ASC "
-				"LIMIT {}",
-				max_results)
-			);
-		}
+		auto results = db.QueryDatabase(fmt::format(
+			"SELECT DISTINCT(t.char_id), t.char_zone_id, t.char_zone_instance_id, t.char_entity_id, c.name "
+			"FROM trader AS t "
+			"JOIN character_data AS c ON t.char_id = c.id "
+			"WHERE t.char_zone_instance_id = {} "
+			"ORDER BY t.char_zone_instance_id ASC "
+			"LIMIT {}",
+			char_zone_instance_id,
+			max_results)
+		);

 		distinct_traders.reserve(results.RowCount());

@@ -502,19 +502,6 @@ bool RuleManager::UpdateInjectedRules(Database *db, const std::string &rule_set_
 		}
 	}

-	// update rules in the database where the description is different
-	for (auto &e : RuleValuesRepository::All(*db)) {
-		auto i = rule_data.find(e.rule_name);
-		if (i != rule_data.end()) {
-			// if notes are different, update them
-			if (i->second.second != nullptr && *i->second.second != e.notes) {
-				LogInfo("Updating rule [{}] notes to [{}]", i->first, *i->second.second);
-				e.notes = *i->second.second;
-				RuleValuesRepository::ReplaceOne(*db, e);
-			}
-		}
-	}
-
 	if (injected_rule_entries.size()) {
 		if (!RuleValuesRepository::InjectRules(*db, injected_rule_entries)) {
 			return false;
@@ -54,7 +54,7 @@ RULE_INT(Character, CorpseDecayTime, 604800000, "Time after which the corpse dec
 RULE_INT(Character, EmptyCorpseDecayTime, 10800000, "Time after which an empty corpse decays (milliseconds) DEFAULT: 10800000 (3 Hours)")
 RULE_INT(Character, CorpseResTime, 10800000, "Time after which the corpse can no longer be resurrected (milliseconds) DEFAULT: 10800000 (3 Hours)")
 RULE_INT(Character, DuelCorpseResTime, 600000, "Time before cant res corpse after a duel (milliseconds) DEFAULT: 600000 (10 Minutes)")
-RULE_INT(Character, CorpseOwnerOnlineCheckTime, 300, "How often corpse will check if its owner is online DEFAULT: 300 (5 minutes)")
+RULE_INT(Character, CorpseOwnerOnlineTime, 30000, "How often corpse will check if its owner is online DEFAULT: 30000 (30 Seconds)")
 RULE_BOOL(Character, LeaveCorpses, true, "Setting whether you leave a corpse behind")
 RULE_BOOL(Character, LeaveNakedCorpses, false, "Setting whether you leave a corpse without items")
 RULE_INT(Character, MaxDraggedCorpses, 2, "Maximum number of corpses you can drag at once")
@@ -156,7 +156,6 @@ RULE_REAL(Character, TradeskillUpPottery, 4.0, "Pottery skillup rate adjustment.
 RULE_REAL(Character, TradeskillUpResearch, 1.0, "Research skillup rate adjustment. Lower is faster")
 RULE_REAL(Character, TradeskillUpTinkering, 2.0, "Tinkering skillup rate adjustment. Lower is faster")
 RULE_REAL(Character, TradeskillUpTailoring, 2.0, "Tailoring skillup rate adjustment. Lower is faster")
-RULE_REAL(Character, TradeskillUpMinChance, 2.5, "Determines the minimum percentage chance to gain a skill increase from a tradeskill.  Cannot go below 2.5")
 RULE_BOOL(Character, MarqueeHPUpdates, false, "Will show health percentage in center of screen if health lesser than 100%")
 RULE_INT(Character, IksarCommonTongue, 95, "Starting value for Common Tongue for Iksars")
 RULE_INT(Character, OgreCommonTongue, 95, "Starting value for Common Tongue for Ogres")
@@ -233,12 +232,6 @@ RULE_BOOL(Character, SneakAlwaysSucceedOver100, false, "When sneak skill is over
 RULE_INT(Character, BandolierSwapDelay, 0, "Bandolier swap delay in milliseconds, default is 0")
 RULE_BOOL(Character, EnableHackedFastCampForGM, false, "Enables hacked fast camp for GM clients, if the GM doesn't have a hacked client they'll camp like normal")
 RULE_BOOL(Character, AlwaysAllowNameChange, false, "Enable this option to allow /changename to work without enabling a name change via scripts.")
-RULE_BOOL(Character, EnableAutoAFK, false, "Enable or disable the auto AFK feature, cuts down on packet spam")
-RULE_BOOL(Character, AutoIdleFilterPackets, true, "Enable or disable filtering packets when auto AFK is enabled, heavily cuts down on packet spam in zones with lots of players")
-RULE_INT(Character, SecondsBeforeIdleCombatZone, 600, "Seconds before a player is considered idle in combat zones (600 = 10 minutes)")
-RULE_INT(Character, SecondsBeforeIdleNonCombatZone, 60, "Seconds before a player is considered idle in non-combat zones (60 = 1 minute)")
-RULE_INT(Character, SecondsBeforeAFKCombatZone, 1800, "Seconds before a player is considered AFK in combat zones (1800 = 30 minutes)")
-RULE_INT(Character, SecondsBeforeAFKNonCombatZone, 600, "Seconds before a player is considered AFK in non-combat zones (600 = 10 minutes)")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Mercs)
@@ -268,7 +261,6 @@ RULE_INT(Guild, TributeTime, 600000, "Time in ms for guild tributes.  Default is
 RULE_INT(Guild, TributeTimeRefreshInterval, 180000, "Time in ms to send all guild members a Tribute Time refresh. Default is 3 mins.")
 RULE_INT(Guild, TributePlatConversionRate, 10, "The conversion rate of platinum donations.  Default is 10 guild favor to 1 platinum.")
 RULE_BOOL(Guild, UseCharacterMaxLevelForGuildTributes, true, "Guild Tributes will adhere to Character:MaxLevel.  Default is true.")
-RULE_BOOL(Guild, EnableLFGuild, false, "Enable the LFGuild system (Requires queryserv)")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Skills)
@@ -298,7 +290,6 @@ RULE_BOOL(Pets, ClientPetsUseOwnerNameInLastName, true, "Disable this to keep cl
 RULE_BOOL(Pets, CanTakeNoDrop, false, "Setting whether anyone can give no-drop items to pets")
 RULE_INT(Pets, PetTauntRange, 150, "Range at which a pet will taunt targets.")
 RULE_BOOL(Pets, AlwaysAllowPetRename, false, "Enable this option to allow /changepetname to work without enabling a pet name change via scripts.")
-RULE_BOOL(Pets, PetsRequireLoS, false, "Whether or not pets require line of sight to be told to attack their target")
 RULE_CATEGORY_END()

 RULE_CATEGORY(GM)
@@ -354,7 +345,6 @@ RULE_STRING(World, SupportedClients, "RoF2", "Comma-delimited list of clients to
 RULE_STRING(World, CustomFilesKey, "", "Enable if the server requires custom files and sends a key to validate. Empty string to disable. Example: eqcustom_v1")
 RULE_STRING(World, CustomFilesUrl, "github.com/knervous/eqnexus/releases", "URL to display at character select if client is missing custom files")
 RULE_INT(World, CustomFilesAdminLevel, 20, "Admin level at which custom file key is not required when CustomFilesKey is specified")
-RULE_BOOL(World, RealTimeCalculateGuilds, false, "(Temp feature flag) If true, guilds will be calculated in real time instead of at zone boot. This is a performance hit but allows for more dynamic guilds.")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Zone)
@@ -389,7 +379,6 @@ RULE_BOOL(Zone, StateSaveEntityVariables, true, "Set to true if you want buffs t
 RULE_BOOL(Zone, StateSaveBuffs, true, "Set to true if you want buffs to be saved on shutdown")
 RULE_INT(Zone, StateSaveClearDays, 7, "Clears state save data older than this many days")
 RULE_BOOL(Zone, StateSavingOnShutdown, true, "Set to true if you want zones to save state on shutdown (npcs, corpses, loot, entity variables, buffs etc.)")
-RULE_INT(Zone, UpdateWhoTimer, 120, "Seconds between updates to /who list, CLE stale timer")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Map)
@@ -399,10 +388,9 @@ RULE_BOOL(Map, MobZVisualDebug, false, "Displays spell effects determining wheth
 RULE_BOOL(Map, MobPathingVisualDebug, false, "Displays nodes in pathing points in realtime to help with visual debugging")
 RULE_REAL(Map, FixPathingZMaxDeltaSendTo, 20, "At runtime in SendTo: maximum change in Z to allow the BestZ code to apply")
 RULE_INT(Map, FindBestZHeightAdjust, 1, "Adds this to the current Z before seeking the best Z position")
-RULE_BOOL(Map, CheckForDoorLoSCheat, true, "Runs LoS checks to prevent cheating through doors.")
-RULE_BOOL(Map, EnableLoSCheatExemptions, false, "Enables exemptions for the LoS Cheat check. Must modify source to create these.")
-RULE_REAL(Map, RangeCheckForDoorLoSCheat, 250.0, "Default 250.0. Range to check if a door is blocking LoS from the target.")
-RULE_STRING(Map, ZonesToCheckDoorCheat, "89,103", "Zones that will check for the door LoS cheat. You can leave it blank to disable, 'all' to check all zones or use a comma-delimited list of zones. Default Sebilis & Chardok")
+RULE_BOOL(Map, CheckForLoSCheat, false, "Runs predefined zone checks to check for LoS cheating through doors and such.")
+RULE_BOOL(Map, EnableLoSCheatExemptions, false, "Enables exemptions for the LoS Cheat check.")
+RULE_REAL(Map, RangeCheckForLoSCheat, 20.0, "Default 20.0. Range to check if one is within range of a door.")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Pathing)
@@ -619,7 +607,7 @@ RULE_INT(Combat, SneakPullAssistRange, 400, "Modified range of assist for sneak
 RULE_BOOL(Combat, Classic2HBAnimation, false, "2HB will use the 2 hand piercing animation instead of the overhead slashing animation")
 RULE_BOOL(Combat, ArcheryConsumesAmmo, true, "Set to false to disable Archery Ammo Consumption")
 RULE_BOOL(Combat, ThrowingConsumesAmmo, true, "Set to false to disable Throwing Ammo Consumption")
-RULE_BOOL(Combat, UseLiveRiposteMechanics, false, "Set to true to disable SPA 173 SpellEffect::RiposteChance from making those with the effect on them immune to enrage, can longer riposte from a riposte.")
+RULE_BOOL(Combat, UseLiveRiposteMechanics, false, "Set to true to disable SPA 173 SE_RiposteChance from making those with the effect on them immune to enrage, can longer riposte from a riposte.")
 RULE_INT(Combat, FrontalStunImmunityClasses, 0, "Bitmask for Classes than have frontal stun immunity, No Races (0) by default.")
 RULE_BOOL(Combat, NPCsUseFrontalStunImmunityClasses, false, "Enable or disable NPCs using frontal stun immunity Classes from Combat:FrontalStunImmunityClasses, false by default.")
 RULE_INT(Combat, FrontalStunImmunityRaces, 512, "Bitmask for Races than have frontal stun immunity, Ogre (512) only by default.")
@@ -826,7 +814,6 @@ RULE_INT(Bots, PercentChanceToCastDispel, 75, "The chance for a bot to attempt t
 RULE_INT(Bots, PercentChanceToCastInCombatBuff, 75, "The chance for a bot to attempt to cast the given spell type in combat. Default 75%.")
 RULE_INT(Bots, PercentChanceToCastHateLine, 75, "The chance for a bot to attempt to cast the given spell type in combat. Default 75%.")
 RULE_INT(Bots, PercentChanceToCastMez, 75, "The chance for a bot to attempt to cast the given spell type in combat. Default 75%.")
-RULE_INT(Bots, PercentChanceToCastAEMez, 40, "The chance for a bot to attempt to cast the given spell type in combat. Default 40%.")
 RULE_INT(Bots, PercentChanceToCastSlow, 75, "The chance for a bot to attempt to cast the given spell type in combat. Default 75%.")
 RULE_INT(Bots, PercentChanceToCastDebuff, 75, "The chance for a bot to attempt to cast the given spell type in combat. Default 75%.")
 RULE_INT(Bots, PercentChanceToCastCure, 75, "The chance for a bot to attempt to cast the given spell type in combat. Default 75%.")
@@ -838,6 +825,8 @@ RULE_INT(Bots, MinDelayBetweenInCombatCastAttempts, 500, "The minimum delay in m
 RULE_INT(Bots, MaxDelayBetweenInCombatCastAttempts, 2000, "The maximum delay in milliseconds between cast attempts while in-combat. This is rolled between the min and max. Default 2500ms.")
 RULE_INT(Bots, MinDelayBetweenOutCombatCastAttempts, 1000, "The minimum delay in milliseconds between cast attempts while out-of-combat. This is rolled between the min and max. Default 1000ms.")
 RULE_INT(Bots, MaxDelayBetweenOutCombatCastAttempts, 2500, "The maximum delay in milliseconds between cast attempts while out-of-combat. This is rolled between the min and max. Default 2500ms.")
+RULE_INT(Bots, MezChance, 60, "60 Default. Chance for a bot to attempt to Mez a target after validating it is eligible.")
+RULE_INT(Bots, AEMezChance, 35, "35 Default. Chance for a bot to attempt to AE Mez targets after validating they are eligible.")
 RULE_INT(Bots, MezSuccessDelay, 2500, "2500 (2.5 sec) Default. Delay between successful Mez attempts.")
 RULE_INT(Bots, AEMezSuccessDelay, 5000, "5000 (5 sec) Default. Delay between successful AEMez attempts.")
 RULE_INT(Bots, MezFailDelay, 1250, "1250 (1.25 sec) Default. Delay between failed Mez attempts.")
@@ -854,7 +843,7 @@ RULE_BOOL(Bots, AllowCastAAs, true, "If enabled, players can use ^cast aa to cas
 RULE_BOOL(Bots, AllowMagicianEpicPet, false, "If enabled, magician bots can summon their epic pets following the rules AllowMagicianEpicPetLevel")
 RULE_INT(Bots, AllowMagicianEpicPetLevel, 50, "If AllowMagicianEpicPet is enabled, bots can start using their epic pets at this level")
 RULE_INT(Bots, RequiredMagicianEpicPetItemID, 28034, "If AllowMagicianEpicPet is enabled and this is set, bots will be required to have this item ID equipped to cast their epic. Takes in to account AllowMagicianEpicPetLevel as well. Set to 0 to disable requirement")
-RULE_STRING(Bots, EpicPetSpellName, "", "'teleport_zone' in the spell to be cast for epic pets. This must be in their usable spell list to cast. Empty uses Manifest Elements - 'SumMageMultiElement'")
+RULE_STRING(Bots, EpicPetSpellName, "", "'teleport_zone' in the spell to be cast for epic pets. This must be in their spell list to cast.")
 RULE_INT(Bots, ReclaimEnergySpellID, 331, "Spell ID for reclaim energy when using ^petsettype. Default 331")
 RULE_BOOL(Bots, UseSpellPulling, true, "If enabled bots will use a spell to pull when within range. Uses PullSpellID.")
 RULE_INT(Bots, PullSpellID, 5225, "Default 5225 - Throw Stone. Spell that will be cast to pull by bots")
@@ -865,7 +854,15 @@ RULE_BOOL(Bots, BotArcheryConsumesAmmo, true, "Set to false to disable Archery A
 RULE_BOOL(Bots, BotThrowingConsumesAmmo, true, "Set to false to disable Throwing Ammo Consumption")
 RULE_INT(Bots, StackSizeMin, 20, "20 Default. -1 to disable and use default max stack size. Minimum stack size to give a bot (Arrows/Throwing).")
 RULE_INT(Bots, HasOrMayGetAggroThreshold, 90, "90 Default. Percent threshold of total hate where bots will stop casting spells that generate hate if they are set to try to not pull aggro via spells.")
+RULE_REAL(Bots, LowerMeleeDistanceMultiplier, 0.35, "Closest % of the hit box a melee bot will get to the target. Default 0.35")
+RULE_REAL(Bots, LowerTauntingMeleeDistanceMultiplier, 0.25, "Closest % of the hit box a taunting melee bot will get to the target. Default 0.25")
+RULE_REAL(Bots, LowerMaxMeleeRangeDistanceMultiplier, 0.80, "Closest % of the hit box a max melee range melee bot will get to the target. Default 0.80")
+RULE_REAL(Bots, UpperMeleeDistanceMultiplier, 0.55, "Furthest % of the hit box a melee bot will get from the target. Default 0.55")
+RULE_REAL(Bots, UpperTauntingMeleeDistanceMultiplier, 0.45, "Furthest % of the hit box a taunting melee bot will get from the target. Default 0.45")
+RULE_REAL(Bots, UpperMaxMeleeRangeDistanceMultiplier, 0.95, "Furthest % of the hit box a max melee range melee bot will get from the target. Default 0.95")
 RULE_BOOL(Bots, DisableSpecialAbilitiesAtMaxMelee, true, "If true, when bots are at max melee distance, special abilities including taunt will be disabled. Default True.")
+RULE_BOOL(Bots, TauntingBotsFollowTopHate, true, "True Default. If true, bots that are taunting will attempt to stick with whoever currently is top hate.")
+RULE_INT(Bots, DistanceTauntingBotsStickMainHate, 10, "If TauntingBotsFollowTopHate is enabled, this is the distance bots will try to stick to whoever currently is Top Hate.")
 RULE_INT(Bots, MinJitterTimer, 500, "Minimum ms between bot movement jitter checks.")
 RULE_INT(Bots, MaxJitterTimer, 2500, "Maximum ms between bot movement jitter checks. Set to 0 to disable timer checks.")
 RULE_BOOL(Bots, PreventBotCampOnFD, true, "True Default. If true, players will not be able to camp bots while feign death.")
@@ -885,7 +882,6 @@ RULE_INT(Bots, MinStatusToBypassSpawnLimit, 100, "Minimum status to bypass spawn
 RULE_INT(Bots, MinStatusBypassSpawnLimit, 120, "Spawn limit with status bypass. Default 120.")
 RULE_INT(Bots, MinStatusToBypassCreateLimit, 100, "Minimum status to bypass create limit. Default 100.")
 RULE_INT(Bots, MinStatusBypassCreateLimit, 120, "Create limit with status bypass. Default 120.")
-RULE_INT(Bots, MinStatusToBypassBotLevelRequirement, 100, "Minimum status to bypass level requirement for bots. Default 100.")
 RULE_BOOL(Bots, EnableBotTGB, true, "If enabled bots will cast group buffs as TGB.")
 RULE_BOOL(Bots, DoResponseAnimations, true, "If enabled bots will do animations to certain responses or commands.")
 RULE_INT(Bots, DefaultFollowDistance, 20, "Default 20. Distance a bot will follow behind.")
@@ -907,7 +903,6 @@ RULE_STRING(Bots, ZonesWithForcedSpawnLimits, "", "Comma-delimited list of zones
 RULE_STRING(Bots, ZoneForcedSpawnLimits, "", "Comma-delimited list of forced spawn limits for zones.")
 RULE_INT(Bots, AICastSpellTypeDelay, 100, "Delay in milliseconds between AI cast attempts for each spell type. Default 100ms")
 RULE_INT(Bots, AICastSpellTypeHeldDelay, 2500, "Delay in milliseconds between AI cast attempts for each spell type that is held or disabled. Default 2500ms (2.5s)")
-RULE_BOOL(Bots, BotsRequireLoS, true, "Whether or not bots require line of sight to be told to attack their target")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Chat)
@@ -931,7 +926,6 @@ RULE_BOOL(Chat, AutoInjectSaylinksToSay, true, "Automatically injects saylinks i
 RULE_BOOL(Chat, AutoInjectSaylinksToClientMessage, true, "Automatically injects saylinks into dialogue that has [brackets in them]")
 RULE_BOOL(Chat, QuestDialogueUsesDialogueWindow, false, "Pipes all quest dialogue to dialogue window")
 RULE_BOOL(Chat, DialogueWindowAnimatesNPCsIfNoneSet, true, "If there is no animation specified in the dialogue window markdown then it will choose a random greet animation such as wave or salute")
-RULE_BOOL(Chat, AlwaysCaptureCommandText, false, "Consume command text (# and ^ by default), regardless of which channel it is sent to")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Merchant)
@@ -1079,7 +1073,6 @@ RULE_CATEGORY(Logging)
 RULE_BOOL(Logging, PrintFileFunctionAndLine, false, "Ex: [World Server] [net.cpp::main:309] Loading variables...")
 RULE_BOOL(Logging, WorldGMSayLogging, true, "Relay worldserver logging to zone processes via GM say output")
 RULE_BOOL(Logging, PlayerEventsQSProcess, false, "Have query server process player events instead of world. Useful when wanting to use a dedicated server and database for processing player events on separate disk")
-RULE_STRING(Logging, PlayerEventsIgnoreGMCommands, "help,show", "This is a comma delimited list of commands to ignore when recording GM command player events.")
 RULE_INT(Logging, BatchPlayerEventProcessIntervalSeconds, 5, "This is the interval in which player events are processed in world or qs")
 RULE_INT(Logging, BatchPlayerEventProcessChunkSize, 10000, "This is the cap of events that can be inserted into the queue before a force flush. This is to keep from hitting MySQL max_allowed_packet and killing the connection")
 RULE_CATEGORY_END()
@@ -1101,7 +1094,6 @@ RULE_CATEGORY(Instances)
 RULE_INT(Instances, ReservedInstances, 100, "Number of instance IDs which are reserved for globals. This value should not be changed while a server is running")
 RULE_BOOL(Instances, RecycleInstanceIds, true, "Setting whether free instance IDs should be recycled to prevent them from gradually running out at 32k")
 RULE_INT(Instances, GuildHallExpirationDays, 90, "Amount of days before a Guild Hall instance expires")
-RULE_INT(Instances, ExpireOffsetTimeSeconds, 3600, "Amount of seconds to beyond instance expiration time we wait to purge the entry from the database. (Default: 1 Hour)")
 RULE_CATEGORY_END()

 RULE_CATEGORY(Expedition)
@@ -22,7 +22,6 @@ namespace ServerReload {
 		LevelEXPMods,
 		Logs,
 		Loot,
-		Maps,
 		Merchants,
 		NPCEmotes,
 		NPCSpells,
@@ -62,7 +61,6 @@ namespace ServerReload {
 		"Level EXP Mods",
 		"Logs",
 		"Loot",
-		"Maps",
 		"Merchants",
 		"NPC Emotes",
 		"NPC Spells",
@@ -273,9 +273,8 @@
 #define ServerOP_WWTaskUpdate 0x4758

 // player events
-#define ServerOP_QSSendQuery 0x5000
+#define ServerOP_QSSendQuery		0x5000
 #define ServerOP_PlayerEvent 0x5100
-#define ServerOP_SendPlayerEventSettings 0x5101

 enum {
 	CZUpdateType_Character,
@@ -1779,7 +1778,6 @@ struct BazaarPurchaseMessaging_Struct {
 	uint32           id;
 };

-
 #pragma pack()

 #endif
@@ -48,7 +48,7 @@ enum class SharedTaskRequestGroupType {
 struct ServerSharedTaskRequest_Struct {
 	uint32 requested_character_id;
 	uint32 requested_task_id;
-	uint32 requested_npc_entity_id; // original task logic passthrough
+	uint32 requested_npc_type_id; // original task logic passthrough
 	uint32 accept_time;
 };

@@ -51,10 +51,19 @@
 #include "repositories/inventory_repository.h"
 #include "repositories/books_repository.h"
 #include "repositories/sharedbank_repository.h"
-#include "repositories/character_inspect_messages_repository.h"
-#include "repositories/spells_new_repository.h"
-#include "repositories/damageshieldtypes_repository.h"
-#include "repositories/items_repository.h"
+
+namespace ItemField
+{
+	enum {
+		source = 0,
+#define F(x) x,
+#include "item_fieldlist.h"
+#undef F
+		updated,
+		minstatus,
+		comment,
+	};
+}

 SharedDatabase::SharedDatabase()
 : Database()
@@ -122,41 +131,66 @@ bool SharedDatabase::SetGMFlymode(uint32 account_id, uint8 flymode)
 	return a.id > 0;
 }

-void SharedDatabase::SetMailKey(uint32 character_id, uint32 ip_address, uint32 mail_key)
+uint32 SharedDatabase::GetTotalTimeEntitledOnAccount(uint32 AccountID) {
+	uint32 EntitledTime = 0;
+	const std::string query = StringFormat("SELECT `time_played` FROM `character_data` WHERE `account_id` = %u", AccountID);
+	auto results = QueryDatabase(query);
+	for (auto& row = results.begin(); row != results.end(); ++row) {
+		EntitledTime += Strings::ToUnsignedInt(row[0]);
+	}
+	return EntitledTime;
+}
+
+void SharedDatabase::SetMailKey(int CharID, int IPAddress, int MailKey)
 {
-	std::string full_mail_key;
+	char mail_key[17];

-	if (RuleB(Chat, EnableMailKeyIPVerification)) {
-		full_mail_key = fmt::format("{:08X}{:08X}", ip_address, mail_key);
-	} else {
-		full_mail_key = fmt::format("{:08X}", mail_key);
+	if (RuleB(Chat, EnableMailKeyIPVerification) == true) {
+		sprintf(mail_key, "%08X%08X", IPAddress, MailKey);
+	}
+	else {
+		sprintf(mail_key, "%08X", MailKey);
 	}

-	auto e = CharacterDataRepository::FindOne(*this, character_id);
-	if (!e.id) {
-		LogError("Failed to find character_id [{}] when setting mailkey", character_id);
-		return;
-	}
+	const std::string query = StringFormat(
+		"UPDATE character_data SET mailkey = '%s' WHERE id = '%i'",
+		mail_key, CharID
+	);

-	e.mailkey = full_mail_key;
-
-	if (!CharacterDataRepository::UpdateOne(*this, e)) {
-		LogError("Failed to set mailkey to [{}] for character_id [{}]", full_mail_key, character_id);
+	const auto        results = QueryDatabase(query);
+	if (!results.Success()) {
+		LogError("SharedDatabase::SetMailKey({}, {}) : {}", CharID, mail_key, results.ErrorMessage().c_str());
 	}
 }

-SharedDatabase::MailKeys SharedDatabase::GetMailKey(uint32 character_id)
+SharedDatabase::MailKeys SharedDatabase::GetMailKey(int character_id)
 {
-	auto e = CharacterDataRepository::FindOne(*this, character_id);
-
-	if (!e.id) {
-		return MailKeys{ };
+	const std::string query   = StringFormat("SELECT `mailkey` FROM `character_data` WHERE `id`='%i' LIMIT 1", character_id);
+	auto              results = QueryDatabase(query);
+	if (!results.Success()) {
+		return MailKeys{};
 	}

-	return MailKeys{
-		.mail_key = e.mailkey.substr(8),
-		.mail_key_full = e.mailkey
-	};
+	if (!results.RowCount()) {
+		Log(Logs::General,
+			Logs::ClientLogin,
+			"Error: Mailkey for character id [%i] does not exist or could not be found",
+			character_id
+		);
+		return MailKeys{};
+	}
+
+	auto &row = results.begin();
+	if (row != results.end()) {
+		std::string mail_key = row[0];
+
+		return MailKeys{
+			.mail_key = mail_key.substr(8),
+			.mail_key_full = mail_key
+		};
+	}
+
+	return MailKeys{};
 }

 bool SharedDatabase::SaveCursor(
@@ -423,20 +457,27 @@ bool SharedDatabase::DeleteSharedBankSlot(uint32 char_id, int16 slot_id)
 	);
 }

+
 int32 SharedDatabase::GetSharedPlatinum(uint32 account_id)
 {
-	const auto& e = AccountRepository::FindOne(*this, account_id);
+	const auto query   = fmt::format("SELECT sharedplat FROM account WHERE id = {}", account_id);
+	auto       results = QueryDatabase(query);
+	if (!results.Success() || !results.RowCount()) {
+		return 0;
+	}

-	return e.sharedplat;
+	auto row = results.begin();
+	return Strings::ToInt(row[0]);
 }

-bool SharedDatabase::AddSharedPlatinum(uint32 account_id, int amount)
-{
-	auto e = AccountRepository::FindOne(*this, account_id);
+bool SharedDatabase::SetSharedPlatinum(uint32 account_id, int32 amount_to_add) {
+	const std::string query = StringFormat("UPDATE account SET sharedplat = sharedplat + %i WHERE id = %i", amount_to_add, account_id);
+	const auto results = QueryDatabase(query);
+	if (!results.Success()) {
+		return false;
+	}

-	e.sharedplat += amount;
-
-	return AccountRepository::UpdateOne(*this, e);
+	return true;
 }

 bool SharedDatabase::SetStartingItems(
@@ -783,7 +824,7 @@ bool SharedDatabase::GetInventory(Client *c)
 				e.character_id  = char_id;
 				e.item_id       = item_id;
 				e.equipped      = inst->GetEvolveEquipped();
-				e.final_item_id = EvolvingItemsManager::Instance()->GetFinalItemID(*inst);
+				e.final_item_id = evolving_items_manager.GetFinalItemID(*inst);

 				auto r = CharacterEvolvingItemsRepository::InsertOne(*this, e);
 				e.id = r.id;
@@ -903,10 +944,27 @@ void SharedDatabase::ClearOldRecastTimestamps(uint32 char_id)
 	);
 }

-void SharedDatabase::GetItemsCount(int32& item_count, uint32& max_id)
+void SharedDatabase::GetItemsCount(int32 &item_count, uint32 &max_id)
 {
-	max_id     = ItemsRepository::GetMaxId(*this);
-	item_count = ItemsRepository::Count(*this);
+	item_count = -1;
+	max_id = 0;
+
+	const std::string query = "SELECT MAX(id), count(*) FROM items";
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
+		return;
+	}
+
+	if (results.RowCount() == 0)
+		return;
+
+	auto& row = results.begin();
+
+	if (row[0])
+		max_id = Strings::ToUnsignedInt(row[0]);
+
+	if (row[1])
+		item_count = Strings::ToUnsignedInt(row[1]);
 }

 bool SharedDatabase::LoadItems(const std::string &prefix) {
@@ -916,7 +974,7 @@ bool SharedDatabase::LoadItems(const std::string &prefix) {
 		const auto Config = EQEmuConfig::get();
 		EQ::IPCMutex mutex("items");
 		mutex.Lock();
-		std::string file_name = fmt::format("{}/{}{}", PathManager::Instance()->GetSharedMemoryPath(), prefix, std::string("items"));
+		std::string file_name = fmt::format("{}/{}{}", path.GetSharedMemoryPath(), prefix, std::string("items"));
 		items_mmf = std::make_unique<EQ::MemoryMappedFile>(file_name);
 		items_hash = std::make_unique<EQ::FixedMemoryHashSet<EQ::ItemData>>(static_cast<uint8*>(items_mmf->Get()), items_mmf->Size());
 		mutex.Unlock();
@@ -936,14 +994,14 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_

 	std::string variable_buffer;

-	bool disable_attuneable          = RuleB(Items, DisableAttuneable);
-	bool disable_bard_focus_effects  = RuleB(Items, DisableBardFocusEffects);
-	bool disable_lore                = RuleB(Items, DisableLore);
-	bool disable_no_drop             = RuleB(Items, DisableNoDrop);
-	bool disable_no_pet              = RuleB(Items, DisableNoPet);
-	bool disable_no_rent             = RuleB(Items, DisableNoRent);
-	bool disable_no_transfer         = RuleB(Items, DisableNoTransfer);
-	bool disable_potion_belt         = RuleB(Items, DisablePotionBelt);
+	bool disable_attuneable = RuleB(Items, DisableAttuneable);
+	bool disable_bard_focus_effects = RuleB(Items, DisableBardFocusEffects);
+	bool disable_lore = RuleB(Items, DisableLore);
+	bool disable_no_drop = RuleB(Items, DisableNoDrop);
+	bool disable_no_pet = RuleB(Items, DisableNoPet);
+	bool disable_no_rent = RuleB(Items, DisableNoRent);
+	bool disable_no_transfer = RuleB(Items, DisableNoTransfer);
+	bool disable_potion_belt = RuleB(Items, DisablePotionBelt);
 	bool disable_spell_focus_effects = RuleB(Items, DisableSpellFocusEffects);

 	// Old Variable Code
@@ -974,204 +1032,206 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_

 	EQ::ItemData item;

-	const auto& l = ItemsRepository::All(*this);
-
-	if (l.empty()) {
+	const std::string query = "SELECT source,"
+#define F(x) "`"#x"`,"
+#include "item_fieldlist.h"
+#undef F
+		"updated, minstatus, comment FROM items ORDER BY id";
+	auto results = QueryDatabase(query);
+	if (!results.Success()) {
 		return;
 	}

-	for (const auto& e : l) {
+	for (auto& row = results.begin(); row != results.end(); ++row) {
 		memset(&item, 0, sizeof(EQ::ItemData));

 		// Unique Identifier
-		item.ID = e.id;
+		item.ID = Strings::ToUnsignedInt(row[ItemField::id]);

 		// Minimum Status
-		item.MinStatus = static_cast<uint8>(e.minstatus);
+		item.MinStatus = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::minstatus]));

 		// Name, Lore, and Comment
-		strn0cpy(item.Name, e.Name.c_str(), sizeof(item.Name));
-		strn0cpy(item.Lore, e.lore.c_str(), sizeof(item.Lore));
-		strn0cpy(item.Comment, e.comment.c_str(), sizeof(item.Comment));
+		strn0cpy(item.Name, row[ItemField::name], sizeof(item.Name));
+		strn0cpy(item.Lore, row[ItemField::lore], sizeof(item.Lore));
+		strn0cpy(item.Comment, row[ItemField::comment], sizeof(item.Comment));

 		// Flags
-		item.ArtifactFlag    = e.artifactflag;
-		item.Attuneable      = !disable_attuneable && e.attuneable;
-		item.BenefitFlag     = e.benefitflag;
-		item.FVNoDrop        = e.fvnodrop;
-		item.Magic           = e.magic;
-		item.NoDrop          = disable_no_drop ? std::numeric_limits<uint8>::max() : e.nodrop;
-		item.NoPet           = !disable_no_pet && e.nopet;
-		item.NoRent          = disable_no_rent ? std::numeric_limits<uint8>::max() : e.norent;
-		item.NoTransfer      = !disable_no_transfer && e.notransfer;
-		item.PendingLoreFlag = e.pendingloreflag;
-		item.QuestItemFlag   = e.questitemflag;
-		item.Stackable       = e.stackable;
-		item.Tradeskills     = e.tradeskills;
-		item.SummonedFlag    = e.summonedflag;
+		item.ArtifactFlag = Strings::ToBool(row[ItemField::artifactflag]);
+		item.Attuneable = !disable_attuneable && Strings::ToBool(row[ItemField::attuneable]);
+		item.BenefitFlag = Strings::ToBool(row[ItemField::benefitflag]);
+		item.FVNoDrop = Strings::ToBool(row[ItemField::fvnodrop]);
+		item.Magic = Strings::ToBool(row[ItemField::magic]);
+		item.NoDrop = disable_no_drop ? static_cast<uint8>(255) : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::nodrop]));
+		item.NoPet = !disable_no_pet && Strings::ToBool(row[ItemField::nopet]);
+		item.NoRent = disable_no_rent ? static_cast<uint8>(255) : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::norent]));
+		item.NoTransfer = !disable_no_transfer && Strings::ToBool(row[ItemField::notransfer]);
+		item.PendingLoreFlag = Strings::ToBool(row[ItemField::pendingloreflag]);
+		item.QuestItemFlag = Strings::ToBool(row[ItemField::questitemflag]);
+		item.Stackable = Strings::ToBool(row[ItemField::stackable]);
+		item.Tradeskills = Strings::ToBool(row[ItemField::tradeskills]);
+		item.SummonedFlag = Strings::ToBool(row[ItemField::summonedflag]);

 		// Lore
-		item.LoreGroup = disable_lore ? 0 : e.loregroup;
-		item.LoreFlag  = !disable_lore && item.LoreGroup != 0;
+		item.LoreGroup = disable_lore ? 0 : Strings::ToInt(row[ItemField::loregroup]);
+		item.LoreFlag = !disable_lore && item.LoreGroup != 0;

 		// Type
-		item.AugType  = e.augtype;
-		item.ItemType = static_cast<uint8>(e.itemtype);
-		item.SubType  = e.subtype;
+		item.AugType = Strings::ToUnsignedInt(row[ItemField::augtype]);
+		item.ItemType = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::itemtype]));
+		item.SubType = Strings::ToInt(row[ItemField::subtype]);

 		// Miscellaneous
-		item.ExpendableArrow = e.expendablearrow;
-		item.Light           = EQ::Clamp(e.light, -128, 127);
-		item.MaxCharges      = e.maxcharges;
-		item.Size            = static_cast<uint8>(e.size);
-		item.StackSize       = e.stacksize;
-		item.Weight          = e.weight;
+		item.ExpendableArrow = static_cast<uint16>(Strings::ToUnsignedInt(row[ItemField::expendablearrow]));
+		item.Light = static_cast<int8>(Strings::ToInt(row[ItemField::light]));
+		item.MaxCharges = static_cast<int16>(Strings::ToInt(row[ItemField::maxcharges]));
+		item.Size = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::size]));
+		item.StackSize = static_cast<int16>(Strings::ToInt(row[ItemField::stacksize]));
+		item.Weight = Strings::ToInt(row[ItemField::weight]);

 		// Potion Belt
-		item.PotionBelt      = !disable_potion_belt && e.potionbelt;
-		item.PotionBeltSlots = disable_potion_belt ? 0 : static_cast<uint8>(e.potionbeltslots);
+		item.PotionBelt = !disable_potion_belt && Strings::ToBool(row[ItemField::potionbelt]);
+		item.PotionBeltSlots = disable_potion_belt ? 0 : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::potionbeltslots]));

 		// Merchant
-		item.Favor      = e.favor;
-		item.GuildFavor = e.guildfavor;
-		item.Price      = e.price;
-		item.SellRate   = e.sellrate;
+		item.Favor = Strings::ToUnsignedInt(row[ItemField::favor]);
+		item.GuildFavor = Strings::ToUnsignedInt(row[ItemField::guildfavor]);
+		item.Price = Strings::ToUnsignedInt(row[ItemField::price]);
+		item.SellRate = Strings::ToFloat(row[ItemField::sellrate]);

 		// Display
-		item.Color           = e.color;
-		item.EliteMaterial   = e.elitematerial;
-		item.HerosForgeModel = e.herosforgemodel;
-		item.Icon            = e.icon;
-		strn0cpy(item.IDFile, e.idfile.c_str(), sizeof(item.IDFile));
-		item.Material = e.material;
+		item.Color = Strings::ToUnsignedInt(row[ItemField::color]);
+		item.EliteMaterial = Strings::ToUnsignedInt(row[ItemField::elitematerial]);
+		item.HerosForgeModel = Strings::ToUnsignedInt(row[ItemField::herosforgemodel]);
+		item.Icon = Strings::ToUnsignedInt(row[ItemField::icon]);
+		strn0cpy(item.IDFile, row[ItemField::idfile], sizeof(item.IDFile));
+		item.Material = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::material]));

 		// Resists
-		item.CR           = EQ::Clamp(e.cr, -128, 127);
-		item.DR           = EQ::Clamp(e.dr, -128, 127);
-		item.FR           = EQ::Clamp(e.fr, -128, 127);
-		item.MR           = EQ::Clamp(e.mr, -128, 127);
-		item.PR           = EQ::Clamp(e.pr, -128, 127);
-		item.SVCorruption = EQ::Clamp(e.svcorruption, -128, 127);
+		item.CR = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::cr]), -128, 127));
+		item.DR = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::dr]), -128, 127));
+		item.FR = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::fr]), -128, 127));
+		item.MR = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::mr]), -128, 127));
+		item.PR = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::pr]), -128, 127));
+		item.SVCorruption = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::svcorruption]), -128, 127));

 		// Heroic Resists
-		item.HeroicCR       = e.heroic_cr;
-		item.HeroicDR       = e.heroic_dr;
-		item.HeroicFR       = e.heroic_fr;
-		item.HeroicMR       = e.heroic_mr;
-		item.HeroicPR       = e.heroic_pr;
-		item.HeroicSVCorrup = e.heroic_svcorrup;
+		item.HeroicCR = Strings::ToInt(row[ItemField::heroic_cr]);
+		item.HeroicDR = Strings::ToInt(row[ItemField::heroic_dr]);
+		item.HeroicFR = Strings::ToInt(row[ItemField::heroic_fr]);
+		item.HeroicMR = Strings::ToInt(row[ItemField::heroic_mr]);
+		item.HeroicPR = Strings::ToInt(row[ItemField::heroic_pr]);
+		item.HeroicSVCorrup = Strings::ToInt(row[ItemField::heroic_svcorrup]);

 		// Stats
-		item.AAgi = EQ::Clamp(e.aagi, -128, 127);
-		item.ACha = EQ::Clamp(e.acha, -128, 127);
-		item.ADex = EQ::Clamp(e.adex, -128, 127);
-		item.AInt = EQ::Clamp(e.aint, -128, 127);
-		item.ASta = EQ::Clamp(e.asta, -128, 127);
-		item.AStr = EQ::Clamp(e.astr, -128, 127);
-		item.AWis = EQ::Clamp(e.awis, -128, 127);
+		item.AAgi = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::aagi]), -128, 127));
+		item.ACha = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::acha]), -128, 127));
+		item.ADex = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::adex]), -128, 127));
+		item.AInt = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::aint]), -128, 127));
+		item.ASta = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::asta]), -128, 127));
+		item.AStr = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::astr]), -128, 127));
+		item.AWis = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::awis]), -128, 127));

 		// Heroic Stats
-		item.HeroicAgi = e.heroic_agi;
-		item.HeroicCha = e.heroic_cha;
-		item.HeroicDex = e.heroic_dex;
-		item.HeroicInt = e.heroic_int;
-		item.HeroicSta = e.heroic_sta;
-		item.HeroicStr = e.heroic_str;
-		item.HeroicWis = e.heroic_wis;
+		item.HeroicAgi = Strings::ToInt(row[ItemField::heroic_agi]);
+		item.HeroicCha = Strings::ToInt(row[ItemField::heroic_cha]);
+		item.HeroicDex = Strings::ToInt(row[ItemField::heroic_dex]);
+		item.HeroicInt = Strings::ToInt(row[ItemField::heroic_int]);
+		item.HeroicSta = Strings::ToInt(row[ItemField::heroic_sta]);
+		item.HeroicStr = Strings::ToInt(row[ItemField::heroic_str]);
+		item.HeroicWis = Strings::ToInt(row[ItemField::heroic_wis]);

 		// Health, Mana, and Endurance
-		item.HP             = e.hp;
-		item.Regen          = e.regen;
-		item.Mana           = e.mana;
-		item.ManaRegen      = e.manaregen;
-		item.Endur          = e.endur;
-		item.EnduranceRegen = e.enduranceregen;
+		item.HP = Strings::ToInt(row[ItemField::hp]);
+		item.Regen = Strings::ToInt(row[ItemField::regen]);
+		item.Mana = Strings::ToInt(row[ItemField::mana]);
+		item.ManaRegen = Strings::ToInt(row[ItemField::manaregen]);
+		item.Endur = Strings::ToInt(row[ItemField::endur]);
+		item.EnduranceRegen = Strings::ToInt(row[ItemField::enduranceregen]);

 		// Bane Damage
-		item.BaneDmgAmt     = e.banedmgamt;
-		item.BaneDmgBody    = e.banedmgbody;
-		item.BaneDmgRace    = e.banedmgrace;
-		item.BaneDmgRaceAmt = e.banedmgraceamt;
+		item.BaneDmgAmt = Strings::ToInt(row[ItemField::banedmgamt]);
+		item.BaneDmgBody = Strings::ToUnsignedInt(row[ItemField::banedmgbody]);
+		item.BaneDmgRace = Strings::ToUnsignedInt(row[ItemField::banedmgrace]);
+		item.BaneDmgRaceAmt = Strings::ToUnsignedInt(row[ItemField::banedmgraceamt]);

 		// Elemental Damage
-		item.ElemDmgType = static_cast<uint8>(e.elemdmgtype);
-		item.ElemDmgAmt  = static_cast<uint8>(e.elemdmgamt);
+		item.ElemDmgType = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::elemdmgtype]));
+		item.ElemDmgAmt = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::elemdmgamt]));

 		// Combat
-		item.BackstabDmg = e.backstabdmg;
-		item.Damage      = e.damage;
-		item.Delay       = static_cast<uint8>(e.delay);
-		item.Range       = static_cast<uint8>(e.range_);
+		item.BackstabDmg = Strings::ToUnsignedInt(row[ItemField::backstabdmg]);
+		item.Damage = Strings::ToUnsignedInt(row[ItemField::damage]);
+		item.Delay = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::delay]));
+		item.Range = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::range]));

 		// Combat Stats
-		item.AC           = e.ac;
-		item.Accuracy     = EQ::Clamp(e.accuracy, -128, 127);
-		item.Attack       = e.attack;
-		item.Avoidance    = EQ::Clamp(e.avoidance, -128, 127);
-		item.Clairvoyance = e.clairvoyance;
-		item.CombatEffects = Strings::IsNumber(e.combateffects) ? static_cast<int8>(EQ::Clamp(Strings::ToInt(e.combateffects), -128, 127)) : 0;
-		item.DamageShield  = e.damageshield;
-		item.DotShielding  = e.dotshielding;
-		item.DSMitigation  = e.dsmitigation;
-		item.Haste         = e.haste;
-		item.HealAmt       = e.healamt;
-		item.Purity        = e.purity;
-		item.Shielding     = EQ::Clamp(e.shielding, -128, 127);
-		item.SpellDmg      = e.spelldmg;
-		item.SpellShield   = EQ::Clamp(e.spellshield, -128, 127);
-		item.StrikeThrough = EQ::Clamp(e.strikethrough, -128, 127);
-		item.StunResist    = EQ::Clamp(e.stunresist, -128, 127);
+		item.AC = Strings::ToInt(row[ItemField::ac]);
+		item.Accuracy = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::accuracy]), -128, 127));
+		item.Attack = Strings::ToInt(row[ItemField::attack]);
+		item.Avoidance = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::avoidance]), -128, 127));
+		item.Clairvoyance = Strings::ToUnsignedInt(row[ItemField::clairvoyance]);
+		item.CombatEffects = Strings::IsNumber(row[ItemField::combateffects]) ? static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::combateffects]), -128, 127)) : 0;
+		item.DamageShield = Strings::ToInt(row[ItemField::damageshield]);
+		item.DotShielding = Strings::ToInt(row[ItemField::dotshielding]);
+		item.DSMitigation = Strings::ToUnsignedInt(row[ItemField::dsmitigation]);
+		item.Haste = Strings::ToInt(row[ItemField::haste]);
+		item.HealAmt = Strings::ToInt(row[ItemField::healamt]);
+		item.Purity = Strings::ToUnsignedInt(row[ItemField::purity]);
+		item.Shielding = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::shielding]), -128, 127));
+		item.SpellDmg = Strings::ToInt(row[ItemField::spelldmg]);
+		item.SpellShield = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::spellshield]), -128, 127));
+		item.StrikeThrough = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::strikethrough]), -128, 127));
+		item.StunResist = static_cast<int8>(EQ::Clamp(Strings::ToInt(row[ItemField::stunresist]), -128, 127));

 		// Restrictions
-		item.AugRestrict = e.augrestrict;
-		item.Classes     = e.classes;
-		item.Deity       = e.deity;
-		item.ItemClass   = static_cast<uint8>(e.itemclass);
-		item.Races       = e.races;
-		item.RecLevel    = static_cast<uint8>(e.reclevel);
-		item.RecSkill    = static_cast<uint8>(e.recskill);
-		item.ReqLevel    = static_cast<uint8>(e.reqlevel);
-		item.Slots       = e.slots;
+		item.AugRestrict = Strings::ToUnsignedInt(row[ItemField::augrestrict]);
+		item.Classes = Strings::ToUnsignedInt(row[ItemField::classes]);
+		item.Deity = Strings::ToUnsignedInt(row[ItemField::deity]);
+		item.ItemClass = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::itemclass]));
+		item.Races = Strings::ToUnsignedInt(row[ItemField::races]);
+		item.RecLevel = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::reclevel]));
+		item.RecSkill = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::recskill]));
+		item.ReqLevel = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::reqlevel]));
+		item.Slots = Strings::ToUnsignedInt(row[ItemField::slots]);

 		// Skill Modifier
-		item.SkillModValue = e.skillmodvalue;
-		item.SkillModMax   = e.skillmodmax;
-		item.SkillModType  = e.skillmodtype;
+		item.SkillModValue = Strings::ToInt(row[ItemField::skillmodvalue]);
+		item.SkillModMax = Strings::ToInt(row[ItemField::skillmodmax]);
+		item.SkillModType = Strings::ToUnsignedInt(row[ItemField::skillmodtype]);

 		// Extra Damage Skill
-		item.ExtraDmgSkill = e.extradmgskill;
-		item.ExtraDmgAmt   = e.extradmgamt;
+		item.ExtraDmgSkill = Strings::ToInt(row[ItemField::extradmgskill]);
+		item.ExtraDmgAmt = Strings::ToInt(row[ItemField::extradmgamt]);

 		// Bard
-		item.BardType  = e.bardtype;
-		item.BardValue = e.bardvalue;
+		item.BardType = Strings::ToUnsignedInt(row[ItemField::bardtype]);
+		item.BardValue = Strings::ToInt(row[ItemField::bardvalue]);

 		// Faction
-		item.FactionAmt1 = e.factionamt1;
-		item.FactionMod1 = e.factionmod1;
-		item.FactionAmt2 = e.factionamt2;
-		item.FactionMod2 = e.factionmod2;
-		item.FactionAmt3 = e.factionamt3;
-		item.FactionMod3 = e.factionmod3;
-		item.FactionAmt4 = e.factionamt4;
-		item.FactionMod4 = e.factionmod4;
+		item.FactionAmt1 = Strings::ToInt(row[ItemField::factionamt1]);
+		item.FactionMod1 = Strings::ToInt(row[ItemField::factionmod1]);
+		item.FactionAmt2 = Strings::ToInt(row[ItemField::factionamt2]);
+		item.FactionMod2 = Strings::ToInt(row[ItemField::factionmod2]);
+		item.FactionAmt3 = Strings::ToInt(row[ItemField::factionamt3]);
+		item.FactionMod3 = Strings::ToInt(row[ItemField::factionmod3]);
+		item.FactionAmt4 = Strings::ToInt(row[ItemField::factionamt4]);
+		item.FactionMod4 = Strings::ToInt(row[ItemField::factionmod4]);

-		// Augment Distiller
-		item.AugDistiller = e.augdistiller;
-
-		// Augment Slots
-		item.AugSlotType[0]    = static_cast<uint8>(e.augslot1type);
-		item.AugSlotVisible[0] = static_cast<uint8>(e.augslot1visible);
-		item.AugSlotType[1]    = static_cast<uint8>(e.augslot2type);
-		item.AugSlotVisible[1] = static_cast<uint8>(e.augslot2visible);
-		item.AugSlotType[2]    = static_cast<uint8>(e.augslot3type);
-		item.AugSlotVisible[2] = static_cast<uint8>(e.augslot3visible);
-		item.AugSlotType[3]    = static_cast<uint8>(e.augslot4type);
-		item.AugSlotVisible[3] = static_cast<uint8>(e.augslot4visible);
-		item.AugSlotType[4]    = static_cast<uint8>(e.augslot5type);
-		item.AugSlotVisible[4] = static_cast<uint8>(e.augslot5visible);
-		item.AugSlotType[5]    = static_cast<uint8>(e.augslot6type);
-		item.AugSlotVisible[5] = static_cast<uint8>(e.augslot6visible);
+		// Augment
+		item.AugDistiller = Strings::ToUnsignedInt(row[ItemField::augdistiller]);
+		item.AugSlotType[0] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot1type]));
+		item.AugSlotVisible[0] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot1visible]));
+		item.AugSlotType[1] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot2type]));
+		item.AugSlotVisible[1] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot2visible]));
+		item.AugSlotType[2] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot3type]));
+		item.AugSlotVisible[2] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot3visible]));
+		item.AugSlotType[3] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot4type]));
+		item.AugSlotVisible[3] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot4visible]));
+		item.AugSlotType[4] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot5type]));
+		item.AugSlotVisible[4] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot5visible]));
+		item.AugSlotType[5] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot6type]));
+		item.AugSlotVisible[5] = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::augslot6visible]));

 		// Augment Unknowns
 		for (uint8 i = EQ::invaug::SOCKET_BEGIN; i <= EQ::invaug::SOCKET_END; i++) {
@@ -1179,79 +1239,79 @@ void SharedDatabase::LoadItems(void *data, uint32 size, int32 items, uint32 max_
 		}

 		// LDoN
-		item.LDoNTheme        = e.ldontheme;
-		item.LDoNPrice        = e.ldonprice;
-		item.LDoNSellBackRate = e.ldonsellbackrate;
-		item.LDoNSold         = e.ldonsold;
-		item.PointType        = e.pointtype;
+		item.LDoNTheme = Strings::ToUnsignedInt(row[ItemField::ldontheme]);
+		item.LDoNPrice = Strings::ToUnsignedInt(row[ItemField::ldonprice]);
+		item.LDoNSellBackRate = Strings::ToUnsignedInt(row[ItemField::ldonsellbackrate]);
+		item.LDoNSold = Strings::ToUnsignedInt(row[ItemField::ldonsold]);
+		item.PointType = Strings::ToUnsignedInt(row[ItemField::pointtype]);

 		// Bag
-		item.BagSize  = static_cast<uint8>(e.bagsize);
-		item.BagSlots = EQ::Clamp(e.bagslots, 0, static_cast<int>(EQ::invbag::SLOT_COUNT));
-		item.BagType  = static_cast<uint8>(e.bagtype);
-		item.BagWR    = EQ::Clamp(e.bagwr, 0, 100);
+		item.BagSize = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::bagsize]));
+		item.BagSlots = static_cast<uint8>(EQ::Clamp(Strings::ToInt(row[ItemField::bagslots]), 0, static_cast<int>(EQ::invbag::SLOT_COUNT)));
+		item.BagType = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::bagtype]));
+		item.BagWR = static_cast<uint8>(EQ::Clamp(Strings::ToInt(row[ItemField::bagwr]), 0, 100));

 		// Bard Effect
-		item.Bard.Effect = disable_bard_focus_effects ? 0 : e.bardeffect;
-		item.Bard.Type   = disable_bard_focus_effects ? 0 : static_cast<uint8>(e.bardtype);
-		item.Bard.Level  = disable_bard_focus_effects ? 0 : static_cast<uint8>(e.bardlevel);
-		item.Bard.Level2 = disable_bard_focus_effects ? 0 : static_cast<uint8>(e.bardlevel2);
+		item.Bard.Effect = disable_bard_focus_effects ? 0 : Strings::ToInt(row[ItemField::bardeffect]);
+		item.Bard.Type = disable_bard_focus_effects ? 0 : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::bardtype]));
+		item.Bard.Level = disable_bard_focus_effects ? 0 : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::bardlevel]));
+		item.Bard.Level2 = disable_bard_focus_effects ? 0 : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::bardlevel2]));

 		// Book
-		item.Book     = static_cast<uint8>(e.book);
-		item.BookType = e.booktype;
+		item.Book = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::book]));
+		item.BookType = Strings::ToUnsignedInt(row[ItemField::booktype]);

 		// Click Effect
-		item.CastTime     = e.casttime;
-		item.CastTime_    = e.casttime_;
-		item.Click.Effect = e.clickeffect;
-		item.Click.Type   = static_cast<uint8>(e.clicktype);
-		item.Click.Level  = static_cast<uint8>(e.clicklevel);
-		item.Click.Level2 = static_cast<uint8>(e.clicklevel2);
-		strn0cpy(item.ClickName, e.clickname.c_str(), sizeof(item.ClickName));
-		item.RecastDelay = e.recastdelay;
-		item.RecastType  = e.recasttype;
+		item.CastTime = Strings::ToUnsignedInt(row[ItemField::casttime]);
+		item.CastTime_ = Strings::ToInt(row[ItemField::casttime_]);
+		item.Click.Effect = Strings::ToInt(row[ItemField::clickeffect]);
+		item.Click.Type = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::clicktype]));
+		item.Click.Level = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::clicklevel]));
+		item.Click.Level2 = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::clicklevel2]));
+		strn0cpy(item.ClickName, row[ItemField::clickname], sizeof(item.ClickName));
+		item.RecastDelay = Strings::ToUnsignedInt(row[ItemField::recastdelay]);
+		item.RecastType = Strings::ToInt(row[ItemField::recasttype]);

 		// Focus Effect
-		item.Focus.Effect = disable_spell_focus_effects ? 0 : e.focuseffect;
-		item.Focus.Type   = disable_spell_focus_effects ? 0 : static_cast<uint8>(e.focustype);
-		item.Focus.Level  = disable_spell_focus_effects ? 0 : static_cast<uint8>(e.focuslevel);
-		item.Focus.Level2 = disable_spell_focus_effects ? 0 : static_cast<uint8>(e.focuslevel2);
-		strn0cpy(item.FocusName, disable_spell_focus_effects ? "" : e.focusname.c_str(), sizeof(item.FocusName));
+		item.Focus.Effect = disable_spell_focus_effects ? 0 : Strings::ToInt(row[ItemField::focuseffect]);
+		item.Focus.Type = disable_spell_focus_effects ? 0 : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::focustype]));
+		item.Focus.Level = disable_spell_focus_effects ? 0 : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::focuslevel]));
+		item.Focus.Level2 = disable_spell_focus_effects ? 0 : static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::focuslevel2]));
+		strn0cpy(item.FocusName, disable_spell_focus_effects ? "" : row[ItemField::focusname], sizeof(item.FocusName));

 		// Proc Effect
-		item.Proc.Effect = e.proceffect;
-		item.Proc.Type   = static_cast<uint8>(e.proctype);
-		item.Proc.Level  = static_cast<uint8>(e.proclevel);
-		item.Proc.Level2 = static_cast<uint8>(e.proclevel2);
-		strn0cpy(item.ProcName, e.procname.c_str(), sizeof(item.ProcName));
-		item.ProcRate = e.procrate;
+		item.Proc.Effect = Strings::ToInt(row[ItemField::proceffect]);
+		item.Proc.Type = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::proctype]));
+		item.Proc.Level = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::proclevel]));
+		item.Proc.Level2 = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::proclevel2]));
+		strn0cpy(item.ProcName, row[ItemField::procname], sizeof(item.ProcName));
+		item.ProcRate = Strings::ToInt(row[ItemField::procrate]);

 		// Scroll Effect
-		item.Scroll.Effect = e.scrolleffect;
-		item.Scroll.Type   = static_cast<uint8>(e.scrolltype);
-		item.Scroll.Level  = static_cast<uint8>(e.scrolllevel);
-		item.Scroll.Level2 = static_cast<uint8>(e.scrolllevel2);
-		strn0cpy(item.ScrollName, e.scrollname.c_str(), sizeof(item.ScrollName));
+		item.Scroll.Effect = Strings::ToInt(row[ItemField::scrolleffect]);
+		item.Scroll.Type = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::scrolltype]));
+		item.Scroll.Level = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::scrolllevel]));
+		item.Scroll.Level2 = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::scrolllevel2]));
+		strn0cpy(item.ScrollName, row[ItemField::scrollname], sizeof(item.ScrollName));

 		// Worn Effect
-		item.Worn.Effect = e.worneffect;
-		item.Worn.Type   = static_cast<uint8>(e.worntype);
-		item.Worn.Level  = static_cast<uint8>(e.wornlevel);
-		item.Worn.Level2 = static_cast<uint8>(e.wornlevel2);
-		strn0cpy(item.WornName, e.wornname.c_str(), sizeof(item.WornName));
+		item.Worn.Effect = Strings::ToInt(row[ItemField::worneffect]);
+		item.Worn.Type = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::worntype]));
+		item.Worn.Level = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::wornlevel]));
+		item.Worn.Level2 = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::wornlevel2]));
+		strn0cpy(item.WornName, row[ItemField::wornname], sizeof(item.WornName));

 		// Evolving Item
-		item.EvolvingID    = e.evoid;
-		item.EvolvingItem  = static_cast<uint8>(e.evoitem);
-		item.EvolvingLevel = static_cast<uint8>(e.evolvinglevel);
-		item.EvolvingMax   = static_cast<uint8>(e.evomax);
+		item.EvolvingID = Strings::ToUnsignedInt(row[ItemField::evoid]);
+		item.EvolvingItem = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::evoitem]));
+		item.EvolvingLevel = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::evolvinglevel]));
+		item.EvolvingMax = static_cast<uint8>(Strings::ToUnsignedInt(row[ItemField::evomax]));

 		// Scripting
-		item.CharmFileID = Strings::IsNumber(e.charmfileid) ? Strings::ToUnsignedInt(e.charmfileid) : 0;
-		strn0cpy(item.CharmFile, e.charmfile.c_str(), sizeof(item.CharmFile));
-		strn0cpy(item.Filename, e.filename.c_str(), sizeof(item.Filename));
-		item.ScriptFileID = e.scriptfileid;
+		item.CharmFileID = Strings::IsNumber(row[ItemField::charmfileid]) ? Strings::ToUnsignedInt(row[ItemField::charmfileid]) : 0;
+		strn0cpy(item.CharmFile, row[ItemField::charmfile], sizeof(item.CharmFile));
+		strn0cpy(item.Filename, row[ItemField::filename], sizeof(item.Filename));
+		item.ScriptFileID = Strings::ToUnsignedInt(row[ItemField::scriptfileid]);

 		try {
 			hash.insert(item.ID, item);
@@ -1484,60 +1544,12 @@ bool SharedDatabase::GetCommandSettings(std::map<std::string, std::pair<uint8, s
 	return true;
 }

-template<typename T1, typename T2>
-inline std::vector<std::string> join_pair(
-	const std::string &glue,
-	const std::pair<char, char> &encapsulation,
-	const std::vector<std::pair<T1, T2>> &src
-)
-{
-	if (src.empty()) {
-		return {};
-	}
-
-	std::vector<std::string> output;
-
-	for (const std::pair<T1, T2> &src_iter: src) {
-		output.emplace_back(
-
-			fmt::format(
-				"{}{}{}{}{}{}{}",
-				encapsulation.first,
-				src_iter.first,
-				encapsulation.second,
-				glue,
-				encapsulation.first,
-				src_iter.second,
-				encapsulation.second
-			)
-		);
-	}
-
-	return output;
-}
-
-template<typename T>
-inline std::string
-ImplodePair(const std::string &glue, const std::pair<char, char> &encapsulation, const std::vector<T> &src)
-{
-	if (src.empty()) {
-		return {};
-	}
-	std::ostringstream oss;
-	for (const T &src_iter: src) {
-		oss << encapsulation.first << src_iter << encapsulation.second << glue;
-	}
-	std::string output(oss.str());
-	output.resize(output.size() - glue.size());
-	return output;
-}
-
 bool SharedDatabase::UpdateInjectedCommandSettings(const std::vector<std::pair<std::string, uint8>> &injected)
 {
 	if (injected.size()) {
 		const std::string query = fmt::format(
 			"REPLACE INTO `command_settings`(`command`, `access`) VALUES {}",
-			ImplodePair(
+			Strings::ImplodePair(
 				",",
 				std::pair<char, char>('(', ')'),
 				join_pair(",", std::pair<char, char>('\'', '\''), injected)
@@ -1564,7 +1576,7 @@ bool SharedDatabase::UpdateOrphanedCommandSettings(const std::vector<std::string
 	if (orphaned.size()) {
 		std::string query = fmt::format(
 			"DELETE FROM `command_settings` WHERE `command` IN ({})",
-			ImplodePair(",", std::pair<char, char>('\'', '\''), orphaned)
+			Strings::ImplodePair(",", std::pair<char, char>('\'', '\''), orphaned)
 		);

 		auto results = QueryDatabase(query);
@@ -1574,7 +1586,7 @@ bool SharedDatabase::UpdateOrphanedCommandSettings(const std::vector<std::string

 		query = fmt::format(
 			"DELETE FROM `command_subsettings` WHERE `parent_command` IN ({})",
-			ImplodePair(",", std::pair<char, char>('\'', '\''), orphaned)
+			Strings::ImplodePair(",", std::pair<char, char>('\'', '\''), orphaned)
 		);

 		auto results_two = QueryDatabase(query);
@@ -1613,17 +1625,20 @@ bool SharedDatabase::GetCommandSubSettings(std::vector<CommandSubsettingsReposit
 	return true;
 }

-void SharedDatabase::LoadDamageShieldTypes(SPDat_Spell_Struct* s)
-{
-	const auto& l = DamageshieldtypesRepository::All(*this);
+void SharedDatabase::LoadDamageShieldTypes(SPDat_Spell_Struct* sp, int32 iMaxSpellID) {
+	const std::string query = StringFormat("SELECT `spellid`, `type` FROM `damageshieldtypes` WHERE `spellid` > 0 "
+	                                       "AND `spellid` <= %i", iMaxSpellID);
+    auto results = QueryDatabase(query);
+    if (!results.Success()) {
+        return;
+    }

-	if (l.empty()) {
-		return;
-	}
+    for(auto& row = results.begin(); row != results.end(); ++row) {
+	    const int spellID = Strings::ToInt(row[0]);
+        if((spellID > 0) && (spellID <= iMaxSpellID))
+            sp[spellID].damage_shield_type = Strings::ToUnsignedInt(row[1]);
+    }

-	for (const auto& e : l) {
-		s[e.spellid].damage_shield_type = e.type;
-	}
 }

 const EvolveInfo* SharedDatabase::GetEvolveInfo(uint32 loregroup) {
@@ -1650,7 +1665,7 @@ bool SharedDatabase::LoadSpells(const std::string &prefix, int32 *records, const
 		EQ::IPCMutex mutex("spells");
 		mutex.Lock();

-		std::string file_name = fmt::format("{}/{}{}", PathManager::Instance()->GetSharedMemoryPath(), prefix, std::string("spells"));
+		std::string file_name = fmt::format("{}/{}{}", path.GetSharedMemoryPath(), prefix, std::string("spells"));
 		spells_mmf = std::make_unique<EQ::MemoryMappedFile>(file_name);
 		LogInfo("Loading [{}]", file_name);
 		*records = *static_cast<uint32*>(spells_mmf->Get());
@@ -1840,32 +1855,21 @@ void SharedDatabase::LoadSpells(void *data, int max_spells) {
 		sp[tempid].damage_shield_type = 0;
 	}

-	LoadDamageShieldTypes(sp);
+	LoadDamageShieldTypes(sp, max_spells);
 }

-void SharedDatabase::LoadCharacterInspectMessage(uint32 character_id, InspectMessage_Struct* s)
-{
-	const auto& e = CharacterInspectMessagesRepository::FindOne(*this, character_id);
-
-	memset(s, '\0', sizeof(InspectMessage_Struct));
-
-	if (!e.id) {
-		return;
+void SharedDatabase::LoadCharacterInspectMessage(uint32 character_id, InspectMessage_Struct* message) {
+	const std::string query = StringFormat("SELECT `inspect_message` FROM `character_inspect_messages` WHERE `id` = %u LIMIT 1", character_id);
+	auto results = QueryDatabase(query);
+	memset(message, '\0', sizeof(InspectMessage_Struct));
+	for (auto& row = results.begin(); row != results.end(); ++row) {
+		memcpy(message, row[0], sizeof(InspectMessage_Struct));
 	}
-
-	memcpy(s, e.inspect_message.c_str(), sizeof(InspectMessage_Struct));
 }

-void SharedDatabase::SaveCharacterInspectMessage(uint32 character_id, const InspectMessage_Struct* s)
-{
-	auto e = CharacterInspectMessagesRepository::NewEntity();
-
-	e.id              = character_id;
-	e.inspect_message = s->text;
-
-	if (!CharacterInspectMessagesRepository::ReplaceOne(*this, e)) {
-		LogError("Failed to save character inspect message of [{}] for character_id [{}]", s->text, character_id);
-	}
+void SharedDatabase::SaveCharacterInspectMessage(uint32 character_id, const InspectMessage_Struct* message) {
+	const std::string query = StringFormat("REPLACE INTO `character_inspect_messages` (id, inspect_message) VALUES (%u, '%s')", character_id, Strings::Escape(message->text).c_str());
+	auto results = QueryDatabase(query);
 }

 uint32 SharedDatabase::GetSpellsCount()
@@ -1886,7 +1890,18 @@ uint32 SharedDatabase::GetSpellsCount()

 uint32 SharedDatabase::GetItemsCount()
 {
-	return ItemsRepository::Count(*this);
+	auto results = QueryDatabase("SELECT count(*) FROM items");
+	if (!results.Success() || !results.RowCount()) {
+		return 0;
+	}
+
+	auto& row = results.begin();
+
+	if (row[0]) {
+		return Strings::ToUnsignedInt(row[0]);
+	}
+
+	return 0;
 }

 void SharedDatabase::SetSharedItemsCount(uint32 shared_items_count)
--- a/Show More
+++ b/Show More