From 24399e31e47d0efb0d4cd8c546850f1a4086b5d2 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 9 Mar 2018 00:06:44 +0100
Subject: [PATCH] WiP - implementing new framework

---
 src/common/Database/DbConnection.cpp          |   22 +-
 src/common/Framework.cpp                      |    5 +
 src/common/Framework.h                        |   36 +
 src/servers/Scripts/common/ScriptLoader.cpp   |    8 +-
 .../Scripts/instances/ScriptLoader.cpp        | 1042 ++++++++---------
 src/servers/Scripts/opening/ScriptLoader.cpp  |    4 +-
 src/servers/Scripts/quest/ScriptLoader.cpp    |   24 +-
 src/servers/sapphire_api/main.cpp             |    5 +
 .../sapphire_zone/Action/ActionCast.cpp       |    9 +-
 .../sapphire_zone/Action/ActionTeleport.cpp   |    5 +-
 .../sapphire_zone/Action/EventAction.cpp      |   12 +-
 .../sapphire_zone/Action/EventItemAction.cpp  |    8 +-
 src/servers/sapphire_zone/Actor/Actor.cpp     |    6 +-
 src/servers/sapphire_zone/Actor/Chara.cpp     |    6 +-
 .../sapphire_zone/Actor/EventObject.cpp       |   11 +-
 src/servers/sapphire_zone/Actor/Player.cpp    |   97 +-
 .../sapphire_zone/Actor/PlayerEvent.cpp       |   20 +-
 .../sapphire_zone/Actor/PlayerQuest.cpp       |    7 +-
 src/servers/sapphire_zone/Actor/PlayerSql.cpp |   93 +-
 .../DebugCommand/DebugCommandHandler.cpp      |   55 +-
 .../sapphire_zone/Event/EventHelper.cpp       |   16 +-
 src/servers/sapphire_zone/Framework.cpp       |   45 -
 src/servers/sapphire_zone/Framework.h         |   54 -
 .../sapphire_zone/Inventory/Inventory.cpp     |   55 +-
 src/servers/sapphire_zone/Inventory/Item.cpp  |    5 +-
 .../sapphire_zone/Inventory/ItemContainer.cpp |   13 +-
 .../sapphire_zone/Linkshell/LinkshellMgr.cpp  |    6 +-
 src/servers/sapphire_zone/Math/CalcBattle.cpp |    7 +-
 src/servers/sapphire_zone/Math/CalcStats.cpp  |   12 +-
 .../sapphire_zone/Network/GameConnection.cpp  |   60 +-
 .../Network/Handlers/ActionHandler.cpp        |    7 +-
 .../Network/Handlers/CFHandlers.cpp           |   26 +-
 .../Network/Handlers/EventHandlers.cpp        |   25 +-
 .../sapphire_zone/Script/ScriptLoader.cpp     |    4 +-
 src/servers/sapphire_zone/ServerZone.cpp      |  146 +--
 src/servers/sapphire_zone/ServerZone.h        |    4 -
 src/servers/sapphire_zone/Session.cpp         |    5 +-
 src/servers/sapphire_zone/mainGameServer.cpp  |   46 +-
 38 files changed, 1051 insertions(+), 960 deletions(-)
 create mode 100644 src/common/Framework.cpp
 create mode 100644 src/common/Framework.h
 delete mode 100644 src/servers/sapphire_zone/Framework.cpp
 delete mode 100644 src/servers/sapphire_zone/Framework.h

diff --git a/src/common/Database/DbConnection.cpp b/src/common/Database/DbConnection.cpp
index a4353394..366fc954 100644
--- a/src/common/Database/DbConnection.cpp
+++ b/src/common/Database/DbConnection.cpp
@@ -1,13 +1,13 @@
 #include "DbConnection.h"
 #include "DbWorker.h"
 #include <MySqlConnector.h>
-
 #include "Logging/Logger.h"
+
 #include "PreparedStatement.h"
 #include <boost/make_shared.hpp>
+#include "Framework.h"
 
-
-extern Core::Logger g_log;
+extern Core::Framework g_fw;
 
 Core::Db::DbConnection::DbConnection( ConnectionInfo &connInfo ) :
    m_reconnecting( false ),
@@ -67,7 +67,7 @@ uint32_t Core::Db::DbConnection::open()
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return 1;
    }
 
@@ -119,7 +119,7 @@ bool Core::Db::DbConnection::execute( const std::string& sql )
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return false;
    }
 }
@@ -134,7 +134,7 @@ boost::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( const std::
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return nullptr;
    }
 }
@@ -148,13 +148,11 @@ boost::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( boost::shar
 
    if( !ping() )
    {
-      g_log.error( "MysqlConnection went down" );
       // naivly reconnect and hope for the best
       open();
       lockIfReady();
       if( !prepareStatements() )
-         g_log.error( "Mysql Statements failed to prepare..." );
-      g_log.info( "MysqlConnection reestablished" );
+         return nullptr;
    }
 
    uint32_t index = stmt->getIndex();
@@ -172,7 +170,7 @@ boost::shared_ptr< Mysql::ResultSet > Core::Db::DbConnection::query( boost::shar
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return nullptr;
    }
    
@@ -198,7 +196,7 @@ bool Core::Db::DbConnection::execute( boost::shared_ptr< Core::Db::PreparedState
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       return false;
    }
 }
@@ -234,7 +232,7 @@ void Core::Db::DbConnection::prepareStatement( uint32_t index, const std::string
    }
    catch( std::runtime_error& e )
    {
-      g_log.error( e.what() );
+      g_fw.get< Logger >()->error( e.what() );
       m_prepareError = true;
    }
 
diff --git a/src/common/Framework.cpp b/src/common/Framework.cpp
new file mode 100644
index 00000000..9951e8a2
--- /dev/null
+++ b/src/common/Framework.cpp
@@ -0,0 +1,5 @@
+#include "Framework.h"
+
+#include <Logging/Logger.h>
+#include <boost/shared_ptr.hpp>
+#include <boost/make_shared.hpp>
diff --git a/src/common/Framework.h b/src/common/Framework.h
new file mode 100644
index 00000000..06e48ba5
--- /dev/null
+++ b/src/common/Framework.h
@@ -0,0 +1,36 @@
+#ifndef _CORE_FRAMEWORK_H
+#define _CORE_FRAMEWORK_H
+
+#include <map>
+#include <typeindex>
+#include <typeinfo>
+#include <boost/shared_ptr.hpp>
+#include <cassert>
+
+namespace Core
+{
+
+   class Framework
+   {
+      using TypenameToObject = std::map< std::type_index, boost::shared_ptr< void > >;
+      TypenameToObject ObjectMap;
+
+   public:
+      template< typename T >
+      boost::shared_ptr< T > get()
+      {
+         auto iType = ObjectMap.find( typeid( T ) );
+         assert( !( iType == ObjectMap.end() ) );
+         return boost::static_pointer_cast< T >( iType->second );
+      }
+
+      template< typename T >
+      void set( boost::shared_ptr< T > value )
+      {
+         ObjectMap[typeid( T )] = value;
+      }
+   };
+
+}
+
+#endif // _CORE_FRAMEWORK_H
diff --git a/src/servers/Scripts/common/ScriptLoader.cpp b/src/servers/Scripts/common/ScriptLoader.cpp
index e4bc7a56..c1871bea 100644
--- a/src/servers/Scripts/common/ScriptLoader.cpp
+++ b/src/servers/Scripts/common/ScriptLoader.cpp
@@ -2,19 +2,19 @@
 
 #include "Aethernet.cpp"
 #include "Aetheryte.cpp"
-#include "HouFurOrchestrion.cpp"
-#include "CmnDefInnBed.cpp"
 #include "CmnDefCutSceneReplay.cpp"
+#include "CmnDefInnBed.cpp"
 #include "CmnDefLinkShell.cpp"
+#include "HouFurOrchestrion.cpp"
 
 const ScriptObject* ptrs[] =
 {
    static_cast< ScriptObject* >( new Aethernet ),
    static_cast< ScriptObject* >( new Aetheryte ),
-   static_cast< ScriptObject* >( new HouFurOrchestrion ),
-   static_cast< ScriptObject* >( new CmnDefInnBed ),
    static_cast< ScriptObject* >( new CmnDefCutSceneReplay ),
+   static_cast< ScriptObject* >( new CmnDefInnBed ),
    static_cast< ScriptObject* >( new CmnDefLinkShell ),
+   static_cast< ScriptObject* >( new HouFurOrchestrion ),
 
    nullptr
 };
diff --git a/src/servers/Scripts/instances/ScriptLoader.cpp b/src/servers/Scripts/instances/ScriptLoader.cpp
index 0eaf9ab6..7d8fbf10 100644
--- a/src/servers/Scripts/instances/ScriptLoader.cpp
+++ b/src/servers/Scripts/instances/ScriptLoader.cpp
@@ -1,542 +1,542 @@
 #include <Script/NativeScriptApi.h>
 
-#include "pvp/TheFeastTeamRanked.cpp"
-#include "pvp/SealRockSeize.cpp"
-#include "pvp/TheFeast4on4Ranked.cpp"
-#include "pvp/TheFeast4on4LightParty.cpp"
-#include "pvp/TheFeastRanked.cpp"
-#include "pvp/TheFieldsofGloryShatter.cpp"
-#include "pvp/TheFeastTraining.cpp"
-#include "pvp/Astragalos.cpp"
-#include "pvp/TheFeast4on4Training.cpp"
-#include "pvp/TheFeastCustomMatchFeastingGrounds.cpp"
-#include "pvp/TheFeastCustomMatchLichenweed.cpp"
-#include "pvp/TheBorderlandRuinsSecure.cpp"
-#include "pvp/TheFeastCustomMatchCrystalTower.cpp"
-#include "dungeons/TheTamTaraDeepcroft.cpp"
-#include "dungeons/DomaCastle.cpp"
-#include "dungeons/HullbreakerIsleHard.cpp"
-#include "dungeons/Snowcloak.cpp"
-#include "dungeons/TheGreatGubalLibrary.cpp"
-#include "dungeons/TheWanderersPalace.cpp"
-#include "dungeons/Xelphatol.cpp"
-#include "dungeons/TheLostCityofAmdaporHard.cpp"
-#include "dungeons/SaintMociannesArboretum.cpp"
-#include "dungeons/BardamsMettle.cpp"
-#include "dungeons/TheTamTaraDeepcroftHard.cpp"
-#include "dungeons/KuganeCastle.cpp"
-#include "dungeons/TheDrownedCityofSkalla.cpp"
-#include "dungeons/ShisuioftheVioletTides.cpp"
-#include "dungeons/CuttersCry.cpp"
-#include "dungeons/HellsLid.cpp"
-#include "dungeons/TheVault.cpp"
-#include "dungeons/TheStoneVigilHard.cpp"
-#include "dungeons/Sastasha.cpp"
-#include "dungeons/TheFractalContinuum.cpp"
-#include "dungeons/TheLostCityofAmdapor.cpp"
-#include "dungeons/TheAurumVale.cpp"
-#include "dungeons/SohrKhai.cpp"
-#include "dungeons/TheSunkenTempleofQarnHard.cpp"
-#include "dungeons/Neverreap.cpp"
-#include "dungeons/TheAntitower.cpp"
-#include "dungeons/Halatali.cpp"
-#include "dungeons/TheAery.cpp"
-#include "dungeons/PharosSiriusHard.cpp"
-#include "dungeons/CastrumMeridianum.cpp"
-#include "dungeons/TheGreatGubalLibraryHard.cpp"
-#include "dungeons/SohmAl.cpp"
-#include "dungeons/TheTempleoftheFist.cpp"
-#include "dungeons/TheKeeperoftheLake.cpp"
-#include "dungeons/AmdaporKeepHard.cpp"
-#include "dungeons/TheWanderersPalaceHard.cpp"
-#include "dungeons/CastrumAbania.cpp"
-#include "dungeons/AlaMhigo.cpp"
-#include "dungeons/PharosSirius.cpp"
-#include "dungeons/TheStoneVigil.cpp"
-#include "dungeons/TheThousandMawsofTotoRak.cpp"
-#include "dungeons/BrayfloxsLongstopHard.cpp"
-#include "dungeons/DzemaelDarkhold.cpp"
-#include "dungeons/SohmAlHard.cpp"
-#include "dungeons/HaukkeManor.cpp"
-#include "dungeons/HullbreakerIsle.cpp"
-#include "dungeons/TheFractalContinuumHard.cpp"
-#include "dungeons/TheSirensongSea.cpp"
-#include "dungeons/BaelsarsWall.cpp"
-#include "dungeons/HalataliHard.cpp"
-#include "dungeons/TheAetherochemicalResearchFacility.cpp"
-#include "dungeons/SastashaHard.cpp"
-#include "dungeons/CopperbellMinesHard.cpp"
-#include "dungeons/TheSunkenTempleofQarn.cpp"
-#include "dungeons/AmdaporKeep.cpp"
-#include "dungeons/TheDuskVigil.cpp"
-#include "dungeons/BrayfloxsLongstop.cpp"
-#include "dungeons/HaukkeManorHard.cpp"
-#include "dungeons/CopperbellMines.cpp"
-#include "dungeons/ThePraetorium.cpp"
-#include "questbattles/RaisingtheSword.cpp"
-#include "questbattles/InterdimensionalRift.cpp"
-#include "questbattles/CuriousGorgeMeetsHisMatch.cpp"
-#include "questbattles/WithHeartandSteel.cpp"
-#include "questbattles/OneLifeforOneWorld.cpp"
-#include "questbattles/ABloodyReunion.cpp"
-#include "questbattles/MatsubaMayhem.cpp"
-#include "questbattles/BloodontheDeck.cpp"
-#include "questbattles/OurCompromise.cpp"
-#include "questbattles/Naadam.cpp"
-#include "questbattles/InThalsName.cpp"
-#include "questbattles/TheResonant.cpp"
-#include "questbattles/OurUnsungHeroes.cpp"
-#include "questbattles/DarkwingDragon.cpp"
-#include "questbattles/BloodDragoon.cpp"
-#include "questbattles/ASpectaclefortheAges.cpp"
-#include "questbattles/ItsProbablyaTrap.cpp"
-#include "questbattles/TheBattleonBekko.cpp"
-#include "questbattles/TheHeartoftheProblem.cpp"
-#include "questbattles/TheOrphansandtheBrokenBlade.cpp"
-#include "questbattles/TheCarteneauFlatsHeliodrome.cpp"
-#include "questbattles/ReturnoftheBull.cpp"
-#include "questbattles/TheFaceofTrueEvil.cpp"
-#include "questbattles/WhenClansCollide.cpp"
-#include "raids/AlexanderTheArmoftheSonSavage.cpp"
-#include "raids/TheLabyrinthoftheAncients.cpp"
-#include "raids/SigmascapeV30.cpp"
-#include "raids/TheVoidArk.cpp"
-#include "raids/SyrcusTower.cpp"
-#include "raids/DeltascapeV20.cpp"
-#include "raids/TheFinalCoilofBahamutTurn1.cpp"
-#include "raids/SigmascapeV20Savage.cpp"
-#include "raids/TheFinalCoilofBahamutTurn3.cpp"
-#include "raids/SigmascapeV30Savage.cpp"
-#include "raids/TheBindingCoilofBahamutTurn2.cpp"
-#include "raids/AlexanderTheSouloftheCreatorSavage.cpp"
-#include "raids/DunScaith.cpp"
-#include "raids/DeltascapeV40Savage.cpp"
-#include "raids/TheSecondCoilofBahamutTurn1.cpp"
-#include "raids/AlexanderTheHeartoftheCreatorSavage.cpp"
-#include "raids/DeltascapeV40.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn2.cpp"
-#include "raids/TheSecondCoilofBahamutTurn3.cpp"
-#include "raids/TheUnendingCoilofBahamutUltimate.cpp"
-#include "raids/TheSecondCoilofBahamutTurn2.cpp"
-#include "raids/TheWorldofDarkness.cpp"
-#include "raids/SigmascapeV10.cpp"
-#include "raids/AlexanderTheBurdenoftheSonSavage.cpp"
-#include "raids/TheFinalCoilofBahamutTurn2.cpp"
-#include "raids/AlexanderTheBurdenoftheFatherSavage.cpp"
-#include "raids/AlexanderTheHeartoftheCreator.cpp"
-#include "raids/TheBindingCoilofBahamutTurn4.cpp"
-#include "raids/AlexanderTheBreathoftheCreatorSavage.cpp"
-#include "raids/AlexanderTheEyesoftheCreatorSavage.cpp"
-#include "raids/AlexanderTheArmoftheFatherSavage.cpp"
-#include "raids/DeltascapeV30.cpp"
-#include "raids/AlexanderTheFistoftheFather.cpp"
-#include "raids/DeltascapeV10.cpp"
-#include "raids/DeltascapeV10Savage.cpp"
-#include "raids/SigmascapeV40Savage.cpp"
-#include "raids/AlexanderTheCuffoftheSon.cpp"
-#include "raids/AlexanderTheFistoftheSonSavage.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn3.cpp"
-#include "raids/AlexanderTheArmoftheFather.cpp"
-#include "raids/AlexanderTheCuffoftheSonSavage.cpp"
-#include "raids/TheBindingCoilofBahamutTurn5.cpp"
-#include "raids/SigmascapeV20.cpp"
-#include "raids/AlexanderTheCuffoftheFather.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn1.cpp"
-#include "raids/TheBindingCoilofBahamutTurn1.cpp"
-#include "raids/AlexanderTheBurdenoftheSon.cpp"
-#include "raids/AlexanderTheBreathoftheCreator.cpp"
-#include "raids/TheFinalCoilofBahamutTurn4.cpp"
-#include "raids/DeltascapeV30Savage.cpp"
-#include "raids/AlexanderTheFistoftheSon.cpp"
-#include "raids/AlexanderTheFistoftheFatherSavage.cpp"
-#include "raids/AlexanderTheArmoftheSon.cpp"
-#include "raids/TheBindingCoilofBahamutTurn3.cpp"
-#include "raids/SigmascapeV40.cpp"
-#include "raids/TheSecondCoilofBahamutTurn4.cpp"
-#include "raids/AlexanderTheCuffoftheFatherSavage.cpp"
-#include "raids/SigmascapeV10Savage.cpp"
-#include "raids/DeltascapeV20Savage.cpp"
-#include "raids/TheWeepingCityofMhach.cpp"
-#include "raids/TheRoyalCityofRabanastre.cpp"
-#include "raids/AlexanderTheBurdenoftheFather.cpp"
-#include "raids/AlexanderTheEyesoftheCreator.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn4.cpp"
-#include "raids/AlexanderTheSouloftheCreator.cpp"
-#include "guildhests/HeroontheHalfShell.cpp"
-#include "guildhests/BasicTrainingEnemyStrongholds.cpp"
-#include "guildhests/ShadowandClaw.cpp"
-#include "guildhests/AnnoytheVoid.cpp"
-#include "guildhests/StingingBack.cpp"
-#include "guildhests/FlickingSticksandTakingNames.cpp"
-#include "guildhests/SolemnTrinity.cpp"
-#include "guildhests/UndertheArmor.cpp"
-#include "guildhests/LongLivetheQueen.cpp"
-#include "guildhests/AllsWellthatEndsintheWell.cpp"
-#include "guildhests/MorethanaFeeler.cpp"
-#include "guildhests/PullingPoisonPosies.cpp"
-#include "guildhests/WardUp.cpp"
-#include "guildhests/BasicTrainingEnemyParties.cpp"
-#include "trials/TheStrikingTreeHard.cpp"
-#include "trials/TheJadeStoaExtreme.cpp"
-#include "trials/TheMinstrelsBalladThordansReign.cpp"
-#include "trials/TheBowlofEmbersHard.cpp"
-#include "trials/TheSingularityReactor.cpp"
-#include "trials/ContainmentBayS1T7Extreme.cpp"
-#include "trials/ContainmentBayS1T7.cpp"
-#include "trials/TheHowlingEyeHard.cpp"
-#include "trials/TheStrikingTreeExtreme.cpp"
-#include "trials/Emanation.cpp"
-#include "trials/SpecialEventI.cpp"
-#include "trials/TheLimitlessBlueExtreme.cpp"
-#include "trials/ThePoolofTributeExtreme.cpp"
-#include "trials/BattleontheBigBridge.cpp"
-#include "trials/TheRoyalMenagerie.cpp"
-#include "trials/BattleintheBigKeep.cpp"
-#include "trials/UrthsFount.cpp"
-#include "trials/EmanationExtreme.cpp"
-#include "trials/TheJadeStoa.cpp"
-#include "trials/TheHowlingEyeExtreme.cpp"
-#include "trials/TheBowlofEmbers.cpp"
-#include "trials/TheChrysalis.cpp"
-#include "trials/TheStepsofFaith.cpp"
-#include "trials/ARelicReborntheChimera.cpp"
-#include "trials/ContainmentBayP1T6.cpp"
-#include "trials/TheMinstrelsBalladNidhoggsRage.cpp"
-#include "trials/ThokastThokExtreme.cpp"
-#include "trials/AkhAfahAmphitheatreExtreme.cpp"
-#include "trials/ThornmarchExtreme.cpp"
-#include "trials/TheLimitlessBlueHard.cpp"
-#include "trials/ContainmentBayP1T6Extreme.cpp"
-#include "trials/TheNavelExtreme.cpp"
-#include "trials/SpecialEventII.cpp"
-#include "trials/TheWhorleaterExtreme.cpp"
-#include "trials/TheMinstrelsBalladUltimasBane.cpp"
-#include "trials/ContainmentBayZ1T9.cpp"
-#include "trials/TheFinalStepsofFaith.cpp"
-#include "trials/ThokastThokHard.cpp"
-#include "trials/AkhAfahAmphitheatreHard.cpp"
-#include "trials/CapeWestwind.cpp"
-#include "trials/TheMinstrelsBalladShinryusDomain.cpp"
-#include "trials/ContainmentBayZ1T9Extreme.cpp"
-#include "trials/SpecialEventIII.cpp"
-#include "trials/ThornmarchHard.cpp"
-#include "trials/TheDragonsNeck.cpp"
-#include "trials/TheNavelHard.cpp"
-#include "trials/TheWhorleaterHard.cpp"
-#include "trials/TheNavel.cpp"
-#include "trials/TheBowlofEmbersExtreme.cpp"
-#include "trials/ARelicReborntheHydra.cpp"
-#include "trials/ThePoolofTribute.cpp"
-#include "trials/TheHowlingEye.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors181190.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors6170.cpp"
+#include "AkhAfahAmphitheatreExtreme.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors101110.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors110.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors111120.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors1120.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors121130.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors131140.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors141150.cpp"
 #include "deepdungeon/ThePalaceoftheDeadFloors151160.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors161170.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors171180.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors181190.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors191200.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors2130.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors3140.cpp"
 #include "deepdungeon/ThePalaceoftheDeadFloors4150.cpp"
 #include "deepdungeon/ThePalaceoftheDeadFloors5160.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors3140.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors1120.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors110.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors141150.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors161170.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors131140.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors6170.cpp"
 #include "deepdungeon/ThePalaceoftheDeadFloors7180.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors101110.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors171180.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors2130.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors191200.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors121130.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors111120.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors91100.cpp"
 #include "deepdungeon/ThePalaceoftheDeadFloors8190.cpp"
