diff --git a/src/servers/Scripts/common/ScriptLoader.cpp b/src/servers/Scripts/common/ScriptLoader.cpp
index c1871bea..e4bc7a56 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 "CmnDefCutSceneReplay.cpp"
-#include "CmnDefInnBed.cpp"
-#include "CmnDefLinkShell.cpp"
 #include "HouFurOrchestrion.cpp"
+#include "CmnDefInnBed.cpp"
+#include "CmnDefCutSceneReplay.cpp"
+#include "CmnDefLinkShell.cpp"
 
 const ScriptObject* ptrs[] =
 {
    static_cast< ScriptObject* >( new Aethernet ),
    static_cast< ScriptObject* >( new Aetheryte ),
-   static_cast< ScriptObject* >( new CmnDefCutSceneReplay ),
-   static_cast< ScriptObject* >( new CmnDefInnBed ),
-   static_cast< ScriptObject* >( new CmnDefLinkShell ),
    static_cast< ScriptObject* >( new HouFurOrchestrion ),
+   static_cast< ScriptObject* >( new CmnDefInnBed ),
+   static_cast< ScriptObject* >( new CmnDefCutSceneReplay ),
+   static_cast< ScriptObject* >( new CmnDefLinkShell ),
 
    nullptr
 };
diff --git a/src/servers/Scripts/instances/ScriptLoader.cpp b/src/servers/Scripts/instances/ScriptLoader.cpp
index 7d8fbf10..2c0c33c0 100644
--- a/src/servers/Scripts/instances/ScriptLoader.cpp
+++ b/src/servers/Scripts/instances/ScriptLoader.cpp
@@ -1,542 +1,542 @@
 #include <Script/NativeScriptApi.h>
 
-#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/ThePalaceoftheDeadFloors6170.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors7180.cpp"
-#include "deepdungeon/ThePalaceoftheDeadFloors8190.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/TheFeastTeamRanked.cpp"
 #include "pvp/SealRockSeize.cpp"
-#include "pvp/TheBorderlandRuinsSecure.cpp"
-#include "pvp/TheFeast4on4LightParty.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/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 "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/ReturnoftheBull.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/TheCarteneauFlatsHeliodrome.cpp"
-#include "questbattles/TheFaceofTrueEvil.cpp"
 #include "questbattles/TheHeartoftheProblem.cpp"
 #include "questbattles/TheOrphansandtheBrokenBlade.cpp"
-#include "questbattles/TheResonant.cpp"
+#include "questbattles/TheCarteneauFlatsHeliodrome.cpp"
+#include "questbattles/ReturnoftheBull.cpp"
+#include "questbattles/TheFaceofTrueEvil.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/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/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/AlexanderTheCuffoftheSon.cpp"
+#include "raids/AlexanderTheFistoftheSonSavage.cpp"
 #include "raids/TheSecondCoilofBahamutSavageTurn3.cpp"
-#include "raids/TheSecondCoilofBahamutSavageTurn4.cpp"
-#include "raids/TheSecondCoilofBahamutTurn1.cpp"
-#include "raids/TheSecondCoilofBahamutTurn2.cpp"
-#include "raids/TheSecondCoilofBahamutTurn3.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/TheUnendingCoilofBahamutUltimate.cpp"
-#include "raids/TheVoidArk.cpp"
+#include "raids/AlexanderTheCuffoftheFatherSavage.cpp"
+#include "raids/SigmascapeV10Savage.cpp"
+#include "raids/DeltascapeV20Savage.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 "raids/TheRoyalCityofRabanastre.cpp"
+#include "raids/AlexanderTheBurdenoftheFather.cpp"
+#include "raids/AlexanderTheEyesoftheCreator.cpp"
+#include "raids/TheSecondCoilofBahamutSavageTurn4.cpp"
+#include "raids/AlexanderTheSouloftheCreator.cpp"
+#include "AkhAfahAmphitheatreExtreme.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/TheWhorleaterExtreme.cpp"
-#include "trials/TheWhorleaterHard.cpp"
-#include "trials/ThokastThokExtreme.cpp"
-#include "trials/ThokastThokHard.cpp"
-#include "trials/ThornmarchExtreme.cpp"
-#include "trials/ThornmarchHard.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/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 "deepdungeon/ThePalaceoftheDeadFloors151160.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/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 "events/TheHauntedManor.cpp"
 
 const ScriptObject* ptrs[] =
 {
-   static_cast< ScriptObject* >( new AkhAfahAmphitheatreExtreme ),
-   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 ThePalaceoftheDeadFloors6170 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors7180 ),
-   static_cast< ScriptObject* >( new ThePalaceoftheDeadFloors8190 ),
-   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 TheFeastTeamRanked ),
    static_cast< ScriptObject* >( new SealRockSeize ),
-   static_cast< ScriptObject* >( new TheBorderlandRuinsSecure ),
-   static_cast< ScriptObject* >( new TheFeast4on4LightParty ),
    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 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 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 ReturnoftheBull ),
+   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 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 TheCarteneauFlatsHeliodrome ),
+   static_cast< ScriptObject* >( new ReturnoftheBull ),
+   static_cast< ScriptObject* >( new TheFaceofTrueEvil ),
    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 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 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 AlexanderTheCuffoftheSon ),
+   static_cast< ScriptObject* >( new AlexanderTheFistoftheSonSavage ),
    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 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 TheUnendingCoilofBahamutUltimate ),
-   static_cast< ScriptObject* >( new TheVoidArk ),
+   static_cast< ScriptObject* >( new AlexanderTheCuffoftheFatherSavage ),
+   static_cast< ScriptObject* >( new SigmascapeV10Savage ),
+   static_cast< ScriptObject* >( new DeltascapeV20Savage ),
    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 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 AkhAfahAmphitheatreExtreme ),