-#include "treasurehunt/TheAquapolis.cpp"
-#include "treasurehunt/TheLostCanalsofUznair.cpp"
-#include "treasurehunt/TheHiddenCanalsofUznair.cpp"
-#include "hallofthenovice/InteractwiththeBattlefield.cpp"
-#include "hallofthenovice/AvoidEngagedTargets.cpp"
-#include "hallofthenovice/AvoidAreaofEffectAttacks.cpp"
-#include "hallofthenovice/HealMultipleAllies.cpp"
-#include "hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp"
-#include "hallofthenovice/AssistAlliesinDefeatingaTarget.cpp"
-#include "hallofthenovice/HealanAlly.cpp"
-#include "hallofthenovice/EngageMultipleTargets.cpp"
-#include "hallofthenovice/FinalExercise.cpp"
-#include "hallofthenovice/EngageEnemyReinforcements.cpp"
-#include "hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp"
-#include "hallofthenovice/ExecuteaComboinBattle.cpp"
-#include "hallofthenovice/DefeatanOccupiedTarget.cpp"
-#include "hallofthenovice/AccrueEnmityfromMultipleTargets.cpp"
-#include "events/TheValentionesCeremony.cpp"
+#include "deepdungeon/ThePalaceoftheDeadFloors91100.cpp"
+#include "dungeons/AlaMhigo.cpp"
+#include "dungeons/AmdaporKeep.cpp"
+#include "dungeons/AmdaporKeepHard.cpp"
+#include "dungeons/BaelsarsWall.cpp"
+#include "dungeons/BardamsMettle.cpp"
+#include "dungeons/BrayfloxsLongstop.cpp"
+#include "dungeons/BrayfloxsLongstopHard.cpp"
+#include "dungeons/CastrumAbania.cpp"
+#include "dungeons/CastrumMeridianum.cpp"
+#include "dungeons/CopperbellMines.cpp"
+#include "dungeons/CopperbellMinesHard.cpp"
+#include "dungeons/CuttersCry.cpp"
+#include "dungeons/DomaCastle.cpp"
+#include "dungeons/DzemaelDarkhold.cpp"
+#include "dungeons/Halatali.cpp"
+#include "dungeons/HalataliHard.cpp"
+#include "dungeons/HaukkeManor.cpp"
+#include "dungeons/HaukkeManorHard.cpp"
+#include "dungeons/HellsLid.cpp"
+#include "dungeons/HullbreakerIsle.cpp"
+#include "dungeons/HullbreakerIsleHard.cpp"
+#include "dungeons/KuganeCastle.cpp"
+#include "dungeons/Neverreap.cpp"
+#include "dungeons/PharosSirius.cpp"
+#include "dungeons/PharosSiriusHard.cpp"
+#include "dungeons/SaintMociannesArboretum.cpp"
+#include "dungeons/Sastasha.cpp"
+#include "dungeons/SastashaHard.cpp"
+#include "dungeons/ShisuioftheVioletTides.cpp"
+#include "dungeons/Snowcloak.cpp"
+#include "dungeons/SohmAl.cpp"
+#include "dungeons/SohmAlHard.cpp"
+#include "dungeons/SohrKhai.cpp"
+#include "dungeons/TheAery.cpp"
+#include "dungeons/TheAetherochemicalResearchFacility.cpp"
+#include "dungeons/TheAntitower.cpp"
+#include "dungeons/TheAurumVale.cpp"
+#include "dungeons/TheDrownedCityofSkalla.cpp"
+#include "dungeons/TheDuskVigil.cpp"
+#include "dungeons/TheFractalContinuum.cpp"
+#include "dungeons/TheFractalContinuumHard.cpp"
+#include "dungeons/TheGreatGubalLibrary.cpp"
+#include "dungeons/TheGreatGubalLibraryHard.cpp"
+#include "dungeons/TheKeeperoftheLake.cpp"
+#include "dungeons/TheLostCityofAmdapor.cpp"
+#include "dungeons/TheLostCityofAmdaporHard.cpp"
+#include "dungeons/ThePraetorium.cpp"
+#include "dungeons/TheSirensongSea.cpp"
+#include "dungeons/TheStoneVigil.cpp"
+#include "dungeons/TheStoneVigilHard.cpp"
+#include "dungeons/TheSunkenTempleofQarn.cpp"
+#include "dungeons/TheSunkenTempleofQarnHard.cpp"
+#include "dungeons/TheTamTaraDeepcroft.cpp"
+#include "dungeons/TheTamTaraDeepcroftHard.cpp"
+#include "dungeons/TheTempleoftheFist.cpp"
+#include "dungeons/TheThousandMawsofTotoRak.cpp"
+#include "dungeons/TheVault.cpp"
+#include "dungeons/TheWanderersPalace.cpp"
+#include "dungeons/TheWanderersPalaceHard.cpp"
+#include "dungeons/Xelphatol.cpp"
 #include "events/TheHauntedManor.cpp"
+#include "events/TheValentionesCeremony.cpp"
+#include "guildhests/AllsWellthatEndsintheWell.cpp"
+#include "guildhests/AnnoytheVoid.cpp"
+#include "guildhests/BasicTrainingEnemyParties.cpp"
+#include "guildhests/BasicTrainingEnemyStrongholds.cpp"
+#include "guildhests/FlickingSticksandTakingNames.cpp"
+#include "guildhests/HeroontheHalfShell.cpp"
+#include "guildhests/LongLivetheQueen.cpp"
+#include "guildhests/MorethanaFeeler.cpp"
+#include "guildhests/PullingPoisonPosies.cpp"
+#include "guildhests/ShadowandClaw.cpp"
+#include "guildhests/SolemnTrinity.cpp"
+#include "guildhests/StingingBack.cpp"
+#include "guildhests/UndertheArmor.cpp"
+#include "guildhests/WardUp.cpp"
+#include "hallofthenovice/AccrueEnmityfromMultipleTargets.cpp"
+#include "hallofthenovice/AssistAlliesinDefeatingaTarget.cpp"
+#include "hallofthenovice/AvoidAreaofEffectAttacks.cpp"
+#include "hallofthenovice/AvoidEngagedTargets.cpp"
+#include "hallofthenovice/DefeatanOccupiedTarget.cpp"
+#include "hallofthenovice/EngageEnemyReinforcements.cpp"
+#include "hallofthenovice/EngageMultipleTargets.cpp"
+#include "hallofthenovice/ExecuteaComboinBattle.cpp"
+#include "hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp"
+#include "hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp"
+#include "hallofthenovice/FinalExercise.cpp"
+#include "hallofthenovice/HealMultipleAllies.cpp"
+#include "hallofthenovice/HealanAlly.cpp"
+#include "hallofthenovice/InteractwiththeBattlefield.cpp"
+#include "pvp/Astragalos.cpp"
+#include "pvp/SealRockSeize.cpp"
+#include "pvp/TheBorderlandRuinsSecure.cpp"
+#include "pvp/TheFeast4on4LightParty.cpp"
+#include "pvp/TheFeast4on4Ranked.cpp"
+#include "pvp/TheFeast4on4Training.cpp"
+#include "pvp/TheFeastCustomMatchCrystalTower.cpp"
+#include "pvp/TheFeastCustomMatchFeastingGrounds.cpp"
+#include "pvp/TheFeastCustomMatchLichenweed.cpp"
+#include "pvp/TheFeastRanked.cpp"
+#include "pvp/TheFeastTeamRanked.cpp"
+#include "pvp/TheFeastTraining.cpp"
+#include "pvp/TheFieldsofGloryShatter.cpp"
+#include "questbattles/ABloodyReunion.cpp"
+#include "questbattles/ASpectaclefortheAges.cpp"
+#include "questbattles/BloodDragoon.cpp"
+#include "questbattles/BloodontheDeck.cpp"
+#include "questbattles/CuriousGorgeMeetsHisMatch.cpp"
+#include "questbattles/DarkwingDragon.cpp"
+#include "questbattles/InThalsName.cpp"
+#include "questbattles/InterdimensionalRift.cpp"
+#include "questbattles/ItsProbablyaTrap.cpp"
+#include "questbattles/MatsubaMayhem.cpp"
+#include "questbattles/Naadam.cpp"
+#include "questbattles/OneLifeforOneWorld.cpp"
+#include "questbattles/OurCompromise.cpp"
+#include "questbattles/OurUnsungHeroes.cpp"
+#include "questbattles/RaisingtheSword.cpp"
+#include "questbattles/ReturnoftheBull.cpp"
+#include "questbattles/TheBattleonBekko.cpp"
+#include "questbattles/TheCarteneauFlatsHeliodrome.cpp"
+#include "questbattles/TheFaceofTrueEvil.cpp"
+#include "questbattles/TheHeartoftheProblem.cpp"
+#include "questbattles/TheOrphansandtheBrokenBlade.cpp"
+#include "questbattles/TheResonant.cpp"
+#include "questbattles/WhenClansCollide.cpp"
+#include "questbattles/WithHeartandSteel.cpp"
+#include "raids/AlexanderTheArmoftheFather.cpp"
+#include "raids/AlexanderTheArmoftheFatherSavage.cpp"
+#include "raids/AlexanderTheArmoftheSon.cpp"
+#include "raids/AlexanderTheArmoftheSonSavage.cpp"
+#include "raids/AlexanderTheBreathoftheCreator.cpp"
+#include "raids/AlexanderTheBreathoftheCreatorSavage.cpp"
+#include "raids/AlexanderTheBurdenoftheFather.cpp"
+#include "raids/AlexanderTheBurdenoftheFatherSavage.cpp"
+#include "raids/AlexanderTheBurdenoftheSon.cpp"
+#include "raids/AlexanderTheBurdenoftheSonSavage.cpp"
+#include "raids/AlexanderTheCuffoftheFather.cpp"
+#include "raids/AlexanderTheCuffoftheFatherSavage.cpp"
+#include "raids/AlexanderTheCuffoftheSon.cpp"
+#include "raids/AlexanderTheCuffoftheSonSavage.cpp"
+#include "raids/AlexanderTheEyesoftheCreator.cpp"
+#include "raids/AlexanderTheEyesoftheCreatorSavage.cpp"
+#include "raids/AlexanderTheFistoftheFather.cpp"
+#include "raids/AlexanderTheFistoftheFatherSavage.cpp"
+#include "raids/AlexanderTheFistoftheSon.cpp"
+#include "raids/AlexanderTheFistoftheSonSavage.cpp"
+#include "raids/AlexanderTheHeartoftheCreator.cpp"
+#include "raids/AlexanderTheHeartoftheCreatorSavage.cpp"
+#include "raids/AlexanderTheSouloftheCreator.cpp"
+#include "raids/AlexanderTheSouloftheCreatorSavage.cpp"
+#include "raids/DeltascapeV10.cpp"
+#include "raids/DeltascapeV10Savage.cpp"
+#include "raids/DeltascapeV20.cpp"
+#include "raids/DeltascapeV20Savage.cpp"
+#include "raids/DeltascapeV30.cpp"
+#include "raids/DeltascapeV30Savage.cpp"
+#include "raids/DeltascapeV40.cpp"
+#include "raids/DeltascapeV40Savage.cpp"
+#include "raids/DunScaith.cpp"
+#include "raids/SigmascapeV10.cpp"
+#include "raids/SigmascapeV10Savage.cpp"
+#include "raids/SigmascapeV20.cpp"
+#include "raids/SigmascapeV20Savage.cpp"
+#include "raids/SigmascapeV30.cpp"
+#include "raids/SigmascapeV30Savage.cpp"
+#include "raids/SigmascapeV40.cpp"
+#include "raids/SigmascapeV40Savage.cpp"
+#include "raids/SyrcusTower.cpp"
+#include "raids/TheBindingCoilofBahamutTurn1.cpp"
+#include "raids/TheBindingCoilofBahamutTurn2.cpp"
+#include "raids/TheBindingCoilofBahamutTurn3.cpp"
+#include "raids/TheBindingCoilofBahamutTurn4.cpp"
+#include "raids/TheBindingCoilofBahamutTurn5.cpp"
+#include "raids/TheFinalCoilofBahamutTurn1.cpp"
+#include "raids/TheFinalCoilofBahamutTurn2.cpp"
+#include "raids/TheFinalCoilofBahamutTurn3.cpp"
+#include "raids/TheFinalCoilofBahamutTurn4.cpp"
+#include "raids/TheLabyrinthoftheAncients.cpp"
+#include "raids/TheRoyalCityofRabanastre.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn1.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn2.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn3.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn4.cpp"
+#include "raids/TheSecondCoilofBahamutTurn1.cpp"
+#include "raids/TheSecondCoilofBahamutTurn2.cpp"
+#include "raids/TheSecondCoilofBahamutTurn3.cpp"
+#include "raids/TheSecondCoilofBahamutTurn4.cpp"
+#include "raids/TheUnendingCoilofBahamutUltimate.cpp"
+#include "raids/TheVoidArk.cpp"
+#include "raids/TheWeepingCityofMhach.cpp"
+#include "raids/TheWorldofDarkness.cpp"
+#include "treasurehunt/TheAquapolis.cpp"
+#include "treasurehunt/TheHiddenCanalsofUznair.cpp"
+#include "treasurehunt/TheLostCanalsofUznair.cpp"
+#include "trials/ARelicReborntheChimera.cpp"
+#include "trials/ARelicReborntheHydra.cpp"
+#include "trials/AkhAfahAmphitheatreHard.cpp"
+#include "trials/BattleintheBigKeep.cpp"
+#include "trials/BattleontheBigBridge.cpp"
+#include "trials/CapeWestwind.cpp"
+#include "trials/ContainmentBayP1T6.cpp"
+#include "trials/ContainmentBayP1T6Extreme.cpp"
+#include "trials/ContainmentBayS1T7.cpp"
+#include "trials/ContainmentBayS1T7Extreme.cpp"
+#include "trials/ContainmentBayZ1T9.cpp"
+#include "trials/ContainmentBayZ1T9Extreme.cpp"
+#include "trials/Emanation.cpp"
+#include "trials/EmanationExtreme.cpp"
+#include "trials/SpecialEventI.cpp"
+#include "trials/SpecialEventII.cpp"
+#include "trials/SpecialEventIII.cpp"
+#include "trials/TheBowlofEmbers.cpp"
+#include "trials/TheBowlofEmbersExtreme.cpp"
+#include "trials/TheBowlofEmbersHard.cpp"
+#include "trials/TheChrysalis.cpp"
+#include "trials/TheDragonsNeck.cpp"
+#include "trials/TheFinalStepsofFaith.cpp"
+#include "trials/TheHowlingEye.cpp"
+#include "trials/TheHowlingEyeExtreme.cpp"
+#include "trials/TheHowlingEyeHard.cpp"
+#include "trials/TheJadeStoa.cpp"
+#include "trials/TheJadeStoaExtreme.cpp"
+#include "trials/TheLimitlessBlueExtreme.cpp"
+#include "trials/TheLimitlessBlueHard.cpp"
+#include "trials/TheMinstrelsBalladNidhoggsRage.cpp"
+#include "trials/TheMinstrelsBalladShinryusDomain.cpp"
+#include "trials/TheMinstrelsBalladThordansReign.cpp"
+#include "trials/TheMinstrelsBalladUltimasBane.cpp"
+#include "trials/TheNavel.cpp"
+#include "trials/TheNavelExtreme.cpp"
+#include "trials/TheNavelHard.cpp"
+#include "trials/ThePoolofTribute.cpp"
+#include "trials/ThePoolofTributeExtreme.cpp"
+#include "trials/TheRoyalMenagerie.cpp"
+#include "trials/TheSingularityReactor.cpp"
+#include "trials/TheStepsofFaith.cpp"
+#include "trials/TheStrikingTreeExtreme.cpp"
+#include "trials/TheStrikingTreeHard.cpp"
+#include "trials/TheWhorleaterExtreme.cpp"
+#include "trials/TheWhorleaterHard.cpp"
+#include "trials/ThokastThokExtreme.cpp"
+#include "trials/ThokastThokHard.cpp"
+#include "trials/ThornmarchExtreme.cpp"
+#include "trials/ThornmarchHard.cpp"
+#include "trials/UrthsFount.cpp"
 
 const ScriptObject* ptrs[] =
 {
-   static_cast< ScriptObject* >( new TheFeastTeamRanked ),
-   static_cast< ScriptObject* >( new SealRockSeize ),
-   static_cast< ScriptObject* >( new TheFeast4on4Ranked ),
-   static_cast< ScriptObject* >( new TheFeast4on4LightParty ),
-   static_cast< ScriptObject* >( new TheFeastRanked ),
-   static_cast< ScriptObject* >( new TheFieldsofGloryShatter ),
-   static_cast< ScriptObject* >( new TheFeastTraining ),
-   static_cast< ScriptObject* >( new Astragalos ),
-   static_cast< ScriptObject* >( new TheFeast4on4Training ),
-   static_cast< ScriptObject* >( new TheFeastCustomMatchFeastingGrounds ),
-   static_cast< ScriptObject* >( new TheFeastCustomMatchLichenweed ),
-   static_cast< ScriptObject* >( new TheBorderlandRuinsSecure ),
-   static_cast< ScriptObject* >( new TheFeastCustomMatchCrystalTower ),
-   static_cast< ScriptObject* >( new TheTamTaraDeepcroft ),
-   static_cast< ScriptObject* >( new DomaCastle ),
-   static_cast< ScriptObject* >( new HullbreakerIsleHard ),
-   static_cast< ScriptObject* >( new Snowcloak ),
-   static_cast< ScriptObject* >( new TheGreatGubalLibrary ),
-   static_cast< ScriptObject* >( new TheWanderersPalace ),
-   static_cast< ScriptObject* >( new Xelphatol ),
-   static_cast< ScriptObject* >( new TheLostCityofAmdaporHard ),
-   static_cast< ScriptObject* >( new SaintMociannesArboretum ),
-   static_cast< ScriptObject* >( new BardamsMettle ),
-   static_cast< ScriptObject* >( new TheTamTaraDeepcroftHard ),
-   static_cast< ScriptObject* >( new KuganeCastle ),
-   static_cast< ScriptObject* >( new TheDrownedCityofSkalla ),
-   static_cast< ScriptObject* >( new ShisuioftheVioletTides ),
-   static_cast< ScriptObject* >( new CuttersCry ),
-   static_cast< ScriptObject* >( new HellsLid ),
-   static_cast< ScriptObject* >( new TheVault ),
-   static_cast< ScriptObject* >( new TheStoneVigilHard ),
-   static_cast< ScriptObject* >( new Sastasha ),
-   static_cast< ScriptObject* >( new TheFractalContinuum ),
-   static_cast< ScriptObject* >( new TheLostCityofAmdapor ),
-   static_cast< ScriptObject* >( new TheAurumVale ),
-   static_cast< ScriptObject* >( new SohrKhai ),
-   static_cast< ScriptObject* >( new TheSunkenTempleofQarnHard ),
-   static_cast< ScriptObject* >( new Neverreap ),
-   static_cast< ScriptObject* >( new TheAntitower ),
-   static_cast< ScriptObject* >( new Halatali ),
-   static_cast< ScriptObject* >( new TheAery ),
-   static_cast< ScriptObject* >( new PharosSiriusHard ),
-   static_cast< ScriptObject* >( new CastrumMeridianum ),
-   static_cast< ScriptObject* >( new TheGreatGubalLibraryHard ),
-   static_cast< ScriptObject* >( new SohmAl ),
-   static_cast< ScriptObject* >( new TheTempleoftheFist ),
-   static_cast< ScriptObject* >( new TheKeeperoftheLake ),
-   static_cast< ScriptObject* >( new AmdaporKeepHard ),
-   static_cast< ScriptObject* >( new TheWanderersPalaceHard ),
-   static_cast< ScriptObject* >( new CastrumAbania ),
-   static_cast< ScriptObject* >( new AlaMhigo ),
-   static_cast< ScriptObject* >( new PharosSirius ),
-   static_cast< ScriptObject* >( new TheStoneVigil ),
-   static_cast< ScriptObject* >( new TheThousandMawsofTotoRak ),
-   static_cast< ScriptObject* >( new BrayfloxsLongstopHard ),
-   static_cast< ScriptObject* >( new DzemaelDarkhold ),
-   static_cast< ScriptObject* >( new SohmAlHard ),
-   static_cast< ScriptObject* >( new HaukkeManor ),
-   static_cast< ScriptObject* >( new HullbreakerIsle ),
-   static_cast< ScriptObject* >( new TheFractalContinuumHard ),
-   static_cast< ScriptObject* >( new TheSirensongSea ),
-   static_cast< ScriptObject* >( new BaelsarsWall ),
-   static_cast< ScriptObject* >( new HalataliHard ),
-   static_cast< ScriptObject* >( new TheAetherochemicalResearchFacility ),
-   static_cast< ScriptObject* >( new SastashaHard ),
-   static_cast< ScriptObject* >( new CopperbellMinesHard ),
-   static_cast< ScriptObject* >( new TheSunkenTempleofQarn ),
-   static_cast< ScriptObject* >( new AmdaporKeep ),
-   static_cast< ScriptObject* >( new TheDuskVigil ),
-   static_cast< ScriptObject* >( new BrayfloxsLongstop ),
-   static_cast< ScriptObject* >( new HaukkeManorHard ),
-   static_cast< ScriptObject* >( new CopperbellMines ),
-   static_cast< ScriptObject* >( new ThePraetorium ),
-   static_cast< ScriptObject* >( new RaisingtheSword ),
-   static_cast< ScriptObject* >( new InterdimensionalRift ),
-   static_cast< ScriptObject* >( new CuriousGorgeMeetsHisMatch ),
-   static_cast< ScriptObject* >( new WithHeartandSteel ),
-   static_cast< ScriptObject* >( new OneLifeforOneWorld ),
-   static_cast< ScriptObject* >( new ABloodyReunion ),
-   static_cast< ScriptObject* >( new MatsubaMayhem ),
-   static_cast< ScriptObject* >( new BloodontheDeck ),
-   static_cast< ScriptObject* >( new OurCompromise ),
-   static_cast< ScriptObject* >( new Naadam ),
-   static_cast< ScriptObject* >( new InThalsName ),
-   static_cast< ScriptObject* >( new TheResonant ),
-   static_cast< ScriptObject* >( new OurUnsungHeroes ),
-   static_cast< ScriptObject* >( new DarkwingDragon ),
-   static_cast< ScriptObject* >( new BloodDragoon ),
-   static_cast< ScriptObject* >( new ASpectaclefortheAges ),
-   static_cast< ScriptObject* >( new ItsProbablyaTrap ),
-   static_cast< ScriptObject* >( new TheBattleonBekko ),
-   static_cast< ScriptObject* >( new TheHeartoftheProblem ),
-   static_cast< ScriptObject* >( new TheOrphansandtheBrokenBlade ),
-   static_cast< ScriptObject* >( new TheCarteneauFlatsHeliodrome ),
-   static_cast< ScriptObject* >( new ReturnoftheBull ),
-   static_cast< ScriptObject* >( new TheFaceofTrueEvil ),
-   static_cast< ScriptObject* >( new WhenClansCollide ),
-   static_cast< ScriptObject* >( new AlexanderTheArmoftheSonSavage ),
-   static_cast< ScriptObject* >( new TheLabyrinthoftheAncients ),
-   static_cast< ScriptObject* >( new SigmascapeV30 ),
-   static_cast< ScriptObject* >( new TheVoidArk ),
-   static_cast< ScriptObject* >( new SyrcusTower ),
-   static_cast< ScriptObject* >( new DeltascapeV20 ),
-   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn1 ),
-   static_cast< ScriptObject* >( new SigmascapeV20Savage ),
-   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn3 ),
-   static_cast< ScriptObject* >( new SigmascapeV30Savage ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn2 ),
-   static_cast< ScriptObject* >( new AlexanderTheSouloftheCreatorSavage ),
-   static_cast< ScriptObject* >( new DunScaith ),
-   static_cast< ScriptObject* >( new DeltascapeV40Savage ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn1 ),
-   static_cast< ScriptObject* >( new AlexanderTheHeartoftheCreatorSavage ),
-   static_cast< ScriptObject* >( new DeltascapeV40 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn2 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn3 ),
-   static_cast< ScriptObject* >( new TheUnendingCoilofBahamutUltimate ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn2 ),
-   static_cast< ScriptObject* >( new TheWorldofDarkness ),
-   static_cast< ScriptObject* >( new SigmascapeV10 ),
-   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheSonSavage ),
-   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn2 ),
-   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheFatherSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheHeartoftheCreator ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn4 ),
-   static_cast< ScriptObject* >( new AlexanderTheBreathoftheCreatorSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheEyesoftheCreatorSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheArmoftheFatherSavage ),
-   static_cast< ScriptObject* >( new DeltascapeV30 ),
-   static_cast< ScriptObject* >( new AlexanderTheFistoftheFather ),
-   static_cast< ScriptObject* >( new DeltascapeV10 ),
-   static_cast< ScriptObject* >( new DeltascapeV10Savage ),
-   static_cast< ScriptObject* >( new SigmascapeV40Savage ),
-   static_cast< ScriptObject* >( new AlexanderTheCuffoftheSon ),
-   static_cast< ScriptObject* >( new AlexanderTheFistoftheSonSavage ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn3 ),
-   static_cast< ScriptObject* >( new AlexanderTheArmoftheFather ),
-   static_cast< ScriptObject* >( new AlexanderTheCuffoftheSonSavage ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn5 ),
-   static_cast< ScriptObject* >( new SigmascapeV20 ),
-   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFather ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn1 ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn1 ),
-   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheSon ),
-   static_cast< ScriptObject* >( new AlexanderTheBreathoftheCreator ),
-   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn4 ),
-   static_cast< ScriptObject* >( new DeltascapeV30Savage ),
-   static_cast< ScriptObject* >( new AlexanderTheFistoftheSon ),
-   static_cast< ScriptObject* >( new AlexanderTheFistoftheFatherSavage ),
-   static_cast< ScriptObject* >( new AlexanderTheArmoftheSon ),
-   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn3 ),
-   static_cast< ScriptObject* >( new SigmascapeV40 ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn4 ),
-   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFatherSavage ),
-   static_cast< ScriptObject* >( new SigmascapeV10Savage ),
-   static_cast< ScriptObject* >( new DeltascapeV20Savage ),
-   static_cast< ScriptObject* >( new TheWeepingCityofMhach ),
-   static_cast< ScriptObject* >( new TheRoyalCityofRabanastre ),
-   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheFather ),
-   static_cast< ScriptObject* >( new AlexanderTheEyesoftheCreator ),
-   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn4 ),
-   static_cast< ScriptObject* >( new AlexanderTheSouloftheCreator ),
-   static_cast< ScriptObject* >( new HeroontheHalfShell ),
-   static_cast< ScriptObject* >( new BasicTrainingEnemyStrongholds ),
-   static_cast< ScriptObject* >( new ShadowandClaw ),
-   static_cast< ScriptObject* >( new AnnoytheVoid ),
-   static_cast< ScriptObject* >( new StingingBack ),
-   static_cast< ScriptObject* >( new FlickingSticksandTakingNames ),
-   static_cast< ScriptObject* >( new SolemnTrinity ),
-   static_cast< ScriptObject* >( new UndertheArmor ),
-   static_cast< ScriptObject* >( new LongLivetheQueen ),
-   static_cast< ScriptObject* >( new AllsWellthatEndsintheWell ),
-   static_cast< ScriptObject* >( new MorethanaFeeler ),
-   static_cast< ScriptObject* >( new PullingPoisonPosies ),
-   static_cast< ScriptObject* >( new WardUp ),
-   static_cast< ScriptObject* >( new BasicTrainingEnemyParties ),
-   static_cast< ScriptObject* >( new TheStrikingTreeHard ),
-   static_cast< ScriptObject* >( new TheJadeStoaExtreme ),
-   static_cast< ScriptObject* >( new TheMinstrelsBalladThordansReign ),
-   static_cast< ScriptObject* >( new TheBowlofEmbersHard ),
-   static_cast< ScriptObject* >( new TheSingularityReactor ),
-   static_cast< ScriptObject* >( new ContainmentBayS1T7Extreme ),
-   static_cast< ScriptObject* >( new ContainmentBayS1T7 ),
-   static_cast< ScriptObject* >( new TheHowlingEyeHard ),
-   static_cast< ScriptObject* >( new TheStrikingTreeExtreme ),
-   static_cast< ScriptObject* >( new Emanation ),
-   static_cast< ScriptObject* >( new SpecialEventI ),
-   static_cast< ScriptObject* >( new TheLimitlessBlueExtreme ),
-   static_cast< ScriptObject* >( new ThePoolofTributeExtreme ),
-   static_cast< ScriptObject* >( new BattleontheBigBridge ),
-   static_cast< ScriptObject* >( new TheRoyalMenagerie ),
-   static_cast< ScriptObject* >( new BattleintheBigKeep ),
-   static_cast< ScriptObject* >( new UrthsFount ),
-   static_cast< ScriptObject* >( new EmanationExtreme ),
-   static_cast< ScriptObject* >( new TheJadeStoa ),
-   static_cast< ScriptObject* >( new TheHowlingEyeExtreme ),
-   static_cast< ScriptObject* >( new TheBowlofEmbers ),
-   static_cast< ScriptObject* >( new TheChrysalis ),
-   static_cast< ScriptObject* >( new TheStepsofFaith ),
-   static_cast< ScriptObject* >( new ARelicReborntheChimera ),
-   static_cast< ScriptObject* >( new ContainmentBayP1T6 ),
-   static_cast< ScriptObject* >( new TheMinstrelsBalladNidhoggsRage ),
-   static_cast< ScriptObject* >( new ThokastThokExtreme ),
    static_cast< ScriptObject* >( new AkhAfahAmphitheatreExtreme ),
-   static_cast< ScriptObject* >( new ThornmarchExtreme ),
-   static_cast< ScriptObject* >( new TheLimitlessBlueHard ),
-   static_cast< ScriptObject* >( new ContainmentBayP1T6Extreme ),
-   static_cast< ScriptObject* >( new TheNavelExtreme ),
-   static_cast< ScriptObject* >( new SpecialEventII ),
-   static_cast< ScriptObject* >( new TheWhorleaterExtreme ),
-   static_cast< ScriptObject* >( new TheMinstrelsBalladUltimasBane ),
-   static_cast< ScriptObject* >( new ContainmentBayZ1T9 ),
-   static_cast< ScriptObject* >( new TheFinalStepsofFaith ),
-   static_cast< ScriptObject* >( new ThokastThokHard ),
-   static_cast< ScriptObject* >( new AkhAfahAmphitheatreHard ),
-   static_cast< ScriptObject* >( new CapeWestwind ),
-   static_cast< ScriptObject* >( new TheMinstrelsBalladShinryusDomain ),
-   static_cast< ScriptObject* >( new ContainmentBayZ1T9Extreme ),
-   static_cast< ScriptObject* >( new SpecialEventIII ),
-   static_cast< ScriptObject* >( new ThornmarchHard ),
-   static_cast< ScriptObject* >( new TheDragonsNeck ),
-   static_cast< ScriptObject* >( new TheNavelHard ),
-   static_cast< ScriptObject* >( new TheWhorleaterHard ),
-   static_cast< ScriptObject* >( new TheNavel ),
-   static_cast< ScriptObject* >( new TheBowlofEmbersExtreme ),
-   static_cast< ScriptObject* >( new ARelicReborntheHydra ),
-   static_cast< ScriptObject* >( new ThePoolofTribute ),
-   static_cast< ScriptObject* >( new TheHowlingEye ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors181190 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors6170 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors101110 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors110 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors111120 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors1120 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors121130 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors131140 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors141150 ),
    static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors151160 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors161170 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors171180 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors181190 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors191200 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors2130 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors3140 ),
    static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors4150 ),
    static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors5160 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors3140 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors1120 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors110 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors141150 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors161170 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors131140 ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors6170 ),
    static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors7180 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors101110 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors171180 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors2130 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors191200 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors121130 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors111120 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors91100 ),
    static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors8190 ),
-   static_cast< ScriptObject* >( new TheAquapolis ),
-   static_cast< ScriptObject* >( new TheLostCanalsofUznair ),
-   static_cast< ScriptObject* >( new TheHiddenCanalsofUznair ),
-   static_cast< ScriptObject* >( new InteractwiththeBattlefield ),
-   static_cast< ScriptObject* >( new AvoidEngagedTargets ),
-   static_cast< ScriptObject* >( new AvoidAreaofEffectAttacks ),
-   static_cast< ScriptObject* >( new HealMultipleAllies ),
-   static_cast< ScriptObject* >( new ExecuteaCombotoIncreaseEnmity ),
-   static_cast< ScriptObject* >( new AssistAlliesinDefeatingaTarget ),
-   static_cast< ScriptObject* >( new HealanAlly ),
-   static_cast< ScriptObject* >( new EngageMultipleTargets ),
-   static_cast< ScriptObject* >( new FinalExercise ),
-   static_cast< ScriptObject* >( new EngageEnemyReinforcements ),
-   static_cast< ScriptObject* >( new ExecuteaRangedAttacktoIncreaseEnmity ),
-   static_cast< ScriptObject* >( new ExecuteaComboinBattle ),
-   static_cast< ScriptObject* >( new DefeatanOccupiedTarget ),
-   static_cast< ScriptObject* >( new AccrueEnmityfromMultipleTargets ),
-   static_cast< ScriptObject* >( new TheValentionesCeremony ),
+   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors91100 ),
+   static_cast< ScriptObject* >( new AlaMhigo ),
+   static_cast< ScriptObject* >( new AmdaporKeep ),
+   static_cast< ScriptObject* >( new AmdaporKeepHard ),
+   static_cast< ScriptObject* >( new BaelsarsWall ),
+   static_cast< ScriptObject* >( new BardamsMettle ),
+   static_cast< ScriptObject* >( new BrayfloxsLongstop ),
+   static_cast< ScriptObject* >( new BrayfloxsLongstopHard ),
+   static_cast< ScriptObject* >( new CastrumAbania ),
+   static_cast< ScriptObject* >( new CastrumMeridianum ),
+   static_cast< ScriptObject* >( new CopperbellMines ),
+   static_cast< ScriptObject* >( new CopperbellMinesHard ),
+   static_cast< ScriptObject* >( new CuttersCry ),
+   static_cast< ScriptObject* >( new DomaCastle ),
+   static_cast< ScriptObject* >( new DzemaelDarkhold ),
+   static_cast< ScriptObject* >( new Halatali ),
+   static_cast< ScriptObject* >( new HalataliHard ),
+   static_cast< ScriptObject* >( new HaukkeManor ),
+   static_cast< ScriptObject* >( new HaukkeManorHard ),
+   static_cast< ScriptObject* >( new HellsLid ),
+   static_cast< ScriptObject* >( new HullbreakerIsle ),
+   static_cast< ScriptObject* >( new HullbreakerIsleHard ),
+   static_cast< ScriptObject* >( new KuganeCastle ),
+   static_cast< ScriptObject* >( new Neverreap ),
+   static_cast< ScriptObject* >( new PharosSirius ),
+   static_cast< ScriptObject* >( new PharosSiriusHard ),
+   static_cast< ScriptObject* >( new SaintMociannesArboretum ),
+   static_cast< ScriptObject* >( new Sastasha ),
+   static_cast< ScriptObject* >( new SastashaHard ),
+   static_cast< ScriptObject* >( new ShisuioftheVioletTides ),
+   static_cast< ScriptObject* >( new Snowcloak ),
+   static_cast< ScriptObject* >( new SohmAl ),
+   static_cast< ScriptObject* >( new SohmAlHard ),
+   static_cast< ScriptObject* >( new SohrKhai ),
+   static_cast< ScriptObject* >( new TheAery ),
+   static_cast< ScriptObject* >( new TheAetherochemicalResearchFacility ),
+   static_cast< ScriptObject* >( new TheAntitower ),
+   static_cast< ScriptObject* >( new TheAurumVale ),
+   static_cast< ScriptObject* >( new TheDrownedCityofSkalla ),
+   static_cast< ScriptObject* >( new TheDuskVigil ),
+   static_cast< ScriptObject* >( new TheFractalContinuum ),
+   static_cast< ScriptObject* >( new TheFractalContinuumHard ),
+   static_cast< ScriptObject* >( new TheGreatGubalLibrary ),
+   static_cast< ScriptObject* >( new TheGreatGubalLibraryHard ),
+   static_cast< ScriptObject* >( new TheKeeperoftheLake ),
+   static_cast< ScriptObject* >( new TheLostCityofAmdapor ),
+   static_cast< ScriptObject* >( new TheLostCityofAmdaporHard ),
+   static_cast< ScriptObject* >( new ThePraetorium ),
+   static_cast< ScriptObject* >( new TheSirensongSea ),
+   static_cast< ScriptObject* >( new TheStoneVigil ),
+   static_cast< ScriptObject* >( new TheStoneVigilHard ),
+   static_cast< ScriptObject* >( new TheSunkenTempleofQarn ),
+   static_cast< ScriptObject* >( new TheSunkenTempleofQarnHard ),
+   static_cast< ScriptObject* >( new TheTamTaraDeepcroft ),
+   static_cast< ScriptObject* >( new TheTamTaraDeepcroftHard ),
+   static_cast< ScriptObject* >( new TheTempleoftheFist ),
+   static_cast< ScriptObject* >( new TheThousandMawsofTotoRak ),
+   static_cast< ScriptObject* >( new TheVault ),
+   static_cast< ScriptObject* >( new TheWanderersPalace ),
+   static_cast< ScriptObject* >( new TheWanderersPalaceHard ),
+   static_cast< ScriptObject* >( new Xelphatol ),
    static_cast< ScriptObject* >( new TheHauntedManor ),