+   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 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 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 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 ThePalaceoftheDeadFloors151160 ),
+   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 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 TheHauntedManor ),
 
    nullptr
 };
diff --git a/src/servers/Scripts/opening/ScriptLoader.cpp b/src/servers/Scripts/opening/ScriptLoader.cpp
index c0306ca9..e3349224 100644
--- a/src/servers/Scripts/opening/ScriptLoader.cpp
+++ b/src/servers/Scripts/opening/ScriptLoader.cpp
@@ -1,13 +1,13 @@
 #include <Script/NativeScriptApi.h>
 
-#include "OpeningGridania.cpp"
 #include "OpeningLimsa.cpp"
+#include "OpeningGridania.cpp"
 #include "OpeningUldah.cpp"
 
 const ScriptObject* ptrs[] =
 {
-   static_cast< ScriptObject* >( new OpeningGridania ),
    static_cast< ScriptObject* >( new OpeningLimsa ),
+   static_cast< ScriptObject* >( new OpeningGridania ),
    static_cast< ScriptObject* >( new OpeningUldah ),
 
    nullptr
diff --git a/src/servers/Scripts/quest/ScriptLoader.cpp b/src/servers/Scripts/quest/ScriptLoader.cpp
index 53db3f2e..004f37c9 100644
--- a/src/servers/Scripts/quest/ScriptLoader.cpp
+++ b/src/servers/Scripts/quest/ScriptLoader.cpp
@@ -1,32 +1,32 @@
 #include <Script/NativeScriptApi.h>
 
-#include "ManFst001.cpp"
+#include "ManFst004.cpp"
+#include "ManSea002.cpp"
 #include "ManFst002.cpp"
 #include "ManFst003.cpp"
-#include "ManFst004.cpp"
-#include "ManSea001.cpp"
-#include "ManSea002.cpp"
 #include "ManWil001.cpp"
 #include "ManWil002.cpp"
-#include "subquest/gridania/SubFst001.cpp"
+#include "ManFst001.cpp"
 #include "subquest/gridania/SubFst002.cpp"
-#include "subquest/gridania/SubFst010.cpp"
 #include "subquest/gridania/SubFst013.cpp"
+#include "subquest/gridania/SubFst001.cpp"
+#include "subquest/gridania/SubFst010.cpp"
+#include "ManSea001.cpp"
 
 const ScriptObject* ptrs[] =
 {
-   static_cast< ScriptObject* >( new ManFst001 ),
+   static_cast< ScriptObject* >( new ManFst004 ),
+   static_cast< ScriptObject* >( new ManSea002 ),
    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 SubFst001 ),
+   static_cast< ScriptObject* >( new ManFst001 ),
    static_cast< ScriptObject* >( new SubFst002 ),
-   static_cast< ScriptObject* >( new SubFst010 ),
    static_cast< ScriptObject* >( new SubFst013 ),
+   static_cast< ScriptObject* >( new SubFst001 ),
+   static_cast< ScriptObject* >( new SubFst010 ),
+   static_cast< ScriptObject* >( new ManSea001 ),
 
    nullptr
 };
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index dba11f3c..afffb561 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -46,7 +46,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;
@@ -109,7 +109,8 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    uint32_t param2 = inPacket.getValAt< uint32_t >( 0x28 );
    uint32_t param3 = inPacket.getValAt< uint32_t >( 0x38 );
 