+   static_cast< ScriptObject* >( new TheValentionesCeremony ),
+   static_cast< ScriptObject* >( new AllsWellthatEndsintheWell ),
+   static_cast< ScriptObject* >( new AnnoytheVoid ),
+   static_cast< ScriptObject* >( new BasicTrainingEnemyParties ),
+   static_cast< ScriptObject* >( new BasicTrainingEnemyStrongholds ),
+   static_cast< ScriptObject* >( new FlickingSticksandTakingNames ),
+   static_cast< ScriptObject* >( new HeroontheHalfShell ),
+   static_cast< ScriptObject* >( new LongLivetheQueen ),
+   static_cast< ScriptObject* >( new MorethanaFeeler ),
+   static_cast< ScriptObject* >( new PullingPoisonPosies ),
+   static_cast< ScriptObject* >( new ShadowandClaw ),
+   static_cast< ScriptObject* >( new SolemnTrinity ),
+   static_cast< ScriptObject* >( new StingingBack ),
+   static_cast< ScriptObject* >( new UndertheArmor ),
+   static_cast< ScriptObject* >( new WardUp ),
+   static_cast< ScriptObject* >( new AccrueEnmityfromMultipleTargets ),
+   static_cast< ScriptObject* >( new AssistAlliesinDefeatingaTarget ),
+   static_cast< ScriptObject* >( new AvoidAreaofEffectAttacks ),
+   static_cast< ScriptObject* >( new AvoidEngagedTargets ),
+   static_cast< ScriptObject* >( new DefeatanOccupiedTarget ),
+   static_cast< ScriptObject* >( new EngageEnemyReinforcements ),
+   static_cast< ScriptObject* >( new EngageMultipleTargets ),
+   static_cast< ScriptObject* >( new ExecuteaComboinBattle ),
+   static_cast< ScriptObject* >( new ExecuteaCombotoIncreaseEnmity ),
+   static_cast< ScriptObject* >( new ExecuteaRangedAttacktoIncreaseEnmity ),
+   static_cast< ScriptObject* >( new FinalExercise ),
+   static_cast< ScriptObject* >( new HealMultipleAllies ),
+   static_cast< ScriptObject* >( new HealanAlly ),
+   static_cast< ScriptObject* >( new InteractwiththeBattlefield ),
+   static_cast< ScriptObject* >( new Astragalos ),
+   static_cast< ScriptObject* >( new SealRockSeize ),
+   static_cast< ScriptObject* >( new TheBorderlandRuinsSecure ),
+   static_cast< ScriptObject* >( new TheFeast4on4LightParty ),
+   static_cast< ScriptObject* >( new TheFeast4on4Ranked ),
+   static_cast< ScriptObject* >( new TheFeast4on4Training ),
+   static_cast< ScriptObject* >( new TheFeastCustomMatchCrystalTower ),
+   static_cast< ScriptObject* >( new TheFeastCustomMatchFeastingGrounds ),
+   static_cast< ScriptObject* >( new TheFeastCustomMatchLichenweed ),
+   static_cast< ScriptObject* >( new TheFeastRanked ),
+   static_cast< ScriptObject* >( new TheFeastTeamRanked ),
+   static_cast< ScriptObject* >( new TheFeastTraining ),
+   static_cast< ScriptObject* >( new TheFieldsofGloryShatter ),
+   static_cast< ScriptObject* >( new ABloodyReunion ),
+   static_cast< ScriptObject* >( new ASpectaclefortheAges ),
+   static_cast< ScriptObject* >( new BloodDragoon ),
+   static_cast< ScriptObject* >( new BloodontheDeck ),
+   static_cast< ScriptObject* >( new CuriousGorgeMeetsHisMatch ),
+   static_cast< ScriptObject* >( new DarkwingDragon ),
+   static_cast< ScriptObject* >( new InThalsName ),
+   static_cast< ScriptObject* >( new InterdimensionalRift ),
+   static_cast< ScriptObject* >( new ItsProbablyaTrap ),
+   static_cast< ScriptObject* >( new MatsubaMayhem ),
+   static_cast< ScriptObject* >( new Naadam ),
+   static_cast< ScriptObject* >( new OneLifeforOneWorld ),
+   static_cast< ScriptObject* >( new OurCompromise ),
+   static_cast< ScriptObject* >( new OurUnsungHeroes ),
+   static_cast< ScriptObject* >( new RaisingtheSword ),
+   static_cast< ScriptObject* >( new ReturnoftheBull ),
+   static_cast< ScriptObject* >( new TheBattleonBekko ),
+   static_cast< ScriptObject* >( new TheCarteneauFlatsHeliodrome ),
+   static_cast< ScriptObject* >( new TheFaceofTrueEvil ),
+   static_cast< ScriptObject* >( new TheHeartoftheProblem ),
+   static_cast< ScriptObject* >( new TheOrphansandtheBrokenBlade ),
+   static_cast< ScriptObject* >( new TheResonant ),
+   static_cast< ScriptObject* >( new WhenClansCollide ),
+   static_cast< ScriptObject* >( new WithHeartandSteel ),
+   static_cast< ScriptObject* >( new AlexanderTheArmoftheFather ),
+   static_cast< ScriptObject* >( new AlexanderTheArmoftheFatherSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheArmoftheSon ),
+   static_cast< ScriptObject* >( new AlexanderTheArmoftheSonSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheBreathoftheCreator ),
+   static_cast< ScriptObject* >( new AlexanderTheBreathoftheCreatorSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheFather ),
+   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheFatherSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheSon ),
+   static_cast< ScriptObject* >( new AlexanderTheBurdenoftheSonSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFather ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFatherSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheSon ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheSonSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheEyesoftheCreator ),
+   static_cast< ScriptObject* >( new AlexanderTheEyesoftheCreatorSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheFather ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheFatherSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheSon ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheSonSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheHeartoftheCreator ),
+   static_cast< ScriptObject* >( new AlexanderTheHeartoftheCreatorSavage ),
+   static_cast< ScriptObject* >( new AlexanderTheSouloftheCreator ),
+   static_cast< ScriptObject* >( new AlexanderTheSouloftheCreatorSavage ),
+   static_cast< ScriptObject* >( new DeltascapeV10 ),
+   static_cast< ScriptObject* >( new DeltascapeV10Savage ),
+   static_cast< ScriptObject* >( new DeltascapeV20 ),
+   static_cast< ScriptObject* >( new DeltascapeV20Savage ),
+   static_cast< ScriptObject* >( new DeltascapeV30 ),
+   static_cast< ScriptObject* >( new DeltascapeV30Savage ),
+   static_cast< ScriptObject* >( new DeltascapeV40 ),
+   static_cast< ScriptObject* >( new DeltascapeV40Savage ),
+   static_cast< ScriptObject* >( new DunScaith ),
+   static_cast< ScriptObject* >( new SigmascapeV10 ),
+   static_cast< ScriptObject* >( new SigmascapeV10Savage ),
+   static_cast< ScriptObject* >( new SigmascapeV20 ),
+   static_cast< ScriptObject* >( new SigmascapeV20Savage ),
+   static_cast< ScriptObject* >( new SigmascapeV30 ),
+   static_cast< ScriptObject* >( new SigmascapeV30Savage ),
+   static_cast< ScriptObject* >( new SigmascapeV40 ),
+   static_cast< ScriptObject* >( new SigmascapeV40Savage ),
+   static_cast< ScriptObject* >( new SyrcusTower ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn1 ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn2 ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn3 ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn4 ),
+   static_cast< ScriptObject* >( new TheBindingCoilofBahamutTurn5 ),
+   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn1 ),
+   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn2 ),
+   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn3 ),
+   static_cast< ScriptObject* >( new TheFinalCoilofBahamutTurn4 ),
+   static_cast< ScriptObject* >( new TheLabyrinthoftheAncients ),
+   static_cast< ScriptObject* >( new TheRoyalCityofRabanastre ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn1 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn2 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn3 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutSavageTurn4 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn1 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn2 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn3 ),
+   static_cast< ScriptObject* >( new TheSecondCoilofBahamutTurn4 ),
+   static_cast< ScriptObject* >( new TheUnendingCoilofBahamutUltimate ),
+   static_cast< ScriptObject* >( new TheVoidArk ),
+   static_cast< ScriptObject* >( new TheWeepingCityofMhach ),
+   static_cast< ScriptObject* >( new TheWorldofDarkness ),
+   static_cast< ScriptObject* >( new TheAquapolis ),
+   static_cast< ScriptObject* >( new TheHiddenCanalsofUznair ),
+   static_cast< ScriptObject* >( new TheLostCanalsofUznair ),
+   static_cast< ScriptObject* >( new ARelicReborntheChimera ),
+   static_cast< ScriptObject* >( new ARelicReborntheHydra ),
+   static_cast< ScriptObject* >( new AkhAfahAmphitheatreHard ),
+   static_cast< ScriptObject* >( new BattleintheBigKeep ),
+   static_cast< ScriptObject* >( new BattleontheBigBridge ),
+   static_cast< ScriptObject* >( new CapeWestwind ),
+   static_cast< ScriptObject* >( new ContainmentBayP1T6 ),
+   static_cast< ScriptObject* >( new ContainmentBayP1T6Extreme ),
+   static_cast< ScriptObject* >( new ContainmentBayS1T7 ),
+   static_cast< ScriptObject* >( new ContainmentBayS1T7Extreme ),
+   static_cast< ScriptObject* >( new ContainmentBayZ1T9 ),
+   static_cast< ScriptObject* >( new ContainmentBayZ1T9Extreme ),
+   static_cast< ScriptObject* >( new Emanation ),
+   static_cast< ScriptObject* >( new EmanationExtreme ),
+   static_cast< ScriptObject* >( new SpecialEventI ),
+   static_cast< ScriptObject* >( new SpecialEventII ),
+   static_cast< ScriptObject* >( new SpecialEventIII ),
+   static_cast< ScriptObject* >( new TheBowlofEmbers ),
+   static_cast< ScriptObject* >( new TheBowlofEmbersExtreme ),
+   static_cast< ScriptObject* >( new TheBowlofEmbersHard ),
+   static_cast< ScriptObject* >( new TheChrysalis ),
+   static_cast< ScriptObject* >( new TheDragonsNeck ),
+   static_cast< ScriptObject* >( new TheFinalStepsofFaith ),
+   static_cast< ScriptObject* >( new TheHowlingEye ),
+   static_cast< ScriptObject* >( new TheHowlingEyeExtreme ),
+   static_cast< ScriptObject* >( new TheHowlingEyeHard ),
+   static_cast< ScriptObject* >( new TheJadeStoa ),
+   static_cast< ScriptObject* >( new TheJadeStoaExtreme ),
+   static_cast< ScriptObject* >( new TheLimitlessBlueExtreme ),
+   static_cast< ScriptObject* >( new TheLimitlessBlueHard ),
+   static_cast< ScriptObject* >( new TheMinstrelsBalladNidhoggsRage ),
+   static_cast< ScriptObject* >( new TheMinstrelsBalladShinryusDomain ),
+   static_cast< ScriptObject* >( new TheMinstrelsBalladThordansReign ),
+   static_cast< ScriptObject* >( new TheMinstrelsBalladUltimasBane ),
+   static_cast< ScriptObject* >( new TheNavel ),
+   static_cast< ScriptObject* >( new TheNavelExtreme ),
+   static_cast< ScriptObject* >( new TheNavelHard ),
+   static_cast< ScriptObject* >( new ThePoolofTribute ),
+   static_cast< ScriptObject* >( new ThePoolofTributeExtreme ),
+   static_cast< ScriptObject* >( new TheRoyalMenagerie ),
+   static_cast< ScriptObject* >( new TheSingularityReactor ),
+   static_cast< ScriptObject* >( new TheStepsofFaith ),
+   static_cast< ScriptObject* >( new TheStrikingTreeExtreme ),
+   static_cast< ScriptObject* >( new TheStrikingTreeHard ),
+   static_cast< ScriptObject* >( new TheWhorleaterExtreme ),
+   static_cast< ScriptObject* >( new TheWhorleaterHard ),
+   static_cast< ScriptObject* >( new ThokastThokExtreme ),
+   static_cast< ScriptObject* >( new ThokastThokHard ),
+   static_cast< ScriptObject* >( new ThornmarchExtreme ),
+   static_cast< ScriptObject* >( new ThornmarchHard ),
+   static_cast< ScriptObject* >( new UrthsFount ),
 
    nullptr
 };
diff --git a/src/servers/Scripts/opening/ScriptLoader.cpp b/src/servers/Scripts/opening/ScriptLoader.cpp
index e3349224..c0306ca9 100644
--- a/src/servers/Scripts/opening/ScriptLoader.cpp
+++ b/src/servers/Scripts/opening/ScriptLoader.cpp
@@ -1,13 +1,13 @@
 #include <Script/NativeScriptApi.h>
 
-#include "OpeningLimsa.cpp"
 #include "OpeningGridania.cpp"
+#include "OpeningLimsa.cpp"
 #include "OpeningUldah.cpp"
 
 const ScriptObject* ptrs[] =
 {
-   static_cast< ScriptObject* >( new OpeningLimsa ),
    static_cast< ScriptObject* >( new OpeningGridania ),
+   static_cast< ScriptObject* >( new OpeningLimsa ),
    static_cast< ScriptObject* >( new OpeningUldah ),
 
    nullptr
diff --git a/src/servers/Scripts/quest/ScriptLoader.cpp b/src/servers/Scripts/quest/ScriptLoader.cpp
index 004f37c9..53db3f2e 100644
--- a/src/servers/Scripts/quest/ScriptLoader.cpp
+++ b/src/servers/Scripts/quest/ScriptLoader.cpp
@@ -1,32 +1,32 @@
 #include <Script/NativeScriptApi.h>
 
-#include "ManFst004.cpp"
-#include "ManSea002.cpp"
+#include "ManFst001.cpp"
 #include "ManFst002.cpp"
 #include "ManFst003.cpp"
+#include "ManFst004.cpp"
+#include "ManSea001.cpp"
+#include "ManSea002.cpp"
 #include "ManWil001.cpp"
 #include "ManWil002.cpp"
-#include "ManFst001.cpp"
-#include "subquest/gridania/SubFst002.cpp"
-#include "subquest/gridania/SubFst013.cpp"
 #include "subquest/gridania/SubFst001.cpp"
+#include "subquest/gridania/SubFst002.cpp"
 #include "subquest/gridania/SubFst010.cpp"
-#include "ManSea001.cpp"
+#include "subquest/gridania/SubFst013.cpp"
 
 const ScriptObject* ptrs[] =
 {
-   static_cast< ScriptObject* >( new ManFst004 ),
-   static_cast< ScriptObject* >( new ManSea002 ),
+   static_cast< ScriptObject* >( new ManFst001 ),
    static_cast< ScriptObject* >( new ManFst002 ),
    static_cast< ScriptObject* >( new ManFst003 ),
+   static_cast< ScriptObject* >( new ManFst004 ),
+   static_cast< ScriptObject* >( new ManSea001 ),
+   static_cast< ScriptObject* >( new ManSea002 ),
    static_cast< ScriptObject* >( new ManWil001 ),
    static_cast< ScriptObject* >( new ManWil002 ),
-   static_cast< ScriptObject* >( new ManFst001 ),
-   static_cast< ScriptObject* >( new SubFst002 ),
-   static_cast< ScriptObject* >( new SubFst013 ),
    static_cast< ScriptObject* >( new SubFst001 ),
+   static_cast< ScriptObject* >( new SubFst002 ),
    static_cast< ScriptObject* >( new SubFst010 ),
-   static_cast< ScriptObject* >( new ManSea001 ),
+   static_cast< ScriptObject* >( new SubFst013 ),
 
    nullptr
 };
diff --git a/src/servers/sapphire_api/main.cpp b/src/servers/sapphire_api/main.cpp
index da037f9e..d42d53cf 100644
--- a/src/servers/sapphire_api/main.cpp
+++ b/src/servers/sapphire_api/main.cpp
@@ -29,10 +29,13 @@
 #include <vector>
 #include <algorithm>
 
+#include <Framework.h>
+
 #include "Forwards.h"
 #include "SapphireAPI.h"
 
 
+Core::Framework g_fw;
 Core::Logger g_log;
 Core::Db::DbWorkerPool< Core::Db::CharaDbConnection > g_charaDb;
 Core::Data::ExdDataGenerated g_exdDataGen;
@@ -739,6 +742,8 @@ void defaultGet( shared_ptr<HttpServer::Response> response, shared_ptr<HttpServe
 
 int main( int argc, char* argv[] )
 {
+   auto pLog = boost::shared_ptr< Core::Logger >( new Core::Logger() );
+   g_fw.set< Core::Logger >( pLog );
    g_log.setLogPath( "log/SapphireAPI" );
    g_log.init();
 
diff --git a/src/servers/sapphire_zone/Action/ActionCast.cpp b/src/servers/sapphire_zone/Action/ActionCast.cpp
index 0021b1ff..37806683 100644
--- a/src/servers/sapphire_zone/Action/ActionCast.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCast.cpp
@@ -20,7 +20,7 @@ using namespace Core::Network;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Action::ActionCast::ActionCast()
 {
@@ -29,10 +29,11 @@ Core::Action::ActionCast::ActionCast()
 
 Core::Action::ActionCast::ActionCast( Entity::CharaPtr pActor, Entity::CharaPtr pTarget, uint16_t actionId )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    m_startTime = 0;
    m_id = actionId;
    m_handleActionType = HandleActionType::Spell;
-   m_castTime = g_framework.getExdDataGen().get< Core::Data::Action >( actionId )->cast100ms * 100; // TODO: Add security checks.
+   m_castTime = pExdData->get< Core::Data::Action >( actionId )->cast100ms * 100; // TODO: Add security checks.
    m_pSource = pActor;
    m_pTarget = pTarget;
    m_bInterrupt = false;
@@ -67,6 +68,8 @@ void Core::Action::ActionCast::onFinish()
    if( !m_pSource )
       return;
 
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+
    auto pPlayer = m_pSource->getAsPlayer();
    pPlayer->sendDebug( "onFinish()" );
 
@@ -76,7 +79,7 @@ void Core::Action::ActionCast::onFinish()
                                            0x219, m_id, m_id, m_id, m_id );
    m_pSource->sendToInRangeSet( control, true );*/
 
-   g_framework.getScriptMgr().onCastFinish( *pPlayer, m_pTarget, m_id );
+   pScriptMgr->onCastFinish( *pPlayer, m_pTarget, m_id );
 }
 
 void Core::Action::ActionCast::onInterrupt()
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
index 434494c1..88ffc71e 100644
--- a/src/servers/sapphire_zone/Action/ActionTeleport.cpp
+++ b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
@@ -15,7 +15,7 @@ using namespace Core::Network;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Action::ActionTeleport::ActionTeleport()
 {
@@ -24,10 +24,11 @@ Core::Action::ActionTeleport::ActionTeleport()
 
 Core::Action::ActionTeleport::ActionTeleport( Entity::CharaPtr pActor, uint16_t targetZone, uint16_t cost )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    m_startTime = 0;
    m_id = 5;
    m_handleActionType = HandleActionType::Teleport;
-   m_castTime = g_framework.getExdDataGen().get< Core::Data::Action >( 5 )->cast100ms * 100; // TODO: Add security checks.
+   m_castTime = pExdData->get< Core::Data::Action >( 5 )->cast100ms * 100; // TODO: Add security checks.
    m_pSource = pActor;
    m_bInterrupt = false;
    m_targetAetheryte = targetZone;
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
index 6ea5f541..e0578dce 100644
--- a/src/servers/sapphire_zone/Action/EventAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventAction.cpp
@@ -11,7 +11,7 @@
 #include "EventAction.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network;
@@ -26,11 +26,13 @@ Core::Action::EventAction::EventAction()
 Core::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
                                         ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+
    m_additional = additional;
    m_handleActionType = HandleActionType::Event;
    m_eventId = eventId;
    m_id = action;
-   m_castTime = g_framework.getExdDataGen().get< Core::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks.
+   m_castTime = pExdData->get< Core::Data::EventAction >( action )->castTime * 1000; // TODO: Add security checks.
    m_onActionFinishClb = finishRef;
    m_onActionInterruptClb = interruptRef;
    m_pSource = pActor;
@@ -93,7 +95,8 @@ void Core::Action::EventAction::onFinish()
    }
    catch( std::exception& e )
    {
-      g_framework.getLogger().error( e.what() );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( e.what() );
    }
 
 }
@@ -132,7 +135,8 @@ void Core::Action::EventAction::onInterrupt()
    }
    catch( std::exception& e )
    {
-      g_framework.getLogger().error( e.what() );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( e.what() );
    }
 
 }
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.cpp b/src/servers/sapphire_zone/Action/EventItemAction.cpp
index 0188a4ed..91f40ca5 100644
--- a/src/servers/sapphire_zone/Action/EventItemAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventItemAction.cpp
@@ -12,7 +12,7 @@
 #include "EventItemAction.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network;
@@ -86,7 +86,8 @@ void Core::Action::EventItemAction::onFinish()
    }
    catch( std::exception& e )
    {
-      g_framework.getLogger().error( e.what() );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( e.what() );
    }
 
 }
@@ -115,7 +116,8 @@ void Core::Action::EventItemAction::onInterrupt()
    }
    catch( std::exception& e )
    {
-      g_framework.getLogger().error( e.what() );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( e.what() );
    }
 
 }
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 622b004a..0de580e6 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -35,7 +35,7 @@
 
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -288,12 +288,12 @@ Send a packet to all players in range, potentially to self if set and is player
 */
 void Core::Entity::Actor::sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf )
 {
-
+   auto pServerZone = g_fw.get< ServerZone >();
    if( bToSelf && isPlayer() )
    {
       auto pPlayer = getAsPlayer();
 
-      auto pSession = g_framework.getServerZone().getSession( pPlayer->getId() );
+      auto pSession = pServerZone->getSession( pPlayer->getId() );
 
       // it might be that the player DC'd in which case the session would be invalid
       if( pSession )
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index 01130f40..d905c341 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -25,7 +25,7 @@
 #include "Zone/TerritoryMgr.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -421,14 +421,14 @@ ChaiScript Skill Handler.
 void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, uint64_t param1,
                                              uint64_t param2, Entity::Chara& target )
 {
-
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    if( isPlayer() )
    {
       getAsPlayer()->sendDebug( std::to_string( target.getId() ) );
       getAsPlayer()->sendDebug( "Handle script skill type: " + std::to_string( type ) );
    }
 
-   auto actionInfoPtr = g_framework.getExdDataGen().get< Core::Data::Action >( actionId );
+   auto actionInfoPtr = pExdData->get< Core::Data::Action >( actionId );
 
    // Todo: Effect packet generator. 90% of this is basically setting params and it's basically unreadable.
    // Prepare packet. This is seemingly common for all packets in the action handler.
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 432ab466..64e59688 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -15,8 +15,8 @@ using namespace Core::Common;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Logger g_log;
-
+#include "Framework.h"
+extern Core::Framework g_fw;
 
 Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t gimmickId,
                                         uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
@@ -104,7 +104,9 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
    if( !pTarget->isObjSpawnIndexValid( spawnIndex ) )
       return;
 
-   g_log.debug( "Spawning EObj: id:" + std::to_string( getId() ) + " name:" + getName() );
+   auto pLog = g_fw.get< Logger >();
+
+   pLog->debug( "Spawning EObj: id:" + std::to_string( getId() ) + " name:" + getName() );
    ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( getId(), pTarget->getId() );
    eobjStatePacket.data().spawnIndex = spawnIndex;
    eobjStatePacket.data().objKind = getObjKind();
@@ -121,7 +123,8 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
 
 void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget )
 {
-   g_log.debug( "despawn eobj: " + std::to_string( getId() ) );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "despawn eobj: " + std::to_string( getId() ) );
 
    pTarget->freeObjSpawnIndexForActorId( getId( ) );
 }
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 32a26169..6ccc061f 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -46,7 +46,7 @@
 #include "ServerZone.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -100,7 +100,8 @@ Core::Entity::Player::~Player()
 
 void Core::Entity::Player::injectPacket( std::string path )
 {
-   auto session = g_framework.getServerZone().getSession( getId() );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto session = pServerZone->getSession( getId() );
    if( session )
       session->getZoneConnection()->injectPacket( path, *this );
 }
@@ -223,9 +224,11 @@ void Core::Entity::Player::calculateStats()
    uint8_t level = getLevel();
    uint8_t job = static_cast< uint8_t >( getClass() );
 
-   auto classInfo = g_framework.getExdDataGen().get< Core::Data::ClassJob >( job );
-   auto tribeInfo = g_framework.getExdDataGen().get< Core::Data::Tribe >( tribe );
-   auto paramGrowthInfo = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( level );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+
+   auto classInfo = pExdData->get< Core::Data::ClassJob >( job );
+   auto tribeInfo = pExdData->get< Core::Data::Tribe >( tribe );
+   auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( level );
 
    // TODO: put formula somewhere else...
    float base = Math::CalcStats::calculateBaseStat( getAsPlayer() );