-   g_framework.getLogger().debug( player.getName() + " used GM1 commandId: " + std::to_string( commandId ) +
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( player.getName() + " used GM1 commandId: " + std::to_string( commandId ) +
       ", params: " + std::to_string( param1 ) + ", " +
       std::to_string( param2 ) + ", " + std::to_string( param3 ) );
 
@@ -409,19 +410,20 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Teri:
    {
-      if( auto instance = g_framework.getTerritoryMgr().getInstanceZonePtr( param1 ) )
+      auto pTeriMgr = g_fw.get< TerritoryMgr >();
+      if( auto instance = pTeriMgr->getInstanceZonePtr( param1 ) )
       {
          player.sendDebug( "Found instance: " + instance->getName() + ", id: " + std::to_string( param1 ) );
 
          player.setInstance( instance );
       }
-      else if( !g_framework.getTerritoryMgr().isValidTerritory( param1 )  )
+      else if( !pTeriMgr->isValidTerritory( param1 )  )
       {
          player.sendUrgent( "Invalid zone " + std::to_string( param1 ) );
       }
       else
       {
-         auto pZone = g_framework.getTerritoryMgr().getZoneByTerriId( param1 );
+         auto pZone = pTeriMgr->getZoneByTerriId( param1 );
          if( !pZone )
          {
             player.sendUrgent( "No zone instance found for " + std::to_string( param1 ) );
@@ -467,13 +469,16 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
 {
    if( player.getGmRank() <= 0 )
       return;
+   
+   auto pLog = g_fw.get< Logger >();
+   auto pServerZone = g_fw.get< ServerZone >();
 
    uint32_t commandId = inPacket.getValAt< uint32_t >( 0x20 );
    std::string param1 = inPacket.getStringAt( 0x34 );
 
-   g_framework.getLogger().debug( player.getName() + " used GM2 commandId: " + std::to_string( commandId ) + ", params: " + param1 );
+   pLog->debug( player.getName() + " used GM2 commandId: " + std::to_string( commandId ) + ", params: " + param1 );
 
-   auto targetSession = g_framework.getServerZone().getSession( param1 );
+   auto targetSession = pServerZone->getSession( param1 );
    Core::Entity::CharaPtr targetActor;
 
    if( targetSession != nullptr )
diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
index 1d4983c3..00b57c72 100644
--- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
@@ -24,7 +24,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;
@@ -53,10 +53,12 @@ void Core::Network::GameConnection::inventoryModifyHandler( const Packets::GameP
    ackPacket.data().sequence = seq;
    ackPacket.data().type = 7;
    player.queuePacket( ackPacket );
+  
+   auto pLog = g_fw.get< Logger >();
 
 
-   g_framework.getLogger().debug( inPacket.toString() );
-   g_framework.getLogger().debug( "InventoryAction: " + std::to_string( action ) );
+   pLog->debug( inPacket.toString() );
+   pLog->debug( "InventoryAction: " + std::to_string( action ) );
 
    // TODO: other inventory operations need to be implemented
    switch( action )
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 2648374e..4ad33d62 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -7,6 +7,9 @@
 #include <Network/PacketContainer.h>
 #include <Network/PacketDef/Chat/ServerChatDef.h>
 #include <Database/DatabaseDef.h>
+#include <Database/DbWorkerPool.h>
+#include <Database/CharaDbConnection.h>
+
 #include <boost/format.hpp>
 #include <unordered_map>
 #include "Network/GameConnection.h"
@@ -43,7 +46,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;
@@ -285,20 +288,20 @@ void Core::Network::GameConnection::updatePositionHandler( const Packets::GamePa
 void Core::Network::GameConnection::reqEquipDisplayFlagsHandler( const Packets::GamePacket& inPacket,
                                                                  Entity::Player& player )
 {
-   g_framework.getLogger().info( "[" + std::to_string( player.getId() ) + "] Setting EquipDisplayFlags to " + std::to_string( inPacket.getValAt< uint8_t >( 0x20 ) ) );
    player.setEquipDisplayFlags( inPacket.getValAt< uint8_t >( 0x20 ) );
 }
 
 void Core::Network::GameConnection::zoneLineHandler( const Packets::GamePacket& inPacket,
                                                      Entity::Player& player )
 {
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    uint32_t zoneLineId = inPacket.getValAt< uint32_t >( 0x20 );
 
    player.sendDebug( "Walking ZoneLine " + std::to_string( zoneLineId ) );
 
    auto pZone = player.getCurrentZone();
 
-   auto pLine = g_framework.getTerritoryMgr().getTerritoryPosition( zoneLineId );
+   auto pLine = pTeriMgr->getTerritoryPosition( zoneLineId );
 
    Common::FFXIVARR_POSITION3 targetPos{};
    uint32_t targetZone;
@@ -337,7 +340,9 @@ void Core::Network::GameConnection::discoveryHandler( const Packets::GamePacket&
 {
    uint32_t ref_position_id = inPacket.getValAt< uint32_t >( 0x20 );
 
-   auto pQR = g_framework.getCharaDb().query( "SELECT id, map_id, discover_id "
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+
+   auto pQR = pDb->query( "SELECT id, map_id, discover_id "
                                "FROM discoveryinfo "
                                "WHERE id = " + std::to_string( ref_position_id ) + ";" );
 
@@ -489,6 +494,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
                                                  Entity::Player& player )
 {
 
+   auto pDebugCom = g_fw.get< DebugCommandHandler >();
    std::string chatString( inPacket.getStringAt( 0x3a ) );
 
    uint32_t sourceId = inPacket.getValAt< uint32_t >( 0x24 );
@@ -496,7 +502,7 @@ void Core::Network::GameConnection::chatHandler( const Packets::GamePacket& inPa
    if( chatString.at( 0 ) == '!' )
    {
       // execute game console command
-      g_framework.getDebugCommandHandler().execCommand( const_cast< char * >( chatString.c_str() ) + 1, player );
+      pDebugCom->execCommand( const_cast< char * >( chatString.c_str() ) + 1, player );
       return;
    }
 
@@ -553,15 +559,15 @@ void Core::Network::GameConnection::tellHandler( const Packets::GamePacket& inPa
    std::string targetPcName = inPacket.getStringAt( 0x21 );
    std::string msg = inPacket.getStringAt( 0x41 );
 
-   auto pSession = g_framework.getServerZone().getSession( targetPcName );
+   auto pZoneServer = g_fw.get< ServerZone >();
+
+   auto pSession = pZoneServer->getSession( targetPcName );
 
    if( !pSession )
    {
       ChatChannelPacket< FFXIVIpcTellErrNotFound > tellErrPacket( player.getId() );
       strcpy( tellErrPacket.data().receipientName, targetPcName.c_str() );
       sendSinglePacket( tellErrPacket );
-
-      g_framework.getLogger().debug( "TargetPc not found" );
       return;
    }
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
index cf09e092..4ae0ebfe 100644
--- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
@@ -30,7 +30,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;
@@ -47,6 +47,9 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
     uint64_t targetId = inPacket.getValAt< uint64_t >( 0x30 );
 
     player.sendDebug( "Skill type:" + std::to_string( type ) );
+  
+    auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+    auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
 
     switch( type )
     {
@@ -57,7 +60,7 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
         std::string actionIdStr = boost::str( boost::format( "%|04X|" ) % action );
         player.sendDebug( "---------------------------------------" );
         player.sendDebug( "ActionHandler ( " + actionIdStr + " | " +
-                          g_framework.getExdDataGen().get< Core::Data::Action >( action )->name +
+                          pExdData->get< Core::Data::Action >( action )->name +
                           " | " + std::to_string( targetId ) + " )" );
 
         player.queuePacket( ActorControlPacket142( player.getId(), ActorControlType::ActionStart, 0x01, action ) );
@@ -80,7 +83,7 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
 
             if( !player.actionHasCastTime( action ) )
             {
-                g_framework.getScriptMgr().onCastFinish( player, targetActor->getAsChara(), action );
+                pScriptMgr->onCastFinish( player, targetActor->getAsChara(), action );
             }
             else
             {
@@ -97,11 +100,10 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
     }
     else if( action < 3000000 ) // item action
     {
-        auto info = g_framework.getExdDataGen().get< Core::Data::EventItem >( action );
+        auto info = pExdData->get< Core::Data::EventItem >( action );
         if( info )
         {
-            g_framework.getLogger().debug( info->name );
-            g_framework.getScriptMgr().onEventItem( player, action, info->quest, info->castTime, targetId );
+            pScriptMgr->onEventItem( player, action, info->quest, info->castTime, targetId );
         }
     }
     else if( action > 3000000 ) // unknown
diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.cpp b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
index 90067779..05530db9 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.cpp
@@ -10,7 +10,7 @@
 #include <boost/filesystem.hpp>
 
 #include "Framework.h"
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 namespace fs = boost::filesystem;
 
@@ -35,31 +35,35 @@ bool Core::Scripting::ScriptLoader::unloadModule( ModuleHandle handle )
 #else
    bool success = dlclose( handle ) == 0;
 #endif
+  
+   auto pLog = g_fw.get< Logger >();
 
    if( !success )
    {
-      g_framework.getLogger().error( "Failed to unload module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
+      pLog->error( "Failed to unload module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
 
       return false;
    }
 
-   g_framework.getLogger().debug( "Unloaded module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
+   pLog->debug( "Unloaded module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
 
    return true;
 }
 
 Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const std::string& path )
 {
+   auto pLog = g_fw.get< Logger >();
+   auto pConfig = g_fw.get< XMLConfig >();
    fs::path f( path );
 
    if( isModuleLoaded( f.stem().string() ) )
    {
-      g_framework.getLogger().error( "Unable to load module '" + f.stem().string() + "' as it is already loaded" );
+      pLog->error( "Unable to load module '" + f.stem().string() + "' as it is already loaded" );
       return nullptr;
    }
 
    // copy to temp dir
-   fs::path cacheDir( f.parent_path() /= g_framework.getServerZone().getConfig()->getValue< std::string >( "Settings.General.Scripts.CachePath", "./cache/" ) );
+   fs::path cacheDir( f.parent_path() /= pConfig->getValue< std::string >( "Settings.General.Scripts.CachePath", "./cache/" ) );
    fs::create_directories( cacheDir );
    fs::path dest( cacheDir /= f.filename().string() );
 
@@ -69,7 +73,7 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
    }
    catch( const boost::filesystem::filesystem_error& err )
    {
-      g_framework.getLogger().error( "Error copying file to cache: " + err.code().message() );
+      pLog->error( "Error copying file to cache: " + err.code().message() );
 
       return nullptr;
    }
@@ -83,12 +87,12 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
 
    if( !handle )
    {
-      g_framework.getLogger().error( "Failed to load module from: " + path );
+      pLog->error( "Failed to load module from: " + path );
 
       return nullptr;
    }
 
-   g_framework.getLogger().debug( "Loaded module '" + f.filename().string() + "' @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
+   pLog->debug( "Loaded module '" + f.filename().string() + "' @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) );
 
    auto info = new ScriptInfo;
    info->handle = handle;
@@ -104,6 +108,7 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
 ScriptObject** Core::Scripting::ScriptLoader::getScripts( ModuleHandle handle )
 {
    using getScripts = ScriptObject**( *)( );
+   auto pLog = g_fw.get< Logger >();
 
 #ifdef _WIN32
    getScripts func = reinterpret_cast< getScripts >( GetProcAddress( handle, "getScripts" ) );
@@ -115,7 +120,7 @@ ScriptObject** Core::Scripting::ScriptLoader::getScripts( ModuleHandle handle )
    {
       auto ptr = func();
 
-      g_framework.getLogger().debug( "got ScriptObject array @ 0x" + boost::str( boost::format( "%|08X|" ) % ptr ) );
+      pLog->debug( "got ScriptObject array @ 0x" + boost::str( boost::format( "%|08X|" ) % ptr ) );
 
       return ptr;
    }
@@ -130,6 +135,7 @@ bool Core::Scripting::ScriptLoader::unloadScript( Core::Scripting::ScriptInfo* i
 
 bool Core::Scripting::ScriptLoader::unloadScript( ModuleHandle handle )
 {
+   auto pLog = g_fw.get< Logger >();
    for( auto it = m_scriptMap.begin(); it != m_scriptMap.end(); ++it )
    {
       if( it->second->handle == handle )
@@ -148,7 +154,7 @@ bool Core::Scripting::ScriptLoader::unloadScript( ModuleHandle handle )
             return true;
          }
 
-         g_framework.getLogger().error( "failed to unload module: " + info->library_name );
+         pLog->error( "failed to unload module: " + info->library_name );
 
          return false;
       }
diff --git a/src/servers/sapphire_zone/Script/ScriptMgr.cpp b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
index ca7a5d83..dabcaeb6 100644
--- a/src/servers/sapphire_zone/Script/ScriptMgr.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptMgr.cpp
@@ -30,7 +30,7 @@
 // enable the ambiguity fix for every platform to avoid #define nonsense
 #define WIN_AMBIGUITY_FIX
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::Scripting::ScriptMgr::ScriptMgr() :
    m_firstScriptChangeNotificiation( false )
@@ -51,8 +51,10 @@ void Core::Scripting::ScriptMgr::update()
 bool Core::Scripting::ScriptMgr::init()
 {
    std::set< std::string > files;
+   auto pConfig = g_fw.get< XMLConfig >();
+   auto pLog = g_fw.get< Logger >();
 
-   loadDir( g_framework.getServerZone().getConfig()->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ),
+   loadDir( pConfig->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ),
             files, m_nativeScriptMgr->getModuleExtension() );
 
    uint32_t scriptsFound = 0;
@@ -68,7 +70,7 @@ bool Core::Scripting::ScriptMgr::init()
          scriptsLoaded++;
    }
 
-   g_framework.getLogger().info( "ScriptMgr: Loaded " + std::to_string( scriptsLoaded ) + "/" + std::to_string( scriptsFound ) + " scripts successfully" );
+   pLog->info( "ScriptMgr: Loaded " + std::to_string( scriptsLoaded ) + "/" + std::to_string( scriptsFound ) + " scripts successfully" );
 
    watchDirectories();
 
@@ -77,11 +79,12 @@ bool Core::Scripting::ScriptMgr::init()
 
 void Core::Scripting::ScriptMgr::watchDirectories()
 {
-   auto shouldWatch = g_framework.getServerZone().getConfig()->getValue< bool >( "Settings.General.Scripts.HotSwap.Enabled", true );
+   auto pConfig = g_fw.get< XMLConfig >();
+   auto shouldWatch = pConfig->getValue< bool >( "Settings.General.Scripts.HotSwap.Enabled", true );
    if( !shouldWatch )
       return;
 
-   Watchdog::watchMany( g_framework.getServerZone().getConfig()->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ) + "*" + m_nativeScriptMgr->getModuleExtension(),
+   Watchdog::watchMany( pConfig->getValue< std::string >( "Settings.General.Scripts.Path", "./compiledscripts/" ) + "*" + m_nativeScriptMgr->getModuleExtension(),
    [ this ]( const std::vector< ci::fs::path >& paths )
    {
       if( !m_firstScriptChangeNotificiation )
@@ -91,18 +94,19 @@ void Core::Scripting::ScriptMgr::watchDirectories()
          m_firstScriptChangeNotificiation = true;
          return;
       }
+      auto pLog = g_fw.get< Logger >();
 
       for( auto path : paths )
       {
          if( m_nativeScriptMgr->isModuleLoaded( path.stem().string() ) )
          {
-            g_framework.getLogger().debug( "Reloading changed script: " + path.stem().string() );
+            pLog->debug( "Reloading changed script: " + path.stem().string() );
 
             m_nativeScriptMgr->queueScriptReload( path.stem( ).string( ));
          }
          else
          {
-            g_framework.getLogger().debug( "Loading new script: " + path.stem().string() );
+            pLog->debug( "Loading new script: " + path.stem().string() );
 
             m_nativeScriptMgr->loadScript( path.string() );
          }
@@ -113,7 +117,8 @@ void Core::Scripting::ScriptMgr::watchDirectories()
 void Core::Scripting::ScriptMgr::loadDir( const std::string& dirname, std::set<std::string> &files, const std::string& ext )
 {
 
-   g_framework.getLogger().info( "ScriptEngine: loading scripts from " + dirname );
+   auto pLog = g_fw.get< Logger >();
+   pLog->info( "ScriptEngine: loading scripts from " + dirname );
 
    boost::filesystem::path targetDir( dirname );
 
@@ -145,13 +150,14 @@ void Core::Scripting::ScriptMgr::onPlayerFirstEnterWorld( Entity::Player& player
 bool Core::Scripting::ScriptMgr::onTalk( Entity::Player& player, uint64_t actorId, uint32_t eventId )
 {
 
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    uint16_t eventType = eventId >> 16;
    uint32_t scriptId = eventId;
 
    // aethernet/aetherytes need to be handled separately
    if( eventType == Event::EventHandler::EventHandlerType::Aetheryte )
    {
-      auto aetherInfo = g_framework.getExdDataGen().get< Core::Data::Aetheryte >( eventId & 0xFFFF );
+      auto aetherInfo = pExdData->get< Core::Data::Aetheryte >( eventId & 0xFFFF );
       scriptId = EVENTSCRIPT_AETHERYTE_ID;
       if( !aetherInfo->isAetheryte )
          scriptId = EVENTSCRIPT_AETHERNET_ID;
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
index 0e40cd0f..20b2c544 100644
--- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
+++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
@@ -17,7 +17,7 @@
 #include "StatusEffect.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -33,7 +33,8 @@ Core::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr so
    , m_tickRate( tickRate )
    , m_lastTick( 0 )
 {
-   auto entry = g_framework.getExdDataGen().get< Core::Data::Status >( id );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto entry = pExdData->get< Core::Data::Status >( id );
    m_name = entry->name;
       
    std::replace( m_name.begin(), m_name.end(), ' ', '_' );
@@ -66,8 +67,9 @@ std::pair< uint8_t, uint32_t> Core::StatusEffect::StatusEffect::getTickEffect()
 
 void Core::StatusEffect::StatusEffect::onTick()
 {
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
    m_lastTick = Util::getTimeMs();
-   g_framework.getScriptMgr().onStatusTick( m_targetActor, *this );
+   pScriptMgr->onStatusTick( m_targetActor, *this );
 }
 
 uint32_t Core::StatusEffect::StatusEffect::getSrcActorId() const
@@ -88,6 +90,7 @@ uint16_t Core::StatusEffect::StatusEffect::getParam() const
 void Core::StatusEffect::StatusEffect::applyStatus()
 {
    m_startTime = Util::getTimeMs();
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
 
    // this is only right when an action is being used by the player
    // else you probably need to use an actorcontrol
@@ -107,14 +110,13 @@ void Core::StatusEffect::StatusEffect::applyStatus()
    //effectPacket.data().effects[4].unknown_5 = 0x80;
    //m_sourceActor->sendToInRangeSet( effectPacket, true );
 
-   g_framework.getLogger().debug( "StatusEffect applied: " + m_name );
-   g_framework.getScriptMgr().onStatusReceive( m_targetActor, m_id );
+   pScriptMgr->onStatusReceive( m_targetActor, m_id );
 }
 
 void Core::StatusEffect::StatusEffect::removeStatus()
 {
-   g_framework.getLogger().debug( "StatusEffect removed: " + m_name );
-   g_framework.getScriptMgr().onStatusTimeOut( m_targetActor, m_id );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onStatusTimeOut( m_targetActor, m_id );
 }
 
 uint32_t Core::StatusEffect::StatusEffect::getId() const
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index a953c0a5..aaac6a62 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -20,7 +20,7 @@
 #include "InstanceContent.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -44,7 +44,8 @@ Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceC
 
 bool Core::InstanceContent::init()
 {
-   g_framework.getScriptMgr().onInstanceInit( getAsInstanceContent() );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onInstanceInit( getAsInstanceContent() );
 
    return true;
 }
@@ -67,7 +68,8 @@ Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInsta
 
 void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 {
-   g_framework.getLogger().debug( "InstanceContent::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|"
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "InstanceContent::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|"
                                                            + std::to_string( getInstanceContentId() ) +
                                                            + ", Entity#" + std::to_string( player.getId() ) );
 
@@ -83,7 +85,8 @@ void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 
 void Core::InstanceContent::onLeaveTerritory( Entity::Player& player )
 {
-   g_framework.getLogger().debug( "InstanceContent::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|"
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "InstanceContent::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|"
                                                            + std::to_string( getInstanceContentId() ) +
                                                            + ", Entity#" + std::to_string( player.getId() ) );
    sendDirectorClear( player );
@@ -149,8 +152,8 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
       case DutyFinished:
          break;
    }
-
-   g_framework.getScriptMgr().onInstanceUpdate( getAsInstanceContent(), currTime );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onInstanceUpdate( getAsInstanceContent(), currTime );
 
 }
 
@@ -274,13 +277,15 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
       m_eventObjectMap[object->getName()] = object;
    if( object->getObjectId() == 2000182 ) // start
       m_pEntranceEObj = object;
-
-   auto objData = g_framework.getExdDataGen().get< Core::Data::EObj >( object->getObjectId() );
+   
+   auto pLog = g_fw.get< Logger >();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto objData = pExdData->get< Core::Data::EObj >( object->getObjectId() );
    if( objData )
       // todo: data should be renamed to eventId
       m_eventIdToObjectMap[objData->data] = object;
    else
-      g_framework.getLogger().error( "InstanceContent::onRegisterEObj Zone " +
+      pLog->error( "InstanceContent::onRegisterEObj Zone " +
                                      m_internalName + ": No EObj data found for EObj with ID: " +
                                      std::to_string( object->getObjectId() ) );
 }
@@ -334,5 +339,6 @@ void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t event
 
 void Core::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
 {
-   g_framework.getScriptMgr().onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 );
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
+   pScriptMgr->onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 );
 }
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index 23b6071b..f9e87ce7 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -12,7 +12,7 @@
 #include "TerritoryMgr.h"
 #include "Framework.h"
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 Core::TerritoryMgr::TerritoryMgr() :
    m_lastInstanceId( 10000 )
@@ -22,11 +22,12 @@ Core::TerritoryMgr::TerritoryMgr() :
 
 void Core::TerritoryMgr::loadTerritoryTypeDetailCache()
 {
-   auto idList = g_framework.getExdDataGen().getTerritoryTypeIdList();
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto idList = pExdData->getTerritoryTypeIdList();
 
    for( auto id : idList )
    {
-      auto teri1 = g_framework.getExdDataGen().get< Core::Data::TerritoryType >( id );
+      auto teri1 = pExdData->get< Core::Data::TerritoryType >( id );
 
       if( !teri1->name.empty() )
          m_territoryTypeDetailCacheMap[id] = teri1;
@@ -97,6 +98,8 @@ bool Core::TerritoryMgr::isPrivateTerritory( uint32_t territoryTypeId ) const
 
 bool Core::TerritoryMgr::createDefaultTerritories()
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pLog = g_fw.get< Logger >();
    // for each entry in territoryTypeExd, check if it is a normal and if so, add the zone object
    for( const auto& territory : m_territoryTypeDetailCacheMap )
    {
@@ -107,18 +110,18 @@ bool Core::TerritoryMgr::createDefaultTerritories()
       if( territoryInfo->name.empty() )
          continue;
 
-      auto pPlaceName = g_framework.getExdDataGen().get< Core::Data::PlaceName >( territoryInfo->placeName );
+      auto pPlaceName = pExdData->get< Core::Data::PlaceName >( territoryInfo->placeName );
 
       if( !pPlaceName || pPlaceName->name.empty() || !isDefaultTerritory( territoryId ) )
          continue;
 
       uint32_t guid = getNextInstanceId();
-      g_framework.getLogger().info( std::to_string( territoryId ) +
-                                        "\t" + std::to_string( guid ) +
-                                        "\t" + std::to_string( territoryInfo->territoryIntendedUse ) +
-                                        "\t" + ( territoryInfo->name.length() <= 4 ? territoryInfo->name + "\t" : territoryInfo->name ) +
-                                        "\t" + ( isPrivateTerritory( territoryId ) ? "PRIVATE" : "PUBLIC" ) +
-                                        "\t" + pPlaceName->name );
+      pLog->info( std::to_string( territoryId ) +
+                                 "\t" + std::to_string( guid ) +
+                                 "\t" + std::to_string( territoryInfo->territoryIntendedUse ) +
+                                 "\t" + ( territoryInfo->name.length() <= 4 ? territoryInfo->name + "\t" : territoryInfo->name ) +
+                                 "\t" + ( isPrivateTerritory( territoryId ) ? "PRIVATE" : "PUBLIC" ) +
+                                 "\t" + pPlaceName->name );
 
       auto pZone = make_Zone( territoryId, guid, territoryInfo->name, pPlaceName->name );
       pZone->init();
@@ -142,13 +145,15 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp
    if( isInstanceContentTerritory( territoryTypeId ) )
       return nullptr;
 
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pLog = g_fw.get< Logger >();
    auto pTeri = getTerritoryDetail( territoryTypeId );
-   auto pPlaceName = g_framework.getExdDataGen().get< Core::Data::PlaceName >( pTeri->placeName );
+   auto pPlaceName = pExdData->get< Core::Data::PlaceName >( pTeri->placeName );
 
    if( !pTeri || !pPlaceName )
       return nullptr;
 
-   g_framework.getLogger().debug( "Starting instance for territory: " + std::to_string( territoryTypeId ) + " (" + pPlaceName->name + ")" );
+   pLog->debug( "Starting instance for territory: " + std::to_string( territoryTypeId ) + " (" + pPlaceName->name + ")" );
 
    auto pZone = make_Zone( territoryTypeId, getNextInstanceId(), pTeri->name, pPlaceName->name );
    pZone->init();
@@ -161,7 +166,8 @@ Core::ZonePtr Core::TerritoryMgr::createTerritoryInstance( uint32_t territoryTyp
 
 Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t instanceContentId )
 {
-   auto pInstanceContent = g_framework.getExdDataGen().get< Core::Data::InstanceContent >( instanceContentId );
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
+   auto pInstanceContent = pExdData->get< Core::Data::InstanceContent >( instanceContentId );
    if( !pInstanceContent )
       return nullptr;
 
@@ -173,8 +179,9 @@ Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t instanceConten
    if( !pTeri || pInstanceContent->name.empty() )
       return nullptr;
 
-   g_framework.getLogger().debug( "Starting instance for InstanceContent id: " + std::to_string( instanceContentId ) +
-                                                           " (" + pInstanceContent->name + ")" );
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "Starting instance for InstanceContent id: " + std::to_string( instanceContentId ) +
+                " (" + pInstanceContent->name + ")" );
 
    auto pZone = make_InstanceContent( pInstanceContent, getNextInstanceId(),
                                       pTeri->name, pInstanceContent->name, instanceContentId );
@@ -221,7 +228,8 @@ Core::ZonePtr Core::TerritoryMgr::getInstanceZonePtr( uint32_t instanceId ) cons
 
 void Core::TerritoryMgr::loadTerritoryPositionMap()
 {
-   auto pQR = g_framework.getCharaDb().query( "SELECT id, target_zone_id, pos_x, pos_y, pos_z, pos_o, radius FROM zonepositions;" );
+   auto pDb = g_fw.get< Db::DbWorkerPool< Db::CharaDbConnection > >();
+   auto pQR = pDb->query( "SELECT id, target_zone_id, pos_x, pos_y, pos_z, pos_o, radius FROM zonepositions;" );
 
    while( pQR->next() )
    {
@@ -308,9 +316,10 @@ bool Core::TerritoryMgr::movePlayer( uint32_t territoryId, Core::Entity::PlayerP
 
 bool Core::TerritoryMgr::movePlayer( ZonePtr pZone, Core::Entity::PlayerPtr pPlayer )
 {
+   auto pLog = g_fw.get< Logger >();
    if( !pZone  )
    {
-      g_framework.getLogger().error( "Zone not found on this server." );
+      pLog->error( "Zone not found on this server." );
       return false;
    }
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index b858811e..85c8db59 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -39,7 +39,7 @@ using namespace Core::Common;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Framework g_framework;
+extern Core::Framework g_fw;
 
 
 /**
@@ -60,6 +60,7 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
    m_currentWeather( Weather::FairSkies ),
    m_nextEObjId( 0x400D0000 )
 {
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
    m_guId = guId;
 
    m_territoryId = territoryId;
@@ -68,7 +69,7 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
    m_lastMobUpdate = 0;
 
    m_weatherOverride = Weather::None;
-   m_territoryTypeInfo = g_framework.getExdDataGen().get< Core::Data::TerritoryType >( territoryId );
+   m_territoryTypeInfo = pExdData->get< Core::Data::TerritoryType >( territoryId );
 
    loadWeatherRates();
 
@@ -78,17 +79,15 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
 void Core::Zone::loadWeatherRates()
 {
    if( !m_territoryTypeInfo )
-   {
-      g_framework.getLogger().error( std::string( __FUNCTION__ ) + " TerritoryTypeInfo not loaded!" );
       return;
-   }
 
+   auto pExdData = g_fw.get< Data::ExdDataGenerated >();
 
-   uint8_t weatherRateId = m_territoryTypeInfo->weatherRate > g_framework.getExdDataGen().getWeatherRateIdList().size() ?
+   uint8_t weatherRateId = m_territoryTypeInfo->weatherRate > pExdData->getWeatherRateIdList().size() ?
                            uint8_t{ 0 } : m_territoryTypeInfo->weatherRate;
 
    uint8_t sumPc = 0;
-   auto weatherRateFields = g_framework.getExdDataGen().m_WeatherRateDat.get_row( weatherRateId );
+   auto weatherRateFields = pExdData->m_WeatherRateDat.get_row( weatherRateId );
    for( size_t i = 0; i < 16; )
    {
       int32_t weatherId = boost::get< int32_t >( weatherRateFields[i] );
@@ -108,8 +107,9 @@ Core::Zone::~Zone()
 
 bool Core::Zone::init()
 {
+   auto pScriptMgr = g_fw.get< Scripting::ScriptMgr >();
 
-   if( g_framework.getScriptMgr().onZoneInit( shared_from_this() ) )
+   if( pScriptMgr->onZoneInit( shared_from_this() ) )
    {
       // all good
    }
@@ -214,7 +214,8 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor )
    {
       auto pPlayer = pActor->getAsPlayer();
 
-      auto pSession = g_framework.getServerZone().getSession( pPlayer->getId() );
+      auto pServerZone = g_fw.get< ServerZone >();
+      auto pSession = pServerZone->getSession( pPlayer->getId() );
       if( pSession )
          m_sessionSet.insert( pSession );
       m_playerMap[pPlayer->getId()] = pPlayer;
@@ -257,9 +258,11 @@ void Core::Zone::removeActor( Entity::ActorPtr pActor )
 
 void Core::Zone::queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t range, GamePacketPtr pPacketEntry )
 {
-   if( g_framework.getTerritoryMgr().isPrivateTerritory( getTerritoryId() ) )
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
+   if( pTeriMgr->isPrivateTerritory( getTerritoryId() ) )
       return;
 
+   auto pServerZone = g_fw.get< ServerZone >();
    for( auto entry : m_playerMap )
    {
       auto player = entry.second;
@@ -273,7 +276,7 @@ void Core::Zone::queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t
       if( ( distance < range ) && sourcePlayer.getId() != player->getId() )
       {
 
-         auto pSession = g_framework.getServerZone().getSession( player->getId() );
+         auto pSession = pServerZone->getSession( player->getId() );
          pPacketEntry->setValAt< uint32_t >( 0x08, player->getId() );
          if( pSession )
             pSession->getZoneConnection()->queueOutPacket( pPacketEntry );
@@ -313,9 +316,6 @@ bool Core::Zone::checkWeather()
       if( m_weatherOverride != m_currentWeather )
       {
          m_currentWeather = m_weatherOverride;
-         g_framework.getLogger().debug( "[Zone:" + m_internalName + "] overriding weather to : " +
-                                        std::to_string(  static_cast< uint8_t >( m_weatherOverride ) ) );
-
          return true;
       }
    }
@@ -325,9 +325,6 @@ bool Core::Zone::checkWeather()
       if( nextWeather != m_currentWeather )
       {
          m_currentWeather = nextWeather;
-
-         g_framework.getLogger().debug( "[Zone:" + m_internalName + "] changing weather to : " +
-                                        std::to_string( static_cast< uint8_t >( nextWeather ) ) );
          return true;
       }
    }
@@ -588,8 +585,9 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
    if( pCell == nullptr )
       return;
 
+   auto pTeriMgr = g_fw.get< TerritoryMgr >();
    // TODO: make sure gms can overwrite this. Potentially temporary solution
-   if( g_framework.getTerritoryMgr().isPrivateTerritory( getTerritoryId() ) )
+   if( pTeriMgr->isPrivateTerritory( getTerritoryId() ) )
       return;
 
    auto iter = pCell->m_actors.begin();
@@ -637,13 +635,15 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
 
 void Core::Zone::onPlayerZoneIn( Entity::Player &player )
 {
-   g_framework.getLogger().debug( "Zone::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "Zone::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
                                                 + ", Entity#" + std::to_string( player.getId() ) );
 }
 
 void Core::Zone::onLeaveTerritory( Entity::Player& player )
 {
-   g_framework.getLogger().debug( "Zone::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
+   auto pLog = g_fw.get< Logger >();
+   pLog->debug( "Zone::onLeaveTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
                                                 + ", Entity#" + std::to_string( player.getId() ) );
 }
 
@@ -671,7 +671,7 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object )
 {
    if( !object )
       return;
-
+   auto pLog = g_fw.get< Logger >();
    object->setId( getNextEObjId() );
    pushActor( object );
 
@@ -679,7 +679,7 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object )
 
    onRegisterEObj( object );
 
-   g_framework.getLogger().debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
+   pLog->debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
 }
 
 Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId )
diff --git a/src/servers/sapphire_zone/mainGameServer.cpp b/src/servers/sapphire_zone/mainGameServer.cpp
index 144bc74c..b083b3b4 100644
--- a/src/servers/sapphire_zone/mainGameServer.cpp
+++ b/src/servers/sapphire_zone/mainGameServer.cpp
@@ -11,6 +11,7 @@
 #include <Database/DbWorkerPool.h>
 #include "Linkshell/LinkshellMgr.h"
 #include "Zone/TerritoryMgr.h"
+#include "DebugCommand/DebugCommandHandler.h"
 
 Core::Framework g_fw;
 
@@ -26,6 +27,7 @@ bool setupFramework()
    auto pDb = boost::make_shared< Db::DbWorkerPool< Db::CharaDbConnection > >();
    auto pLsMgr = boost::make_shared< LinkshellMgr >();
    auto pTeriMgr = boost::make_shared< TerritoryMgr >();
+   auto pDebugCom = boost::make_shared< DebugCommandHandler >();
 
    pLogger->setLogPath( "log/SapphireZone_" );
    pLogger->init();
@@ -38,6 +40,7 @@ bool setupFramework()
    g_fw.set< Db::DbWorkerPool< Db::CharaDbConnection > >( pDb );
    g_fw.set< LinkshellMgr >( pLsMgr );
    g_fw.set< TerritoryMgr >( pTeriMgr );
+   g_fw.set< DebugCommandHandler >( pDebugCom );
 
    // actuall catch errors here...
    return true;
@@ -51,4 +54,4 @@ int main( int32_t argc, char* argv[] )
 
    g_fw.get< ServerZone >()->run( argc, argv );
    return 0;
-}
\ No newline at end of file
+}