@@ -303,7 +306,10 @@ void Core::Entity::Player::sendStats()
 
 void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
 {
-   auto data = g_framework.getExdDataGen().get< Core::Data::Aetheryte >( aetheryteId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+
+   auto data = pExdData->get< Core::Data::Aetheryte >( aetheryteId );
 
    if( data == nullptr )
    {
@@ -311,7 +317,7 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
    }
 
    setStateFlag( PlayerStateFlag::BetweenAreas );
-   auto targetPos = g_framework.getTerritoryMgr().getTerritoryPosition( data->levelId );
+   auto targetPos = pTeriMgr->getTerritoryPosition( data->levelId );
 
    Common::FFXIVARR_POSITION3 pos;
    pos.x = 0;
@@ -325,8 +331,8 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
       rot = targetPos->getTargetRotation();
    }
 
-   sendDebug( "Teleport: " + g_framework.getExdDataGen().get< Core::Data::PlaceName >( data->placeName )->name + " " +
-                             g_framework.getExdDataGen().get< Core::Data::PlaceName >( data->aethernetName )->name +
+   sendDebug( "Teleport: " + pExdData->get< Core::Data::PlaceName >( data->placeName )->name + " " +
+                             pExdData->get< Core::Data::PlaceName >( data->aethernetName )->name +
                "(" + std::to_string( data->territory ) + ")" );
 
    // TODO: this should be simplified and a type created in server_common/common.h.
@@ -368,15 +374,16 @@ void Core::Entity::Player::returnToHomepoint()
 
 void Core::Entity::Player::setZone( uint32_t zoneId )
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    m_onEnterEventDone = false;
-   if( !g_framework.getTerritoryMgr().movePlayer( zoneId, getAsPlayer() ) )
+   if( !pTeriMgr->movePlayer( zoneId, getAsPlayer() ) )
    {
       // todo: this will require proper handling, for now just return the player to their previous area
       m_pos = m_prevPos;
       m_rot = m_prevRot;
       m_zoneId = m_prevZoneId;
 
-      if( !g_framework.getTerritoryMgr().movePlayer( m_zoneId, getAsPlayer() ) )
+      if( !pTeriMgr->movePlayer( m_zoneId, getAsPlayer() ) )
          return;
    }
 
@@ -385,8 +392,9 @@ void Core::Entity::Player::setZone( uint32_t zoneId )
 
 bool Core::Entity::Player::setInstance( uint32_t instanceContentId )
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    m_onEnterEventDone = false;
-   auto instance = g_framework.getTerritoryMgr().getInstanceZonePtr( instanceContentId );
+   auto instance = pTeriMgr->getInstanceZonePtr( instanceContentId );
    if( !instance )
       return false;
 
@@ -399,6 +407,8 @@ bool Core::Entity::Player::setInstance( ZonePtr instance )
    if( !instance )
       return false;
 
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+
    // zoning within the same zone won't cause the prev data to be overwritten
    if( instance->getTerritoryId() != m_zoneId )
    {
@@ -407,7 +417,7 @@ bool Core::Entity::Player::setInstance( ZonePtr instance )
       m_prevZoneId = m_zoneId;
    }
 
-   if( !g_framework.getTerritoryMgr().movePlayer( instance, getAsPlayer() ) )
+   if( !pTeriMgr->movePlayer( instance, getAsPlayer() ) )
       return false;
 
    sendZonePackets();
@@ -417,7 +427,8 @@ bool Core::Entity::Player::setInstance( ZonePtr instance )
 
 bool Core::Entity::Player::exitInstance()
 {
-   if( !g_framework.getTerritoryMgr().movePlayer( m_prevZoneId, getAsPlayer() ) )
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   if( !pTeriMgr->movePlayer( m_prevZoneId, getAsPlayer() ) )
       return false;
 
    m_pos = m_prevPos;
@@ -490,9 +501,11 @@ void Core::Entity::Player::discover( int16_t map_id, int16_t sub_id )
 
    // section to starts at 320 - 4 bytes long
 
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+
    int32_t offset = 4;
 
-   auto info = g_framework.getExdDataGen().get< Core::Data::Map >( g_framework.getExdDataGen().get< Core::Data::TerritoryType >( getCurrentZone()->getTerritoryId() )->map );
+   auto info = pExdData->get< Core::Data::Map >( pExdData->get< Core::Data::TerritoryType >( getCurrentZone()->getTerritoryId() )->map );
    if( info->discoveryArrayByte )
       offset = 4 + 2 * info->discoveryIndex;
    else
@@ -507,7 +520,7 @@ void Core::Entity::Player::discover( int16_t map_id, int16_t sub_id )
 
    uint16_t level = getLevel();
 
-   uint32_t exp = ( g_framework.getExdDataGen().get< Core::Data::ParamGrow >( level )->expToNext * 5 / 100 );
+   uint32_t exp = ( pExdData->get< Core::Data::ParamGrow >( level )->expToNext * 5 / 100 );
 
    gainExp( exp );
 
@@ -580,13 +593,15 @@ bool Core::Entity::Player::isActionLearned( uint8_t actionId ) const
 
 void Core::Entity::Player::gainExp( uint32_t amount )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+
    uint32_t currentExp = getExp();
 
    uint16_t level = getLevel();
 
-   uint32_t neededExpToLevel = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( level )->expToNext;
+   uint32_t neededExpToLevel = pExdData->get< Core::Data::ParamGrow >( level )->expToNext;
 
-   uint32_t neededExpToLevelplus1 = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( level + 1 )->expToNext;
+   uint32_t neededExpToLevelplus1 = pExdData->get< Core::Data::ParamGrow >( level + 1 )->expToNext;
 
    queuePacket( ActorControlPacket143( getId(), GainExpMsg, static_cast< uint8_t >( getClass() ), amount ) );
 
@@ -659,25 +674,28 @@ void Core::Entity::Player::sendStatusUpdate( bool toSelf )
 
 uint8_t Core::Entity::Player::getLevel() const
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
    return static_cast< uint8_t >( m_classArray[classJobIndex] );
 }
 
 uint8_t Core::Entity::Player::getLevelForClass( Common::ClassJob pClass ) const
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( pClass ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pClass ) )->expArrayIndex;
    return static_cast< uint8_t >( m_classArray[classJobIndex] );
 }
 
 uint32_t Core::Entity::Player::getExp() const
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
    return m_expArray[classJobIndex];
 }
 
 void Core::Entity::Player::setExp( uint32_t amount )
-{
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+{   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
    m_expArray[classJobIndex] = amount;
 }
 
@@ -717,13 +735,15 @@ void Core::Entity::Player::setClassJob( Common::ClassJob classJob )
 
 void Core::Entity::Player::setLevel( uint8_t level )
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( getClass() ) )->expArrayIndex;
    m_classArray[classJobIndex] = level;
 }
 
 void Core::Entity::Player::setLevelForClass( uint8_t level, Common::ClassJob classjob )
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( classjob ) )->expArrayIndex;
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( classjob ) )->expArrayIndex;
 
    if( m_classArray[classJobIndex] == 0 )
       insertDbClass( classJobIndex );
@@ -797,7 +817,8 @@ void Core::Entity::Player::setLookAt( uint8_t index, uint8_t value )
 // spawn this player for pTarget
 void Core::Entity::Player::spawn( Entity::PlayerPtr pTarget )
 {
-   g_framework.getLogger().debug( "[" + std::to_string( pTarget->getId() ) + "] Spawning " +
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "[" + std::to_string( pTarget->getId() ) + "] Spawning " +
                 getName() + " for " +
                 pTarget->getName() );
 
@@ -809,8 +830,8 @@ void Core::Entity::Player::spawn( Entity::PlayerPtr pTarget )
 void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget )
 {
    auto pPlayer = pTarget;
-
-   g_framework.getLogger().debug( "despawning " + getName() + " for " + pTarget->getName() );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "despawning " + getName() + " for " + pTarget->getName() );
 
    pPlayer->freePlayerSpawnId( getId() );
 
@@ -875,7 +896,8 @@ const uint8_t* Core::Entity::Player::getStateFlags() const
 
 bool Core::Entity::Player::actionHasCastTime( uint32_t actionId ) //TODO: Add logic for special cases
 {
-   auto actionInfoPtr = g_framework.getExdDataGen().get< Core::Data::Action >( actionId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto actionInfoPtr = pExdData->get< Core::Data::Action >( actionId );
    if( actionInfoPtr->preservesCombo )
       return false;
 
@@ -1035,7 +1057,8 @@ void Core::Entity::Player::update( int64_t currTime )
 
 void Core::Entity::Player::onMobKill( uint16_t nameId )
 {
-   g_framework.getScriptMgr().onMobKill( *getAsPlayer(), nameId );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onMobKill( *getAsPlayer(), nameId );
 }
 
 void Core::Entity::Player::freePlayerSpawnId( uint32_t actorId )
@@ -1145,7 +1168,8 @@ const uint8_t* Core::Entity::Player::getGcRankArray() const
 
 void Core::Entity::Player::queuePacket( Network::Packets::GamePacketPtr pPacket )
 {
-   auto pSession = g_framework.getServerZone().getSession( m_id );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto pSession = pServerZone->getSession( m_id );
 
    if( !pSession )
       return;
@@ -1159,7 +1183,8 @@ void Core::Entity::Player::queuePacket( Network::Packets::GamePacketPtr pPacket
 
 void Core::Entity::Player::queueChatPacket( Network::Packets::GamePacketPtr pPacket )
 {
-   auto pSession = g_framework.getServerZone().getSession( m_id );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto pSession = pServerZone->getSession( m_id );
 
    if( !pSession )
       return;
@@ -1621,14 +1646,14 @@ void Core::Entity::Player::emote( uint32_t emoteId, uint64_t targetId )
 
 void Core::Entity::Player::teleportQuery( uint16_t aetheryteId )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    // TODO: only register this action if enough gil is in possession
-   auto& exdDataGen = g_framework.getExdDataGen();
-   auto targetAetheryte = exdDataGen.get< Core::Data::Aetheryte >( aetheryteId );
+   auto targetAetheryte = pExdData->get< Core::Data::Aetheryte >( aetheryteId );
 
    if( targetAetheryte )
    {
-      auto fromAetheryte = exdDataGen.get< Core::Data::Aetheryte >(
-                                          exdDataGen.get< Core::Data::TerritoryType >( getZoneId() )->aetheryte );
+      auto fromAetheryte = pExdData->get< Core::Data::Aetheryte >(
+                             pExdData->get< Core::Data::TerritoryType >( getZoneId() )->aetheryte );
 
       // calculate cost - does not apply for favorite points or homepoints neither checks for aether tickets
       auto cost = static_cast< uint16_t > ( ( sqrt( pow( fromAetheryte->aetherstreamX - targetAetheryte->aetherstreamX, 2 ) +
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index b4c435ba..9ebdbcd2 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -26,7 +26,7 @@
 #include "ServerZone.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -84,7 +84,8 @@ void Core::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene,
    auto pEvent = getEvent( eventId );
    if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -147,7 +148,8 @@ void Core::Entity::Player::eventPlay( uint32_t eventId, uint32_t scene,
    }
    else if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -175,7 +177,8 @@ void Core::Entity::Player::eventPlay( uint32_t eventId, uint32_t scene,
    }
    else if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -193,7 +196,8 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer )
 
    if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -262,7 +266,8 @@ void Core::Entity::Player::eventActionStart( uint32_t eventId,
    }
    else if( !pEvent )
    {
-      g_framework.getLogger().error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
       return;
    }
 
@@ -290,7 +295,8 @@ void Core::Entity::Player::eventItemActionStart( uint32_t eventId,
 
 void Core::Entity::Player::onLogin()
 {
-   for( auto& child : g_framework.getServerZone().getConfig()->getChild( "Settings.Parameters.MotDArray" ) )
+   auto pConfig = g_fw.get< XMLConfig >();
+   for( auto& child : pConfig->getChild( "Settings.Parameters.MotDArray" ) )
    {
       sendNotice( child.second.data() );
    }
diff --git a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
index 1cf4e9a0..160d02dc 100644
--- a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
@@ -12,7 +12,7 @@
 #include "Player.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -1014,14 +1014,15 @@ void Core::Entity::Player::removeQuestsCompleted( uint32_t questId )
 
 bool Core::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optionalChoice )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    uint32_t playerLevel = getLevel();
-   auto questInfo = g_framework.getExdDataGen().get< Core::Data::Quest >( questId );
+   auto questInfo = pExdData->get< Core::Data::Quest >( questId );
    
 
    if( !questInfo )
       return false;
 
-   auto paramGrowth = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( questInfo->classJobLevel0 );
+   auto paramGrowth = pExdData->get< Core::Data::ParamGrow >( questInfo->classJobLevel0 );
 
    // TODO: use the correct formula, this one is wrong
    uint32_t exp = ( questInfo->expFactor * paramGrowth->questExpModifier * ( 45 + 5 * questInfo->classJobLevel0 ) ) / 100;
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index 14520794..745bb49c 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -26,7 +26,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -35,12 +35,16 @@ using namespace Core::Network::Packets::Server;
 // load player from the db
 bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   auto pLog = g_fw.get< Logger >();
+
    const std::string char_id_str = std::to_string( charId );
 
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_SEL );
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_SEL );
 
    stmt->setUInt( 1, charId );
-   auto res = g_framework.getCharaDb().query( stmt );
+   auto res = pDb->query( stmt );
 
    if( !res->next() )
       return false;
@@ -68,10 +72,10 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
    ZonePtr pCurrZone = nullptr;
 
    // if the zone is an instanceContent zone, we need to actually find the instance
-   if( g_framework.getTerritoryMgr().isInstanceContentTerritory( zoneId ) )
+   if( pTeriMgr->isInstanceContentTerritory( zoneId ) )
    {
       // try to find an instance actually linked to this player
-      pCurrZone = g_framework.getTerritoryMgr().getLinkedInstance( m_id );
+      pCurrZone = pTeriMgr->getLinkedInstance( m_id );
       // if none found, revert to previous zone and position
       if( !pCurrZone )
       {
@@ -80,12 +84,12 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
          m_pos.y = m_prevPos.y;
          m_pos.z = m_prevPos.z;
          setRot( m_prevRot );
-         pCurrZone = g_framework.getTerritoryMgr().getZoneByTerriId( zoneId );
+         pCurrZone = pTeriMgr->getZoneByTerriId( zoneId );
       }
    }
    else
    {
-      pCurrZone = g_framework.getTerritoryMgr().getZoneByTerriId( zoneId );
+      pCurrZone =pTeriMgr->getZoneByTerriId( zoneId );
    }
 
    m_zoneId = zoneId;
@@ -94,12 +98,12 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
    // see if a valid zone could be found for the character
    if( !pCurrZone )
    {
-      g_framework.getLogger().error( "[" + char_id_str + "] Zone " + std::to_string( zoneId ) + " not found!" );
-      g_framework.getLogger().error( "[" + char_id_str + "] Setting default zone instead" );
+      pLog->error( "[" + char_id_str + "] Zone " + std::to_string( zoneId ) + " not found!" );
+      pLog->error( "[" + char_id_str + "] Setting default zone instead" );
 
       // default to new gridania
       // TODO: should probably just abort and mark character as corrupt
-      pCurrZone = g_framework.getTerritoryMgr().getZoneByTerriId( 132 );
+      pCurrZone = pTeriMgr->getZoneByTerriId( 132 );
 
       m_pos.x = 0.0f;
       m_pos.y = 0.0f;
@@ -186,7 +190,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
    m_pCell = nullptr;
 
    if( !loadActiveQuests() || !loadClassData() || !loadSearchInfo() )
-      g_framework.getLogger().error( "Player id " + char_id_str + " data corrupt!" );
+      pLog->error( "Player id " + char_id_str + " data corrupt!" );
 
    m_maxHp = getMaxHp();
    m_maxMp = getMaxMp();
@@ -230,7 +234,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
 
    initSpawnIdQueue();
 
-   if( !g_framework.getTerritoryMgr().movePlayer( pCurrZone, getAsPlayer() ) )
+   if( !pTeriMgr->movePlayer( pCurrZone, getAsPlayer() ) )
       return false;
 
    return true;
@@ -238,11 +242,11 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
 
 bool Core::Entity::Player::loadActiveQuests()
 {
-
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_QUEST_SEL );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_QUEST_SEL );
 
    stmt->setUInt( 1, m_id );
-   auto res = g_framework.getCharaDb().query( stmt );
+   auto res = pDb->query( stmt );
 
    while( res->next() )
    {
@@ -274,11 +278,11 @@ bool Core::Entity::Player::loadActiveQuests()
 
 bool Core::Entity::Player::loadClassData()
 {
-
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    // ClassIdx, Exp, Lvl
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_CLASS_SEL );
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_CLASS_SEL );
    stmt->setUInt( 1, m_id );
-   auto res = g_framework.getCharaDb().query( stmt );
+   auto res = pDb->query( stmt );
 
    while( res->next() )
    {
@@ -295,9 +299,10 @@ bool Core::Entity::Player::loadClassData()
 
 bool Core::Entity::Player::loadSearchInfo()
 {
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_SEARCHINFO_SEL );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_SEARCHINFO_SEL );
    stmt->setUInt( 1, m_id );
-   auto res = g_framework.getCharaDb().query( stmt );
+   auto res = pDb->query( stmt );
 
    if( !res->next() )
       return false;
@@ -315,7 +320,7 @@ bool Core::Entity::Player::loadSearchInfo()
 
 void Core::Entity::Player::updateSql()
 {
-
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
            /*"Hp 1, Mp 2, Tp 3, Gp 4, Mode 5, Mount 6, InvincibleGM 7, Voice 8, "
            "Customize 9, ModelMainWeapon 10, ModelSubWeapon 11, ModelSystemWeapon 12, "
            "ModelEquip 13, EmoteModeType 14, Language 15, IsNewGame 16, IsNewAdventurer 17, "
@@ -326,7 +331,7 @@ void Core::Entity::Player::updateSql()
            "EquippedMannequin 44, ConfigFlags 45, QuestCompleteFlags 46, OpeningSequence 47, "
            "QuestTracking 48, GrandCompany 49, GrandCompanyRank 50, Discovery 51, GMRank 52, Unlocks 53, "
            "CFPenaltyUntil 54"*/
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CharaDbStatements::CHARA_UP );
+   auto stmt = pDb->getPreparedStatement( Db::CharaDbStatements::CHARA_UP );
 
    stmt->setInt( 1, getHp() );
    stmt->setInt( 2, getMp() );
@@ -435,7 +440,7 @@ void Core::Entity::Player::updateSql()
 
    stmt->setInt( 55, m_id );
 
-   g_framework.getCharaDb().execute( stmt );
+   pDb->execute( stmt );
 
    ////// Searchinfo
    updateDbSearchInfo();
@@ -450,54 +455,58 @@ void Core::Entity::Player::updateSql()
 
 void Core::Entity::Player::updateDbClass() const
 {
-   uint8_t classJobIndex = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast<uint8_t>( getClass() ) )->expArrayIndex;
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   uint8_t classJobIndex = pExdData->get< Core::Data::ClassJob >( static_cast<uint8_t>( getClass() ) )->expArrayIndex;
 
    //Exp = ?, Lvl = ? WHERE CharacterId = ? AND ClassIdx = ?
-   auto stmtS = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_CLASS_UP );
+   auto stmtS = pDb->getPreparedStatement( Db::CHARA_CLASS_UP );
    stmtS->setInt( 1, getExp() );
    stmtS->setInt( 2, getLevel() );
    stmtS->setInt( 3, m_id );
    stmtS->setInt( 4, classJobIndex );
-   g_framework.getCharaDb().execute( stmtS );
+   pDb->execute( stmtS );
 }
 
 void Core::Entity::Player::insertDbClass( const uint8_t classJobIndex ) const
 {
-   auto stmtClass = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_CLASS_INS );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmtClass = pDb->getPreparedStatement( Db::CHARA_CLASS_INS );
    stmtClass->setInt( 1, getId() );
    stmtClass->setInt( 2, classJobIndex );
    stmtClass->setInt( 3, 0 );
    stmtClass->setInt( 4, 1 );
-   g_framework.getCharaDb().directExecute( stmtClass );
+   pDb->directExecute( stmtClass );
 }
 
 void Core::Entity::Player::updateDbSearchInfo() const
 {
-   auto stmtS = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTCLASS );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmtS = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTCLASS );
    stmtS->setInt( 1, m_searchSelectClass );
    stmtS->setInt( 2, m_id );
-   g_framework.getCharaDb().execute( stmtS );
+   pDb->execute( stmtS );
 
-   auto stmtS1 = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
+   auto stmtS1 = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
    stmtS1->setInt( 1, m_searchSelectRegion );
    stmtS1->setInt( 2, m_id );
-   g_framework.getCharaDb().execute( stmtS1 );
+   pDb->execute( stmtS1 );
 
-   auto stmtS2 = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
+   auto stmtS2 = pDb->getPreparedStatement( Db::CHARA_SEARCHINFO_UP_SELECTREGION );
    stmtS2->setString( 1, string( m_searchMessage != nullptr ? m_searchMessage : "" ) );
    stmtS2->setInt( 2, m_id );
-   g_framework.getCharaDb().execute( stmtS2 );
+   pDb->execute( stmtS2 );
 }
 
 void Core::Entity::Player::updateDbAllQuests() const
 {
-
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    for( int32_t i = 0; i < 30; i++ )
    {
       if( !m_activeQuests[i] )
          continue;
 
-      auto stmtS3 = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_QUEST_UP );
+      auto stmtS3 = pDb->getPreparedStatement( Db::CHARA_QUEST_UP );
       stmtS3->setInt( 1, m_activeQuests[i]->c.sequence );
       stmtS3->setInt( 2, m_activeQuests[i]->c.flags );
       stmtS3->setInt( 3, m_activeQuests[i]->c.UI8A );
@@ -509,22 +518,24 @@ void Core::Entity::Player::updateDbAllQuests() const
       stmtS3->setInt( 9, m_activeQuests[i]->c.padding1 );
       stmtS3->setInt( 10, m_id);
       stmtS3->setInt( 11, m_activeQuests[i]->c.questId );
-      g_framework.getCharaDb().execute( stmtS3 );
+      pDb->execute( stmtS3 );
 
    }
 }
 
 void Core::Entity::Player::deleteQuest( uint16_t questId ) const
 {
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_QUEST_DEL );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmt = pDb->getPreparedStatement( Db::CHARA_QUEST_DEL );
    stmt->setInt( 1, m_id );
    stmt->setInt( 2, questId );
-   g_framework.getCharaDb().execute( stmt );
+   pDb->execute( stmt );
 }
 
 void Core::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uint8_t seq ) const
 {
-   auto stmt = g_framework.getCharaDb().getPreparedStatement( Db::CHARA_QUEST_INS );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto stmt = pDb->getPreparedStatement( Db::CHARA_QUEST_INS );
    stmt->setInt( 1, m_id );
    stmt->setInt( 2, index );
    stmt->setInt( 3, questId );
@@ -537,5 +548,5 @@ void Core::Entity::Player::insertQuest( uint16_t questId, uint8_t index, uint8_t
    stmt->setInt( 10, 0 );
    stmt->setInt( 11, 0 );
    stmt->setInt( 12, 0 );
-   g_framework.getCharaDb().execute( stmt );
+   pDb->execute( stmt );
 }
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 0adf199d..3051e091 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -38,7 +38,7 @@
 #include "Session.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 // instanciate and initialize commands
 Core::DebugCommandHandler::DebugCommandHandler()
@@ -133,6 +133,8 @@ void Core::DebugCommandHandler::help( char* data, Entity::Player& player, boost:
 
 void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    std::string subCommand = "";
    std::string params = "";
 
@@ -151,7 +153,7 @@ void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost:
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
 
@@ -219,8 +221,8 @@ void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost:
          "', '" + std::to_string( map_id ) +
          "', '" + std::to_string( discover_id ) + "')";
 
-      g_framework.getCharaDb().execute( query1 );
-      g_framework.getCharaDb().execute( query2 );
+      pDb->execute( query1 );
+      pDb->execute( query2 );
 
    }
 
@@ -316,6 +318,7 @@ void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost:
 
 void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
    std::string subCommand;
    std::string params = "";
 
@@ -334,7 +337,7 @@ void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost:
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
 
@@ -417,6 +420,8 @@ void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost:
 
 void Core::DebugCommandHandler::get( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    std::string subCommand;
    std::string params = "";
 
@@ -435,14 +440,14 @@ void Core::DebugCommandHandler::get( char * data, Entity::Player& player, boost:
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
 
    if( ( subCommand == "pos" ) )
    {
 
-      int16_t map_id = g_framework.getExdDataGen().get< Core::Data::TerritoryType >( player.getCurrentZone()->getTerritoryId() )->map;
+      int16_t map_id = pExdData->get< Core::Data::TerritoryType >( player.getCurrentZone()->getTerritoryId() )->map;
 
       player.sendNotice( "Pos:\n" +
                          std::to_string( player.getPos().x ) + "\n" +
@@ -461,20 +466,24 @@ void Core::DebugCommandHandler::get( char * data, Entity::Player& player, boost:
 
 void Core::DebugCommandHandler::injectPacket( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
-   auto pSession = g_framework.getServerZone().getSession( player.getId() );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto pSession = pServerZone->getSession( player.getId() );
    if( pSession )
       pSession->getZoneConnection()->injectPacket( data + 7, player );
 }
 
 void Core::DebugCommandHandler::injectChatPacket( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
-   auto pSession = g_framework.getServerZone().getSession( player.getId() );
+   auto pServerZone = g_fw.get< ServerZone >();
+   auto pSession = pServerZone->getSession( player.getId() );
    if( pSession )
       pSession->getChatConnection()->injectPacket( data + 8, player );
 }
 
 void Core::DebugCommandHandler::replay( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pServerZone = g_fw.get< ServerZone >();
    std::string subCommand;
    std::string params = "";
 
@@ -493,25 +502,25 @@ void Core::DebugCommandHandler::replay( char * data, Entity::Player& player, boo
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
 
    if( subCommand == "start" )
    {
-      auto pSession = g_framework.getServerZone().getSession( player.getId() );
+      auto pSession = pServerZone->getSession( player.getId() );
       if( pSession )
          pSession->startReplay( params );
    }
    else if( subCommand == "stop" )
    {
-      auto pSession = g_framework.getServerZone().getSession( player.getId() );
+      auto pSession = pServerZone->getSession( player.getId() );
       if( pSession )
          pSession->stopReplay();
    }
    else if( subCommand == "info" )
    {
-      auto pSession = g_framework.getServerZone().getSession( player.getId() );
+      auto pSession = pServerZone->getSession( player.getId() );
       if( pSession )
          pSession->sendReplayInfo();
    }
@@ -572,13 +581,16 @@ void Core::DebugCommandHandler::nudge( char * data, Entity::Player& player, boos
 
 void Core::DebugCommandHandler::serverInfo( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pServerZone = g_fw.get< ServerZone >();
    player.sendDebug( "SapphireZone " + Version::VERSION + "\nRev: " + Version::GIT_HASH );
    player.sendDebug( "Compiled: " __DATE__ " " __TIME__ );
-   player.sendDebug( "Sessions: " + std::to_string( g_framework.getServerZone().getSessionCount() ) );
+   player.sendDebug( "Sessions: " + std::to_string( pServerZone->getSessionCount() ) );
 }
 
 void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    std::string subCommand;
    std::string params = "";
 
@@ -598,7 +610,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
    if( command->getName().length() + 1 + pos + 1 < strlen( data ) )
       params = std::string( data + command->getName().length() + 1 + pos + 1 );
 
-   g_framework.getLogger().debug( "[" + std::to_string( player.getId() ) + "] " +
+   pLog->debug( "[" + std::to_string( player.getId() ) + "] " +
                 "subCommand " + subCommand + " params: " + params );
 
    if( subCommand == "unload" )
@@ -606,7 +618,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
       if ( subCommand == params )
          player.sendDebug( "Command failed: requires name of script" );
       else
-         if( g_framework.getScriptMgr().getNativeScriptHandler().unloadScript( params ) )
+         if( pScriptMgr->getNativeScriptHandler().unloadScript( params ) )
             player.sendDebug( "Unloaded script successfully." );
          else
             player.sendDebug( "Failed to unload script: " + params );
@@ -618,7 +630,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
       else
       {
          std::set< Core::Scripting::ScriptInfo* > scripts;
-         g_framework.getScriptMgr().getNativeScriptHandler().findScripts( scripts, params );
+         pScriptMgr->getNativeScriptHandler().findScripts( scripts, params );
 
          if( !scripts.empty() )
          {
@@ -642,7 +654,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
          player.sendDebug( "Command failed: requires relative path to script" );
       else
       {
-         if ( g_framework.getScriptMgr().getNativeScriptHandler().loadScript( params ) )
+         if ( pScriptMgr->getNativeScriptHandler().loadScript( params ) )
             player.sendDebug( "Loaded '" + params + "' successfully" );
          else
             player.sendDebug( "Failed to load '" + params + "'" );
@@ -655,7 +667,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
          player.sendDebug( "Command failed: requires name of script to reload" );
       else
       {
-         g_framework.getScriptMgr().getNativeScriptHandler().queueScriptReload( params );
+         pScriptMgr->getNativeScriptHandler().queueScriptReload( params );
          player.sendDebug( "Queued script reload for script: " + params );
       }
    }
@@ -667,6 +679,7 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos
 
 void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, boost::shared_ptr< DebugCommand > command )
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    std::string cmd( data ), params, subCommand;
    auto cmdPos = cmd.find_first_of( ' ' );
 
@@ -690,7 +703,7 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
       uint32_t instanceContentId;
       sscanf( params.c_str(), "%d", &instanceContentId );
 
-      auto instance = g_framework.getTerritoryMgr().createInstanceContent( instanceContentId );
+      auto instance = pTeriMgr->createInstanceContent( instanceContentId );
       if( instance )
          player.sendDebug( "Created instance with id: " + std::to_string( instance->getGuId() ) + " -> " + instance->getName() );
       else
@@ -701,7 +714,7 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
       uint32_t terriId;
       sscanf( params.c_str(), "%d", &terriId );
 
-      if( g_framework.getTerritoryMgr().removeTerritoryInstance( terriId ) )
+      if( pTeriMgr->removeTerritoryInstance( terriId ) )
          player.sendDebug( "Removed instance with id: " + std::to_string( terriId ) );
       else
          player.sendDebug( "Failed to remove instance with id: " + std::to_string( terriId ) );
diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 3423fc85..4a389965 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -6,13 +6,14 @@
 #include <boost/range/algorithm/remove_if.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 
 using namespace Core::Common;
 
 std::string Core::Event::getEventName( uint32_t eventId )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    uint16_t eventType = eventId >> 16;
 
    auto unknown = std::string{ "unknown" };
@@ -21,7 +22,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
    {
    case Event::EventHandler::EventHandlerType::Quest:
    {
-      auto questInfo = g_framework.getExdDataGen().get< Core::Data::Quest >( eventId );
+      auto questInfo = pExdData->get< Core::Data::Quest >( eventId );
       if( !questInfo )
          return unknown + "Quest";
 
@@ -32,7 +33,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
    }
    case Event::EventHandler::EventHandlerType::CustomTalk:
    {
-      auto customTalkInfo = g_framework.getExdDataGen().get< Core::Data::CustomTalk >( eventId );
+      auto customTalkInfo = pExdData->get< Core::Data::CustomTalk >( eventId );
       if( !customTalkInfo )
          return unknown + "CustomTalk";
 
@@ -43,21 +44,21 @@ std::string Core::Event::getEventName( uint32_t eventId )
    }
    case Event::EventHandler::EventHandlerType::Opening:
    {
-      auto openingInfo = g_framework.getExdDataGen().get< Core::Data::Opening >( eventId );
+      auto openingInfo = pExdData->get< Core::Data::Opening >( eventId );
       if( openingInfo )
          return openingInfo->name;
       return unknown + "Opening";
    }
    case Event::EventHandler::EventHandlerType::Aetheryte:
    {
-      auto aetherInfo = g_framework.getExdDataGen().get< Core::Data::Aetheryte >( eventId & 0xFFFF );
+      auto aetherInfo = pExdData->get< Core::Data::Aetheryte >( eventId & 0xFFFF );
       if( aetherInfo->isAetheryte )
          return "Aetheryte";
       return "Aethernet";
    }
    case Event::EventHandler::EventHandlerType::ICDirector:
    {
-      auto contentInfo = g_framework.getExdDataGen().get< Core::Data::InstanceContent >( eventId & 0xFFFF );
+      auto contentInfo = pExdData->get< Core::Data::InstanceContent >( eventId & 0xFFFF );
       std::string name = contentInfo->name;
 
       name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() );
@@ -78,7 +79,8 @@ std::string Core::Event::getEventName( uint32_t eventId )
 
 uint32_t Core::Event::mapEventActorToRealActor( uint32_t eventActorId )
 {
-   auto levelInfo = g_framework.getExdDataGen().get< Core::Data::Level >( eventActorId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto levelInfo = pExdData->get< Core::Data::Level >( eventActorId );
    if( levelInfo )
       return levelInfo->objectKey;
 
diff --git a/src/servers/sapphire_zone/Framework.cpp b/src/servers/sapphire_zone/Framework.cpp
deleted file mode 100644
index b50a7806..00000000
--- a/src/servers/sapphire_zone/Framework.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <boost/make_shared.hpp>
-
-#include "Framework.h"
-
-Core::ServerZone g_serverZone( "config/settings_zone.xml" );
-
-Core::Logger& Core::Framework::getLogger()
-{
-   return g_log;
-}
-
-Core::DebugCommandHandler& Core::Framework::getDebugCommandHandler()
-{
-   return g_debugCmdHandler;
-}
-
-Core::Scripting::ScriptMgr& Core::Framework::getScriptMgr()
-{
-   return g_scriptMgr;
-}
-
-Core::Data::ExdDataGenerated& Core::Framework::getExdDataGen()
-{
-   return g_exdDataGen;
-}
-
-Core::TerritoryMgr& Core::Framework::getTerritoryMgr()
-{
-   return g_territoryMgr;
-}
-
-Core::LinkshellMgr& Core::Framework::getLinkshellMgr()
-{
-   return g_linkshellMgr;
-}
-
-Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >& Core::Framework::getCharaDb()
-{
-   return g_charaDb;
-}
-
-Core::ServerZone& Core::Framework::getServerZone()
-{
-   return g_serverZone;
-}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Framework.h b/src/servers/sapphire_zone/Framework.h
deleted file mode 100644
index 2609fa83..00000000
--- a/src/servers/sapphire_zone/Framework.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef CORE_FRAMEWORK_H
-#define CORE_FRAMEWORK_H
-
-#include <boost/shared_ptr.hpp>
-#include <map>
-
-#include "Forwards.h"
-
-#include "ServerZone.h"
-
-#include <Logging/Logger.h>
-#include <Exd/ExdDataGenerated.h>
-#include <Database/CharaDbConnection.h>
-#include <Database/DbWorkerPool.h>
-
-#include "Script/ScriptMgr.h"
-
-#include "Linkshell/LinkshellMgr.h"
-
-#include "Zone/TerritoryMgr.h"
-
-#include "DebugCommand/DebugCommandHandler.h"
-
-
-namespace Core
-{
-
-class Framework
-{
-private:
-
-   Logger g_log;
-   DebugCommandHandler g_debugCmdHandler;
-   Scripting::ScriptMgr g_scriptMgr;
-   Data::ExdDataGenerated g_exdDataGen;
-   TerritoryMgr g_territoryMgr;
-   LinkshellMgr g_linkshellMgr;
-   Db::DbWorkerPool< Db::CharaDbConnection > g_charaDb;
-
-public:
-
-   Logger& getLogger();
-   DebugCommandHandler& getDebugCommandHandler();
-   Scripting::ScriptMgr& getScriptMgr();
-   Data::ExdDataGenerated& getExdDataGen();
-   TerritoryMgr& getTerritoryMgr();
-   LinkshellMgr& getLinkshellMgr();
-   Db::DbWorkerPool< Db::CharaDbConnection >& getCharaDb();
-   ServerZone& getServerZone();
-
-};
-
-}
-#endif // CORE_FRAMEWORK_H
diff --git a/src/servers/sapphire_zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp
index 820ab435..b601dd81 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.cpp
+++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp
@@ -18,7 +18,7 @@
 #include "Item.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network;
@@ -132,7 +132,9 @@ Core::ItemPtr Core::Inventory::getItemAt( uint16_t containerId, uint8_t slotId )
 
 Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint8_t quantity )
 {
-   auto itemInfo = g_framework.getExdDataGen().get< Core::Data::Item >( catalogId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
 
    uint8_t itemAmount = quantity;
 
@@ -153,7 +155,7 @@ Core::ItemPtr Core::Inventory::createItem( uint32_t catalogId, uint8_t quantity
    pItem->setModelIds( itemInfo->modelMain, itemInfo->modelSub );
    pItem->setCategory( static_cast< ItemUICategory >( itemInfo->itemUICategory ) );
 
-   g_framework.getCharaDb().execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
+  pDb->execute( "INSERT INTO charaglobalitem ( CharacterId, itemId, catalogId, stack, flags ) VALUES ( " +
                       std::to_string( m_pOwner->getId() ) + ", " +
                       std::to_string( pItem->getUId() ) + ", " +
                       std::to_string( pItem->getId() ) + ", " +
@@ -235,6 +237,7 @@ bool Core::Inventory::addCurrency( CurrencyType type, uint32_t amount )
 
 void Core::Inventory::updateCurrencyDb()
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    int32_t firstItemPos = -1;
    std::string query = "UPDATE charaitemcurrency SET ";
 
@@ -256,12 +259,13 @@ void Core::Inventory::updateCurrencyDb()
 
    query += " WHERE CharacterId = " + std::to_string( m_pOwner->getId() );
 
-   g_framework.getCharaDb().execute( query );
+   pDb->execute( query );
 }
 
 
 void Core::Inventory::updateCrystalDb()
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    int32_t firstItemPos = -1;
    std::string query = "UPDATE charaitemcrystal SET ";
 
@@ -283,11 +287,12 @@ void Core::Inventory::updateCrystalDb()
 
    query += " WHERE CharacterId = " + std::to_string( m_pOwner->getId() );
 
-   g_framework.getCharaDb().execute( query );
+   pDb->execute( query );
 }
 
 void Core::Inventory::updateBagDb( InventoryType type )
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    std::string query = "UPDATE charaiteminventory SET ";
 
    for( int32_t i = 0; i <= 34; i++ )
@@ -303,7 +308,7 @@ void Core::Inventory::updateBagDb( InventoryType type )
    query += " WHERE CharacterId = " + std::to_string( m_pOwner->getId() ) +
       " AND storageId = " + std::to_string( static_cast< uint16_t >( type ) );
 
-   g_framework.getCharaDb().execute( query );
+   pDb->execute( query );
 }
 
 bool Core::Inventory::isArmory( uint16_t containerId )
@@ -371,6 +376,8 @@ bool Core::Inventory::isEquipment( uint16_t containerId )
 
 void Core::Inventory::updateMannequinDb( InventoryType type )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    std::string query = "UPDATE charaitemgearset SET ";
 
    for( int32_t i = 0; i <= 13; i++ )
@@ -386,14 +393,15 @@ void Core::Inventory::updateMannequinDb( InventoryType type )
    query += " WHERE CharacterId = " + std::to_string( m_pOwner->getId() ) +
       " AND storageId = " + std::to_string( static_cast< uint16_t >( type ) );
 
-   g_framework.getLogger().debug( query );
-   g_framework.getCharaDb().execute( query );
+   pLog->debug( query );
+   pDb->execute( query );
 }
 
 
 void Core::Inventory::updateItemDb( Core::ItemPtr pItem ) const
 {
-   g_framework.getCharaDb().execute( "UPDATE charaglobalitem SET stack = " + std::to_string( pItem->getStackSize() ) + " " +
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   pDb->execute( "UPDATE charaglobalitem SET stack = " + std::to_string( pItem->getStackSize() ) + " " +
                      // TODO: add other attributes
                      " WHERE itemId = " + std::to_string( pItem->getUId() ) );
 }
@@ -469,8 +477,9 @@ bool Core::Inventory::isObtainable( uint32_t catalogId, uint8_t quantity )
 
 int16_t Core::Inventory::addItem( uint16_t inventoryId, int8_t slotId, uint32_t catalogId, uint8_t quantity )
 {
-
-   auto itemInfo = g_framework.getExdDataGen().get< Core::Data::Item >( catalogId );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
 
    // if item data doesn't exist or it's a blank field
    if( !itemInfo || itemInfo->levelItem == 0 )
@@ -503,7 +512,7 @@ int16_t Core::Inventory::addItem( uint16_t inventoryId, int8_t slotId, uint32_t
 
       m_inventoryMap[inventoryId]->setItem( rSlotId, item );
 
-      g_framework.getCharaDb().execute( "UPDATE charaiteminventory SET container_" + std::to_string( rSlotId ) + " = " + std::to_string( item->getUId() ) +
+      pDb->execute( "UPDATE charaiteminventory SET container_" + std::to_string( rSlotId ) + " = " + std::to_string( item->getUId() ) +
                          " WHERE storageId = " + std::to_string( inventoryId ) +
                          " AND CharacterId = " + std::to_string( m_pOwner->getId() ) );
 
@@ -646,14 +655,16 @@ void Core::Inventory::discardItem( uint16_t fromInventoryId, uint8_t fromSlotId
 
 Core::ItemPtr Core::Inventory::loadItem( uint64_t uId )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    // load actual item 
-   auto itemRes = g_framework.getCharaDb().query( "SELECT catalogId, stack, flags FROM charaglobalitem WHERE itemId = " + std::to_string( uId ) + ";" );
+   auto itemRes = pDb->query( "SELECT catalogId, stack, flags FROM charaglobalitem WHERE itemId = " + std::to_string( uId ) + ";" );
    if( !itemRes->next() )
       return nullptr;
 
    try
    {
-      auto itemInfo = g_framework.getExdDataGen().get< Core::Data::Item >( itemRes->getUInt( 1 ) );
+      auto itemInfo = pExdData->get< Core::Data::Item >( itemRes->getUInt( 1 ) );
       bool isHq = itemRes->getUInt( 3 ) == 1 ? true : false;
       ItemPtr pItem( new Item( uId, 
                                itemRes->getUInt( 1 ),
@@ -673,9 +684,10 @@ Core::ItemPtr Core::Inventory::loadItem( uint64_t uId )
 
 bool Core::Inventory::load()
 {
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    //////////////////////////////////////////////////////////////////////////////////////////////////////
    // load active gearset
-   auto res = g_framework.getCharaDb().query( "SELECT storageId, container_0, container_1, container_2, container_3, "
+   auto res = pDb->query( "SELECT storageId, container_0, container_1, container_2, container_3, "
                                "container_4, container_5, container_6, container_7, "
                                "container_8, container_9, container_10, container_11, "
                                "container_12, container_13 "
@@ -705,7 +717,7 @@ bool Core::Inventory::load()
 
    ///////////////////////////////////////////////////////////////////////////////////////////////////////
    // Load Bags
-   auto bagRes = g_framework.getCharaDb().query( "SELECT storageId, "
+   auto bagRes = pDb->query( "SELECT storageId, "
                                   "container_0, container_1, container_2, container_3, container_4, "
                                   "container_5, container_6, container_7, container_8, container_9, "
                                   "container_10, container_11, container_12, container_13, container_14, "
@@ -738,7 +750,7 @@ bool Core::Inventory::load()
 
    ///////////////////////////////////////////////////////////////////////////////////////////////////////
    // Load Currency
-   auto curRes = g_framework.getCharaDb().query( "SELECT storageId, "
+   auto curRes = pDb->query( "SELECT storageId, "
                                   "container_0, container_1, container_2, container_3, container_4, "
                                   "container_5, container_6, container_7, container_8, container_9, "
                                   "container_10, container_11 "
@@ -767,7 +779,7 @@ bool Core::Inventory::load()
 
    ///////////////////////////////////////////////////////////////////////////////////////////////////////
    // Load Crystals
-   auto crystalRes = g_framework.getCharaDb().query( "SELECT storageId, "
+   auto crystalRes = pDb->query( "SELECT storageId, "
                                       "container_0, container_1, container_2, container_3, container_4, "
                                       "container_5, container_6, container_7, container_8, container_9, "
                                       "container_10, container_11, container_12, container_13, container_14, "
@@ -874,7 +886,8 @@ uint16_t Core::Inventory::calculateEquippedGearItemLevel()
          }
          else
          {
-            g_framework.getLogger().debug( "Is one handed" );
+            auto pLog = g_fw.get< Logger >();
+            pLog->debug( "Is one handed" );
          }
       }
 
@@ -923,8 +936,8 @@ Core::Inventory::ContainerType Core::Inventory::getContainerType( uint32_t conta
 uint32_t Core::Inventory::getNextUId()
 {
    uint32_t charId = 0;
-
-   auto pQR = g_framework.getCharaDb().query( "SELECT MAX(ItemId) FROM charaglobalitem" );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pQR = pDb->query( "SELECT MAX(ItemId) FROM charaglobalitem" );
 
    if( !pQR->next() )
       return 0x00500001;
diff --git a/src/servers/sapphire_zone/Inventory/Item.cpp b/src/servers/sapphire_zone/Inventory/Item.cpp
index f5907f98..e77210bc 100644
--- a/src/servers/sapphire_zone/Inventory/Item.cpp
+++ b/src/servers/sapphire_zone/Inventory/Item.cpp
@@ -4,7 +4,7 @@
 #include "Framework.h"
 #include "Item.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Item::Item()
 {
@@ -26,7 +26,8 @@ Core::Item::Item( uint64_t uId, uint32_t catalogId, uint64_t model1, uint64_t mo
    m_model2( model2 ),
    m_isHq( isHq )
 {
-   auto itemInfo = g_framework.getExdDataGen().get< Core::Data::Item >( catalogId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto itemInfo = pExdData->get< Core::Data::Item >( catalogId );
    m_delayMs = itemInfo->delayms;
    m_physicalDmg = itemInfo->damagePhys;
    m_magicalDmg = itemInfo->damageMag;
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
index 23670cfa..54a65309 100644
--- a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
+++ b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
@@ -9,7 +9,7 @@
 #include "Forwards.h"
 #include "ItemContainer.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::ItemContainer::ItemContainer( uint16_t locationId ) : 
    m_id( locationId ),
@@ -35,19 +35,21 @@ uint8_t Core::ItemContainer::getEntryCount() const
 
 void Core::ItemContainer::removeItem( uint8_t slotId )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
    ItemMap::iterator it = m_itemMap.find( slotId );
 
    if( it != m_itemMap.end() )
    {
-      g_framework.getCharaDb().execute( "DELETE FROM charaglobalitem WHERE itemId = " + std::to_string( it->second->getUId() ) );
+      pDb->execute( "DELETE FROM charaglobalitem WHERE itemId = " + std::to_string( it->second->getUId() ) );
 
       m_itemMap.erase( it );
 
-      g_framework.getLogger().debug( "Dropped item from slot " + std::to_string( slotId ) );
+      pLog->debug( "Dropped item from slot " + std::to_string( slotId ) );
    }
    else
    {
-      g_framework.getLogger().debug( "Item could not be dropped from slot " + std::to_string( slotId ) );
+      pLog->debug( "Item could not be dropped from slot " + std::to_string( slotId ) );
    }
 }
 
@@ -78,7 +80,8 @@ Core::ItemPtr Core::ItemContainer::getItem( uint8_t slotId )
 
    if( ( slotId > m_size ) || ( slotId == -1 ) )
    {
-      g_framework.getLogger().error( "Slot out of range " + std::to_string( slotId ) );
+      auto pLog = g_fw.get< Logger >();
+      pLog->error( "Slot out of range " + std::to_string( slotId ) );
       return nullptr;
    }
 
diff --git a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
index 5cdd5ad9..ab30816b 100644
--- a/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
+++ b/src/servers/sapphire_zone/Linkshell/LinkshellMgr.cpp
@@ -7,7 +7,7 @@
 #include "Framework.h"
 #include "LinkshellMgr.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::LinkshellMgr::LinkshellMgr()
 {
@@ -16,8 +16,8 @@ Core::LinkshellMgr::LinkshellMgr()
 
 bool Core::LinkshellMgr::loadLinkshells()
 {
-
-   auto res = g_framework.getCharaDb().query( "SELECT LinkshellId, MasterCharacterId, CharacterIdList, "
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto res = pDb->query( "SELECT LinkshellId, MasterCharacterId, CharacterIdList, "
                                       "LinkshellName, LeaderIdList, InviteIdList "
                                       "FROM infolinkshell "
                                "ORDER BY LinkshellId ASC;" );
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.cpp b/src/servers/sapphire_zone/Math/CalcBattle.cpp
index 4a68d6b0..5010537c 100644
--- a/src/servers/sapphire_zone/Math/CalcBattle.cpp
+++ b/src/servers/sapphire_zone/Math/CalcBattle.cpp
@@ -10,7 +10,7 @@
 #include "CalcBattle.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Math;
 using namespace Core::Entity;
@@ -33,8 +33,9 @@ using namespace Core::Entity;
 
 uint32_t CalcBattle::calculateHealValue( PlayerPtr pPlayer, uint32_t potency )
 {
-   auto classInfo = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-   auto paramGrowthInfo = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( pPlayer->getLevel() );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto classInfo = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
+   auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() );
 
    if( !classInfo || !paramGrowthInfo )
       return 0;
diff --git a/src/servers/sapphire_zone/Math/CalcStats.cpp b/src/servers/sapphire_zone/Math/CalcStats.cpp
index 10119e4a..2f8932e6 100644
--- a/src/servers/sapphire_zone/Math/CalcStats.cpp
+++ b/src/servers/sapphire_zone/Math/CalcStats.cpp
@@ -13,7 +13,7 @@
 using namespace Core::Math;
 using namespace Core::Entity;
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 /*
    Class used for battle-related formulas and calculations.
@@ -59,12 +59,13 @@ float CalcStats::calculateBaseStat( PlayerPtr pPlayer )
 
 uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    // TODO: Replace ApproxBaseHP with something that can get us an accurate BaseHP.
    // Is there any way to pull reliable BaseHP without having to manually use a pet for every level, and using the values from a table?
    // More info here: https://docs.google.com/spreadsheets/d/1de06KGT0cNRUvyiXNmjNgcNvzBCCQku7jte5QxEQRbs/edit?usp=sharing
    
-   auto classInfo = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-   auto paramGrowthInfo = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( pPlayer->getLevel() );
+   auto classInfo = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
+   auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() );
 
    if( !classInfo || !paramGrowthInfo )
       return 0;
@@ -96,8 +97,9 @@ uint32_t CalcStats::calculateMaxHp( PlayerPtr pPlayer )
 
 uint32_t CalcStats::calculateMaxMp( PlayerPtr pPlayer )
 {
-   auto classInfo = g_framework.getExdDataGen().get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
-   auto paramGrowthInfo = g_framework.getExdDataGen().get< Core::Data::ParamGrow >( pPlayer->getLevel() );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto classInfo = pExdData->get< Core::Data::ClassJob >( static_cast< uint8_t >( pPlayer->getClass() ) );
+   auto paramGrowthInfo = pExdData->get< Core::Data::ParamGrow >( pPlayer->getLevel() );
 
    if( !classInfo || !paramGrowthInfo )
       return 0;
diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp
index 3dfdcd8b..31fc5062 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.cpp
+++ b/src/servers/sapphire_zone/Network/GameConnection.cpp
@@ -21,7 +21,7 @@
 #include "Framework.h"
 #include "Forwards.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -111,34 +111,35 @@ void Core::Network::GameConnection::OnAccept( const std::string & host, uint16_t
 {
    GameConnectionPtr connection( new GameConnection( m_hive, m_pAcceptor ) );
    m_pAcceptor->Accept( connection );
-
-   g_framework.getLogger().info( "Connect from " + m_socket.remote_endpoint().address().to_string() );
+   auto pLog = g_fw.get< Logger >();
+   pLog->info( "Connect from " + m_socket.remote_endpoint().address().to_string() );
 }
 
 
 void Core::Network::GameConnection::OnDisconnect()
 {
-   g_framework.getLogger().debug( "GameConnection DISCONNECT" );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "GameConnection DISCONNECT" );
    m_pSession = nullptr;
 }
 
 void Core::Network::GameConnection::OnRecv( std::vector< uint8_t > & buffer )
 {
    // This is assumed packet always start with valid FFXIVARR_PACKET_HEADER for now.
-
+   auto pLog = g_fw.get< Logger >();
    Packets::FFXIVARR_PACKET_HEADER packetHeader{};
    const auto headerResult = Packets::getHeader( buffer, 0, packetHeader );
 
    if( headerResult == Incomplete )
    {
-      g_framework.getLogger().info( "Dropping connection due to incomplete packet header." );
-      g_framework.getLogger().info( "FIXME: Packet message bounary is not implemented." );
+      pLog->info( "Dropping connection due to incomplete packet header." );
+      pLog->info( "FIXME: Packet message bounary is not implemented." );
       Disconnect();
       return;
    }
    else if( headerResult == Malformed )
    {
-      g_framework.getLogger().info( "Dropping connection due to malformed packet header." );
+      pLog->info( "Dropping connection due to malformed packet header." );
       Disconnect();
       return;
    }
@@ -150,14 +151,14 @@ void Core::Network::GameConnection::OnRecv( std::vector< uint8_t > & buffer )
    
    if( packetResult == Incomplete )
    {
-      g_framework.getLogger().info( "Dropping connection due to incomplete packets." );
-      g_framework.getLogger().info( "FIXME: Packet message bounary is not implemented." );
+      pLog->info( "Dropping connection due to incomplete packets." );
+      pLog->info( "FIXME: Packet message bounary is not implemented." );
       Disconnect();
       return;
    }
    else if( packetResult == Malformed )
    {
-      g_framework.getLogger().info( "Dropping connection due to malformed packets." );
+      pLog->info( "Dropping connection due to malformed packets." );
       Disconnect();
       return;
    }
@@ -168,7 +169,8 @@ void Core::Network::GameConnection::OnRecv( std::vector< uint8_t > & buffer )
 
 void Core::Network::GameConnection::OnError( const boost::system::error_code & error )
 {
-   g_framework.getLogger().debug( "GameConnection ERROR: " + error.message() );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "GameConnection ERROR: " + error.message() );
 }
 
 void Core::Network::GameConnection::queueInPacket( Core::Network::Packets::GamePacketPtr inPacket )
@@ -183,6 +185,7 @@ void Core::Network::GameConnection::queueOutPacket( Core::Network::Packets::Game
 
 void Core::Network::GameConnection::handleZonePacket( const Packets::GamePacket& pPacket )
 {
+   auto pLog = g_fw.get< Logger >();
    auto it = m_zoneHandlerMap.find( pPacket.getSubType() );
 
    std::string sessionStr = "[" + std::to_string( m_pSession->getId() ) + "]";
@@ -195,7 +198,7 @@ void Core::Network::GameConnection::handleZonePacket( const Packets::GamePacket&
       if( pPacket.getSubType() != PingHandler &&
           pPacket.getSubType() != UpdatePositionHandler )
 
-         g_framework.getLogger().debug( sessionStr + " Handling Zone IPC : " + name + "( " +
+         pLog->debug( sessionStr + " Handling Zone IPC : " + name + "( " +
                       boost::str( boost::format( "%|04X|" ) %
                                          static_cast< uint32_t >( pPacket.getSubType() & 0xFFFF ) ) + " )" );
 
@@ -203,16 +206,17 @@ void Core::Network::GameConnection::handleZonePacket( const Packets::GamePacket&
    }
    else
    {
-      g_framework.getLogger().debug( sessionStr + " Undefined Zone IPC : Unknown ( " +
+      pLog->debug( sessionStr + " Undefined Zone IPC : Unknown ( " +
                    boost::str( boost::format( "%|04X|" ) %
                                       static_cast< uint32_t >( pPacket.getSubType() & 0xFFFF ) ) + " )" );
-      g_framework.getLogger().debug( "\n" + pPacket.toString() );
+      pLog->debug( "\n" + pPacket.toString() );
    }
 }
 
 
 void Core::Network::GameConnection::handleChatPacket( const Packets::GamePacket& pPacket )
 {
+   auto pLog = g_fw.get< Logger >();
    auto it = m_chatHandlerMap.find( pPacket.getSubType() );
 
    std::string sessionStr = "[" + std::to_string( m_pSession->getId() ) + "]";
@@ -223,7 +227,7 @@ void Core::Network::GameConnection::handleChatPacket( const Packets::GamePacket&
       std::string name = itStr != m_chatHandlerStrMap.end() ? itStr->second : "unknown";
       // dont display packet notification if it is a ping or pos update, don't want the spam
 
-      g_framework.getLogger().debug( sessionStr + " Handling Chat IPC : " + name + "( " +
+      pLog->debug( sessionStr + " Handling Chat IPC : " + name + "( " +
                    boost::str( boost::format( "%|04X|" ) %
                                       static_cast< uint32_t >( pPacket.getSubType() & 0xFFFF ) ) + " )" );
 
@@ -231,10 +235,10 @@ void Core::Network::GameConnection::handleChatPacket( const Packets::GamePacket&
    }
    else
    {
-      g_framework.getLogger().debug( sessionStr + " Undefined Chat IPC : Unknown ( " +
+      pLog->debug( sessionStr + " Undefined Chat IPC : Unknown ( " +
                   boost::str( boost::format( "%|04X|" ) %
                                      static_cast< uint32_t >( pPacket.getSubType() & 0xFFFF ) ) + " )" );
-      g_framework.getLogger().debug( pPacket.toString() );
+      pLog->debug( pPacket.toString() );
    }
 }
 
@@ -276,7 +280,7 @@ void Core::Network::GameConnection::processInQueue()
 
 void Core::Network::GameConnection::processOutQueue()
 {
-
+   auto pLog = g_fw.get< Logger >();
    if( m_outQueue.size() < 1 )
       return;
 
@@ -290,7 +294,7 @@ void Core::Network::GameConnection::processOutQueue()
    {
       if( pPacket->getSize() == 0 )
       {
-         g_framework.getLogger().debug( "end of packet set" );
+         pLog->debug( "end of packet set" );
          break;
       }
 
@@ -362,6 +366,8 @@ void Core::Network::GameConnection::injectPacket( const std::string& packetpath,
 void Core::Network::GameConnection::handlePackets( const Core::Network::Packets::FFXIVARR_PACKET_HEADER& ipcHeader,
                                                    const std::vector< Core::Network::Packets::FFXIVARR_PACKET_RAW >& packetData )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pServerZone = g_fw.get< ServerZone >();
    // if a session is set, update the last time it recieved a game packet
    if( m_pSession )
       m_pSession->updateLastDataTime();
@@ -377,23 +383,23 @@ void Core::Network::GameConnection::handlePackets( const Core::Network::Packets:
          auto pCon = boost::static_pointer_cast< GameConnection, Connection >( shared_from_this() );
 
          // try to retrieve the session for this id
-         auto session = g_framework.getServerZone().getSession( playerId );
+         auto session = pServerZone->getSession( playerId );
 
          if( !session )
          {
-            g_framework.getLogger().info( "[" + std::string( id ) + "] Session not registered, creating" );
+            pLog->info( "[" + std::string( id ) + "] Session not registered, creating" );
             // return;
-            if( !g_framework.getServerZone().createSession( playerId ) )
+            if( !pServerZone->createSession( playerId ) )
             {
                Disconnect();
                return;
             }
-            session = g_framework.getServerZone().getSession( playerId );
+            session = pServerZone->getSession( playerId );
          }
          //TODO: Catch more things in lobby and send real errors
          else if( !session->isValid() || ( session->getPlayer() && session->getPlayer()->getLastPing() != 0 ) )
          {
-            g_framework.getLogger().error( "[" + std::string(id) + "] Session INVALID, disconnecting" );
+            pLog->error( "[" + std::string(id) + "] Session INVALID, disconnecting" );
             Disconnect();
             return;
          }
@@ -414,7 +420,7 @@ void Core::Network::GameConnection::handlePackets( const Core::Network::Packets:
             pPe = GamePacket( 0x00, 0x38, 0, 0, 0x02 );
             pPe.setValAt< uint32_t >( 0x10, playerId );
             sendSinglePacket( &pPe );
-            g_framework.getLogger().info( "[" + std::string( id ) + "] Setting session for zone connection" );
+            pLog->info( "[" + std::string( id ) + "] Setting session for zone connection" );
             session->setZoneConnection( pCon );
          }
          // chat connection, assinging it to the session
@@ -424,7 +430,7 @@ void Core::Network::GameConnection::handlePackets( const Core::Network::Packets:
             pPe.setValAt< uint32_t >( 0x10, playerId );
             sendSinglePacket( &pPe );
 
-            g_framework.getLogger().info( "[" + std::string( id ) + "] Setting session for chat connection" );
+            pLog->info( "[" + std::string( id ) + "] Setting session for chat connection" );
             session->setChatConnection( pCon );
             pPe = GamePacket( 0x02, 0x28, playerId, playerId, 0x03 );
             sendSinglePacket( &pPe );
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 961106d7..2e1ad688 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -39,7 +39,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -107,6 +107,7 @@ enum ClientTrigger
 void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& inPacket,
                                                    Entity::Player& player )
 {
+    auto pLog = g_fw.get< Logger >();
     uint16_t commandId = inPacket.getValAt< uint16_t >( 0x20 );
     uint64_t param1 = inPacket.getValAt< uint64_t >( 0x24 );
     uint32_t param11 = inPacket.getValAt< uint32_t >( 0x24 );
@@ -114,7 +115,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
     uint32_t param2 = inPacket.getValAt< uint32_t >( 0x2C );
     uint64_t param3 = inPacket.getValAt< uint64_t >( 0x38 );
 
-    g_framework.getLogger().debug( "[" + std::to_string( m_pSession->getId() ) + "] Incoming action: " +
+    pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Incoming action: " +
                  boost::str( boost::format( "%|04X|" ) % ( uint32_t ) ( commandId & 0xFFFF ) ) +
                  "\nparam1: " + boost::str( boost::format( "%|016X|" ) % ( uint64_t ) ( param1 & 0xFFFFFFFFFFFFFFF ) ) +
                  "\nparam2: " + boost::str( boost::format( "%|08X|" ) % ( uint32_t ) ( param2 & 0xFFFFFFFF ) ) +
@@ -271,7 +272,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
         }
         default:
         {
-           g_framework.getLogger().debug( "[" + std::to_string( m_pSession->getId() ) + "] Unhandled action: " +
+           pLog->debug( "[" + std::to_string( m_pSession->getId() ) + "] Unhandled action: " +
               boost::str( boost::format( "%|04X|" ) % (uint32_t) ( commandId & 0xFFFF ) ) );
            break;
         }
diff --git a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
index 5a0bc0a4..0ece4964 100644
--- a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
@@ -22,7 +22,7 @@
 #include "Session.h"
 
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -35,7 +35,7 @@ void Core::Network::GameConnection::cfDutyInfoRequest( const Packets::GamePacket
    ZoneChannelPacket< FFXIVIpcCFDutyInfo > dutyInfoPacket( player.getId() );
 
    auto penaltyMinutes = player.getCFPenaltyMinutes();
-   if (penaltyMinutes > 255)
+   if( penaltyMinutes > 255 )
    {
       // cap it since it's uint8_t in packets
       penaltyMinutes = 255;
@@ -52,6 +52,8 @@ void Core::Network::GameConnection::cfDutyInfoRequest( const Packets::GamePacket
 void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& inPacket,
                                                     Entity::Player& player)
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    // TODO use for loop for this
    auto contentId1 = inPacket.getValAt< uint16_t >( 0x2E );
    auto contentId2 = inPacket.getValAt< uint16_t >( 0x30 );
@@ -59,12 +61,12 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
    auto contentId4 = inPacket.getValAt< uint16_t >( 0x34 );
    auto contentId5 = inPacket.getValAt< uint16_t >( 0x36 );
 
-   player.sendDebug("Duty register request");
-   player.sendDebug("ContentId1: " + std::to_string(contentId1));
-   player.sendDebug("ContentId2: " + std::to_string(contentId2));
-   player.sendDebug("ContentId3: " + std::to_string(contentId3));
-   player.sendDebug("ContentId4: " + std::to_string(contentId4));
-   player.sendDebug("ContentId5: " + std::to_string(contentId5));
+   player.sendDebug( "Duty register request");
+   player.sendDebug( "ContentId1: " + std::to_string( contentId1 ) );
+   player.sendDebug( "ContentId2: " + std::to_string( contentId2 ) );
+   player.sendDebug( "ContentId3: " + std::to_string( contentId3 ) );
+   player.sendDebug( "ContentId4: " + std::to_string( contentId4 ) );
+   player.sendDebug( "ContentId5: " + std::to_string( contentId5 ) );
 
    // let's cancel it because otherwise you can't register it again
    ZoneChannelPacket< FFXIVIpcCFNotify > cfCancelPacket( player.getId() );
@@ -72,11 +74,11 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
    cfCancelPacket.data().state2 = 1; // Your registration is withdrawn.
    queueOutPacket( cfCancelPacket );
 
-   auto cfCondition = g_framework.getExdDataGen().get< Core::Data::ContentFinderCondition >( contentId1 );
+   auto cfCondition = pExdData->get< Core::Data::ContentFinderCondition >( contentId1 );
    if( !cfCondition )
       return;
 
-   auto instance = g_framework.getTerritoryMgr().createInstanceContent( cfCondition->instanceContent );
+   auto instance = pTeriMgr->createInstanceContent( cfCondition->instanceContent );
    if( !instance )
       return;
 
@@ -88,11 +90,11 @@ void Core::Network::GameConnection::cfRegisterDuty( const Packets::GamePacket& i
 void Core::Network::GameConnection::cfRegisterRoulette( const Packets::GamePacket& inPacket,
                                                         Entity::Player& player)
 {
-   player.sendDebug("Roulette register");
+   player.sendDebug( "Roulette register" );
 }
 
 void Core::Network::GameConnection::cfDutyAccepted( const Packets::GamePacket& inPacket,
                                                     Entity::Player& player)
 {
-   player.sendDebug("TODO: Duty accept");
+   player.sendDebug( "TODO: Duty accept" );
 }
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index 6d22c190..32dfaba5 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -28,7 +28,7 @@
 #include "Forwards.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -36,6 +36,8 @@ using namespace Core::Network::Packets::Server;
 
 void Core::Network::GameConnection::eventHandlerTalk( const Packets::GamePacket& inPacket, Entity::Player& player )
 {
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    auto actorId = inPacket.getValAt< uint64_t >( 0x20 );
    auto eventId = inPacket.getValAt< uint32_t >( 0x28 );
    auto eventType = static_cast< uint16_t >( eventId >> 16 );
@@ -60,10 +62,10 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::GamePacket&
    {
       instance->onTalk( player, eventId, actorId );
    }
-   else if( !g_framework.getScriptMgr().onTalk( player, actorId, eventId ) &&
+   else if( !pScriptMgr->onTalk( player, actorId, eventId ) &&
             eventType == Event::EventHandler::EventHandlerType::Quest )
    {
-      auto questInfo = g_framework.getExdDataGen().get< Core::Data::Quest >( eventId );
+      auto questInfo = pExdData->get< Core::Data::Quest >( eventId );
       if( questInfo )
          player.sendUrgent( "Quest not implemented: " + questInfo->name + " (" + questInfo->id + ")" );
    }
@@ -75,6 +77,8 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::GamePacket&
 void Core::Network::GameConnection::eventHandlerEmote( const Packets::GamePacket& inPacket, Entity::Player& player )
 {
 
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    auto actorId = inPacket.getValAt< uint64_t >( 0x20 );
    auto eventId = inPacket.getValAt< uint32_t >( 0x28 );
    auto emoteId = inPacket.getValAt< uint16_t >( 0x2C );
@@ -95,10 +99,10 @@ void Core::Network::GameConnection::eventHandlerEmote( const Packets::GamePacket
 
    player.eventStart( actorId, eventId, Event::EventHandler::Emote, 0, emoteId );
 
-   if( !g_framework.getScriptMgr().onEmote( player, actorId, eventId, static_cast< uint8_t >( emoteId ) )  &&
+   if( !pScriptMgr->onEmote( player, actorId, eventId, static_cast< uint8_t >( emoteId ) )  &&
        eventType == Event::EventHandler::EventHandlerType::Quest )
    {
-      auto questInfo = g_framework.getExdDataGen().get< Core::Data::Quest >( eventId );
+      auto questInfo = pExdData->get< Core::Data::Quest >( eventId );
       if( questInfo )
          player.sendUrgent( "Quest not implemented: " + questInfo->name );
    }
@@ -109,7 +113,7 @@ void Core::Network::GameConnection::eventHandlerEmote( const Packets::GamePacket
 void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::GamePacket& inPacket,
                                                              Entity::Player& player )
 {
-
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    auto eventId = inPacket.getValAt< uint32_t >( 0x24 );
    auto param1 = inPacket.getValAt< uint32_t >( 0x20 );
    auto x = inPacket.getValAt< float >( 0x28 );
@@ -123,7 +127,7 @@ void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::Game
 
    player.eventStart( player.getId(), eventId, Event::EventHandler::WithinRange, 1, param1 );
 
-   g_framework.getScriptMgr().onWithinRange( player, eventId, param1, x, y, z );
+   pScriptMgr->onWithinRange( player, eventId, param1, x, y, z );
 
    player.checkEvent( eventId );
 }
@@ -131,7 +135,7 @@ void Core::Network::GameConnection::eventHandlerWithinRange( const Packets::Game
 void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::GamePacket& inPacket,
                                                               Entity::Player& player )
 {
-
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    auto eventId = inPacket.getValAt< uint32_t >( 0x24 );
    auto param1 = inPacket.getValAt< uint32_t >( 0x20 );
    auto x = inPacket.getValAt< float >( 0x28 );
@@ -145,7 +149,7 @@ void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::Gam
 
    player.eventStart( player.getId(), eventId, Event::EventHandler::WithinRange, 1, param1 );
 
-   g_framework.getScriptMgr().onOutsideRange( player, eventId, param1, x, y, z );
+   pScriptMgr->onOutsideRange( player, eventId, param1, x, y, z );
 
    player.checkEvent( eventId );
 }
@@ -153,6 +157,7 @@ void Core::Network::GameConnection::eventHandlerOutsideRange( const Packets::Gam
 void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::GamePacket &inPacket,
                                                                 Entity::Player &player )
 {
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    auto eventId = inPacket.getValAt< uint32_t >( 0x20 );
    auto param1 = inPacket.getValAt< uint16_t >( 0x24 );
    auto param2 = inPacket.getValAt< uint16_t >( 0x26 );
@@ -171,7 +176,7 @@ void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::G
    else
    {
       player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId() );
-      g_framework.getScriptMgr().onEnterTerritory( player, eventId, param1, param2 );
+      pScriptMgr->onEnterTerritory( player, eventId, param1, param2 );
    }
 
    player.checkEvent( eventId );
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
index 6479a809..90067779 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
@@ -2,12 +2,14 @@
 
 #include <Logging/Logger.h>
 #include <Config/XMLConfig.h>
-#include "Framework.h"
+
+#include "ServerZone.h"
 
 #include <boost/format.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 
+#include "Framework.h"
 extern Core::Framework g_framework;
 
 namespace fs = boost::filesystem;
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index c4e88c79..46f635ef 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -39,26 +39,19 @@
 
 #include "Framework.h"
 
-Core::Framework g_framework;
-Core::Logger g_log;
+extern Core::Framework g_fw;
 
-Core::ServerZone::ServerZone( const std::string& configPath )
-   : m_configPath( configPath ),
-     m_bRunning( true ),
-     m_lastDBPingTime( 0 )
+Core::ServerZone::ServerZone( const std::string& configPath ) :
+   m_configPath( configPath ),
+   m_bRunning( true ),
+   m_lastDBPingTime( 0 )
 {
-   m_pConfig = XMLConfigPtr( new XMLConfig );
 }
 
 Core::ServerZone::~ServerZone()
 {
 }
 
-Core::XMLConfigPtr Core::ServerZone::getConfig() const
-{
-   return m_pConfig;
-}
-
 size_t Core::ServerZone::getSessionCount() const
 {
    return m_sessionMapById.size();
@@ -66,15 +59,20 @@ size_t Core::ServerZone::getSessionCount() const
 
 bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
 {
-   g_framework.getLogger().info( "Loading config " + m_configPath );
+   auto pLog = g_fw.get< Core::Logger >();
+   auto pConfig = g_fw.get< Core::XMLConfig >();
+   auto pExd = g_fw.get< Data::ExdDataGenerated >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
 
-   if( !m_pConfig->loadConfig( m_configPath ) )
+   pLog->info( "Loading config " + m_configPath );
+
+   if( !pConfig->loadConfig( m_configPath ) )
    {
-      g_framework.getLogger().fatal( "Error loading config " + m_configPath );
+      pLog->fatal( "Error loading config " + m_configPath );
       return false;
    }
 
-   std::vector<std::string> args( argv + 1, argv + argc );
+   std::vector< std::string > args( argv + 1, argv + argc );
    for( uint32_t i = 0; i + 1 < args.size(); i += 2 )
    {
       std::string arg( "" );
@@ -91,116 +89,111 @@ bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
          if( arg == "ip" )
          {
             // todo: ip addr in config
-            m_pConfig->setValue< std::string >( "Settings.General.ListenIP", val );
+            pConfig->setValue< std::string >( "Settings.General.ListenIP", val );
          }
          else if( arg == "p" || arg == "port" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.ListenPort", val );
+            pConfig->setValue< std::string >( "Settings.General.ListenPort", val );
          }
          else if( arg == "exdpath" || arg == "datapath" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.DataPath", val );
+            pConfig->setValue< std::string >( "Settings.General.DataPath", val );
          }
          else if( arg == "s" || arg == "scriptpath" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.ScriptPath", val );
+            pConfig->setValue< std::string >( "Settings.General.ScriptPath", val );
          }
          else if( arg == "h" || arg == "dbhost" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Host", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Host", val );
          }
          else if( arg == "dbport" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Port", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Port", val );
          }
          else if( arg == "u" || arg == "user" || arg == "dbuser" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Username", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Username", val );
          }
          else if( arg == "pass" || arg == "dbpass" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Pass", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Pass", val );
          }
          else if( arg == "d" || arg == "db" || arg == "database" )
          {
-            m_pConfig->setValue< std::string >( "Settings.General.Mysql.Database", val );
+            pConfig->setValue< std::string >( "Settings.General.Mysql.Database", val );
          }
       }
       catch( ... )
       {
-         g_framework.getLogger().error( "Error parsing argument: " + arg + " " + "value: " + val + "\n" );
-         g_framework.getLogger().error( "Usage: <arg> <val> \n" );
+         pLog->error( "Error parsing argument: " + arg + " " + "value: " + val + "\n" );
+         pLog->error( "Usage: <arg> <val> \n" );
       }
    }
 
-   g_framework.getLogger().info( "Setting up generated EXD data" );
-   if( !g_framework.getExdDataGen().init( m_pConfig->getValue< std::string >( "Settings.General.DataPath", "" ) ) )
+   pLog->info( "Setting up generated EXD data" );
+   if( !pExd->init( pConfig->getValue< std::string >( "Settings.General.DataPath", "" ) ) )
    {
-      g_framework.getLogger().fatal( "Error setting up generated EXD data " );
+      pLog->fatal( "Error setting up generated EXD data " );
       return false;
    }
 
    Core::Db::DbLoader loader;
 
    Core::Db::ConnectionInfo info;
-   info.password = m_pConfig->getValue< std::string >( "Settings.General.Mysql.Pass", "" );
-   info.host = m_pConfig->getValue< std::string >( "Settings.General.Mysql.Host", "127.0.0.1" );
-   info.database = m_pConfig->getValue< std::string >( "Settings.General.Mysql.Database", "sapphire" );
-   info.port = m_pConfig->getValue< uint16_t >( "Settings.General.Mysql.Port", 3306 );
-   info.user = m_pConfig->getValue< std::string >( "Settings.General.Mysql.Username", "root" );
-   info.syncThreads = m_pConfig->getValue< uint8_t >( "Settings.General.Mysql.SyncThreads", 2 );
-   info.asyncThreads = m_pConfig->getValue< uint8_t >( "Settings.General.Mysql.AsyncThreads", 2 );
+   info.password = pConfig->getValue< std::string >( "Settings.General.Mysql.Pass", "" );
+   info.host = pConfig->getValue< std::string >( "Settings.General.Mysql.Host", "127.0.0.1" );
+   info.database = pConfig->getValue< std::string >( "Settings.General.Mysql.Database", "sapphire" );
+   info.port = pConfig->getValue< uint16_t >( "Settings.General.Mysql.Port", 3306 );
+   info.user = pConfig->getValue< std::string >( "Settings.General.Mysql.Username", "root" );
+   info.syncThreads = pConfig->getValue< uint8_t >( "Settings.General.Mysql.SyncThreads", 2 );
+   info.asyncThreads = pConfig->getValue< uint8_t >( "Settings.General.Mysql.AsyncThreads", 2 );
 
-   loader.addDb( g_framework.getCharaDb(), info );
+   loader.addDb( *pDb, info );
    if( !loader.initDbs() )
       return false;
 
-   m_port = m_pConfig->getValue< uint16_t >( "Settings.General.ListenPort", 54992 );
-   m_ip = m_pConfig->getValue< std::string >( "Settings.General.ListenIp", "0.0.0.0" );
+   m_port = pConfig->getValue< uint16_t >( "Settings.General.ListenPort", 54992 );
+   m_ip = pConfig->getValue< std::string >( "Settings.General.ListenIp", "0.0.0.0" );
 
    return true;
 }
 
 void Core::ServerZone::run( int32_t argc, char* argv[] )
 {
-   // TODO: add more error checks for the entire initialisation
-   /*g_log.setLogPath( "log/SapphireZone_" );
-   g_log.init();*/
+   auto pLog = g_fw.get< Core::Logger>();
+   auto pScript = g_fw.get< Scripting::ScriptMgr >();
+   auto pLsMgr = g_fw.get< LinkshellMgr >();
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
 
    printBanner();
 
-   g_framework.getLogger().setLogPath( "log/SapphireZone_" );
-   g_framework.getLogger().init();
-
-   g_log = g_framework.getLogger();
-   
-
    if( !loadSettings( argc, argv ) )
    {
-      g_framework.getLogger().fatal( "Unable to load settings!" );
+      pLog->fatal( "Unable to load settings!" );
       return;
    }
 
-   g_framework.getLogger().info( "LinkshellMgr: Caching linkshells" );
-   if( !g_framework.getLinkshellMgr().loadLinkshells() )
+   pLog->info( "LinkshellMgr: Caching linkshells" );
+   if( !pLsMgr->loadLinkshells() )
    {
-      g_framework.getLogger().fatal( "Unable to load linkshells!" );
+      pLog->fatal( "Unable to load linkshells!" );
       return;
    }
 
    Network::HivePtr hive( new Network::Hive() );
    Network::addServerToHive< Network::GameConnection >( m_ip, m_port, hive );
 
-   g_framework.getScriptMgr().init();
+   pScript->init();
 
-   g_framework.getLogger().info( "TerritoryMgr: Setting up zones" );
-   g_framework.getTerritoryMgr().init();
+   pLog->info( "TerritoryMgr: Setting up zones" );
+   pTeriMgr->init();
 
    std::vector< std::thread > thread_list;
    thread_list.emplace_back( std::thread( std::bind( &Network::Hive::Run, hive.get() ) ) );
 
-   g_framework.getLogger().info( "Server listening on port: " + std::to_string( m_port ) );
-   g_framework.getLogger().info( "Ready for connections..." );
+   pLog->info( "Server listening on port: " + std::to_string( m_port ) );
+   pLog->info( "Ready for connections..." );
 
    mainLoop();
 
@@ -213,25 +206,32 @@ void Core::ServerZone::run( int32_t argc, char* argv[] )
 
 void Core::ServerZone::printBanner() const
 {
-   g_framework.getLogger().info("===========================================================" );
-   g_framework.getLogger().info( "Sapphire Server Project " );
-   g_framework.getLogger().info( "Version: " + Version::VERSION );
-   g_framework.getLogger().info( "Git Hash: " + Version::GIT_HASH );
-   g_framework.getLogger().info( "Compiled: " __DATE__ " " __TIME__ );
-   g_framework.getLogger().info( "===========================================================" );
+   auto pLog = g_fw.get< Core::Logger>();
+
+   pLog->info("===========================================================" );
+   pLog->info( "Sapphire Server Project " );
+   pLog->info( "Version: " + Version::VERSION );
+   pLog->info( "Git Hash: " + Version::GIT_HASH );
+   pLog->info( "Compiled: " __DATE__ " " __TIME__ );
+   pLog->info( "===========================================================" );
 }
 
 void Core::ServerZone::mainLoop()
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+
    while( isRunning() )
    {
       this_thread::sleep_for( chrono::milliseconds( 50 ) );
 
       auto currTime = Util::getTimeSeconds();
 
-      g_framework.getTerritoryMgr().updateTerritoryInstances( currTime );
+      pTeriMgr->updateTerritoryInstances( currTime );
 
-      g_framework.getScriptMgr().update();
+      pScriptMgr->update();
 
       lock_guard< std::mutex > lock( this->m_sessionMutex );
       for( auto sessionIt : this->m_sessionMapById )
@@ -250,7 +250,7 @@ void Core::ServerZone::mainLoop()
 
       if( currTime - m_lastDBPingTime > 3 )
       {
-         g_framework.getCharaDb().keepAlive();
+         pDb->keepAlive();
          m_lastDBPingTime = currTime;
       }
 
@@ -268,7 +268,7 @@ void Core::ServerZone::mainLoop()
             it->second->close();
             // if( it->second.unique() )
             {
-               g_framework.getLogger().info("[" + std::to_string(it->second->getId() ) + "] Session removal" );
+               pLog->info("[" + std::to_string(it->second->getId() ) + "] Session removal" );
                it = this->m_sessionMapById.erase( it );
                removeSession( pPlayer->getName() );
                continue;
@@ -278,7 +278,7 @@ void Core::ServerZone::mainLoop()
          // remove sessions that simply timed out
          if( diff > 20 )
          {
-            g_framework.getLogger().info("[" + std::to_string( it->second->getId() ) + "] Session time out" );
+            pLog->info("[" + std::to_string( it->second->getId() ) + "] Session time out" );
 
             it->second->close();
             // if( it->second.unique() )
@@ -299,6 +299,8 @@ void Core::ServerZone::mainLoop()
 
 bool Core::ServerZone::createSession( uint32_t sessionId )
 {
+   auto pLog = g_fw.get< Core::Logger>();
+
    std::lock_guard< std::mutex > lock( m_sessionMutex );
 
    const std::string session_id_str = std::to_string( sessionId );
@@ -307,18 +309,18 @@ bool Core::ServerZone::createSession( uint32_t sessionId )
 
    if( it != m_sessionMapById.end() )
    {
-      g_framework.getLogger().error( "[" + session_id_str + "] Error creating session" );
+      pLog->error( "[" + session_id_str + "] Error creating session" );
       return false;
    }
 
-   g_framework.getLogger().info( "[" + session_id_str + "] Creating new session" );
+   pLog->info( "[" + session_id_str + "] Creating new session" );
 
    boost::shared_ptr<Session> newSession( new Session( sessionId ) );
    m_sessionMapById[sessionId] = newSession;
 
    if( !newSession->loadPlayer() )
    {
-      g_framework.getLogger().error( "[" + session_id_str + "] Error loading player " + session_id_str );
+      pLog->error( "[" + session_id_str + "] Error loading player " + session_id_str );
       return false;
    }
 
diff --git a/src/servers/sapphire_zone/ServerZone.h b/src/servers/sapphire_zone/ServerZone.h
index ef85c00e..4c728f9c 100644
--- a/src/servers/sapphire_zone/ServerZone.h
+++ b/src/servers/sapphire_zone/ServerZone.h
@@ -30,8 +30,6 @@ namespace Core {
       void updateSession( uint32_t id );
       void updateSession( std::string playerName );
 
-      XMLConfigPtr getConfig() const;
-
       size_t getSessionCount() const;
 
       void mainLoop();
@@ -51,8 +49,6 @@ namespace Core {
 
       std::string m_configPath;
 
-      XMLConfigPtr m_pConfig;
-
       std::mutex m_sessionMutex;
 
       std::map< uint32_t, SessionPtr > m_sessionMapById;
diff --git a/src/servers/sapphire_zone/Session.cpp b/src/servers/sapphire_zone/Session.cpp
index 2a1c2e33..a676f158 100644
--- a/src/servers/sapphire_zone/Session.cpp
+++ b/src/servers/sapphire_zone/Session.cpp
@@ -12,7 +12,7 @@
 #include "Framework.h"
 
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Session::Session( uint32_t sessionId ) :
    m_sessionId( sessionId ),
@@ -112,6 +112,7 @@ void Core::Session::updateLastSqlTime()
 
 void Core::Session::startReplay( const std::string& path )
 {
+   auto pLog = g_fw.get< Logger >();
    if( !boost::filesystem::exists( path ) )
    {
       getPlayer()->sendDebug( "Couldn't find folder." );
@@ -148,7 +149,7 @@ void Core::Session::startReplay( const std::string& path )
       m_replayCache.push_back( std::tuple< uint64_t, std::string >(
          Util::getTimeMs() + ( std::get< 0 >( set ) - startTime ), std::get< 1 >( set ) ) );
 
-      g_framework.getLogger().info( "Registering " + std::get< 1 >( set ) + " for " + std::to_string( std::get< 0 >( set ) - startTime ) );
+      pLog->info( "Registering " + std::get< 1 >( set ) + " for " + std::to_string( std::get< 0 >( set ) - startTime ) );
    }
 
    getPlayer()->sendDebug( "Registered " + std::to_string( m_replayCache.size() ) + " sets for replay" );
diff --git a/src/servers/sapphire_zone/mainGameServer.cpp b/src/servers/sapphire_zone/mainGameServer.cpp
index 131cc3cf..144bc74c 100644
--- a/src/servers/sapphire_zone/mainGameServer.cpp
+++ b/src/servers/sapphire_zone/mainGameServer.cpp
@@ -2,13 +2,53 @@
 
 #include "ServerZone.h"
 #include <boost/algorithm/string.hpp>
+#include <Framework.h>
+#include <Logging/Logger.h>
+#include <Config/XMLConfig.h>
+#include <Exd/ExdDataGenerated.h>
+#include "Script/ScriptMgr.h"
+#include <Database/CharaDbConnection.h>
+#include <Database/DbWorkerPool.h>
+#include "Linkshell/LinkshellMgr.h"
+#include "Zone/TerritoryMgr.h"
 
-#include "Framework.h"
+Core::Framework g_fw;
 
-extern Core::Framework g_framework;
+using namespace Core;
+
+bool setupFramework()
+{
+   auto pServer = boost::make_shared< ServerZone >( "config/settings_zone.xml" );
+   auto pLogger = boost::make_shared< Logger >();
+   auto pConfig = boost::make_shared< XMLConfig >();
+   auto pExdData = boost::make_shared< Data::ExdDataGenerated >();
+   auto pScript = boost::make_shared< Scripting::ScriptMgr >();
+   auto pDb = boost::make_shared< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pLsMgr = boost::make_shared< LinkshellMgr >();
+   auto pTeriMgr = boost::make_shared< TerritoryMgr >();
+
+   pLogger->setLogPath( "log/SapphireZone_" );
+   pLogger->init();
+
+   g_fw.set< ServerZone >( pServer );
+   g_fw.set< Logger >( pLogger );
+   g_fw.set< XMLConfig >( pConfig );
+   g_fw.set< Data::ExdDataGenerated >( pExdData );
+   g_fw.set< Scripting::ScriptMgr >( pScript );
+   g_fw.set< Db::DbWorkerPool< Db::CharaDbConnection > >( pDb );
+   g_fw.set< LinkshellMgr >( pLsMgr );
+   g_fw.set< TerritoryMgr >( pTeriMgr );
+
+   // actuall catch errors here...
+   return true;
+}
 
 int main( int32_t argc, char* argv[] )
 {
-   g_framework.getServerZone().run( argc, argv );
+
+   if( !setupFramework() )
+      return 0; // too fucking bad...
+
+   g_fw.get< ServerZone >()->run( argc, argv );
    return 0;
 }
\ No newline at end of file