From e8ab570502fe96e48978ff32d02e5d5e8ed96b1a Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 14 Feb 2018 20:44:35 +0100
Subject: [PATCH 01/69] refactoring of session update loop in zone

---
 src/servers/sapphire_zone/Zone/Zone.cpp | 28 ++++++++++++++-----------
 src/servers/sapphire_zone/Zone/Zone.h   |  2 ++
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 4f24f064..eee90859 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -481,8 +481,18 @@ bool Core::Zone::update( uint32_t currTime )
 {
    int64_t tickCount = Util::getTimeMs();
 
+   //TODO: this should be moved to a updateWeather call and pulled out of updateSessions
    bool changedWeather = checkWeather();
 
+   updateSessions( changedWeather );
+   updateBnpcs( tickCount );
+   onUpdate( currTime );
+
+   return true;
+}
+
+void Core::Zone::updateSessions( bool changedWeather )
+{
    auto it = m_sessionSet.begin();
 
    // update sessions in this zone
@@ -493,24 +503,24 @@ bool Core::Zone::update( uint32_t currTime )
 
       if( !pSession )
       {
-         it = m_sessionSet.erase( it );
+         it = m_sessionSet.erase(it );
          continue;
       }
 
       // this session is not linked to this area anymore, remove it from zone session list
-      if( ( !pSession->getPlayer()->getCurrentZone() )
-          || ( pSession->getPlayer()->getCurrentZone() != shared_from_this() ) )
+      if( ( !pSession->getPlayer()->getCurrentZone() ) ||
+          ( pSession->getPlayer()->getCurrentZone() != shared_from_this() ) )
       {
          if( pSession->getPlayer()->getCell() )
-            removeActor( pSession->getPlayer() );
+            removeActor(pSession->getPlayer() );
 
-         it = m_sessionSet.erase( it );
+         it = m_sessionSet.erase(it );
          continue;
       }
 
       if( changedWeather )
       {
-         Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcWeatherChange  >
+         Core::Network::Packets::ZoneChannelPacket< Core::Network::Packets::Server::FFXIVIpcWeatherChange  >
                  weatherChangePacket( pSession->getPlayer()->getId() );
          weatherChangePacket.data().weatherId = m_currentWeather;
          weatherChangePacket.data().delay = 5.0f;
@@ -521,12 +531,6 @@ bool Core::Zone::update( uint32_t currTime )
       pSession->update();
       ++it;
    }
-
-   updateBnpcs( tickCount );
-
-   onUpdate( currTime );
-
-   return true;
 }
 
 bool Core::Zone::isCellActive( uint32_t x, uint32_t y )
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index dedf6e3a..a9b09ecc 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -111,6 +111,8 @@ public:
 
    bool update( uint32_t currTime );
 
+   void updateSessions( bool changedWeather );
+
    void registerInstanceObj( Entity::InstanceObjectPtr object );
    Entity::InstanceObjectPtr getInstanceObject( uint32_t objId );
    void updateInstanceObj( Entity::InstanceObjectPtr object );

From ddb424758872ad8c226f71aa38f2f230c8349879 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 14 Feb 2018 21:11:23 +0100
Subject: [PATCH 02/69] More zone refactoring, general style fixes

---
 src/common/CommonGen.h                        |  1 +
 .../Network/Handlers/GMCommandHandlers.cpp    | 48 +++++++++----------
 src/servers/sapphire_zone/Zone/Zone.cpp       | 47 +++++++++++-------
 src/servers/sapphire_zone/Zone/Zone.h         | 11 +++--
 4 files changed, 61 insertions(+), 46 deletions(-)

diff --git a/src/common/CommonGen.h b/src/common/CommonGen.h
index e0005ada..5e9bf149 100644
--- a/src/common/CommonGen.h
+++ b/src/common/CommonGen.h
@@ -463,6 +463,7 @@ namespace Common {
    //Weather.exd
    enum class Weather : uint8_t
    {
+      None = 0,
       ClearSkies = 1,
       FairSkies = 2,
       Clouds = 3,
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 9ba5c2b9..865ffdc1 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -139,7 +139,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       player.sendNotice( "Race for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
       auto inRange = targetPlayer->getInRangeActors();
-      for ( auto actor : inRange )
+      for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
          targetPlayer->spawn( actor->getAsPlayer() );
@@ -152,7 +152,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       player.sendNotice( "Tribe for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
       auto inRange = targetPlayer->getInRangeActors();
-      for ( auto actor : inRange )
+      for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
          targetPlayer->spawn( actor->getAsPlayer() );
@@ -165,7 +165,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       player.sendNotice( "Sex for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
       auto inRange = targetActor->getInRangeActors();
-      for ( auto actor : inRange )
+      for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
          targetPlayer->spawn( actor->getAsPlayer() );
@@ -180,14 +180,14 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Weather:
    {
-      targetPlayer->getCurrentZone()->setWeatherOverride( param1 );
+      targetPlayer->getCurrentZone()->setWeatherOverride( static_cast< Common::Weather >( param1 ) );
       player.sendNotice( "Weather in Zone \"" + targetPlayer->getCurrentZone()->getName() + "\" of " +
          targetPlayer->getName() + " set in range." );
       break;
    }
    case GmCommand::Call:
    {
-      if ( targetPlayer->getZoneId() != player.getZoneId() )
+      if( targetPlayer->getZoneId() != player.getZoneId() )
          targetPlayer->setZone( player.getZoneId() );
 
       targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z,
@@ -266,7 +266,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Inv:
    {
-      if ( targetActor->getInvincibilityType() == Common::InvincibilityType::InvincibilityRefill )
+      if( targetActor->getInvincibilityType() == Common::InvincibilityType::InvincibilityRefill )
          targetActor->setInvincibilityType( Common::InvincibilityType::InvincibilityNone );
       else
          targetActor->setInvincibilityType( Common::InvincibilityType::InvincibilityRefill );
@@ -277,11 +277,11 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Orchestrion:
    {
-      if ( param1 == 1 )
+      if( param1 == 1 )
       {
-         if ( param2 == 0 )
+         if( param2 == 0 )
          {
-            for ( uint8_t i = 0; i < 255; i++ )
+            for( uint8_t i = 0; i < 255; i++ )
                targetActor->getAsPlayer()->learnSong( i, 0 );
 
             player.sendNotice( "All Songs for " + targetPlayer->getName() +
@@ -324,7 +324,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    {
       uint32_t gil = targetPlayer->getCurrency( 1 );
 
-      if ( gil < param1 )
+      if( gil < param1 )
       {
          player.sendUrgent( "Player does not have enough Gil(" + std::to_string( gil ) + ")" );
       }
@@ -379,11 +379,11 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Aetheryte:
    {
-      if ( param1 == 0 )
+      if( param1 == 0 )
       {
-         if ( param2 == 0 )
+         if( param2 == 0 )
          {
-            for ( uint8_t i = 0; i < 255; i++ )
+            for( uint8_t i = 0; i < 255; i++ )
                targetActor->getAsPlayer()->registerAetheryte( i );
 
             player.sendNotice( "All Aetherytes for " + targetPlayer->getName() +
@@ -427,23 +427,23 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::TeriInfo:
    {
+      auto pCurrentZone = player.getCurrentZone();
       player.sendNotice( "ZoneId: " + std::to_string( player.getZoneId() ) + "\nName: " +
-                         player.getCurrentZone()->getName() + "\nInternalName: " +
-                         player.getCurrentZone()->getInternalName() + "\nPopCount: " +
-                         std::to_string( player.getCurrentZone()->getPopCount() ) +
-                         "\nCurrentWeather:" + std::to_string( player.getCurrentZone()->getCurrentWeather() ) +
-                         "\nNextWeather:" + std::to_string( player.getCurrentZone()->getNextWeather() ) );
+                         pCurrentZone->getName() + "\nInternalName: " +
+                         pCurrentZone->getInternalName() + "\nPopCount: " +
+                         std::to_string( pCurrentZone->getPopCount() ) +
+                         "\nCurrentWeather:" + std::to_string( static_cast< uint8_t >( pCurrentZone->getCurrentWeather() ) ) +
+                         "\nNextWeather:" + std::to_string( static_cast< uint8_t >( pCurrentZone->getNextWeather() ) ) );
       break;
    }
    case GmCommand::Jump:
    {
 
       auto inRange = player.getInRangeActors();
-      for( auto actor : inRange )
-      {
-         player.changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
-                                targetActor->getRotation() );
-      }
+
+      player.changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
+                             targetActor->getRotation() );
+
       player.sendNotice( "Jumping to " + targetPlayer->getName() + " in range." );
       break;
    }
@@ -517,7 +517,7 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Call:
    {
-      if ( targetPlayer->getZoneId() != player.getZoneId() )
+      if( targetPlayer->getZoneId() != player.getZoneId() )
          targetPlayer->setZone( player.getZoneId() );
 
       targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z,
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index eee90859..30d7e399 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -44,15 +44,15 @@ extern Core::TerritoryMgr g_territoryMgr;
 Core::Zone::Zone() :
    m_territoryId( 0 ),
    m_guId( 0 ),
-   m_currentWeather( static_cast< uint8_t >( Common::Weather::FairSkies ) ),
-   m_weatherOverride( 0 ),
+   m_currentWeather( Common::Weather::FairSkies ),
+   m_weatherOverride( Common::Weather::None ),
    m_lastMobUpdate( 0 ),
    m_currentFestivalId( 0 )
 {
 }
 
 Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& internalName, const std::string& placeName ) :
-   m_currentWeather( static_cast< uint8_t >( Common::Weather::FairSkies ) )
+   m_currentWeather( Common::Weather::FairSkies )
 {
    m_guId = guId;
 
@@ -61,9 +61,22 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
    m_placeName = placeName;
    m_lastMobUpdate = 0;
 
-   m_weatherOverride = 0;
+   m_weatherOverride = Common::Weather::None;
    m_territoryTypeInfo = g_exdDataGen.get< Core::Data::TerritoryType >( territoryId );
 
+   loadWeatherRates();
+
+   m_currentWeather = getNextWeather();
+}
+
+void Core::Zone::loadWeatherRates()
+{
+   if( !m_territoryTypeInfo )
+   {
+      g_log.error( std::string( __FUNCTION__ ) + " TerritoryTypeInfo not loaded!" );
+      return;
+   }
+
    uint8_t weatherRateId = m_territoryTypeInfo->weatherRate > g_exdDataGen.getWeatherRateIdList().size() ?
                            uint8_t{ 0 } : m_territoryTypeInfo->weatherRate;
 
@@ -80,8 +93,6 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
       m_weatherRateMap[sumPc] = weatherId;
       i += 2;
    }
-
-   m_currentWeather = getNextWeather();
 }
 
 Core::Zone::~Zone()
@@ -102,12 +113,12 @@ bool Core::Zone::init()
    return true;
 }
 
-void Core::Zone::setWeatherOverride( uint8_t weather )
+void Core::Zone::setWeatherOverride( Common::Weather weather )
 {
    m_weatherOverride = weather;
 }
 
-uint8_t Core::Zone::getCurrentWeather() const
+Core::Common::Weather Core::Zone::getCurrentWeather() const
 {
    return m_currentWeather;
 }
@@ -227,7 +238,7 @@ void Core::Zone::loadCellCache()
 
 }
 
-uint8_t Core::Zone::getNextWeather()
+Core::Common::Weather Core::Zone::getNextWeather()
 {
    uint32_t unixTime = static_cast< uint32_t >( Util::getTimeSeconds() );
    // Get Eorzea hour for weather start
@@ -248,13 +259,13 @@ uint8_t Core::Zone::getNextWeather()
    for( auto entry : m_weatherRateMap )
    {
       uint8_t sRate = entry.first;
-      auto weatherId = static_cast< uint8_t >( entry.second );
+      auto weatherId = static_cast< Common::Weather >( entry.second );
 
       if( rate <= sRate )
          return weatherId;
    }
 
-   return 1;
+   return Common::Weather::FairSkies;
 }
 
 void Core::Zone::pushActor( Entity::ActorPtr pActor )
@@ -407,22 +418,24 @@ std::size_t Core::Zone::getPopCount() const
 
 bool Core::Zone::checkWeather()
 {
-   if ( m_weatherOverride != 0 )
+   if( m_weatherOverride != Common::Weather::None )
    {
-      if ( m_weatherOverride != m_currentWeather )
+      if( m_weatherOverride != m_currentWeather )
       {
          m_currentWeather = m_weatherOverride;
-         g_log.debug( "[Zone:" + m_internalName + "] overriding weather to : " + std::to_string( m_weatherOverride ) );
+         g_log.debug( "[Zone:" + m_internalName + "] overriding weather to : " +
+                      std::to_string( static_cast< uint8_t >( m_weatherOverride ) ) );
          return true;
       }
    }
    else
    {
       auto nextWeather = getNextWeather();
-      if ( nextWeather != m_currentWeather )
+      if( nextWeather != m_currentWeather )
       {
          m_currentWeather = nextWeather;
-         g_log.debug( "[Zone:" + m_internalName + "] changing weather to : " + std::to_string( nextWeather ) );
+         g_log.debug( "[Zone:" + m_internalName + "] changing weather to : " +
+                      std::to_string( static_cast< uint8_t >( nextWeather ) ) );
          return true;
       }
    }
@@ -522,7 +535,7 @@ void Core::Zone::updateSessions( bool changedWeather )
       {
          Core::Network::Packets::ZoneChannelPacket< Core::Network::Packets::Server::FFXIVIpcWeatherChange  >
                  weatherChangePacket( pSession->getPlayer()->getId() );
-         weatherChangePacket.data().weatherId = m_currentWeather;
+         weatherChangePacket.data().weatherId = static_cast< uint8_t >( m_currentWeather );
          weatherChangePacket.data().delay = 5.0f;
          pSession->getPlayer()->queuePacket( weatherChangePacket );
       }
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index a9b09ecc..3a84eaee 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -44,8 +44,8 @@ protected:
 
    CellCache** m_pCellCache[_sizeX];
 
-   uint8_t m_currentWeather;
-   uint8_t m_weatherOverride;
+   Common::Weather m_currentWeather;
+   Common::Weather m_weatherOverride;
 
    uint64_t m_lastMobUpdate;
 
@@ -65,9 +65,9 @@ public:
    bool init();
 
    /*! overrides the zone's weather, set to 0 to unlock */
-   void setWeatherOverride( uint8_t weather );
+   void setWeatherOverride( Common::Weather weather );
 
-   uint8_t getCurrentWeather() const;
+   Common::Weather getCurrentWeather() const;
 
    uint16_t getCurrentFestival() const;
    void setCurrentFestival( uint16_t festivalId );
@@ -84,7 +84,7 @@ public:
    virtual void onLeaveTerritory( Entity::Player& player );
    virtual void onUpdate( uint32_t currTime );
 
-   uint8_t getNextWeather();
+   Common::Weather getNextWeather();
 
    void pushActor( Entity::ActorPtr pActor );
 
@@ -106,6 +106,7 @@ public:
    const std::string& getInternalName() const;
 
    std::size_t getPopCount() const;
+   void loadWeatherRates();
    bool checkWeather();
    void updateBnpcs( int64_t tickCount );
 

From cb441475647251b7e140f437fabd6c26baa10166 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Thu, 15 Feb 2018 19:27:44 +1100
Subject: [PATCH 03/69] fix compile warning

---
 src/servers/sapphire_zone/Actor/PlayerSql.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index b3b63f1f..8e72f3cd 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -313,7 +313,8 @@ bool Core::Entity::Player::loadSearchInfo()
 
    m_searchSelectClass = res->getUInt8( 1 );
    m_searchSelectRegion = res->getUInt8( 2 );
-   sprintf( m_searchMessage, res->getString( 3 ).c_str() );
+   auto searchMessage = res->getString( 3 );
+   std::copy( searchMessage.begin(), searchMessage.end(), m_searchMessage );
 
    return true;
 }

From 48a1fd502a05a6f2eb60b952987bbd647679d4c6 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Thu, 15 Feb 2018 19:44:54 +1100
Subject: [PATCH 04/69] add todo note

---
 src/servers/sapphire_zone/Actor/PlayerSql.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index 8e72f3cd..b1522720 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -313,6 +313,8 @@ bool Core::Entity::Player::loadSearchInfo()
 
    m_searchSelectClass = res->getUInt8( 1 );
    m_searchSelectRegion = res->getUInt8( 2 );
+
+   // todo: internally use an std::string instead of a char[]
    auto searchMessage = res->getString( 3 );
    std::copy( searchMessage.begin(), searchMessage.end(), m_searchMessage );
 

From b8cbdf3fa5fc476d021940450a95644a507a6fe7 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 15 Feb 2018 23:50:28 +0100
Subject: [PATCH 05/69] removed all unused state flags, mapped more client
 actions

---
 src/common/Common.h                           | 70 +++----------------
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  6 +-
 .../sapphire_zone/Action/ActionCast.cpp       |  2 +-
 .../sapphire_zone/Action/ActionMount.cpp      |  2 +-
 .../sapphire_zone/Action/EventAction.cpp      |  8 +--
 src/servers/sapphire_zone/Actor/Player.cpp    |  2 +-
 src/servers/sapphire_zone/Actor/Player.h      |  2 +-
 .../sapphire_zone/Actor/PlayerEvent.cpp       |  5 +-
 .../Network/Handlers/ActionHandler.cpp        | 25 ++++++-
 .../Network/Handlers/PacketHandlers.cpp       |  6 +-
 .../PacketWrappers/PlayerStateFlagsPacket.h   |  6 +-
 11 files changed, 48 insertions(+), 86 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 15fb9800..2a62c6ef 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -380,73 +380,21 @@ namespace Common {
       InvincibilityStayAlive,
    };
 
-   enum struct PlayerStateFlag : uint8_t
+   enum PlayerStateFlag : uint8_t
    {
-      NoCombat,
-      Combat,
-      Casting,
-      StatusAffliction,
-      StatusAffliction1,
-      Occupied,
-      Occupied1,
-      Occupied2,
-      Occupied3,
+      HideUILockChar = 0, // as the name suggests, hides the ui and logs the char...
+      InCombat = 1, // in Combat, locks gearchange/return/teleport
+      Casting = 2,
+      InNpcEvent = 7, // when talking to an npc, locks ui giving "occupied" message
 
-      BoundByDuty,
-      Occupied4,
-      DuelingArea,
-      TradeOpen,
-      Occupied5,
-      HandlingItems,
-      Crafting,
-      PreparingToCraft,
-      Gathering,
-      Fishing,
+      InNpcEvent1 = 10, // Sent together with InNpcEvent, when waiting for input? just a guess...
 
-      BeingRaised,
-      BetweenAreas,
-      Stealthed,
-      InnRoom,
-      Jumping,
-      AutoRun,
-      Occupied6,
-      BetweenAreas1,
-      SystemError,
-      LoggingOut,
+      BoundByDuty = 11,
 
-      InvalidLocation,
-      WaitingForDuty,
-      BoundByDuty1,
-      Mounting,
-      WatchingCutscene,
-      WaitingForDutyFinder,
-      CreatingCharacter,
-      Jumping1,
-      PvpDisplay,
-      StatusAfflication2,
+      BetweenAreas = 24,
 
-      Mounting1,
-      CarryingItem,
-      UsingPartyFinder,
-      HousingFunctions,
-      Transformed,
-      FreeTrail,
-      BeingMoved,
-      Mounting2,
-      StatusAffliction3,
-      StatusAffliction4,
+      WatchingCutscene = 50, // this is actually just a dummy, this id is different
 
-      RegisteringRaceOrMatch,
-      WaitingForRaceOrMatch,
-      WaitingForTripleTriadMatch,
-      InFlight,
-      WatchingCutscene1,
-      DeepDungeon,
-      Swimming,
-      Diving,
-      RegisteringTripleTriad,
-      WaitingTripleTriad,
-      InCrossWorldParty
 
    };
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index aba88ad3..d63dc394 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -826,10 +826,8 @@ struct FFXIVIpcActorOwner : FFXIVIpcBasePacket<ActorOwner>
 */
 struct FFXIVIpcPlayerStateFlags : FFXIVIpcBasePacket<PlayerStateFlags>
 {
-   uint8_t flags[7];
-   uint8_t padding1[3];
-   uint32_t padding2;
-   uint16_t padding;
+   uint8_t flags[12];
+   uint32_t padding;
 };
 
 /**
diff --git a/src/servers/sapphire_zone/Action/ActionCast.cpp b/src/servers/sapphire_zone/Action/ActionCast.cpp
index ee75c48b..00e0e966 100644
--- a/src/servers/sapphire_zone/Action/ActionCast.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCast.cpp
@@ -83,7 +83,7 @@ void Core::Action::ActionCast::onInterrupt()
    if( !m_pSource )
       return;
 
-   m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 );
+   //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 );
    m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Casting );
 
    auto control = ActorControlPacket142( m_pSource->getId(), ActorControlType::CastInterrupt,
diff --git a/src/servers/sapphire_zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp
index 13dcc05d..9ec4588e 100644
--- a/src/servers/sapphire_zone/Action/ActionMount.cpp
+++ b/src/servers/sapphire_zone/Action/ActionMount.cpp
@@ -94,7 +94,7 @@ void Core::Action::ActionMount::onInterrupt()
    if( !m_pSource )
       return;
 
-   m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 );
+   //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 );
    m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Casting );
 
    auto control = ActorControlPacket142( m_pSource->getId(), ActorControlType::CastInterrupt,
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
index 9c08f3a7..47b9895f 100644
--- a/src/servers/sapphire_zone/Action/EventAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventAction.cpp
@@ -53,7 +53,7 @@ void Core::Action::EventAction::onStart()
    if( m_pSource->isPlayer() )
    {
       m_pSource->sendToInRangeSet( control, true );
-      m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::Occupied2 );
+      //m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::Occupied2 );
    }
    else
       m_pSource->sendToInRangeSet( control );
@@ -82,7 +82,7 @@ void Core::Action::EventAction::onFinish()
 
       if( m_pSource->isPlayer() )
       {
-         m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied2 );
+         //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied2 );
          m_pSource->sendToInRangeSet( control, true );
       }
       else
@@ -110,8 +110,8 @@ void Core::Action::EventAction::onInterrupt()
       {
          auto control1 = ActorControlPacket143( m_pSource->getId(), ActorControlType::FreeEventPos, m_eventId );
 
-         m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::NoCombat );
-         m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 );
+         //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::NoCombat );
+         //m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::Occupied1 );
          m_pSource->sendToInRangeSet( control );
          m_pSource->sendToInRangeSet( control1 );
 
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 3b0afa41..2cbcfe09 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -177,7 +177,7 @@ Core::Common::OnlineStatus Core::Entity::Player::getOnlineStatus()
    if( m_onlineStatus & rpMask )
       status = OnlineStatus::Roleplaying;
 
-   if( hasStateFlag( PlayerStateFlag::WatchingCutscene ) || hasStateFlag( PlayerStateFlag::WatchingCutscene1 ) )
+   if( hasStateFlag( PlayerStateFlag::WatchingCutscene ) )
       status = OnlineStatus::ViewingCutscene;
 
    // TODO: add all the logic for returning the proper online status, there probably is a better way for this alltogether
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 712aa1c2..22a474fa 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -637,7 +637,7 @@ private:
    boost::shared_ptr< Common::QuestActive > m_activeQuests[30];
    int16_t m_questTracking[5];
 
-   uint8_t m_stateFlags[7];
+   uint8_t m_stateFlags[12];
    uint8_t m_gmRank;
    uint16_t zoneId;
 
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index 7189b106..aeeb5ad9 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -84,7 +84,7 @@ void Core::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId,
 
    addEvent( newEvent );
 
-   setStateFlag( PlayerStateFlag::Occupied2 );
+   setStateFlag( PlayerStateFlag::InNpcEvent );
 
    EventStartPacket eventStart( getId(), actorId, eventId, eventType, eventParam1, eventParam2 );
    
@@ -218,7 +218,7 @@ void Core::Entity::Player::eventFinish( uint32_t eventId, uint32_t freePlayer )
    removeEvent( pEvent->getId() );
 
    if( freePlayer == 1 )
-      unsetStateFlag( PlayerStateFlag::Occupied2 );
+      unsetStateFlag( PlayerStateFlag::InNpcEvent );
 }
 
 void Core::Entity::Player::eventActionStart( uint32_t eventId,
@@ -290,7 +290,6 @@ void Core::Entity::Player::onDeath()
 
 }
 
-
 // TODO: slightly ugly here and way too static. Needs too be done properly
 void Core::Entity::Player::onTick()
 {
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index d79c8001..d709f552 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -117,6 +117,10 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
                player.getCurrentAction()->setInterrupted();
            break;
         }
+        case 0x12D: // Mark player
+        {
+           break;
+        }
         case 0x12E: // Set player title
         {
            player.setTitle( static_cast< uint16_t >( param1 ) );
@@ -132,7 +136,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
         }
         case 0x133: // Update howtos seen
         {
-            uint32_t howToId = static_cast< uint32_t >( param1 );
+            uint32_t howToId = param11;
             player.updateHowtosSeen( howToId );
             break;
         }
@@ -144,7 +148,23 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
             player.sendToInRangeSet( ActorControlPacket144( player.getId(), Emote, emoteId, 0, 0, 0, targetId ) );
             break;
         }
-        case 0xC8: // return dead
+        case 0x1F7: // cancel persistant emote
+        {
+            break;
+        }
+        case 0x1F9: // change pose
+        {
+            break;
+        }
+        case 0x1FA: // reapply pose
+        {
+            break;
+        }
+        case 0x1FB: // cancel pose
+        {
+            break;
+        }
+        case 0xC8: // return dead / accept raise
         {
            switch ( static_cast < ResurrectType >( param1 ) )
            {
@@ -193,7 +213,6 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
             player.setZoningType( Common::ZoneingType::None );
 
             player.unsetStateFlag( PlayerStateFlag::BetweenAreas );
-            player.unsetStateFlag( PlayerStateFlag::BetweenAreas1 );
             break;
         }
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 8e5d27d5..c6232a22 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -564,16 +564,14 @@ void Core::Network::GameConnection::tellHandler( const Packets::GamePacket& inPa
 
    auto pTargetPlayer = pSession->getPlayer();
 
-   if( pTargetPlayer->hasStateFlag( PlayerStateFlag::BetweenAreas ) ||
-       pTargetPlayer->hasStateFlag( PlayerStateFlag::BetweenAreas1 ) )
+   if( pTargetPlayer->hasStateFlag( PlayerStateFlag::BetweenAreas ) )
    {
       // send error for player between areas
       // TODO: implement me
       return;
    }
 
-   if( pTargetPlayer->hasStateFlag( PlayerStateFlag::BoundByDuty ) ||
-       pTargetPlayer->hasStateFlag( PlayerStateFlag::BoundByDuty1 ) )
+   if( pTargetPlayer->hasStateFlag( PlayerStateFlag::BoundByDuty ) )
    {
       // send error for player bound by duty
       // TODO: implement me
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
index 920a4a80..ac1bf5a5 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerStateFlagsPacket.h
@@ -26,8 +26,8 @@ public:
    PlayerStateFlagsPacket( Entity::Player& player, std::vector< Common::PlayerStateFlag > flags ) :
       ZoneChannelPacket< FFXIVIpcPlayerStateFlags >( player.getId(), player.getId() )
    {
-      uint8_t newFlags[7];
-      memset( newFlags, 0, 7 );
+      uint8_t newFlags[12];
+      memset( newFlags, 0, 12 );
 
       for( auto& flag : flags )
       {
@@ -46,7 +46,7 @@ public:
 private:
    void initialize( const uint8_t* flags )
    {
-      memcpy( m_data.flags, flags, 7 );
+      memcpy( m_data.flags, flags, 12 );
    };
 };
 

From 1f37416202d7361e6b9d66087ec6e38a45777cd9 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 17 Feb 2018 01:20:40 +0100
Subject: [PATCH 06/69] Actionhandler cleaned up a bit

---
 src/servers/sapphire_zone/Actor/Player.cpp    | 23 ++++-
 src/servers/sapphire_zone/Actor/Player.h      |  3 +
 .../Network/Handlers/ActionHandler.cpp        | 96 ++++++++++++++-----
 3 files changed, 92 insertions(+), 30 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 2cbcfe09..18cec2d1 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -1357,6 +1357,11 @@ uint8_t* Core::Entity::Player::getTitleList()
    return m_titleList;
 }
 
+const uint8_t* Core::Entity::Player::getTitleList() const
+{
+   return m_titleList;
+}
+
 uint16_t Core::Entity::Player::getTitle() const
 {
    return m_activeTitle;
@@ -1541,17 +1546,17 @@ void Core::Entity::Player::setEorzeaTimeOffset( uint64_t timestamp )
    queuePacket( packet );
 }
 
-void Player::setTerritoryId( uint32_t territoryId )
+void Core::Entity::Player::setTerritoryId( uint32_t territoryId )
 {
    m_zoneId = territoryId;
 }
 
-uint32_t Player::getTerritoryId() const
+uint32_t Core::Entity::Player::getTerritoryId() const
 {
    return m_zoneId;
 }
 
-void Player::sendZonePackets()
+void Core::Entity::Player::sendZonePackets()
 {
    ZoneChannelPacket< FFXIVIpcInit > initPacket( getId() );
    initPacket.data().charId = getId();
@@ -1623,12 +1628,20 @@ void Player::sendZonePackets()
    m_bMarkedForZoning = false;
 }
 
-void Player::setDirectorInitialized( bool isInitialized )
+void Core::Entity::Player::setDirectorInitialized( bool isInitialized )
 {
    m_directorInitialized = isInitialized;
 }
 
-bool Player::isDirectorInitialized() const
+bool Core::Entity::Player::isDirectorInitialized() const
 {
    return m_directorInitialized;
 }
+
+void  Core::Entity::Player::sendTitleList()
+{
+   ZoneChannelPacket< FFXIVIpcPlayerTitleList > titleListPacket( getId() );
+   memcpy( titleListPacket.data().titleList, getTitleList(), sizeof( titleListPacket.data().titleList ) );
+
+   queuePacket( titleListPacket );
+}
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 22a474fa..65f7638e 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -347,12 +347,15 @@ public:
    void prepareZoning( uint16_t targetZone, bool fadeOut, uint8_t fadoutTime = 0, uint16_t animation = 0 );
    /*! get player's title list (available titles) */
    uint8_t* getTitleList();
+   const uint8_t* getTitleList() const;
    /*! get player's active title */
    uint16_t getTitle() const;
    /*! add title to player title list */
    void addTitle( uint16_t titleId );
    /*! change player's active title */
    void setTitle( uint16_t titleId );
+   /*! send the players title list */
+   void sendTitleList();
    /*! change gear param state */
    void setEquipDisplayFlags( uint8_t state );
    /*! get gear param state */
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index d709f552..e20a9784 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -43,6 +43,55 @@ using namespace Core::Common;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
+enum ClientTrigger
+{
+   ToggleSeathe = 0x01,
+   ToggleAutoAttack = 0x02,
+   ChangeTarget = 0x03,
+
+   Dismount = 0x65,
+
+   RemoveStatusEffect = 0x68,
+   CastCancel = 0x69,
+
+   Return = 0xC8, // return dead / accept raise
+   FinishZoning = 0xC9,
+   Teleport = 0xCA,
+
+   MarkPlayer = 0x12D, // Mark player, visible to party only
+   SetTitle = 0x12E,
+   TitleList = 0x12F,
+
+   UpdatedSeenHowTos = 0x133,
+   AllotAttribute = 0x135,
+
+   HuntingLogDetails = 0x194,
+
+   EstateTimers = 0x1AB,
+  
+   DyeItem = 0x1B5,
+
+   Emote = 0x1F4,
+   PersistantEmoteCancel = 0x1F7,
+   PoseChange = 0x1F9,
+   PoseReapply = 0x1FA,
+   PoseCancel = 0x1FB,
+
+   AchievementCrit = 0x202,
+   AchievementComp = 0x203,
+   AchievementCatChat = 0x206,
+  
+   AchievementCritReq = 0x3E8,
+   AchievementList = 0x3E9,
+   
+   DirectorInitFinish = 0x321,
+
+   CompanionAction = 0x6A4,
+   CompanionSetBarding = 0x6A5,
+   CompanionActionUnlock = 0x6A6,
+
+};
+
 void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& inPacket,
                                                    Entity::Player& player )
 {
@@ -65,7 +114,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
 
     switch( commandId )
     {
-        case 0x01:  // Toggle sheathe
+        case ClientTrigger::ToggleSeathe:  // Toggle sheathe
         {
             if ( param11 == 1 )
                 player.setStance( Entity::Actor::Stance::Active );
@@ -79,7 +128,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
 
             break;
         }
-        case 0x02:  // Toggle auto-attack
+        case ClientTrigger::ToggleAutoAttack:  // Toggle auto-attack
         {
             if ( param11 == 1 )
             {
@@ -93,78 +142,75 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
 
             break;
         }
-        case 0x03: // Change target
+        case ClientTrigger::ChangeTarget: // Change target
         {
 
             uint64_t targetId = inPacket.getValAt< uint64_t >( 0x24 );
             player.changeTarget( targetId );
             break;
         }
-        case 0x65:
+        case ClientTrigger::Dismount:
         {
            player.dismount();
            break;
         }
-        case 0x68: // Remove status (clicking it off)
+        case ClientTrigger::RemoveStatusEffect: // Remove status (clicking it off)
         {
            // todo: check if status can be removed by client from exd
            player.removeSingleStatusEffectById( static_cast< uint32_t >( param1 ) );
            break;
         }
-        case 0x69: // Cancel cast
+        case ClientTrigger::CastCancel: // Cancel cast
         {
            if( player.getCurrentAction() )
                player.getCurrentAction()->setInterrupted();
            break;
         }
-        case 0x12D: // Mark player
+        case ClientTrigger::MarkPlayer: // Mark player
         {
            break;
         }
-        case 0x12E: // Set player title
+        case ClientTrigger::SetTitle: // Set player title
         {
            player.setTitle( static_cast< uint16_t >( param1 ) );
            break;
         }
-        case 0x12F: // Get title list
+        case ClientTrigger::TitleList: // Get title list
         {
-           ZoneChannelPacket< FFXIVIpcPlayerTitleList > titleListPacket( player.getId() );
-           memcpy( titleListPacket.data().titleList, player.getTitleList(), sizeof( titleListPacket.data().titleList ) );
-
-           player.queuePacket( titleListPacket );
+           player.sendTitleList();
            break;
         }
-        case 0x133: // Update howtos seen
+        case ClientTrigger::UpdatedSeenHowTos: // Update howtos seen
         {
             uint32_t howToId = param11;
             player.updateHowtosSeen( howToId );
             break;
         }
-        case 0x1F4: // emote
+        case ClientTrigger::Emote: // emote
         {
             uint64_t targetId = player.getTargetId();
             uint32_t emoteId = inPacket.getValAt< uint32_t >( 0x24 );
 
-            player.sendToInRangeSet( ActorControlPacket144( player.getId(), Emote, emoteId, 0, 0, 0, targetId ) );
+            player.sendToInRangeSet( ActorControlPacket144( player.getId(), ActorControlType::Emote, emoteId, 0, 0, 0, targetId ) );
             break;
         }
-        case 0x1F7: // cancel persistant emote
+        case ClientTrigger::PersistantEmoteCancel: // cancel persistant emote
         {
             break;
         }
-        case 0x1F9: // change pose
+        case ClientTrigger::PoseChange: // change pose
         {
             break;
         }
-        case 0x1FA: // reapply pose
+        case ClientTrigger::PoseReapply: // reapply pose
         {
             break;
         }
-        case 0x1FB: // cancel pose
+        case ClientTrigger::PoseCancel: // cancel pose
         {
             break;
         }
-        case 0xC8: // return dead / accept raise
+        case ClientTrigger::Return: // return dead / accept raise
         {
            switch ( static_cast < ResurrectType >( param1 ) )
            {
@@ -180,7 +226,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
            }
             
         }
-        case 0xC9: // Finish zoning
+        case ClientTrigger::FinishZoning: // Finish zoning
         {
             switch( player.getZoningType() )
             {
@@ -216,7 +262,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
             break;
         }
 
-        case 0xCA: // Teleport
+        case ClientTrigger::Teleport: // Teleport
         {
             // TODO: only register this action if enough gil is in possession
             auto targetAetheryte = g_exdDataGen.get< Core::Data::Aetheryte >( param11 );
@@ -244,11 +290,11 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
             }
             break;
         }
-        case 0x1B5: // Dye item
+        case ClientTrigger::DyeItem: // Dye item
         {
            break;
         }
-        case 0x321: // Director init finish
+        case ClientTrigger::DirectorInitFinish: // Director init finish
         {
            player.getCurrentZone()->onInitDirector( player );
            break;

From 883916aa489151205bb7a9ff7dee0896e56169b3 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 18 Feb 2018 01:50:20 +0100
Subject: [PATCH 07/69] More cleanup of actionhandler

---
 src/servers/sapphire_zone/Actor/Player.cpp    | 85 +++++++++++++++++--
 src/servers/sapphire_zone/Actor/Player.h      |  6 ++
 .../Network/Handlers/ActionHandler.cpp        | 59 +------------
 3 files changed, 89 insertions(+), 61 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 18cec2d1..4c7c3df8 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -19,6 +19,7 @@
 #include "Network/GameConnection.h"
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlPacket144.h"
 #include "Network/PacketWrappers/InitUIPacket.h"
 #include "Network/PacketWrappers/ServerNoticePacket.h"
 #include "Network/PacketWrappers/ChatPacket.h"
@@ -36,6 +37,7 @@
 #include "Action/Action.h"
 #include "Action/EventAction.h"
 #include "Action/EventItemAction.h"
+#include "Action/ActionTeleport.h"
 #include "Zone/ZonePosition.h"
 #include "Math/CalcStats.h"
 #include "Math/CalcBattle.h"
@@ -299,7 +301,7 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
 
    setStateFlag( PlayerStateFlag::BetweenAreas );
 
-   auto z_pos = g_territoryMgr.getTerritoryPosition( data->territory );
+   auto targetPos = g_territoryMgr.getTerritoryPosition( data->territory );
 
    Common::FFXIVARR_POSITION3 pos;
    pos.x = 0;
@@ -307,10 +309,10 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
    pos.z = 0;
    float rot = 0;
 
-   if( z_pos != nullptr )
+   if( targetPos != nullptr )
    {
-      pos = z_pos->getTargetPosition();
-      rot = z_pos->getTargetRotation();
+      pos = targetPos->getTargetPosition();
+      rot = targetPos->getTargetRotation();
    }
 
    sendDebug( "Teleport: " + g_exdDataGen.get< Core::Data::PlaceName >( data->placeName )->name + " " +
@@ -1638,10 +1640,83 @@ bool Core::Entity::Player::isDirectorInitialized() const
    return m_directorInitialized;
 }
 
-void  Core::Entity::Player::sendTitleList()
+void Core::Entity::Player::sendTitleList()
 {
    ZoneChannelPacket< FFXIVIpcPlayerTitleList > titleListPacket( getId() );
    memcpy( titleListPacket.data().titleList, getTitleList(), sizeof( titleListPacket.data().titleList ) );
 
    queuePacket( titleListPacket );
 }
+
+void Core::Entity::Player::finishZoning()
+{
+   switch( getZoningType() )
+   {
+      case ZoneingType::None:
+         sendToInRangeSet( ActorControlPacket143( getId(), ZoneIn, 0x01 ), true );
+         break;
+
+      case ZoneingType::Teleport:
+         sendToInRangeSet( ActorControlPacket143( getId(), ZoneIn, 0x01, 0, 0, 110 ), true );
+         break;
+
+      case ZoneingType::Return:
+      case ZoneingType::ReturnDead:
+      {
+         if( getStatus() == Entity::Actor::ActorStatus::Dead )
+         {
+            resetHp();
+            resetMp();
+            setStatus( Entity::Actor::ActorStatus::Idle );
+
+            sendToInRangeSet( ActorControlPacket143( getId(), ZoneIn, 0x01, 0x01, 0, 111 ), true );
+            sendToInRangeSet( ActorControlPacket142( getId(), SetStatus,
+                                                     static_cast< uint8_t >( Entity::Actor::ActorStatus::Idle ) ), true );
+         }
+         else
+            sendToInRangeSet( ActorControlPacket143( getId(), ZoneIn, 0x01, 0x00, 0, 111 ), true );
+      }
+         break;
+
+      case ZoneingType::FadeIn:
+         break;
+   }
+
+   setZoningType( Common::ZoneingType::None );
+   unsetStateFlag( PlayerStateFlag::BetweenAreas );
+}
+
+void Player::emote( uint32_t emoteId, uint64_t targetId )
+{
+   sendToInRangeSet( ActorControlPacket144( getId(), ActorControlType::Emote, emoteId, 0, 0, 0, targetId ) );
+}
+
+void Player::teleportQuery( uint16_t aetheryteId )
+{
+   // TODO: only register this action if enough gil is in possession
+   auto targetAetheryte = g_exdDataGen.get< Core::Data::Aetheryte >( aetheryteId );
+
+   if( targetAetheryte )
+   {
+      auto fromAetheryte = g_exdDataGen.get< Core::Data::Aetheryte >(
+                                          g_exdDataGen.get< Core::Data::TerritoryType >( getZoneId() )->aetheryte );
+
+      // calculate cost - does not apply for favorite points or homepoints neither checks for aether tickets
+      auto cost = static_cast< uint16_t > ( ( sqrt( pow( fromAetheryte->aetherstreamX - targetAetheryte->aetherstreamX, 2 ) +
+                                                    pow( fromAetheryte->aetherstreamY - targetAetheryte->aetherstreamY, 2 ) ) / 2 ) + 100 );
+
+      // cap at 999 gil
+      cost = cost > uint16_t{999} ? uint16_t{999} : cost;
+
+      bool insufficientGil = getCurrency( Inventory::CurrencyType::Gil ) < cost;
+      // TODO: figure out what param1 really does
+      queuePacket( ActorControlPacket143( getId(), TeleportStart, insufficientGil ? 2 : 0, aetheryteId ) );
+
+      if( !insufficientGil )
+      {
+         Action::ActionPtr pActionTeleport;
+         pActionTeleport = Action::make_ActionTeleport( getAsPlayer(), aetheryteId, cost );
+         setCurrentAction( pActionTeleport );
+      }
+   }
+}
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 65f7638e..7fb80e58 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -343,6 +343,8 @@ public:
    uint64_t getOnlineStatusMask() const;
    /*! perform a teleport of a specified type ( teleport,return,aethernet ) */
    void teleport( uint16_t aetheryteId, uint8_t type = 1 );
+   /*! query teleport of a specified type */
+   void teleportQuery( uint16_t aetheryteId );
    /*! prepares zoning / fades out the screen */
    void prepareZoning( uint16_t targetZone, bool fadeOut, uint8_t fadoutTime = 0, uint16_t animation = 0 );
    /*! get player's title list (available titles) */
@@ -488,6 +490,10 @@ public:
    /*! return true if the player is marked for zoning */
    bool isMarkedForZoning() const;
 
+   void emote( uint32_t emoteId, uint64_t targetId );
+
+   void finishZoning();
+
    void sendZonePackets();
 
    Common::ZoneingType getZoningType() const;
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index e20a9784..b04e9074 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -191,7 +191,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
             uint64_t targetId = player.getTargetId();
             uint32_t emoteId = inPacket.getValAt< uint32_t >( 0x24 );
 
-            player.sendToInRangeSet( ActorControlPacket144( player.getId(), ActorControlType::Emote, emoteId, 0, 0, 0, targetId ) );
+            player.emote( emoteId, targetId );
             break;
         }
         case ClientTrigger::PersistantEmoteCancel: // cancel persistant emote
@@ -228,66 +228,13 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
         }
         case ClientTrigger::FinishZoning: // Finish zoning
         {
-            switch( player.getZoningType() )
-            {
-                case ZoneingType::None:
-                    player.sendToInRangeSet( ActorControlPacket143( player.getId(), ZoneIn, 0x01 ), true );
-                    break;
-                case ZoneingType::Teleport:
-                    player.sendToInRangeSet( ActorControlPacket143( player.getId(), ZoneIn, 0x01, 0, 0, 110 ), true );
-                    break;
-                case ZoneingType::Return:
-                case ZoneingType::ReturnDead:
-                {
-                    if( player.getStatus() == Entity::Actor::ActorStatus::Dead )
-                    {
-                        player.resetHp();
-                        player.resetMp();
-                        player.setStatus( Entity::Actor::ActorStatus::Idle );
-
-                        player.sendToInRangeSet( ActorControlPacket143( player.getId(), ZoneIn, 0x01, 0x01, 0, 111 ), true );
-                        player.sendToInRangeSet( ActorControlPacket142( player.getId(), SetStatus, static_cast< uint8_t >( Entity::Actor::ActorStatus::Idle ) ), true );
-                    }
-                    else
-                        player.sendToInRangeSet( ActorControlPacket143( player.getId(), ZoneIn, 0x01, 0x00, 0, 111 ), true );
-                }
-                    break;
-                case ZoneingType::FadeIn:
-                    break;
-            }
-
-            player.setZoningType( Common::ZoneingType::None );
-
-            player.unsetStateFlag( PlayerStateFlag::BetweenAreas );
+            player.finishZoning();
             break;
         }
 
         case ClientTrigger::Teleport: // Teleport
         {
-            // TODO: only register this action if enough gil is in possession
-            auto targetAetheryte = g_exdDataGen.get< Core::Data::Aetheryte >( param11 );
-
-            if( targetAetheryte )
-            {
-               auto fromAetheryte = g_exdDataGen.get< Core::Data::Aetheryte >( g_exdDataGen.get< Core::Data::TerritoryType >( player.getZoneId() )->aetheryte );
-
-                // calculate cost - does not apply for favorite points or homepoints neither checks for aether tickets
-                auto cost = static_cast< uint16_t > ( ( sqrt( pow( fromAetheryte->aetherstreamX - targetAetheryte->aetherstreamX, 2 ) +
-                                    pow( fromAetheryte->aetherstreamY - targetAetheryte->aetherstreamY, 2 ) ) / 2 ) + 100 );
-
-                // cap at 999 gil
-                cost = cost > uint16_t{999} ? uint16_t{999} : cost;
-
-                bool insufficientGil = player.getCurrency( Inventory::CurrencyType::Gil ) < cost;
-                // todo: figure out what param1 really does
-                player.queuePacket( ActorControlPacket143( player.getId(), TeleportStart, insufficientGil ? 2 : 0, param11 ) );
-
-                if( !insufficientGil )
-                {
-                    auto pActionTeleport = Action::make_ActionTeleport( player.getAsPlayer(), param11, cost );
-                    player.setCurrentAction( pActionTeleport );
-                }
-            }
+            player.teleportQuery( param11 );
             break;
         }
         case ClientTrigger::DyeItem: // Dye item

From 237d3cc7a6f5615c9c69a7adb36d099bc7b3421a Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 18 Feb 2018 02:05:25 +0100
Subject: [PATCH 08/69] Added Waymarks trigger to enum, fixed initial array
 sizes for new chars

---
 src/servers/sapphire_api/PlayerMinimal.cpp             | 10 +++++-----
 .../sapphire_zone/Network/Handlers/ActionHandler.cpp   |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/servers/sapphire_api/PlayerMinimal.cpp b/src/servers/sapphire_api/PlayerMinimal.cpp
index ba95c96f..1fa2604d 100644
--- a/src/servers/sapphire_api/PlayerMinimal.cpp
+++ b/src/servers/sapphire_api/PlayerMinimal.cpp
@@ -148,13 +148,13 @@ namespace Core {
    {
 
       std::vector< uint8_t > customize( 26 );
-      std::vector< uint8_t > howTo( 32 );
-      std::vector< uint8_t > aetherytes( 12 );
-      std::vector< uint8_t > discovery( 411 );
+      std::vector< uint8_t > howTo( 33 );
+      std::vector< uint8_t > aetherytes( 16 );
+      std::vector< uint8_t > discovery( 421 );
       std::vector< uint8_t > questComplete( 396 );
       std::vector< uint8_t > unlocks( 64 );
-      std::vector< uint8_t > mountGuide( 13 );
-      std::vector< uint8_t > orchestrion( 38 );
+      std::vector< uint8_t > mountGuide( 15 );
+      std::vector< uint8_t > orchestrion( 40 );
       std::vector< uint8_t > modelEquip( 40 );
       std::vector< uint8_t > questTracking8( 10 );
       std::vector< int16_t > questTracking = { -1, -1, -1, -1, -1 };
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index b04e9074..70ce5885 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -65,9 +65,11 @@ enum ClientTrigger
    UpdatedSeenHowTos = 0x133,
    AllotAttribute = 0x135,
 
+   ClearWaymarks = 0x13A,
+
    HuntingLogDetails = 0x194,
 
-   EstateTimers = 0x1AB,
+   Timers = 0x1AB,
   
    DyeItem = 0x1B5,
 

From 62f69040b470e26c11ffb5c91053d10d7f9116b4 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 18 Feb 2018 02:12:15 +0100
Subject: [PATCH 09/69] Added comment to spawn packet indicating field meaning
 of type

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index d63dc394..572b08fb 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -382,7 +382,7 @@ struct FFXIVIpcPlayerSpawn : FFXIVIpcBasePacket<PlayerSpawn>
    uint8_t spawnIndex;
    uint8_t state;
    uint8_t persistantEmote;
-   uint8_t type;
+   uint8_t type; // modelType -> eventSystemDefine
    uint8_t subtype;
    uint8_t voice;
    uint16_t u25c;

From c4206ee9bc7a3c60c4d7be4b562d10feb5e459d5 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 18 Feb 2018 22:53:12 +0100
Subject: [PATCH 10/69] Simplified in range logic

---
 src/servers/sapphire_zone/Actor/Actor.cpp | 32 -----------------------
 src/servers/sapphire_zone/Actor/Actor.h   |  2 --
 src/servers/sapphire_zone/Zone/Zone.cpp   | 24 +++++++++++------
 3 files changed, 16 insertions(+), 42 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index a874b71c..45b076a6 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -538,38 +538,6 @@ void Core::Entity::Actor::removeFromInRange()
 
 }
 
-void Core::Entity::Actor::checkInRangeActors()
-{
-   if( hasInRangeActor() )
-   {
-      Entity::ActorPtr pCurAct;
-
-      float fRange = 70.0f;
-      for( auto iter = m_inRangeActors.begin(); iter != m_inRangeActors.end();)
-      {
-         pCurAct = *iter;
-         auto iter2 = iter++;
-
-         float distance = Math::Util::distance( pCurAct->getPos().x, pCurAct->getPos().y, pCurAct->getPos().z,
-                                                getPos().x, getPos().y, getPos().z );
-
-         if( fRange > 0.0f && distance > fRange )
-         {
-            pCurAct->removeInRangeActor( *this );
-
-            if( getCurrentZone() != pCurAct->getCurrentZone() )
-               return;
-
-            removeInRangeActor( **iter2 );
-
-            // @TODO FIXME!
-            // this break is more or less a hack, iteration will break otherwise after removing
-            break;
-         }
-      }
-   }
-}
-
 /*! Clear the whole in range set, this does no cleanup */
 void Core::Entity::Actor::clearInRangeSet()
 {
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index e65d1b0a..cb2142af 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -271,8 +271,6 @@ public:
    // return true if there is at least one actor in the in range set
    bool hasInRangeActor() const;
 
-   void checkInRangeActors();
-
    void removeFromInRange();
 
    // clear the whole in range set, this does no cleanup
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 30d7e399..c930f3da 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -631,7 +631,7 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor )
    if( actor.getCurrentZone() != shared_from_this() )
       return;
 
-   actor.checkInRangeActors();
+   //actor.checkInRangeActors();
 
    uint32_t cellX = getPosX( actor.getPos().x );
    uint32_t cellY = getPosY( actor.getPos().z );
@@ -712,19 +712,18 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
       pCurAct = *iter;
       ++iter;
 
-      if( !pCurAct )
+      if( !pCurAct || pCurAct == pActor )
          continue;
 
       float distance = Math::Util::distance( pCurAct->getPos().x, pCurAct->getPos().y, pCurAct->getPos().z,
                                              pActor->getPos().x, pActor->getPos().y, pActor->getPos().z );
 
-      // Add if we are not ourself and  range == 0 or distance is withing range.
-      if( pCurAct != pActor && ( fRange == 0.0f || distance <= fRange ) )
-      {
+      bool isInRange = ( fRange == 0.0f || distance <= fRange );
+      bool isInRangeSet = pActor->isInRangeSet( pCurAct );
 
-         if( pActor->isInRangeSet( pCurAct ) )
-            // Actor already in range set, skip
-            continue;
+      // Add if we are not ourself and range == 0 or distance is withing range.
+      if( isInRange && !isInRangeSet )
+      {
 
          if( pActor->isPlayer() )
          {
@@ -769,6 +768,15 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
             pCurAct->addInRangeActor( pActor );
          }
       }
+      else if( !isInRange && isInRangeSet )
+      {
+         pCurAct->removeInRangeActor( *pActor );
+
+         if( pActor->getCurrentZone() != pCurAct->getCurrentZone() )
+            continue;
+
+         pActor->removeInRangeActor( *pCurAct );
+      }
    }
 }
 

From 7d916f7d86684303306952338f867ca122b818fb Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 18 Feb 2018 23:48:51 +0100
Subject: [PATCH 11/69] Changeing base access type of actors to gameobject

---
 .../sapphire_zone/Action/ActionCollision.cpp  |  23 +--
 .../sapphire_zone/Action/ActionCollision.h    |   2 +-
 src/servers/sapphire_zone/Actor/Actor.cpp     | 131 +-----------------
 src/servers/sapphire_zone/Actor/Actor.h       |  26 ----
 src/servers/sapphire_zone/Actor/BattleNpc.cpp |   8 +-
 .../sapphire_zone/Actor/GameObject.cpp        | 128 +++++++++++++++++
 src/servers/sapphire_zone/Actor/GameObject.h  |  26 ++++
 src/servers/sapphire_zone/Actor/Player.cpp    |  15 +-
 .../Network/Handlers/GMCommandHandlers.cpp    |  12 +-
 .../Network/Handlers/PacketHandlers.cpp       |   2 +-
 src/servers/sapphire_zone/Zone/Zone.cpp       |  16 +--
 11 files changed, 199 insertions(+), 190 deletions(-)

diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index a66d234c..60948fcf 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -2,6 +2,7 @@
 #include <common/Util/UtilMath.h>
 
 #include "ActionCollision.h"
+#include "Actor/GameObject.h"
 #include "Actor/Actor.h"
 #include "Actor/Player.h"
 
@@ -51,7 +52,7 @@ bool ActionCollision::isActorApplicable( Actor& actor, TargetFilter targetFilter
 }
 
 std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXIVARR_POSITION3 aoePosition,
-                                                                            std::set< ActorPtr > actorsInRange,
+                                                                            std::set< GameObjectPtr > gameObjectsInRange,
                                                                             boost::shared_ptr< Core::Data::Action > actionInfo,
                                                                             TargetFilter targetFilter )
 {
@@ -64,52 +65,52 @@ std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXI
    {
       // This is actually needed. There is "splash damage" in actions marked as single target.
       // Notice how we're using aoe_width. How collision works for SingleTarget is unknown as of now.
-      for( auto pActor : actorsInRange )
+      for( auto pActor : gameObjectsInRange )
       {
          // Make sure actor exists. If it doesn't we done goofed.
          assert( pActor );
 
          // Don't bother wasting on collision if actor doesn't apply for it
-         if ( !isActorApplicable( *pActor, targetFilter ) )
+         if ( !isActorApplicable( *pActor->getAsActor(), targetFilter ) )
             continue;
 
          // Test our collision from actor with the area generated by the action from the AoE data
          if ( radiusCollision( pActor->getPos(), aoePosition, actionInfo->effectRange ) )
          {
             // Add it to the actors collided with the area
-            actorsCollided.insert( pActor );
+            //actorsCollided.insert( pActor );
          }
       }
       break;
    }
    case ActionCollisionType::Circle:
    {
-      for( auto pActor : actorsInRange )
+      for( auto pActor : gameObjectsInRange )
       {
          assert( pActor );
 
-         if ( !isActorApplicable( *pActor, targetFilter ) )
+         if ( !isActorApplicable( *pActor->getAsActor(), targetFilter ) )
             continue;
 
-         if ( radiusCollision( pActor->getPos(), aoePosition, actionInfo->effectRange ) )
-            actorsCollided.insert( pActor );
+         //if ( radiusCollision( pActor->getPos(), aoePosition, actionInfo->effectRange ) )
+            //actorsCollided.insert( pActor );
       }
       break;
    }
    case ActionCollisionType::Box:
    {
-      for( auto pActor : actorsInRange )
+      for( auto pActor : gameObjectsInRange )
       {
          assert( pActor );
 
-         if ( !isActorApplicable( *pActor, targetFilter ) )
+         if ( !isActorApplicable( *pActor->getAsActor(), targetFilter ) )
             continue;
 
          if ( boxCollision( pActor->getPos(), aoePosition, actionInfo->xAxisModifier, actionInfo->effectRange ) )
          {
             // todo: does this actually work?
 
-            actorsCollided.insert( pActor );
+            //actorsCollided.insert( pActor );
          }
       }
       break;
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
index 0c0da597..47684448 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.h
+++ b/src/servers/sapphire_zone/Action/ActionCollision.h
@@ -25,7 +25,7 @@ namespace Entity {
 
       static bool isActorApplicable( Actor& actor, TargetFilter targetFilter );
       static std::set< ActorPtr > getActorsHitFromAction( Common::FFXIVARR_POSITION3 aoePosition,
-                                                          std::set< ActorPtr > actorsInRange,
+                                                          std::set< GameObjectPtr > gameObjectsInRange,
                                                           boost::shared_ptr< Data::Action > actionInfo,
                                                           TargetFilter targetFilter );
 
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 45b076a6..8b7f02ea 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -52,17 +52,6 @@ std::string Core::Entity::Actor::getName() const
    return std::string( m_name );
 }
 
-/*! \return list of actors currently in range */
-std::set< Core::Entity::ActorPtr > Core::Entity::Actor::getInRangeActors( bool includeSelf )
-{
-   auto tempInRange = m_inRangeActors;
-
-   if( includeSelf )
-      tempInRange.insert( getAsActor() );
-
-   return tempInRange;
-   }
-
 /*! \return current stance of the actors */
 Core::Entity::Actor::Stance Core::Entity::Actor::getStance() const
 {
@@ -396,48 +385,6 @@ void Core::Entity::Actor::setCurrentAction( Core::Action::ActionPtr pAction )
    m_pCurrentAction = pAction;
 }
 
-/*!
-check if a given actor is in the actors in range set
-
-\param ActorPtr to be checked for
-\return true if the actor was found
-*/
-bool Core::Entity::Actor::isInRangeSet( ActorPtr pActor ) const
-{
-   return !( m_inRangeActors.find( pActor ) == m_inRangeActors.end() );
-}
-
-/*! \return ActorPtr of the closest actor in range, if none, nullptr */
-Core::Entity::ActorPtr Core::Entity::Actor::getClosestActor()
-{
-   if( m_inRangeActors.empty() )
-      // no actors in range, don't bother
-      return nullptr;
-
-   ActorPtr tmpActor = nullptr;
-
-   // arbitrary high number
-   float minDistance = 10000;
-
-   for( const auto& pCurAct : m_inRangeActors )
-   {
-      float distance = Math::Util::distance( getPos().x,
-                                             getPos().y,
-                                             getPos().z,
-                                             pCurAct->getPos().x,
-                                             pCurAct->getPos().y,
-                                             pCurAct->getPos().z );
-
-      if( distance < minDistance )
-      {
-         minDistance = distance;
-         tmpActor = pCurAct;
-      }
-   }
-
-   return tmpActor;
-}
-
 /*!
 Send a packet to all players in range, potentially to self if set and is player
 
@@ -471,80 +418,6 @@ void Core::Entity::Actor::sendToInRangeSet( Network::Packets::GamePacketPtr pPac
    }
 }
 
-/*!
-Add a given actor to the fitting in range set according to type
-but also to the global actor map
-
-\param ActorPtr to add
-*/
-void Core::Entity::Actor::addInRangeActor( ActorPtr pActor )
-{
-
-   // if this is null, something went wrong
-   assert( pActor );
-
-   // add actor to in range set
-   m_inRangeActors.insert( pActor );
-
-   if( pActor->isPlayer() )
-   {
-      auto pPlayer = pActor->getAsPlayer();
-
-      // if actor is a player, add it to the in range player set
-      m_inRangePlayers.insert( pPlayer );
-   }
-}
-
-/*!
-Remove a given actor from the matching in range set according to type
-but also to the global actor map
-
-\param ActorPtr to remove
-*/
-void Core::Entity::Actor::removeInRangeActor( Actor& actor )
-{
-   // call virtual event
-   onRemoveInRangeActor( actor );
-
-   // remove actor from in range actor set
-   m_inRangeActors.erase( actor.getAsActor() );
-
-   // if actor is a player, despawn ourself for him
-   // TODO: move to virtual onRemove?
-   if( isPlayer() )
-      actor.despawn( getAsPlayer() );
-
-   if( actor.isPlayer() )
-      m_inRangePlayers.erase( actor.getAsPlayer() );
-}
-
-/*! \return true if there is at least one actor in the in range set */
-bool Core::Entity::Actor::hasInRangeActor() const
-{
-   return ( m_inRangeActors.size() > 0 );
-}
-
-void Core::Entity::Actor::removeFromInRange()
-{
-   if( !hasInRangeActor() )
-      return;
-
-   Entity::ActorPtr pCurAct;
-
-   for( auto& pCurAct : m_inRangeActors )
-   {
-      pCurAct->removeInRangeActor( *this );
-   }
-
-}
-
-/*! Clear the whole in range set, this does no cleanup */
-void Core::Entity::Actor::clearInRangeSet()
-{
-   m_inRangeActors.clear();
-   m_inRangePlayers.clear();
-}
-
 /*! \return ZonePtr to the current zone, nullptr if not set */
 Core::ZonePtr Core::Entity::Actor::getCurrentZone() const
 {
@@ -682,7 +555,7 @@ void Core::Entity::Actor::handleScriptSkill( uint32_t type, uint16_t actionId, u
       else
       {
 
-         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeActors( true ),
+         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeGameObjects( true ),
                                                                         actionInfoPtr, TargetFilter::Enemies );
 
          for( const auto& pHitActor : actorsCollided )
@@ -734,7 +607,7 @@ void Core::Entity::Actor::handleScriptSkill( uint32_t type, uint16_t actionId, u
          // todo: get proper packets: the following was just kind of thrown together from what we know.
          // atm buggy (packets look "delayed" from client)
 
-         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeActors( true ),
+         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeGameObjects( true ),
                                                                         actionInfoPtr, TargetFilter::Allies );
 
          for( auto pHitActor : actorsCollided )
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index cb2142af..3948b547 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -139,9 +139,6 @@ protected:
    std::vector< std::pair< uint8_t, uint32_t> > m_statusEffectList;
    std::map< uint8_t, StatusEffect::StatusEffectPtr > m_statusEffectMap;
 
-   std::set< ActorPtr > m_inRangeActors;
-   std::set< PlayerPtr > m_inRangePlayers;
-
 public:
    Actor( ObjKind type );
 
@@ -182,8 +179,6 @@ public:
 
    std::string getName() const;
 
-   std::set< ActorPtr > getInRangeActors( bool includeSelf = false );
-
    bool face( const Common::FFXIVARR_POSITION3& p );
 
    Stance getStance() const;
@@ -233,8 +228,6 @@ public:
 
    virtual void autoAttack( ActorPtr pTarget );
 
-   virtual void onRemoveInRangeActor( Actor& pActor ) {}
-
    virtual void onDeath() {};
    virtual void onDamageTaken( Actor& pSource ) {};
    virtual void onActionHostile( Actor& source ) {};
@@ -255,27 +248,8 @@ public:
 
    ///// IN RANGE LOGIC /////
 
-   // check if another actor is in the actors in range set
-   bool isInRangeSet( ActorPtr pActor ) const;
-
-   ActorPtr getClosestActor();
-
    void sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf = false );
 
-   // add an actor to in range set
-   void addInRangeActor( ActorPtr pActor );
-
-   // remove an actor from the in range set
-   void removeInRangeActor( Actor& pActor );
-
-   // return true if there is at least one actor in the in range set
-   bool hasInRangeActor() const;
-
-   void removeFromInRange();
-
-   // clear the whole in range set, this does no cleanup
-   virtual void clearInRangeSet();
-
    ZonePtr getCurrentZone() const;
 
    void setCurrentZone( ZonePtr currZone );
diff --git a/src/servers/sapphire_zone/Actor/BattleNpc.cpp b/src/servers/sapphire_zone/Actor/BattleNpc.cpp
index 5b43728b..29cdf7b3 100644
--- a/src/servers/sapphire_zone/Actor/BattleNpc.cpp
+++ b/src/servers/sapphire_zone/Actor/BattleNpc.cpp
@@ -501,9 +501,13 @@ void Core::Entity::BattleNpc::update( int64_t currTime )
 
    case MODE_IDLE:
    {
-      ActorPtr pClosestActor = getClosestActor();
+      // this is bad, it should be getClosesPlayer
+      GameObjectPtr pClosestActor = getClosestGameObject();
 
-      if( pClosestActor && pClosestActor->isAlive() )
+      if( !pClosestActor->isPlayer() )
+         break;
+
+      if( pClosestActor && pClosestActor->getAsPlayer()->isAlive() )
       {
          distance = Math::Util::distance( getPos().x, getPos().y, getPos().z,
                                           pClosestActor->getPos().x,
diff --git a/src/servers/sapphire_zone/Actor/GameObject.cpp b/src/servers/sapphire_zone/Actor/GameObject.cpp
index 16c042ab..475abb37 100644
--- a/src/servers/sapphire_zone/Actor/GameObject.cpp
+++ b/src/servers/sapphire_zone/Actor/GameObject.cpp
@@ -1,5 +1,8 @@
 #include "GameObject.h"
 
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+
 #include "Player.h"
 #include "Actor.h"
 #include "BattleNpc.h"
@@ -63,6 +66,131 @@ bool Core::Entity::GameObject::isEventNpc() const
    return m_objKind == ObjKind::EventNpc;
 }
 
+/*!
+Add a given actor to the fitting in range set according to type
+but also to the global actor map
+
+\param ActorPtr to add
+*/
+void Core::Entity::GameObject::addInRangeGameObject( GameObjectPtr pGameObject )
+{
+
+   // if this is null, something went wrong
+   assert( pGameObject );
+
+   // add actor to in range set
+   m_inRangeGameObjects.insert( { pGameObject } );
+
+   if( pGameObject->isPlayer() )
+   {
+      auto pPlayer = pGameObject->getAsPlayer();
+
+      // if actor is a player, add it to the in range player set
+      m_inRangePlayers.insert( pGameObject->getAsPlayer() );
+   }
+}
+
+/*!
+Remove a given actor from the matching in range set according to type
+but also to the global actor map
+
+\param ActorPtr to remove
+*/
+void Core::Entity::GameObject::removeInRangeGameObject( GameObject& gameObject )
+{
+   // call virtual event
+   onRemoveInRangeGameObject( gameObject );
+
+   // remove actor from in range actor set
+   m_inRangeGameObjects.erase( gameObject.shared_from_this() );
+
+   // if actor is a player, despawn ourself for him
+   // TODO: move to virtual onRemove?
+   if( isPlayer() )
+      gameObject.despawn( getAsPlayer() );
+
+   if( gameObject.isPlayer() )
+      m_inRangePlayers.erase( gameObject.getAsPlayer() );
+}
+
+/*! \return true if there is at least one actor in the in range set */
+bool Core::Entity::GameObject::hasInRangeGameObject() const
+{
+   return ( m_inRangeGameObjects.size() > 0 );
+}
+
+void Core::Entity::GameObject::removeFromInRange()
+{
+   if( !hasInRangeGameObject() )
+      return;
+
+   for( auto& pCurAct : m_inRangeGameObjects )
+   {
+      pCurAct->removeInRangeGameObject( *this );
+   }
+
+}
+
+/*! Clear the whole in range set, this does no cleanup */
+void Core::Entity::GameObject::clearInRangeSet()
+{
+   m_inRangeGameObjects.clear();
+   m_inRangePlayers.clear();
+}
+
+/*! \return list of actors currently in range */
+std::set< Core::Entity::GameObjectPtr > Core::Entity::GameObject::getInRangeGameObjects( bool includeSelf )
+{
+   auto tempInRange = m_inRangeGameObjects;
+
+   if( includeSelf )
+      tempInRange.insert( { shared_from_this() } );
+
+   return tempInRange;
+}
+
+/*!
+check if a given actor is in the actors in range set
+
+\param ActorPtr to be checked for
+\return true if the actor was found
+*/
+bool Core::Entity::GameObject::isInRangeSet( GameObjectPtr pGameObject ) const
+{
+   return !( m_inRangeGameObjects.find( pGameObject ) == m_inRangeGameObjects.end() );
+}
+
+/*! \return ActorPtr of the closest actor in range, if none, nullptr */
+Core::Entity::GameObjectPtr Core::Entity::GameObject::getClosestGameObject()
+{
+   if( m_inRangeGameObjects.empty() )
+      // no actors in range, don't bother
+      return nullptr;
+
+   GameObjectPtr tmpActor = nullptr;
+
+   // arbitrary high number
+   float minDistance = 10000;
+
+   for( const auto& pCurAct : m_inRangeGameObjects )
+   {
+      float distance = Math::Util::distance( getPos().x,
+                                             getPos().y,
+                                             getPos().z,
+                                             pCurAct->getPos().x,
+                                             pCurAct->getPos().y,
+                                             pCurAct->getPos().z );
+
+      if( distance < minDistance )
+      {
+         minDistance = distance;
+         tmpActor = pCurAct;
+      }
+   }
+
+   return tmpActor;
+}
+
 /*! \return pointer to this instance as ActorPtr */
 Core::Entity::ActorPtr Core::Entity::GameObject::getAsActor()
 {
diff --git a/src/servers/sapphire_zone/Actor/GameObject.h b/src/servers/sapphire_zone/Actor/GameObject.h
index d1f70b3b..cc4e7eb2 100644
--- a/src/servers/sapphire_zone/Actor/GameObject.h
+++ b/src/servers/sapphire_zone/Actor/GameObject.h
@@ -49,6 +49,9 @@ namespace Entity {
       /*! Type of the actor */
       ObjKind              m_objKind;
 
+      std::set< GameObjectPtr > m_inRangeGameObjects;
+      std::set< PlayerPtr > m_inRangePlayers;
+
    public:
       explicit GameObject( ObjKind type );
       virtual ~GameObject() {};
@@ -56,6 +59,29 @@ namespace Entity {
       virtual void spawn( PlayerPtr pTarget ) {}
       virtual void despawn( PlayerPtr pTarget ) {}
 
+      virtual void onRemoveInRangeGameObject( GameObject &pGameObject ) {}
+
+      // add an actor to in range set
+      void addInRangeGameObject( GameObjectPtr pGameObject );
+
+      // remove an actor from the in range set
+      void removeInRangeGameObject( GameObject& pGameObject );
+
+      // return true if there is at least one actor in the in range set
+      bool hasInRangeGameObject() const;
+
+      void removeFromInRange();
+
+      // clear the whole in range set, this does no cleanup
+      virtual void clearInRangeSet();
+
+      std::set< GameObjectPtr > getInRangeGameObjects( bool includeSelf = false );
+
+      // check if another actor is in the actors in range set
+      bool isInRangeSet( GameObjectPtr pGameObject ) const;
+
+      GameObjectPtr getClosestGameObject();
+
       uint32_t getId() const;
 
       ObjKind getObjKind() const;
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 4c7c3df8..8b6762d3 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -831,14 +831,14 @@ void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget )
 
 Core::Entity::ActorPtr Core::Entity::Player::lookupTargetById( uint64_t targetId )
 {
-   ActorPtr targetActor;
-   auto inRange = getInRangeActors( true );
+   GameObjectPtr targetActor;
+   auto inRange = getInRangeGameObjects(true);
    for( auto actor : inRange )
    {
       if( actor->getId() == targetId )
          targetActor = actor;
    }
-   return targetActor;
+   return targetActor->getAsActor();
 }
 
 void Core::Entity::Player::setLastPing( uint32_t ping )
@@ -1005,9 +1005,12 @@ void Core::Entity::Player::update( int64_t currTime )
          auto mainWeap = m_pInventory->getItemAt( Inventory::GearSet0, Inventory::EquipSlot::MainHand );
 
          // @TODO i dislike this, iterating over all in range actors when you already know the id of the actor you need...
-         for( auto actor : m_inRangeActors )
+         for( auto actor : m_inRangeGameObjects )
          {
-            if( actor->getId() == m_targetId && actor->isAlive() && mainWeap )
+            if( actor->getId() != m_targetId || !actor->isBattleNpc() )
+               continue;
+
+            if( actor->getAsBattleNpc()->isAlive() && mainWeap )
             {
                // default autoattack range
                // TODO make this dependant on bnpc size
@@ -1027,7 +1030,7 @@ void Core::Entity::Player::update( int64_t currTime )
                   if( ( currTime - m_lastAttack ) > mainWeap->getDelay() )
                   {
                      m_lastAttack = currTime;
-                     autoAttack( actor );
+                     autoAttack( actor->getAsBattleNpc() );
                   }
 
                }
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 865ffdc1..74d9e453 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -113,11 +113,11 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    else
    {
-      auto inRange = player.getInRangeActors();
+      auto inRange = player.getInRangeGameObjects();
       for( auto actor : inRange )
       {
          if( actor->getId() == param3 )
-            targetActor = actor;
+            targetActor = actor->getAsActor();
       }
    }
 
@@ -138,7 +138,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Race, param1 );
       player.sendNotice( "Race for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetPlayer->getInRangeActors();
+      auto inRange = targetPlayer->getInRangeGameObjects();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -151,7 +151,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Tribe, param1 );
       player.sendNotice( "Tribe for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetPlayer->getInRangeActors();
+      auto inRange = targetPlayer->getInRangeGameObjects();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -164,7 +164,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Gender, param1 );
       player.sendNotice( "Sex for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetActor->getInRangeActors();
+      auto inRange = targetActor->getInRangeGameObjects();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -439,7 +439,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    case GmCommand::Jump:
    {
 
-      auto inRange = player.getInRangeActors();
+      auto inRange = player.getInRangeGameObjects();
 
       player.changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
                              targetActor->getRotation() );
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index c6232a22..55488fa5 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -190,7 +190,7 @@ void Core::Network::GameConnection::updatePositionHandler( const Packets::GamePa
       player.getCurrentAction()->setInterrupted();
 
    // if no one is in range, don't bother trying to send a position update
-   if( !player.hasInRangeActor() )
+   if( !player.hasInRangeGameObject() )
       return;
 
    uint8_t unk = inPacket.getValAt< uint8_t >( 0x29 );
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index c930f3da..e0ecad27 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -737,8 +737,8 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
             if( count > 12 )
                break;
 
-            pActor->addInRangeActor( pCurAct );
-            pCurAct->addInRangeActor( pActor );
+            pActor->addInRangeGameObject( pCurAct );
+            pCurAct->addInRangeGameObject( pActor );
             // spawn the actor for the player
             pCurAct->spawn( pOwnPlayer );
 
@@ -758,24 +758,24 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
             if( pPlayer->isLoadingComplete() )
             {
                pActor->spawn( pPlayer );
-               pCurAct->addInRangeActor( pActor );
-               pActor->addInRangeActor( pCurAct );
+               pCurAct->addInRangeGameObject( pActor );
+               pActor->addInRangeGameObject( pCurAct );
             }
          }
          else
          {
-            pActor->addInRangeActor( pCurAct );
-            pCurAct->addInRangeActor( pActor );
+            pActor->addInRangeGameObject( pCurAct );
+            pCurAct->addInRangeGameObject( pActor );
          }
       }
       else if( !isInRange && isInRangeSet )
       {
-         pCurAct->removeInRangeActor( *pActor );
+         pCurAct->removeInRangeGameObject( *pActor );
 
          if( pActor->getCurrentZone() != pCurAct->getCurrentZone() )
             continue;
 
-         pActor->removeInRangeActor( *pCurAct );
+         pActor->removeInRangeGameObject( *pCurAct );
       }
    }
 }

From ba511a23e22c0963263f1053612f23380acf8b4d Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Mon, 19 Feb 2018 22:00:32 +0100
Subject: [PATCH 12/69] Revert "Changeing base access type of actors to
 gameobject"

This reverts commit 7d916f7
---
 .../sapphire_zone/Action/ActionCollision.cpp  |  23 ++-
 .../sapphire_zone/Action/ActionCollision.h    |   2 +-
 src/servers/sapphire_zone/Actor/Actor.cpp     | 131 +++++++++++++++++-
 src/servers/sapphire_zone/Actor/Actor.h       |  26 ++++
 src/servers/sapphire_zone/Actor/BattleNpc.cpp |   8 +-
 .../sapphire_zone/Actor/GameObject.cpp        | 128 -----------------
 src/servers/sapphire_zone/Actor/GameObject.h  |  26 ----
 src/servers/sapphire_zone/Actor/Player.cpp    |  15 +-
 .../Network/Handlers/GMCommandHandlers.cpp    |  12 +-
 .../Network/Handlers/PacketHandlers.cpp       |   2 +-
 src/servers/sapphire_zone/Zone/Zone.cpp       |  16 +--
 11 files changed, 190 insertions(+), 199 deletions(-)

diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index 60948fcf..a66d234c 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -2,7 +2,6 @@
 #include <common/Util/UtilMath.h>
 
 #include "ActionCollision.h"
-#include "Actor/GameObject.h"
 #include "Actor/Actor.h"
 #include "Actor/Player.h"
 
@@ -52,7 +51,7 @@ bool ActionCollision::isActorApplicable( Actor& actor, TargetFilter targetFilter
 }
 
 std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXIVARR_POSITION3 aoePosition,
-                                                                            std::set< GameObjectPtr > gameObjectsInRange,
+                                                                            std::set< ActorPtr > actorsInRange,
                                                                             boost::shared_ptr< Core::Data::Action > actionInfo,
                                                                             TargetFilter targetFilter )
 {
@@ -65,52 +64,52 @@ std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXI
    {
       // This is actually needed. There is "splash damage" in actions marked as single target.
       // Notice how we're using aoe_width. How collision works for SingleTarget is unknown as of now.
-      for( auto pActor : gameObjectsInRange )
+      for( auto pActor : actorsInRange )
       {
          // Make sure actor exists. If it doesn't we done goofed.
          assert( pActor );
 
          // Don't bother wasting on collision if actor doesn't apply for it
-         if ( !isActorApplicable( *pActor->getAsActor(), targetFilter ) )
+         if ( !isActorApplicable( *pActor, targetFilter ) )
             continue;
 
          // Test our collision from actor with the area generated by the action from the AoE data
          if ( radiusCollision( pActor->getPos(), aoePosition, actionInfo->effectRange ) )
          {
             // Add it to the actors collided with the area
-            //actorsCollided.insert( pActor );
+            actorsCollided.insert( pActor );
          }
       }
       break;
    }
    case ActionCollisionType::Circle:
    {
-      for( auto pActor : gameObjectsInRange )
+      for( auto pActor : actorsInRange )
       {
          assert( pActor );
 
-         if ( !isActorApplicable( *pActor->getAsActor(), targetFilter ) )
+         if ( !isActorApplicable( *pActor, targetFilter ) )
             continue;
 
-         //if ( radiusCollision( pActor->getPos(), aoePosition, actionInfo->effectRange ) )
-            //actorsCollided.insert( pActor );
+         if ( radiusCollision( pActor->getPos(), aoePosition, actionInfo->effectRange ) )
+            actorsCollided.insert( pActor );
       }
       break;
    }
    case ActionCollisionType::Box:
    {
-      for( auto pActor : gameObjectsInRange )
+      for( auto pActor : actorsInRange )
       {
          assert( pActor );
 
-         if ( !isActorApplicable( *pActor->getAsActor(), targetFilter ) )
+         if ( !isActorApplicable( *pActor, targetFilter ) )
             continue;
 
          if ( boxCollision( pActor->getPos(), aoePosition, actionInfo->xAxisModifier, actionInfo->effectRange ) )
          {
             // todo: does this actually work?
 
-            //actorsCollided.insert( pActor );
+            actorsCollided.insert( pActor );
          }
       }
       break;
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
index 47684448..0c0da597 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.h
+++ b/src/servers/sapphire_zone/Action/ActionCollision.h
@@ -25,7 +25,7 @@ namespace Entity {
 
       static bool isActorApplicable( Actor& actor, TargetFilter targetFilter );
       static std::set< ActorPtr > getActorsHitFromAction( Common::FFXIVARR_POSITION3 aoePosition,
-                                                          std::set< GameObjectPtr > gameObjectsInRange,
+                                                          std::set< ActorPtr > actorsInRange,
                                                           boost::shared_ptr< Data::Action > actionInfo,
                                                           TargetFilter targetFilter );
 
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 8b7f02ea..45b076a6 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -52,6 +52,17 @@ std::string Core::Entity::Actor::getName() const
    return std::string( m_name );
 }
 
+/*! \return list of actors currently in range */
+std::set< Core::Entity::ActorPtr > Core::Entity::Actor::getInRangeActors( bool includeSelf )
+{
+   auto tempInRange = m_inRangeActors;
+
+   if( includeSelf )
+      tempInRange.insert( getAsActor() );
+
+   return tempInRange;
+   }
+
 /*! \return current stance of the actors */
 Core::Entity::Actor::Stance Core::Entity::Actor::getStance() const
 {
@@ -385,6 +396,48 @@ void Core::Entity::Actor::setCurrentAction( Core::Action::ActionPtr pAction )
    m_pCurrentAction = pAction;
 }
 
+/*!
+check if a given actor is in the actors in range set
+
+\param ActorPtr to be checked for
+\return true if the actor was found
+*/
+bool Core::Entity::Actor::isInRangeSet( ActorPtr pActor ) const
+{
+   return !( m_inRangeActors.find( pActor ) == m_inRangeActors.end() );
+}
+
+/*! \return ActorPtr of the closest actor in range, if none, nullptr */
+Core::Entity::ActorPtr Core::Entity::Actor::getClosestActor()
+{
+   if( m_inRangeActors.empty() )
+      // no actors in range, don't bother
+      return nullptr;
+
+   ActorPtr tmpActor = nullptr;
+
+   // arbitrary high number
+   float minDistance = 10000;
+
+   for( const auto& pCurAct : m_inRangeActors )
+   {
+      float distance = Math::Util::distance( getPos().x,
+                                             getPos().y,
+                                             getPos().z,
+                                             pCurAct->getPos().x,
+                                             pCurAct->getPos().y,
+                                             pCurAct->getPos().z );
+
+      if( distance < minDistance )
+      {
+         minDistance = distance;
+         tmpActor = pCurAct;
+      }
+   }
+
+   return tmpActor;
+}
+
 /*!
 Send a packet to all players in range, potentially to self if set and is player
 
@@ -418,6 +471,80 @@ void Core::Entity::Actor::sendToInRangeSet( Network::Packets::GamePacketPtr pPac
    }
 }
 
+/*!
+Add a given actor to the fitting in range set according to type
+but also to the global actor map
+
+\param ActorPtr to add
+*/
+void Core::Entity::Actor::addInRangeActor( ActorPtr pActor )
+{
+
+   // if this is null, something went wrong
+   assert( pActor );
+
+   // add actor to in range set
+   m_inRangeActors.insert( pActor );
+
+   if( pActor->isPlayer() )
+   {
+      auto pPlayer = pActor->getAsPlayer();
+
+      // if actor is a player, add it to the in range player set
+      m_inRangePlayers.insert( pPlayer );
+   }
+}
+
+/*!
+Remove a given actor from the matching in range set according to type
+but also to the global actor map
+
+\param ActorPtr to remove
+*/
+void Core::Entity::Actor::removeInRangeActor( Actor& actor )
+{
+   // call virtual event
+   onRemoveInRangeActor( actor );
+
+   // remove actor from in range actor set
+   m_inRangeActors.erase( actor.getAsActor() );
+
+   // if actor is a player, despawn ourself for him
+   // TODO: move to virtual onRemove?
+   if( isPlayer() )
+      actor.despawn( getAsPlayer() );
+
+   if( actor.isPlayer() )
+      m_inRangePlayers.erase( actor.getAsPlayer() );
+}
+
+/*! \return true if there is at least one actor in the in range set */
+bool Core::Entity::Actor::hasInRangeActor() const
+{
+   return ( m_inRangeActors.size() > 0 );
+}
+
+void Core::Entity::Actor::removeFromInRange()
+{
+   if( !hasInRangeActor() )
+      return;
+
+   Entity::ActorPtr pCurAct;
+
+   for( auto& pCurAct : m_inRangeActors )
+   {
+      pCurAct->removeInRangeActor( *this );
+   }
+
+}
+
+/*! Clear the whole in range set, this does no cleanup */
+void Core::Entity::Actor::clearInRangeSet()
+{
+   m_inRangeActors.clear();
+   m_inRangePlayers.clear();
+}
+
 /*! \return ZonePtr to the current zone, nullptr if not set */
 Core::ZonePtr Core::Entity::Actor::getCurrentZone() const
 {
@@ -555,7 +682,7 @@ void Core::Entity::Actor::handleScriptSkill( uint32_t type, uint16_t actionId, u
       else
       {
 
-         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeGameObjects( true ),
+         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeActors( true ),
                                                                         actionInfoPtr, TargetFilter::Enemies );
 
          for( const auto& pHitActor : actorsCollided )
@@ -607,7 +734,7 @@ void Core::Entity::Actor::handleScriptSkill( uint32_t type, uint16_t actionId, u
          // todo: get proper packets: the following was just kind of thrown together from what we know.
          // atm buggy (packets look "delayed" from client)
 
-         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeGameObjects( true ),
+         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeActors( true ),
                                                                         actionInfoPtr, TargetFilter::Allies );
 
          for( auto pHitActor : actorsCollided )
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 3948b547..cb2142af 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -139,6 +139,9 @@ protected:
    std::vector< std::pair< uint8_t, uint32_t> > m_statusEffectList;
    std::map< uint8_t, StatusEffect::StatusEffectPtr > m_statusEffectMap;
 
+   std::set< ActorPtr > m_inRangeActors;
+   std::set< PlayerPtr > m_inRangePlayers;
+
 public:
    Actor( ObjKind type );
 
@@ -179,6 +182,8 @@ public:
 
    std::string getName() const;
 
+   std::set< ActorPtr > getInRangeActors( bool includeSelf = false );
+
    bool face( const Common::FFXIVARR_POSITION3& p );
 
    Stance getStance() const;
@@ -228,6 +233,8 @@ public:
 
    virtual void autoAttack( ActorPtr pTarget );
 
+   virtual void onRemoveInRangeActor( Actor& pActor ) {}
+
    virtual void onDeath() {};
    virtual void onDamageTaken( Actor& pSource ) {};
    virtual void onActionHostile( Actor& source ) {};
@@ -248,8 +255,27 @@ public:
 
    ///// IN RANGE LOGIC /////
 
+   // check if another actor is in the actors in range set
+   bool isInRangeSet( ActorPtr pActor ) const;
+
+   ActorPtr getClosestActor();
+
    void sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf = false );
 
+   // add an actor to in range set
+   void addInRangeActor( ActorPtr pActor );
+
+   // remove an actor from the in range set
+   void removeInRangeActor( Actor& pActor );
+
+   // return true if there is at least one actor in the in range set
+   bool hasInRangeActor() const;
+
+   void removeFromInRange();
+
+   // clear the whole in range set, this does no cleanup
+   virtual void clearInRangeSet();
+
    ZonePtr getCurrentZone() const;
 
    void setCurrentZone( ZonePtr currZone );
diff --git a/src/servers/sapphire_zone/Actor/BattleNpc.cpp b/src/servers/sapphire_zone/Actor/BattleNpc.cpp
index 29cdf7b3..5b43728b 100644
--- a/src/servers/sapphire_zone/Actor/BattleNpc.cpp
+++ b/src/servers/sapphire_zone/Actor/BattleNpc.cpp
@@ -501,13 +501,9 @@ void Core::Entity::BattleNpc::update( int64_t currTime )
 
    case MODE_IDLE:
    {
-      // this is bad, it should be getClosesPlayer
-      GameObjectPtr pClosestActor = getClosestGameObject();
+      ActorPtr pClosestActor = getClosestActor();
 
-      if( !pClosestActor->isPlayer() )
-         break;
-
-      if( pClosestActor && pClosestActor->getAsPlayer()->isAlive() )
+      if( pClosestActor && pClosestActor->isAlive() )
       {
          distance = Math::Util::distance( getPos().x, getPos().y, getPos().z,
                                           pClosestActor->getPos().x,
diff --git a/src/servers/sapphire_zone/Actor/GameObject.cpp b/src/servers/sapphire_zone/Actor/GameObject.cpp
index 475abb37..16c042ab 100644
--- a/src/servers/sapphire_zone/Actor/GameObject.cpp
+++ b/src/servers/sapphire_zone/Actor/GameObject.cpp
@@ -1,8 +1,5 @@
 #include "GameObject.h"
 
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-
 #include "Player.h"
 #include "Actor.h"
 #include "BattleNpc.h"
@@ -66,131 +63,6 @@ bool Core::Entity::GameObject::isEventNpc() const
    return m_objKind == ObjKind::EventNpc;
 }
 
-/*!
-Add a given actor to the fitting in range set according to type
-but also to the global actor map
-
-\param ActorPtr to add
-*/
-void Core::Entity::GameObject::addInRangeGameObject( GameObjectPtr pGameObject )
-{
-
-   // if this is null, something went wrong
-   assert( pGameObject );
-
-   // add actor to in range set
-   m_inRangeGameObjects.insert( { pGameObject } );
-
-   if( pGameObject->isPlayer() )
-   {
-      auto pPlayer = pGameObject->getAsPlayer();
-
-      // if actor is a player, add it to the in range player set
-      m_inRangePlayers.insert( pGameObject->getAsPlayer() );
-   }
-}
-
-/*!
-Remove a given actor from the matching in range set according to type
-but also to the global actor map
-
-\param ActorPtr to remove
-*/
-void Core::Entity::GameObject::removeInRangeGameObject( GameObject& gameObject )
-{
-   // call virtual event
-   onRemoveInRangeGameObject( gameObject );
-
-   // remove actor from in range actor set
-   m_inRangeGameObjects.erase( gameObject.shared_from_this() );
-
-   // if actor is a player, despawn ourself for him
-   // TODO: move to virtual onRemove?
-   if( isPlayer() )
-      gameObject.despawn( getAsPlayer() );
-
-   if( gameObject.isPlayer() )
-      m_inRangePlayers.erase( gameObject.getAsPlayer() );
-}
-
-/*! \return true if there is at least one actor in the in range set */
-bool Core::Entity::GameObject::hasInRangeGameObject() const
-{
-   return ( m_inRangeGameObjects.size() > 0 );
-}
-
-void Core::Entity::GameObject::removeFromInRange()
-{
-   if( !hasInRangeGameObject() )
-      return;
-
-   for( auto& pCurAct : m_inRangeGameObjects )
-   {
-      pCurAct->removeInRangeGameObject( *this );
-   }
-
-}
-
-/*! Clear the whole in range set, this does no cleanup */
-void Core::Entity::GameObject::clearInRangeSet()
-{
-   m_inRangeGameObjects.clear();
-   m_inRangePlayers.clear();
-}
-
-/*! \return list of actors currently in range */
-std::set< Core::Entity::GameObjectPtr > Core::Entity::GameObject::getInRangeGameObjects( bool includeSelf )
-{
-   auto tempInRange = m_inRangeGameObjects;
-
-   if( includeSelf )
-      tempInRange.insert( { shared_from_this() } );
-
-   return tempInRange;
-}
-
-/*!
-check if a given actor is in the actors in range set
-
-\param ActorPtr to be checked for
-\return true if the actor was found
-*/
-bool Core::Entity::GameObject::isInRangeSet( GameObjectPtr pGameObject ) const
-{
-   return !( m_inRangeGameObjects.find( pGameObject ) == m_inRangeGameObjects.end() );
-}
-
-/*! \return ActorPtr of the closest actor in range, if none, nullptr */
-Core::Entity::GameObjectPtr Core::Entity::GameObject::getClosestGameObject()
-{
-   if( m_inRangeGameObjects.empty() )
-      // no actors in range, don't bother
-      return nullptr;
-
-   GameObjectPtr tmpActor = nullptr;
-
-   // arbitrary high number
-   float minDistance = 10000;
-
-   for( const auto& pCurAct : m_inRangeGameObjects )
-   {
-      float distance = Math::Util::distance( getPos().x,
-                                             getPos().y,
-                                             getPos().z,
-                                             pCurAct->getPos().x,
-                                             pCurAct->getPos().y,
-                                             pCurAct->getPos().z );
-
-      if( distance < minDistance )
-      {
-         minDistance = distance;
-         tmpActor = pCurAct;
-      }
-   }
-
-   return tmpActor;
-}
-
 /*! \return pointer to this instance as ActorPtr */
 Core::Entity::ActorPtr Core::Entity::GameObject::getAsActor()
 {
diff --git a/src/servers/sapphire_zone/Actor/GameObject.h b/src/servers/sapphire_zone/Actor/GameObject.h
index cc4e7eb2..d1f70b3b 100644
--- a/src/servers/sapphire_zone/Actor/GameObject.h
+++ b/src/servers/sapphire_zone/Actor/GameObject.h
@@ -49,9 +49,6 @@ namespace Entity {
       /*! Type of the actor */
       ObjKind              m_objKind;
 
-      std::set< GameObjectPtr > m_inRangeGameObjects;
-      std::set< PlayerPtr > m_inRangePlayers;
-
    public:
       explicit GameObject( ObjKind type );
       virtual ~GameObject() {};
@@ -59,29 +56,6 @@ namespace Entity {
       virtual void spawn( PlayerPtr pTarget ) {}
       virtual void despawn( PlayerPtr pTarget ) {}
 
-      virtual void onRemoveInRangeGameObject( GameObject &pGameObject ) {}
-
-      // add an actor to in range set
-      void addInRangeGameObject( GameObjectPtr pGameObject );
-
-      // remove an actor from the in range set
-      void removeInRangeGameObject( GameObject& pGameObject );
-
-      // return true if there is at least one actor in the in range set
-      bool hasInRangeGameObject() const;
-
-      void removeFromInRange();
-
-      // clear the whole in range set, this does no cleanup
-      virtual void clearInRangeSet();
-
-      std::set< GameObjectPtr > getInRangeGameObjects( bool includeSelf = false );
-
-      // check if another actor is in the actors in range set
-      bool isInRangeSet( GameObjectPtr pGameObject ) const;
-
-      GameObjectPtr getClosestGameObject();
-
       uint32_t getId() const;
 
       ObjKind getObjKind() const;
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 8b6762d3..4c7c3df8 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -831,14 +831,14 @@ void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget )
 
 Core::Entity::ActorPtr Core::Entity::Player::lookupTargetById( uint64_t targetId )
 {
-   GameObjectPtr targetActor;
-   auto inRange = getInRangeGameObjects(true);
+   ActorPtr targetActor;
+   auto inRange = getInRangeActors( true );
    for( auto actor : inRange )
    {
       if( actor->getId() == targetId )
          targetActor = actor;
    }
-   return targetActor->getAsActor();
+   return targetActor;
 }
 
 void Core::Entity::Player::setLastPing( uint32_t ping )
@@ -1005,12 +1005,9 @@ void Core::Entity::Player::update( int64_t currTime )
          auto mainWeap = m_pInventory->getItemAt( Inventory::GearSet0, Inventory::EquipSlot::MainHand );
 
          // @TODO i dislike this, iterating over all in range actors when you already know the id of the actor you need...
-         for( auto actor : m_inRangeGameObjects )
+         for( auto actor : m_inRangeActors )
          {
-            if( actor->getId() != m_targetId || !actor->isBattleNpc() )
-               continue;
-
-            if( actor->getAsBattleNpc()->isAlive() && mainWeap )
+            if( actor->getId() == m_targetId && actor->isAlive() && mainWeap )
             {
                // default autoattack range
                // TODO make this dependant on bnpc size
@@ -1030,7 +1027,7 @@ void Core::Entity::Player::update( int64_t currTime )
                   if( ( currTime - m_lastAttack ) > mainWeap->getDelay() )
                   {
                      m_lastAttack = currTime;
-                     autoAttack( actor->getAsBattleNpc() );
+                     autoAttack( actor );
                   }
 
                }
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 74d9e453..865ffdc1 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -113,11 +113,11 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    else
    {
-      auto inRange = player.getInRangeGameObjects();
+      auto inRange = player.getInRangeActors();
       for( auto actor : inRange )
       {
          if( actor->getId() == param3 )
-            targetActor = actor->getAsActor();
+            targetActor = actor;
       }
    }
 
@@ -138,7 +138,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Race, param1 );
       player.sendNotice( "Race for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetPlayer->getInRangeGameObjects();
+      auto inRange = targetPlayer->getInRangeActors();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -151,7 +151,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Tribe, param1 );
       player.sendNotice( "Tribe for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetPlayer->getInRangeGameObjects();
+      auto inRange = targetPlayer->getInRangeActors();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -164,7 +164,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Gender, param1 );
       player.sendNotice( "Sex for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetActor->getInRangeGameObjects();
+      auto inRange = targetActor->getInRangeActors();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -439,7 +439,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    case GmCommand::Jump:
    {
 
-      auto inRange = player.getInRangeGameObjects();
+      auto inRange = player.getInRangeActors();
 
       player.changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
                              targetActor->getRotation() );
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 55488fa5..c6232a22 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -190,7 +190,7 @@ void Core::Network::GameConnection::updatePositionHandler( const Packets::GamePa
       player.getCurrentAction()->setInterrupted();
 
    // if no one is in range, don't bother trying to send a position update
-   if( !player.hasInRangeGameObject() )
+   if( !player.hasInRangeActor() )
       return;
 
    uint8_t unk = inPacket.getValAt< uint8_t >( 0x29 );
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index e0ecad27..c930f3da 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -737,8 +737,8 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
             if( count > 12 )
                break;
 
-            pActor->addInRangeGameObject( pCurAct );
-            pCurAct->addInRangeGameObject( pActor );
+            pActor->addInRangeActor( pCurAct );
+            pCurAct->addInRangeActor( pActor );
             // spawn the actor for the player
             pCurAct->spawn( pOwnPlayer );
 
@@ -758,24 +758,24 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
             if( pPlayer->isLoadingComplete() )
             {
                pActor->spawn( pPlayer );
-               pCurAct->addInRangeGameObject( pActor );
-               pActor->addInRangeGameObject( pCurAct );
+               pCurAct->addInRangeActor( pActor );
+               pActor->addInRangeActor( pCurAct );
             }
          }
          else
          {
-            pActor->addInRangeGameObject( pCurAct );
-            pCurAct->addInRangeGameObject( pActor );
+            pActor->addInRangeActor( pCurAct );
+            pCurAct->addInRangeActor( pActor );
          }
       }
       else if( !isInRange && isInRangeSet )
       {
-         pCurAct->removeInRangeGameObject( *pActor );
+         pCurAct->removeInRangeActor( *pActor );
 
          if( pActor->getCurrentZone() != pCurAct->getCurrentZone() )
             continue;
 
-         pActor->removeInRangeGameObject( *pCurAct );
+         pActor->removeInRangeActor( *pCurAct );
       }
    }
 }

From 9a4e7533c630bb9196f7cc17d52ea1d55441e610 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 20 Feb 2018 22:46:44 +0100
Subject: [PATCH 13/69] Renaming classes in preperation of actor rework

---
 CONTRIBUTING.md                               |   4 +-
 src/servers/sapphire_api/Forwards.h           |   4 +-
 src/servers/sapphire_zone/Action/Action.cpp   |   4 +-
 src/servers/sapphire_zone/Action/Action.h     |   8 +-
 .../sapphire_zone/Action/ActionCast.cpp       |   2 +-
 src/servers/sapphire_zone/Action/ActionCast.h |   2 +-
 .../sapphire_zone/Action/ActionCollision.cpp  |  20 +-
 .../sapphire_zone/Action/ActionCollision.h    |   8 +-
 .../sapphire_zone/Action/ActionMount.cpp      |   2 +-
 .../sapphire_zone/Action/ActionMount.h        |   2 +-
 .../sapphire_zone/Action/ActionTeleport.cpp   |   2 +-
 .../sapphire_zone/Action/ActionTeleport.h     |   2 +-
 .../sapphire_zone/Action/EventAction.cpp      |   2 +-
 .../sapphire_zone/Action/EventAction.h        |   2 +-
 .../sapphire_zone/Action/EventItemAction.cpp  |   2 +-
 .../sapphire_zone/Action/EventItemAction.h    |   2 +-
 src/servers/sapphire_zone/Actor/Actor.cpp     | 966 +----------------
 src/servers/sapphire_zone/Actor/Actor.h       | 335 ++----
 src/servers/sapphire_zone/Actor/BattleNpc.cpp |  80 +-
 src/servers/sapphire_zone/Actor/BattleNpc.h   |  28 +-
 src/servers/sapphire_zone/Actor/Chara.cpp     | 974 ++++++++++++++++++
 src/servers/sapphire_zone/Actor/Chara.h       | 295 ++++++
 src/servers/sapphire_zone/Actor/EventNpc.cpp  |   4 +-
 src/servers/sapphire_zone/Actor/EventNpc.h    |   6 +-
 .../sapphire_zone/Actor/GameObject.cpp        |  94 --
 src/servers/sapphire_zone/Actor/GameObject.h  |  82 --
 .../sapphire_zone/Actor/InstanceObject.cpp    |   2 +-
 .../sapphire_zone/Actor/InstanceObject.h      |   4 +-
 src/servers/sapphire_zone/Actor/Player.cpp    |  26 +-
 src/servers/sapphire_zone/Actor/Player.h      |   8 +-
 .../sapphire_zone/Actor/PlayerEvent.cpp       |   4 +-
 src/servers/sapphire_zone/Forwards.h          |   2 +-
 src/servers/sapphire_zone/Math/CalcBattle.cpp |   2 +-
 src/servers/sapphire_zone/Math/CalcBattle.h   |   2 +-
 src/servers/sapphire_zone/Math/CalcStats.cpp  |   2 +-
 src/servers/sapphire_zone/Math/CalcStats.h    |   2 +-
 .../Network/Handlers/ActionHandler.cpp        |   6 +-
 .../Network/Handlers/EventHandlers.cpp        |   4 +-
 .../Network/Handlers/GMCommandHandlers.cpp    |  18 +-
 .../Network/Handlers/SkillHandler.cpp         |   2 +-
 .../Network/PacketWrappers/MoveActorPacket.h  |   4 +-
 .../PacketWrappers/PlayerSpawnPacket.h        |   8 +-
 .../PacketWrappers/UpdateHpMpTpPacket.h       |   6 +-
 .../sapphire_zone/Script/NativeScriptApi.h    |  24 +-
 .../sapphire_zone/Script/ScriptManager.cpp    |  20 +-
 .../sapphire_zone/Script/ScriptManager.h      |   8 +-
 .../Script/Scripts/ScriptObject.h             |   2 +-
 .../Script/Scripts/action/ActionSprint3.cpp   |   2 +-
 .../StatusEffect/StatusEffect.cpp             |   4 +-
 .../sapphire_zone/StatusEffect/StatusEffect.h |   6 +-
 src/servers/sapphire_zone/Zone/Cell.cpp       | 269 +++--
 src/servers/sapphire_zone/Zone/Cell.h         |  32 +-
 src/servers/sapphire_zone/Zone/Zone.cpp       | 114 +-
 src/servers/sapphire_zone/Zone/Zone.h         |   8 +-
 54 files changed, 1749 insertions(+), 1774 deletions(-)
 create mode 100644 src/servers/sapphire_zone/Actor/Chara.cpp
 create mode 100644 src/servers/sapphire_zone/Actor/Chara.h
 delete mode 100644 src/servers/sapphire_zone/Actor/GameObject.cpp
 delete mode 100644 src/servers/sapphire_zone/Actor/GameObject.h

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9f3f22ab..da0c7441 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,10 +33,10 @@ switch( commandId )
    case 0x01:  // Toggle sheathe
    {
       if ( param11 == 1 )
-         pPlayer->setStance( Entity::Actor::Stance::Active );
+         pPlayer->setStance( Entity::Chara::Stance::Active );
       else
       {
-         pPlayer->setStance( Entity::Actor::Stance::Passive );
+         pPlayer->setStance( Entity::Chara::Stance::Passive );
          pPlayer->setAutoattack( false );
       }
 
diff --git a/src/servers/sapphire_api/Forwards.h b/src/servers/sapphire_api/Forwards.h
index bdffff9f..cbc8d820 100644
--- a/src/servers/sapphire_api/Forwards.h
+++ b/src/servers/sapphire_api/Forwards.h
@@ -34,11 +34,11 @@ namespace Core
 
    namespace Entity
    {
-      class Actor;
+      class Chara;
       class Player;
       class BattleNpc;
 
-      typedef boost::shared_ptr<Actor> ActorPtr;
+      typedef boost::shared_ptr<Chara> ActorPtr;
       typedef boost::shared_ptr<Player> PlayerPtr;
       typedef boost::shared_ptr<BattleNpc> BattleNpcPtr;
    }
diff --git a/src/servers/sapphire_zone/Action/Action.cpp b/src/servers/sapphire_zone/Action/Action.cpp
index 56512f09..ed3c3e36 100644
--- a/src/servers/sapphire_zone/Action/Action.cpp
+++ b/src/servers/sapphire_zone/Action/Action.cpp
@@ -22,7 +22,7 @@ Core::Common::HandleActionType Core::Action::Action::getHandleActionType() const
    return m_handleActionType;
 }
 
-Core::Entity::ActorPtr Core::Action::Action::getTargetActor() const
+Core::Entity::CharaPtr Core::Action::Action::getTargetChara() const
 {
    return m_pTarget;
 }
@@ -57,7 +57,7 @@ void Core::Action::Action::setCastTime( uint32_t castTime )
    m_castTime = castTime;
 }
 
-Core::Entity::ActorPtr Core::Action::Action::getActionSource() const
+Core::Entity::CharaPtr Core::Action::Action::getActionSource() const
 {
    return m_pSource;
 }
diff --git a/src/servers/sapphire_zone/Action/Action.h b/src/servers/sapphire_zone/Action/Action.h
index 8cd4c3cc..995835dd 100644
--- a/src/servers/sapphire_zone/Action/Action.h
+++ b/src/servers/sapphire_zone/Action/Action.h
@@ -18,7 +18,7 @@ namespace Action {
 
       Common::HandleActionType getHandleActionType() const;
 
-      Entity::ActorPtr getTargetActor() const;
+      Entity::CharaPtr getTargetChara() const;
 
       bool isInterrupted() const;
 
@@ -32,7 +32,7 @@ namespace Action {
 
       void setCastTime( uint32_t castTime );
 
-      Entity::ActorPtr getActionSource() const;
+      Entity::CharaPtr getActionSource() const;
 
       virtual void onStart() {};
       virtual void onFinish() {};
@@ -48,8 +48,8 @@ namespace Action {
       uint64_t	m_startTime;
       uint32_t	m_castTime;
 
-      Entity::ActorPtr m_pSource;
-      Entity::ActorPtr m_pTarget;
+      Entity::CharaPtr m_pSource;
+      Entity::CharaPtr m_pTarget;
 
       bool m_bInterrupt;
 
diff --git a/src/servers/sapphire_zone/Action/ActionCast.cpp b/src/servers/sapphire_zone/Action/ActionCast.cpp
index 00e0e966..fbdd780e 100644
--- a/src/servers/sapphire_zone/Action/ActionCast.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCast.cpp
@@ -26,7 +26,7 @@ Core::Action::ActionCast::ActionCast()
    m_handleActionType = Common::HandleActionType::Event;
 }
 
-Core::Action::ActionCast::ActionCast( Entity::ActorPtr pActor, Entity::ActorPtr pTarget, uint16_t actionId )
+Core::Action::ActionCast::ActionCast( Entity::CharaPtr pActor, Entity::CharaPtr pTarget, uint16_t actionId )
 {
    m_startTime = 0;
    m_id = actionId;
diff --git a/src/servers/sapphire_zone/Action/ActionCast.h b/src/servers/sapphire_zone/Action/ActionCast.h
index b656b391..c1dac482 100644
--- a/src/servers/sapphire_zone/Action/ActionCast.h
+++ b/src/servers/sapphire_zone/Action/ActionCast.h
@@ -15,7 +15,7 @@ namespace Action {
       ActionCast();
       ~ActionCast();
       
-      ActionCast( Entity::ActorPtr pActor, Entity::ActorPtr pTarget, uint16_t actionId );
+      ActionCast( Entity::CharaPtr pActor, Entity::CharaPtr pTarget, uint16_t actionId );
 
       void onStart() override;
       void onFinish() override;
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index a66d234c..c13a3e29 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -2,7 +2,7 @@
 #include <common/Util/UtilMath.h>
 
 #include "ActionCollision.h"
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 #include "Actor/Player.h"
 
 #include <cmath>
@@ -13,7 +13,7 @@ using namespace Core::Common;
 
 // todo: add AoE actor limits (16, 32)
 
-bool ActionCollision::isActorApplicable( Actor& actor, TargetFilter targetFilter )
+bool ActionCollision::isActorApplicable( Chara& chara, TargetFilter targetFilter )
 {
    bool actorApplicable = false;
    switch( targetFilter )
@@ -25,37 +25,37 @@ bool ActionCollision::isActorApplicable( Actor& actor, TargetFilter targetFilter
    }
    case TargetFilter::Players:
    {
-      actorApplicable = actor.isPlayer();
+      actorApplicable = chara.isPlayer();
       break;
    }
    case TargetFilter::Allies:
    {
       // todo: implement ally NPCs
-      actorApplicable = !actor.isBattleNpc();
+      actorApplicable = !chara.isBattleNpc();
       break;
    }
    case TargetFilter::Party:
    {
       // todo: implement party
-      actorApplicable = actor.isPlayer();
+      actorApplicable = chara.isPlayer();
       break;
    }
    case TargetFilter::Enemies:
    {
-      actorApplicable = actor.isBattleNpc();
+      actorApplicable = chara.isBattleNpc();
       break;
    }
    }
 
-   return ( actorApplicable && actor.isAlive() );
+   return ( actorApplicable && chara.isAlive() );
 }
 
-std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXIVARR_POSITION3 aoePosition,
-                                                                            std::set< ActorPtr > actorsInRange,
+std::set< Core::Entity::CharaPtr > ActionCollision::getActorsHitFromAction( FFXIVARR_POSITION3 aoePosition,
+                                                                            std::set< CharaPtr > actorsInRange,
                                                                             boost::shared_ptr< Core::Data::Action > actionInfo,
                                                                             TargetFilter targetFilter )
 {
-   std::set< ActorPtr > actorsCollided;
+   std::set< CharaPtr > actorsCollided;
 
    switch( static_cast< ActionCollisionType >( actionInfo->castType ) )
    {
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
index 0c0da597..470a31f2 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.h
+++ b/src/servers/sapphire_zone/Action/ActionCollision.h
@@ -4,7 +4,7 @@
 #include <common/Common.h>
 #include <common/Exd/ExdDataGenerated.h>
 
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 #include "Action.h"
 
 namespace Core {
@@ -23,9 +23,9 @@ namespace Entity {
    {
    public:
 
-      static bool isActorApplicable( Actor& actor, TargetFilter targetFilter );
-      static std::set< ActorPtr > getActorsHitFromAction( Common::FFXIVARR_POSITION3 aoePosition,
-                                                          std::set< ActorPtr > actorsInRange,
+      static bool isActorApplicable( Chara& actor, TargetFilter targetFilter );
+      static std::set< CharaPtr > getActorsHitFromAction( Common::FFXIVARR_POSITION3 aoePosition,
+                                                          std::set< CharaPtr > actorsInRange,
                                                           boost::shared_ptr< Data::Action > actionInfo,
                                                           TargetFilter targetFilter );
 
diff --git a/src/servers/sapphire_zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp
index 9ec4588e..53d72eca 100644
--- a/src/servers/sapphire_zone/Action/ActionMount.cpp
+++ b/src/servers/sapphire_zone/Action/ActionMount.cpp
@@ -24,7 +24,7 @@ Core::Action::ActionMount::ActionMount()
    m_handleActionType = HandleActionType::Event;
 }
 
-Core::Action::ActionMount::ActionMount( Entity::ActorPtr pActor, uint16_t mountId )
+Core::Action::ActionMount::ActionMount( Entity::CharaPtr pActor, uint16_t mountId )
 {
    m_startTime = 0;
    m_id = mountId;
diff --git a/src/servers/sapphire_zone/Action/ActionMount.h b/src/servers/sapphire_zone/Action/ActionMount.h
index ba32817d..3450a2b2 100644
--- a/src/servers/sapphire_zone/Action/ActionMount.h
+++ b/src/servers/sapphire_zone/Action/ActionMount.h
@@ -15,7 +15,7 @@ namespace Action {
       ActionMount();
       ~ActionMount();
       
-      ActionMount( Entity::ActorPtr pActor, uint16_t mountId );
+      ActionMount( Entity::CharaPtr pActor, uint16_t mountId );
 
       void onStart() override;
       void onFinish() override;
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
index 6151b2cd..18c41dee 100644
--- a/src/servers/sapphire_zone/Action/ActionTeleport.cpp
+++ b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
@@ -21,7 +21,7 @@ Core::Action::ActionTeleport::ActionTeleport()
    m_handleActionType = HandleActionType::Event;
 }
 
-Core::Action::ActionTeleport::ActionTeleport( Entity::ActorPtr pActor, uint16_t targetZone, uint16_t cost )
+Core::Action::ActionTeleport::ActionTeleport( Entity::CharaPtr pActor, uint16_t targetZone, uint16_t cost )
 {
    m_startTime = 0;
    m_id = 5;
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.h b/src/servers/sapphire_zone/Action/ActionTeleport.h
index 480090eb..fab98d06 100644
--- a/src/servers/sapphire_zone/Action/ActionTeleport.h
+++ b/src/servers/sapphire_zone/Action/ActionTeleport.h
@@ -17,7 +17,7 @@ namespace Action {
       ActionTeleport();
       ~ActionTeleport();
       
-      ActionTeleport( Entity::ActorPtr pActor, uint16_t action, uint16_t cost );
+      ActionTeleport( Entity::CharaPtr pActor, uint16_t action, uint16_t cost );
 
       void onStart() override;
       void onFinish() override;
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
index 47b9895f..5bdef79c 100644
--- a/src/servers/sapphire_zone/Action/EventAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventAction.cpp
@@ -21,7 +21,7 @@ Core::Action::EventAction::EventAction()
    m_handleActionType = HandleActionType::Event;
 }
 
-Core::Action::EventAction::EventAction( Entity::ActorPtr pActor, uint32_t eventId, uint16_t action,
+Core::Action::EventAction::EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
                                         ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional )
 {
    m_additional = additional;
diff --git a/src/servers/sapphire_zone/Action/EventAction.h b/src/servers/sapphire_zone/Action/EventAction.h
index f0857d34..a92831ef 100644
--- a/src/servers/sapphire_zone/Action/EventAction.h
+++ b/src/servers/sapphire_zone/Action/EventAction.h
@@ -16,7 +16,7 @@ namespace Action {
       EventAction();
       ~EventAction();
       
-      EventAction( Entity::ActorPtr pActor, uint32_t eventId, uint16_t action,
+      EventAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
                    ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional );
 
       void onStart() override;
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.cpp b/src/servers/sapphire_zone/Action/EventItemAction.cpp
index 28ddd8fb..742a40ae 100644
--- a/src/servers/sapphire_zone/Action/EventItemAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventItemAction.cpp
@@ -22,7 +22,7 @@ Core::Action::EventItemAction::EventItemAction()
    m_handleActionType = HandleActionType::Event;
 }
 
-Core::Action::EventItemAction::EventItemAction( Entity::ActorPtr pActor, uint32_t eventId, uint16_t action,
+Core::Action::EventItemAction::EventItemAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
                                                 ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional )
 {
    m_additional = additional;
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.h b/src/servers/sapphire_zone/Action/EventItemAction.h
index bd9eee9d..6c69e1aa 100644
--- a/src/servers/sapphire_zone/Action/EventItemAction.h
+++ b/src/servers/sapphire_zone/Action/EventItemAction.h
@@ -14,7 +14,7 @@ namespace Action {
       EventItemAction();
       ~EventItemAction();
       
-      EventItemAction( Entity::ActorPtr pActor, uint32_t eventId, uint16_t action,
+      EventItemAction( Entity::CharaPtr pActor, uint32_t eventId, uint16_t action,
                        ActionCallback finishRef, ActionCallback interruptRef, uint64_t additional );
 
       void onStart() override;
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 45b076a6..5fa1cc69 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -1,974 +1,94 @@
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-#include <common/Network/PacketContainer.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Network/GamePacket.h>
-
-#include "Forwards.h"
-#include "Action/Action.h"
-
-#include "Zone/Zone.h"
-
-#include "Network/GameConnection.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-#include "Network/PacketWrappers/ActorControlPacket144.h"
-#include "Network/PacketWrappers/UpdateHpMpTpPacket.h"
-
-#include "StatusEffect/StatusEffect.h"
-#include "Action/ActionCollision.h"
-#include "ServerZone.h"
-#include "Session.h"
-#include "Math/CalcBattle.h"
 #include "Actor.h"
+
 #include "Player.h"
-#include "Zone/TerritoryMgr.h"
-
-extern Core::ServerZone g_serverZone;
-extern Core::Data::ExdDataGenerated g_exdDataGen;
-extern Core::TerritoryMgr g_territoryMgr;
-
-using namespace Core::Common;
-using namespace Core::Network::Packets;
-using namespace Core::Network::Packets::Server;
+#include "Chara.h"
+#include "BattleNpc.h"
+#include "EventNpc.h"
 
 Core::Entity::Actor::Actor( ObjKind type ) :
-   GameObject( type )
+   m_objKind( type )
 {
-   // initialize the free slot queue
-   for( uint8_t i = 0; i < MAX_STATUS_EFFECTS; i++ )
-   {
-      m_statusEffectFreeSlotQueue.push( i );
-   }
-}
-
-Core::Entity::Actor::~Actor()
-{
-}
-
-/*! \return the actors name */
-std::string Core::Entity::Actor::getName() const
-{
-   return std::string( m_name );
-}
-
-/*! \return list of actors currently in range */
-std::set< Core::Entity::ActorPtr > Core::Entity::Actor::getInRangeActors( bool includeSelf )
-{
-   auto tempInRange = m_inRangeActors;
-
-   if( includeSelf )
-      tempInRange.insert( getAsActor() );
-
-   return tempInRange;
-   }
-
-/*! \return current stance of the actors */
-Core::Entity::Actor::Stance Core::Entity::Actor::getStance() const
-{
-   return m_currentStance;
-}
-
-/*! \return actor stats */
-Core::Entity::Actor::ActorStats Core::Entity::Actor::getStats() const
-{
-   return m_baseStats;
-}
-
-/*! \return current HP */
-uint32_t Core::Entity::Actor::getHp() const
-{
-   return m_hp;
-}
-
-/*! \return current MP */
-uint32_t Core::Entity::Actor::getMp() const
-{
-   return m_mp;
-}
-
-/*! \return current TP */
-uint16_t Core::Entity::Actor::getTp() const
-{
-   return m_tp;
-}
-
-/*! \return current GP */
-uint16_t Core::Entity::Actor::getGp() const
-{
-   return m_gp;
-}
-
-/*! \return current invincibility type */
-InvincibilityType Core::Entity::Actor::getInvincibilityType() const
-{
-   return m_invincibilityType;
-}
-
-/*! \return current class or job */
-Core::Common::ClassJob Core::Entity::Actor::getClass() const
-{
-   return m_class;
-}
-
-/*! \return current class or job as int32_t ( this feels pointless ) */
-uint8_t Core::Entity::Actor::getClassAsInt() const
-{
-   return static_cast< uint8_t >( m_class );
-}
-
-/*! \param ClassJob to set */
-void Core::Entity::Actor::setClass( Common::ClassJob classJob )
-{
-   m_class = classJob;
-}
-
-/*! \param Id of the target to set */
-void Core::Entity::Actor::setTargetId( uint64_t targetId )
-{
-   m_targetId = targetId;
-}
-
-/*! \return Id of the current target */
-uint64_t Core::Entity::Actor::getTargetId() const
-{
-   return m_targetId;
-}
-
-/*! \return True if the actor is alive */
-bool Core::Entity::Actor::isAlive() const
-{
-   return ( m_hp > 0 );
-}
-
-/*! \return max hp for the actor */
-uint32_t Core::Entity::Actor::getMaxHp() const
-{
-   return m_baseStats.max_hp;
-}
-
-/*! \return max mp for the actor */
-uint32_t Core::Entity::Actor::getMaxMp() const
-{
-   return m_baseStats.max_mp;
-}
-
-/*! \return reset hp to current max hp */
-void Core::Entity::Actor::resetHp()
-{
-   m_hp = getMaxHp();
-   sendStatusUpdate( true );
-}
-
-/*! \return reset mp to current max mp */
-void Core::Entity::Actor::resetMp()
-{
-   m_mp = getMaxMp();
-   sendStatusUpdate( true );
-}
-
-/*! \param hp amount to set ( caps to maxHp ) */
-void Core::Entity::Actor::setHp( uint32_t hp )
-{
-   m_hp = hp < getMaxHp() ? hp : getMaxHp();
-   sendStatusUpdate( true );
-}
-
-/*! \param mp amount to set ( caps to maxMp ) */
-void Core::Entity::Actor::setMp( uint32_t mp )
-{
-   m_mp = mp < getMaxMp() ? mp : getMaxMp();
-   sendStatusUpdate( true );
-}
-
-/*! \param gp amount to set*/
-void Core::Entity::Actor::setGp( uint32_t gp )
-{
-   m_gp = gp;
-   sendStatusUpdate( true );
-}
-
-/*! \param type invincibility type to set */
-void Core::Entity::Actor::setInvincibilityType( Common::InvincibilityType type )
-{
-   m_invincibilityType = type;
-}
-
-/*! \return current status of the actor */
-Core::Entity::Actor::ActorStatus Core::Entity::Actor::getStatus() const
-{
-   return m_status;
-}
-
-/*! \param status to set */
-void Core::Entity::Actor::setStatus( ActorStatus status )
-{
-   m_status = status;
-}
-
-/*!
-Performs necessary steps to mark an actor dead.
-Sets hp/mp/tp, sets status, plays animation and fires onDeath event
-*/
-void Core::Entity::Actor::die()
-{
-   m_status = ActorStatus::Dead;
-   m_hp = 0;
-   m_mp = 0;
-   m_tp = 0;
-
-   // fire onDeath event
-   onDeath();
-
-   // if the actor is a player, the update needs to be send to himself too
-   bool selfNeedsUpdate = isPlayer();
-
-   sendToInRangeSet( ActorControlPacket142( m_id, SetStatus, static_cast< uint8_t >( ActorStatus::Dead ) ), selfNeedsUpdate );
-
-   // TODO: not all actor show the death animation when they die, some quest npcs might just despawn
-   //       although that might be handled by setting the HP to 1 and doing some script magic
-   sendToInRangeSet( ActorControlPacket142( m_id, DeathAnimation, 0, 0, 0, 0x20 ), selfNeedsUpdate );
 
 }
 
-/*!
-Calculates and sets the rotation to look towards a specified
-position
-
-\param Position to look towards
-*/
-bool Core::Entity::Actor::face( const Common::FFXIVARR_POSITION3& p )
+uint32_t Core::Entity::Actor::getId() const
 {
-   float oldRot = getRotation();
-   float rot = Math::Util::calcAngFrom( getPos().x, getPos().z, p.x, p.z );
-   float newRot = PI - rot + ( PI / 2 );
-
-   m_pCell = nullptr;
-
-   setRotation( newRot );
-
-   return oldRot != newRot ? true : false;
+   return m_id;
 }
 
-/*!
-Sets the actors position and notifies the zone to propagate the change
-
-\param Position to set
-*/
-void Core::Entity::Actor::setPosition( const Common::FFXIVARR_POSITION3& pos )
+Core::Entity::Actor::ObjKind Core::Entity::Actor::getObjKind() const
 {
-   m_pos = pos;
-   m_pCurrentZone->updateActorPosition( *this );
+   return m_objKind;
 }
 
-void Core::Entity::Actor::setPosition( float x, float y, float z )
+Core::Common::FFXIVARR_POSITION3& Core::Entity::Actor::getPos()
+{
+   return m_pos;
+}
+
+void Core::Entity::Actor::setPos( float x, float y, float z )
 {
    m_pos.x = x;
    m_pos.y = y;
    m_pos.z = z;
-   m_pCurrentZone->updateActorPosition( *this );
 }
 
-/*!
-Set and propagate the actor stance to in range players
-( not the actor himself )
-
-\param stance to set
-*/
-void Core::Entity::Actor::setStance( Stance stance )
+void Core::Entity::Actor::setPos( const Core::Common::FFXIVARR_POSITION3& pos )
 {
-   m_currentStance = stance;
-
-   sendToInRangeSet( ActorControlPacket142( m_id, ToggleAggro, stance, 1 ) );
+   m_pos = pos;
 }
 
-/*!
-Check if an action is queued for execution, if so update it
-and if fully performed, clean up again.
-
-\return true if a queued action has been updated
-*/
-bool Core::Entity::Actor::checkAction()
-{
-
-   if( m_pCurrentAction == nullptr )
-      return false;
-
-   if( m_pCurrentAction->update() )
-      m_pCurrentAction.reset();
-
-   return true;
-
-}
-
-/*!
-Change the current target and propagate to in range players
-
-\param target actor id
-*/
-void Core::Entity::Actor::changeTarget( uint64_t targetId )
-{
-   setTargetId( targetId );
-   sendToInRangeSet( ActorControlPacket144( m_id, SetTarget, 0, 0, 0, 0, targetId ) );
-}
-
-/*!
-Dummy function \return 0
-*/
-uint8_t Core::Entity::Actor::getLevel() const
-{
-   return 0;
-}
-
-/*!
-Let an actor take damage and perform necessary steps
-according to resulting hp, propagates new hp value to players
-in range
-TODO: eventually this needs to distinguish between physical and
-magical dmg and take status effects into account
-
-\param amount of damage to be taken
-*/
-void Core::Entity::Actor::takeDamage( uint32_t damage )
-{
-   if( damage >= m_hp )
-   {
-      switch( m_invincibilityType ) { 
-         case InvincibilityNone: 
-            setHp( 0 );
-            die();
-            break;
-         case InvincibilityRefill:
-            resetHp();
-            break;
-         case InvincibilityStayAlive:
-            setHp( 0 );
-            break;
-      }
-   }
-   else
-      m_hp -= damage;
-
-   sendStatusUpdate( false );
-}
-
-/*!
-Let an actor get healed and perform necessary steps
-according to resulting hp, propagates new hp value to players
-in range
-
-\param amount of hp to be healed
-*/
-void Core::Entity::Actor::heal( uint32_t amount )
-{
-   if( ( m_hp + amount ) > getMaxHp() )
-   {
-      m_hp = getMaxHp();
-   }
-   else
-      m_hp += amount;
-
-   sendStatusUpdate( false );
-}
-
-/*!
-Send an HpMpTp update to players in range ( and potentially to self )
-TODO: poor naming, should be changed. Status is not HP. Also should be virtual
-so players can have their own version and we can abolish the param.
-
-\param true if the update should also be sent to the actor ( player ) himself
-*/
-void Core::Entity::Actor::sendStatusUpdate( bool toSelf )
-{
-   UpdateHpMpTpPacket updateHpPacket( *this );
-   sendToInRangeSet( updateHpPacket );
-}
-
-/*! \return ActionPtr of the currently registered action, or nullptr */
-Core::Action::ActionPtr Core::Entity::Actor::getCurrentAction() const
-{
-   return m_pCurrentAction;
-}
-
-/*! \param ActionPtr of the action to be registered */
-void Core::Entity::Actor::setCurrentAction( Core::Action::ActionPtr pAction )
-{
-   m_pCurrentAction = pAction;
-}
-
-/*!
-check if a given actor is in the actors in range set
-
-\param ActorPtr to be checked for
-\return true if the actor was found
-*/
-bool Core::Entity::Actor::isInRangeSet( ActorPtr pActor ) const
-{
-   return !( m_inRangeActors.find( pActor ) == m_inRangeActors.end() );
-}
-
-/*! \return ActorPtr of the closest actor in range, if none, nullptr */
-Core::Entity::ActorPtr Core::Entity::Actor::getClosestActor()
-{
-   if( m_inRangeActors.empty() )
-      // no actors in range, don't bother
-      return nullptr;
-
-   ActorPtr tmpActor = nullptr;
-
-   // arbitrary high number
-   float minDistance = 10000;
-
-   for( const auto& pCurAct : m_inRangeActors )
-   {
-      float distance = Math::Util::distance( getPos().x,
-                                             getPos().y,
-                                             getPos().z,
-                                             pCurAct->getPos().x,
-                                             pCurAct->getPos().y,
-                                             pCurAct->getPos().z );
-
-      if( distance < minDistance )
-      {
-         minDistance = distance;
-         tmpActor = pCurAct;
-      }
-   }
-
-   return tmpActor;
-}
-
-/*!
-Send a packet to all players in range, potentially to self if set and is player
-
-\param GamePacketPtr to send
-\param bool should be send to self?
-*/
-void Core::Entity::Actor::sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf )
-{
-
-   if( bToSelf && isPlayer() )
-   {
-      auto pPlayer = getAsPlayer();
-
-      auto pSession = g_serverZone.getSession( pPlayer->getId() );
-
-      // it might be that the player DC'd in which case the session would be invalid
-      if( pSession )
-         pSession->getZoneConnection()->queueOutPacket( pPacket );
-   }
-
-   if( m_inRangePlayers.empty() )
-      return;
-
-   for( const auto &pCurAct : m_inRangePlayers )
-   {
-      assert( pCurAct );
-      pPacket->setValAt< uint32_t >( 0x04, m_id );
-      pPacket->setValAt< uint32_t >( 0x08, pCurAct->m_id );
-      // it might be that the player DC'd in which case the session would be invalid
-      pCurAct->queuePacket( pPacket );
-   }
-}
-
-/*!
-Add a given actor to the fitting in range set according to type
-but also to the global actor map
-
-\param ActorPtr to add
-*/
-void Core::Entity::Actor::addInRangeActor( ActorPtr pActor )
-{
-
-   // if this is null, something went wrong
-   assert( pActor );
-
-   // add actor to in range set
-   m_inRangeActors.insert( pActor );
-
-   if( pActor->isPlayer() )
-   {
-      auto pPlayer = pActor->getAsPlayer();
-
-      // if actor is a player, add it to the in range player set
-      m_inRangePlayers.insert( pPlayer );
-   }
-}
-
-/*!
-Remove a given actor from the matching in range set according to type
-but also to the global actor map
-
-\param ActorPtr to remove
-*/
-void Core::Entity::Actor::removeInRangeActor( Actor& actor )
-{
-   // call virtual event
-   onRemoveInRangeActor( actor );
-
-   // remove actor from in range actor set
-   m_inRangeActors.erase( actor.getAsActor() );
-
-   // if actor is a player, despawn ourself for him
-   // TODO: move to virtual onRemove?
-   if( isPlayer() )
-      actor.despawn( getAsPlayer() );
-
-   if( actor.isPlayer() )
-      m_inRangePlayers.erase( actor.getAsPlayer() );
-}
-
-/*! \return true if there is at least one actor in the in range set */
-bool Core::Entity::Actor::hasInRangeActor() const
-{
-   return ( m_inRangeActors.size() > 0 );
-}
-
-void Core::Entity::Actor::removeFromInRange()
-{
-   if( !hasInRangeActor() )
-      return;
-
-   Entity::ActorPtr pCurAct;
-
-   for( auto& pCurAct : m_inRangeActors )
-   {
-      pCurAct->removeInRangeActor( *this );
-   }
-
-}
-
-/*! Clear the whole in range set, this does no cleanup */
-void Core::Entity::Actor::clearInRangeSet()
-{
-   m_inRangeActors.clear();
-   m_inRangePlayers.clear();
-}
-
-/*! \return ZonePtr to the current zone, nullptr if not set */
-Core::ZonePtr Core::Entity::Actor::getCurrentZone() const
-{
-   return m_pCurrentZone;
-}
-
-/*! \param ZonePtr to the zone to be set as current */
-void Core::Entity::Actor::setCurrentZone( ZonePtr currZone )
-{
-   m_pCurrentZone = currZone;
-}
-
-/*!
-Get the current cell of a region the actor is in
-
-\return Cell*
-*/
-Core::Cell * Core::Entity::Actor::getCell() const
-{
-   return m_pCell;
-}
-
-/*!
-Set the current cell the actor is in
-
-\param Cell* for the cell to be set
-*/
-void Core::Entity::Actor::setCell( Cell * pCell )
-{
-   m_pCell = pCell;
-}
-
-/*!
-Autoattack prototype implementation
-TODO: move the check if the autoAttack can be performed to the callee
-also rename autoAttack to autoAttack as that is more elaborate
-On top of that, this only solves attacks from melee classes.
-Will have to be extended for ranged attacks.
-
-\param ActorPtr the autoAttack is performed on
-*/
-void Core::Entity::Actor::autoAttack( ActorPtr pTarget )
-{
-
-   uint64_t tick = Util::getTimeMs();
-
-   if( ( tick - m_lastAttack ) > 2500 )
-   {
-      pTarget->onActionHostile( *this );
-      m_lastAttack = tick;
-      srand( static_cast< uint32_t >( tick ) );
-
-      uint16_t damage = static_cast< uint16_t >( 10 + rand() % 12 );
-      uint32_t variation = static_cast< uint32_t >( 0 + rand() % 4 );
-
-      ZoneChannelPacket< FFXIVIpcEffect > effectPacket( getId() );
-      effectPacket.data().targetId = pTarget->getId();
-      effectPacket.data().actionAnimationId = 0x366;
-      effectPacket.data().unknown_2 = variation;
-//      effectPacket.data().unknown_3 = 1;
-      effectPacket.data().actionTextId = 0x366;
-      effectPacket.data().numEffects = 1;
-      effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
-      effectPacket.data().effectTarget = pTarget->getId();
-      effectPacket.data().effects[0].value = damage;
-      effectPacket.data().effects[0].effectType = ActionEffectType::Damage;
-      effectPacket.data().effects[0].hitSeverity = static_cast< ActionHitSeverityType >( variation );
-      effectPacket.data().effects[0].unknown_3 = 7;
-
-      sendToInRangeSet( effectPacket );
-
-      if( this->isPlayer() )
-         this->getAsPlayer()->queuePacket( effectPacket );
-
-      pTarget->takeDamage( damage );
-   }
-}
-
-/*!
-ChaiScript Skill Handler.
-
-\param GamePacketPtr to send
-\param bool should be send to self?
-*/
-void Core::Entity::Actor::handleScriptSkill( uint32_t type, uint16_t actionId, uint64_t param1,
-                                             uint64_t param2, Entity::Actor& target )
-{
-
-   if( isPlayer() )
-   {
-      getAsPlayer()->sendDebug( std::to_string( target.getId() ) );
-      getAsPlayer()->sendDebug( "Handle script skill type: " + std::to_string( type ) );
-   }
-
-   auto actionInfoPtr = g_exdDataGen.get< Core::Data::Action >( actionId );
-
-   // Todo: Effect packet generator. 90% of this is basically setting params and it's basically unreadable.
-   // Prepare packet. This is seemingly common for all packets in the action handler.
-
-   ZoneChannelPacket< FFXIVIpcEffect > effectPacket( getId() );
-   effectPacket.data().targetId = target.getId();
-   effectPacket.data().actionAnimationId = actionId;
-   effectPacket.data().unknown_62 = 1; // Affects displaying action name next to number in floating text
-   effectPacket.data().unknown_2 = 1;  // This seems to have an effect on the "double-cast finish" animation
-   effectPacket.data().actionTextId = actionId;
-   effectPacket.data().numEffects = 1;
-   effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
-   effectPacket.data().effectTarget = target.getId();
-
-   // Todo: for each actor, calculate how much damage the calculated value should deal to them - 2-step damage calc. we only have 1-step
-   switch( type )
-   {
-
-   case ActionEffectType::Damage:
-   {
-      effectPacket.data().effects[0].value = static_cast< uint16_t >( param1 );
-      effectPacket.data().effects[0].effectType = ActionEffectType::Damage;
-      effectPacket.data().effects[0].hitSeverity = ActionHitSeverityType::NormalDamage;
-      effectPacket.data().effects[0].unknown_3 = 7;
-
-      if( actionInfoPtr->castType == 1 && actionInfoPtr->effectRange != 0 || actionInfoPtr->castType != 1 )
-      {
-         // If action on this specific target is valid...
-         if ( isPlayer() && !ActionCollision::isActorApplicable( target, TargetFilter::Enemies ) )
-            break;
-
-         sendToInRangeSet( effectPacket, true );
-
-         if ( target.isAlive() )
-            target.onActionHostile( *this );
-
-         target.takeDamage( static_cast< uint32_t >( param1 ) );
-
-      }
-      else
-      {
-
-         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeActors( true ),
-                                                                        actionInfoPtr, TargetFilter::Enemies );
-
-         for( const auto& pHitActor : actorsCollided )
-         {
-            effectPacket.data().targetId = pHitActor->getId();
-            effectPacket.data().effectTarget = pHitActor->getId();
-
-            // todo: send to range of what? ourselves? when mob script hits this is going to be lacking
-            sendToInRangeSet( effectPacket, true );
-
-
-            if( pHitActor->isAlive() )
-               pHitActor->onActionHostile( *this );
-
-            pHitActor->takeDamage( static_cast< uint32_t >( param1 ) );
-
-            // Debug
-            if ( isPlayer() ) 
-            {
-               if ( pHitActor->isPlayer() )
-                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) + " (" + pHitActor->getName() + ")" );
-               else
-                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) );
-            }  
-         }
-      }
-
-      break;
-   }
-
-   case ActionEffectType::Heal:
-   {
-      uint32_t calculatedHeal = Math::CalcBattle::calculateHealValue( getAsPlayer(), static_cast< uint32_t >( param1 ) );
-
-      effectPacket.data().effects[0].value = calculatedHeal;
-      effectPacket.data().effects[0].effectType = ActionEffectType::Heal;
-      effectPacket.data().effects[0].hitSeverity = ActionHitSeverityType::NormalHeal;
-
-      if( actionInfoPtr->castType == 1 && actionInfoPtr->effectRange != 0 || actionInfoPtr->castType != 1 )
-      {
-         if( isPlayer() && !ActionCollision::isActorApplicable( target, TargetFilter::Allies ) )
-            break;
-
-         sendToInRangeSet( effectPacket, true );
-         target.heal( calculatedHeal );
-      }
-      else
-      {
-         // todo: get proper packets: the following was just kind of thrown together from what we know.
-         // atm buggy (packets look "delayed" from client)
-
-         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeActors( true ),
-                                                                        actionInfoPtr, TargetFilter::Allies );
-
-         for( auto pHitActor : actorsCollided )
-         {
-            effectPacket.data().targetId = target.getId();
-            effectPacket.data().effectTarget = pHitActor->getId();
-
-            sendToInRangeSet( effectPacket, true );
-            pHitActor->heal( calculatedHeal );
-
-            // Debug
-            if( isPlayer() )
-            {
-               if( pHitActor->isPlayer() )
-                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) + " (" + pHitActor->getName() + ")" );
-               else
-                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) );
-            }
-         }
-      }
-      break;
-   }
-
-   default:
-      break;
-   }
-}
-
-/*! \param StatusEffectPtr to be applied to the actor */
-void Core::Entity::Actor::addStatusEffect( StatusEffect::StatusEffectPtr pEffect )
-{
-   int8_t nextSlot = getStatusEffectFreeSlot();
-   // if there is no slot left, do not add the effect
-   if( nextSlot == -1 )
-      return;
-
-   pEffect->applyStatus();
-   m_statusEffectMap[nextSlot] = pEffect;
-
-   ZoneChannelPacket< Server::FFXIVIpcAddStatusEffect > statusEffectAdd( getId() );
-   statusEffectAdd.data().actor_id = pEffect->getTargetActorId();
-   statusEffectAdd.data().actor_id1 = pEffect->getSrcActorId(); 
-   statusEffectAdd.data().current_hp = getHp();
-   statusEffectAdd.data().current_mp = getMp();
-   statusEffectAdd.data().current_tp = getTp();
-   statusEffectAdd.data().duration = static_cast< float >( pEffect->getDuration() ) / 1000;
-   statusEffectAdd.data().effect_id = pEffect->getId();
-   statusEffectAdd.data().effect_index = nextSlot;
-   statusEffectAdd.data().max_hp = getMaxHp();
-   statusEffectAdd.data().max_mp = getMaxMp();
-   statusEffectAdd.data().max_something = 1;
-    //statusEffectAdd.data().unknown2 = 28;
-   statusEffectAdd.data().param = pEffect->getParam();
-
-   sendToInRangeSet( statusEffectAdd, isPlayer() );
-}
-
-/*! \param StatusEffectPtr to be applied to the actor */
-void Core::Entity::Actor::addStatusEffectById( uint32_t id, int32_t duration, Entity::Actor& source, uint16_t param )
-{
-   auto effect = StatusEffect::make_StatusEffect( id, source.getAsActor(), getAsActor(), duration, 3000 );
-   effect->setParam( param );
-   addStatusEffect( effect );
-}
-
-/*! \param StatusEffectPtr to be applied to the actor */
-void Core::Entity::Actor::addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Actor& source, uint16_t param )
-{
-   if( hasStatusEffect( id ) )
-      return;
-
-   auto effect = StatusEffect::make_StatusEffect( id, source.getAsActor(), getAsActor(), duration, 3000 );
-   effect->setParam( param );
-   addStatusEffect( effect );
-
-}
-
-float Core::Entity::Actor::getRotation() const
+float Core::Entity::Actor::getRot() const
 {
    return m_rot;
 }
 
-void Core::Entity::Actor::setRotation( float rot )
+void Core::Entity::Actor::setRot( float rot )
 {
    m_rot = rot;
 }
 
-int8_t Core::Entity::Actor::getStatusEffectFreeSlot()
+bool Core::Entity::Actor::isPlayer() const
 {
-   int8_t freeEffectSlot = -1;
-
-   if( m_statusEffectFreeSlotQueue.empty() )
-      return freeEffectSlot;
-
-   freeEffectSlot = m_statusEffectFreeSlotQueue.front();
-   m_statusEffectFreeSlotQueue.pop();
-
-   return freeEffectSlot;
+   return m_objKind == ObjKind::Player;
 }
 
-void Core::Entity::Actor::statusEffectFreeSlot( uint8_t slotId )
+bool Core::Entity::Actor::isBattleNpc() const
 {
-   m_statusEffectFreeSlotQueue.push( slotId );
+   return m_objKind == ObjKind::BattleNpc;
 }
 
-void Core::Entity::Actor::removeSingleStatusEffectById( uint32_t id )
+bool Core::Entity::Actor::isEventNpc() const
 {
-   for( auto effectIt : m_statusEffectMap )
-   {
-      if( effectIt.second->getId() == id )
-      {
-         removeStatusEffect( effectIt.first );
-         break;
-      }
-   }
+   return m_objKind == ObjKind::EventNpc;
 }
 
-void Core::Entity::Actor::removeStatusEffect( uint8_t effectSlotId )
+/*! \return pointer to this instance as ActorPtr */
+Core::Entity::CharaPtr Core::Entity::Actor::getAsChara()
 {
-   auto pEffectIt = m_statusEffectMap.find( effectSlotId );
-   if( pEffectIt == m_statusEffectMap.end() )
-      return;
-
-   statusEffectFreeSlot( effectSlotId );
-
-   auto pEffect = pEffectIt->second;
-   pEffect->removeStatus();
-
-   sendToInRangeSet( ActorControlPacket142( getId(), StatusEffectLose, pEffect->getId() ), isPlayer() );
-
-   m_statusEffectMap.erase( effectSlotId );
-
-   sendStatusEffectUpdate();
+   return boost::dynamic_pointer_cast< Entity::Chara, Entity::Actor >( shared_from_this() );
 }
 
-std::map< uint8_t, Core::StatusEffect::StatusEffectPtr > Core::Entity::Actor::getStatusEffectMap() const
+/*! \return pointer to this instance as PlayerPtr */
+Core::Entity::PlayerPtr Core::Entity::Actor::getAsPlayer()
 {
-   return m_statusEffectMap;
+   if( !isPlayer() )
+      return nullptr;
+   return boost::dynamic_pointer_cast< Entity::Player, Entity::Actor >( shared_from_this() );
 }
 
-void Core::Entity::Actor::sendStatusEffectUpdate()
+/*! \return pointer to this instance as BattleNpcPtr */
+Core::Entity::BattleNpcPtr Core::Entity::Actor::getAsBattleNpc()
 {
-   uint64_t currentTimeMs = Util::getTimeMs();
-
-   ZoneChannelPacket< Server::FFXIVIpcStatusEffectList > statusEffectList( getId() );
-
-   statusEffectList.data().current_hp = getHp();
-   statusEffectList.data().current_mp = getMp();
-   statusEffectList.data().currentTp = getTp();
-   statusEffectList.data().max_hp = getMaxHp();
-   statusEffectList.data().max_mp = getMaxMp();
-   uint8_t slot = 0;
-   for( auto effectIt : m_statusEffectMap )
-   {
-      float timeLeft = static_cast< float >( effectIt.second->getDuration() - 
-                                             ( currentTimeMs - effectIt.second->getStartTimeMs() ) ) / 1000;
-      statusEffectList.data().effect[slot].duration = timeLeft;
-      statusEffectList.data().effect[slot].effect_id = effectIt.second->getId();
-      statusEffectList.data().effect[slot].sourceActorId = effectIt.second->getSrcActorId();
-      slot++;
-   }
-
-   sendToInRangeSet( statusEffectList, isPlayer() );
-
+   if( !isBattleNpc() )
+      return nullptr;
+   return boost::dynamic_pointer_cast< Entity::BattleNpc, Entity::Actor >( shared_from_this() );
 }
 
-void Core::Entity::Actor::updateStatusEffects()
+/*! \return pointer to this instance as EventNpcPtr */
+Core::Entity::EventNpcPtr Core::Entity::Actor::getAsEventNpc()
 {
-   uint64_t currentTimeMs = Util::getTimeMs();
-
-   uint32_t thisTickDmg = 0;
-   uint32_t thisTickHeal = 0;
-
-   for( auto effectIt : m_statusEffectMap )
-   {
-      uint8_t effectIndex = effectIt.first;
-      auto effect = effectIt.second;
-
-      uint64_t lastTick = effect->getLastTickMs();
-      uint64_t startTime = effect->getStartTimeMs();
-      uint32_t duration = effect->getDuration();
-      uint32_t tickRate = effect->getTickRate();
-
-      if( ( currentTimeMs - startTime ) > duration )
-      {
-         // remove status effect
-         removeStatusEffect( effectIndex );
-         // break because removing invalidates iterators
-         break;
-      }
-
-      if( ( currentTimeMs - lastTick ) > tickRate )
-      {
-         effect->setLastTick( currentTimeMs );
-         effect->onTick();
-
-         auto thisEffect = effect->getTickEffect();
-
-         switch( thisEffect.first )
-         {
-
-         case 1:
-         {
-            thisTickDmg += thisEffect.second;
-            break;
-         }
-
-         case 2:
-         {
-            thisTickHeal += thisEffect.second;
-            break;
-         }
-
-         }
-      }
-
-   }
-
-   if( thisTickDmg != 0 )
-   {
-      takeDamage( thisTickDmg );
-      sendToInRangeSet( ActorControlPacket142( getId(), HPFloatingText, 0, static_cast< uint8_t >( ActionEffectType::Damage ), thisTickDmg ) );
-   }
-
-   if( thisTickHeal != 0 )
-   {
-      heal( thisTickDmg );
-      sendToInRangeSet( ActorControlPacket142( getId(), HPFloatingText, 0, static_cast< uint8_t >( ActionEffectType::Heal ), thisTickHeal ) );
-   }
-}
-
-bool Core::Entity::Actor::hasStatusEffect( uint32_t id )
-{
-   if( m_statusEffectMap.find( id ) != m_statusEffectMap.end() )
-      return true;
-   return false;
+   if( !isEventNpc() )
+      return nullptr;
+   return boost::dynamic_pointer_cast< Entity::EventNpc, Entity::Actor >( shared_from_this() );
 }
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index cb2142af..ccd5996c 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -1,11 +1,10 @@
-#ifndef _ACTOR_H_
-#define _ACTOR_H_
+#ifndef _GAME_OBJECT_H_
+#define _GAME_OBJECT_H_
 
 #include <common/Common.h>
 #include <boost/enable_shared_from_this.hpp>
 
 #include "Forwards.h"
-#include "GameObject.h"
 #include <set>
 #include <map>
 #include <queue>
@@ -14,282 +13,70 @@ namespace Core {
 namespace Entity {
 
 /*!
-\class Actor
-\brief Base class for all actors
+\class GameObject
+\brief Base class for all actor/objects
 
 */
-class Actor : public GameObject
-{
-public:
-   enum Stance : uint8_t
+   class Actor : public boost::enable_shared_from_this< Actor >
    {
-      Passive = 0,
-      Active = 1,
+   public:
+      enum ObjKind : uint8_t
+      {
+         None = 0x00,
+         Player = 0x01,
+         BattleNpc = 0x02,
+         EventNpc = 0x03,
+         Treasure = 0x04,
+         Aetheryte = 0x05,
+         GatheringPoint = 0x06,
+         EventObj = 0x07,
+         Mount = 0x08,
+         Companion = 0x09,
+         Retainer = 0x0A,
+         Area = 0x0B,
+         Housing = 0x0C,
+         Cutscene = 0x0D,
+         CardStand = 0x0E,
+      };
+
+   protected:
+      /*! Position of the object */
+      Common::FFXIVARR_POSITION3 m_pos;
+      /*! Rotation of the object */
+      float m_rot;
+      /*! Id of the actor */
+      uint32_t             m_id;
+      /*! Type of the actor */
+      ObjKind              m_objKind;
+
+   public:
+      explicit Actor( ObjKind type );
+      virtual ~Actor() {};
+
+      virtual void spawn( PlayerPtr pTarget ) {}
+      virtual void despawn( PlayerPtr pTarget ) {}
+
+      uint32_t getId() const;
+
+      ObjKind getObjKind() const;
+
+      Common::FFXIVARR_POSITION3& getPos();
+      void setPos( const Common::FFXIVARR_POSITION3& pos );
+      void setPos( float x, float y, float z );
+
+      float getRot() const;
+      void setRot( float rot );
+
+      bool isPlayer() const;
+      bool isBattleNpc() const;
+      bool isEventNpc() const;
+
+      CharaPtr getAsChara();
+      PlayerPtr getAsPlayer();
+      BattleNpcPtr getAsBattleNpc();
+      EventNpcPtr getAsEventNpc();
    };
 
-   enum DisplayFlags : uint16_t
-   {
-      ActiveStance = 0x001,
-      Invisible = 0x020,
-      HideHead = 0x040,
-      HideWeapon = 0x080,
-      Faded = 0x100,
-      Visor = 0x800,
-   };
-
-   enum struct ActorStatus : uint8_t
-   {
-      Idle = 0x01,
-      Dead = 0x02,
-      Sitting = 0x03,
-      Mounted = 0x04,
-      Crafting = 0x05,
-      Gathering = 0x06,
-      Melding = 0x07,
-      SMachine = 0x08
-   };
-
-   struct ActorStats
-   {
-      uint32_t max_mp = 0;
-      uint32_t max_hp = 0;
-
-      uint32_t str = 0;
-      uint32_t dex = 0;
-      uint32_t vit = 0;
-      uint32_t inte = 0;
-      uint32_t mnd = 0;
-      uint32_t pie = 0;
-
-      uint32_t tenacity = 0;
-      uint32_t attack = 0;
-      uint32_t defense = 0;
-      uint32_t accuracy = 0;
-      uint32_t spellSpeed = 0;
-      uint32_t magicDefense = 0;
-      uint32_t critHitRate = 0;
-      uint32_t resistSlash = 0;
-      uint32_t resistPierce = 0;
-      uint32_t resistBlunt = 0;
-      uint32_t attackPotMagic = 0;
-      uint32_t healingPotMagic = 0;
-      uint32_t determination = 0;
-      uint32_t skillSpeed = 0;
-
-      uint32_t resistSlow = 0;
-      uint32_t resistSilence = 0;
-      uint32_t resistBlind = 0;
-      uint32_t resistPoison = 0;
-      uint32_t resistStun = 0;
-      uint32_t resistSleep = 0;
-      uint32_t resistBind = 0;
-      uint32_t resistHeavy = 0;
-
-      uint32_t resistFire = 0;
-      uint32_t resistIce = 0;
-      uint32_t resistWind = 0;
-      uint32_t resistEarth = 0;
-      uint32_t resistLightning = 0;
-      uint32_t resistWater = 0;
-
-   } m_baseStats;
-
-protected:
-   char                 m_name[34];
-   /*! Id of the zone the actor currently is in */
-   uint32_t	            m_zoneId;
-   /*! Ptr to the ZoneObj the actor belongs to */
-   ZonePtr              m_pCurrentZone;
-   /*! Last tick time for the actor  ( in ms ) */
-   uint64_t             m_lastTickTime;
-   /*! Last time the actor performed an autoAttack ( in ms ) */
-   uint64_t	            m_lastAttack;
-   /*! Last time the actor was updated ( in ms ) */
-   uint64_t             m_lastUpdate;
-   /*! Current stance of the actor */
-   Stance               m_currentStance;
-   /*! Current staus of the actor */
-   ActorStatus          m_status;
-   /*! Max HP of the actor ( based on job / class ) */
-   uint32_t             m_maxHp;
-   /*! Max MP of the actor ( based on job / class ) */
-   uint32_t             m_maxMp;
-   /*! Current HP of the actor */
-   uint32_t	            m_hp;
-   /*! Current MP of the actor */
-   uint32_t             m_mp;
-   /*! Current TP of the actor */
-   uint16_t             m_tp;
-   /*! Current GP of the actor */
-   uint16_t             m_gp;
-   /*! Additional look info of the actor */
-   uint8_t              m_customize[26];
-   /*! Current class of the actor */
-   Common::ClassJob     m_class;
-   /*! Id of the currently selected target actor */
-   uint64_t             m_targetId;
-   /*! Ptr to a queued action */
-   Action::ActionPtr    m_pCurrentAction;
-   /*! Invincibility type */
-   Common::InvincibilityType m_invincibilityType;
-
-   /*! Status effects */
-   const uint8_t MAX_STATUS_EFFECTS = 30;
-   std::queue< uint8_t > m_statusEffectFreeSlotQueue;
-   std::vector< std::pair< uint8_t, uint32_t> > m_statusEffectList;
-   std::map< uint8_t, StatusEffect::StatusEffectPtr > m_statusEffectMap;
-
-   std::set< ActorPtr > m_inRangeActors;
-   std::set< PlayerPtr > m_inRangePlayers;
-
-public:
-   Actor( ObjKind type );
-
-   virtual ~Actor() override;
-
-   virtual void calculateStats() {};
-
-   /// Status effect functions 
-   void addStatusEffect( StatusEffect::StatusEffectPtr pEffect );
-   void removeStatusEffect( uint8_t effectSlotId );
-   void removeSingleStatusEffectById( uint32_t id );
-   void updateStatusEffects();
-
-   bool hasStatusEffect( uint32_t id );
-
-   int8_t getStatusEffectFreeSlot();
-   void statusEffectFreeSlot( uint8_t slotId );
-
-   std::map< uint8_t, Core::StatusEffect::StatusEffectPtr > getStatusEffectMap() const;
-
-   void sendStatusEffectUpdate();
-   // add a status effect by id
-   void addStatusEffectById( uint32_t id, int32_t duration, Entity::Actor& pSource, uint16_t param = 0 );
-
-   // add a status effect by id if it doesn't exist
-   void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Actor& pSource, uint16_t param = 0 );
-
-   // remove a status effect by id
-   void removeSingleStatusEffectFromId( uint32_t id );
-   /// End Status Effect Functions
-
-   void setPosition( const Common::FFXIVARR_POSITION3& pos );
-   void setPosition( float x, float y, float z );
-
-   void setRotation( float rot );
-
-   float getRotation() const;
-
-   std::string getName() const;
-
-   std::set< ActorPtr > getInRangeActors( bool includeSelf = false );
-
-   bool face( const Common::FFXIVARR_POSITION3& p );
-
-   Stance getStance() const;
-
-   void setStance( Stance stance );
-
-   ActorStats getStats() const;
-
-   uint32_t getHp() const;
-   uint32_t getMp() const;
-   uint16_t getTp() const;
-   uint16_t getGp() const;
-
-   Common::InvincibilityType getInvincibilityType() const;
-
-   Common::ClassJob getClass() const;
-
-   uint8_t getClassAsInt() const;
-
-   void setClass( Common::ClassJob classJob );
-
-   void setTargetId( uint64_t targetId );
-
-   uint64_t getTargetId() const;
-
-   bool isAlive() const;
-
-   virtual uint32_t getMaxHp() const;
-   virtual uint32_t getMaxMp() const;
-
-   void resetHp();
-   void resetMp();
-
-   void setHp( uint32_t hp );
-   void setMp( uint32_t mp );
-   void setGp( uint32_t gp );
-
-   void setInvincibilityType( Common::InvincibilityType type );
-
-   void die();
-
-   ActorStatus getStatus() const;
-
-   void setStatus( ActorStatus  status );
-
-   void handleScriptSkill( uint32_t type, uint16_t actionId, uint64_t param1, uint64_t param2, Entity::Actor& target );
-
-   virtual void autoAttack( ActorPtr pTarget );
-
-   virtual void onRemoveInRangeActor( Actor& pActor ) {}
-
-   virtual void onDeath() {};
-   virtual void onDamageTaken( Actor& pSource ) {};
-   virtual void onActionHostile( Actor& source ) {};
-   virtual void onActionFriendly( Actor& pSource ) {};
-   virtual void onTick() {};
-
-   virtual void changeTarget( uint64_t targetId );
-   virtual uint8_t getLevel() const;
-   virtual void sendStatusUpdate( bool toSelf = true );
-   virtual void takeDamage( uint32_t damage );
-   virtual void heal( uint32_t amount );
-   virtual bool checkAction();
-   virtual void update( int64_t currTime ) {};
-
-   Action::ActionPtr getCurrentAction() const;
-
-   void setCurrentAction( Action::ActionPtr pAction );
-
-   ///// IN RANGE LOGIC /////
-
-   // check if another actor is in the actors in range set
-   bool isInRangeSet( ActorPtr pActor ) const;
-
-   ActorPtr getClosestActor();
-
-   void sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf = false );
-
-   // add an actor to in range set
-   void addInRangeActor( ActorPtr pActor );
-
-   // remove an actor from the in range set
-   void removeInRangeActor( Actor& pActor );
-
-   // return true if there is at least one actor in the in range set
-   bool hasInRangeActor() const;
-
-   void removeFromInRange();
-
-   // clear the whole in range set, this does no cleanup
-   virtual void clearInRangeSet();
-
-   ZonePtr getCurrentZone() const;
-
-   void setCurrentZone( ZonePtr currZone );
-
-   // get the current cell of a region the actor is in
-   Cell* getCell() const;
-
-   // set the current cell
-   void setCell( Cell* pCell );
-
-   Core::Cell* m_pCell;
-
-};
-
 }
 }
 #endif
diff --git a/src/servers/sapphire_zone/Actor/BattleNpc.cpp b/src/servers/sapphire_zone/Actor/BattleNpc.cpp
index 5b43728b..26d76f4a 100644
--- a/src/servers/sapphire_zone/Actor/BattleNpc.cpp
+++ b/src/servers/sapphire_zone/Actor/BattleNpc.cpp
@@ -26,7 +26,7 @@ extern Core::Data::ExdDataGenerated g_exdDataGen;
 uint32_t Core::Entity::BattleNpc::m_nextID = 1149241694;
 
 Core::Entity::BattleNpc::BattleNpc() :
-   Actor( ObjKind::BattleNpc )
+   Chara( ObjKind::BattleNpc )
 {
    m_id = 0;
    m_status = ActorStatus::Idle;
@@ -40,7 +40,7 @@ Core::Entity::BattleNpc::~BattleNpc()
 Core::Entity::BattleNpc::BattleNpc( uint16_t modelId, uint16_t nameid, const Common::FFXIVARR_POSITION3& spawnPos,
                                     uint16_t bnpcBaseId, uint32_t type, uint8_t level, uint8_t behaviour,
                                     uint32_t mobType ) :
-   Actor( ObjKind::BattleNpc )
+   Chara( ObjKind::BattleNpc )
 {
    BattleNpc::m_nextID++;
    m_id = BattleNpc::m_nextID;
@@ -177,16 +177,16 @@ uint8_t Core::Entity::BattleNpc::getbehavior() const
    return m_behavior;
 }
 
-void Core::Entity::BattleNpc::hateListAdd( Actor& actor, int32_t hateAmount )
+void Core::Entity::BattleNpc::hateListAdd( Chara& actor, int32_t hateAmount )
 {
    auto hateEntry = new HateListEntry();
    hateEntry->m_hateAmount = hateAmount;
-   hateEntry->m_pActor = actor.getAsActor();
+   hateEntry->m_pChara = actor.getAsChara();
 
    m_hateList.insert( hateEntry );
 }
 
-Core::Entity::ActorPtr Core::Entity::BattleNpc::hateListGetHighest()
+Core::Entity::CharaPtr Core::Entity::BattleNpc::hateListGetHighest()
 {
 
    auto it = m_hateList.begin();
@@ -202,7 +202,7 @@ Core::Entity::ActorPtr Core::Entity::BattleNpc::hateListGetHighest()
    }
 
    if( entry && maxHate != 0 )
-      return entry->m_pActor;
+      return entry->m_pChara;
 
    return nullptr;
 }
@@ -274,7 +274,7 @@ bool Core::Entity::BattleNpc::moveTo( Common::FFXIVARR_POSITION3& pos )
 
 }
 
-void Core::Entity::BattleNpc::aggro( Actor& actor )
+void Core::Entity::BattleNpc::aggro( Chara& actor )
 {
 
    m_lastAttack = Util::getTimeMs();
@@ -292,7 +292,7 @@ void Core::Entity::BattleNpc::aggro( Actor& actor )
    }
 }
 
-void Core::Entity::BattleNpc::deaggro( Actor& actor )
+void Core::Entity::BattleNpc::deaggro( Chara& actor )
 {
    if( !hateListHasActor( actor ) )
       hateListRemove( actor );
@@ -309,8 +309,8 @@ void Core::Entity::BattleNpc::hateListClear()
    auto it = m_hateList.begin();
    for( ; it != m_hateList.end(); ++it )
    {
-      if( isInRangeSet( ( *it )->m_pActor ) )
-         deaggro( *( *it )->m_pActor );
+      if( isInRangeSet( ( *it )->m_pChara ) )
+         deaggro( *( *it )->m_pChara );
       HateListEntry* tmpListEntry = ( *it );
       delete tmpListEntry;
    }
@@ -318,12 +318,12 @@ void Core::Entity::BattleNpc::hateListClear()
 }
 
 
-void Core::Entity::BattleNpc::hateListRemove( Actor& actor )
+void Core::Entity::BattleNpc::hateListRemove( Chara& actor )
 {
    auto it = m_hateList.begin();
    for( ; it != m_hateList.end(); ++it )
    {
-      if( ( *it )->m_pActor->getId() == actor.getId() )
+      if( ( *it )->m_pChara->getId() == actor.getId() )
       {
          HateListEntry* pEntry = *it;
          m_hateList.erase( it );
@@ -338,12 +338,12 @@ void Core::Entity::BattleNpc::hateListRemove( Actor& actor )
    }
 }
 
-bool Core::Entity::BattleNpc::hateListHasActor( Actor& actor )
+bool Core::Entity::BattleNpc::hateListHasActor( Chara& actor )
 {
    auto it = m_hateList.begin();
    for( ; it != m_hateList.end(); ++it )
    {
-      if( ( *it )->m_pActor->getId() == actor.getId() )
+      if( ( *it )->m_pChara->getId() == actor.getId() )
          return true;
    }
    return false;
@@ -359,13 +359,13 @@ uint32_t Core::Entity::BattleNpc::getNameId() const
    return m_nameId;
 }
 
-void Core::Entity::BattleNpc::hateListUpdate( Actor& actor, int32_t hateAmount )
+void Core::Entity::BattleNpc::hateListUpdate( Chara& actor, int32_t hateAmount )
 {
 
    auto it = m_hateList.begin();
    for( ; it != m_hateList.end(); ++it )
    {
-      if( ( *it )->m_pActor->getId() == actor.getId() )
+      if( ( *it )->m_pChara->getId() == actor.getId() )
       {
          ( *it )->m_hateAmount += hateAmount;
          return;
@@ -374,7 +374,7 @@ void Core::Entity::BattleNpc::hateListUpdate( Actor& actor, int32_t hateAmount )
 
    auto hateEntry = new HateListEntry();
    hateEntry->m_hateAmount = hateAmount;
-   hateEntry->m_pActor = actor.getAsActor();
+   hateEntry->m_pChara = actor.getAsChara();
    m_hateList.insert( hateEntry );
 }
 
@@ -396,7 +396,7 @@ void Core::Entity::BattleNpc::onDeath()
       uint32_t totalHate = 0;
       for( auto& pHateEntry : m_hateList )
       {
-         if( pHateEntry->m_pActor->isPlayer() )
+         if( pHateEntry->m_pChara->isPlayer() )
          {
             if( pHateEntry->m_hateAmount < minHate )
                minHate = pHateEntry->m_hateAmount;
@@ -412,9 +412,9 @@ void Core::Entity::BattleNpc::onDeath()
       {
          // todo: this is pure retarded
          // todo: check for companion
-         if( pHateEntry->m_pActor->isPlayer()  ) // && pHateEntry->m_hateAmount >= plsBeHatedThisMuchAtLeast )
+         if( pHateEntry->m_pChara->isPlayer()  ) // && pHateEntry->m_hateAmount >= plsBeHatedThisMuchAtLeast )
          {
-            uint8_t level = pHateEntry->m_pActor->getLevel();
+            uint8_t level = pHateEntry->m_pChara->getLevel();
             auto levelDiff = static_cast< int32_t >( this->m_level ) - level;
             auto cappedLevelDiff = Math::Util::clamp( levelDiff, 1, 6 );
 
@@ -439,7 +439,7 @@ void Core::Entity::BattleNpc::onDeath()
             // todo: this is actually retarded, we need real rand()
             srand( static_cast< uint32_t > ( time( nullptr ) ) );
 
-            auto pPlayer = pHateEntry->m_pActor->getAsPlayer();
+            auto pPlayer = pHateEntry->m_pChara->getAsPlayer();
             pPlayer->gainExp( exp );
             pPlayer->onMobKill( m_nameId );
          }
@@ -448,7 +448,7 @@ void Core::Entity::BattleNpc::onDeath()
    hateListClear();
 }
 
-void Core::Entity::BattleNpc::onActionHostile( Actor& source )
+void Core::Entity::BattleNpc::onActionHostile( Chara& source )
 {
 
    if( hateListGetHighest() == nullptr )
@@ -458,7 +458,7 @@ void Core::Entity::BattleNpc::onActionHostile( Actor& source )
       setOwner( source.getAsPlayer() );
 }
 
-Core::Entity::ActorPtr Core::Entity::BattleNpc::getClaimer() const
+Core::Entity::CharaPtr Core::Entity::BattleNpc::getClaimer() const
 {
    return m_pOwner;
 }
@@ -501,46 +501,46 @@ void Core::Entity::BattleNpc::update( int64_t currTime )
 
    case MODE_IDLE:
    {
-      ActorPtr pClosestActor = getClosestActor();
+      CharaPtr pClosestChara = getClosestChara();
 
-      if( pClosestActor && pClosestActor->isAlive() )
+      if( pClosestChara && pClosestChara->isAlive() )
       {
          distance = Math::Util::distance( getPos().x, getPos().y, getPos().z,
-                                          pClosestActor->getPos().x,
-                                          pClosestActor->getPos().y,
-                                          pClosestActor->getPos().z );
+                                          pClosestChara->getPos().x,
+                                          pClosestChara->getPos().y,
+                                          pClosestChara->getPos().z );
 
          //if( distance < 8 && getbehavior() == 2 )
-         //   aggro( pClosestActor );
+         //   aggro( pClosestChara );
       }
    }
    break;
 
    case MODE_COMBAT:
    {
-      ActorPtr pClosestActor = hateListGetHighest();
+      CharaPtr pClosestChara = hateListGetHighest();
 
-      if( pClosestActor != nullptr && !pClosestActor->isAlive() )
+      if( pClosestChara != nullptr && !pClosestChara->isAlive() )
       {
-         hateListRemove( *pClosestActor );
-         pClosestActor = hateListGetHighest();
+         hateListRemove( *pClosestChara );
+         pClosestChara = hateListGetHighest();
       }
 
-      if( pClosestActor != nullptr )
+      if( pClosestChara != nullptr )
       {
          distance = Math::Util::distance( getPos().x, getPos().y, getPos().z,
-                                          pClosestActor->getPos().x,
-                                          pClosestActor->getPos().y,
-                                          pClosestActor->getPos().z );
+                                          pClosestChara->getPos().x,
+                                          pClosestChara->getPos().y,
+                                          pClosestChara->getPos().z );
 
          if( distance > 4 )
-            moveTo( pClosestActor->getPos() );
+            moveTo( pClosestChara->getPos() );
          else
          {
-            if( face( pClosestActor->getPos() ) )
+            if( face( pClosestChara->getPos() ) )
                sendPositionUpdate();
             // in combat range. ATTACK!
-            autoAttack( pClosestActor );
+            autoAttack( pClosestChara );
          }
       }
       else
diff --git a/src/servers/sapphire_zone/Actor/BattleNpc.h b/src/servers/sapphire_zone/Actor/BattleNpc.h
index b80e6340..a072bca1 100644
--- a/src/servers/sapphire_zone/Actor/BattleNpc.h
+++ b/src/servers/sapphire_zone/Actor/BattleNpc.h
@@ -1,7 +1,7 @@
 #ifndef _BATTLENPC_H
 #define _BATTLENPC_H
 
-#include "Actor.h"
+#include "Chara.h"
 
 namespace Core {
 namespace Entity {
@@ -16,11 +16,11 @@ enum StateMode
 typedef struct
 {
    uint32_t m_hateAmount;
-   ActorPtr m_pActor;
+   CharaPtr m_pChara;
 } HateListEntry;
 
-// class for Mobs inheriting from Actor
-class BattleNpc : public Actor
+// class for Mobs inheriting from Chara
+class BattleNpc : public Chara
 {
 public:
    BattleNpc();
@@ -52,12 +52,12 @@ public:
 
    uint8_t getbehavior() const;
 
-   void hateListAdd( Actor& actor, int32_t hateAmount );
+   void hateListAdd( Chara& actor, int32_t hateAmount );
 
-   void hateListUpdate( Actor& actor, int32_t hateAmount );
-   void hateListRemove( Actor& actor );
+   void hateListUpdate( Chara& actor, int32_t hateAmount );
+   void hateListRemove( Chara& actor );
 
-   bool hateListHasActor( Actor& actor );
+   bool hateListHasActor( Chara& actor );
 
    void resetPos();
 
@@ -65,19 +65,19 @@ public:
 
    void hateListClear();
 
-   ActorPtr hateListGetHighest();
+   CharaPtr hateListGetHighest();
 
-   void aggro( Actor& actor );
+   void aggro( Chara& actor );
 
-   void deaggro( Actor& actor );
+   void deaggro( Chara& actor );
 
    void setOwner( PlayerPtr pPlayer );
 
    void onDeath() override;
 
-   void onActionHostile( Actor& source ) override;
+   void onActionHostile( Chara& source ) override;
 
-   ActorPtr getClaimer() const;
+   CharaPtr getClaimer() const;
 
    void sendPositionUpdate();
 
@@ -103,7 +103,7 @@ private:
    uint32_t m_unk1;
    uint32_t m_unk2;
    std::set< HateListEntry* > m_hateList;
-   ActorPtr m_pOwner;
+   CharaPtr m_pOwner;
    uint32_t m_timeOfDeath;
    uint32_t m_mobType;
 
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
new file mode 100644
index 00000000..a7162f4e
--- /dev/null
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -0,0 +1,974 @@
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+#include <common/Network/PacketContainer.h>
+#include <common/Exd/ExdDataGenerated.h>
+#include <common/Network/GamePacket.h>
+
+#include "Forwards.h"
+#include "Action/Action.h"
+
+#include "Zone/Zone.h"
+
+#include "Network/GameConnection.h"
+#include "Network/PacketWrappers/ActorControlPacket142.h"
+#include "Network/PacketWrappers/ActorControlPacket143.h"
+#include "Network/PacketWrappers/ActorControlPacket144.h"
+#include "Network/PacketWrappers/UpdateHpMpTpPacket.h"
+
+#include "StatusEffect/StatusEffect.h"
+#include "Action/ActionCollision.h"
+#include "ServerZone.h"
+#include "Session.h"
+#include "Math/CalcBattle.h"
+#include "Chara.h"
+#include "Player.h"
+#include "Zone/TerritoryMgr.h"
+
+extern Core::ServerZone g_serverZone;
+extern Core::Data::ExdDataGenerated g_exdDataGen;
+extern Core::TerritoryMgr g_territoryMgr;
+
+using namespace Core::Common;
+using namespace Core::Network::Packets;
+using namespace Core::Network::Packets::Server;
+
+Core::Entity::Chara::Chara( ObjKind type ) :
+   Actor( type )
+{
+   // initialize the free slot queue
+   for( uint8_t i = 0; i < MAX_STATUS_EFFECTS; i++ )
+   {
+      m_statusEffectFreeSlotQueue.push( i );
+   }
+}
+
+Core::Entity::Chara::~Chara()
+{
+}
+
+/*! \return the actors name */
+std::string Core::Entity::Chara::getName() const
+{
+   return std::string( m_name );
+}
+
+/*! \return list of actors currently in range */
+std::set< Core::Entity::CharaPtr > Core::Entity::Chara::getInRangeCharas( bool includeSelf )
+{
+   auto tempInRange = m_inRangeCharas;
+
+   if( includeSelf )
+      tempInRange.insert( getAsChara() );
+
+   return tempInRange;
+   }
+
+/*! \return current stance of the actors */
+Core::Entity::Chara::Stance Core::Entity::Chara::getStance() const
+{
+   return m_currentStance;
+}
+
+/*! \return actor stats */
+Core::Entity::Chara::ActorStats Core::Entity::Chara::getStats() const
+{
+   return m_baseStats;
+}
+
+/*! \return current HP */
+uint32_t Core::Entity::Chara::getHp() const
+{
+   return m_hp;
+}
+
+/*! \return current MP */
+uint32_t Core::Entity::Chara::getMp() const
+{
+   return m_mp;
+}
+
+/*! \return current TP */
+uint16_t Core::Entity::Chara::getTp() const
+{
+   return m_tp;
+}
+
+/*! \return current GP */
+uint16_t Core::Entity::Chara::getGp() const
+{
+   return m_gp;
+}
+
+/*! \return current invincibility type */
+InvincibilityType Core::Entity::Chara::getInvincibilityType() const
+{
+   return m_invincibilityType;
+}
+
+/*! \return current class or job */
+Core::Common::ClassJob Core::Entity::Chara::getClass() const
+{
+   return m_class;
+}
+
+/*! \return current class or job as int32_t ( this feels pointless ) */
+uint8_t Core::Entity::Chara::getClassAsInt() const
+{
+   return static_cast< uint8_t >( m_class );
+}
+
+/*! \param ClassJob to set */
+void Core::Entity::Chara::setClass( Common::ClassJob classJob )
+{
+   m_class = classJob;
+}
+
+/*! \param Id of the target to set */
+void Core::Entity::Chara::setTargetId( uint64_t targetId )
+{
+   m_targetId = targetId;
+}
+
+/*! \return Id of the current target */
+uint64_t Core::Entity::Chara::getTargetId() const
+{
+   return m_targetId;
+}
+
+/*! \return True if the actor is alive */
+bool Core::Entity::Chara::isAlive() const
+{
+   return ( m_hp > 0 );
+}
+
+/*! \return max hp for the actor */
+uint32_t Core::Entity::Chara::getMaxHp() const
+{
+   return m_baseStats.max_hp;
+}
+
+/*! \return max mp for the actor */
+uint32_t Core::Entity::Chara::getMaxMp() const
+{
+   return m_baseStats.max_mp;
+}
+
+/*! \return reset hp to current max hp */
+void Core::Entity::Chara::resetHp()
+{
+   m_hp = getMaxHp();
+   sendStatusUpdate( true );
+}
+
+/*! \return reset mp to current max mp */
+void Core::Entity::Chara::resetMp()
+{
+   m_mp = getMaxMp();
+   sendStatusUpdate( true );
+}
+
+/*! \param hp amount to set ( caps to maxHp ) */
+void Core::Entity::Chara::setHp( uint32_t hp )
+{
+   m_hp = hp < getMaxHp() ? hp : getMaxHp();
+   sendStatusUpdate( true );
+}
+
+/*! \param mp amount to set ( caps to maxMp ) */
+void Core::Entity::Chara::setMp( uint32_t mp )
+{
+   m_mp = mp < getMaxMp() ? mp : getMaxMp();
+   sendStatusUpdate( true );
+}
+
+/*! \param gp amount to set*/
+void Core::Entity::Chara::setGp( uint32_t gp )
+{
+   m_gp = gp;
+   sendStatusUpdate( true );
+}
+
+/*! \param type invincibility type to set */
+void Core::Entity::Chara::setInvincibilityType( Common::InvincibilityType type )
+{
+   m_invincibilityType = type;
+}
+
+/*! \return current status of the actor */
+Core::Entity::Chara::ActorStatus Core::Entity::Chara::getStatus() const
+{
+   return m_status;
+}
+
+/*! \param status to set */
+void Core::Entity::Chara::setStatus( ActorStatus status )
+{
+   m_status = status;
+}
+
+/*!
+Performs necessary steps to mark an actor dead.
+Sets hp/mp/tp, sets status, plays animation and fires onDeath event
+*/
+void Core::Entity::Chara::die()
+{
+   m_status = ActorStatus::Dead;
+   m_hp = 0;
+   m_mp = 0;
+   m_tp = 0;
+
+   // fire onDeath event
+   onDeath();
+
+   // if the actor is a player, the update needs to be send to himself too
+   bool selfNeedsUpdate = isPlayer();
+
+   sendToInRangeSet( ActorControlPacket142( m_id, SetStatus, static_cast< uint8_t >( ActorStatus::Dead ) ), selfNeedsUpdate );
+
+   // TODO: not all actor show the death animation when they die, some quest npcs might just despawn
+   //       although that might be handled by setting the HP to 1 and doing some script magic
+   sendToInRangeSet( ActorControlPacket142( m_id, DeathAnimation, 0, 0, 0, 0x20 ), selfNeedsUpdate );
+
+}
+
+/*!
+Calculates and sets the rotation to look towards a specified
+position
+
+\param Position to look towards
+*/
+bool Core::Entity::Chara::face( const Common::FFXIVARR_POSITION3& p )
+{
+   float oldRot = getRotation();
+   float rot = Math::Util::calcAngFrom( getPos().x, getPos().z, p.x, p.z );
+   float newRot = PI - rot + ( PI / 2 );
+
+   m_pCell = nullptr;
+
+   setRotation( newRot );
+
+   return oldRot != newRot ? true : false;
+}
+
+/*!
+Sets the actors position and notifies the zone to propagate the change
+
+\param Position to set
+*/
+void Core::Entity::Chara::setPosition( const Common::FFXIVARR_POSITION3& pos )
+{
+   m_pos = pos;
+   m_pCurrentZone->updateActorPosition( *this );
+}
+
+void Core::Entity::Chara::setPosition( float x, float y, float z )
+{
+   m_pos.x = x;
+   m_pos.y = y;
+   m_pos.z = z;
+   m_pCurrentZone->updateActorPosition( *this );
+}
+
+/*!
+Set and propagate the actor stance to in range players
+( not the actor himself )
+
+\param stance to set
+*/
+void Core::Entity::Chara::setStance( Stance stance )
+{
+   m_currentStance = stance;
+
+   sendToInRangeSet( ActorControlPacket142( m_id, ToggleAggro, stance, 1 ) );
+}
+
+/*!
+Check if an action is queued for execution, if so update it
+and if fully performed, clean up again.
+
+\return true if a queued action has been updated
+*/
+bool Core::Entity::Chara::checkAction()
+{
+
+   if( m_pCurrentAction == nullptr )
+      return false;
+
+   if( m_pCurrentAction->update() )
+      m_pCurrentAction.reset();
+
+   return true;
+
+}
+
+/*!
+Change the current target and propagate to in range players
+
+\param target actor id
+*/
+void Core::Entity::Chara::changeTarget( uint64_t targetId )
+{
+   setTargetId( targetId );
+   sendToInRangeSet( ActorControlPacket144( m_id, SetTarget, 0, 0, 0, 0, targetId ) );
+}
+
+/*!
+Dummy function \return 0
+*/
+uint8_t Core::Entity::Chara::getLevel() const
+{
+   return 0;
+}
+
+/*!
+Let an actor take damage and perform necessary steps
+according to resulting hp, propagates new hp value to players
+in range
+TODO: eventually this needs to distinguish between physical and
+magical dmg and take status effects into account
+
+\param amount of damage to be taken
+*/
+void Core::Entity::Chara::takeDamage( uint32_t damage )
+{
+   if( damage >= m_hp )
+   {
+      switch( m_invincibilityType ) { 
+         case InvincibilityNone: 
+            setHp( 0 );
+            die();
+            break;
+         case InvincibilityRefill:
+            resetHp();
+            break;
+         case InvincibilityStayAlive:
+            setHp( 0 );
+            break;
+      }
+   }
+   else
+      m_hp -= damage;
+
+   sendStatusUpdate( false );
+}
+
+/*!
+Let an actor get healed and perform necessary steps
+according to resulting hp, propagates new hp value to players
+in range
+
+\param amount of hp to be healed
+*/
+void Core::Entity::Chara::heal( uint32_t amount )
+{
+   if( ( m_hp + amount ) > getMaxHp() )
+   {
+      m_hp = getMaxHp();
+   }
+   else
+      m_hp += amount;
+
+   sendStatusUpdate( false );
+}
+
+/*!
+Send an HpMpTp update to players in range ( and potentially to self )
+TODO: poor naming, should be changed. Status is not HP. Also should be virtual
+so players can have their own version and we can abolish the param.
+
+\param true if the update should also be sent to the actor ( player ) himself
+*/
+void Core::Entity::Chara::sendStatusUpdate( bool toSelf )
+{
+   UpdateHpMpTpPacket updateHpPacket( *this );
+   sendToInRangeSet( updateHpPacket );
+}
+
+/*! \return ActionPtr of the currently registered action, or nullptr */
+Core::Action::ActionPtr Core::Entity::Chara::getCurrentAction() const
+{
+   return m_pCurrentAction;
+}
+
+/*! \param ActionPtr of the action to be registered */
+void Core::Entity::Chara::setCurrentAction( Core::Action::ActionPtr pAction )
+{
+   m_pCurrentAction = pAction;
+}
+
+/*!
+check if a given actor is in the actors in range set
+
+\param ActorPtr to be checked for
+\return true if the actor was found
+*/
+bool Core::Entity::Chara::isInRangeSet( CharaPtr pChara ) const
+{
+   return !( m_inRangeCharas.find( pChara ) == m_inRangeCharas.end() );
+}
+
+/*! \return ActorPtr of the closest actor in range, if none, nullptr */
+Core::Entity::CharaPtr Core::Entity::Chara::getClosestChara()
+{
+   if( m_inRangeCharas.empty() )
+      // no actors in range, don't bother
+      return nullptr;
+
+   CharaPtr tmpActor = nullptr;
+
+   // arbitrary high number
+   float minDistance = 10000;
+
+   for( const auto& pCurAct : m_inRangeCharas )
+   {
+      float distance = Math::Util::distance( getPos().x,
+                                             getPos().y,
+                                             getPos().z,
+                                             pCurAct->getPos().x,
+                                             pCurAct->getPos().y,
+                                             pCurAct->getPos().z );
+
+      if( distance < minDistance )
+      {
+         minDistance = distance;
+         tmpActor = pCurAct;
+      }
+   }
+
+   return tmpActor;
+}
+
+/*!
+Send a packet to all players in range, potentially to self if set and is player
+
+\param GamePacketPtr to send
+\param bool should be send to self?
+*/
+void Core::Entity::Chara::sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf )
+{
+
+   if( bToSelf && isPlayer() )
+   {
+      auto pPlayer = getAsPlayer();
+
+      auto pSession = g_serverZone.getSession( pPlayer->getId() );
+
+      // it might be that the player DC'd in which case the session would be invalid
+      if( pSession )
+         pSession->getZoneConnection()->queueOutPacket( pPacket );
+   }
+
+   if( m_inRangePlayers.empty() )
+      return;
+
+   for( const auto &pCurAct : m_inRangePlayers )
+   {
+      assert( pCurAct );
+      pPacket->setValAt< uint32_t >( 0x04, m_id );
+      pPacket->setValAt< uint32_t >( 0x08, pCurAct->m_id );
+      // it might be that the player DC'd in which case the session would be invalid
+      pCurAct->queuePacket( pPacket );
+   }
+}
+
+/*!
+Add a given actor to the fitting in range set according to type
+but also to the global actor map
+
+\param ActorPtr to add
+*/
+void Core::Entity::Chara::addInRangeChara( CharaPtr pChara )
+{
+
+   // if this is null, something went wrong
+   assert( pChara );
+
+   // add actor to in range set
+   m_inRangeCharas.insert( pChara );
+
+   if( pChara->isPlayer() )
+   {
+      auto pPlayer = pChara->getAsPlayer();
+
+      // if actor is a player, add it to the in range player set
+      m_inRangePlayers.insert( pPlayer );
+   }
+}
+
+/*!
+Remove a given actor from the matching in range set according to type
+but also to the global actor map
+
+\param ActorPtr to remove
+*/
+void Core::Entity::Chara::removeInRangeChara( Chara& chara )
+{
+   // call virtual event
+   onRemoveInRangeChara( chara );
+
+   // remove actor from in range actor set
+   m_inRangeCharas.erase( chara.getAsChara() );
+
+   // if actor is a player, despawn ourself for him
+   // TODO: move to virtual onRemove?
+   if( isPlayer() )
+      chara.despawn( getAsPlayer() );
+
+   if( chara.isPlayer() )
+      m_inRangePlayers.erase( chara.getAsPlayer() );
+}
+
+/*! \return true if there is at least one actor in the in range set */
+bool Core::Entity::Chara::hasInRangeActor() const
+{
+   return ( m_inRangeCharas.size() > 0 );
+}
+
+void Core::Entity::Chara::removeFromInRange()
+{
+   if( !hasInRangeActor() )
+      return;
+
+   Entity::ActorPtr pCurAct;
+
+   for( auto& pCurAct : m_inRangeCharas )
+   {
+      pCurAct->removeInRangeChara( *this );
+   }
+
+}
+
+/*! Clear the whole in range set, this does no cleanup */
+void Core::Entity::Chara::clearInRangeSet()
+{
+   m_inRangeCharas.clear();
+   m_inRangePlayers.clear();
+}
+
+/*! \return ZonePtr to the current zone, nullptr if not set */
+Core::ZonePtr Core::Entity::Chara::getCurrentZone() const
+{
+   return m_pCurrentZone;
+}
+
+/*! \param ZonePtr to the zone to be set as current */
+void Core::Entity::Chara::setCurrentZone( ZonePtr currZone )
+{
+   m_pCurrentZone = currZone;
+}
+
+/*!
+Get the current cell of a region the actor is in
+
+\return Cell*
+*/
+Core::Cell * Core::Entity::Chara::getCell() const
+{
+   return m_pCell;
+}
+
+/*!
+Set the current cell the actor is in
+
+\param Cell* for the cell to be set
+*/
+void Core::Entity::Chara::setCell( Cell * pCell )
+{
+   m_pCell = pCell;
+}
+
+/*!
+Autoattack prototype implementation
+TODO: move the check if the autoAttack can be performed to the callee
+also rename autoAttack to autoAttack as that is more elaborate
+On top of that, this only solves attacks from melee classes.
+Will have to be extended for ranged attacks.
+
+\param ActorPtr the autoAttack is performed on
+*/
+void Core::Entity::Chara::autoAttack( CharaPtr pTarget )
+{
+
+   uint64_t tick = Util::getTimeMs();
+
+   if( ( tick - m_lastAttack ) > 2500 )
+   {
+      pTarget->onActionHostile( *this );
+      m_lastAttack = tick;
+      srand( static_cast< uint32_t >( tick ) );
+
+      uint16_t damage = static_cast< uint16_t >( 10 + rand() % 12 );
+      uint32_t variation = static_cast< uint32_t >( 0 + rand() % 4 );
+
+      ZoneChannelPacket< FFXIVIpcEffect > effectPacket( getId() );
+      effectPacket.data().targetId = pTarget->getId();
+      effectPacket.data().actionAnimationId = 0x366;
+      effectPacket.data().unknown_2 = variation;
+//      effectPacket.data().unknown_3 = 1;
+      effectPacket.data().actionTextId = 0x366;
+      effectPacket.data().numEffects = 1;
+      effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
+      effectPacket.data().effectTarget = pTarget->getId();
+      effectPacket.data().effects[0].value = damage;
+      effectPacket.data().effects[0].effectType = ActionEffectType::Damage;
+      effectPacket.data().effects[0].hitSeverity = static_cast< ActionHitSeverityType >( variation );
+      effectPacket.data().effects[0].unknown_3 = 7;
+
+      sendToInRangeSet( effectPacket );
+
+      if( isPlayer() )
+         getAsPlayer()->queuePacket( effectPacket );
+
+      pTarget->takeDamage( damage );
+   }
+}
+
+/*!
+ChaiScript Skill Handler.
+
+\param GamePacketPtr to send
+\param bool should be send to self?
+*/
+void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, uint64_t param1,
+                                             uint64_t param2, Entity::Chara& target )
+{
+
+   if( isPlayer() )
+   {
+      getAsPlayer()->sendDebug( std::to_string( target.getId() ) );
+      getAsPlayer()->sendDebug( "Handle script skill type: " + std::to_string( type ) );
+   }
+
+   auto actionInfoPtr = g_exdDataGen.get< Core::Data::Action >( actionId );
+
+   // Todo: Effect packet generator. 90% of this is basically setting params and it's basically unreadable.
+   // Prepare packet. This is seemingly common for all packets in the action handler.
+
+   ZoneChannelPacket< FFXIVIpcEffect > effectPacket( getId() );
+   effectPacket.data().targetId = target.getId();
+   effectPacket.data().actionAnimationId = actionId;
+   effectPacket.data().unknown_62 = 1; // Affects displaying action name next to number in floating text
+   effectPacket.data().unknown_2 = 1;  // This seems to have an effect on the "double-cast finish" animation
+   effectPacket.data().actionTextId = actionId;
+   effectPacket.data().numEffects = 1;
+   effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
+   effectPacket.data().effectTarget = target.getId();
+
+   // Todo: for each actor, calculate how much damage the calculated value should deal to them - 2-step damage calc. we only have 1-step
+   switch( type )
+   {
+
+   case ActionEffectType::Damage:
+   {
+      effectPacket.data().effects[0].value = static_cast< uint16_t >( param1 );
+      effectPacket.data().effects[0].effectType = ActionEffectType::Damage;
+      effectPacket.data().effects[0].hitSeverity = ActionHitSeverityType::NormalDamage;
+      effectPacket.data().effects[0].unknown_3 = 7;
+
+      if( actionInfoPtr->castType == 1 && actionInfoPtr->effectRange != 0 || actionInfoPtr->castType != 1 )
+      {
+         // If action on this specific target is valid...
+         if ( isPlayer() && !ActionCollision::isActorApplicable( target, TargetFilter::Enemies ) )
+            break;
+
+         sendToInRangeSet( effectPacket, true );
+
+         if ( target.isAlive() )
+            target.onActionHostile( *this );
+
+         target.takeDamage( static_cast< uint32_t >( param1 ) );
+
+      }
+      else
+      {
+
+         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeCharas(true),
+                                                                        actionInfoPtr, TargetFilter::Enemies );
+
+         for( const auto& pHitActor : actorsCollided )
+         {
+            effectPacket.data().targetId = pHitActor->getId();
+            effectPacket.data().effectTarget = pHitActor->getId();
+
+            // todo: send to range of what? ourselves? when mob script hits this is going to be lacking
+            sendToInRangeSet( effectPacket, true );
+
+
+            if( pHitActor->isAlive() )
+               pHitActor->onActionHostile( *this );
+
+            pHitActor->takeDamage( static_cast< uint32_t >( param1 ) );
+
+            // Debug
+            if ( isPlayer() ) 
+            {
+               if ( pHitActor->isPlayer() )
+                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) + " (" + pHitActor->getName() + ")" );
+               else
+                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) );
+            }  
+         }
+      }
+
+      break;
+   }
+
+   case ActionEffectType::Heal:
+   {
+      uint32_t calculatedHeal = Math::CalcBattle::calculateHealValue( getAsPlayer(), static_cast< uint32_t >( param1 ) );
+
+      effectPacket.data().effects[0].value = calculatedHeal;
+      effectPacket.data().effects[0].effectType = ActionEffectType::Heal;
+      effectPacket.data().effects[0].hitSeverity = ActionHitSeverityType::NormalHeal;
+
+      if( actionInfoPtr->castType == 1 && actionInfoPtr->effectRange != 0 || actionInfoPtr->castType != 1 )
+      {
+         if( isPlayer() && !ActionCollision::isActorApplicable( target, TargetFilter::Allies ) )
+            break;
+
+         sendToInRangeSet( effectPacket, true );
+         target.heal( calculatedHeal );
+      }
+      else
+      {
+         // todo: get proper packets: the following was just kind of thrown together from what we know.
+         // atm buggy (packets look "delayed" from client)
+
+         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeCharas(true),
+                                                                        actionInfoPtr, TargetFilter::Allies );
+
+         for( auto pHitActor : actorsCollided )
+         {
+            effectPacket.data().targetId = target.getId();
+            effectPacket.data().effectTarget = pHitActor->getId();
+
+            sendToInRangeSet( effectPacket, true );
+            pHitActor->heal( calculatedHeal );
+
+            // Debug
+            if( isPlayer() )
+            {
+               if( pHitActor->isPlayer() )
+                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) + " (" + pHitActor->getName() + ")" );
+               else
+                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) );
+            }
+         }
+      }
+      break;
+   }
+
+   default:
+      break;
+   }
+}
+
+/*! \param StatusEffectPtr to be applied to the actor */
+void Core::Entity::Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEffect )
+{
+   int8_t nextSlot = getStatusEffectFreeSlot();
+   // if there is no slot left, do not add the effect
+   if( nextSlot == -1 )
+      return;
+
+   pEffect->applyStatus();
+   m_statusEffectMap[nextSlot] = pEffect;
+
+   ZoneChannelPacket< Server::FFXIVIpcAddStatusEffect > statusEffectAdd( getId() );
+   statusEffectAdd.data().actor_id = pEffect->getTargetActorId();
+   statusEffectAdd.data().actor_id1 = pEffect->getSrcActorId(); 
+   statusEffectAdd.data().current_hp = getHp();
+   statusEffectAdd.data().current_mp = getMp();
+   statusEffectAdd.data().current_tp = getTp();
+   statusEffectAdd.data().duration = static_cast< float >( pEffect->getDuration() ) / 1000;
+   statusEffectAdd.data().effect_id = pEffect->getId();
+   statusEffectAdd.data().effect_index = nextSlot;
+   statusEffectAdd.data().max_hp = getMaxHp();
+   statusEffectAdd.data().max_mp = getMaxMp();
+   statusEffectAdd.data().max_something = 1;
+    //statusEffectAdd.data().unknown2 = 28;
+   statusEffectAdd.data().param = pEffect->getParam();
+
+   sendToInRangeSet( statusEffectAdd, isPlayer() );
+}
+
+/*! \param StatusEffectPtr to be applied to the actor */
+void Core::Entity::Chara::addStatusEffectById( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param )
+{
+   auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, 3000 );
+   effect->setParam( param );
+   addStatusEffect( effect );
+}
+
+/*! \param StatusEffectPtr to be applied to the actor */
+void Core::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param )
+{
+   if( hasStatusEffect( id ) )
+      return;
+
+   auto effect = StatusEffect::make_StatusEffect( id, source.getAsChara(), getAsChara(), duration, 3000 );
+   effect->setParam( param );
+   addStatusEffect( effect );
+
+}
+
+float Core::Entity::Chara::getRotation() const
+{
+   return m_rot;
+}
+
+void Core::Entity::Chara::setRotation( float rot )
+{
+   m_rot = rot;
+}
+
+int8_t Core::Entity::Chara::getStatusEffectFreeSlot()
+{
+   int8_t freeEffectSlot = -1;
+
+   if( m_statusEffectFreeSlotQueue.empty() )
+      return freeEffectSlot;
+
+   freeEffectSlot = m_statusEffectFreeSlotQueue.front();
+   m_statusEffectFreeSlotQueue.pop();
+
+   return freeEffectSlot;
+}
+
+void Core::Entity::Chara::statusEffectFreeSlot( uint8_t slotId )
+{
+   m_statusEffectFreeSlotQueue.push( slotId );
+}
+
+void Core::Entity::Chara::removeSingleStatusEffectById( uint32_t id )
+{
+   for( auto effectIt : m_statusEffectMap )
+   {
+      if( effectIt.second->getId() == id )
+      {
+         removeStatusEffect( effectIt.first );
+         break;
+      }
+   }
+}
+
+void Core::Entity::Chara::removeStatusEffect( uint8_t effectSlotId )
+{
+   auto pEffectIt = m_statusEffectMap.find( effectSlotId );
+   if( pEffectIt == m_statusEffectMap.end() )
+      return;
+
+   statusEffectFreeSlot( effectSlotId );
+
+   auto pEffect = pEffectIt->second;
+   pEffect->removeStatus();
+
+   sendToInRangeSet( ActorControlPacket142( getId(), StatusEffectLose, pEffect->getId() ), isPlayer() );
+
+   m_statusEffectMap.erase( effectSlotId );
+
+   sendStatusEffectUpdate();
+}
+
+std::map< uint8_t, Core::StatusEffect::StatusEffectPtr > Core::Entity::Chara::getStatusEffectMap() const
+{
+   return m_statusEffectMap;
+}
+
+void Core::Entity::Chara::sendStatusEffectUpdate()
+{
+   uint64_t currentTimeMs = Util::getTimeMs();
+
+   ZoneChannelPacket< Server::FFXIVIpcStatusEffectList > statusEffectList( getId() );
+
+   statusEffectList.data().current_hp = getHp();
+   statusEffectList.data().current_mp = getMp();
+   statusEffectList.data().currentTp = getTp();
+   statusEffectList.data().max_hp = getMaxHp();
+   statusEffectList.data().max_mp = getMaxMp();
+   uint8_t slot = 0;
+   for( auto effectIt : m_statusEffectMap )
+   {
+      float timeLeft = static_cast< float >( effectIt.second->getDuration() - 
+                                             ( currentTimeMs - effectIt.second->getStartTimeMs() ) ) / 1000;
+      statusEffectList.data().effect[slot].duration = timeLeft;
+      statusEffectList.data().effect[slot].effect_id = effectIt.second->getId();
+      statusEffectList.data().effect[slot].sourceActorId = effectIt.second->getSrcActorId();
+      slot++;
+   }
+
+   sendToInRangeSet( statusEffectList, isPlayer() );
+
+}
+
+void Core::Entity::Chara::updateStatusEffects()
+{
+   uint64_t currentTimeMs = Util::getTimeMs();
+
+   uint32_t thisTickDmg = 0;
+   uint32_t thisTickHeal = 0;
+
+   for( auto effectIt : m_statusEffectMap )
+   {
+      uint8_t effectIndex = effectIt.first;
+      auto effect = effectIt.second;
+
+      uint64_t lastTick = effect->getLastTickMs();
+      uint64_t startTime = effect->getStartTimeMs();
+      uint32_t duration = effect->getDuration();
+      uint32_t tickRate = effect->getTickRate();
+
+      if( ( currentTimeMs - startTime ) > duration )
+      {
+         // remove status effect
+         removeStatusEffect( effectIndex );
+         // break because removing invalidates iterators
+         break;
+      }
+
+      if( ( currentTimeMs - lastTick ) > tickRate )
+      {
+         effect->setLastTick( currentTimeMs );
+         effect->onTick();
+
+         auto thisEffect = effect->getTickEffect();
+
+         switch( thisEffect.first )
+         {
+
+         case 1:
+         {
+            thisTickDmg += thisEffect.second;
+            break;
+         }
+
+         case 2:
+         {
+            thisTickHeal += thisEffect.second;
+            break;
+         }
+
+         }
+      }
+
+   }
+
+   if( thisTickDmg != 0 )
+   {
+      takeDamage( thisTickDmg );
+      sendToInRangeSet( ActorControlPacket142( getId(), HPFloatingText, 0, static_cast< uint8_t >( ActionEffectType::Damage ), thisTickDmg ) );
+   }
+
+   if( thisTickHeal != 0 )
+   {
+      heal( thisTickDmg );
+      sendToInRangeSet( ActorControlPacket142( getId(), HPFloatingText, 0, static_cast< uint8_t >( ActionEffectType::Heal ), thisTickHeal ) );
+   }
+}
+
+bool Core::Entity::Chara::hasStatusEffect( uint32_t id )
+{
+   if( m_statusEffectMap.find( id ) != m_statusEffectMap.end() )
+      return true;
+   return false;
+}
diff --git a/src/servers/sapphire_zone/Actor/Chara.h b/src/servers/sapphire_zone/Actor/Chara.h
new file mode 100644
index 00000000..116288f5
--- /dev/null
+++ b/src/servers/sapphire_zone/Actor/Chara.h
@@ -0,0 +1,295 @@
+#ifndef _ACTOR_H_
+#define _ACTOR_H_
+
+#include <common/Common.h>
+#include <boost/enable_shared_from_this.hpp>
+
+#include "Forwards.h"
+#include "Actor.h"
+#include <set>
+#include <map>
+#include <queue>
+
+namespace Core {
+namespace Entity {
+
+/*!
+\class Chara
+\brief Base class for all animate actors
+
+*/
+class Chara : public Actor
+{
+public:
+   enum Stance : uint8_t
+   {
+      Passive = 0,
+      Active = 1,
+   };
+
+   enum DisplayFlags : uint16_t
+   {
+      ActiveStance = 0x001,
+      Invisible = 0x020,
+      HideHead = 0x040,
+      HideWeapon = 0x080,
+      Faded = 0x100,
+      Visor = 0x800,
+   };
+
+   enum struct ActorStatus : uint8_t
+   {
+      Idle = 0x01,
+      Dead = 0x02,
+      Sitting = 0x03,
+      Mounted = 0x04,
+      Crafting = 0x05,
+      Gathering = 0x06,
+      Melding = 0x07,
+      SMachine = 0x08
+   };
+
+   struct ActorStats
+   {
+      uint32_t max_mp = 0;
+      uint32_t max_hp = 0;
+
+      uint32_t str = 0;
+      uint32_t dex = 0;
+      uint32_t vit = 0;
+      uint32_t inte = 0;
+      uint32_t mnd = 0;
+      uint32_t pie = 0;
+
+      uint32_t tenacity = 0;
+      uint32_t attack = 0;
+      uint32_t defense = 0;
+      uint32_t accuracy = 0;
+      uint32_t spellSpeed = 0;
+      uint32_t magicDefense = 0;
+      uint32_t critHitRate = 0;
+      uint32_t resistSlash = 0;
+      uint32_t resistPierce = 0;
+      uint32_t resistBlunt = 0;
+      uint32_t attackPotMagic = 0;
+      uint32_t healingPotMagic = 0;
+      uint32_t determination = 0;
+      uint32_t skillSpeed = 0;
+
+      uint32_t resistSlow = 0;
+      uint32_t resistSilence = 0;
+      uint32_t resistBlind = 0;
+      uint32_t resistPoison = 0;
+      uint32_t resistStun = 0;
+      uint32_t resistSleep = 0;
+      uint32_t resistBind = 0;
+      uint32_t resistHeavy = 0;
+
+      uint32_t resistFire = 0;
+      uint32_t resistIce = 0;
+      uint32_t resistWind = 0;
+      uint32_t resistEarth = 0;
+      uint32_t resistLightning = 0;
+      uint32_t resistWater = 0;
+
+   } m_baseStats;
+
+protected:
+   char                 m_name[34];
+   /*! Id of the zone the actor currently is in */
+   uint32_t	            m_zoneId;
+   /*! Ptr to the ZoneObj the actor belongs to */
+   ZonePtr              m_pCurrentZone;
+   /*! Last tick time for the actor  ( in ms ) */
+   uint64_t             m_lastTickTime;
+   /*! Last time the actor performed an autoAttack ( in ms ) */
+   uint64_t	            m_lastAttack;
+   /*! Last time the actor was updated ( in ms ) */
+   uint64_t             m_lastUpdate;
+   /*! Current stance of the actor */
+   Stance               m_currentStance;
+   /*! Current staus of the actor */
+   ActorStatus          m_status;
+   /*! Max HP of the actor ( based on job / class ) */
+   uint32_t             m_maxHp;
+   /*! Max MP of the actor ( based on job / class ) */
+   uint32_t             m_maxMp;
+   /*! Current HP of the actor */
+   uint32_t	            m_hp;
+   /*! Current MP of the actor */
+   uint32_t             m_mp;
+   /*! Current TP of the actor */
+   uint16_t             m_tp;
+   /*! Current GP of the actor */
+   uint16_t             m_gp;
+   /*! Additional look info of the actor */
+   uint8_t              m_customize[26];
+   /*! Current class of the actor */
+   Common::ClassJob     m_class;
+   /*! Id of the currently selected target actor */
+   uint64_t             m_targetId;
+   /*! Ptr to a queued action */
+   Action::ActionPtr    m_pCurrentAction;
+   /*! Invincibility type */
+   Common::InvincibilityType m_invincibilityType;
+
+   /*! Status effects */
+   const uint8_t MAX_STATUS_EFFECTS = 30;
+   std::queue< uint8_t > m_statusEffectFreeSlotQueue;
+   std::vector< std::pair< uint8_t, uint32_t> > m_statusEffectList;
+   std::map< uint8_t, StatusEffect::StatusEffectPtr > m_statusEffectMap;
+
+   std::set< CharaPtr > m_inRangeCharas;
+   std::set< PlayerPtr > m_inRangePlayers;
+
+public:
+   Chara( ObjKind type );
+
+   virtual ~Chara() override;
+
+   virtual void calculateStats() {};
+
+   /// Status effect functions 
+   void addStatusEffect( StatusEffect::StatusEffectPtr pEffect );
+   void removeStatusEffect( uint8_t effectSlotId );
+   void removeSingleStatusEffectById( uint32_t id );
+   void updateStatusEffects();
+
+   bool hasStatusEffect( uint32_t id );
+
+   int8_t getStatusEffectFreeSlot();
+   void statusEffectFreeSlot( uint8_t slotId );
+
+   std::map< uint8_t, Core::StatusEffect::StatusEffectPtr > getStatusEffectMap() const;
+
+   void sendStatusEffectUpdate();
+   // add a status effect by id
+   void addStatusEffectById( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param = 0 );
+
+   // add a status effect by id if it doesn't exist
+   void addStatusEffectByIdIfNotExist( uint32_t id, int32_t duration, Entity::Chara& source, uint16_t param = 0 );
+
+   // remove a status effect by id
+   void removeSingleStatusEffectFromId( uint32_t id );
+   /// End Status Effect Functions
+
+   void setPosition( const Common::FFXIVARR_POSITION3& pos );
+   void setPosition( float x, float y, float z );
+
+   void setRotation( float rot );
+
+   float getRotation() const;
+
+   std::string getName() const;
+
+   std::set< CharaPtr > getInRangeCharas( bool includeSelf = false );
+
+   bool face( const Common::FFXIVARR_POSITION3& p );
+
+   Stance getStance() const;
+
+   void setStance( Stance stance );
+
+   ActorStats getStats() const;
+
+   uint32_t getHp() const;
+   uint32_t getMp() const;
+   uint16_t getTp() const;
+   uint16_t getGp() const;
+
+   Common::InvincibilityType getInvincibilityType() const;
+
+   Common::ClassJob getClass() const;
+
+   uint8_t getClassAsInt() const;
+
+   void setClass( Common::ClassJob classJob );
+
+   void setTargetId( uint64_t targetId );
+
+   uint64_t getTargetId() const;
+
+   bool isAlive() const;
+
+   virtual uint32_t getMaxHp() const;
+   virtual uint32_t getMaxMp() const;
+
+   void resetHp();
+   void resetMp();
+
+   void setHp( uint32_t hp );
+   void setMp( uint32_t mp );
+   void setGp( uint32_t gp );
+
+   void setInvincibilityType( Common::InvincibilityType type );
+
+   void die();
+
+   ActorStatus getStatus() const;
+
+   void setStatus( ActorStatus  status );
+
+   void handleScriptSkill( uint32_t type, uint16_t actionId, uint64_t param1, uint64_t param2, Entity::Chara& target );
+
+   virtual void autoAttack( CharaPtr pTarget );
+
+   virtual void onRemoveInRangeChara( Chara& pActor ) {}
+
+   virtual void onDeath() {};
+   virtual void onDamageTaken( Chara& pSource ) {};
+   virtual void onActionHostile( Chara& source ) {};
+   virtual void onActionFriendly( Chara& pSource ) {};
+   virtual void onTick() {};
+
+   virtual void changeTarget( uint64_t targetId );
+   virtual uint8_t getLevel() const;
+   virtual void sendStatusUpdate( bool toSelf = true );
+   virtual void takeDamage( uint32_t damage );
+   virtual void heal( uint32_t amount );
+   virtual bool checkAction();
+   virtual void update( int64_t currTime ) {};
+
+   Action::ActionPtr getCurrentAction() const;
+
+   void setCurrentAction( Action::ActionPtr pAction );
+
+   ///// IN RANGE LOGIC /////
+
+   // check if another actor is in the actors in range set
+   bool isInRangeSet( CharaPtr pChara ) const;
+
+   CharaPtr getClosestChara();
+
+   void sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf = false );
+
+   // add an actor to in range set
+   void addInRangeChara( CharaPtr pChara );
+
+   // remove an actor from the in range set
+   void removeInRangeChara( Chara& chara );
+
+   // return true if there is at least one actor in the in range set
+   bool hasInRangeActor() const;
+
+   void removeFromInRange();
+
+   // clear the whole in range set, this does no cleanup
+   virtual void clearInRangeSet();
+
+   ZonePtr getCurrentZone() const;
+
+   void setCurrentZone( ZonePtr currZone );
+
+   // get the current cell of a region the actor is in
+   Cell* getCell() const;
+
+   // set the current cell
+   void setCell( Cell* pCell );
+
+   Core::Cell* m_pCell;
+
+};
+
+}
+}
+#endif
diff --git a/src/servers/sapphire_zone/Actor/EventNpc.cpp b/src/servers/sapphire_zone/Actor/EventNpc.cpp
index af3eb0a3..47555f8b 100644
--- a/src/servers/sapphire_zone/Actor/EventNpc.cpp
+++ b/src/servers/sapphire_zone/Actor/EventNpc.cpp
@@ -24,7 +24,7 @@ extern Core::Logger g_log;
 uint32_t Core::Entity::EventNpc::m_nextID = 1249241694;
 
 Core::Entity::EventNpc::EventNpc() :
-   Actor( ObjKind::EventNpc )
+   Chara( ObjKind::EventNpc )
 {
    m_id = 0;
    m_status = ActorStatus::Idle;
@@ -36,7 +36,7 @@ Core::Entity::EventNpc::~EventNpc()
 }
 
 Core::Entity::EventNpc::EventNpc( uint32_t enpcId, const Common::FFXIVARR_POSITION3& spawnPos, float rotation ) :
-   Actor( ObjKind::EventNpc )
+   Chara( ObjKind::EventNpc )
 {
    EventNpc::m_nextID++;
    m_id = EventNpc::m_nextID;
diff --git a/src/servers/sapphire_zone/Actor/EventNpc.h b/src/servers/sapphire_zone/Actor/EventNpc.h
index 726eae94..854e4453 100644
--- a/src/servers/sapphire_zone/Actor/EventNpc.h
+++ b/src/servers/sapphire_zone/Actor/EventNpc.h
@@ -1,13 +1,13 @@
 #ifndef _EVENTNPC_H
 #define _EVENTNPC_H
 
-#include "Actor.h"
+#include "Chara.h"
 
 namespace Core {
 namespace Entity {
 
-// class for Mobs inheriting from Actor
-class EventNpc : public Actor
+// class for Mobs inheriting from Chara
+class EventNpc : public Chara
 {
 public:
    EventNpc();
diff --git a/src/servers/sapphire_zone/Actor/GameObject.cpp b/src/servers/sapphire_zone/Actor/GameObject.cpp
deleted file mode 100644
index 16c042ab..00000000
--- a/src/servers/sapphire_zone/Actor/GameObject.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-#include "GameObject.h"
-
-#include "Player.h"
-#include "Actor.h"
-#include "BattleNpc.h"
-#include "EventNpc.h"
-
-Core::Entity::GameObject::GameObject( ObjKind type ) :
-   m_objKind( type )
-{
-
-}
-
-uint32_t Core::Entity::GameObject::getId() const
-{
-   return m_id;
-}
-
-Core::Entity::GameObject::ObjKind Core::Entity::GameObject::getObjKind() const
-{
-   return m_objKind;
-}
-
-Core::Common::FFXIVARR_POSITION3& Core::Entity::GameObject::getPos()
-{
-   return m_pos;
-}
-
-void Core::Entity::GameObject::setPos( float x, float y, float z )
-{
-   m_pos.x = x;
-   m_pos.y = y;
-   m_pos.z = z;
-}
-
-void Core::Entity::GameObject::setPos( const Core::Common::FFXIVARR_POSITION3& pos )
-{
-   m_pos = pos;
-}
-
-float Core::Entity::GameObject::getRot() const
-{
-   return m_rot;
-}
-
-void Core::Entity::GameObject::setRot( float rot )
-{
-   m_rot = rot;
-}
-
-bool Core::Entity::GameObject::isPlayer() const
-{
-   return m_objKind == ObjKind::Player;
-}
-
-bool Core::Entity::GameObject::isBattleNpc() const
-{
-   return m_objKind == ObjKind::BattleNpc;
-}
-
-bool Core::Entity::GameObject::isEventNpc() const
-{
-   return m_objKind == ObjKind::EventNpc;
-}
-
-/*! \return pointer to this instance as ActorPtr */
-Core::Entity::ActorPtr Core::Entity::GameObject::getAsActor()
-{
-   return boost::dynamic_pointer_cast< Entity::Actor, Entity::GameObject >( shared_from_this() );
-}
-
-/*! \return pointer to this instance as PlayerPtr */
-Core::Entity::PlayerPtr Core::Entity::GameObject::getAsPlayer()
-{
-   if( !isPlayer() )
-      return nullptr;
-   return boost::dynamic_pointer_cast< Entity::Player, Entity::GameObject >( shared_from_this() );
-}
-
-/*! \return pointer to this instance as BattleNpcPtr */
-Core::Entity::BattleNpcPtr Core::Entity::GameObject::getAsBattleNpc()
-{
-   if( !isBattleNpc() )
-      return nullptr;
-   return boost::dynamic_pointer_cast< Entity::BattleNpc, Entity::GameObject >( shared_from_this() );
-}
-
-/*! \return pointer to this instance as EventNpcPtr */
-Core::Entity::EventNpcPtr Core::Entity::GameObject::getAsEventNpc()
-{
-   if( !isEventNpc() )
-      return nullptr;
-   return boost::dynamic_pointer_cast< Entity::EventNpc, Entity::GameObject >( shared_from_this() );
-}
diff --git a/src/servers/sapphire_zone/Actor/GameObject.h b/src/servers/sapphire_zone/Actor/GameObject.h
deleted file mode 100644
index d1f70b3b..00000000
--- a/src/servers/sapphire_zone/Actor/GameObject.h
+++ /dev/null
@@ -1,82 +0,0 @@
-#ifndef _GAME_OBJECT_H_
-#define _GAME_OBJECT_H_
-
-#include <common/Common.h>
-#include <boost/enable_shared_from_this.hpp>
-
-#include "Forwards.h"
-#include <set>
-#include <map>
-#include <queue>
-
-namespace Core {
-namespace Entity {
-
-/*!
-\class GameObject
-\brief Base class for all actor/objects
-
-*/
-   class GameObject : public boost::enable_shared_from_this< GameObject >
-   {
-   public:
-      enum ObjKind : uint8_t
-      {
-         None = 0x00,
-         Player = 0x01,
-         BattleNpc = 0x02,
-         EventNpc = 0x03,
-         Treasure = 0x04,
-         Aetheryte = 0x05,
-         GatheringPoint = 0x06,
-         EventObj = 0x07,
-         Mount = 0x08,
-         Companion = 0x09,
-         Retainer = 0x0A,
-         Area = 0x0B,
-         Housing = 0x0C,
-         Cutscene = 0x0D,
-         CardStand = 0x0E,
-      };
-
-   protected:
-      /*! Position of the object */
-      Common::FFXIVARR_POSITION3 m_pos;
-      /*! Rotation of the object */
-      float m_rot;
-      /*! Id of the actor */
-      uint32_t             m_id;
-      /*! Type of the actor */
-      ObjKind              m_objKind;
-
-   public:
-      explicit GameObject( ObjKind type );
-      virtual ~GameObject() {};
-
-      virtual void spawn( PlayerPtr pTarget ) {}
-      virtual void despawn( PlayerPtr pTarget ) {}
-
-      uint32_t getId() const;
-
-      ObjKind getObjKind() const;
-
-      Common::FFXIVARR_POSITION3& getPos();
-      void setPos( const Common::FFXIVARR_POSITION3& pos );
-      void setPos( float x, float y, float z );
-
-      float getRot() const;
-      void setRot( float rot );
-
-      bool isPlayer() const;
-      bool isBattleNpc() const;
-      bool isEventNpc() const;
-
-      ActorPtr getAsActor();
-      PlayerPtr getAsPlayer();
-      BattleNpcPtr getAsBattleNpc();
-      EventNpcPtr getAsEventNpc();
-   };
-
-}
-}
-#endif
diff --git a/src/servers/sapphire_zone/Actor/InstanceObject.cpp b/src/servers/sapphire_zone/Actor/InstanceObject.cpp
index a182b66b..17b75497 100644
--- a/src/servers/sapphire_zone/Actor/InstanceObject.cpp
+++ b/src/servers/sapphire_zone/Actor/InstanceObject.cpp
@@ -2,7 +2,7 @@
 #include "Zone/InstanceContent.h"
 
 Core::Entity::InstanceObject::InstanceObject( uint32_t objectId, uint32_t mapLinkId ) :
-   Core::Entity::GameObject( ObjKind::EventObj ),
+   Core::Entity::Actor( ObjKind::EventObj ),
    m_mapLinkId( mapLinkId ),
    m_state( 0 )
 {
diff --git a/src/servers/sapphire_zone/Actor/InstanceObject.h b/src/servers/sapphire_zone/Actor/InstanceObject.h
index 6bd61e0f..ed7d4d1a 100644
--- a/src/servers/sapphire_zone/Actor/InstanceObject.h
+++ b/src/servers/sapphire_zone/Actor/InstanceObject.h
@@ -1,13 +1,13 @@
 #ifndef SAPPHIRE_INSTANCEOBJECT_H
 #define SAPPHIRE_INSTANCEOBJECT_H
 
-#include "GameObject.h"
+#include "Actor.h"
 
 namespace Core
 {
 namespace Entity
 {
-   class InstanceObject : public GameObject
+   class InstanceObject : public Actor
    {
    public:
       InstanceObject( uint32_t objectId, uint32_t mapLinkId );
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 4c7c3df8..e3cf4b3c 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -55,7 +55,7 @@ using namespace Core::Network::Packets::Server;
 
 // player constructor
 Core::Entity::Player::Player() :
-   Actor( ObjKind::Player ),
+   Chara( ObjKind::Player ),
    m_lastWrite( 0 ),
    m_lastPing( 0 ),
    m_bIsLogin( false ),
@@ -250,7 +250,7 @@ void Core::Entity::Player::calculateStats()
 }
 
 
-void Core::Entity::Player::setAutoattack(bool mode)
+void Core::Entity::Player::setAutoattack( bool mode )
 {
    m_bAutoattack = mode;
    m_lastAttack = Util::getTimeMs();
@@ -829,10 +829,10 @@ void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget )
    pPlayer->queuePacket( ActorControlPacket143( getId(), DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
 }
 
-Core::Entity::ActorPtr Core::Entity::Player::lookupTargetById( uint64_t targetId )
+Core::Entity::CharaPtr Core::Entity::Player::lookupTargetById( uint64_t targetId )
 {
-   ActorPtr targetActor;
-   auto inRange = getInRangeActors( true );
+   CharaPtr targetActor;
+   auto inRange = getInRangeCharas(true);
    for( auto actor : inRange )
    {
       if( actor->getId() == targetId )
@@ -1000,12 +1000,12 @@ void Core::Entity::Player::update( int64_t currTime )
 
    if( !checkAction() )
    {
-      if( m_targetId && m_currentStance == Entity::Actor::Stance::Active && isAutoattackOn() )
+      if( m_targetId && m_currentStance == Entity::Chara::Stance::Active && isAutoattackOn() )
       {
          auto mainWeap = m_pInventory->getItemAt( Inventory::GearSet0, Inventory::EquipSlot::MainHand );
 
          // @TODO i dislike this, iterating over all in range actors when you already know the id of the actor you need...
-         for( auto actor : m_inRangeActors )
+         for( auto actor : m_inRangeCharas )
          {
             if( actor->getId() == m_targetId && actor->isAlive() && mainWeap )
             {
@@ -1408,7 +1408,7 @@ uint8_t Core::Entity::Player::getEquipDisplayFlags() const
 void Core::Entity::Player::mount( uint32_t id )
 {
    m_mount = id;
-   sendToInRangeSet( ActorControlPacket142( getId(), ActorControlType::SetStatus, static_cast< uint8_t >( Entity::Actor::ActorStatus::Mounted )), true );
+   sendToInRangeSet( ActorControlPacket142( getId(), ActorControlType::SetStatus, static_cast< uint8_t >( Entity::Chara::ActorStatus::Mounted )), true );
    sendToInRangeSet( ActorControlPacket143( getId(), 0x39e, 12 ), true ); //?
 
    ZoneChannelPacket< FFXIVIpcMount > mountPacket( getId() );
@@ -1419,7 +1419,7 @@ void Core::Entity::Player::mount( uint32_t id )
 void Core::Entity::Player::dismount()
 {
    sendToInRangeSet( ActorControlPacket142( getId(), ActorControlType::SetStatus,
-                                            static_cast< uint8_t >( Entity::Actor::ActorStatus::Idle )), true );
+                                            static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle )), true );
    sendToInRangeSet( ActorControlPacket143( getId(), ActorControlType::Dismount, 1 ), true );
    m_mount = 0;
 }
@@ -1429,7 +1429,7 @@ uint8_t Core::Entity::Player::getCurrentMount() const
    return m_mount;
 }
 
-void Core::Entity::Player::autoAttack( ActorPtr pTarget )
+void Core::Entity::Player::autoAttack( CharaPtr pTarget )
 {
 
    auto mainWeap = m_pInventory->getItemAt( Inventory::GearSet0,
@@ -1663,15 +1663,15 @@ void Core::Entity::Player::finishZoning()
       case ZoneingType::Return:
       case ZoneingType::ReturnDead:
       {
-         if( getStatus() == Entity::Actor::ActorStatus::Dead )
+         if( getStatus() == Entity::Chara::ActorStatus::Dead )
          {
             resetHp();
             resetMp();
-            setStatus( Entity::Actor::ActorStatus::Idle );
+            setStatus( Entity::Chara::ActorStatus::Idle );
 
             sendToInRangeSet( ActorControlPacket143( getId(), ZoneIn, 0x01, 0x01, 0, 111 ), true );
             sendToInRangeSet( ActorControlPacket142( getId(), SetStatus,
-                                                     static_cast< uint8_t >( Entity::Actor::ActorStatus::Idle ) ), true );
+                                                     static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) ), true );
          }
          else
             sendToInRangeSet( ActorControlPacket143( getId(), ZoneIn, 0x01, 0x00, 0, 111 ), true );
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 7fb80e58..291091c0 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -5,7 +5,7 @@
 
 #include <common/Common.h>
 
-#include "Actor.h"
+#include "Chara.h"
 #include "Inventory/Inventory.h"
 #include "Event/EventHandler.h"
 #include <map>
@@ -33,7 +33,7 @@ struct QueuedZoning
 *  Inheriting from Actor
 *
 */
-class Player : public Actor
+class Player : public Chara
 {
 public:
    /*! Contructor */
@@ -42,7 +42,7 @@ public:
    /*! Destructor */
    ~Player();
 
-   void autoAttack( ActorPtr pTarget ) override;
+   void autoAttack( CharaPtr pTarget ) override;
 
    // EventHandlers
    //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -526,7 +526,7 @@ public:
 
    bool actionHasCastTime( uint32_t actionId );
 
-   Core::Entity::ActorPtr lookupTargetById( uint64_t targetId );
+   Core::Entity::CharaPtr lookupTargetById( uint64_t targetId );
 
    bool isLogin() const;
    void setIsLogin( bool bIsLogin );
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index aeeb5ad9..b0ba4679 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -227,7 +227,7 @@ void Core::Entity::Player::eventActionStart( uint32_t eventId,
                                              ActionCallback interruptCallback,
                                              uint64_t additional )
 {
-   auto pEventAction = Action::make_EventAction( getAsActor(), eventId, action,
+   auto pEventAction = Action::make_EventAction( getAsChara(), eventId, action,
                                                  finishCallback, interruptCallback, additional );
 
    setCurrentAction( pEventAction );
@@ -257,7 +257,7 @@ void Core::Entity::Player::eventItemActionStart( uint32_t eventId,
                                                  ActionCallback interruptCallback,
                                                  uint64_t additional )
 {
-   Action::ActionPtr pEventItemAction = Action::make_EventItemAction( getAsActor(), eventId, action,
+   Action::ActionPtr pEventItemAction = Action::make_EventItemAction( getAsChara(), eventId, action,
                                                                       finishCallback, interruptCallback, additional );
 
    setCurrentAction( pEventItemAction );
diff --git a/src/servers/sapphire_zone/Forwards.h b/src/servers/sapphire_zone/Forwards.h
index fa387adb..85e07eef 100644
--- a/src/servers/sapphire_zone/Forwards.h
+++ b/src/servers/sapphire_zone/Forwards.h
@@ -34,8 +34,8 @@ namespace Core
 
    namespace Entity
    {
-      TYPE_FORWARD( GameObject );
       TYPE_FORWARD( Actor );
+      TYPE_FORWARD( Chara );
       TYPE_FORWARD( Player );
       TYPE_FORWARD( BattleNpc );
       TYPE_FORWARD( EventNpc );
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.cpp b/src/servers/sapphire_zone/Math/CalcBattle.cpp
index fb95cddc..9b1bc1a4 100644
--- a/src/servers/sapphire_zone/Math/CalcBattle.cpp
+++ b/src/servers/sapphire_zone/Math/CalcBattle.cpp
@@ -2,7 +2,7 @@
 
 #include <common/Exd/ExdDataGenerated.h>
 #include <common/Common.h>
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 #include "Actor/Player.h"
 #include "CalcBattle.h"
 
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.h b/src/servers/sapphire_zone/Math/CalcBattle.h
index 8c43107f..72a160c0 100644
--- a/src/servers/sapphire_zone/Math/CalcBattle.h
+++ b/src/servers/sapphire_zone/Math/CalcBattle.h
@@ -2,7 +2,7 @@
 #define _CALCBATTLE_H
 
 #include <common/Common.h>
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 
 using namespace Core::Entity;
 
diff --git a/src/servers/sapphire_zone/Math/CalcStats.cpp b/src/servers/sapphire_zone/Math/CalcStats.cpp
index d15814dd..52213552 100644
--- a/src/servers/sapphire_zone/Math/CalcStats.cpp
+++ b/src/servers/sapphire_zone/Math/CalcStats.cpp
@@ -2,7 +2,7 @@
 
 #include <common/Exd/ExdDataGenerated.h>
 #include <common/Common.h>
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 #include "Actor/Player.h"
 
 #include "CalcStats.h"
diff --git a/src/servers/sapphire_zone/Math/CalcStats.h b/src/servers/sapphire_zone/Math/CalcStats.h
index 2bf17da5..868d86f4 100644
--- a/src/servers/sapphire_zone/Math/CalcStats.h
+++ b/src/servers/sapphire_zone/Math/CalcStats.h
@@ -2,7 +2,7 @@
 #define _CALCSTATS_H
 
 #include <common/Common.h>
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 
 using namespace Core::Entity;
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 70ce5885..9739756a 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -119,10 +119,10 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
         case ClientTrigger::ToggleSeathe:  // Toggle sheathe
         {
             if ( param11 == 1 )
-                player.setStance( Entity::Actor::Stance::Active );
+                player.setStance( Entity::Chara::Stance::Active );
             else
             {
-                player.setStance( Entity::Actor::Stance::Passive );
+                player.setStance( Entity::Chara::Stance::Passive );
                 player.setAutoattack( false );
             }
 
@@ -135,7 +135,7 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
             if ( param11 == 1 )
             {
                 player.setAutoattack( true );
-                player.setStance( Entity::Actor::Stance::Active );
+                player.setStance( Entity::Chara::Stance::Active );
             }
             else
                 player.setAutoattack( false );
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index 399fdf9b..692fc1a5 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -37,7 +37,7 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::GamePacket&
    std::string eventName = "onTalk";
    std::string objName = Event::getEventName( eventId );
 
-   player.sendDebug( "Actor: " +
+   player.sendDebug( "Chara: " +
                      std::to_string( actorId ) + " -> " +
                      std::to_string( Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ) ) +
                      " \neventId: " +
@@ -72,7 +72,7 @@ void Core::Network::GameConnection::eventHandlerEmote( const Packets::GamePacket
    std::string eventName = "onEmote";
    std::string objName = Event::getEventName( eventId );
 
-   player.sendDebug( "Actor: " +
+   player.sendDebug( "Chara: " +
                      std::to_string( actorId ) + " -> " +
                      std::to_string( Event::mapEventActorToRealActor( static_cast< uint32_t >( actorId ) ) ) +
                      " \neventId: " +
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 865ffdc1..63c19006 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -104,7 +104,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       ", params: " + std::to_string( param1 ) + ", " +
       std::to_string( param2 ) + ", " + std::to_string( param3 ) );
 
-   Core::Entity::ActorPtr targetActor;
+   Core::Entity::CharaPtr targetActor;
 
 
    if( player.getId() == param3 )
@@ -113,7 +113,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    else
    {
-      auto inRange = player.getInRangeActors();
+      auto inRange = player.getInRangeCharas();
       for( auto actor : inRange )
       {
          if( actor->getId() == param3 )
@@ -138,7 +138,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Race, param1 );
       player.sendNotice( "Race for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetPlayer->getInRangeActors();
+      auto inRange = targetPlayer->getInRangeCharas();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -151,7 +151,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Tribe, param1 );
       player.sendNotice( "Tribe for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetPlayer->getInRangeActors();
+      auto inRange = targetPlayer->getInRangeCharas();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -164,7 +164,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Gender, param1 );
       player.sendNotice( "Sex for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetActor->getInRangeActors();
+      auto inRange = targetActor->getInRangeCharas();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -439,7 +439,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    case GmCommand::Jump:
    {
 
-      auto inRange = player.getInRangeActors();
+      auto inRange = player.getInRangeCharas();
 
       player.changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
                              targetActor->getRotation() );
@@ -466,7 +466,7 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
    g_log.debug( player.getName() + " used GM2 commandId: " + std::to_string( commandId ) + ", params: " + param1 );
 
    auto targetSession = g_serverZone.getSession( param1 );
-   Core::Entity::ActorPtr targetActor;
+   Core::Entity::CharaPtr targetActor;
 
    if( targetSession != nullptr )
    {
@@ -496,11 +496,11 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
    {
       targetPlayer->resetHp();
       targetPlayer->resetMp();
-      targetPlayer->setStatus( Entity::Actor::ActorStatus::Idle );
+      targetPlayer->setStatus( Entity::Chara::ActorStatus::Idle );
 
       targetPlayer->sendToInRangeSet( ActorControlPacket143( player.getId(), ZoneIn, 0x01, 0x01, 0, 113 ), true );
       targetPlayer->sendToInRangeSet( ActorControlPacket142( player.getId(), SetStatus,
-         static_cast< uint8_t >( Entity::Actor::ActorStatus::Idle ) ), true );
+         static_cast< uint8_t >( Entity::Chara::ActorStatus::Idle ) ), true );
       player.sendNotice( "Raised  " + targetPlayer->getName() );
       break;
    }
diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
index a47a4988..ac964471 100644
--- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
@@ -75,7 +75,7 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
         }
         else
         {
-            Core::Entity::ActorPtr targetActor = player.getAsPlayer();
+            Core::Entity::CharaPtr targetActor = player.getAsPlayer();
             if( targetId != player.getId() )
             {
                 targetActor = player.lookupTargetById( targetId );
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
index 1771d801..ee671e85 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
@@ -21,14 +21,14 @@ class MoveActorPacket :
    public ZoneChannelPacket< FFXIVIpcActorMove >
 {
 public:
-   MoveActorPacket( Entity::Actor& actor, uint8_t unk1, uint8_t unk2, uint8_t unk3, uint16_t unk4 ) :
+   MoveActorPacket( Entity::Chara& actor, uint8_t unk1, uint8_t unk2, uint8_t unk3, uint16_t unk4 ) :
       ZoneChannelPacket< FFXIVIpcActorMove >( actor.getId(), actor.getId() )
    {
       initialize( actor, unk1, unk2, unk3, unk4 );
    };
 
 private:
-   void initialize( Entity::Actor& actor, uint8_t unk1, uint8_t unk2, uint8_t unk3, uint16_t unk4 )
+   void initialize( Entity::Chara& actor, uint8_t unk1, uint8_t unk2, uint8_t unk3, uint16_t unk4 )
    {
       
       m_data.rotation = Math::Util::floatToUInt8Rot( actor.getRotation() );
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
index 9c367aa9..e940e53a 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -90,22 +90,22 @@ namespace Server {
 
          if( player.getZoningType() != Common::ZoneingType::None )
          {
-            m_data.displayFlags |= Entity::Actor::DisplayFlags::Invisible;
+            m_data.displayFlags |= Entity::Chara::DisplayFlags::Invisible;
          }
 
          if( player.getEquipDisplayFlags() & Core::Common::EquipDisplayFlags::HideHead )
          {
-            m_data.displayFlags |= Entity::Actor::DisplayFlags::HideHead;
+            m_data.displayFlags |= Entity::Chara::DisplayFlags::HideHead;
          }
 
          if( player.getEquipDisplayFlags() & Core::Common::EquipDisplayFlags::HideWeapon )
          {
-            m_data.displayFlags |= Entity::Actor::DisplayFlags::HideWeapon;
+            m_data.displayFlags |= Entity::Chara::DisplayFlags::HideWeapon;
          }
 
          if( player.getEquipDisplayFlags() & Core::Common::EquipDisplayFlags::Visor )
          {
-            m_data.displayFlags |= Entity::Actor::DisplayFlags::Visor;
+            m_data.displayFlags |= Entity::Chara::DisplayFlags::Visor;
          }
 
          m_data.currentMount = player.getCurrentMount();
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
index e880a4da..64952593 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/UpdateHpMpTpPacket.h
@@ -2,7 +2,7 @@
 #define _UPDATEHPMPTP_H
 
 #include <common/Network/GamePacketNew.h>
-#include <Actor/Actor.h>
+#include <Actor/Chara.h>
 #include "Forwards.h"
 
 namespace Core {
@@ -17,14 +17,14 @@ class UpdateHpMpTpPacket :
    public ZoneChannelPacket< FFXIVIpcUpdateHpMpTp >
 {
 public:
-   UpdateHpMpTpPacket( Entity::Actor& actor ) :
+   UpdateHpMpTpPacket( Entity::Chara& actor ) :
       ZoneChannelPacket< FFXIVIpcUpdateHpMpTp >( actor.getId(), actor.getId() )
    {
       initialize( actor );
    };
 
 private:
-   void initialize( Entity::Actor& actor )
+   void initialize( Entity::Chara& actor )
    {
       m_data.hp = actor.getHp();
       m_data.mp = actor.getMp();
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index 893dc6cd..1d5e5b22 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -5,7 +5,7 @@
 #include <typeinfo>
 #include <typeindex>
 
-#include <Actor/Actor.h>
+#include <Actor/Chara.h>
 #include <Actor/Player.h>
 #include <StatusEffect/StatusEffect.h>
 #include <Zone/InstanceContent.h>
@@ -53,14 +53,14 @@ public:
       ScriptObject( effectId, typeid( StatusEffectScript ).hash_code() )
    { }
 
-   virtual void onTick( Entity::Actor& actor ) { }
-   virtual void onApply( Entity::Actor& actor ) { }
-   virtual void onRemove( Entity::Actor& actor ) { }
-   virtual void onExpire( Entity::Actor& actor ) { }
-   virtual void onPlayerCollision( Entity::Actor& actor, Entity::Actor& actorHit ) { }
-   virtual void onPlayerFinishCast( Entity::Actor& actor ) { }
-   virtual void onPlayerDamaged( Entity::Actor& actor ) { }
-   virtual void onPlayerDeath( Entity::Actor& actor ) { }
+   virtual void onTick( Entity::Chara& actor ) { }
+   virtual void onApply( Entity::Chara& actor ) { }
+   virtual void onRemove( Entity::Chara& actor ) { }
+   virtual void onExpire( Entity::Chara& actor ) { }
+   virtual void onPlayerCollision( Entity::Chara& actor, Entity::Chara& actorHit ) { }
+   virtual void onPlayerFinishCast( Entity::Chara& actor ) { }
+   virtual void onPlayerDamaged( Entity::Chara& actor ) { }
+   virtual void onPlayerDeath( Entity::Chara& actor ) { }
 };
 
 
@@ -71,9 +71,9 @@ public:
       ScriptObject( abilityId, typeid( ActionScript ).hash_code() )
    { }
 
-   virtual void onStart( Entity::Actor& sourceActor, Entity::Actor& targetActor ) { }
-   virtual void onCastFinish( Entity::Player& player, Entity::Actor& targetActor ) { }
-   virtual void onInterrupt( Entity::Actor& sourceActor/*, Core::Entity::Actor targetActor*/ ) { }
+   virtual void onStart( Entity::Chara& sourceActor, Entity::Chara& targetActor ) { }
+   virtual void onCastFinish( Entity::Player& player, Entity::Chara& targetActor ) { }
+   virtual void onInterrupt( Entity::Chara& sourceActor/*, Core::Entity::Chara targetActor*/ ) { }
 };
 
 
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 1e569918..07f0b18f 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -275,7 +275,7 @@ bool Core::Scripting::ScriptManager::onMobKill( Entity::Player& player, uint16_t
    return true;
 }
 
-bool Core::Scripting::ScriptManager::onCastFinish( Entity::Player& player, Entity::ActorPtr pTarget, uint32_t actionId )
+bool Core::Scripting::ScriptManager::onCastFinish( Entity::Player& player, Entity::CharaPtr pTarget, uint32_t actionId )
 {
    auto script = m_nativeScriptManager->getScript< ActionScript >( actionId );
 
@@ -284,7 +284,7 @@ bool Core::Scripting::ScriptManager::onCastFinish( Entity::Player& player, Entit
    return true;
 }
 
-bool Core::Scripting::ScriptManager::onStatusReceive( Entity::ActorPtr pActor, uint32_t effectId )
+bool Core::Scripting::ScriptManager::onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId )
 {
    auto script = m_nativeScriptManager->getScript< StatusEffectScript >( effectId );
 
@@ -300,30 +300,30 @@ bool Core::Scripting::ScriptManager::onStatusReceive( Entity::ActorPtr pActor, u
    return false;
 }
 
-bool Core::Scripting::ScriptManager::onStatusTick( Entity::ActorPtr pActor, Core::StatusEffect::StatusEffect& effect )
+bool Core::Scripting::ScriptManager::onStatusTick( Entity::CharaPtr pChara, Core::StatusEffect::StatusEffect& effect )
 {
    auto script = m_nativeScriptManager->getScript< StatusEffectScript >( effect.getId() );
    if( script )
    {
-      if( pActor->isPlayer() )
-         pActor->getAsPlayer()->sendDebug( "Calling status tick for statusid: " + std::to_string( effect.getId() ) );
+      if( pChara->isPlayer() )
+         pChara->getAsPlayer()->sendDebug( "Calling status tick for statusid: " + std::to_string( effect.getId() ) );
 
-      script->onTick( *pActor );
+      script->onTick( *pChara );
       return true;
    }
 
    return false;
 }
 
-bool Core::Scripting::ScriptManager::onStatusTimeOut( Entity::ActorPtr pActor, uint32_t effectId )
+bool Core::Scripting::ScriptManager::onStatusTimeOut( Entity::CharaPtr pChara, uint32_t effectId )
 {
    auto script = m_nativeScriptManager->getScript< StatusEffectScript >( effectId );
    if( script )
    {
-      if( pActor->isPlayer() )
-         pActor->getAsPlayer()->sendDebug( "Calling status timeout for statusid: " + std::to_string( effectId ) );
+      if( pChara->isPlayer() )
+         pChara->getAsPlayer()->sendDebug( "Calling status timeout for statusid: " + std::to_string( effectId ) );
 
-      script->onExpire( *pActor );
+      script->onExpire( *pChara );
       return true;
    }
 
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.h b/src/servers/sapphire_zone/Script/ScriptManager.h
index 634afefb..ac423b39 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.h
+++ b/src/servers/sapphire_zone/Script/ScriptManager.h
@@ -48,11 +48,11 @@ namespace Core
 
          bool onMobKill( Entity::Player& player, uint16_t nameId );
 
-         bool onCastFinish( Entity::Player& pPlayer, Entity::ActorPtr pTarget, uint32_t actionId );
+         bool onCastFinish( Entity::Player& pPlayer, Entity::CharaPtr pTarget, uint32_t actionId );
 
-         bool onStatusReceive( Entity::ActorPtr pActor, uint32_t effectId );
-         bool onStatusTick( Entity::ActorPtr pActor, Core::StatusEffect::StatusEffect& effect );
-         bool onStatusTimeOut( Entity::ActorPtr pActor, uint32_t effectId );
+         bool onStatusReceive( Entity::CharaPtr pActor, uint32_t effectId );
+         bool onStatusTick( Entity::CharaPtr pActor, Core::StatusEffect::StatusEffect& effect );
+         bool onStatusTimeOut( Entity::CharaPtr pActor, uint32_t effectId );
 
          bool onZoneInit( ZonePtr pZone );
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
index 17da1520..3848b55c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
+++ b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
@@ -3,7 +3,7 @@
 
 #include <Script/NativeScriptApi.h>
 #include <Forwards.h>
-#include <Actor/Actor.h>
+#include <Actor/Chara.h>
 #include <Actor/Player.h>
 #include <Event/EventHelper.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp b/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
index 076bbf5f..428a0c60 100644
--- a/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
@@ -6,7 +6,7 @@ public:
    ActionSprint3() : ActionScript( 3 )
    {}
 
-   void onCastFinish( Core::Entity::Player& player, Core::Entity::Actor& targetActor ) override
+   void onCastFinish( Core::Entity::Player& player, Core::Entity::Chara& targetActor ) override
    {
       player.addStatusEffectByIdIfNotExist( 50, 20000, player, 30 );
    }
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
index 1b8d38d6..dc69667d 100644
--- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
+++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
@@ -6,7 +6,7 @@
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
 
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 
 #include "StatusEffect.h"
 #include "Script/ScriptManager.h"
@@ -20,7 +20,7 @@ using namespace Core::Network::Packets::Server;
 extern Core::Scripting::ScriptManager g_scriptMgr;
 
 
-Core::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::ActorPtr sourceActor, Entity::ActorPtr targetActor,
+Core::StatusEffect::StatusEffect::StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
                                                 uint32_t duration, uint32_t tickRate )
    : m_id( id )
    , m_sourceActor( sourceActor )
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.h b/src/servers/sapphire_zone/StatusEffect/StatusEffect.h
index 070bfb44..3a139ec0 100644
--- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.h
+++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.h
@@ -14,7 +14,7 @@ namespace StatusEffect
 class StatusEffect
 {
 public:
-   StatusEffect( uint32_t id, Entity::ActorPtr sourceActor, Entity::ActorPtr targetActor,
+   StatusEffect( uint32_t id, Entity::CharaPtr sourceActor, Entity::CharaPtr targetActor,
                  uint32_t duration, uint32_t tickRate );
 
    ~StatusEffect();
@@ -39,8 +39,8 @@ public:
 
 private:
    uint32_t m_id;
-   Entity::ActorPtr m_sourceActor;
-   Entity::ActorPtr m_targetActor;
+   Entity::CharaPtr m_sourceActor;
+   Entity::CharaPtr m_targetActor;
    uint32_t m_duration;
    uint64_t m_startTime;
    uint32_t m_tickRate;
diff --git a/src/servers/sapphire_zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Zone/Cell.cpp
index 9ee35e31..860f859b 100644
--- a/src/servers/sapphire_zone/Zone/Cell.cpp
+++ b/src/servers/sapphire_zone/Zone/Cell.cpp
@@ -1,171 +1,146 @@
 #include "Cell.h"
 
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 #include "Actor/BattleNpc.h"
 #include "Forwards.h"
 #include "Zone.h"
 
-
 // TODO: the entire zone / areahandling is a bit outdated ( in parts i used this for the 1.0 iteration )
 // likely this could be greatly improved or redone
-namespace Core 
+
+Core::Cell::Cell() :
+   m_bActive( false ),
+   m_bLoaded( false ),
+   m_playerCount( 0 ),
+   m_bUnloadPending( false )
 {
+   m_bForcedActive = false;
+}
 
+Core::Cell::~Cell()
+{
+   removeCharas();
+}
 
-   Cell::Cell() 
-      : m_bActive(false)
-      , m_bLoaded(false)
-      , m_playerCount(0)
-      , m_bUnloadPending(false)
+void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone )
+{
+   //Console->outDebOnly("[Region:%X] Initializing a new cell[%i/%i]", pRegion->getId(), x, y );
+   m_pZone = pZone;
+   m_posX = x;
+   m_posY = y;
+
+   m_charas.clear();
+}
+
+void Core::Cell::loadCharas( CellCache* pCC )
+{
+   m_bLoaded = true;
+   assert( pCC );
+
+   for( auto entry : pCC->battleNpcCache )
    {
-      m_bForcedActive = false;
+      entry->setCurrentZone( m_pZone );
+      m_pZone->pushActor( entry );
    }
+}
 
-   Cell::~Cell() 
+void Core::Cell::addChara( Entity::CharaPtr pAct )
+{
+   if( pAct->isPlayer() )
+      ++m_playerCount;
+
+   m_charas.insert(pAct);
+}
+
+void Core::Cell::removeChara( Entity::CharaPtr pAct )
+{
+   if( pAct->isPlayer() )
+      --m_playerCount;
+
+   m_charas.erase(pAct);
+}
+
+void Core::Cell::setActivity( bool state )
+{
+   if( !m_bActive && state )
    {
-      removeActors();
-   }
+      // Move all objects to active set.
+      //for( auto itr = m_charas.begin(); itr != m_charas.end(); ++itr )
+      //{
 
-   void Cell::init(uint32_t x, uint32_t y, ZonePtr pZone)
+      //}
+
+      if( m_bUnloadPending )
+         cancelPendingUnload();
+
+   }
+   else if( m_bActive && !state )
    {
-      //Console->outDebOnly("[Region:%X] Initializing a new cell[%i/%i]", pRegion->getId(), x, y );
-      m_pZone				= pZone;
-      m_posX				= x;
-      m_posY				= y;
+      // Move all objects from active set.
+      //for(auto itr = m_charas.begin(); itr != m_charas.end(); ++itr)
+      //{
 
-      m_actors.clear();
-   }
+      //}
 
-   void Cell::loadActors(CellCache* pCC) 
-   {
-
-      m_bLoaded = true;
-      assert(pCC);
-
-      for( auto entry : pCC->battleNpcCache ) 
-      {
-
-         entry->setCurrentZone( m_pZone );
-         m_pZone->pushActor( entry );
-
-      }
-   }
-
-   void Cell::addActor(Entity::ActorPtr pAct) 
-   {
-      if(pAct->isPlayer()) 
-      {
-         //Console->outDebOnly("[Region:%X] Adding player %i to cell[%i/%i]", m_pZone->getId(), pAct->getId(), m_posX, m_posY);
-         ++m_playerCount;
-      }
-
-      m_actors.insert(pAct);
-   }
-
-   void Cell::removeActor(Entity::ActorPtr pAct)
-   {
-      if(pAct->isPlayer()) 
-      {
-         //->outDebOnly("[Region:%X] Removing player %i from cell[%i/%i]", m_pZone->getId(), pAct->getId(), m_posX, m_posY);
-         --m_playerCount;
-      }
-
-      m_actors.erase(pAct);
-   }
-
-   void Cell::setActivity(bool state) 
-   {	
-      if(!m_bActive && state)
-      {
-         // Move all objects to active set.
-         for(auto itr = m_actors.begin(); itr != m_actors.end(); ++itr) 
-         {
-
-         }
-
-         if(m_bUnloadPending) 
-         {
-            cancelPendingUnload();
-         }
-
-      } 
-      else if(m_bActive && !state) 
-      {
-         // Move all objects from active set.
-         for(auto itr = m_actors.begin(); itr != m_actors.end(); ++itr) 
-         {
-
-         }
-
-
-      }
-
-      m_bActive = state; 
-
-   }
-   void Cell::removeActors() 
-   {
-      //uint32_t ltime = getMSTime();
-
-      m_actors.clear();
-
-      //This time it's simpler! We just remove everything 
-      Entity::ActorPtr pAct; //do this outside the loop!
-      for(auto itr = m_actors.begin(); itr != m_actors.end();) 
-      {
-         pAct = (*itr);
-         itr++;
-
-         if(!pAct) 
-         {
-            continue;
-         }
-
-         if(m_bUnloadPending) 
-         {
-
-         }
-
-      }
-
-      m_playerCount = 0;
-      m_bLoaded = false;
-   }
-
-
-
-   void Cell::queueUnloadPending() 
-   {
-      if(m_bUnloadPending) 
-      {
-         return;
-      }
-
-      m_bUnloadPending = true;
 
    }
 
-   void Cell::cancelPendingUnload() 
-   {
-
-      if(!m_bUnloadPending)
-      {
-         return;
-      }
-
-   }
-
-   void Cell::unload()
-   {
-
-      assert(m_bUnloadPending);
-      if(m_bActive) 
-      {
-         return;
-      }
-
-      removeActors();
-      m_bUnloadPending = false;
-   }
+   m_bActive = state;
 
 }
+
+void Core::Cell::removeCharas()
+{
+   //uint32_t ltime = getMSTime();
+
+   m_charas.clear();
+
+   //This time it's simpler! We just remove everything
+   Entity::ActorPtr pAct; //do this outside the loop!
+   for( auto itr = m_charas.begin(); itr != m_charas.end(); )
+   {
+      pAct = (*itr);
+      itr++;
+
+      if(!pAct)
+      {
+         continue;
+      }
+
+      if(m_bUnloadPending)
+      {
+
+      }
+
+   }
+
+   m_playerCount = 0;
+   m_bLoaded = false;
+}
+
+void Core::Cell::queueUnloadPending()
+{
+   if( m_bUnloadPending )
+      return;
+
+   m_bUnloadPending = true;
+
+}
+
+void Core::Cell::cancelPendingUnload()
+{
+   if( !m_bUnloadPending )
+      return;
+}
+
+void Core::Cell::unload()
+{
+
+   assert( m_bUnloadPending );
+   if( m_bActive )
+      return;
+
+   removeCharas();
+   m_bUnloadPending = false;
+}
+
diff --git a/src/servers/sapphire_zone/Zone/Cell.h b/src/servers/sapphire_zone/Zone/Cell.h
index ede57a6f..2136d755 100644
--- a/src/servers/sapphire_zone/Zone/Cell.h
+++ b/src/servers/sapphire_zone/Zone/Cell.h
@@ -15,7 +15,7 @@ namespace Core {
       std::vector< Entity::BattleNpcPtr > battleNpcCache;
    };
 
-   typedef std::set< Entity::ActorPtr > ActorSet;
+   typedef std::set< Entity::CharaPtr > CharaSet;
 
    class Cell 
    {
@@ -25,9 +25,9 @@ namespace Core {
       bool m_bForcedActive;
       uint16_t m_posX;
       uint16_t m_posY;
-      ActorSet m_actors;
+      CharaSet m_charas;
       bool m_bActive;
-      bool  m_bLoaded;
+      bool m_bLoaded;
       bool m_bUnloadPending;
 
       uint16_t m_playerCount;
@@ -37,17 +37,17 @@ namespace Core {
       Cell();
       ~Cell();
 
-      void init(uint32_t x, uint32_t y, ZonePtr pZone);
+      void init( uint32_t x, uint32_t y, ZonePtr pZone );
 
-      void addActor(Entity::ActorPtr pAct); 
+      void addChara( Entity::CharaPtr pAct );
 
-      void removeActor(Entity::ActorPtr pAct);
+      void removeChara( Entity::CharaPtr pAct );
 
-      void loadActors(CellCache* pCC);
+      void loadCharas( CellCache *pCC );
 
-      bool hasActor(Entity::ActorPtr pAct) 
+      bool hasChara( Entity::CharaPtr pAct )
       { 
-         return (m_actors.find(pAct) != m_actors.end()); 
+         return (m_charas.find(pAct) != m_charas.end());
       }
 
       bool hasPlayers() const
@@ -55,21 +55,21 @@ namespace Core {
          return ((m_playerCount > 0) ? true : false); 
       }
 
-      size_t getActorCount() const
+      size_t getCharaCount() const
       { 
-         return m_actors.size(); 
+         return m_charas.size();
       }
 
-      void removeActors();
+      void removeCharas();
 
-      ActorSet::iterator begin() 
+      CharaSet::iterator begin()
       {
-         return m_actors.begin(); 
+         return m_charas.begin();
       }
 
-      ActorSet::iterator end() 
+      CharaSet::iterator end()
       {
-         return m_actors.end(); 
+         return m_charas.end();
       }
 
       void setActivity(bool state);
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index c930f3da..c2570b49 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -16,7 +16,7 @@
 #include "TerritoryMgr.h"
 
 #include "Session.h"
-#include "Actor/Actor.h"
+#include "Actor/Chara.h"
 #include "Actor/Player.h"
 #include "Actor/BattleNpc.h"
 #include "Actor/EventNpc.h"
@@ -268,10 +268,10 @@ Core::Common::Weather Core::Zone::getNextWeather()
    return Common::Weather::FairSkies;
 }
 
-void Core::Zone::pushActor( Entity::ActorPtr pActor )
+void Core::Zone::pushActor( Entity::CharaPtr pChara )
 {
-   float mx = pActor->getPos().x;
-   float my = pActor->getPos().z;
+   float mx = pChara->getPos().x;
+   float my = pChara->getPos().z;
    uint32_t cx = getPosX( mx );
    uint32_t cy = getPosY( my );
 
@@ -282,12 +282,12 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor )
       pCell->init( cx, cy, shared_from_this() );
    }
 
-   pCell->addActor( pActor );
+   pCell->addChara(pChara);
 
-   pActor->setCell( pCell );
+   pChara->setCell( pCell );
 
-   uint32_t cellX = getPosX( pActor->getPos().x );
-   uint32_t cellY = getPosY( pActor->getPos().z );
+   uint32_t cellX = getPosX( pChara->getPos().x );
+   uint32_t cellY = getPosY( pChara->getPos().z );
 
    uint32_t endX = cellX <= _sizeX ? cellX + 1 : ( _sizeX - 1 );
    uint32_t endY = cellY <= _sizeY ? cellY + 1 : ( _sizeY - 1 );
@@ -301,13 +301,13 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor )
       {
          pCell = getCell( posX, posY );
          if( pCell )
-            updateInRangeSet( pActor, pCell );
+            updateInRangeSet( pChara, pCell );
       }
    }
 
-   if( pActor->isPlayer() )
+   if( pChara->isPlayer() )
    {
-      auto pPlayer = pActor->getAsPlayer();
+      auto pPlayer = pChara->getAsPlayer();
 
       auto pSession = g_serverZone.getSession( pPlayer->getId() );
       if( pSession )
@@ -315,17 +315,17 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor )
       m_playerMap[pPlayer->getId()] = pPlayer;
       updateCellActivity( cx, cy, 2 );
    }
-   else if( pActor->isBattleNpc() )
+   else if( pChara->isBattleNpc() )
    {
 
-      Entity::BattleNpcPtr pBNpc = pActor->getAsBattleNpc();
+      Entity::BattleNpcPtr pBNpc = pChara->getAsBattleNpc();
       m_BattleNpcMap[pBNpc->getId()] = pBNpc;
       pBNpc->setPosition( pBNpc->getPos() );
 
    }
-   else if( pActor->isEventNpc() )
+   else if( pChara->isEventNpc() )
    {
-      Entity::EventNpcPtr pENpc = pActor->getAsEventNpc();
+      Entity::EventNpcPtr pENpc = pChara->getAsEventNpc();
       m_EventNpcMap[pENpc->getId()] = pENpc;
       pENpc->setPosition( pENpc->getPos() );
    }
@@ -333,37 +333,37 @@ void Core::Zone::pushActor( Entity::ActorPtr pActor )
 
 }
 
-void Core::Zone::removeActor( Entity::ActorPtr pActor )
+void Core::Zone::removeActor( Entity::CharaPtr pChara )
 {
 
-   if( pActor->m_pCell )
+   if( pChara->m_pCell )
    {
-      pActor->m_pCell->removeActor( pActor );
-      pActor->m_pCell = nullptr;
+      pChara->m_pCell->removeChara(pChara);
+      pChara->m_pCell = nullptr;
    }
 
-   if( pActor->isPlayer() )
+   if( pChara->isPlayer() )
    {
 
       // If it's a player and he's inside boundaries - update his nearby cells
-      if( pActor->getPos().x <= _maxX && pActor->getPos().x >= _minX &&
-          pActor->getPos().z <= _maxY && pActor->getPos().z >= _minY )
+      if( pChara->getPos().x <= _maxX && pChara->getPos().x >= _minX &&
+          pChara->getPos().z <= _maxY && pChara->getPos().z >= _minY )
       {
-         uint32_t x = getPosX( pActor->getPos().x );
-         uint32_t y = getPosY( pActor->getPos().z );
+         uint32_t x = getPosX( pChara->getPos().x );
+         uint32_t y = getPosY( pChara->getPos().z );
          updateCellActivity( x, y, 3 );
       }
-      m_playerMap.erase( pActor->getId() );
+      m_playerMap.erase( pChara->getId() );
 
-      onLeaveTerritory( *pActor->getAsPlayer() );
+      onLeaveTerritory( *pChara->getAsPlayer() );
 
    }
-   else if( pActor->isBattleNpc() )
-      m_BattleNpcMap.erase( pActor->getId() );
+   else if( pChara->isBattleNpc() )
+      m_BattleNpcMap.erase( pChara->getId() );
 
    // remove from lists of other actors
-   pActor->removeFromInRange();
-   pActor->clearInRangeSet();
+   pChara->removeFromInRange();
+   pChara->clearInRangeSet();
 
 }
 
@@ -601,7 +601,7 @@ void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
 
                CellCache * pCC = getCellCacheAndCreate( posX, posY );
                if( pCC )
-                  pCell->loadActors( pCC );
+                  pCell->loadCharas(pCC);
             }
          }
          else
@@ -615,7 +615,7 @@ void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
                {
                   CellCache * pCC = getCellCacheAndCreate( posX, posY );
                   if( pCC )
-                     pCell->loadActors( pCC );
+                     pCell->loadCharas(pCC);
                }
             }
             else if( !isCellActive( posX, posY ) && pCell->isActive() )
@@ -625,7 +625,7 @@ void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
    }
 }
 
-void Core::Zone::updateActorPosition( Entity::Actor &actor )
+void Core::Zone::updateActorPosition( Entity::Chara &actor )
 {
 
    if( actor.getCurrentZone() != shared_from_this() )
@@ -652,9 +652,9 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor )
    {
 
       if( pOldCell )
-         pOldCell->removeActor( actor.getAsActor() );
+         pOldCell->removeChara(actor.getAsChara());
 
-      pCell->addActor( actor.getAsActor() );
+      pCell->addChara(actor.getAsChara());
       actor.m_pCell = pCell;
 
       // if player we need to update cell activity
@@ -686,13 +686,13 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor )
       {
          pCell = getCell( posX, posY );
          if( pCell )
-            updateInRangeSet( actor.getAsActor(), pCell );
+            updateInRangeSet( actor.getAsChara(), pCell );
       }
    }
 }
 
 
-void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
+void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
 {
    if( pCell == nullptr )
       return;
@@ -701,33 +701,33 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
    if( g_territoryMgr.isPrivateTerritory( getTerritoryId() ) )
       return;
 
-   Entity::ActorPtr pCurAct;
+   Entity::CharaPtr pCurAct;
 
-   auto iter = pCell->m_actors.begin();
+   auto iter = pCell->m_charas.begin();
 
    float fRange = 70.0f;
    int32_t count = 0;
-   while( iter != pCell->m_actors.end() )
+   while( iter != pCell->m_charas.end() )
    {
       pCurAct = *iter;
       ++iter;
 
-      if( !pCurAct || pCurAct == pActor )
+      if( !pCurAct || pCurAct == pChara )
          continue;
 
       float distance = Math::Util::distance( pCurAct->getPos().x, pCurAct->getPos().y, pCurAct->getPos().z,
-                                             pActor->getPos().x, pActor->getPos().y, pActor->getPos().z );
+                                             pChara->getPos().x, pChara->getPos().y, pChara->getPos().z );
 
       bool isInRange = ( fRange == 0.0f || distance <= fRange );
-      bool isInRangeSet = pActor->isInRangeSet( pCurAct );
+      bool isInRangeSet = pChara->isInRangeSet( pCurAct );
 
       // Add if we are not ourself and range == 0 or distance is withing range.
       if( isInRange && !isInRangeSet )
       {
 
-         if( pActor->isPlayer() )
+         if( pChara->isPlayer() )
          {
-            auto pOwnPlayer = pActor->getAsPlayer();
+            auto pOwnPlayer = pChara->getAsPlayer();
 
             if( !pOwnPlayer->isLoadingComplete() )
                continue;
@@ -737,8 +737,8 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
             if( count > 12 )
                break;
 
-            pActor->addInRangeActor( pCurAct );
-            pCurAct->addInRangeActor( pActor );
+            pChara->addInRangeChara( pCurAct );
+            pCurAct->addInRangeChara( pChara );
             // spawn the actor for the player
             pCurAct->spawn( pOwnPlayer );
 
@@ -748,34 +748,34 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
                if( !pPlayer->isLoadingComplete() )
                   continue;
 
-               pActor->spawn( pPlayer );
+               pChara->spawn( pPlayer );
             }
 
          }
-         else if( ( pActor->isBattleNpc() || pActor->isEventNpc() ) && pCurAct->isPlayer() && pActor->isAlive() )
+         else if( ( pChara->isBattleNpc() || pChara->isEventNpc() ) && pCurAct->isPlayer() && pChara->isAlive() )
          {
             auto pPlayer = pCurAct->getAsPlayer();
             if( pPlayer->isLoadingComplete() )
             {
-               pActor->spawn( pPlayer );
-               pCurAct->addInRangeActor( pActor );
-               pActor->addInRangeActor( pCurAct );
+               pChara->spawn( pPlayer );
+               pCurAct->addInRangeChara( pChara );
+               pChara->addInRangeChara( pCurAct );
             }
          }
          else
          {
-            pActor->addInRangeActor( pCurAct );
-            pCurAct->addInRangeActor( pActor );
+            pChara->addInRangeChara( pCurAct );
+            pCurAct->addInRangeChara( pChara );
          }
       }
       else if( !isInRange && isInRangeSet )
       {
-         pCurAct->removeInRangeActor( *pActor );
+         pCurAct->removeInRangeChara( *pChara );
 
-         if( pActor->getCurrentZone() != pCurAct->getCurrentZone() )
+         if( pChara->getCurrentZone() != pCurAct->getCurrentZone() )
             continue;
 
-         pActor->removeInRangeActor( *pCurAct );
+         pChara->removeInRangeChara( *pCurAct );
       }
    }
 }
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 3a84eaee..d9bceda4 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -86,17 +86,17 @@ public:
 
    Common::Weather getNextWeather();
 
-   void pushActor( Entity::ActorPtr pActor );
+   void pushActor( Entity::CharaPtr pActor );
 
-   void removeActor( Entity::ActorPtr pActor );
+   void removeActor( Entity::CharaPtr pActor );
 
-   void updateActorPosition( Entity::Actor &pActor );
+   void updateActorPosition( Entity::Chara &pActor );
 
    bool isCellActive( uint32_t x, uint32_t y );
 
    void updateCellActivity( uint32_t x, uint32_t y, int32_t radius );
 
-   void updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell );
+   void updateInRangeSet( Entity::CharaPtr pActor, Cell* pCell );
 
    void queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t range, Network::Packets::GamePacketPtr pPacketEntry );
 

From 70732114112b93d10b0256ee47fc5c07c045e3d2 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Tue, 20 Feb 2018 23:42:09 +0100
Subject: [PATCH 14/69] Started stripping actors - readding after rewrite

---
 src/servers/sapphire_zone/Actor/Actor.cpp     |  16 +--
 src/servers/sapphire_zone/Actor/Actor.h       |   2 -
 .../sapphire_zone/Actor/BattleNpcTemplate.cpp |  37 ------
 .../sapphire_zone/Actor/BattleNpcTemplate.h   |  38 ------
 src/servers/sapphire_zone/Actor/EventNpc.cpp  | 118 ------------------
 src/servers/sapphire_zone/Actor/EventNpc.h    |  42 -------
 .../sapphire_zone/Actor/EventObject.cpp       |  48 +++++++
 .../Actor/{InstanceObject.h => EventObject.h} |   6 +-
 .../sapphire_zone/Actor/InstanceObject.cpp    |  48 -------
 .../DebugCommand/DebugCommandHandler.cpp      |  34 +----
 src/servers/sapphire_zone/Forwards.h          |   4 +-
 .../sapphire_zone/Script/ScriptManager.cpp    |   6 -
 .../sapphire_zone/Script/ScriptManager.h      |   2 -
 .../Scripts/instances/trials/TheNavel.cpp     |   8 +-
 src/servers/sapphire_zone/ServerZone.cpp      |  29 -----
 src/servers/sapphire_zone/ServerZone.h        |   8 --
 src/servers/sapphire_zone/Zone/Zone.cpp       |  17 +--
 src/servers/sapphire_zone/Zone/Zone.h         |  11 +-
 18 files changed, 69 insertions(+), 405 deletions(-)
 delete mode 100644 src/servers/sapphire_zone/Actor/BattleNpcTemplate.cpp
 delete mode 100644 src/servers/sapphire_zone/Actor/BattleNpcTemplate.h
 delete mode 100644 src/servers/sapphire_zone/Actor/EventNpc.cpp
 delete mode 100644 src/servers/sapphire_zone/Actor/EventNpc.h
 create mode 100644 src/servers/sapphire_zone/Actor/EventObject.cpp
 rename src/servers/sapphire_zone/Actor/{InstanceObject.h => EventObject.h} (74%)
 delete mode 100644 src/servers/sapphire_zone/Actor/InstanceObject.cpp

diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 5fa1cc69..924b5dd3 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -3,7 +3,6 @@
 #include "Player.h"
 #include "Chara.h"
 #include "BattleNpc.h"
-#include "EventNpc.h"
 
 Core::Entity::Actor::Actor( ObjKind type ) :
    m_objKind( type )
@@ -58,11 +57,6 @@ bool Core::Entity::Actor::isBattleNpc() const
    return m_objKind == ObjKind::BattleNpc;
 }
 
-bool Core::Entity::Actor::isEventNpc() const
-{
-   return m_objKind == ObjKind::EventNpc;
-}
-
 /*! \return pointer to this instance as ActorPtr */
 Core::Entity::CharaPtr Core::Entity::Actor::getAsChara()
 {
@@ -83,12 +77,4 @@ Core::Entity::BattleNpcPtr Core::Entity::Actor::getAsBattleNpc()
    if( !isBattleNpc() )
       return nullptr;
    return boost::dynamic_pointer_cast< Entity::BattleNpc, Entity::Actor >( shared_from_this() );
-}
-
-/*! \return pointer to this instance as EventNpcPtr */
-Core::Entity::EventNpcPtr Core::Entity::Actor::getAsEventNpc()
-{
-   if( !isEventNpc() )
-      return nullptr;
-   return boost::dynamic_pointer_cast< Entity::EventNpc, Entity::Actor >( shared_from_this() );
-}
+}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index ccd5996c..7f46e59e 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -69,12 +69,10 @@ namespace Entity {
 
       bool isPlayer() const;
       bool isBattleNpc() const;
-      bool isEventNpc() const;
 
       CharaPtr getAsChara();
       PlayerPtr getAsPlayer();
       BattleNpcPtr getAsBattleNpc();
-      EventNpcPtr getAsEventNpc();
    };
 
 }
diff --git a/src/servers/sapphire_zone/Actor/BattleNpcTemplate.cpp b/src/servers/sapphire_zone/Actor/BattleNpcTemplate.cpp
deleted file mode 100644
index 62c21ab1..00000000
--- a/src/servers/sapphire_zone/Actor/BattleNpcTemplate.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "BattleNpcTemplate.h"
-
-Core::Entity::BattleNpcTemplate::BattleNpcTemplate()
-{
-   
-}
-
-Core::Entity::BattleNpcTemplate::BattleNpcTemplate( std::string templateName, uint32_t bnpcBaseId, 
-                                                    uint32_t bnpcNameId, uint32_t modelId, std::string aiName ) :
-   m_templateName( templateName ),
-   m_bnpcBaseId( bnpcBaseId ),
-   m_bnpcNameId( bnpcNameId ),
-   m_modelId( modelId ),
-   m_aiName( aiName )
-{
-   
-}
-
-Core::Entity::BattleNpcTemplate::~BattleNpcTemplate()
-{
-
-}
-
-uint32_t Core::Entity::BattleNpcTemplate::getBnpcBaseId() const
-{
-   return m_bnpcBaseId;
-}
-
-uint32_t Core::Entity::BattleNpcTemplate::getBnpcNameId() const
-{
-   return m_bnpcNameId;
-}
-
-uint32_t Core::Entity::BattleNpcTemplate::getModelId() const
-{
-   return m_modelId;
-}
diff --git a/src/servers/sapphire_zone/Actor/BattleNpcTemplate.h b/src/servers/sapphire_zone/Actor/BattleNpcTemplate.h
deleted file mode 100644
index 07e8f5b9..00000000
--- a/src/servers/sapphire_zone/Actor/BattleNpcTemplate.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef _BATTLENPCTEMPLATE_H
-#define _BATTLENPCTEMPLATE_H
-
-#include <stdint.h>
-#include <string>
-
-namespace Core {
-namespace Entity {
-
-   /**
-    * \brief BattleNpcTemplate - Class which defines a template specific BNpcs can be created from
-    */
-   class BattleNpcTemplate
-   {
-   public:
-      BattleNpcTemplate();
-      BattleNpcTemplate( std::string templateName, uint32_t bnpcBaseId, uint32_t bnpcNameId, uint32_t modelId, std::string aiName );
-
-      ~BattleNpcTemplate();
-
-      uint32_t getBnpcBaseId() const;
-      uint32_t getBnpcNameId() const;
-      uint32_t getModelId() const;
-
-   private:
-      std::string m_templateName;
-      std::string m_aiName;
-      uint32_t m_bnpcBaseId = 0;
-      uint32_t m_bnpcNameId = 0;
-      uint32_t m_modelId = 0;
- 
-
-   };
-
-}
-}
-
-#endif
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/EventNpc.cpp b/src/servers/sapphire_zone/Actor/EventNpc.cpp
deleted file mode 100644
index 47555f8b..00000000
--- a/src/servers/sapphire_zone/Actor/EventNpc.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <stdint.h>
-#include <cmath>
-
-#include <common/Logging/Logger.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-
-#include "Player.h"
-#include "EventNpc.h"
-
-#include "Network/PacketWrappers/MoveActorPacket.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-
-using namespace Core::Common;
-using namespace Core::Network::Packets;
-using namespace Core::Network::Packets::Server;
-
-extern Core::Logger g_log;
-
-uint32_t Core::Entity::EventNpc::m_nextID = 1249241694;
-
-Core::Entity::EventNpc::EventNpc() :
-   Chara( ObjKind::EventNpc )
-{
-   m_id = 0;
-   m_status = ActorStatus::Idle;
-}
-
-Core::Entity::EventNpc::~EventNpc()
-{
-
-}
-
-Core::Entity::EventNpc::EventNpc( uint32_t enpcId, const Common::FFXIVARR_POSITION3& spawnPos, float rotation ) :
-   Chara( ObjKind::EventNpc )
-{
-   EventNpc::m_nextID++;
-   m_id = EventNpc::m_nextID;
-
-   m_pos = spawnPos;
-   m_posOrigin = spawnPos;
-
-   m_targetId = static_cast< uint64_t >( INVALID_GAME_OBJECT_ID );
-
-   m_maxHp = 150;
-   m_maxMp = 100;
-
-   m_baseStats.max_hp = m_maxHp;
-   m_baseStats.max_mp = m_maxMp;
-
-   m_hp = m_maxHp;
-   m_mp = m_maxMp;
-
-   m_currentStance = Stance::Passive;
-
-   m_eNpcId = enpcId;
-
-   m_status = ActorStatus::Idle;
-
-   m_invincibilityType = InvincibilityType::InvincibilityNone;
-   m_rot = rotation;
-
-}
-
-// spawn this player for pTarget
-/*! TODO: Retail additionally sends Look+Models for EventNpcs even though it is not needed,
-          add when the new exd reader is implemented(also counts for BNPCs) */
-void Core::Entity::EventNpc::spawn( PlayerPtr pTarget )
-{
-   ZoneChannelPacket< FFXIVIpcNpcSpawn > spawnPacket( getId(), pTarget->getId() );
-
-
-   spawnPacket.data().pos.x = m_pos.x;
-   spawnPacket.data().pos.y = m_pos.y;
-   spawnPacket.data().pos.z = m_pos.z;
-
-   spawnPacket.data().targetId = pTarget->getId();
-   spawnPacket.data().hPCurr = 1;
-   spawnPacket.data().hPMax = 1;
-
-   spawnPacket.data().bNPCBase = m_eNpcId;
-   spawnPacket.data().bNPCName = m_eNpcId;
-   spawnPacket.data().spawnIndex = pTarget->getSpawnIdForActorId( getId() );
-
-   spawnPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
-
-   spawnPacket.data().type = static_cast< uint8_t >( m_objKind );
-
-   pTarget->queuePacket( spawnPacket );
-}
-
-// despawn
-void Core::Entity::EventNpc::despawn( PlayerPtr pTarget )
-{
-   pTarget->freePlayerSpawnId( getId() );
-
-   ActorControlPacket143 controlPacket( m_id, DespawnZoneScreenMsg, 0x04, getId(), 0x01 );
-   pTarget->queuePacket( controlPacket );
-}
-
-uint8_t Core::Entity::EventNpc::getLevel() const
-{
-   return m_level;
-}
-
-void Core::Entity::EventNpc::resetPos()
-{
-   m_pos = m_posOrigin;
-}
-
-uint32_t Core::Entity::EventNpc::getEnpcId() const
-{
-   return m_eNpcId;
-}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/EventNpc.h b/src/servers/sapphire_zone/Actor/EventNpc.h
deleted file mode 100644
index 854e4453..00000000
--- a/src/servers/sapphire_zone/Actor/EventNpc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _EVENTNPC_H
-#define _EVENTNPC_H
-
-#include "Chara.h"
-
-namespace Core {
-namespace Entity {
-
-// class for Mobs inheriting from Chara
-class EventNpc : public Chara
-{
-public:
-   EventNpc();
-   virtual ~EventNpc() override;
-
-   EventNpc( uint32_t enpcId, const Common::FFXIVARR_POSITION3& spawnPos, float rotation );
-
-   // send spawn packets to pTarget
-   void spawn( PlayerPtr pTarget ) override;
-
-   // send despawn packets to pTarget
-   void despawn( PlayerPtr pTarget ) override;
-
-   uint8_t getLevel() const override;
-
-   void resetPos();
-
-   uint32_t getEnpcId() const;
-
-private:
-
-   static uint32_t m_nextID;
-   Common::FFXIVARR_POSITION3 m_posOrigin;
-   uint8_t m_level;
-   uint32_t m_eNpcId;
-
-};
-
-}
-}
-
-#endif
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
new file mode 100644
index 00000000..9dc54b5b
--- /dev/null
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -0,0 +1,48 @@
+#include "EventObject.h"
+#include "Zone/InstanceContent.h"
+
+Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId ) :
+   Core::Entity::Actor( ObjKind::EventObj ),
+   m_mapLinkId( mapLinkId ),
+   m_state( 0 )
+{
+   m_id = objectId;
+}
+
+Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId, Common::FFXIVARR_POSITION3 pos ) :
+   EventObject( objectId, mapLinkId )
+{
+
+}
+
+uint32_t Core::Entity::EventObject::getHierachyId() const
+{
+   return m_mapLinkId;
+}
+
+void Core::Entity::EventObject::setHierachyId( uint32_t hierachyId )
+{
+   m_mapLinkId = hierachyId;
+}
+
+uint8_t Core::Entity::EventObject::getState() const
+{
+   return m_state;
+}
+
+void Core::Entity::EventObject::setState( uint8_t state )
+{
+   m_state = state;
+
+   //m_parentInstance->updateEObj( InstanceObjectPtr( this ) );
+}
+
+void Core::Entity::EventObject::setParentInstance( Core::InstanceContentPtr instance )
+{
+   m_parentInstance = instance;
+}
+
+Core::InstanceContentPtr Core::Entity::EventObject::getParentInstance() const
+{
+   return m_parentInstance;
+}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/InstanceObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
similarity index 74%
rename from src/servers/sapphire_zone/Actor/InstanceObject.h
rename to src/servers/sapphire_zone/Actor/EventObject.h
index ed7d4d1a..4a0c8180 100644
--- a/src/servers/sapphire_zone/Actor/InstanceObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -7,11 +7,11 @@ namespace Core
 {
 namespace Entity
 {
-   class InstanceObject : public Actor
+   class EventObject : public Actor
    {
    public:
-      InstanceObject( uint32_t objectId, uint32_t mapLinkId );
-      InstanceObject( uint32_t objectId, uint32_t mapLinkId, Common::FFXIVARR_POSITION3 pos );
+      EventObject( uint32_t objectId, uint32_t mapLinkId );
+      EventObject( uint32_t objectId, uint32_t mapLinkId, Common::FFXIVARR_POSITION3 pos );
 
       uint32_t getHierachyId() const;
       void setHierachyId( uint32_t hierachyId );
diff --git a/src/servers/sapphire_zone/Actor/InstanceObject.cpp b/src/servers/sapphire_zone/Actor/InstanceObject.cpp
deleted file mode 100644
index 17b75497..00000000
--- a/src/servers/sapphire_zone/Actor/InstanceObject.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "InstanceObject.h"
-#include "Zone/InstanceContent.h"
-
-Core::Entity::InstanceObject::InstanceObject( uint32_t objectId, uint32_t mapLinkId ) :
-   Core::Entity::Actor( ObjKind::EventObj ),
-   m_mapLinkId( mapLinkId ),
-   m_state( 0 )
-{
-   m_id = objectId;
-}
-
-Core::Entity::InstanceObject::InstanceObject( uint32_t objectId, uint32_t mapLinkId, Common::FFXIVARR_POSITION3 pos ) :
-   InstanceObject( objectId, mapLinkId )
-{
-
-}
-
-uint32_t Core::Entity::InstanceObject::getHierachyId() const
-{
-   return m_mapLinkId;
-}
-
-void Core::Entity::InstanceObject::setHierachyId( uint32_t hierachyId )
-{
-   m_mapLinkId = hierachyId;
-}
-
-uint8_t Core::Entity::InstanceObject::getState() const
-{
-   return m_state;
-}
-
-void Core::Entity::InstanceObject::setState( uint8_t state )
-{
-   m_state = state;
-
-   //m_parentInstance->updateInstanceObj( InstanceObjectPtr( this ) );
-}
-
-void Core::Entity::InstanceObject::setParentInstance( Core::InstanceContentPtr instance )
-{
-   m_parentInstance = instance;
-}
-
-Core::InstanceContentPtr Core::Entity::InstanceObject::getParentInstance() const
-{
-   return m_parentInstance;
-}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index e163da34..ad646e02 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -23,7 +23,6 @@
 
 #include "Actor/Player.h"
 #include "Actor/BattleNpc.h"
-#include "Actor/EventNpc.h"
 
 #include "Zone/Zone.h"
 #include "Zone/InstanceContent.h"
@@ -379,33 +378,6 @@ void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost:
       auto pPe = Network::Packets::make_GamePacket( opcode, 0x30, player.getId(), player.getId() );
       player.queuePacket( pPe );
    }
-   else if( subCommand == "eventnpc-self" )
-   {
-      int32_t id;
-
-      sscanf( params.c_str(), "%d", &id );
-
-      Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcNpcSpawn > spawnPacket( player.getId() );
-      spawnPacket.data().type = 3;
-      spawnPacket.data().pos = player.getPos();
-      spawnPacket.data().rotation = player.getRotation();
-      spawnPacket.data().bNPCBase = id;
-      spawnPacket.data().bNPCName = id;
-      spawnPacket.data().targetId = player.getId();
-      player.queuePacket( spawnPacket );
-   }
-   else if( subCommand == "eventnpc" )
-   {
-      int32_t id;
-
-      sscanf( params.c_str(), "%d", &id );
-
-      auto pENpc = Entity::make_EventNpc( id, player.getPos(), player.getRotation() );
-
-      auto pZone = player.getCurrentZone();
-      pENpc->setCurrentZone( pZone );
-      pZone->pushActor( pENpc );
-   }
    else if( subCommand == "actrl" )
    {
 
@@ -778,11 +750,11 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
       if( !instance )
          return;
 
-      auto obj = instance->getInstanceObject( objId );
+      auto obj = instance->getEObj(objId);
       if( !obj )
          return;
 
-      instance->updateInstanceObj( obj );
+      instance->updateEObj(obj);
    }
    else if( subCommand == "objstate" )
    {
@@ -795,7 +767,7 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
       if( !instance )
          return;
 
-      auto obj = instance->getInstanceObject( objId );
+      auto obj = instance->getEObj(objId);
       if( !obj )
          return;
 
diff --git a/src/servers/sapphire_zone/Forwards.h b/src/servers/sapphire_zone/Forwards.h
index 85e07eef..4ff9966a 100644
--- a/src/servers/sapphire_zone/Forwards.h
+++ b/src/servers/sapphire_zone/Forwards.h
@@ -38,9 +38,7 @@ namespace Core
       TYPE_FORWARD( Chara );
       TYPE_FORWARD( Player );
       TYPE_FORWARD( BattleNpc );
-      TYPE_FORWARD( EventNpc );
-      TYPE_FORWARD( BattleNpcTemplate );
-      TYPE_FORWARD( InstanceObject );
+      TYPE_FORWARD( EventObject );
    }
 
    namespace Event
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 07f0b18f..5c047257 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -139,12 +139,6 @@ void Core::Scripting::ScriptManager::onPlayerFirstEnterWorld( Entity::Player& pl
 //   }
 }
 
-bool Core::Scripting::ScriptManager::registerBnpcTemplate( std::string templateName, uint32_t bnpcBaseId,
-                                                           uint32_t bnpcNameId, uint32_t modelId, std::string aiName )
-{
-   return g_serverZone.registerBnpcTemplate( templateName, bnpcBaseId, bnpcNameId, modelId, aiName );
-}
-
 bool Core::Scripting::ScriptManager::onTalk( Entity::Player& player, uint64_t actorId, uint32_t eventId )
 {
 
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.h b/src/servers/sapphire_zone/Script/ScriptManager.h
index ac423b39..c06fc626 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.h
+++ b/src/servers/sapphire_zone/Script/ScriptManager.h
@@ -37,8 +37,6 @@ namespace Core
 
          void onPlayerFirstEnterWorld( Entity::Player& player );
 
-         static bool registerBnpcTemplate( std::string templateName, uint32_t bnpcBaseId, uint32_t bnpcNameId, uint32_t modelId, std::string aiName );
-
          bool onTalk( Entity::Player& player, uint64_t actorId, uint32_t eventId );
          bool onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 );
          bool onWithinRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z );
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index 66b381c4..16908f83 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -9,11 +9,11 @@ public:
 
    void onInit( InstanceContent& instance ) override
    {
-      auto exit = new Entity::InstanceObject( EXIT_OBJECT, 0, { 0, 0, -10 } );
-      instance.registerInstanceObj( Entity::InstanceObjectPtr( exit ) );
+      auto exit = new Entity::EventObject( EXIT_OBJECT, 0, { 0, 0, -10 } );
+      instance.registerEObj(Entity::InstanceObjectPtr(exit));
 
-      auto start = new Entity::InstanceObject( START_CIRCLE, 4236868, { 0, 0, 24 } );
-      instance.registerInstanceObj( Entity::InstanceObjectPtr( start ) );
+      auto start = new Entity::EventObject( START_CIRCLE, 4236868, { 0, 0, 24 } );
+      instance.registerEObj(Entity::InstanceObjectPtr(start));
    }
 
    void onUpdate( InstanceContent& instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index 9f2f3785..f21c48d6 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -65,34 +65,6 @@ size_t Core::ServerZone::getSessionCount() const
    return m_sessionMapById.size();
 }
 
-bool Core::ServerZone::registerBnpcTemplate( std::string templateName, uint32_t bnpcBaseId,
-                                             uint32_t bnpcNameId, uint32_t modelId, std::string aiName )
-{
-
-   auto it = m_bnpcTemplates.find( templateName );
-
-   if( it != m_bnpcTemplates.end() )
-   {
-      g_log.error( templateName + " already registered, skipping..." );
-      return false;
-   }
-
-   Entity::BattleNpcTemplatePtr pNpcTemplate( new Entity::BattleNpcTemplate( templateName, bnpcBaseId, bnpcNameId, modelId, aiName ) );
-   m_bnpcTemplates[templateName] = pNpcTemplate;
-
-   return true;
-}
-
-Core::Entity::BattleNpcTemplatePtr Core::ServerZone::getBnpcTemplate( std::string templateName )
-{
-   auto it = m_bnpcTemplates.find( templateName );
-
-   if (it != m_bnpcTemplates.end())
-      return nullptr;
-
-   return it->second;
-}
-
 bool Core::ServerZone::loadSettings( int32_t argc, char* argv[] )
 {
    g_log.info( "Loading config " + m_configPath );
@@ -250,7 +222,6 @@ void Core::ServerZone::mainLoop()
    {
       this_thread::sleep_for( chrono::milliseconds( 50 ) );
 
-
       auto currTime = Util::getTimeSeconds();
 
       g_territoryMgr.updateTerritoryInstances( currTime );
diff --git a/src/servers/sapphire_zone/ServerZone.h b/src/servers/sapphire_zone/ServerZone.h
index acaf0d7e..0dc5dd11 100644
--- a/src/servers/sapphire_zone/ServerZone.h
+++ b/src/servers/sapphire_zone/ServerZone.h
@@ -8,7 +8,6 @@
 #include <map>
 
 #include "Forwards.h"
-#include "Actor/BattleNpcTemplate.h"
 
 namespace Core {
 
@@ -35,11 +34,6 @@ namespace Core {
 
       size_t getSessionCount() const;
 
-      bool registerBnpcTemplate( std::string templateName, uint32_t bnpcBaseId,
-                                 uint32_t bnpcNameId, uint32_t modelId, std::string aiName );
-
-      Entity::BattleNpcTemplatePtr getBnpcTemplate( std::string templateName );
-
       void mainLoop();
 
       bool isRunning() const;
@@ -66,8 +60,6 @@ namespace Core {
 
       std::map< uint32_t, uint32_t > m_zones;
 
-      std::map< std::string, Entity::BattleNpcTemplatePtr > m_bnpcTemplates;
-      
    };
 
 }
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index c2570b49..87f0e5a9 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -19,7 +19,6 @@
 #include "Actor/Chara.h"
 #include "Actor/Player.h"
 #include "Actor/BattleNpc.h"
-#include "Actor/EventNpc.h"
 
 #include "Forwards.h"
 
@@ -323,14 +322,6 @@ void Core::Zone::pushActor( Entity::CharaPtr pChara )
       pBNpc->setPosition( pBNpc->getPos() );
 
    }
-   else if( pChara->isEventNpc() )
-   {
-      Entity::EventNpcPtr pENpc = pChara->getAsEventNpc();
-      m_EventNpcMap[pENpc->getId()] = pENpc;
-      pENpc->setPosition( pENpc->getPos() );
-   }
-
-
 }
 
 void Core::Zone::removeActor( Entity::CharaPtr pChara )
@@ -752,7 +743,7 @@ void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
             }
 
          }
-         else if( ( pChara->isBattleNpc() || pChara->isEventNpc() ) && pCurAct->isPlayer() && pChara->isAlive() )
+         else if( ( pChara->isBattleNpc() ) && pCurAct->isPlayer() && pChara->isAlive() )
          {
             auto pPlayer = pCurAct->getAsPlayer();
             if( pPlayer->isLoadingComplete() )
@@ -807,7 +798,7 @@ void Core::Zone::onInitDirector( Entity::Player& player )
 
 }
 
-void Core::Zone::registerInstanceObj( Entity::InstanceObjectPtr object )
+void Core::Zone::registerEObj( Entity::EventObjectPtr object )
 {
    if( !object )
       return;
@@ -819,7 +810,7 @@ void Core::Zone::registerInstanceObj( Entity::InstanceObjectPtr object )
    g_log.debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
 }
 
-Core::Entity::InstanceObjectPtr Core::Zone::getInstanceObject( uint32_t objId )
+Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId )
 {
    auto obj = m_instanceObjects.find( objId );
    if( obj == m_instanceObjects.end() )
@@ -828,7 +819,7 @@ Core::Entity::InstanceObjectPtr Core::Zone::getInstanceObject( uint32_t objId )
    return obj->second;
 }
 
-void Core::Zone::updateInstanceObj( Core::Entity::InstanceObjectPtr object )
+void Core::Zone::updateEObj( Entity::EventObjectPtr object )
 {
    if( !object )
       return;
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index d9bceda4..7f9f9ceb 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -6,7 +6,7 @@
 
 #include "Cell.h"
 #include "CellHandler.h"
-#include "Actor/InstanceObject.h"
+#include "Actor/EventObject.h"
 
 #include "Forwards.h"
 
@@ -35,8 +35,7 @@ protected:
 
    std::unordered_map< int32_t, Entity::PlayerPtr > m_playerMap;
    std::unordered_map< int32_t, Entity::BattleNpcPtr > m_BattleNpcMap;
-   std::unordered_map< int32_t, Entity::EventNpcPtr > m_EventNpcMap;
-   std::unordered_map< int32_t, Entity::InstanceObjectPtr > m_instanceObjects;
+   std::unordered_map< int32_t, Entity::EventObjectPtr > m_instanceObjects;
 
    std::set< Entity::BattleNpcPtr > m_BattleNpcDeadMap;
 
@@ -114,9 +113,9 @@ public:
 
    void updateSessions( bool changedWeather );
 
-   void registerInstanceObj( Entity::InstanceObjectPtr object );
-   Entity::InstanceObjectPtr getInstanceObject( uint32_t objId );
-   void updateInstanceObj( Entity::InstanceObjectPtr object );
+   void registerEObj( Entity::EventObjectPtr object );
+   Entity::EventObjectPtr getEObj( uint32_t objId );
+   void updateEObj( Entity::EventObjectPtr object );
 
    InstanceContentPtr getAsInstanceContent();
 

From 684735ee559ff2d34a223336899f703b160d07f9 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 21 Feb 2018 11:28:34 +0100
Subject: [PATCH 15/69] Build fix

---
 .../Script/Scripts/instances/trials/TheNavel.cpp            | 4 ++--
 src/servers/sapphire_zone/Zone/Zone.cpp                     | 6 +++---
 src/servers/sapphire_zone/Zone/Zone.h                       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index 16908f83..bc176fb4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -10,10 +10,10 @@ public:
    void onInit( InstanceContent& instance ) override
    {
       auto exit = new Entity::EventObject( EXIT_OBJECT, 0, { 0, 0, -10 } );
-      instance.registerEObj(Entity::InstanceObjectPtr(exit));
+      instance.registerEObj(Entity::EventObjectPtr(exit));
 
       auto start = new Entity::EventObject( START_CIRCLE, 4236868, { 0, 0, 24 } );
-      instance.registerEObj(Entity::InstanceObjectPtr(start));
+      instance.registerEObj(Entity::EventObjectPtr(start));
    }
 
    void onUpdate( InstanceContent& instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 87f0e5a9..22c384e6 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -805,15 +805,15 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object )
 
    //object->setParentInstance( InstanceContentPtr( this ) );
 
-   m_instanceObjects[object->getId()] = object;
+   m_eventObjects[object->getId()] = object;
 
    g_log.debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
 }
 
 Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId )
 {
-   auto obj = m_instanceObjects.find( objId );
-   if( obj == m_instanceObjects.end() )
+   auto obj = m_eventObjects.find( objId );
+   if( obj == m_eventObjects.end() )
       return nullptr;
 
    return obj->second;
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 7f9f9ceb..1619cafc 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -35,7 +35,7 @@ protected:
 
    std::unordered_map< int32_t, Entity::PlayerPtr > m_playerMap;
    std::unordered_map< int32_t, Entity::BattleNpcPtr > m_BattleNpcMap;
-   std::unordered_map< int32_t, Entity::EventObjectPtr > m_instanceObjects;
+   std::unordered_map< int32_t, Entity::EventObjectPtr > m_eventObjects;
 
    std::set< Entity::BattleNpcPtr > m_BattleNpcDeadMap;
 

From f12c431173a1505f966cd2eb0d56e2a12e522bb8 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 21 Feb 2018 12:48:27 +0100
Subject: [PATCH 16/69] Removed battlenpc for cleanup work

---
 src/servers/sapphire_zone/Actor/Actor.cpp     |   8 -
 src/servers/sapphire_zone/Actor/Actor.h       |   1 -
 src/servers/sapphire_zone/Actor/BattleNpc.cpp | 569 ------------------
 src/servers/sapphire_zone/Actor/BattleNpc.h   | 115 ----
 src/servers/sapphire_zone/Actor/Player.cpp    |  59 --
 src/servers/sapphire_zone/Actor/Player.h      |   7 -
 .../DebugCommand/DebugCommandHandler.cpp      |  14 -
 src/servers/sapphire_zone/Forwards.h          |   1 -
 .../sapphire_zone/Script/ScriptManager.cpp    |   1 -
 src/servers/sapphire_zone/Zone/Cell.cpp       |  16 +-
 src/servers/sapphire_zone/Zone/Cell.h         |   8 -
 src/servers/sapphire_zone/Zone/Zone.cpp       | 125 +---
 src/servers/sapphire_zone/Zone/Zone.h         |  13 +-
 13 files changed, 7 insertions(+), 930 deletions(-)
 delete mode 100644 src/servers/sapphire_zone/Actor/BattleNpc.cpp
 delete mode 100644 src/servers/sapphire_zone/Actor/BattleNpc.h

diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 924b5dd3..bff257d3 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -2,7 +2,6 @@
 
 #include "Player.h"
 #include "Chara.h"
-#include "BattleNpc.h"
 
 Core::Entity::Actor::Actor( ObjKind type ) :
    m_objKind( type )
@@ -71,10 +70,3 @@ Core::Entity::PlayerPtr Core::Entity::Actor::getAsPlayer()
    return boost::dynamic_pointer_cast< Entity::Player, Entity::Actor >( shared_from_this() );
 }
 
-/*! \return pointer to this instance as BattleNpcPtr */
-Core::Entity::BattleNpcPtr Core::Entity::Actor::getAsBattleNpc()
-{
-   if( !isBattleNpc() )
-      return nullptr;
-   return boost::dynamic_pointer_cast< Entity::BattleNpc, Entity::Actor >( shared_from_this() );
-}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 7f46e59e..1b4382b5 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -72,7 +72,6 @@ namespace Entity {
 
       CharaPtr getAsChara();
       PlayerPtr getAsPlayer();
-      BattleNpcPtr getAsBattleNpc();
    };
 
 }
diff --git a/src/servers/sapphire_zone/Actor/BattleNpc.cpp b/src/servers/sapphire_zone/Actor/BattleNpc.cpp
deleted file mode 100644
index 26d76f4a..00000000
--- a/src/servers/sapphire_zone/Actor/BattleNpc.cpp
+++ /dev/null
@@ -1,569 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <stdint.h>
-#include <cmath>
-
-#include <common/Logging/Logger.h>
-#include <common/Exd/ExdDataGenerated.h>
-#include <common/Util/Util.h>
-#include <common/Util/UtilMath.h>
-
-#include "Player.h"
-#include "BattleNpc.h"
-
-#include "Network/PacketWrappers/MoveActorPacket.h"
-#include "Network/PacketWrappers/ActorControlPacket142.h"
-#include "Network/PacketWrappers/ActorControlPacket143.h"
-
-using namespace Core::Common;
-using namespace Core::Network::Packets;
-using namespace Core::Network::Packets::Server;
-
-extern Core::Logger g_log;
-extern Core::Data::ExdDataGenerated g_exdDataGen;
-
-uint32_t Core::Entity::BattleNpc::m_nextID = 1149241694;
-
-Core::Entity::BattleNpc::BattleNpc() :
-   Chara( ObjKind::BattleNpc )
-{
-   m_id = 0;
-   m_status = ActorStatus::Idle;
-}
-
-Core::Entity::BattleNpc::~BattleNpc()
-{
-
-}
-
-Core::Entity::BattleNpc::BattleNpc( uint16_t modelId, uint16_t nameid, const Common::FFXIVARR_POSITION3& spawnPos,
-                                    uint16_t bnpcBaseId, uint32_t type, uint8_t level, uint8_t behaviour,
-                                    uint32_t mobType ) :
-   Chara( ObjKind::BattleNpc )
-{
-   BattleNpc::m_nextID++;
-   m_id = BattleNpc::m_nextID;
-   //strcpy( m_name, pBNpc->m_name.c_str() );
-
-   m_pos = spawnPos;
-   m_posOrigin = spawnPos;
-
-   m_mode = MODE_IDLE;
-   m_targetId = static_cast< uint64_t >( INVALID_GAME_OBJECT_ID );
-
-   m_maxHp = 150;
-   m_maxMp = 100;
-
-   m_baseStats.max_hp = m_maxHp;
-   m_baseStats.max_mp = m_maxMp;
-
-   m_hp = m_maxHp;
-   m_mp = m_maxMp;
-
-   m_currentStance = Stance::Passive;
-
-   m_class = ClassJob::Gladiator;
-   m_level = level > uint8_t{0} ? level : uint8_t{70};
-
-   m_modelId = modelId;
-   m_nameId = nameid;
-
-   m_behavior = behaviour;
-
-   m_bnpcBaseId = bnpcBaseId;
-
-   m_status = ActorStatus::Idle;
-
-   m_pOwner = nullptr;
-
-   m_mobType = mobType;
-
-   m_invincibilityType = InvincibilityType::InvincibilityNone;
-
-   //m_type = static_cast< Common::ObjKind >( type );
-
-}
-
-// spawn this player for pTarget
-void Core::Entity::BattleNpc::spawn( PlayerPtr pTarget )
-{
-   //GamePacketNew< FFXIVIpcActorSpawn > spawnPacket( getId(), pTarget->getId() );
-
-   //spawnPacket.data().unknown_0 = 0;
-   //spawnPacket.data().ownerId = m_pOwner == nullptr ? INVALID_GAME_OBJECT_ID : m_pOwner->getId();
-   //spawnPacket.data().targetId = INVALID_GAME_OBJECT_ID & 0xFFFFFFFF;
-   //spawnPacket.data().hPCurr = m_hp;
-   //spawnPacket.data().hPMax = m_baseStats.max_hp;
-   //spawnPacket.data().level = m_level;
-   ////spawnPacket.data().tPCurr = 1000;
-   //spawnPacket.data().model = m_modelId;
-   //spawnPacket.data().bnpcBaseId = m_bnpcBaseId;
-   //spawnPacket.data().nameId = m_nameId;
-   //spawnPacket.data().spawnIndex = pTarget->getSpawnIdForActorId( getId() );
-   //g_log.info(std::to_string(spawnPacket.data().spawnIndex) + " " + std::to_string(getId()));
-   //spawnPacket.data().status = static_cast< uint8_t >( m_status );
-   //spawnPacket.data().mobAgressive = m_behavior;
-   //spawnPacket.data().type = static_cast< uint8_t >( m_type );
-   //spawnPacket.data().mobTypeIcon = m_mobType;
-   //spawnPacket.data().unknown_33 = 5;
-   //spawnPacket.data().typeFlags = 4;
-   //spawnPacket.data().pos.x = m_pos.x;
-   //spawnPacket.data().pos.y = m_pos.y;
-   //spawnPacket.data().pos.z = m_pos.z;
-   //spawnPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
-   ////spawnPacket.data().unknown_B0[11] = 1;
-   ////spawnPacket.data().unknown_B0[12] = 4;
-   ////spawnPacket.data().unknown_B0[14] = 20;
-
-   //pTarget->queuePacket( spawnPacket );
-
-   ZoneChannelPacket< FFXIVIpcNpcSpawn > spawnPacket( getId(), pTarget->getId() );
-
-
-   spawnPacket.data().pos.x = m_pos.x;
-   spawnPacket.data().pos.y = m_pos.y;
-   spawnPacket.data().pos.z = m_pos.z;
-
-   spawnPacket.data().targetId = INVALID_GAME_OBJECT_ID & 0xFFFFFFFF;
-   spawnPacket.data().hPCurr = m_hp;
-   spawnPacket.data().hPMax = m_baseStats.max_hp;
-   spawnPacket.data().level = m_level;
-
-   spawnPacket.data().subtype = 5;
-   spawnPacket.data().enemyType = 4;
-
-   spawnPacket.data().modelChara = m_modelId;
-   spawnPacket.data().bNPCBase = m_bnpcBaseId;
-   spawnPacket.data().bNPCName = m_nameId;
-   spawnPacket.data().spawnIndex = pTarget->getSpawnIdForActorId( getId() );
-
-   spawnPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
-
-   spawnPacket.data().type = static_cast< uint8_t >( m_objKind );
-
-   spawnPacket.data().state = static_cast< uint8_t >( m_status );
-
-   pTarget->queuePacket( spawnPacket );
-}
-
-// despawn
-void Core::Entity::BattleNpc::despawn( PlayerPtr pPlayer )
-{
-   pPlayer->freePlayerSpawnId( getId() );
-
-   ActorControlPacket143 controlPacket( m_id, DespawnZoneScreenMsg, 0x04, getId(), 0x01 );
-   pPlayer->queuePacket( controlPacket );
-
-}
-
-uint8_t Core::Entity::BattleNpc::getLevel() const
-{
-   return m_level;
-}
-
-Core::Entity::StateMode Core::Entity::BattleNpc::getMode() const
-{
-   return m_mode;
-}
-
-void Core::Entity::BattleNpc::setMode( StateMode mode )
-{
-   m_mode = mode;
-}
-
-uint8_t Core::Entity::BattleNpc::getbehavior() const
-{
-   return m_behavior;
-}
-
-void Core::Entity::BattleNpc::hateListAdd( Chara& actor, int32_t hateAmount )
-{
-   auto hateEntry = new HateListEntry();
-   hateEntry->m_hateAmount = hateAmount;
-   hateEntry->m_pChara = actor.getAsChara();
-
-   m_hateList.insert( hateEntry );
-}
-
-Core::Entity::CharaPtr Core::Entity::BattleNpc::hateListGetHighest()
-{
-
-   auto it = m_hateList.begin();
-   uint32_t maxHate = 0;
-   HateListEntry* entry = nullptr;
-   for( ; it != m_hateList.end(); ++it )
-   {
-      if( ( *it )->m_hateAmount > maxHate )
-      {
-         maxHate = ( *it )->m_hateAmount;
-         entry = *it;
-      }
-   }
-
-   if( entry && maxHate != 0 )
-      return entry->m_pChara;
-
-   return nullptr;
-}
-
-void Core::Entity::BattleNpc::setOwner( PlayerPtr pPlayer )
-{
-   m_pOwner = pPlayer;
-
-   if( pPlayer != nullptr )
-   {
-      ZoneChannelPacket< FFXIVIpcActorOwner > setOwnerPacket( getId(), pPlayer->getId() );
-      setOwnerPacket.data().type = 0x01;
-      setOwnerPacket.data().actorId = pPlayer->getId();
-      sendToInRangeSet( setOwnerPacket );
-   }
-   else
-   {
-      ZoneChannelPacket< FFXIVIpcActorOwner > setOwnerPacket(getId(), INVALID_GAME_OBJECT_ID );
-      setOwnerPacket.data().type = 0x01;
-      setOwnerPacket.data().actorId = INVALID_GAME_OBJECT_ID;
-      sendToInRangeSet( setOwnerPacket );
-   }
-
-}
-
-void Core::Entity::BattleNpc::sendPositionUpdate()
-{
-   MoveActorPacket movePacket( *this, 0x3A, 0x00, 0, 0x5A );
-   sendToInRangeSet( movePacket );
-}
-
-bool Core::Entity::BattleNpc::moveTo( Common::FFXIVARR_POSITION3& pos )
-{
-
-   if( Math::Util::distance( getPos().x, getPos().y, getPos().z, 
-                             pos.x, pos.y, pos.z ) <= 4 )
-      // reached destination
-      return true;
-
-   float rot = Math::Util::calcAngFrom( getPos().x, getPos().z, pos.x, pos.z );
-   float newRot = PI - rot + ( PI / 2 );
-
-   face( pos );
-   float angle = Math::Util::calcAngFrom( getPos().x, getPos().z, pos.x, pos.z ) + PI;
-   
-   float x = static_cast< float >( cosf( angle ) * 1.1f );
-   float y = ( getPos().y + pos.y ) * 0.5f; // fake value while there is no collision
-   float z = static_cast< float >( sinf( angle ) * 1.1f );
-
-   Common::FFXIVARR_POSITION3 newPos{};
-
-   newPos.x = getPos().x + x;
-   newPos.y = y;
-   newPos.z = getPos().z + z;
-
-   setPosition( newPos );
-
-   Common::FFXIVARR_POSITION3 tmpPos{};
-   tmpPos.x = getPos().x + x;
-   tmpPos.y = y;
-   tmpPos.z = getPos().z + z;
-
-   setPosition( tmpPos );
-   setRotation(newRot);
-
-   sendPositionUpdate();
-
-   return false;
-
-}
-
-void Core::Entity::BattleNpc::aggro( Chara& actor )
-{
-
-   m_lastAttack = Util::getTimeMs();
-   hateListUpdate( actor, 1 );
-
-   changeTarget( actor.getId() );
-   setStance( Stance::Active );
-   m_mode = MODE_COMBAT;
-
-   if( actor.isPlayer() )
-   {
-      PlayerPtr tmpPlayer = actor.getAsPlayer();
-      tmpPlayer->queuePacket( ActorControlPacket142( getId(), 0, 1, 1 ) );
-      tmpPlayer->onMobAggro( getAsBattleNpc() );
-   }
-}
-
-void Core::Entity::BattleNpc::deaggro( Chara& actor )
-{
-   if( !hateListHasActor( actor ) )
-      hateListRemove( actor );
-
-   if( actor.isPlayer() )
-   {
-      PlayerPtr tmpPlayer = actor.getAsPlayer();
-      tmpPlayer->onMobDeaggro( getAsBattleNpc() );
-   }
-}
-
-void Core::Entity::BattleNpc::hateListClear()
-{
-   auto it = m_hateList.begin();
-   for( ; it != m_hateList.end(); ++it )
-   {
-      if( isInRangeSet( ( *it )->m_pChara ) )
-         deaggro( *( *it )->m_pChara );
-      HateListEntry* tmpListEntry = ( *it );
-      delete tmpListEntry;
-   }
-   m_hateList.clear();
-}
-
-
-void Core::Entity::BattleNpc::hateListRemove( Chara& actor )
-{
-   auto it = m_hateList.begin();
-   for( ; it != m_hateList.end(); ++it )
-   {
-      if( ( *it )->m_pChara->getId() == actor.getId() )
-      {
-         HateListEntry* pEntry = *it;
-         m_hateList.erase( it );
-         delete pEntry;
-         if( actor.isPlayer() )
-         {
-            PlayerPtr tmpPlayer = actor.getAsPlayer();
-            tmpPlayer->onMobDeaggro( getAsBattleNpc() );
-         }
-         return;
-      }
-   }
-}
-
-bool Core::Entity::BattleNpc::hateListHasActor( Chara& actor )
-{
-   auto it = m_hateList.begin();
-   for( ; it != m_hateList.end(); ++it )
-   {
-      if( ( *it )->m_pChara->getId() == actor.getId() )
-         return true;
-   }
-   return false;
-}
-
-void Core::Entity::BattleNpc::resetPos()
-{
-   m_pos = m_posOrigin;
-}
-
-uint32_t Core::Entity::BattleNpc::getNameId() const
-{
-   return m_nameId;
-}
-
-void Core::Entity::BattleNpc::hateListUpdate( Chara& actor, int32_t hateAmount )
-{
-
-   auto it = m_hateList.begin();
-   for( ; it != m_hateList.end(); ++it )
-   {
-      if( ( *it )->m_pChara->getId() == actor.getId() )
-      {
-         ( *it )->m_hateAmount += hateAmount;
-         return;
-      }
-   }
-
-   auto hateEntry = new HateListEntry();
-   hateEntry->m_hateAmount = hateAmount;
-   hateEntry->m_pChara = actor.getAsChara();
-   m_hateList.insert( hateEntry );
-}
-
-void Core::Entity::BattleNpc::onDeath()
-{
-   //LuaManager->onMobDeath( this );
-
-   setTimeOfDeath( static_cast< uint32_t >( time( nullptr ) ) );
-   setTargetId( INVALID_GAME_OBJECT_ID );
-   m_currentStance = Stance::Passive;
-   m_mode = MODE_IDLE;
-   m_hp = 0;
-   setOwner( nullptr );
-
-   // todo: fully ghetto retarded exp reward pls fix
-   {
-      uint32_t minHate = -1;
-      uint32_t maxHate = 0;
-      uint32_t totalHate = 0;
-      for( auto& pHateEntry : m_hateList )
-      {
-         if( pHateEntry->m_pChara->isPlayer() )
-         {
-            if( pHateEntry->m_hateAmount < minHate )
-               minHate = pHateEntry->m_hateAmount;
-            else if( pHateEntry->m_hateAmount > maxHate )
-               maxHate = pHateEntry->m_hateAmount;
-         }
-         totalHate += pHateEntry->m_hateAmount;
-      }
-
-      //uint32_t plsBeHatedThisMuchAtLeast = totalHate / ( maxHate + 2 ) / clamp( m_hateList.size(), 1.0f, 1.5f );
-
-      for( auto& pHateEntry : m_hateList )
-      {
-         // todo: this is pure retarded
-         // todo: check for companion
-         if( pHateEntry->m_pChara->isPlayer()  ) // && pHateEntry->m_hateAmount >= plsBeHatedThisMuchAtLeast )
-         {
-            uint8_t level = pHateEntry->m_pChara->getLevel();
-            auto levelDiff = static_cast< int32_t >( this->m_level ) - level;
-            auto cappedLevelDiff = Math::Util::clamp( levelDiff, 1, 6 );
-
-            auto expNeeded = g_exdDataGen.get< Core::Data::ParamGrow >( m_level + cappedLevelDiff - 1 )->expToNext;
-            int32_t exp = 0;
-
-            // todo: arbitrary numbers pulled out of my ass
-            if( m_level <= 14 )
-               exp = ( expNeeded / ( 100 - levelDiff) ) + cappedLevelDiff + ( cappedLevelDiff * ( ( rand() % ( cappedLevelDiff * 9 ) ) + 1 ) );
-            else if( m_level <= 24 )
-               exp = ( expNeeded / ( 150 - levelDiff) ) + cappedLevelDiff + ( cappedLevelDiff * ( ( rand() % ( cappedLevelDiff * 8 ) ) + 1 ) );
-            else if( m_level <= 34 )
-               exp = ( expNeeded / ( 350 - levelDiff ) ) + cappedLevelDiff + ( cappedLevelDiff * ( ( rand() % ( cappedLevelDiff * 7 ) ) + 1 ) );
-            else if( m_level <= 44 )
-               exp = ( expNeeded / ( 550 - levelDiff ) ) + cappedLevelDiff + ( cappedLevelDiff *  ( ( rand() % ( cappedLevelDiff * 6  ) ) + 1 ) );
-            else if( m_level <= 50 )
-               exp = ( expNeeded / ( 750 - levelDiff ) ) + cappedLevelDiff + ( cappedLevelDiff * ( ( rand() % ( cappedLevelDiff * 5 ) ) + 1 ) );
-            else
-               exp = ( expNeeded / ( 1200 - levelDiff ) ) + cappedLevelDiff + ( cappedLevelDiff * ( ( rand() % ( cappedLevelDiff * 4 ) ) + 1 ) );
-            
-
-            // todo: this is actually retarded, we need real rand()
-            srand( static_cast< uint32_t > ( time( nullptr ) ) );
-
-            auto pPlayer = pHateEntry->m_pChara->getAsPlayer();
-            pPlayer->gainExp( exp );
-            pPlayer->onMobKill( m_nameId );
-         }
-      }
-   }
-   hateListClear();
-}
-
-void Core::Entity::BattleNpc::onActionHostile( Chara& source )
-{
-
-   if( hateListGetHighest() == nullptr )
-      aggro( source );
-
-   if( getClaimer() == nullptr )
-      setOwner( source.getAsPlayer() );
-}
-
-Core::Entity::CharaPtr Core::Entity::BattleNpc::getClaimer() const
-{
-   return m_pOwner;
-}
-
-
-// HACK: this is highly experimental code, will have to be changed eventually
-// since there are different types of mobs... (stationary, moving...) likely to be 
-// handled by scripts entirely.
-void Core::Entity::BattleNpc::update( int64_t currTime )
-{
-
-   if( !isAlive() )
-   {
-      m_status = ActorStatus::Idle;
-      m_mode = MODE_IDLE;
-      return;
-   }
-
-   updateStatusEffects();
-   float distance = Math::Util::distance( m_pos.x, m_pos.y, m_pos.z,
-                                          m_posOrigin.x, m_posOrigin.y, m_posOrigin.z );
-
-   if( ( distance > 70 ) && m_mode != MODE_RETREAT )
-   {
-      changeTarget( INVALID_GAME_OBJECT_ID );
-      m_mode = MODE_RETREAT;
-      hateListClear();
-      setOwner( nullptr );
-   }
-
-   switch( m_mode )
-   {
-
-   case MODE_RETREAT:
-   {
-      if( moveTo( m_posOrigin ) )
-         m_mode = MODE_IDLE;
-   }
-   break;
-
-   case MODE_IDLE:
-   {
-      CharaPtr pClosestChara = getClosestChara();
-
-      if( pClosestChara && pClosestChara->isAlive() )
-      {
-         distance = Math::Util::distance( getPos().x, getPos().y, getPos().z,
-                                          pClosestChara->getPos().x,
-                                          pClosestChara->getPos().y,
-                                          pClosestChara->getPos().z );
-
-         //if( distance < 8 && getbehavior() == 2 )
-         //   aggro( pClosestChara );
-      }
-   }
-   break;
-
-   case MODE_COMBAT:
-   {
-      CharaPtr pClosestChara = hateListGetHighest();
-
-      if( pClosestChara != nullptr && !pClosestChara->isAlive() )
-      {
-         hateListRemove( *pClosestChara );
-         pClosestChara = hateListGetHighest();
-      }
-
-      if( pClosestChara != nullptr )
-      {
-         distance = Math::Util::distance( getPos().x, getPos().y, getPos().z,
-                                          pClosestChara->getPos().x,
-                                          pClosestChara->getPos().y,
-                                          pClosestChara->getPos().z );
-
-         if( distance > 4 )
-            moveTo( pClosestChara->getPos() );
-         else
-         {
-            if( face( pClosestChara->getPos() ) )
-               sendPositionUpdate();
-            // in combat range. ATTACK!
-            autoAttack( pClosestChara );
-         }
-      }
-      else
-      {
-         changeTarget( INVALID_GAME_OBJECT_ID );
-         setStance( Stance::Passive );
-         setOwner( nullptr );
-         m_mode = MODE_RETREAT;
-      }
-
-   }
-   break;
-   }
-
-}
-
-uint32_t Core::Entity::BattleNpc::getTimeOfDeath() const
-{
-   return m_timeOfDeath;
-}
-
-void Core::Entity::BattleNpc::setTimeOfDeath( uint32_t tod )
-{
-   m_timeOfDeath = tod;
-}
-
diff --git a/src/servers/sapphire_zone/Actor/BattleNpc.h b/src/servers/sapphire_zone/Actor/BattleNpc.h
deleted file mode 100644
index a072bca1..00000000
--- a/src/servers/sapphire_zone/Actor/BattleNpc.h
+++ /dev/null
@@ -1,115 +0,0 @@
-#ifndef _BATTLENPC_H
-#define _BATTLENPC_H
-
-#include "Chara.h"
-
-namespace Core {
-namespace Entity {
-
-enum StateMode
-{
-   MODE_COMBAT,
-   MODE_RETREAT,
-   MODE_IDLE,
-};
-
-typedef struct
-{
-   uint32_t m_hateAmount;
-   CharaPtr m_pChara;
-} HateListEntry;
-
-// class for Mobs inheriting from Chara
-class BattleNpc : public Chara
-{
-public:
-   BattleNpc();
-   virtual ~BattleNpc() override;
-
-   BattleNpc( uint16_t modelId, uint16_t nameid, const Common::FFXIVARR_POSITION3& spawnPos, uint16_t bnpcBaseId = 0,
-              uint32_t type = 2, uint8_t level = 0, uint8_t behaviour = 1, uint32_t mobType = 0 );
-
-   //BattleNpc( uint32_t modelId, 
-   //           uint32_t nameId,
-   //           uint32_t bnpcBaseId,
-   //           uint32_t level,
-   //           const Common::FFXIVARR_POSITION3& spawnPos,
-   //           uint32_t type = 2,  uint32_t behaviour = 1, uint32_t mobType = 0 );
-
-   void initStatusEffectContainer();
-
-   // send spawn packets to pTarget
-   void spawn( PlayerPtr pTarget ) override;
-
-   // send despawn packets to pTarget
-   void despawn( PlayerPtr pTarget ) override;
-
-   uint8_t getLevel() const override;
-
-   StateMode getMode() const;
-
-   void setMode( StateMode mode );
-
-   uint8_t getbehavior() const;
-
-   void hateListAdd( Chara& actor, int32_t hateAmount );
-
-   void hateListUpdate( Chara& actor, int32_t hateAmount );
-   void hateListRemove( Chara& actor );
-
-   bool hateListHasActor( Chara& actor );
-
-   void resetPos();
-
-   uint32_t getNameId() const;
-
-   void hateListClear();
-
-   CharaPtr hateListGetHighest();
-
-   void aggro( Chara& actor );
-
-   void deaggro( Chara& actor );
-
-   void setOwner( PlayerPtr pPlayer );
-
-   void onDeath() override;
-
-   void onActionHostile( Chara& source ) override;
-
-   CharaPtr getClaimer() const;
-
-   void sendPositionUpdate();
-
-   // return true if it reached the position
-   bool moveTo( Common::FFXIVARR_POSITION3& pos );
-
-   void update( int64_t currTime ) override;
-
-   uint32_t getTimeOfDeath() const;
-
-   void setTimeOfDeath( uint32_t tod );
-
-private:
-
-   static uint32_t m_nextID;
-   StateMode m_mode;
-   Common::FFXIVARR_POSITION3 m_posOrigin;
-   uint8_t m_level;
-   uint16_t m_modelId;
-   uint16_t m_nameId;
-   uint16_t m_bnpcBaseId;
-   uint8_t m_behavior;
-   uint32_t m_unk1;
-   uint32_t m_unk2;
-   std::set< HateListEntry* > m_hateList;
-   CharaPtr m_pOwner;
-   uint32_t m_timeOfDeath;
-   uint32_t m_mobType;
-
-};
-
-}
-}
-
-#endif
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index e3cf4b3c..62361f89 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -9,7 +9,6 @@
 
 #include "Session.h"
 #include "Player.h"
-#include "BattleNpc.h"
 
 #include "Zone/TerritoryMgr.h"
 #include "Zone/Zone.h"
@@ -1266,64 +1265,6 @@ void Core::Entity::Player::updateHowtosSeen( uint32_t howToId )
    m_howTo[index] |= value;
 }
 
-
-void Core::Entity::Player::onMobAggro( BattleNpcPtr pBNpc )
-{
-   hateListAdd( pBNpc );
-
-   queuePacket( ActorControlPacket142( getId(), ToggleAggro, 1 ) );
-}
-
-void Core::Entity::Player::onMobDeaggro( BattleNpcPtr pBNpc )
-{
-   hateListRemove( pBNpc );
-
-   if( m_actorIdTohateSlotMap.empty() )
-      queuePacket( ActorControlPacket142( getId(), ToggleAggro ) );
-}
-
-void Core::Entity::Player::hateListAdd( BattleNpcPtr pBNpc )
-
-{
-   if( m_freeHateSlotQueue.empty() )
-      return;
-   uint8_t hateId = m_freeHateSlotQueue.front();
-   m_freeHateSlotQueue.pop();
-   m_actorIdTohateSlotMap[pBNpc->getId()] = hateId;
-   sendHateList();
-
-}
-
-void Core::Entity::Player::hateListRemove( BattleNpcPtr pBNpc )
-{
-
-   auto it = m_actorIdTohateSlotMap.begin();
-   for( ; it != m_actorIdTohateSlotMap.end(); ++it )
-   {
-      if( it->first == pBNpc->getId() )
-      {
-         uint8_t hateSlot = it->second;
-         m_freeHateSlotQueue.push( hateSlot );
-         m_actorIdTohateSlotMap.erase( it );
-         sendHateList();
-
-         return;
-      }
-   }
-}
-
-bool Core::Entity::Player::hateListHasMob( BattleNpcPtr pBNpc )
-{
-
-   auto it = m_actorIdTohateSlotMap.begin();
-   for( ; it != m_actorIdTohateSlotMap.end(); ++it )
-   {
-      if( it->first == pBNpc->getId() )
-         return true;
-   }
-   return false;
-}
-
 void Core::Entity::Player::initHateSlotQueue()
 {
    m_freeHateSlotQueue = std::queue< uint8_t >();
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 291091c0..07c18827 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -513,14 +513,7 @@ public:
 
    // Player Battle Handling
    //////////////////////////////////////////////////////////////////////////////////////////////////////
-   void onMobAggro( BattleNpcPtr pBNpc );
-   void onMobDeaggro( BattleNpcPtr pBNpc );
-
    void initHateSlotQueue();
-   void hateListAdd( BattleNpcPtr pBNpc );
-   void hateListRemove( BattleNpcPtr pBNpc );
-
-   bool hateListHasMob( BattleNpcPtr pBNpc );
 
    void sendHateList();
 
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index ad646e02..0fde5dce 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -22,7 +22,6 @@
 #include "Script/NativeScriptManager.h"
 
 #include "Actor/Player.h"
-#include "Actor/BattleNpc.h"
 
 #include "Zone/Zone.h"
 #include "Zone/InstanceContent.h"
@@ -357,19 +356,6 @@ void Core::DebugCommandHandler::add( char * data, Entity::Player& player, boost:
       player.addTitle( titleId );
       player.sendNotice( "Added title (ID: " + std::to_string( titleId ) + ")" );
    }
-   else if( subCommand == "spawn" )
-   {
-      int32_t model, name;
-
-      sscanf( params.c_str(), "%d %d", &model, &name );
-
-      auto pBNpc = Entity::make_BattleNpc( model, name, player.getPos() );
-
-      auto pZone = player.getCurrentZone();
-      pBNpc->setCurrentZone( pZone );
-      pZone->pushActor( pBNpc );
-
-   }
    else if( subCommand == "op" )
    {
       // temporary research packet
diff --git a/src/servers/sapphire_zone/Forwards.h b/src/servers/sapphire_zone/Forwards.h
index 4ff9966a..a75c5e45 100644
--- a/src/servers/sapphire_zone/Forwards.h
+++ b/src/servers/sapphire_zone/Forwards.h
@@ -37,7 +37,6 @@ namespace Core
       TYPE_FORWARD( Actor );
       TYPE_FORWARD( Chara );
       TYPE_FORWARD( Player );
-      TYPE_FORWARD( BattleNpc );
       TYPE_FORWARD( EventObject );
    }
 
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 5c047257..51e50e77 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -6,7 +6,6 @@
 
 #include "Zone/Zone.h"
 #include "Actor/Player.h"
-#include "Actor/BattleNpc.h"
 #include "ServerZone.h"
 #include "Event/EventHandler.h"
 #include "Event/EventHelper.h"
diff --git a/src/servers/sapphire_zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Zone/Cell.cpp
index 860f859b..b753e6b3 100644
--- a/src/servers/sapphire_zone/Zone/Cell.cpp
+++ b/src/servers/sapphire_zone/Zone/Cell.cpp
@@ -1,7 +1,6 @@
 #include "Cell.h"
 
 #include "Actor/Chara.h"
-#include "Actor/BattleNpc.h"
 #include "Forwards.h"
 #include "Zone.h"
 
@@ -24,7 +23,6 @@ Core::Cell::~Cell()
 
 void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone )
 {
-   //Console->outDebOnly("[Region:%X] Initializing a new cell[%i/%i]", pRegion->getId(), x, y );
    m_pZone = pZone;
    m_posX = x;
    m_posY = y;
@@ -32,24 +30,12 @@ void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone )
    m_charas.clear();
 }
 
-void Core::Cell::loadCharas( CellCache* pCC )
-{
-   m_bLoaded = true;
-   assert( pCC );
-
-   for( auto entry : pCC->battleNpcCache )
-   {
-      entry->setCurrentZone( m_pZone );
-      m_pZone->pushActor( entry );
-   }
-}
-
 void Core::Cell::addChara( Entity::CharaPtr pAct )
 {
    if( pAct->isPlayer() )
       ++m_playerCount;
 
-   m_charas.insert(pAct);
+   m_charas.insert( pAct );
 }
 
 void Core::Cell::removeChara( Entity::CharaPtr pAct )
diff --git a/src/servers/sapphire_zone/Zone/Cell.h b/src/servers/sapphire_zone/Zone/Cell.h
index 2136d755..3b10a819 100644
--- a/src/servers/sapphire_zone/Zone/Cell.h
+++ b/src/servers/sapphire_zone/Zone/Cell.h
@@ -9,12 +9,6 @@
 
 namespace Core {
 
-
-   struct CellCache
-   {
-      std::vector< Entity::BattleNpcPtr > battleNpcCache;
-   };
-
    typedef std::set< Entity::CharaPtr > CharaSet;
 
    class Cell 
@@ -43,8 +37,6 @@ namespace Core {
 
       void removeChara( Entity::CharaPtr pAct );
 
-      void loadCharas( CellCache *pCC );
-
       bool hasChara( Entity::CharaPtr pAct )
       { 
          return (m_charas.find(pAct) != m_charas.end());
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 22c384e6..36718f0c 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -18,7 +18,6 @@
 #include "Session.h"
 #include "Actor/Chara.h"
 #include "Actor/Player.h"
-#include "Actor/BattleNpc.h"
 
 #include "Forwards.h"
 
@@ -100,14 +99,12 @@ Core::Zone::~Zone()
 
 bool Core::Zone::init()
 {
-   memset( m_pCellCache, 0, sizeof( CellCache* ) * _sizeX );
 
    if( g_scriptMgr.onZoneInit( shared_from_this() ) )
    {
       // all good
    }
 
-   loadCellCache();
 
    return true;
 }
@@ -132,108 +129,9 @@ void Core::Zone::setCurrentFestival( uint16_t festivalId )
    m_currentFestivalId = festivalId;
 }
 
-Core::CellCache* Core::Zone::getCellCacheList( uint32_t cellx, uint32_t celly )
-{
-   assert( cellx < _sizeX );
-   assert( celly < _sizeY );
-   if( m_pCellCache[cellx] == nullptr )
-      return nullptr;
-
-   return m_pCellCache[cellx][celly];
-}
-
-Core::CellCache* Core::Zone::getCellCacheAndCreate( uint32_t cellx, uint32_t celly )
-{
-   assert( cellx < _sizeX );
-   assert( celly < _sizeY );
-   if( m_pCellCache[cellx] == nullptr )
-   {
-      m_pCellCache[cellx] = new CellCache*[_sizeY];
-      memset(m_pCellCache[cellx], 0, sizeof( CellCache* ) * _sizeY);
-   }
-
-   if( m_pCellCache[cellx][celly] == nullptr )
-   {
-      //m_pCellCache[cellx][celly] = new CellCache;
-   }
-
-   return m_pCellCache[cellx][celly];
-}
 
 void Core::Zone::loadCellCache()
 {
-   auto pQR = g_charaDb.query( "SELECT Id,"
-                               "Zoneid,"
-                               "NameId,"
-                               "SizeId,"
-                               "ClassJob,"
-                               "DisplayFlags1,"
-                               "DisplayFlags2,"
-                               "Level,"
-                               "Pos_0_0,"
-                               "Pos_0_1,"
-                               "Pos_0_2,"
-                               "Rotation,"
-                               "MobType,"
-                               "Behaviour,"
-                               "ModelMainWeapon,"
-                               "ModelSubWeapon,"
-                               "ModelId,"
-                               "Look,"
-                               "Models,"
-                               "type "
-                               "FROM battlenpc WHERE ZoneId = " + std::to_string( getTerritoryId() ) + ";" );
-
-   std::vector< Entity::BattleNpcPtr > cache;
-
-   while( pQR->next() )
-   {
-      uint32_t id = pQR->getUInt( 1 );
-      uint32_t targetZoneId = pQR->getUInt( 2 );
-      uint32_t nameId = pQR->getUInt( 3 );
-      uint32_t sizeId = pQR->getUInt( 4 );
-      uint32_t classJob = pQR->getUInt( 5 );
-      uint32_t displayFlags1 = pQR->getUInt( 6 );
-      uint32_t displayFlags2 = pQR->getUInt( 7 );
-      uint32_t level = pQR->getUInt( 8 );
-      float posX = pQR->getFloat( 9 );
-      float posY = pQR->getFloat( 10 );
-      float posZ = pQR->getFloat( 11 );
-      uint32_t rotation = pQR->getUInt( 12 );
-      uint32_t mobType = pQR->getUInt( 13 );
-      uint32_t behaviour = pQR->getUInt( 14 );
-      uint64_t modelMainWeapon = pQR->getUInt( 15 );
-      uint64_t modelSubWeapon = pQR->getUInt( 16 );
-      uint32_t modelId = pQR->getUInt( 17 );
-      uint32_t type = pQR->getUInt( 18 );
-
-      Common::FFXIVARR_POSITION3 pos{ posX, posY, posZ };
-      auto pBNpc = Entity::make_BattleNpc( modelId, nameId, pos, sizeId, type, level, behaviour, mobType );
-      pBNpc->setRotation( static_cast< float >( rotation ) );
-      cache.push_back( pBNpc );
-   }
-
-
-
-   for( auto entry : cache )
-   {
-      // get cell position
-      uint32_t cellX = CellHandler< TerritoryMgr >::getPosX( entry->getPos().x );
-      uint32_t cellY = CellHandler< TerritoryMgr >::getPosY( entry->getPos().z );
-
-      // find the right cell, create it if not existing yet
-      if( m_pCellCache[cellX] == nullptr )
-      {
-         m_pCellCache[cellX] = new CellCache*[_sizeY];
-         memset( m_pCellCache[cellX], 0, sizeof( CellCache* ) * _sizeY );
-      }
-
-      if( !m_pCellCache[cellX][cellY] )
-         m_pCellCache[cellX][cellY] = new CellCache;
-
-      // add the populace cache object to the cells list
-      m_pCellCache[cellX][cellY]->battleNpcCache.push_back( entry );
-   }
 
 }
 
@@ -314,15 +212,7 @@ void Core::Zone::pushActor( Entity::CharaPtr pChara )
       m_playerMap[pPlayer->getId()] = pPlayer;
       updateCellActivity( cx, cy, 2 );
    }
-   else if( pChara->isBattleNpc() )
-   {
-
-      Entity::BattleNpcPtr pBNpc = pChara->getAsBattleNpc();
-      m_BattleNpcMap[pBNpc->getId()] = pBNpc;
-      pBNpc->setPosition( pBNpc->getPos() );
-
-   }
-}
+ }
 
 void Core::Zone::removeActor( Entity::CharaPtr pChara )
 {
@@ -349,8 +239,6 @@ void Core::Zone::removeActor( Entity::CharaPtr pChara )
       onLeaveTerritory( *pChara->getAsPlayer() );
 
    }
-   else if( pChara->isBattleNpc() )
-      m_BattleNpcMap.erase( pChara->getId() );
 
    // remove from lists of other actors
    pChara->removeFromInRange();
@@ -433,6 +321,7 @@ bool Core::Zone::checkWeather()
    return false;
 }
 
+/*
 void Core::Zone::updateBnpcs( int64_t tickCount )
 {
    if( ( tickCount - m_lastMobUpdate ) > 250 )
@@ -480,6 +369,7 @@ void Core::Zone::updateBnpcs( int64_t tickCount )
       }
    }
 }
+*/
 
 bool Core::Zone::update( uint32_t currTime )
 {
@@ -489,7 +379,7 @@ bool Core::Zone::update( uint32_t currTime )
    bool changedWeather = checkWeather();
 
    updateSessions( changedWeather );
-   updateBnpcs( tickCount );
+   //updateBnpcs( tickCount );
    onUpdate( currTime );
 
    return true;
@@ -590,9 +480,6 @@ void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
 
                assert( !pCell->isLoaded() );
 
-               CellCache * pCC = getCellCacheAndCreate( posX, posY );
-               if( pCC )
-                  pCell->loadCharas(pCC);
             }
          }
          else
@@ -604,9 +491,7 @@ void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
 
                if( !pCell->isLoaded() )
                {
-                  CellCache * pCC = getCellCacheAndCreate( posX, posY );
-                  if( pCC )
-                     pCell->loadCharas(pCC);
+
                }
             }
             else if( !isCellActive( posX, posY ) && pCell->isActive() )
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 1619cafc..11a188da 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -34,15 +34,10 @@ protected:
    std::string m_internalName;
 
    std::unordered_map< int32_t, Entity::PlayerPtr > m_playerMap;
-   std::unordered_map< int32_t, Entity::BattleNpcPtr > m_BattleNpcMap;
    std::unordered_map< int32_t, Entity::EventObjectPtr > m_eventObjects;
 
-   std::set< Entity::BattleNpcPtr > m_BattleNpcDeadMap;
-
    SessionSet m_sessionSet;
 
-   CellCache** m_pCellCache[_sizeX];
-
    Common::Weather m_currentWeather;
    Common::Weather m_weatherOverride;
 
@@ -53,8 +48,6 @@ protected:
 
    std::map< uint8_t, int32_t> m_weatherRateMap;
 
-
-
 public:
    Zone();
 
@@ -71,10 +64,6 @@ public:
    uint16_t getCurrentFestival() const;
    void setCurrentFestival( uint16_t festivalId );
 
-   CellCache* getCellCacheList( uint32_t cellx, uint32_t celly );
-
-   CellCache* getCellCacheAndCreate( uint32_t cellx, uint32_t celly );
-
    virtual void loadCellCache();
    virtual uint32_t getTerritoryId() const;
    virtual void onEnterTerritory( Entity::Player& player );
@@ -107,7 +96,7 @@ public:
    std::size_t getPopCount() const;
    void loadWeatherRates();
    bool checkWeather();
-   void updateBnpcs( int64_t tickCount );
+   //void updateBnpcs( int64_t tickCount );
 
    bool update( uint32_t currTime );
 

From c1fb728a057eec47a190fecc8900d46de98c50ee Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 21 Feb 2018 18:06:52 +0100
Subject: [PATCH 17/69] In range restructuring

---
 .../sapphire_zone/Action/ActionCollision.cpp  |   4 +-
 src/servers/sapphire_zone/Actor/Actor.cpp     |   5 -
 src/servers/sapphire_zone/Actor/Actor.h       |   1 -
 src/servers/sapphire_zone/Actor/Player.cpp    |   2 +
 src/servers/sapphire_zone/Zone/Zone.cpp       | 109 ++++++++----------
 5 files changed, 49 insertions(+), 72 deletions(-)

diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index c13a3e29..86ac4933 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -31,7 +31,7 @@ bool ActionCollision::isActorApplicable( Chara& chara, TargetFilter targetFilter
    case TargetFilter::Allies:
    {
       // todo: implement ally NPCs
-      actorApplicable = !chara.isBattleNpc();
+    //  actorApplicable = !chara.isBattleNpc();
       break;
    }
    case TargetFilter::Party:
@@ -42,7 +42,7 @@ bool ActionCollision::isActorApplicable( Chara& chara, TargetFilter targetFilter
    }
    case TargetFilter::Enemies:
    {
-      actorApplicable = chara.isBattleNpc();
+      //actorApplicable = chara.isBattleNpc();
       break;
    }
    }
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index bff257d3..3890dd40 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -51,11 +51,6 @@ bool Core::Entity::Actor::isPlayer() const
    return m_objKind == ObjKind::Player;
 }
 
-bool Core::Entity::Actor::isBattleNpc() const
-{
-   return m_objKind == ObjKind::BattleNpc;
-}
-
 /*! \return pointer to this instance as ActorPtr */
 Core::Entity::CharaPtr Core::Entity::Actor::getAsChara()
 {
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 1b4382b5..3127bf3e 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -68,7 +68,6 @@ namespace Entity {
       void setRot( float rot );
 
       bool isPlayer() const;
-      bool isBattleNpc() const;
 
       CharaPtr getAsChara();
       PlayerPtr getAsPlayer();
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 62361f89..347e4add 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -823,6 +823,8 @@ void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget )
 {
    auto pPlayer = pTarget;
 
+   g_log.debug( "despawning " + getName() + " for " + pTarget->getName() );
+
    pPlayer->freePlayerSpawnId( getId() );
 
    pPlayer->queuePacket( ActorControlPacket143( getId(), DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 36718f0c..e7056c57 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -35,6 +35,9 @@ extern Core::Data::ExdDataGenerated g_exdDataGen;
 extern Core::Scripting::ScriptManager g_scriptMgr;
 extern Core::TerritoryMgr g_territoryMgr;
 
+using namespace Core::Common;
+using namespace Core::Network::Packets;
+using namespace Core::Network::Packets::Server;
 
 /**
 * \brief
@@ -42,15 +45,15 @@ extern Core::TerritoryMgr g_territoryMgr;
 Core::Zone::Zone() :
    m_territoryId( 0 ),
    m_guId( 0 ),
-   m_currentWeather( Common::Weather::FairSkies ),
-   m_weatherOverride( Common::Weather::None ),
+   m_currentWeather( Weather::FairSkies ),
+   m_weatherOverride( Weather::None ),
    m_lastMobUpdate( 0 ),
    m_currentFestivalId( 0 )
 {
 }
 
 Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& internalName, const std::string& placeName ) :
-   m_currentWeather( Common::Weather::FairSkies )
+   m_currentWeather( Weather::FairSkies )
 {
    m_guId = guId;
 
@@ -59,7 +62,7 @@ Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& intern
    m_placeName = placeName;
    m_lastMobUpdate = 0;
 
-   m_weatherOverride = Common::Weather::None;
+   m_weatherOverride = Weather::None;
    m_territoryTypeInfo = g_exdDataGen.get< Core::Data::TerritoryType >( territoryId );
 
    loadWeatherRates();
@@ -109,12 +112,12 @@ bool Core::Zone::init()
    return true;
 }
 
-void Core::Zone::setWeatherOverride( Common::Weather weather )
+void Core::Zone::setWeatherOverride( Weather weather )
 {
    m_weatherOverride = weather;
 }
 
-Core::Common::Weather Core::Zone::getCurrentWeather() const
+Weather Core::Zone::getCurrentWeather() const
 {
    return m_currentWeather;
 }
@@ -135,7 +138,7 @@ void Core::Zone::loadCellCache()
 
 }
 
-Core::Common::Weather Core::Zone::getNextWeather()
+Weather Core::Zone::getNextWeather()
 {
    uint32_t unixTime = static_cast< uint32_t >( Util::getTimeSeconds() );
    // Get Eorzea hour for weather start
@@ -156,13 +159,13 @@ Core::Common::Weather Core::Zone::getNextWeather()
    for( auto entry : m_weatherRateMap )
    {
       uint8_t sRate = entry.first;
-      auto weatherId = static_cast< Common::Weather >( entry.second );
+      auto weatherId = static_cast< Weather >( entry.second );
 
       if( rate <= sRate )
          return weatherId;
    }
 
-   return Common::Weather::FairSkies;
+   return Weather::FairSkies;
 }
 
 void Core::Zone::pushActor( Entity::CharaPtr pChara )
@@ -246,24 +249,25 @@ void Core::Zone::removeActor( Entity::CharaPtr pChara )
 
 }
 
-void Core::Zone::queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t range, Network::Packets::GamePacketPtr pPacketEntry )
+void Core::Zone::queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t range, GamePacketPtr pPacketEntry )
 {
    if( g_territoryMgr.isPrivateTerritory( getTerritoryId() ) )
       return;
 
-   for( auto it = m_playerMap.begin(); it != m_playerMap.end(); ++it )
+   for( auto entry : m_playerMap )
    {
+      auto player = entry.second;
       float distance = Math::Util::distance( sourcePlayer.getPos().x,
                                              sourcePlayer.getPos().y,
                                              sourcePlayer.getPos().z,
-                                             ( *it ).second->getPos().x,
-                                             ( *it ).second->getPos().y,
-                                             ( *it ).second->getPos().z );
+                                             player->getPos().x,
+                                             player->getPos().y,
+                                             player->getPos().z );
 
-      if( ( distance < range ) && sourcePlayer.getId() != ( *it ).second->getId() )
+      if( ( distance < range ) && sourcePlayer.getId() != player->getId() )
       {
-         auto pSession = g_serverZone.getSession( ( *it ).second->getId() );
-         pPacketEntry->setValAt< uint32_t >( 0x08, ( *it ).second->getId() );
+         auto pSession = g_serverZone.getSession( player->getId() );
+         pPacketEntry->setValAt< uint32_t >( 0x08, player->getId() );
          if( pSession )
             pSession->getZoneConnection()->queueOutPacket( pPacketEntry );
       }
@@ -297,7 +301,7 @@ std::size_t Core::Zone::getPopCount() const
 
 bool Core::Zone::checkWeather()
 {
-   if( m_weatherOverride != Common::Weather::None )
+   if( m_weatherOverride != Weather::None )
    {
       if( m_weatherOverride != m_currentWeather )
       {
@@ -401,12 +405,13 @@ void Core::Zone::updateSessions( bool changedWeather )
          continue;
       }
 
+      auto pPlayer = pSession->getPlayer();
+
       // this session is not linked to this area anymore, remove it from zone session list
-      if( ( !pSession->getPlayer()->getCurrentZone() ) ||
-          ( pSession->getPlayer()->getCurrentZone() != shared_from_this() ) )
+      if( ( !pPlayer->getCurrentZone() ) || ( pPlayer->getCurrentZone() != shared_from_this() ) )
       {
-         if( pSession->getPlayer()->getCell() )
-            removeActor(pSession->getPlayer() );
+         if( pPlayer->getCell() )
+            removeActor( pSession->getPlayer() );
 
          it = m_sessionSet.erase(it );
          continue;
@@ -414,8 +419,7 @@ void Core::Zone::updateSessions( bool changedWeather )
 
       if( changedWeather )
       {
-         Core::Network::Packets::ZoneChannelPacket< Core::Network::Packets::Server::FFXIVIpcWeatherChange  >
-                 weatherChangePacket( pSession->getPlayer()->getId() );
+         ZoneChannelPacket< FFXIVIpcWeatherChange  > weatherChangePacket( pPlayer->getId() );
          weatherChangePacket.data().weatherId = static_cast< uint8_t >( m_currentWeather );
          weatherChangePacket.data().delay = 5.0f;
          pSession->getPlayer()->queuePacket( weatherChangePacket );
@@ -577,15 +581,13 @@ void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
    if( g_territoryMgr.isPrivateTerritory( getTerritoryId() ) )
       return;
 
-   Entity::CharaPtr pCurAct;
-
    auto iter = pCell->m_charas.begin();
 
    float fRange = 70.0f;
    int32_t count = 0;
    while( iter != pCell->m_charas.end() )
    {
-      pCurAct = *iter;
+      auto pCurAct = *iter;
       ++iter;
 
       if( !pCurAct || pCurAct == pChara )
@@ -597,60 +599,38 @@ void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
       bool isInRange = ( fRange == 0.0f || distance <= fRange );
       bool isInRangeSet = pChara->isInRangeSet( pCurAct );
 
-      // Add if we are not ourself and range == 0 or distance is withing range.
+      // Add if range == 0 or distance is withing range.
       if( isInRange && !isInRangeSet )
       {
-
          if( pChara->isPlayer() )
          {
             auto pOwnPlayer = pChara->getAsPlayer();
-
             if( !pOwnPlayer->isLoadingComplete() )
                continue;
 
-            // this is a hack to limit actor spawn in one packetset
-            count++;
-            if( count > 12 )
-               break;
-
-            pChara->addInRangeChara( pCurAct );
-            pCurAct->addInRangeChara( pChara );
             // spawn the actor for the player
             pCurAct->spawn( pOwnPlayer );
-
-            if( pCurAct->isPlayer() )
-            {
-               auto pPlayer = pCurAct->getAsPlayer();
-               if( !pPlayer->isLoadingComplete() )
-                  continue;
-
-               pChara->spawn( pPlayer );
-            }
-
          }
-         else if( ( pChara->isBattleNpc() ) && pCurAct->isPlayer() && pChara->isAlive() )
+
+         if( pCurAct->isPlayer() )
          {
             auto pPlayer = pCurAct->getAsPlayer();
-            if( pPlayer->isLoadingComplete() )
-            {
-               pChara->spawn( pPlayer );
-               pCurAct->addInRangeChara( pChara );
-               pChara->addInRangeChara( pCurAct );
-            }
-         }
-         else
-         {
-            pChara->addInRangeChara( pCurAct );
-            pCurAct->addInRangeChara( pChara );
+            if( !pPlayer->isLoadingComplete() )
+               continue;
+
+            pChara->spawn( pPlayer );
          }
+
+         pChara->addInRangeChara( pCurAct );
+         pCurAct->addInRangeChara( pChara );
+
+         // this is a hack to limit actor spawn in one packetset
+         if( count++ > 12 )
+            break;
       }
       else if( !isInRange && isInRangeSet )
       {
          pCurAct->removeInRangeChara( *pChara );
-
-         if( pChara->getCurrentZone() != pCurAct->getCurrentZone() )
-            continue;
-
          pChara->removeInRangeChara( *pCurAct );
       }
    }
@@ -704,6 +684,7 @@ Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId )
    return obj->second;
 }
 
+// TODO: this is located wrong. state change should happen in the object and it should send to his in range set.
 void Core::Zone::updateEObj( Entity::EventObjectPtr object )
 {
    if( !object )
@@ -712,7 +693,7 @@ void Core::Zone::updateEObj( Entity::EventObjectPtr object )
    for( const auto& playerIt : m_playerMap )
    {
       // send that packet with le data
-      Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcObjectSpawn > eobjStatePacket( playerIt.second->getId() );
+      ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( playerIt.second->getId() );
       eobjStatePacket.data().objKind = object->getObjKind();
       eobjStatePacket.data().state = object->getState();
       eobjStatePacket.data().objId = object->getId();

From 29918f58074cd2c25e1223b019c791c451d57cee Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 21 Feb 2018 23:30:35 +0100
Subject: [PATCH 18/69] Fixed an issue with teleport not picking the correct
 target position, eventaction unlocks player now

---
 src/common/Exd/ExdDataGenerated.cpp                 |  1 +
 src/common/Exd/ExdDataGenerated.h                   |  1 +
 src/servers/sapphire_zone/Action/EventAction.cpp    |  3 ++-
 src/servers/sapphire_zone/Actor/Player.cpp          | 13 +------------
 .../DebugCommand/DebugCommandHandler.cpp            |  6 ------
 .../Script/Scripts/common/Aethernet.cpp             |  1 -
 .../Script/Scripts/quest/ManFst002.cpp              |  1 -
 7 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/src/common/Exd/ExdDataGenerated.cpp b/src/common/Exd/ExdDataGenerated.cpp
index 859998d2..eda4a919 100644
--- a/src/common/Exd/ExdDataGenerated.cpp
+++ b/src/common/Exd/ExdDataGenerated.cpp
@@ -172,6 +172,7 @@ Core::Data::Aetheryte::Aetheryte( uint32_t row_id, Core::Data::ExdDataGenerated*
    placeName = exdData->getField< uint16_t >( row, 8 );
    aethernetName = exdData->getField< uint16_t >( row, 9 );
    territory = exdData->getField< uint16_t >( row, 10 );
+   levelId = exdData->getField< uint32_t >( row, 11 );
    isAetheryte = exdData->getField< bool >( row, 15 );
    aethernetGroup = exdData->getField< uint8_t >( row, 16 );
    map = exdData->getField< uint16_t >( row, 19 );
diff --git a/src/common/Exd/ExdDataGenerated.h b/src/common/Exd/ExdDataGenerated.h
index 0cc29084..d17edf4a 100644
--- a/src/common/Exd/ExdDataGenerated.h
+++ b/src/common/Exd/ExdDataGenerated.h
@@ -496,6 +496,7 @@ struct Aetheryte
    uint16_t placeName;
    uint16_t aethernetName;
    uint16_t territory;
+   uint32_t levelId;
    bool isAetheryte;
    uint8_t aethernetGroup;
    uint16_t map;
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
index 5bdef79c..3d5b80e8 100644
--- a/src/servers/sapphire_zone/Action/EventAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventAction.cpp
@@ -53,7 +53,8 @@ void Core::Action::EventAction::onStart()
    if( m_pSource->isPlayer() )
    {
       m_pSource->sendToInRangeSet( control, true );
-      //m_pSource->getAsPlayer()->setStateFlag( PlayerStateFlag::Occupied2 );
+      if( m_pSource->getAsPlayer()->hasStateFlag( PlayerStateFlag::InNpcEvent ) )
+         m_pSource->getAsPlayer()->unsetStateFlag( PlayerStateFlag::InNpcEvent );
    }
    else
       m_pSource->sendToInRangeSet( control );
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 347e4add..941ba949 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -300,7 +300,7 @@ void Core::Entity::Player::teleport( uint16_t aetheryteId, uint8_t type )
 
    setStateFlag( PlayerStateFlag::BetweenAreas );
 
-   auto targetPos = g_territoryMgr.getTerritoryPosition( data->territory );
+   auto targetPos = g_territoryMgr.getTerritoryPosition( data->levelId );
 
    Common::FFXIVARR_POSITION3 pos;
    pos.x = 0;
@@ -652,17 +652,6 @@ void Core::Entity::Player::gainLevel()
    classInfoPacket.data().currentExp = getExp();
    queuePacket( classInfoPacket );
 
-
-
-
-
-
-
-}
-
-void Core::Entity::Player::unlock()
-{
-   queuePacket( PlayerStateFlagsPacket( *getAsPlayer(), PlayerStateFlagList{} ) );
 }
 
 void Core::Entity::Player::sendStatusUpdate( bool toSelf )
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 0fde5dce..736e87c5 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -56,7 +56,6 @@ Core::DebugCommandHandler::DebugCommandHandler()
    registerCommand( "replay", &DebugCommandHandler::replay, "Replays a saved capture folder.", 1 );
    registerCommand( "nudge", &DebugCommandHandler::nudge, "Nudges you forward/up/down.", 1 );
    registerCommand( "info", &DebugCommandHandler::serverInfo, "Show server info.", 0 );
-   registerCommand( "unlock", &DebugCommandHandler::unlockCharacter, "Unlock character.", 1 );
    registerCommand( "help", &DebugCommandHandler::help, "Shows registered commands.", 0 );
    registerCommand( "script", &DebugCommandHandler::script, "Server script utilities.", 1 );
    registerCommand( "instance", &DebugCommandHandler::instance, "Instance utilities", 1 );
@@ -574,11 +573,6 @@ void Core::DebugCommandHandler::serverInfo( char * data, Entity::Player& player,
    player.sendDebug( "Sessions: " + std::to_string( g_serverZone.getSessionCount() ) );
 }
 
-void Core::DebugCommandHandler::unlockCharacter( char* data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
-{
-   player.unlock();
-}
-
 void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boost::shared_ptr< DebugCommand > command )
 {
    std::string subCommand;
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp b/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
index 9a3ccd8f..45b57f1b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
@@ -39,7 +39,6 @@ public:
 
          }, 0 );
 
-         player.unlock();
       }
 
    }
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp
index 707150cb..a2348a7e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp
@@ -211,7 +211,6 @@ public:
 
          player.eventActionStart( 0x050002, 0x13, event, nullptr, 0x050002 );
 
-         player.unlock();
       }
       else if( actor == ACTOR2 )
          Scene00002( player );

From 6e5737f4015419a0dbcfa72221d3d5df9307ffee Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 22 Feb 2018 15:31:10 +0100
Subject: [PATCH 19/69] Actors are now used as base for any entity

---
 src/common/Common.h                           |  10 -
 .../Network/PacketDef/Zone/ServerZoneDef.h    |   4 +-
 .../sapphire_zone/Action/ActionCollision.cpp  |  15 +-
 .../sapphire_zone/Action/ActionCollision.h    |   6 +-
 src/servers/sapphire_zone/Actor/Actor.cpp     | 174 ++++++++++++++++-
 src/servers/sapphire_zone/Actor/Actor.h       |  32 +++
 src/servers/sapphire_zone/Actor/Chara.cpp     | 182 ++----------------
 src/servers/sapphire_zone/Actor/Chara.h       |  44 ++---
 src/servers/sapphire_zone/Actor/Player.cpp    |  13 +-
 src/servers/sapphire_zone/Actor/Player.h      |   2 +-
 .../Network/Handlers/GMCommandHandlers.cpp    |  22 +--
 .../Network/Handlers/SkillHandler.cpp         |   6 +-
 .../PacketWrappers/PlayerSpawnPacket.h        |   2 +-
 src/servers/sapphire_zone/Zone/Zone.cpp       |  28 +--
 14 files changed, 278 insertions(+), 262 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 2a62c6ef..6d5b204d 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -708,16 +708,6 @@ namespace Common {
       MountSkill = 0xD,
    };
 
-   /*! ModelType as found in eventsystemdefine.exd */
-   enum ModelType : uint8_t
-   {
-      Human = 1,
-      DemiHuman = 2,
-      Monster = 3,
-      SharedGroup = 4,
-      Parts = 5
-   };
-
    typedef std::vector< PlayerStateFlag > PlayerStateFlagList;
 
 } /* Common */
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 572b08fb..0b32b0b4 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -382,7 +382,7 @@ struct FFXIVIpcPlayerSpawn : FFXIVIpcBasePacket<PlayerSpawn>
    uint8_t spawnIndex;
    uint8_t state;
    uint8_t persistantEmote;
-   uint8_t type; // modelType -> eventSystemDefine
+   uint8_t modelType; // modelType -> eventSystemDefine
    uint8_t subtype;
    uint8_t voice;
    uint16_t u25c;
@@ -458,7 +458,7 @@ struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket<NpcSpawn>
    uint8_t spawnIndex;
    uint8_t state;
    uint8_t persistantEmote;
-   uint8_t type;
+   uint8_t modelType;
    uint8_t subtype;
    uint8_t voice;
    uint16_t u25c;
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index 86ac4933..defb184a 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -2,6 +2,7 @@
 #include <common/Util/UtilMath.h>
 
 #include "ActionCollision.h"
+#include "Actor/Actor.h"
 #include "Actor/Chara.h"
 #include "Actor/Player.h"
 
@@ -13,7 +14,7 @@ using namespace Core::Common;
 
 // todo: add AoE actor limits (16, 32)
 
-bool ActionCollision::isActorApplicable( Chara& chara, TargetFilter targetFilter )
+bool ActionCollision::isActorApplicable( Actor& actor, TargetFilter targetFilter )
 {
    bool actorApplicable = false;
    switch( targetFilter )
@@ -25,7 +26,7 @@ bool ActionCollision::isActorApplicable( Chara& chara, TargetFilter targetFilter
    }
    case TargetFilter::Players:
    {
-      actorApplicable = chara.isPlayer();
+      actorApplicable = actor.isPlayer();
       break;
    }
    case TargetFilter::Allies:
@@ -37,7 +38,7 @@ bool ActionCollision::isActorApplicable( Chara& chara, TargetFilter targetFilter
    case TargetFilter::Party:
    {
       // todo: implement party
-      actorApplicable = chara.isPlayer();
+      actorApplicable = actor.isPlayer();
       break;
    }
    case TargetFilter::Enemies:
@@ -47,15 +48,15 @@ bool ActionCollision::isActorApplicable( Chara& chara, TargetFilter targetFilter
    }
    }
 
-   return ( actorApplicable && chara.isAlive() );
+   return ( actorApplicable && actor.getAsChara()->isAlive() );
 }
 
-std::set< Core::Entity::CharaPtr > ActionCollision::getActorsHitFromAction( FFXIVARR_POSITION3 aoePosition,
-                                                                            std::set< CharaPtr > actorsInRange,
+std::set< Core::Entity::ActorPtr > ActionCollision::getActorsHitFromAction( FFXIVARR_POSITION3 aoePosition,
+                                                                            std::set< ActorPtr > actorsInRange,
                                                                             boost::shared_ptr< Core::Data::Action > actionInfo,
                                                                             TargetFilter targetFilter )
 {
-   std::set< CharaPtr > actorsCollided;
+   std::set< ActorPtr > actorsCollided;
 
    switch( static_cast< ActionCollisionType >( actionInfo->castType ) )
    {
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
index 470a31f2..13cddd44 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.h
+++ b/src/servers/sapphire_zone/Action/ActionCollision.h
@@ -23,9 +23,9 @@ namespace Entity {
    {
    public:
 
-      static bool isActorApplicable( Chara& actor, TargetFilter targetFilter );
-      static std::set< CharaPtr > getActorsHitFromAction( Common::FFXIVARR_POSITION3 aoePosition,
-                                                          std::set< CharaPtr > actorsInRange,
+      static bool isActorApplicable( Actor& actor, TargetFilter targetFilter );
+      static std::set< ActorPtr > getActorsHitFromAction( Common::FFXIVARR_POSITION3 aoePosition,
+                                                          std::set< ActorPtr > actorsInRange,
                                                           boost::shared_ptr< Data::Action > actionInfo,
                                                           TargetFilter targetFilter );
 
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 3890dd40..fc13ddc8 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -1,7 +1,17 @@
 #include "Actor.h"
 
-#include "Player.h"
+#include <common/Network/PacketContainer.h>
+#include <common/Network/GamePacket.h>
+#include <common/Util/Util.h>
+#include <common/Util/UtilMath.h>
+
 #include "Chara.h"
+#include "Network/GameConnection.h"
+#include "Player.h"
+#include "ServerZone.h"
+#include "Session.h"
+
+extern Core::ServerZone g_serverZone;
 
 Core::Entity::Actor::Actor( ObjKind type ) :
    m_objKind( type )
@@ -65,3 +75,165 @@ Core::Entity::PlayerPtr Core::Entity::Actor::getAsPlayer()
    return boost::dynamic_pointer_cast< Entity::Player, Entity::Actor >( shared_from_this() );
 }
 
+/*!
+Add a given actor to the fitting in range set according to type
+but also to the global actor map
+
+\param ActorPtr to add
+*/
+void Core::Entity::Actor::addInRangeActor( ActorPtr pActor )
+{
+
+   // if this is null, something went wrong
+   assert( pActor );
+
+   // add actor to in range set
+   m_inRangeActor.insert( pActor );
+
+   if( pActor->isPlayer() )
+   {
+      auto pPlayer = pActor->getAsPlayer();
+
+      pPlayer->spawn( getAsPlayer() );
+
+      // if actor is a player, add it to the in range player set
+      m_inRangePlayers.insert( pPlayer );
+   }
+}
+
+/*!
+Remove a given actor from the matching in range set according to type
+but also to the global actor map
+
+\param ActorPtr to remove
+*/
+void Core::Entity::Actor::removeInRangeActor( Actor& actor )
+{
+   // call virtual event
+   onRemoveInRangeActor( actor );
+
+   // remove actor from in range actor set
+   m_inRangeActor.erase( actor.shared_from_this() );
+
+   // if actor is a player, despawn ourself for him
+   // TODO: move to virtual onRemove?
+   if( isPlayer() )
+      actor.despawn( getAsPlayer() );
+
+   if( actor.isPlayer() )
+      m_inRangePlayers.erase( actor.getAsPlayer() );
+}
+
+/*! \return true if there is at least one actor in the in range set */
+bool Core::Entity::Actor::hasInRangeActor() const
+{
+   return ( m_inRangeActor.size() > 0 );
+}
+
+void Core::Entity::Actor::removeFromInRange()
+{
+   if( !hasInRangeActor() )
+      return;
+
+   Entity::ActorPtr pCurAct;
+
+   for( auto& pCurAct : m_inRangeActor )
+   {
+      pCurAct->removeInRangeActor( *this );
+   }
+
+}
+
+/*!
+check if a given actor is in the actors in range set
+
+\param ActorPtr to be checked for
+\return true if the actor was found
+*/
+bool Core::Entity::Actor::isInRangeSet( ActorPtr pActor ) const
+{
+   return !( m_inRangeActor.find( pActor ) == m_inRangeActor.end() );
+}
+
+/*! \return ActorPtr of the closest actor in range, if none, nullptr */
+Core::Entity::ActorPtr Core::Entity::Actor::getClosestActor()
+{
+   if( m_inRangeActor.empty() )
+      // no actors in range, don't bother
+      return nullptr;
+
+   ActorPtr tmpActor = nullptr;
+
+   // arbitrary high number
+   float minDistance = 10000;
+
+   for( const auto& pCurAct : m_inRangeActor )
+   {
+      float distance = Math::Util::distance( getPos().x,
+                                             getPos().y,
+                                             getPos().z,
+                                             pCurAct->getPos().x,
+                                             pCurAct->getPos().y,
+                                             pCurAct->getPos().z );
+
+      if( distance < minDistance )
+      {
+         minDistance = distance;
+         tmpActor = pCurAct;
+      }
+   }
+
+   return tmpActor;
+}
+
+
+/*! Clear the whole in range set, this does no cleanup */
+void Core::Entity::Actor::clearInRangeSet()
+{
+   m_inRangeActor.clear();
+   m_inRangePlayers.clear();
+}
+
+/*!
+Send a packet to all players in range, potentially to self if set and is player
+
+\param GamePacketPtr to send
+\param bool should be send to self?
+*/
+void Core::Entity::Actor::sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf )
+{
+
+   if( bToSelf && isPlayer() )
+   {
+      auto pPlayer = getAsPlayer();
+
+      auto pSession = g_serverZone.getSession( pPlayer->getId() );
+
+      // it might be that the player DC'd in which case the session would be invalid
+      if( pSession )
+         pSession->getZoneConnection()->queueOutPacket( pPacket );
+   }
+
+   if( m_inRangePlayers.empty() )
+      return;
+
+   for( const auto &pCurAct : m_inRangePlayers )
+   {
+      assert( pCurAct );
+      pPacket->setValAt< uint32_t >( 0x04, m_id );
+      pPacket->setValAt< uint32_t >( 0x08, pCurAct->getId() );
+      // it might be that the player DC'd in which case the session would be invalid
+      pCurAct->queuePacket( pPacket );
+   }
+}
+
+/*! \return list of actors currently in range */
+std::set< Core::Entity::ActorPtr > Core::Entity::Actor::getInRangeActors( bool includeSelf )
+{
+   auto tempInRange = m_inRangeActor;
+
+   if( includeSelf )
+      tempInRange.insert( shared_from_this() );
+
+   return tempInRange;
+}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 3127bf3e..555a9fc9 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -49,6 +49,10 @@ namespace Entity {
       /*! Type of the actor */
       ObjKind              m_objKind;
 
+      /*! list of various actors in range */
+      std::set< ActorPtr > m_inRangeActor;
+      std::set< PlayerPtr > m_inRangePlayers;
+
    public:
       explicit Actor( ObjKind type );
       virtual ~Actor() {};
@@ -69,6 +73,34 @@ namespace Entity {
 
       bool isPlayer() const;
 
+      ///// IN RANGE LOGIC ///////////////////////////////
+      virtual void onRemoveInRangeActor( Actor& pActor ) {}
+
+      // check if another actor is in the actors in range set
+      bool isInRangeSet( ActorPtr pActor ) const;
+
+      ActorPtr getClosestActor();
+
+      void sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf = false );
+
+      // add an actor to in range set
+      void addInRangeActor( ActorPtr pActor );
+
+      // remove an actor from the in range set
+      void removeInRangeActor( Actor& actor );
+
+      // return true if there is at least one actor in the in range set
+      bool hasInRangeActor() const;
+
+      void removeFromInRange();
+
+      // clear the whole in range set, this does no cleanup
+      virtual void clearInRangeSet();
+
+      std::set< ActorPtr > getInRangeActors( bool includeSelf = false );
+
+      ////////////////////////////////////////////////////
+
       CharaPtr getAsChara();
       PlayerPtr getAsPlayer();
    };
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index a7162f4e..588ef935 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -52,16 +52,6 @@ std::string Core::Entity::Chara::getName() const
    return std::string( m_name );
 }
 
-/*! \return list of actors currently in range */
-std::set< Core::Entity::CharaPtr > Core::Entity::Chara::getInRangeCharas( bool includeSelf )
-{
-   auto tempInRange = m_inRangeCharas;
-
-   if( includeSelf )
-      tempInRange.insert( getAsChara() );
-
-   return tempInRange;
-   }
 
 /*! \return current stance of the actors */
 Core::Entity::Chara::Stance Core::Entity::Chara::getStance() const
@@ -396,155 +386,6 @@ void Core::Entity::Chara::setCurrentAction( Core::Action::ActionPtr pAction )
    m_pCurrentAction = pAction;
 }
 
-/*!
-check if a given actor is in the actors in range set
-
-\param ActorPtr to be checked for
-\return true if the actor was found
-*/
-bool Core::Entity::Chara::isInRangeSet( CharaPtr pChara ) const
-{
-   return !( m_inRangeCharas.find( pChara ) == m_inRangeCharas.end() );
-}
-
-/*! \return ActorPtr of the closest actor in range, if none, nullptr */
-Core::Entity::CharaPtr Core::Entity::Chara::getClosestChara()
-{
-   if( m_inRangeCharas.empty() )
-      // no actors in range, don't bother
-      return nullptr;
-
-   CharaPtr tmpActor = nullptr;
-
-   // arbitrary high number
-   float minDistance = 10000;
-
-   for( const auto& pCurAct : m_inRangeCharas )
-   {
-      float distance = Math::Util::distance( getPos().x,
-                                             getPos().y,
-                                             getPos().z,
-                                             pCurAct->getPos().x,
-                                             pCurAct->getPos().y,
-                                             pCurAct->getPos().z );
-
-      if( distance < minDistance )
-      {
-         minDistance = distance;
-         tmpActor = pCurAct;
-      }
-   }
-
-   return tmpActor;
-}
-
-/*!
-Send a packet to all players in range, potentially to self if set and is player
-
-\param GamePacketPtr to send
-\param bool should be send to self?
-*/
-void Core::Entity::Chara::sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf )
-{
-
-   if( bToSelf && isPlayer() )
-   {
-      auto pPlayer = getAsPlayer();
-
-      auto pSession = g_serverZone.getSession( pPlayer->getId() );
-
-      // it might be that the player DC'd in which case the session would be invalid
-      if( pSession )
-         pSession->getZoneConnection()->queueOutPacket( pPacket );
-   }
-
-   if( m_inRangePlayers.empty() )
-      return;
-
-   for( const auto &pCurAct : m_inRangePlayers )
-   {
-      assert( pCurAct );
-      pPacket->setValAt< uint32_t >( 0x04, m_id );
-      pPacket->setValAt< uint32_t >( 0x08, pCurAct->m_id );
-      // it might be that the player DC'd in which case the session would be invalid
-      pCurAct->queuePacket( pPacket );
-   }
-}
-
-/*!
-Add a given actor to the fitting in range set according to type
-but also to the global actor map
-
-\param ActorPtr to add
-*/
-void Core::Entity::Chara::addInRangeChara( CharaPtr pChara )
-{
-
-   // if this is null, something went wrong
-   assert( pChara );
-
-   // add actor to in range set
-   m_inRangeCharas.insert( pChara );
-
-   if( pChara->isPlayer() )
-   {
-      auto pPlayer = pChara->getAsPlayer();
-
-      // if actor is a player, add it to the in range player set
-      m_inRangePlayers.insert( pPlayer );
-   }
-}
-
-/*!
-Remove a given actor from the matching in range set according to type
-but also to the global actor map
-
-\param ActorPtr to remove
-*/
-void Core::Entity::Chara::removeInRangeChara( Chara& chara )
-{
-   // call virtual event
-   onRemoveInRangeChara( chara );
-
-   // remove actor from in range actor set
-   m_inRangeCharas.erase( chara.getAsChara() );
-
-   // if actor is a player, despawn ourself for him
-   // TODO: move to virtual onRemove?
-   if( isPlayer() )
-      chara.despawn( getAsPlayer() );
-
-   if( chara.isPlayer() )
-      m_inRangePlayers.erase( chara.getAsPlayer() );
-}
-
-/*! \return true if there is at least one actor in the in range set */
-bool Core::Entity::Chara::hasInRangeActor() const
-{
-   return ( m_inRangeCharas.size() > 0 );
-}
-
-void Core::Entity::Chara::removeFromInRange()
-{
-   if( !hasInRangeActor() )
-      return;
-
-   Entity::ActorPtr pCurAct;
-
-   for( auto& pCurAct : m_inRangeCharas )
-   {
-      pCurAct->removeInRangeChara( *this );
-   }
-
-}
-
-/*! Clear the whole in range set, this does no cleanup */
-void Core::Entity::Chara::clearInRangeSet()
-{
-   m_inRangeCharas.clear();
-   m_inRangePlayers.clear();
-}
-
 /*! \return ZonePtr to the current zone, nullptr if not set */
 Core::ZonePtr Core::Entity::Chara::getCurrentZone() const
 {
@@ -682,7 +523,7 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u
       else
       {
 
-         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeCharas(true),
+         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeActors( true ),
                                                                         actionInfoPtr, TargetFilter::Enemies );
 
          for( const auto& pHitActor : actorsCollided )
@@ -694,16 +535,17 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u
             sendToInRangeSet( effectPacket, true );
 
 
-            if( pHitActor->isAlive() )
-               pHitActor->onActionHostile( *this );
+            if( pHitActor->getAsChara()->isAlive() )
+               pHitActor->getAsChara()->onActionHostile( *this );
 
-            pHitActor->takeDamage( static_cast< uint32_t >( param1 ) );
+            pHitActor->getAsChara()->takeDamage( static_cast< uint32_t >( param1 ) );
 
             // Debug
             if ( isPlayer() ) 
             {
                if ( pHitActor->isPlayer() )
-                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) + " (" + pHitActor->getName() + ")" );
+                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) +
+                                            " (" + pHitActor->getAsChara()->getName() + ")" );
                else
                   getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) );
             }  
@@ -734,7 +576,7 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u
          // todo: get proper packets: the following was just kind of thrown together from what we know.
          // atm buggy (packets look "delayed" from client)
 
-         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeCharas(true),
+         auto actorsCollided = ActionCollision::getActorsHitFromAction( target.getPos(), getInRangeActors(true),
                                                                         actionInfoPtr, TargetFilter::Allies );
 
          for( auto pHitActor : actorsCollided )
@@ -743,13 +585,14 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u
             effectPacket.data().effectTarget = pHitActor->getId();
 
             sendToInRangeSet( effectPacket, true );
-            pHitActor->heal( calculatedHeal );
+            pHitActor->getAsChara()->heal( calculatedHeal );
 
             // Debug
             if( isPlayer() )
             {
                if( pHitActor->isPlayer() )
-                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) + " (" + pHitActor->getName() + ")" );
+                  getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) +
+                                            " (" + pHitActor->getAsChara()->getName() + ")" );
                else
                   getAsPlayer()->sendDebug( "AoE hit actor " + std::to_string( pHitActor->getId() ) );
             }
@@ -972,3 +815,8 @@ bool Core::Entity::Chara::hasStatusEffect( uint32_t id )
       return true;
    return false;
 }
+
+Chara::ModelType Chara::getModelType() const
+{
+   return m_modelType;
+}
diff --git a/src/servers/sapphire_zone/Actor/Chara.h b/src/servers/sapphire_zone/Actor/Chara.h
index 116288f5..d24c96e2 100644
--- a/src/servers/sapphire_zone/Actor/Chara.h
+++ b/src/servers/sapphire_zone/Actor/Chara.h
@@ -49,6 +49,16 @@ public:
       SMachine = 0x08
    };
 
+   /*! ModelType as found in eventsystemdefine.exd */
+   enum ModelType : uint8_t
+   {
+      Human = 1,
+      DemiHuman = 2,
+      Monster = 3,
+      SharedGroup = 4,
+      Parts = 5
+   };
+
    struct ActorStats
    {
       uint32_t max_mp = 0;
@@ -132,6 +142,8 @@ protected:
    Action::ActionPtr    m_pCurrentAction;
    /*! Invincibility type */
    Common::InvincibilityType m_invincibilityType;
+   /*! Type of model to use, humanoid for actors that use look data */
+   ModelType m_modelType;
 
    /*! Status effects */
    const uint8_t MAX_STATUS_EFFECTS = 30;
@@ -139,9 +151,6 @@ protected:
    std::vector< std::pair< uint8_t, uint32_t> > m_statusEffectList;
    std::map< uint8_t, StatusEffect::StatusEffectPtr > m_statusEffectMap;
 
-   std::set< CharaPtr > m_inRangeCharas;
-   std::set< PlayerPtr > m_inRangePlayers;
-
 public:
    Chara( ObjKind type );
 
@@ -182,8 +191,6 @@ public:
 
    std::string getName() const;
 
-   std::set< CharaPtr > getInRangeCharas( bool includeSelf = false );
-
    bool face( const Common::FFXIVARR_POSITION3& p );
 
    Stance getStance() const;
@@ -201,6 +208,8 @@ public:
 
    Common::ClassJob getClass() const;
 
+   ModelType getModelType() const;
+
    uint8_t getClassAsInt() const;
 
    void setClass( Common::ClassJob classJob );
@@ -233,8 +242,6 @@ public:
 
    virtual void autoAttack( CharaPtr pTarget );
 
-   virtual void onRemoveInRangeChara( Chara& pActor ) {}
-
    virtual void onDeath() {};
    virtual void onDamageTaken( Chara& pSource ) {};
    virtual void onActionHostile( Chara& source ) {};
@@ -253,29 +260,6 @@ public:
 
    void setCurrentAction( Action::ActionPtr pAction );
 
-   ///// IN RANGE LOGIC /////
-
-   // check if another actor is in the actors in range set
-   bool isInRangeSet( CharaPtr pChara ) const;
-
-   CharaPtr getClosestChara();
-
-   void sendToInRangeSet( Network::Packets::GamePacketPtr pPacket, bool bToSelf = false );
-
-   // add an actor to in range set
-   void addInRangeChara( CharaPtr pChara );
-
-   // remove an actor from the in range set
-   void removeInRangeChara( Chara& chara );
-
-   // return true if there is at least one actor in the in range set
-   bool hasInRangeActor() const;
-
-   void removeFromInRange();
-
-   // clear the whole in range set, this does no cleanup
-   virtual void clearInRangeSet();
-
    ZonePtr getCurrentZone() const;
 
    void setCurrentZone( ZonePtr currZone );
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 941ba949..46cb3280 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -80,6 +80,7 @@ Core::Entity::Player::Player() :
    m_queuedZoneing = nullptr;
    m_status = ActorStatus::Idle;
    m_invincibilityType = InvincibilityType::InvincibilityNone;
+   m_modelType = ModelType::Human;
 
    memset( m_questTracking, 0, sizeof( m_questTracking ) );
    memset( m_name, 0, sizeof( m_name ) );
@@ -819,10 +820,10 @@ void Core::Entity::Player::despawn( Entity::PlayerPtr pTarget )
    pPlayer->queuePacket( ActorControlPacket143( getId(), DespawnZoneScreenMsg, 0x04, getId(), 0x01 ) );
 }
 
-Core::Entity::CharaPtr Core::Entity::Player::lookupTargetById( uint64_t targetId )
+Core::Entity::ActorPtr Core::Entity::Player::lookupTargetById( uint64_t targetId )
 {
-   CharaPtr targetActor;
-   auto inRange = getInRangeCharas(true);
+   ActorPtr targetActor;
+   auto inRange = getInRangeActors(true);
    for( auto actor : inRange )
    {
       if( actor->getId() == targetId )
@@ -995,9 +996,9 @@ void Core::Entity::Player::update( int64_t currTime )
          auto mainWeap = m_pInventory->getItemAt( Inventory::GearSet0, Inventory::EquipSlot::MainHand );
 
          // @TODO i dislike this, iterating over all in range actors when you already know the id of the actor you need...
-         for( auto actor : m_inRangeCharas )
+         for( auto actor : m_inRangeActor )
          {
-            if( actor->getId() == m_targetId && actor->isAlive() && mainWeap )
+            if( actor->getId() == m_targetId && actor->getAsChara()->isAlive() && mainWeap )
             {
                // default autoattack range
                // TODO make this dependant on bnpc size
@@ -1017,7 +1018,7 @@ void Core::Entity::Player::update( int64_t currTime )
                   if( ( currTime - m_lastAttack ) > mainWeap->getDelay() )
                   {
                      m_lastAttack = currTime;
-                     autoAttack( actor );
+                     autoAttack( actor->getAsChara() );
                   }
 
                }
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 07c18827..e1f57e1d 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -519,7 +519,7 @@ public:
 
    bool actionHasCastTime( uint32_t actionId );
 
-   Core::Entity::CharaPtr lookupTargetById( uint64_t targetId );
+   Core::Entity::ActorPtr lookupTargetById( uint64_t targetId );
 
    bool isLogin() const;
    void setIsLogin( bool bIsLogin );
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 63c19006..578b2ad6 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -104,7 +104,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       ", params: " + std::to_string( param1 ) + ", " +
       std::to_string( param2 ) + ", " + std::to_string( param3 ) );
 
-   Core::Entity::CharaPtr targetActor;
+   Core::Entity::ActorPtr targetActor;
 
 
    if( player.getId() == param3 )
@@ -113,7 +113,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    else
    {
-      auto inRange = player.getInRangeCharas();
+      auto inRange = player.getInRangeActors();
       for( auto actor : inRange )
       {
          if( actor->getId() == param3 )
@@ -138,7 +138,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Race, param1 );
       player.sendNotice( "Race for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetPlayer->getInRangeCharas();
+      auto inRange = targetPlayer->getInRangeActors();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -151,7 +151,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Tribe, param1 );
       player.sendNotice( "Tribe for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetPlayer->getInRangeCharas();
+      auto inRange = targetPlayer->getInRangeActors();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -164,7 +164,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       targetPlayer->setLookAt( CharaLook::Gender, param1 );
       player.sendNotice( "Sex for " + targetPlayer->getName() + " was set to " + std::to_string( param1 ) );
       targetPlayer->spawn( targetPlayer );
-      auto inRange = targetActor->getInRangeCharas();
+      auto inRange = targetActor->getInRangeActors();
       for( auto actor : inRange )
       {
          targetPlayer->despawn( actor->getAsPlayer() );
@@ -216,7 +216,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Kill:
    {
-      targetActor->takeDamage( 9999999 );
+      targetActor->getAsChara()->takeDamage( 9999999 );
       player.sendNotice( "Killed " + std::to_string( targetActor->getId() ) );
       break;
    }
@@ -266,10 +266,10 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    }
    case GmCommand::Inv:
    {
-      if( targetActor->getInvincibilityType() == Common::InvincibilityType::InvincibilityRefill )
-         targetActor->setInvincibilityType( Common::InvincibilityType::InvincibilityNone );
+      if( targetActor->getAsChara()->getInvincibilityType() == Common::InvincibilityType::InvincibilityRefill )
+         targetActor->getAsChara()->setInvincibilityType( Common::InvincibilityType::InvincibilityNone );
       else
-         targetActor->setInvincibilityType( Common::InvincibilityType::InvincibilityRefill );
+         targetActor->getAsChara()->setInvincibilityType( Common::InvincibilityType::InvincibilityRefill );
 
       player.sendNotice( "Invincibility for " + targetPlayer->getName() +
          " was switched." );
@@ -439,10 +439,10 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
    case GmCommand::Jump:
    {
 
-      auto inRange = player.getInRangeCharas();
+      auto inRange = player.getInRangeActors();
 
       player.changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
-                             targetActor->getRotation() );
+                             targetActor->getRot() );
 
       player.sendNotice( "Jumping to " + targetPlayer->getName() + " in range." );
       break;
diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
index ac964471..c566556d 100644
--- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
@@ -75,7 +75,7 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
         }
         else
         {
-            Core::Entity::CharaPtr targetActor = player.getAsPlayer();
+            Core::Entity::ActorPtr targetActor = player.getAsPlayer();
             if( targetId != player.getId() )
             {
                 targetActor = player.lookupTargetById( targetId );
@@ -83,11 +83,11 @@ void Core::Network::GameConnection::skillHandler( const Packets::GamePacket& inP
 
             if( !player.actionHasCastTime( action ) )
             {
-                g_scriptMgr.onCastFinish( player, targetActor, action );
+                g_scriptMgr.onCastFinish( player, targetActor->getAsChara(), action );
             }
             else
             {
-                auto pActionCast = Action::make_ActionCast( player.getAsPlayer(), targetActor, action );
+                auto pActionCast = Action::make_ActionCast( player.getAsPlayer(), targetActor->getAsChara(), action );
                 player.setCurrentAction( pActionCast );
                 player.sendDebug( "setCurrentAction()" );
                 player.getCurrentAction()->onStart();
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
index e940e53a..7aa01d61 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -76,7 +76,7 @@ namespace Server {
          //m_data.u23 = 0x04;
          //m_data.u24 = 256;
          m_data.state = static_cast< uint8_t >( player.getStatus() );
-         m_data.type = 1;
+         m_data.modelType = player.getModelType();
          if( target.getId() == player.getId() )
          {
             m_data.spawnIndex = 0x00;
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index e7056c57..f8c7c58f 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -602,27 +602,15 @@ void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
       // Add if range == 0 or distance is withing range.
       if( isInRange && !isInRangeSet )
       {
-         if( pChara->isPlayer() )
-         {
-            auto pOwnPlayer = pChara->getAsPlayer();
-            if( !pOwnPlayer->isLoadingComplete() )
-               continue;
 
-            // spawn the actor for the player
-            pCurAct->spawn( pOwnPlayer );
-         }
+         if( pChara->isPlayer() && !pChara->getAsPlayer()->isLoadingComplete() )
+            continue;
 
-         if( pCurAct->isPlayer() )
-         {
-            auto pPlayer = pCurAct->getAsPlayer();
-            if( !pPlayer->isLoadingComplete() )
-               continue;
+         if( pCurAct->isPlayer() && !pCurAct->getAsPlayer()->isLoadingComplete() )
+            continue;
 
-            pChara->spawn( pPlayer );
-         }
-
-         pChara->addInRangeChara( pCurAct );
-         pCurAct->addInRangeChara( pChara );
+         pChara->addInRangeActor( pCurAct );
+         pCurAct->addInRangeActor( pChara );
 
          // this is a hack to limit actor spawn in one packetset
          if( count++ > 12 )
@@ -630,8 +618,8 @@ void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
       }
       else if( !isInRange && isInRangeSet )
       {
-         pCurAct->removeInRangeChara( *pChara );
-         pChara->removeInRangeChara( *pCurAct );
+         pCurAct->removeInRangeActor( *pChara );
+         pChara->removeInRangeActor( *pCurAct );
       }
    }
 }

From cb9a93db6c8010c2014056a905d10aae13afaa38 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 22 Feb 2018 17:06:30 +0100
Subject: [PATCH 20/69] Added type checks for possibly object kinds

---
 src/servers/sapphire_zone/Actor/Actor.cpp | 55 ++++++++++++++++++++++-
 src/servers/sapphire_zone/Actor/Actor.h   | 11 ++++-
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index fc13ddc8..1fc923b0 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -56,14 +56,57 @@ void Core::Entity::Actor::setRot( float rot )
    m_rot = rot;
 }
 
+bool Core::Entity::Actor::isChara() const
+{
+   return isPlayer() || isBattleNpc() || isEventNpc() || isRetainer() || isCompanion();
+}
+
 bool Core::Entity::Actor::isPlayer() const
 {
    return m_objKind == ObjKind::Player;
 }
 
+bool Core::Entity::Actor::isEventNpc() const
+{
+   return m_objKind == ObjKind::EventNpc;
+}
+
+bool Core::Entity::Actor::isBattleNpc() const
+{
+   return m_objKind == ObjKind::BattleNpc;
+}
+
+bool Core::Entity::Actor::isRetainer() const
+{
+   return m_objKind == ObjKind::Retainer;
+}
+
+bool Core::Entity::Actor::isCompanion() const
+{
+   return m_objKind == ObjKind::Companion;
+}
+
+bool Core::Entity::Actor::isEventObj() const
+{
+   return m_objKind == ObjKind::EventObj;
+}
+
+bool Core::Entity::Actor::isHousingEventObj() const
+{
+   return m_objKind == ObjKind::Housing;
+}
+
+bool Core::Entity::Actor::isAetheryte() const
+{
+   return m_objKind == ObjKind::Aetheryte;
+}
+
+
 /*! \return pointer to this instance as ActorPtr */
 Core::Entity::CharaPtr Core::Entity::Actor::getAsChara()
 {
+   if( !isChara() )
+      return nullptr;
    return boost::dynamic_pointer_cast< Entity::Chara, Entity::Actor >( shared_from_this() );
 }
 
@@ -75,6 +118,14 @@ Core::Entity::PlayerPtr Core::Entity::Actor::getAsPlayer()
    return boost::dynamic_pointer_cast< Entity::Player, Entity::Actor >( shared_from_this() );
 }
 
+/*! \return pointer to this instance as PlayerPtr */
+Core::Entity::EventObjectPtr Core::Entity::Actor::getAsEventObj()
+{
+   if( !isEventObj() )
+      return nullptr;
+   return boost::dynamic_pointer_cast< Entity::EventObject, Entity::Actor >( shared_from_this() );
+}
+
 /*!
 Add a given actor to the fitting in range set according to type
 but also to the global actor map
@@ -155,6 +206,7 @@ bool Core::Entity::Actor::isInRangeSet( ActorPtr pActor ) const
    return !( m_inRangeActor.find( pActor ) == m_inRangeActor.end() );
 }
 
+
 /*! \return ActorPtr of the closest actor in range, if none, nullptr */
 Core::Entity::ActorPtr Core::Entity::Actor::getClosestActor()
 {
@@ -186,7 +238,6 @@ Core::Entity::ActorPtr Core::Entity::Actor::getClosestActor()
    return tmpActor;
 }
 
-
 /*! Clear the whole in range set, this does no cleanup */
 void Core::Entity::Actor::clearInRangeSet()
 {
@@ -236,4 +287,4 @@ std::set< Core::Entity::ActorPtr > Core::Entity::Actor::getInRangeActors( bool i
       tempInRange.insert( shared_from_this() );
 
    return tempInRange;
-}
\ No newline at end of file
+}
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 555a9fc9..1b4c1ee3 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -31,7 +31,7 @@ namespace Entity {
          GatheringPoint = 0x06,
          EventObj = 0x07,
          Mount = 0x08,
-         Companion = 0x09,
+         Companion = 0x09, // this probably actually means minion
          Retainer = 0x0A,
          Area = 0x0B,
          Housing = 0x0C,
@@ -71,7 +71,15 @@ namespace Entity {
       float getRot() const;
       void setRot( float rot );
 
+      bool isChara() const;
       bool isPlayer() const;
+      bool isEventNpc() const;
+      bool isBattleNpc() const;
+      bool isRetainer() const;
+      bool isCompanion() const;
+      bool isEventObj() const;
+      bool isHousingEventObj() const;
+      bool isAetheryte() const;
 
       ///// IN RANGE LOGIC ///////////////////////////////
       virtual void onRemoveInRangeActor( Actor& pActor ) {}
@@ -103,6 +111,7 @@ namespace Entity {
 
       CharaPtr getAsChara();
       PlayerPtr getAsPlayer();
+      EventObjectPtr getAsEventObj();
    };
 
 }

From 692ca9d56e1693b80e71546e5596f75cef00552e Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 22 Feb 2018 18:12:36 +0100
Subject: [PATCH 21/69] More stuff moved over to actor baseclass

---
 .../sapphire_zone/Action/ActionMount.cpp      |  2 +-
 .../sapphire_zone/Action/ActionTeleport.cpp   |  2 +-
 .../sapphire_zone/Action/EventItemAction.cpp  |  2 +-
 src/servers/sapphire_zone/Actor/Actor.cpp     | 41 ++++++++++-
 src/servers/sapphire_zone/Actor/Actor.h       | 16 +++++
 src/servers/sapphire_zone/Actor/Chara.cpp     | 69 ++-----------------
 src/servers/sapphire_zone/Actor/Chara.h       | 23 -------
 .../sapphire_zone/Actor/EventObject.cpp       |  6 +-
 src/servers/sapphire_zone/Actor/EventObject.h |  4 +-
 src/servers/sapphire_zone/Actor/Player.cpp    | 16 ++---
 src/servers/sapphire_zone/Actor/PlayerSql.cpp |  8 +--
 .../DebugCommand/DebugCommandHandler.cpp      | 18 ++---
 .../Network/Handlers/GMCommandHandlers.cpp    | 10 ++-
 .../Network/Handlers/PacketHandlers.cpp       | 10 +--
 .../Network/PacketWrappers/MoveActorPacket.h  |  2 +-
 .../PacketWrappers/PlayerSpawnPacket.h        |  2 +-
 src/servers/sapphire_zone/Zone/CellHandler.h  |  6 +-
 src/servers/sapphire_zone/Zone/Zone.cpp       | 32 +++++----
 src/servers/sapphire_zone/Zone/Zone.h         |  2 +-
 19 files changed, 120 insertions(+), 151 deletions(-)

diff --git a/src/servers/sapphire_zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp
index 53d72eca..3fd67f0d 100644
--- a/src/servers/sapphire_zone/Action/ActionMount.cpp
+++ b/src/servers/sapphire_zone/Action/ActionMount.cpp
@@ -78,7 +78,7 @@ void Core::Action::ActionMount::onFinish()
    effectPacket.data().unknown_62 = 13; 
    effectPacket.data().actionTextId = 4;
    effectPacket.data().numEffects = 1;
-   effectPacket.data().rotation = Math::Util::floatToUInt16Rot( pPlayer->getRotation() );
+   effectPacket.data().rotation = Math::Util::floatToUInt16Rot( pPlayer->getRot() );
    effectPacket.data().effectTarget = INVALID_GAME_OBJECT_ID;
    effectPacket.data().effects[0].effectType = ActionEffectType::Mount;
    effectPacket.data().effects[0].hitSeverity = ActionHitSeverityType::CritDamage;
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.cpp b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
index 18c41dee..55a6fc5a 100644
--- a/src/servers/sapphire_zone/Action/ActionTeleport.cpp
+++ b/src/servers/sapphire_zone/Action/ActionTeleport.cpp
@@ -88,7 +88,7 @@ void Core::Action::ActionTeleport::onFinish()
    effectPacket.data().actionTextId = 5;
    effectPacket.data().unknown_5 = 1;
    effectPacket.data().numEffects = 1;
-   effectPacket.data().rotation = static_cast< uint16_t >( 0x8000 * ( ( pPlayer->getRotation() + 3.1415926 ) ) / 3.1415926 );
+   effectPacket.data().rotation = static_cast< uint16_t >( 0x8000 * ( ( pPlayer->getRot() + 3.1415926 ) ) / 3.1415926 );
    effectPacket.data().effectTarget = pPlayer->getId();
    pPlayer->sendToInRangeSet( effectPacket, true );
 
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.cpp b/src/servers/sapphire_zone/Action/EventItemAction.cpp
index 742a40ae..cf1d242b 100644
--- a/src/servers/sapphire_zone/Action/EventItemAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventItemAction.cpp
@@ -73,7 +73,7 @@ void Core::Action::EventItemAction::onFinish()
       effectPacket.data().actionTextId = m_id;
       effectPacket.data().unknown_5 = 2;
       effectPacket.data().numEffects = 1;
-      effectPacket.data().rotation = Math::Util::floatToUInt16Rot( m_pSource->getRotation() );
+      effectPacket.data().rotation = Math::Util::floatToUInt16Rot( m_pSource->getRot() );
       effectPacket.data().effectTarget = static_cast< uint32_t >( m_additional );
 
       m_pSource->getAsPlayer()->unsetStateFlag( Common::PlayerStateFlag::Casting );
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 1fc923b0..acefabbc 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -5,11 +5,16 @@
 #include <common/Util/Util.h>
 #include <common/Util/UtilMath.h>
 
-#include "Chara.h"
+
 #include "Network/GameConnection.h"
+
+#include "Chara.h"
+#include "EventObject.h"
 #include "Player.h"
+
 #include "ServerZone.h"
 #include "Session.h"
+#include "Zone/Zone.h"
 
 extern Core::ServerZone g_serverZone;
 
@@ -39,11 +44,13 @@ void Core::Entity::Actor::setPos( float x, float y, float z )
    m_pos.x = x;
    m_pos.y = y;
    m_pos.z = z;
+   m_pCurrentZone->updateActorPosition( *this );
 }
 
 void Core::Entity::Actor::setPos( const Core::Common::FFXIVARR_POSITION3& pos )
 {
    m_pos = pos;
+   m_pCurrentZone->updateActorPosition( *this );
 }
 
 float Core::Entity::Actor::getRot() const
@@ -288,3 +295,35 @@ std::set< Core::Entity::ActorPtr > Core::Entity::Actor::getInRangeActors( bool i
 
    return tempInRange;
 }
+
+/*! \return ZonePtr to the current zone, nullptr if not set */
+Core::ZonePtr Core::Entity::Actor::getCurrentZone() const
+{
+   return m_pCurrentZone;
+}
+
+/*! \param ZonePtr to the zone to be set as current */
+void Core::Entity::Actor::setCurrentZone( ZonePtr currZone )
+{
+   m_pCurrentZone = currZone;
+}
+
+/*!
+Get the current cell of a region the actor is in
+
+\return Cell*
+*/
+Core::Cell * Core::Entity::Actor::getCellPtr()
+{
+   return m_pCell;
+}
+
+/*!
+Set the current cell the actor is in
+
+\param Cell* for the cell to be set
+*/
+void Core::Entity::Actor::setCell( Cell * pCell )
+{
+   m_pCell = pCell;
+}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 1b4c1ee3..647af43e 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -48,11 +48,18 @@ namespace Entity {
       uint32_t             m_id;
       /*! Type of the actor */
       ObjKind              m_objKind;
+      /*! Id of the zone the actor currently is in */
+      uint32_t	            m_zoneId;
+      /*! Ptr to the ZoneObj the actor belongs to */
+      ZonePtr              m_pCurrentZone;
 
       /*! list of various actors in range */
       std::set< ActorPtr > m_inRangeActor;
       std::set< PlayerPtr > m_inRangePlayers;
 
+      /*! Parent cell in the zone */
+      Core::Cell* m_pCell;
+
    public:
       explicit Actor( ObjKind type );
       virtual ~Actor() {};
@@ -112,6 +119,15 @@ namespace Entity {
       CharaPtr getAsChara();
       PlayerPtr getAsPlayer();
       EventObjectPtr getAsEventObj();
+
+      ZonePtr getCurrentZone() const;
+      void setCurrentZone( ZonePtr currZone );
+
+      // get the current cell of a region the actor is in
+      Cell* getCellPtr();
+      // set the current cell
+      void setCell( Cell* pCell );
+
    };
 
 }
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index 588ef935..eb6e0896 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -229,36 +229,17 @@ position
 */
 bool Core::Entity::Chara::face( const Common::FFXIVARR_POSITION3& p )
 {
-   float oldRot = getRotation();
+   float oldRot = getRot();
    float rot = Math::Util::calcAngFrom( getPos().x, getPos().z, p.x, p.z );
    float newRot = PI - rot + ( PI / 2 );
 
    m_pCell = nullptr;
 
-   setRotation( newRot );
+   setRot( newRot );
 
    return oldRot != newRot ? true : false;
 }
 
-/*!
-Sets the actors position and notifies the zone to propagate the change
-
-\param Position to set
-*/
-void Core::Entity::Chara::setPosition( const Common::FFXIVARR_POSITION3& pos )
-{
-   m_pos = pos;
-   m_pCurrentZone->updateActorPosition( *this );
-}
-
-void Core::Entity::Chara::setPosition( float x, float y, float z )
-{
-   m_pos.x = x;
-   m_pos.y = y;
-   m_pos.z = z;
-   m_pCurrentZone->updateActorPosition( *this );
-}
-
 /*!
 Set and propagate the actor stance to in range players
 ( not the actor himself )
@@ -386,38 +367,6 @@ void Core::Entity::Chara::setCurrentAction( Core::Action::ActionPtr pAction )
    m_pCurrentAction = pAction;
 }
 
-/*! \return ZonePtr to the current zone, nullptr if not set */
-Core::ZonePtr Core::Entity::Chara::getCurrentZone() const
-{
-   return m_pCurrentZone;
-}
-
-/*! \param ZonePtr to the zone to be set as current */
-void Core::Entity::Chara::setCurrentZone( ZonePtr currZone )
-{
-   m_pCurrentZone = currZone;
-}
-
-/*!
-Get the current cell of a region the actor is in
-
-\return Cell*
-*/
-Core::Cell * Core::Entity::Chara::getCell() const
-{
-   return m_pCell;
-}
-
-/*!
-Set the current cell the actor is in
-
-\param Cell* for the cell to be set
-*/
-void Core::Entity::Chara::setCell( Cell * pCell )
-{
-   m_pCell = pCell;
-}
-
 /*!
 Autoattack prototype implementation
 TODO: move the check if the autoAttack can be performed to the callee
@@ -448,7 +397,7 @@ void Core::Entity::Chara::autoAttack( CharaPtr pTarget )
 //      effectPacket.data().unknown_3 = 1;
       effectPacket.data().actionTextId = 0x366;
       effectPacket.data().numEffects = 1;
-      effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
+      effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRot() );
       effectPacket.data().effectTarget = pTarget->getId();
       effectPacket.data().effects[0].value = damage;
       effectPacket.data().effects[0].effectType = ActionEffectType::Damage;
@@ -492,7 +441,7 @@ void Core::Entity::Chara::handleScriptSkill( uint32_t type, uint16_t actionId, u
    effectPacket.data().unknown_2 = 1;  // This seems to have an effect on the "double-cast finish" animation
    effectPacket.data().actionTextId = actionId;
    effectPacket.data().numEffects = 1;
-   effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRotation() );
+   effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRot() );
    effectPacket.data().effectTarget = target.getId();
 
    // Todo: for each actor, calculate how much damage the calculated value should deal to them - 2-step damage calc. we only have 1-step
@@ -655,16 +604,6 @@ void Core::Entity::Chara::addStatusEffectByIdIfNotExist( uint32_t id, int32_t du
 
 }
 
-float Core::Entity::Chara::getRotation() const
-{
-   return m_rot;
-}
-
-void Core::Entity::Chara::setRotation( float rot )
-{
-   m_rot = rot;
-}
-
 int8_t Core::Entity::Chara::getStatusEffectFreeSlot()
 {
    int8_t freeEffectSlot = -1;
diff --git a/src/servers/sapphire_zone/Actor/Chara.h b/src/servers/sapphire_zone/Actor/Chara.h
index d24c96e2..dd5bb340 100644
--- a/src/servers/sapphire_zone/Actor/Chara.h
+++ b/src/servers/sapphire_zone/Actor/Chara.h
@@ -106,10 +106,6 @@ public:
 
 protected:
    char                 m_name[34];
-   /*! Id of the zone the actor currently is in */
-   uint32_t	            m_zoneId;
-   /*! Ptr to the ZoneObj the actor belongs to */
-   ZonePtr              m_pCurrentZone;
    /*! Last tick time for the actor  ( in ms ) */
    uint64_t             m_lastTickTime;
    /*! Last time the actor performed an autoAttack ( in ms ) */
@@ -182,13 +178,6 @@ public:
    void removeSingleStatusEffectFromId( uint32_t id );
    /// End Status Effect Functions
 
-   void setPosition( const Common::FFXIVARR_POSITION3& pos );
-   void setPosition( float x, float y, float z );
-
-   void setRotation( float rot );
-
-   float getRotation() const;
-
    std::string getName() const;
 
    bool face( const Common::FFXIVARR_POSITION3& p );
@@ -260,18 +249,6 @@ public:
 
    void setCurrentAction( Action::ActionPtr pAction );
 
-   ZonePtr getCurrentZone() const;
-
-   void setCurrentZone( ZonePtr currZone );
-
-   // get the current cell of a region the actor is in
-   Cell* getCell() const;
-
-   // set the current cell
-   void setCell( Cell* pCell );
-
-   Core::Cell* m_pCell;
-
 };
 
 }
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 9dc54b5b..6f361889 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -15,14 +15,14 @@ Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId, C
 
 }
 
-uint32_t Core::Entity::EventObject::getHierachyId() const
+uint32_t Core::Entity::EventObject::getMapLinkId() const
 {
    return m_mapLinkId;
 }
 
-void Core::Entity::EventObject::setHierachyId( uint32_t hierachyId )
+void Core::Entity::EventObject::setMapLinkId( uint32_t mapLinkId )
 {
-   m_mapLinkId = hierachyId;
+   m_mapLinkId = mapLinkId;
 }
 
 uint8_t Core::Entity::EventObject::getState() const
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 4a0c8180..49df8e18 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -13,8 +13,8 @@ namespace Entity
       EventObject( uint32_t objectId, uint32_t mapLinkId );
       EventObject( uint32_t objectId, uint32_t mapLinkId, Common::FFXIVARR_POSITION3 pos );
 
-      uint32_t getHierachyId() const;
-      void setHierachyId( uint32_t hierachyId );
+      uint32_t getMapLinkId() const;
+      void setMapLinkId( uint32_t mapLinkId );
 
       uint8_t getState() const;
       void setState( uint8_t state );
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 46cb3280..44d990e7 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -973,7 +973,7 @@ void Core::Entity::Player::update( int64_t currTime )
          setActorPosPacket.data().y = targetPos.y;
          setActorPosPacket.data().z = targetPos.z;
          sendToInRangeSet( setActorPosPacket, true );
-         setPosition( targetPos );
+         setPos( targetPos );
       }
       m_queuedZoneing.reset();
       return;
@@ -1190,7 +1190,7 @@ void Core::Entity::Player::performZoning( uint16_t zoneId, const Common::FFXIVAR
    m_pos = pos;
    m_zoneId = zoneId;
    m_bMarkedForZoning = true;
-   setRotation( rotation );
+   setRot( rotation );
    setZone( zoneId );
 }
 
@@ -1375,11 +1375,9 @@ void Core::Entity::Player::autoAttack( CharaPtr pTarget )
    uint32_t damage = static_cast< uint32_t >( mainWeap->getAutoAttackDmg() );
    uint32_t variation = 0 + rand() % 3;
 
-   if( getClass() == ClassJob::Machinist ||
-       getClass() == ClassJob::Bard ||
-       getClass() == ClassJob::Archer )
+   if( getClass() == ClassJob::Machinist || getClass() == ClassJob::Bard || getClass() == ClassJob::Archer )
    {
-      ZoneChannelPacket< FFXIVIpcEffect > effectPacket(getId());
+      ZoneChannelPacket< FFXIVIpcEffect > effectPacket( getId() );
       effectPacket.data().targetId = pTarget->getId();
       effectPacket.data().actionAnimationId = 8;
      // effectPacket.data().unknown_2 = variation;
@@ -1387,7 +1385,7 @@ void Core::Entity::Player::autoAttack( CharaPtr pTarget )
       effectPacket.data().unknown_61 = 1;
       effectPacket.data().unknown_62 = 1;
       effectPacket.data().actionTextId = 8;
-      effectPacket.data().rotation = Math::Util::floatToUInt16Rot(getRotation());
+      effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRot() );
       effectPacket.data().effectTargetId = pTarget->getId();
       effectPacket.data().effectTarget = pTarget->getId();
       effectPacket.data().effects[0].value = damage;
@@ -1400,7 +1398,7 @@ void Core::Entity::Player::autoAttack( CharaPtr pTarget )
    else
    {
 
-      ZoneChannelPacket< FFXIVIpcEffect > effectPacket(getId());
+      ZoneChannelPacket< FFXIVIpcEffect > effectPacket( getId() );
       effectPacket.data().targetId = pTarget->getId();
       effectPacket.data().actionAnimationId = 7;
       // effectPacket.data().unknown_2 = variation;
@@ -1408,7 +1406,7 @@ void Core::Entity::Player::autoAttack( CharaPtr pTarget )
       effectPacket.data().unknown_61 = 1;
       effectPacket.data().unknown_62 = 1;
       effectPacket.data().actionTextId = 7;
-      effectPacket.data().rotation = Math::Util::floatToUInt16Rot(getRotation());
+      effectPacket.data().rotation = Math::Util::floatToUInt16Rot( getRot() );
       effectPacket.data().effectTarget = pTarget->getId();
       effectPacket.data().effects[0].value = damage;
       effectPacket.data().effects[0].effectType = Common::ActionEffectType::Damage;
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index b1522720..ab127e0f 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -64,7 +64,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
    m_pos.x = res->getFloat( "PosX" );
    m_pos.y = res->getFloat( "PosY" );
    m_pos.z = res->getFloat( "PosZ" );
-   setRotation( res->getFloat( "PosR" ) );
+   setRot( res->getFloat( "PosR" ) );
 
    m_prevPos.x = res->getFloat( "OPosX" );
    m_prevPos.y = res->getFloat( "OPosY" );
@@ -85,7 +85,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
          m_pos.x = m_prevPos.x;
          m_pos.y = m_prevPos.y;
          m_pos.z = m_prevPos.z;
-         setRotation( m_prevRot );
+         setRot( m_prevRot );
          pCurrZone = g_territoryMgr.getZoneByTerriId( zoneId );
       }
    }
@@ -110,7 +110,7 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
       m_pos.x = 0.0f;
       m_pos.y = 0.0f;
       m_pos.z = 0.0f;
-      setRotation( 0.0f );
+      setRot( 0.0f );
    }
 
    // Stats
@@ -369,7 +369,7 @@ void Core::Entity::Player::updateSql()
    stmt->setDouble( 20, m_pos.x );
    stmt->setDouble( 21, m_pos.y );
    stmt->setDouble( 22, m_pos.z );
-   stmt->setDouble( 23, getRotation() );
+   stmt->setDouble( 23, getRot() );
 
    stmt->setInt( 24, m_prevZoneType ); // OTerritoryType
    stmt->setInt( 25, m_prevZoneId ); // OTerritoryId
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 736e87c5..14a938c7 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -174,13 +174,13 @@ void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost:
       }
 
       if( subCommand == "pos" )
-         player.setPosition( static_cast< float >( posX ),
-                             static_cast< float >( posY ),
-                             static_cast< float >( posZ ) );
+         player.setPos( static_cast< float >( posX ),
+                        static_cast< float >( posY ),
+                        static_cast< float >( posZ ) );
       else
-         player.setPosition( player.getPos().x + static_cast< float >( posX ),
-                             player.getPos().y + static_cast< float >( posY ),
-                             player.getPos().z + static_cast< float >( posZ ) );
+         player.setPos( player.getPos().x + static_cast< float >( posX ),
+                        player.getPos().y + static_cast< float >( posY ),
+                        player.getPos().z + static_cast< float >( posZ ) );
 
       Network::Packets::ZoneChannelPacket< Network::Packets::Server::FFXIVIpcActorSetPos >
          setActorPosPacket( player.getId() );
@@ -444,7 +444,7 @@ void Core::DebugCommandHandler::get( char * data, Entity::Player& player, boost:
                          std::to_string( player.getPos().x ) + "\n" +
                          std::to_string( player.getPos().y ) + "\n" +
                          std::to_string( player.getPos().z ) + "\n" +
-                         std::to_string( player.getRotation() ) + "\nMapId: " +
+                         std::to_string( player.getRot() ) + "\nMapId: " +
                          std::to_string( map_id ) + "\nZoneID: " +
                          std::to_string(player.getCurrentZone()->getTerritoryId() ) + "\n" );
    }
@@ -549,7 +549,7 @@ void Core::DebugCommandHandler::nudge( char * data, Entity::Player& player, boos
    }
    else
    {
-      float angle = player.getRotation() + ( PI / 2 );
+      float angle = player.getRot() + ( PI / 2 );
       pos.x -= offset * cos( angle );
       pos.z += offset * sin( angle );
       player.sendNotice( "nudge: Placing forward " + std::to_string( offset ) + " yalms" );
@@ -561,7 +561,7 @@ void Core::DebugCommandHandler::nudge( char * data, Entity::Player& player, boos
       setActorPosPacket.data().x = player.getPos().x;
       setActorPosPacket.data().y = player.getPos().y;
       setActorPosPacket.data().z = player.getPos().z;
-      setActorPosPacket.data().r16 = Math::Util::floatToUInt16Rot( player.getRotation() );
+      setActorPosPacket.data().r16 = Math::Util::floatToUInt16Rot( player.getRot() );
       player.queuePacket( setActorPosPacket );
    }
 }
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 578b2ad6..9fa34628 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -190,8 +190,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
       if( targetPlayer->getZoneId() != player.getZoneId() )
          targetPlayer->setZone( player.getZoneId() );
 
-      targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z,
-         player.getRotation() );
+      targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, player.getRot() );
       player.sendNotice( "Calling " + targetPlayer->getName() );
       break;
    }
@@ -419,7 +418,7 @@ void Core::Network::GameConnection::gm1Handler( const Packets::GamePacket& inPac
             player.sendUrgent( "No zone instance found for " + std::to_string( param1 ) );
             break;
          }
-         targetPlayer->setPosition( targetPlayer->getPos() );
+         targetPlayer->setPos( targetPlayer->getPos() );
          targetPlayer->performZoning( param1, targetPlayer->getPos(), 0 );
          player.sendNotice( targetPlayer->getName() + " was warped to zone " + std::to_string( param1 ) + " (" + pZone->getName() + ")" );
       }
@@ -511,7 +510,7 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
          player.setZone( targetPlayer->getZoneId() );
       }
       player.changePosition( targetActor->getPos().x, targetActor->getPos().y, targetActor->getPos().z,
-         targetActor->getRotation() );
+         targetActor->getRot() );
       player.sendNotice( "Jumping to " + targetPlayer->getName() );
       break;
    }
@@ -520,8 +519,7 @@ void Core::Network::GameConnection::gm2Handler( const Packets::GamePacket& inPac
       if( targetPlayer->getZoneId() != player.getZoneId() )
          targetPlayer->setZone( player.getZoneId() );
 
-      targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z,
-         player.getRotation() );
+      targetPlayer->changePosition( player.getPos().x, player.getPos().y, player.getPos().z, player.getRot() );
       player.sendNotice( "Calling " + targetPlayer->getName() );
       break;
    }
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index c6232a22..50f38dd4 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -178,13 +178,13 @@ void Core::Network::GameConnection::updatePositionHandler( const Packets::GamePa
        ( player.getPos().y != inPacket.getValAt< float >( 0x30 ) ) ||
        ( player.getPos().z != inPacket.getValAt< float >( 0x34 ) ) )
       bPosChanged = true;
-   if( !bPosChanged  && player.getRotation() == inPacket.getValAt< float >( 0x20 ) )
+   if( !bPosChanged  && player.getRot() == inPacket.getValAt< float >( 0x20 ) )
       return;
 
-   player.setRotation( inPacket.getValAt< float >( 0x20 ) );
-   player.setPosition( inPacket.getValAt< float >( 0x2c ),
-                       inPacket.getValAt< float >( 0x30 ),
-                       inPacket.getValAt< float >( 0x34 ) );
+   player.setRot( inPacket.getValAt< float >( 0x20 ) );
+   player.setPos( inPacket.getValAt< float >( 0x2c ),
+                  inPacket.getValAt< float >( 0x30 ),
+                  inPacket.getValAt< float >( 0x34 ) );
 
    if( ( player.getCurrentAction() != nullptr ) && bPosChanged )
       player.getCurrentAction()->setInterrupted();
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
index ee671e85..2ffa31d2 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/MoveActorPacket.h
@@ -31,7 +31,7 @@ private:
    void initialize( Entity::Chara& actor, uint8_t unk1, uint8_t unk2, uint8_t unk3, uint16_t unk4 )
    {
       
-      m_data.rotation = Math::Util::floatToUInt8Rot( actor.getRotation() );
+      m_data.rotation = Math::Util::floatToUInt8Rot( actor.getRot() );
       m_data.unknown_1 = unk1;
       m_data.unknown_2 = unk2;
       m_data.unknown_3 = unk3;
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
index 7aa01d61..c56f9ccf 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -64,7 +64,7 @@ namespace Server {
          m_data.pos.x = player.getPos().x;
          m_data.pos.y = player.getPos().y;
          m_data.pos.z = player.getPos().z;
-         m_data.rotation = Math::Util::floatToUInt16Rot( player.getRotation() );
+         m_data.rotation = Math::Util::floatToUInt16Rot( player.getRot() );
          
 
          m_data.title = player.getTitle();
diff --git a/src/servers/sapphire_zone/Zone/CellHandler.h b/src/servers/sapphire_zone/Zone/CellHandler.h
index 253f4823..8c2ff8ff 100644
--- a/src/servers/sapphire_zone/Zone/CellHandler.h
+++ b/src/servers/sapphire_zone/Zone/CellHandler.h
@@ -26,7 +26,7 @@ public:
    CellHandler();
    ~CellHandler();
 
-   T* getCell( uint32_t x, uint32_t y );
+   T* getCellPtr( uint32_t x, uint32_t y );
    T* getCellByCoords( float x, float y );
    T* create( uint32_t x, uint32_t y );
    T* createByCoords( float x, float y );
@@ -144,7 +144,7 @@ void CellHandler<T>::remove( uint32_t x, uint32_t y )
 }
 
 template <class T>
-T* CellHandler<T>::getCell( uint32_t x, uint32_t y )
+T* CellHandler<T>::getCellPtr( uint32_t x, uint32_t y )
 {
    if( !m_pCells[x] )
    {
@@ -157,7 +157,7 @@ T* CellHandler<T>::getCell( uint32_t x, uint32_t y )
 template <class T>
 T* CellHandler<T>::getCellByCoords( float x, float y )
 {
-   return getCell( getPosX( x ), getPosY( y ) );
+   return getCellPtr(getPosX(x), getPosY(y));
 }
 
 template <class T>
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index f8c7c58f..a1442fee 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -175,7 +175,7 @@ void Core::Zone::pushActor( Entity::CharaPtr pChara )
    uint32_t cx = getPosX( mx );
    uint32_t cy = getPosY( my );
 
-   Cell* pCell = getCell( cx, cy );
+   Cell* pCell = getCellPtr(cx, cy);
    if( !pCell )
    {
       pCell = create( cx, cy );
@@ -199,7 +199,7 @@ void Core::Zone::pushActor( Entity::CharaPtr pChara )
    {
       for( posY = startY; posY <= endY; ++posY )
       {
-         pCell = getCell( posX, posY );
+         pCell = getCellPtr(posX, posY);
          if( pCell )
             updateInRangeSet( pChara, pCell );
       }
@@ -220,10 +220,11 @@ void Core::Zone::pushActor( Entity::CharaPtr pChara )
 void Core::Zone::removeActor( Entity::CharaPtr pChara )
 {
 
-   if( pChara->m_pCell )
+   auto pCell = pChara->getCellPtr();
+   if( pCell )
    {
-      pChara->m_pCell->removeChara(pChara);
-      pChara->m_pCell = nullptr;
+      pCell->removeChara(pChara);
+      pCell = nullptr;
    }
 
    if( pChara->isPlayer() )
@@ -410,7 +411,7 @@ void Core::Zone::updateSessions( bool changedWeather )
       // this session is not linked to this area anymore, remove it from zone session list
       if( ( !pPlayer->getCurrentZone() ) || ( pPlayer->getCurrentZone() != shared_from_this() ) )
       {
-         if( pPlayer->getCell() )
+         if( pPlayer->getCellPtr() )
             removeActor( pSession->getPlayer() );
 
          it = m_sessionSet.erase(it );
@@ -446,7 +447,7 @@ bool Core::Zone::isCellActive( uint32_t x, uint32_t y )
    {
       for( posY = startY; posY <= endY; posY++ )
       {
-         pCell = getCell( posX, posY );
+         pCell = getCellPtr(posX, posY);
 
          if( pCell && ( pCell->hasPlayers() || pCell->isForcedActive() ) )
             return true;
@@ -471,7 +472,7 @@ void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
    {
       for( posY = startY; posY <= endY; posY++ )
       {
-         pCell = getCell( posX, posY );
+         pCell = getCellPtr(posX, posY);
 
          if( !pCell )
          {
@@ -505,7 +506,7 @@ void Core::Zone::updateCellActivity( uint32_t x, uint32_t y, int32_t radius )
    }
 }
 
-void Core::Zone::updateActorPosition( Entity::Chara &actor )
+void Core::Zone::updateActorPosition( Entity::Actor &actor )
 {
 
    if( actor.getCurrentZone() != shared_from_this() )
@@ -519,8 +520,9 @@ void Core::Zone::updateActorPosition( Entity::Chara &actor )
    if( cellX >= _sizeX || cellY >= _sizeY )
       return;
 
-   Cell* pCell = getCell( cellX, cellY );
-   Cell* pOldCell = actor.m_pCell;
+   auto pCell = getCellPtr(cellX, cellY);
+
+   auto pOldCell = actor.getCellPtr();
    if( !pCell )
    {
       pCell = create( cellX, cellY );
@@ -534,8 +536,8 @@ void Core::Zone::updateActorPosition( Entity::Chara &actor )
       if( pOldCell )
          pOldCell->removeChara(actor.getAsChara());
 
-      pCell->addChara(actor.getAsChara());
-      actor.m_pCell = pCell;
+      pCell->addChara( actor.getAsChara() );
+      pOldCell = pCell;
 
       // if player we need to update cell activity
       // radius = 2 is used in order to update both
@@ -564,7 +566,7 @@ void Core::Zone::updateActorPosition( Entity::Chara &actor )
    {
       for( posY = startY; posY <= endY; ++posY )
       {
-         pCell = getCell( posX, posY );
+         pCell = getCellPtr(posX, posY);
          if( pCell )
             updateInRangeSet( actor.getAsChara(), pCell );
       }
@@ -685,7 +687,7 @@ void Core::Zone::updateEObj( Entity::EventObjectPtr object )
       eobjStatePacket.data().objKind = object->getObjKind();
       eobjStatePacket.data().state = object->getState();
       eobjStatePacket.data().objId = object->getId();
-      eobjStatePacket.data().hierachyId = object->getHierachyId();
+      eobjStatePacket.data().hierachyId = object->getMapLinkId();
       eobjStatePacket.data().position = object->getPos();
 
       // ????
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 11a188da..72a5fa9c 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -78,7 +78,7 @@ public:
 
    void removeActor( Entity::CharaPtr pActor );
 
-   void updateActorPosition( Entity::Chara &pActor );
+   void updateActorPosition( Entity::Actor &pActor );
 
    bool isCellActive( uint32_t x, uint32_t y );
 

From 99520f492342c0266e5566820b4e1633a245a5de Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 22 Feb 2018 22:15:32 +0100
Subject: [PATCH 22/69] More transitional work towards actors as base

---
 src/common/Network/PacketDef/Ipcs.h     |  4 +-
 src/servers/sapphire_zone/Zone/Cell.cpp | 24 ++++-----
 src/servers/sapphire_zone/Zone/Cell.h   | 26 ++++-----
 src/servers/sapphire_zone/Zone/Zone.cpp | 72 ++++++++++++-------------
 src/servers/sapphire_zone/Zone/Zone.h   |  6 +--
 5 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index d0d8052e..a7892f9e 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -227,8 +227,8 @@ namespace Packets {
       OutOfRangeEventHandler   = 0x014B, // updated 4.2
       EnterTeriEventHandler    = 0x014C, // updated 4.2
 
-      ReturnEventHandler       = 0x0151, // updated 4.2 ?
-      TradeReturnEventHandler  = 0x0152, // updated 4.2 ?
+      ReturnEventHandler       = 0x0151, // updated 4.2
+      TradeReturnEventHandler  = 0x0152, // updated 4.2
 
 
       LinkshellEventHandler    = 0x0144, // updated 4.1 ??
diff --git a/src/servers/sapphire_zone/Zone/Cell.cpp b/src/servers/sapphire_zone/Zone/Cell.cpp
index b753e6b3..6259da07 100644
--- a/src/servers/sapphire_zone/Zone/Cell.cpp
+++ b/src/servers/sapphire_zone/Zone/Cell.cpp
@@ -18,7 +18,7 @@ Core::Cell::Cell() :
 
 Core::Cell::~Cell()
 {
-   removeCharas();
+   removeActors();
 }
 
 void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone )
@@ -27,23 +27,23 @@ void Core::Cell::init( uint32_t x, uint32_t y, ZonePtr pZone )
    m_posX = x;
    m_posY = y;
 
-   m_charas.clear();
+   m_actors.clear();
 }
 
-void Core::Cell::addChara( Entity::CharaPtr pAct )
+void Core::Cell::addActor( Entity::ActorPtr pAct )
 {
    if( pAct->isPlayer() )
       ++m_playerCount;
 
-   m_charas.insert( pAct );
+   m_actors.insert( pAct );
 }
 
-void Core::Cell::removeChara( Entity::CharaPtr pAct )
+void Core::Cell::removeActor( Entity::ActorPtr pAct )
 {
    if( pAct->isPlayer() )
       --m_playerCount;
 
-   m_charas.erase(pAct);
+   m_actors.erase( pAct );
 }
 
 void Core::Cell::setActivity( bool state )
@@ -51,7 +51,7 @@ void Core::Cell::setActivity( bool state )
    if( !m_bActive && state )
    {
       // Move all objects to active set.
-      //for( auto itr = m_charas.begin(); itr != m_charas.end(); ++itr )
+      //for( auto itr = m_actors.begin(); itr != m_actors.end(); ++itr )
       //{
 
       //}
@@ -63,7 +63,7 @@ void Core::Cell::setActivity( bool state )
    else if( m_bActive && !state )
    {
       // Move all objects from active set.
-      //for(auto itr = m_charas.begin(); itr != m_charas.end(); ++itr)
+      //for(auto itr = m_actors.begin(); itr != m_actors.end(); ++itr)
       //{
 
       //}
@@ -75,15 +75,15 @@ void Core::Cell::setActivity( bool state )
 
 }
 
-void Core::Cell::removeCharas()
+void Core::Cell::removeActors()
 {
    //uint32_t ltime = getMSTime();
 
-   m_charas.clear();
+   m_actors.clear();
 
    //This time it's simpler! We just remove everything
    Entity::ActorPtr pAct; //do this outside the loop!
-   for( auto itr = m_charas.begin(); itr != m_charas.end(); )
+   for( auto itr = m_actors.begin(); itr != m_actors.end(); )
    {
       pAct = (*itr);
       itr++;
@@ -126,7 +126,7 @@ void Core::Cell::unload()
    if( m_bActive )
       return;
 
-   removeCharas();
+   removeActors();
    m_bUnloadPending = false;
 }
 
diff --git a/src/servers/sapphire_zone/Zone/Cell.h b/src/servers/sapphire_zone/Zone/Cell.h
index 3b10a819..fb61ac43 100644
--- a/src/servers/sapphire_zone/Zone/Cell.h
+++ b/src/servers/sapphire_zone/Zone/Cell.h
@@ -9,7 +9,7 @@
 
 namespace Core {
 
-   typedef std::set< Entity::CharaPtr > CharaSet;
+   typedef std::set< Entity::ActorPtr > ActorSet;
 
    class Cell 
    {
@@ -19,7 +19,7 @@ namespace Core {
       bool m_bForcedActive;
       uint16_t m_posX;
       uint16_t m_posY;
-      CharaSet m_charas;
+      ActorSet m_actors;
       bool m_bActive;
       bool m_bLoaded;
       bool m_bUnloadPending;
@@ -33,13 +33,13 @@ namespace Core {
 
       void init( uint32_t x, uint32_t y, ZonePtr pZone );
 
-      void addChara( Entity::CharaPtr pAct );
+      void addActor( Entity::ActorPtr pAct );
 
-      void removeChara( Entity::CharaPtr pAct );
+      void removeActor( Entity::ActorPtr pAct );
 
-      bool hasChara( Entity::CharaPtr pAct )
+      bool hasActor( Entity::ActorPtr pAct )
       { 
-         return (m_charas.find(pAct) != m_charas.end());
+         return ( m_actors.find(pAct) != m_actors.end() );
       }
 
       bool hasPlayers() const
@@ -47,21 +47,21 @@ namespace Core {
          return ((m_playerCount > 0) ? true : false); 
       }
 
-      size_t getCharaCount() const
+      size_t getActorCount() const
       { 
-         return m_charas.size();
+         return m_actors.size();
       }
 
-      void removeCharas();
+      void removeActors();
 
-      CharaSet::iterator begin()
+      ActorSet::iterator begin()
       {
-         return m_charas.begin();
+         return m_actors.begin();
       }
 
-      CharaSet::iterator end()
+      ActorSet::iterator end()
       {
-         return m_charas.end();
+         return m_actors.end();
       }
 
       void setActivity(bool state);
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index a1442fee..7125b32d 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -168,10 +168,10 @@ Weather Core::Zone::getNextWeather()
    return Weather::FairSkies;
 }
 
-void Core::Zone::pushActor( Entity::CharaPtr pChara )
+void Core::Zone::pushActor( Entity::ActorPtr pActor )
 {
-   float mx = pChara->getPos().x;
-   float my = pChara->getPos().z;
+   float mx = pActor->getPos().x;
+   float my = pActor->getPos().z;
    uint32_t cx = getPosX( mx );
    uint32_t cy = getPosY( my );
 
@@ -182,12 +182,12 @@ void Core::Zone::pushActor( Entity::CharaPtr pChara )
       pCell->init( cx, cy, shared_from_this() );
    }
 
-   pCell->addChara(pChara);
+   pCell->addActor( pActor );
 
-   pChara->setCell( pCell );
+   pActor->setCell( pCell );
 
-   uint32_t cellX = getPosX( pChara->getPos().x );
-   uint32_t cellY = getPosY( pChara->getPos().z );
+   uint32_t cellX = getPosX( pActor->getPos().x );
+   uint32_t cellY = getPosY( pActor->getPos().z );
 
    uint32_t endX = cellX <= _sizeX ? cellX + 1 : ( _sizeX - 1 );
    uint32_t endY = cellY <= _sizeY ? cellY + 1 : ( _sizeY - 1 );
@@ -201,13 +201,13 @@ void Core::Zone::pushActor( Entity::CharaPtr pChara )
       {
          pCell = getCellPtr(posX, posY);
          if( pCell )
-            updateInRangeSet( pChara, pCell );
+            updateInRangeSet( pActor, pCell );
       }
    }
 
-   if( pChara->isPlayer() )
+   if( pActor->isPlayer() )
    {
-      auto pPlayer = pChara->getAsPlayer();
+      auto pPlayer = pActor->getAsPlayer();
 
       auto pSession = g_serverZone.getSession( pPlayer->getId() );
       if( pSession )
@@ -217,36 +217,36 @@ void Core::Zone::pushActor( Entity::CharaPtr pChara )
    }
  }
 
-void Core::Zone::removeActor( Entity::CharaPtr pChara )
+void Core::Zone::removeActor( Entity::ActorPtr pActor )
 {
 
-   auto pCell = pChara->getCellPtr();
+   auto pCell = pActor->getCellPtr();
    if( pCell )
    {
-      pCell->removeChara(pChara);
+      pCell->removeActor( pActor );
       pCell = nullptr;
    }
 
-   if( pChara->isPlayer() )
+   if( pActor->isPlayer() )
    {
 
       // If it's a player and he's inside boundaries - update his nearby cells
-      if( pChara->getPos().x <= _maxX && pChara->getPos().x >= _minX &&
-          pChara->getPos().z <= _maxY && pChara->getPos().z >= _minY )
+      if( pActor->getPos().x <= _maxX && pActor->getPos().x >= _minX &&
+              pActor->getPos().z <= _maxY && pActor->getPos().z >= _minY )
       {
-         uint32_t x = getPosX( pChara->getPos().x );
-         uint32_t y = getPosY( pChara->getPos().z );
+         uint32_t x = getPosX( pActor->getPos().x );
+         uint32_t y = getPosY( pActor->getPos().z );
          updateCellActivity( x, y, 3 );
       }
-      m_playerMap.erase( pChara->getId() );
+      m_playerMap.erase( pActor->getId() );
 
-      onLeaveTerritory( *pChara->getAsPlayer() );
+      onLeaveTerritory( *pActor->getAsPlayer() );
 
    }
 
    // remove from lists of other actors
-   pChara->removeFromInRange();
-   pChara->clearInRangeSet();
+   pActor->removeFromInRange();
+   pActor->clearInRangeSet();
 
 }
 
@@ -534,9 +534,9 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor )
    {
 
       if( pOldCell )
-         pOldCell->removeChara(actor.getAsChara());
+         pOldCell->removeActor( actor.shared_from_this() );
 
-      pCell->addChara( actor.getAsChara() );
+      pCell->addActor( actor.shared_from_this() );
       pOldCell = pCell;
 
       // if player we need to update cell activity
@@ -568,13 +568,13 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor )
       {
          pCell = getCellPtr(posX, posY);
          if( pCell )
-            updateInRangeSet( actor.getAsChara(), pCell );
+            updateInRangeSet( actor.shared_from_this(), pCell );
       }
    }
 }
 
 
-void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
+void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
 {
    if( pCell == nullptr )
       return;
@@ -583,36 +583,36 @@ void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
    if( g_territoryMgr.isPrivateTerritory( getTerritoryId() ) )
       return;
 
-   auto iter = pCell->m_charas.begin();
+   auto iter = pCell->m_actors.begin();
 
    float fRange = 70.0f;
    int32_t count = 0;
-   while( iter != pCell->m_charas.end() )
+   while( iter != pCell->m_actors.end() )
    {
       auto pCurAct = *iter;
       ++iter;
 
-      if( !pCurAct || pCurAct == pChara )
+      if( !pCurAct || pCurAct == pActor )
          continue;
 
       float distance = Math::Util::distance( pCurAct->getPos().x, pCurAct->getPos().y, pCurAct->getPos().z,
-                                             pChara->getPos().x, pChara->getPos().y, pChara->getPos().z );
+                                             pActor->getPos().x, pActor->getPos().y, pActor->getPos().z );
 
       bool isInRange = ( fRange == 0.0f || distance <= fRange );
-      bool isInRangeSet = pChara->isInRangeSet( pCurAct );
+      bool isInRangeSet = pActor->isInRangeSet( pCurAct );
 
       // Add if range == 0 or distance is withing range.
       if( isInRange && !isInRangeSet )
       {
 
-         if( pChara->isPlayer() && !pChara->getAsPlayer()->isLoadingComplete() )
+         if( pActor->isPlayer() && !pActor->getAsPlayer()->isLoadingComplete() )
             continue;
 
          if( pCurAct->isPlayer() && !pCurAct->getAsPlayer()->isLoadingComplete() )
             continue;
 
-         pChara->addInRangeActor( pCurAct );
-         pCurAct->addInRangeActor( pChara );
+         pActor->addInRangeActor( pCurAct );
+         pCurAct->addInRangeActor( pActor );
 
          // this is a hack to limit actor spawn in one packetset
          if( count++ > 12 )
@@ -620,8 +620,8 @@ void Core::Zone::updateInRangeSet( Entity::CharaPtr pChara, Cell* pCell )
       }
       else if( !isInRange && isInRangeSet )
       {
-         pCurAct->removeInRangeActor( *pChara );
-         pChara->removeInRangeActor( *pCurAct );
+         pCurAct->removeInRangeActor( *pActor );
+         pActor->removeInRangeActor( *pCurAct );
       }
    }
 }
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 72a5fa9c..8802ff2a 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -74,9 +74,9 @@ public:
 
    Common::Weather getNextWeather();
 
-   void pushActor( Entity::CharaPtr pActor );
+   void pushActor( Entity::ActorPtr pActor );
 
-   void removeActor( Entity::CharaPtr pActor );
+   void removeActor( Entity::ActorPtr pActor );
 
    void updateActorPosition( Entity::Actor &pActor );
 
@@ -84,7 +84,7 @@ public:
 
    void updateCellActivity( uint32_t x, uint32_t y, int32_t radius );
 
-   void updateInRangeSet( Entity::CharaPtr pActor, Cell* pCell );
+   void updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell );
 
    void queueOutPacketForRange( Entity::Player& sourcePlayer, uint32_t range, Network::Packets::GamePacketPtr pPacketEntry );
 

From c53642bf7d81ca26f569ee9616116f6a53891bc5 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 22 Feb 2018 23:13:31 +0100
Subject: [PATCH 23/69] Warrior of light in init ui

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 0b32b0b4..5258a3d2 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -629,7 +629,7 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
    uint8_t namedayDay;
    uint8_t cityState;
    uint8_t homepoint;
-   uint8_t unknown26;
+   uint8_t unknown26; // 2 if "warrior of light"
    uint8_t petHotBar;
    uint8_t companionRank;
    uint8_t companionStars;

From f9722b5e2e5339002b7d68805ec0f1975522e68c Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 23 Feb 2018 23:47:21 +0100
Subject: [PATCH 24/69] EventObjects are not properly spawned and initialized

---
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  2 +-
 src/servers/sapphire_zone/Actor/Actor.cpp     |  7 ++-
 src/servers/sapphire_zone/Actor/Actor.h       |  1 +
 .../sapphire_zone/Actor/EventObject.cpp       | 57 ++++++++++++++++---
 src/servers/sapphire_zone/Actor/EventObject.h |  9 ++-
 src/servers/sapphire_zone/Actor/Player.cpp    | 10 +++-
 src/servers/sapphire_zone/Actor/Player.h      |  5 ++
 .../sapphire_zone/Script/NativeScriptApi.h    |  4 +-
 .../sapphire_zone/Script/ScriptManager.cpp    |  8 +--
 .../sapphire_zone/Script/ScriptManager.h      |  4 +-
 .../Scripts/instances/trials/TheNavel.cpp     | 12 ++--
 .../sapphire_zone/Zone/InstanceContent.cpp    | 33 +++++++++--
 .../sapphire_zone/Zone/InstanceContent.h      |  8 ++-
 .../sapphire_zone/Zone/TerritoryMgr.cpp       |  4 +-
 src/servers/sapphire_zone/Zone/Zone.cpp       | 19 ++++++-
 src/servers/sapphire_zone/Zone/Zone.h         | 10 +++-
 16 files changed, 155 insertions(+), 38 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 5258a3d2..3899a0a5 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1318,8 +1318,8 @@ struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket<ObjectSpawn>
 {
    uint8_t count;
    uint8_t objKind;
-   uint8_t unknown2;
    uint8_t state;
+   uint8_t unknown2;
    uint32_t objId;
    uint32_t actorId;
    uint32_t levelId;
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index acefabbc..f1db8533 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -29,6 +29,11 @@ uint32_t Core::Entity::Actor::getId() const
    return m_id;
 }
 
+void Core::Entity::Actor::setId( uint32_t id )
+{
+   m_id = id;
+}
+
 Core::Entity::Actor::ObjKind Core::Entity::Actor::getObjKind() const
 {
    return m_objKind;
@@ -152,7 +157,7 @@ void Core::Entity::Actor::addInRangeActor( ActorPtr pActor )
    {
       auto pPlayer = pActor->getAsPlayer();
 
-      pPlayer->spawn( getAsPlayer() );
+      spawn( pPlayer );
 
       // if actor is a player, add it to the in range player set
       m_inRangePlayers.insert( pPlayer );
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 647af43e..94502c0d 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -68,6 +68,7 @@ namespace Entity {
       virtual void despawn( PlayerPtr pTarget ) {}
 
       uint32_t getId() const;
+      void setId( uint32_t id );
 
       ObjKind getObjKind() const;
 
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 6f361889..1162e9c1 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -1,18 +1,33 @@
 #include "EventObject.h"
-#include "Zone/InstanceContent.h"
 
-Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId ) :
+#include "Zone/InstanceContent.h"
+#include "Actor/Player.h"
+
+#include <common/Logging/Logger.h>
+#include <common/Network/GamePacket.h>
+#include <common/Network/GamePacketNew.h>
+#include <common/Network/CommonNetwork.h>
+#include <common/Network/PacketDef/Zone/ServerZoneDef.h>
+#include <common/Network/PacketContainer.h>
+
+using namespace Core::Common;
+using namespace Core::Network::Packets;
+using namespace Core::Network::Packets::Server;
+
+extern Core::Logger g_log;
+
+
+Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId,
+                                        uint8_t initialState, Common::FFXIVARR_POSITION3 pos ) :
    Core::Entity::Actor( ObjKind::EventObj ),
    m_mapLinkId( mapLinkId ),
-   m_state( 0 )
+   m_state( initialState ),
+   m_objectId( objectId )
 {
    m_id = objectId;
-}
-
-Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId, Common::FFXIVARR_POSITION3 pos ) :
-   EventObject( objectId, mapLinkId )
-{
-
+   m_pos.x = pos.x;
+   m_pos.y = pos.y;
+   m_pos.z = pos.z;
 }
 
 uint32_t Core::Entity::EventObject::getMapLinkId() const
@@ -20,6 +35,11 @@ uint32_t Core::Entity::EventObject::getMapLinkId() const
    return m_mapLinkId;
 }
 
+uint32_t Core::Entity::EventObject::getObjectId() const
+{
+   return m_objectId;
+}
+
 void Core::Entity::EventObject::setMapLinkId( uint32_t mapLinkId )
 {
    m_mapLinkId = mapLinkId;
@@ -45,4 +65,23 @@ void Core::Entity::EventObject::setParentInstance( Core::InstanceContentPtr inst
 Core::InstanceContentPtr Core::Entity::EventObject::getParentInstance() const
 {
    return m_parentInstance;
+}
+
+void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
+{
+   g_log.debug( "spawn eobj: " + std::to_string( getId() ) );
+   ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( getId(), pTarget->getId() );
+   eobjStatePacket.data().count = pTarget->getNextObjCount();
+   eobjStatePacket.data().objKind = getObjKind();
+   eobjStatePacket.data().state = getState();
+   eobjStatePacket.data().objId = getId();
+   eobjStatePacket.data().hierachyId = getMapLinkId();
+   eobjStatePacket.data().position = getPos();
+   pTarget->queuePacket( eobjStatePacket );
+}
+
+
+void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget )
+{
+   g_log.debug( "despawn eobj: " + std::to_string( getId() ) );
 }
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 49df8e18..1c48b72d 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -10,8 +10,7 @@ namespace Entity
    class EventObject : public Actor
    {
    public:
-      EventObject( uint32_t objectId, uint32_t mapLinkId );
-      EventObject( uint32_t objectId, uint32_t mapLinkId, Common::FFXIVARR_POSITION3 pos );
+      EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos );
 
       uint32_t getMapLinkId() const;
       void setMapLinkId( uint32_t mapLinkId );
@@ -19,11 +18,17 @@ namespace Entity
       uint8_t getState() const;
       void setState( uint8_t state );
 
+      uint32_t getObjectId() const;
+
       InstanceContentPtr getParentInstance() const;
       void setParentInstance( InstanceContentPtr instance );
 
+      void spawn( PlayerPtr pTarget ) override;
+      void despawn( PlayerPtr pTarget ) override;
+
    protected:
       uint32_t m_mapLinkId;
+      uint32_t m_objectId;
       uint8_t m_state;
       InstanceContentPtr m_parentInstance;
    };
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 44d990e7..5b44a401 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -72,7 +72,8 @@ Core::Entity::Player::Player() :
    m_bAutoattack( false ),
    m_markedForRemoval( false ),
    m_mount( 0 ),
-   m_directorInitialized( false )
+   m_directorInitialized( false ),
+   m_objCount( 0 )
 {
    m_id = 0;
    m_currentStance = Stance::Passive;
@@ -1491,6 +1492,8 @@ uint32_t Core::Entity::Player::getTerritoryId() const
 
 void Core::Entity::Player::sendZonePackets()
 {
+   getCurrentZone()->onBeforeEnterTerritory( *this );
+
    ZoneChannelPacket< FFXIVIpcInit > initPacket( getId() );
    initPacket.data().charId = getId();
    queuePacket( initPacket );
@@ -1651,3 +1654,8 @@ void Player::teleportQuery( uint16_t aetheryteId )
       }
    }
 }
+
+uint8_t Player::getNextObjCount()
+{
+   return m_objCount++;
+}
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index e1f57e1d..a5681055 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -559,6 +559,8 @@ public:
    void setMarkedForRemoval();
    bool isMarkedForRemoval() const;
 
+   uint8_t getNextObjCount();
+
 private:
    uint32_t m_lastWrite;
    uint32_t m_lastPing;
@@ -669,6 +671,9 @@ private:
    uint32_t m_cfPenaltyUntil; // unix time
 
    uint8_t m_mount;
+
+   // counter used to index objects spawned for the player
+   uint8_t m_objCount;
 };
 
 }
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index 1d5e5b22..045d734f 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -120,8 +120,8 @@ public:
       ScriptObject( instanceContentId, typeid( InstanceContentScript ).hash_code() )
    { }
 
-   virtual void onInit( InstanceContent& instance ) { }
-   virtual void onUpdate( InstanceContent& instance, uint32_t currTime ) { }
+   virtual void onInit( InstanceContentPtr instance ) { }
+   virtual void onUpdate( InstanceContentPtr instance, uint32_t currTime ) { }
 };
 
 #endif
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 51e50e77..4e96a2a8 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -335,9 +335,9 @@ bool Core::Scripting::ScriptManager::onZoneInit( ZonePtr pZone )
    return false;
 }
 
-bool Core::Scripting::ScriptManager::onInstanceInit( InstanceContent& instance )
+bool Core::Scripting::ScriptManager::onInstanceInit( InstanceContentPtr instance )
 {
-   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance.getInstanceContentId() );
+   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance->getInstanceContentId() );
    if( script )
    {
       script->onInit( instance );
@@ -347,9 +347,9 @@ bool Core::Scripting::ScriptManager::onInstanceInit( InstanceContent& instance )
    return false;
 }
 
-bool Core::Scripting::ScriptManager::onInstanceUpdate( InstanceContent& instance, uint32_t currTime )
+bool Core::Scripting::ScriptManager::onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime )
 {
-   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance.getInstanceContentId() );
+   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance->getInstanceContentId() );
    if( script )
    {
       script->onUpdate( instance, currTime );
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.h b/src/servers/sapphire_zone/Script/ScriptManager.h
index c06fc626..39b702cb 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.h
+++ b/src/servers/sapphire_zone/Script/ScriptManager.h
@@ -57,8 +57,8 @@ namespace Core
          bool onEventHandlerReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param1, uint16_t param2, uint16_t param3 );
          bool onEventHandlerTradeReturn( Entity::Player& player, uint32_t eventId, uint16_t subEvent, uint16_t param, uint32_t catalogId );
 
-         bool onInstanceInit( InstanceContent& instance );
-         bool onInstanceUpdate( InstanceContent& instance, uint32_t currTime );
+         bool onInstanceInit( InstanceContentPtr instance );
+         bool onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime );
 
          void loadDir( const std::string& dirname, std::set<std::string> &files, const std::string& ext );
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index bc176fb4..1a04204d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -7,16 +7,16 @@ public:
    TheNavel() : InstanceContentScript( 20002 )
    { }
 
-   void onInit( InstanceContent& instance ) override
+   void onInit( InstanceContentPtr instance ) override
    {
-      auto exit = new Entity::EventObject( EXIT_OBJECT, 0, { 0, 0, -10 } );
-      instance.registerEObj(Entity::EventObjectPtr(exit));
+      auto exit = Entity::EventObjectPtr( new Entity::EventObject( EXIT_OBJECT, 0, 4, { 0, 0, -10 } ) );
+      instance->registerEObj( exit );
 
-      auto start = new Entity::EventObject( START_CIRCLE, 4236868, { 0, 0, 24 } );
-      instance.registerEObj(Entity::EventObjectPtr(start));
+      auto start = Entity::EventObjectPtr( new Entity::EventObject( START_CIRCLE, 4236868, 5, { 0, 0, 24 } ) );
+      instance->registerEObj( start );
    }
 
-   void onUpdate( InstanceContent& instance, uint32_t currTime ) override
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
    {
 
    }
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index c4fc6514..b7572a9a 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -29,11 +29,20 @@ Core::InstanceContent::InstanceContent( boost::shared_ptr< Core::Data::InstanceC
      Director( Event::Director::InstanceContent, instanceContentId ),
      m_instanceContentInfo( pInstanceContent ),
      m_instanceContentId( instanceContentId ),
-     m_state( Created )
+     m_state( Created ),
+     m_pEntranceEObj( nullptr )
 {
-   g_scriptMgr.onInstanceInit( *this );
+
 }
 
+bool Core::InstanceContent::init()
+{
+   g_scriptMgr.onInstanceInit( getAsInstanceContent() );
+
+   return true;
+}
+
+
 Core::InstanceContent::~InstanceContent()
 {
 
@@ -121,7 +130,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
          break;
    }
 
-   g_scriptMgr.onInstanceUpdate( *this, currTime );
+   g_scriptMgr.onInstanceUpdate( getAsInstanceContent(), currTime );
 }
 
 void Core::InstanceContent::onFinishLoading( Entity::Player& player )
@@ -210,4 +219,20 @@ void Core::InstanceContent::setVar( uint8_t index, uint8_t value )
    {
       sendDirectorVars( *playerIt.second );
    }
-}
\ No newline at end of file
+}
+
+void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
+{
+   if( object->getObjectId() == 2000182 ) // start
+      m_pEntranceEObj = object;
+}
+
+void Core::InstanceContent::onBeforeEnterTerritory( Core::Entity::Player &player )
+{
+   if( m_pEntranceEObj != nullptr )
+      player.setPos( m_pEntranceEObj->getPos() );
+   else
+      player.setPos( { 0.f, 0.f, 0.f } );
+}
+
+
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index 318b82c7..1b150800 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -9,7 +9,7 @@
 namespace Core
 {
 
-class InstanceContent : public Zone, Event::Director
+class InstanceContent : public Event::Director, public Zone
 {
 public:
    enum InstanceContentState
@@ -27,12 +27,16 @@ public:
                     uint32_t instanceContentId );
    virtual ~InstanceContent();
 
+   bool init() override;
+   void onBeforeEnterTerritory( Entity::Player& player ) override;
    void onEnterTerritory( Entity::Player& player ) override;
    void onLeaveTerritory( Entity::Player& player ) override;
    void onFinishLoading( Entity::Player& player ) override;
    void onInitDirector( Entity::Player& player ) override;
    void onUpdate( uint32_t currTime ) override;
 
+   void onRegisterEObj( Entity::EventObjectPtr object ) override;
+
    void setVar( uint8_t index, uint8_t value );
 
    Core::Data::ExdDataGenerated::InstanceContentPtr getInstanceContentInfo() const;
@@ -46,6 +50,8 @@ private:
    InstanceContentState m_state;
 
    int64_t m_instanceExpireTime;
+
+   Entity::EventObjectPtr m_pEntranceEObj;
 };
 
 }
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index 879d47ae..18ae16c2 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -181,7 +181,7 @@ Core::ZonePtr Core::TerritoryMgr::createInstanceContent( uint32_t instanceConten
 
    m_instanceContentToInstanceMap[instanceContentId][pZone->getGuId()] = pZone;
    m_instanceIdToZonePtrMap[pZone->getGuId()] = pZone;
-   m_instanceZoneSet.insert( { pZone } );
+   m_instanceZoneSet.insert( pZone );
 
    return pZone;
 }
@@ -313,6 +313,8 @@ bool Core::TerritoryMgr::movePlayer( ZonePtr pZone, Core::Entity::PlayerPtr pPla
       return false;
    }
 
+   pPlayer->initSpawnIdQueue();
+
    pPlayer->setTerritoryId( pZone->getTerritoryId() );
 
    // mark character as zoning in progress
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 7125b32d..ff016078 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -13,6 +13,7 @@
 #include <common/Database/DatabaseDef.h>
 
 #include "Zone.h"
+#include "InstanceContent.h"
 #include "TerritoryMgr.h"
 
 #include "Session.h"
@@ -48,7 +49,8 @@ Core::Zone::Zone() :
    m_currentWeather( Weather::FairSkies ),
    m_weatherOverride( Weather::None ),
    m_lastMobUpdate( 0 ),
-   m_currentFestivalId( 0 )
+   m_currentFestivalId( 0 ),
+   m_nextEObjId( 0x400D0000 )
 {
 }
 
@@ -658,10 +660,13 @@ void Core::Zone::registerEObj( Entity::EventObjectPtr object )
    if( !object )
       return;
 
-   //object->setParentInstance( InstanceContentPtr( this ) );
+   object->setId( getNextEObjId() );
+   pushActor( object );
 
    m_eventObjects[object->getId()] = object;
 
+   onRegisterEObj( object );
+
    g_log.debug( "Registered instance eobj: " + std::to_string( object->getId() ) );
 }
 
@@ -701,3 +706,13 @@ void Core::Zone::updateEObj( Entity::EventObjectPtr object )
       playerIt.second->queuePacket( eobjStatePacket );
    }
 }
+
+Core::InstanceContentPtr Core::Zone::getAsInstanceContent()
+{
+   return boost::dynamic_pointer_cast< InstanceContent, Zone >( shared_from_this() );
+}
+
+uint32_t Core::Zone::getNextEObjId()
+{
+   return ++m_nextEObjId;
+}
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 8802ff2a..c90290f6 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -48,14 +48,14 @@ protected:
 
    std::map< uint8_t, int32_t> m_weatherRateMap;
 
+   uint32_t m_nextEObjId;
+
 public:
    Zone();
 
    Zone( uint16_t territoryId, uint32_t guId, const std::string& internalName, const std::string& placeName );
    virtual ~Zone();
 
-   bool init();
-
    /*! overrides the zone's weather, set to 0 to unlock */
    void setWeatherOverride( Common::Weather weather );
 
@@ -64,13 +64,17 @@ public:
    uint16_t getCurrentFestival() const;
    void setCurrentFestival( uint16_t festivalId );
 
+   virtual bool init();
+
    virtual void loadCellCache();
    virtual uint32_t getTerritoryId() const;
+   virtual void onBeforeEnterTerritory( Entity::Player& player ) {};
    virtual void onEnterTerritory( Entity::Player& player );
    virtual void onFinishLoading( Entity::Player& player );
    virtual void onInitDirector( Entity::Player& player );
    virtual void onLeaveTerritory( Entity::Player& player );
    virtual void onUpdate( uint32_t currTime );
+   virtual void onRegisterEObj( Entity::EventObjectPtr object ) {};
 
    Common::Weather getNextWeather();
 
@@ -90,6 +94,8 @@ public:
 
    uint32_t getGuId() const;
 
+   uint32_t getNextEObjId();
+
    const std::string& getName() const;
    const std::string& getInternalName() const;
 

From acee4d4b51b168d87fdbd09e49bb1cc617b9ef5c Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 24 Feb 2018 00:07:07 +0100
Subject: [PATCH 25/69] EObjects are now given a name and can be retrieved
 using it

---
 src/servers/sapphire_zone/Actor/EventObject.cpp   | 15 +++++++++++----
 src/servers/sapphire_zone/Actor/EventObject.h     |  6 +++++-
 .../Script/Scripts/instances/trials/TheNavel.cpp  |  4 ++--
 .../sapphire_zone/Zone/InstanceContent.cpp        | 11 +++++++++++
 src/servers/sapphire_zone/Zone/InstanceContent.h  |  4 ++++
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 1162e9c1..6a4c4d56 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -18,11 +18,13 @@ extern Core::Logger g_log;
 
 
 Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId,
-                                        uint8_t initialState, Common::FFXIVARR_POSITION3 pos ) :
+                                        uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
+                                        const std::string givenName ) :
    Core::Entity::Actor( ObjKind::EventObj ),
    m_mapLinkId( mapLinkId ),
    m_state( initialState ),
-   m_objectId( objectId )
+   m_objectId( objectId ),
+   m_name( givenName )
 {
    m_id = objectId;
    m_pos.x = pos.x;
@@ -69,7 +71,7 @@ Core::InstanceContentPtr Core::Entity::EventObject::getParentInstance() const
 
 void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
 {
-   g_log.debug( "spawn eobj: " + std::to_string( getId() ) );
+   g_log.debug( "Spawning EObj: id:" + std::to_string( getId() ) + " name:" + getName() );
    ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( getId(), pTarget->getId() );
    eobjStatePacket.data().count = pTarget->getNextObjCount();
    eobjStatePacket.data().objKind = getObjKind();
@@ -84,4 +86,9 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
 void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget )
 {
    g_log.debug( "despawn eobj: " + std::to_string( getId() ) );
-}
\ No newline at end of file
+}
+
+const std::string &Core::Entity::EventObject::getName() const
+{
+   return m_name;
+}
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 1c48b72d..5a9d1da8 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -10,7 +10,8 @@ namespace Entity
    class EventObject : public Actor
    {
    public:
-      EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos );
+      EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
+                   const std::string givenName = "none" );
 
       uint32_t getMapLinkId() const;
       void setMapLinkId( uint32_t mapLinkId );
@@ -20,6 +21,8 @@ namespace Entity
 
       uint32_t getObjectId() const;
 
+      const std::string& getName() const;
+
       InstanceContentPtr getParentInstance() const;
       void setParentInstance( InstanceContentPtr instance );
 
@@ -30,6 +33,7 @@ namespace Entity
       uint32_t m_mapLinkId;
       uint32_t m_objectId;
       uint8_t m_state;
+      std::string m_name;
       InstanceContentPtr m_parentInstance;
    };
 }
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index 1a04204d..14f6a813 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -9,10 +9,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      auto exit = Entity::EventObjectPtr( new Entity::EventObject( EXIT_OBJECT, 0, 4, { 0, 0, -10 } ) );
+      auto exit = Entity::EventObjectPtr( new Entity::EventObject( EXIT_OBJECT, 0, 4, { 0, 0, -10 }, "Entrance" ) );
       instance->registerEObj( exit );
 
-      auto start = Entity::EventObjectPtr( new Entity::EventObject( START_CIRCLE, 4236868, 5, { 0, 0, 24 } ) );
+      auto start = Entity::EventObjectPtr( new Entity::EventObject( START_CIRCLE, 4236868, 5, { 0, 0, 24 }, "Exit" ) );
       instance->registerEObj( start );
    }
 
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index b7572a9a..d2f553a4 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -223,6 +223,8 @@ void Core::InstanceContent::setVar( uint8_t index, uint8_t value )
 
 void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
 {
+   if( object->getName() != "none" )
+      m_eventObjectMap[object->getName()] = object;
    if( object->getObjectId() == 2000182 ) // start
       m_pEntranceEObj = object;
 }
@@ -235,4 +237,13 @@ void Core::InstanceContent::onBeforeEnterTerritory( Core::Entity::Player &player
       player.setPos( { 0.f, 0.f, 0.f } );
 }
 
+Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string &name )
+{
+   auto it = m_eventObjectMap.find( name );
+   if( it == m_eventObjectMap.end() )
+      return nullptr;
+
+   return it->second;
+}
+
 
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index 1b150800..184dde51 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -43,6 +43,8 @@ public:
 
    uint32_t getInstanceContentId() const;
 
+   Entity::EventObjectPtr getEObjByName( const std::string& name );
+
 private:
    Event::DirectorPtr m_pDirector;
    Core::Data::ExdDataGenerated::InstanceContentPtr m_instanceContentInfo;
@@ -52,6 +54,8 @@ private:
    int64_t m_instanceExpireTime;
 
    Entity::EventObjectPtr m_pEntranceEObj;
+
+   std::map< std::string, Entity::EventObjectPtr > m_eventObjectMap;
 };
 
 }

From c7e15bf52af02bd3a13442d1fe51cf884d2e9539 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 24 Feb 2018 09:40:44 +0100
Subject: [PATCH 26/69] Use make shared in instance scripts for eobjs

---
 .../Script/Scripts/instances/trials/TheNavel.cpp          | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index 14f6a813..5692e719 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -1,6 +1,6 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
-
+#include <boost/make_shared.hpp>
 class TheNavel : public InstanceContentScript
 {
 public:
@@ -9,10 +9,12 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      auto exit = Entity::EventObjectPtr( new Entity::EventObject( EXIT_OBJECT, 0, 4, { 0, 0, -10 }, "Entrance" ) );
+      Common::FFXIVARR_POSITION3 pos = { 0, 0, -10 };
+      auto exit = Entity::make_EventObject( EXIT_OBJECT, 0, 4, pos, "Entrance" );
       instance->registerEObj( exit );
 
-      auto start = Entity::EventObjectPtr( new Entity::EventObject( START_CIRCLE, 4236868, 5, { 0, 0, 24 }, "Exit" ) );
+      Common::FFXIVARR_POSITION3 pos1 = { 0, 0, 24 };
+      auto start = Entity::make_EventObject( START_CIRCLE, 4236868, 5, pos1, "Exit" );
       instance->registerEObj( start );
    }
 

From 65242d2dee185f825113af58810385fcf34698d4 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 24 Feb 2018 15:19:32 +0100
Subject: [PATCH 27/69] Added onEnterTerritory for IC, also changed the way IC
 is called

---
 src/servers/sapphire_zone/Actor/EventObject.cpp       |  4 ++--
 src/servers/sapphire_zone/Actor/EventObject.h         |  2 +-
 src/servers/sapphire_zone/Event/EventHandler.h        |  1 +
 src/servers/sapphire_zone/Event/EventHelper.cpp       | 11 +++++++++++
 src/servers/sapphire_zone/Script/NativeScriptApi.h    |  4 ++--
 src/servers/sapphire_zone/Script/ScriptManager.cpp    |  6 +++---
 .../Script/Scripts/common/CmnDefInnBed.cpp            |  2 +-
 .../Script/Scripts/instances/trials/TheNavel.cpp      | 10 +++++++---
 .../Script/Scripts/quest/opening/OpeningGridania.cpp  |  2 +-
 .../Script/Scripts/quest/opening/OpeningLimsa.cpp     |  2 +-
 .../Script/Scripts/quest/opening/OpeningUldah.cpp     |  2 +-
 11 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 6a4c4d56..ec901c45 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -19,7 +19,7 @@ extern Core::Logger g_log;
 
 Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId,
                                         uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
-                                        const std::string givenName ) :
+                                        const std::string& givenName ) :
    Core::Entity::Actor( ObjKind::EventObj ),
    m_mapLinkId( mapLinkId ),
    m_state( initialState ),
@@ -88,7 +88,7 @@ void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget )
    g_log.debug( "despawn eobj: " + std::to_string( getId() ) );
 }
 
-const std::string &Core::Entity::EventObject::getName() const
+const std::string& Core::Entity::EventObject::getName() const
 {
    return m_name;
 }
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 5a9d1da8..076a8a85 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -11,7 +11,7 @@ namespace Entity
    {
    public:
       EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
-                   const std::string givenName = "none" );
+                   const std::string& givenName = "none" );
 
       uint32_t getMapLinkId() const;
       void setMapLinkId( uint32_t mapLinkId );
diff --git a/src/servers/sapphire_zone/Event/EventHandler.h b/src/servers/sapphire_zone/Event/EventHandler.h
index e02434c6..42490462 100644
--- a/src/servers/sapphire_zone/Event/EventHandler.h
+++ b/src/servers/sapphire_zone/Event/EventHandler.h
@@ -61,6 +61,7 @@ namespace Core {
             SpecialShop = 0x001B,
             BahamutGuide = 0x001C,
             FcTalk = 0x001F,
+            ICDirector = 0x8003,
          };
 
          using SceneReturnCallback = std::function< void( Entity::Player&, uint32_t, uint16_t, uint16_t, uint16_t ) > ;
diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 90ac6d26..54dd0750 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -3,6 +3,9 @@
 #include <common/Common.h>
 #include <common/Exd/ExdDataGenerated.h>
 
+#include <boost/range/algorithm/remove_if.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 extern Core::Data::ExdDataGenerated g_exdDataGen;
 
 using namespace Core::Common;
@@ -51,6 +54,14 @@ std::string Core::Event::getEventName( uint32_t eventId )
          return "Aetheryte";
       return "Aethernet";
    }
+   case Event::EventHandler::EventHandlerType::ICDirector:
+   {
+      auto contentInfo = g_exdDataGen.get< Core::Data::InstanceContent >( eventId & 0xFFFF );
+      std::string name = contentInfo->name;
+
+      name.erase( boost::remove_if( name, boost::is_any_of( "_ '()[]" ) ), name.end() );
+      return name;
+   }
 
    case Event::EventHandler::EventHandlerType::Warp:
    {
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index 045d734f..22c5485b 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -87,7 +87,7 @@ public:
    virtual void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) { }
    virtual void onNpcKill( uint32_t npcId, Entity::Player& player ) { }
    virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) { }
-   virtual void onEnterZone( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
+   virtual void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
    virtual void onWithinRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) { }
    virtual void onOutsideRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) { }
    virtual void onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ) { }
@@ -117,7 +117,7 @@ class InstanceContentScript : public ScriptObject
 {
 public:
    explicit InstanceContentScript( uint32_t instanceContentId ) :
-      ScriptObject( instanceContentId, typeid( InstanceContentScript ).hash_code() )
+      ScriptObject( uint32_t{ 0x8003 } << 16 | instanceContentId, typeid( InstanceContentScript ).hash_code() )
    { }
 
    virtual void onInit( InstanceContentPtr instance ) { }
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 4e96a2a8..1106535a 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -166,7 +166,7 @@ bool Core::Scripting::ScriptManager::onEnterTerritory( Entity::Player& player, u
    auto script = m_nativeScriptManager->getScript< EventScript >( eventId );
    if( !script )
       return false;
-   script->onEnterZone( player, eventId, param1, param2 );
+   script->onEnterTerritory( player, eventId, param1, param2 );
    return true;
 }
 
@@ -337,7 +337,7 @@ bool Core::Scripting::ScriptManager::onZoneInit( ZonePtr pZone )
 
 bool Core::Scripting::ScriptManager::onInstanceInit( InstanceContentPtr instance )
 {
-   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance->getInstanceContentId() );
+   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance->getDirectorId() );
    if( script )
    {
       script->onInit( instance );
@@ -349,7 +349,7 @@ bool Core::Scripting::ScriptManager::onInstanceInit( InstanceContentPtr instance
 
 bool Core::Scripting::ScriptManager::onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime )
 {
-   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance->getInstanceContentId() );
+   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance->getDirectorId() );
    if( script )
    {
       script->onUpdate( instance, currTime );
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
index ac8a0a68..714f9e55 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
@@ -49,7 +49,7 @@ public:
       Scene00000( player );
    }
 
-   void onEnterZone( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
    {
       Scene00100( player );
    }
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index 5692e719..f57654b5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -1,6 +1,6 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
-#include <boost/make_shared.hpp>
+
 class TheNavel : public InstanceContentScript
 {
 public:
@@ -10,11 +10,11 @@ public:
    void onInit( InstanceContentPtr instance ) override
    {
       Common::FFXIVARR_POSITION3 pos = { 0, 0, -10 };
-      auto exit = Entity::make_EventObject( EXIT_OBJECT, 0, 4, pos, "Entrance" );
+      auto exit = Entity::make_EventObject( EXIT_OBJECT, 0, EXIT_OBJECT_STATE, pos, "Exit" );
       instance->registerEObj( exit );
 
       Common::FFXIVARR_POSITION3 pos1 = { 0, 0, 24 };
-      auto start = Entity::make_EventObject( START_CIRCLE, 4236868, 5, pos1, "Exit" );
+      auto start = Entity::make_EventObject( START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, pos1, "Entrance" );
       instance->registerEObj( start );
    }
 
@@ -25,5 +25,9 @@ public:
 
 private:
    static constexpr auto EXIT_OBJECT = 2000139;
+   static constexpr auto EXIT_OBJECT_STATE = 4;
+
    static constexpr auto START_CIRCLE = 2000182;
+   static constexpr auto START_CIRCLE_MAPLINK = 4236868;
+   static constexpr auto START_CIRCLE_STATE = 5;
 };
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp
index 1541561c..3fab8186 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp
@@ -68,7 +68,7 @@ public:
    OpeningGridania() : EventScript( 1245186 )
    {}
 
-   void onEnterZone( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
    {
       if( player.getOpeningSequence() == 0 )
       {
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp
index f30a2aed..3aba580e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp
@@ -83,7 +83,7 @@ private:
 public:
    OpeningLimsa() : EventScript( 1245185 ) {}
 
-   void onEnterZone( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
    {
       if( player.getOpeningSequence() == 0 )
          Scene00000( player );
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp
index c780782e..97374f2c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp
@@ -67,7 +67,7 @@ private:
 public:
    OpeningUldah() : EventScript( 1245187 ) {}
 
-   void onEnterZone( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
    {
       if( player.getOpeningSequence() == 0 )
          Scene00000( player );

From 8cf15061d0e13d1e6514b2b448cb68397d310e76 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 24 Feb 2018 15:21:18 +0100
Subject: [PATCH 28/69] Fixed eventObject not using correct object id

---
 src/servers/sapphire_zone/Actor/EventObject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index ec901c45..9784e8e1 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -76,7 +76,7 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
    eobjStatePacket.data().count = pTarget->getNextObjCount();
    eobjStatePacket.data().objKind = getObjKind();
    eobjStatePacket.data().state = getState();
-   eobjStatePacket.data().objId = getId();
+   eobjStatePacket.data().objId = getObjectId();
    eobjStatePacket.data().hierachyId = getMapLinkId();
    eobjStatePacket.data().position = getPos();
    pTarget->queuePacket( eobjStatePacket );

From 67c2cb79715d22c4a68fc00b4503ed0f577fd8f7 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 24 Feb 2018 23:53:32 +0100
Subject: [PATCH 29/69] Improved timing on instance starting

---
 src/servers/sapphire_zone/Actor/Player.cpp    | 24 +++++++++++++++----
 src/servers/sapphire_zone/Actor/Player.h      |  5 ++++
 .../Network/Handlers/ActionHandler.cpp        | 15 +++++++++---
 .../sapphire_zone/Script/NativeScriptApi.h    |  1 +
 .../Scripts/instances/trials/TheNavel.cpp     |  5 ++++
 .../sapphire_zone/Zone/InstanceContent.cpp    | 13 +++++++---
 6 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 5b44a401..65ab2fe5 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -73,7 +73,8 @@ Core::Entity::Player::Player() :
    m_markedForRemoval( false ),
    m_mount( 0 ),
    m_directorInitialized( false ),
-   m_objCount( 0 )
+   m_objCount( 0 ),
+   m_onEnterEventDone( false )
 {
    m_id = 0;
    m_currentStance = Stance::Passive;
@@ -359,6 +360,7 @@ void Core::Entity::Player::returnToHomepoint()
 
 void Core::Entity::Player::setZone( uint32_t zoneId )
 {
+   m_onEnterEventDone = false;
    if( !g_territoryMgr.movePlayer( zoneId, getAsPlayer() ) )
    {
       // todo: this will require proper handling, for now just return the player to their previous area
@@ -375,6 +377,7 @@ void Core::Entity::Player::setZone( uint32_t zoneId )
 
 bool Core::Entity::Player::setInstance( uint32_t instanceContentId )
 {
+   m_onEnterEventDone = false;
    auto instance = g_territoryMgr.getInstanceZonePtr( instanceContentId );
    if( !instance )
       return false;
@@ -384,6 +387,7 @@ bool Core::Entity::Player::setInstance( uint32_t instanceContentId )
 
 bool Core::Entity::Player::setInstance( ZonePtr instance )
 {
+   m_onEnterEventDone = false;
    if( !instance )
       return false;
 
@@ -1620,12 +1624,12 @@ void Core::Entity::Player::finishZoning()
    unsetStateFlag( PlayerStateFlag::BetweenAreas );
 }
 
-void Player::emote( uint32_t emoteId, uint64_t targetId )
+void Core::Entity::Player::emote( uint32_t emoteId, uint64_t targetId )
 {
    sendToInRangeSet( ActorControlPacket144( getId(), ActorControlType::Emote, emoteId, 0, 0, 0, targetId ) );
 }
 
-void Player::teleportQuery( uint16_t aetheryteId )
+void Core::Entity::Player::teleportQuery( uint16_t aetheryteId )
 {
    // TODO: only register this action if enough gil is in possession
    auto targetAetheryte = g_exdDataGen.get< Core::Data::Aetheryte >( aetheryteId );
@@ -1655,7 +1659,17 @@ void Player::teleportQuery( uint16_t aetheryteId )
    }
 }
 
-uint8_t Player::getNextObjCount()
+uint8_t Core::Entity::Player::getNextObjCount()
 {
    return m_objCount++;
-}
\ No newline at end of file
+}
+
+void Core::Entity::Player::setOnEnterEventDone( bool isDone )
+{
+   m_onEnterEventDone = isDone;
+}
+
+bool Core::Entity::Player::isOnEnterEventDone() const
+{
+   return m_onEnterEventDone;
+}
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index a5681055..7f362e6a 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -559,6 +559,9 @@ public:
    void setMarkedForRemoval();
    bool isMarkedForRemoval() const;
 
+   void setOnEnterEventDone( bool isDone );
+   bool isOnEnterEventDone() const;
+
    uint8_t getNextObjCount();
 
 private:
@@ -575,6 +578,8 @@ private:
 
    bool m_directorInitialized;
 
+   bool m_onEnterEventDone;
+
 private:
 
    Common::FFXIVARR_POSITION3 m_prevPos;
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 9739756a..0b4fee82 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -82,11 +82,14 @@ enum ClientTrigger
    AchievementCrit = 0x202,
    AchievementComp = 0x203,
    AchievementCatChat = 0x206,
-  
+
+
+   DirectorInitFinish = 0x321,
+
+   EnterTerritoryEventFinished = 0x330,
+
    AchievementCritReq = 0x3E8,
    AchievementList = 0x3E9,
-   
-   DirectorInitFinish = 0x321,
 
    CompanionAction = 0x6A4,
    CompanionSetBarding = 0x6A5,
@@ -248,6 +251,12 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
            player.getCurrentZone()->onInitDirector( player );
            break;
         }
+        case ClientTrigger::EnterTerritoryEventFinished:
+        {
+           g_log.debug( "[DOOOOOOOOOOOOOOOOOOOOOOONE]" );
+           player.setOnEnterEventDone( true );
+           break;
+        }
         default:
         {
            g_log.debug( "[" + std::to_string( m_pSession->getId() ) + "] Unhandled action: " +
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index 22c5485b..058195c6 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -122,6 +122,7 @@ public:
 
    virtual void onInit( InstanceContentPtr instance ) { }
    virtual void onUpdate( InstanceContentPtr instance, uint32_t currTime ) { }
+   virtual void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
 };
 
 #endif
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index f57654b5..b5a5a83a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -23,6 +23,11 @@ public:
 
    }
 
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
 private:
    static constexpr auto EXIT_OBJECT = 2000139;
    static constexpr auto EXIT_OBJECT_STATE = 4;
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index d2f553a4..ee0a032a 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -99,7 +99,9 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
 
          for( const auto &playerIt : m_playerMap )
          {
-            if( !playerIt.second->isLoadingComplete() || !playerIt.second->isDirectorInitialized() )
+            if( !playerIt.second->isLoadingComplete() ||
+                !playerIt.second->isDirectorInitialized() ||
+                !playerIt.second->isOnEnterEventDone() )
                return;
          }
 
@@ -135,8 +137,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
 
 void Core::InstanceContent::onFinishLoading( Entity::Player& player )
 {
-   if( m_state != Created )
-      sendDirectorInit( player );
+   sendDirectorInit( player );
 }
 
 void Core::InstanceContent::onInitDirector( Entity::Player& player )
@@ -232,9 +233,15 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
 void Core::InstanceContent::onBeforeEnterTerritory( Core::Entity::Player &player )
 {
    if( m_pEntranceEObj != nullptr )
+   {
+      player.setRot( PI );
       player.setPos( m_pEntranceEObj->getPos() );
+   }
    else
+   {
+      player.setRot( PI );
       player.setPos( { 0.f, 0.f, 0.f } );
+   }
 }
 
 Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string &name )

From e548e148e51113fb375ad1ab3a8e4e58a0bfd609 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 25 Feb 2018 01:23:40 +0100
Subject: [PATCH 30/69] Simplified syntax for eobj registering, added test
 script for thousand maws

---
 .../sapphire_zone/Event/EventHelper.cpp       |  3 +-
 .../Network/Handlers/ActionHandler.cpp        |  3 +-
 .../dungeon/TheThousandMawsOfTotoRak.cpp      | 33 +++++++++++++++++++
 .../Scripts/instances/trials/TheNavel.cpp     |  9 ++---
 src/servers/sapphire_zone/Zone/Zone.cpp       |  7 ++++
 src/servers/sapphire_zone/Zone/Zone.h         |  3 ++
 6 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp

diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 54dd0750..1993a881 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -59,7 +59,8 @@ std::string Core::Event::getEventName( uint32_t eventId )
       auto contentInfo = g_exdDataGen.get< Core::Data::InstanceContent >( eventId & 0xFFFF );
       std::string name = contentInfo->name;
 
-      name.erase( boost::remove_if( name, boost::is_any_of( "_ '()[]" ) ), name.end() );
+      name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() );
+      name[0] = toupper( name[0] );
       return name;
    }
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 0b4fee82..00cc62d0 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -251,9 +251,8 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
            player.getCurrentZone()->onInitDirector( player );
            break;
         }
-        case ClientTrigger::EnterTerritoryEventFinished:
+        case ClientTrigger::EnterTerritoryEventFinished:// this may still be something else. I think i have seen it elsewhere
         {
-           g_log.debug( "[DOOOOOOOOOOOOOOOOOOOOOOONE]" );
            player.setOnEnterEventDone( true );
            break;
         }
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp
new file mode 100644
index 00000000..037db112
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheThousandMawsOfTotoRak : public InstanceContentScript
+{
+public:
+   TheThousandMawsOfTotoRak() : InstanceContentScript( 1 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { 237, -39, -144 } );
+      instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { -322, 12, -78 } );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+private:
+   static constexpr auto EXIT_OBJECT = 2000683;
+   static constexpr auto EXIT_OBJECT_STATE = 4;
+
+   static constexpr auto START_CIRCLE = 2000182;
+   static constexpr auto START_CIRCLE_MAPLINK = 4127435;
+   static constexpr auto START_CIRCLE_STATE = 5;
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index b5a5a83a..1e12dd48 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -9,13 +9,8 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      Common::FFXIVARR_POSITION3 pos = { 0, 0, -10 };
-      auto exit = Entity::make_EventObject( EXIT_OBJECT, 0, EXIT_OBJECT_STATE, pos, "Exit" );
-      instance->registerEObj( exit );
-
-      Common::FFXIVARR_POSITION3 pos1 = { 0, 0, 24 };
-      auto start = Entity::make_EventObject( START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, pos1, "Entrance" );
-      instance->registerEObj( start );
+      instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { 0, 0, -10 } );
+      instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { 0, 0, 24 } );
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index ff016078..b679ce83 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -716,3 +716,10 @@ uint32_t Core::Zone::getNextEObjId()
 {
    return ++m_nextEObjId;
 }
+
+void Core::Zone::registerEObj( const std::string &name, uint32_t objectId, uint32_t mapLink, uint8_t state,
+                               FFXIVARR_POSITION3 pos )
+{
+   auto eObj = Entity::make_EventObject( objectId, mapLink, state, pos, name );
+   registerEObj( eObj );
+}
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index c90290f6..048421c7 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -108,6 +108,9 @@ public:
 
    void updateSessions( bool changedWeather );
 
+   void registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink,
+                      uint8_t state, Common::FFXIVARR_POSITION3 pos );
+
    void registerEObj( Entity::EventObjectPtr object );
    Entity::EventObjectPtr getEObj( uint32_t objId );
    void updateEObj( Entity::EventObjectPtr object );

From b6cfa339d6e5ac55f0e832b7b545e7e0e3915d31 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Sun, 25 Feb 2018 15:16:42 +1100
Subject: [PATCH 31/69] more opcodes

---
 src/common/Network/PacketDef/Ipcs.h                         | 2 ++
 .../sapphire_zone/Network/Handlers/ActionHandler.cpp        | 3 +++
 src/servers/sapphire_zone/Zone/TerritoryMgr.cpp             | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index a7892f9e..fc4a1da2 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -206,6 +206,8 @@ namespace Packets {
 
       FcInfoReqHandler         = 0x011A, // updated 4.2
 
+
+      ReqJoinNoviceNetwork     = 0x0129, // updated 4.2
       ReqCountdownInitiate     = 0x012C, // updated 4.2
       ReqCountdownCancel       = 0x012D, // updated 4.2
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 00cc62d0..6915f69b 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -73,6 +73,8 @@ enum ClientTrigger
   
    DyeItem = 0x1B5,
 
+   RequestChocoboInventory = 0x1C4,
+
    Emote = 0x1F4,
    PersistantEmoteCancel = 0x1F7,
    PoseChange = 0x1F9,
@@ -95,6 +97,7 @@ enum ClientTrigger
    CompanionSetBarding = 0x6A5,
    CompanionActionUnlock = 0x6A6,
 
+   OpenPerformInstrumentUI = 0x71C,
 };
 
 void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& inPacket,
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index 18ae16c2..ed4c1513 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -115,9 +115,9 @@ bool Core::TerritoryMgr::createDefaultTerritories()
       g_log.Log( LoggingSeverity::info, std::to_string( territoryId ) +
                                         "\t" + std::to_string( guid ) +
                                         "\t" + std::to_string( territoryInfo->territoryIntendedUse ) +
-                                        "\t" + territoryInfo->name +
-                                        "\t" + pPlaceName->name +
-                                        "\t" + ( isPrivateTerritory( territoryId ) ? "PRIVATE" : "PUBLIC" ) );
+                                        "\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();

From 8a3ed93fbcb9d7da965f11e06bdf81cda0676758 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Sun, 25 Feb 2018 17:23:52 +1100
Subject: [PATCH 32/69] redirect ontalk events inside instances to
 instancecontent ptr

---
 src/servers/sapphire_zone/Actor/Actor.cpp     |  6 ++++
 src/servers/sapphire_zone/Actor/Actor.h       |  2 ++
 .../DebugCommand/DebugCommandHandler.cpp      |  2 +-
 .../Network/Handlers/EventHandlers.cpp        |  8 +++++-
 .../sapphire_zone/Script/NativeScriptApi.h    |  4 +--
 .../sapphire_zone/Zone/InstanceContent.cpp    |  7 ++++-
 .../sapphire_zone/Zone/InstanceContent.h      |  1 +
 src/servers/sapphire_zone/Zone/Zone.cpp       | 28 -------------------
 src/servers/sapphire_zone/Zone/Zone.h         |  1 -
 9 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index f1db8533..7c855c43 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -313,6 +313,12 @@ void Core::Entity::Actor::setCurrentZone( ZonePtr currZone )
    m_pCurrentZone = currZone;
 }
 
+/*! \return InstanceContentPtr to the current instance, null if not an instance or not set */
+Core::InstanceContentPtr Core::Entity::Actor::getCurrentInstance() const
+{
+   return getCurrentZone()->getAsInstanceContent();
+}
+
 /*!
 Get the current cell of a region the actor is in
 
diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 94502c0d..54916754 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -124,6 +124,8 @@ namespace Entity {
       ZonePtr getCurrentZone() const;
       void setCurrentZone( ZonePtr currZone );
 
+      InstanceContentPtr getCurrentInstance() const;
+
       // get the current cell of a region the actor is in
       Cell* getCellPtr();
       // set the current cell
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 14a938c7..46241c87 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -734,7 +734,7 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
       if( !obj )
          return;
 
-      instance->updateEObj(obj);
+      //instance->updateEObj(obj);
    }
    else if( subCommand == "objstate" )
    {
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index 692fc1a5..d44e0241 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -20,6 +20,7 @@
 #include "Actor/Player.h"
 #include "Forwards.h"
 #include "Event/EventHelper.h"
+#include "Zone/InstanceContent.h"
 
 extern Core::Data::ExdDataGenerated g_exdDataGen;
 extern Core::Scripting::ScriptManager g_scriptMgr;
@@ -49,7 +50,12 @@ void Core::Network::GameConnection::eventHandlerTalk( const Packets::GamePacket&
    player.sendDebug( "Calling: " + objName + "." + eventName );
    player.eventStart( actorId, eventId, Event::EventHandler::Talk, 0, 0 );
 
-   if( !g_scriptMgr.onTalk( player, actorId, eventId ) &&
+
+   if( auto instance = player.getCurrentInstance() )
+   {
+      instance->onTalk( player, eventId, actorId );
+   }
+   else if( !g_scriptMgr.onTalk( player, actorId, eventId ) &&
        eventType == Event::EventHandler::EventHandlerType::Quest )
    {
       auto questInfo = g_exdDataGen.get< Core::Data::Quest >( eventId );
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index 058195c6..f65f93f4 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -87,7 +87,7 @@ public:
    virtual void onTalk( uint32_t eventId, Entity::Player& player, uint64_t actorId ) { }
    virtual void onNpcKill( uint32_t npcId, Entity::Player& player ) { }
    virtual void onEmote( uint64_t actorId, uint32_t eventId, uint32_t emoteId, Entity::Player& player ) { }
-   virtual void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
+   virtual void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
    virtual void onWithinRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) { }
    virtual void onOutsideRange( Entity::Player& player, uint32_t eventId, uint32_t param1, float x, float y, float z ) { }
    virtual void onEventItem( Entity::Player& player, uint32_t eventItemId, uint32_t eventId, uint32_t castTime, uint64_t targetId ) { }
@@ -122,7 +122,7 @@ public:
 
    virtual void onInit( InstanceContentPtr instance ) { }
    virtual void onUpdate( InstanceContentPtr instance, uint32_t currTime ) { }
-   virtual void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
+   virtual void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
 };
 
 #endif
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index ee0a032a..2b8682a0 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -13,6 +13,8 @@
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
 
+#include "Event/EventHandler.h"
+
 extern Core::Logger g_log;
 extern Core::Scripting::ScriptManager g_scriptMgr;
 
@@ -253,4 +255,7 @@ Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::st
    return it->second;
 }
 
-
+void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t eventId, uint64_t actorId )
+{
+   auto type = static_cast< Core::Event::EventHandler::EventType >( eventId >> 16 );
+}
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index 184dde51..b42dc47d 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -34,6 +34,7 @@ public:
    void onFinishLoading( Entity::Player& player ) override;
    void onInitDirector( Entity::Player& player ) override;
    void onUpdate( uint32_t currTime ) override;
+   void onTalk( Entity::Player& player, uint32_t eventId, uint64_t actorId );
 
    void onRegisterEObj( Entity::EventObjectPtr object ) override;
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index b679ce83..1df0f389 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -679,34 +679,6 @@ Core::Entity::EventObjectPtr Core::Zone::getEObj( uint32_t objId )
    return obj->second;
 }
 
-// TODO: this is located wrong. state change should happen in the object and it should send to his in range set.
-void Core::Zone::updateEObj( Entity::EventObjectPtr object )
-{
-   if( !object )
-      return;
-
-   for( const auto& playerIt : m_playerMap )
-   {
-      // send that packet with le data
-      ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( playerIt.second->getId() );
-      eobjStatePacket.data().objKind = object->getObjKind();
-      eobjStatePacket.data().state = object->getState();
-      eobjStatePacket.data().objId = object->getId();
-      eobjStatePacket.data().hierachyId = object->getMapLinkId();
-      eobjStatePacket.data().position = object->getPos();
-
-      // ????
-      //eobjStatePacket.data().levelId = 4236873;
-      //eobjStatePacket.data().unknown2 = 5;
-      //eobjStatePacket.data().unknown1C = 1065353216;
-      //eobjStatePacket.data().unknown20 = 2147423605;
-      //eobjStatePacket.data().actorId = 1074105831;
-      //eobjStatePacket.data().unknown = 1;
-
-      playerIt.second->queuePacket( eobjStatePacket );
-   }
-}
-
 Core::InstanceContentPtr Core::Zone::getAsInstanceContent()
 {
    return boost::dynamic_pointer_cast< InstanceContent, Zone >( shared_from_this() );
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 048421c7..097100c9 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -113,7 +113,6 @@ public:
 
    void registerEObj( Entity::EventObjectPtr object );
    Entity::EventObjectPtr getEObj( uint32_t objId );
-   void updateEObj( Entity::EventObjectPtr object );
 
    InstanceContentPtr getAsInstanceContent();
 

From c210b5ebef19a0bed811af746799e923cb1c0a7c Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Sun, 25 Feb 2018 17:24:00 +1100
Subject: [PATCH 33/69] cmake test

---
 src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
index 03c76b3c..907e3288 100644
--- a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
+++ b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
@@ -42,6 +42,10 @@ foreach(_scriptDir ${children})
         add_library("script_${_name}" MODULE "${SCRIPT_BUILD_FILES}" "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
         target_link_libraries("script_${_name}" sapphire_zone)
 
+        if(MSVC)
+            target_link_libraries("script_${_name}" ${Boost_LIBRARIES})
+        endif()
+
         if(MSVC)
             set_target_properties("script_${_name}" PROPERTIES
                 CXX_STANDARD 14

From 4137379853cec4dcf6ab2677470b0b0dae3eb997 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Sun, 25 Feb 2018 21:46:34 +1100
Subject: [PATCH 34/69] fix possible null pointer access & eobj state update

---
 src/servers/sapphire_zone/Actor/Actor.cpp       | 7 +++++--
 src/servers/sapphire_zone/Actor/EventObject.cpp | 9 +++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 7c855c43..560d5b9b 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -313,10 +313,13 @@ void Core::Entity::Actor::setCurrentZone( ZonePtr currZone )
    m_pCurrentZone = currZone;
 }
 
-/*! \return InstanceContentPtr to the current instance, null if not an instance or not set */
+/*! \return InstanceContentPtr to the current instance, nullptr if not an instance or not set */
 Core::InstanceContentPtr Core::Entity::Actor::getCurrentInstance() const
 {
-   return getCurrentZone()->getAsInstanceContent();
+   if( m_pCurrentZone )
+      return m_pCurrentZone->getAsInstanceContent();
+
+   return nullptr;
 }
 
 /*!
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 9784e8e1..87fba41a 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -56,6 +56,15 @@ void Core::Entity::EventObject::setState( uint8_t state )
 {
    m_state = state;
 
+   for( const auto& player : m_inRangePlayers )
+   {
+      ZoneChannelPacket< FFXIVIpcActorControl142 > eobjUpdatePacket( getId(), player->getId() );
+      eobjUpdatePacket.data().category = Common::ActorControlType::DirectorEObjMod;
+      eobjUpdatePacket.data().param1 = state;
+
+      player->queuePacket( eobjUpdatePacket );
+   }
+
    //m_parentInstance->updateEObj( InstanceObjectPtr( this ) );
 }
 

From 4afc9e91b7dafa40ac8122565a406e0603695fe6 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Tue, 27 Feb 2018 02:13:01 +1100
Subject: [PATCH 35/69] eobj interaction callbacks, eobj spawning fixed,
 sastasha instance eobjs

---
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 15 +++---
 src/servers/sapphire_api/Forwards.h           |  4 +-
 .../sapphire_zone/Actor/EventObject.cpp       | 24 ++++++++-
 src/servers/sapphire_zone/Actor/EventObject.h | 10 ++++
 .../Scripts/instances/dungeon/Sastasha.cpp    | 50 +++++++++++++++++++
 .../dungeon/TheThousandMawsOfTotoRak.cpp      |  1 +
 .../sapphire_zone/Zone/InstanceContent.cpp    | 21 +++++++-
 .../sapphire_zone/Zone/InstanceContent.h      |  1 +
 src/servers/sapphire_zone/Zone/Zone.cpp       |  4 +-
 src/servers/sapphire_zone/Zone/Zone.h         |  2 +-
 10 files changed, 119 insertions(+), 13 deletions(-)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 3899a0a5..985af408 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1319,18 +1319,21 @@ struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket<ObjectSpawn>
    uint8_t count;
    uint8_t objKind;
    uint8_t state;
-   uint8_t unknown2;
+   uint8_t unknown3;
    uint32_t objId;
    uint32_t actorId;
    uint32_t levelId;
    uint32_t unknown10;
    uint32_t someActorId14;
    uint32_t hierachyId;
-   uint32_t unknown1C;
-   uint32_t unknown20;
-   uint32_t unknown24;
-   uint32_t unknown28;
-   uint32_t unknown2c;
+   float scale;
+   int16_t unknown20a;
+   uint16_t unknown20b;
+   int16_t unknown24a;
+   int16_t unknown24b;
+   uint16_t unknown28a;
+   int16_t unknown28c;
+   uint32_t unknown2C;
    Common::FFXIVARR_POSITION3 position;
    int16_t rotation;
    int16_t unknown;
diff --git a/src/servers/sapphire_api/Forwards.h b/src/servers/sapphire_api/Forwards.h
index cbc8d820..73b6429d 100644
--- a/src/servers/sapphire_api/Forwards.h
+++ b/src/servers/sapphire_api/Forwards.h
@@ -91,10 +91,10 @@ namespace Core
 
    namespace Scripting
    {
-      typedef std::function< void( Entity::Player&, uint32_t, uint16_t, uint16_t, uint16_t, uint16_t ) > EventReturnCallback;
+      using EventReturnCallback = std::function< void( Entity::Player&, uint32_t, uint16_t, uint16_t, uint16_t, uint16_t ) >;
    }
 
-   typedef std::function< void( Entity::Player&, uint32_t, uint64_t ) > ActionCallback;
+   using ActionCallback = std::function< void( Entity::Player&, uint32_t, uint64_t ) >;
 
 }
 
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 87fba41a..26775c1b 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -42,6 +42,26 @@ uint32_t Core::Entity::EventObject::getObjectId() const
    return m_objectId;
 }
 
+float Core::Entity::EventObject::getScale() const
+{
+   return m_scale;
+}
+
+void Core::Entity::EventObject::setScale( float scale )
+{
+   m_scale = scale;
+}
+
+Core::Entity::EventObject::OnTalkEventHandler Core::Entity::EventObject::getOnTalkHandler() const
+{
+   return m_onTalkEventHandler;
+}
+
+void Core::Entity::EventObject::setOnTalkHandler( Core::Entity::EventObject::OnTalkEventHandler handler )
+{
+   m_onTalkEventHandler = handler;
+}
+
 void Core::Entity::EventObject::setMapLinkId( uint32_t mapLinkId )
 {
    m_mapLinkId = mapLinkId;
@@ -64,8 +84,6 @@ void Core::Entity::EventObject::setState( uint8_t state )
 
       player->queuePacket( eobjUpdatePacket );
    }
-
-   //m_parentInstance->updateEObj( InstanceObjectPtr( this ) );
 }
 
 void Core::Entity::EventObject::setParentInstance( Core::InstanceContentPtr instance )
@@ -88,6 +106,8 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
    eobjStatePacket.data().objId = getObjectId();
    eobjStatePacket.data().hierachyId = getMapLinkId();
    eobjStatePacket.data().position = getPos();
+   eobjStatePacket.data().scale = getScale();
+   eobjStatePacket.data().actorId = getId();
    pTarget->queuePacket( eobjStatePacket );
 }
 
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 076a8a85..85dd329d 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -13,12 +13,20 @@ namespace Entity
       EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
                    const std::string& givenName = "none" );
 
+      using OnTalkEventHandler = std::function< void( Entity::Player&, uint64_t ) >;
+
       uint32_t getMapLinkId() const;
       void setMapLinkId( uint32_t mapLinkId );
 
       uint8_t getState() const;
       void setState( uint8_t state );
 
+      float getScale() const;
+      void setScale( float scale );
+
+      void setOnTalkHandler( OnTalkEventHandler handler );
+      OnTalkEventHandler getOnTalkHandler() const;
+
       uint32_t getObjectId() const;
 
       const std::string& getName() const;
@@ -33,8 +41,10 @@ namespace Entity
       uint32_t m_mapLinkId;
       uint32_t m_objectId;
       uint8_t m_state;
+      float m_scale;
       std::string m_name;
       InstanceContentPtr m_parentInstance;
+      OnTalkEventHandler m_onTalkEventHandler;
    };
 }
 }
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp
new file mode 100644
index 00000000..9d120479
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp
@@ -0,0 +1,50 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Sastasha : public InstanceContentScript
+{
+private:
+   static void exitOnTalk( Entity::Player& player, uint64_t actorId )
+   {
+      player.sendDebug( "actor: " + std::to_string( actorId ) );
+   }
+
+public:
+   Sastasha() : InstanceContentScript( 4 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      auto exit = instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { -314, 5.6, 348.73 } );
+      exit->setScale( 0.6f );
+      exit->setOnTalkHandler( exitOnTalk );
+
+      instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { 361, 46, -225 } );
+
+      auto memo = instance->registerEObj( "BloodyMemo", BLOODY_MEMO_1, 0, BLOODY_MEMO_STATE, { 320.81, 47.86, -130.78 } );
+      memo->setScale( 0.6f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+private:
+   static constexpr auto EXIT_OBJECT = 2000139;
+   static constexpr auto EXIT_OBJECT_STATE = 4;
+
+   static constexpr auto START_CIRCLE = 2000182;
+   static constexpr auto START_CIRCLE_MAPLINK = 4096706;
+   static constexpr auto START_CIRCLE_STATE = 5;
+
+   static constexpr auto BLOODY_MEMO_1 = 2000212;
+   static constexpr auto BLOODY_MEMO_2 = 2001548;
+   static constexpr auto BLOODY_MEMO_3 = 2001549;
+   static constexpr auto BLOODY_MEMO_STATE = 4;
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp
index 037db112..4094b7b7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp
@@ -10,6 +10,7 @@ public:
    void onInit( InstanceContentPtr instance ) override
    {
       instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { 237, -39, -144 } );
+      instance->getEObjByName( "Exit" )->setScale( 0.6f );
       instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { -322, 12, -78 } );
    }
 
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 2b8682a0..48457c84 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -4,6 +4,7 @@
 #include <common/Logging/Logger.h>
 #include <common/Util/Util.h>
 #include <common/Util/UtilMath.h>
+#include <common/Exd/ExdDataGenerated.h>
 
 #include "Event/Director.h"
 #include "Script/ScriptManager.h"
@@ -17,6 +18,7 @@
 
 extern Core::Logger g_log;
 extern Core::Scripting::ScriptManager g_scriptMgr;
+extern Core::Data::ExdDataGenerated g_exdDataGen;
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -230,6 +232,13 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
       m_eventObjectMap[object->getName()] = object;
    if( object->getObjectId() == 2000182 ) // start
       m_pEntranceEObj = object;
+
+   auto objData = g_exdDataGen.get< Core::Data::EObj >( object->getObjectId() );
+   if( objData )
+      // todo: data should be renamed to eventId
+      m_eventIdToObjectMap[objData->data] = object;
+   else
+      g_log.error( "InstanceContent::onRegisterEObj Zone " + m_internalName + ": No EObj data found for EObj with ID: " + std::to_string( object->getObjectId() ) );
 }
 
 void Core::InstanceContent::onBeforeEnterTerritory( Core::Entity::Player &player )
@@ -257,5 +266,15 @@ Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::st
 
 void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t eventId, uint64_t actorId )
 {
-   auto type = static_cast< Core::Event::EventHandler::EventType >( eventId >> 16 );
+   // todo: handle exit (and maybe shortcut?) behaviour here
+
+   auto it = m_eventIdToObjectMap.find( eventId );
+   if( it == m_eventIdToObjectMap.end() )
+      return;
+
+   if( auto onTalk = it->second->getOnTalkHandler() )
+      onTalk( player, actorId );
+   else
+      player.sendDebug( "No onTalk handler found for interactable eobj with EObjID: " +
+                        std::to_string( it->second->getObjectId() ) + ", eventId: " + std::to_string( eventId ) );
 }
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index b42dc47d..328251c4 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -57,6 +57,7 @@ private:
    Entity::EventObjectPtr m_pEntranceEObj;
 
    std::map< std::string, Entity::EventObjectPtr > m_eventObjectMap;
+   std::unordered_map< uint32_t, Entity::EventObjectPtr > m_eventIdToObjectMap;
 };
 
 }
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 1df0f389..8bfb0f01 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -689,9 +689,11 @@ uint32_t Core::Zone::getNextEObjId()
    return ++m_nextEObjId;
 }
 
-void Core::Zone::registerEObj( const std::string &name, uint32_t objectId, uint32_t mapLink, uint8_t state,
+Core::Entity::EventObjectPtr Core::Zone::registerEObj( const std::string &name, uint32_t objectId, uint32_t mapLink, uint8_t state,
                                FFXIVARR_POSITION3 pos )
 {
    auto eObj = Entity::make_EventObject( objectId, mapLink, state, pos, name );
    registerEObj( eObj );
+
+   return eObj;
 }
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 097100c9..a876a00f 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -108,7 +108,7 @@ public:
 
    void updateSessions( bool changedWeather );
 
-   void registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink,
+   Entity::EventObjectPtr registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink,
                       uint8_t state, Common::FFXIVARR_POSITION3 pos );
 
    void registerEObj( Entity::EventObjectPtr object );

From 0e64bf76d253f6f842fdcc021056a7073d828ff2 Mon Sep 17 00:00:00 2001
From: Mordred <30826167+SapphireMordred@users.noreply.github.com>
Date: Mon, 26 Feb 2018 19:33:31 +0100
Subject: [PATCH 36/69] Update Sastasha.cpp

---
 .../Script/Scripts/instances/dungeon/Sastasha.cpp         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp
index 9d120479..9e1329af 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp
@@ -15,13 +15,13 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      auto exit = instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { -314, 5.6, 348.73 } );
+      auto exit = instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { -314.0f, 5.6f, 348.73f } );
       exit->setScale( 0.6f );
       exit->setOnTalkHandler( exitOnTalk );
 
-      instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { 361, 46, -225 } );
+      instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { 361.0f, 46.0f, -225.0f } );
 
-      auto memo = instance->registerEObj( "BloodyMemo", BLOODY_MEMO_1, 0, BLOODY_MEMO_STATE, { 320.81, 47.86, -130.78 } );
+      auto memo = instance->registerEObj( "BloodyMemo", BLOODY_MEMO_1, 0, BLOODY_MEMO_STATE, { 320.81f, 47.86f, -130.78f } );
       memo->setScale( 0.6f );
    }
 
@@ -47,4 +47,4 @@ private:
    static constexpr auto BLOODY_MEMO_2 = 2001548;
    static constexpr auto BLOODY_MEMO_3 = 2001549;
    static constexpr auto BLOODY_MEMO_STATE = 4;
-};
\ No newline at end of file
+};

From b9da9eed664521cb11fd5d624b1fdb8390cd4740 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Mon, 26 Feb 2018 23:43:19 +0100
Subject: [PATCH 37/69] Added all barebone scripts

---
 CMakeLists.txt                                |   3 +-
 .../Scripts/instances/ABloodyReunion.cpp      |  57 ++
 .../instances/ARelicReborntheChimera.cpp      |  41 ++
 .../instances/ARelicReborntheHydra.cpp        |  66 ++
 .../instances/ASpectaclefortheAges.cpp        |  41 ++
 .../AccrueEnmityfromMultipleTargets.cpp       |  34 +
 .../instances/AkhAfahAmphitheatreExtreme.cpp  |  33 +
 .../instances/AkhAfahAmphitheatreHard.cpp     |  33 +
 .../Script/Scripts/instances/AlaMhigo.cpp     |  54 ++
 .../instances/AlexanderTheArmoftheFather.cpp  |  39 ++
 .../AlexanderTheArmoftheFatherSavage.cpp      |  39 ++
 .../instances/AlexanderTheArmoftheSon.cpp     |  68 ++
 .../AlexanderTheArmoftheSonSavage.cpp         |  68 ++
 .../AlexanderTheBreathoftheCreator.cpp        |  48 ++
 .../AlexanderTheBreathoftheCreatorSavage.cpp  |  48 ++
 .../AlexanderTheBurdenoftheFather.cpp         |  28 +
 .../AlexanderTheBurdenoftheFatherSavage.cpp   |  28 +
 .../instances/AlexanderTheBurdenoftheSon.cpp  |  31 +
 .../AlexanderTheBurdenoftheSonSavage.cpp      |  31 +
 .../instances/AlexanderTheCuffoftheFather.cpp |  49 ++
 .../AlexanderTheCuffoftheFatherSavage.cpp     |  49 ++
 .../instances/AlexanderTheCuffoftheSon.cpp    |  48 ++
 .../AlexanderTheCuffoftheSonSavage.cpp        |  48 ++
 .../AlexanderTheEyesoftheCreator.cpp          |  50 ++
 .../AlexanderTheEyesoftheCreatorSavage.cpp    |  50 ++
 .../instances/AlexanderTheFistoftheFather.cpp |  58 ++
 .../AlexanderTheFistoftheFatherSavage.cpp     |  58 ++
 .../instances/AlexanderTheFistoftheSon.cpp    |  49 ++
 .../AlexanderTheFistoftheSonSavage.cpp        |  49 ++
 .../AlexanderTheHeartoftheCreator.cpp         |  55 ++
 .../AlexanderTheHeartoftheCreatorSavage.cpp   |  55 ++
 .../AlexanderTheSouloftheCreator.cpp          |  46 ++
 .../AlexanderTheSouloftheCreatorSavage.cpp    |  46 ++
 .../instances/AllsWellthatEndsintheWell.cpp   |  27 +
 .../Script/Scripts/instances/AmdaporKeep.cpp  | 107 ++++
 .../Scripts/instances/AmdaporKeepHard.cpp     |  56 ++
 .../Script/Scripts/instances/AnnoytheVoid.cpp |  25 +
 .../AssistAlliesinDefeatingaTarget.cpp        |  34 +
 .../Script/Scripts/instances/Astragalos.cpp   |  39 ++
 .../instances/AvoidAreaofEffectAttacks.cpp    |  34 +
 .../Scripts/instances/AvoidEngagedTargets.cpp |  34 +
 .../Script/Scripts/instances/BaelsarsWall.cpp |  51 ++
 .../Scripts/instances/BardamsMettle.cpp       |  49 ++
 .../instances/BasicTrainingEnemyParties.cpp   |  25 +
 .../BasicTrainingEnemyStrongholds.cpp         |  28 +
 .../Scripts/instances/BattleintheBigKeep.cpp  | 107 ++++
 .../instances/BattleontheBigBridge.cpp        |  33 +
 .../Script/Scripts/instances/BloodDragoon.cpp |  49 ++
 .../Scripts/instances/BloodontheDeck.cpp      |  26 +
 .../Scripts/instances/BrayfloxsLongstop.cpp   |  43 ++
 .../instances/BrayfloxsLongstopHard.cpp       |  48 ++
 .../Script/Scripts/instances/CapeWestwind.cpp |  28 +
 .../Scripts/instances/CastrumAbania.cpp       |  81 +++
 .../Scripts/instances/CastrumMeridianum.cpp   |  82 +++
 .../Script/Scripts/instances/CommonGen.h      | 590 ++++++++++++++++++
 .../Scripts/instances/ContainmentBayP1T6.cpp  |  33 +
 .../instances/ContainmentBayP1T6Extreme.cpp   |  33 +
 .../Scripts/instances/ContainmentBayS1T7.cpp  |  40 ++
 .../instances/ContainmentBayS1T7Extreme.cpp   |  40 ++
 .../Scripts/instances/ContainmentBayZ1T9.cpp  |  39 ++
 .../instances/ContainmentBayZ1T9Extreme.cpp   |  39 ++
 .../Scripts/instances/CopperbellMines.cpp     |  75 +++
 .../Scripts/instances/CopperbellMinesHard.cpp |  65 ++
 .../instances/CuriousGorgeMeetsHisMatch.cpp   |  27 +
 .../Script/Scripts/instances/CuttersCry.cpp   |  55 ++
 .../Scripts/instances/DarkwingDragon.cpp      |  29 +
 .../instances/DefeatanOccupiedTarget.cpp      |  34 +
 .../Scripts/instances/DeltascapeV10.cpp       |  30 +
 .../Scripts/instances/DeltascapeV10Savage.cpp |  30 +
 .../Scripts/instances/DeltascapeV20.cpp       |  29 +
 .../Scripts/instances/DeltascapeV20Savage.cpp |  29 +
 .../Scripts/instances/DeltascapeV30.cpp       |  44 ++
 .../Scripts/instances/DeltascapeV30Savage.cpp |  44 ++
 .../Scripts/instances/DeltascapeV40.cpp       |  34 +
 .../Scripts/instances/DeltascapeV40Savage.cpp |  34 +
 .../Script/Scripts/instances/DomaCastle.cpp   |  53 ++
 .../Script/Scripts/instances/DunScaith.cpp    |  86 +++
 .../Scripts/instances/DzemaelDarkhold.cpp     |  92 +++
 .../Script/Scripts/instances/Emanation.cpp    |  27 +
 .../Scripts/instances/EmanationExtreme.cpp    |  27 +
 .../instances/EngageEnemyReinforcements.cpp   |  34 +
 .../instances/EngageMultipleTargets.cpp       |  34 +
 .../instances/ExecuteaComboinBattle.cpp       |  34 +
 .../ExecuteaCombotoIncreaseEnmity.cpp         |  34 +
 .../ExecuteaRangedAttacktoIncreaseEnmity.cpp  |  34 +
 .../Scripts/instances/FinalExercise.cpp       |  27 +
 .../FlickingSticksandTakingNames.cpp          |  26 +
 .../Script/Scripts/instances/Halatali.cpp     |  66 ++
 .../Script/Scripts/instances/HalataliHard.cpp |  75 +++
 .../Script/Scripts/instances/HaukkeManor.cpp  |  59 ++
 .../Scripts/instances/HaukkeManorHard.cpp     |  75 +++
 .../Scripts/instances/HealMultipleAllies.cpp  |  34 +
 .../Script/Scripts/instances/HealanAlly.cpp   |  34 +
 .../Script/Scripts/instances/HellsLid.cpp     |  68 ++
 .../Scripts/instances/HeroontheHalfShell.cpp  |  25 +
 .../Scripts/instances/HullbreakerIsle.cpp     |  75 +++
 .../Scripts/instances/HullbreakerIsleHard.cpp |  51 ++
 .../Script/Scripts/instances/InThalsName.cpp  |  27 +
 .../instances/InteractwiththeBattlefield.cpp  |  34 +
 .../instances/InterdimensionalRift.cpp        |  35 ++
 .../Scripts/instances/ItsProbablyaTrap.cpp    |  33 +
 .../Script/Scripts/instances/KuganeCastle.cpp |  86 +++
 .../Scripts/instances/LongLivetheQueen.cpp    |  41 ++
 .../Scripts/instances/MatsubaMayhem.cpp       |  33 +
 .../Scripts/instances/MorethanaFeeler.cpp     |  25 +
 .../Script/Scripts/instances/Naadam.cpp       |  29 +
 .../Script/Scripts/instances/Neverreap.cpp    |  65 ++
 .../Scripts/instances/OneLifeforOneWorld.cpp  |  29 +
 .../Scripts/instances/OurCompromise.cpp       |  26 +
 .../Scripts/instances/OurUnsungHeroes.cpp     |  65 ++
 .../Script/Scripts/instances/PharosSirius.cpp |  53 ++
 .../Scripts/instances/PharosSiriusHard.cpp    |  51 ++
 .../Scripts/instances/PullingPoisonPosies.cpp |  25 +
 .../Scripts/instances/RaisingtheSword.cpp     |  27 +
 .../Scripts/instances/ReturnoftheBull.cpp     |  54 ++
 .../instances/SaintMociannesArboretum.cpp     |  51 ++
 .../Script/Scripts/instances/Sastasha.cpp     |  65 ++
 .../Script/Scripts/instances/SastashaHard.cpp |  60 ++
 .../Scripts/instances/SealRockSeize.cpp       |  58 ++
 .../Scripts/instances/ShadowandClaw.cpp       |  41 ++
 .../instances/ShisuioftheVioletTides.cpp      |  67 ++
 .../Scripts/instances/SigmascapeV10.cpp       |  45 ++
 .../Scripts/instances/SigmascapeV10Savage.cpp |  45 ++
 .../Scripts/instances/SigmascapeV20.cpp       |  43 ++
 .../Scripts/instances/SigmascapeV20Savage.cpp |  43 ++
 .../Scripts/instances/SigmascapeV30.cpp       |  38 ++
 .../Scripts/instances/SigmascapeV30Savage.cpp |  38 ++
 .../Scripts/instances/SigmascapeV40.cpp       |  43 ++
 .../Scripts/instances/SigmascapeV40Savage.cpp |  43 ++
 .../Script/Scripts/instances/Snowcloak.cpp    |  58 ++
 .../Script/Scripts/instances/SohmAl.cpp       |  46 ++
 .../Script/Scripts/instances/SohmAlHard.cpp   |  67 ++
 .../Script/Scripts/instances/SohrKhai.cpp     |  54 ++
 .../Scripts/instances/SolemnTrinity.cpp       |  25 +
 .../Scripts/instances/SpecialEventI.cpp       |  27 +
 .../Scripts/instances/SpecialEventII.cpp      |  27 +
 .../Scripts/instances/SpecialEventIII.cpp     |  40 ++
 .../Script/Scripts/instances/StingingBack.cpp |  27 +
 .../Script/Scripts/instances/SyrcusTower.cpp  |  78 +++
 .../Script/Scripts/instances/TheAery.cpp      |  45 ++
 .../TheAetherochemicalResearchFacility.cpp    |  57 ++
 .../Script/Scripts/instances/TheAntitower.cpp |  76 +++
 .../Script/Scripts/instances/TheAquapolis.cpp | 119 ++++
 .../Script/Scripts/instances/TheAurumVale.cpp |  38 ++
 .../Scripts/instances/TheBattleonBekko.cpp    |  27 +
 .../TheBindingCoilofBahamutTurn1.cpp          |  58 ++
 .../TheBindingCoilofBahamutTurn2.cpp          |  54 ++
 .../TheBindingCoilofBahamutTurn3.cpp          |  72 +++
 .../TheBindingCoilofBahamutTurn4.cpp          |  40 ++
 .../TheBindingCoilofBahamutTurn5.cpp          |  34 +
 .../instances/TheBorderlandRuinsSecure.cpp    |  40 ++
 .../Scripts/instances/TheBowlofEmbers.cpp     |  29 +
 .../instances/TheBowlofEmbersExtreme.cpp      |  29 +
 .../Scripts/instances/TheBowlofEmbersHard.cpp |  29 +
 .../instances/TheCarteneauFlatsHeliodrome.cpp |  40 ++
 .../Script/Scripts/instances/TheChrysalis.cpp |  44 ++
 .../Scripts/instances/TheDragonsNeck.cpp      |  75 +++
 .../instances/TheDrownedCityofSkalla.cpp      |  54 ++
 .../Script/Scripts/instances/TheDuskVigil.cpp |  62 ++
 .../Scripts/instances/TheFaceofTrueEvil.cpp   |  25 +
 .../instances/TheFeast4on4LightParty.cpp      |  29 +
 .../Scripts/instances/TheFeast4on4Ranked.cpp  |  27 +
 .../instances/TheFeast4on4Training.cpp        |  27 +
 .../TheFeastCustomMatchCrystalTower.cpp       |  31 +
 .../TheFeastCustomMatchFeastingGrounds.cpp    |  29 +
 .../TheFeastCustomMatchLichenweed.cpp         |  27 +
 .../Scripts/instances/TheFeastRanked.cpp      |  31 +
 .../Scripts/instances/TheFeastTeamRanked.cpp  |  31 +
 .../Scripts/instances/TheFeastTraining.cpp    |  31 +
 .../instances/TheFieldsofGloryShatter.cpp     |  50 ++
 .../instances/TheFinalCoilofBahamutTurn1.cpp  |  48 ++
 .../instances/TheFinalCoilofBahamutTurn2.cpp  |  57 ++
 .../instances/TheFinalCoilofBahamutTurn3.cpp  |  31 +
 .../instances/TheFinalCoilofBahamutTurn4.cpp  |  32 +
 .../instances/TheFinalStepsofFaith.cpp        |  30 +
 .../Scripts/instances/TheFractalContinuum.cpp |  88 +++
 .../instances/TheFractalContinuumHard.cpp     |  58 ++
 .../instances/TheGreatGubalLibrary.cpp        |  56 ++
 .../instances/TheGreatGubalLibraryHard.cpp    |  69 ++
 .../Scripts/instances/TheHauntedManor.cpp     |  41 ++
 .../instances/TheHeartoftheProblem.cpp        |  29 +
 .../instances/TheHiddenCanalsofUznair.cpp     | 140 +++++
 .../Scripts/instances/TheHowlingEye.cpp       |  35 ++
 .../instances/TheHowlingEyeExtreme.cpp        |  35 ++
 .../Scripts/instances/TheHowlingEyeHard.cpp   |  35 ++
 .../Script/Scripts/instances/TheJadeStoa.cpp  |  30 +
 .../Scripts/instances/TheJadeStoaExtreme.cpp  |  30 +
 .../Scripts/instances/TheKeeperoftheLake.cpp  |  51 ++
 .../instances/TheLabyrinthoftheAncients.cpp   |  91 +++
 .../instances/TheLimitlessBlueExtreme.cpp     |  33 +
 .../instances/TheLimitlessBlueHard.cpp        |  33 +
 .../instances/TheLostCanalsofUznair.cpp       | 140 +++++
 .../instances/TheLostCityofAmdapor.cpp        |  69 ++
 .../instances/TheLostCityofAmdaporHard.cpp    |  65 ++
 .../TheMinstrelsBalladNidhoggsRage.cpp        |  30 +
 .../TheMinstrelsBalladShinryusDomain.cpp      |  44 ++
 .../TheMinstrelsBalladThordansReign.cpp       |  58 ++
 .../TheMinstrelsBalladUltimasBane.cpp         |  33 +
 .../Script/Scripts/instances/TheNavel.cpp     |  27 +
 .../Scripts/instances/TheNavelExtreme.cpp     |  27 +
 .../Script/Scripts/instances/TheNavelHard.cpp |  27 +
 .../instances/TheOrphansandtheBrokenBlade.cpp |  25 +
 .../ThePalaceoftheDeadFloors101110.cpp        |  27 +
 .../instances/ThePalaceoftheDeadFloors110.cpp |  26 +
 .../ThePalaceoftheDeadFloors111120.cpp        |  26 +
 .../ThePalaceoftheDeadFloors1120.cpp          |  26 +
 .../ThePalaceoftheDeadFloors121130.cpp        |  26 +
 .../ThePalaceoftheDeadFloors131140.cpp        |  26 +
 .../ThePalaceoftheDeadFloors141150.cpp        |  26 +
 .../ThePalaceoftheDeadFloors151160.cpp        |  26 +
 .../ThePalaceoftheDeadFloors161170.cpp        |  26 +
 .../ThePalaceoftheDeadFloors171180.cpp        |  26 +
 .../ThePalaceoftheDeadFloors181190.cpp        |  26 +
 .../ThePalaceoftheDeadFloors191200.cpp        |  26 +
 .../ThePalaceoftheDeadFloors2130.cpp          |  26 +
 .../ThePalaceoftheDeadFloors3140.cpp          |  33 +
 .../ThePalaceoftheDeadFloors4150.cpp          |  33 +
 .../ThePalaceoftheDeadFloors5160.cpp          |  26 +
 .../ThePalaceoftheDeadFloors6170.cpp          |  26 +
 .../ThePalaceoftheDeadFloors7180.cpp          |  26 +
 .../ThePalaceoftheDeadFloors8190.cpp          |  27 +
 .../ThePalaceoftheDeadFloors91100.cpp         |  27 +
 .../Scripts/instances/ThePoolofTribute.cpp    |  29 +
 .../instances/ThePoolofTributeExtreme.cpp     |  29 +
 .../Scripts/instances/ThePraetorium.cpp       | 131 ++++
 .../Script/Scripts/instances/TheResonant.cpp  |  31 +
 .../instances/TheRoyalCityofRabanastre.cpp    | 114 ++++
 .../Scripts/instances/TheRoyalMenagerie.cpp   |  40 ++
 .../TheSecondCoilofBahamutSavageTurn1.cpp     |  38 ++
 .../TheSecondCoilofBahamutSavageTurn2.cpp     |  38 ++
 .../TheSecondCoilofBahamutSavageTurn3.cpp     |  74 +++
 .../TheSecondCoilofBahamutSavageTurn4.cpp     |  38 ++
 .../instances/TheSecondCoilofBahamutTurn1.cpp |  38 ++
 .../instances/TheSecondCoilofBahamutTurn2.cpp |  38 ++
 .../instances/TheSecondCoilofBahamutTurn3.cpp |  74 +++
 .../instances/TheSecondCoilofBahamutTurn4.cpp |  38 ++
 .../instances/TheSingularityReactor.cpp       |  58 ++
 .../Scripts/instances/TheSirensongSea.cpp     |  52 ++
 .../Scripts/instances/TheStepsofFaith.cpp     |  48 ++
 .../Scripts/instances/TheStoneVigil.cpp       |  49 ++
 .../Scripts/instances/TheStoneVigilHard.cpp   |  45 ++
 .../instances/TheStrikingTreeExtreme.cpp      |  27 +
 .../Scripts/instances/TheStrikingTreeHard.cpp |  27 +
 .../instances/TheSunkenTempleofQarn.cpp       |  80 +++
 .../instances/TheSunkenTempleofQarnHard.cpp   |  71 +++
 .../Scripts/instances/TheTamTaraDeepcroft.cpp |  45 ++
 .../instances/TheTamTaraDeepcroftHard.cpp     |  76 +++
 .../Scripts/instances/TheTempleoftheFist.cpp  |  62 ++
 .../instances/TheThousandMawsofTotoRak.cpp    |  75 +++
 .../TheUnendingCoilofBahamutUltimate.cpp      |  33 +
 .../instances/TheValentionesCeremony.cpp      |  69 ++
 .../Script/Scripts/instances/TheVault.cpp     |  63 ++
 .../Script/Scripts/instances/TheVoidArk.cpp   |  98 +++
 .../Scripts/instances/TheWanderersPalace.cpp  |  71 +++
 .../instances/TheWanderersPalaceHard.cpp      |  52 ++
 .../instances/TheWeepingCityofMhach.cpp       | 107 ++++
 .../instances/TheWhorleaterExtreme.cpp        |  32 +
 .../Scripts/instances/TheWhorleaterHard.cpp   |  32 +
 .../Scripts/instances/TheWorldofDarkness.cpp  | 116 ++++
 .../Scripts/instances/ThokastThokExtreme.cpp  |  47 ++
 .../Scripts/instances/ThokastThokHard.cpp     |  47 ++
 .../Scripts/instances/ThornmarchExtreme.cpp   |  27 +
 .../Scripts/instances/ThornmarchHard.cpp      |  27 +
 .../Scripts/instances/UndertheArmor.cpp       |  26 +
 .../Script/Scripts/instances/UrthsFount.cpp   |  27 +
 .../Script/Scripts/instances/WardUp.cpp       |  25 +
 .../Scripts/instances/WhenClansCollide.cpp    |  29 +
 .../Scripts/instances/WithHeartandSteel.cpp   | 107 ++++
 .../Script/Scripts/instances/Xelphatol.cpp    |  58 ++
 .../Scripts/instances/dungeon/Sastasha.cpp    |  50 --
 .../dungeon/TheThousandMawsOfTotoRak.cpp      |  34 -
 .../Scripts/instances/trials/TheNavel.cpp     |  33 -
 src/servers/sapphire_zone/Zone/Zone.cpp       |   5 +-
 src/servers/sapphire_zone/Zone/Zone.h         |   2 +-
 274 files changed, 12871 insertions(+), 121 deletions(-)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ABloodyReunion.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheChimera.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheHydra.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ASpectaclefortheAges.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AccrueEnmityfromMultipleTargets.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlaMhigo.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFather.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFatherSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSonSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreator.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreatorSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFather.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFatherSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSonSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFather.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFatherSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSonSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreator.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreatorSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFather.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFatherSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSonSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreator.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreatorSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreator.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreatorSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AllsWellthatEndsintheWell.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeep.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeepHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AnnoytheVoid.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AssistAlliesinDefeatingaTarget.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/Astragalos.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AvoidAreaofEffectAttacks.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/AvoidEngagedTargets.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BaelsarsWall.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BardamsMettle.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyParties.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyStrongholds.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BattleintheBigKeep.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BattleontheBigBridge.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BloodDragoon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BloodontheDeck.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstop.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstopHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CapeWestwind.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CastrumAbania.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CastrumMeridianum.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6Extreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7Extreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9Extreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMines.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMinesHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CuriousGorgeMeetsHisMatch.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CuttersCry.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DarkwingDragon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DefeatanOccupiedTarget.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DomaCastle.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DunScaith.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/DzemaelDarkhold.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/Emanation.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/EmanationExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/EngageEnemyReinforcements.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/EngageMultipleTargets.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaComboinBattle.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaCombotoIncreaseEnmity.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaRangedAttacktoIncreaseEnmity.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/FinalExercise.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/FlickingSticksandTakingNames.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/Halatali.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HalataliHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManor.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManorHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HealMultipleAllies.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HealanAlly.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HellsLid.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HeroontheHalfShell.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsle.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsleHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/InThalsName.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/InteractwiththeBattlefield.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/InterdimensionalRift.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ItsProbablyaTrap.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/KuganeCastle.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/LongLivetheQueen.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/MatsubaMayhem.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/MorethanaFeeler.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/Naadam.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/Neverreap.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/OneLifeforOneWorld.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/OurCompromise.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/OurUnsungHeroes.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/PharosSirius.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/PharosSiriusHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/PullingPoisonPosies.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/RaisingtheSword.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ReturnoftheBull.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SaintMociannesArboretum.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SastashaHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SealRockSeize.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ShadowandClaw.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ShisuioftheVioletTides.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/Snowcloak.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SohmAl.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SohmAlHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SohrKhai.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SolemnTrinity.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventI.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventII.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventIII.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/StingingBack.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/SyrcusTower.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheAery.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheAetherochemicalResearchFacility.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheAntitower.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheAquapolis.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheAurumVale.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBattleonBekko.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn1.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn3.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn4.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn5.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBorderlandRuinsSecure.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbers.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheCarteneauFlatsHeliodrome.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheChrysalis.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheDragonsNeck.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheDrownedCityofSkalla.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheDuskVigil.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFaceofTrueEvil.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4LightParty.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Ranked.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Training.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchCrystalTower.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchFeastingGrounds.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchLichenweed.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeastRanked.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTeamRanked.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTraining.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFieldsofGloryShatter.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn1.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn3.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn4.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFinalStepsofFaith.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuum.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuumHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibrary.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibraryHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheHauntedManor.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheHeartoftheProblem.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheHiddenCanalsofUznair.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEye.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoa.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoaExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheKeeperoftheLake.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheLabyrinthoftheAncients.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheLostCanalsofUznair.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdapor.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdaporHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladNidhoggsRage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladShinryusDomain.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladThordansReign.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladUltimasBane.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheNavel.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheNavelExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheNavelHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheOrphansandtheBrokenBlade.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors101110.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors110.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors111120.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors1120.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors121130.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors131140.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors141150.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors151160.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors161170.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors171180.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors181190.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors191200.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors2130.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors3140.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors4150.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors5160.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors6170.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors7180.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors8190.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors91100.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTribute.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTributeExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThePraetorium.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheResonant.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalCityofRabanastre.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalMenagerie.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn1.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn3.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn4.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn1.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn3.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn4.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSingularityReactor.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSirensongSea.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheStepsofFaith.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigil.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigilHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarn.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarnHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroft.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroftHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheTempleoftheFist.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheThousandMawsofTotoRak.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheUnendingCoilofBahamutUltimate.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheValentionesCeremony.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheVault.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheVoidArk.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalace.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalaceHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheWeepingCityofMhach.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/TheWorldofDarkness.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchHard.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/UndertheArmor.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/UrthsFount.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/WardUp.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/WhenClansCollide.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/WithHeartandSteel.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/Xelphatol.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca7af689..561d4790 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,4 +67,5 @@ add_subdirectory("src/tools/exd_common_gen")
 add_subdirectory("src/tools/exd_struct_gen")
 add_subdirectory("src/tools/exd_struct_test")
 add_subdirectory("src/tools/quest_parser")
-#add_subdirectory("src/tools/pcb_reader")
+add_subdirectory("src/tools/pcb_reader")
+add_subdirectory("src/tools/event_object_parser")
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ABloodyReunion.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ABloodyReunion.cpp
new file mode 100644
index 00000000..03dc3ed1
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ABloodyReunion.cpp
@@ -0,0 +1,57 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ABloodyReunion : public InstanceContentScript
+{
+public:
+   ABloodyReunion() : InstanceContentScript( 5002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -133.497498f, 394.924286f, -295.299713f }, 1.400000f );
+      instance->registerEObj( "Unknown1", 2002872, 5786705, 4, { -140.602203f, 394.529388f, -295.997314f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005310, 5698551, 4, { -81.047653f, 394.430786f, -296.243713f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2006038, 5891863, 4, { -103.765701f, 394.988708f, -312.957214f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2006039, 5891860, 4, { -102.201103f, 394.988708f, -278.118988f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 228.611694f, 225.066895f, 272.124695f }, 1.400000f );
+      instance->registerEObj( "Unknown6", 2002872, 5786711, 4, { 220.192200f, 224.639603f, 271.691895f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002872, 5786715, 4, { 265.170685f, 225.066895f, 271.760712f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 230.175598f, -96.457947f, -160.689804f }, 1.400000f );
+      instance->registerEObj( "Unknown9", 2002872, 5786724, 4, { 231.302200f, -96.512398f, -143.853394f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2006040, 5855034, 4, { 230.235901f, -96.457947f, -181.102600f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 230.936203f, -456.457886f, 65.952606f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 229.505203f, -456.329193f, 99.828033f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002872, 5859273, 4, { 229.632996f, -456.457886f, 93.179420f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007177, 6268147, 4, { 230.075500f, -456.357605f, 58.431438f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007178, 6275911, 4, { 230.467407f, -456.457886f, 79.306190f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007168, 0, 4, { 248.035400f, 225.116302f, 271.869995f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2005295, 5698524, 4, { -232.841797f, 402.044098f, -353.718689f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005296, 5698521, 4, { -177.212006f, 398.044098f, -361.393311f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2005297, 5698523, 4, { -162.152802f, 398.044098f, -369.069885f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2005298, 5698522, 4, { -176.852295f, 398.044098f, -382.745087f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2005299, 5886628, 4, { -168.304993f, 394.044098f, -296.534088f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2005300, 5686456, 4, { 28.763180f, 209.979401f, 211.474701f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2005301, 5686457, 4, { 100.159401f, 220.000000f, 272.267090f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2005293, 5889119, 4, { 28.122299f, 209.979401f, 220.050293f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2005294, 5889137, 4, { 111.924896f, 219.958694f, 271.931000f }, 1.000000f );
+      instance->registerEObj( "Liftterminal", 2005308, 0, 4, { 203.525803f, -28.163019f, 195.849503f }, 0.991760f );
+      instance->registerEObj( "Liftterminal", 2005309, 0, 4, { 229.755005f, -59.269020f, 94.956909f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2005306, 5815811, 4, { -359.609406f, -299.984009f, -249.805496f }, 0.991760f );
+      instance->registerEObj( "Liftterminal", 2005307, 0, 4, { -351.717102f, -299.983887f, -250.003098f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -309.444885f, 400.000000f, -287.942108f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5782651, 5, { -332.999207f, 400.000000f, -297.435211f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheChimera.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheChimera.cpp
new file mode 100644
index 00000000..0be7715a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheChimera.cpp
@@ -0,0 +1,41 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ARelicReborntheChimera : public InstanceContentScript
+{
+public:
+   ARelicReborntheChimera() : InstanceContentScript( 20019 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheHydra.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheHydra.cpp
new file mode 100644
index 00000000..2683b929
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheHydra.cpp
@@ -0,0 +1,66 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ARelicReborntheHydra : public InstanceContentScript
+{
+public:
+   ARelicReborntheHydra() : InstanceContentScript( 20020 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2001649, 4097866, 4, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f );
+      instance->registerEObj( "Exit", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f );
+      instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f );
+      instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f );
+      instance->registerEObj( "Aetherialflow", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ASpectaclefortheAges.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ASpectaclefortheAges.cpp
new file mode 100644
index 00000000..55c6bc02
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ASpectaclefortheAges.cpp
@@ -0,0 +1,41 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ASpectaclefortheAges : public InstanceContentScript
+{
+public:
+   ASpectaclefortheAges() : InstanceContentScript( 5001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AccrueEnmityfromMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AccrueEnmityfromMultipleTargets.cpp
new file mode 100644
index 00000000..8db0f170
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AccrueEnmityfromMultipleTargets.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AccrueEnmityfromMultipleTargets : public InstanceContentScript
+{
+public:
+   AccrueEnmityfromMultipleTargets() : InstanceContentScript( 15004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
new file mode 100644
index 00000000..ad01d235
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AkhAfahAmphitheatreExtreme : public InstanceContentScript
+{
+public:
+   AkhAfahAmphitheatreExtreme() : InstanceContentScript( 20025 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreHard.cpp
new file mode 100644
index 00000000..fece0c08
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreHard.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AkhAfahAmphitheatreHard : public InstanceContentScript
+{
+public:
+   AkhAfahAmphitheatreHard() : InstanceContentScript( 20024 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlaMhigo.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlaMhigo.cpp
new file mode 100644
index 00000000..76209b41
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlaMhigo.cpp
@@ -0,0 +1,54 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlaMhigo : public InstanceContentScript
+{
+public:
+   AlaMhigo() : InstanceContentScript( 56 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6894813, 4, { -209.363495f, 35.017460f, 72.069672f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6894812, 4, { -172.226807f, 35.017342f, 72.369667f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -210.219406f, 35.017460f, 72.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2008685, 0, 4, { -192.767105f, 34.867069f, 71.984734f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6894833, 4, { 250.000000f, 106.496902f, -50.489590f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6894834, 4, { 250.000000f, 106.496902f, -89.516243f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 250.000000f, 106.496902f, -50.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002872, 6895342, 4, { 248.500000f, 122.000000f, -329.291107f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6865535, 4, { 249.561295f, 121.995796f, -352.681793f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007457, 6895343, 4, { 249.487595f, 122.005699f, -330.083801f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002872, 6904529, 4, { 248.937500f, 122.000000f, -377.252899f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2008350, 0, 4, { 250.000000f, 122.000000f, -353.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007168, 0, 4, { 250.018997f, 121.995796f, -353.109009f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6879593, 5, { -408.611298f, 2.500000f, 233.977905f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -398.118408f, 2.500000f, 236.857193f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 250.007294f, 122.000000f, -370.492889f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2008319, 6844583, 4, { -342.881104f, 24.000010f, 149.680099f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2008319, 6844584, 4, { -258.130402f, 27.000010f, 99.970268f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 6840800, 4, { -100.167801f, 44.750629f, 73.001747f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 6853103, 4, { 193.710297f, 106.000000f, 128.847397f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6847102, 4, { 263.424286f, 106.400002f, -8.750051f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007457, 6847104, 4, { 249.800797f, 106.428101f, -108.873100f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2008335, 6844579, 4, { 233.630905f, 109.971703f, -155.596298f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2008335, 6844578, 4, { 233.295197f, 109.971703f, -144.792892f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2008335, 6844581, 4, { 224.912094f, 120.000000f, -248.707504f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2008335, 6844580, 4, { 210.809296f, 120.000000f, -248.716202f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2008336, 6845038, 4, { 249.895905f, 122.099899f, -294.475403f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007457, 6942278, 4, { 233.967697f, 110.000000f, -150.215607f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007457, 6942279, 4, { 217.761505f, 119.889999f, -247.455597f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFather.cpp
new file mode 100644
index 00000000..88fbc4fb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFather.cpp
@@ -0,0 +1,39 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheArmoftheFather : public InstanceContentScript
+{
+public:
+   AlexanderTheArmoftheFather() : InstanceContentScript( 30023 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005400, 0, 4, { 39.638931f, -9.000000f, -67.173187f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005314, 5878653, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005314, 6048829, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006094, 5864098, 4, { 58.027489f, -0.000134f, -20.193150f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 58.000000f, -0.000003f, -20.943159f }, 0.600000f );
+      instance->registerEObj( "Unknown5", 2002872, 5787963, 4, { 58.043961f, -0.000054f, -20.107550f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 100.941902f, -10.500000f, -63.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 0, 4, { 87.814133f, -9.000000f, -61.109859f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005911, 5814854, 4, { 58.000000f, -8.999999f, -63.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006095, 5905878, 4, { 58.000000f, -9.000000f, -63.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5787948, 5, { -0.015320f, -0.015320f, 43.037189f }, 0.778198f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.252589f, 0.000000f, 30.523800f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5911899, 5, { 58.000000f, -0.000049f, -11.175000f }, 0.800000f );
+      instance->registerEObj( "Unknown11", 2000608, 5911895, 4, { 58.000000f, 0.841694f, -1.705941f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFatherSavage.cpp
new file mode 100644
index 00000000..c0ffba55
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFatherSavage.cpp
@@ -0,0 +1,39 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheArmoftheFatherSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheArmoftheFatherSavage() : InstanceContentScript( 30027 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005400, 0, 4, { 39.638931f, -9.000000f, -67.173187f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005314, 5878653, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005314, 6048829, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006094, 5864098, 4, { 58.027489f, -0.000134f, -20.193150f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 58.000000f, -0.000003f, -20.943159f }, 0.600000f );
+      instance->registerEObj( "Unknown5", 2002872, 5787963, 4, { 58.043961f, -0.000054f, -20.107550f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 100.941902f, -10.500000f, -63.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 0, 4, { 87.814133f, -9.000000f, -61.109859f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005911, 5814854, 4, { 58.000000f, -8.999999f, -63.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006095, 5905878, 4, { 58.000000f, -9.000000f, -63.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5787948, 5, { -0.015320f, -0.015320f, 43.037189f }, 0.778198f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.252589f, 0.000000f, 30.523800f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5911899, 5, { 58.000000f, -0.000049f, -11.175000f }, 0.800000f );
+      instance->registerEObj( "Unknown11", 2000608, 5911895, 4, { 58.000000f, 0.841694f, -1.705941f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSon.cpp
new file mode 100644
index 00000000..8b91b644
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSon.cpp
@@ -0,0 +1,68 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheArmoftheSon : public InstanceContentScript
+{
+public:
+   AlexanderTheArmoftheSon() : InstanceContentScript( 30032 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006968, 6185537, 4, { 131.518402f, 80.000000f, 274.864899f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006968, 6185538, 4, { 175.156296f, 80.000000f, 241.302505f }, 1.000000f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166806, 4, { 200.016602f, 120.459198f, 366.976898f }, 1.000000f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166805, 4, { 205.097305f, 120.459297f, 361.868408f }, 1.000000f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166804, 4, { 209.928207f, 120.459297f, 357.120789f }, 1.000000f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166803, 4, { 214.981201f, 120.459297f, 352.151215f }, 1.000000f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166799, 4, { 240.142395f, 120.459198f, 367.151886f }, 1.000000f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166800, 4, { 235.272293f, 120.459198f, 362.214691f }, 1.000000f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166801, 4, { 230.089401f, 120.459198f, 357.031799f }, 1.000000f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166802, 4, { 224.994095f, 120.439499f, 352.101807f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2006968, 6185540, 4, { 67.856812f, 44.968262f, 161.486206f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2006968, 6185539, 4, { 109.369904f, 44.998779f, 135.606796f }, 0.991760f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166815, 4, { 125.322304f, 79.972527f, 221.637207f }, 0.991760f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166816, 4, { 123.289001f, 79.972527f, 227.745804f }, 0.991760f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166817, 4, { 122.181702f, 79.972527f, 234.485397f }, 0.991760f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166818, 4, { 121.125298f, 79.972527f, 240.497803f }, 0.991760f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166810, 4, { 128.984406f, 79.972527f, 220.023499f }, 0.991760f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166809, 4, { 135.454193f, 79.972527f, 221.574799f }, 0.991760f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166808, 4, { 141.527298f, 79.972527f, 223.192398f }, 0.991760f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166807, 4, { 148.760101f, 79.972527f, 224.975006f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 51.013248f, 39.939819f, 88.328903f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6184075, 4, { 51.497959f, 39.939819f, 88.859413f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2006969, 6168354, 4, { 51.316040f, 39.993900f, 88.853271f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2006954, 6169546, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006968, 6242752, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2006968, 6242751, 4, { 76.247543f, 42.568901f, 132.191803f }, 100.000000f );
+      instance->registerEObj( "Unknown10", 2006954, 6162743, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006955, 6197901, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006958, 0, 4, { 0.447336f, 0.000000f, 4.119453f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006611, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006612, 0, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006650, 0, 4, { -23.000000f, 0.000000f, 23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006698, 0, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006964, 6215558, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006964, 6215559, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2006964, 6215560, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2006964, 6215561, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 6185488, 4, { -0.329697f, 0.000000f, -28.830790f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2006979, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 220.005096f, 120.491501f, 359.291504f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6177872, 5, { 220.000000f, 120.000000f, 383.467712f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6184212, 5, { 62.804680f, 40.200001f, 108.771896f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -29.143539f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSonSavage.cpp
new file mode 100644
index 00000000..633ad833
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSonSavage.cpp
@@ -0,0 +1,68 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheArmoftheSonSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheArmoftheSonSavage() : InstanceContentScript( 30036 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006968, 6185537, 4, { 131.518402f, 80.000000f, 274.864899f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006968, 6185538, 4, { 175.156296f, 80.000000f, 241.302505f }, 1.000000f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166806, 4, { 200.016602f, 120.459198f, 366.976898f }, 1.000000f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166805, 4, { 205.097305f, 120.459297f, 361.868408f }, 1.000000f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166804, 4, { 209.928207f, 120.459297f, 357.120789f }, 1.000000f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166803, 4, { 214.981201f, 120.459297f, 352.151215f }, 1.000000f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166799, 4, { 240.142395f, 120.459198f, 367.151886f }, 1.000000f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166800, 4, { 235.272293f, 120.459198f, 362.214691f }, 1.000000f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166801, 4, { 230.089401f, 120.459198f, 357.031799f }, 1.000000f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166802, 4, { 224.994095f, 120.439499f, 352.101807f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2006968, 6185540, 4, { 67.856812f, 44.968262f, 161.486206f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2006968, 6185539, 4, { 109.369904f, 44.998779f, 135.606796f }, 0.991760f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166815, 4, { 125.322304f, 79.972527f, 221.637207f }, 0.991760f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166816, 4, { 123.289001f, 79.972527f, 227.745804f }, 0.991760f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166817, 4, { 122.181702f, 79.972527f, 234.485397f }, 0.991760f );
+      instance->registerEObj( "Exhaustductβ", 2006967, 6166818, 4, { 121.125298f, 79.972527f, 240.497803f }, 0.991760f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166810, 4, { 128.984406f, 79.972527f, 220.023499f }, 0.991760f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166809, 4, { 135.454193f, 79.972527f, 221.574799f }, 0.991760f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166808, 4, { 141.527298f, 79.972527f, 223.192398f }, 0.991760f );
+      instance->registerEObj( "Exhaustductα", 2006966, 6166807, 4, { 148.760101f, 79.972527f, 224.975006f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 51.013248f, 39.939819f, 88.328903f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6184075, 4, { 51.497959f, 39.939819f, 88.859413f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2006969, 6168354, 4, { 51.316040f, 39.993900f, 88.853271f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2006954, 6169546, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006968, 6242752, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2006968, 6242751, 4, { 76.247543f, 42.568901f, 132.191803f }, 100.000000f );
+      instance->registerEObj( "Unknown10", 2006954, 6162743, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006955, 6197901, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006958, 0, 4, { 0.447336f, 0.000000f, 4.119453f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006611, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006612, 0, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006650, 0, 4, { -23.000000f, 0.000000f, 23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006698, 0, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006964, 6215558, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006964, 6215559, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2006964, 6215560, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2006964, 6215561, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 6185488, 4, { -0.329697f, 0.000000f, -28.830790f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2006979, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 220.005096f, 120.491501f, 359.291504f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6177872, 5, { 220.000000f, 120.000000f, 383.467712f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6184212, 5, { 62.804680f, 40.200001f, 108.771896f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -29.143539f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreator.cpp
new file mode 100644
index 00000000..ce9b3233
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreator.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBreathoftheCreator : public InstanceContentScript
+{
+public:
+   AlexanderTheBreathoftheCreator() : InstanceContentScript( 30040 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6424853, 4, { 0.000000f, -114.849998f, 12.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6424863, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6424869, 4, { 0.000000f, -114.849998f, -12.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6418872, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6421358, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6421505, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6421506, 4, { 0.000000f, -114.849998f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007496, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6515444, 4, { 0.680462f, -115.000000f, 1.219872f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007498, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 0, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6538404, 4, { 0.000000f, -115.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6538406, 4, { 0.000000f, -115.000000f, -4.000006f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6294347, 4, { -17.866249f, -10.500000f, 148.102402f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6294348, 4, { -44.597561f, -10.500000f, 101.743698f }, 1.000000f );
+      instance->registerEObj( "Exhaustvent", 2007470, 6367742, 4, { 1.716182f, -18.500000f, 37.358582f }, 1.000000f );
+      instance->registerEObj( "Ingress", 2007471, 0, 4, { 1.998901f, -16.647579f, 36.697880f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 2.000000f, -18.940580f, 37.027279f }, 0.500000f );
+      instance->registerEObj( "Unknown16", 2002872, 6487232, 4, { 1.792570f, -18.500000f, 38.188919f }, 1.000000f );
+      instance->registerEObj( "Exit", 2006235, 0, 4, { 11.500000f, -115.007301f, -18.204100f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6449464, 5, { -0.025814f, -10.500000f, 188.076599f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 2.874061f, -10.500000f, 177.815994f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449481, 5, { -7.931533f, -18.500000f, 50.286880f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreatorSavage.cpp
new file mode 100644
index 00000000..338d656a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreatorSavage.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBreathoftheCreatorSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheBreathoftheCreatorSavage() : InstanceContentScript( 30044 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6424853, 4, { 0.000000f, -114.849998f, 12.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6424863, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6424869, 4, { 0.000000f, -114.849998f, -12.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6418872, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6421358, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6421505, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6421506, 4, { 0.000000f, -114.849998f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007496, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6515444, 4, { 0.680462f, -115.000000f, 1.219872f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007498, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 0, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6538404, 4, { 0.000000f, -115.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6538406, 4, { 0.000000f, -115.000000f, -4.000006f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6294347, 4, { -17.866249f, -10.500000f, 148.102402f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6294348, 4, { -44.597561f, -10.500000f, 101.743698f }, 1.000000f );
+      instance->registerEObj( "Exhaustvent", 2007470, 6367742, 4, { 1.716182f, -18.500000f, 37.358582f }, 1.000000f );
+      instance->registerEObj( "Ingress", 2007471, 0, 4, { 1.998901f, -16.647579f, 36.697880f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 2.000000f, -18.940580f, 37.027279f }, 0.500000f );
+      instance->registerEObj( "Unknown16", 2002872, 6487232, 4, { 1.792570f, -18.500000f, 38.188919f }, 1.000000f );
+      instance->registerEObj( "Exit", 2006235, 0, 4, { 11.500000f, -115.007301f, -18.204100f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6449464, 5, { -0.025814f, -10.500000f, 188.076599f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 2.874061f, -10.500000f, 177.815994f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449481, 5, { -7.931533f, -18.500000f, 50.286880f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFather.cpp
new file mode 100644
index 00000000..5eb2b3be
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFather.cpp
@@ -0,0 +1,28 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBurdenoftheFather : public InstanceContentScript
+{
+public:
+   AlexanderTheBurdenoftheFather() : InstanceContentScript( 30024 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005494, 5863691, 4, { 102.000000f, 43.646099f, 16.000000f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5788043, 5, { -0.001985f, 10.900000f, 20.255680f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 10.561610f, -23.025881f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFatherSavage.cpp
new file mode 100644
index 00000000..6baab0fe
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFatherSavage.cpp
@@ -0,0 +1,28 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBurdenoftheFatherSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheBurdenoftheFatherSavage() : InstanceContentScript( 30028 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005494, 5863691, 4, { 102.000000f, 43.646099f, 16.000000f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5788043, 5, { -0.001985f, 10.900000f, 20.255680f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 10.561610f, -23.025881f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSon.cpp
new file mode 100644
index 00000000..16f7333a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSon.cpp
@@ -0,0 +1,31 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBurdenoftheSon : public InstanceContentScript
+{
+public:
+   AlexanderTheBurdenoftheSon() : InstanceContentScript( 30033 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 10.705920f, -21.985399f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2006984, 6164617, 4, { -0.231898f, 10.500000f, -1.988388f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006989, 6234571, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2006974, 0, 4, { -16.291439f, 10.500000f, 4.361944f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 6076667, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6177907, 5, { 0.000000f, 10.500000f, 19.500000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSonSavage.cpp
new file mode 100644
index 00000000..c2ba29fc
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSonSavage.cpp
@@ -0,0 +1,31 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBurdenoftheSonSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheBurdenoftheSonSavage() : InstanceContentScript( 30037 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 10.705920f, -21.985399f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2006984, 6164617, 4, { -0.231898f, 10.500000f, -1.988388f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006989, 6234571, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2006974, 0, 4, { -16.291439f, 10.500000f, 4.361944f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 6076667, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6177907, 5, { 0.000000f, 10.500000f, 19.500000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFather.cpp
new file mode 100644
index 00000000..a8c8645a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFather.cpp
@@ -0,0 +1,49 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheCuffoftheFather : public InstanceContentScript
+{
+public:
+   AlexanderTheCuffoftheFather() : InstanceContentScript( 30022 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -23.299919f, -27.250000f, -93.915253f }, 2.500000f );
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005474, 0, 4, { -25.869850f, -27.250000f, -91.505951f }, 2.500000f );
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005475, 0, 4, { -28.364830f, -27.250000f, -89.139442f }, 2.500000f );
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -24.477819f, -27.250000f, -93.315643f }, 2.500000f );
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005474, 0, 4, { -27.127260f, -27.250000f, -90.671631f }, 2.500000f );
+      instance->registerEObj( "Unknown0", 2005047, 5796486, 4, { -16.006710f, 28.995720f, 121.127502f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2005047, 5796475, 4, { -15.991690f, 25.994120f, 104.104698f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005047, 5796479, 4, { -0.042969f, -15.876210f, 39.414860f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2005047, 5796481, 4, { -0.042969f, -22.069151f, 4.294098f }, 1.000000f );
+      instance->registerEObj( "Steamspoutingcontraption", 2005048, 5828187, 4, { -20.999439f, 28.890051f, 120.379700f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2005428, 5828194, 4, { -20.812780f, 25.885040f, 102.729103f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2005428, 5828205, 4, { -5.111024f, -22.178221f, 3.677231f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -19.655809f, 31.065201f, 144.212204f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005047, 5962936, 4, { -16.018070f, 27.033091f, 118.517899f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005047, 5962937, 4, { 4.629210f, -8.535899f, 53.038620f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 0.000000f, -28.000000f, -53.246899f }, 0.750000f );
+      instance->registerEObj( "Unknown9", 2002872, 5787859, 4, { -0.137953f, -26.000000f, -52.603008f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 5787862, 4, { 0.000000f, -26.000000f, -96.909851f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006105, 5883005, 4, { 0.000000f, -28.000000f, -75.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 5908620, 4, { 0.000000f, -26.000000f, -110.560898f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -27.991100f, -115.007500f }, 1.000000f );
+      instance->registerEObj( "Steamspoutingcontraption", 2005427, 5828202, 4, { -5.000190f, -15.985280f, 39.105530f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5787826, 5, { -16.006710f, 36.148560f, 161.008804f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5908672, 5, { 0.002526f, -28.000019f, -23.439610f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFatherSavage.cpp
new file mode 100644
index 00000000..9fd5f5d9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFatherSavage.cpp
@@ -0,0 +1,49 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheCuffoftheFatherSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheCuffoftheFatherSavage() : InstanceContentScript( 30026 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -23.299919f, -27.250000f, -93.915253f }, 2.500000f );
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005474, 0, 4, { -25.869850f, -27.250000f, -91.505951f }, 2.500000f );
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005475, 0, 4, { -28.364830f, -27.250000f, -89.139442f }, 2.500000f );
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -24.477819f, -27.250000f, -93.315643f }, 2.500000f );
+      instance->registerEObj( "MagitekgobwalkerGVII", 2005474, 0, 4, { -27.127260f, -27.250000f, -90.671631f }, 2.500000f );
+      instance->registerEObj( "Unknown0", 2005047, 5796486, 4, { -16.006710f, 28.995720f, 121.127502f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2005047, 5796475, 4, { -15.991690f, 25.994120f, 104.104698f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005047, 5796479, 4, { -0.042969f, -15.876210f, 39.414860f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2005047, 5796481, 4, { -0.042969f, -22.069151f, 4.294098f }, 1.000000f );
+      instance->registerEObj( "Steamspoutingcontraption", 2005048, 5828187, 4, { -20.999439f, 28.890051f, 120.379700f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2005428, 5828194, 4, { -20.812780f, 25.885040f, 102.729103f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2005428, 5828205, 4, { -5.111024f, -22.178221f, 3.677231f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -19.655809f, 31.065201f, 144.212204f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005047, 5962936, 4, { -16.018070f, 27.033091f, 118.517899f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005047, 5962937, 4, { 4.629210f, -8.535899f, 53.038620f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 0.000000f, -28.000000f, -53.246899f }, 0.750000f );
+      instance->registerEObj( "Unknown9", 2002872, 5787859, 4, { -0.137953f, -26.000000f, -52.603008f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 5787862, 4, { 0.000000f, -26.000000f, -96.909851f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006105, 5883005, 4, { 0.000000f, -28.000000f, -75.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 5908620, 4, { 0.000000f, -26.000000f, -110.560898f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -27.991100f, -115.007500f }, 1.000000f );
+      instance->registerEObj( "Steamspoutingcontraption", 2005427, 5828202, 4, { -5.000190f, -15.985280f, 39.105530f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5787826, 5, { -16.006710f, 36.148560f, 161.008804f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5908672, 5, { 0.002526f, -28.000019f, -23.439610f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSon.cpp
new file mode 100644
index 00000000..f6cc46b6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSon.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheCuffoftheSon : public InstanceContentScript
+{
+public:
+   AlexanderTheCuffoftheSon() : InstanceContentScript( 30031 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005400, 0, 4, { -0.062597f, -7.999998f, -318.102112f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004356, 6075850, 4, { 16.000000f, 17.661369f, 68.195396f }, 1.000000f );
+      instance->registerEObj( "Steamspoutingcontraption", 2004357, 6075772, 4, { 21.013269f, 19.288509f, 69.098198f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004356, 6183194, 4, { 16.000000f, 17.933451f, 69.738426f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004362, 6075779, 4, { 21.207670f, 12.939710f, 41.993370f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6183959, 4, { 0.000000f, -26.000000f, -99.284462f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6185722, 4, { 0.000000f, -25.918800f, -139.159302f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 0.000000f, -25.959690f, -100.169899f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 0.000000f, -19.459700f, -163.887405f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002872, 6185721, 4, { 0.000000f, -19.913139f, -203.123398f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002872, 6183975, 4, { 0.000000f, -20.000000f, -163.001999f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002735, 0, 4, { 0.000000f, -13.500000f, -227.525406f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002872, 6185576, 4, { 0.000000f, -14.000000f, -267.622406f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002872, 6183981, 4, { 0.000000f, -14.000000f, -226.639999f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 0.000000f, -8.000000f, -286.936798f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2002872, 6183985, 4, { 0.000000f, -8.000000f, -286.051392f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 6186651, 4, { -0.636187f, -7.999998f, -335.408813f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -7.921236f, -335.377502f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006984, 6210606, 4, { -0.151275f, -14.000000f, -248.039703f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006989, 6234539, 4, { 1.000000f, -20.000000f, -184.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6177892, 5, { 16.000000f, 21.783440f, 91.573517f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 10.387650f, 18.918310f, 75.899696f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6184206, 5, { 0.000000f, -26.000000f, -65.141693f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSonSavage.cpp
new file mode 100644
index 00000000..6ac593af
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSonSavage.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheCuffoftheSonSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheCuffoftheSonSavage() : InstanceContentScript( 30035 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005400, 0, 4, { -0.062597f, -7.999998f, -318.102112f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004356, 6075850, 4, { 16.000000f, 17.661369f, 68.195396f }, 1.000000f );
+      instance->registerEObj( "Steamspoutingcontraption", 2004357, 6075772, 4, { 21.013269f, 19.288509f, 69.098198f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004356, 6183194, 4, { 16.000000f, 17.933451f, 69.738426f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004362, 6075779, 4, { 21.207670f, 12.939710f, 41.993370f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6183959, 4, { 0.000000f, -26.000000f, -99.284462f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6185722, 4, { 0.000000f, -25.918800f, -139.159302f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 0.000000f, -25.959690f, -100.169899f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 0.000000f, -19.459700f, -163.887405f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002872, 6185721, 4, { 0.000000f, -19.913139f, -203.123398f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002872, 6183975, 4, { 0.000000f, -20.000000f, -163.001999f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002735, 0, 4, { 0.000000f, -13.500000f, -227.525406f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002872, 6185576, 4, { 0.000000f, -14.000000f, -267.622406f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002872, 6183981, 4, { 0.000000f, -14.000000f, -226.639999f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 0.000000f, -8.000000f, -286.936798f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2002872, 6183985, 4, { 0.000000f, -8.000000f, -286.051392f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 6186651, 4, { -0.636187f, -7.999998f, -335.408813f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -7.921236f, -335.377502f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006984, 6210606, 4, { -0.151275f, -14.000000f, -248.039703f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006989, 6234539, 4, { 1.000000f, -20.000000f, -184.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6177892, 5, { 16.000000f, 21.783440f, 91.573517f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 10.387650f, 18.918310f, 75.899696f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6184206, 5, { 0.000000f, -26.000000f, -65.141693f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreator.cpp
new file mode 100644
index 00000000..ba79f724
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreator.cpp
@@ -0,0 +1,50 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheEyesoftheCreator : public InstanceContentScript
+{
+public:
+   AlexanderTheEyesoftheCreator() : InstanceContentScript( 30039 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6430458, 4, { 8.200209f, -250.000000f, -257.340210f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6430459, 4, { 8.200209f, -250.000000f, -242.154495f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6430457, 4, { -9.317612f, -250.000000f, -257.340210f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6430456, 4, { -9.317612f, -250.000000f, -242.154495f }, 1.000000f );
+      instance->registerEObj( "Powergenerator", 2007469, 0, 4, { 13.381770f, -250.000000f, -248.034500f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6513582, 4, { 10.437510f, -250.000000f, -260.791412f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6513579, 4, { 10.437510f, -250.000000f, -238.786697f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6513584, 4, { -11.731350f, -250.000000f, -260.791412f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6511025, 4, { -11.731350f, -250.000000f, -238.786697f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6516007, 4, { 0.000000f, -249.000000f, -250.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6412089, 4, { -124.346802f, -26.965401f, -70.917450f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6492511, 4, { -124.346802f, -26.965401f, -70.917503f }, 1.000000f );
+      instance->registerEObj( "Ingress", 2007456, 0, 4, { -40.238098f, 116.186600f, 3.921570f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2002735, 0, 4, { -40.738098f, 114.683800f, 6.860600f }, 0.750000f );
+      instance->registerEObj( "Unknown12", 2002872, 6480419, 4, { -40.263161f, 114.683800f, 4.312012f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, -246.936798f, -289.430511f }, 0.991760f );
+      instance->registerEObj( "Cranialhatch", 2007455, 6401919, 4, { -40.885181f, 114.683899f, 3.853281f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2002872, 6488523, 4, { -41.825008f, 114.671501f, -5.474617f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2007457, 6480499, 4, { 0.029205f, -250.000000f, -269.982300f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6422309, 4, { 0.029205f, -249.000000f, -271.779205f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002587, 0, 4, { -36.774879f, 114.683701f, -18.658051f }, 1.200000f );
+      instance->registerEObj( "Unknown17", 2002872, 6502657, 4, { -36.910030f, 114.683701f, -17.920090f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449051, 5, { -133.348099f, -24.805401f, -98.991310f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -133.531906f, -24.595860f, -91.717850f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6449334, 5, { -36.523010f, 114.683701f, -20.849701f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreatorSavage.cpp
new file mode 100644
index 00000000..94556e0c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreatorSavage.cpp
@@ -0,0 +1,50 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheEyesoftheCreatorSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheEyesoftheCreatorSavage() : InstanceContentScript( 30043 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6430458, 4, { 8.200209f, -250.000000f, -257.340210f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6430459, 4, { 8.200209f, -250.000000f, -242.154495f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6430457, 4, { -9.317612f, -250.000000f, -257.340210f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6430456, 4, { -9.317612f, -250.000000f, -242.154495f }, 1.000000f );
+      instance->registerEObj( "Powergenerator", 2007469, 0, 4, { 13.381770f, -250.000000f, -248.034500f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6513582, 4, { 10.437510f, -250.000000f, -260.791412f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6513579, 4, { 10.437510f, -250.000000f, -238.786697f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6513584, 4, { -11.731350f, -250.000000f, -260.791412f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6511025, 4, { -11.731350f, -250.000000f, -238.786697f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6516007, 4, { 0.000000f, -249.000000f, -250.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6412089, 4, { -124.346802f, -26.965401f, -70.917450f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6492511, 4, { -124.346802f, -26.965401f, -70.917503f }, 1.000000f );
+      instance->registerEObj( "Ingress", 2007456, 0, 4, { -40.238098f, 116.186600f, 3.921570f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2002735, 0, 4, { -40.738098f, 114.683800f, 6.860600f }, 0.750000f );
+      instance->registerEObj( "Unknown12", 2002872, 6480419, 4, { -40.263161f, 114.683800f, 4.312012f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, -246.936798f, -289.430511f }, 0.991760f );
+      instance->registerEObj( "Cranialhatch", 2007455, 6401919, 4, { -40.885181f, 114.683899f, 3.853281f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2002872, 6488523, 4, { -41.825008f, 114.671501f, -5.474617f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2007457, 6480499, 4, { 0.029205f, -250.000000f, -269.982300f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6422309, 4, { 0.029205f, -249.000000f, -271.779205f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002587, 0, 4, { -36.774879f, 114.683701f, -18.658051f }, 1.200000f );
+      instance->registerEObj( "Unknown17", 2002872, 6502657, 4, { -36.910030f, 114.683701f, -17.920090f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449051, 5, { -133.348099f, -24.805401f, -98.991310f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -133.531906f, -24.595860f, -91.717850f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6449334, 5, { -36.523010f, 114.683701f, -20.849701f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFather.cpp
new file mode 100644
index 00000000..d8713dd8
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFather.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheFistoftheFather : public InstanceContentScript
+{
+public:
+   AlexanderTheFistoftheFather() : InstanceContentScript( 30021 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005032, 0, 4, { -10.154560f, -23.900000f, -171.851105f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005046, 0, 4, { -13.656920f, -24.002501f, -180.132797f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2005033, 0, 4, { -16.466789f, -24.000000f, -176.308197f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 0.000000f, 8.000000f, -39.386002f }, 0.750000f );
+      instance->registerEObj( "Unknown4", 2002872, 5787765, 4, { -0.007763f, 8.000001f, -38.723202f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 5787769, 4, { -0.007763f, 8.000002f, -76.255096f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005148, 5835158, 4, { -5.000000f, -4.351456f, 18.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005149, 5835159, 4, { 5.000000f, -4.368736f, 18.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005150, 5835148, 4, { -4.000000f, -3.485719f, 13.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005151, 5835149, 4, { 4.000000f, -3.483227f, 13.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2005315, 5835144, 4, { -4.000000f, -2.619212f, 8.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006035, 5835145, 4, { 4.000000f, -2.621703f, 8.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006053, 5835143, 4, { -3.000000f, -1.918940f, 4.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006054, 5835135, 4, { 3.000000f, -1.911465f, 4.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006055, 5835141, 4, { -3.000000f, -1.231334f, 0.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006056, 5835136, 4, { 3.000000f, -1.231335f, 0.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006057, 5835153, 4, { -9.000000f, -3.642947f, 14.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006058, 5835152, 4, { -9.000000f, -3.309154f, 12.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006059, 5835151, 4, { 9.000000f, -3.666079f, 14.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2006060, 5835150, 4, { 9.000000f, -3.310075f, 12.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2006093, 5858144, 4, { -0.006211f, 12.000000f, -107.218903f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2002872, 5787778, 4, { 0.000000f, 12.000000f, -107.839302f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.035584f, -24.311769f, -187.660599f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2005402, 5815199, 4, { 1.317244f, -23.900000f, -173.937302f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2005401, 5837182, 4, { -0.350596f, -23.900000f, -171.328796f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 5908619, 4, { 0.000000f, -23.476339f, -186.888397f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002735, 0, 4, { 0.000000f, 11.993800f, -108.070297f }, 0.500000f );
+      instance->registerEObj( "Entrance", 2000182, 5786793, 5, { -0.057753f, -21.358721f, 88.563942f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -1.141299f, -16.781481f, 74.122673f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2005147, 5905927, 4, { -0.186450f, -20.599979f, 84.260910f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5911084, 5, { -0.057753f, 8.090733f, -31.639650f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2000608, 5911088, 4, { -0.300161f, 5.743856f, -19.072269f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2005147, 5912244, 4, { -0.186450f, 8.755365f, -27.952221f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFatherSavage.cpp
new file mode 100644
index 00000000..8efd9ce6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFatherSavage.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheFistoftheFatherSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheFistoftheFatherSavage() : InstanceContentScript( 30025 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005032, 0, 4, { -10.154560f, -23.900000f, -171.851105f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005046, 0, 4, { -13.656920f, -24.002501f, -180.132797f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2005033, 0, 4, { -16.466789f, -24.000000f, -176.308197f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 0.000000f, 8.000000f, -39.386002f }, 0.750000f );
+      instance->registerEObj( "Unknown4", 2002872, 5787765, 4, { -0.007763f, 8.000001f, -38.723202f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 5787769, 4, { -0.007763f, 8.000002f, -76.255096f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005148, 5835158, 4, { -5.000000f, -4.351456f, 18.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005149, 5835159, 4, { 5.000000f, -4.368736f, 18.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005150, 5835148, 4, { -4.000000f, -3.485719f, 13.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005151, 5835149, 4, { 4.000000f, -3.483227f, 13.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2005315, 5835144, 4, { -4.000000f, -2.619212f, 8.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006035, 5835145, 4, { 4.000000f, -2.621703f, 8.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006053, 5835143, 4, { -3.000000f, -1.918940f, 4.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006054, 5835135, 4, { 3.000000f, -1.911465f, 4.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006055, 5835141, 4, { -3.000000f, -1.231334f, 0.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006056, 5835136, 4, { 3.000000f, -1.231335f, 0.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006057, 5835153, 4, { -9.000000f, -3.642947f, 14.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006058, 5835152, 4, { -9.000000f, -3.309154f, 12.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006059, 5835151, 4, { 9.000000f, -3.666079f, 14.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2006060, 5835150, 4, { 9.000000f, -3.310075f, 12.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2006093, 5858144, 4, { -0.006211f, 12.000000f, -107.218903f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2002872, 5787778, 4, { 0.000000f, 12.000000f, -107.839302f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.035584f, -24.311769f, -187.660599f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2005402, 5815199, 4, { 1.317244f, -23.900000f, -173.937302f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2005401, 5837182, 4, { -0.350596f, -23.900000f, -171.328796f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 5908619, 4, { 0.000000f, -23.476339f, -186.888397f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002735, 0, 4, { 0.000000f, 11.993800f, -108.070297f }, 0.500000f );
+      instance->registerEObj( "Entrance", 2000182, 5786793, 5, { -0.057753f, -21.358721f, 88.563942f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -1.141299f, -16.781481f, 74.122673f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2005147, 5905927, 4, { -0.186450f, -20.599979f, 84.260910f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5911084, 5, { -0.057753f, 8.090733f, -31.639650f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2000608, 5911088, 4, { -0.300161f, 5.743856f, -19.072269f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2005147, 5912244, 4, { -0.186450f, 8.755365f, -27.952221f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSon.cpp
new file mode 100644
index 00000000..724d8a79
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSon.cpp
@@ -0,0 +1,49 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheFistoftheSon : public InstanceContentScript
+{
+public:
+   AlexanderTheFistoftheSon() : InstanceContentScript( 30030 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006093, 0, 4, { -0.030479f, -18.000000f, -87.654160f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6179766, 4, { 0.048718f, -8.000000f, -25.550190f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 6179771, 4, { 0.348718f, -8.000000f, -62.819778f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002587, 0, 4, { 0.000000f, -7.796605f, -27.253839f }, 1.400000f );
+      instance->registerEObj( "Unknown4", 2002872, 6179774, 4, { 0.000000f, -18.000000f, -86.751549f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 0.000000f, -18.000000f, -88.696098f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -10.159560f, -10.000000f, -208.556000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2006965, 6200579, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004870, 6200506, 4, { -0.400928f, -10.000000f, -198.953598f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005111, 6200497, 4, { 9.766629f, -10.000000f, -190.029099f }, 1.000000f );
+      instance->registerEObj( "Koboldkey", 2006468, 6200507, 4, { -9.431794f, -10.000000f, -190.472397f }, 1.000000f );
+      instance->registerEObj( "Koboldkey", 2006469, 6200508, 4, { 0.206919f, -10.000000f, -180.011597f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004363, 0, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004367, 0, 4, { 0.000000f, -10.000000f, -206.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004368, 0, 4, { 16.000000f, -10.000000f, -190.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004369, 0, 4, { -16.000000f, -10.000000f, -190.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004575, 0, 4, { 0.000000f, -10.000000f, -174.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 6180367, 4, { -8.545354f, -9.800000f, -209.792007f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6177861, 5, { 0.000000f, -60.199001f, 70.921097f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 1.189643f, -53.337769f, 57.917198f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006105, 6185484, 4, { 0.000000f, -58.108219f, 65.176361f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6184198, 5, { 4.589292f, -3.826589f, 1.082808f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.135107f, -6.123573f, -3.436843f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006105, 6198124, 4, { 4.362909f, -6.098227f, -3.232224f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSonSavage.cpp
new file mode 100644
index 00000000..dc4d1b3f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSonSavage.cpp
@@ -0,0 +1,49 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheFistoftheSonSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheFistoftheSonSavage() : InstanceContentScript( 30034 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006093, 0, 4, { -0.030479f, -18.000000f, -87.654160f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6179766, 4, { 0.048718f, -8.000000f, -25.550190f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 6179771, 4, { 0.348718f, -8.000000f, -62.819778f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002587, 0, 4, { 0.000000f, -7.796605f, -27.253839f }, 1.400000f );
+      instance->registerEObj( "Unknown4", 2002872, 6179774, 4, { 0.000000f, -18.000000f, -86.751549f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 0.000000f, -18.000000f, -88.696098f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -10.159560f, -10.000000f, -208.556000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2006965, 6200579, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004870, 6200506, 4, { -0.400928f, -10.000000f, -198.953598f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005111, 6200497, 4, { 9.766629f, -10.000000f, -190.029099f }, 1.000000f );
+      instance->registerEObj( "Koboldkey", 2006468, 6200507, 4, { -9.431794f, -10.000000f, -190.472397f }, 1.000000f );
+      instance->registerEObj( "Koboldkey", 2006469, 6200508, 4, { 0.206919f, -10.000000f, -180.011597f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004363, 0, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004367, 0, 4, { 0.000000f, -10.000000f, -206.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004368, 0, 4, { 16.000000f, -10.000000f, -190.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004369, 0, 4, { -16.000000f, -10.000000f, -190.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004575, 0, 4, { 0.000000f, -10.000000f, -174.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2005313, 6180367, 4, { -8.545354f, -9.800000f, -209.792007f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6177861, 5, { 0.000000f, -60.199001f, 70.921097f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 1.189643f, -53.337769f, 57.917198f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006105, 6185484, 4, { 0.000000f, -58.108219f, 65.176361f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6184198, 5, { 4.589292f, -3.826589f, 1.082808f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.135107f, -6.123573f, -3.436843f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006105, 6198124, 4, { 4.362909f, -6.098227f, -3.232224f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreator.cpp
new file mode 100644
index 00000000..b6164a90
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreator.cpp
@@ -0,0 +1,55 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheHeartoftheCreator : public InstanceContentScript
+{
+public:
+   AlexanderTheHeartoftheCreator() : InstanceContentScript( 30041 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 42.000000f }, 1.000000f );
+      instance->registerEObj( "Openduct", 2007466, 0, 4, { 10.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 62.000000f }, 1.000000f );
+      instance->registerEObj( "Openduct", 2007466, 0, 4, { -10.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2007457, 6516055, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6516054, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6516050, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6516150, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6516057, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6516049, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6516058, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6516056, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6433752, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6498824, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6494083, 4, { -12.120000f, -79.986076f, 45.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6494060, 4, { 12.120000f, -79.986076f, 45.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6494084, 4, { 0.000000f, -79.986076f, 66.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007497, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6572855, 4, { 0.000000f, -80.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6573190, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007507, 0, 4, { 0.000000f, -79.986076f, 2.957292f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 6433738, 4, { 26.696230f, 0.000000f, 11.513790f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6433741, 4, { -57.433731f, -40.000000f, -0.807872f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -79.986076f, 40.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2002872, 6485880, 4, { -58.072899f, -39.959671f, -0.860951f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2002735, 0, 4, { -59.879780f, -40.078049f, 0.248821f }, 0.500000f );
+      instance->registerEObj( "Unknown21", 2006981, 6588684, 4, { 0.000000f, -80.000000f, 51.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449497, 5, { 5.000000f, 0.060100f, 29.472811f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 15.893050f, -0.000000f, 20.165380f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449499, 5, { -46.692200f, -40.000000f, -16.064711f }, 2.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreatorSavage.cpp
new file mode 100644
index 00000000..aba627c9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreatorSavage.cpp
@@ -0,0 +1,55 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheHeartoftheCreatorSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheHeartoftheCreatorSavage() : InstanceContentScript( 30045 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 42.000000f }, 1.000000f );
+      instance->registerEObj( "Openduct", 2007466, 0, 4, { 10.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 62.000000f }, 1.000000f );
+      instance->registerEObj( "Openduct", 2007466, 0, 4, { -10.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2007457, 6516055, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6516054, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6516050, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6516150, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6516057, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6516049, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6516058, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6516056, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6433752, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6498824, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6494083, 4, { -12.120000f, -79.986076f, 45.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6494060, 4, { 12.120000f, -79.986076f, 45.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6494084, 4, { 0.000000f, -79.986076f, 66.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007497, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6572855, 4, { 0.000000f, -80.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6573190, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007507, 0, 4, { 0.000000f, -79.986076f, 2.957292f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 6433738, 4, { 26.696230f, 0.000000f, 11.513790f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6433741, 4, { -57.433731f, -40.000000f, -0.807872f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -79.986076f, 40.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2002872, 6485880, 4, { -58.072899f, -39.959671f, -0.860951f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2002735, 0, 4, { -59.879780f, -40.078049f, 0.248821f }, 0.500000f );
+      instance->registerEObj( "Unknown21", 2006981, 6588684, 4, { 0.000000f, -80.000000f, 51.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449497, 5, { 5.000000f, 0.060100f, 29.472811f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 15.893050f, -0.000000f, 20.165380f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449499, 5, { -46.692200f, -40.000000f, -16.064711f }, 2.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreator.cpp
new file mode 100644
index 00000000..8f330fa6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreator.cpp
@@ -0,0 +1,46 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheSouloftheCreator : public InstanceContentScript
+{
+public:
+   AlexanderTheSouloftheCreator() : InstanceContentScript( 30042 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 400.000000f, -21.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007468, 0, 4, { 14.140000f, 400.049988f, 14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007468, 0, 4, { -14.140000f, 400.049988f, -14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007468, 0, 4, { -14.140000f, 400.049988f, 14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007519, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007520, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007521, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6421491, 4, { 0.000000f, 400.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007516, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6487368, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6487369, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6487367, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6487366, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6483882, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6421479, 4, { 0.000000f, 400.168701f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007499, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007534, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6539545, 4, { 0.024963f, -480.000000f, 52.037621f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449508, 5, { -0.015367f, 400.000000f, 21.278250f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreatorSavage.cpp
new file mode 100644
index 00000000..a5a518d7
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreatorSavage.cpp
@@ -0,0 +1,46 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheSouloftheCreatorSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheSouloftheCreatorSavage() : InstanceContentScript( 30046 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 400.000000f, -21.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007468, 0, 4, { 14.140000f, 400.049988f, 14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007468, 0, 4, { -14.140000f, 400.049988f, -14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007468, 0, 4, { -14.140000f, 400.049988f, 14.140000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007519, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007520, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007521, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6421491, 4, { 0.000000f, 400.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007516, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6487368, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6487369, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6487367, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6487366, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6483882, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6421479, 4, { 0.000000f, 400.168701f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007499, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007534, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6539545, 4, { 0.024963f, -480.000000f, 52.037621f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6449508, 5, { -0.015367f, 400.000000f, 21.278250f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AllsWellthatEndsintheWell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AllsWellthatEndsintheWell.cpp
new file mode 100644
index 00000000..7657705b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AllsWellthatEndsintheWell.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AllsWellthatEndsintheWell : public InstanceContentScript
+{
+public:
+   AllsWellthatEndsintheWell() : InstanceContentScript( 10007 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeep.cpp
new file mode 100644
index 00000000..798dc4c4
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeep.cpp
@@ -0,0 +1,107 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AmdaporKeep : public InstanceContentScript
+{
+public:
+   AmdaporKeep() : InstanceContentScript( 14 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000491, 4246565, 4, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f );
+      instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown30", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown31", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f );
+      instance->registerEObj( "Unknown33", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f );
+      instance->registerEObj( "Unknown39", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f );
+      instance->registerEObj( "Unknown40", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown41", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown42", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown43", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f );
+      instance->registerEObj( "Unknown44", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f );
+      instance->registerEObj( "Unknown45", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f );
+      instance->registerEObj( "Unknown46", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f );
+      instance->registerEObj( "Unknown47", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f );
+      instance->registerEObj( "Unknown48", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f );
+      instance->registerEObj( "Unknown49", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f );
+      instance->registerEObj( "Unknown50", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f );
+      instance->registerEObj( "Unknown51", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f );
+      instance->registerEObj( "Unknown52", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown53", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown54", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown55", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f );
+      instance->registerEObj( "Unknown56", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f );
+      instance->registerEObj( "Unknown57", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f );
+      instance->registerEObj( "Unknown58", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f );
+      instance->registerEObj( "Unknown59", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f );
+      instance->registerEObj( "Unknown60", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f );
+      instance->registerEObj( "Unknown62", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f );
+      instance->registerEObj( "Unknown64", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f );
+      instance->registerEObj( "Unknown65", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f );
+      instance->registerEObj( "Unknown66", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f );
+      instance->registerEObj( "Unknown67", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown68", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f );
+      instance->registerEObj( "Aetherialflow", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f );
+      instance->registerEObj( "Unknown69", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown70", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown71", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown72", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown73", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown74", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeepHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeepHard.cpp
new file mode 100644
index 00000000..3f2be9fd
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeepHard.cpp
@@ -0,0 +1,56 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AmdaporKeepHard : public InstanceContentScript
+{
+public:
+   AmdaporKeepHard() : InstanceContentScript( 29 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 5040923, 4, { 203.452301f, 0.116688f, 208.657593f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 199.471802f, 0.116693f, 210.128204f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005153, 5619221, 4, { 198.706802f, -20.000010f, 229.113907f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004696, 5009720, 4, { -200.316895f, -4.301562f, -43.621670f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004697, 5009721, 4, { -47.771290f, -0.000000f, -71.658272f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004698, 5031991, 4, { -125.087196f, -2.000000f, 28.417601f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2004699, 5031992, 4, { -104.790604f, -2.000000f, 47.174728f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004700, 0, 4, { 2.343430f, 48.179089f, -2.083742f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004702, 5009732, 4, { 125.604897f, 43.999989f, 3.999085f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004701, 0, 4, { 149.666000f, 44.200001f, -0.006115f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004703, 5010816, 4, { 196.927399f, 44.000019f, -101.381798f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004704, 5032163, 4, { 199.696106f, 44.000000f, -181.197006f }, 1.000000f );
+      instance->registerEObj( "Aetherialflow", 2004705, 5032164, 4, { 199.682800f, 44.163898f, -180.392395f }, 1.000000f );
+      instance->registerEObj( "Fellorb", 2004706, 5009746, 4, { 200.094101f, -0.000008f, 0.050249f }, 1.000000f );
+      instance->registerEObj( "Aetherialflow", 2004707, 5033533, 4, { 199.899506f, 0.000000f, -3.297300f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004768, 5033548, 4, { 210.649307f, 0.116687f, -6.120441f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004769, 5033549, 4, { 189.489807f, 0.116688f, -6.804901f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2004770, 5033551, 4, { 204.506500f, 0.116687f, 9.902725f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2004708, 5034801, 4, { -119.510101f, -2.400002f, 18.885540f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002872, 5034800, 4, { -130.314606f, -2.400000f, -18.221069f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2002735, 0, 4, { -125.041801f, -1.964380f, -20.543480f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2004996, 5390927, 4, { -112.845497f, -2.400000f, 12.122500f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2004997, 5390928, 4, { -112.845497f, -2.400000f, -12.378100f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2004998, 5390929, 4, { -137.250000f, -2.400000f, 12.122500f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2004999, 5390930, 4, { -137.396194f, -2.400000f, -12.366500f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2004782, 5038257, 4, { 198.459198f, 43.991699f, -172.369705f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2002872, 5038255, 4, { 197.802597f, 43.991699f, -125.932701f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002735, 0, 4, { 199.511703f, 44.022221f, -130.601303f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5018466, 5, { -255.724792f, -9.199999f, -5.249732f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -252.173401f, -9.199999f, 5.737248f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 200.798599f, -0.000008f, 240.880905f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AnnoytheVoid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AnnoytheVoid.cpp
new file mode 100644
index 00000000..e1545b98
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AnnoytheVoid.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AnnoytheVoid : public InstanceContentScript
+{
+public:
+   AnnoytheVoid() : InstanceContentScript( 10010 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AssistAlliesinDefeatingaTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AssistAlliesinDefeatingaTarget.cpp
new file mode 100644
index 00000000..beafc103
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AssistAlliesinDefeatingaTarget.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AssistAlliesinDefeatingaTarget : public InstanceContentScript
+{
+public:
+   AssistAlliesinDefeatingaTarget() : InstanceContentScript( 15008 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Astragalos.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/Astragalos.cpp
new file mode 100644
index 00000000..cf493515
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/Astragalos.cpp
@@ -0,0 +1,39 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Astragalos : public InstanceContentScript
+{
+public:
+   Astragalos() : InstanceContentScript( 51001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7033316, 4, { -140.058197f, 45.799999f, -133.960495f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 7033315, 4, { -123.008400f, 16.299999f, 103.779503f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7033317, 4, { 105.712799f, 16.299980f, 114.356003f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7033318, 4, { 183.420807f, 45.799980f, -111.239098f }, 1.000000f );
+      instance->registerEObj( "Powergenerator", 2009034, 7032566, 4, { 6.485046f, 46.386410f, -10.055730f }, 0.991760f );
+      instance->registerEObj( "Hangarterminal", 2009035, 7032549, 4, { -258.015198f, 44.361351f, 21.038191f }, 1.000000f );
+      instance->registerEObj( "Hangarterminal", 2009062, 7032550, 4, { -262.674988f, 44.773441f, -32.764599f }, 1.000000f );
+      instance->registerEObj( "Hangarterminal", 2009063, 7032561, 4, { 276.628510f, 44.544209f, 18.968180f }, 1.000000f );
+      instance->registerEObj( "Hangarterminal", 2009064, 7032562, 4, { 258.262787f, 44.210709f, 69.718079f }, 1.000000f );
+      instance->registerEObj( "Ceruleumtank", 2009031, 0, 4, { 8.651855f, 46.280640f, -142.595596f }, 0.991760f );
+      instance->registerEObj( "Steamcannon", 2009032, 0, 4, { -181.307602f, 47.593700f, -28.846230f }, 1.000000f );
+      instance->registerEObj( "Steamcannon", 2009033, 0, 4, { -178.482193f, 47.593700f, 2.992350f }, 1.000000f );
+      instance->registerEObj( "Steamcannon", 2009040, 0, 4, { 186.000504f, 47.578602f, 31.721189f }, 0.991760f );
+      instance->registerEObj( "Steamcannon", 2009041, 0, 4, { 196.952606f, 47.593700f, 1.659642f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AvoidAreaofEffectAttacks.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AvoidAreaofEffectAttacks.cpp
new file mode 100644
index 00000000..f7f28f72
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AvoidAreaofEffectAttacks.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AvoidAreaofEffectAttacks : public InstanceContentScript
+{
+public:
+   AvoidAreaofEffectAttacks() : InstanceContentScript( 15001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AvoidEngagedTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/AvoidEngagedTargets.cpp
new file mode 100644
index 00000000..fd841a93
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/AvoidEngagedTargets.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AvoidEngagedTargets : public InstanceContentScript
+{
+public:
+   AvoidEngagedTargets() : InstanceContentScript( 15015 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BaelsarsWall.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BaelsarsWall.cpp
new file mode 100644
index 00000000..08f7481e
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BaelsarsWall.cpp
@@ -0,0 +1,51 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BaelsarsWall : public InstanceContentScript
+{
+public:
+   BaelsarsWall() : InstanceContentScript( 48 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -173.966797f, 3.049999f, 52.443710f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6588628, 4, { -173.612198f, 3.049997f, 52.688000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 6588629, 4, { -154.029907f, 3.049906f, 72.262756f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 95.577843f, -300.028412f, 0.707827f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6588652, 4, { 95.163948f, -300.028198f, 0.952097f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6588653, 4, { 135.748398f, -300.000092f, 0.172490f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 6588667, 4, { 371.527588f, 212.000000f, 391.566010f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 371.795685f, 212.000000f, 391.643097f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -230.764297f, -0.932137f, -173.143600f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 352.071411f, 212.000000f, 391.988892f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6562675, 5, { -228.044006f, -0.901261f, -183.153198f }, 1.000000f );
+      instance->registerEObj( "Imperialidentificationkey", 2007567, 0, 4, { -202.837997f, -0.966086f, -62.488140f }, 1.000000f );
+      instance->registerEObj( "Securityterminal", 2007571, 6640773, 4, { -206.023102f, 2.815013f, -48.897739f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007575, 6501039, 4, { -203.861694f, 1.804717f, -49.827511f }, 1.000000f );
+      instance->registerEObj( "Imperialidentificationkey", 2007568, 0, 4, { -176.569397f, 2.150000f, 17.400681f }, 1.000000f );
+      instance->registerEObj( "Securityterminal", 2007572, 6516973, 4, { -187.083206f, 2.707914f, 19.031469f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007576, 6502290, 4, { -174.854904f, 2.100000f, 23.458460f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007776, 6500492, 4, { -126.770897f, 2.000089f, 72.952606f }, 1.000000f );
+      instance->registerEObj( "Controlpanel", 2007580, 0, 4, { -0.003809f, -299.760315f, 0.024599f }, 2.000000f );
+      instance->registerEObj( "Controlpanel", 2007581, 0, 4, { 177.511993f, -298.963196f, 4.224624f }, 0.991760f );
+      instance->registerEObj( "Controlpanel", 2007582, 6523203, 4, { 177.434006f, -298.072601f, 6.243333f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007601, 6516974, 4, { 176.321396f, -299.105713f, 0.250570f }, 1.000000f );
+      instance->registerEObj( "Imperialidentificationkey", 2007569, 0, 4, { 317.032288f, 169.000107f, 230.153503f }, 1.000000f );
+      instance->registerEObj( "Securityterminal", 2007573, 6488516, 4, { 320.921600f, 169.867996f, 243.976807f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007577, 6488509, 4, { 328.225189f, 169.000107f, 244.581894f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007578, 6777152, 4, { 382.790100f, 203.000000f, 357.169403f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BardamsMettle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BardamsMettle.cpp
new file mode 100644
index 00000000..51f3f14e
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BardamsMettle.cpp
@@ -0,0 +1,49 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BardamsMettle : public InstanceContentScript
+{
+public:
+   BardamsMettle() : InstanceContentScript( 53 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007896, 6803926, 4, { 3.704567f, -0.506593f, 225.007507f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6805825, 4, { 4.867329f, -0.098875f, 275.309509f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 4.932000f, -0.320500f, 274.559509f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007899, 6802026, 4, { -28.138130f, -45.000000f, -32.892731f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6806775, 4, { -28.390051f, -45.148991f, 8.165403f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -28.551781f, -45.222500f, 5.617400f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007903, 6773193, 4, { -18.557831f, -44.964081f, -0.932714f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007904, 6773192, 4, { -30.723289f, -45.025860f, 1.953206f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007905, 6773194, 4, { -42.383171f, -44.962471f, -5.125507f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2008196, 0, 4, { -37.125240f, -45.059940f, -9.414856f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2008310, 6879064, 4, { -23.194941f, -45.000000f, -3.016589f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7008362, 4, { -28.500000f, -45.000000f, -14.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002872, 6806776, 4, { 24.174879f, -167.392899f, -453.406586f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 24.419100f, -167.350601f, -455.580109f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007894, 6525794, 4, { -36.023540f, 4.305134f, 406.807404f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007895, 6525806, 4, { 4.331786f, 1.464790f, 289.456207f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007897, 6540078, 4, { -49.525101f, -45.174839f, 117.206200f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007898, 6540093, 4, { -14.321400f, -42.200001f, 42.272179f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007900, 6525664, 4, { -19.668949f, -188.037003f, -235.950302f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2007901, 6525665, 4, { 25.192631f, -172.808502f, -362.417114f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2007902, 6525180, 4, { 23.936859f, -172.125198f, -405.882996f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6797774, 5, { -23.838560f, 8.289917f, 482.742615f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -20.252930f, 8.134582f, 489.817200f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 23.942671f, -167.617996f, -486.860809f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyParties.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyParties.cpp
new file mode 100644
index 00000000..18b9e457
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyParties.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BasicTrainingEnemyParties : public InstanceContentScript
+{
+public:
+   BasicTrainingEnemyParties() : InstanceContentScript( 10001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyStrongholds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyStrongholds.cpp
new file mode 100644
index 00000000..ac337f81
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyStrongholds.cpp
@@ -0,0 +1,28 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BasicTrainingEnemyStrongholds : public InstanceContentScript
+{
+public:
+   BasicTrainingEnemyStrongholds() : InstanceContentScript( 10003 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000604, 4262798, 4, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BattleintheBigKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BattleintheBigKeep.cpp
new file mode 100644
index 00000000..1713f9d8
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BattleintheBigKeep.cpp
@@ -0,0 +1,107 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BattleintheBigKeep : public InstanceContentScript
+{
+public:
+   BattleintheBigKeep() : InstanceContentScript( 20030 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000491, 4246565, 4, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f );
+      instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown30", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown31", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f );
+      instance->registerEObj( "Unknown33", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f );
+      instance->registerEObj( "Unknown39", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f );
+      instance->registerEObj( "Unknown40", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown41", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown42", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown43", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f );
+      instance->registerEObj( "Unknown44", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f );
+      instance->registerEObj( "Unknown45", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f );
+      instance->registerEObj( "Unknown46", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f );
+      instance->registerEObj( "Unknown47", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f );
+      instance->registerEObj( "Unknown48", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f );
+      instance->registerEObj( "Unknown49", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f );
+      instance->registerEObj( "Unknown50", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f );
+      instance->registerEObj( "Unknown51", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f );
+      instance->registerEObj( "Unknown52", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown53", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown54", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f );
+      instance->registerEObj( "Unknown55", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f );
+      instance->registerEObj( "Unknown56", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f );
+      instance->registerEObj( "Unknown57", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f );
+      instance->registerEObj( "Unknown58", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f );
+      instance->registerEObj( "Unknown59", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f );
+      instance->registerEObj( "Unknown60", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f );
+      instance->registerEObj( "Unknown62", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f );
+      instance->registerEObj( "Unknown64", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f );
+      instance->registerEObj( "Unknown65", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f );
+      instance->registerEObj( "Unknown66", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f );
+      instance->registerEObj( "Unknown67", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown68", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f );
+      instance->registerEObj( "Aetherialflow", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f );
+      instance->registerEObj( "Unknown69", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown70", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown71", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown72", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown73", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f );
+      instance->registerEObj( "Unknown74", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BattleontheBigBridge.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BattleontheBigBridge.cpp
new file mode 100644
index 00000000..588f8377
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BattleontheBigBridge.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BattleontheBigBridge : public InstanceContentScript
+{
+public:
+   BattleontheBigBridge() : InstanceContentScript( 20021 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 106.355499f, -5.000003f, -0.049812f }, 0.404395f );
+      instance->registerEObj( "Unknown1", 2002872, 4630952, 4, { 109.916496f, -5.000003f, -0.035030f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -75.653900f, 1.999997f, 0.149403f }, 0.500000f );
+      instance->registerEObj( "Unknown3", 2002872, 4635071, 4, { -72.579193f, 1.999997f, 0.830825f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2003902, 4635078, 4, { -37.106110f, 2.000000f, 1.552188f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4630929, 5, { -141.564804f, 1.314597f, 3.459962f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 143.814301f, -5.000000f, -0.081344f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -136.750107f, 1.329580f, 5.374416f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BloodDragoon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BloodDragoon.cpp
new file mode 100644
index 00000000..7e432d7b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BloodDragoon.cpp
@@ -0,0 +1,49 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BloodDragoon : public InstanceContentScript
+{
+public:
+   BloodDragoon() : InstanceContentScript( 5021 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007896, 6803926, 4, { 3.704567f, -0.506593f, 225.007507f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6805825, 4, { 4.867329f, -0.098875f, 275.309509f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 4.932000f, -0.320500f, 274.559509f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007899, 6802026, 4, { -28.138130f, -45.000000f, -32.892731f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6806775, 4, { -28.390051f, -45.148991f, 8.165403f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -28.551781f, -45.222500f, 5.617400f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007903, 6773193, 4, { -18.557831f, -44.964081f, -0.932714f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007904, 6773192, 4, { -30.723289f, -45.025860f, 1.953206f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007905, 6773194, 4, { -42.383171f, -44.962471f, -5.125507f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2008196, 0, 4, { -37.125240f, -45.059940f, -9.414856f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2008310, 6879064, 4, { -23.194941f, -45.000000f, -3.016589f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7008362, 4, { -28.500000f, -45.000000f, -14.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002872, 6806776, 4, { 24.174879f, -167.392899f, -453.406586f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 24.419100f, -167.350601f, -455.580109f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007894, 6525794, 4, { -36.023540f, 4.305134f, 406.807404f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007895, 6525806, 4, { 4.331786f, 1.464790f, 289.456207f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007897, 6540078, 4, { -49.525101f, -45.174839f, 117.206200f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007898, 6540093, 4, { -14.321400f, -42.200001f, 42.272179f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007900, 6525664, 4, { -19.668949f, -188.037003f, -235.950302f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2007901, 6525665, 4, { 25.192631f, -172.808502f, -362.417114f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2007902, 6525180, 4, { 23.936859f, -172.125198f, -405.882996f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6797774, 5, { -23.838560f, 8.289917f, 482.742615f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -20.252930f, 8.134582f, 489.817200f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 23.942671f, -167.617996f, -486.860809f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BloodontheDeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BloodontheDeck.cpp
new file mode 100644
index 00000000..7992c6a4
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BloodontheDeck.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BloodontheDeck : public InstanceContentScript
+{
+public:
+   BloodontheDeck() : InstanceContentScript( 5009 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6904219, 4, { 5.684449f, 16.347240f, 3.782750f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstop.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstop.cpp
new file mode 100644
index 00000000..4738abef
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstop.cpp
@@ -0,0 +1,43 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BrayfloxsLongstop : public InstanceContentScript
+{
+public:
+   BrayfloxsLongstop() : InstanceContentScript( 8 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2001694, 0, 4, { -36.384769f, 34.915119f, -234.568405f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2001461, 0, 4, { 142.567200f, -1.266762f, 67.804497f }, 0.991760f );
+      instance->registerEObj( "RunstopHeadgate", 2001462, 3996541, 4, { 105.920601f, 1.745684f, 11.445460f }, 1.000000f );
+      instance->registerEObj( "RunstopGutgate", 2001463, 3970152, 4, { 113.391296f, -0.849704f, -33.166710f }, 1.000000f );
+      instance->registerEObj( "RunstopBackgate", 2001464, 3970154, 4, { -19.424801f, 7.919373f, -71.122383f }, 0.991760f );
+      instance->registerEObj( "LongstopHeadgate", 2001465, 3970153, 4, { -113.634499f, 1.332127f, -58.144779f }, 1.000000f );
+      instance->registerEObj( "LongstopGutgate", 2001466, 3976772, 4, { -89.831360f, 14.042510f, -96.676224f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2001584, 4086949, 4, { 106.822800f, -1.629326f, 2.541263f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001585, 0, 4, { 110.429604f, -1.663330f, 3.311157f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2001586, 4088979, 4, { 8.021301f, 5.921407f, -69.090309f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001587, 0, 4, { 6.458210f, 5.902269f, -67.560417f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001588, 4088985, 4, { -106.298798f, -2.123102f, -10.585170f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001589, 0, 4, { -105.172897f, -2.123102f, -10.865350f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001590, 4088991, 4, { -68.039551f, 33.716820f, -232.938904f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001591, 0, 4, { -68.693542f, 33.682091f, -234.070496f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4097104, 5, { 122.445702f, -1.119082f, 68.403687f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.256897f, -1.172536f, 59.115589f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -8.639429f, 35.641689f, -234.813797f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstopHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstopHard.cpp
new file mode 100644
index 00000000..e2e58b9e
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstopHard.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BrayfloxsLongstopHard : public InstanceContentScript
+{
+public:
+   BrayfloxsLongstopHard() : InstanceContentScript( 20 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003103, 0, 4, { -16.800230f, 25.375731f, -171.007904f }, 0.991760f );
+      instance->registerEObj( "RunstopHeadgate", 2002182, 4542379, 4, { 105.912804f, 1.724182f, 11.428960f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002183, 4621964, 4, { 111.650299f, 0.228821f, -49.790279f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -75.025421f, -1.210333f, 73.659332f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4543753, 5, { -77.622681f, 0.605630f, 95.628304f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2002326, 0, 4, { -3.491464f, -0.354560f, -24.718349f }, 1.000000f );
+      instance->registerEObj( "Tinykey", 2002325, 0, 4, { -62.769581f, -0.332854f, 36.199650f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 4543726, 4, { 111.888000f, -2.109839f, -6.942894f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 114.658699f, -2.093417f, -6.149437f }, 1.100000f );
+      instance->registerEObj( "Unknown6", 2002109, 4549243, 4, { 92.977211f, 5.002774f, -110.975502f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002150, 4549448, 4, { 30.497520f, 8.248112f, -82.096916f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2002180, 4549459, 4, { 27.134510f, 7.114878f, -120.719704f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002181, 4574849, 4, { 45.695850f, 7.015042f, -129.344604f }, 1.000000f );
+      instance->registerEObj( "Stolenwares", 2002262, 4598415, 4, { -28.610241f, 25.192631f, -174.631195f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002735, 0, 4, { 44.686901f, 7.015000f, -131.547394f }, 0.500000f );
+      instance->registerEObj( "Unknown11", 2002872, 4543729, 4, { 44.232769f, 7.015042f, -129.352997f }, 0.991760f );
+      instance->registerEObj( "ブレイフロクスの抜道", 2003429, 0, 4, { 44.358749f, 7.554582f, -132.341095f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -25.894650f, 35.019409f, -222.949600f }, 0.991760f );
+      instance->registerEObj( "SwiftmakeCheckgate", 2002184, 4549240, 4, { -95.264717f, 12.888430f, -122.593300f }, 1.000000f );
+      instance->registerEObj( "SwiftmakeCheckgate", 2002665, 4549241, 4, { -100.273201f, 20.310730f, -163.513397f }, 1.000000f );
+      instance->registerEObj( "SwiftmakeCheckgate", 2002884, 4572942, 4, { -102.647499f, 21.011600f, -187.365494f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2002872, 4543735, 4, { -48.175251f, 34.706921f, -234.463196f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2002735, 0, 4, { -48.271229f, 34.918541f, -235.574203f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CapeWestwind.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/CapeWestwind.cpp
new file mode 100644
index 00000000..e037af61
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/CapeWestwind.cpp
@@ -0,0 +1,28 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class CapeWestwind : public InstanceContentScript
+{
+public:
+   CapeWestwind() : InstanceContentScript( 20007 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000604, 4262798, 4, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CastrumAbania.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/CastrumAbania.cpp
new file mode 100644
index 00000000..28de071c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/CastrumAbania.cpp
@@ -0,0 +1,81 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class CastrumAbania : public InstanceContentScript
+{
+public:
+   CastrumAbania() : InstanceContentScript( 55 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 277.157013f, 20.000000f, -7.932621f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6841714, 4, { 276.710388f, 20.000000f, -6.315289f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 286.855713f, 20.000000f, -43.546181f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6777074, 4, { 281.592285f, 20.000000f, -45.737782f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6828612, 5, { -406.401794f, -17.924580f, 314.141907f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -414.573212f, -18.000120f, 306.364807f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2008027, 6738153, 4, { -362.172913f, -10.025270f, 237.292999f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2008029, 6739981, 4, { -291.220795f, -6.000043f, 108.329102f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2008030, 6739980, 4, { -298.753113f, -6.000044f, 108.051498f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2008031, 6739979, 4, { -305.840515f, -6.000044f, 107.763603f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2008032, 6739982, 4, { -281.123505f, -6.000060f, 118.299301f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2008033, 6739984, 4, { -280.565704f, -6.000067f, 125.491203f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2008034, 6739983, 4, { -280.552185f, -6.000068f, 132.687302f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2008035, 6869663, 4, { -273.854889f, -6.000038f, 100.620499f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2008036, 6740009, 4, { -213.504593f, -6.129103f, 82.266739f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2008037, 6740016, 4, { -213.045807f, -1.999959f, 131.946198f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2008038, 6914793, 4, { -179.395294f, 2.138688f, 279.671387f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2008041, 6752603, 4, { -167.801697f, 2.138688f, 273.763214f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2008042, 6752604, 4, { -167.091507f, 2.138688f, 278.924805f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2008043, 6752601, 4, { -180.179504f, 2.138688f, 292.024200f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2008044, 6752602, 4, { -184.772797f, 2.138688f, 291.367188f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2008047, 6752608, 4, { -166.154602f, 2.000032f, 293.249298f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2008039, 6914794, 4, { -101.486900f, 6.138662f, 311.254791f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2008050, 6752644, 4, { -81.520500f, 6.000006f, 290.652313f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2008051, 6752643, 4, { -81.142883f, 6.000006f, 332.866211f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2008048, 6752633, 4, { -80.650719f, 6.138662f, 311.338989f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2008040, 6914795, 4, { -22.122820f, 10.138660f, 278.146912f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2008045, 6752689, 4, { -27.394449f, 10.138660f, 265.483795f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2008046, 6752679, 4, { -16.694490f, 10.138650f, 265.926208f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2008070, 6752690, 4, { -9.852131f, 10.138650f, 272.919403f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2008089, 6752691, 4, { -9.914229f, 10.138650f, 283.758392f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2008052, 6752695, 4, { -21.991831f, 9.999999f, 250.500702f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2008053, 6752694, 4, { 5.133811f, 9.999997f, 278.283295f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2008049, 6752681, 4, { -8.415267f, 9.999998f, 264.128204f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2008320, 6869673, 4, { -84.465187f, 6.000006f, 311.371613f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2008054, 6785102, 4, { 22.499630f, 14.184900f, 175.166702f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2008056, 6741815, 4, { 110.871597f, 26.000059f, 144.405807f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2008055, 6698733, 4, { 178.971298f, 20.000139f, 81.701027f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2008057, 6717638, 4, { 154.867996f, 20.000160f, 106.733902f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2008058, 6717639, 4, { 165.172699f, 20.000019f, 86.256683f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2008059, 6717640, 4, { 195.091507f, 20.000170f, 51.864651f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2008060, 6717641, 4, { 200.323502f, 20.000179f, 46.925930f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2008061, 6717642, 4, { 203.790298f, 20.000200f, 59.565971f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2008062, 6717643, 4, { 209.140793f, 20.000191f, 54.901482f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2008063, 6772873, 4, { 172.971100f, 20.100290f, 82.304329f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2008064, 6773603, 4, { 267.862396f, 20.100000f, 30.848459f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2008455, 6790661, 4, { 294.476715f, 20.000000f, -39.619999f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2008527, 6914797, 4, { 21.803070f, 14.184900f, 182.260696f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2007457, 6842146, 4, { 205.204193f, 20.000271f, 41.332821f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2007457, 6842148, 4, { 214.202393f, 20.000271f, 49.597000f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2002735, 0, 4, { -212.960007f, -2.000000f, 167.038193f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2002872, 6841858, 4, { -212.643799f, -2.000000f, 164.712097f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2008071, 6841865, 4, { -212.474792f, -1.815126f, 204.927307f }, 1.000000f );
+      instance->registerEObj( "Unknown51", 2002872, 6841875, 4, { 10.483370f, 14.000030f, 208.476395f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2002735, 0, 4, { 10.447360f, 14.000030f, 206.708298f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2008072, 6841959, 4, { 28.276699f, 14.184900f, 186.737000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CastrumMeridianum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/CastrumMeridianum.cpp
new file mode 100644
index 00000000..8e6c4520
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/CastrumMeridianum.cpp
@@ -0,0 +1,82 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class CastrumMeridianum : public InstanceContentScript
+{
+public:
+   CastrumMeridianum() : InstanceContentScript( 15 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000593, 4249703, 4, { -67.576859f, 70.350082f, -36.382999f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000594, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f );
+      instance->registerEObj( "Magitekmissile", 2000662, 0, 4, { -108.687798f, 70.343590f, -8.558592f }, 1.400000f );
+      instance->registerEObj( "Magitekmissile", 2000663, 0, 4, { -116.665100f, 70.390266f, -53.063919f }, 1.400000f );
+      instance->registerEObj( "Unknown2", 2001149, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000591, 4249720, 4, { -25.465830f, 83.385536f, -254.529602f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000592, 0, 4, { -25.038260f, 81.798767f, -248.906296f }, 1.100000f );
+      instance->registerEObj( "Imperialidentificationkey", 2000870, 0, 4, { -67.439163f, 81.798767f, -231.079102f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000588, 0, 4, { 34.634392f, 71.755402f, -45.910198f }, 0.900000f );
+      instance->registerEObj( "Unknown6", 2000587, 4249693, 4, { 36.526970f, 70.598427f, -46.207680f }, 1.000000f );
+      instance->registerEObj( "Imperialidentificationkey", 2000869, 0, 4, { -7.280443f, 69.781212f, 27.170691f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000590, 0, 4, { -7.938801f, 70.550377f, 55.590679f }, 1.100000f );
+      instance->registerEObj( "Unknown8", 2000589, 4249713, 4, { -5.998041f, 70.281548f, 58.349812f }, 1.000000f );
+      instance->registerEObj( "Searchlightterminal", 2000564, 3169670, 4, { 213.829102f, 89.024597f, -107.133797f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000565, 4204866, 4, { 210.588501f, 88.962471f, -106.430901f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000603, 0, 4, { 242.256302f, 87.579422f, -95.018204f }, 0.991760f );
+      instance->registerEObj( "Disposalchute", 2000597, 0, 4, { 40.790581f, 71.410004f, -11.781850f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2000860, 3168876, 4, { 197.143005f, 92.716309f, -155.744797f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000861, 3168877, 4, { 211.024704f, 89.452042f, -70.152588f }, 1.000000f );
+      instance->registerEObj( "Searchlightterminal", 2000873, 4317191, 4, { 206.509399f, 90.986397f, -79.219772f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000566, 4204867, 4, { -62.804321f, 72.657097f, 180.368805f }, 1.000000f );
+      instance->registerEObj( "Searchlightterminal", 2000567, 4204869, 4, { -71.896492f, 74.742790f, 151.474503f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000569, 4204871, 4, { 1.863623f, 71.927399f, 89.175919f }, 1.000000f );
+      instance->registerEObj( "Unstablepaneling", 2000571, 3956106, 4, { 95.737846f, 64.963051f, 103.147400f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000573, 3149745, 4, { 93.090912f, 66.531853f, 117.642097f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2000572, 4065604, 4, { 83.071327f, 60.587688f, 116.300903f }, 1.000000f );
+      instance->registerEObj( "Unstablepaneling", 2000574, 3956104, 4, { 104.309601f, 64.941147f, 67.240013f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2000575, 4065628, 4, { 93.616432f, 60.529831f, 51.407162f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2000576, 3149747, 4, { 101.933800f, 66.905586f, 52.199631f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2000577, 3642024, 4, { 20.799950f, 70.334259f, 4.277452f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2000862, 3149816, 4, { -77.378540f, 78.416023f, 130.266205f }, 0.991760f );
+      instance->registerEObj( "Incendiary#37", 2000570, 0, 4, { 109.141098f, 64.757690f, 62.367512f }, 0.991760f );
+      instance->registerEObj( "Incendiary#37", 2001113, 0, 4, { 124.726898f, 64.689621f, 62.085869f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2001206, 0, 4, { 104.233803f, 66.103699f, 68.343483f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2001205, 0, 4, { 95.566910f, 66.188728f, 101.984398f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2000578, 3642033, 4, { 5.540902f, 70.172447f, -68.735893f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2000586, 3169187, 4, { -84.639374f, 86.075699f, -294.635010f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000582, 0, 4, { -62.063919f, 69.259163f, -89.851593f }, 1.500000f );
+      instance->registerEObj( "Magitekterminal", 2000583, 0, 4, { -43.080639f, 69.331673f, -84.657654f }, 1.480042f );
+      instance->registerEObj( "Unknown24", 2000584, 3642010, 4, { -53.516090f, 69.940781f, -85.333992f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2000863, 3169178, 4, { 31.803410f, 83.652863f, -168.188904f }, 1.000000f );
+      instance->registerEObj( "Searchlightterminal", 2000568, 4204872, 4, { 24.724890f, 77.701874f, -154.365402f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2000874, 4317259, 4, { 10.967040f, 74.960777f, -139.438599f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2001136, 4265914, 4, { -18.308630f, 81.798767f, -204.730896f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2001160, 4200584, 4, { 5.338250f, 70.502319f, -87.827461f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2001159, 4200444, 4, { 21.572090f, 70.516617f, 9.031565f }, 1.000000f );
+      instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000595, 0, 4, { -66.151108f, 69.594437f, -20.559780f }, 0.991760f );
+      instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000600, 0, 4, { -70.083420f, 69.122810f, -65.019180f }, 0.991760f );
+      instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000601, 0, 4, { -44.756939f, 67.998627f, -39.293011f }, 0.991760f );
+      instance->registerEObj( "Unknown30", 2000865, 3169123, 4, { -27.982929f, 79.754509f, -48.873550f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2000865, 3284996, 4, { -19.120440f, 79.754509f, -11.464200f }, 1.000000f );
+      instance->registerEObj( "Searchlightterminal", 2000580, 4204877, 4, { -26.230459f, 79.754509f, -42.167561f }, 0.991760f );
+      instance->registerEObj( "Searchlightterminal", 2000581, 4265903, 4, { -23.853939f, 79.754509f, -15.348020f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2000875, 4317262, 4, { -45.087860f, 67.998833f, -39.263939f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2000562, 4247977, 4, { 257.286194f, 87.030891f, -99.538628f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2000563, 0, 4, { 260.508087f, 86.897049f, -89.411842f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000596, 0, 4, { -121.432404f, 70.350082f, -28.426470f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h b/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h
new file mode 100644
index 00000000..02d91881
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h
@@ -0,0 +1,590 @@
+[00:54:47][info] Setting up EXD data
+[00:54:56][info] #ifndef _COMMON_GEN_H_
+#define _COMMON_GEN_H_
+/* This file has been automatically generated.
+   Changes will be lost upon regeneration.
+   To change the content edit tools/exd_common_gen */
+namespace Core {
+namespace Common {
+
+   ///////////////////////////////////////////////////////////
+   //ActionCategory.exd
+   enum class ActionCategory : uint8_t
+   {
+      Autoattack = 1,
+      Spell = 2,
+      Weaponskill = 3,
+      Ability = 4,
+      Item = 5,
+      DoLAbility = 6,
+      DoHAbility = 7,
+      Event = 8,
+      LimitBreak = 9,
+      System = 10,
+      Artillery = 11,
+      Mount = 12,
+      Glamour = 13,
+      ItemManipulation = 14,
+      AdrenalineRush = 15,
+      bool operator==( const ActionCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const ActionCategory& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //BeastReputationRank.exd
+   enum class BeastReputationRank : uint8_t
+   {
+      None = 0,
+      Neutral = 1,
+      Recognized = 2,
+      Friendly = 3,
+      Trusted = 4,
+      Respected = 5,
+      Honored = 6,
+      Sworn = 7,
+      Allied = 8,
+      bool operator==( const BeastReputationRank& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const BeastReputationRank& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //BeastTribe.exd
+   enum class BeastTribe : uint8_t
+   {
+      bool operator==( const BeastTribe& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const BeastTribe& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //ClassJob.exd
+   enum class ClassJob : uint8_t
+   {
+      Adventurer = 0,
+      Gladiator = 1,
+      Pugilist = 2,
+      Marauder = 3,
+      Lancer = 4,
+      Archer = 5,
+      Conjurer = 6,
+      Thaumaturge = 7,
+      Carpenter = 8,
+      Blacksmith = 9,
+      Armorer = 10,
+      Goldsmith = 11,
+      Leatherworker = 12,
+      Weaver = 13,
+      Alchemist = 14,
+      Culinarian = 15,
+      Miner = 16,
+      Botanist = 17,
+      Fisher = 18,
+      Paladin = 19,
+      Monk = 20,
+      Warrior = 21,
+      Dragoon = 22,
+      Bard = 23,
+      Whitemage = 24,
+      Blackmage = 25,
+      Arcanist = 26,
+      Summoner = 27,
+      Scholar = 28,
+      Rogue = 29,
+      Ninja = 30,
+      Machinist = 31,
+      Darkknight = 32,
+      Astrologian = 33,
+      Samurai = 34,
+      Redmage = 35,
+      bool operator==( const ClassJob& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const ClassJob& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //ContentType.exd
+   enum class ContentType : uint8_t
+   {
+      DutyRoulette = 1,
+      Dungeons = 2,
+      Guildhests = 3,
+      Trials = 4,
+      Raids = 5,
+      PvP = 6,
+      QuestBattles = 7,
+      FATEs = 8,
+      TreasureHunt = 9,
+      Levequests = 10,
+      GrandCompany = 11,
+      Companions = 12,
+      BeastTribeQuests = 13,
+      OverallCompletion = 14,
+      PlayerCommendation = 15,
+      DisciplesoftheLand = 16,
+      DisciplesoftheHand = 17,
+      RetainerVentures = 18,
+      GoldSaucer = 19,
+      DeepDungeons = 21,
+      WondrousTails = 24,
+      CustomDeliveries = 25,
+      bool operator==( const ContentType& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const ContentType& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //EmoteCategory.exd
+   enum class EmoteCategory : uint8_t
+   {
+      General = 1,
+      Persistent = 2,
+      Expressions = 3,
+      bool operator==( const EmoteCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const EmoteCategory& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //ExVersion.exd
+   enum class ExVersion : uint8_t
+   {
+      ARealmReborn = 0,
+      Heavensward = 1,
+      Stormblood = 2,
+      bool operator==( const ExVersion& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const ExVersion& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //GrandCompany.exd
+   enum class GrandCompany : uint8_t
+   {
+      None = 0,
+      Maelstrom = 1,
+      OrderoftheTwinAdder = 2,
+      ImmortalFlames = 3,
+      bool operator==( const GrandCompany& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const GrandCompany& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //GuardianDeity.exd
+   enum class GuardianDeity : uint8_t
+   {
+      HalonetheFury = 1,
+      MenphinatheLover = 2,
+      ThaliaktheScholar = 3,
+      NymeiatheSpinner = 4,
+      LlymlaentheNavigator = 5,
+      OschontheWanderer = 6,
+      ByregottheBuilder = 7,
+      RhalgrtheDestroyer = 8,
+      AzeymatheWarden = 9,
+      NaldthaltheTraders = 10,
+      NophicatheMatron = 11,
+      AlthyktheKeeper = 12,
+      bool operator==( const GuardianDeity& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const GuardianDeity& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //ItemUICategory.exd
+   enum class ItemUICategory : uint8_t
+   {
+      PugilistsArm = 1,
+      GladiatorsArm = 2,
+      MaraudersArm = 3,
+      ArchersArm = 4,
+      LancersArm = 5,
+      OnehandedThaumaturgesArm = 6,
+      TwohandedThaumaturgesArm = 7,
+      OnehandedConjurersArm = 8,
+      TwohandedConjurersArm = 9,
+      ArcanistsGrimoire = 10,
+      Shield = 11,
+      CarpentersPrimaryTool = 12,
+      CarpentersSecondaryTool = 13,
+      BlacksmithsPrimaryTool = 14,
+      BlacksmithsSecondaryTool = 15,
+      ArmorersPrimaryTool = 16,
+      ArmorersSecondaryTool = 17,
+      GoldsmithsPrimaryTool = 18,
+      GoldsmithsSecondaryTool = 19,
+      LeatherworkersPrimaryTool = 20,
+      LeatherworkersSecondaryTool = 21,
+      WeaversPrimaryTool = 22,
+      WeaversSecondaryTool = 23,
+      AlchemistsPrimaryTool = 24,
+      AlchemistsSecondaryTool = 25,
+      CulinariansPrimaryTool = 26,
+      CulinariansSecondaryTool = 27,
+      MinersPrimaryTool = 28,
+      MinersSecondaryTool = 29,
+      BotanistsPrimaryTool = 30,
+      BotanistsSecondaryTool = 31,
+      FishersPrimaryTool = 32,
+      FishingTackle = 33,
+      Head = 34,
+      Body = 35,
+      Legs = 36,
+      Hands = 37,
+      Feet = 38,
+      Waist = 39,
+      Necklace = 40,
+      Earrings = 41,
+      Bracelets = 42,
+      Ring = 43,
+      Medicine = 44,
+      Ingredient = 45,
+      Meal = 46,
+      Seafood = 47,
+      Stone = 48,
+      Metal = 49,
+      Lumber = 50,
+      Cloth = 51,
+      Leather = 52,
+      Bone = 53,
+      Reagent = 54,
+      Dye = 55,
+      Part = 56,
+      Furnishing = 57,
+      Materia = 58,
+      Crystal = 59,
+      Catalyst = 60,
+      Miscellany = 61,
+      SoulCrystal = 62,
+      Other = 63,
+      ConstructionPermit = 64,
+      Roof = 65,
+      ExteriorWall = 66,
+      Window = 67,
+      Door = 68,
+      RoofDecoration = 69,
+      ExteriorWallDecoration = 70,
+      Placard = 71,
+      Fence = 72,
+      InteriorWall = 73,
+      Flooring = 74,
+      CeilingLight = 75,
+      OutdoorFurnishing = 76,
+      Table = 77,
+      Tabletop = 78,
+      Wallmounted = 79,
+      Rug = 80,
+      Minion = 81,
+      Gardening = 82,
+      Demimateria = 83,
+      RoguesArm = 84,
+      SeasonalMiscellany = 85,
+      TripleTriadCard = 86,
+      DarkKnightsArm = 87,
+      MachinistsArm = 88,
+      AstrologiansArm = 89,
+      AirshipHull = 90,
+      AirshipRigging = 91,
+      AirshipAftcastle = 92,
+      AirshipForecastle = 93,
+      OrchestrionRoll = 94,
+      Painting = 95,
+      SamuraisArm = 96,
+      RedMagesArm = 97,
+      ScholarsArm = 98,
+      FishersSecondaryTool = 99,
+      Currency = 100,
+      bool operator==( const ItemUICategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const ItemUICategory& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //ItemSearchCategory.exd
+   enum class ItemSearchCategory : uint8_t
+   {
+      PrimaryArms = 1,
+      PrimaryTools = 2,
+      PrimaryTools1 = 3,
+      Armor = 4,
+      Accessories = 5,
+      Medicines = 6,
+      Materials = 7,
+      Other = 8,
+      PugilistsArms = 9,
+      GladiatorsArms = 10,
+      MaraudersArms = 11,
+      ArchersArms = 12,
+      LancersArms = 13,
+      ThaumaturgesArms = 14,
+      ConjurersArms = 15,
+      ArcanistsArms = 16,
+      Shields = 17,
+      ThrowingWeapons = 18,
+      CarpentersTools = 19,
+      BlacksmithsTools = 20,
+      ArmorersTools = 21,
+      GoldsmithsTools = 22,
+      LeatherworkersTools = 23,
+      WeaversTools = 24,
+      AlchemistsTools = 25,
+      CulinariansTools = 26,
+      MinersTools = 27,
+      BotanistsTools = 28,
+      FishersTools = 29,
+      FishingTackle = 30,
+      Head = 31,
+      Undershirts = 32,
+      Body = 33,
+      Undergarments = 34,
+      Legs = 35,
+      Hands = 36,
+      Feet = 37,
+      Waist = 38,
+      Necklaces = 39,
+      Earrings = 40,
+      Bracelets = 41,
+      Rings = 42,
+      Medicine = 43,
+      Ingredients = 44,
+      Meals = 45,
+      Seafood = 46,
+      Stone = 47,
+      Metal = 48,
+      Lumber = 49,
+      Cloth = 50,
+      Leather = 51,
+      Bone = 52,
+      Reagents = 53,
+      Dyes = 54,
+      WeaponParts = 55,
+      Furnishings = 56,
+      Materia = 57,
+      Crystals = 58,
+      Catalysts = 59,
+      Miscellany = 60,
+      SoulCrystals = 61,
+      Arrows = 62,
+      QuestItems = 63,
+      Other1 = 64,
+      ExteriorFixtures = 65,
+      InteriorFixtures = 66,
+      OutdoorFurnishings = 67,
+      ChairsandBeds = 68,
+      Tables = 69,
+      Tabletop = 70,
+      Wallmounted = 71,
+      Rugs = 72,
+      RoguesArms = 73,
+      SeasonalMiscellany = 74,
+      Minions = 75,
+      DarkKnightsArms = 76,
+      MachinistsArms = 77,
+      AstrologiansArms = 78,
+      AirshipComponents = 79,
+      OrchestrionComponents = 80,
+      GardeningItems = 81,
+      Paintings = 82,
+      SamuraisArms = 83,
+      RedMagesArms = 84,
+      ScholarsArms = 85,
+      bool operator==( const ItemSearchCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const ItemSearchCategory& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //OnlineStatus.exd
+   enum class OnlineStatus : uint8_t
+   {
+      Producer = 1,
+      GameMaster = 2,
+      GameMaster1 = 3,
+      GameMaster2 = 4,
+      Disconnected = 5,
+      WaitingforFriendListApproval = 6,
+      WaitingforLinkshellApproval = 7,
+      WaitingforFreeCompanyApproval = 8,
+      NotFound = 9,
+      Offline = 10,
+      Mentor = 11,
+      Busy = 12,
+      PvP = 13,
+      PlayingTripleTriad = 14,
+      ViewingCutscene = 15,
+      UsingaChocoboPorter = 16,
+      AwayfromKeyboard = 17,
+      CameraMode = 18,
+      LookingforRepairs = 19,
+      LookingtoRepair = 20,
+      LookingtoMeldMateria = 21,
+      Roleplaying = 22,
+      LookingforParty = 23,
+      SwordforHire = 24,
+      WaitingforDutyFinder = 25,
+      RecruitingPartyMembers = 26,
+      Mentor1 = 27,
+      PvEMentor = 28,
+      TradeMentor = 29,
+      PvPMentor = 30,
+      Returner = 31,
+      NewAdventurer = 32,
+      AllianceLeader = 33,
+      AlliancePartyLeader = 34,
+      AlliancePartyMember = 35,
+      PartyLeader = 36,
+      PartyMember = 37,
+      PartyLeaderCrossworld = 38,
+      PartyMemberCrossworld = 39,
+      AnotherWorld = 40,
+      SharingDuty = 41,
+      SimilarDuty = 42,
+      InDuty = 43,
+      TrialAdventurer = 44,
+      FreeCompany = 45,
+      GrandCompany = 46,
+      Online = 47,
+      bool operator==( const OnlineStatus& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const OnlineStatus& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //Race.exd
+   enum class Race : uint8_t
+   {
+      Hyur = 1,
+      Elezen = 2,
+      Lalafell = 3,
+      Miqote = 4,
+      Roegadyn = 5,
+      AuRa = 6,
+      bool operator==( const Race& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const Race& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //Tribe.exd
+   enum class Tribe : uint8_t
+   {
+      Midlander = 1,
+      Highlander = 2,
+      Wildwood = 3,
+      Duskwight = 4,
+      Plainsfolk = 5,
+      Dunesfolk = 6,
+      SeekeroftheSun = 7,
+      KeeperoftheMoon = 8,
+      SeaWolf = 9,
+      Hellsguard = 10,
+      Raen = 11,
+      Xaela = 12,
+      bool operator==( const Tribe& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const Tribe& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //Town.exd
+   enum class Town : uint8_t
+   {
+      Nowheresville = 0,
+      LimsaLominsa = 1,
+      Gridania = 2,
+      Uldah = 3,
+      Ishgard = 4,
+      Kugane = 7,
+      bool operator==( const Town& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const Town& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+
+   ///////////////////////////////////////////////////////////
+   //Weather.exd
+   enum class Weather : uint8_t
+   {
+      ClearSkies = 1,
+      FairSkies = 2,
+      Clouds = 3,
+      Fog = 4,
+      Wind = 5,
+      Gales = 6,
+      Rain = 7,
+      Showers = 8,
+      Thunder = 9,
+      Thunderstorms = 10,
+      DustStorms = 11,
+      Sandstorms = 12,
+      HotSpells = 13,
+      HeatWaves = 14,
+      Snow = 15,
+      Blizzards = 16,
+      Gloom = 17,
+      Auroras = 18,
+      Darkness = 19,
+      Tension = 20,
+      Clouds1 = 21,
+      StormClouds = 22,
+      RoughSeas = 23,
+      RoughSeas1 = 24,
+      Louring = 25,
+      HeatWaves1 = 26,
+      Gloom1 = 27,
+      Gales1 = 28,
+      Eruptions = 29,
+      FairSkies1 = 30,
+      FairSkies2 = 31,
+      FairSkies3 = 32,
+      FairSkies4 = 33,
+      FairSkies5 = 34,
+      Irradiance = 35,
+      CoreRadiation = 36,
+      CoreRadiation1 = 37,
+      CoreRadiation2 = 38,
+      CoreRadiation3 = 39,
+      ShelfClouds = 40,
+      ShelfClouds1 = 41,
+      ShelfClouds2 = 42,
+      ShelfClouds3 = 43,
+      Oppression = 44,
+      Oppression1 = 45,
+      Oppression2 = 46,
+      Oppression3 = 47,
+      Oppression4 = 48,
+      UmbralWind = 49,
+      UmbralStatic = 50,
+      Smoke = 51,
+      FairSkies6 = 52,
+      RoyalLevin = 53,
+      Hyperelectricity = 54,
+      RoyalLevin1 = 55,
+      Oppression5 = 56,
+      Thunder1 = 57,
+      Thunder2 = 58,
+      CutScene = 59,
+      Multiplicity = 60,
+      Multiplicity1 = 61,
+      Rain1 = 62,
+      FairSkies7 = 63,
+      Rain2 = 64,
+      FairSkies8 = 65,
+      Dragonstorm = 66,
+      Dragonstorm1 = 67,
+      Subterrain = 68,
+      Concordance = 69,
+      Concordance1 = 70,
+      BeyondTime = 71,
+      BeyondTime1 = 72,
+      BeyondTime2 = 73,
+      DemonicInfinity = 74,
+      DemonicInfinity1 = 75,
+      DemonicInfinity2 = 76,
+      DimensionalDisruption = 77,
+      DimensionalDisruption1 = 78,
+      DimensionalDisruption2 = 79,
+      Revelstorm = 80,
+      Revelstorm1 = 81,
+      EternalBliss = 82,
+      EternalBliss1 = 83,
+      Wyrmstorm = 84,
+      Wyrmstorm1 = 85,
+      Revelstorm2 = 86,
+      Quicklevin = 87,
+      Thunder3 = 88,
+      DimensionalDisruption3 = 89,
+      FairSkies9 = 90,
+      bool operator==( const Weather& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
+      bool operator==( const uint8_t& g, const Weather& t ) { return static_cast< uint8_t >( t ) == g; }
+   };
+}
+}
+#endif
+
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6.cpp
new file mode 100644
index 00000000..dde50b3a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayP1T6 : public InstanceContentScript
+{
+public:
+   ContainmentBayP1T6() : InstanceContentScript( 20041 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007340, 6383469, 4, { -0.194161f, 0.000000f, 3.451970f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007442, 6424145, 4, { -5.251681f, 0.000000f, -1.313751f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007443, 0, 4, { -4.046182f, 0.000000f, 3.618896f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007449, 0, 4, { 2.914429f, -0.015320f, -2.731445f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007464, 0, 4, { -0.015320f, -0.015320f, -14.419800f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002618, 6563705, 4, { 6.090889f, 0.000000f, -1.422338f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6392588, 5, { 0.132306f, 0.592461f, 10.611330f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.001971f, 0.000000f, -11.776730f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6Extreme.cpp
new file mode 100644
index 00000000..305e4357
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6Extreme.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayP1T6Extreme : public InstanceContentScript
+{
+public:
+   ContainmentBayP1T6Extreme() : InstanceContentScript( 20042 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007340, 6383469, 4, { -0.194161f, 0.000000f, 3.451970f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007442, 6424145, 4, { -5.251681f, 0.000000f, -1.313751f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007443, 0, 4, { -4.046182f, 0.000000f, 3.618896f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007449, 0, 4, { 2.914429f, -0.015320f, -2.731445f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007464, 0, 4, { -0.015320f, -0.015320f, -14.419800f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002618, 6563705, 4, { 6.090889f, 0.000000f, -1.422338f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6392588, 5, { 0.132306f, 0.592461f, 10.611330f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.001971f, 0.000000f, -11.776730f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7.cpp
new file mode 100644
index 00000000..16ade109
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayS1T7 : public InstanceContentScript
+{
+public:
+   ContainmentBayS1T7() : InstanceContentScript( 20037 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7Extreme.cpp
new file mode 100644
index 00000000..e62111b1
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7Extreme.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayS1T7Extreme : public InstanceContentScript
+{
+public:
+   ContainmentBayS1T7Extreme() : InstanceContentScript( 20038 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9.cpp
new file mode 100644
index 00000000..859b9c10
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9.cpp
@@ -0,0 +1,39 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayZ1T9 : public InstanceContentScript
+{
+public:
+   ContainmentBayZ1T9() : InstanceContentScript( 20043 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007719, 0, 4, { 5.447040f, 0.000002f, -9.308832f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007720, 0, 4, { 9.576125f, 0.000002f, -3.402662f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007716, 0, 4, { 11.420000f, 0.000004f, 11.783210f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007717, 0, 4, { -11.656410f, -0.000002f, 12.218210f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007718, 0, 4, { -17.805031f, 0.000000f, 4.207765f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6625715, 5, { 0.000000f, 0.000000f, 14.500000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007689, 6621345, 4, { -3.765648f, 0.000001f, 14.953240f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007690, 6643541, 4, { -12.141200f, -0.000001f, 4.715301f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007691, 6621347, 4, { 5.404188f, 0.000000f, -14.762600f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007692, 6621352, 4, { 14.969930f, 0.000002f, -2.525420f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007693, 6621398, 4, { -1.996956f, 0.000000f, 6.613101f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007694, 6621516, 4, { 5.478731f, 0.000000f, 9.952977f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007695, 0, 4, { 5.515548f, 0.000000f, 11.770850f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9Extreme.cpp
new file mode 100644
index 00000000..1fb71bbc
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9Extreme.cpp
@@ -0,0 +1,39 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayZ1T9Extreme : public InstanceContentScript
+{
+public:
+   ContainmentBayZ1T9Extreme() : InstanceContentScript( 20044 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007719, 0, 4, { 5.447040f, 0.000002f, -9.308832f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007720, 0, 4, { 9.576125f, 0.000002f, -3.402662f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007716, 0, 4, { 11.420000f, 0.000004f, 11.783210f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007717, 0, 4, { -11.656410f, -0.000002f, 12.218210f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007718, 0, 4, { -17.805031f, 0.000000f, 4.207765f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6625715, 5, { 0.000000f, 0.000000f, 14.500000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007689, 6621345, 4, { -3.765648f, 0.000001f, 14.953240f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007690, 6643541, 4, { -12.141200f, -0.000001f, 4.715301f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007691, 6621347, 4, { 5.404188f, 0.000000f, -14.762600f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007692, 6621352, 4, { 14.969930f, 0.000002f, -2.525420f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007693, 6621398, 4, { -1.996956f, 0.000000f, 6.613101f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007694, 6621516, 4, { 5.478731f, 0.000000f, 9.952977f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007695, 0, 4, { 5.515548f, 0.000000f, 11.770850f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMines.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMines.cpp
new file mode 100644
index 00000000..675ffb3c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMines.cpp
@@ -0,0 +1,75 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class CopperbellMines : public InstanceContentScript
+{
+public:
+   CopperbellMines() : InstanceContentScript( 3 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000068, 0, 4, { 44.405670f, -9.596272f, -115.661201f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2001526, 4056196, 4, { 42.862770f, -9.734462f, -118.006302f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000069, 0, 4, { 35.776779f, -38.010250f, 86.627357f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001527, 4056695, 4, { 34.781620f, -38.026581f, 85.051003f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001528, 4056696, 4, { -93.129417f, -57.842449f, 54.637360f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000037, 0, 4, { -90.569702f, -57.860081f, 55.157581f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000266, 3163462, 4, { -73.202423f, -55.895020f, 1.983328f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000267, 3163472, 4, { -123.490501f, -56.689388f, 36.337471f }, 0.991760f );
+      instance->registerEObj( "Improvedblastingdevice", 2000184, 4093714, 4, { 30.553780f, -37.974628f, 110.802399f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000239, 4093740, 4, { 34.836300f, -38.021832f, 115.035202f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2000186, 3163464, 4, { -127.532204f, -56.557701f, 13.108460f }, 1.000000f );
+      instance->registerEObj( "Tinykey", 2000159, 0, 4, { -209.307999f, 23.619301f, -210.254105f }, 0.991760f );
+      instance->registerEObj( "Sealedblastingdoor", 2000160, 4025573, 4, { -205.498901f, 23.819269f, -208.536697f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2000161, 4024332, 4, { -184.037094f, 13.828580f, -208.114502f }, 0.991760f );
+      instance->registerEObj( "Liftlever", 2000162, 4018210, 4, { -191.827606f, 23.433090f, -205.127106f }, 0.991760f );
+      instance->registerEObj( "Liftlever", 2000163, 0, 4, { -183.969498f, 24.006029f, -205.712097f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2001559, 4023678, 4, { -189.593399f, 23.392031f, -208.209396f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4085080, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2000167, 0, 4, { -81.437439f, -5.447510f, -171.343597f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2000168, 3163094, 4, { -74.540337f, -5.935791f, -162.462799f }, 0.991760f );
+      instance->registerEObj( "Firesand", 2000169, 0, 4, { -20.828609f, -8.071711f, -161.638901f }, 0.991760f );
+      instance->registerEObj( "Blastingdevice", 2000170, 4053820, 4, { 41.374290f, -9.249741f, -135.238800f }, 1.000000f );
+      instance->registerEObj( "Firesand", 2000172, 0, 4, { 53.101452f, -3.845266f, -153.826401f }, 0.991760f );
+      instance->registerEObj( "Sealedblastingdoor", 2000173, 4025574, 4, { 43.376751f, -9.109680f, -58.134281f }, 0.991760f );
+      instance->registerEObj( "Liftlever", 2000174, 4018213, 4, { 55.344479f, -8.804504f, -1.751919f }, 0.991760f );
+      instance->registerEObj( "Liftlever", 2000175, 0, 4, { 55.965420f, -8.264337f, 6.017679f }, 0.991760f );
+      instance->registerEObj( "Liftlever", 2000166, 0, 4, { -183.969498f, -6.008533f, -205.992905f }, 0.991760f );
+      instance->registerEObj( "Liftlever", 2000165, 4018211, 4, { -176.318695f, -6.546204f, -210.956100f }, 0.991760f );
+      instance->registerEObj( "Tinykey", 2000178, 0, 4, { 42.903980f, -9.979086f, -69.086594f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2001529, 4024331, 4, { 58.267658f, -19.085461f, 6.177349f }, 1.000000f );
+      instance->registerEObj( "Powderchamber", 2001536, 0, 4, { 43.821098f, -8.847800f, -128.329102f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2001560, 4023676, 4, { -178.386200f, -6.605137f, -207.831696f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2001561, 4023677, 4, { 58.670898f, -8.835022f, 0.472961f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2000171, 3163067, 4, { 43.472900f, -9.262273f, -126.115898f }, 0.991789f );
+      instance->registerEObj( "Liftlever", 2000176, 4018212, 4, { 61.119492f, -37.911671f, 13.438640f }, 1.000000f );
+      instance->registerEObj( "Liftlever", 2000177, 0, 4, { 55.985229f, -38.263531f, 6.003702f }, 0.991760f );
+      instance->registerEObj( "Firesand", 2000179, 0, 4, { 14.572330f, -42.069149f, 43.503422f }, 0.991760f );
+      instance->registerEObj( "Blastingdevice", 2000180, 4053821, 4, { 56.726372f, -37.999741f, 47.990452f }, 0.991760f );
+      instance->registerEObj( "Firesand", 2001531, 0, 4, { 93.184647f, -41.640049f, 67.395599f }, 1.000000f );
+      instance->registerEObj( "Firesand", 2001532, 0, 4, { 38.064529f, -38.712662f, 60.511768f }, 1.000000f );
+      instance->registerEObj( "Firesand", 2001533, 0, 4, { 31.755930f, -37.938789f, 114.646599f }, 1.000000f );
+      instance->registerEObj( "Blastingdevice", 2001534, 4053822, 4, { 10.162710f, -36.846409f, 106.696999f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2001535, 3163445, 4, { 5.569519f, -38.040829f, 111.711197f }, 0.991760f );
+      instance->registerEObj( "Powderchamber", 2001537, 0, 4, { 58.852821f, -37.774250f, 55.076962f }, 0.991760f );
+      instance->registerEObj( "Powderchamber", 2001538, 0, 4, { 6.485046f, -37.171558f, 113.633904f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2001562, 4023675, 4, { 57.846920f, -38.864811f, 11.550960f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2000181, 3163079, 4, { 57.479050f, -38.038540f, 56.536980f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2000185, 3163454, 4, { -55.588661f, -37.033691f, 94.193893f }, 0.991789f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMinesHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMinesHard.cpp
new file mode 100644
index 00000000..3d351f8c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMinesHard.cpp
@@ -0,0 +1,65 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class CopperbellMinesHard : public InstanceContentScript
+{
+public:
+   CopperbellMinesHard() : InstanceContentScript( 18 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002930, 0, 4, { -90.674911f, -57.698959f, 55.099388f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002929, 4481287, 4, { -93.494362f, -57.942631f, 52.914669f }, 1.000000f );
+      instance->registerEObj( "Crystallizedrock", 2002947, 0, 4, { -104.992798f, -53.764061f, -21.253201f }, 1.000000f );
+      instance->registerEObj( "Crystallizedrock", 2003150, 0, 4, { -131.401993f, -56.204762f, 0.851171f }, 0.991760f );
+      instance->registerEObj( "Crystallizedrock", 2003151, 0, 4, { -62.481171f, -59.339249f, 24.728519f }, 0.991760f );
+      instance->registerEObj( "Crystallizedrock", 2003152, 0, 4, { -86.379723f, -58.526180f, 47.109539f }, 0.991760f );
+      instance->registerEObj( "Crystallizedrock", 2003153, 0, 4, { -114.249298f, -57.590469f, 38.164780f }, 0.991760f );
+      instance->registerEObj( "Crystallizedrock", 2003154, 0, 4, { -78.472977f, -56.144230f, -6.125785f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 66.489433f, -9.196375f, -91.109978f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002872, 4481282, 4, { 69.178787f, -9.885409f, -91.345154f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 4497376, 4, { 64.314568f, -9.885409f, -48.220890f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002866, 4498423, 4, { 73.371529f, -11.611810f, -91.558388f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002867, 4498424, 4, { 79.777977f, -11.999900f, -79.149048f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002868, 4498425, 4, { 91.175873f, -12.124900f, -66.404877f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002869, 4498426, 4, { 77.390869f, -12.124900f, -55.604710f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002735, 0, 4, { 35.741501f, -38.003502f, 86.637199f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 4481286, 4, { 34.816029f, -37.807098f, 89.653633f }, 1.000000f );
+      instance->registerEObj( "Improvedblastingdevice", 2002870, 4500271, 4, { 39.532532f, -37.026131f, 113.598297f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002948, 4508121, 4, { 6.729187f, -37.796692f, 112.748901f }, 0.991760f );
+      instance->registerEObj( "Liftlever", 2002902, 0, 4, { -184.034393f, 23.988701f, -205.737198f }, 1.000000f );
+      instance->registerEObj( "Liftlever", 2002904, 0, 4, { -183.968002f, -6.010950f, -205.991592f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002905, 4478636, 4, { -192.156906f, 22.842710f, -208.392502f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2002900, 4498399, 4, { -209.037796f, 23.594311f, -208.732300f }, 1.000000f );
+      instance->registerEObj( "Liftlever", 2002901, 4478628, 4, { -191.601700f, 23.360180f, -205.152100f }, 1.000000f );
+      instance->registerEObj( "Liftlever", 2002903, 4478629, 4, { -176.329803f, -6.592807f, -210.900894f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2002906, 4478634, 4, { -177.598907f, -6.741823f, -208.024597f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2002907, 4478650, 4, { -183.958496f, 8.816254f, -208.023193f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002908, 4498400, 4, { -50.309021f, -3.189148f, -200.885101f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2002909, 4498416, 4, { 21.741100f, -9.932099f, -141.413300f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2002910, 4498406, 4, { -12.649780f, -6.958161f, -219.043304f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2002911, 4498409, 4, { 18.035469f, -6.958161f, -209.711594f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2002912, 4498410, 4, { 17.977119f, -7.000057f, -185.896194f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2002923, 4498451, 4, { 60.402431f, -38.719849f, 51.888512f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2002924, 4498457, 4, { 65.252907f, -38.455730f, 39.846581f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2002925, 4498456, 4, { 55.235111f, -38.564739f, 39.248360f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002926, 4500996, 4, { -82.288239f, -39.313419f, 101.057198f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4481330, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2002899, 0, 4, { -267.241791f, 23.005880f, -170.712494f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CuriousGorgeMeetsHisMatch.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/CuriousGorgeMeetsHisMatch.cpp
new file mode 100644
index 00000000..b6691899
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/CuriousGorgeMeetsHisMatch.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class CuriousGorgeMeetsHisMatch : public InstanceContentScript
+{
+public:
+   CuriousGorgeMeetsHisMatch() : InstanceContentScript( 5013 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Summoningbell", 2000401, 4260827, 4, { 14.143430f, 5.238082f, 13.664930f }, 1.000000f );
+      instance->registerEObj( "Teamboard", 2009097, 4302533, 4, { 15.508660f, 6.051773f, -14.767720f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CuttersCry.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/CuttersCry.cpp
new file mode 100644
index 00000000..1555b9e0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/CuttersCry.cpp
@@ -0,0 +1,55 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class CuttersCry : public InstanceContentScript
+{
+public:
+   CuttersCry() : InstanceContentScript( 12 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000659, 0, 4, { -190.040604f, -4.267580f, -210.611801f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2001133, 4323450, 4, { 268.610687f, -4.089700f, 104.917397f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2001133, 4323451, 4, { 250.254807f, -3.751600f, 99.675102f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001133, 4323452, 4, { 268.589386f, -2.609000f, 88.017700f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001133, 4323453, 4, { 105.129799f, -0.534200f, 147.850800f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001133, 4323454, 4, { 119.166603f, 0.308000f, 155.483704f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001133, 4323455, 4, { 103.312500f, -0.406300f, 194.717194f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001133, 4323456, 4, { 73.898598f, 0.574600f, 187.497803f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001133, 4323457, 4, { 72.064903f, 0.259800f, 157.992203f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001133, 4323458, 4, { 116.819603f, -0.614000f, 179.620300f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2001133, 4323459, 4, { -11.408770f, -1.184585f, 148.053894f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2001133, 4323460, 4, { -46.669281f, 0.651785f, 135.550003f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2001133, 4323462, 4, { -24.331600f, -1.221600f, 145.870697f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2001133, 4323464, 4, { 15.181000f, -0.706100f, 126.443100f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2001133, 4323468, 4, { -92.665901f, 4.399500f, 112.625504f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4222581, 5, { 263.888306f, -0.101790f, 157.188995f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.520508f, 0.002038f, 142.558197f }, 1.000000f );
+      instance->registerEObj( "Shiftingsands", 2000460, 4279880, 4, { 259.501709f, -3.500300f, 88.085403f }, 1.000000f );
+      instance->registerEObj( "Shiftingsands", 2000461, 4279889, 4, { 79.087517f, 0.289220f, 152.208694f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2000462, 4222616, 4, { -46.215149f, 6.077029f, 159.979706f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2000463, 0, 4, { -48.096859f, 5.781024f, 159.723999f }, 1.000000f );
+      instance->registerEObj( "Shiftingsands", 2000464, 4279890, 4, { -8.133057f, -5.813782f, 215.716797f }, 0.991760f );
+      instance->registerEObj( "Shiftingsands", 2000465, 4279892, 4, { 301.838593f, -0.717224f, -111.039902f }, 0.991760f );
+      instance->registerEObj( "Shiftingsands", 2000466, 4279893, 4, { 319.020294f, 0.259338f, -232.654297f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2000467, 4374288, 4, { -146.843597f, -0.005151f, 184.227493f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2000468, 0, 4, { -144.488297f, -0.192320f, 184.547104f }, 1.000000f );
+      instance->registerEObj( "Shiftingsands", 2000469, 4279894, 4, { -144.457199f, -3.646973f, 134.843994f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2000471, 4222648, 4, { -182.117905f, -0.203522f, -160.895706f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2000472, 0, 4, { -179.869202f, -0.089300f, -160.548294f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -180.661194f, -4.240662f, -222.797607f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DarkwingDragon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DarkwingDragon.cpp
new file mode 100644
index 00000000..fa61f53f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DarkwingDragon.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DarkwingDragon : public InstanceContentScript
+{
+public:
+   DarkwingDragon() : InstanceContentScript( 5016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f );
+      instance->registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f );
+      instance->registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DefeatanOccupiedTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DefeatanOccupiedTarget.cpp
new file mode 100644
index 00000000..0cefd33f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DefeatanOccupiedTarget.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DefeatanOccupiedTarget : public InstanceContentScript
+{
+public:
+   DefeatanOccupiedTarget() : InstanceContentScript( 15009 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10.cpp
new file mode 100644
index 00000000..963deba5
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10.cpp
@@ -0,0 +1,30 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV10 : public InstanceContentScript
+{
+public:
+   DeltascapeV10() : InstanceContentScript( 30049 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6791878, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6885561, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6852121, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6910535, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10Savage.cpp
new file mode 100644
index 00000000..a8780d43
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10Savage.cpp
@@ -0,0 +1,30 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV10Savage : public InstanceContentScript
+{
+public:
+   DeltascapeV10Savage() : InstanceContentScript( 30053 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6791878, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6885561, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6852121, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6910535, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20.cpp
new file mode 100644
index 00000000..f1fe04e2
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV20 : public InstanceContentScript
+{
+public:
+   DeltascapeV20() : InstanceContentScript( 30050 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008482, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6872632, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6910926, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20Savage.cpp
new file mode 100644
index 00000000..c5de8afa
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20Savage.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV20Savage : public InstanceContentScript
+{
+public:
+   DeltascapeV20Savage() : InstanceContentScript( 30054 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008482, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6872632, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6910926, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30.cpp
new file mode 100644
index 00000000..ebc2dfc9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30.cpp
@@ -0,0 +1,44 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV30 : public InstanceContentScript
+{
+public:
+   DeltascapeV30() : InstanceContentScript( 30051 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Matterrelocationdevice", 2008501, 6913059, 4, { 230.975693f, 231.836197f, -19.028080f }, 0.991760f );
+      instance->registerEObj( "Unknown0", 2007457, 6792212, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6847573, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6848219, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6953156, 4, { 250.000000f, 250.995605f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6929138, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6847577, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6853325, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6853774, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6846630, 4, { -15.000000f, 0.000001f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6846632, 4, { -5.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6846634, 4, { 5.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6846637, 4, { 15.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6846642, 4, { -15.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6846643, 4, { -5.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6846644, 4, { 5.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6846645, 4, { 15.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6912959, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30Savage.cpp
new file mode 100644
index 00000000..269d8c9b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30Savage.cpp
@@ -0,0 +1,44 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV30Savage : public InstanceContentScript
+{
+public:
+   DeltascapeV30Savage() : InstanceContentScript( 30055 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Matterrelocationdevice", 2008501, 6913059, 4, { 230.975693f, 231.836197f, -19.028080f }, 0.991760f );
+      instance->registerEObj( "Unknown0", 2007457, 6792212, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6847573, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6848219, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6953156, 4, { 250.000000f, 250.995605f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6929138, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6847577, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6853325, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6853774, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6846630, 4, { -15.000000f, 0.000001f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6846632, 4, { -5.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6846634, 4, { 5.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6846637, 4, { 15.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6846642, 4, { -15.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6846643, 4, { -5.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6846644, 4, { 5.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6846645, 4, { 15.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6912959, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40.cpp
new file mode 100644
index 00000000..52bcd4ab
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV40 : public InstanceContentScript
+{
+public:
+   DeltascapeV40() : InstanceContentScript( 30052 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6925502, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6925503, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6925504, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6936015, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6865650, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6872744, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2008483, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -17.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6914211, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40Savage.cpp
new file mode 100644
index 00000000..946022c6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40Savage.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV40Savage : public InstanceContentScript
+{
+public:
+   DeltascapeV40Savage() : InstanceContentScript( 30056 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6925502, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6925503, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6925504, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6936015, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6865650, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6872744, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2008483, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -17.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6914211, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DomaCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DomaCastle.cpp
new file mode 100644
index 00000000..ca287579
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DomaCastle.cpp
@@ -0,0 +1,53 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DomaCastle : public InstanceContentScript
+{
+public:
+   DomaCastle() : InstanceContentScript( 54 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6889640, 4, { -239.375000f, 67.999496f, -175.164597f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007791, 0, 4, { -240.158905f, 67.039032f, -177.843399f }, 0.750000f );
+      instance->registerEObj( "Unknown2", 2007457, 6889642, 4, { -241.910706f, 67.000000f, -215.185699f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6794570, 4, { 287.722412f, 21.499981f, 115.300598f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6739699, 4, { 262.936493f, 21.500010f, 110.142799f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6777815, 4, { 261.315491f, 25.500010f, -10.943810f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6851198, 4, { 248.248901f, 20.000000f, 78.568604f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2007457, 6928399, 4, { 264.958405f, 24.750000f, 121.939598f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6952007, 4, { 285.857391f, 24.500000f, 90.541313f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007457, 6973643, 4, { 189.428497f, 36.749840f, 50.824680f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6735489, 4, { 33.135330f, 40.000000f, 88.297363f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6679193, 4, { -183.423004f, 44.000000f, 125.024200f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6735529, 4, { -193.153900f, 46.551128f, 128.625107f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2007457, 6732692, 4, { -240.779297f, 64.000023f, -93.377197f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6732698, 4, { -240.802704f, 66.000023f, -140.615494f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2007457, 6880936, 4, { -243.716507f, 48.000000f, 37.417641f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 6739904, 4, { -239.397202f, 45.467159f, 60.631378f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 6901296, 4, { -239.515396f, 44.299999f, 93.293831f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6928755, 4, { -243.442398f, 56.000000f, -37.595749f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2002872, 6889553, 4, { 148.284103f, 41.499981f, 20.913610f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007791, 0, 4, { 145.028793f, 40.575001f, 21.644630f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007457, 6889570, 4, { 110.384399f, 41.489140f, 13.189620f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2002872, 6889631, 4, { -222.430801f, 45.500000f, 129.655899f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2007791, 0, 4, { -219.254501f, 45.500000f, 130.342697f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007457, 6889633, 4, { -242.418503f, 45.500000f, 113.102501f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6881291, 5, { 341.375793f, 13.500000f, 180.479599f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 336.598785f, 16.739140f, 178.515305f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -239.781799f, 67.000000f, -212.105698f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DunScaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DunScaith.cpp
new file mode 100644
index 00000000..df9c52b3
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DunScaith.cpp
@@ -0,0 +1,86 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DunScaith : public InstanceContentScript
+{
+public:
+   DunScaith() : InstanceContentScript( 30047 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6610729, 4, { 331.572388f, 2.765574f, 418.256012f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007602, 6610730, 4, { 266.946014f, 2.765530f, 420.309692f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2007609, 6612545, 4, { 276.236511f, 2.869957f, 402.357910f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007610, 6612547, 4, { 291.404297f, 2.869957f, 402.158112f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007611, 6612549, 4, { 306.464600f, 2.869963f, 402.176208f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007612, 6612551, 4, { 321.436493f, 2.869970f, 402.213196f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007613, 6612544, 4, { 276.728699f, 2.869961f, 417.200195f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007614, 6612546, 4, { 291.491791f, 2.869957f, 417.279388f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007615, 6612548, 4, { 306.298187f, 2.869963f, 417.075897f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007616, 6612550, 4, { 321.398895f, 2.869969f, 417.089905f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007603, 6612604, 4, { 279.000000f, 2.869900f, 398.600006f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007604, 6612605, 4, { 305.000000f, 2.870000f, 398.600006f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007605, 6612606, 4, { 319.000000f, 2.870000f, 398.600006f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007606, 6612608, 4, { 287.000000f, 2.869900f, 420.600006f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007607, 6612609, 4, { 305.000000f, 2.870000f, 420.600006f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007608, 6612611, 4, { 315.000000f, 2.870000f, 420.600006f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007619, 6613747, 4, { 299.266815f, 2.869962f, 409.699585f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007617, 6584508, 4, { 255.549805f, 2.765237f, 401.452301f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007783, 0, 4, { 316.110107f, 2.869910f, 411.214813f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007791, 0, 4, { 329.623108f, 2.825000f, 409.616913f }, 1.250000f );
+      instance->registerEObj( "Unknown20", 2002872, 6613229, 4, { -348.000000f, -7.000000f, 256.488800f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2002587, 0, 4, { -350.000000f, -7.000000f, 255.088806f }, 1.400000f );
+      instance->registerEObj( "Unknown22", 2007620, 0, 4, { -366.689606f, -7.003906f, 224.200806f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2007621, 0, 4, { -361.958405f, -7.000000f, 224.734894f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002872, 6620377, 4, { -0.071279f, -600.000000f, -18.220051f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007630, 0, 4, { -4.827496f, -600.000000f, -58.405430f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007631, 0, 4, { 7.122071f, -600.000000f, -58.051449f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007636, 6563525, 4, { -16.708380f, -600.000000f, -41.601891f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007637, 6588851, 4, { -18.625420f, -600.000000f, -43.212120f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007791, 0, 4, { 0.000000f, -600.000000f, -20.142851f }, 0.750000f );
+      instance->registerEObj( "Unknown30", 2002872, 6620064, 4, { -317.914093f, 1.360948f, -445.124115f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2002587, 0, 4, { -320.546295f, 0.991760f, -444.693695f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2007630, 0, 4, { -351.186401f, 0.991760f, -466.178406f }, 0.991760f );
+      instance->registerEObj( "Unknown33", 2007631, 0, 4, { -366.506500f, 0.991760f, -461.936401f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2007632, 0, 4, { -359.822998f, 0.991760f, -429.373688f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2007633, 0, 4, { -347.127502f, 0.991760f, -428.549713f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2007638, 6586142, 4, { 343.046997f, -300.000000f, -447.157593f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2007653, 6637716, 4, { -335.860596f, 1.000000f, -437.835388f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2007654, 6629695, 4, { -335.609100f, 1.000000f, -440.386108f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2007655, 6629831, 4, { -332.752014f, 1.000000f, -437.575012f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2007656, 6637880, 4, { -332.460205f, 1.000000f, -440.058685f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2007697, 0, 4, { -346.146393f, 1.000000f, -424.946991f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2007787, 6752662, 4, { -368.030212f, 0.974755f, -434.419312f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007660, 6610748, 4, { 231.338699f, -6.515625f, 346.216797f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2007661, 6610750, 4, { -356.222900f, -7.000000f, 287.132996f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007699, 0, 4, { 397.550415f, 2.656644f, 398.343109f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2007667, 6606266, 4, { 188.339996f, -6.500000f, 359.549011f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2007668, 6606267, 4, { 19.479019f, -6.500000f, 316.675598f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2007669, 6606268, 4, { -110.310303f, 1.500000f, 315.310303f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2007670, 6606273, 4, { -357.075592f, -7.000000f, 201.676895f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007662, 6610755, 4, { -357.847107f, 12.985350f, 16.963461f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2007663, 6610756, 4, { -342.946594f, 13.000000f, -123.268700f }, 0.991760f );
+      instance->registerEObj( "Unknown47", 2007671, 6601719, 4, { -356.908508f, 13.000000f, 12.522250f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2007672, 6601720, 4, { -356.563599f, 1.000000f, -74.405586f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2007698, 0, 4, { -94.983139f, 1.500000f, 320.626312f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2007703, 0, 4, { -94.909897f, 1.500000f, 313.278015f }, 1.000000f );
+      instance->registerEObj( "Unknown51", 2007702, 0, 4, { -364.034485f, 0.991760f, -43.015259f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6610725, 5, { 386.739899f, 2.618790f, 416.983307f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -371.922791f, 1.000000f, -444.704590f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2002872, 6638848, 4, { -344.433014f, 13.000000f, 7.243163f }, 1.000000f );
+      instance->registerEObj( "Unknown54", 2002587, 0, 4, { -350.500793f, 13.000000f, 5.113899f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DzemaelDarkhold.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/DzemaelDarkhold.cpp
new file mode 100644
index 00000000..709a2f8a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/DzemaelDarkhold.cpp
@@ -0,0 +1,92 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DzemaelDarkhold : public InstanceContentScript
+{
+public:
+   DzemaelDarkhold() : InstanceContentScript( 13 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "埋門", 2000033, 3328371, 4, { 79.909241f, 1.268266f, 161.509598f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000066, 3328664, 4, { 144.020004f, -6.834667f, 162.001907f }, 1.000000f );
+      instance->registerEObj( "Grandhallgate", 2000438, 3328665, 4, { 98.210373f, -6.834594f, 111.974403f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2000453, 0, 4, { 79.384338f, -10.733530f, 106.701599f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000452, 4229638, 4, { 76.745064f, -11.090400f, 105.321198f }, 1.000000f );
+      instance->registerEObj( "Magitektransporter", 2000458, 0, 4, { 23.358509f, -12.304620f, 57.612831f }, 1.000000f );
+      instance->registerEObj( "MagitekterminalI", 2000476, 4256808, 4, { 80.927979f, 1.365243f, 173.289703f }, 1.000000f );
+      instance->registerEObj( "MagitekterminalIII", 2000478, 4256810, 4, { 124.023804f, -13.794070f, 123.296898f }, 1.000000f );
+      instance->registerEObj( "MagitekterminalIV", 2000479, 4256811, 4, { 140.853195f, -11.962310f, 113.256302f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000276, 4255636, 4, { 36.155140f, 8.079000f, 207.374298f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000276, 4255639, 4, { 112.091797f, -3.877179f, 176.216904f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000276, 4255640, 4, { 139.427399f, -10.726720f, 108.501404f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000276, 4255644, 4, { 67.860687f, -14.328120f, 84.076920f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000276, 4255645, 4, { 51.562908f, -11.769940f, 111.841400f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000276, 4255646, 4, { 18.496250f, -15.965690f, 87.930252f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000276, 4255648, 4, { 19.309570f, -10.954800f, 51.356911f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000279, 4247600, 4, { 35.302368f, 8.108457f, 206.288605f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000279, 4247601, 4, { 111.093102f, -3.403727f, 176.495895f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000279, 4247603, 4, { 68.310699f, -14.257320f, 83.756592f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000279, 4247604, 4, { 52.317631f, -11.815490f, 110.621300f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000279, 4247605, 4, { 18.860821f, -14.036660f, 88.283234f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000279, 4247606, 4, { 20.972610f, -11.172370f, 51.726391f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2000279, 4247602, 4, { 138.802094f, -10.764680f, 110.383400f }, 1.000000f );
+      instance->registerEObj( "Magitektransporter", 2000474, 0, 4, { -96.800278f, -30.000010f, -41.821941f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2000455, 0, 4, { -106.309601f, -26.688049f, -16.372990f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2000454, 4233746, 4, { -107.679703f, -26.639919f, -15.815070f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2000487, 4184823, 4, { -111.157799f, -22.833250f, 2.271249f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2000490, 4255705, 4, { -242.711304f, -24.146959f, -32.381401f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2000490, 4255691, 4, { -261.321289f, -25.547960f, -34.986919f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2000490, 4255694, 4, { -261.811310f, -26.640051f, -20.854830f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2000490, 4255706, 4, { -237.266907f, -48.000000f, -0.833767f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2000490, 4255707, 4, { -217.921600f, -18.200211f, 20.315559f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2000490, 4255708, 4, { -169.460999f, -33.749729f, 51.753731f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2000490, 4255709, 4, { -166.205704f, -33.174091f, 41.379780f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2000490, 4255710, 4, { -136.133698f, -24.761801f, 11.194330f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2000280, 4247607, 4, { -260.415710f, -25.404510f, -36.083500f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2000280, 4247608, 4, { -262.467896f, -26.663879f, -21.408119f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2000280, 4247609, 4, { -241.470901f, -24.060431f, -29.972530f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2000280, 4247611, 4, { -238.320496f, -47.903111f, -3.008399f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2000280, 4247610, 4, { -219.957108f, -17.854340f, 18.911011f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2000280, 4247613, 4, { -168.223907f, -33.658329f, 50.704330f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2000280, 4247612, 4, { -165.114899f, -32.678890f, 41.844219f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2000280, 4247614, 4, { -133.651001f, -24.416229f, 10.934760f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2000488, 4233760, 4, { 13.842580f, -15.160090f, -143.072693f }, 1.000000f );
+      instance->registerEObj( "MagitekterminalVIII", 2000483, 4256818, 4, { -16.049601f, -17.297310f, -177.329498f }, 0.991760f );
+      instance->registerEObj( "MagitekterminalIX", 2000484, 4256819, 4, { -14.914310f, -21.075211f, -144.145996f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2000457, 0, 4, { 56.778809f, -36.148682f, -150.835495f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2000456, 4233771, 4, { 55.222290f, -35.782471f, -150.255600f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2000490, 4255718, 4, { -48.459080f, -19.742540f, -176.405197f }, 0.991760f );
+      instance->registerEObj( "Unknown39", 2000490, 4255720, 4, { -11.239590f, -21.204630f, -144.906204f }, 0.991760f );
+      instance->registerEObj( "Unknown40", 2000490, 4255721, 4, { -15.353870f, -17.228140f, -178.818893f }, 0.991760f );
+      instance->registerEObj( "Unknown41", 2000490, 4255722, 4, { 29.525160f, -23.532890f, -108.452202f }, 0.991760f );
+      instance->registerEObj( "Unknown42", 2000490, 4255723, 4, { 27.773970f, -23.532040f, -114.936401f }, 0.991760f );
+      instance->registerEObj( "Unknown43", 2000490, 4255725, 4, { 64.981979f, -38.499950f, -172.408997f }, 0.991760f );
+      instance->registerEObj( "Unknown44", 2000490, 4255728, 4, { 70.785149f, -37.665981f, -203.212097f }, 0.991760f );
+      instance->registerEObj( "Unknown45", 2000490, 4255729, 4, { 105.072098f, -38.024330f, -158.260803f }, 0.991760f );
+      instance->registerEObj( "Unknown46", 2000280, 4246846, 4, { -45.950432f, -19.312410f, -177.762207f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2000280, 4246848, 4, { -14.610830f, -21.218700f, -145.140900f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2000280, 4246847, 4, { -16.411739f, -16.383909f, -180.914902f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2000280, 4246849, 4, { 26.993160f, -23.453131f, -107.682999f }, 0.991760f );
+      instance->registerEObj( "Unknown50", 2000280, 0, 4, { 32.493099f, -24.000099f, -113.021797f }, 1.000000f );
+      instance->registerEObj( "Unknown51", 2000280, 4246850, 4, { 66.021332f, -38.500019f, -172.238098f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2000280, 4246851, 4, { 70.452782f, -37.655048f, -202.913803f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2000280, 4246852, 4, { 103.330498f, -38.100510f, -159.167999f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 79.243332f, -38.930771f, -182.480194f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4229601, 5, { -48.620270f, 19.892130f, 221.013596f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -44.993790f, 14.002300f, 204.521896f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Emanation.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/Emanation.cpp
new file mode 100644
index 00000000..f90e2bc5
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/Emanation.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Emanation : public InstanceContentScript
+{
+public:
+   Emanation() : InstanceContentScript( 20048 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 6894521, 5, { 0.000796f, 0.035467f, 12.032630f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.062970f, -12.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EmanationExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/EmanationExtreme.cpp
new file mode 100644
index 00000000..28c47b41
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/EmanationExtreme.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class EmanationExtreme : public InstanceContentScript
+{
+public:
+   EmanationExtreme() : InstanceContentScript( 20049 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 6894521, 5, { 0.000796f, 0.035467f, 12.032630f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.062970f, -12.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EngageEnemyReinforcements.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/EngageEnemyReinforcements.cpp
new file mode 100644
index 00000000..5100ef87
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/EngageEnemyReinforcements.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class EngageEnemyReinforcements : public InstanceContentScript
+{
+public:
+   EngageEnemyReinforcements() : InstanceContentScript( 15011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EngageMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/EngageMultipleTargets.cpp
new file mode 100644
index 00000000..6c1607a9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/EngageMultipleTargets.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class EngageMultipleTargets : public InstanceContentScript
+{
+public:
+   EngageMultipleTargets() : InstanceContentScript( 15005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaComboinBattle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaComboinBattle.cpp
new file mode 100644
index 00000000..dd23dd6c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaComboinBattle.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ExecuteaComboinBattle : public InstanceContentScript
+{
+public:
+   ExecuteaComboinBattle() : InstanceContentScript( 15003 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaCombotoIncreaseEnmity.cpp
new file mode 100644
index 00000000..0adbc4a0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaCombotoIncreaseEnmity.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ExecuteaCombotoIncreaseEnmity : public InstanceContentScript
+{
+public:
+   ExecuteaCombotoIncreaseEnmity() : InstanceContentScript( 15002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaRangedAttacktoIncreaseEnmity.cpp
new file mode 100644
index 00000000..6849bda0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaRangedAttacktoIncreaseEnmity.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ExecuteaRangedAttacktoIncreaseEnmity : public InstanceContentScript
+{
+public:
+   ExecuteaRangedAttacktoIncreaseEnmity() : InstanceContentScript( 15006 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/FinalExercise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/FinalExercise.cpp
new file mode 100644
index 00000000..657574c3
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/FinalExercise.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class FinalExercise : public InstanceContentScript
+{
+public:
+   FinalExercise() : InstanceContentScript( 15016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 6228959, 5, { 457.583801f, 5.680784f, 280.512787f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000608, 2807920, 4, { -95.322441f, -25.054260f, 61.518002f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/FlickingSticksandTakingNames.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/FlickingSticksandTakingNames.cpp
new file mode 100644
index 00000000..e5b4b041
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/FlickingSticksandTakingNames.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class FlickingSticksandTakingNames : public InstanceContentScript
+{
+public:
+   FlickingSticksandTakingNames() : InstanceContentScript( 10008 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Halatali.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/Halatali.cpp
new file mode 100644
index 00000000..aa9de7cb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/Halatali.cpp
@@ -0,0 +1,66 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Halatali : public InstanceContentScript
+{
+public:
+   Halatali() : InstanceContentScript( 7 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2001649, 4097866, 4, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f );
+      instance->registerEObj( "Exit", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f );
+      instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f );
+      instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f );
+      instance->registerEObj( "Chainwinch", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f );
+      instance->registerEObj( "Aetherialflow", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HalataliHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HalataliHard.cpp
new file mode 100644
index 00000000..7a1ab655
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HalataliHard.cpp
@@ -0,0 +1,75 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HalataliHard : public InstanceContentScript
+{
+public:
+   HalataliHard() : InstanceContentScript( 21 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f );
+      instance->registerEObj( "Unknown0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f );
+      instance->registerEObj( "Thalsscepter", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f );
+      instance->registerEObj( "Thalsscepter", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f );
+      instance->registerEObj( "Thalsscepter", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f );
+      instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f );
+      instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f );
+      instance->registerEObj( "Shadowyorb", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f );
+      instance->registerEObj( "Shadowyorb", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f );
+      instance->registerEObj( "Shadowyorb", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f );
+      instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManor.cpp
new file mode 100644
index 00000000..eb599894
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManor.cpp
@@ -0,0 +1,59 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HaukkeManor : public InstanceContentScript
+{
+public:
+   HaukkeManor() : InstanceContentScript( 6 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Voidlamp", 2000366, 3873151, 4, { 19.527651f, 17.000000f, 22.036671f }, 0.991789f );
+      instance->registerEObj( "Voidlamp", 2000367, 3873152, 4, { -24.524000f, 16.999901f, 22.023741f }, 1.000000f );
+      instance->registerEObj( "Voidlamp", 2000368, 3873153, 4, { 19.541849f, 16.999950f, -13.996940f }, 1.000000f );
+      instance->registerEObj( "Voidlamp", 2000369, 3873154, 4, { -24.503330f, 16.999889f, -14.014120f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000370, 0, 4, { -2.517786f, 16.952730f, 21.011629f }, 0.930753f );
+      instance->registerEObj( "Unknown0", 2000371, 0, 4, { 81.895119f, 0.228838f, -0.106860f }, 0.900235f );
+      instance->registerEObj( "Tinykey", 2000302, 0, 4, { 71.396912f, -0.001627f, 28.641140f }, 0.869717f );
+      instance->registerEObj( "Tinykey", 2000303, 0, 4, { -26.322651f, -0.005771f, 50.722679f }, 0.778163f );
+      instance->registerEObj( "Tinykey", 2000304, 0, 4, { -52.424351f, -0.002903f, 22.515909f }, 0.930753f );
+      instance->registerEObj( "Tinykey", 2000305, 0, 4, { -68.498917f, -16.795919f, -8.967492f }, 0.869717f );
+      instance->registerEObj( "Tinykey", 2000306, 0, 4, { -46.234051f, -18.800501f, 38.557331f }, 0.900235f );
+      instance->registerEObj( "Tinykey", 2000307, 0, 4, { 14.015370f, -18.796499f, -43.227589f }, 0.900235f );
+      instance->registerEObj( "Tinykey", 2000308, 0, 4, { -11.804590f, -18.800249f, -50.647060f }, 0.991789f );
+      instance->registerEObj( "Lockeddoor", 2000329, 3457073, 4, { 0.509394f, 0.143553f, 56.976101f }, 0.991789f );
+      instance->registerEObj( "Lockeddoor", 2000331, 3457076, 4, { -16.586599f, 0.172088f, 84.043991f }, 0.961271f );
+      instance->registerEObj( "Lockeddoor", 2000337, 3457070, 4, { -48.657558f, 0.174862f, -36.017189f }, 0.991789f );
+      instance->registerEObj( "Lockeddoor", 2000338, 3457071, 4, { -48.701061f, 0.167371f, 36.007271f }, 0.930753f );
+      instance->registerEObj( "Lockeddoor", 2000339, 3457083, 4, { -25.116051f, -18.616779f, -34.637550f }, 0.961271f );
+      instance->registerEObj( "Lockeddoor", 2000343, 3457090, 4, { -1.899940f, -18.615101f, 34.620899f }, 0.961271f );
+      instance->registerEObj( "Lockeddoor", 2000344, 3457093, 4, { 25.192600f, -18.692350f, 34.531120f }, 0.930753f );
+      instance->registerEObj( "IvyDoor", 2000355, 3457081, 4, { -48.382030f, 0.425044f, -0.015306f }, 0.961271f );
+      instance->registerEObj( "CarnationDoor", 2000356, 3457082, 4, { -25.558910f, -18.570280f, -0.076342f }, 0.930753f );
+      instance->registerEObj( "LilyDoor", 2000357, 3449005, 4, { 22.842710f, 17.196871f, -0.015306f }, 0.991789f );
+      instance->registerEObj( "Unknown1", 2001080, 0, 4, { 22.000000f, 17.000000f, 0.000000f }, 0.575000f );
+      instance->registerEObj( "Unknown2", 2001236, 3852702, 4, { 24.498400f, 0.449216f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Sealedbarrier", 2001233, 3909497, 4, { 46.699810f, 9.875019f, -0.253856f }, 1.000000f );
+      instance->registerEObj( "Yellowkey", 2000325, 0, 4, { -12.348700f, -18.803230f, 52.290878f }, 1.000000f );
+      instance->registerEObj( "Lockeddoor", 2000345, 3457077, 4, { 16.464439f, 17.135830f, 84.153458f }, 0.930753f );
+      instance->registerEObj( "Unknown3", 2001604, 4103506, 4, { -23.510660f, -0.000664f, 0.588553f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001605, 4103511, 4, { -23.446470f, -0.000633f, -0.525669f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001606, 4103508, 4, { -24.734859f, -18.800381f, 0.630995f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001607, 4103512, 4, { -24.765221f, -18.800400f, -0.546668f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4143756, 5, { 73.330597f, 0.000000f, 0.000000f }, 0.991760f );
+      instance->registerEObj( "Greenkey", 2000324, 0, 4, { 1.500000f, 0.007936f, -0.000000f }, 0.961271f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManorHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManorHard.cpp
new file mode 100644
index 00000000..63bf962b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManorHard.cpp
@@ -0,0 +1,75 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HaukkeManorHard : public InstanceContentScript
+{
+public:
+   HaukkeManorHard() : InstanceContentScript( 19 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -26.487801f, 17.000000f, -0.008300f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 4497628, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002873, 4498555, 4, { -1.869557f, 17.000000f, 15.055300f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002874, 4498556, 4, { -5.211004f, 17.000000f, -10.575720f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2003318, 4484553, 4, { 23.178410f, 16.983280f, 0.137329f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 25.786711f, 0.000000f, 0.119909f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 4505837, 4, { 23.084200f, 0.000000f, -1.591900f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2003126, 4521780, 4, { -20.141510f, -0.000000f, -0.141697f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { -24.169260f, -18.905939f, -0.137390f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2002872, 4509134, 4, { -22.072941f, -18.814390f, -0.320496f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002997, 0, 4, { -20.433430f, -18.936470f, 0.755735f }, 1.000000f );
+      instance->registerEObj( "LilyDoor", 2002915, 4484551, 4, { -28.152889f, 16.983280f, 0.015198f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2002917, 4505698, 4, { -36.195190f, 16.983280f, -5.685384f }, 0.991760f );
+      instance->registerEObj( "Crystalball", 2002916, 4488372, 4, { 28.044069f, 16.983280f, 0.168350f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2003319, 4544200, 4, { -36.143250f, 17.000000f, 7.445584f }, 1.000000f );
+      instance->registerEObj( "Lockeddoor", 2003315, 4484546, 4, { 15.988830f, 17.000000f, -82.166763f }, 1.000000f );
+      instance->registerEObj( "Tinykey", 2003312, 0, 4, { 23.053480f, 17.000000f, -63.610909f }, 1.000000f );
+      instance->registerEObj( "Lockeddoor", 2003316, 4484554, 4, { 0.701762f, 17.000000f, -96.124260f }, 1.000000f );
+      instance->registerEObj( "Lockeddoor", 2003317, 4484573, 4, { -15.941600f, 17.000000f, -86.214546f }, 1.000000f );
+      instance->registerEObj( "Tinykey", 2003314, 0, 4, { 11.497100f, 17.000000f, -97.655212f }, 1.000000f );
+      instance->registerEObj( "Tinykey", 2003430, 0, 4, { -10.688510f, 17.000000f, -98.849060f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2002938, 4484560, 4, { 16.478939f, 0.000000f, -83.923622f }, 1.000000f );
+      instance->registerEObj( "Crystalball", 2002941, 4488371, 4, { -43.455170f, -0.000000f, 13.580270f }, 1.000000f );
+      instance->registerEObj( "RoseDoor", 2002943, 0, 4, { 27.084721f, -0.015320f, 0.045776f }, 0.991760f );
+      instance->registerEObj( "Redkey", 2002942, 0, 4, { 58.672710f, 0.000000f, -30.483391f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2002937, 4484569, 4, { -16.476231f, 0.000000f, -69.988670f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2002944, 4499358, 4, { -16.603889f, 0.000000f, -68.606903f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002945, 4499362, 4, { 16.527910f, 0.000000f, -85.147072f }, 1.000000f );
+      instance->registerEObj( "Voidlamp", 2002939, 4488368, 4, { -29.871300f, -0.015320f, -70.456650f }, 0.991760f );
+      instance->registerEObj( "Voidlamp", 2002940, 4488367, 4, { -17.039709f, 0.000000f, -84.537079f }, 1.000000f );
+      instance->registerEObj( "Sealedbarrier", 2003321, 4545173, 4, { 29.337740f, 0.000000f, -1.101776f }, 1.000000f );
+      instance->registerEObj( "Lockeddoor", 2003320, 4484571, 4, { 46.738281f, -0.015320f, -35.965580f }, 0.991760f );
+      instance->registerEObj( "Tinykey", 2003313, 0, 4, { 43.982948f, 0.000000f, -34.342270f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2003463, 4588435, 4, { -5.889304f, 0.000000f, -71.199730f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2003464, 4588440, 4, { 6.823740f, 0.000000f, -82.895660f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2003465, 4588441, 4, { 16.834749f, 0.000000f, -70.555031f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2003466, 4588442, 4, { 27.007900f, 0.000000f, -82.771332f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2003467, 4588444, 4, { 34.488140f, -0.000000f, -61.907959f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2003468, 4588448, 4, { 48.546879f, 0.000000f, -53.979691f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2003469, 4588445, 4, { 24.192520f, 0.000000f, -55.798260f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002951, 4486667, 4, { -25.301229f, -18.799990f, -33.673420f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2002952, 4486668, 4, { 1.978515f, -18.799990f, -34.167542f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2002953, 0, 4, { 25.467291f, -18.814390f, 33.859741f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2002954, 4486671, 4, { -2.139196f, -18.799990f, 34.235821f }, 1.000000f );
+      instance->registerEObj( "Sealedbarrier", 2002955, 4508183, 4, { -25.881571f, -18.799999f, 0.041033f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2003322, 4486669, 4, { 28.549561f, -18.799999f, -33.402039f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4488394, 5, { 73.319580f, -0.015320f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 17.397711f, -18.804060f, 0.066881f }, 0.900200f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 72.756577f, 0.000000f, 5.215310f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2002913, 0, 4, { 81.361702f, 0.249998f, -0.409441f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HealMultipleAllies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HealMultipleAllies.cpp
new file mode 100644
index 00000000..e4139d83
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HealMultipleAllies.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HealMultipleAllies : public InstanceContentScript
+{
+public:
+   HealMultipleAllies() : InstanceContentScript( 15014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HealanAlly.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HealanAlly.cpp
new file mode 100644
index 00000000..e59d2d6d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HealanAlly.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HealanAlly : public InstanceContentScript
+{
+public:
+   HealanAlly() : InstanceContentScript( 15013 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HellsLid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HellsLid.cpp
new file mode 100644
index 00000000..6e503d7f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HellsLid.cpp
@@ -0,0 +1,68 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HellsLid : public InstanceContentScript
+{
+public:
+   HellsLid() : InstanceContentScript( 59 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7170401, 4, { -71.824219f, 36.942020f, 308.278015f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007457, 7170402, 4, { -74.204651f, 2.975464f, 288.624390f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2007457, 7170403, 4, { -74.725868f, 2.999996f, 204.499496f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7253595, 4, { -82.098160f, 3.000000f, 259.118103f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7253596, 4, { -82.556618f, 3.000000f, 259.252808f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7253597, 4, { -82.556618f, 3.000000f, 259.252808f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 7253612, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2007457, 7253613, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2007457, 7253614, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007457, 7253621, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 7253622, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7253623, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 7253630, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 7253631, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 7253632, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2002735, 0, 4, { -70.236214f, -2.994005f, 150.513504f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2007457, 7173420, 4, { -67.025093f, -3.000000f, 145.419205f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 7173423, 4, { -67.025078f, -2.956286f, 106.833702f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 7229619, 4, { -78.515167f, -3.000000f, 126.046402f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007457, 7229620, 4, { -65.781677f, -3.006042f, 126.756599f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2007457, 7229622, 4, { -78.080513f, -3.006042f, 134.996597f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2007457, 7229623, 4, { -63.370731f, -3.006042f, 134.752396f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2007457, 7242616, 4, { -45.700809f, -8.255188f, 23.636169f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2007457, 7245584, 4, { 26.736940f, -16.665211f, 27.040310f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2007457, 7167237, 4, { 55.466431f, -16.525570f, 30.044920f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2007457, 7167239, 4, { 57.053471f, -25.528379f, -52.079102f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2002735, 0, 4, { 59.280998f, -26.000000f, -100.623596f }, 1.250000f );
+      instance->registerEObj( "Unknown27", 2007457, 7173646, 4, { 63.367290f, -26.500000f, -104.259499f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007457, 7173648, 4, { 61.874378f, -26.500059f, -136.133804f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007457, 7167248, 4, { 60.837650f, -96.757507f, -322.591003f }, 0.991760f );
+      instance->registerEObj( "Unknown30", 2007457, 7167249, 4, { 61.997311f, -93.000023f, -421.408386f }, 0.991760f );
+      instance->registerEObj( "Unknown31", 2002735, 0, 4, { 62.119381f, -88.000000f, -455.242706f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2007457, 7174030, 4, { 62.878109f, -88.000000f, -458.344788f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007457, 7207905, 4, { 57.755989f, -88.029297f, -476.778687f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2009378, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2009379, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2009380, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2009381, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2009382, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f );
+      instance->registerEObj( "Unknown39", 2009383, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 7167443, 5, { -121.331703f, 65.000000f, 474.948303f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 62.058472f, -88.000000f, -489.921387f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -113.603500f, 65.000000f, 469.016510f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HeroontheHalfShell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HeroontheHalfShell.cpp
new file mode 100644
index 00000000..c1837447
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HeroontheHalfShell.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HeroontheHalfShell : public InstanceContentScript
+{
+public:
+   HeroontheHalfShell() : InstanceContentScript( 10004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsle.cpp
new file mode 100644
index 00000000..ddf1c94d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsle.cpp
@@ -0,0 +1,75 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HullbreakerIsle : public InstanceContentScript
+{
+public:
+   HullbreakerIsle() : InstanceContentScript( 23 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004341, 4797423, 4, { -368.761902f, 1.900000f, 20.220869f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004342, 4797424, 4, { -367.525085f, 1.900000f, 26.995680f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004343, 4797425, 4, { -371.746185f, 1.900000f, 32.584270f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004338, 4797426, 4, { -362.507385f, 1.900000f, 48.482269f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004339, 4797427, 4, { -355.184601f, 1.899924f, 47.853260f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004340, 4797428, 4, { -349.628601f, 1.899914f, 52.138340f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2004335, 4797429, 4, { -334.406708f, 1.899990f, 43.799950f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004336, 4797430, 4, { -336.870087f, 1.900000f, 37.104382f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004337, 4797431, 4, { -332.837006f, 1.900000f, 30.666309f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004344, 4797421, 4, { -341.024414f, 1.880961f, 15.649740f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004345, 4797419, 4, { -348.232788f, 1.900000f, 15.852800f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004346, 4797422, 4, { -353.540588f, 1.899946f, 11.553900f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4685106, 5, { 320.642792f, 3.735552f, 302.314301f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 220.874298f, 64.988159f, 13.046390f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2002872, 4685143, 4, { 220.800797f, 64.801514f, 13.539410f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2004050, 4685147, 4, { 219.745102f, 64.682983f, -33.707211f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2004049, 4685157, 4, { 219.958694f, 65.018677f, 47.991199f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2002735, 0, 4, { -60.079769f, 44.339741f, -124.669800f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2002872, 4685162, 4, { -61.990799f, 44.123230f, -125.263000f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2004051, 4685163, 4, { -98.791832f, 44.299992f, -124.783699f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2002735, 0, 4, { -315.480286f, 1.957748f, 33.432499f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2002872, 4685167, 4, { -314.885803f, 1.999334f, 32.833080f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 325.360901f, 6.499028f, 292.726807f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2004052, 4584550, 4, { 165.269104f, 52.440060f, -190.280197f }, 1.000000f );
+      instance->registerEObj( "Stonepedestal", 2004057, 4588393, 4, { 163.784195f, 52.706680f, -185.027100f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2004053, 4584553, 4, { -35.849411f, 44.986191f, -124.177696f }, 1.000000f );
+      instance->registerEObj( "Stonepedestal", 2004058, 4588617, 4, { -32.145729f, 44.996059f, -118.336502f }, 1.000000f );
+      instance->registerEObj( "Stonepedestal", 2004059, 4588610, 4, { -32.404221f, 44.937031f, -128.964096f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -326.989685f, 2.000000f, 43.114891f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2004074, 0, 4, { 191.947693f, 59.006939f, -163.899307f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2004075, 0, 4, { 194.472900f, 59.156731f, -165.022003f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2004076, 0, 4, { 196.017197f, 59.853050f, -161.548294f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2004077, 0, 4, { 198.798004f, 60.096630f, -162.115204f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2004078, 0, 4, { 199.929993f, 60.852970f, -158.189896f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2004079, 0, 4, { 203.014206f, 61.084290f, -158.453995f }, 1.000000f );
+      instance->registerEObj( "Wildbananatree", 2004062, 4706914, 4, { 206.036896f, 65.302567f, -27.040119f }, 0.991760f );
+      instance->registerEObj( "Wildbananatree", 2004063, 4722842, 4, { 199.376907f, 64.682983f, -11.735090f }, 0.991760f );
+      instance->registerEObj( "Wildbananatree", 2004064, 4706915, 4, { 205.968002f, 64.690811f, 3.866779f }, 0.991760f );
+      instance->registerEObj( "Wildbananatree", 2004065, 4706916, 4, { 236.652100f, 64.927116f, -28.061340f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2004066, 0, 4, { 206.655502f, 65.036621f, -25.903111f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2004067, 0, 4, { 200.604294f, 64.690804f, -10.987260f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2004068, 0, 4, { 206.716095f, 64.690811f, 3.346290f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2004069, 0, 4, { 235.736603f, 64.682983f, -27.115360f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2004060, 4585424, 4, { -218.153107f, -0.000002f, -6.398464f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2004061, 4585624, 4, { -307.270905f, 4.409851f, 14.023010f }, 0.991760f );
+      instance->registerEObj( "Wildbananatree", 2004070, 4722840, 4, { 241.380005f, 64.956383f, -12.841170f }, 1.000000f );
+      instance->registerEObj( "Wildbananatree", 2004071, 4706917, 4, { 234.644501f, 64.824364f, 2.652663f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2004072, 0, 4, { 239.884903f, 64.690811f, -12.610960f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2004073, 0, 4, { 233.623596f, 64.760551f, 2.089992f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2004129, 0, 4, { -80.000000f, 44.200001f, -124.500000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsleHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsleHard.cpp
new file mode 100644
index 00000000..fbb5a042
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsleHard.cpp
@@ -0,0 +1,51 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class HullbreakerIsleHard : public InstanceContentScript
+{
+public:
+   HullbreakerIsleHard() : InstanceContentScript( 45 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -343.904602f, 7.822294f, 39.109711f }, 0.500000f );
+      instance->registerEObj( "Unknown1", 2002872, 6253922, 4, { -342.837006f, 6.196667f, 36.610142f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -360.775909f, 7.864089f, 68.887756f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2007257, 0, 4, { -350.992401f, 7.892528f, 56.902512f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2007258, 0, 4, { -354.052490f, 7.892528f, 54.626640f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007359, 0, 4, { -352.179810f, 7.927567f, 63.128880f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6245769, 5, { 322.891693f, 3.635096f, 313.253510f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.376587f, 5.844693f, 298.411591f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007025, 6235928, 4, { 307.237701f, 11.852150f, 276.543915f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007026, 6240784, 4, { 286.591309f, 19.136169f, 239.456497f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007027, 6239711, 4, { 306.575897f, 31.887329f, 181.107697f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007028, 6244799, 4, { 220.128998f, 63.509621f, 114.498398f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007156, 6249693, 4, { 308.747314f, 51.440979f, 125.671898f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007157, 6249706, 4, { 313.862793f, 51.438110f, 123.826897f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2007030, 6244507, 4, { 60.801022f, 85.774963f, -64.387527f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007034, 6232348, 4, { -35.186840f, 44.985500f, -123.946198f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007035, 6243845, 4, { -235.700607f, 0.607149f, 8.445139f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007036, 6243848, 4, { -284.362396f, 0.606121f, 11.598470f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007037, 6243852, 4, { -334.528412f, 1.244455f, 21.911160f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 222.214600f, 65.079712f, 11.398440f }, 1.400000f );
+      instance->registerEObj( "Unknown16", 2002872, 6253107, 4, { 221.229599f, 65.079712f, 13.333970f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2007072, 6241286, 4, { 198.155396f, 64.976288f, -11.912840f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2002735, 0, 4, { -60.746220f, 44.327389f, -123.705002f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2002872, 6253215, 4, { -58.605789f, 45.157280f, -124.548203f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007073, 6253218, 4, { -102.000999f, 45.915119f, -123.827301f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007260, 6252642, 4, { -76.831734f, 44.106281f, -123.152199f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InThalsName.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/InThalsName.cpp
new file mode 100644
index 00000000..6c39dbf2
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/InThalsName.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class InThalsName : public InstanceContentScript
+{
+public:
+   InThalsName() : InstanceContentScript( 5006 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f );
+      instance->registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InteractwiththeBattlefield.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/InteractwiththeBattlefield.cpp
new file mode 100644
index 00000000..f51e9dc6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/InteractwiththeBattlefield.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class InteractwiththeBattlefield : public InstanceContentScript
+{
+public:
+   InteractwiththeBattlefield() : InstanceContentScript( 15012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InterdimensionalRift.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/InterdimensionalRift.cpp
new file mode 100644
index 00000000..0fa6e21d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/InterdimensionalRift.cpp
@@ -0,0 +1,35 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class InterdimensionalRift : public InstanceContentScript
+{
+public:
+   InterdimensionalRift() : InstanceContentScript( 5023 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6944598, 4, { -14.915330f, -256.500000f, 385.545197f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6944604, 4, { -280.000000f, -239.750000f, 196.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6944605, 4, { -255.313797f, -226.000000f, -187.394394f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6944606, 4, { -246.604706f, -226.000000f, -192.211807f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000046, 0, 4, { 843.573914f, 427.000000f, 948.472290f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000046, 0, 4, { -207.965302f, -224.000000f, -147.401306f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007457, 6889957, 4, { 1.846330f, -271.700012f, 428.457886f }, 0.991760f );
+      instance->registerEObj( "Matterrelocationdevice", 2008501, 6938814, 4, { -16.956310f, -256.250000f, 382.407898f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2007457, 6954336, 4, { -7.878613f, -256.250000f, 385.557495f }, 1.000000f );
+      instance->registerEObj( "Matterrelocationdevice", 2000048, 6938826, 4, { -286.946014f, -239.764999f, 192.797699f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ItsProbablyaTrap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ItsProbablyaTrap.cpp
new file mode 100644
index 00000000..61fda53d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ItsProbablyaTrap.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ItsProbablyaTrap : public InstanceContentScript
+{
+public:
+   ItsProbablyaTrap() : InstanceContentScript( 5005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6538194, 4, { -27.571140f, -3.000000f, 46.619968f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000608, 6538193, 4, { -28.307659f, 3.999977f, 61.762589f }, 1.000000f );
+      instance->registerEObj( "ClanHuntboard", 2008655, 6422886, 4, { -31.520060f, 0.076252f, -43.853790f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2002872, 6799085, 4, { -79.087517f, -3.006042f, 41.336670f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2002872, 6799087, 4, { -61.668732f, -3.014119f, 84.855003f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007457, 6611234, 4, { 137.621094f, 14.816470f, 92.484863f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2007457, 6538193, 4, { -27.894131f, 3.999977f, 61.384491f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6538194, 4, { -28.259020f, -3.000000f, 46.489510f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/KuganeCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/KuganeCastle.cpp
new file mode 100644
index 00000000..49f90833
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/KuganeCastle.cpp
@@ -0,0 +1,86 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class KuganeCastle : public InstanceContentScript
+{
+public:
+   KuganeCastle() : InstanceContentScript( 57 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6891156, 4, { 280.110413f, -75.860001f, 341.057800f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 280.000000f, -75.860001f, 338.900696f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 280.000000f, -75.860001f, 375.299988f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 0, 4, { 280.179993f, -75.859993f, 363.578888f }, 1.000000f );
+      instance->registerEObj( "Pileofgold", 2007814, 0, 4, { 289.943695f, -75.859993f, 360.566986f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007815, 0, 4, { 279.957306f, -75.883118f, 375.295685f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { -110.000000f, 0.000003f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6886643, 4, { -108.904198f, 0.000003f, -0.184188f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 6886655, 4, { -147.474503f, 0.100000f, -0.110550f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 280.000000f, -90.771896f, 28.200001f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6795321, 4, { 294.636414f, -90.775902f, 64.530403f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007457, 6795322, 4, { 284.810699f, -90.771896f, 64.853622f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6795323, 4, { 275.195496f, -90.771896f, 64.375351f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6795324, 4, { 264.569000f, -90.771896f, 65.125214f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6795325, 4, { 295.691193f, -90.771896f, 55.563641f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6795326, 4, { 284.563385f, -90.771896f, 57.046230f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6795327, 4, { 274.879486f, -90.771896f, 57.698601f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6795328, 4, { 264.951508f, -90.771896f, 57.270260f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 6795329, 4, { 294.813904f, -90.771896f, 45.369381f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 6795330, 4, { 284.412811f, -90.775940f, 44.846191f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2007457, 6795331, 4, { 274.009003f, -90.771896f, 44.232479f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007457, 6795332, 4, { 264.546387f, -90.771896f, 44.505569f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007457, 6795333, 4, { 294.721802f, -90.771896f, 35.522999f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007457, 6795334, 4, { 284.550293f, -90.771896f, 35.573021f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007457, 6795335, 4, { 274.647095f, -90.775940f, 36.026489f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2007457, 6795336, 4, { 265.028992f, -90.771896f, 35.466030f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002872, 6972248, 4, { 279.929291f, -90.862122f, 25.802130f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2002872, 6972249, 4, { 279.425995f, -90.862122f, 73.752983f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007457, 6795811, 4, { -18.923059f, -4.000000f, -47.771740f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007457, 6795812, 4, { -82.884247f, 0.000003f, -0.161598f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007457, 6795813, 4, { -179.231201f, 4.000000f, -0.161991f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007812, 0, 4, { -60.365211f, -6.291489f, 11.147480f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2007812, 0, 4, { -60.697491f, -6.291489f, -12.243330f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2007812, 0, 4, { -64.355148f, -6.291490f, 11.308300f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2007812, 0, 4, { -64.521027f, -6.291490f, -11.570270f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007812, 0, 4, { -55.949509f, -6.291489f, 9.962895f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2007812, 0, 4, { -56.575081f, -6.291490f, -10.074280f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2007457, 6993778, 4, { -11.244300f, -5.961200f, -57.744499f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2007457, 6994112, 4, { -17.911301f, -5.796600f, -65.317596f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2007812, 0, 4, { -49.310871f, -6.291489f, 10.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2007812, 0, 4, { -49.310860f, -6.291490f, -10.674300f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2007457, 6795420, 4, { 248.664993f, -94.824402f, -117.732498f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2007457, 6795421, 4, { 279.489410f, -92.996399f, 3.845758f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2007457, 6795419, 4, { 280.175507f, -92.998596f, 93.664139f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2007813, 0, 4, { 248.706802f, -94.834801f, -131.982498f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2007813, 0, 4, { 286.988312f, -92.855598f, -10.582000f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2007813, 0, 4, { 273.011108f, -92.855598f, -10.581000f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2007813, 0, 4, { 279.995697f, -92.851196f, -21.638639f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2007813, 0, 4, { 279.987701f, -92.881706f, -7.278625f }, 0.991760f );
+      instance->registerEObj( "Unknown47", 2007457, 6795337, 4, { 279.713104f, -83.786652f, 143.480499f }, 0.991760f );
+      instance->registerEObj( "Unknown48", 2007457, 6795422, 4, { 280.061096f, -73.914101f, 313.413391f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2007457, 6795342, 4, { 289.140198f, -73.914101f, 284.393890f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2007457, 6795343, 4, { 288.888214f, -73.914200f, 303.585907f }, 1.000000f );
+      instance->registerEObj( "Unknown51", 2007457, 6795341, 4, { 271.105591f, -73.914101f, 284.355804f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2007457, 6795345, 4, { 271.048309f, -73.914200f, 302.845795f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2007457, 6795344, 4, { 289.058899f, -73.914101f, 291.958588f }, 1.000000f );
+      instance->registerEObj( "Unknown54", 2007457, 6795346, 4, { 288.715912f, -73.914299f, 310.894012f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2007457, 6795338, 4, { 271.824585f, -73.914101f, 292.335999f }, 1.000000f );
+      instance->registerEObj( "Unknown56", 2007457, 6795339, 4, { 271.103790f, -73.914299f, 311.710388f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6881046, 5, { 66.323036f, -6.000000f, -68.720047f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 49.699169f, -6.000000f, -60.817249f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/LongLivetheQueen.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/LongLivetheQueen.cpp
new file mode 100644
index 00000000..752b1dc0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/LongLivetheQueen.cpp
@@ -0,0 +1,41 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class LongLivetheQueen : public InstanceContentScript
+{
+public:
+   LongLivetheQueen() : InstanceContentScript( 10012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/MatsubaMayhem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/MatsubaMayhem.cpp
new file mode 100644
index 00000000..c36126e5
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/MatsubaMayhem.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class MatsubaMayhem : public InstanceContentScript
+{
+public:
+   MatsubaMayhem() : InstanceContentScript( 5011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6538194, 4, { -27.571140f, -3.000000f, 46.619968f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000608, 6538193, 4, { -28.307659f, 3.999977f, 61.762589f }, 1.000000f );
+      instance->registerEObj( "ClanHuntboard", 2008655, 6422886, 4, { -31.520060f, 0.076252f, -43.853790f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2002872, 6799085, 4, { -79.087517f, -3.006042f, 41.336670f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2002872, 6799087, 4, { -61.668732f, -3.014119f, 84.855003f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007457, 6611234, 4, { 137.621094f, 14.816470f, 92.484863f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2007457, 6538193, 4, { -27.894131f, 3.999977f, 61.384491f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6538194, 4, { -28.259020f, -3.000000f, 46.489510f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/MorethanaFeeler.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/MorethanaFeeler.cpp
new file mode 100644
index 00000000..2c7e935a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/MorethanaFeeler.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class MorethanaFeeler : public InstanceContentScript
+{
+public:
+   MorethanaFeeler() : InstanceContentScript( 10009 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Naadam.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/Naadam.cpp
new file mode 100644
index 00000000..fb471d26
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/Naadam.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Naadam : public InstanceContentScript
+{
+public:
+   Naadam() : InstanceContentScript( 5008 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f );
+      instance->registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f );
+      instance->registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Neverreap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/Neverreap.cpp
new file mode 100644
index 00000000..15c5d674
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/Neverreap.cpp
@@ -0,0 +1,65 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Neverreap : public InstanceContentScript
+{
+public:
+   Neverreap() : InstanceContentScript( 33 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Vanutotem", 2005373, 0, 4, { 171.495407f, 64.000000f, -17.861130f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005374, 0, 4, { 172.963303f, 64.000000f, -17.254971f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005375, 0, 4, { 173.628693f, 64.000000f, -16.836420f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005376, 0, 4, { 173.837097f, 64.000000f, -15.707030f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005377, 0, 4, { 172.736298f, 64.000000f, -15.517540f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005378, 0, 4, { 172.030807f, 64.000000f, -15.895150f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005379, 0, 4, { 171.188904f, 64.000000f, -16.423241f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005380, 0, 4, { 170.423996f, 64.000000f, -18.803040f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005381, 0, 4, { 169.871201f, 64.000000f, -17.785959f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005382, 0, 4, { 170.450607f, 64.000000f, -15.978460f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005383, 0, 4, { 169.593307f, 64.000000f, -15.827410f }, 1.000000f );
+      instance->registerEObj( "Vanutotem", 2005384, 0, 4, { 170.206100f, 64.000000f, -15.102260f }, 1.000000f );
+      instance->registerEObj( "Cloudaltar", 2005130, 5786938, 4, { -160.917892f, 5.000000f, 291.800598f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2005135, 5887646, 4, { -160.814896f, 4.989685f, 291.432007f }, 0.991760f );
+      instance->registerEObj( "Cloudaltar", 2005131, 5786940, 4, { -87.421448f, 21.000000f, 290.602692f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005136, 5887670, 4, { -97.348267f, 21.000000f, 290.468292f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005137, 5887709, 4, { -1.889378f, 43.351429f, 215.919601f }, 1.000000f );
+      instance->registerEObj( "Cloudaltar", 2005132, 5786943, 4, { -4.570463f, 44.541019f, 216.505707f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2002872, 5778078, 4, { 74.175919f, 38.000000f, 213.378998f }, 1.000000f );
+      instance->registerEObj( "Cloudaltar", 2005133, 5786946, 4, { 77.225830f, 37.979610f, 211.596802f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002872, 5789280, 4, { -5.153300f, 43.220901f, 215.814102f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002587, 0, 4, { -5.153300f, 43.138199f, 214.261093f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005137, 5887710, 4, { 79.964493f, 38.000000f, 209.654800f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005139, 5606925, 4, { 132.122696f, 55.455528f, 135.050995f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005140, 5606936, 4, { 142.889496f, 67.000000f, 67.840523f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002872, 5777608, 4, { 165.085007f, 63.500000f, 10.671380f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 5777614, 4, { 178.430206f, 64.000000f, -23.500389f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 163.308899f, 63.926491f, 9.173799f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2005142, 0, 4, { 177.194199f, 60.250000f, -155.280502f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 172.014893f, 58.670898f, -358.327606f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2002872, 5615523, 4, { 175.494003f, 59.281250f, -305.348297f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2002587, 0, 4, { 175.127701f, 59.281250f, -310.170197f }, 0.991760f );
+      instance->registerEObj( "Cloudaltar", 2005134, 5786958, 4, { 164.310806f, 60.349369f, -127.550201f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2005143, 5900091, 4, { 164.190903f, 61.358318f, -219.399506f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2005146, 5894450, 4, { 175.280396f, 59.281250f, -309.102112f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2005144, 5893679, 4, { 158.342804f, 60.440922f, -191.393906f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2005145, 5893776, 4, { 162.635193f, 59.999939f, -271.153412f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2005141, 5764461, 4, { 165.941803f, 60.440899f, -205.985107f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5614672, 5, { -195.491302f, -0.022185f, 305.059296f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -179.874603f, 2.417616f, 306.529602f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OneLifeforOneWorld.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/OneLifeforOneWorld.cpp
new file mode 100644
index 00000000..9784a891
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/OneLifeforOneWorld.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class OneLifeforOneWorld : public InstanceContentScript
+{
+public:
+   OneLifeforOneWorld() : InstanceContentScript( 5003 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OurCompromise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/OurCompromise.cpp
new file mode 100644
index 00000000..7cb0f4c3
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/OurCompromise.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class OurCompromise : public InstanceContentScript
+{
+public:
+   OurCompromise() : InstanceContentScript( 5020 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6941254, 4, { -613.766602f, 59.266399f, -460.085205f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OurUnsungHeroes.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/OurUnsungHeroes.cpp
new file mode 100644
index 00000000..87dc0745
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/OurUnsungHeroes.cpp
@@ -0,0 +1,65 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class OurUnsungHeroes : public InstanceContentScript
+{
+public:
+   OurUnsungHeroes() : InstanceContentScript( 5014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f );
+      instance->registerEObj( "Unknown6", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f );
+      instance->registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f );
+      instance->registerEObj( "Guardianstatue", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f );
+      instance->registerEObj( "Guardianstatue", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070313f, 100.000000f, -376.644592f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f );
+      instance->registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f }, 0.991760f );
+      instance->registerEObj( "Unknown31", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f }, 0.991760f );
+      instance->registerEObj( "Unknown33", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PharosSirius.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/PharosSirius.cpp
new file mode 100644
index 00000000..5b61298d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/PharosSirius.cpp
@@ -0,0 +1,53 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class PharosSirius : public InstanceContentScript
+{
+public:
+   PharosSirius() : InstanceContentScript( 17 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002718, 4378108, 4, { 88.730026f, 0.300000f, 69.993042f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002719, 0, 4, { 118.749496f, 0.300000f, 70.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -18.275600f, 193.987900f, 0.000000f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 42.000000f, 30.001560f, -31.911860f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002720, 4378115, 4, { 41.977539f, 30.001610f, -32.837688f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002723, 4391376, 4, { 23.849791f, 29.984011f, -56.015869f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 21.750000f, 90.008011f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002721, 4378121, 4, { 20.298759f, 90.000008f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002724, 4378123, 4, { -20.870550f, 90.000008f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 25.750000f, 194.136505f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002722, 4378127, 4, { 24.286779f, 194.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 76.644943f, 0.300000f, 66.422493f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002725, 4392603, 4, { -42.923710f, 29.984011f, -56.504211f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2002726, 4392604, 4, { -19.028080f, 36.148560f, -22.110350f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2002727, 4392605, 4, { 17.898800f, 44.388432f, -22.415590f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2002728, 4392606, 4, { 26.840580f, 52.091381f, 10.055660f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2002729, 4404469, 4, { -41.947140f, 29.984011f, 55.924320f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 0.000000f, 140.000000f, 21.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002744, 4390583, 4, { 0.213522f, 139.893402f, 22.075270f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2002743, 4390585, 4, { -0.033084f, 140.000000f, -20.026180f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2002742, 4390546, 4, { -11.093380f, 1.388489f, -23.453131f }, 0.991760f );
+      instance->registerEObj( "Aethervalve", 2002730, 4392611, 4, { -0.015320f, 119.981598f, -32.913761f }, 0.991760f );
+      instance->registerEObj( "Aethervalve", 2002731, 4392612, 4, { -0.076355f, 139.970901f, 42.618408f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2002787, 4395239, 4, { -38.345951f, 60.593510f, 21.011600f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2003436, 4406574, 4, { 41.813019f, 29.999941f, -29.969271f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2003032, 0, 4, { 42.000000f, 30.000771f, -59.314499f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2003033, 0, 4, { 42.000000f, 30.000771f, -56.244320f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2003034, 0, 4, { 42.000000f, 30.000771f, -51.724258f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PharosSiriusHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/PharosSiriusHard.cpp
new file mode 100644
index 00000000..4e8f78eb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/PharosSiriusHard.cpp
@@ -0,0 +1,51 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class PharosSiriusHard : public InstanceContentScript
+{
+public:
+   PharosSiriusHard() : InstanceContentScript( 40 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 5963936, 4, { -1.480164f, 93.003777f, -23.788879f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -0.228943f, 93.016541f, -22.052860f }, 0.869751f );
+      instance->registerEObj( "Unknown2", 2002872, 5963943, 4, { 21.051910f, 90.039482f, -0.641622f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006551, 0, 4, { 6.820740f, 90.135010f, -0.717224f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002872, 5963945, 4, { 20.515039f, 30.001440f, -55.973820f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 21.438900f, 30.001369f, -55.832821f }, 0.869751f );
+      instance->registerEObj( "Unknown6", 2002872, 5963948, 4, { 60.977539f, 30.000811f, -56.096581f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2006563, 0, 4, { 42.160641f, 29.984011f, -60.227360f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2002872, 5963970, 4, { -95.386551f, -5.551003f, -272.570099f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2002735, 0, 4, { -95.423126f, -5.551003f, -271.765991f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5963633, 5, { 39.155338f, 189.990097f, -2.100519f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 39.255451f, 188.130096f, -17.964260f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -95.418854f, -5.446677f, -305.998199f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2006461, 5961306, 4, { -42.092682f, 170.000000f, 1.321840f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006462, 5961309, 4, { 0.142279f, 160.000000f, 41.544201f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006463, 5965424, 4, { 1.331733f, 158.160294f, 25.044350f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006464, 5964060, 4, { 0.116699f, 139.949997f, -18.497431f }, 1.000000f );
+      instance->registerEObj( "Candlekeepkey", 2006467, 0, 4, { 13.504210f, 29.984011f, -54.795170f }, 0.991760f );
+      instance->registerEObj( "Lockeddoor", 2006470, 5955784, 4, { 15.219990f, 31.371090f, -56.250301f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006465, 5963843, 4, { 32.070061f, 72.230629f, -55.058460f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006466, 5965844, 4, { -0.253021f, 39.999969f, -21.544781f }, 1.000000f );
+      instance->registerEObj( "Port3526", 2006471, 5960472, 4, { -16.647579f, 7.686357f, -153.002304f }, 0.991760f );
+      instance->registerEObj( "Port3524", 2006472, 5960468, 4, { -94.266373f, -0.598898f, -227.302200f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2006528, 5967682, 4, { 10.338900f, 10.519330f, -124.110298f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006564, 5967692, 4, { -3.081049f, 5.016401f, -212.859802f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2002618, 5993225, 4, { 0.231439f, 90.039482f, -21.072599f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PullingPoisonPosies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/PullingPoisonPosies.cpp
new file mode 100644
index 00000000..b71eafe3
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/PullingPoisonPosies.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class PullingPoisonPosies : public InstanceContentScript
+{
+public:
+   PullingPoisonPosies() : InstanceContentScript( 10005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/RaisingtheSword.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/RaisingtheSword.cpp
new file mode 100644
index 00000000..5c7db071
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/RaisingtheSword.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class RaisingtheSword : public InstanceContentScript
+{
+public:
+   RaisingtheSword() : InstanceContentScript( 5018 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f );
+      instance->registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ReturnoftheBull.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ReturnoftheBull.cpp
new file mode 100644
index 00000000..984d60b7
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ReturnoftheBull.cpp
@@ -0,0 +1,54 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ReturnoftheBull : public InstanceContentScript
+{
+public:
+   ReturnoftheBull() : InstanceContentScript( 5024 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6894813, 4, { -209.363495f, 35.017460f, 72.069672f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6894812, 4, { -172.226807f, 35.017342f, 72.369667f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -210.219406f, 35.017460f, 72.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2008685, 0, 4, { -192.767105f, 34.867069f, 71.984734f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6894833, 4, { 250.000000f, 106.496902f, -50.489590f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6894834, 4, { 250.000000f, 106.496902f, -89.516243f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 250.000000f, 106.496902f, -50.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002872, 6895342, 4, { 248.500000f, 122.000000f, -329.291107f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6865535, 4, { 249.561295f, 121.995796f, -352.681793f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007457, 6895343, 4, { 249.487595f, 122.005699f, -330.083801f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002872, 6904529, 4, { 248.937500f, 122.000000f, -377.252899f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2008350, 0, 4, { 250.000000f, 122.000000f, -353.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007168, 0, 4, { 250.018997f, 121.995796f, -353.109009f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6879593, 5, { -408.611298f, 2.500000f, 233.977905f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -398.118408f, 2.500000f, 236.857193f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 250.007294f, 122.000000f, -370.492889f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2008319, 6844583, 4, { -342.881104f, 24.000010f, 149.680099f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2008319, 6844584, 4, { -258.130402f, 27.000010f, 99.970268f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 6840800, 4, { -100.167801f, 44.750629f, 73.001747f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 6853103, 4, { 193.710297f, 106.000000f, 128.847397f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6847102, 4, { 263.424286f, 106.400002f, -8.750051f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007457, 6847104, 4, { 249.800797f, 106.428101f, -108.873100f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2008335, 6844579, 4, { 233.630905f, 109.971703f, -155.596298f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2008335, 6844578, 4, { 233.295197f, 109.971703f, -144.792892f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2008335, 6844581, 4, { 224.912094f, 120.000000f, -248.707504f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2008335, 6844580, 4, { 210.809296f, 120.000000f, -248.716202f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2008336, 6845038, 4, { 249.895905f, 122.099899f, -294.475403f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007457, 6942278, 4, { 233.967697f, 110.000000f, -150.215607f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007457, 6942279, 4, { 217.761505f, 119.889999f, -247.455597f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SaintMociannesArboretum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SaintMociannesArboretum.cpp
new file mode 100644
index 00000000..46b0a680
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SaintMociannesArboretum.cpp
@@ -0,0 +1,51 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SaintMociannesArboretum : public InstanceContentScript
+{
+public:
+   SaintMociannesArboretum() : InstanceContentScript( 41 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6038834, 4, { -14.984150f, -350.000000f, -10.860330f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 10.788090f, -350.026703f, 7.522644f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -16.401690f, -350.000000f, -11.633360f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2006520, 6041801, 4, { 113.481300f, 2.975464f, 19.363649f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2006521, 6047538, 4, { 67.640343f, 0.000000f, -71.112350f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2006586, 0, 4, { 85.017906f, -0.020000f, -58.585030f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2006522, 5966533, 4, { -125.780197f, -12.375120f, -188.891495f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2006523, 6037786, 4, { -234.627304f, -29.692921f, -182.589401f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2006594, 6068325, 4, { -244.373505f, -37.105370f, -163.858002f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006524, 6046538, 4, { -102.066101f, -349.342285f, 55.198681f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2006526, 6046053, 4, { -86.535728f, -356.521301f, -4.785355f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2006527, 6046055, 4, { -104.847900f, -356.059692f, 4.146202f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006525, 6046572, 4, { -47.545761f, -359.815613f, -33.600189f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006596, 6058396, 4, { -262.334015f, -39.551819f, -111.790802f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006597, 6077036, 4, { -248.226898f, -46.000000f, -133.086304f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006598, 6077035, 4, { -283.791992f, -46.000000f, -122.796700f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006609, 6084794, 4, { -242.938904f, -44.861469f, -84.336670f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2002872, 6037810, 4, { 15.731990f, 3.000000f, -89.860413f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2002735, 0, 4, { 18.234501f, 3.097534f, -90.928528f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2006531, 6037814, 4, { -17.876730f, 3.000000f, -82.649872f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2002872, 6041100, 4, { -245.545395f, -36.853828f, -164.052200f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2002735, 0, 4, { -245.869705f, -36.958050f, -162.887695f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2006532, 6082449, 4, { -260.975098f, -44.815800f, -108.476402f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2006566, 0, 4, { -263.891296f, -44.889751f, -114.578796f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6034530, 5, { 0.231333f, 0.000002f, 140.623901f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 4.219861f, 0.000001f, 131.545197f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp
new file mode 100644
index 00000000..20186ef2
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp
@@ -0,0 +1,65 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Sastasha : public InstanceContentScript
+{
+public:
+   Sastasha() : InstanceContentScript( 4 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000211, 0, 4, { 367.827087f, 47.400051f, -226.694305f }, 4.714991f );
+      instance->registerEObj( "Unknown1", 2001504, 4323996, 4, { 94.597588f, 26.865030f, -68.584061f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2001505, 4323997, 4, { 95.510597f, 26.620729f, -67.853653f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001506, 3653862, 4, { -9.239832f, 24.789940f, 35.778252f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2001507, 4035750, 4, { -2.841087f, 23.114571f, 38.090420f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2001539, 3653864, 4, { -158.560898f, 8.099012f, 214.344803f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2001540, 4056793, 4, { -163.598602f, 8.026373f, 214.030106f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2001508, 4236989, 4, { -303.983612f, 5.576412f, 276.214111f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001509, 4236990, 4, { -305.302002f, 5.542851f, 275.750885f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4096706, 5, { 361.881714f, 46.092751f, -225.181305f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 344.705688f, 43.781551f, -217.365997f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -314.279114f, 5.630589f, 348.735596f }, 0.900235f );
+      instance->registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f }, 0.930753f );
+      instance->registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f }, 0.930753f );
+      instance->registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f }, 0.991789f );
+      instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f );
+      instance->registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f );
+      instance->registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f );
+      instance->registerEObj( "Unknown10", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f }, 0.991789f );
+      instance->registerEObj( "Unknown11", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f }, 0.991789f );
+      instance->registerEObj( "Unknown12", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f }, 0.991789f );
+      instance->registerEObj( "Unknown13", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f }, 0.991789f );
+      instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+      instance->registerEObj( "Bloodymemo", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+      instance->registerEObj( "Bloodymemo", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+      instance->registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f );
+      instance->registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f }, 0.991789f );
+      instance->registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f );
+      instance->registerEObj( "TheHole", 2000232, 3656260, 4, { -36.000000f, 16.500000f, 163.300003f }, 1.000000f );
+      instance->registerEObj( "Rambadedoor", 2000236, 3655908, 4, { -190.000000f, 7.000000f, 252.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2000235, 3656262, 4, { -156.500000f, 8.600000f, 252.500000f }, 1.000000f );
+      instance->registerEObj( "WaveriderGatekey", 2000255, 0, 4, { -95.515343f, 20.000000f, 177.197800f }, 1.000000f );
+      instance->registerEObj( "KeytotheHole", 2000256, 0, 4, { -38.076599f, 17.232731f, 158.839401f }, 0.991760f );
+      instance->registerEObj( "Captainsquarterskey", 2000250, 0, 4, { -100.625000f, 15.600010f, 137.150696f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2000223, 4200832, 4, { -24.018980f, 18.475060f, 111.404900f }, 1.000000f );
+      instance->registerEObj( "Unnaturalripples", 2000405, 3992454, 4, { -301.973206f, 6.500000f, 300.029388f }, 0.991789f );
+      instance->registerEObj( "Unnaturalripples", 2000406, 3992452, 4, { -302.037598f, 6.500000f, 336.047302f }, 1.000000f );
+      instance->registerEObj( "Unnaturalripples", 2000407, 3992449, 4, { -338.036499f, 6.500000f, 300.206512f }, 0.991789f );
+      instance->registerEObj( "Unnaturalripples", 2000408, 3992453, 4, { -337.929596f, 6.500000f, 335.975311f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SastashaHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SastashaHard.cpp
new file mode 100644
index 00000000..2d87b363
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SastashaHard.cpp
@@ -0,0 +1,60 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SastashaHard : public InstanceContentScript
+{
+public:
+   SastashaHard() : InstanceContentScript( 28 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 157.165298f, 14.000000f, -65.283813f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 4887881, 4, { 157.156601f, 14.074050f, -62.918228f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 4887882, 4, { 143.947693f, 14.031430f, -75.422539f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { -103.378998f, 15.750010f, 113.646400f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002872, 4887934, 4, { -102.988998f, 14.900710f, 111.903198f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 4868757, 4, { -120.026100f, 15.610280f, 152.360199f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -300.099213f, 5.569519f, 278.309296f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -326.124603f, 5.082251f, 320.072388f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004421, 4769863, 4, { 228.091507f, 40.730598f, -164.119293f }, 1.000000f );
+      instance->registerEObj( "Drainagepump", 2004406, 4768296, 4, { 179.233200f, 33.911160f, -25.225599f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004405, 4768239, 4, { 164.693695f, 26.418791f, -51.467159f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004407, 4877642, 4, { 116.227898f, 13.992490f, -60.624149f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2004408, 4867860, 4, { 94.502289f, 14.098320f, -72.764816f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004409, 4867859, 4, { 61.426201f, 16.933029f, -87.107803f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004410, 4878592, 4, { -14.773780f, 12.568780f, -21.590240f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004411, 4878584, 4, { -34.366249f, 12.620500f, -10.794950f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2004412, 4878593, 4, { -38.197849f, 12.744050f, -32.694260f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2004422, 4770074, 4, { -47.051659f, 12.731530f, -15.329430f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2004413, 4878605, 4, { -75.129097f, 7.724828f, -3.396252f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2004414, 4878604, 4, { -67.776993f, 7.424381f, 10.125570f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2004415, 4878603, 4, { -74.879089f, 7.540010f, 24.726391f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2004416, 4878609, 4, { -92.286110f, 7.701883f, 26.123421f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2004417, 4878523, 4, { -103.974098f, 8.528216f, 17.928379f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2004418, 4878606, 4, { -107.137001f, 7.762873f, 7.250639f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2004419, 4878607, 4, { -97.134842f, 7.622185f, -4.976304f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2004420, 4878608, 4, { -83.913422f, 7.926591f, -9.813313f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2004423, 4770075, 4, { -84.640503f, 7.804197f, 29.907909f }, 1.000000f );
+      instance->registerEObj( "DoortoDeadMansDrink", 2004424, 4765267, 4, { -96.240341f, 19.268089f, 87.404861f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2004425, 4761283, 4, { -188.014496f, 7.483281f, 252.162704f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2004426, 4762024, 4, { -299.676086f, 5.576687f, 280.853699f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2004429, 0, 4, { -302.662689f, 5.569519f, 269.489502f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2004441, 4765263, 4, { -130.635300f, 16.327169f, 156.933502f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2004428, 4890021, 4, { -295.493286f, 5.576687f, 275.610901f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4878710, 5, { 347.674713f, 44.019909f, -221.552002f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.774994f, 44.119980f, -229.481705f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SealRockSeize.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SealRockSeize.cpp
new file mode 100644
index 00000000..9eeec3d2
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SealRockSeize.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SealRockSeize : public InstanceContentScript
+{
+public:
+   SealRockSeize() : InstanceContentScript( 50004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005325, 5810980, 4, { 187.869202f, 8.108603f, 250.084000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005326, 5810982, 4, { 57.053249f, 17.165449f, -249.904694f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005327, 5810983, 4, { -314.464996f, 41.657890f, 126.635803f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithA1", 2005338, 5821682, 4, { 18.148529f, 18.849100f, 267.572693f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2005502, 5821737, 4, { 18.255230f, 16.804850f, 267.227814f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithA2", 2005339, 5821685, 4, { 8.120948f, 21.013821f, 167.772705f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2005503, 5821738, 4, { 8.225257f, 19.763350f, 167.312195f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithA3", 2005340, 5821686, 4, { 96.414833f, 34.135899f, 108.177002f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2005504, 5821739, 4, { 96.322990f, 33.288559f, 107.972397f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithA4", 2005341, 5821687, 4, { 200.335693f, 30.775141f, 68.234734f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2005505, 5821740, 4, { 200.310593f, 29.688540f, 68.217537f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithB1", 2005342, 5821688, 4, { 157.733093f, 4.437783f, -49.087921f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2005506, 5821741, 4, { 157.696793f, 2.356474f, -49.159088f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithB2", 2005343, 5821689, 4, { 51.290970f, 32.733749f, -82.673607f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2005507, 5821743, 4, { 51.310070f, 31.154039f, -82.935127f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithB3", 2005344, 5821690, 4, { 74.829063f, 13.976150f, -16.412930f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2005508, 5821744, 4, { 74.846779f, 11.294810f, -16.719721f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithB4", 2005345, 5821691, 4, { -47.222630f, 31.708929f, -92.240723f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2005509, 5821746, 4, { -47.175869f, 29.272760f, -92.573776f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithC2", 2005346, 5821693, 4, { -163.868805f, 46.920021f, 1.751138f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2005510, 5821747, 4, { -164.055405f, 45.557041f, 1.093665f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithD2", 2005347, 5821695, 4, { -32.930420f, 18.645050f, 19.141041f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2005511, 5821748, 4, { -32.986580f, 17.328630f, 18.981670f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithD3", 2005348, 5821697, 4, { -62.119572f, 40.360111f, 48.813599f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2005512, 5821749, 4, { -62.187111f, 38.493420f, 48.440479f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithC4", 2005349, 5821698, 4, { -148.508499f, 43.280338f, 161.458603f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2005513, 5821750, 4, { -148.519196f, 41.333549f, 161.070908f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithC3", 2005350, 5821699, 4, { -167.072998f, 26.487570f, 71.059898f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2005514, 5821751, 4, { -167.089294f, 24.449400f, 70.683212f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithC1", 2005351, 5821700, 4, { -120.087196f, 28.019110f, -46.859772f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2005515, 5821752, 4, { -120.122597f, 27.122120f, -47.061981f }, 1.000000f );
+      instance->registerEObj( "AllagantomelithD1", 2005352, 5821701, 4, { 15.841110f, 19.797770f, 101.591301f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2005516, 5821753, 4, { 15.812600f, 18.748220f, 101.435699f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ShadowandClaw.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ShadowandClaw.cpp
new file mode 100644
index 00000000..6ee45292
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ShadowandClaw.cpp
@@ -0,0 +1,41 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ShadowandClaw : public InstanceContentScript
+{
+public:
+   ShadowandClaw() : InstanceContentScript( 10011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ShisuioftheVioletTides.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ShisuioftheVioletTides.cpp
new file mode 100644
index 00000000..e79c80f9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ShisuioftheVioletTides.cpp
@@ -0,0 +1,67 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ShisuioftheVioletTides : public InstanceContentScript
+{
+public:
+   ShisuioftheVioletTides() : InstanceContentScript( 50 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 6526609, 5, { 8.208527f, 11.171570f, 362.661407f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 12.390300f, 9.221273f, 350.790100f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6709633, 4, { 0.322443f, 45.921879f, -411.857788f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -0.011370f, 45.921879f, -412.896698f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.069154f, 45.921871f, -447.611115f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2008110, 6865017, 4, { -0.060144f, 45.921879f, -430.535889f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6890670, 4, { 5.646293f, 45.921879f, -440.096588f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6709518, 4, { -0.364792f, 18.299490f, 91.107010f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 0.033326f, 18.500010f, 89.883667f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007771, 6709586, 4, { -0.180471f, 18.500010f, 50.377258f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2008311, 0, 4, { -7.074059f, 18.500019f, 72.067329f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2008312, 0, 4, { 5.212873f, 18.500019f, 72.435066f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 6709598, 4, { 0.399389f, 26.954840f, -187.217804f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007772, 6709615, 4, { -17.157890f, 27.250010f, -208.294098f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002735, 0, 4, { 0.044392f, 27.249910f, -188.679199f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2008106, 6869249, 4, { -8.237946f, 27.250010f, -216.909500f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2008107, 6869206, 4, { -7.564978f, 27.250010f, -199.660095f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2008108, 6869244, 4, { 8.748951f, 27.249981f, -199.725601f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2008109, 6869228, 4, { 8.554644f, 27.250010f, -216.964706f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007745, 6496157, 4, { 6.118062f, 6.997511f, 335.203186f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2007746, 6502056, 4, { 29.832279f, -1.756603f, 291.307404f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007747, 6502057, 4, { 0.594021f, -3.646973f, 227.895996f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2007748, 6502133, 4, { 19.059891f, -3.462188f, 230.198303f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007749, 6502058, 4, { -3.533240f, -5.778060f, 244.420105f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007750, 6502145, 4, { -55.424740f, 7.160790f, 138.440201f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007751, 6502143, 4, { -40.800652f, 6.339986f, 152.161407f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007752, 6502138, 4, { -42.255699f, 6.735332f, 144.687607f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007762, 6502139, 4, { -58.166401f, 3.768957f, 197.653702f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007763, 6502141, 4, { -46.675800f, 6.647403f, 136.313400f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007764, 0, 4, { -25.192690f, 6.973328f, 142.992203f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2007753, 6502709, 4, { -9.730975f, -4.657778f, 229.435501f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007754, 6502794, 4, { -19.627199f, 7.090509f, 140.629501f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2007767, 6526733, 4, { -52.219410f, 6.701191f, 142.932297f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2007770, 6514679, 4, { 0.421847f, 21.000000f, 23.917980f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2007768, 6708902, 4, { -42.045250f, 6.286057f, 150.394806f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007769, 6708901, 4, { -56.005989f, 6.588723f, 144.949600f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2007755, 6504391, 4, { 0.527385f, 26.000010f, -18.338779f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2007756, 6504406, 4, { 0.118717f, 26.000010f, -49.912861f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2007757, 6504429, 4, { 0.465194f, 26.078131f, -80.333969f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2007758, 6504452, 4, { -0.073714f, 26.078131f, -165.829300f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2007759, 6517284, 4, { 9.887736f, 30.921881f, -285.783295f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2007760, 6517285, 4, { 0.046282f, 40.921879f, -372.485901f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10.cpp
new file mode 100644
index 00000000..d96f3010
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10.cpp
@@ -0,0 +1,45 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV10 : public InstanceContentScript
+{
+public:
+   SigmascapeV10() : InstanceContentScript( 30059 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7230603, 4, { -6.335131f, 0.049939f, -10.559780f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 7230604, 4, { -5.699108f, 0.049922f, -2.387848f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7230605, 4, { -6.369749f, 0.050002f, 7.711805f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7230606, 4, { -6.234384f, 0.050004f, 17.721371f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2009408, 7231049, 4, { -3.117226f, 0.050002f, 9.861297f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2009409, 7231069, 4, { -25.851500f, 16.520651f, 22.008921f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 7274404, 4, { -22.963020f, -2.647718f, 8.151876f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 7297633, 4, { -30.500000f, 0.552600f, 43.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2009384, 0, 4, { 220.569107f, -108.812103f, 5.081238f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009400, 7231089, 4, { 144.482300f, -110.000000f, -71.090813f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009401, 7231090, 4, { 144.468994f, -110.000000f, -23.514120f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009402, 7231091, 4, { 144.456100f, -110.000000f, 23.836590f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009403, 7231092, 4, { 144.470901f, -110.000000f, 71.062202f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009404, 7231093, 4, { 215.991302f, -110.000000f, -71.152832f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009405, 7231096, 4, { 215.991302f, -110.000000f, -23.514160f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009406, 7231097, 4, { 215.991302f, -110.000000f, 23.880310f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009407, 7231098, 4, { 215.991302f, -110.000000f, 71.061279f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007457, 7297634, 4, { 178.511902f, -110.002403f, -0.198364f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2007457, 7181869, 4, { -3.537696f, 0.000001f, 18.750830f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -0.015320f, -9.170715f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10Savage.cpp
new file mode 100644
index 00000000..4fdded9f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10Savage.cpp
@@ -0,0 +1,45 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV10Savage : public InstanceContentScript
+{
+public:
+   SigmascapeV10Savage() : InstanceContentScript( 30063 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7230603, 4, { -6.335131f, 0.049939f, -10.559780f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 7230604, 4, { -5.699108f, 0.049922f, -2.387848f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7230605, 4, { -6.369749f, 0.050002f, 7.711805f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7230606, 4, { -6.234384f, 0.050004f, 17.721371f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2009408, 7231049, 4, { -3.117226f, 0.050002f, 9.861297f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2009409, 7231069, 4, { -25.851500f, 16.520651f, 22.008921f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 7274404, 4, { -22.963020f, -2.647718f, 8.151876f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 7297633, 4, { -30.500000f, 0.552600f, 43.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2009384, 0, 4, { 220.569107f, -108.812103f, 5.081238f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009400, 7231089, 4, { 144.482300f, -110.000000f, -71.090813f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009401, 7231090, 4, { 144.468994f, -110.000000f, -23.514120f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009402, 7231091, 4, { 144.456100f, -110.000000f, 23.836590f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009403, 7231092, 4, { 144.470901f, -110.000000f, 71.062202f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009404, 7231093, 4, { 215.991302f, -110.000000f, -71.152832f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009405, 7231096, 4, { 215.991302f, -110.000000f, -23.514160f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009406, 7231097, 4, { 215.991302f, -110.000000f, 23.880310f }, 0.991760f );
+      instance->registerEObj( "Aetherialstream", 2009407, 7231098, 4, { 215.991302f, -110.000000f, 71.061279f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007457, 7297634, 4, { 178.511902f, -110.002403f, -0.198364f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2007457, 7181869, 4, { -3.537696f, 0.000001f, 18.750830f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -0.015320f, -9.170715f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20.cpp
new file mode 100644
index 00000000..4158be21
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20.cpp
@@ -0,0 +1,43 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV20 : public InstanceContentScript
+{
+public:
+   SigmascapeV20() : InstanceContentScript( 30060 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7244294, 4, { -6.511937f, 0.003125f, -4.958800f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 7181375, 4, { 12.476670f, -0.015002f, 6.948618f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2007457, 7181377, 4, { 12.570220f, -0.015320f, -9.693607f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2007457, 7329867, 4, { -4.318359f, -0.015320f, 5.722107f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007457, 7187344, 4, { -1.960858f, 0.001128f, 0.319698f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7174526, 4, { -6.872698f, 0.004465f, 1.843464f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 7174523, 4, { 11.220570f, 0.054783f, -1.564175f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 7174518, 4, { 8.520967f, 0.009985f, -8.679861f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 7174519, 4, { 9.028366f, 0.055644f, 3.513119f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 7180548, 4, { 2.311234f, 0.003611f, 3.656348f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 7244420, 4, { 2.385169f, 0.003358f, 3.242888f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7181938, 4, { 15.676980f, 0.010429f, -11.942520f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 7181940, 4, { 16.526520f, 0.010429f, 11.441620f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 7181939, 4, { -16.083740f, 0.010429f, 11.147680f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 7181937, 4, { -16.250851f, -0.015320f, -11.795230f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 7179724, 5, { -1.443299f, 0.007087f, 6.836350f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -11.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 7171885, 4, { 4.955309f, 0.000000f, -52.142441f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20Savage.cpp
new file mode 100644
index 00000000..dda2da3a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20Savage.cpp
@@ -0,0 +1,43 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV20Savage : public InstanceContentScript
+{
+public:
+   SigmascapeV20Savage() : InstanceContentScript( 30064 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7244294, 4, { -6.511937f, 0.003125f, -4.958800f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 7181375, 4, { 12.476670f, -0.015002f, 6.948618f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2007457, 7181377, 4, { 12.570220f, -0.015320f, -9.693607f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2007457, 7329867, 4, { -4.318359f, -0.015320f, 5.722107f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007457, 7187344, 4, { -1.960858f, 0.001128f, 0.319698f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7174526, 4, { -6.872698f, 0.004465f, 1.843464f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 7174523, 4, { 11.220570f, 0.054783f, -1.564175f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 7174518, 4, { 8.520967f, 0.009985f, -8.679861f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 7174519, 4, { 9.028366f, 0.055644f, 3.513119f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 7180548, 4, { 2.311234f, 0.003611f, 3.656348f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 7244420, 4, { 2.385169f, 0.003358f, 3.242888f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7181938, 4, { 15.676980f, 0.010429f, -11.942520f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 7181940, 4, { 16.526520f, 0.010429f, 11.441620f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 7181939, 4, { -16.083740f, 0.010429f, 11.147680f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 7181937, 4, { -16.250851f, -0.015320f, -11.795230f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 7179724, 5, { -1.443299f, 0.007087f, 6.836350f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -11.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 7171885, 4, { 4.955309f, 0.000000f, -52.142441f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30.cpp
new file mode 100644
index 00000000..43fcff38
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV30 : public InstanceContentScript
+{
+public:
+   SigmascapeV30() : InstanceContentScript( 30061 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 7174192, 5, { -0.028109f, 0.000000f, 12.665810f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2009292, 7185733, 4, { -7.736383f, 3.268075f, -35.776291f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2009293, 7185734, 4, { 10.155860f, 3.268075f, -35.738319f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2009294, 0, 4, { 18.075230f, 0.000000f, -16.894060f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2009295, 0, 4, { 15.384740f, 0.000000f, -8.198026f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2009296, 0, 4, { 17.399639f, 0.000000f, -8.148316f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2009297, 0, 4, { 10.133680f, 0.000000f, -9.799342f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2009298, 0, 4, { 12.524550f, 0.000000f, -0.314495f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2009299, 0, 4, { 4.409851f, -0.015320f, -0.839294f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2009300, 0, 4, { 10.240340f, 0.000000f, 2.827696f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2009301, 0, 4, { 12.606230f, 0.000000f, 7.149309f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2009302, 7178404, 4, { 0.616980f, 0.000000f, 0.677854f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30Savage.cpp
new file mode 100644
index 00000000..b44745c7
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30Savage.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV30Savage : public InstanceContentScript
+{
+public:
+   SigmascapeV30Savage() : InstanceContentScript( 30065 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 7174192, 5, { -0.028109f, 0.000000f, 12.665810f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2009292, 7185733, 4, { -7.736383f, 3.268075f, -35.776291f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2009293, 7185734, 4, { 10.155860f, 3.268075f, -35.738319f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2009294, 0, 4, { 18.075230f, 0.000000f, -16.894060f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2009295, 0, 4, { 15.384740f, 0.000000f, -8.198026f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2009296, 0, 4, { 17.399639f, 0.000000f, -8.148316f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2009297, 0, 4, { 10.133680f, 0.000000f, -9.799342f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2009298, 0, 4, { 12.524550f, 0.000000f, -0.314495f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2009299, 0, 4, { 4.409851f, -0.015320f, -0.839294f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2009300, 0, 4, { 10.240340f, 0.000000f, 2.827696f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2009301, 0, 4, { 12.606230f, 0.000000f, 7.149309f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2009302, 7178404, 4, { 0.616980f, 0.000000f, 0.677854f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40.cpp
new file mode 100644
index 00000000..0359d7a4
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40.cpp
@@ -0,0 +1,43 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV40 : public InstanceContentScript
+{
+public:
+   SigmascapeV40() : InstanceContentScript( 30062 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7307403, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2008982, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2008978, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2008979, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2008980, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2008981, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2008976, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2008977, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 7296769, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000051, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000052, 0, 4, { 0.000000f, 0.000000f, -5.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2008626, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2008627, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2008629, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2008630, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006821, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 7181990, 5, { 0.000000f, 0.000000f, 14.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40Savage.cpp
new file mode 100644
index 00000000..b46323ab
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40Savage.cpp
@@ -0,0 +1,43 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV40Savage : public InstanceContentScript
+{
+public:
+   SigmascapeV40Savage() : InstanceContentScript( 30066 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7307403, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2008982, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2008978, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2008979, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2008980, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2008981, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2008976, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2008977, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 7296769, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000051, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000052, 0, 4, { 0.000000f, 0.000000f, -5.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2008626, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2008627, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2008629, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2008630, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006821, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 7181990, 5, { 0.000000f, 0.000000f, 14.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Snowcloak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/Snowcloak.cpp
new file mode 100644
index 00000000..2a1a5d88
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/Snowcloak.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Snowcloak : public InstanceContentScript
+{
+public:
+   Snowcloak() : InstanceContentScript( 27 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -25.554501f, 40.000000f, 65.525902f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 4729361, 4, { -29.985430f, 40.000000f, 65.539711f }, 1.000000f );
+      instance->registerEObj( "DoortoSilence", 2004203, 4680394, 4, { 57.114368f, 4.480070f, -45.937630f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004204, 4682554, 4, { 40.009041f, 0.491693f, -60.195160f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004206, 4725471, 4, { 32.621071f, -4.715674f, -117.578201f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004206, 4731431, 4, { 5.652817f, -1.779197f, -107.755600f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004208, 4895362, 4, { -30.982800f, -10.047770f, -162.841003f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2004209, 4685130, 4, { -39.827599f, -10.619430f, -155.585907f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004210, 4895363, 4, { -53.244961f, 3.577940f, -135.326797f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004211, 4685137, 4, { -57.355659f, 4.520907f, -101.443703f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004212, 4731432, 4, { -50.192619f, 6.129761f, -94.793358f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004692, 5018298, 4, { 1.842873f, -9.975479f, -135.724899f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004214, 4680578, 4, { -76.946297f, 28.400000f, -25.080601f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004215, 4680579, 4, { -76.355118f, 28.400000f, -0.768542f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004216, 4680574, 4, { -71.720413f, 28.400000f, 2.866590f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2004217, 4680909, 4, { -59.031670f, 28.399969f, 6.586658f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2004218, 4680572, 4, { -46.184601f, 27.650000f, 1.393153f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2004219, 4680571, 4, { -41.333439f, 28.400000f, -9.966988f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2004220, 4680577, 4, { -81.969833f, 38.540291f, -11.185970f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2004221, 4680576, 4, { -82.257988f, 38.540291f, -0.033865f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2004222, 4680575, 4, { -73.807869f, 38.540279f, 8.961772f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2004223, 4680573, 4, { -44.264439f, 38.540291f, 9.105038f }, 1.000000f );
+      instance->registerEObj( "DoortoOblivion", 2004224, 4680395, 4, { -52.060501f, 40.000000f, 65.066193f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2002735, 0, 4, { 46.358002f, -2.246400f, -72.299896f }, 0.800000f );
+      instance->registerEObj( "Unknown22", 2002872, 4725552, 4, { 48.054039f, -2.500000f, -74.312141f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2004205, 4725555, 4, { 59.417969f, -1.480164f, -102.836304f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2004577, 4982369, 4, { 44.252331f, -2.500000f, -89.438400f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2002735, 0, 4, { -79.379898f, 10.614600f, -109.116402f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2002872, 4725659, 4, { -83.147453f, 10.501150f, -112.069199f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2004213, 4725660, 4, { -107.265800f, 10.450760f, -103.052803f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4725473, 5, { 116.416702f, -9.665442f, 114.240799f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 117.194199f, -11.854060f, 106.498703f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 18.403561f, 40.000000f, 67.026413f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohmAl.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SohmAl.cpp
new file mode 100644
index 00000000..df3773b8
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SohmAl.cpp
@@ -0,0 +1,46 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SohmAl : public InstanceContentScript
+{
+public:
+   SohmAl() : InstanceContentScript( 37 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -142.306107f, 11.741690f, 188.300797f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 5777776, 4, { -146.759598f, 9.382987f, 191.177994f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 5777778, 4, { -126.024696f, 11.736150f, 144.580200f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 165.208603f, 137.478806f, -62.228100f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 5777792, 4, { 166.178696f, 137.607697f, -62.706631f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 5777793, 4, { 180.090302f, 138.237793f, -115.812103f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -112.464798f, 348.165985f, -368.176514f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002872, 5777990, 4, { -112.426399f, 348.165985f, -371.392487f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002872, 5777991, 4, { -89.965149f, 348.204498f, -416.112213f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -92.610641f, 348.164886f, -410.511993f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2005284, 5773453, 4, { -274.538086f, -4.016628f, 191.237701f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2005278, 5772621, 4, { -253.212296f, -2.894600f, 189.267303f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2005285, 5773460, 4, { -196.123306f, 3.106796f, 187.990906f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2005286, 5773461, 4, { -171.931305f, 2.815973f, 206.485794f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2005279, 5772623, 4, { -165.063995f, 4.074061f, 197.945007f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2005280, 5852453, 4, { 335.063385f, 114.335999f, -89.093300f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2005281, 5777403, 4, { 247.495102f, 126.954300f, -30.577419f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2005282, 5773504, 4, { -173.859894f, 324.834686f, -273.653503f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005283, 5773503, 4, { -191.639694f, 329.656799f, -321.158691f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5777084, 5, { -267.602997f, -18.376320f, 282.751190f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -278.421387f, -17.669189f, 277.700714f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohmAlHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SohmAlHard.cpp
new file mode 100644
index 00000000..6d31629b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SohmAlHard.cpp
@@ -0,0 +1,67 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SohmAlHard : public InstanceContentScript
+{
+public:
+   SohmAlHard() : InstanceContentScript( 49 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6610531, 4, { 171.484497f, 137.748795f, 239.483704f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 174.120697f, 137.590607f, 236.701706f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2007599, 6610540, 4, { 162.998398f, 137.748596f, 274.239502f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002872, 6613704, 4, { 299.153107f, 111.986000f, 138.189499f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 301.151306f, 112.000000f, 141.222107f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2007600, 6613798, 4, { 284.901794f, 112.000000f, 109.136398f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007648, 6621383, 4, { 128.328293f, 107.293800f, -303.903107f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007649, 0, 4, { 169.258698f, 106.695999f, -298.126007f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2007650, 0, 4, { 168.423599f, 108.900002f, -315.103485f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007651, 0, 4, { 167.744797f, 109.165802f, -335.555908f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002872, 6631462, 4, { 128.893707f, 107.000000f, -274.034393f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 127.962402f, 107.223801f, -277.597412f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2007706, 6653690, 4, { -198.779297f, 329.243896f, 33.463009f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2007706, 6653700, 4, { -206.605194f, 329.253998f, 59.786411f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2007706, 6653718, 4, { -190.572800f, 329.253998f, 54.758789f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2007706, 6653721, 4, { -169.511398f, 324.396088f, 88.214813f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2007706, 6653723, 4, { -154.978302f, 324.396088f, 84.108612f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2007706, 6653726, 4, { -115.709198f, 318.959412f, 108.811996f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2007735, 6572900, 4, { -188.843201f, 329.253998f, 66.614899f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007736, 6572901, 4, { -95.983841f, 318.012787f, 134.955994f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007765, 0, 4, { -166.002899f, 324.396088f, 99.648300f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2007785, 6735263, 4, { -113.389900f, 346.242401f, -11.429080f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2007784, 0, 4, { -185.825699f, 329.150208f, 67.756607f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007784, 0, 4, { -95.353699f, 317.812805f, 138.109406f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2007737, 6572914, 4, { 271.778503f, 120.866699f, 247.657700f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2007738, 6572915, 4, { 318.409912f, 114.000099f, 174.170197f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2007784, 0, 4, { 271.381592f, 121.015800f, 246.143295f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2007784, 0, 4, { 317.092896f, 114.000000f, 172.080200f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2007739, 6583747, 4, { 170.824707f, 125.108597f, -116.025803f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2007740, 6583766, 4, { 87.968140f, 114.976700f, -165.190399f }, 0.991760f );
+      instance->registerEObj( "Unknown30", 2007741, 6583828, 4, { 128.564804f, 107.608704f, -252.169403f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2007761, 0, 4, { 107.591301f, 114.427399f, -119.840599f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2007773, 6583797, 4, { 137.386398f, 120.578796f, -148.604599f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007774, 6583799, 4, { 91.874512f, 115.007202f, -129.728394f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2007775, 6648314, 4, { 79.667358f, 113.878098f, -201.079605f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2007776, 6648318, 4, { 104.478500f, 109.971703f, -225.310898f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2007785, 6735374, 4, { 202.686295f, 126.422096f, -89.904701f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2007784, 0, 4, { 87.159088f, 115.000000f, -167.944199f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2007784, 0, 4, { 128.283905f, 106.994301f, -255.937302f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6610262, 5, { -108.575996f, 348.171692f, -39.539310f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -115.366699f, 348.201599f, -26.746000f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 127.929398f, 107.364899f, -323.381989f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohrKhai.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SohrKhai.cpp
new file mode 100644
index 00000000..ff928ffe
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SohrKhai.cpp
@@ -0,0 +1,54 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SohrKhai : public InstanceContentScript
+{
+public:
+   SohrKhai() : InstanceContentScript( 44 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6258645, 4, { 400.881195f, -19.484011f, -332.214996f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 400.118713f, -18.543800f, -338.582886f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007078, 6220718, 4, { -400.506195f, 0.390429f, 82.229874f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007079, 6220719, 4, { -400.289886f, 0.381470f, -77.470093f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007189, 0, 4, { -425.070587f, -0.015320f, 5.569519f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2007084, 6241486, 4, { 377.864990f, 0.390429f, 352.375702f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007087, 6242639, 4, { 399.851196f, -58.700001f, -128.611893f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007088, 6242640, 4, { 363.607697f, -38.700001f, -242.258194f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007089, 6242641, 4, { 400.331604f, -18.700001f, -336.562897f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007090, 6229304, 4, { 423.391998f, -40.024479f, -205.523697f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002872, 6258669, 4, { -400.654388f, 9.235634f, -135.696106f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007082, 6258670, 4, { -400.434387f, 8.000000f, -177.220200f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002735, 0, 4, { -400.177612f, 8.431900f, -137.820801f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007083, 6238460, 4, { -401.279297f, 9.299995f, -184.260300f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2002872, 6258680, 4, { 399.753113f, 9.358741f, 161.151505f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 400.071198f, 9.620000f, 156.602402f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007085, 6242340, 4, { 397.968506f, 9.664823f, 157.574600f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007086, 6241485, 4, { 398.938812f, 24.959961f, 85.423576f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007158, 6241490, 4, { 407.500000f, 24.959999f, 89.161400f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007159, 6241491, 4, { 407.500000f, 24.959999f, 99.161400f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007160, 6241492, 4, { 407.500000f, 24.959999f, 109.161400f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007161, 6241493, 4, { 407.500000f, 24.959999f, 119.161400f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007162, 6241489, 4, { 392.500000f, 24.959999f, 89.161400f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007163, 6241488, 4, { 392.500000f, 24.959999f, 99.161400f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007164, 6241487, 4, { 392.500000f, 24.959999f, 109.161400f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007165, 6241484, 4, { 392.500000f, 24.959999f, 119.161400f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6258660, 5, { -406.742615f, -8.000000f, 164.927795f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -393.089386f, -8.000000f, 150.811401f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 399.538910f, -50.000011f, -494.319092f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SolemnTrinity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SolemnTrinity.cpp
new file mode 100644
index 00000000..6a067978
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SolemnTrinity.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SolemnTrinity : public InstanceContentScript
+{
+public:
+   SolemnTrinity() : InstanceContentScript( 10014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventI.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventI.cpp
new file mode 100644
index 00000000..1da20ba0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventI.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SpecialEventI : public InstanceContentScript
+{
+public:
+   SpecialEventI() : InstanceContentScript( 20014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventII.cpp
new file mode 100644
index 00000000..4ddd5e24
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventII.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SpecialEventII : public InstanceContentScript
+{
+public:
+   SpecialEventII() : InstanceContentScript( 20015 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 6430385, 5, { -7.331871f, 0.000000f, 23.153120f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.017054f, 0.000000f, -17.456369f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventIII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventIII.cpp
new file mode 100644
index 00000000..c5f05e52
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventIII.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SpecialEventIII : public InstanceContentScript
+{
+public:
+   SpecialEventIII() : InstanceContentScript( 20016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/StingingBack.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/StingingBack.cpp
new file mode 100644
index 00000000..b0c6ee8a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/StingingBack.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class StingingBack : public InstanceContentScript
+{
+public:
+   StingingBack() : InstanceContentScript( 10006 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SyrcusTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/SyrcusTower.cpp
new file mode 100644
index 00000000..b65488ad
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/SyrcusTower.cpp
@@ -0,0 +1,78 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SyrcusTower : public InstanceContentScript
+{
+public:
+   SyrcusTower() : InstanceContentScript( 30011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002587, 0, 4, { -370.000000f, 500.115387f, -199.956299f }, 0.700000f );
+      instance->registerEObj( "Unknown1", 2002872, 4738783, 4, { -394.730194f, 500.000000f, -199.572800f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -415.668213f, 500.000000f, -200.003296f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004244, 4757482, 4, { -390.384705f, 500.000000f, -194.533203f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004292, 4757483, 4, { -401.338287f, 500.000000f, -196.787003f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004293, 4757484, 4, { -403.504913f, 500.000000f, -196.539597f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004294, 4757485, 4, { -405.170593f, 500.000000f, -202.118393f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2004295, 4757486, 4, { -400.173798f, 500.000000f, -200.892807f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004296, 4757487, 4, { -395.280304f, 500.000000f, -200.854401f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004243, 4757498, 4, { -400.242615f, 500.000000f, -197.116501f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004354, 0, 4, { -397.029785f, 500.000000f, -196.979202f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004355, 0, 4, { -459.071411f, 506.001801f, -196.468506f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004236, 4759659, 4, { -1.397732f, -589.900085f, -194.801498f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004237, 0, 4, { 2.182007f, -589.929077f, -198.077499f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2002587, 0, 4, { -0.015320f, -590.000000f, -152.513794f }, 0.686646f );
+      instance->registerEObj( "Unknown14", 2002872, 4725495, 4, { 0.228821f, -590.000000f, -174.995300f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2002587, 0, 4, { -0.883440f, -4.000000f, -141.001801f }, 0.700000f );
+      instance->registerEObj( "Unknown16", 2002872, 4738653, 4, { -0.991882f, 0.000000f, -196.720993f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2004245, 4711823, 4, { -0.379705f, 0.000000f, -145.342300f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2004246, 4711824, 4, { 0.710614f, 0.000000f, -199.171204f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2004247, 4711825, 4, { 0.439319f, 0.000001f, -201.553802f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2004248, 4711828, 4, { 0.202690f, 0.000000f, -199.270599f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2004250, 4867789, 4, { -0.142451f, -0.000001f, -199.916000f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2004251, 4771487, 4, { 6.207808f, 0.025001f, -197.716293f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2004252, 4771488, 4, { 0.912855f, 0.000000f, -200.229401f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2004253, 4771264, 4, { -0.249095f, 0.000000f, -200.632095f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2004540, 0, 4, { 2.310606f, 0.000000f, -199.315903f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2002587, 0, 4, { 16.500000f, 600.000000f, -175.000000f }, 0.700000f );
+      instance->registerEObj( "Unknown27", 2002872, 4738751, 4, { 6.038667f, 600.000000f, -191.625595f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2004249, 0, 4, { 0.534058f, 600.000000f, -204.089493f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2004372, 0, 4, { 2.491530f, 600.000000f, -197.343201f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2004498, 0, 4, { 7.797371f, 600.000000f, -197.855301f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2002587, 0, 4, { 0.000000f, -700.000000f, 79.955803f }, 0.700000f );
+      instance->registerEObj( "Unknown32", 2002872, 4725557, 4, { -0.328611f, -700.000000f, 53.732899f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2002587, 0, 4, { 29.805300f, -400.000000f, -200.000000f }, 0.700000f );
+      instance->registerEObj( "Unknown34", 2002872, 4725580, 4, { 5.249963f, -400.000000f, -199.878006f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2002587, 0, 4, { 0.000000f, 200.000000f, -229.757797f }, 0.700000f );
+      instance->registerEObj( "Unknown36", 2002872, 4738682, 4, { 0.542766f, 199.899994f, -231.713898f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4723157, 5, { -0.325782f, -897.940918f, 371.584106f }, 1.000000f );
+      instance->registerEObj( "Allaganteleporter", 2004154, 4645409, 4, { -5.014030f, -894.781982f, 324.891296f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2004155, 4645410, 4, { 8.084772f, -708.339111f, 175.045898f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2004158, 4645412, 4, { 7.971835f, -598.362915f, -76.990211f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2004156, 4652344, 4, { 72.370857f, -402.456696f, -206.931000f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2004159, 4645415, 4, { -6.906353f, -2.365848f, -126.353897f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2004157, 4645417, 4, { -6.845924f, 197.827805f, -274.836700f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2004160, 4651219, 4, { 29.220949f, 599.725220f, -140.581406f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2004161, 4636419, 4, { -317.290192f, 500.821808f, -189.288193f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2004164, 4738634, 4, { 0.448093f, -700.000000f, 104.558601f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2004173, 4720323, 4, { 0.019809f, -590.000000f, -150.897903f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2004167, 4711138, 4, { 44.295219f, -403.598602f, -199.389694f }, 0.991760f );
+      instance->registerEObj( "Unknown41", 2004176, 4710992, 4, { 0.045776f, 0.000000f, -180.284607f }, 0.991760f );
+      instance->registerEObj( "Unknown42", 2004170, 4710494, 4, { 0.449279f, 196.100006f, -262.072296f }, 0.991760f );
+      instance->registerEObj( "Unknown43", 2004179, 4742340, 4, { 28.708071f, 598.000183f, -156.658600f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAery.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheAery.cpp
new file mode 100644
index 00000000..a45dd14a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheAery.cpp
@@ -0,0 +1,45 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheAery : public InstanceContentScript
+{
+public:
+   TheAery() : InstanceContentScript( 39 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 5754325, 4, { 346.791687f, 93.919189f, -178.606903f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2005233, 5754326, 4, { 317.558105f, 93.945251f, -180.372498f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 345.215607f, 93.945251f, -178.963303f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002872, 5795105, 4, { 40.665161f, 59.433842f, 65.873169f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2005234, 5795134, 4, { -14.039410f, 61.140190f, 54.695210f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002587, 0, 4, { 39.169510f, 59.433949f, 66.247253f }, 1.300000f );
+      instance->registerEObj( "Unknown6", 2002872, 5762428, 4, { 37.260880f, 148.068100f, -236.237595f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 35.001831f, 148.194504f, -233.032303f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005542, 0, 4, { 36.301151f, 148.393906f, -242.999893f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2006454, 0, 4, { 32.698120f, 148.397095f, -251.838501f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5724494, 5, { 136.459106f, 67.985649f, 171.436401f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 144.406906f, 67.985611f, 177.100906f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 21.307430f, 148.274002f, -283.827087f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2005222, 5685356, 4, { 267.117188f, 64.682983f, 47.219650f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2005223, 5685357, 4, { 358.511414f, 81.162720f, -120.381798f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2005224, 5821951, 4, { 131.793304f, 5.889650f, -103.881500f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2005225, 5821943, 4, { 50.821239f, 55.531479f, 63.561810f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2005438, 5851315, 4, { -77.756859f, 91.481842f, -15.425310f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2005439, 5851342, 4, { 82.891663f, 108.510201f, -49.804409f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005540, 5864523, 4, { 33.827099f, 134.430405f, -194.964005f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAetherochemicalResearchFacility.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheAetherochemicalResearchFacility.cpp
new file mode 100644
index 00000000..079bc5a4
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheAetherochemicalResearchFacility.cpp
@@ -0,0 +1,57 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheAetherochemicalResearchFacility : public InstanceContentScript
+{
+public:
+   TheAetherochemicalResearchFacility() : InstanceContentScript( 38 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -133.497498f, 394.924286f, -295.299713f }, 1.400000f );
+      instance->registerEObj( "Unknown1", 2002872, 5786705, 4, { -140.602203f, 394.529388f, -295.997314f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005310, 5698551, 4, { -81.047653f, 394.430786f, -296.243713f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2006038, 5891863, 4, { -103.765701f, 394.988708f, -312.957214f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2006039, 5891860, 4, { -102.201103f, 394.988708f, -278.118988f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 228.611694f, 225.066895f, 272.124695f }, 1.400000f );
+      instance->registerEObj( "Unknown6", 2002872, 5786711, 4, { 220.192200f, 224.639603f, 271.691895f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002872, 5786715, 4, { 265.170685f, 225.066895f, 271.760712f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 230.175598f, -96.457947f, -160.689804f }, 1.400000f );
+      instance->registerEObj( "Unknown9", 2002872, 5786724, 4, { 231.302200f, -96.512398f, -143.853394f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2006040, 5855034, 4, { 230.235901f, -96.457947f, -181.102600f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 230.936203f, -456.457886f, 65.952606f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 229.505203f, -456.329193f, 99.828033f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002872, 5859273, 4, { 229.632996f, -456.457886f, 93.179420f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007177, 6268147, 4, { 230.075500f, -456.357605f, 58.431438f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007178, 6275911, 4, { 230.467407f, -456.457886f, 79.306190f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007168, 0, 4, { 248.035400f, 225.116302f, 271.869995f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2005295, 5698524, 4, { -232.841797f, 402.044098f, -353.718689f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005296, 5698521, 4, { -177.212006f, 398.044098f, -361.393311f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2005297, 5698523, 4, { -162.152802f, 398.044098f, -369.069885f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2005298, 5698522, 4, { -176.852295f, 398.044098f, -382.745087f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2005299, 5886628, 4, { -168.304993f, 394.044098f, -296.534088f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2005300, 5686456, 4, { 28.763180f, 209.979401f, 211.474701f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2005301, 5686457, 4, { 100.159401f, 220.000000f, 272.267090f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2005293, 5889119, 4, { 28.122299f, 209.979401f, 220.050293f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2005294, 5889137, 4, { 111.924896f, 219.958694f, 271.931000f }, 1.000000f );
+      instance->registerEObj( "Liftterminal", 2005308, 0, 4, { 203.525803f, -28.163019f, 195.849503f }, 0.991760f );
+      instance->registerEObj( "Liftterminal", 2005309, 0, 4, { 229.755005f, -59.269020f, 94.956909f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2005306, 5815811, 4, { -359.609406f, -299.984009f, -249.805496f }, 0.991760f );
+      instance->registerEObj( "Liftterminal", 2005307, 0, 4, { -351.717102f, -299.983887f, -250.003098f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -309.444885f, 400.000000f, -287.942108f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5782651, 5, { -332.999207f, 400.000000f, -297.435211f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAntitower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheAntitower.cpp
new file mode 100644
index 00000000..58b7ec92
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheAntitower.cpp
@@ -0,0 +1,76 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheAntitower : public InstanceContentScript
+{
+public:
+   TheAntitower() : InstanceContentScript( 43 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 252.045807f, -9.475893f, -181.933304f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002872, 6169321, 4, { 255.394501f, -8.467778f, -179.715897f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 6169306, 4, { -367.917297f, 325.000000f, -225.755905f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { -365.057709f, 325.000000f, -230.778107f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2006816, 6169309, 4, { -367.727386f, 325.000000f, -267.544891f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2006858, 0, 4, { -364.583893f, 324.971405f, -250.263199f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2006817, 6169316, 4, { 207.573303f, -22.000000f, 137.064407f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002872, 6169315, 4, { 163.478195f, -21.493710f, 135.478806f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 165.865494f, -22.000000f, 137.572006f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2006767, 6215870, 4, { -319.905396f, 220.000000f, 144.542892f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2006771, 6215871, 4, { -351.689087f, 255.000000f, 14.809160f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006778, 6215872, 4, { -361.023285f, 290.000000f, -120.754402f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006781, 6112286, 4, { 202.549393f, 2.000032f, 188.466202f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006782, 6112287, 4, { 190.864197f, 1.999979f, 180.727493f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006783, 6112293, 4, { 181.429306f, 1.899876f, 187.239197f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006786, 6112290, 4, { 138.231400f, -16.006710f, 145.799896f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2006787, 6112291, 4, { 125.191902f, -16.000000f, 143.181503f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006788, 6112288, 4, { 124.527199f, -16.000000f, 132.912994f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006789, 6112289, 4, { 137.132797f, -16.006710f, 128.862396f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2006790, 6168912, 4, { 143.049393f, -16.000000f, 136.666702f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2006994, 6220274, 4, { 156.748901f, -3.960001f, 175.039703f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2006995, 6220275, 4, { 151.476196f, -3.952148f, 182.940308f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2006996, 6220281, 4, { 154.570801f, -3.951959f, 179.952393f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2006997, 6220282, 4, { 132.225601f, -15.960000f, 142.602600f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007012, 6107601, 4, { 215.289795f, -22.099991f, 137.138306f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2006791, 6215456, 4, { 141.712997f, 22.840740f, -75.213570f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2006792, 6215659, 4, { 143.769394f, 22.262880f, -82.780273f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2006793, 6215458, 4, { 176.529694f, 12.734810f, -76.608017f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2006794, 6215660, 4, { 175.971298f, 13.065370f, -83.629440f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2006795, 6140680, 4, { 262.401794f, -0.700000f, -74.295052f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2006796, 6140674, 4, { 262.532196f, -0.700000f, -86.662819f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2006797, 6123756, 4, { 262.633514f, -0.700000f, -79.584007f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2006798, 0, 4, { 291.762695f, -2.200014f, -76.847649f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2006799, 0, 4, { 298.066406f, -2.151550f, -76.649200f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2006800, 0, 4, { 298.579895f, -2.037392f, -84.721710f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2006801, 6215463, 4, { 298.707794f, -2.062215f, -111.243301f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2006802, 6215464, 4, { 291.473785f, -2.200000f, -111.318298f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2006803, 6215465, 4, { 298.705597f, -2.065336f, -116.301102f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2006804, 6215466, 4, { 291.648193f, -2.200000f, -116.725502f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2006805, 6215467, 4, { 303.031708f, -0.700000f, -133.974594f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2006806, 6215468, 4, { 286.195709f, -0.700000f, -132.797195f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2006807, 6215469, 4, { 303.791687f, -0.717224f, -138.384094f }, 0.991760f );
+      instance->registerEObj( "Unknown42", 2006808, 6215470, 4, { 286.152313f, -0.717224f, -136.736099f }, 0.991760f );
+      instance->registerEObj( "Unknown43", 2006809, 6215471, 4, { 303.913788f, -0.717224f, -142.473495f }, 0.991760f );
+      instance->registerEObj( "Unknown44", 2006810, 6215472, 4, { 286.518585f, -0.717224f, -140.550903f }, 0.991760f );
+      instance->registerEObj( "Unknown45", 2006811, 6140683, 4, { 300.845215f, -0.700000f, -149.810699f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2006812, 6140685, 4, { 289.275787f, -0.700000f, -149.729401f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2006813, 6123759, 4, { 294.959503f, -0.700000f, -149.563904f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6168791, 5, { -303.646912f, 230.000000f, 280.401703f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -293.381012f, 230.000000f, 269.617188f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 216.878998f, -9.458686f, -181.220200f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAquapolis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheAquapolis.cpp
new file mode 100644
index 00000000..235b55b6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheAquapolis.cpp
@@ -0,0 +1,119 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheAquapolis : public InstanceContentScript
+{
+public:
+   TheAquapolis() : InstanceContentScript( 55001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Treasurecoffer", 2007190, 0, 4, { 0.001130f, 0.200000f, 340.004486f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2007191, 0, 4, { 0.002947f, -7.800000f, 215.005096f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2007192, 0, 4, { 0.002900f, -15.800000f, 90.001167f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2007193, 0, 4, { -0.000139f, -23.819401f, -34.999279f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2007194, 0, 4, { 0.001485f, -31.815121f, -160.003693f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2007195, 0, 4, { 0.004197f, -39.810791f, -284.993011f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2007196, 0, 4, { 0.000420f, -47.806580f, -409.995514f }, 0.991760f );
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -0.122746f, 0.000000f, 361.538513f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6288992, 4, { 0.686486f, 0.049996f, 362.050415f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007203, 6287388, 4, { -18.243860f, 0.099997f, 321.842285f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007204, 6287665, 4, { 18.988001f, 0.099997f, 321.533508f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007287, 6288229, 4, { -25.275770f, 0.000000f, 340.210388f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007288, 6288231, 4, { 0.185137f, 0.000000f, 312.600098f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007289, 6288233, 4, { 25.078310f, 0.000000f, 339.623596f }, 1.000000f );
+      instance->registerEObj( "Vaultkey", 2007282, 0, 4, { 0.829522f, 0.220668f, 337.850708f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007316, 6288699, 4, { -18.478701f, -5.661133f, 279.285889f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2007317, 6286455, 4, { 15.609920f, -6.088379f, 277.302094f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2007328, 6383033, 4, { -16.922300f, 0.076233f, 321.705902f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2007329, 6383032, 4, { 18.844851f, 0.076233f, 322.468903f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2007343, 6289147, 4, { 3.738403f, 0.198364f, 339.833588f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002735, 0, 4, { -0.120655f, -7.700002f, 236.767395f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002872, 6289205, 4, { -0.442505f, -7.827942f, 237.140396f }, 0.991760f );
+      instance->registerEObj( "Vaultdoor", 2007205, 6288210, 4, { -18.722839f, -7.827942f, 196.063095f }, 0.991760f );
+      instance->registerEObj( "Vaultdoor", 2007206, 6288211, 4, { 18.844851f, -7.827942f, 196.185196f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2007290, 6288342, 4, { -25.317570f, -7.980009f, 215.039398f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007291, 6288340, 4, { 0.322333f, -7.980009f, 189.283798f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007292, 6288337, 4, { 24.222750f, -7.980009f, 215.066498f }, 1.000000f );
+      instance->registerEObj( "Vaultkey", 2007311, 0, 4, { -3.870050f, -7.800000f, 213.458496f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007318, 6288701, 4, { -16.983280f, -13.870480f, 153.185303f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2007319, 6286451, 4, { 16.678040f, -13.962040f, 152.574997f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2007330, 6383034, 4, { -17.685249f, -7.797425f, 197.619507f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2007331, 6383035, 4, { 18.509090f, -7.827942f, 197.497406f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2007344, 6289152, 4, { -1.286773f, -7.800001f, 215.448593f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2002872, 6289228, 4, { -0.142505f, -15.800000f, 112.190002f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2002735, 0, 4, { 0.053155f, -15.700000f, 111.576698f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007207, 6288213, 4, { -18.719660f, -15.805200f, 71.150551f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007208, 6288215, 4, { 18.666090f, -15.800000f, 71.347427f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007293, 6288400, 4, { -25.407360f, -15.950010f, 89.850311f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007294, 6288402, 4, { 0.914349f, -15.950010f, 64.629997f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007295, 6288404, 4, { 24.828060f, -15.950010f, 89.997643f }, 1.000000f );
+      instance->registerEObj( "Vaultkey", 2007312, 0, 4, { 0.302402f, -15.800000f, 94.839752f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007320, 6288702, 4, { -17.441099f, -21.797001f, 28.519039f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2007321, 6286453, 4, { 16.342409f, -21.896730f, 28.458010f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2007332, 6383037, 4, { -16.861271f, -15.915160f, 70.694946f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2007333, 6383036, 4, { 18.326050f, -15.915160f, 72.465088f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2007345, 6289153, 4, { 4.112751f, -15.800000f, 94.003380f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2002872, 6289248, 4, { -0.327447f, -23.797190f, -12.626270f }, 0.991760f );
+      instance->registerEObj( "Unknown31", 2002735, 0, 4, { -0.005597f, -23.697189f, -13.437240f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007209, 6288216, 4, { -18.686550f, -23.797190f, -53.735790f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007210, 6288218, 4, { 18.561710f, -23.797190f, -53.381920f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2007296, 6288442, 4, { -24.187929f, -23.863649f, -34.945591f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007297, 6288444, 4, { 0.165738f, -23.873119f, -62.594398f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2007298, 6288446, 4, { 25.276409f, -23.913509f, -35.549301f }, 1.000000f );
+      instance->registerEObj( "Vaultkey", 2007313, 0, 4, { -2.565299f, -23.799999f, -37.906879f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2007322, 6288703, 4, { -16.708679f, -29.892460f, -96.391296f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2007323, 6288689, 4, { 15.640440f, -30.075560f, -97.917236f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2007334, 6383039, 4, { -17.044371f, -23.910950f, -54.093319f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2007335, 6383038, 4, { 18.326050f, -23.910950f, -52.323238f }, 0.991760f );
+      instance->registerEObj( "Unknown39", 2007346, 6289154, 4, { 1.893377f, -23.785940f, -36.201401f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2002872, 6289271, 4, { -0.402360f, -31.785391f, -137.661194f }, 0.991760f );
+      instance->registerEObj( "Unknown41", 2002735, 0, 4, { 0.026965f, -31.685390f, -138.459503f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007211, 6288221, 4, { -18.820810f, -31.785391f, -179.046600f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007212, 6288219, 4, { 18.590670f, -31.785391f, -178.683807f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2007299, 6288471, 4, { -25.063971f, -31.928049f, -159.375900f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2007300, 6288469, 4, { -0.225626f, -31.950010f, -184.941803f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2007301, 6288473, 4, { 24.164009f, -31.929609f, -159.852798f }, 1.000000f );
+      instance->registerEObj( "Vaultkey", 2007314, 0, 4, { -1.933799f, -31.799999f, -161.905502f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2007324, 6288704, 4, { -15.976260f, -38.010250f, -222.247696f }, 0.991760f );
+      instance->registerEObj( "Unknown46", 2007325, 6288690, 4, { 15.274170f, -38.071289f, -222.339203f }, 0.991760f );
+      instance->registerEObj( "Unknown47", 2007336, 6383042, 4, { -17.596230f, -31.900000f, -178.846298f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2007337, 6383041, 4, { 18.875370f, -31.906679f, -177.538803f }, 0.991760f );
+      instance->registerEObj( "Unknown49", 2007347, 6289155, 4, { 1.494756f, -31.797430f, -156.976593f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2002872, 6289287, 4, { -0.102360f, -39.780590f, -262.818298f }, 0.991760f );
+      instance->registerEObj( "Unknown51", 2002735, 0, 4, { -0.061376f, -39.680592f, -263.631805f }, 1.000000f );
+      instance->registerEObj( "Vaultdoor", 2007213, 6288224, 4, { -18.631350f, -39.810791f, -303.547699f }, 0.991760f );
+      instance->registerEObj( "Vaultdoor", 2007214, 6288223, 4, { 18.847080f, -39.780579f, -304.087585f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2007302, 6288508, 4, { -24.544001f, -39.909939f, -284.787201f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2007303, 6288524, 4, { -0.272618f, -39.928360f, -310.519714f }, 1.000000f );
+      instance->registerEObj( "Unknown54", 2007304, 6288522, 4, { 24.354900f, -39.900742f, -285.109314f }, 1.000000f );
+      instance->registerEObj( "Vaultkey", 2007315, 0, 4, { -2.969681f, -39.799999f, -286.637512f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2007326, 6288705, 4, { -15.793150f, -45.975460f, -346.730804f }, 0.991760f );
+      instance->registerEObj( "Unknown56", 2007327, 6288694, 4, { 16.555969f, -46.005981f, -347.859894f }, 0.991760f );
+      instance->registerEObj( "Unknown57", 2007338, 6383044, 4, { -17.091330f, -39.875000f, -302.618896f }, 1.000000f );
+      instance->registerEObj( "Unknown58", 2007339, 6383045, 4, { 17.074829f, -39.902340f, -303.334198f }, 0.991760f );
+      instance->registerEObj( "Unknown59", 2007348, 6289156, 4, { 1.662274f, -39.779591f, -284.155792f }, 1.000000f );
+      instance->registerEObj( "Unknown60", 2002872, 6289300, 4, { 0.019862f, -47.800430f, -387.795288f }, 0.991760f );
+      instance->registerEObj( "Unknown61", 2002735, 0, 4, { 0.060846f, -47.799999f, -388.568115f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -47.887440f, -427.461304f }, 0.991760f );
+      instance->registerEObj( "Unknown62", 2007305, 6288552, 4, { -24.623159f, -47.927639f, -409.027313f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2007306, 6288548, 4, { -0.124747f, -47.950401f, -433.348785f }, 1.000000f );
+      instance->registerEObj( "Unknown64", 2007307, 6288550, 4, { 23.612570f, -47.899090f, -409.669586f }, 1.000000f );
+      instance->registerEObj( "Unknown65", 2007349, 6395686, 4, { 2.822051f, -47.754410f, -409.509888f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6289067, 5, { 1.346699f, 0.199998f, 429.462097f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.438223f, -0.100000f, 415.292694f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAurumVale.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheAurumVale.cpp
new file mode 100644
index 00000000..bf4b9dae
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheAurumVale.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheAurumVale : public InstanceContentScript
+{
+public:
+   TheAurumVale() : InstanceContentScript( 5 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4246303, 5, { 158.558304f, -0.023911f, 81.249123f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -410.069702f, -33.063400f, -116.395897f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 151.384796f, -1.596331f, 86.655884f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2000272, 3643401, 4, { -44.571659f, -16.218571f, -112.108101f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2000779, 4259184, 4, { 58.213131f, -9.300029f, -0.564636f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2000780, 4259186, 4, { 58.539280f, -8.801913f, 4.282087f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000785, 4259185, 4, { 34.952770f, -9.096572f, -23.527361f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000273, 4248891, 4, { -333.089203f, -32.733212f, -161.730392f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2000781, 4259189, 4, { -127.598099f, -30.310749f, -139.019302f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000782, 4259188, 4, { -126.660500f, -30.285540f, -134.096695f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000786, 4259190, 4, { -169.906296f, -27.704550f, -169.152496f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000783, 4246452, 4, { -374.789612f, -32.153561f, -140.808197f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000784, 4246451, 4, { -372.679901f, -32.341091f, -136.354401f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBattleonBekko.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBattleonBekko.cpp
new file mode 100644
index 00000000..5b133331
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBattleonBekko.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBattleonBekko : public InstanceContentScript
+{
+public:
+   TheBattleonBekko() : InstanceContentScript( 5012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008480, 6894787, 4, { 564.783630f, -60.304729f, -136.444901f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004541, 0, 4, { 800.087585f, 0.000000f, 44.317749f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn1.cpp
new file mode 100644
index 00000000..f13b7b22
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn1.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn1 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn1() : InstanceContentScript( 30002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000620, 4293369, 4, { -1.810616f, 13.164380f, 57.682442f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000619, 4293368, 4, { -3.276026f, 13.164380f, 57.488449f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000680, 0, 4, { 0.000000f, 5.245687f, 4.314113f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000620, 4293633, 4, { 8.673634f, 4.398203f, -361.720886f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000619, 4293632, 4, { 7.539745f, 4.948945f, -366.654388f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2001137, 0, 4, { -8.048342f, 1.700000f, -412.088593f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001696, 0, 4, { -23.791620f, 1.300000f, -414.239990f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -45.330261f, 25.136589f, 134.093399f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000486, 4374535, 4, { -5.435945f, 12.209330f, 0.953091f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2000746, 4312523, 4, { 57.321320f, 2.000001f, -254.168396f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000746, 4312527, 4, { 36.303661f, 2.815034f, -341.235992f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2001154, 4083745, 4, { -38.633110f, 0.899952f, -414.162201f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2001167, 4329693, 4, { -50.832001f, 59.871399f, -332.417511f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002712, 4374479, 4, { 52.174641f, 2.740428f, -248.752899f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2002712, 4374482, 4, { 44.598309f, 1.549361f, -340.584991f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2001152, 4374713, 4, { -4.591531f, 4.500000f, -379.052795f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2001152, 4374714, 4, { -47.199150f, 4.900000f, -430.581299f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2001152, 4374715, 4, { -12.391370f, -0.160584f, -378.187805f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2001152, 4374749, 4, { -12.091370f, -0.160584f, -376.087799f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2000681, 4312291, 4, { 0.534759f, 4.500000f, -374.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2000681, 4312292, 4, { -7.437989f, 0.900002f, -387.547607f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2000681, 4312293, 4, { -23.117430f, 0.472961f, -387.472412f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2000681, 4312297, 4, { -46.428509f, 0.500000f, -400.448212f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2000681, 4312296, 4, { -30.738091f, 0.099998f, -400.874908f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2000681, 4312295, 4, { -14.994600f, -0.299999f, -400.505615f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2000681, 4312294, 4, { 0.589670f, -0.700001f, -400.720093f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2000681, 4312298, 4, { -7.442382f, 1.700001f, -414.361389f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2000681, 4312299, 4, { -22.934330f, 1.296936f, -414.053589f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2000681, 4312300, 4, { -38.631561f, 0.900004f, -414.153595f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2000681, 4312303, 4, { -49.847839f, 4.899996f, -429.440002f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2000681, 4312302, 4, { -30.867050f, 2.500000f, -428.009308f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2000681, 4312301, 4, { -15.123560f, 2.100006f, -427.852295f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2000627, 4293311, 4, { -57.085258f, 25.136589f, 146.983200f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn2.cpp
new file mode 100644
index 00000000..7c820224
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn2.cpp
@@ -0,0 +1,54 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn2 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn2() : InstanceContentScript( 30003 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000668, 4307413, 4, { -16.838060f, -60.912392f, 116.477898f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000669, 4307414, 4, { -16.655029f, -61.041161f, 117.352303f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000670, 4306762, 4, { -65.538063f, -38.998699f, 90.104332f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000671, 4306763, 4, { -66.396652f, -38.998539f, 88.058296f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000680, 0, 4, { -48.355518f, -38.578499f, 86.879211f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2000672, 4293655, 4, { -51.865479f, -18.020941f, 35.080441f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2000673, 4293656, 4, { -50.583679f, -18.020941f, 35.538212f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2000674, 4331576, 4, { 0.736900f, 0.033629f, 31.115801f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000675, 4331583, 4, { 1.580210f, 0.032013f, 29.906660f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2000676, 4306493, 4, { 52.177799f, -21.010019f, 34.437031f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000677, 4306494, 4, { 51.183399f, -21.011810f, 34.504452f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000679, 4306772, 4, { 60.934231f, -41.989620f, 101.246002f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000678, 4306771, 4, { 59.622169f, -41.994068f, 98.767616f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000621, 4307578, 4, { 0.106751f, -65.934273f, 82.291870f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2000622, 4307579, 4, { -0.320496f, -65.934273f, 82.322388f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2000640, 4092173, 4, { -14.019790f, -0.010602f, 31.855391f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2000641, 4092174, 4, { 15.101930f, -0.029503f, 31.798840f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2000638, 4092177, 4, { -58.677170f, -18.016920f, 47.536171f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2000639, 4092181, 4, { -27.060640f, -18.102751f, 58.292858f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2000642, 4092183, 4, { 58.277191f, -20.996519f, 62.605671f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2000643, 4092178, 4, { 30.274019f, -20.952881f, 58.602650f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2000644, 4092182, 4, { 29.367611f, -41.975361f, 110.864998f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2000635, 4092184, 4, { 0.539888f, -62.460609f, 100.908897f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2000636, 4092179, 4, { -55.941719f, -38.998539f, 78.436340f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2000637, 4092180, 4, { -51.528130f, -38.998749f, 109.805901f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2000645, 4092175, 4, { 0.474554f, -65.943604f, 68.078178f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2001161, 4107517, 4, { -0.118857f, -102.612297f, 0.534058f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2001152, 4107515, 4, { 2.090964f, 0.000001f, 22.575050f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2000628, 4293644, 4, { 0.852533f, 0.148087f, 20.254930f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn3.cpp
new file mode 100644
index 00000000..f44ac704
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn3.cpp
@@ -0,0 +1,72 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn3 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn3() : InstanceContentScript( 30004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2001046, 4204647, 4, { -38.434280f, 0.755630f, 27.186541f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2001047, 4204649, 4, { -22.930870f, -38.074230f, 51.622608f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2001048, 4204652, 4, { 17.410521f, -36.911560f, 65.506958f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2001049, 4204654, 4, { 43.230721f, -36.854370f, 41.278610f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001050, 4204661, 4, { 41.756340f, -37.405720f, 11.258040f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001051, 4204644, 4, { 18.406361f, -75.101082f, 30.246229f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001052, 4204665, 4, { -30.734369f, -111.808601f, 16.055771f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001053, 4204660, 4, { 28.263350f, -74.681847f, -39.544411f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001054, 4204664, 4, { -8.499553f, -113.039597f, -34.010311f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001055, 4204662, 4, { -15.483490f, -112.471001f, -20.925671f }, 1.000000f );
+      instance->registerEObj( "Silentterminal", 2001132, 4322464, 4, { -6.976719f, -112.013496f, 23.202400f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -16.955231f, -0.864158f, 0.593589f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2001152, 4238687, 4, { -1.707294f, 0.000000f, 3.048101f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2001056, 4204669, 4, { -14.240080f, -150.417404f, 1.736771f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2001057, 4204678, 4, { -29.648090f, -188.419907f, -3.748357f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2001058, 4204672, 4, { -12.738200f, -187.302002f, 51.141499f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2001059, 4204697, 4, { 0.332115f, -225.076202f, 50.155842f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2001060, 4204703, 4, { 52.345329f, -224.740707f, 37.453941f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2001061, 4204709, 4, { 46.480949f, -262.093811f, 5.845346f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2001062, 4204723, 4, { 28.585011f, -299.527008f, 19.833670f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2001063, 4204712, 4, { -15.037280f, -262.281311f, 51.584450f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2001064, 4204725, 4, { -15.719740f, -300.085785f, -22.829020f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2001065, 4204720, 4, { -0.428782f, -300.866394f, 22.938450f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2001066, 4204671, 4, { 9.075709f, -150.864899f, -17.327230f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2001067, 4204680, 4, { -25.603180f, -188.390701f, -25.489799f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2001068, 4204687, 4, { 28.229540f, -188.408707f, -2.975939f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2001069, 4204684, 4, { 37.952412f, -187.292603f, -39.644798f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2001070, 4204707, 4, { -5.330157f, -225.534607f, -50.912369f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2001071, 4204688, 4, { 23.554840f, -223.922607f, -46.970329f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2001072, 4204689, 4, { -44.635330f, -225.534607f, -27.836760f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2001073, 4204715, 4, { -24.786400f, -262.708405f, -39.642220f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2001074, 4204716, 4, { -0.141846f, -262.624695f, -63.058170f }, 1.000000f );
+      instance->registerEObj( "Silentterminal", 2001140, 4328681, 4, { -8.207968f, -300.679108f, -11.383970f }, 0.991760f );
+      instance->registerEObj( "Unknown30", 2001075, 4204730, 4, { -27.307819f, -347.278900f, 23.850750f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2001076, 4204722, 4, { -32.117531f, -347.483307f, -18.936440f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2001077, 4204728, 4, { -0.090805f, -348.068695f, -13.361250f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2001078, 4204719, 4, { 27.568150f, -347.808289f, 23.699249f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2001106, 4204738, 4, { -64.801163f, -383.539886f, -16.602329f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2001107, 4204740, 4, { -34.187149f, -383.967804f, -51.634480f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2001108, 4204732, 4, { 58.207191f, -383.523010f, -18.762280f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2001109, 4204735, 4, { 27.461531f, -384.122589f, 40.984268f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2001110, 4204746, 4, { 22.577141f, -422.501587f, 53.173019f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2001111, 4204744, 4, { -46.433231f, -422.842804f, 34.744751f }, 0.991760f );
+      instance->registerEObj( "Unknown40", 2001112, 4204747, 4, { 17.206091f, -423.418488f, -16.318670f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2001162, 4317929, 4, { -15.875440f, -423.430511f, 18.778770f }, 1.000000f );
+      instance->registerEObj( "Silentterminal", 2002600, 4334493, 4, { -24.909149f, -423.472595f, 41.999378f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2000629, 4294859, 4, { -0.075790f, 0.000000f, 0.310051f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn4.cpp
new file mode 100644
index 00000000..a8740602
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn4.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn4 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn4() : InstanceContentScript( 30005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Silentterminal", 2000633, 4974723, 4, { -16.904461f, 1.700597f, 17.125530f }, 1.000000f );
+      instance->registerEObj( "Silentterminal", 2000634, 4974724, 4, { 17.103741f, 1.662121f, 16.896111f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2001153, 4254608, 4, { 7.917505f, 0.058137f, -7.647632f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2001153, 4254609, 4, { 8.217505f, 0.058137f, -6.747632f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2001153, 4254607, 4, { 8.517506f, 0.000000f, -5.847631f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001153, 4254606, 4, { 8.817506f, 0.000000f, -4.947631f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001155, 4974722, 4, { -16.599979f, 0.058137f, -16.803070f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001155, 4974721, 4, { 16.776859f, 0.058137f, -16.643490f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001764, 3961628, 4, { -0.983059f, 0.058134f, 3.319265f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001764, 4974712, 4, { -2.906071f, 0.058134f, 2.796373f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001764, 3962580, 4, { -4.811448f, 0.000001f, 9.066607f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2001764, 4330325, 4, { 2.346304f, 0.058136f, 5.385328f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2001764, 4330326, 4, { 4.663461f, 0.058136f, 4.726402f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000630, 4294847, 4, { -12.531030f, 0.000001f, 12.592170f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000615, 4374568, 4, { -15.534740f, 0.058137f, -15.601170f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn5.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn5.cpp
new file mode 100644
index 00000000..4f72c6c7
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn5.cpp
@@ -0,0 +1,34 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn5 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn5() : InstanceContentScript( 30006 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000623, 4328290, 4, { -7.770457f, 54.493511f, -29.083250f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000666, 4323972, 4, { -3.001781f, 50.022308f, -7.576328f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000682, 0, 4, { -0.531223f, 50.025429f, 6.100062f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001151, 0, 4, { 11.681320f, 50.085152f, -0.915123f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001150, 0, 4, { 14.631230f, 50.087898f, 1.687731f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001168, 0, 4, { 17.845060f, 50.181900f, -0.676077f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002664, 0, 4, { -7.768790f, 50.005032f, -4.092178f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2001163, 4328464, 4, { 51.910549f, 48.460838f, 72.757553f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000631, 4294944, 4, { -26.751080f, 100.099998f, -128.204498f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBorderlandRuinsSecure.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBorderlandRuinsSecure.cpp
new file mode 100644
index 00000000..a4e19042
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBorderlandRuinsSecure.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBorderlandRuinsSecure : public InstanceContentScript
+{
+public:
+   TheBorderlandRuinsSecure() : InstanceContentScript( 50001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2005084, 5573690, 4, { -0.015320f, -15.426880f, -162.924103f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2005085, 5573691, 4, { 19.010229f, -15.416970f, -200.015396f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005086, 5573692, 4, { -18.994471f, -15.426880f, -199.992905f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2004187, 4724282, 4, { -0.007111f, 12.000000f, -386.299896f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004188, 4724284, 4, { 335.025513f, 12.000000f, 193.711899f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004189, 4724283, 4, { -334.556213f, 12.000000f, 193.274796f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f }, 1.000000f );
+      instance->registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbers.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbers.cpp
new file mode 100644
index 00000000..28e2d6b6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbers.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBowlofEmbers : public InstanceContentScript
+{
+public:
+   TheBowlofEmbers() : InstanceContentScript( 20001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersExtreme.cpp
new file mode 100644
index 00000000..e88ecc6a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersExtreme.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBowlofEmbersExtreme : public InstanceContentScript
+{
+public:
+   TheBowlofEmbersExtreme() : InstanceContentScript( 20008 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersHard.cpp
new file mode 100644
index 00000000..f7023444
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersHard.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBowlofEmbersHard : public InstanceContentScript
+{
+public:
+   TheBowlofEmbersHard() : InstanceContentScript( 20004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheCarteneauFlatsHeliodrome.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheCarteneauFlatsHeliodrome.cpp
new file mode 100644
index 00000000..17302925
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheCarteneauFlatsHeliodrome.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheCarteneauFlatsHeliodrome : public InstanceContentScript
+{
+public:
+   TheCarteneauFlatsHeliodrome() : InstanceContentScript( 5004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2005084, 5573690, 4, { -0.015320f, -15.426880f, -162.924103f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2005085, 5573691, 4, { 19.010229f, -15.416970f, -200.015396f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005086, 5573692, 4, { -18.994471f, -15.426880f, -199.992905f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2004187, 4724282, 4, { -0.007111f, 12.000000f, -386.299896f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004188, 4724284, 4, { 335.025513f, 12.000000f, 193.711899f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004189, 4724283, 4, { -334.556213f, 12.000000f, 193.274796f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f }, 1.000000f );
+      instance->registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheChrysalis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheChrysalis.cpp
new file mode 100644
index 00000000..37dc3012
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheChrysalis.cpp
@@ -0,0 +1,44 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheChrysalis : public InstanceContentScript
+{
+public:
+   TheChrysalis() : InstanceContentScript( 20029 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005209, 5689928, 4, { -0.866003f, 0.000000f, -29.632271f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5649517, 5, { -0.064617f, 0.000000f, 21.704861f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -22.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005160, 5652375, 4, { -1.683807f, -0.002888f, -0.074251f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2005158, 0, 4, { 220.000000f, -0.045776f, 0.000000f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2005159, 0, 4, { 229.899994f, -0.013268f, 9.900000f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2004550, 0, 4, { 0.068370f, -0.002887f, -0.230858f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005161, 5652362, 4, { 219.837494f, -0.000000f, -20.737341f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005198, 5675943, 4, { 234.366592f, -0.000818f, -14.481080f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005199, 5675944, 4, { 238.872803f, -0.002887f, -0.791933f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005200, 5675945, 4, { 233.135101f, -0.002692f, 13.732260f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2005201, 5675946, 4, { 220.264893f, -0.002887f, 18.895180f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2005202, 5675947, 4, { 206.385605f, -0.002087f, 13.131840f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2005203, 5675948, 4, { 201.101196f, -0.002887f, -0.591635f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2005204, 5675951, 4, { 206.584305f, -0.002887f, -14.412730f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2005205, 5675952, 4, { 227.781204f, -0.002888f, -8.587747f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2005206, 5675953, 4, { 227.676605f, -0.002889f, 8.141966f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2005207, 5675954, 4, { 211.709396f, -0.002890f, 7.657639f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005208, 5675955, 4, { 211.825500f, -0.001177f, -9.651319f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDragonsNeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheDragonsNeck.cpp
new file mode 100644
index 00000000..d858083c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheDragonsNeck.cpp
@@ -0,0 +1,75 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheDragonsNeck : public InstanceContentScript
+{
+public:
+   TheDragonsNeck() : InstanceContentScript( 20026 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f );
+      instance->registerEObj( "Unknown0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f );
+      instance->registerEObj( "Thalsscepter", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f );
+      instance->registerEObj( "Thalsscepter", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f );
+      instance->registerEObj( "Thalsscepter", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f );
+      instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f );
+      instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f );
+      instance->registerEObj( "Shadowyorb", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f );
+      instance->registerEObj( "Shadowyorb", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f );
+      instance->registerEObj( "Shadowyorb", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f );
+      instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDrownedCityofSkalla.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheDrownedCityofSkalla.cpp
new file mode 100644
index 00000000..96f784a5
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheDrownedCityofSkalla.cpp
@@ -0,0 +1,54 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheDrownedCityofSkalla : public InstanceContentScript
+{
+public:
+   TheDrownedCityofSkalla() : InstanceContentScript( 58 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 7068116, 4, { 459.000000f, -14.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 459.000000f, -14.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 491.000000f, -14.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 7068596, 4, { -245.000000f, -2.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002872, 7068599, 4, { -194.500000f, -2.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7072874, 4, { -220.044601f, -2.000000f, 3.151932f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2009045, 0, 4, { -224.806396f, -2.000000f, 8.647594f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -245.000000f, -2.000000f, 4.000000f }, 1.400000f );
+      instance->registerEObj( "Unknown7", 2002872, 7068491, 4, { 95.000000f, 9.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 95.000000f, 9.000000f, 4.000000f }, 1.400000f );
+      instance->registerEObj( "Unknown9", 2002872, 7068496, 4, { 135.000000f, 9.000000f, 4.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2009046, 0, 4, { 111.907600f, 9.000000f, 4.017264f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7075163, 4, { -335.663391f, 1.815782f, -38.379379f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 7075164, 4, { -324.520203f, 1.008244f, -28.697809f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 7032771, 4, { -380.099701f, 5.500000f, -16.441790f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 7075174, 4, { -298.365204f, 1.706293f, -25.538429f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 7075175, 4, { -290.733002f, 1.250000f, -27.983721f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 7065309, 4, { -273.437195f, 1.281705f, 3.216716f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 7132450, 4, { -322.497589f, 1.008244f, -34.442020f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 7132455, 4, { -293.498108f, 1.972912f, -19.170090f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007457, 7132456, 4, { -287.911407f, 1.972912f, -26.723471f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007457, 7034067, 4, { -67.254761f, 3.500000f, -34.435638f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007457, 7065310, 4, { 68.873291f, 7.500000f, 3.740700f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007457, 0, 4, { 133.644806f, 9.000000f, 3.453697f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007457, 7029084, 4, { 272.652802f, -12.000000f, 48.014309f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007457, 7032009, 4, { 276.325592f, -12.008910f, -34.378601f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2007457, 7034222, 4, { 433.853088f, -15.937500f, 3.644273f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 7042417, 5, { -488.282501f, -3.750000f, 2.201033f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -457.918304f, -3.860892f, 14.784940f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDuskVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheDuskVigil.cpp
new file mode 100644
index 00000000..9b2be4e1
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheDuskVigil.cpp
@@ -0,0 +1,62 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheDuskVigil : public InstanceContentScript
+{
+public:
+   TheDuskVigil() : InstanceContentScript( 36 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 5658893, 4, { -0.378468f, -0.000006f, 19.173130f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -0.473083f, -0.015320f, 21.194759f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2005189, 5658883, 4, { 0.051215f, 0.000000f, -19.347589f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 191.935699f, -8.000000f, -97.548279f }, 1.143130f );
+      instance->registerEObj( "Unknown4", 2002872, 5670058, 4, { 191.873398f, -8.000000f, -94.706589f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2005190, 5670071, 4, { 192.629501f, -8.000000f, -145.825104f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005319, 0, 4, { 191.294998f, -8.000000f, -126.640503f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { -69.815361f, 32.171459f, -368.314209f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2002872, 5670105, 4, { -69.864067f, 32.000050f, -370.484314f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005395, 0, 4, { -72.186203f, 32.000000f, -389.922302f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -119.582703f, -47.846481f, 223.251007f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -69.846916f, 32.000000f, -403.795990f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5653670, 5, { -135.662598f, -48.859058f, 229.988297f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2005169, 5674328, 4, { -66.894547f, -5.577260f, 129.660202f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2005170, 5674333, 4, { -28.173691f, -5.988469f, 165.738907f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2005171, 5674334, 4, { 32.157242f, -8.242720f, 98.301018f }, 0.991760f );
+      instance->registerEObj( "Coldsteellever", 2005172, 0, 4, { 9.864166f, -0.650611f, 48.260380f }, 0.991760f );
+      instance->registerEObj( "Damagedwinch", 2005173, 5660757, 4, { -3.958177f, 1.907400f, 32.349579f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2005174, 5584415, 4, { -0.076084f, -0.115606f, 34.058880f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006185, 5912762, 4, { -131.761703f, -48.569462f, 225.451996f }, 0.991760f );
+      instance->registerEObj( "Tornjournalpage", 2005180, 0, 4, { 66.788696f, -3.996225f, -52.994629f }, 0.991760f );
+      instance->registerEObj( "Tornjournalpage", 2005181, 0, 4, { 96.351990f, -8.050000f, -30.383080f }, 1.000000f );
+      instance->registerEObj( "Tornjournalpage", 2005182, 0, 4, { 151.468704f, -7.345456f, -48.435421f }, 1.000000f );
+      instance->registerEObj( "Tornjournalpage", 2005183, 0, 4, { 170.853394f, -7.671008f, -20.209290f }, 1.000000f );
+      instance->registerEObj( "Tornjournalpage", 2005184, 0, 4, { 208.382401f, -8.050000f, -58.810051f }, 0.991760f );
+      instance->registerEObj( "Barracksdoor", 2005177, 5584421, 4, { 158.730606f, -8.011047f, -24.266649f }, 0.991760f );
+      instance->registerEObj( "Lordcommandersseat", 2005178, 5584424, 4, { 192.164307f, -8.050052f, -70.690117f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2005179, 5584425, 4, { 191.948196f, -8.000000f, -159.505096f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005185, 5584476, 4, { 96.173714f, 24.000000f, -222.821701f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2005186, 5584485, 4, { 21.875490f, 28.000000f, -217.942505f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2005187, 5584486, 4, { -35.156700f, 32.000000f, -286.161285f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2005320, 5800343, 4, { 179.680298f, 16.000111f, -261.236206f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2005321, 5800818, 4, { 127.707603f, 20.323111f, -262.321411f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2005322, 5800840, 4, { 5.201134f, 28.557409f, -289.850006f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2005323, 5800842, 4, { -21.532181f, 32.000061f, -289.092407f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2005353, 5584312, 4, { -73.144119f, 32.000000f, -405.536011f }, 1.000000f );
+      instance->registerEObj( "Chapeldoor", 2005357, 5584428, 4, { -69.550163f, 31.950060f, -291.505493f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFaceofTrueEvil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFaceofTrueEvil.cpp
new file mode 100644
index 00000000..e2f52dd8
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFaceofTrueEvil.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFaceofTrueEvil : public InstanceContentScript
+{
+public:
+   TheFaceofTrueEvil() : InstanceContentScript( 5010 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4LightParty.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4LightParty.cpp
new file mode 100644
index 00000000..1ddd9c59
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4LightParty.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeast4on4LightParty : public InstanceContentScript
+{
+public:
+   TheFeast4on4LightParty() : InstanceContentScript( 40012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Ranked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Ranked.cpp
new file mode 100644
index 00000000..3382f538
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Ranked.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeast4on4Ranked : public InstanceContentScript
+{
+public:
+   TheFeast4on4Ranked() : InstanceContentScript( 40018 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Training.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Training.cpp
new file mode 100644
index 00000000..752a9c57
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Training.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeast4on4Training : public InstanceContentScript
+{
+public:
+   TheFeast4on4Training() : InstanceContentScript( 40016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchCrystalTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchCrystalTower.cpp
new file mode 100644
index 00000000..94d4a5a9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchCrystalTower.cpp
@@ -0,0 +1,31 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeastCustomMatchCrystalTower : public InstanceContentScript
+{
+public:
+   TheFeastCustomMatchCrystalTower() : InstanceContentScript( 40025 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchFeastingGrounds.cpp
new file mode 100644
index 00000000..f0d24c0c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchFeastingGrounds.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeastCustomMatchFeastingGrounds : public InstanceContentScript
+{
+public:
+   TheFeastCustomMatchFeastingGrounds() : InstanceContentScript( 40014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchLichenweed.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchLichenweed.cpp
new file mode 100644
index 00000000..f9f11cea
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchLichenweed.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeastCustomMatchLichenweed : public InstanceContentScript
+{
+public:
+   TheFeastCustomMatchLichenweed() : InstanceContentScript( 40021 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastRanked.cpp
new file mode 100644
index 00000000..ea3a2663
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastRanked.cpp
@@ -0,0 +1,31 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeastRanked : public InstanceContentScript
+{
+public:
+   TheFeastRanked() : InstanceContentScript( 40023 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTeamRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTeamRanked.cpp
new file mode 100644
index 00000000..2a3173c9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTeamRanked.cpp
@@ -0,0 +1,31 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeastTeamRanked : public InstanceContentScript
+{
+public:
+   TheFeastTeamRanked() : InstanceContentScript( 40022 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTraining.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTraining.cpp
new file mode 100644
index 00000000..7f0f9749
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTraining.cpp
@@ -0,0 +1,31 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFeastTraining : public InstanceContentScript
+{
+public:
+   TheFeastTraining() : InstanceContentScript( 40024 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFieldsofGloryShatter.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFieldsofGloryShatter.cpp
new file mode 100644
index 00000000..4d9abd9b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFieldsofGloryShatter.cpp
@@ -0,0 +1,50 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFieldsofGloryShatter : public InstanceContentScript
+{
+public:
+   TheFieldsofGloryShatter() : InstanceContentScript( 50005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007022, 6245702, 4, { -263.444885f, 52.175270f, -209.921402f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007023, 6245745, 4, { -91.249367f, 27.082781f, 248.251297f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007024, 6245744, 4, { 262.704590f, 7.555402f, -83.636391f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2007038, 6246503, 4, { -33.290001f, 8.500000f, -64.930000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007039, 6246502, 4, { -29.181200f, 4.895900f, -181.130005f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007040, 6246500, 4, { 49.409801f, 1.000000f, 95.446404f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007041, 6246488, 4, { -139.203201f, 2.000000f, 42.698399f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007042, 6246517, 4, { 10.250100f, 7.501600f, -73.703102f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007126, 6260293, 4, { -21.009300f, 6.445800f, -124.468399f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007044, 6246516, 4, { -57.941700f, 7.532000f, -89.861702f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007043, 6246515, 4, { -28.053699f, 7.586800f, -20.808001f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007124, 6260291, 4, { -81.065201f, 8.327300f, -23.711300f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007122, 6260289, 4, { 17.876400f, 7.001300f, 11.047300f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007053, 6246513, 4, { -126.529999f, 35.526501f, -132.360001f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007125, 6260292, 4, { -224.454102f, 30.212000f, -33.290001f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007052, 6246514, 4, { -148.077499f, 48.772800f, -3.141700f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007051, 6246505, 4, { -195.641693f, 37.440800f, 80.677399f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007123, 6260290, 4, { -107.700996f, 10.249100f, 150.690598f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007050, 6246507, 4, { -8.180000f, 31.300200f, 107.550003f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007049, 6246508, 4, { 75.684898f, 35.111000f, 149.223801f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007048, 6246509, 4, { 174.059998f, 30.587099f, 122.660004f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007047, 6246510, 4, { 175.149307f, 0.118000f, 8.585100f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007046, 6246511, 4, { 121.235901f, 29.898701f, -190.225006f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007121, 6260294, 4, { 29.201799f, 37.825001f, -217.776505f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007045, 6246512, 4, { -43.203499f, 42.615501f, -229.343597f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn1.cpp
new file mode 100644
index 00000000..09c7233a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn1.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalCoilofBahamutTurn1 : public InstanceContentScript
+{
+public:
+   TheFinalCoilofBahamutTurn1() : InstanceContentScript( 30016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004612, 0, 4, { -0.116493f, -0.000001f, -293.875214f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004613, 0, 4, { -5.014206f, -0.000001f, -285.730896f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4894214, 5, { 0.172209f, 1.707170f, 221.425903f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -6.029538f, -0.000005f, 188.016205f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003679, 4868598, 4, { -0.125790f, 0.523954f, 167.023605f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004605, 4852714, 4, { -0.194780f, -0.000003f, 177.104095f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2003849, 4881763, 4, { 0.031929f, -19.494820f, 141.135101f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2003905, 4868599, 4, { -0.095059f, -7.275987f, 79.729607f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004605, 4879813, 4, { -10.904620f, -18.183340f, 116.685303f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004605, 4879797, 4, { 11.416480f, -18.931650f, 116.685303f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004605, 4879805, 4, { 11.416480f, -19.000000f, 103.064003f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004605, 4879822, 4, { -11.312880f, -19.000000f, 103.064003f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004116, 4881762, 4, { 0.171127f, -19.487169f, 30.039690f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004117, 4868600, 4, { 0.009460f, -29.465590f, 10.045650f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004605, 4879838, 4, { 0.047739f, -29.000000f, 19.918270f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2004605, 4879850, 4, { 0.018590f, -29.000000f, 19.923750f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2004118, 4881761, 4, { 0.003261f, -4.463747f, -152.984604f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2004119, 4868601, 4, { 0.003693f, -4.463205f, -166.994400f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2002735, 0, 4, { 0.007116f, -5.000001f, -171.749207f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2002872, 4895024, 4, { -0.005186f, -4.890112f, -171.362305f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2004305, 4841650, 4, { 0.086417f, 0.090680f, -300.234711f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2004141, 4841682, 4, { 0.003672f, 1.083544f, -337.998596f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2004137, 4895069, 4, { 3.638081f, 0.152056f, -331.675415f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn2.cpp
new file mode 100644
index 00000000..9220669d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn2.cpp
@@ -0,0 +1,57 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalCoilofBahamutTurn2 : public InstanceContentScript
+{
+public:
+   TheFinalCoilofBahamutTurn2() : InstanceContentScript( 30017 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004618, 0, 4, { 8.377602f, -4.963000f, 2.130980f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004622, 5004388, 4, { 0.000000f, -4.963000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004138, 4985190, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -8.983331f, -89.405617f, 340.705505f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4895376, 5, { -2.304138f, -95.841980f, 373.883514f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2004138, 4772070, 4, { -3.471196f, -85.362328f, 329.862915f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2004138, 0, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2004138, 4772073, 4, { 82.671562f, 89.558182f, 312.686188f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004138, 4772071, 4, { -87.694283f, 61.779518f, 322.880798f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004138, 4772074, 4, { 68.781647f, 74.135750f, 257.001312f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004138, 4772072, 4, { -71.265640f, 50.681782f, 262.029907f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004138, 0, 4, { 3.045514f, -50.605240f, 198.785202f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004131, 4772088, 4, { -0.320496f, -61.905880f, 240.100693f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2004131, 4772089, 4, { -0.150618f, -58.926769f, 229.063507f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004130, 4903493, 4, { 0.167786f, -56.382141f, 216.998505f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2004138, 4772084, 4, { 5.588670f, -50.254120f, 198.785202f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2004138, 4985729, 4, { -1.068177f, -50.250832f, 198.785202f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2004138, 4772077, 4, { 93.772713f, 2.760812f, 164.237198f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2004138, 4772078, 4, { 62.832458f, 2.703932f, 109.635002f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2004138, 4772079, 4, { -101.804497f, -15.054380f, 174.336105f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2004138, 4772080, 4, { -68.094177f, -9.272421f, 114.627701f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2004131, 4772085, 4, { -33.952530f, 1.069616f, 57.437080f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2004131, 4772087, 4, { 34.497631f, 1.062853f, 57.576210f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2004130, 4903494, 4, { -18.231251f, 0.578985f, 63.141258f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2004130, 4903495, 4, { 18.776350f, 0.578991f, 63.349949f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2004138, 4772081, 4, { 0.088281f, 0.909978f, 67.335487f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2004138, 4772082, 4, { -66.984283f, 1.029588f, -0.043371f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2004138, 4772083, 4, { 67.627632f, 1.029588f, -0.043371f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2002735, 0, 4, { 0.046454f, 0.339829f, 55.289249f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2002872, 4896001, 4, { -0.021759f, 0.578989f, 57.955990f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2004142, 4797408, 4, { 0.001913f, -4.224863f, -30.000130f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2004137, 4895798, 4, { -0.366558f, -4.738363f, -24.911970f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn3.cpp
new file mode 100644
index 00000000..ae870bbb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn3.cpp
@@ -0,0 +1,31 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalCoilofBahamutTurn3 : public InstanceContentScript
+{
+public:
+   TheFinalCoilofBahamutTurn3() : InstanceContentScript( 30018 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004611, 0, 4, { -7.491028f, -53.235149f, -153.215500f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004610, 0, 4, { 22.322800f, -53.235241f, -154.775101f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004627, 5009741, 4, { 0.000000f, -53.682961f, -160.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004638, 0, 4, { -14.415940f, -53.682961f, -162.090302f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4895872, 5, { 0.005331f, -53.234989f, -140.846207f }, 1.000000f );
+      instance->registerEObj( "Entrypoint", 2004650, 0, 4, { -0.019161f, -53.626511f, -182.364700f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn4.cpp
new file mode 100644
index 00000000..74683dcf
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn4.cpp
@@ -0,0 +1,32 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalCoilofBahamutTurn4 : public InstanceContentScript
+{
+public:
+   TheFinalCoilofBahamutTurn4() : InstanceContentScript( 30019 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2004578, 0, 4, { 452.681213f, 0.000000f, 6.016883f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004579, 0, 4, { 450.366699f, -0.000000f, 5.948895f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004580, 0, 4, { 443.205688f, 0.000000f, 4.024448f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4895882, 5, { 450.000000f, 0.000000f, 21.250090f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004785, 5039563, 4, { 450.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004649, 5018241, 4, { 448.419403f, 0.000000f, 4.765350f }, 1.000000f );
+      instance->registerEObj( "Exit", 2004651, 0, 4, { 450.000000f, 0.000000f, 29.273590f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalStepsofFaith.cpp
new file mode 100644
index 00000000..ce785d73
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalStepsofFaith.cpp
@@ -0,0 +1,30 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalStepsofFaith : public InstanceContentScript
+{
+public:
+   TheFinalStepsofFaith() : InstanceContentScript( 20039 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuum.cpp
new file mode 100644
index 00000000..3fd78eaa
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuum.cpp
@@ -0,0 +1,88 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFractalContinuum : public InstanceContentScript
+{
+public:
+   TheFractalContinuum() : InstanceContentScript( 35 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 5777077, 4, { 140.603302f, 2.700000f, 34.720928f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005259, 5777078, 4, { 106.765198f, 2.700000f, 53.335590f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 138.876297f, 2.700000f, 35.495899f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002872, 5777135, 4, { -185.039200f, -0.000010f, 97.665123f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2005260, 5777136, 4, { -143.174301f, -0.000001f, 86.487961f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -179.727097f, -0.015191f, 96.334610f }, 0.790818f );
+      instance->registerEObj( "Biomassincubator", 2005480, 5627459, 4, { -143.238602f, 2.285363f, 101.305000f }, 1.000000f );
+      instance->registerEObj( "Biomassincubator", 2005481, 5632316, 4, { -150.372604f, 2.650113f, 73.551849f }, 1.000000f );
+      instance->registerEObj( "Biomassincubator", 2005482, 5627460, 4, { -170.712601f, 2.379743f, 108.801201f }, 1.000000f );
+      instance->registerEObj( "Biomassincubator", 2005483, 5632317, 4, { -178.309097f, 2.550030f, 81.099091f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005476, 5852048, 4, { -143.988998f, 0.000000f, 100.704399f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005477, 5852047, 4, { -150.881500f, 0.000000f, 74.554863f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005478, 5852050, 4, { -170.231705f, 0.000000f, 108.158203f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005479, 5852049, 4, { -177.203705f, 0.000000f, 81.434868f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002735, 0, 4, { -0.027993f, 46.596539f, -329.937805f }, 1.701462f );
+      instance->registerEObj( "Unknown11", 2002872, 5777412, 4, { -0.735815f, 46.585819f, -331.464386f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 4.587201f, 0.167401f, 228.424301f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.198364f, 46.585819f, -364.727509f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5615534, 5, { 1.419067f, -0.015320f, 234.058105f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2005242, 5722042, 4, { 36.979809f, 1.210160f, 215.020599f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2005251, 5754030, 4, { 0.697166f, -0.000000f, 210.678497f }, 1.000000f );
+      instance->registerEObj( "Guidepanel", 2005252, 0, 4, { 189.739594f, 2.452829f, 125.865196f }, 0.991760f );
+      instance->registerEObj( "Guidepanel", 2005253, 0, 4, { 225.485703f, 3.355857f, 61.434238f }, 1.000000f );
+      instance->registerEObj( "Guidepanel", 2005254, 0, 4, { 158.995697f, 4.255857f, 31.260679f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2005246, 5607049, 4, { 230.547394f, 0.900000f, 95.770508f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2005247, 5607052, 4, { 228.780106f, 1.800000f, 59.805061f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2005248, 5607058, 4, { 184.888702f, 1.800000f, 26.321140f }, 1.000000f );
+      instance->registerEObj( "Allaganteleporter", 2005243, 5722173, 4, { 65.541313f, 3.869573f, 77.942459f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2005261, 5722056, 4, { 1.617853f, 1.549526f, 178.122406f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2005257, 5581056, 4, { 130.087601f, 2.694753f, 39.807980f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2005425, 5829636, 4, { 124.304901f, 2.666066f, 55.191471f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2005250, 5810989, 4, { 2.160641f, 0.030060f, 207.184006f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2005249, 5614162, 4, { -211.984406f, 0.000000f, 104.404701f }, 1.000000f );
+      instance->registerEObj( "Allaganteleporter", 2005244, 5722174, 4, { -103.539803f, 1.217043f, 76.015160f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2005358, 5763607, 4, { -352.642700f, 1.499993f, 119.149300f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2005359, 5763630, 4, { -351.399994f, 1.480042f, 110.398903f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2005360, 5763608, 4, { -349.473907f, 1.499977f, 99.800461f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2005364, 5650881, 4, { -352.015686f, 1.499995f, 116.202499f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2005365, 5650883, 4, { -350.711609f, 1.499995f, 107.232002f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2005366, 5819525, 4, { -348.442902f, 1.499981f, 98.183548f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2005361, 5814450, 4, { -288.068115f, -2.700021f, 113.654198f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2005362, 5814433, 4, { -272.828888f, -2.700021f, 111.659203f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2005363, 5814516, 4, { -268.089691f, -2.700021f, 117.225700f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2005367, 5819526, 4, { -286.325989f, -2.700022f, 113.195000f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2005368, 5650635, 4, { -271.312897f, -2.700021f, 112.812401f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2005369, 5819527, 4, { -266.722595f, -2.700022f, 118.620300f }, 1.000000f );
+      instance->registerEObj( "Informationpanel", 2005255, 0, 4, { -230.635101f, 1.639121f, 176.464996f }, 1.000000f );
+      instance->registerEObj( "Informationpanel", 2005256, 0, 4, { -348.181610f, 1.613136f, 135.909897f }, 0.991760f );
+      instance->registerEObj( "Informationpanel", 2005674, 0, 4, { -345.653900f, 1.626497f, 98.636726f }, 0.991760f );
+      instance->registerEObj( "Informationpanel", 2005675, 0, 4, { -324.880798f, 1.642515f, 68.081039f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2005268, 5652510, 4, { -51.865479f, 53.147091f, -208.636703f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2005269, 5652511, 4, { 54.518261f, 53.147091f, -208.602707f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2005270, 5643840, 4, { -149.095901f, 53.147091f, -378.377991f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2005271, 5652506, 4, { -96.421806f, 53.147091f, -467.216003f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2005272, 5652515, 4, { 149.401093f, 53.147091f, -378.561096f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2005273, 5652509, 4, { 98.842590f, 53.164989f, -466.923706f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2005318, 0, 4, { -8.227161f, 53.165001f, -195.021896f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2005329, 5670473, 4, { 130.894806f, 53.165001f, -422.856415f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2005330, 5670424, 4, { 3.461859f, 53.165001f, -200.625595f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2005331, 5670459, 4, { -131.889603f, 53.165001f, -421.513885f }, 1.000000f );
+      instance->registerEObj( "Emeraldcontrolunit", 2005262, 5819696, 4, { 127.567200f, 55.922291f, -423.497711f }, 0.991760f );
+      instance->registerEObj( "Violetcontrolunit", 2005263, 5819695, 4, { -0.232653f, 56.361301f, -203.010300f }, 0.991760f );
+      instance->registerEObj( "Crimsoncontrolunit", 2005264, 5819698, 4, { -126.342796f, 55.969429f, -423.260895f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuumHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuumHard.cpp
new file mode 100644
index 00000000..351e08f3
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuumHard.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFractalContinuumHard : public InstanceContentScript
+{
+public:
+   TheFractalContinuumHard() : InstanceContentScript( 60 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -0.015320f, 46.585819f, -330.098389f }, 1.693726f );
+      instance->registerEObj( "Unknown1", 2002872, 7178420, 4, { 0.000000f, 46.597000f, -330.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7154681, 4, { -336.809601f, -4.091716f, 270.330200f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7154670, 4, { -356.951599f, -4.091716f, 262.314697f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7154683, 4, { -357.732788f, -4.091716f, 240.942001f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 7178527, 4, { -322.993408f, -14.000000f, 237.739197f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -323.681213f, -13.915580f, 238.152405f }, 0.520000f );
+      instance->registerEObj( "Unknown7", 2002872, 7178530, 4, { -363.058411f, -14.000000f, 250.964600f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2009284, 0, 4, { -334.828705f, -13.901060f, 251.636505f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2009285, 0, 4, { -348.204712f, -13.892940f, 243.150803f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2009286, 0, 4, { -341.067108f, -13.892940f, 237.005600f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002872, 7178955, 4, { -0.015300f, -0.015300f, 318.593109f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2002735, 0, 4, { -0.015320f, -0.015320f, 318.593109f }, 1.388489f );
+      instance->registerEObj( "Entrance", 2000182, 7170984, 5, { -168.370193f, 53.116581f, -447.149506f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -165.940704f, 53.142620f, -435.801300f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, 285.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 7141324, 4, { -0.193053f, 53.508301f, -157.354904f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2007457, 7174264, 4, { 57.117458f, 53.142620f, -213.119202f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 7170395, 4, { -0.015320f, 46.597000f, -350.082092f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2009278, 0, 4, { 0.002865f, 46.599701f, -377.001007f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2007457, 7141398, 4, { -147.123795f, 53.529110f, -369.004913f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2007457, 7141397, 4, { -82.715157f, 42.516201f, -199.536606f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2007457, 7141396, 4, { 57.117241f, 53.527908f, -213.116699f }, 0.991760f );
+      instance->registerEObj( "Tornnavigatorslogpage", 2009412, 0, 4, { -132.524704f, 53.177608f, -407.217499f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2007457, 7141895, 4, { -305.774811f, -0.751164f, 94.720772f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007457, 7167075, 4, { -291.432098f, -0.015320f, 191.088593f }, 0.991760f );
+      instance->registerEObj( "Tornnavigatorslogpage", 2009413, 0, 4, { -202.481003f, 0.052476f, 171.440704f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007457, 7170446, 4, { 78.733200f, 20.000000f, 245.622299f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2007457, 7170445, 4, { 29.878000f, 12.000000f, 404.197998f }, 1.000000f );
+      instance->registerEObj( "Securityterminal", 2009276, 7188820, 4, { 67.426903f, 12.000000f, 331.441711f }, 1.000000f );
+      instance->registerEObj( "Securityterminal", 2009277, 7188819, 4, { 0.000000f, 12.000000f, 370.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007457, 7336140, 4, { 69.068199f, 12.000000f, 332.207001f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007457, 7336141, 4, { 0.000000f, 12.000000f, 371.396515f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibrary.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibrary.cpp
new file mode 100644
index 00000000..fc0e357c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibrary.cpp
@@ -0,0 +1,56 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheGreatGubalLibrary : public InstanceContentScript
+{
+public:
+   TheGreatGubalLibrary() : InstanceContentScript( 31 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 353.541412f, -39.250000f, -59.553089f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 5419624, 4, { 350.673187f, -39.000000f, -60.588070f }, 1.000000f );
+      instance->registerEObj( "OnGarleanHierarchyVolume1", 2005891, 0, 4, { -199.611694f, 6.900000f, -56.354649f }, 1.000000f );
+      instance->registerEObj( "OnGarleanHierarchyVolume2", 2005892, 0, 4, { -72.116417f, 0.900000f, -9.577726f }, 1.000000f );
+      instance->registerEObj( "Essences&Permutations", 2005893, 0, 4, { 54.309052f, -8.099999f, 62.262531f }, 1.000000f );
+      instance->registerEObj( "OvertheHorizon", 2005894, 0, 4, { 113.656601f, -8.153534f, 83.276863f }, 1.000000f );
+      instance->registerEObj( "Leatherbounddiary", 2005895, 0, 4, { 253.342499f, -24.000000f, -16.578369f }, 1.000000f );
+      instance->registerEObj( "Leatherbounddiary", 2005896, 0, 4, { 252.532898f, -40.000000f, -78.517921f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 5419606, 4, { -22.327221f, 0.000000f, -0.318492f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2005019, 5419607, 4, { 22.309731f, 0.000000f, -0.124082f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { -20.486000f, 0.000000f, 0.109200f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2005316, 5774736, 4, { -11.221270f, 0.000000f, -6.534676f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005328, 5815254, 4, { -10.516900f, 0.000000f, -1.875240f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002872, 5419612, 4, { 178.337997f, -8.000000f, 53.739559f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005020, 5419614, 4, { 179.630203f, -8.000000f, 0.354116f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002735, 0, 4, { 177.873505f, -8.000000f, 52.121300f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2005354, 5852274, 4, { 177.539993f, -7.995000f, 32.977421f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004942, 5033535, 4, { -316.612915f, -0.015320f, 0.045776f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2004949, 5033537, 4, { -173.408096f, 12.000000f, -33.362572f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2004956, 5033536, 4, { -48.355900f, -0.015320f, 0.747620f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2004957, 5033538, 4, { 43.900150f, -0.015320f, -1.083435f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2004958, 5004619, 4, { 82.139282f, -8.011047f, 69.748901f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2004959, 5004620, 4, { 117.387604f, -9.018127f, 69.291138f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2004960, 5336977, 4, { 138.888000f, -9.018127f, 87.533859f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2004962, 5033543, 4, { 156.328598f, -9.018127f, 95.628304f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2004963, 5004621, 4, { 176.257004f, -8.011047f, -9.414856f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2004964, 5773506, 4, { 297.779785f, -24.002501f, -43.308731f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2004965, 5004586, 4, { 325.666107f, -39.017399f, -59.098209f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5330520, 5, { -387.057098f, -0.015320f, 4.592957f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -381.085205f, -0.015320f, 6.094601f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 393.697998f, -39.047909f, -59.586491f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibraryHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibraryHard.cpp
new file mode 100644
index 00000000..eaf2f854
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibraryHard.cpp
@@ -0,0 +1,69 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheGreatGubalLibraryHard : public InstanceContentScript
+{
+public:
+   TheGreatGubalLibraryHard() : InstanceContentScript( 47 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6493754, 4, { 337.666901f, -0.015320f, -154.009293f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 337.666901f, -0.015320f, -154.009293f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 381.624786f, 0.033357f, -154.061295f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007511, 6493828, 4, { 387.818298f, 0.057078f, -146.448898f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007513, 6401215, 4, { 361.552795f, 0.056058f, -150.124802f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007512, 0, 4, { 375.502197f, 0.033357f, -161.256607f }, 1.000000f );
+      instance->registerEObj( "TheBoyandtheDragonGay", 2007490, 0, 4, { -171.036804f, 11.988180f, -36.461899f }, 0.991760f );
+      instance->registerEObj( "OfLovesUnrequited", 2007491, 0, 4, { -59.891842f, 0.931515f, 7.942907f }, 0.991760f );
+      instance->registerEObj( "OvertheHorizonRedux", 2007492, 0, 4, { 61.203861f, -8.102600f, 81.803589f }, 0.991760f );
+      instance->registerEObj( "OntheCulinaryApplicationsofCoblyns", 2007493, 0, 4, { 148.354507f, -20.004641f, 27.979099f }, 0.991760f );
+      instance->registerEObj( "ProceedingsoftheCouncilofMagi", 2007494, 0, 4, { 91.658020f, -14.648220f, -87.438591f }, 0.991760f );
+      instance->registerEObj( "TheBoyandtheDragonGayALiteraryAnalysis", 2007495, 0, 4, { 261.494995f, -2.524073f, -175.726593f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002872, 6331565, 4, { -22.327221f, 0.000000f, -0.318492f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -20.486000f, 0.000000f, 0.109200f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007475, 6331566, 4, { 23.113720f, 0.000000f, -0.647191f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002872, 6331601, 4, { 178.337997f, -8.000000f, -0.391663f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002735, 0, 4, { 177.825394f, -8.000000f, 2.100500f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007479, 6331602, 4, { 178.545807f, -8.011047f, 54.734009f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2007510, 6402810, 4, { 172.105392f, -7.900000f, 35.499100f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007509, 6545426, 4, { 177.732605f, -7.900000f, 35.055210f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007546, 0, 4, { 177.791000f, -7.900000f, 27.118000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007473, 6399834, 4, { -172.812195f, 12.000000f, -33.611160f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007474, 6399835, 4, { -49.912289f, -0.015320f, 0.167786f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2007478, 6400099, 4, { 162.976501f, -20.000000f, -2.988169f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007477, 6399813, 4, { 76.753242f, -8.000000f, 70.675980f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007476, 6399648, 4, { 80.002747f, -4.000000f, -0.293232f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007486, 6403597, 4, { 182.834000f, -7.950000f, -154.079605f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007480, 6400740, 4, { 167.797897f, -7.950000f, -161.345093f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007481, 6400741, 4, { 166.957901f, -7.949998f, -145.330505f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007482, 6400744, 4, { 168.266495f, -7.950000f, -153.578705f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007483, 6400763, 4, { 171.314407f, -7.950000f, -162.037598f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007484, 6400774, 4, { 171.048599f, -7.950000f, -145.992599f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007485, 6400779, 4, { 171.229401f, -7.950000f, -153.966995f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007487, 6401038, 4, { 249.953903f, -3.950001f, -153.130600f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007488, 6400896, 4, { 278.625397f, -3.950001f, -153.498093f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007489, 6485974, 4, { 378.746613f, 0.033356f, -154.978699f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007552, 6573181, 4, { 365.530090f, 0.056058f, -151.957199f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2007553, 6573293, 4, { 163.576996f, -7.950000f, -161.503799f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2007554, 6573290, 4, { 167.881699f, -7.950000f, -147.169601f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2007555, 6573294, 4, { 163.131195f, -7.950000f, -146.200302f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007558, 6573550, 4, { 138.722900f, -7.950000f, -161.914902f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2007559, 6573551, 4, { 138.516602f, -7.950000f, -145.595200f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6331751, 5, { -387.057098f, -0.015320f, 4.592957f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -381.085205f, -0.015320f, 6.094601f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHauntedManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheHauntedManor.cpp
new file mode 100644
index 00000000..b038b8a0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheHauntedManor.cpp
@@ -0,0 +1,41 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheHauntedManor : public InstanceContentScript
+{
+public:
+   TheHauntedManor() : InstanceContentScript( 25001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Pumpkinchest", 2007385, 0, 4, { 72.176666f, -0.000001f, 8.325592f }, 1.000000f );
+      instance->registerEObj( "Crypticnote", 2007394, 0, 4, { 77.017143f, 0.000000f, 7.811212f }, 1.000000f );
+      instance->registerEObj( "Curiousswitch", 2007406, 0, 4, { 75.432663f, 0.000000f, 9.083635f }, 1.000000f );
+      instance->registerEObj( "Goldbasket", 2007407, 0, 4, { 67.265839f, -0.000000f, 8.740001f }, 1.000000f );
+      instance->registerEObj( "Silverbasket", 2007408, 0, 4, { 69.001480f, 0.000000f, 7.453632f }, 1.000000f );
+      instance->registerEObj( "Bronzebasket", 2007409, 0, 4, { 65.439072f, 0.000000f, 7.248850f }, 1.000000f );
+      instance->registerEObj( "Jackolantern", 2007410, 0, 4, { 61.411270f, 0.000000f, 12.014820f }, 1.000000f );
+      instance->registerEObj( "Smolderingcoal", 2007411, 0, 4, { 58.469200f, -0.000000f, 11.999350f }, 1.000000f );
+      instance->registerEObj( "Truesightsmokebomb", 2007412, 0, 4, { 55.969971f, 0.000000f, 12.118080f }, 1.000000f );
+      instance->registerEObj( "Pumpkincoffer", 2007413, 0, 4, { 53.116581f, -0.015320f, 12.344480f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 15.229340f, -18.678320f, -0.619758f }, 1.000000f );
+      instance->registerEObj( "Obfuscationcharm", 2007414, 0, 4, { 54.995380f, 0.000000f, 9.411625f }, 1.000000f );
+      instance->registerEObj( "Jackinthebox", 2007547, 0, 4, { 69.704788f, 0.000000f, 10.012170f }, 1.000000f );
+      instance->registerEObj( "Suspiciouspumpkin", 2007548, 0, 4, { 67.828171f, 0.000000f, 10.094330f }, 1.000000f );
+      instance->registerEObj( "Suspiciouschest", 2007562, 0, 4, { 3.501173f, -18.779980f, -0.195926f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6381325, 5, { 73.499107f, -0.000000f, 4.652901f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHeartoftheProblem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheHeartoftheProblem.cpp
new file mode 100644
index 00000000..6bafcd4a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheHeartoftheProblem.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheHeartoftheProblem : public InstanceContentScript
+{
+public:
+   TheHeartoftheProblem() : InstanceContentScript( 5015 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f );
+      instance->registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f );
+      instance->registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHiddenCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheHiddenCanalsofUznair.cpp
new file mode 100644
index 00000000..9dfca234
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheHiddenCanalsofUznair.cpp
@@ -0,0 +1,140 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheHiddenCanalsofUznair : public InstanceContentScript
+{
+public:
+   TheHiddenCanalsofUznair() : InstanceContentScript( 55003 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Sluicegate", 2008671, 6880327, 4, { 0.568258f, 100.300003f, 274.168488f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008672, 6880319, 4, { 0.269765f, 50.299999f, 154.680405f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2007457, 6879916, 4, { -1.092401f, 100.300003f, 275.638214f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6879843, 4, { -1.524224f, 50.299999f, 155.176193f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008673, 6880331, 4, { 0.313768f, 0.272164f, 33.151051f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008674, 6880926, 4, { -0.058978f, -49.700001f, -85.039810f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008675, 6880353, 4, { -0.094499f, -99.699997f, -204.539307f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008676, 6880364, 4, { -0.132713f, -149.699997f, -325.173187f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6878453, 4, { -0.983721f, 0.299997f, 33.876339f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6878661, 4, { -1.446076f, -49.700001f, -85.301064f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6878563, 4, { -1.907748f, -99.699997f, -205.542297f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6874398, 4, { 0.861505f, -149.699997f, -323.648102f }, 1.000000f );
+      instance->registerEObj( "High", 2008960, 7005817, 4, { 0.995313f, 100.400002f, 303.008911f }, 1.000000f );
+      instance->registerEObj( "Low", 2008961, 7005818, 4, { 2.977269f, 100.400002f, 303.015686f }, 1.000000f );
+      instance->registerEObj( "High", 2008962, 7005819, 4, { 1.004384f, 50.369999f, 183.038193f }, 0.991760f );
+      instance->registerEObj( "Low", 2008963, 7005820, 4, { 3.018387f, 50.400009f, 183.009003f }, 1.000000f );
+      instance->registerEObj( "High", 2008964, 7005821, 4, { 1.013391f, 0.381469f, 63.020931f }, 0.991760f );
+      instance->registerEObj( "Low", 2008965, 7005822, 4, { 3.000382f, 0.400042f, 63.011879f }, 1.000000f );
+      instance->registerEObj( "High", 2008966, 7005823, 4, { 0.999980f, -49.628479f, -56.984692f }, 0.991760f );
+      instance->registerEObj( "Low", 2008967, 7005824, 4, { 2.994332f, -49.599289f, -56.969849f }, 1.000000f );
+      instance->registerEObj( "High", 2008968, 7005825, 4, { 0.976013f, -99.617447f, -176.984695f }, 0.991760f );
+      instance->registerEObj( "Low", 2008969, 7005826, 4, { 3.016492f, -99.599678f, -176.996704f }, 1.000000f );
+      instance->registerEObj( "High", 2008970, 7005827, 4, { 1.002942f, -149.605804f, -296.980713f }, 0.991760f );
+      instance->registerEObj( "Low", 2008971, 7005828, 4, { 3.024055f, -149.599503f, -297.002808f }, 1.000000f );
+      instance->registerEObj( "High", 2008972, 7005829, 4, { 1.005902f, -199.603302f, -416.980988f }, 0.991760f );
+      instance->registerEObj( "Low", 2008973, 7005830, 4, { 3.005575f, -199.600403f, -416.998596f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6996412, 4, { -4.068258f, 100.300003f, 294.718903f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6996413, 4, { 3.038667f, 100.300003f, 294.803009f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6996415, 4, { -4.038448f, 50.400009f, 176.206604f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6996416, 4, { 3.159257f, 50.400009f, 176.996399f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6996417, 4, { -5.237320f, 0.309626f, 53.443291f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6996418, 4, { 1.048808f, 0.300000f, 53.069832f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6996420, 4, { -4.622195f, -49.700001f, -65.730782f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6996419, 4, { 3.246223f, -49.700001f, -66.129990f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6996421, 4, { -4.211632f, -99.699997f, -185.489395f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6996422, 4, { 3.121258f, -99.697990f, -185.125397f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 6996424, 4, { -3.555968f, -149.663605f, -304.656311f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 6996423, 4, { 2.999705f, -149.599503f, -304.547394f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6996425, 4, { -3.452516f, -199.699997f, -425.304108f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007457, 6996426, 4, { 3.398586f, -199.699997f, -425.457886f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6904134, 5, { 2.648753f, 150.300003f, 421.065491f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 4.024228f, 150.300003f, 411.372498f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2002735, 0, 4, { 0.000000f, 100.300003f, 317.628296f }, 1.200000f );
+      instance->registerEObj( "Unknown22", 2002872, 6904820, 4, { 0.778198f, 99.992310f, 319.020294f }, 0.991760f );
+      instance->registerEObj( "Sluicegate", 2008593, 6880322, 4, { -17.906931f, 99.999687f, 282.242706f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008594, 6880329, 4, { 18.638870f, 99.999748f, 281.840912f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2008566, 0, 4, { 0.000000f, 100.400002f, 300.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007457, 6837839, 4, { -24.428419f, 99.999702f, 299.505890f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007457, 6837819, 4, { 3.431039f, 99.999771f, 274.684387f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007457, 6837820, 4, { 24.678801f, 99.999672f, 300.109589f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007457, 6837843, 4, { 1.030507f, 100.399696f, 298.205200f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007457, 6879918, 4, { -19.918140f, 99.999687f, 285.122803f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007457, 6879917, 4, { 16.073009f, 99.999748f, 280.430511f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2002735, 0, 4, { -0.000000f, 50.299999f, 197.665695f }, 1.200000f );
+      instance->registerEObj( "Unknown30", 2002872, 6908678, 4, { 0.647792f, 49.999809f, 199.196106f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008595, 6880321, 4, { -18.062990f, 49.999699f, 162.414703f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008596, 6880320, 4, { 18.482809f, 49.999790f, 162.012894f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2008567, 0, 4, { 0.000000f, 50.399700f, 180.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2007457, 6859376, 4, { -24.584480f, 49.999680f, 179.677902f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2007457, 6859374, 4, { 3.274982f, 49.999809f, 154.856400f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007457, 6859375, 4, { 24.522739f, 49.999729f, 180.281601f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2007457, 6859377, 4, { 0.874450f, 50.399719f, 178.377197f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2007457, 6879845, 4, { -20.074200f, 49.999729f, 165.294800f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2007457, 6879844, 4, { 15.916950f, 49.999790f, 160.602493f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2002735, 0, 4, { -0.000000f, 0.300000f, 77.670822f }, 1.200000f );
+      instance->registerEObj( "Unknown38", 2002872, 6908750, 4, { 0.647792f, -0.000183f, 79.265778f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008597, 6880336, 4, { -18.062990f, -0.000261f, 42.484371f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008598, 6880333, 4, { 18.482809f, -0.000181f, 42.082581f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2008568, 0, 4, { 0.000000f, 0.399994f, 60.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2007457, 6859445, 4, { -24.584480f, -0.000300f, 59.747551f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2007457, 6859443, 4, { 3.274982f, -0.000159f, 34.926048f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2007457, 6859444, 4, { 24.522739f, -0.000267f, 60.351250f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2007457, 6880919, 4, { 0.874450f, 0.399750f, 58.446869f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2007457, 6878455, 4, { -20.074200f, -0.000246f, 45.364471f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2007457, 6878454, 4, { 15.916950f, -0.000182f, 40.672180f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2002735, 0, 4, { -0.000000f, -49.700001f, -42.294621f }, 1.200000f );
+      instance->registerEObj( "Unknown46", 2002872, 6910488, 4, { 0.647793f, -49.999901f, -40.657509f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008599, 6880352, 4, { -18.062990f, -49.999981f, -77.438744f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008600, 6880349, 4, { 18.478640f, -50.003849f, -77.866821f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2008569, 0, 4, { 0.000000f, -49.600010f, -60.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2007457, 6859528, 4, { -24.584480f, -50.000099f, -60.175560f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2007457, 6859530, 4, { 3.275066f, -50.000000f, -84.997147f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2007457, 6859529, 4, { 24.522739f, -49.999950f, -59.571861f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2007457, 6859527, 4, { 0.874527f, -49.599991f, -61.476238f }, 1.000000f );
+      instance->registerEObj( "Unknown51", 2007457, 6878662, 4, { -20.074200f, -49.999969f, -74.558640f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2007457, 6878660, 4, { 15.916950f, -49.999950f, -79.250931f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2002735, 0, 4, { 0.000000f, -99.699997f, -162.569397f }, 1.200000f );
+      instance->registerEObj( "Unknown54", 2002872, 6910585, 4, { 0.625610f, -100.000000f, -160.942093f }, 0.991760f );
+      instance->registerEObj( "Sluicegate", 2008601, 6880358, 4, { -18.062990f, -100.000000f, -197.715500f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008602, 6880354, 4, { 18.478640f, -100.022903f, -198.168900f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2008570, 0, 4, { 0.000000f, -99.600014f, -180.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2007457, 6843688, 4, { -24.612850f, -100.000099f, -180.473694f }, 0.991760f );
+      instance->registerEObj( "Unknown56", 2007457, 6843689, 4, { 3.250122f, -100.000000f, -205.284805f }, 0.991760f );
+      instance->registerEObj( "Unknown57", 2007457, 6843686, 4, { 24.521240f, -100.000000f, -179.863297f }, 0.991760f );
+      instance->registerEObj( "Unknown58", 2007457, 6843671, 4, { 0.869751f, -99.600113f, -181.755402f }, 0.991760f );
+      instance->registerEObj( "Unknown59", 2007457, 6878564, 4, { -20.096189f, -100.000000f, -194.847595f }, 0.991760f );
+      instance->registerEObj( "Unknown60", 2007457, 6878562, 4, { 15.915160f, -100.000000f, -199.547394f }, 0.991760f );
+      instance->registerEObj( "Unknown61", 2002735, 0, 4, { 0.000000f, -149.699997f, -282.259888f }, 1.200000f );
+      instance->registerEObj( "Unknown62", 2002872, 6910763, 4, { 0.625622f, -150.000107f, -281.035614f }, 0.991760f );
+      instance->registerEObj( "Sluicegate", 2008603, 6880362, 4, { -18.081970f, -150.000107f, -317.830200f }, 0.991760f );
+      instance->registerEObj( "Sluicegate", 2008604, 6880366, 4, { 17.127180f, -150.000107f, -317.622009f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2008571, 0, 4, { 0.000000f, -149.600006f, -300.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2007457, 6859613, 4, { -24.612820f, -150.000198f, -300.567108f }, 0.991760f );
+      instance->registerEObj( "Unknown64", 2007457, 6859615, 4, { 3.250126f, -150.000107f, -325.378296f }, 0.991760f );
+      instance->registerEObj( "Unknown65", 2007457, 6859614, 4, { 24.521259f, -150.000107f, -299.956696f }, 0.991760f );
+      instance->registerEObj( "Unknown66", 2007457, 6859612, 4, { 0.869759f, -149.600204f, -301.848907f }, 0.991760f );
+      instance->registerEObj( "Unknown67", 2007457, 6874400, 4, { -20.096189f, -150.000107f, -314.941101f }, 0.991760f );
+      instance->registerEObj( "Unknown68", 2007457, 6874396, 4, { 15.915160f, -150.000107f, -319.640900f }, 0.991760f );
+      instance->registerEObj( "Unknown69", 2002735, 0, 4, { 0.000000f, -199.699997f, -402.035004f }, 1.200000f );
+      instance->registerEObj( "Unknown70", 2002872, 6910821, 4, { 0.625622f, -200.000305f, -400.930389f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.069897f, -200.000305f, -436.982697f }, 1.000000f );
+      instance->registerEObj( "Unknown71", 2007457, 6859698, 4, { -24.612860f, -200.000504f, -420.461792f }, 0.991760f );
+      instance->registerEObj( "Unknown72", 2007457, 6859700, 4, { 3.250122f, -200.000397f, -445.273010f }, 0.991760f );
+      instance->registerEObj( "Unknown73", 2007457, 6859699, 4, { 24.521210f, -200.000305f, -419.851410f }, 0.991760f );
+      instance->registerEObj( "Unknown74", 2007457, 6859697, 4, { 0.869759f, -199.600403f, -421.743500f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEye.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEye.cpp
new file mode 100644
index 00000000..3e8a5f00
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEye.cpp
@@ -0,0 +1,35 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheHowlingEye : public InstanceContentScript
+{
+public:
+   TheHowlingEye() : InstanceContentScript( 20003 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000274, 4246117, 4, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeExtreme.cpp
new file mode 100644
index 00000000..e0a8fdf6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeExtreme.cpp
@@ -0,0 +1,35 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheHowlingEyeExtreme : public InstanceContentScript
+{
+public:
+   TheHowlingEyeExtreme() : InstanceContentScript( 20010 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000274, 4246117, 4, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeHard.cpp
new file mode 100644
index 00000000..bac5099d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeHard.cpp
@@ -0,0 +1,35 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheHowlingEyeHard : public InstanceContentScript
+{
+public:
+   TheHowlingEyeHard() : InstanceContentScript( 20006 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000274, 4246117, 4, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoa.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoa.cpp
new file mode 100644
index 00000000..7545184b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoa.cpp
@@ -0,0 +1,30 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheJadeStoa : public InstanceContentScript
+{
+public:
+   TheJadeStoa() : InstanceContentScript( 20051 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2009431, 0, 4, { -2.722647f, -0.000001f, 7.311604f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 7174720, 5, { 5.504887f, 0.000000f, 14.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7181535, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2009214, 0, 4, { 2.987230f, 0.000000f, -2.908927f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoaExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoaExtreme.cpp
new file mode 100644
index 00000000..c80cd4c5
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoaExtreme.cpp
@@ -0,0 +1,30 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheJadeStoaExtreme : public InstanceContentScript
+{
+public:
+   TheJadeStoaExtreme() : InstanceContentScript( 20052 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2009431, 0, 4, { -2.722647f, -0.000001f, 7.311604f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 7174720, 5, { 5.504887f, 0.000000f, 14.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7181535, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2009214, 0, 4, { 2.987230f, 0.000000f, -2.908927f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheKeeperoftheLake.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheKeeperoftheLake.cpp
new file mode 100644
index 00000000..a64adf35
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheKeeperoftheLake.cpp
@@ -0,0 +1,51 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheKeeperoftheLake : public InstanceContentScript
+{
+public:
+   TheKeeperoftheLake() : InstanceContentScript( 32 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -40.786701f, 641.215271f, -59.415600f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 5097808, 4, { -40.752449f, 641.160522f, -54.934898f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004825, 5040985, 4, { 194.842896f, -0.000001f, -91.318947f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004826, 5097903, 4, { 139.959106f, 4.489269f, -37.319328f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004828, 5041736, 4, { -97.215271f, 329.152313f, -129.564407f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2004829, 5073686, 4, { -104.691200f, 328.877686f, -135.171402f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2004830, 5054264, 4, { -85.465736f, 329.158203f, -114.917397f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2004831, 5054260, 4, { -74.450752f, 350.933899f, -163.969894f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004832, 5054262, 4, { -68.565010f, 338.613892f, -210.672806f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004833, 5041738, 4, { -36.703850f, 338.613892f, -209.867294f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2004834, 5073702, 4, { -33.987030f, 338.612915f, -200.545197f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2004835, 5041733, 4, { -102.992203f, 338.700012f, -173.230301f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004836, 5041740, 4, { -91.617867f, 338.742096f, -191.340103f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004837, 5041734, 4, { -56.932819f, 338.613800f, -220.085907f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004838, 5041739, 4, { -58.661549f, 338.321289f, -231.786407f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2004840, 5097049, 4, { 60.261662f, 608.420776f, -64.327179f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2004842, 5097050, 4, { -42.140709f, 637.801575f, -13.313470f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 36.823841f, 26.884010f, -25.290840f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002872, 5072855, 4, { 40.635441f, 24.890421f, -26.286221f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2004827, 5072856, 4, { 5.803720f, 26.994020f, -14.402020f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2002735, 0, 4, { 8.333900f, 345.993805f, -169.028107f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2002872, 5076365, 4, { 9.495131f, 345.449799f, -172.095505f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2004839, 5076366, 4, { 7.837297f, 345.993805f, -134.142197f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5072285, 5, { 294.405701f, 3.332572f, -157.864304f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -48.338951f, 641.026917f, -87.713493f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 279.041687f, 2.095404f, -159.624695f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLabyrinthoftheAncients.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheLabyrinthoftheAncients.cpp
new file mode 100644
index 00000000..b9f46df2
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheLabyrinthoftheAncients.cpp
@@ -0,0 +1,91 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheLabyrinthoftheAncients : public InstanceContentScript
+{
+public:
+   TheLabyrinthoftheAncients() : InstanceContentScript( 30001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002108, 0, 4, { -109.946503f, 44.168140f, -165.619995f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4317322, 5, { -110.032799f, 30.372690f, 417.614990f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2001023, 3445281, 4, { -117.450104f, 45.942120f, 317.195892f }, 0.778198f );
+      instance->registerEObj( "Unknown2", 2002793, 4493308, 4, { -148.301498f, 48.301128f, 279.915802f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002794, 4493309, 4, { -109.977203f, 48.251709f, 243.024094f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002795, 4493310, 4, { -71.722931f, 48.301121f, 280.086487f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001024, 4199521, 4, { -451.214386f, 41.580811f, 182.050903f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001025, 4303928, 4, { -451.373688f, 24.800070f, 73.862427f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2001026, 0, 4, { -451.305206f, 24.873600f, 73.806000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002798, 0, 4, { -355.665405f, 41.884102f, 279.420288f }, 1.550000f );
+      instance->registerEObj( "Unknown9", 2002801, 4478011, 4, { -346.181488f, 42.801510f, 279.988708f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002799, 0, 4, { -415.959198f, 42.400002f, 280.898804f }, 1.550000f );
+      instance->registerEObj( "Unknown11", 2002802, 4478013, 4, { -415.761597f, 42.400002f, 279.982788f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002800, 0, 4, { -452.406799f, 42.400002f, 239.395096f }, 1.550000f );
+      instance->registerEObj( "Unknown13", 2002803, 4478015, 4, { -451.081909f, 41.580811f, 243.305099f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2002839, 4493435, 4, { -413.650909f, 42.000000f, 279.285889f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2002840, 4493436, 4, { -450.220612f, 41.580811f, 247.690399f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2002807, 3445282, 4, { -301.062592f, 54.375320f, 290.201904f }, 0.991760f );
+      instance->registerEObj( "Allaganteleporter", 2002808, 3974161, 4, { -457.203400f, 38.418018f, 104.051903f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2002804, 0, 4, { -451.176910f, 25.504910f, 18.912251f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2001027, 4304910, 4, { 191.423996f, 51.658699f, 280.097992f }, 0.400000f );
+      instance->registerEObj( "Unknown17", 2001028, 4304912, 4, { 191.145798f, 51.767059f, 279.359497f }, 0.400000f );
+      instance->registerEObj( "Unknown18", 2001032, 0, 4, { 409.496094f, 66.240303f, 280.004395f }, 0.800000f );
+      instance->registerEObj( "Unknown19", 2001031, 4304071, 4, { 438.027588f, 69.382690f, 281.602203f }, 0.778198f );
+      instance->registerEObj( "Allaganteleporter", 2002809, 3445284, 4, { 115.688499f, 65.110123f, 280.018311f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2002813, 4199883, 4, { 253.669495f, 51.066391f, 244.695007f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2002814, 4199882, 4, { 253.676102f, 51.066399f, 279.965607f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2002815, 4199881, 4, { 253.683899f, 51.066360f, 315.213013f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2002816, 4199880, 4, { 213.707596f, 51.052799f, 244.895493f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002817, 4199878, 4, { 213.688202f, 51.052799f, 280.125214f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2002818, 4199879, 4, { 213.723404f, 51.052799f, 315.105286f }, 1.000000f );
+      instance->registerEObj( "Allaganteleporter", 2002810, 3974166, 4, { 349.215515f, 60.567490f, 268.536591f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2002805, 0, 4, { 455.122894f, 66.249268f, 279.987701f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2001030, 4199894, 4, { 264.739899f, 50.679981f, 279.921509f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2001033, 4305031, 4, { -110.210899f, 44.083248f, -116.227997f }, 0.381470f );
+      instance->registerEObj( "Unknown28", 2001034, 0, 4, { -110.254898f, 44.168098f, -111.387901f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2001035, 4317566, 4, { -110.054497f, 46.072929f, -214.578705f }, 0.400000f );
+      instance->registerEObj( "Unknown30", 2001036, 4305191, 4, { -111.224899f, 67.886620f, -344.147797f }, 0.400000f );
+      instance->registerEObj( "Unknown31", 2001037, 0, 4, { -109.930298f, 67.892403f, -338.731415f }, 1.000000f );
+      instance->registerEObj( "Energytowerconsole", 2001038, 0, 4, { -85.032784f, 70.241432f, -343.493713f }, 0.800000f );
+      instance->registerEObj( "Energytowerconsole", 2001039, 0, 4, { -85.044861f, 70.240898f, -393.307587f }, 0.800000f );
+      instance->registerEObj( "Energytowerconsole", 2001040, 0, 4, { -134.983994f, 70.240898f, -343.431213f }, 0.800000f );
+      instance->registerEObj( "Energytowerconsole", 2001041, 0, 4, { -134.925201f, 70.240898f, -393.378296f }, 0.800000f );
+      instance->registerEObj( "Allaganteleporter", 2002811, 3445283, 4, { -117.500000f, 39.417461f, -60.409302f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2002819, 4317548, 4, { -109.942200f, 44.168140f, -140.697403f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2002820, 4317564, 4, { -109.933800f, 44.168140f, -190.218903f }, 1.000000f );
+      instance->registerEObj( "Allaganteleporter", 2002812, 3974167, 4, { -117.461098f, 57.435680f, -288.075104f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2002806, 0, 4, { -109.976601f, 68.215019f, -378.115906f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2002821, 4407451, 4, { -110.134598f, 68.248489f, -367.669708f }, 1.000000f );
+      instance->registerEObj( "Allaganteleporter", 2002822, 4322323, 4, { -123.763496f, 650.608582f, 254.596695f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2001042, 4491496, 4, { -110.122498f, 650.015808f, 227.968597f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2001043, 0, 4, { -110.052299f, 650.020020f, 227.514893f }, 0.800000f );
+      instance->registerEObj( "Unknown37", 2001044, 4497411, 4, { -109.941299f, 650.720886f, 194.445694f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2002823, 4101871, 4, { -86.638451f, 650.731018f, 191.568298f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2002824, 4101872, 4, { -109.887199f, 650.970886f, 207.029099f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2002825, 4101873, 4, { -132.905304f, 650.731018f, 191.279907f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2002826, 0, 4, { -78.160004f, 649.940125f, 206.024597f }, 0.800000f );
+      instance->registerEObj( "Unknown42", 2002832, 0, 4, { -85.569000f, 649.940125f, 213.420593f }, 0.800000f );
+      instance->registerEObj( "Unknown43", 2002833, 0, 4, { -94.658401f, 649.940125f, 218.672806f }, 0.800000f );
+      instance->registerEObj( "Unknown44", 2002834, 0, 4, { -125.350403f, 649.940125f, 218.672806f }, 0.800000f );
+      instance->registerEObj( "Unknown45", 2002835, 0, 4, { -134.429901f, 649.940125f, 213.420593f }, 0.800000f );
+      instance->registerEObj( "Unknown46", 2002836, 0, 4, { -141.827698f, 649.940125f, 206.024597f }, 0.800000f );
+      instance->registerEObj( "Unknown47", 2002837, 4478584, 4, { -89.563782f, 650.019226f, 209.632706f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2002838, 4478586, 4, { -131.352798f, 650.019226f, 210.327194f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -110.009903f, 650.972229f, 157.832199f }, 0.793408f );
+      instance->registerEObj( "Unknown49", 2001029, 4499125, 4, { -109.987602f, 650.731018f, 181.576202f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueExtreme.cpp
new file mode 100644
index 00000000..96b9494a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueExtreme.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheLimitlessBlueExtreme : public InstanceContentScript
+{
+public:
+   TheLimitlessBlueExtreme() : InstanceContentScript( 20034 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Magitekfieldgenerator", 2005541, 0, 4, { -15.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Dragonkiller", 2005544, 0, 4, { -13.000000f, 0.182584f, -17.700001f }, 1.000000f );
+      instance->registerEObj( "Dragonkiller", 2005545, 0, 4, { -14.150000f, 0.168036f, 19.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2005847, 5865535, 4, { -5.185479f, 0.084680f, 0.234906f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005958, 5898723, 4, { -3.398252f, 0.016719f, -0.449336f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005965, 5874950, 4, { -14.475140f, 0.010675f, 5.614964f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5778232, 5, { -26.139870f, 0.000001f, -0.197510f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -4.281307f, 0.000000f, 0.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueHard.cpp
new file mode 100644
index 00000000..7c1ed631
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueHard.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheLimitlessBlueHard : public InstanceContentScript
+{
+public:
+   TheLimitlessBlueHard() : InstanceContentScript( 20033 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Magitekfieldgenerator", 2005541, 0, 4, { -15.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Dragonkiller", 2005544, 0, 4, { -13.000000f, 0.182584f, -17.700001f }, 1.000000f );
+      instance->registerEObj( "Dragonkiller", 2005545, 0, 4, { -14.150000f, 0.168036f, 19.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2005847, 5865535, 4, { -5.185479f, 0.084680f, 0.234906f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005958, 5898723, 4, { -3.398252f, 0.016719f, -0.449336f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005965, 5874950, 4, { -14.475140f, 0.010675f, 5.614964f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5778232, 5, { -26.139870f, 0.000001f, -0.197510f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -4.281307f, 0.000000f, 0.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCanalsofUznair.cpp
new file mode 100644
index 00000000..9fbd16b7
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCanalsofUznair.cpp
@@ -0,0 +1,140 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheLostCanalsofUznair : public InstanceContentScript
+{
+public:
+   TheLostCanalsofUznair() : InstanceContentScript( 55002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Sluicegate", 2008671, 6880327, 4, { 0.568258f, 100.300003f, 274.168488f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008672, 6880319, 4, { 0.269765f, 50.299999f, 154.680405f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2007457, 6879916, 4, { -1.092401f, 100.300003f, 275.638214f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 6879843, 4, { -1.524224f, 50.299999f, 155.176193f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008673, 6880331, 4, { 0.313768f, 0.272164f, 33.151051f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008674, 6880926, 4, { -0.058978f, -49.700001f, -85.039810f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008675, 6880353, 4, { -0.094499f, -99.699997f, -204.539307f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008676, 6880364, 4, { -0.132713f, -149.699997f, -325.173187f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6878453, 4, { -0.983721f, 0.299997f, 33.876339f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6878661, 4, { -1.446076f, -49.700001f, -85.301064f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6878563, 4, { -1.907748f, -99.699997f, -205.542297f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6874398, 4, { 0.861505f, -149.699997f, -323.648102f }, 1.000000f );
+      instance->registerEObj( "High", 2008960, 7005817, 4, { 0.995313f, 100.400002f, 303.008911f }, 1.000000f );
+      instance->registerEObj( "Low", 2008961, 7005818, 4, { 2.977269f, 100.400002f, 303.015686f }, 1.000000f );
+      instance->registerEObj( "High", 2008962, 7005819, 4, { 1.004384f, 50.369999f, 183.038193f }, 0.991760f );
+      instance->registerEObj( "Low", 2008963, 7005820, 4, { 3.018387f, 50.400009f, 183.009003f }, 1.000000f );
+      instance->registerEObj( "High", 2008964, 7005821, 4, { 1.013391f, 0.381469f, 63.020931f }, 0.991760f );
+      instance->registerEObj( "Low", 2008965, 7005822, 4, { 3.000382f, 0.400042f, 63.011879f }, 1.000000f );
+      instance->registerEObj( "High", 2008966, 7005823, 4, { 0.999980f, -49.628479f, -56.984692f }, 0.991760f );
+      instance->registerEObj( "Low", 2008967, 7005824, 4, { 2.994332f, -49.599289f, -56.969849f }, 1.000000f );
+      instance->registerEObj( "High", 2008968, 7005825, 4, { 0.976013f, -99.617447f, -176.984695f }, 0.991760f );
+      instance->registerEObj( "Low", 2008969, 7005826, 4, { 3.016492f, -99.599678f, -176.996704f }, 1.000000f );
+      instance->registerEObj( "High", 2008970, 7005827, 4, { 1.002942f, -149.605804f, -296.980713f }, 0.991760f );
+      instance->registerEObj( "Low", 2008971, 7005828, 4, { 3.024055f, -149.599503f, -297.002808f }, 1.000000f );
+      instance->registerEObj( "High", 2008972, 7005829, 4, { 1.005902f, -199.603302f, -416.980988f }, 0.991760f );
+      instance->registerEObj( "Low", 2008973, 7005830, 4, { 3.005575f, -199.600403f, -416.998596f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6996412, 4, { -4.068258f, 100.300003f, 294.718903f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6996413, 4, { 3.038667f, 100.300003f, 294.803009f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6996415, 4, { -4.038448f, 50.400009f, 176.206604f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6996416, 4, { 3.159257f, 50.400009f, 176.996399f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6996417, 4, { -5.237320f, 0.309626f, 53.443291f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6996418, 4, { 1.048808f, 0.300000f, 53.069832f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6996420, 4, { -4.622195f, -49.700001f, -65.730782f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 6996419, 4, { 3.246223f, -49.700001f, -66.129990f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 6996421, 4, { -4.211632f, -99.699997f, -185.489395f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 6996422, 4, { 3.121258f, -99.697990f, -185.125397f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 6996424, 4, { -3.555968f, -149.663605f, -304.656311f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 6996423, 4, { 2.999705f, -149.599503f, -304.547394f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 6996425, 4, { -3.452516f, -199.699997f, -425.304108f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007457, 6996426, 4, { 3.398586f, -199.699997f, -425.457886f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6904134, 5, { 2.648753f, 150.300003f, 421.065491f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 4.024228f, 150.300003f, 411.372498f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2002735, 0, 4, { 0.000000f, 100.300003f, 317.628296f }, 1.200000f );
+      instance->registerEObj( "Unknown22", 2002872, 6904820, 4, { 0.778198f, 99.992310f, 319.020294f }, 0.991760f );
+      instance->registerEObj( "Sluicegate", 2008593, 6880322, 4, { -17.906931f, 99.999687f, 282.242706f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008594, 6880329, 4, { 18.638870f, 99.999748f, 281.840912f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2008566, 0, 4, { 0.000000f, 100.400002f, 300.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007457, 6837839, 4, { -24.428419f, 99.999702f, 299.505890f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007457, 6837819, 4, { 3.431039f, 99.999771f, 274.684387f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007457, 6837820, 4, { 24.678801f, 99.999672f, 300.109589f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007457, 6837843, 4, { 1.030507f, 100.399696f, 298.205200f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007457, 6879918, 4, { -19.918140f, 99.999687f, 285.122803f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007457, 6879917, 4, { 16.073009f, 99.999748f, 280.430511f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2002735, 0, 4, { -0.000000f, 50.299999f, 197.665695f }, 1.200000f );
+      instance->registerEObj( "Unknown30", 2002872, 6908678, 4, { 0.647792f, 49.999809f, 199.196106f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008595, 6880321, 4, { -18.062990f, 49.999699f, 162.414703f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008596, 6880320, 4, { 18.482809f, 49.999790f, 162.012894f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2008567, 0, 4, { 0.000000f, 50.399700f, 180.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2007457, 6859376, 4, { -24.584480f, 49.999680f, 179.677902f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2007457, 6859374, 4, { 3.274982f, 49.999809f, 154.856400f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007457, 6859375, 4, { 24.522739f, 49.999729f, 180.281601f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2007457, 6859377, 4, { 0.874450f, 50.399719f, 178.377197f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2007457, 6879845, 4, { -20.074200f, 49.999729f, 165.294800f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2007457, 6879844, 4, { 15.916950f, 49.999790f, 160.602493f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2002735, 0, 4, { -0.000000f, 0.300000f, 77.670822f }, 1.200000f );
+      instance->registerEObj( "Unknown38", 2002872, 6908750, 4, { 0.647792f, -0.000183f, 79.265778f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008597, 6880336, 4, { -18.062990f, -0.000261f, 42.484371f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008598, 6880333, 4, { 18.482809f, -0.000181f, 42.082581f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2008568, 0, 4, { 0.000000f, 0.399994f, 60.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2007457, 6859445, 4, { -24.584480f, -0.000300f, 59.747551f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2007457, 6859443, 4, { 3.274982f, -0.000159f, 34.926048f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2007457, 6859444, 4, { 24.522739f, -0.000267f, 60.351250f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2007457, 6880919, 4, { 0.874450f, 0.399750f, 58.446869f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2007457, 6878455, 4, { -20.074200f, -0.000246f, 45.364471f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2007457, 6878454, 4, { 15.916950f, -0.000182f, 40.672180f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2002735, 0, 4, { -0.000000f, -49.700001f, -42.294621f }, 1.200000f );
+      instance->registerEObj( "Unknown46", 2002872, 6910488, 4, { 0.647793f, -49.999901f, -40.657509f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008599, 6880352, 4, { -18.062990f, -49.999981f, -77.438744f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008600, 6880349, 4, { 18.478640f, -50.003849f, -77.866821f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2008569, 0, 4, { 0.000000f, -49.600010f, -60.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2007457, 6859528, 4, { -24.584480f, -50.000099f, -60.175560f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2007457, 6859530, 4, { 3.275066f, -50.000000f, -84.997147f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2007457, 6859529, 4, { 24.522739f, -49.999950f, -59.571861f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2007457, 6859527, 4, { 0.874527f, -49.599991f, -61.476238f }, 1.000000f );
+      instance->registerEObj( "Unknown51", 2007457, 6878662, 4, { -20.074200f, -49.999969f, -74.558640f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2007457, 6878660, 4, { 15.916950f, -49.999950f, -79.250931f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2002735, 0, 4, { 0.000000f, -99.699997f, -162.569397f }, 1.200000f );
+      instance->registerEObj( "Unknown54", 2002872, 6910585, 4, { 0.625610f, -100.000000f, -160.942093f }, 0.991760f );
+      instance->registerEObj( "Sluicegate", 2008601, 6880358, 4, { -18.062990f, -100.000000f, -197.715500f }, 1.000000f );
+      instance->registerEObj( "Sluicegate", 2008602, 6880354, 4, { 18.478640f, -100.022903f, -198.168900f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2008570, 0, 4, { 0.000000f, -99.600014f, -180.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2007457, 6843688, 4, { -24.612850f, -100.000099f, -180.473694f }, 0.991760f );
+      instance->registerEObj( "Unknown56", 2007457, 6843689, 4, { 3.250122f, -100.000000f, -205.284805f }, 0.991760f );
+      instance->registerEObj( "Unknown57", 2007457, 6843686, 4, { 24.521240f, -100.000000f, -179.863297f }, 0.991760f );
+      instance->registerEObj( "Unknown58", 2007457, 6843671, 4, { 0.869751f, -99.600113f, -181.755402f }, 0.991760f );
+      instance->registerEObj( "Unknown59", 2007457, 6878564, 4, { -20.096189f, -100.000000f, -194.847595f }, 0.991760f );
+      instance->registerEObj( "Unknown60", 2007457, 6878562, 4, { 15.915160f, -100.000000f, -199.547394f }, 0.991760f );
+      instance->registerEObj( "Unknown61", 2002735, 0, 4, { 0.000000f, -149.699997f, -282.259888f }, 1.200000f );
+      instance->registerEObj( "Unknown62", 2002872, 6910763, 4, { 0.625622f, -150.000107f, -281.035614f }, 0.991760f );
+      instance->registerEObj( "Sluicegate", 2008603, 6880362, 4, { -18.081970f, -150.000107f, -317.830200f }, 0.991760f );
+      instance->registerEObj( "Sluicegate", 2008604, 6880366, 4, { 17.127180f, -150.000107f, -317.622009f }, 0.991760f );
+      instance->registerEObj( "Treasurecoffer", 2008571, 0, 4, { 0.000000f, -149.600006f, -300.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2007457, 6859613, 4, { -24.612820f, -150.000198f, -300.567108f }, 0.991760f );
+      instance->registerEObj( "Unknown64", 2007457, 6859615, 4, { 3.250126f, -150.000107f, -325.378296f }, 0.991760f );
+      instance->registerEObj( "Unknown65", 2007457, 6859614, 4, { 24.521259f, -150.000107f, -299.956696f }, 0.991760f );
+      instance->registerEObj( "Unknown66", 2007457, 6859612, 4, { 0.869759f, -149.600204f, -301.848907f }, 0.991760f );
+      instance->registerEObj( "Unknown67", 2007457, 6874400, 4, { -20.096189f, -150.000107f, -314.941101f }, 0.991760f );
+      instance->registerEObj( "Unknown68", 2007457, 6874396, 4, { 15.915160f, -150.000107f, -319.640900f }, 0.991760f );
+      instance->registerEObj( "Unknown69", 2002735, 0, 4, { 0.000000f, -199.699997f, -402.035004f }, 1.200000f );
+      instance->registerEObj( "Unknown70", 2002872, 6910821, 4, { 0.625622f, -200.000305f, -400.930389f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.069897f, -200.000305f, -436.982697f }, 1.000000f );
+      instance->registerEObj( "Unknown71", 2007457, 6859698, 4, { -24.612860f, -200.000504f, -420.461792f }, 0.991760f );
+      instance->registerEObj( "Unknown72", 2007457, 6859700, 4, { 3.250122f, -200.000397f, -445.273010f }, 0.991760f );
+      instance->registerEObj( "Unknown73", 2007457, 6859699, 4, { 24.521210f, -200.000305f, -419.851410f }, 0.991760f );
+      instance->registerEObj( "Unknown74", 2007457, 6859697, 4, { 0.869759f, -199.600403f, -421.743500f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdapor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdapor.cpp
new file mode 100644
index 00000000..8b5fd51d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdapor.cpp
@@ -0,0 +1,69 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheLostCityofAmdapor : public InstanceContentScript
+{
+public:
+   TheLostCityofAmdapor() : InstanceContentScript( 22 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 4579298, 4, { 9.791200f, -279.967285f, 21.616301f }, 0.700000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 8.967742f, -279.844086f, 22.640949f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -6.668615f, -279.989990f, -16.121090f }, 1.000000f );
+      instance->registerEObj( "Diabolicalgate", 2003262, 0, 4, { -11.735310f, -279.600006f, 1.146639f }, 1.000000f );
+      instance->registerEObj( "Diabolicalgate", 2003263, 0, 4, { -5.801897f, -279.600006f, -2.180922f }, 1.000000f );
+      instance->registerEObj( "Diabolicalgate", 2003264, 0, 4, { -9.593593f, -279.600006f, 5.704061f }, 1.000000f );
+      instance->registerEObj( "Diabolicalgate", 2003265, 0, 4, { -3.149769f, -279.600006f, 2.478353f }, 1.000000f );
+      instance->registerEObj( "Dubiouscoffer", 2003266, 0, 4, { 8.612234f, -279.989990f, -20.760429f }, 1.000000f );
+      instance->registerEObj( "Dubiouscoffer", 2003267, 0, 4, { 20.769291f, -279.989990f, -8.610124f }, 1.000000f );
+      instance->registerEObj( "Dubiouscoffer", 2003268, 0, 4, { -20.776131f, -279.989990f, 8.642863f }, 0.991760f );
+      instance->registerEObj( "Dubiouscoffer", 2003269, 0, 4, { -20.738871f, -279.989990f, -8.552890f }, 1.000000f );
+      instance->registerEObj( "Dubiouscoffer", 2003270, 0, 4, { 20.683531f, -279.989990f, 8.612939f }, 1.000000f );
+      instance->registerEObj( "Dubiouscoffer", 2003271, 0, 4, { -8.611513f, -279.989990f, 20.715059f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003361, 4538596, 4, { 146.386597f, 68.131821f, -32.655411f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2003431, 4577623, 4, { 141.929794f, 66.690971f, -22.680590f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2003362, 4577620, 4, { 124.650101f, 58.000000f, 21.475590f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2003800, 0, 4, { 125.169800f, 58.259232f, 24.765381f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2003364, 4538597, 4, { 1.248910f, 34.305920f, -96.145103f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2003432, 4577625, 4, { 7.652231f, 33.999989f, -83.909409f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2003365, 4572307, 4, { 16.420071f, 30.172510f, -53.162449f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2003366, 4629067, 4, { 13.762910f, 27.170670f, -29.499069f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2003367, 4577622, 4, { -35.077301f, 20.181410f, -5.543382f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2003368, 4572310, 4, { -36.282841f, 10.771230f, 27.777269f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2003369, 4629073, 4, { -38.452469f, 10.771230f, 26.955620f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2003370, 4538791, 4, { 11.000470f, 7.980469f, 18.231581f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2003371, 4572309, 4, { 15.090590f, 6.133745f, 32.735611f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2003372, 4629074, 4, { 11.812460f, 6.045094f, 32.012810f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2003433, 4577626, 4, { 25.308140f, 6.141701f, 43.055359f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2003801, 0, 4, { -39.169922f, 18.680960f, -1.968445f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2003374, 4583478, 4, { 23.827320f, -252.500000f, -65.956993f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2003375, 4583476, 4, { 9.536644f, -252.394394f, -55.117130f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2003376, 4583473, 4, { 47.898071f, -270.801910f, 54.428829f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2003377, 4583472, 4, { 35.751831f, -270.679901f, 43.045650f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2003378, 4583471, 4, { 42.832031f, -270.801910f, 35.995972f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2003379, 4583474, 4, { 54.564331f, -270.899994f, 47.591949f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2002872, 4577505, 4, { 100.376602f, 43.960560f, 2.708986f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2002735, 0, 4, { 97.980797f, 42.137150f, -0.222000f }, 0.900000f );
+      instance->registerEObj( "Unknown24", 2003363, 4578411, 4, { 86.630951f, 42.801220f, -47.240730f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2003373, 4578103, 4, { -38.428570f, 12.100000f, 70.544273f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2002872, 4578066, 4, { 6.156913f, 11.249960f, 70.316727f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2002735, 0, 4, { 4.235116f, 12.085570f, 69.965263f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2003360, 0, 4, { 284.752808f, 100.000000f, -31.765209f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4574610, 5, { 270.581207f, 100.000000f, -17.202379f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.173615f, 100.000000f, -32.604542f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdaporHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdaporHard.cpp
new file mode 100644
index 00000000..b7cc6a70
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdaporHard.cpp
@@ -0,0 +1,65 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheLostCityofAmdaporHard : public InstanceContentScript
+{
+public:
+   TheLostCityofAmdaporHard() : InstanceContentScript( 42 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f );
+      instance->registerEObj( "Unknown6", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f );
+      instance->registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f );
+      instance->registerEObj( "Guardianstatue", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f );
+      instance->registerEObj( "Guardianstatue", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070313f, 100.000000f, -376.644592f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f );
+      instance->registerEObj( "Unknown23", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f );
+      instance->registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f }, 0.991760f );
+      instance->registerEObj( "Unknown31", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f }, 0.991760f );
+      instance->registerEObj( "Unknown33", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladNidhoggsRage.cpp
new file mode 100644
index 00000000..65c0ce03
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladNidhoggsRage.cpp
@@ -0,0 +1,30 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheMinstrelsBalladNidhoggsRage : public InstanceContentScript
+{
+public:
+   TheMinstrelsBalladNidhoggsRage() : InstanceContentScript( 20040 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladShinryusDomain.cpp
new file mode 100644
index 00000000..4c371537
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladShinryusDomain.cpp
@@ -0,0 +1,44 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheMinstrelsBalladShinryusDomain : public InstanceContentScript
+{
+public:
+   TheMinstrelsBalladShinryusDomain() : InstanceContentScript( 20050 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 7034110, 5, { -21.048290f, -380.000092f, 1.297991f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 620.000000f, 20.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 7023869, 4, { -16.594919f, -380.000092f, -17.432211f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7023871, 4, { -0.213646f, -380.000092f, -17.432211f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7023870, 4, { 19.761841f, -380.000092f, -17.432211f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7023865, 4, { -16.594919f, -380.000092f, 0.746161f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7023864, 4, { 20.591261f, -380.000092f, 1.852063f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 7023866, 4, { -16.594919f, -380.000092f, 20.030439f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 7023868, 4, { 1.859938f, -380.000092f, 20.168671f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 7023867, 4, { 21.489799f, -380.000092f, 20.306919f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 7023863, 4, { 0.270193f, -380.000092f, 0.884399f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 7024624, 4, { -5.336151f, -380.000000f, 8.195240f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7024837, 4, { 17.385090f, 620.000000f, -3.965453f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 7024899, 4, { 15.077030f, 620.000000f, -79.248016f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 7032157, 4, { 7.331779f, 620.000000f, 0.488136f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 7032193, 4, { 9.743866f, 620.000000f, -5.475266f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2009049, 0, 4, { 20.000000f, 620.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2009065, 0, 4, { -0.015030f, 619.988770f, -6.068220f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2009073, 0, 4, { -20.000000f, 620.000000f, 0.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladThordansReign.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladThordansReign.cpp
new file mode 100644
index 00000000..de66a6e3
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladThordansReign.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheMinstrelsBalladThordansReign : public InstanceContentScript
+{
+public:
+   TheMinstrelsBalladThordansReign() : InstanceContentScript( 20036 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006312, 5922953, 4, { -7.224293f, 0.039305f, -2.496346f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005944, 5895686, 4, { 12.728000f, 0.012478f, -12.728000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005945, 5895687, 4, { 12.728000f, 0.012478f, 12.728000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2005946, 5895690, 4, { -12.728000f, 0.012478f, 12.728000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2005947, 5895691, 4, { -12.728000f, 0.012478f, -12.728000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2005915, 5894863, 4, { 9.000000f, 0.012478f, -16.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005916, 5894864, 4, { 18.000000f, 0.012478f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005917, 5894866, 4, { 9.000000f, 0.012478f, 16.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005918, 5894867, 4, { -9.000000f, 0.012478f, 16.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005919, 5894868, 4, { -18.000000f, 0.012478f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2005920, 5894869, 4, { -9.000000f, 0.012478f, -16.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2005914, 5894871, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2005913, 5894872, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006575, 6061720, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006576, 6061721, 4, { 0.000000f, 0.039305f, -19.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006577, 6061722, 4, { 19.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006578, 6061723, 4, { 0.000000f, 0.039305f, 19.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006579, 6061724, 4, { -19.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006580, 6061725, 4, { 8.485300f, 0.039305f, -8.485300f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2006581, 6061727, 4, { 8.485300f, 0.039304f, 9.619522f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2006582, 6061728, 4, { -8.499329f, 0.015198f, 9.174744f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2006583, 6061730, 4, { -8.485300f, 0.039305f, -8.485300f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2006567, 6046991, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2006568, 6059913, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2006569, 6059911, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2006570, 6047214, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2006571, 6059909, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2006572, 6047213, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2006573, 6059910, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2006574, 6059912, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2006587, 6056540, 4, { -0.607457f, 0.039305f, -0.008893f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5854853, 5, { 0.035266f, 0.012478f, 11.380060f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.012478f, -18.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladUltimasBane.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladUltimasBane.cpp
new file mode 100644
index 00000000..a8c3de6a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladUltimasBane.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheMinstrelsBalladUltimasBane : public InstanceContentScript
+{
+public:
+   TheMinstrelsBalladUltimasBane() : InstanceContentScript( 20013 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002745, 4391076, 4, { 7.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002746, 4391074, 4, { -7.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002747, 4976890, 4, { 0.000000f, -0.131581f, -18.566719f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002748, 4391072, 4, { 17.676531f, -0.144861f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002749, 4976892, 4, { 0.000000f, 0.000000f, 17.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002750, 4976891, 4, { -17.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4391941, 5, { -6.677185f, 0.068419f, 12.835030f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.316700f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheNavel.cpp
new file mode 100644
index 00000000..01f8e9f7
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheNavel.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheNavel : public InstanceContentScript
+{
+public:
+   TheNavel() : InstanceContentScript( 20002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelExtreme.cpp
new file mode 100644
index 00000000..7f0c31e0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelExtreme.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheNavelExtreme : public InstanceContentScript
+{
+public:
+   TheNavelExtreme() : InstanceContentScript( 20009 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelHard.cpp
new file mode 100644
index 00000000..74687de6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelHard.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheNavelHard : public InstanceContentScript
+{
+public:
+   TheNavelHard() : InstanceContentScript( 20005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheOrphansandtheBrokenBlade.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheOrphansandtheBrokenBlade.cpp
new file mode 100644
index 00000000..35198971
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheOrphansandtheBrokenBlade.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheOrphansandtheBrokenBlade : public InstanceContentScript
+{
+public:
+   TheOrphansandtheBrokenBlade() : InstanceContentScript( 5019 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors101110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors101110.cpp
new file mode 100644
index 00000000..74118967
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors101110.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors101110 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors101110() : InstanceContentScript( 60011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors110.cpp
new file mode 100644
index 00000000..3a8bb8a5
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors110.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors110 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors110() : InstanceContentScript( 60001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors111120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors111120.cpp
new file mode 100644
index 00000000..dd655293
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors111120.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors111120 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors111120() : InstanceContentScript( 60012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors1120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors1120.cpp
new file mode 100644
index 00000000..4932cc33
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors1120.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors1120 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors1120() : InstanceContentScript( 60002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors121130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors121130.cpp
new file mode 100644
index 00000000..d0b6a4bc
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors121130.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors121130 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors121130() : InstanceContentScript( 60013 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors131140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors131140.cpp
new file mode 100644
index 00000000..2451e4cd
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors131140.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors131140 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors131140() : InstanceContentScript( 60014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors141150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors141150.cpp
new file mode 100644
index 00000000..f596415f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors141150.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors141150 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors141150() : InstanceContentScript( 60015 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors151160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors151160.cpp
new file mode 100644
index 00000000..61e5593f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors151160.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors151160 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors151160() : InstanceContentScript( 60016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors161170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors161170.cpp
new file mode 100644
index 00000000..2d62f760
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors161170.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors161170 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors161170() : InstanceContentScript( 60017 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors171180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors171180.cpp
new file mode 100644
index 00000000..c26192f5
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors171180.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors171180 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors171180() : InstanceContentScript( 60018 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors181190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors181190.cpp
new file mode 100644
index 00000000..2c9e444f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors181190.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors181190 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors181190() : InstanceContentScript( 60019 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors191200.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors191200.cpp
new file mode 100644
index 00000000..ab39e366
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors191200.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors191200 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors191200() : InstanceContentScript( 60020 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors2130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors2130.cpp
new file mode 100644
index 00000000..60bdee61
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors2130.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors2130 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors2130() : InstanceContentScript( 60003 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors3140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors3140.cpp
new file mode 100644
index 00000000..0e947a49
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors3140.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors3140 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors3140() : InstanceContentScript( 60004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors4150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors4150.cpp
new file mode 100644
index 00000000..b9b11385
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors4150.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors4150 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors4150() : InstanceContentScript( 60005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors5160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors5160.cpp
new file mode 100644
index 00000000..c3842694
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors5160.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors5160 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors5160() : InstanceContentScript( 60006 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors6170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors6170.cpp
new file mode 100644
index 00000000..d1cc3100
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors6170.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors6170 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors6170() : InstanceContentScript( 60007 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors7180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors7180.cpp
new file mode 100644
index 00000000..9af4d977
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors7180.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors7180 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors7180() : InstanceContentScript( 60008 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors8190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors8190.cpp
new file mode 100644
index 00000000..abe093ae
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors8190.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors8190 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors8190() : InstanceContentScript( 60009 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors91100.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors91100.cpp
new file mode 100644
index 00000000..798bd75c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors91100.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors91100 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors91100() : InstanceContentScript( 60010 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTribute.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTribute.cpp
new file mode 100644
index 00000000..fdf977ec
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTribute.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePoolofTribute : public InstanceContentScript
+{
+public:
+   ThePoolofTribute() : InstanceContentScript( 20046 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Bladesshadow", 2008185, 6849163, 4, { -0.015320f, 0.206439f, -5.020264f }, 0.991760f );
+      instance->registerEObj( "Unknown0", 2008184, 6843593, 4, { -4.501404f, 0.200000f, 8.957031f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6847132, 5, { -3.489120f, 0.200000f, 16.024530f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.357571f, 0.200000f, -11.800290f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTributeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTributeExtreme.cpp
new file mode 100644
index 00000000..9a5c7506
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTributeExtreme.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePoolofTributeExtreme : public InstanceContentScript
+{
+public:
+   ThePoolofTributeExtreme() : InstanceContentScript( 20047 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Bladesshadow", 2008185, 6849163, 4, { -0.015320f, 0.206439f, -5.020264f }, 0.991760f );
+      instance->registerEObj( "Unknown0", 2008184, 6843593, 4, { -4.501404f, 0.200000f, 8.957031f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6847132, 5, { -3.489120f, 0.200000f, 16.024530f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.357571f, 0.200000f, -11.800290f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePraetorium.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThePraetorium.cpp
new file mode 100644
index 00000000..eb6f5fc9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThePraetorium.cpp
@@ -0,0 +1,131 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePraetorium : public InstanceContentScript
+{
+public:
+   ThePraetorium() : InstanceContentScript( 16 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000828, 4305694, 4, { -784.536987f, -344.000000f, 0.121873f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000829, 0, 4, { -781.198120f, -344.000000f, 0.127798f }, 0.900000f );
+      instance->registerEObj( "Shortcut", 2000848, 0, 4, { -788.420593f, -400.046387f, -601.281189f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2000832, 4303065, 4, { -703.485413f, -185.734299f, 461.314697f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2000833, 4303324, 4, { -721.744019f, -185.531204f, 478.978302f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2000834, 4303325, 4, { -704.359924f, -185.731995f, 498.390015f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2000831, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f );
+      instance->registerEObj( "Unknown6", 2002538, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f );
+      instance->registerEObj( "Unknown7", 2000828, 4305491, 4, { 212.974304f, 75.866501f, -0.668073f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000829, 0, 4, { 215.905304f, 76.000000f, -0.131676f }, 0.700000f );
+      instance->registerEObj( "Unknown9", 2000822, 4305462, 4, { -135.017593f, -103.976402f, -1.129792f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2000823, 0, 4, { -129.654205f, -104.027000f, -0.290400f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2000826, 4305555, 4, { -216.218002f, -103.997398f, -3.836082f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000827, 0, 4, { -208.879593f, -103.997398f, -0.252325f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000848, 0, 4, { -577.757813f, -268.000000f, 218.871399f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000876, 4317513, 4, { 180.458893f, 76.089233f, -0.360356f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000976, 0, 4, { 180.548401f, 76.089943f, 0.959593f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2001134, 4326317, 4, { -166.447800f, -104.221901f, 16.976521f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2001135, 4326381, 4, { -196.318497f, -104.078903f, -0.786835f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2001766, 4175265, 4, { -570.270081f, -268.000000f, 217.461197f }, 1.000000f );
+      instance->registerEObj( "仮シド指令", 2000806, 0, 4, { 217.957397f, 46.000000f, -11.597380f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000851, 0, 4, { 133.745193f, 22.964720f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2000852, 0, 4, { 134.477707f, 7.614197f, -0.045776f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2000856, 0, 4, { 145.769394f, 21.988159f, 7.095398f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2000813, 0, 4, { 136.430801f, 22.354429f, -0.137390f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2000858, 0, 4, { 121.995796f, -104.020798f, 3.707886f }, 0.991760f );
+      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 12.002250f, -107.811699f, -78.686447f }, 2.578735f );
+      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 108.952103f, -106.029999f, -7.573757f }, 2.578735f );
+      instance->registerEObj( "Unknown19", 2000791, 4118536, 4, { 226.850998f, 155.775497f, 3.640267f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2000836, 4178897, 4, { 230.933899f, 156.818100f, 25.887810f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000792, 0, 4, { 240.527893f, 155.626495f, 4.989798f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2000793, 4243244, 4, { 187.994705f, 152.227097f, -80.103348f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2000794, 4178131, 4, { 157.029907f, 155.725204f, -56.634510f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2000795, 4118533, 4, { 171.986206f, 160.259903f, -32.392151f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2000796, 4317691, 4, { 177.690002f, 155.500000f, -35.500401f }, 1.000000f );
+      instance->registerEObj( "Imperialidentificationkey", 2000837, 0, 4, { 226.065094f, 155.807800f, 7.053694f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2000855, 4178132, 4, { 224.098007f, 156.000000f, -26.999870f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2000845, 4316977, 4, { 221.255707f, 156.000000f, 6.591867f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2001145, 4329956, 4, { 196.345398f, 186.275101f, -3.980006f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2001146, 4329960, 4, { 196.312805f, 155.999893f, 4.083439f }, 1.000000f );
+      instance->registerEObj( "Magitektransporter", 2001147, 0, 4, { 204.421494f, 120.000000f, -60.006229f }, 1.000000f );
+      instance->registerEObj( "Magitektransporter", 2001148, 0, 4, { 228.831696f, 71.500000f, -28.156210f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2002628, 4305528, 4, { 221.126099f, 153.428696f, -69.269623f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2000871, 0, 4, { 174.414993f, 102.515198f, -88.973930f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2000797, 4118552, 4, { 227.155396f, 72.000000f, -43.219952f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2000798, 4119463, 4, { 190.957703f, 72.355438f, -64.773132f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000799, 0, 4, { 268.474396f, 67.031410f, -49.967129f }, 0.991760f );
+      instance->registerEObj( "Imperialidentificationkey", 2000838, 0, 4, { 263.129395f, 66.381569f, -71.274437f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2000667, 4119461, 4, { 271.022614f, 68.049881f, -45.787529f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2000800, 4124814, 4, { 237.461395f, 72.250000f, 33.809959f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2000843, 4119464, 4, { 190.731094f, 67.877243f, -85.008949f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2000844, 0, 4, { 254.749405f, 72.098747f, -36.545410f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2000841, 0, 4, { 234.100006f, 72.101990f, -5.516209f }, 1.000000f );
+      instance->registerEObj( "Imperialidentificationkey", 2000840, 0, 4, { 242.130798f, 72.250000f, 26.153481f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2000842, 4186210, 4, { 224.041794f, 75.715820f, -0.347510f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000802, 4299253, 4, { 177.904907f, 76.066162f, -5.569580f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2000803, 0, 4, { 173.805496f, 76.081238f, 4.123073f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2000804, 4175899, 4, { 172.537292f, 76.600563f, -0.941921f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000849, 0, 4, { 173.793900f, 47.632881f, 4.163035f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2001020, 4119459, 4, { 236.713104f, 68.589233f, 77.256348f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2001021, 4119458, 4, { 214.862198f, 47.531738f, 39.169922f }, 0.991760f );
+      instance->registerEObj( "Unknown39", 2000877, 4317555, 4, { 178.867599f, 76.089233f, -0.117565f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2000878, 4317536, 4, { 168.665405f, 46.519169f, 1.801311f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2002629, 4305536, 4, { 241.707993f, 66.877907f, -82.835068f }, 0.991760f );
+      instance->registerEObj( "Unknown42", 2002630, 4305537, 4, { 112.046898f, 67.002319f, 46.555180f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2000805, 4299251, 4, { 167.034500f, 46.199989f, 8.192681f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2000811, 4175901, 4, { 149.577499f, 46.799969f, -30.579741f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2000807, 4309445, 4, { 146.929092f, 45.975342f, -50.736271f }, 0.991760f );
+      instance->registerEObj( "Identificationkeyreader", 2000808, 4182427, 4, { 128.409805f, 47.799999f, -49.366180f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000809, 4298905, 4, { 150.029999f, 46.723068f, -39.001339f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000810, 0, 4, { 154.199600f, 46.894550f, -34.215000f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2000812, 4119481, 4, { 208.043594f, 43.053101f, 0.003599f }, 1.000000f );
+      instance->registerEObj( "Imperialidentificationkey", 2000839, 0, 4, { 155.484695f, 46.000000f, -57.763378f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2000850, 0, 4, { 154.192307f, 101.909103f, -34.226189f }, 0.991760f );
+      instance->registerEObj( "Magitekterminal", 2000857, 0, 4, { 142.995895f, 46.047619f, -53.038639f }, 0.991760f );
+      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 140.619904f, 102.000000f, -50.628609f }, 2.600000f );
+      instance->registerEObj( "Magitekterminal", 2000904, 4298910, 4, { 150.108398f, 102.204201f, -39.998730f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2000879, 4317581, 4, { 145.143005f, 46.118488f, -33.631050f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2000880, 4317584, 4, { 144.416595f, 102.000000f, -35.715260f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2002539, 4323543, 4, { 191.892395f, 46.000000f, -42.993431f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2001205, 0, 4, { 134.810394f, 21.910000f, -0.001021f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2001205, 0, 4, { 133.078400f, -102.979202f, 0.123506f }, 1.000000f );
+      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 129.111298f, 68.261063f, -59.929440f }, 2.578735f );
+      instance->registerEObj( "Unknown51", 2000815, 4190796, 4, { 81.888397f, -107.400002f, -45.959042f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2000816, 4323560, 4, { 38.618160f, -107.400002f, -72.955917f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2000817, 4190794, 4, { 37.580742f, -107.400002f, -70.481018f }, 1.000000f );
+      instance->registerEObj( "Unknown54", 2000819, 4323562, 4, { -38.041451f, -103.786201f, 0.069122f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2000818, 4200594, 4, { -31.718330f, -103.400002f, 2.561740f }, 1.000000f );
+      instance->registerEObj( "Unknown56", 2000820, 4190789, 4, { -31.696360f, -103.400002f, -2.409777f }, 1.000000f );
+      instance->registerEObj( "Unknown57", 2000821, 4189149, 4, { -68.916000f, -102.759399f, -0.015143f }, 0.991760f );
+      instance->registerEObj( "Unknown58", 2000824, 4119565, 4, { -184.609695f, -104.221901f, -2.135104f }, 1.000000f );
+      instance->registerEObj( "Magitekterminal", 2000825, 0, 4, { -238.152893f, -104.051300f, -19.744539f }, 0.991760f );
+      instance->registerEObj( "Unknown59", 2000854, 4119564, 4, { -117.637398f, -103.993301f, 0.252331f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000853, 0, 4, { -228.197906f, -103.997398f, 0.789458f }, 0.991760f );
+      instance->registerEObj( "Unknown60", 2000814, 4323557, 4, { 84.611214f, -107.408302f, -51.255131f }, 0.991760f );
+      instance->registerEObj( "Unknown61", 2001138, 4125125, 4, { -249.059494f, -104.000000f, -3.238936f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000846, 0, 4, { -787.271912f, -344.000000f, 2.392201f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000847, 0, 4, { -787.513977f, -344.014587f, -1.791996f }, 1.000000f );
+      instance->registerEObj( "PortaDecumanaentryway", 2001045, 0, 4, { -792.387329f, -343.440887f, -0.126096f }, 1.500000f );
+      instance->registerEObj( "Unknown62", 2001139, 4328790, 4, { -765.431274f, -343.997589f, 1.749690f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2000787, 0, 4, { 147.015701f, 186.100006f, -4.199400f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000788, 0, 4, { -721.074524f, -185.731598f, 478.324890f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000789, 0, 4, { 167.870895f, 186.000000f, -0.104399f }, 1.000000f );
+      instance->registerEObj( "Unknown64", 2000790, 4301608, 4, { 152.054794f, 187.039200f, 3.392751f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000789, 0, 4, { -237.161896f, -104.020897f, -21.575460f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000789, 0, 4, { 115.949501f, 67.588867f, -74.186333f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheResonant.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheResonant.cpp
new file mode 100644
index 00000000..75a9a536
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheResonant.cpp
@@ -0,0 +1,31 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheResonant : public InstanceContentScript
+{
+public:
+   TheResonant() : InstanceContentScript( 5017 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 6927333, 4, { 503.255096f, 70.000000f, 589.613708f }, 1.000000f );
+      instance->registerEObj( "Gatewinch", 2008907, 0, 4, { 508.261505f, 71.415131f, 575.156982f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007457, 7012282, 4, { 702.654602f, 70.000000f, 532.514282f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2008678, 0, 4, { -139.654007f, 69.993042f, 667.066772f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2008678, 0, 4, { -187.638397f, 69.993042f, 634.666504f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2008678, 0, 4, { -73.946472f, 69.993042f, 652.456177f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalCityofRabanastre.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalCityofRabanastre.cpp
new file mode 100644
index 00000000..c50f12f1
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalCityofRabanastre.cpp
@@ -0,0 +1,114 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheRoyalCityofRabanastre : public InstanceContentScript
+{
+public:
+   TheRoyalCityofRabanastre() : InstanceContentScript( 30058 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -319.173004f, 9.994568f, 320.515686f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007457, 7069100, 4, { -319.896515f, 10.000000f, 325.206085f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7075766, 4, { -320.000000f, 1.230700f, 221.199997f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7075769, 4, { -320.351501f, 1.230694f, 262.307892f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7075770, 4, { -346.200012f, 1.229800f, 238.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2009060, 0, 4, { -311.306702f, 1.230747f, 242.805496f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2009061, 0, 4, { -316.517914f, 1.205444f, 246.509399f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2007457, 7069107, 4, { -319.661407f, 10.000000f, -11.625690f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2009055, 0, 4, { -336.110504f, 9.964111f, -51.682369f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2009057, 0, 4, { -306.355408f, 9.964111f, -48.539001f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 7075611, 4, { -320.081390f, 10.000000f, -69.048653f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7075799, 4, { -320.000702f, 10.000000f, -56.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 7075800, 4, { -310.799988f, 10.000000f, -41.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 7075801, 4, { -329.200012f, 10.000000f, -41.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 7076220, 4, { -315.688690f, 10.000000f, -47.888401f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007457, 7075820, 4, { -316.520996f, 10.000000f, -31.534470f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 7077538, 4, { -338.909393f, 10.000000f, -32.073681f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007791, 0, 4, { -319.963013f, 10.052400f, -16.952101f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2009242, 0, 4, { -332.255402f, 10.108630f, -33.994350f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007457, 7080565, 4, { 106.000000f, -694.000000f, -128.399994f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007791, 0, 4, { 106.000000f, -694.000000f, -128.399994f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007457, 7082088, 4, { 108.221199f, -694.000000f, -208.120697f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007457, 7082089, 4, { 121.728897f, -694.000000f, -183.748199f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007457, 7082090, 4, { 94.008781f, -694.000000f, -182.456207f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009076, 0, 4, { 83.147507f, -694.000000f, -193.267899f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009203, 0, 4, { 83.057159f, -694.000000f, -182.946304f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009204, 0, 4, { 89.546783f, -694.000000f, -172.278000f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009205, 0, 4, { 96.837830f, -694.000000f, -165.190094f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009206, 0, 4, { 105.990601f, -694.000000f, -164.696304f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009207, 0, 4, { 117.216599f, -694.000000f, -169.060196f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009208, 0, 4, { 125.204498f, -694.000000f, -175.811493f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009209, 0, 4, { 130.969604f, -694.000000f, -185.265594f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009210, 0, 4, { 130.999893f, -694.000000f, -195.328003f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009211, 0, 4, { 124.798302f, -694.000000f, -204.280807f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009212, 0, 4, { 114.994301f, -694.000000f, -210.576996f }, 1.000000f );
+      instance->registerEObj( "Darkcircle", 2009213, 0, 4, { 103.221703f, -694.000000f, -213.151794f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007457, 7079402, 4, { 104.478500f, -679.000000f, -322.819489f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2007791, 0, 4, { 106.449997f, -679.000000f, -328.250000f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2009068, 0, 4, { 97.794479f, -679.000000f, -387.672394f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2009069, 0, 4, { 101.213097f, -679.000000f, -388.533600f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2009070, 0, 4, { 104.362602f, -679.000000f, -388.768097f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007457, 7081152, 4, { 101.446701f, -679.000000f, -398.626587f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2007457, 7081153, 4, { 114.988701f, -679.000000f, -399.119598f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2007457, 7081154, 4, { 105.230202f, -679.000000f, -389.831512f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2007457, 7151392, 4, { 105.983803f, -679.025024f, -386.058899f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2009221, 7094307, 4, { -323.781189f, 9.994568f, 322.467499f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2009222, 7094363, 4, { -325.789886f, 1.230697f, 217.839005f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2007457, 7041438, 4, { -274.571594f, 2.310245f, 37.022179f }, 1.000000f );
+      instance->registerEObj( "Waterwaygatelever", 2009184, 7080218, 4, { 338.918091f, -262.287415f, 267.698608f }, 0.991760f );
+      instance->registerEObj( "Waterwaygatelever", 2009186, 7080217, 4, { 337.924988f, -322.267212f, 299.494385f }, 1.000000f );
+      instance->registerEObj( "Waterwaygatelever", 2009188, 7080216, 4, { 338.580200f, -292.267212f, 331.283905f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2007457, 7080221, 4, { 323.797211f, -262.267395f, 275.364105f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2007457, 7080220, 4, { 324.137909f, -322.267303f, 308.012604f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2007457, 7080219, 4, { 325.866394f, -292.267212f, 339.968201f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2007457, 7080213, 4, { 205.647507f, -374.000092f, 339.617889f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2007457, 7080215, 4, { 164.959000f, -374.000092f, 324.108002f }, 1.000000f );
+      instance->registerEObj( "Passagecontrols", 2009200, 0, 4, { 189.533096f, -373.602295f, 305.302490f }, 1.000000f );
+      instance->registerEObj( "Passagecontrols", 2009201, 0, 4, { 162.416901f, -373.621887f, 283.383911f }, 1.000000f );
+      instance->registerEObj( "Passagecontrols", 2009202, 0, 4, { 167.371002f, -373.190186f, 332.672913f }, 1.000000f );
+      instance->registerEObj( "Scratchedlettering", 2009271, 0, 4, { 272.859009f, -490.182709f, 293.584595f }, 0.991760f );
+      instance->registerEObj( "Scratchedlettering", 2009272, 0, 4, { 212.923599f, -491.264191f, 290.957306f }, 0.991760f );
+      instance->registerEObj( "Scratchedlettering", 2009273, 0, 4, { 211.674301f, -491.485199f, 242.033600f }, 0.991760f );
+      instance->registerEObj( "Skypiratesscrawlings", 2009435, 0, 4, { 222.766403f, -333.455414f, 360.799591f }, 0.991760f );
+      instance->registerEObj( "Unknown41", 2009223, 7102857, 4, { 101.048698f, -694.000000f, -122.909698f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2009224, 7102858, 4, { 99.562241f, -694.000000f, -216.590393f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2009225, 7102860, 4, { 99.290398f, -679.011230f, -323.639587f }, 0.991760f );
+      instance->registerEObj( "Unknown44", 2009190, 0, 4, { -298.663086f, -4.197479f, 44.907139f }, 0.991760f );
+      instance->registerEObj( "Unknown45", 2009191, 0, 4, { -301.684296f, -4.350000f, 41.550209f }, 0.991760f );
+      instance->registerEObj( "Unknown46", 2009192, 0, 4, { -304.369995f, -4.219625f, 44.113739f }, 0.991760f );
+      instance->registerEObj( "Unknown47", 2009193, 0, 4, { -316.182190f, -4.226807f, 42.099609f }, 0.991760f );
+      instance->registerEObj( "Unknown48", 2009194, 0, 4, { -319.364990f, -4.219666f, 44.197979f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2009195, 0, 4, { -322.700989f, -4.219666f, 42.268631f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2009196, 0, 4, { -331.298615f, -4.379395f, 42.587891f }, 0.991760f );
+      instance->registerEObj( "Unknown51", 2009197, 0, 4, { -334.136810f, -4.379395f, 39.322510f }, 0.991760f );
+      instance->registerEObj( "Unknown52", 2009198, 0, 4, { -337.097107f, -4.379391f, 41.112068f }, 0.991760f );
+      instance->registerEObj( "Unknown53", 2009199, 0, 4, { -320.000000f, 19.928169f, -182.845596f }, 1.000000f );
+      instance->registerEObj( "Unknown54", 2002735, 0, 4, { -320.106812f, 19.946039f, -144.699493f }, 1.750000f );
+      instance->registerEObj( "Unknown55", 2007457, 7099082, 4, { -320.132294f, 19.899990f, -145.586395f }, 1.000000f );
+      instance->registerEObj( "Unknown56", 2007457, 7099092, 4, { -319.884003f, 19.900000f, -202.859207f }, 1.000000f );
+      instance->registerEObj( "Teleportationcrystal", 2009176, 7102798, 4, { -326.309998f, 5.729747f, 406.047699f }, 0.991760f );
+      instance->registerEObj( "Teleportationcrystal", 2009177, 7102799, 4, { -326.251099f, 9.753006f, 115.489799f }, 1.000000f );
+      instance->registerEObj( "Teleportationcrystal", 2009178, 7102800, 4, { -326.389801f, 10.000000f, -10.478860f }, 1.000000f );
+      instance->registerEObj( "Teleportationcrystal", 2009179, 7102801, 4, { -312.818115f, 19.899851f, -141.350296f }, 1.000000f );
+      instance->registerEObj( "Teleportationcrystal", 2009180, 7102802, 4, { 439.169189f, -229.561905f, 292.789886f }, 1.000000f );
+      instance->registerEObj( "Teleportationcrystal", 2009181, 7102803, 4, { 133.837006f, -374.000092f, 311.904785f }, 1.000000f );
+      instance->registerEObj( "Teleportationcrystal", 2009182, 7102804, 4, { 114.414299f, -694.000000f, -113.204399f }, 1.000000f );
+      instance->registerEObj( "Teleportationcrystal", 2009183, 7102805, 4, { 97.279610f, -679.000000f, -305.258087f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 7069095, 5, { -328.378906f, 0.730057f, 439.144012f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 106.318901f, -679.000000f, -398.354614f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalMenagerie.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalMenagerie.cpp
new file mode 100644
index 00000000..871bd02f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalMenagerie.cpp
@@ -0,0 +1,40 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheRoyalMenagerie : public InstanceContentScript
+{
+public:
+   TheRoyalMenagerie() : InstanceContentScript( 20045 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 6842660, 5, { -12.652360f, -380.000000f, 1.417362f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 620.000000f, -6.698792f }, 0.991760f );
+      instance->registerEObj( "Barrelsoffiresand", 2003127, 0, 4, { -0.108200f, -380.000000f, 0.890151f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007457, 6858507, 4, { -0.819489f, -380.000000f, 1.685981f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 6953496, 4, { -1.111895f, -380.000000f, 11.857690f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 6797912, 4, { -13.550160f, 620.000000f, -23.367689f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 6797914, 4, { -6.156202f, 620.000000f, -24.638531f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 6797913, 4, { 14.468520f, 620.000000f, -17.925461f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007457, 6797908, 4, { -13.109160f, 620.000000f, -3.235081f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2007457, 6797907, 4, { 14.608040f, 620.000000f, 0.876270f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 6797909, 4, { -13.849610f, 620.000000f, 15.100500f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 6797911, 4, { 7.597056f, 620.000000f, 16.291180f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007457, 6797910, 4, { 14.168900f, 620.000000f, 15.941650f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 6797906, 4, { 6.113630f, 620.000000f, 5.558393f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007457, 6925491, 4, { 8.519539f, 620.000000f, 7.842079f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn1.cpp
new file mode 100644
index 00000000..e647cd6e
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn1.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutSavageTurn1 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutSavageTurn1() : InstanceContentScript( 30012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f );
+      instance->registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn2.cpp
new file mode 100644
index 00000000..411f53c9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn2.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutSavageTurn2 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutSavageTurn2() : InstanceContentScript( 30013 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f );
+      instance->registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f );
+      instance->registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn3.cpp
new file mode 100644
index 00000000..e3fb9c50
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn3.cpp
@@ -0,0 +1,74 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutSavageTurn3 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutSavageTurn3() : InstanceContentScript( 30014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f );
+      instance->registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f );
+      instance->registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f );
+      instance->registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f }, 0.991760f );
+      instance->registerEObj( "Boxofcrystals", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f }, 1.000000f );
+      instance->registerEObj( "Boxofcrystals", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f }, 1.000000f );
+      instance->registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn4.cpp
new file mode 100644
index 00000000..3445d1bb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn4.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutSavageTurn4 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutSavageTurn4() : InstanceContentScript( 30015 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn1.cpp
new file mode 100644
index 00000000..d258a718
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn1.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutTurn1 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutTurn1() : InstanceContentScript( 30007 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f );
+      instance->registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn2.cpp
new file mode 100644
index 00000000..6d8a5501
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn2.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutTurn2 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutTurn2() : InstanceContentScript( 30008 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f );
+      instance->registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f );
+      instance->registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn3.cpp
new file mode 100644
index 00000000..ce9de1c0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn3.cpp
@@ -0,0 +1,74 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutTurn3 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutTurn3() : InstanceContentScript( 30009 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f );
+      instance->registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f );
+      instance->registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f );
+      instance->registerEObj( "Destination", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f );
+      instance->registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f }, 0.991760f );
+      instance->registerEObj( "Boxofcrystals", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f }, 1.000000f );
+      instance->registerEObj( "Boxofcrystals", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f }, 1.000000f );
+      instance->registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn4.cpp
new file mode 100644
index 00000000..0824f6d8
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn4.cpp
@@ -0,0 +1,38 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutTurn4 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutTurn4() : InstanceContentScript( 30010 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f );
+      instance->registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSingularityReactor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSingularityReactor.cpp
new file mode 100644
index 00000000..77820440
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSingularityReactor.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSingularityReactor : public InstanceContentScript
+{
+public:
+   TheSingularityReactor() : InstanceContentScript( 20035 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2006312, 5922953, 4, { -7.224293f, 0.039305f, -2.496346f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005944, 5895686, 4, { 12.728000f, 0.012478f, -12.728000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005945, 5895687, 4, { 12.728000f, 0.012478f, 12.728000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2005946, 5895690, 4, { -12.728000f, 0.012478f, 12.728000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2005947, 5895691, 4, { -12.728000f, 0.012478f, -12.728000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2005915, 5894863, 4, { 9.000000f, 0.012478f, -16.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005916, 5894864, 4, { 18.000000f, 0.012478f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005917, 5894866, 4, { 9.000000f, 0.012478f, 16.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005918, 5894867, 4, { -9.000000f, 0.012478f, 16.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005919, 5894868, 4, { -18.000000f, 0.012478f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2005920, 5894869, 4, { -9.000000f, 0.012478f, -16.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2005914, 5894871, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2005913, 5894872, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006575, 6061720, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006576, 6061721, 4, { 0.000000f, 0.039305f, -19.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006577, 6061722, 4, { 19.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006578, 6061723, 4, { 0.000000f, 0.039305f, 19.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006579, 6061724, 4, { -19.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006580, 6061725, 4, { 8.485300f, 0.039305f, -8.485300f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2006581, 6061727, 4, { 8.485300f, 0.039304f, 9.619522f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2006582, 6061728, 4, { -8.499329f, 0.015198f, 9.174744f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2006583, 6061730, 4, { -8.485300f, 0.039305f, -8.485300f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2006567, 6046991, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2006568, 6059913, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2006569, 6059911, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2006570, 6047214, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2006571, 6059909, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2006572, 6047213, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2006573, 6059910, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2006574, 6059912, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2006587, 6056540, 4, { -0.607457f, 0.039305f, -0.008893f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5854853, 5, { 0.035266f, 0.012478f, 11.380060f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.012478f, -18.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSirensongSea.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSirensongSea.cpp
new file mode 100644
index 00000000..aa02ef6f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSirensongSea.cpp
@@ -0,0 +1,52 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSirensongSea : public InstanceContentScript
+{
+public:
+   TheSirensongSea() : InstanceContentScript( 52 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 6819364, 4, { -44.318520f, 7.751197f, 441.540314f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -44.500000f, 7.751200f, 442.849213f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -44.500000f, 7.751197f, 479.639496f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007807, 6538465, 4, { -47.414162f, 7.761197f, 460.423798f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007808, 0, 4, { -47.907341f, 7.761197f, 468.566406f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6799021, 4, { -0.932950f, 2.896456f, -244.606796f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007805, 6799028, 4, { -3.967087f, 2.901603f, -197.601196f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -0.941400f, 2.840884f, -239.721100f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002872, 6815429, 4, { -2.123292f, 4.050672f, 57.244740f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007805, 6815430, 4, { -8.575331f, 3.826778f, 103.254997f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002735, 0, 4, { -1.497813f, 4.446609f, 60.548241f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2007793, 6532641, 4, { 2.243042f, 18.326050f, -408.926514f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2007794, 6563600, 4, { 41.646648f, 2.171033f, -286.870514f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007796, 6532642, 4, { 3.723403f, 2.665442f, -271.541992f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007800, 6532643, 4, { -60.279049f, 11.703340f, -43.075298f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007792, 6532645, 4, { -22.236191f, 16.347031f, 23.168619f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007809, 0, 4, { 22.290779f, 4.298793f, -79.014076f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007801, 6531305, 4, { -9.013880f, 2.088060f, 112.314201f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007802, 6531303, 4, { -11.146170f, 0.410454f, 129.890305f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007803, 6536676, 4, { -27.389811f, -1.621430f, 174.494598f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007804, 6536677, 4, { 8.575519f, -2.552741f, 200.835098f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007795, 6536431, 4, { 14.781270f, -3.423584f, 241.748199f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007797, 6786442, 4, { 11.182830f, 9.875385f, 302.008087f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007798, 6786460, 4, { -44.133888f, 5.932619f, 395.955688f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007799, 6516590, 4, { -45.003849f, 7.341055f, 413.088501f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6793848, 5, { 0.380240f, 21.347240f, -469.744507f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 0.000000f, 21.511560f, -462.178009f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheStepsofFaith.cpp
new file mode 100644
index 00000000..0484356d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheStepsofFaith.cpp
@@ -0,0 +1,48 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheStepsofFaith : public InstanceContentScript
+{
+public:
+   TheStepsofFaith() : InstanceContentScript( 20028 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Dragonkiller", 2004760, 4999878, 4, { 43.311161f, 37.600201f, 35.701099f }, 1.000000f );
+      instance->registerEObj( "Dragonkiller", 2004761, 4999884, 4, { -43.632969f, 37.582890f, -115.844101f }, 0.991760f );
+      instance->registerEObj( "Dragonkiller", 2004762, 4999881, 4, { 43.015141f, 37.582890f, -284.251709f }, 0.991760f );
+      instance->registerEObj( "Unknown0", 2004767, 4886787, 4, { -3.110714f, 0.000000f, -348.303711f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2004757, 0, 4, { 2.667883f, 0.324675f, 123.758301f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004758, 0, 4, { 4.085252f, 0.000000f, -28.159849f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004759, 0, 4, { 1.381998f, 0.000000f, -194.763107f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004763, 5038552, 4, { 0.000000f, -0.000000f, 45.788021f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004764, 5038553, 4, { -0.015320f, -0.015320f, -114.274803f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2004765, 5038554, 4, { -0.015320f, -0.000000f, -276.691895f }, 0.991760f );
+      instance->registerEObj( "Snare", 2005115, 0, 4, { -18.000000f, 0.045776f, -155.000000f }, 0.991760f );
+      instance->registerEObj( "Snare", 2005116, 0, 4, { 18.000000f, 0.045776f, -155.016403f }, 0.991760f );
+      instance->registerEObj( "Snare", 2005117, 0, 4, { -18.000000f, 0.045776f, -315.022491f }, 0.991760f );
+      instance->registerEObj( "Snare", 2005118, 0, 4, { 18.000000f, 0.045776f, -315.022491f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2005215, 5698814, 4, { 46.280449f, 37.600201f, 45.540260f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005216, 5698815, 4, { -42.818661f, 37.600201f, -120.297798f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005217, 5698817, 4, { 43.612808f, 37.600201f, -279.243195f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5035236, 5, { 5.791933f, 0.049998f, 253.589600f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, -350.057312f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -5.264404f, 0.045776f, 248.188004f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000104f, 125.000000f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.079958f, -35.000000f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -195.000000f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigil.cpp
new file mode 100644
index 00000000..6aef0416
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigil.cpp
@@ -0,0 +1,49 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheStoneVigil : public InstanceContentScript
+{
+public:
+   TheStoneVigil() : InstanceContentScript( 11 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000611, 0, 4, { 0.015198f, 0.350891f, -246.784195f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2001869, 4239670, 4, { -0.000510f, 3.949623f, 307.392395f }, 2.000000f );
+      instance->registerEObj( "Unknown2", 2001870, 0, 4, { 0.015198f, 3.949618f, 317.179199f }, 0.991760f );
+      instance->registerEObj( "Exit", 2001871, 4239710, 4, { 0.004404f, 0.076945f, -268.716095f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001872, 4239719, 4, { -0.106873f, 3.860474f, 136.491898f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2001873, 4239720, 4, { -0.625671f, 3.829956f, 136.461395f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2001874, 4239769, 4, { 20.620710f, 3.949919f, -80.003052f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2001875, 4239782, 4, { 20.559681f, 3.949919f, -80.277771f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2001876, 4239833, 4, { -0.197872f, 4.844441f, -223.182404f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001877, 4239838, 4, { 0.816688f, 4.854907f, -223.199707f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.484173f, 4.000121f, 298.130005f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001878, 4239736, 4, { 0.228821f, 3.982544f, 95.231567f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2001879, 4239917, 4, { -0.137390f, -0.076355f, -90.104553f }, 0.991760f );
+      instance->registerEObj( "Strongroomgate", 2001880, 4172415, 4, { -0.022534f, 4.052033f, -215.388901f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2001881, 4240140, 4, { 24.443140f, -0.000003f, -16.325529f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2001882, 4240143, 4, { 24.207170f, -0.386616f, -119.586502f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2001883, 4240145, 4, { 24.277100f, -0.015320f, -168.047699f }, 0.991760f );
+      instance->registerEObj( "Bertha", 2001884, 0, 4, { 56.748291f, 4.989685f, -86.472900f }, 0.991760f );
+      instance->registerEObj( "Bertha", 2001885, 0, 4, { 58.899940f, 4.989685f, -79.857857f }, 0.991760f );
+      instance->registerEObj( "Bertha", 2001886, 0, 4, { 56.935600f, 5.003687f, -73.150261f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2002618, 4334349, 4, { -0.221096f, 4.007471f, 137.674500f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2002618, 4334437, 4, { 0.000000f, 5.259686f, -221.867004f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002618, 4334925, 4, { -0.016311f, 0.434590f, -224.636993f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2002618, 4334973, 4, { 0.117383f, 0.135054f, -224.822800f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigilHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigilHard.cpp
new file mode 100644
index 00000000..0c581ec4
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigilHard.cpp
@@ -0,0 +1,45 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheStoneVigilHard : public InstanceContentScript
+{
+public:
+   TheStoneVigilHard() : InstanceContentScript( 25 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -138.305603f, -7.970538f, -56.005821f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -103.660202f, -7.970543f, -55.945332f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 4724293, 4, { -105.613098f, -7.970541f, -56.019131f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -47.933350f, -3.938287f, 35.426449f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2002872, 4725733, 4, { -47.291790f, -3.999902f, 33.349419f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 4725734, 4, { -38.530239f, -3.999901f, 23.897659f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -0.189037f, 3.895030f, -223.430893f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 4724833, 4, { 0.361240f, 3.879290f, -226.177200f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001869, 4559005, 4, { 131.881805f, 4.081586f, 116.103600f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.577202f, 8.000000f, 113.037003f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2002872, 4864542, 4, { -24.639549f, -0.050003f, 47.771549f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004182, 4933921, 4, { -0.990592f, 0.027524f, 96.986580f }, 1.000000f );
+      instance->registerEObj( "Bertha", 2003540, 0, 4, { 31.943810f, 0.326915f, -151.623703f }, 1.000000f );
+      instance->registerEObj( "Bertha", 2003541, 0, 4, { 34.257309f, 0.068675f, -143.886703f }, 1.000000f );
+      instance->registerEObj( "Bertha", 2003542, 0, 4, { 31.738079f, 0.068675f, -136.270004f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2003543, 4635871, 4, { 24.398520f, -0.049999f, -178.281799f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2003544, 4724326, 4, { -7.216811f, 0.000001f, -183.345200f }, 1.000000f );
+      instance->registerEObj( "Mainstoragevaultgate", 2003547, 4556427, 4, { -96.021538f, -1.183108f, -56.314732f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004183, 4933927, 4, { -48.010059f, -0.050043f, -85.297096f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004184, 4947920, 4, { -43.944740f, -0.050000f, -96.101196f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeExtreme.cpp
new file mode 100644
index 00000000..4201b990
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeExtreme.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheStrikingTreeExtreme : public InstanceContentScript
+{
+public:
+   TheStrikingTreeExtreme() : InstanceContentScript( 20023 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeHard.cpp
new file mode 100644
index 00000000..f2084d78
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeHard.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheStrikingTreeHard : public InstanceContentScript
+{
+public:
+   TheStrikingTreeHard() : InstanceContentScript( 20022 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarn.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarn.cpp
new file mode 100644
index 00000000..4c5b0c81
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarn.cpp
@@ -0,0 +1,80 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSunkenTempleofQarn : public InstanceContentScript
+{
+public:
+   TheSunkenTempleofQarn() : InstanceContentScript( 9 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000413, 0, 4, { -211.000000f, 0.000002f, 2.000000f }, 1.000000f );
+      instance->registerEObj( "TheWarden", 2000414, 0, 4, { -111.221802f, 14.346200f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "TheFlameofMagic", 2000415, 3878710, 4, { 8.987488f, -17.399031f, 53.998150f }, 1.000000f );
+      instance->registerEObj( "TheFruitofKnowledge", 2000416, 3878713, 4, { 9.005134f, -17.409531f, -53.991970f }, 1.000000f );
+      instance->registerEObj( "TheGemofAffluence", 2000417, 3878714, 4, { -151.210800f, -10.391200f, -62.004131f }, 1.000000f );
+      instance->registerEObj( "TheHelmofMight", 2000418, 3878715, 4, { -151.162506f, -7.407125f, 61.966801f }, 1.000000f );
+      instance->registerEObj( "Stonepedestal", 2000419, 0, 4, { 117.361099f, -3.708839f, -23.835030f }, 1.000000f );
+      instance->registerEObj( "DoortotheVaultofAether", 2000420, 3692635, 4, { 125.343102f, -0.964693f, -20.363819f }, 1.000000f );
+      instance->registerEObj( "Stonepedestal", 2000421, 0, 4, { 117.353203f, -3.713329f, 23.859619f }, 1.000000f );
+      instance->registerEObj( "DoortotheVaultofSecrets", 2000422, 3692636, 4, { 125.292603f, -1.268839f, 20.414270f }, 1.000000f );
+      instance->registerEObj( "Stonepedestal", 2000423, 0, 4, { 61.900841f, -17.710569f, 22.327250f }, 1.000000f );
+      instance->registerEObj( "DoortotheVaultofWealth", 2000424, 3692634, 4, { 70.569122f, -15.302040f, 21.475040f }, 1.000000f );
+      instance->registerEObj( "Stonepedestal", 2000425, 0, 4, { 61.907928f, -17.695210f, -22.335239f }, 1.000000f );
+      instance->registerEObj( "DoortotheVaultofSteel", 2000426, 3692631, 4, { 70.709091f, -15.224650f, -21.394239f }, 1.000000f );
+      instance->registerEObj( "Leftpan", 2000427, 0, 4, { 190.478394f, -4.200000f, -0.796000f }, 1.000000f );
+      instance->registerEObj( "ThePathtoRetribution", 2000429, 3692668, 4, { 206.461700f, 0.128704f, 0.089424f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2000430, 3693498, 4, { 191.008408f, -0.694424f, -14.489020f }, 1.000000f );
+      instance->registerEObj( "Sealeddoor", 2000431, 3692650, 4, { -9.500046f, -15.008410f, 0.079636f }, 1.000000f );
+      instance->registerEObj( "Sealeddoor", 2000432, 3689141, 4, { 9.008017f, -16.388670f, -27.499990f }, 1.000000f );
+      instance->registerEObj( "Sealeddoor", 2000433, 3692625, 4, { 8.971441f, -16.420650f, 27.488810f }, 1.000000f );
+      instance->registerEObj( "Sealedentryway", 2000434, 3692683, 4, { 75.484787f, -8.687153f, 0.065771f }, 1.000000f );
+      instance->registerEObj( "Sealeddoor", 2000435, 3692667, 4, { 132.458893f, -1.129695f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "InnerSanctumgate", 2000436, 3689097, 4, { -62.922180f, -9.678907f, -43.500019f }, 1.000000f );
+      instance->registerEObj( "LowerSanctumgate", 2000437, 3692684, 4, { 48.112701f, -45.229740f, 19.500000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4208417, 5, { -202.000000f, 0.000002f, 2.000000f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -173.000000f, 12.000000f, 4.500000f }, 1.000000f );
+      instance->registerEObj( "Rightpan", 2000428, 0, 4, { 190.478394f, -4.200000f, 0.831205f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2000443, 4208428, 4, { -96.278473f, -11.750040f, -58.418720f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2000444, 0, 4, { -95.744789f, -11.997100f, -61.865219f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000445, 4208432, 4, { 65.669456f, -45.004108f, -34.907001f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2000446, 0, 4, { 68.223022f, -44.998901f, -35.050049f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2000447, 4208435, 4, { 208.815399f, -4.000029f, 3.424202f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2000448, 0, 4, { 208.268402f, -4.000159f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 255.000000f, -3.999998f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "TheScalesofJudgment", 2000658, 0, 4, { 190.569901f, -2.364499f, 0.034341f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001156, 4069463, 4, { 190.000000f, -4.000078f, -0.800000f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2001157, 4069468, 4, { 190.000000f, -4.000021f, 0.800000f }, 1.000000f );
+      instance->registerEObj( "Leftpan", 2001165, 0, 4, { 190.478394f, -4.170000f, -0.796000f }, 1.000000f );
+      instance->registerEObj( "Rightpan", 2001166, 0, 4, { 190.478394f, -4.170000f, 0.831200f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2001765, 4334159, 4, { -10.000000f, -18.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2000281, 4323974, 4, { 228.750000f, -3.999998f, -9.250000f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000281, 4323976, 4, { 247.250000f, -3.999998f, -9.250000f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000281, 4323978, 4, { 228.750000f, -3.999998f, 9.250000f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2000281, 4323979, 4, { 247.250000f, -3.999998f, 9.250000f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2000655, 3947232, 4, { 225.699997f, -2.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2000656, 3947235, 4, { 238.000000f, -2.000000f, 12.250000f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2000657, 3947234, 4, { 238.000000f, -2.000000f, -12.250000f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2000866, 4309073, 4, { -82.750000f, -11.000000f, -61.680000f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2000867, 4309075, 4, { -69.175003f, -11.000000f, -52.720001f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2000868, 4309074, 4, { -55.514999f, -11.000000f, -61.680000f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2000650, 3879215, 4, { -20.000000f, -16.500000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2000651, 3879238, 4, { 9.000000f, -17.000000f, -15.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2000652, 3879240, 4, { 9.000000f, -17.000000f, 15.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2000653, 3879241, 4, { 50.000000f, -17.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2000654, 3879249, 4, { 124.500000f, -2.000000f, 0.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarnHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarnHard.cpp
new file mode 100644
index 00000000..794d9a7c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarnHard.cpp
@@ -0,0 +1,71 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSunkenTempleofQarnHard : public InstanceContentScript
+{
+public:
+   TheSunkenTempleofQarnHard() : InstanceContentScript( 26 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4876828, 5, { -201.196701f, 0.682657f, 0.238411f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000603, 0, 4, { -172.011398f, 12.472960f, 3.615232f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 128.831894f, -3.999020f, -0.076355f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2004381, 4688136, 4, { -62.950489f, -9.042180f, -43.471519f }, 1.000000f );
+      instance->registerEObj( "Lockeddoor", 2004382, 4686911, 4, { -52.102619f, -15.747660f, 0.003015f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004383, 4880940, 4, { -32.646118f, -15.322760f, -0.535999f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004384, 4688144, 4, { -9.445859f, -15.431120f, 0.091173f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { -24.503120f, -51.014042f, -2.151611f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2002872, 4877209, 4, { -24.127260f, -49.149910f, -1.216785f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2004385, 4877211, 4, { -33.270012f, -49.495350f, -17.436060f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2004576, 4880984, 4, { -32.350761f, -15.369120f, 1.208490f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004386, 4877345, 4, { 47.455811f, -46.541481f, 18.191370f }, 1.000000f );
+      instance->registerEObj( "Lockeddoor", 2004388, 4688151, 4, { 166.535797f, -43.147060f, 0.015993f }, 0.991760f );
+      instance->registerEObj( "Unknown9", 2004402, 4877619, 4, { 213.946701f, -42.801571f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2004389, 4688148, 4, { 207.414703f, -1.759183f, 0.009065f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 256.782104f, -3.999999f, 0.025025f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2002872, 4877953, 4, { 257.319305f, -2.265031f, 0.350891f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2004431, 4879695, 4, { 218.928802f, -2.699499f, 0.015198f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2004391, 4742442, 4, { -44.851521f, -16.474951f, -61.569599f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2004392, 4742441, 4, { -34.082909f, -16.222090f, -39.745499f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2004403, 4688145, 4, { -9.412401f, -14.700150f, -48.979301f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2004393, 4685534, 4, { 13.954340f, -16.478741f, -36.432899f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2004394, 4688137, 4, { 8.975560f, -14.432130f, -28.492041f }, 0.991760f );
+      instance->registerEObj( "Magickedpedestal", 2004396, 4688166, 4, { 53.655460f, -15.371500f, 0.015198f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2004397, 4688139, 4, { 70.286049f, -14.700250f, -20.531210f }, 0.991760f );
+      instance->registerEObj( "Magickedpedestal", 2004398, 4685848, 4, { 79.511627f, -15.096250f, -36.674881f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2004399, 4688140, 4, { 70.381950f, -14.689050f, 20.486361f }, 0.991760f );
+      instance->registerEObj( "Magickedpedestal", 2004400, 4685849, 4, { 79.392357f, -14.749610f, 36.721691f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2002872, 4981816, 4, { 97.856079f, -4.013123f, -1.052917f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2004772, 4878447, 4, { 98.950607f, -4.000012f, -2.245166f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2004602, 0, 4, { 133.195908f, -4.013123f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2004603, 0, 4, { 133.195908f, -4.013123f, 12.924380f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2004709, 0, 4, { 128.074203f, -4.000000f, 18.223900f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2004710, 0, 4, { 115.087196f, -4.000000f, 18.223900f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2004711, 0, 4, { 102.068398f, -4.000000f, 18.223900f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2004712, 0, 4, { 97.276253f, -4.013123f, 12.893800f }, 0.991760f );
+      instance->registerEObj( "Unknown29", 2004713, 0, 4, { 97.276253f, -4.013123f, -0.045776f }, 0.991760f );
+      instance->registerEObj( "Unknown30", 2004714, 0, 4, { 97.293999f, -4.000000f, -12.961500f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2004715, 0, 4, { 102.037003f, -4.013123f, -17.868410f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2004716, 0, 4, { 115.069099f, -4.000000f, -17.860500f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2004717, 0, 4, { 128.038498f, -4.013123f, -17.898861f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2004718, 0, 4, { 133.195908f, -4.013123f, -12.954960f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2004604, 0, 4, { 130.266205f, -4.013123f, 15.518430f }, 0.991760f );
+      instance->registerEObj( "Unknown36", 2004719, 0, 4, { 99.982773f, -4.000000f, 15.879740f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2004720, 0, 4, { 100.288803f, -4.000000f, -15.013530f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2004721, 0, 4, { 130.501694f, -4.000000f, -14.939790f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroft.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroft.cpp
new file mode 100644
index 00000000..9c75a08b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroft.cpp
@@ -0,0 +1,45 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheTamTaraDeepcroft : public InstanceContentScript
+{
+public:
+   TheTamTaraDeepcroft() : InstanceContentScript( 2 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Cultistorb", 2000061, 3816929, 4, { -8.115554f, 31.427530f, -15.950320f }, 1.000000f );
+      instance->registerEObj( "Cultistorb", 2000062, 3817025, 4, { -22.784361f, 25.526300f, 20.482220f }, 1.000000f );
+      instance->registerEObj( "Sealedbarrier", 2000060, 2065984, 4, { -103.196800f, 16.825590f, 15.152160f }, 0.950000f );
+      instance->registerEObj( "Cultistrosary", 2000057, 0, 4, { -179.952606f, 14.711600f, -4.996500f }, 0.750000f );
+      instance->registerEObj( "Cultistorb", 2000063, 3817039, 4, { -89.733833f, 15.701490f, 13.923830f }, 0.991789f );
+      instance->registerEObj( "Cultistorb", 2000067, 3817052, 4, { -94.766899f, 15.709600f, 3.820237f }, 1.000000f );
+      instance->registerEObj( "Unknown0", 2000054, 0, 4, { -53.345570f, 49.647820f, -146.799103f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f );
+      instance->registerEObj( "Unknown2", 2001697, 4108043, 4, { 13.157160f, 29.280100f, -7.370761f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001698, 4108046, 4, { -18.524361f, 23.342850f, 42.375740f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001699, 4108055, 4, { 19.811380f, 30.119770f, -20.717630f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2001700, 0, 4, { 19.739401f, 30.119801f, -19.838511f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001701, 4108071, 4, { -3.087158f, 23.754129f, 40.895020f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001702, 0, 4, { -3.984208f, 23.754129f, 41.874859f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2001703, 4108078, 4, { -95.779678f, 14.524550f, 45.017761f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001704, 0, 4, { -97.035683f, 14.524550f, 44.317101f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2001741, 3860684, 4, { -64.365189f, 15.049010f, -4.720837f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f );
+      instance->registerEObj( "Entrance", 2000182, 4108136, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroftHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroftHard.cpp
new file mode 100644
index 00000000..16bea6bd
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroftHard.cpp
@@ -0,0 +1,76 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheTamTaraDeepcroftHard : public InstanceContentScript
+{
+public:
+   TheTamTaraDeepcroftHard() : InstanceContentScript( 24 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f );
+      instance->registerEObj( "Unknown1", 2002872, 4660133, 4, { -67.088028f, 14.657070f, -5.210713f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2004286, 4745117, 4, { -60.778740f, 14.055000f, -22.019831f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004287, 4745111, 4, { -42.778549f, 14.055000f, -12.943500f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004288, 4745124, 4, { -48.035992f, 14.055000f, -5.265638f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004289, 4745125, 4, { -57.996319f, 14.055000f, -5.661358f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2004290, 4745126, 4, { -59.234348f, 14.055000f, -15.781390f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004291, 4745127, 4, { -50.008671f, 14.055000f, -22.601339f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2004285, 4867481, 4, { -55.031620f, 14.055000f, 5.443754f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004285, 4867482, 4, { -41.704861f, 14.055000f, 2.969403f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004285, 4867483, 4, { -33.780270f, 14.055000f, -9.729918f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004285, 4867484, 4, { -39.301521f, 14.055000f, -26.615370f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004285, 4867485, 4, { -55.347961f, 14.055000f, -30.450310f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004285, 4867486, 4, { -65.834686f, 14.055000f, -19.944820f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2002872, 4660142, 4, { 19.425310f, 16.400459f, 72.640419f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2004084, 4660138, 4, { 47.314381f, 16.403030f, 108.679100f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002735, 0, 4, { 20.629601f, 16.280300f, 75.420700f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2002735, 0, 4, { 88.048500f, 22.493870f, -21.533701f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2002872, 4660145, 4, { 88.376717f, 21.338551f, -19.283840f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2004285, 4771300, 4, { 84.103310f, 22.101000f, -58.390091f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2004285, 4771301, 4, { 96.234253f, 22.101000f, -56.482040f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2004285, 4771302, 4, { 105.255798f, 22.101000f, -44.764778f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2004285, 4771303, 4, { 102.038200f, 22.101000f, -32.837021f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2004285, 4771304, 4, { 91.888603f, 22.101000f, -25.882389f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2004285, 4771305, 4, { 80.039169f, 22.101000f, -26.985500f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2004285, 4771306, 4, { 71.290688f, 22.101000f, -37.049461f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2004285, 4771307, 4, { 71.819580f, 22.079769f, -49.945210f }, 0.991760f );
+      instance->registerEObj( "Tornfolio", 2004297, 0, 4, { -47.454521f, 44.378349f, -68.195801f }, 0.991760f );
+      instance->registerEObj( "Tornfolio", 2004298, 0, 4, { -11.833840f, 29.549919f, -15.995260f }, 1.000000f );
+      instance->registerEObj( "Tornfolio", 2004299, 0, 4, { -28.185230f, 24.286421f, 20.665119f }, 0.991760f );
+      instance->registerEObj( "Tornfolio", 2004300, 0, 4, { 72.129387f, 16.396311f, 132.066803f }, 0.991760f );
+      instance->registerEObj( "Tornfolio", 2004301, 0, 4, { 80.744392f, 16.907101f, 57.719940f }, 1.000000f );
+      instance->registerEObj( "Tornfolio", 2004302, 0, 4, { 147.103104f, 18.005850f, 69.150192f }, 1.000000f );
+      instance->registerEObj( "Tornfolio", 2004303, 0, 4, { -147.644699f, 15.900680f, 113.328697f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2004086, 4656964, 4, { -7.602334f, 30.454849f, -18.853220f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2004088, 4656965, 4, { -20.840630f, 24.342739f, 19.409069f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2004087, 4671678, 4, { 11.105700f, 29.275560f, -8.141251f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2004089, 4671683, 4, { -6.673915f, 23.630680f, 39.042259f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2004093, 4671679, 4, { 74.836761f, 16.445829f, 108.252800f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2004094, 4671680, 4, { 100.083900f, 17.257870f, 47.440189f }, 0.991760f );
+      instance->registerEObj( "Defiledcoffin", 2004090, 4695648, 4, { 78.676689f, 17.793221f, 150.248901f }, 1.000000f );
+      instance->registerEObj( "Defiledcoffin", 2004091, 4671204, 4, { 72.424454f, 18.387079f, 48.386349f }, 0.991760f );
+      instance->registerEObj( "Defiledcoffin", 2004092, 4668899, 4, { 146.684906f, 17.990360f, 69.562866f }, 0.991760f );
+      instance->registerEObj( "Aetherialflow", 2004095, 4696055, 4, { 96.409500f, 22.100000f, -49.506569f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2004099, 0, 4, { -85.344437f, 15.048210f, 7.188452f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2004096, 4656966, 4, { -89.972237f, 14.236630f, 16.250851f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2004097, 4656967, 4, { -97.824608f, 14.083040f, 2.446555f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2004098, 4660132, 4, { -89.234444f, 13.859010f, 8.573526f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f );
+      instance->registerEObj( "Entrance", 2000182, 4660224, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTempleoftheFist.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheTempleoftheFist.cpp
new file mode 100644
index 00000000..e61d0108
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheTempleoftheFist.cpp
@@ -0,0 +1,62 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheTempleoftheFist : public InstanceContentScript
+{
+public:
+   TheTempleoftheFist() : InstanceContentScript( 51 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 423.422485f, 65.445923f, 441.737213f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2002872, 6797376, 4, { 423.331299f, 65.474983f, 444.327301f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 6797378, 4, { 442.370697f, 65.474983f, 460.851013f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { -249.873398f, 296.000000f, -77.899078f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002872, 6797503, 4, { -249.992004f, 296.000000f, -75.599426f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 6797504, 4, { -250.001602f, 296.000000f, -116.498398f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2008209, 6769836, 4, { -249.829300f, 296.000000f, -95.249687f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { -249.652893f, 275.999908f, -441.789886f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2002872, 6797511, 4, { -249.766495f, 275.999603f, -438.543091f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 380.357208f, 48.477909f, 199.450607f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 6797015, 5, { 384.232910f, 48.477909f, 190.203598f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -250.049606f, 275.999908f, -476.951202f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2007880, 6741864, 4, { 336.278503f, 53.817650f, 313.365601f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007881, 6653501, 4, { 424.189697f, 65.474983f, 415.504608f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007882, 6797118, 4, { 339.809296f, 54.757198f, 321.431305f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2007883, 6742023, 4, { 363.048401f, 59.017422f, 336.516998f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007884, 6742029, 4, { 377.123596f, 62.271931f, 343.185791f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007885, 6797120, 4, { 384.602997f, 66.764778f, 371.233795f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007886, 6797121, 4, { 410.327301f, 66.278519f, 376.253693f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007887, 6797122, 4, { 424.830414f, 66.366417f, 401.730988f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007888, 6765334, 4, { -344.965302f, 288.858490f, 3.678721f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007889, 6779339, 4, { -250.141205f, 295.979187f, -44.449520f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2008288, 6852038, 4, { -371.378693f, 270.328491f, 112.430801f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2008288, 6852040, 4, { -371.275787f, 270.243988f, 109.578796f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2008288, 6852041, 4, { -370.932190f, 270.135010f, 106.583000f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2008288, 6852045, 4, { -371.375702f, 270.360413f, 99.153847f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2008288, 6852043, 4, { -370.707001f, 270.230713f, 95.389702f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2008288, 6852044, 4, { -370.509613f, 270.239685f, 92.297852f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2008288, 6773554, 4, { -365.927399f, 288.163910f, 5.884438f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2008288, 6852047, 4, { -362.804993f, 288.071808f, 5.945870f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2008288, 6852048, 4, { -359.589600f, 287.859314f, 5.824460f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2008288, 6852051, 4, { -352.795807f, 287.719910f, 5.701195f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2008288, 6852050, 4, { -349.930786f, 287.818604f, 5.373718f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2008288, 6852052, 4, { -346.784210f, 287.961914f, 5.057184f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2007890, 6796543, 4, { -226.703293f, 299.977112f, -260.456207f }, 0.991760f );
+      instance->registerEObj( "Unknown33", 2007891, 6796598, 4, { -250.507401f, 292.000000f, -384.725800f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2007892, 6771621, 4, { -250.875107f, 292.000000f, -436.964691f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheThousandMawsofTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheThousandMawsofTotoRak.cpp
new file mode 100644
index 00000000..f210ba9c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheThousandMawsofTotoRak.cpp
@@ -0,0 +1,75 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheThousandMawsofTotoRak : public InstanceContentScript
+{
+public:
+   TheThousandMawsofTotoRak() : InstanceContentScript( 1 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000404, 0, 4, { 216.937500f, -35.568851f, -142.076797f }, 0.961304f );
+      instance->registerEObj( "Unknown1", 2000133, 0, 4, { 185.564896f, -34.195511f, -144.640305f }, 0.900235f );
+      instance->registerEObj( "Exit", 2000683, 0, 4, { 237.565506f, -38.900299f, -144.195099f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2000041, 3879345, 4, { 191.261795f, -36.122822f, -143.910904f }, 1.267374f );
+      instance->registerEObj( "Unknown3", 2000040, 0, 4, { 191.150696f, -36.117340f, -144.592300f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001005, 0, 4, { 188.864594f, -35.987011f, -144.216095f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000131, 4126014, 4, { -117.593002f, -4.171226f, 107.608299f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2000132, 4127292, 4, { -76.504066f, -8.171217f, -41.161350f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2000137, 4127387, 4, { -119.798599f, -4.165526f, 104.508904f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2000138, 4127414, 4, { -78.310173f, -8.133030f, -44.002850f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001152, 4374098, 4, { 197.405899f, -39.475101f, -147.966705f }, 0.991760f );
+      instance->registerEObj( "Waterstainednote", 2000093, 0, 4, { -241.596100f, 4.936373f, -72.770317f }, 0.930753f );
+      instance->registerEObj( "Waterstainednote", 2000094, 0, 4, { -211.121002f, 2.082635f, -67.117737f }, 0.991789f );
+      instance->registerEObj( "Waterstainednote", 2000095, 0, 4, { -204.427002f, -1.617569f, 21.831829f }, 1.000000f );
+      instance->registerEObj( "Waterstainednote", 2000096, 0, 4, { -149.074097f, -2.569309f, 101.795403f }, 0.930753f );
+      instance->registerEObj( "Magitekphotocell", 2000100, 0, 4, { -202.105804f, 0.318934f, -79.179108f }, 0.991789f );
+      instance->registerEObj( "Magitekphotocell", 2000101, 0, 4, { -221.659195f, -4.425579f, 54.985451f }, 0.869717f );
+      instance->registerEObj( "Magitekphotocell", 2000102, 0, 4, { -204.699799f, -4.926546f, 88.822723f }, 0.900235f );
+      instance->registerEObj( "Magitekphotocell", 2000103, 0, 4, { -104.023300f, -3.463795f, 104.075897f }, 0.839199f );
+      instance->registerEObj( "Magitekterminal", 2000116, 0, 4, { -112.013199f, -4.132327f, 112.031403f }, 0.991789f );
+      instance->registerEObj( "Unknown10", 2000117, 1699196, 4, { -95.990372f, -4.125101f, 111.985901f }, 0.991789f );
+      instance->registerEObj( "Magitekterminal", 2000118, 0, 4, { -80.026077f, -8.132326f, -47.971760f }, 0.961271f );
+      instance->registerEObj( "Unknown11", 2000121, 1699201, 4, { -95.538803f, -8.133920f, -48.020191f }, 0.991789f );
+      instance->registerEObj( "Accusationchamberdoor", 2000384, 3302267, 4, { -207.996994f, 0.110343f, -95.749359f }, 0.961271f );
+      instance->registerEObj( "Abacinationchamberdoor", 2000385, 3302270, 4, { 96.210892f, -19.927860f, -112.002098f }, 0.961271f );
+      instance->registerEObj( "Unknown12", 2000389, 3302276, 4, { -223.993698f, 2.170142f, -111.314598f }, 0.900235f );
+      instance->registerEObj( "Unknown13", 2000390, 3302281, 4, { 15.396310f, -12.161490f, -31.967699f }, 0.961271f );
+      instance->registerEObj( "Unknown14", 2000391, 3302277, 4, { -111.986000f, -11.694670f, -63.677799f }, 0.961271f );
+      instance->registerEObj( "Unknown15", 2000392, 3302279, 4, { -54.326931f, -12.619540f, -135.517899f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2000393, 3302283, 4, { 127.918297f, -24.124969f, -112.616798f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2000397, 3302282, 4, { -66.330208f, -8.057444f, -48.020191f }, 0.961271f );
+      instance->registerEObj( "Unknown18", 2000398, 3302278, 4, { -103.188698f, -12.587360f, -137.701004f }, 0.991789f );
+      instance->registerEObj( "Unknown19", 2000399, 3302280, 4, { -7.119315f, -12.783910f, -137.865402f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2000400, 3302275, 4, { 175.723206f, -34.137970f, -140.074005f }, 0.930753f );
+      instance->registerEObj( "Magitekphotocell", 2000104, 0, 4, { -130.358597f, -8.977930f, -71.240982f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2000111, 0, 4, { -221.057495f, -0.076355f, -113.847603f }, 0.991760f );
+      instance->registerEObj( "Unknown22", 2000112, 0, 4, { 18.393040f, -12.250300f, -28.183680f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2000113, 0, 4, { -109.852501f, -11.441870f, -58.962391f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2000114, 0, 4, { -55.111301f, -12.534730f, -140.141006f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2000115, 0, 4, { 121.910698f, -23.325809f, -110.515297f }, 1.000000f );
+      instance->registerEObj( "Magitekphotocell", 2000105, 0, 4, { -130.724106f, -9.414856f, -68.131592f }, 0.991760f );
+      instance->registerEObj( "Magitekphotocell", 2000106, 0, 4, { -130.418900f, -9.567444f, -67.856873f }, 0.991760f );
+      instance->registerEObj( "Magitekphotocell", 2000107, 0, 4, { -130.101807f, -9.739193f, -67.526657f }, 0.991789f );
+      instance->registerEObj( "Magitekphotocell", 2000107, 0, 4, { -129.796707f, -9.914070f, -67.221481f }, 0.991789f );
+      instance->registerEObj( "Magitekphotocell", 2000039, 0, 4, { -73.754570f, -6.333896f, 21.536640f }, 0.991789f );
+      instance->registerEObj( "Magitekphotocell", 2000108, 0, 4, { -186.655807f, -0.160111f, -10.531350f }, 1.000000f );
+      instance->registerEObj( "Magitekphotocell", 2000109, 0, 4, { -143.922195f, 0.079653f, 1.801933f }, 0.961271f );
+      instance->registerEObj( "Magitekphotocell", 2000110, 0, 4, { -233.539398f, -0.167908f, -103.013702f }, 0.991760f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -311.485504f, 9.496978f, -76.989082f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4127435, 5, { -322.238495f, 11.991770f, -78.470192f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheUnendingCoilofBahamutUltimate.cpp
new file mode 100644
index 00000000..c52e36e8
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheUnendingCoilofBahamutUltimate.cpp
@@ -0,0 +1,33 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheUnendingCoilofBahamutUltimate : public InstanceContentScript
+{
+public:
+   TheUnendingCoilofBahamutUltimate() : InstanceContentScript( 30057 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7040178, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2007457, 7040443, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007457, 7040473, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2007457, 7144982, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007457, 7075281, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007457, 7144855, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -20.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 7068018, 5, { 0.000000f, 0.000000f, 18.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheValentionesCeremony.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheValentionesCeremony.cpp
new file mode 100644
index 00000000..90f1ee09
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheValentionesCeremony.cpp
@@ -0,0 +1,69 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheValentionesCeremony : public InstanceContentScript
+{
+public:
+   TheValentionesCeremony() : InstanceContentScript( 25002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2007457, 7231658, 4, { -3.500000f, -6.000000f, -42.000000f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2007457, 7231654, 4, { 17.466560f, -6.000000f, -45.513531f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2007457, 7231667, 4, { 18.500000f, -6.000000f, -59.500000f }, 0.991760f );
+      instance->registerEObj( "Unknown3", 2007457, 7231666, 4, { -9.500000f, -6.000000f, -68.500000f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2007457, 7231668, 4, { -18.500000f, -6.000000f, -59.500000f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2007457, 7231669, 4, { 11.489990f, -6.027344f, -68.528320f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2007457, 7231672, 4, { 15.495000f, -6.027344f, -77.500671f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2007457, 7231671, 4, { -16.500000f, -6.000000f, -71.500000f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2007457, 7231673, 4, { 8.500000f, -8.000000f, -95.199997f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007457, 7231674, 4, { -6.515625f, -8.011047f, -92.729057f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2007457, 7231677, 4, { -6.500000f, -8.000000f, -89.699997f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007457, 7231676, 4, { 8.475829f, -8.011047f, -101.701401f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2007457, 7231678, 4, { -18.500000f, -8.000000f, -112.699997f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007457, 7231679, 4, { 14.500000f, -8.000000f, -111.699997f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007457, 7231681, 4, { 10.000000f, -8.000000f, -134.699997f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2007457, 7231680, 4, { -15.500000f, -8.000000f, -127.699997f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007457, 7231683, 4, { -16.500000f, -10.000000f, -160.699997f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007457, 7231684, 4, { 3.558000f, -10.000000f, -150.699997f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007457, 7231686, 4, { 6.499207f, -10.025270f, -172.723999f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2007457, 7231687, 4, { -17.471680f, -10.025270f, -170.716904f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2007457, 7231689, 4, { 18.500000f, -10.000000f, -190.199997f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007457, 7231688, 4, { -3.550100f, -10.000000f, -186.699997f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007457, 7231690, 4, { -18.500000f, -10.000000f, -190.199997f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007457, 7231691, 4, { 3.550100f, -10.000000f, -186.699997f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007457, 7171421, 4, { -0.007954f, -11.881100f, -230.514008f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007457, 7231843, 4, { 0.006785f, -11.881100f, -253.447296f }, 1.000000f );
+      instance->registerEObj( "ValentionesDaycard", 2009385, 7231795, 4, { -5.426984f, -11.917360f, -260.462494f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009387, 7231796, 4, { -9.668927f, -11.917360f, -260.401611f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009388, 7231797, 4, { -6.021372f, -11.917360f, -253.618393f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009389, 7231798, 4, { -10.334230f, -11.917360f, -253.545105f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009390, 7231799, 4, { -4.210987f, -11.917360f, -246.692703f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009391, 7231800, 4, { -8.330921f, -11.917360f, -246.662094f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009392, 7231801, 4, { 5.258507f, -11.917360f, -260.425812f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009393, 7231802, 4, { 9.500511f, -11.917360f, -260.425812f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009394, 7231803, 4, { 6.041663f, -11.881100f, -253.545105f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009395, 7231804, 4, { 10.315010f, -11.881100f, -253.545105f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009396, 7231805, 4, { 3.961101f, -11.917360f, -246.662094f }, 0.991760f );
+      instance->registerEObj( "ValentionesDaycard", 2009397, 7231806, 4, { 8.203044f, -11.917360f, -246.662094f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 7186874, 5, { -0.017344f, 0.700000f, 15.850460f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.151178f, -11.881100f, -262.439209f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007457, 7167001, 4, { -0.198283f, 0.437501f, 3.359166f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007457, 7167005, 4, { -10.222270f, -6.000000f, -25.717331f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007457, 7167002, 4, { 10.259260f, -6.000000f, -25.717331f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2007457, 7154005, 4, { -0.045776f, -11.734250f, -210.009903f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheVault.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheVault.cpp
new file mode 100644
index 00000000..cb625442
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheVault.cpp
@@ -0,0 +1,63 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheVault : public InstanceContentScript
+{
+public:
+   TheVault() : InstanceContentScript( 34 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 5588600, 4, { 0.359463f, 300.000000f, 26.171600f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 0.428600f, 300.000000f, 24.562250f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005580, 5873754, 4, { 0.360928f, 300.000000f, -15.306860f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006743, 5474300, 4, { 39.139400f, -300.007690f, 29.587160f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2006744, 5474303, 4, { 43.961182f, -299.855103f, -30.197689f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2006745, 6143050, 4, { -34.927921f, -300.007690f, -80.460876f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2006746, 6147782, 4, { -38.559631f, -300.007690f, -72.068359f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2006747, 6147781, 4, { -38.986820f, -300.007690f, -30.014530f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2006748, 6143048, 4, { 52.795311f, -299.984589f, -36.063671f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2006749, 6147791, 4, { 0.604760f, -291.999908f, -117.413803f }, 1.000000f );
+      instance->registerEObj( "Bonds", 2006752, 0, 4, { -52.262211f, -300.000793f, -27.878300f }, 0.991760f );
+      instance->registerEObj( "Bonds", 2006752, 0, 4, { 56.960300f, -299.984589f, -73.657806f }, 0.991760f );
+      instance->registerEObj( "Unknown10", 2002872, 5581166, 4, { -18.416611f, -292.000000f, -99.614120f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2002735, 0, 4, { -20.099001f, -292.000000f, -98.859291f }, 0.700000f );
+      instance->registerEObj( "Unknown12", 2005106, 5581173, 4, { -0.494135f, -292.000000f, -117.713799f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 18.757099f, 0.000000f, 72.079903f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2002872, 5583050, 4, { 17.161560f, 0.000000f, 73.880867f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2005087, 5474300, 4, { 37.735470f, -300.007690f, 30.228149f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2005088, 5499954, 4, { 51.884090f, -300.000000f, -35.577080f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005089, 5474303, 4, { 44.255379f, -300.000000f, -31.015051f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2005090, 5474308, 4, { -36.242680f, -300.000000f, -29.871010f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2005091, 5474306, 4, { -37.591751f, -300.000000f, -69.819733f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2005092, 5499959, 4, { -33.701191f, -300.000000f, -79.843872f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2005093, 5499966, 4, { 6.953651f, -281.975708f, -150.744995f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2005094, 5476161, 4, { 101.518402f, -263.140503f, -12.115350f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2005095, 5476162, 4, { 101.390800f, -263.204315f, 11.842000f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2005096, 5474532, 4, { 99.222763f, -264.000000f, -0.362554f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2005097, 5499987, 4, { 22.634041f, 0.000000f, 71.960167f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2005098, 5499980, 4, { -17.585621f, 0.000000f, 72.136276f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2005099, 5444302, 4, { -92.607063f, -0.015320f, 0.076233f }, 0.991760f );
+      instance->registerEObj( "Unknown28", 2005100, 5499663, 4, { -52.663239f, 291.000000f, 42.623951f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2005101, 5499660, 4, { -67.359016f, 291.000000f, 42.656231f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2005102, 5499645, 4, { -66.869476f, 291.000000f, 55.587841f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2005103, 5499653, 4, { -53.398609f, 291.000000f, 55.570320f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2005104, 5499600, 4, { -46.140011f, 291.000000f, 48.667049f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5578486, 5, { -5.010592f, -300.000000f, 86.198753f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 11.135890f, -300.000000f, 78.862717f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.136796f, 299.977112f, -9.654591f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheVoidArk.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheVoidArk.cpp
new file mode 100644
index 00000000..f6c2b02b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheVoidArk.cpp
@@ -0,0 +1,98 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheVoidArk : public InstanceContentScript
+{
+public:
+   TheVoidArk() : InstanceContentScript( 30029 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -288.000000f, 196.497299f, 30.140800f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 5965588, 4, { -288.643890f, 196.450897f, 30.140779f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 5965606, 4, { -315.195099f, 196.497299f, 1.375446f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2006489, 5961744, 4, { -289.112610f, 196.497299f, -1.589648f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 0.220062f, -191.999893f, 170.174606f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2002872, 5965590, 4, { 0.354952f, -191.297607f, 150.971207f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2002872, 6047090, 4, { -0.028858f, -192.000000f, 97.337067f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2006559, 5996197, 4, { -0.306469f, -192.000000f, 68.934158f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2006595, 6067109, 4, { 0.064018f, -192.000107f, 129.936996f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002735, 0, 4, { 288.000000f, -400.000000f, 205.443207f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 5965591, 4, { 287.996399f, -400.000000f, 205.904694f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2006503, 6046596, 4, { 288.000000f, -415.885803f, 122.751602f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2006504, 6046597, 4, { 304.000000f, -415.885803f, 138.751602f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2006505, 6046598, 4, { 288.000000f, -415.885803f, 154.751602f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2006506, 6046599, 4, { 272.000000f, -415.885803f, 138.751602f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2006507, 5960467, 4, { 287.856598f, -415.885803f, 143.716400f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2006508, 5960881, 4, { 285.596008f, -415.885803f, 140.864807f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2006509, 6046600, 4, { 302.141998f, -415.885803f, 124.609596f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2006510, 6046601, 4, { 302.141998f, -415.885803f, 152.893600f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2006511, 6046603, 4, { 273.858002f, -415.885803f, 152.893600f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2006512, 6046605, 4, { 273.858002f, -415.885803f, 124.609596f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2006557, 0, 4, { 287.799805f, -404.548615f, 195.221893f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2002735, 0, 4, { 288.000000f, -384.162506f, -95.628960f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2002872, 5965592, 4, { 288.000000f, -384.162506f, -95.628960f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 288.126709f, -384.000000f, -148.276505f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2006553, 5963619, 4, { 315.121185f, -383.995300f, -124.638199f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2006554, 5963620, 4, { 306.932800f, -383.996399f, -105.577400f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2006555, 5963624, 4, { 269.917114f, -383.996613f, -104.726303f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2006556, 5963623, 4, { 260.673615f, -383.995697f, -124.058601f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2006558, 5962617, 4, { 290.482605f, -383.959595f, -120.825897f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2002618, 6081545, 4, { -299.194611f, 190.131699f, 168.493698f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2006480, 6038921, 4, { 0.900612f, -170.857101f, -94.333923f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2006481, 6038938, 4, { -0.336078f, -173.837097f, -233.919296f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2006482, 6038951, 4, { 288.027313f, -389.776489f, 270.818390f }, 0.991760f );
+      instance->registerEObj( "Unknown33", 2006483, 6038992, 4, { 287.894806f, -401.574585f, 187.283997f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2006484, 6038994, 4, { 284.993500f, -415.823212f, 86.327766f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2006485, 6039015, 4, { 287.921509f, -390.522614f, 3.389776f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2002872, 5965364, 4, { -300.557312f, 212.000000f, 117.936600f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2002872, 5965516, 4, { -278.075989f, 212.000000f, 79.110680f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2006486, 6035569, 4, { -315.424896f, 212.000000f, 174.253601f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2006487, 6034672, 4, { -258.244904f, 212.000000f, 126.032799f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2006488, 6048680, 4, { -328.040894f, 212.000000f, 55.589699f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2002735, 0, 4, { -419.231812f, 186.000000f, -74.560600f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2002872, 5965586, 4, { -419.093201f, 186.000000f, -73.534798f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2006513, 6035498, 4, { -419.235107f, 186.000000f, -161.599701f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2006514, 0, 4, { -431.485107f, 186.000000f, -119.195801f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2006515, 6035399, 4, { -436.306396f, 186.750000f, -119.027199f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2006516, 6035398, 4, { -435.929291f, 186.750000f, -118.520103f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2006517, 6035400, 4, { -436.270203f, 186.750000f, -119.108101f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2006518, 6035453, 4, { -456.071899f, 186.169495f, -117.249802f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2006519, 6046161, 4, { -422.286713f, 186.000000f, -116.948799f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2002735, 0, 4, { 0.000000f, -191.204102f, -65.541000f }, 1.000000f );
+      instance->registerEObj( "Unknown51", 2002872, 5965587, 4, { -0.369300f, -191.254105f, -64.493927f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2006490, 5960825, 4, { 0.213054f, -159.951599f, -180.332703f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2006491, 5960830, 4, { -8.808896f, -159.965195f, -172.749893f }, 1.000000f );
+      instance->registerEObj( "Unknown54", 2006492, 5960829, 4, { 0.816076f, -160.000000f, -164.794800f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2006493, 5960826, 4, { 9.567483f, -160.000000f, -172.413895f }, 1.000000f );
+      instance->registerEObj( "Unknown56", 2006494, 5960831, 4, { 11.416360f, -160.000000f, -185.623001f }, 1.000000f );
+      instance->registerEObj( "Unknown57", 2006495, 5960837, 4, { 21.345461f, -160.000000f, -178.053101f }, 1.000000f );
+      instance->registerEObj( "Unknown58", 2006496, 5960835, 4, { 21.132700f, -159.955307f, -155.512405f }, 1.000000f );
+      instance->registerEObj( "Unknown59", 2006497, 5960832, 4, { 10.413970f, -159.959305f, -145.012100f }, 1.000000f );
+      instance->registerEObj( "Unknown60", 2006498, 5960833, 4, { -11.132170f, -159.967697f, -145.107101f }, 1.000000f );
+      instance->registerEObj( "Unknown61", 2006499, 5960834, 4, { -23.702101f, -159.669800f, -155.260895f }, 1.000000f );
+      instance->registerEObj( "Unknown62", 2006500, 5960836, 4, { -22.808531f, -160.000000f, -178.798004f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2006501, 5960817, 4, { -11.047090f, -159.967697f, -185.956802f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2006473, 5939346, 4, { -319.478088f, 216.000000f, 222.247696f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2006474, 5939357, 4, { -288.014099f, 196.138107f, 47.531738f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2006475, 5938845, 4, { -429.923004f, 190.000000f, -34.653320f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2006476, 5938846, 4, { 10.635500f, -192.000000f, 224.872192f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2006477, 5937335, 4, { 4.501404f, -192.000000f, -0.015320f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2006478, 5941617, 4, { 283.497314f, -400.000000f, 229.022598f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2006479, 5941618, 4, { 292.469604f, -400.000000f, 48.325321f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5965017, 5, { -312.459290f, 216.000000f, 229.715897f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalace.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalace.cpp
new file mode 100644
index 00000000..11b5708a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalace.cpp
@@ -0,0 +1,71 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheWanderersPalace : public InstanceContentScript
+{
+public:
+   TheWanderersPalace() : InstanceContentScript( 10 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2001809, 0, 4, { 134.115601f, -17.997431f, 473.641693f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 137.299393f, -17.990360f, 454.401398f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4177700, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2001822, 4086687, 4, { 125.014000f, -9.459579f, 64.149277f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001811, 4259124, 4, { 127.094200f, -12.000000f, 125.826500f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2001810, 4259126, 4, { 124.986603f, -12.039370f, 125.401100f }, 0.991760f );
+      instance->registerEObj( "Unknown5", 2000277, 4259125, 4, { 125.461502f, -12.000000f, 89.079697f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2001114, 4323503, 4, { 118.000000f, -8.700125f, 65.370102f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2001823, 4323504, 4, { 117.995003f, -7.766907f, 65.232300f }, 0.991760f );
+      instance->registerEObj( "Nymiandevice", 2001123, 4126926, 4, { 117.995003f, -9.001419f, 65.378754f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2002790, 4405761, 4, { 125.029999f, -13.277490f, 181.098602f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2001813, 4259128, 4, { 45.925018f, 0.000000f, -212.411499f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2001812, 4259127, 4, { 43.121960f, -0.015320f, -212.616592f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2001824, 4086767, 4, { 43.140591f, 0.499020f, -29.383511f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2001827, 4086770, 4, { 43.011742f, 0.540422f, -152.602997f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2000278, 4259129, 4, { 43.493420f, -0.100058f, -248.056198f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2001115, 4323510, 4, { 35.000000f, 1.250271f, -5.876968f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2001116, 4323508, 4, { 35.000000f, 1.249865f, -28.099899f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2001117, 4323512, 4, { 43.000000f, 1.300663f, -58.799179f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2001118, 4323515, 4, { 54.099178f, 9.249764f, -95.999512f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2001119, 4323518, 4, { 122.099899f, 1.250139f, -145.999405f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2001120, 4323522, 4, { 36.000000f, 1.299810f, -151.049896f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2001825, 4323511, 4, { 35.027500f, 2.231338f, -5.969540f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2001826, 4323509, 4, { 34.988789f, 2.301583f, -28.158291f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2001828, 4323513, 4, { 43.003689f, 2.351689f, -58.849869f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2001829, 4323516, 4, { 54.100830f, 10.258660f, -95.915703f }, 0.991760f );
+      instance->registerEObj( "Unknown24", 2001830, 4323519, 4, { 121.982201f, 2.305465f, -145.991302f }, 0.991760f );
+      instance->registerEObj( "Unknown25", 2001831, 4323523, 4, { 35.995869f, 2.276821f, -151.081100f }, 0.991760f );
+      instance->registerEObj( "RustedNymiandevice", 2001124, 4126931, 4, { 34.988892f, 0.930786f, -6.393555f }, 0.991760f );
+      instance->registerEObj( "RustedNymiandevice", 2001125, 4126938, 4, { 34.988892f, 0.930786f, -27.634159f }, 0.991760f );
+      instance->registerEObj( "RustedNymiandevice", 2001126, 4126941, 4, { 42.984619f, 0.991760f, -58.335270f }, 0.991760f );
+      instance->registerEObj( "Nymiandevice", 2001127, 4126947, 4, { 53.613361f, 8.952527f, -95.999352f }, 1.000000f );
+      instance->registerEObj( "RustedNymiandevice", 2001128, 4126952, 4, { 121.629601f, 0.930786f, -146.013596f }, 0.991760f );
+      instance->registerEObj( "RustedNymiandevice", 2001129, 4126956, 4, { 35.995972f, 0.991760f, -150.591400f }, 0.991760f );
+      instance->registerEObj( "Lanternoil", 2002789, 0, 4, { 35.621380f, -0.164260f, -23.125179f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2001832, 4086777, 4, { 73.005737f, 10.540420f, -380.487610f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2001814, 4239448, 4, { 72.890900f, 9.976854f, -400.332489f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2001815, 4239449, 4, { 74.758614f, 9.976894f, -400.332489f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2001121, 4323530, 4, { 80.979607f, 11.245850f, -380.117493f }, 0.991760f );
+      instance->registerEObj( "Unknown30", 2001122, 4323528, 4, { 65.000000f, 11.249720f, -380.099792f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2001833, 4323531, 4, { 81.010132f, 12.313960f, -380.117493f }, 0.991760f );
+      instance->registerEObj( "Unknown32", 2001834, 4323529, 4, { 65.001831f, 12.381110f, -380.103790f }, 1.000000f );
+      instance->registerEObj( "RustedNymiandevice", 2001130, 4126964, 4, { 80.979607f, 10.940670f, -379.629211f }, 0.991760f );
+      instance->registerEObj( "RustedNymiandevice", 2001131, 4126966, 4, { 64.988159f, 10.940670f, -379.629211f }, 0.991760f );
+      instance->registerEObj( "Unknown33", 2005197, 5674883, 4, { 73.492577f, 6.000000f, -464.485596f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalaceHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalaceHard.cpp
new file mode 100644
index 00000000..739c0f7a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalaceHard.cpp
@@ -0,0 +1,52 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheWanderersPalaceHard : public InstanceContentScript
+{
+public:
+   TheWanderersPalaceHard() : InstanceContentScript( 30 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2000277, 4898030, 4, { 125.461502f, -12.000000f, 89.079697f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2001810, 4898029, 4, { 124.986603f, -12.039370f, 125.401100f }, 0.991760f );
+      instance->registerEObj( "Unknown2", 2001811, 4898028, 4, { 127.094200f, -12.000000f, 125.826500f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2001812, 4898056, 4, { 43.121960f, -0.015320f, -212.616592f }, 0.991760f );
+      instance->registerEObj( "Unknown4", 2001813, 4898057, 4, { 45.925018f, 0.000000f, -212.411499f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2000278, 4898058, 4, { 43.472900f, -0.106873f, -248.065994f }, 0.991760f );
+      instance->registerEObj( "Unknown6", 2001815, 4898090, 4, { 74.753906f, 9.964111f, -400.351013f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2001814, 4898089, 4, { 72.890900f, 9.976854f, -400.332489f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005119, 0, 4, { 68.684860f, 6.000000f, -449.635315f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005196, 5674432, 4, { 72.966209f, 6.000000f, -464.577209f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 137.285400f, -17.990419f, 454.398407f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4898005, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004551, 5018234, 4, { 184.679901f, -14.023070f, 304.066406f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2004552, 5018233, 4, { 125.230698f, -14.053590f, 244.800400f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2004553, 5018223, 4, { 124.956100f, -14.023070f, 183.581207f }, 0.991760f );
+      instance->registerEObj( "Unknown14", 2004554, 5018182, 4, { 42.770088f, -0.167908f, -26.822309f }, 0.991760f );
+      instance->registerEObj( "Unknown15", 2004555, 5018205, 4, { 42.862549f, 0.442505f, -150.225098f }, 0.991760f );
+      instance->registerEObj( "Asylumcell", 2004556, 5019054, 4, { 71.785713f, -11.783800f, -311.787598f }, 0.991760f );
+      instance->registerEObj( "Asylumcell", 2004557, 5019055, 4, { 71.870552f, -11.659170f, -324.391602f }, 0.991760f );
+      instance->registerEObj( "Unknown16", 2004558, 5019051, 4, { 94.316040f, -12.008810f, -312.062286f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2004559, 5019004, 4, { 161.119995f, -8.011047f, -353.322693f }, 0.991760f );
+      instance->registerEObj( "Unknown18", 2004560, 5018224, 4, { 73.226128f, 10.390440f, -379.721588f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2004561, 5034792, 4, { 120.347900f, -12.000000f, -338.826599f }, 0.991760f );
+      instance->registerEObj( "Drainagevalve", 2004562, 5022359, 4, { 124.002098f, -10.704290f, -341.825287f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2004564, 5018828, 4, { 141.315598f, -11.750000f, -326.359711f }, 1.000000f );
+      instance->registerEObj( "Nymiandevice", 2004565, 4896865, 4, { 156.023407f, -6.851379f, -351.735809f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWeepingCityofMhach.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheWeepingCityofMhach.cpp
new file mode 100644
index 00000000..c47fe5ee
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheWeepingCityofMhach.cpp
@@ -0,0 +1,107 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheWeepingCityofMhach : public InstanceContentScript
+{
+public:
+   TheWeepingCityofMhach() : InstanceContentScript( 30038 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 16.000000f, -0.599972f, -25.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6255278, 4, { 15.499620f, -0.600000f, -32.576271f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 6255280, 4, { 16.000000f, -0.599986f, -84.500000f }, 1.200000f );
+      instance->registerEObj( "Unknown3", 2007130, 6259583, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007131, 6271618, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007127, 6263439, 4, { 2.786298f, 1.130917f, -81.495903f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007128, 6263438, 4, { 44.322010f, 1.937706f, -52.936489f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2007129, 6263356, 4, { -1.414551f, 2.361187f, -31.816429f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002872, 6256300, 4, { -298.284485f, -74.099991f, -394.606812f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 6252961, 4, { -298.284485f, -74.000061f, -446.164307f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007174, 0, 4, { -301.925903f, -74.099998f, -434.771606f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007175, 6275855, 4, { -305.091309f, -74.099998f, -434.266205f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007176, 6275857, 4, { -299.330200f, -74.099998f, -441.272186f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000034, 6252960, 4, { -301.382507f, -74.111649f, -397.150391f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2000035, 0, 4, { -300.012909f, -74.111687f, -411.038788f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002735, 0, 4, { 280.000000f, -468.750000f, -352.734314f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2002872, 6256312, 4, { 279.076385f, -468.799988f, -346.734894f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007092, 6246904, 4, { 271.681488f, -269.434998f, 263.484192f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007093, 6246906, 4, { 299.983093f, -269.438812f, 263.439911f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007094, 6246909, 4, { 328.133606f, -269.459900f, 263.349915f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007095, 6246905, 4, { 272.007813f, -270.624695f, 249.703201f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007096, 6246907, 4, { 299.972198f, -270.615295f, 249.808594f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007097, 6246910, 4, { 327.886597f, -270.637299f, 249.556503f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007098, 6276590, 4, { 271.976288f, -270.275513f, 254.027298f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007099, 6276603, 4, { 300.073914f, -270.279907f, 253.881897f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007100, 6276618, 4, { 328.117798f, -270.282501f, 253.919098f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007101, 6277276, 4, { 300.580688f, -329.902802f, 215.101807f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007102, 0, 4, { 313.999695f, -254.436203f, 249.057007f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007091, 6253623, 4, { 280.196686f, -468.799988f, -340.444214f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2000015, 6323645, 4, { 280.035004f, -444.700012f, -381.003815f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2000015, 6323651, 4, { 255.731705f, -444.700012f, -423.649811f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2000015, 6323650, 4, { 304.734985f, -444.700012f, -424.385590f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007350, 6405524, 4, { 280.000000f, -446.006287f, -410.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2002618, 6405504, 4, { 271.693695f, -445.000000f, -398.334412f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2002618, 6413337, 4, { 284.413513f, -444.945587f, -428.864410f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2002735, 0, 4, { -300.007690f, -436.179108f, -3.677429f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2002872, 6256352, 4, { -299.044006f, -436.200012f, 1.934000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -300.007690f, -436.057098f, -56.789539f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2000019, 6223041, 4, { -293.815094f, -436.100006f, -36.657909f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2007363, 6403167, 4, { -300.000000f, -436.100006f, -34.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2007381, 0, 4, { -288.659698f, -436.100006f, -36.228500f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2007104, 6253621, 4, { -293.853302f, -417.190002f, 338.020691f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2007105, 6262270, 4, { 279.377411f, -481.421112f, -273.999298f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2007106, 6253622, 4, { 282.739197f, -506.212494f, -377.761414f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2007630, 0, 4, { -307.311310f, -74.111656f, -404.095490f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2007457, 6873350, 4, { -287.981812f, -74.111671f, -418.439789f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2007457, 7008372, 4, { -286.682404f, -74.111656f, -414.302185f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2000034, 6252960, 4, { -299.669098f, -74.111687f, -422.791412f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2008306, 6873007, 4, { -299.592712f, -123.000000f, -313.306885f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2002872, 6873032, 4, { -298.298706f, -74.113159f, -394.613586f }, 0.991760f );
+      instance->registerEObj( "Unknown51", 2007112, 6252937, 4, { -258.522614f, -114.655602f, -231.454193f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2007112, 6403165, 4, { -360.672485f, -116.000198f, -271.268707f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2008452, 6889796, 4, { -239.520905f, -116.014397f, -230.853806f }, 0.991760f );
+      instance->registerEObj( "Unknown54", 2007457, 6941894, 4, { -299.583099f, -75.000023f, -353.118500f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2007108, 6252917, 4, { 52.989189f, 8.000000f, 109.725502f }, 1.000000f );
+      instance->registerEObj( "Unknown56", 2007109, 6252933, 4, { 40.849979f, 7.999999f, 54.685509f }, 1.000000f );
+      instance->registerEObj( "Unknown57", 2007110, 6258888, 4, { -217.946503f, -116.000000f, -210.519608f }, 0.991760f );
+      instance->registerEObj( "Unknown58", 2007111, 6258889, 4, { -351.721313f, -116.000000f, -260.105499f }, 1.000000f );
+      instance->registerEObj( "Unknown59", 2007112, 6252937, 4, { -249.593796f, -116.000000f, -229.014603f }, 1.000000f );
+      instance->registerEObj( "Unknown60", 2007112, 6403165, 4, { -354.681885f, -116.000298f, -278.960693f }, 1.000000f );
+      instance->registerEObj( "Unknown61", 2002735, 0, 4, { -185.956604f, -394.699890f, 235.090607f }, 1.000000f );
+      instance->registerEObj( "Unknown62", 2002872, 6259368, 4, { -189.835297f, -394.768494f, 236.985107f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2002872, 6259369, 4, { -152.910706f, -394.522003f, 215.716797f }, 0.991760f );
+      instance->registerEObj( "Unknown64", 2007114, 6265979, 4, { -179.125702f, -394.522003f, 205.950897f }, 0.991760f );
+      instance->registerEObj( "Unknown65", 2007115, 6265980, 4, { -157.763107f, -394.522003f, 242.664200f }, 0.991760f );
+      instance->registerEObj( "Unknown66", 2007116, 6265977, 4, { -181.536697f, -394.522003f, 201.556396f }, 0.991760f );
+      instance->registerEObj( "Unknown67", 2007117, 6275728, 4, { -180.590607f, -394.522003f, 231.158905f }, 0.991760f );
+      instance->registerEObj( "Unknown68", 2007118, 6262272, 4, { -156.623795f, -394.500092f, 244.445908f }, 1.000000f );
+      instance->registerEObj( "Unknown69", 2007119, 6264911, 4, { -168.688507f, -391.866913f, 224.567001f }, 0.991760f );
+      instance->registerEObj( "Unknown70", 2007378, 6404242, 4, { -170.886597f, -394.500092f, 228.890305f }, 1.000000f );
+      instance->registerEObj( "Unknown71", 2007379, 6404243, 4, { -174.892807f, -394.500092f, 226.853806f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007054, 6277013, 4, { 29.465090f, 12.072440f, 173.291306f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2007055, 6277014, 4, { 10.055660f, 10.610950f, 59.293789f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2007056, 6277015, 4, { 21.985451f, -1.159537f, -124.736298f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007057, 6277012, 4, { -290.684998f, -71.292747f, -368.263885f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007058, 6235460, 4, { -244.833099f, -390.428986f, 258.731689f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007059, 6235461, 4, { 276.184296f, -461.318604f, -294.996796f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007060, 6235463, 4, { -304.521301f, -435.890594f, 23.143780f }, 1.000000f );
+      instance->registerEObj( "Unknown72", 2007103, 6259793, 4, { 16.303080f, -3.864367f, -114.426003f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6247654, 5, { 81.884888f, 13.000000f, 208.698303f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterExtreme.cpp
new file mode 100644
index 00000000..d66f2cf1
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterExtreme.cpp
@@ -0,0 +1,32 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheWhorleaterExtreme : public InstanceContentScript
+{
+public:
+   TheWhorleaterExtreme() : InstanceContentScript( 20018 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f );
+      instance->registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterHard.cpp
new file mode 100644
index 00000000..5b13841a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterHard.cpp
@@ -0,0 +1,32 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheWhorleaterHard : public InstanceContentScript
+{
+public:
+   TheWhorleaterHard() : InstanceContentScript( 20017 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f );
+      instance->registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWorldofDarkness.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/TheWorldofDarkness.cpp
new file mode 100644
index 00000000..12166e1c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/TheWorldofDarkness.cpp
@@ -0,0 +1,116 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheWorldofDarkness : public InstanceContentScript
+{
+public:
+   TheWorldofDarkness() : InstanceContentScript( 30020 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002872, 5033058, 4, { -148.309006f, 25.000000f, 327.505005f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -147.190506f, 34.000000f, 326.593597f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 5033059, 4, { -116.020401f, 25.000000f, 291.514313f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2004749, 5022919, 4, { -150.811707f, 33.999840f, 292.778412f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2004750, 5022920, 4, { -143.519608f, 34.000000f, 294.027710f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2004751, 5022915, 4, { -143.096893f, 34.000000f, 301.814209f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2004752, 5022916, 4, { -151.221893f, 34.000000f, 301.291809f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2004753, 5034307, 4, { -153.117905f, 34.000000f, 292.031494f }, 0.991760f );
+      instance->registerEObj( "Unknown8", 2004754, 5034303, 4, { -141.245300f, 34.000000f, 291.586212f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2004755, 5034301, 4, { -141.807693f, 34.000000f, 303.198395f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2004756, 5034306, 4, { -151.877304f, 34.000000f, 303.085297f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2004748, 5033636, 4, { -149.922104f, 34.000000f, 293.955414f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2004774, 5033642, 4, { -144.841095f, 34.000000f, 295.275208f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2004775, 5033641, 4, { -144.940308f, 34.000000f, 300.121399f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2004776, 5033639, 4, { -150.097397f, 34.000000f, 299.867798f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2005026, 5444436, 4, { -147.017593f, 34.000000f, 317.352814f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002872, 5033193, 4, { 200.082001f, 81.974503f, 211.096603f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2002735, 0, 4, { 200.000000f, 82.124329f, 208.778595f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2002872, 5035970, 4, { 167.647797f, 81.909058f, 178.824493f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2004777, 0, 4, { 192.319397f, 82.000000f, 182.835999f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2004778, 0, 4, { 197.039703f, 81.986687f, 184.863007f }, 0.991760f );
+      instance->registerEObj( "Unknown21", 2004779, 0, 4, { 204.338196f, 82.000000f, 183.053802f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2004780, 0, 4, { 189.642700f, 82.000000f, 176.451202f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2005018, 0, 4, { 199.442200f, 82.000000f, 183.869598f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2002587, 0, 4, { 0.000000f, 129.250000f, -157.414307f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2002872, 5040833, 4, { -0.855141f, 129.250000f, -164.190598f }, 0.991760f );
+      instance->registerEObj( "Unknown26", 2002872, 5039743, 4, { 0.048592f, 128.906403f, -155.346100f }, 1.000000f );
+      instance->registerEObj( "Openfetter", 2004787, 0, 4, { 2.542549f, 129.250000f, -205.570496f }, 1.000000f );
+      instance->registerEObj( "Openfetter", 2004789, 0, 4, { 3.817404f, 129.250000f, -207.100800f }, 1.000000f );
+      instance->registerEObj( "Magickedfetter", 2004790, 5039668, 4, { -17.519341f, 129.250000f, -235.697693f }, 1.000000f );
+      instance->registerEObj( "Magickedfetter", 2004791, 5039667, 4, { 17.275551f, 129.198105f, -235.656799f }, 0.991760f );
+      instance->registerEObj( "Unknown27", 2004808, 5039717, 4, { -10.696810f, -497.601990f, -204.956100f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2004809, 5039714, 4, { 6.635397f, -498.601898f, -210.257507f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2004810, 5039710, 4, { 11.312720f, -498.093597f, -196.581207f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2004811, 5039721, 4, { -9.022294f, -499.107513f, -190.416397f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2004548, 0, 4, { 1.212110f, 129.300003f, -202.733398f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2002735, 0, 4, { -0.000000f, 143.250000f, -314.710114f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2002872, 5041153, 4, { -0.147327f, 143.250000f, -328.516998f }, 0.991760f );
+      instance->registerEObj( "Unknown34", 2004732, 5039981, 4, { -0.015320f, 143.236298f, -316.334808f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -299.977112f, 279.987701f, -420.645508f }, 0.991760f );
+      instance->registerEObj( "Unknown35", 2004814, 0, 4, { -300.240906f, 280.000000f, -402.510712f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2004815, 0, 4, { -300.687103f, 280.000000f, -398.160706f }, 1.000000f );
+      instance->registerEObj( "Unknown37", 2004620, 0, 4, { 0.203211f, 129.250000f, -202.244904f }, 1.000000f );
+      instance->registerEObj( "Unknown38", 2004816, 5041561, 4, { -304.280212f, 279.987701f, -415.243805f }, 0.991760f );
+      instance->registerEObj( "Unknown39", 2004817, 5041563, 4, { -286.856506f, 280.000000f, -392.695404f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2004818, 5041562, 4, { -313.290710f, 280.000000f, -392.472412f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2002872, 5032353, 4, { -54.450321f, 16.000000f, 406.409088f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2002735, 0, 4, { -56.151901f, 16.000000f, 403.855896f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2002872, 5032356, 4, { -102.950996f, 16.000000f, 383.202911f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2004735, 5437119, 4, { -76.985458f, 16.000000f, 382.746613f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2004736, 0, 4, { -74.916229f, 16.000000f, 380.485291f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2002735, 0, 4, { 99.718719f, 63.999989f, 265.143799f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2002872, 5035968, 4, { 95.926514f, 63.980949f, 265.796906f }, 0.991760f );
+      instance->registerEObj( "Unknown48", 2002872, 5035969, 4, { 167.944199f, 65.533363f, 264.945587f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2004745, 0, 4, { 130.000000f, 63.999989f, 264.710388f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2004738, 5437120, 4, { 130.000000f, 65.431679f, 264.710388f }, 0.991760f );
+      instance->registerEObj( "Unknown50", 2004739, 5037994, 4, { 138.468002f, 63.999989f, 275.781311f }, 1.000000f );
+      instance->registerEObj( "Unknown51", 2004740, 5037996, 4, { 129.901001f, 63.999729f, 278.588593f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2004741, 5037997, 4, { 121.644699f, 63.999729f, 275.762695f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2004742, 5037998, 4, { 138.356506f, 63.999989f, 250.555603f }, 1.000000f );
+      instance->registerEObj( "Unknown54", 2004743, 5037999, 4, { 129.881393f, 64.000031f, 250.721893f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2004744, 5038000, 4, { 121.628601f, 63.999989f, 250.572296f }, 1.000000f );
+      instance->registerEObj( "Unknown56", 2004746, 5037995, 4, { 130.020493f, 63.999748f, 279.027191f }, 1.000000f );
+      instance->registerEObj( "Unknown57", 2004747, 5038001, 4, { 130.056702f, 63.999989f, 249.980301f }, 1.000000f );
+      instance->registerEObj( "Unknown58", 2002735, 0, 4, { 0.000000f, 94.750053f, 84.669502f }, 0.991760f );
+      instance->registerEObj( "Unknown59", 2004788, 5499560, 4, { 0.320374f, 95.231567f, 31.296261f }, 0.991760f );
+      instance->registerEObj( "Unknown60", 2004792, 5038584, 4, { -28.578890f, 95.250008f, 39.174721f }, 1.000000f );
+      instance->registerEObj( "Unknown61", 2004793, 5038586, 4, { -21.418350f, 95.250008f, 51.649750f }, 1.000000f );
+      instance->registerEObj( "Unknown62", 2004794, 5038587, 4, { -33.994980f, 95.250008f, 58.976070f }, 0.991760f );
+      instance->registerEObj( "Unknown63", 2004795, 5038580, 4, { -41.014271f, 95.250008f, 46.442242f }, 1.000000f );
+      instance->registerEObj( "Unknown64", 2004796, 5038588, 4, { 7.240406f, 95.250008f, -12.319770f }, 1.000000f );
+      instance->registerEObj( "Unknown65", 2004797, 5038590, 4, { 7.179711f, 95.250008f, 2.152661f }, 1.000000f );
+      instance->registerEObj( "Unknown66", 2004798, 5038589, 4, { -7.245643f, 95.250008f, 2.096094f }, 1.000000f );
+      instance->registerEObj( "Unknown67", 2004799, 5038570, 4, { -7.080731f, 95.250008f, -12.155750f }, 1.000000f );
+      instance->registerEObj( "Unknown68", 2004800, 5038591, 4, { 41.068710f, 95.250008f, 46.325569f }, 1.000000f );
+      instance->registerEObj( "Unknown69", 2004801, 5038592, 4, { 33.762070f, 95.250008f, 58.721840f }, 1.000000f );
+      instance->registerEObj( "Unknown70", 2004802, 5038593, 4, { 21.204290f, 95.250008f, 51.578461f }, 1.000000f );
+      instance->registerEObj( "Unknown71", 2004803, 5038571, 4, { 28.640770f, 95.250008f, 39.349319f }, 1.000000f );
+      instance->registerEObj( "Unknown72", 2002872, 5038256, 4, { -0.165812f, 94.731613f, 85.317574f }, 0.991760f );
+      instance->registerEObj( "Unknown73", 2004784, 5489265, 4, { 0.294310f, 90.349991f, 22.469700f }, 0.991760f );
+      instance->registerEObj( "Unknown74", 2005042, 5476812, 4, { -0.380919f, 99.969032f, 29.779119f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5032012, 5, { 0.112444f, 1.000004f, 460.032898f }, 1.000000f );
+      instance->registerEObj( "Wormholegenerator", 2004722, 4985258, 4, { -9.284863f, 0.332117f, 436.627411f }, 0.991760f );
+      instance->registerEObj( "Wormholegenerator", 2004723, 4985259, 4, { -157.081207f, 25.477930f, 382.938385f }, 0.991760f );
+      instance->registerEObj( "Wormholegenerator", 2004724, 4985260, 4, { 65.994957f, 65.452766f, 265.003998f }, 0.991760f );
+      instance->registerEObj( "Wormholegenerator", 2004725, 4985261, 4, { 210.040405f, 73.397346f, 264.987091f }, 0.991760f );
+      instance->registerEObj( "Wormholegenerator", 2004726, 4985262, 4, { 9.958203f, 96.762039f, 104.047096f }, 0.991760f );
+      instance->registerEObj( "Wormholegenerator", 2004727, 4985263, 4, { -9.978291f, 128.313095f, -121.979301f }, 0.991760f );
+      instance->registerEObj( "Wormholegenerator", 2004728, 4985264, 4, { 9.998364f, 128.645798f, -274.001892f }, 0.991760f );
+      instance->registerEObj( "Unknown76", 2004729, 5034813, 4, { -91.447388f, 32.791962f, 296.223389f }, 0.991760f );
+      instance->registerEObj( "Unknown77", 2004730, 5034821, 4, { 143.374405f, 80.799957f, 179.826706f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokExtreme.cpp
new file mode 100644
index 00000000..a28fe619
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokExtreme.cpp
@@ -0,0 +1,47 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThokastThokExtreme : public InstanceContentScript
+{
+public:
+   ThokastThokExtreme() : InstanceContentScript( 20032 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005385, 5674976, 4, { -1.192890f, 0.000000f, 17.474220f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005386, 5675419, 4, { -13.222250f, 0.000000f, 12.212180f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005387, 5675420, 4, { -18.468269f, 0.000000f, 0.628434f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2005388, 5675421, 4, { -13.285940f, 0.000000f, -12.470450f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2005389, 5675422, 4, { 0.342176f, 0.000000f, -18.571230f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2005390, 5675423, 4, { 12.720200f, 0.000000f, -12.658900f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005391, 5675424, 4, { 17.782970f, 0.000000f, -0.534297f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005392, 5687664, 4, { 13.452240f, 0.000000f, 12.733450f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005393, 5797622, 4, { -8.704693f, 0.000000f, 1.700043f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005394, 5797549, 4, { -1.334651f, 0.000000f, -2.316425f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2005385, 5674976, 4, { 3.622319f, -0.000001f, 15.464100f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2005386, 5675419, 4, { -11.612120f, -0.015320f, 13.595760f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2005387, 5675420, 4, { -17.196960f, -0.015320f, 2.304016f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2005388, 5675421, 4, { -13.697780f, 0.000000f, -10.715490f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2005389, 5675422, 4, { -2.138674f, 0.000000f, -16.784149f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2005390, 5675423, 4, { 12.378810f, 0.000000f, -10.929330f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2005391, 5675424, 4, { 17.679670f, 0.000000f, 1.168503f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005392, 5687664, 4, { 12.017570f, 0.000000f, 13.670370f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2005393, 5797622, 4, { -10.360960f, -0.015320f, 2.975464f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2005394, 5797549, 4, { -9.475891f, -0.015320f, 4.837097f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5774826, 5, { -4.440430f, -0.015320f, 14.846980f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.068703f, -0.000001f, -13.884950f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokHard.cpp
new file mode 100644
index 00000000..38d4285c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokHard.cpp
@@ -0,0 +1,47 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThokastThokHard : public InstanceContentScript
+{
+public:
+   ThokastThokHard() : InstanceContentScript( 20031 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005385, 5674976, 4, { -1.192890f, 0.000000f, 17.474220f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2005386, 5675419, 4, { -13.222250f, 0.000000f, 12.212180f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2005387, 5675420, 4, { -18.468269f, 0.000000f, 0.628434f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2005388, 5675421, 4, { -13.285940f, 0.000000f, -12.470450f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2005389, 5675422, 4, { 0.342176f, 0.000000f, -18.571230f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2005390, 5675423, 4, { 12.720200f, 0.000000f, -12.658900f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2005391, 5675424, 4, { 17.782970f, 0.000000f, -0.534297f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2005392, 5687664, 4, { 13.452240f, 0.000000f, 12.733450f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2005393, 5797622, 4, { -8.704693f, 0.000000f, 1.700043f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2005394, 5797549, 4, { -1.334651f, 0.000000f, -2.316425f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2005385, 5674976, 4, { 3.622319f, -0.000001f, 15.464100f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2005386, 5675419, 4, { -11.612120f, -0.015320f, 13.595760f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2005387, 5675420, 4, { -17.196960f, -0.015320f, 2.304016f }, 0.991760f );
+      instance->registerEObj( "Unknown13", 2005388, 5675421, 4, { -13.697780f, 0.000000f, -10.715490f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2005389, 5675422, 4, { -2.138674f, 0.000000f, -16.784149f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2005390, 5675423, 4, { 12.378810f, 0.000000f, -10.929330f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2005391, 5675424, 4, { 17.679670f, 0.000000f, 1.168503f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2005392, 5687664, 4, { 12.017570f, 0.000000f, 13.670370f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2005393, 5797622, 4, { -10.360960f, -0.015320f, 2.975464f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2005394, 5797549, 4, { -9.475891f, -0.015320f, 4.837097f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 5774826, 5, { -4.440430f, -0.015320f, 14.846980f }, 0.991760f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.068703f, -0.000001f, -13.884950f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchExtreme.cpp
new file mode 100644
index 00000000..8d7970ad
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchExtreme.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThornmarchExtreme : public InstanceContentScript
+{
+public:
+   ThornmarchExtreme() : InstanceContentScript( 20012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchHard.cpp
new file mode 100644
index 00000000..50d9f9a1
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchHard.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThornmarchHard : public InstanceContentScript
+{
+public:
+   ThornmarchHard() : InstanceContentScript( 20011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/UndertheArmor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/UndertheArmor.cpp
new file mode 100644
index 00000000..d9f49abe
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/UndertheArmor.cpp
@@ -0,0 +1,26 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class UndertheArmor : public InstanceContentScript
+{
+public:
+   UndertheArmor() : InstanceContentScript( 10002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/UrthsFount.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/UrthsFount.cpp
new file mode 100644
index 00000000..80c66d71
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/UrthsFount.cpp
@@ -0,0 +1,27 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class UrthsFount : public InstanceContentScript
+{
+public:
+   UrthsFount() : InstanceContentScript( 20027 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WardUp.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/WardUp.cpp
new file mode 100644
index 00000000..dd3663c9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/WardUp.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class WardUp : public InstanceContentScript
+{
+public:
+   WardUp() : InstanceContentScript( 10013 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WhenClansCollide.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/WhenClansCollide.cpp
new file mode 100644
index 00000000..84a14053
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/WhenClansCollide.cpp
@@ -0,0 +1,29 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class WhenClansCollide : public InstanceContentScript
+{
+public:
+   WhenClansCollide() : InstanceContentScript( 5022 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f );
+      instance->registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f );
+      instance->registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f );
+      instance->registerEObj( "Unknown1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WithHeartandSteel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/WithHeartandSteel.cpp
new file mode 100644
index 00000000..df48a678
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/WithHeartandSteel.cpp
@@ -0,0 +1,107 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class WithHeartandSteel : public InstanceContentScript
+{
+public:
+   WithHeartandSteel() : InstanceContentScript( 5007 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 16.000000f, -0.599972f, -25.600000f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6255278, 4, { 15.499620f, -0.600000f, -32.576271f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2002872, 6255280, 4, { 16.000000f, -0.599986f, -84.500000f }, 1.200000f );
+      instance->registerEObj( "Unknown3", 2007130, 6259583, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f );
+      instance->registerEObj( "Unknown4", 2007131, 6271618, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007127, 6263439, 4, { 2.786298f, 1.130917f, -81.495903f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007128, 6263438, 4, { 44.322010f, 1.937706f, -52.936489f }, 0.991760f );
+      instance->registerEObj( "Unknown7", 2007129, 6263356, 4, { -1.414551f, 2.361187f, -31.816429f }, 1.000000f );
+      instance->registerEObj( "Unknown8", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2002872, 6256300, 4, { -298.284485f, -74.099991f, -394.606812f }, 1.000000f );
+      instance->registerEObj( "Unknown10", 2002872, 6252961, 4, { -298.284485f, -74.000061f, -446.164307f }, 1.000000f );
+      instance->registerEObj( "Unknown11", 2007174, 0, 4, { -301.925903f, -74.099998f, -434.771606f }, 1.000000f );
+      instance->registerEObj( "Unknown12", 2007175, 6275855, 4, { -305.091309f, -74.099998f, -434.266205f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007176, 6275857, 4, { -299.330200f, -74.099998f, -441.272186f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2000034, 6252960, 4, { -301.382507f, -74.111649f, -397.150391f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2000035, 0, 4, { -300.012909f, -74.111687f, -411.038788f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2002735, 0, 4, { 280.000000f, -468.750000f, -352.734314f }, 0.991760f );
+      instance->registerEObj( "Unknown17", 2002872, 6256312, 4, { 279.076385f, -468.799988f, -346.734894f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007092, 6246904, 4, { 271.681488f, -269.434998f, 263.484192f }, 1.000000f );
+      instance->registerEObj( "Unknown19", 2007093, 6246906, 4, { 299.983093f, -269.438812f, 263.439911f }, 1.000000f );
+      instance->registerEObj( "Unknown20", 2007094, 6246909, 4, { 328.133606f, -269.459900f, 263.349915f }, 1.000000f );
+      instance->registerEObj( "Unknown21", 2007095, 6246905, 4, { 272.007813f, -270.624695f, 249.703201f }, 1.000000f );
+      instance->registerEObj( "Unknown22", 2007096, 6246907, 4, { 299.972198f, -270.615295f, 249.808594f }, 1.000000f );
+      instance->registerEObj( "Unknown23", 2007097, 6246910, 4, { 327.886597f, -270.637299f, 249.556503f }, 1.000000f );
+      instance->registerEObj( "Unknown24", 2007098, 6276590, 4, { 271.976288f, -270.275513f, 254.027298f }, 1.000000f );
+      instance->registerEObj( "Unknown25", 2007099, 6276603, 4, { 300.073914f, -270.279907f, 253.881897f }, 1.000000f );
+      instance->registerEObj( "Unknown26", 2007100, 6276618, 4, { 328.117798f, -270.282501f, 253.919098f }, 1.000000f );
+      instance->registerEObj( "Unknown27", 2007101, 6277276, 4, { 300.580688f, -329.902802f, 215.101807f }, 1.000000f );
+      instance->registerEObj( "Unknown28", 2007102, 0, 4, { 313.999695f, -254.436203f, 249.057007f }, 1.000000f );
+      instance->registerEObj( "Unknown29", 2007091, 6253623, 4, { 280.196686f, -468.799988f, -340.444214f }, 1.000000f );
+      instance->registerEObj( "Unknown30", 2000015, 6323645, 4, { 280.035004f, -444.700012f, -381.003815f }, 1.000000f );
+      instance->registerEObj( "Unknown31", 2000015, 6323651, 4, { 255.731705f, -444.700012f, -423.649811f }, 1.000000f );
+      instance->registerEObj( "Unknown32", 2000015, 6323650, 4, { 304.734985f, -444.700012f, -424.385590f }, 1.000000f );
+      instance->registerEObj( "Unknown33", 2007350, 6405524, 4, { 280.000000f, -446.006287f, -410.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown34", 2002618, 6405504, 4, { 271.693695f, -445.000000f, -398.334412f }, 1.000000f );
+      instance->registerEObj( "Unknown35", 2002618, 6413337, 4, { 284.413513f, -444.945587f, -428.864410f }, 1.000000f );
+      instance->registerEObj( "Unknown36", 2002735, 0, 4, { -300.007690f, -436.179108f, -3.677429f }, 0.991760f );
+      instance->registerEObj( "Unknown37", 2002872, 6256352, 4, { -299.044006f, -436.200012f, 1.934000f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -300.007690f, -436.057098f, -56.789539f }, 0.991760f );
+      instance->registerEObj( "Unknown38", 2000019, 6223041, 4, { -293.815094f, -436.100006f, -36.657909f }, 1.000000f );
+      instance->registerEObj( "Unknown39", 2007363, 6403167, 4, { -300.000000f, -436.100006f, -34.000000f }, 1.000000f );
+      instance->registerEObj( "Unknown40", 2007381, 0, 4, { -288.659698f, -436.100006f, -36.228500f }, 1.000000f );
+      instance->registerEObj( "Unknown41", 2007104, 6253621, 4, { -293.853302f, -417.190002f, 338.020691f }, 1.000000f );
+      instance->registerEObj( "Unknown42", 2007105, 6262270, 4, { 279.377411f, -481.421112f, -273.999298f }, 1.000000f );
+      instance->registerEObj( "Unknown43", 2007106, 6253622, 4, { 282.739197f, -506.212494f, -377.761414f }, 1.000000f );
+      instance->registerEObj( "Unknown44", 2007630, 0, 4, { -307.311310f, -74.111656f, -404.095490f }, 1.000000f );
+      instance->registerEObj( "Unknown45", 2007457, 6873350, 4, { -287.981812f, -74.111671f, -418.439789f }, 1.000000f );
+      instance->registerEObj( "Unknown46", 2007457, 7008372, 4, { -286.682404f, -74.111656f, -414.302185f }, 1.000000f );
+      instance->registerEObj( "Unknown47", 2000034, 6252960, 4, { -299.669098f, -74.111687f, -422.791412f }, 1.000000f );
+      instance->registerEObj( "Unknown48", 2008306, 6873007, 4, { -299.592712f, -123.000000f, -313.306885f }, 1.000000f );
+      instance->registerEObj( "Unknown49", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f );
+      instance->registerEObj( "Unknown50", 2002872, 6873032, 4, { -298.298706f, -74.113159f, -394.613586f }, 0.991760f );
+      instance->registerEObj( "Unknown51", 2007112, 6252937, 4, { -258.522614f, -114.655602f, -231.454193f }, 1.000000f );
+      instance->registerEObj( "Unknown52", 2007112, 6403165, 4, { -360.672485f, -116.000198f, -271.268707f }, 1.000000f );
+      instance->registerEObj( "Unknown53", 2008452, 6889796, 4, { -239.520905f, -116.014397f, -230.853806f }, 0.991760f );
+      instance->registerEObj( "Unknown54", 2007457, 6941894, 4, { -299.583099f, -75.000023f, -353.118500f }, 1.000000f );
+      instance->registerEObj( "Unknown55", 2007108, 6252917, 4, { 52.989189f, 8.000000f, 109.725502f }, 1.000000f );
+      instance->registerEObj( "Unknown56", 2007109, 6252933, 4, { 40.849979f, 7.999999f, 54.685509f }, 1.000000f );
+      instance->registerEObj( "Unknown57", 2007110, 6258888, 4, { -217.946503f, -116.000000f, -210.519608f }, 0.991760f );
+      instance->registerEObj( "Unknown58", 2007111, 6258889, 4, { -351.721313f, -116.000000f, -260.105499f }, 1.000000f );
+      instance->registerEObj( "Unknown59", 2007112, 6252937, 4, { -249.593796f, -116.000000f, -229.014603f }, 1.000000f );
+      instance->registerEObj( "Unknown60", 2007112, 6403165, 4, { -354.681885f, -116.000298f, -278.960693f }, 1.000000f );
+      instance->registerEObj( "Unknown61", 2002735, 0, 4, { -185.956604f, -394.699890f, 235.090607f }, 1.000000f );
+      instance->registerEObj( "Unknown62", 2002872, 6259368, 4, { -189.835297f, -394.768494f, 236.985107f }, 1.000000f );
+      instance->registerEObj( "Unknown63", 2002872, 6259369, 4, { -152.910706f, -394.522003f, 215.716797f }, 0.991760f );
+      instance->registerEObj( "Unknown64", 2007114, 6265979, 4, { -179.125702f, -394.522003f, 205.950897f }, 0.991760f );
+      instance->registerEObj( "Unknown65", 2007115, 6265980, 4, { -157.763107f, -394.522003f, 242.664200f }, 0.991760f );
+      instance->registerEObj( "Unknown66", 2007116, 6265977, 4, { -181.536697f, -394.522003f, 201.556396f }, 0.991760f );
+      instance->registerEObj( "Unknown67", 2007117, 6275728, 4, { -180.590607f, -394.522003f, 231.158905f }, 0.991760f );
+      instance->registerEObj( "Unknown68", 2007118, 6262272, 4, { -156.623795f, -394.500092f, 244.445908f }, 1.000000f );
+      instance->registerEObj( "Unknown69", 2007119, 6264911, 4, { -168.688507f, -391.866913f, 224.567001f }, 0.991760f );
+      instance->registerEObj( "Unknown70", 2007378, 6404242, 4, { -170.886597f, -394.500092f, 228.890305f }, 1.000000f );
+      instance->registerEObj( "Unknown71", 2007379, 6404243, 4, { -174.892807f, -394.500092f, 226.853806f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007054, 6277013, 4, { 29.465090f, 12.072440f, 173.291306f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2007055, 6277014, 4, { 10.055660f, 10.610950f, 59.293789f }, 0.991760f );
+      instance->registerEObj( "Basicconveyanceunit", 2007056, 6277015, 4, { 21.985451f, -1.159537f, -124.736298f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007057, 6277012, 4, { -290.684998f, -71.292747f, -368.263885f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007058, 6235460, 4, { -244.833099f, -390.428986f, 258.731689f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007059, 6235461, 4, { 276.184296f, -461.318604f, -294.996796f }, 1.000000f );
+      instance->registerEObj( "Basicconveyanceunit", 2007060, 6235463, 4, { -304.521301f, -435.890594f, 23.143780f }, 1.000000f );
+      instance->registerEObj( "Unknown72", 2007103, 6259793, 4, { 16.303080f, -3.864367f, -114.426003f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6247654, 5, { 81.884888f, 13.000000f, 208.698303f }, 0.991760f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Xelphatol.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/Xelphatol.cpp
new file mode 100644
index 00000000..7206d430
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/Xelphatol.cpp
@@ -0,0 +1,58 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Xelphatol : public InstanceContentScript
+{
+public:
+   Xelphatol() : InstanceContentScript( 46 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      
+      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -84.755379f, 28.000000f, -51.118382f }, 1.000000f );
+      instance->registerEObj( "Unknown1", 2002872, 6403264, 4, { -82.540977f, 28.000000f, -53.644989f }, 1.000000f );
+      instance->registerEObj( "Unknown2", 2007376, 6403259, 4, { -59.964069f, 28.000000f, -78.522522f }, 1.000000f );
+      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 223.705399f, 113.500000f, 35.108238f }, 0.500000f );
+      instance->registerEObj( "Unknown4", 2002872, 6403502, 4, { 224.909500f, 113.199997f, 33.535221f }, 1.000000f );
+      instance->registerEObj( "Unknown5", 2007377, 6403509, 4, { 264.503998f, 113.199997f, -5.542618f }, 1.000000f );
+      instance->registerEObj( "Unknown6", 2007431, 6384823, 4, { 245.262695f, 113.500000f, 13.527060f }, 1.000000f );
+      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 336.690308f, 166.643707f, -409.414886f }, 0.472961f );
+      instance->registerEObj( "Unknown8", 2002872, 6403539, 4, { 335.712402f, 166.653793f, -410.036194f }, 1.000000f );
+      instance->registerEObj( "Unknown9", 2007441, 6425251, 4, { 321.753204f, 166.653793f, -415.372711f }, 1.000000f );
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -204.533798f, -33.742210f, 271.416107f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 306.067810f, 166.653793f, -420.100494f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6399475, 5, { -219.983398f, -34.117180f, 275.020111f }, 0.991760f );
+      instance->registerEObj( "Unknown11", 2007371, 6572085, 4, { -124.008698f, -10.048470f, 151.735703f }, 0.991760f );
+      instance->registerEObj( "Unknown12", 2007372, 6572086, 4, { -88.521538f, 27.655760f, -44.885460f }, 1.000000f );
+      instance->registerEObj( "Unknown13", 2007366, 6384146, 4, { 70.443916f, 25.187500f, -55.889919f }, 1.000000f );
+      instance->registerEObj( "Unknown14", 2007367, 6384285, 4, { 178.158096f, 99.562508f, -3.919224f }, 1.000000f );
+      instance->registerEObj( "Unknown15", 2007364, 6384308, 4, { 78.279350f, 25.190849f, -47.949661f }, 1.000000f );
+      instance->registerEObj( "Unknown16", 2007365, 6384356, 4, { 178.228394f, 99.500000f, 8.238135f }, 1.000000f );
+      instance->registerEObj( "Liftlever", 2007388, 0, 4, { 180.229706f, 56.749981f, -76.583313f }, 1.000000f );
+      instance->registerEObj( "Liftlever", 2007389, 0, 4, { 180.245193f, 86.749977f, -76.529610f }, 1.000000f );
+      instance->registerEObj( "Liftlever", 2007390, 0, 4, { 188.720001f, 56.749981f, -68.098488f }, 1.000000f );
+      instance->registerEObj( "Liftlever", 2007391, 0, 4, { 188.709198f, 86.749977f, -68.041428f }, 1.000000f );
+      instance->registerEObj( "Imposinggate", 2007373, 6382783, 4, { 168.614197f, 55.750000f, -60.833012f }, 1.000000f );
+      instance->registerEObj( "Bonekey", 2007397, 0, 4, { 143.135406f, 52.677929f, -35.654629f }, 1.000000f );
+      instance->registerEObj( "Unknown17", 2007370, 6383173, 4, { 97.740517f, 26.124990f, -40.661610f }, 1.000000f );
+      instance->registerEObj( "Unknown18", 2007405, 6527474, 4, { 351.622009f, 163.753799f, -404.382599f }, 0.991760f );
+      instance->registerEObj( "Airstone", 2007398, 0, 4, { 316.850586f, 142.878403f, -142.151505f }, 1.000000f );
+      instance->registerEObj( "Airstone", 2007399, 0, 4, { 420.029205f, 149.955597f, -271.014801f }, 1.000000f );
+      instance->registerEObj( "Tailwindrelic", 2007400, 6422938, 4, { 342.708191f, 145.153397f, -162.585800f }, 1.000000f );
+      instance->registerEObj( "Tailwindrelic", 2007401, 6422940, 4, { 414.549988f, 152.457504f, -298.508392f }, 0.991760f );
+      instance->registerEObj( "Unknown19", 2007524, 6493432, 4, { 341.786896f, 144.853806f, -164.354904f }, 0.991760f );
+      instance->registerEObj( "Unknown20", 2007525, 6493431, 4, { 412.853699f, 152.110397f, -297.974396f }, 1.000000f );
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp
deleted file mode 100644
index 9e1329af..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/Sastasha.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class Sastasha : public InstanceContentScript
-{
-private:
-   static void exitOnTalk( Entity::Player& player, uint64_t actorId )
-   {
-      player.sendDebug( "actor: " + std::to_string( actorId ) );
-   }
-
-public:
-   Sastasha() : InstanceContentScript( 4 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      auto exit = instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { -314.0f, 5.6f, 348.73f } );
-      exit->setScale( 0.6f );
-      exit->setOnTalkHandler( exitOnTalk );
-
-      instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { 361.0f, 46.0f, -225.0f } );
-
-      auto memo = instance->registerEObj( "BloodyMemo", BLOODY_MEMO_1, 0, BLOODY_MEMO_STATE, { 320.81f, 47.86f, -130.78f } );
-      memo->setScale( 0.6f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-private:
-   static constexpr auto EXIT_OBJECT = 2000139;
-   static constexpr auto EXIT_OBJECT_STATE = 4;
-
-   static constexpr auto START_CIRCLE = 2000182;
-   static constexpr auto START_CIRCLE_MAPLINK = 4096706;
-   static constexpr auto START_CIRCLE_STATE = 5;
-
-   static constexpr auto BLOODY_MEMO_1 = 2000212;
-   static constexpr auto BLOODY_MEMO_2 = 2001548;
-   static constexpr auto BLOODY_MEMO_3 = 2001549;
-   static constexpr auto BLOODY_MEMO_STATE = 4;
-};
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp
deleted file mode 100644
index 4094b7b7..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeon/TheThousandMawsOfTotoRak.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheThousandMawsOfTotoRak : public InstanceContentScript
-{
-public:
-   TheThousandMawsOfTotoRak() : InstanceContentScript( 1 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { 237, -39, -144 } );
-      instance->getEObjByName( "Exit" )->setScale( 0.6f );
-      instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { -322, 12, -78 } );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-private:
-   static constexpr auto EXIT_OBJECT = 2000683;
-   static constexpr auto EXIT_OBJECT_STATE = 4;
-
-   static constexpr auto START_CIRCLE = 2000182;
-   static constexpr auto START_CIRCLE_MAPLINK = 4127435;
-   static constexpr auto START_CIRCLE_STATE = 5;
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
deleted file mode 100644
index 1e12dd48..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheNavel : public InstanceContentScript
-{
-public:
-   TheNavel() : InstanceContentScript( 20002 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      instance->registerEObj( "Exit", EXIT_OBJECT, 0, EXIT_OBJECT_STATE, { 0, 0, -10 } );
-      instance->registerEObj( "Entrance", START_CIRCLE, START_CIRCLE_MAPLINK, START_CIRCLE_STATE, { 0, 0, 24 } );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-private:
-   static constexpr auto EXIT_OBJECT = 2000139;
-   static constexpr auto EXIT_OBJECT_STATE = 4;
-
-   static constexpr auto START_CIRCLE = 2000182;
-   static constexpr auto START_CIRCLE_MAPLINK = 4236868;
-   static constexpr auto START_CIRCLE_STATE = 5;
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 8bfb0f01..0aa49852 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -689,10 +689,11 @@ uint32_t Core::Zone::getNextEObjId()
    return ++m_nextEObjId;
 }
 
-Core::Entity::EventObjectPtr Core::Zone::registerEObj( const std::string &name, uint32_t objectId, uint32_t mapLink, uint8_t state,
-                               FFXIVARR_POSITION3 pos )
+Core::Entity::EventObjectPtr Core::Zone::registerEObj( const std::string &name, uint32_t objectId, uint32_t mapLink,
+                                                       uint8_t state, FFXIVARR_POSITION3 pos, float scale )
 {
    auto eObj = Entity::make_EventObject( objectId, mapLink, state, pos, name );
+   eObj->setScale( scale );
    registerEObj( eObj );
 
    return eObj;
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index a876a00f..7b43c772 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -109,7 +109,7 @@ public:
    void updateSessions( bool changedWeather );
 
    Entity::EventObjectPtr registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink,
-                      uint8_t state, Common::FFXIVARR_POSITION3 pos );
+                                        uint8_t state, Common::FFXIVARR_POSITION3 pos, float scale );
 
    void registerEObj( Entity::EventObjectPtr object );
    Entity::EventObjectPtr getEObj( uint32_t objId );

From a7bef9e244c2d2b968b0a4e8d236829d8cd237b1 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Mon, 26 Feb 2018 23:50:50 +0100
Subject: [PATCH 38/69] Added instance script dumper

---
 src/tools/event_object_parser/CMakeLists.txt |  33 ++
 src/tools/event_object_parser/README.md      |  26 +
 src/tools/event_object_parser/instance.tmpl  |  25 +
 src/tools/event_object_parser/lgb.h          | 363 ++++++++++++
 src/tools/event_object_parser/main.cpp       | 576 +++++++++++++++++++
 src/tools/event_object_parser/matrix4.h      | 100 ++++
 src/tools/event_object_parser/pcb.h          |  92 +++
 src/tools/event_object_parser/sgb.h          | 213 +++++++
 src/tools/event_object_parser/vec3.h         |  31 +
 9 files changed, 1459 insertions(+)
 create mode 100644 src/tools/event_object_parser/CMakeLists.txt
 create mode 100644 src/tools/event_object_parser/README.md
 create mode 100644 src/tools/event_object_parser/instance.tmpl
 create mode 100644 src/tools/event_object_parser/lgb.h
 create mode 100644 src/tools/event_object_parser/main.cpp
 create mode 100644 src/tools/event_object_parser/matrix4.h
 create mode 100644 src/tools/event_object_parser/pcb.h
 create mode 100644 src/tools/event_object_parser/sgb.h
 create mode 100644 src/tools/event_object_parser/vec3.h

diff --git a/src/tools/event_object_parser/CMakeLists.txt b/src/tools/event_object_parser/CMakeLists.txt
new file mode 100644
index 00000000..3af2ac6b
--- /dev/null
+++ b/src/tools/event_object_parser/CMakeLists.txt
@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 2.6)
+cmake_policy(SET CMP0015 NEW)
+project(Tool_event_object_parser)
+
+set(SAPPHIRE_BOOST_VER 1.63.0)
+set(SAPPHIRE_BOOST_FOLDER_NAME boost_1_63_0)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY  "${CMAKE_CURRENT_SOURCE_DIR}/../bin/")
+
+
+file(GLOB SERVER_PUBLIC_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/*")
+file(GLOB SERVER_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}*.c*")
+
+#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "../bin/")
+add_executable(event_object_parser ${SERVER_PUBLIC_INCLUDE_FILES} ${SERVER_SOURCE_FILES})
+
+set_target_properties(event_object_parser PROPERTIES
+    CXX_STANDARD 14
+    CXX_STANDARD_REQUIRED ON
+    CXX_EXTENSIONS ON
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
+    RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
+    RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL "${CMAKE_CURRENT_SOURCE_DIR}/../bin/"
+)
+
+if (UNIX)
+  target_link_libraries (event_object_parser common xivdat pthread mysqlclient dl z)
+else()
+  target_link_libraries (event_object_parser common xivdat libmysql zlib1)
+endif()
+
+target_link_libraries(event_object_parser ${Boost_LIBRARIES} ${Boost_LIBRARIES})
+
diff --git a/src/tools/event_object_parser/README.md b/src/tools/event_object_parser/README.md
new file mode 100644
index 00000000..66fb849f
--- /dev/null
+++ b/src/tools/event_object_parser/README.md
@@ -0,0 +1,26 @@
+collision data exporter for sapphire
+
+compile with STANDALONE defined to compile without boost and sapphire dependencies
+
+usage:
+- regular
+ - compile with root sapphire dir cmakelists
+ - sapphire/src/tools/bin/pcb_reader2 <territory> "<path/to/game/sqpack/ffxiv>" 
+- standalone
+ - compile main.cpp with STANDALONE defined in build arg
+ - download ffxivexplorer <http://ffxivexplorer.fragmenterworks.com/>
+ - ffxivexplorer > path/to/ffxiv's/game/sqpack/ffxiv/0a0000.dat
+ - exd/territorytype.exh > `File > Export` and copy `territorytype.exh.csv` from exproted directory to `pcb_reader.exe` directory 
+ - ffxivexplorer > path/to/ffxiv's/game/sqpack/ffxiv/020000.dat
+ - ctrl click the following: 
+  - `bg/ffxiv/[REGION]/common/collision`
+  - `bg/ffxiv/[REGION]/[dun|fld|twn|etc..]/common/collision/`
+  - `bg/ffxiv/[REGION]/[dun|fld|twn|etc..]/collision/`
+  - `bg/ffxiv/region/shared/[for_bg|for_hou]/`
+  - `bg/ffxiv/[REGION]/[dun|fld|twn|etc..]/ZONE/level/`
+  - `bg/ffxiv/[REGION]/[dun|fld|twn|etc..]/ZONE/collision/`
+  - `bgcommon/world/sys/shared/for_bg/`
+ and `File > Export Raw` to pcb_reader exe dir (common and shared files are optional but you will be missing a lot of objects if you skip them)
+ - note: at this time ffxivexplorer is still missing some hashes, though any tool which can export the exds should work fine
+ - main "" <territory>
+
diff --git a/src/tools/event_object_parser/instance.tmpl b/src/tools/event_object_parser/instance.tmpl
new file mode 100644
index 00000000..04cdb716
--- /dev/null
+++ b/src/tools/event_object_parser/instance.tmpl
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class INSTANCE_NAME : public InstanceContentScript
+{
+public:
+   INSTANCE_NAME() : InstanceContentScript( INSTANCE_ID )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      EOBJ_INIT
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/tools/event_object_parser/lgb.h b/src/tools/event_object_parser/lgb.h
new file mode 100644
index 00000000..2b6aa003
--- /dev/null
+++ b/src/tools/event_object_parser/lgb.h
@@ -0,0 +1,363 @@
+#ifndef _LGB_H
+#define _LGB_H
+
+#include <cstring>
+#include <memory>
+#include <cstdint>
+#include <iostream>
+#include <vector>
+#include <map>
+#include <string>
+
+#include "matrix4.h"
+#include "vec3.h"
+#include "sgb.h"
+
+// garbage to skip model loading
+extern bool ignoreModels;
+
+// all credit to
+// https://github.com/ufx/SaintCoinach/blob/master/SaintCoinach/Graphics/Lgb/
+// this is simply their work ported to c++ since we dont c#
+struct LGB_FILE;
+struct LGB_FILE_HEADER;
+struct LGB_GROUP;
+struct LGB_GROUP_HEADER;
+
+enum class LgbEntryType : uint32_t
+{
+   BgParts = 1,
+   Light = 3,
+   Vfx = 4,
+   PositionMarker = 5,
+   Gimmick = 6,
+   SharedGroup6 = 6,// secondary variable is set to 2
+   Sound = 7,
+   EventNpc = 8,
+   BattleNpc = 9,
+   Aetheryte = 12,
+   EnvSpace = 13,
+   Gathering = 14,
+   SharedGroup15 = 15,// secondary variable is set to 13
+   Treasure = 16,
+   Weapon = 39,
+   PopRange = 40,
+   ExitRange = 41,
+   MapRange = 43,
+   NaviMeshRange = 44,
+   EventObject = 45,
+   EnvLocation = 47,
+   EventRange = 49,
+   QuestMarker = 51,
+   CollisionBox = 57,
+   DoorRange = 58,
+   LineVfx = 59,
+   ClientPath = 65,
+   ServerPath = 66,
+   GimmickRange = 67,
+   TargetMarker = 68,
+   ChairMarker = 69,
+   ClickableRange = 70,
+   PrefetchRange = 71,
+   FateRange = 72,
+   SphereCastRange = 75,
+};
+
+struct LGB_ENTRY_HEADER
+{
+   LgbEntryType type;
+   uint32_t unknown;
+   uint32_t nameOffset;
+   vec3 translation;
+   vec3 rotation;
+   vec3 scale;
+};
+
+class LGB_ENTRY
+{
+public:
+   char* m_buf;
+   uint32_t m_offset;
+   LGB_ENTRY_HEADER header;
+
+   LGB_ENTRY()
+   {
+      m_buf = nullptr;
+      m_offset = 0;
+      memset( &header, 0, sizeof( header ) );
+   };
+   LGB_ENTRY( char* buf, uint32_t offset )
+   {
+      m_buf = buf;
+      m_offset = offset;
+      header = *reinterpret_cast< LGB_ENTRY_HEADER* >( buf + offset );
+   };
+   const LgbEntryType getType() const
+   {
+      return header.type;
+   };
+   virtual ~LGB_ENTRY() {};
+};
+
+
+struct LGB_BGPARTS_HEADER : public LGB_ENTRY_HEADER
+{
+   uint32_t modelFileOffset;
+   uint32_t collisionFileOffset;
+   uint32_t unknown4;
+   uint32_t unknown5;
+   uint32_t unknown6;
+   uint32_t unknown7;
+   uint32_t unknown8;
+   uint32_t unknown9;
+};
+
+class LGB_BGPARTS_ENTRY : public LGB_ENTRY
+{
+public:
+   LGB_BGPARTS_HEADER header;
+   std::string name;
+   std::string modelFileName;
+   std::string collisionFileName;
+   LGB_BGPARTS_ENTRY() {};
+   LGB_BGPARTS_ENTRY( char* buf, uint32_t offset ) : LGB_ENTRY( buf, offset )
+   {
+      header = *reinterpret_cast<LGB_BGPARTS_HEADER*>( buf + offset );
+      name = std::string( buf + offset + header.nameOffset );
+      modelFileName = std::string( buf + offset + header.modelFileOffset );
+      collisionFileName = std::string( buf + offset + header.collisionFileOffset );
+   };
+};
+
+struct LGB_GIMMICK_HEADER : public LGB_ENTRY_HEADER
+{
+   uint32_t gimmickFileOffset;
+   char unknownBytes[100];
+};
+
+class LGB_GIMMICK_ENTRY : public LGB_ENTRY
+{
+public:
+   LGB_GIMMICK_HEADER header;
+   std::string name;
+   std::string gimmickFileName;
+
+   LGB_GIMMICK_ENTRY( char* buf, uint32_t offset ) : LGB_ENTRY( buf, offset )
+   {
+      header = *reinterpret_cast<LGB_GIMMICK_HEADER*>( buf + offset );
+      name = std::string( buf + offset + header.nameOffset );
+      gimmickFileName = std::string( buf + offset + header.gimmickFileOffset );
+      //std::cout << "\t " << gimmickFileName << " unknown: " << header.unknown << "\n";
+   };
+};
+
+struct LGB_ENPC_HEADER : public LGB_ENTRY_HEADER
+{
+   uint32_t enpcId;
+   uint8_t unknown1[0x24];
+};
+
+class LGB_ENPC_ENTRY : public LGB_ENTRY
+{
+public:
+   LGB_ENPC_HEADER header;
+   std::string name;
+
+   LGB_ENPC_ENTRY( char* buf, uint32_t offset ) : LGB_ENTRY( buf, offset )
+   {
+      header = *reinterpret_cast< LGB_ENPC_HEADER* >( buf + offset );
+      name = std::string( buf + offset + header.nameOffset );
+      //std::cout << "\t ENpc " << header.enpcId << " " << name << "\n";
+   };
+};
+
+struct LGB_EOBJ_HEADER : public LGB_ENTRY_HEADER
+{
+   uint32_t eobjId;
+   uint32_t levelHierachyId;
+   uint8_t unknown1[0xC];
+};
+
+class LGB_EOBJ_ENTRY : public LGB_ENTRY
+{
+public:
+   LGB_EOBJ_HEADER header;
+   std::string name;
+
+   LGB_EOBJ_ENTRY( char* buf, uint32_t offset ) : LGB_ENTRY( buf, offset )
+   {
+      header = *reinterpret_cast< LGB_EOBJ_HEADER* >( buf + offset );
+      //std::cout << "\t " << header.eobjId << " " << name << " unknown: " << header.unknown << "\n";
+      name = std::string( buf + offset + header.nameOffset );
+   };
+};
+
+struct LGB_MAPRANGE_HEADER : public LGB_ENTRY_HEADER
+{
+   uint32_t type;
+   uint16_t unknown2;
+   uint16_t unknown3;
+   uint8_t unknown4[0x10];
+};
+
+struct LGB_MAPRANGE_ENTRY : public LGB_ENTRY
+{
+public:
+   LGB_MAPRANGE_HEADER header;
+   std::string name;
+
+   LGB_MAPRANGE_ENTRY( char* buf, uint32_t offset ) : LGB_ENTRY( buf, offset )
+   {
+      header = *reinterpret_cast< LGB_MAPRANGE_HEADER* >( buf + offset );
+      name = std::string( buf + offset + header.nameOffset );
+   };
+};
+
+struct LGB_GROUP_HEADER
+{
+   uint32_t unknown;
+   int32_t groupNameOffset;
+   int32_t entriesOffset;
+   int32_t entryCount;
+   uint32_t unknown2;
+   uint32_t unknown3;
+   uint32_t unknown4;
+   uint32_t unknown5;
+   uint32_t unknown6;
+   uint32_t unknown7;
+   uint32_t unknown8;
+   uint32_t unknown9;
+   uint32_t unknown10;
+};
+
+struct LGB_GROUP
+{
+   LGB_FILE* parent;
+   LGB_GROUP_HEADER header;
+   std::string name;
+   std::vector< std::shared_ptr< LGB_ENTRY > > entries;
+
+   LGB_GROUP( char* buf, LGB_FILE* parentStruct, uint32_t offset )
+   {
+      parent = parentStruct;
+      header = *reinterpret_cast< LGB_GROUP_HEADER* >( buf + offset );
+      name = std::string( buf + offset + header.groupNameOffset );
+      //entries.resize( header.entryCount );
+      //std::cout << name << "\n\t unknown: " << header.unknown << "\n";
+      const auto entriesOffset = offset + header.entriesOffset;
+      for( auto i = 0; i < header.entryCount; ++i )
+      {
+         const auto entryOffset = entriesOffset + *reinterpret_cast< int32_t* >( buf + ( entriesOffset + i * 4 ) );
+
+         try
+         {
+            const auto type = *reinterpret_cast<LgbEntryType*>( buf + entryOffset );
+            // garbage to skip model loading
+            if( !ignoreModels && type == LgbEntryType::BgParts )
+            {
+               entries.push_back( std::make_shared< LGB_BGPARTS_ENTRY >( buf, entryOffset ) );
+            }
+            else if( !ignoreModels && type == LgbEntryType::Gimmick )
+            {
+               entries.push_back( std::make_shared< LGB_GIMMICK_ENTRY >( buf, entryOffset ) );
+            }
+            else if( type == LgbEntryType::EventNpc )
+            {
+               entries.push_back( std::make_shared< LGB_ENPC_ENTRY >( buf, entryOffset ) );
+            }
+            else if( type == LgbEntryType::EventObject )
+            {
+               entries.push_back( std::make_shared< LGB_EOBJ_ENTRY >( buf, entryOffset ) );
+            }
+            else if( type == LgbEntryType::MapRange )
+            {
+               entries.push_back( std::make_shared< LGB_MAPRANGE_ENTRY >( buf, entryOffset ) );
+            }
+            /*
+            else
+            {
+               entries[i] = nullptr;
+            }
+            */
+
+         }
+         catch( std::exception& e )
+         {
+            std::cout << name << " " << e.what() << std::endl;
+         }
+      }
+   };
+};
+
+struct LGB_FILE_HEADER
+{
+   char magic[4]; // LGB 1
+   uint32_t fileSize;
+   uint32_t unknown;
+   char magic2[4]; // LGP1
+   uint32_t unknown2;
+   uint32_t unknown3;
+   uint32_t unknown4;
+   uint32_t unknown5;
+   int32_t groupCount;
+};
+
+struct LGB_FILE
+{
+   LGB_FILE_HEADER header;
+   std::vector< LGB_GROUP > groups;
+   std::string name;
+
+   LGB_FILE( char* buf, const std::string& name )
+   {
+      header = *reinterpret_cast< LGB_FILE_HEADER* >( buf );
+      if( strncmp( &header.magic[0], "LGB1", 4 ) != 0 || strncmp( &header.magic2[0], "LGP1", 4 ) != 0 )
+         throw std::runtime_error( "Invalid LGB file!" );
+
+      //groups.resize(header.groupCount);
+
+      constexpr auto baseOffset = sizeof( header );
+      for( auto i = 0; i < header.groupCount; ++i )
+      {
+         const auto groupOffset = baseOffset + *reinterpret_cast< int32_t* >( buf + ( baseOffset + i * 4 ) );
+         const auto group = LGB_GROUP( buf, this, groupOffset );
+         groups.push_back( group );
+      }
+   };
+};
+
+/*
+#if __cplusplus >= 201703L
+#include <experimental/filesystem>
+std::map<std::string, LGB_FILE> getLgbFiles( const std::string& dir )
+{
+   namespace fs = std::experimental::filesystem;
+   std::map<std::string, LGB_FILE> fileMap;
+   for( const auto& path : fs::recursive_directory_iterator( dir ) )
+   {
+      if( path.path().extension() == ".lgb" )
+      {
+         const auto& strPath = path.path().string();
+         auto f = fopen( strPath.c_str(), "rb" );
+         fseek( f, 0, SEEK_END );
+         const auto size = ftell( f );
+         std::vector<char> bytes( size );
+         rewind( f );
+         fread( bytes.data(), 1, size, f );
+         fclose( f );
+         try
+         {
+            LGB_FILE lgbFile( bytes.data() );
+            fileMap.insert( std::make_pair( strPath, lgbFile ) );
+         }
+         catch( std::exception& e )
+         {
+            std::cout << "Unable to load " << strPath << std::endl;
+         }
+      }
+   }
+   return fileMap;
+}
+#endif
+*/
+#endif
\ No newline at end of file
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
new file mode 100644
index 00000000..bb8e8188
--- /dev/null
+++ b/src/tools/event_object_parser/main.cpp
@@ -0,0 +1,576 @@
+#include <stdio.h>
+#include <cstdint>
+#include <string>
+#include <iostream>
+#include <chrono>
+#include <fstream>
+#include <regex>
+#include <map>
+#include <vector>
+#include <set>
+
+#include "pcb.h"
+#include "lgb.h"
+#include "sgb.h"
+
+#ifndef STANDALONE
+#include <GameData.h>
+#include <File.h>
+#include <DatCat.h>
+#include <ExdData.h>
+#include <ExdCat.h>
+#include <Exd.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/range/algorithm/remove_if.hpp>
+#include <boost/algorithm/string/classification.hpp>
+#endif
+
+// garbage to ignore models
+bool ignoreModels = false;
+
+std::string gamePath( "C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack" );
+std::unordered_map< uint32_t, std::string > eobjNameMap;
+std::unordered_map< uint16_t, std::string > zoneNameMap;
+std::unordered_map< uint16_t, std::vector< std::pair< uint16_t, std::string > > > zoneInstanceMap;
+uint32_t zoneId;
+
+struct instanceContent
+{
+   uint32_t id;
+   std::string name;
+   std::string zoneName;
+};
+
+std::vector< instanceContent > contentList;
+
+std::set< std::string > zoneDumpList;
+
+xiv::dat::GameData* data1 = nullptr;
+xiv::exd::ExdData* eData = nullptr;
+
+enum class TerritoryTypeExdIndexes : size_t
+{
+   TerritoryType = 0,
+   Path = 1
+};
+
+using namespace std::chrono_literals;
+
+struct face
+{
+   int32_t f1, f2, f3;
+};
+
+void initExd( const std::string& gamePath )
+{
+   data1 = data1 ? data1 : new xiv::dat::GameData( gamePath );
+   eData = eData ? eData : new xiv::exd::ExdData( *data1 );
+}
+
+int parseBlockEntry( char* data, std::vector<PCB_BLOCK_ENTRY>& entries, int gOff )
+{
+   int offset = 0;
+   bool isgroup = true;
+   while( isgroup )
+   {
+      PCB_BLOCK_ENTRY block_entry;
+      memcpy( &block_entry.header, data + offset, sizeof( block_entry.header ) );
+      isgroup = block_entry.header.type == 0x30;
+
+      //printf( " BLOCKHEADER_%X: type: %i, group_size: %i\n", gOff + offset, block_entry.header.type, block_entry.header.group_size );
+
+      if( isgroup )
+      {
+         parseBlockEntry( data + offset + 0x30, entries, gOff + offset );
+         offset += block_entry.header.group_size;
+      }
+      else
+      {
+         /*   printf( "\tnum_v16: %i, num_indices: %i, num_vertices: %i\n\n",
+                    block_entry.header.num_v16, block_entry.header.num_indices, block_entry.header.num_vertices );*/
+         int doffset = sizeof( block_entry.header ) + offset;
+         uint16_t block_size = sizeof( block_entry.header ) +
+            block_entry.header.num_vertices * 3 * 4 +
+            block_entry.header.num_v16 * 6 +
+            block_entry.header.num_indices * 6;
+
+         if( block_entry.header.num_vertices != 0 )
+         {
+            block_entry.data.vertices.resize( block_entry.header.num_vertices );
+
+            int32_t size_vertexbuffer = block_entry.header.num_vertices * 3;
+            memcpy( &block_entry.data.vertices[0], data + doffset, size_vertexbuffer * 4 );
+            doffset += size_vertexbuffer * 4;
+         }
+         if( block_entry.header.num_v16 != 0 )
+         {
+            block_entry.data.vertices_i16.resize( block_entry.header.num_v16 );
+            int32_t size_unknownbuffer = block_entry.header.num_v16 * 6;
+            memcpy( &block_entry.data.vertices_i16[0], data + doffset, size_unknownbuffer );
+            doffset += block_entry.header.num_v16 * 6;
+         }
+         if( block_entry.header.num_indices != 0 )
+         {
+            block_entry.data.indices.resize( block_entry.header.num_indices );
+            int32_t size_indexbuffer = block_entry.header.num_indices * 12;
+            memcpy( &block_entry.data.indices[0], data + doffset, size_indexbuffer );
+            doffset += size_indexbuffer;
+         }
+         entries.push_back( block_entry );
+      }
+   }
+
+   return 0;
+}
+
+void dumpLevelExdEntries( uint32_t zoneId, const std::string& name = std::string() )
+{
+   static auto& cat = eData->get_category( "Level" );
+   static auto exd = static_cast< xiv::exd::Exd >( cat.get_data_ln( xiv::exd::Language::none ) );
+
+   std::string fileName( name + "_" + std::to_string( zoneId ) + "_Level" + ".csv" );
+   std::ofstream outfile( fileName, std::ios::trunc );
+   std::cout << "[Info] Writing level.exd entries to " << fileName << "\n";
+   if( outfile.good() )
+   {
+      outfile.close();
+      outfile.open( fileName, std::ios::app );
+      static auto rows = exd.get_rows();
+      for( auto& row : rows )
+      {
+         auto id = row.first;
+         auto& fields = row.second;
+         auto x = *boost::get< float >( &fields.at( 0 ) );
+         auto y = *boost::get< float >( &fields.at( 1 ) );
+         auto z = *boost::get< float >( &fields.at( 2 ) );
+         auto yaw = *boost::get< float >( &fields.at( 3 ) );
+         auto radius = *boost::get< float >( &fields.at( 4 ) );
+         auto type = *boost::get< uint8_t >( &fields.at( 5 ) );
+         auto objectid = *boost::get< uint32_t >( &fields.at( 6 ) );
+         auto zone = *boost::get< uint16_t >( &fields.at( 9 ) );
+
+         if( zone == zoneId )
+         {
+            std::string outStr(
+               std::to_string( id ) + ", " + std::to_string( objectid ) + ", " +
+               std::to_string( x ) + ", " + std::to_string( y ) + ", " + std::to_string( z ) + ", " +
+               std::to_string( yaw ) + ", " + std::to_string( radius ) + ", " + std::to_string( type ) + "\n"
+            );
+            outfile.write( outStr.c_str(), outStr.size() );
+         }
+      }
+   }
+}
+
+std::string zoneNameToPath( const std::string& name )
+{
+   std::string path;
+   bool found = false;
+
+#ifdef STANDALONE
+   auto inFile = std::ifstream( "territorytype.exh.csv" );
+   if( inFile.good() )
+   {
+      std::string line;
+      std::regex re( "(\\d+),\"(.*)\",\"(.*)\",.*" );
+      while( std::getline( inFile, line ) )
+      {
+         std::smatch match;
+         if( std::regex_match( line, match, re )
+         {
+            auto tmpId = std::stoul( match[1].str() );
+            if( !found && name == match[2].str() )
+            {
+               zoneId = tmpId;
+               path = match[3].str();
+               found = true;
+            }
+            zoneNameMap[tmpId] = match[2].str();
+         }
+      }
+      inFile.close();
+   }
+#else
+
+   auto& cat = eData->get_category( "TerritoryType" );
+   auto exd = static_cast< xiv::exd::Exd >( cat.get_data_ln( xiv::exd::Language::none ) );
+   for( auto& row : exd.get_rows() )
+   {
+      auto& fields = row.second;
+      auto teriName = *boost::get< std::string >( &fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::TerritoryType ) ) );
+      if( teriName.empty() )
+         continue;
+      auto teriPath = *boost::get< std::string >( &fields.at( static_cast< size_t >( TerritoryTypeExdIndexes::Path ) ) );
+      if( !found && boost::iequals( name, teriName ) )
+      {
+         path = teriPath;
+         found = true;
+         zoneId = row.first;
+      }
+      zoneNameMap[row.first] = teriName;
+   }
+#endif
+
+   if( found )
+   {
+      //path = path.substr( path.find_first_of( "/" ) + 1, path.size() - path.find_first_of( "/" ));
+      //path = std::string( "ffxiv/" ) + path;
+      path = std::string( "bg/" ) + path.substr( 0, path.find( "/level/" ) );
+      std::cout << "[Info] " << "Found path for " << name << ": " << path << std::endl;
+   }
+   else
+   {
+      throw std::runtime_error( "Unable to find path for " + name +
+      ".\n\tPlease double check spelling or open 0a0000.win32.index with FFXIV Explorer and extract territorytype.exh as CSV\n\tand copy territorytype.exh.csv into pcb_reader.exe directory if using standalone" );
+   }
+
+   return path;
+}
+
+void loadEobjNames()
+{
+   auto& cat = eData->get_category( "EObjName" );
+   auto exd = static_cast< xiv::exd::Exd >( cat.get_data_ln( xiv::exd::Language::en ) );
+   for( auto& row : exd.get_rows() )
+   {
+      auto id = row.first;
+      auto& fields = row.second;
+      auto name = *boost::get< std::string >( &fields.at( 0 ) );
+      eobjNameMap[id] = name;
+   }
+}
+
+void writeEobjEntry( std::ofstream& out, LGB_ENTRY* pObj )
+{
+   static std::string mapRangeStr( "\"MapRange\", " );
+   static std::string eobjStr( "\"EObj\", " );
+
+   uint32_t id;
+   uint32_t unknown = 0, unknown2 = 0;
+   std::string name;
+   std::string typeStr;
+   uint32_t eobjlevelHierachyId = 0;
+
+   if( pObj->getType() == LgbEntryType::EventObject )
+   {
+      auto pEobj = reinterpret_cast< LGB_EOBJ_ENTRY* >( pObj );
+      id = pEobj->header.eobjId;
+      unknown = pEobj->header.unknown;
+      name = eobjNameMap[id];
+      typeStr = eobjStr;
+      eobjlevelHierachyId = pEobj->header.levelHierachyId;
+   }
+   else if( pObj->getType() == LgbEntryType::MapRange )
+   {
+      auto pMapRange = reinterpret_cast< LGB_MAPRANGE_ENTRY* >( pObj );
+      id = pMapRange->header.unknown;
+      unknown = pMapRange->header.unknown2;
+      unknown2 = pMapRange->header.unknown3;
+      typeStr = mapRangeStr;
+   }
+
+   std::string outStr(
+      std::to_string( id ) + ", " + typeStr +  "\"" + name + "\", " +
+      std::to_string( pObj->header.translation.x ) + ", " + std::to_string( pObj->header.translation.y ) + ", " + std::to_string( pObj->header.translation.z ) +
+      ", " + std::to_string( eobjlevelHierachyId ) + "\n"
+   );
+   out.write( outStr.c_str(), outStr.size() );
+}
+
+void loadAllInstanceContentEntries()
+{
+   auto& catInstance = eData->get_category( "InstanceContent" );
+   auto exdInstance = static_cast< xiv::exd::Exd >( catInstance.get_data_ln( xiv::exd::Language::en ) );
+
+   if( zoneNameMap.size() == 0 )
+   {
+      zoneNameToPath( "f1d1" );
+   }
+
+   std::ofstream out( "instancecontent.csv", std::ios::trunc );
+   if( out.good() )
+   {
+      out.close();
+   }
+   out.open( "instancecontent.csv", std::ios::app );
+   if( !out.good() )
+   {
+      throw std::runtime_error( "Unable to create instancecontent.csv!" );
+   }
+   std::cout << "[Info] Writing instancecontent.csv\n";
+
+   for( auto& row : exdInstance.get_rows() )
+   {
+      auto id = row.first;
+      auto& fields = row.second;
+
+      auto name = *boost::get< std::string >( &fields.at( 3 ) );
+      if( name.empty() )
+         continue;
+      auto teri = *boost::get< uint32_t >( &fields.at( 9 ) );
+      auto i = 0;
+      while( ( i = name.find( ' ' ) ) != std::string::npos )
+         name = name.replace( name.begin() + i, name.begin() + i + 1, { '_' } );
+      std::string outStr(
+         std::to_string( id ) + ", \"" + name + "\", \"" + zoneNameMap[teri] + "\","  + std::to_string( teri ) + "\n"
+      );
+      out.write( outStr.c_str(), outStr.size() );
+      //zoneInstanceMap[zoneId].push_back( std::make_pair( id, name ) );
+      zoneDumpList.emplace( zoneNameMap[teri] );
+
+      name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() );
+      name[0] = toupper( name[0] );
+      contentList.push_back( { id, name, zoneNameMap[teri] } );
+   }
+   out.close();
+}
+
+void readFileToBuffer( const std::string& path, std::vector< char >& buf )
+{
+   auto inFile = std::ifstream( path, std::ios::binary );
+   if( inFile.good() )
+   {
+      inFile.seekg( 0, inFile.end );
+      int32_t fileSize = (int32_t)inFile.tellg();
+      buf.resize( fileSize );
+      inFile.seekg( 0, inFile.beg );
+      inFile.read( &buf[0], fileSize );
+      inFile.close();
+   }
+   else
+   {
+      throw std::runtime_error( "Unable to open " + path );
+   }
+}
+
+int main( int argc, char* argv[] )
+{
+   auto startTime = std::chrono::system_clock::now();
+   auto entryStartTime = std::chrono::system_clock::now();
+
+   std::vector< std::string > argVec( argv + 1, argv + argc );
+   // todo: support expansions
+   std::string zoneName = "r2t2";
+   bool dumpInstances = ignoreModels = std::remove_if( argVec.begin(), argVec.end(), []( auto arg ){ return arg == "--instance-dump"; } ) != argVec.end();
+   ignoreModels = true;
+   dumpInstances = true;
+   if( argc > 1 )
+   {
+      zoneName = argv[1];
+      if( argc > 2 )
+      {
+         std::string tmpPath( argv[2] );
+         if( !tmpPath.empty() )
+            gamePath = argv[2];
+      }
+   }
+
+   initExd( gamePath );
+   if( dumpInstances )
+   {
+      loadAllInstanceContentEntries();
+   }
+   else
+   {
+      zoneDumpList.emplace( zoneName );
+   }
+
+   for( auto entry : contentList )
+   {
+      std::string eobjects = "";
+      entryStartTime = std::chrono::system_clock::now();
+      zoneName = entry.zoneName;
+      try
+      {
+         const auto& zonePath = zoneNameToPath( zoneName );
+
+         std::string listPcbPath( zonePath + "/collision/list.pcb" );
+         std::string bgLgbPath( zonePath + "/level/bg.lgb" );
+         std::string planmapLgbPath( zonePath + "/level/planmap.lgb" );
+         std::string collisionFilePath( zonePath + "/collision/" );
+         std::vector< char > section;
+         std::vector< char > section1;
+         std::vector< char > section2;
+
+#ifndef STANDALONE
+         const xiv::dat::Cat& test = data1->getCategory( "bg" );
+
+         auto test_file = data1->getFile( bgLgbPath );
+         section = test_file->access_data_sections().at( 0 );
+
+         auto planmap_file = data1->getFile( planmapLgbPath );
+         section2 = planmap_file->access_data_sections().at( 0 );
+
+#else
+         {
+            readFileToBuffer( bgLgbPath, section );
+            readFileToBuffer( listPcbPath, section1 );
+         }
+#endif
+
+         std::vector< std::string > stringList;
+
+         uint32_t offset1 = 0x20;
+
+         loadEobjNames();
+         //dumpLevelExdEntries( zoneId, zoneName );
+         std::string eobjFileName( entry.name + "_eobj.csv" );
+         std::ofstream eobjOut( eobjFileName, std::ios::trunc );
+         if( !eobjOut.good() )
+            throw std::string( "Unable to create " + zoneName + "_eobj.csv for eobj entries. Run as admin or check there isnt already a handle on the file." ).c_str();
+
+         eobjOut.close();
+         eobjOut.open( eobjFileName, std::ios::app );
+
+         if( !eobjOut.good() )
+            throw std::string( "Unable to create " + zoneName + "_eobj.csv for eobj entries. Run as admin or check there isnt already a handle on the file." ).c_str();
+
+         LGB_FILE bgLgb( &section[0], "bg" );
+         LGB_FILE planmapLgb( &section2[0], "planmap" );
+
+         std::vector< LGB_FILE > lgbList{ bgLgb, planmapLgb };
+         uint32_t max_index = 0;
+
+         if( ignoreModels )
+         {
+            std::map< std::string, SGB_FILE > sgbFiles;
+
+            auto loadSgbFile = [&]( const std::string& fileName ) -> bool
+            {
+               SGB_FILE sgbFile;
+               try
+               {
+                  char* dataSection = nullptr;
+                  //std::cout << fileName << " ";
+#ifndef STANDALONE
+                  auto file = data1->getFile( fileName );
+                  auto sections = file->get_data_sections();
+                  dataSection = &sections.at( 0 )[0];
+#else
+                  std::vector< char > buf;
+                  readFileToBuffer( fileName, buf );
+                  dataSection = &buf[0];
+#endif
+                  sgbFile = SGB_FILE( &dataSection[0] );
+                  sgbFiles.insert( std::make_pair( fileName, sgbFile ) );
+                  return true;
+               }
+               catch( std::exception& e )
+               {
+                  std::cout << "[Error] " << "Unable to load SGB " << fileName << "\n\tError:\n\t" << e.what() << "\n";
+                  sgbFiles.insert( std::make_pair( fileName, sgbFile ) );
+               }
+               return false;
+            };
+
+            std::cout << "[Info] " << ( ignoreModels ? "Dumping MapRange and EObj" : "Writing obj file " ) << "\n";
+            uint32_t totalGroups = 0;
+            uint32_t totalGroupEntries = 0;
+
+            uint32_t count = 0;
+            for( const auto& lgb : lgbList )
+            {
+               for( const auto& group : lgb.groups )
+               {
+                  //std::cout << "\t" << group.name << " Size " << group.header.entryCount << "\n";
+                  totalGroups++;
+                  for( const auto& pEntry : group.entries )
+                  {
+                     auto pGimmick = dynamic_cast< LGB_GIMMICK_ENTRY* >( pEntry.get() );
+                     auto pBgParts = dynamic_cast< LGB_BGPARTS_ENTRY* >( pEntry.get() );
+
+                     std::string fileName( "" );
+                     fileName.resize( 256 );
+                     totalGroupEntries++;
+
+                     if( pEntry->getType() == LgbEntryType::EventObject )
+                     {
+                        auto pObj = pEntry.get();
+                        static std::string eobjStr( "\"EObj\", " );
+
+                        uint32_t id;
+                        uint32_t unknown = 0, unknown2 = 0;
+                        std::string name;
+                        std::string typeStr;
+                        uint32_t eobjlevelHierachyId = 0;
+
+                        if( pObj->getType() == LgbEntryType::EventObject )
+                        {
+                           auto pEobj = reinterpret_cast< LGB_EOBJ_ENTRY* >( pObj );
+                           id = pEobj->header.eobjId;
+                           unknown = pEobj->header.unknown;
+                           name = eobjNameMap[id];
+                           if( name.empty() )
+                              name = "unknown" + std::to_string( count++ );
+                           name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() );
+                           name[0] = toupper( name[0] );
+                           typeStr = eobjStr;
+                           eobjlevelHierachyId = pEobj->header.levelHierachyId;
+                        }
+                        int state = 4;
+
+                        if( id == 2000182 )
+                        {
+                           state = 5;
+                           name = "Entrance";
+                        }
+
+                        eobjects += "\n      instance->registerEObj( \"" + name + "\", " + std::to_string( id ) + 
+                                     ", " + std::to_string( eobjlevelHierachyId ) + ", " + std::to_string( state ) + ", " +
+                                     "{ " + std::to_string( pObj->header.translation.x ) + "f, " 
+                                     + std::to_string( pObj->header.translation.y ) + "f, " 
+                                     + std::to_string( pObj->header.translation.z ) + "f }, " + std::to_string( pObj->header.scale.x ) + "f );";
+
+                        std::string outStr(
+                           std::to_string( id ) + ", " + typeStr + "\"" + name + "\", " +
+                           std::to_string( pObj->header.translation.x ) + ", " +
+                           std::to_string( pObj->header.translation.y ) + ", " +
+                           std::to_string( pObj->header.translation.z ) + ", " +
+                           std::to_string( eobjlevelHierachyId ) + "\n"
+                        );
+                        //eobjOut.write( outStr.c_str(), outStr.size() );
+                     }
+                  }
+               }
+            }
+            std::cout << "[Info] " << "Total Groups " << totalGroups << " Total entries " << totalGroupEntries << "\n";
+         }
+         std::cout << "[Success] " << "Exported " << zoneName << " in " <<
+            std::chrono::duration_cast< std::chrono::seconds >( std::chrono::system_clock::now() - entryStartTime ).count() << " seconds\n";
+      }
+      catch( std::exception& e )
+      {
+         std::cout << "[Error] " << e.what() << std::endl;
+         std::cout << "[Error] " << "Unable to extract collision data.\n\tIf using standalone ensure your working directory folder layout is \n\tbg/[ffxiv|ex1|ex2]/teri/type/zone/[level|collision]" << std::endl;
+         std::cout << std::endl;
+         std::cout << "[Info] " << "Usage: pcb_reader2 territory \"path/to/game/sqpack/ffxiv\" " << std::endl;
+      }
+      std::cout << "\n\n\n";
+
+      std::ifstream t( "instance.tmpl" );
+      std::string instanceTpl( ( std::istreambuf_iterator<char>( t ) ),
+                                 std::istreambuf_iterator<char>() );
+
+      auto result = std::regex_replace( instanceTpl, std::regex( "\\INSTANCE_NAME" ), entry.name );
+      result = std::regex_replace( result, std::regex( "\\INSTANCE_ID" ), std::to_string( entry.id ) );
+      result = std::regex_replace( result, std::regex( "\\EOBJ_INIT" ), eobjects );
+
+      
+      std::ofstream outH( entry.name + ".cpp" );
+      outH << result;
+      outH.close();
+      
+   }
+
+
+   std::cout << "\n\n\n[Success] Finished all tasks in " <<
+      std::chrono::duration_cast< std::chrono::seconds >( std::chrono::system_clock::now() - startTime ).count() << " seconds\n";
+
+   getchar();
+
+   if( eData )
+      delete eData;
+   if( data1 )
+      delete data1;
+   return 0;
+}
diff --git a/src/tools/event_object_parser/matrix4.h b/src/tools/event_object_parser/matrix4.h
new file mode 100644
index 00000000..d02d2c84
--- /dev/null
+++ b/src/tools/event_object_parser/matrix4.h
@@ -0,0 +1,100 @@
+#ifndef _MATRIX4_H
+#define _MATRIX4_H
+
+#include <cstdint>
+#include <cmath>
+
+// https://github.com/jpd002/Play--Framework/tree/master/include/math
+struct matrix4
+{
+   // 4x4
+   float grid[16];
+   matrix4()
+   {
+      memset( &grid[0], 0, sizeof( grid ) );
+   }
+
+   float operator()( int row, int col ) const
+	{
+		return grid[(row * 4) + col];
+	}
+
+   float& operator()( int row, int col )
+	{
+		return grid[(row * 4) + col];
+	}
+   static matrix4 rotateX( float angle )
+	{
+		matrix4 ret = matrix4();
+		ret(0, 0) = 1.000000000f;
+		ret(1, 1) = cos(angle);
+		ret(1, 2) = -sin(angle);
+		ret(2, 1) = sin(angle);
+		ret(2, 2) = cos(angle);
+		ret(3, 3) = 1.000000000f;
+		return ret;
+	}
+
+   static matrix4 rotateY( float angle )
+	{
+		matrix4 ret = matrix4();
+		ret(0, 0) = cos(angle);
+		ret(0, 2) = sin(angle);
+		ret(1, 1) = 1.000000000f;
+		ret(2, 0) = -sin(angle);
+		ret(2, 2) = cos(angle);
+		ret(3, 3) = 1.000000000f;
+		return ret;
+	}
+
+   static matrix4 rotateZ( float angle )
+	{
+		matrix4 ret = matrix4();
+		ret(0, 0) = cos(angle);
+		ret(0, 1) = -sin(angle);
+		ret(1, 0) = sin(angle);
+		ret(1, 1) = cos(angle);
+		ret(2, 2) = 1.000000000f;
+		ret(3, 3) = 1.000000000f;
+		return ret;
+   }
+
+   static matrix4 scale( float x, float y, float z )
+	{
+		matrix4 ret = matrix4();
+		ret(0, 0) = x;
+		ret(1, 1) = y;
+		ret(2, 2) = z;
+		ret(3, 3) = 1;
+
+		return ret;
+	}
+
+   static matrix4 translate( float x, float y, float z )
+	{
+		matrix4 ret = matrix4();
+		ret(0, 0) = 1;
+		ret(1, 1) = 1;
+		ret(2, 2) = 1;
+		ret(3, 3) = 1;
+
+		ret(3, 0) = x;
+		ret(3, 1) = y;
+		ret(3, 2) = z;
+		return ret;
+	}
+
+   matrix4 operator *( const matrix4& rhs ) const
+   {
+      matrix4 ret;
+      for( unsigned int i = 0; i < 4; i++ )
+      {
+         ret( i, 0 ) = (*this)(i, 0) * rhs( 0, 0 ) + (*this)(i, 1) * rhs( 1, 0 ) + (*this)(i, 2) * rhs( 2, 0 ) + (*this)(i, 3) * rhs( 3, 0 );
+         ret( i, 1 ) = (*this)(i, 0) * rhs( 0, 1 ) + (*this)(i, 1) * rhs( 1, 1 ) + (*this)(i, 2) * rhs( 2, 1 ) + (*this)(i, 3) * rhs( 3, 1 );
+         ret( i, 2 ) = (*this)(i, 0) * rhs( 0, 2 ) + (*this)(i, 1) * rhs( 1, 2 ) + (*this)(i, 2) * rhs( 2, 2 ) + (*this)(i, 3) * rhs( 3, 2 );
+         ret( i, 3 ) = (*this)(i, 0) * rhs( 0, 3 ) + (*this)(i, 1) * rhs( 1, 3 ) + (*this)(i, 2) * rhs( 2, 3 ) + (*this)(i, 3) * rhs( 3, 3 );
+      }
+      return ret;
+   }
+};
+#endif
diff --git a/src/tools/event_object_parser/pcb.h b/src/tools/event_object_parser/pcb.h
new file mode 100644
index 00000000..4b775d84
--- /dev/null
+++ b/src/tools/event_object_parser/pcb.h
@@ -0,0 +1,92 @@
+#ifndef _PCB_H
+#define _PCB_H
+
+#include <stdint.h>
+#include <vector>
+
+struct PCB_HEADER
+{
+   uint32_t unknown_1;
+   uint32_t unknown_2;
+   uint32_t num_entries; // count starts at 0
+   uint32_t total_indices;
+   uint64_t padding;
+};
+
+struct PCB_BLOCK_HEADER
+{
+   uint32_t type; // 0 for entry, 0x30 for group
+   uint32_t group_size; // when group size in bytes for the group block
+   // bounding box
+   float x;
+   float y;
+   float z;
+   float x1;
+   float y1;
+   float z1;
+   // number of vertices packed into 16 bit
+   uint16_t num_v16;
+   // number of indices
+   uint16_t num_indices;
+   // number of normal floar vertices
+   uint32_t num_vertices;
+};
+
+struct PCB_VERTEXDATA
+{
+   float x;
+   float y;
+   float z;
+};
+
+struct PCB_INDEXDATA
+{
+   uint8_t index[3];
+   uint8_t unknown[3];
+   uint8_t unknown1[6];
+};
+
+struct PCB_VERTEXDATAI16
+{
+   uint16_t x;
+   uint16_t y;
+   uint16_t z;
+};
+
+struct PCB_BLOCK_DATA
+{
+   std::vector< PCB_VERTEXDATA > vertices;
+   std::vector< PCB_VERTEXDATAI16 > vertices_i16;
+   std::vector< PCB_INDEXDATA > indices;
+};
+
+struct PCB_BLOCK_ENTRY
+{
+   PCB_BLOCK_HEADER header;
+   PCB_BLOCK_DATA data;
+};
+
+struct PCB_FILE
+{
+   PCB_HEADER header;
+   std::vector< PCB_BLOCK_ENTRY > entries;
+};
+
+struct PCB_LIST_ENTRY
+{
+   uint32_t id;
+   float x, y, z, x2, y2, z2, rot;
+};
+
+struct PCB_LIST_BASE_ENTRY
+{
+   float x, y, z, x2, y2, z2, rot;
+};
+
+struct PCB_LIST_FILE
+{
+   uint32_t count;
+   PCB_LIST_BASE_ENTRY entry;
+   std::vector<PCB_LIST_ENTRY> entries;
+};
+#endif
\ No newline at end of file
diff --git a/src/tools/event_object_parser/sgb.h b/src/tools/event_object_parser/sgb.h
new file mode 100644
index 00000000..2aa675aa
--- /dev/null
+++ b/src/tools/event_object_parser/sgb.h
@@ -0,0 +1,213 @@
+#ifndef _SGB_H
+#define _SGB_H
+
+#include <cstring>
+#include <memory>
+#include <cstdint>
+#include <iostream>
+#include <vector>
+#include <map>
+#include <string>
+
+#include "vec3.h"
+
+// garbage to skip model loading
+extern bool ignoreModels;
+
+//
+// ported from https://github.com/ufx/SaintCoinach/blob/master/SaintCoinach/Graphics/Sgb/SgbDataType.cs
+
+struct SGB_FILE;
+struct SGB_HEADER;
+struct SGB_MODEL_ENTRY;
+struct SGB_MODEL_HEADER;
+struct SGB_GROUP;
+struct SGB_GROUP_HEADER;
+
+
+enum SgbDataType : uint32_t
+{
+   Unknown0008 = 0x0008,
+   Group = 0x0100,
+};
+
+enum SgbGroupEntryType : uint32_t
+{
+   Model = 0x01,
+};
+
+struct SGB_GROUP_HEADER
+{
+   SgbDataType type;
+   int32_t nameOffset;
+   uint32_t unknown08;
+   uint32_t unknown0C;
+
+   uint32_t unknown10;
+   uint32_t unknown14;
+   uint32_t unknown18;
+   uint32_t unknown1C;
+
+   int32_t entryCount;
+   uint32_t unknown24;
+   uint32_t unknown28;
+   uint32_t unknown2C;
+
+   uint32_t unknown30;
+   uint32_t unknown34;
+   uint32_t unknown38;
+   uint32_t unknown3C;
+
+   uint32_t unknown40;
+   uint32_t unknown44;
+};
+
+struct SGB_GROUP_ENTRY
+{
+public:
+   char* m_buf;
+   uint32_t m_offset;
+
+   SGB_GROUP_ENTRY()
+   {
+      m_buf = nullptr;
+      m_offset = 0;
+   };
+   SGB_GROUP_ENTRY( char* buf, uint32_t offset )
+   {
+      m_buf = buf;
+      m_offset = offset;
+   };
+   virtual ~SGB_GROUP_ENTRY() {};
+};
+
+struct SGB_ENTRY_HEADER
+{
+   SgbGroupEntryType type;
+   uint32_t unknown2;
+   int32_t nameOffset;
+   vec3 translation;
+   vec3 rotation;
+   vec3 scale;
+};
+
+struct SGB_MODEL_HEADER : public SGB_ENTRY_HEADER
+{
+   int32_t modelFileOffset;
+   int32_t collisionFileOffset;
+};
+
+struct SGB_MODEL_ENTRY : public SGB_GROUP_ENTRY
+{
+   SGB_MODEL_HEADER header;
+   SgbGroupEntryType type;
+   std::string name;
+   std::string modelFileName;
+   std::string collisionFileName;
+
+   SGB_MODEL_ENTRY( char* buf, uint32_t offset )
+   {
+      header = *reinterpret_cast< SGB_MODEL_HEADER* >( buf + offset );
+      name = std::string( buf + offset + header.nameOffset );
+      modelFileName = std::string( buf + offset + header.modelFileOffset );
+      collisionFileName = std::string( buf + offset + header.collisionFileOffset );
+   }
+};
+
+struct SGB_GROUP
+{
+   SGB_GROUP_HEADER header;
+   std::string name;
+   SGB_FILE* parent;
+   std::vector< std::shared_ptr< SGB_GROUP_ENTRY > > entries;
+
+   SGB_GROUP( char* buf, SGB_FILE* file, uint32_t fileSize, uint32_t offset )
+   {
+      parent = file;
+      header = *reinterpret_cast< SGB_GROUP_HEADER* >( buf + offset );
+      name = std::string( buf + offset + header.nameOffset );
+
+      auto entriesOffset = offset + sizeof( header );
+
+      for( auto i = 0; i < header.entryCount; ++i )
+      {
+         auto entryOffset = entriesOffset + *reinterpret_cast< uint32_t* >( buf + ( entriesOffset + ( i * 4 ) ) );
+         if( entryOffset > fileSize )
+            throw std::runtime_error( "SGB_GROUP entry offset was larger than SGB file size!" );
+         auto type = *reinterpret_cast< uint32_t* >( buf + entryOffset );
+         if( type == SgbGroupEntryType::Model && !ignoreModels )
+         {
+            entries.push_back( std::make_shared< SGB_MODEL_ENTRY >( buf, entryOffset ) );
+         }
+         else
+         {
+            // std::cout << "\t\tUnknown SGB entry! Group: " << name << " type: " << type << " index: " << i << " entryOffset: " << entryOffset << "\n";
+         }
+      }
+   }
+};
+
+struct SGB_HEADER
+{
+   char magic[4];     // SGB1
+   uint32_t fileSize;
+   uint32_t unknown1;
+   char magic2[4];    // SCN1
+
+   uint32_t unknown10;
+   int32_t sharedOffset;
+   uint32_t unknown18;
+   int32_t offset1C;
+
+   uint32_t unknown20;
+   uint32_t unknown24;
+   uint32_t unknown28;
+   uint32_t unknown2C;
+
+   uint32_t unknown30;
+   uint32_t unknown34;
+   uint32_t unknown38;
+   uint32_t unknown3C;
+
+   uint32_t unknown40;
+   uint32_t unknown44;
+   uint32_t unknown48;
+   uint32_t unknown4C;
+
+   uint32_t unknown50;
+   uint32_t unknown54;
+};
+
+struct SGB_FILE
+{
+   SGB_HEADER header;
+   std::vector<SGB_GROUP> entries;
+
+   SGB_FILE()
+   {
+      memset( &header, 0, sizeof( header ) );
+   }
+   SGB_FILE( char* buf )
+   {
+      constexpr int baseOffset = 0x14;
+      header = *reinterpret_cast< SGB_HEADER* >( buf );
+
+      if( strncmp( &header.magic[0], "SGB1", 4 ) != 0 || strncmp( &header.magic2[0], "SCN1", 4 ) != 0 )
+         throw std::runtime_error( "Unable to load SGB File!" );
+
+      try
+      {
+         auto group = SGB_GROUP( buf, this, header.fileSize, baseOffset + header.sharedOffset );
+         entries.push_back( group );
+         auto group2 = SGB_GROUP( buf, this, header.fileSize, baseOffset + header.offset1C );
+         entries.push_back( group2 );
+      }
+      catch( std::exception& e )
+      {
+         std::cout << e.what() << "\n";
+      }
+   };
+};
+
+
+#endif // !_SGB_H
diff --git a/src/tools/event_object_parser/vec3.h b/src/tools/event_object_parser/vec3.h
new file mode 100644
index 00000000..a8fdfbd1
--- /dev/null
+++ b/src/tools/event_object_parser/vec3.h
@@ -0,0 +1,31 @@
+#ifndef _VEC3_H
+#define _VEC3_H
+
+#include <cstdint>
+#include "matrix4.h"
+
+struct vec3
+{
+   float x, y, z;
+   vec3()
+   {
+      x = 0.0f;
+      y = 0.0f;
+      z = 0.0f;
+   }
+   vec3(float x, float y, float z)
+   {
+      this->x = x;
+      this->y = y;
+      this->z = z;
+   };
+};
+static vec3 operator *(const vec3& lhs, const matrix4& rhs)
+{
+   vec3 ret;
+   ret.x = rhs(0, 0) * lhs.x + rhs(0, 1) * lhs.y + rhs(0, 2) * lhs.z;
+   ret.y = rhs(1, 0) * lhs.x + rhs(1, 1) * lhs.y + rhs(1, 2) * lhs.z;
+   ret.z = rhs(2, 0) * lhs.x + rhs(2, 1) * lhs.y + rhs(2, 2) * lhs.z;
+   return ret;
+};
+#endif
\ No newline at end of file

From 7a7674b943ebb723a36600593b00f9cfc91ab8f6 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Tue, 27 Feb 2018 17:08:38 +1100
Subject: [PATCH 39/69] restructure instance script folder

---
 .../Script/Scripts/instances/CommonGen.h      | 590 ------------------
 .../instances/{ => dungeons}/AlaMhigo.cpp     |   0
 .../instances/{ => dungeons}/AmdaporKeep.cpp  |   0
 .../{ => dungeons}/AmdaporKeepHard.cpp        |   0
 .../instances/{ => dungeons}/BaelsarsWall.cpp |   0
 .../{ => dungeons}/BardamsMettle.cpp          |   0
 .../{ => dungeons}/BrayfloxsLongstop.cpp      |   0
 .../{ => dungeons}/BrayfloxsLongstopHard.cpp  |   0
 .../{ => dungeons}/CastrumAbania.cpp          |   0
 .../{ => dungeons}/CastrumMeridianum.cpp      |   0
 .../{ => dungeons}/CopperbellMines.cpp        |   0
 .../{ => dungeons}/CopperbellMinesHard.cpp    |   0
 .../instances/{ => dungeons}/CuttersCry.cpp   |   0
 .../instances/{ => dungeons}/DomaCastle.cpp   |   0
 .../{ => dungeons}/DzemaelDarkhold.cpp        |   0
 .../instances/{ => dungeons}/Halatali.cpp     |   0
 .../instances/{ => dungeons}/HalataliHard.cpp |   0
 .../instances/{ => dungeons}/HaukkeManor.cpp  |   0
 .../{ => dungeons}/HaukkeManorHard.cpp        |   0
 .../instances/{ => dungeons}/HellsLid.cpp     |   0
 .../{ => dungeons}/HullbreakerIsle.cpp        |   0
 .../{ => dungeons}/HullbreakerIsleHard.cpp    |   0
 .../instances/{ => dungeons}/KuganeCastle.cpp |   0
 .../instances/{ => dungeons}/Neverreap.cpp    |   0
 .../instances/{ => dungeons}/PharosSirius.cpp |   0
 .../{ => dungeons}/PharosSiriusHard.cpp       |   0
 .../SaintMociannesArboretum.cpp               |   0
 .../instances/{ => dungeons}/Sastasha.cpp     |   0
 .../instances/{ => dungeons}/SastashaHard.cpp |   0
 .../{ => dungeons}/ShisuioftheVioletTides.cpp |   0
 .../instances/{ => dungeons}/Snowcloak.cpp    |   0
 .../instances/{ => dungeons}/SohmAl.cpp       |   0
 .../instances/{ => dungeons}/SohmAlHard.cpp   |   0
 .../instances/{ => dungeons}/SohrKhai.cpp     |   0
 .../instances/{ => dungeons}/TheAery.cpp      |   0
 .../TheAetherochemicalResearchFacility.cpp    |   0
 .../instances/{ => dungeons}/TheAntitower.cpp |   0
 .../instances/{ => dungeons}/TheAurumVale.cpp |   0
 .../{ => dungeons}/TheDrownedCityofSkalla.cpp |   0
 .../instances/{ => dungeons}/TheDuskVigil.cpp |   0
 .../{ => dungeons}/TheFractalContinuum.cpp    |   0
 .../TheFractalContinuumHard.cpp               |   0
 .../{ => dungeons}/TheGreatGubalLibrary.cpp   |   0
 .../TheGreatGubalLibraryHard.cpp              |   0
 .../{ => dungeons}/TheKeeperoftheLake.cpp     |   0
 .../{ => dungeons}/TheLostCityofAmdapor.cpp   |   0
 .../TheLostCityofAmdaporHard.cpp              |   0
 .../{ => dungeons}/ThePraetorium.cpp          |   0
 .../{ => dungeons}/TheSirensongSea.cpp        |   0
 .../{ => dungeons}/TheStoneVigil.cpp          |   0
 .../{ => dungeons}/TheStoneVigilHard.cpp      |   0
 .../{ => dungeons}/TheSunkenTempleofQarn.cpp  |   0
 .../TheSunkenTempleofQarnHard.cpp             |   0
 .../{ => dungeons}/TheTamTaraDeepcroft.cpp    |   0
 .../TheTamTaraDeepcroftHard.cpp               |   0
 .../{ => dungeons}/TheTempleoftheFist.cpp     |   0
 .../TheThousandMawsofTotoRak.cpp              |   0
 .../instances/{ => dungeons}/TheVault.cpp     |   0
 .../{ => dungeons}/TheWanderersPalace.cpp     |   0
 .../{ => dungeons}/TheWanderersPalaceHard.cpp |   0
 .../instances/{ => dungeons}/Xelphatol.cpp    |   0
 .../instances/{ => events}/SpecialEventI.cpp  |   0
 .../instances/{ => events}/SpecialEventII.cpp |   0
 .../{ => events}/SpecialEventIII.cpp          |   0
 .../{ => events}/TheHauntedManor.cpp          |   0
 .../{ => events}/TheValentionesCeremony.cpp   |   0
 .../AllsWellthatEndsintheWell.cpp             |   0
 .../{ => guildhest}/AnnoytheVoid.cpp          |   0
 .../BasicTrainingEnemyParties.cpp             |   0
 .../BasicTrainingEnemyStrongholds.cpp         |   0
 .../FlickingSticksandTakingNames.cpp          |   0
 .../{ => guildhest}/HeroontheHalfShell.cpp    |   0
 .../{ => guildhest}/LongLivetheQueen.cpp      |   0
 .../{ => guildhest}/MorethanaFeeler.cpp       |   0
 .../{ => guildhest}/PullingPoisonPosies.cpp   |   0
 .../{ => guildhest}/ShadowandClaw.cpp         |   0
 .../{ => guildhest}/SolemnTrinity.cpp         |   0
 .../{ => guildhest}/StingingBack.cpp          |   0
 .../{ => guildhest}/UndertheArmor.cpp         |   0
 .../instances/{ => guildhest}/WardUp.cpp      |   0
 .../AccrueEnmityfromMultipleTargets.cpp       |   0
 .../AssistAlliesinDefeatingaTarget.cpp        |   0
 .../AvoidAreaofEffectAttacks.cpp              |   0
 .../AvoidEngagedTargets.cpp                   |   0
 .../DefeatanOccupiedTarget.cpp                |   0
 .../EngageEnemyReinforcements.cpp             |   0
 .../EngageMultipleTargets.cpp                 |   0
 .../ExecuteaComboinBattle.cpp                 |   0
 .../ExecuteaCombotoIncreaseEnmity.cpp         |   0
 .../ExecuteaRangedAttacktoIncreaseEnmity.cpp  |   0
 .../{ => hallofthenovice}/FinalExercise.cpp   |   0
 .../HealMultipleAllies.cpp                    |   0
 .../{ => hallofthenovice}/HealanAlly.cpp      |   0
 .../InteractwiththeBattlefield.cpp            |   0
 .../ThePalaceoftheDeadFloors101110.cpp        |   0
 .../ThePalaceoftheDeadFloors110.cpp           |   0
 .../ThePalaceoftheDeadFloors111120.cpp        |   0
 .../ThePalaceoftheDeadFloors1120.cpp          |   0
 .../ThePalaceoftheDeadFloors121130.cpp        |   0
 .../ThePalaceoftheDeadFloors131140.cpp        |   0
 .../ThePalaceoftheDeadFloors141150.cpp        |   0
 .../ThePalaceoftheDeadFloors151160.cpp        |   0
 .../ThePalaceoftheDeadFloors161170.cpp        |   0
 .../ThePalaceoftheDeadFloors171180.cpp        |   0
 .../ThePalaceoftheDeadFloors181190.cpp        |   0
 .../ThePalaceoftheDeadFloors191200.cpp        |   0
 .../ThePalaceoftheDeadFloors2130.cpp          |   0
 .../ThePalaceoftheDeadFloors3140.cpp          |   0
 .../ThePalaceoftheDeadFloors4150.cpp          |   0
 .../ThePalaceoftheDeadFloors5160.cpp          |   0
 .../ThePalaceoftheDeadFloors6170.cpp          |   0
 .../ThePalaceoftheDeadFloors7180.cpp          |   0
 .../ThePalaceoftheDeadFloors8190.cpp          |   0
 .../ThePalaceoftheDeadFloors91100.cpp         |   0
 .../instances/{ => pvp}/Astragalos.cpp        |   0
 .../instances/{ => pvp}/SealRockSeize.cpp     |   0
 .../{ => pvp}/TheBorderlandRuinsSecure.cpp    |   0
 .../{ => pvp}/TheCarteneauFlatsHeliodrome.cpp |   0
 .../{ => pvp}/TheFeast4on4LightParty.cpp      |   0
 .../{ => pvp}/TheFeast4on4Ranked.cpp          |   0
 .../{ => pvp}/TheFeast4on4Training.cpp        |   0
 .../TheFeastCustomMatchCrystalTower.cpp       |   0
 .../TheFeastCustomMatchFeastingGrounds.cpp    |   0
 .../TheFeastCustomMatchLichenweed.cpp         |   0
 .../instances/{ => pvp}/TheFeastRanked.cpp    |   0
 .../{ => pvp}/TheFeastTeamRanked.cpp          |   0
 .../instances/{ => pvp}/TheFeastTraining.cpp  |   0
 .../{ => pvp}/TheFieldsofGloryShatter.cpp     |   0
 .../{ => questbattle}/ABloodyReunion.cpp      |   0
 .../ASpectaclefortheAges.cpp                  |   0
 .../{ => questbattle}/BloodDragoon.cpp        |   0
 .../{ => questbattle}/BloodontheDeck.cpp      |   0
 .../CuriousGorgeMeetsHisMatch.cpp             |   0
 .../{ => questbattle}/DarkwingDragon.cpp      |   0
 .../{ => questbattle}/InThalsName.cpp         |   0
 .../InterdimensionalRift.cpp                  |   0
 .../{ => questbattle}/ItsProbablyaTrap.cpp    |   0
 .../{ => questbattle}/MatsubaMayhem.cpp       |   0
 .../instances/{ => questbattle}/Naadam.cpp    |   0
 .../{ => questbattle}/OneLifeforOneWorld.cpp  |   0
 .../{ => questbattle}/OurCompromise.cpp       |   0
 .../{ => questbattle}/OurUnsungHeroes.cpp     |   0
 .../{ => questbattle}/RaisingtheSword.cpp     |   0
 .../{ => questbattle}/ReturnoftheBull.cpp     |   0
 .../{ => questbattle}/TheBattleonBekko.cpp    |   0
 .../{ => questbattle}/TheFaceofTrueEvil.cpp   |   0
 .../TheHeartoftheProblem.cpp                  |   0
 .../TheOrphansandtheBrokenBlade.cpp           |   0
 .../{ => questbattle}/TheResonant.cpp         |   0
 .../{ => questbattle}/WhenClansCollide.cpp    |   0
 .../{ => questbattle}/WithHeartandSteel.cpp   |   0
 .../alexander}/AlexanderTheArmoftheFather.cpp |   0
 .../AlexanderTheArmoftheFatherSavage.cpp      |   0
 .../alexander}/AlexanderTheArmoftheSon.cpp    |   0
 .../AlexanderTheArmoftheSonSavage.cpp         |   0
 .../AlexanderTheBreathoftheCreator.cpp        |   0
 .../AlexanderTheBreathoftheCreatorSavage.cpp  |   0
 .../AlexanderTheBurdenoftheFather.cpp         |   0
 .../AlexanderTheBurdenoftheFatherSavage.cpp   |   0
 .../alexander}/AlexanderTheBurdenoftheSon.cpp |   0
 .../AlexanderTheBurdenoftheSonSavage.cpp      |   0
 .../AlexanderTheCuffoftheFather.cpp           |   0
 .../AlexanderTheCuffoftheFatherSavage.cpp     |   0
 .../alexander}/AlexanderTheCuffoftheSon.cpp   |   0
 .../AlexanderTheCuffoftheSonSavage.cpp        |   0
 .../AlexanderTheEyesoftheCreator.cpp          |   0
 .../AlexanderTheEyesoftheCreatorSavage.cpp    |   0
 .../AlexanderTheFistoftheFather.cpp           |   0
 .../AlexanderTheFistoftheFatherSavage.cpp     |   0
 .../alexander}/AlexanderTheFistoftheSon.cpp   |   0
 .../AlexanderTheFistoftheSonSavage.cpp        |   0
 .../AlexanderTheHeartoftheCreator.cpp         |   0
 .../AlexanderTheHeartoftheCreatorSavage.cpp   |   0
 .../AlexanderTheSouloftheCreator.cpp          |   0
 .../AlexanderTheSouloftheCreatorSavage.cpp    |   0
 .../coils}/TheBindingCoilofBahamutTurn1.cpp   |   0
 .../coils}/TheBindingCoilofBahamutTurn2.cpp   |   0
 .../coils}/TheBindingCoilofBahamutTurn3.cpp   |   0
 .../coils}/TheBindingCoilofBahamutTurn4.cpp   |   0
 .../coils}/TheBindingCoilofBahamutTurn5.cpp   |   0
 .../coils}/TheFinalCoilofBahamutTurn1.cpp     |   0
 .../coils}/TheFinalCoilofBahamutTurn2.cpp     |   0
 .../coils}/TheFinalCoilofBahamutTurn3.cpp     |   0
 .../coils}/TheFinalCoilofBahamutTurn4.cpp     |   0
 .../TheSecondCoilofBahamutSavageTurn1.cpp     |   0
 .../TheSecondCoilofBahamutSavageTurn2.cpp     |   0
 .../TheSecondCoilofBahamutSavageTurn3.cpp     |   0
 .../TheSecondCoilofBahamutSavageTurn4.cpp     |   0
 .../coils}/TheSecondCoilofBahamutTurn1.cpp    |   0
 .../coils}/TheSecondCoilofBahamutTurn2.cpp    |   0
 .../coils}/TheSecondCoilofBahamutTurn3.cpp    |   0
 .../coils}/TheSecondCoilofBahamutTurn4.cpp    |   0
 .../{ => raids/crystaltower}/SyrcusTower.cpp  |   0
 .../TheLabyrinthoftheAncients.cpp             |   0
 .../crystaltower}/TheWorldofDarkness.cpp      |   0
 .../{ => raids/omega}/DeltascapeV10.cpp       |   0
 .../{ => raids/omega}/DeltascapeV10Savage.cpp |   0
 .../{ => raids/omega}/DeltascapeV20.cpp       |   0
 .../{ => raids/omega}/DeltascapeV20Savage.cpp |   0
 .../{ => raids/omega}/DeltascapeV30.cpp       |   0
 .../{ => raids/omega}/DeltascapeV30Savage.cpp |   0
 .../{ => raids/omega}/DeltascapeV40.cpp       |   0
 .../{ => raids/omega}/DeltascapeV40Savage.cpp |   0
 .../{ => raids/omega}/SigmascapeV10.cpp       |   0
 .../{ => raids/omega}/SigmascapeV10Savage.cpp |   0
 .../{ => raids/omega}/SigmascapeV20.cpp       |   0
 .../{ => raids/omega}/SigmascapeV20Savage.cpp |   0
 .../{ => raids/omega}/SigmascapeV30.cpp       |   0
 .../{ => raids/omega}/SigmascapeV30Savage.cpp |   0
 .../{ => raids/omega}/SigmascapeV40.cpp       |   0
 .../{ => raids/omega}/SigmascapeV40Savage.cpp |   0
 .../TheRoyalCityofRabanastre.cpp              |   0
 .../{ => raids/shadowofmhach}/DunScaith.cpp   |   0
 .../{ => raids/shadowofmhach}/TheVoidArk.cpp  |   0
 .../shadowofmhach}/TheWeepingCityofMhach.cpp  |   0
 .../TheUnendingCoilofBahamutUltimate.cpp      |   0
 .../{ => treasurehunt}/TheAquapolis.cpp       |   0
 .../TheHiddenCanalsofUznair.cpp               |   0
 .../TheLostCanalsofUznair.cpp                 |   0
 .../{ => trials}/ARelicReborntheChimera.cpp   |   0
 .../{ => trials}/ARelicReborntheHydra.cpp     |   0
 .../AkhAfahAmphitheatreExtreme.cpp            |   0
 .../{ => trials}/AkhAfahAmphitheatreHard.cpp  |   0
 .../{ => trials}/BattleintheBigKeep.cpp       |   0
 .../{ => trials}/BattleontheBigBridge.cpp     |   0
 .../instances/{ => trials}/CapeWestwind.cpp   |   0
 .../instances/{ => trials}/Emanation.cpp      |   0
 .../{ => trials}/EmanationExtreme.cpp         |   0
 .../{ => trials}/TheBowlofEmbers.cpp          |   0
 .../{ => trials}/TheBowlofEmbersExtreme.cpp   |   0
 .../{ => trials}/TheBowlofEmbersHard.cpp      |   0
 .../instances/{ => trials}/TheChrysalis.cpp   |   0
 .../instances/{ => trials}/TheDragonsNeck.cpp |   0
 .../{ => trials}/TheFinalStepsofFaith.cpp     |   0
 .../instances/{ => trials}/TheHowlingEye.cpp  |   0
 .../{ => trials}/TheHowlingEyeExtreme.cpp     |   0
 .../{ => trials}/TheHowlingEyeHard.cpp        |   0
 .../{ => trials}/TheLimitlessBlueExtreme.cpp  |   0
 .../{ => trials}/TheLimitlessBlueHard.cpp     |   0
 .../TheMinstrelsBalladNidhoggsRage.cpp        |   0
 .../TheMinstrelsBalladShinryusDomain.cpp      |   0
 .../TheMinstrelsBalladThordansReign.cpp       |   0
 .../TheMinstrelsBalladUltimasBane.cpp         |   0
 .../instances/{ => trials}/TheNavel.cpp       |   0
 .../{ => trials}/TheNavelExtreme.cpp          |   0
 .../instances/{ => trials}/TheNavelHard.cpp   |   0
 .../{ => trials}/ThePoolofTribute.cpp         |   0
 .../{ => trials}/ThePoolofTributeExtreme.cpp  |   0
 .../{ => trials}/TheRoyalMenagerie.cpp        |   0
 .../{ => trials}/TheSingularityReactor.cpp    |   0
 .../{ => trials}/TheStepsofFaith.cpp          |   0
 .../{ => trials}/TheStrikingTreeExtreme.cpp   |   0
 .../{ => trials}/TheStrikingTreeHard.cpp      |   0
 .../{ => trials}/TheWhorleaterExtreme.cpp     |   0
 .../{ => trials}/TheWhorleaterHard.cpp        |   0
 .../{ => trials}/ThokastThokExtreme.cpp       |   0
 .../{ => trials}/ThokastThokHard.cpp          |   0
 .../{ => trials}/ThornmarchExtreme.cpp        |   0
 .../instances/{ => trials}/ThornmarchHard.cpp |   0
 .../instances/{ => trials}/UrthsFount.cpp     |   0
 .../{ => trials/thefourlords}/TheJadeStoa.cpp |   0
 .../thefourlords}/TheJadeStoaExtreme.cpp      |   0
 .../warringtriad}/ContainmentBayP1T6.cpp      |   0
 .../ContainmentBayP1T6Extreme.cpp             |   0
 .../warringtriad}/ContainmentBayS1T7.cpp      |   0
 .../ContainmentBayS1T7Extreme.cpp             |   0
 .../warringtriad}/ContainmentBayZ1T9.cpp      |   0
 .../ContainmentBayZ1T9Extreme.cpp             |   0
 268 files changed, 590 deletions(-)
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/AlaMhigo.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/AmdaporKeep.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/AmdaporKeepHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/BaelsarsWall.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/BardamsMettle.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/BrayfloxsLongstop.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/BrayfloxsLongstopHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/CastrumAbania.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/CastrumMeridianum.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/CopperbellMines.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/CopperbellMinesHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/CuttersCry.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/DomaCastle.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/DzemaelDarkhold.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/Halatali.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/HalataliHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/HaukkeManor.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/HaukkeManorHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/HellsLid.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/HullbreakerIsle.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/HullbreakerIsleHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/KuganeCastle.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/Neverreap.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/PharosSirius.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/PharosSiriusHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/SaintMociannesArboretum.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/Sastasha.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/SastashaHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/ShisuioftheVioletTides.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/Snowcloak.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/SohmAl.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/SohmAlHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/SohrKhai.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheAery.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheAetherochemicalResearchFacility.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheAntitower.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheAurumVale.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheDrownedCityofSkalla.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheDuskVigil.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheFractalContinuum.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheFractalContinuumHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheGreatGubalLibrary.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheGreatGubalLibraryHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheKeeperoftheLake.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheLostCityofAmdapor.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheLostCityofAmdaporHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/ThePraetorium.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheSirensongSea.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheStoneVigil.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheStoneVigilHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheSunkenTempleofQarn.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheSunkenTempleofQarnHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheTamTaraDeepcroft.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheTamTaraDeepcroftHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheTempleoftheFist.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheThousandMawsofTotoRak.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheVault.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheWanderersPalace.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/TheWanderersPalaceHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => dungeons}/Xelphatol.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => events}/SpecialEventI.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => events}/SpecialEventII.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => events}/SpecialEventIII.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => events}/TheHauntedManor.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => events}/TheValentionesCeremony.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/AllsWellthatEndsintheWell.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/AnnoytheVoid.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/BasicTrainingEnemyParties.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/BasicTrainingEnemyStrongholds.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/FlickingSticksandTakingNames.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/HeroontheHalfShell.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/LongLivetheQueen.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/MorethanaFeeler.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/PullingPoisonPosies.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/ShadowandClaw.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/SolemnTrinity.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/StingingBack.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/UndertheArmor.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => guildhest}/WardUp.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/AccrueEnmityfromMultipleTargets.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/AssistAlliesinDefeatingaTarget.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/AvoidAreaofEffectAttacks.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/AvoidEngagedTargets.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/DefeatanOccupiedTarget.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/EngageEnemyReinforcements.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/EngageMultipleTargets.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/ExecuteaComboinBattle.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/ExecuteaCombotoIncreaseEnmity.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/ExecuteaRangedAttacktoIncreaseEnmity.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/FinalExercise.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/HealMultipleAllies.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/HealanAlly.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => hallofthenovice}/InteractwiththeBattlefield.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors101110.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors110.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors111120.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors1120.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors121130.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors131140.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors141150.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors151160.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors161170.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors171180.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors181190.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors191200.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors2130.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors3140.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors4150.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors5160.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors6170.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors7180.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors8190.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => potd}/ThePalaceoftheDeadFloors91100.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/Astragalos.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/SealRockSeize.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheBorderlandRuinsSecure.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheCarteneauFlatsHeliodrome.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeast4on4LightParty.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeast4on4Ranked.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeast4on4Training.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeastCustomMatchCrystalTower.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeastCustomMatchFeastingGrounds.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeastCustomMatchLichenweed.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeastRanked.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeastTeamRanked.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFeastTraining.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => pvp}/TheFieldsofGloryShatter.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/ABloodyReunion.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/ASpectaclefortheAges.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/BloodDragoon.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/BloodontheDeck.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/CuriousGorgeMeetsHisMatch.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/DarkwingDragon.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/InThalsName.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/InterdimensionalRift.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/ItsProbablyaTrap.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/MatsubaMayhem.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/Naadam.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/OneLifeforOneWorld.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/OurCompromise.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/OurUnsungHeroes.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/RaisingtheSword.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/ReturnoftheBull.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/TheBattleonBekko.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/TheFaceofTrueEvil.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/TheHeartoftheProblem.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/TheOrphansandtheBrokenBlade.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/TheResonant.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/WhenClansCollide.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => questbattle}/WithHeartandSteel.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheArmoftheFather.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheArmoftheFatherSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheArmoftheSon.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheArmoftheSonSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheBreathoftheCreator.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheBreathoftheCreatorSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheBurdenoftheFather.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheBurdenoftheFatherSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheBurdenoftheSon.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheBurdenoftheSonSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheCuffoftheFather.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheCuffoftheFatherSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheCuffoftheSon.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheCuffoftheSonSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheEyesoftheCreator.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheEyesoftheCreatorSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheFistoftheFather.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheFistoftheFatherSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheFistoftheSon.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheFistoftheSonSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheHeartoftheCreator.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheHeartoftheCreatorSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheSouloftheCreator.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/alexander}/AlexanderTheSouloftheCreatorSavage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheBindingCoilofBahamutTurn1.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheBindingCoilofBahamutTurn2.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheBindingCoilofBahamutTurn3.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheBindingCoilofBahamutTurn4.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheBindingCoilofBahamutTurn5.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheFinalCoilofBahamutTurn1.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheFinalCoilofBahamutTurn2.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheFinalCoilofBahamutTurn3.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheFinalCoilofBahamutTurn4.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheSecondCoilofBahamutSavageTurn1.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheSecondCoilofBahamutSavageTurn2.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheSecondCoilofBahamutSavageTurn3.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheSecondCoilofBahamutSavageTurn4.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheSecondCoilofBahamutTurn1.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheSecondCoilofBahamutTurn2.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheSecondCoilofBahamutTurn3.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/coils}/TheSecondCoilofBahamutTurn4.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/crystaltower}/SyrcusTower.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/crystaltower}/TheLabyrinthoftheAncients.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/crystaltower}/TheWorldofDarkness.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/DeltascapeV10.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/DeltascapeV10Savage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/DeltascapeV20.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/DeltascapeV20Savage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/DeltascapeV30.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/DeltascapeV30Savage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/DeltascapeV40.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/DeltascapeV40Savage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/SigmascapeV10.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/SigmascapeV10Savage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/SigmascapeV20.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/SigmascapeV20Savage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/SigmascapeV30.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/SigmascapeV30Savage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/SigmascapeV40.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/omega}/SigmascapeV40Savage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/returntoivalice}/TheRoyalCityofRabanastre.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/shadowofmhach}/DunScaith.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/shadowofmhach}/TheVoidArk.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/shadowofmhach}/TheWeepingCityofMhach.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => raids/ultimate}/TheUnendingCoilofBahamutUltimate.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => treasurehunt}/TheAquapolis.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => treasurehunt}/TheHiddenCanalsofUznair.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => treasurehunt}/TheLostCanalsofUznair.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/ARelicReborntheChimera.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/ARelicReborntheHydra.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/AkhAfahAmphitheatreExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/AkhAfahAmphitheatreHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/BattleintheBigKeep.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/BattleontheBigBridge.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/CapeWestwind.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/Emanation.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/EmanationExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheBowlofEmbers.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheBowlofEmbersExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheBowlofEmbersHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheChrysalis.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheDragonsNeck.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheFinalStepsofFaith.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheHowlingEye.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheHowlingEyeExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheHowlingEyeHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheLimitlessBlueExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheLimitlessBlueHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheMinstrelsBalladNidhoggsRage.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheMinstrelsBalladShinryusDomain.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheMinstrelsBalladThordansReign.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheMinstrelsBalladUltimasBane.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheNavel.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheNavelExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheNavelHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/ThePoolofTribute.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/ThePoolofTributeExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheRoyalMenagerie.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheSingularityReactor.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheStepsofFaith.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheStrikingTreeExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheStrikingTreeHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheWhorleaterExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/TheWhorleaterHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/ThokastThokExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/ThokastThokHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/ThornmarchExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/ThornmarchHard.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials}/UrthsFount.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials/thefourlords}/TheJadeStoa.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials/thefourlords}/TheJadeStoaExtreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials/warringtriad}/ContainmentBayP1T6.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials/warringtriad}/ContainmentBayP1T6Extreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials/warringtriad}/ContainmentBayS1T7.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials/warringtriad}/ContainmentBayS1T7Extreme.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials/warringtriad}/ContainmentBayZ1T9.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{ => trials/warringtriad}/ContainmentBayZ1T9Extreme.cpp (100%)

diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h b/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h
deleted file mode 100644
index 02d91881..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/CommonGen.h
+++ /dev/null
@@ -1,590 +0,0 @@
-[00:54:47][info] Setting up EXD data
-[00:54:56][info] #ifndef _COMMON_GEN_H_
-#define _COMMON_GEN_H_
-/* This file has been automatically generated.
-   Changes will be lost upon regeneration.
-   To change the content edit tools/exd_common_gen */
-namespace Core {
-namespace Common {
-
-   ///////////////////////////////////////////////////////////
-   //ActionCategory.exd
-   enum class ActionCategory : uint8_t
-   {
-      Autoattack = 1,
-      Spell = 2,
-      Weaponskill = 3,
-      Ability = 4,
-      Item = 5,
-      DoLAbility = 6,
-      DoHAbility = 7,
-      Event = 8,
-      LimitBreak = 9,
-      System = 10,
-      Artillery = 11,
-      Mount = 12,
-      Glamour = 13,
-      ItemManipulation = 14,
-      AdrenalineRush = 15,
-      bool operator==( const ActionCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ActionCategory& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //BeastReputationRank.exd
-   enum class BeastReputationRank : uint8_t
-   {
-      None = 0,
-      Neutral = 1,
-      Recognized = 2,
-      Friendly = 3,
-      Trusted = 4,
-      Respected = 5,
-      Honored = 6,
-      Sworn = 7,
-      Allied = 8,
-      bool operator==( const BeastReputationRank& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const BeastReputationRank& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //BeastTribe.exd
-   enum class BeastTribe : uint8_t
-   {
-      bool operator==( const BeastTribe& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const BeastTribe& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ClassJob.exd
-   enum class ClassJob : uint8_t
-   {
-      Adventurer = 0,
-      Gladiator = 1,
-      Pugilist = 2,
-      Marauder = 3,
-      Lancer = 4,
-      Archer = 5,
-      Conjurer = 6,
-      Thaumaturge = 7,
-      Carpenter = 8,
-      Blacksmith = 9,
-      Armorer = 10,
-      Goldsmith = 11,
-      Leatherworker = 12,
-      Weaver = 13,
-      Alchemist = 14,
-      Culinarian = 15,
-      Miner = 16,
-      Botanist = 17,
-      Fisher = 18,
-      Paladin = 19,
-      Monk = 20,
-      Warrior = 21,
-      Dragoon = 22,
-      Bard = 23,
-      Whitemage = 24,
-      Blackmage = 25,
-      Arcanist = 26,
-      Summoner = 27,
-      Scholar = 28,
-      Rogue = 29,
-      Ninja = 30,
-      Machinist = 31,
-      Darkknight = 32,
-      Astrologian = 33,
-      Samurai = 34,
-      Redmage = 35,
-      bool operator==( const ClassJob& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ClassJob& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ContentType.exd
-   enum class ContentType : uint8_t
-   {
-      DutyRoulette = 1,
-      Dungeons = 2,
-      Guildhests = 3,
-      Trials = 4,
-      Raids = 5,
-      PvP = 6,
-      QuestBattles = 7,
-      FATEs = 8,
-      TreasureHunt = 9,
-      Levequests = 10,
-      GrandCompany = 11,
-      Companions = 12,
-      BeastTribeQuests = 13,
-      OverallCompletion = 14,
-      PlayerCommendation = 15,
-      DisciplesoftheLand = 16,
-      DisciplesoftheHand = 17,
-      RetainerVentures = 18,
-      GoldSaucer = 19,
-      DeepDungeons = 21,
-      WondrousTails = 24,
-      CustomDeliveries = 25,
-      bool operator==( const ContentType& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ContentType& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //EmoteCategory.exd
-   enum class EmoteCategory : uint8_t
-   {
-      General = 1,
-      Persistent = 2,
-      Expressions = 3,
-      bool operator==( const EmoteCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const EmoteCategory& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ExVersion.exd
-   enum class ExVersion : uint8_t
-   {
-      ARealmReborn = 0,
-      Heavensward = 1,
-      Stormblood = 2,
-      bool operator==( const ExVersion& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ExVersion& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //GrandCompany.exd
-   enum class GrandCompany : uint8_t
-   {
-      None = 0,
-      Maelstrom = 1,
-      OrderoftheTwinAdder = 2,
-      ImmortalFlames = 3,
-      bool operator==( const GrandCompany& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const GrandCompany& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //GuardianDeity.exd
-   enum class GuardianDeity : uint8_t
-   {
-      HalonetheFury = 1,
-      MenphinatheLover = 2,
-      ThaliaktheScholar = 3,
-      NymeiatheSpinner = 4,
-      LlymlaentheNavigator = 5,
-      OschontheWanderer = 6,
-      ByregottheBuilder = 7,
-      RhalgrtheDestroyer = 8,
-      AzeymatheWarden = 9,
-      NaldthaltheTraders = 10,
-      NophicatheMatron = 11,
-      AlthyktheKeeper = 12,
-      bool operator==( const GuardianDeity& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const GuardianDeity& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ItemUICategory.exd
-   enum class ItemUICategory : uint8_t
-   {
-      PugilistsArm = 1,
-      GladiatorsArm = 2,
-      MaraudersArm = 3,
-      ArchersArm = 4,
-      LancersArm = 5,
-      OnehandedThaumaturgesArm = 6,
-      TwohandedThaumaturgesArm = 7,
-      OnehandedConjurersArm = 8,
-      TwohandedConjurersArm = 9,
-      ArcanistsGrimoire = 10,
-      Shield = 11,
-      CarpentersPrimaryTool = 12,
-      CarpentersSecondaryTool = 13,
-      BlacksmithsPrimaryTool = 14,
-      BlacksmithsSecondaryTool = 15,
-      ArmorersPrimaryTool = 16,
-      ArmorersSecondaryTool = 17,
-      GoldsmithsPrimaryTool = 18,
-      GoldsmithsSecondaryTool = 19,
-      LeatherworkersPrimaryTool = 20,
-      LeatherworkersSecondaryTool = 21,
-      WeaversPrimaryTool = 22,
-      WeaversSecondaryTool = 23,
-      AlchemistsPrimaryTool = 24,
-      AlchemistsSecondaryTool = 25,
-      CulinariansPrimaryTool = 26,
-      CulinariansSecondaryTool = 27,
-      MinersPrimaryTool = 28,
-      MinersSecondaryTool = 29,
-      BotanistsPrimaryTool = 30,
-      BotanistsSecondaryTool = 31,
-      FishersPrimaryTool = 32,
-      FishingTackle = 33,
-      Head = 34,
-      Body = 35,
-      Legs = 36,
-      Hands = 37,
-      Feet = 38,
-      Waist = 39,
-      Necklace = 40,
-      Earrings = 41,
-      Bracelets = 42,
-      Ring = 43,
-      Medicine = 44,
-      Ingredient = 45,
-      Meal = 46,
-      Seafood = 47,
-      Stone = 48,
-      Metal = 49,
-      Lumber = 50,
-      Cloth = 51,
-      Leather = 52,
-      Bone = 53,
-      Reagent = 54,
-      Dye = 55,
-      Part = 56,
-      Furnishing = 57,
-      Materia = 58,
-      Crystal = 59,
-      Catalyst = 60,
-      Miscellany = 61,
-      SoulCrystal = 62,
-      Other = 63,
-      ConstructionPermit = 64,
-      Roof = 65,
-      ExteriorWall = 66,
-      Window = 67,
-      Door = 68,
-      RoofDecoration = 69,
-      ExteriorWallDecoration = 70,
-      Placard = 71,
-      Fence = 72,
-      InteriorWall = 73,
-      Flooring = 74,
-      CeilingLight = 75,
-      OutdoorFurnishing = 76,
-      Table = 77,
-      Tabletop = 78,
-      Wallmounted = 79,
-      Rug = 80,
-      Minion = 81,
-      Gardening = 82,
-      Demimateria = 83,
-      RoguesArm = 84,
-      SeasonalMiscellany = 85,
-      TripleTriadCard = 86,
-      DarkKnightsArm = 87,
-      MachinistsArm = 88,
-      AstrologiansArm = 89,
-      AirshipHull = 90,
-      AirshipRigging = 91,
-      AirshipAftcastle = 92,
-      AirshipForecastle = 93,
-      OrchestrionRoll = 94,
-      Painting = 95,
-      SamuraisArm = 96,
-      RedMagesArm = 97,
-      ScholarsArm = 98,
-      FishersSecondaryTool = 99,
-      Currency = 100,
-      bool operator==( const ItemUICategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ItemUICategory& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //ItemSearchCategory.exd
-   enum class ItemSearchCategory : uint8_t
-   {
-      PrimaryArms = 1,
-      PrimaryTools = 2,
-      PrimaryTools1 = 3,
-      Armor = 4,
-      Accessories = 5,
-      Medicines = 6,
-      Materials = 7,
-      Other = 8,
-      PugilistsArms = 9,
-      GladiatorsArms = 10,
-      MaraudersArms = 11,
-      ArchersArms = 12,
-      LancersArms = 13,
-      ThaumaturgesArms = 14,
-      ConjurersArms = 15,
-      ArcanistsArms = 16,
-      Shields = 17,
-      ThrowingWeapons = 18,
-      CarpentersTools = 19,
-      BlacksmithsTools = 20,
-      ArmorersTools = 21,
-      GoldsmithsTools = 22,
-      LeatherworkersTools = 23,
-      WeaversTools = 24,
-      AlchemistsTools = 25,
-      CulinariansTools = 26,
-      MinersTools = 27,
-      BotanistsTools = 28,
-      FishersTools = 29,
-      FishingTackle = 30,
-      Head = 31,
-      Undershirts = 32,
-      Body = 33,
-      Undergarments = 34,
-      Legs = 35,
-      Hands = 36,
-      Feet = 37,
-      Waist = 38,
-      Necklaces = 39,
-      Earrings = 40,
-      Bracelets = 41,
-      Rings = 42,
-      Medicine = 43,
-      Ingredients = 44,
-      Meals = 45,
-      Seafood = 46,
-      Stone = 47,
-      Metal = 48,
-      Lumber = 49,
-      Cloth = 50,
-      Leather = 51,
-      Bone = 52,
-      Reagents = 53,
-      Dyes = 54,
-      WeaponParts = 55,
-      Furnishings = 56,
-      Materia = 57,
-      Crystals = 58,
-      Catalysts = 59,
-      Miscellany = 60,
-      SoulCrystals = 61,
-      Arrows = 62,
-      QuestItems = 63,
-      Other1 = 64,
-      ExteriorFixtures = 65,
-      InteriorFixtures = 66,
-      OutdoorFurnishings = 67,
-      ChairsandBeds = 68,
-      Tables = 69,
-      Tabletop = 70,
-      Wallmounted = 71,
-      Rugs = 72,
-      RoguesArms = 73,
-      SeasonalMiscellany = 74,
-      Minions = 75,
-      DarkKnightsArms = 76,
-      MachinistsArms = 77,
-      AstrologiansArms = 78,
-      AirshipComponents = 79,
-      OrchestrionComponents = 80,
-      GardeningItems = 81,
-      Paintings = 82,
-      SamuraisArms = 83,
-      RedMagesArms = 84,
-      ScholarsArms = 85,
-      bool operator==( const ItemSearchCategory& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const ItemSearchCategory& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //OnlineStatus.exd
-   enum class OnlineStatus : uint8_t
-   {
-      Producer = 1,
-      GameMaster = 2,
-      GameMaster1 = 3,
-      GameMaster2 = 4,
-      Disconnected = 5,
-      WaitingforFriendListApproval = 6,
-      WaitingforLinkshellApproval = 7,
-      WaitingforFreeCompanyApproval = 8,
-      NotFound = 9,
-      Offline = 10,
-      Mentor = 11,
-      Busy = 12,
-      PvP = 13,
-      PlayingTripleTriad = 14,
-      ViewingCutscene = 15,
-      UsingaChocoboPorter = 16,
-      AwayfromKeyboard = 17,
-      CameraMode = 18,
-      LookingforRepairs = 19,
-      LookingtoRepair = 20,
-      LookingtoMeldMateria = 21,
-      Roleplaying = 22,
-      LookingforParty = 23,
-      SwordforHire = 24,
-      WaitingforDutyFinder = 25,
-      RecruitingPartyMembers = 26,
-      Mentor1 = 27,
-      PvEMentor = 28,
-      TradeMentor = 29,
-      PvPMentor = 30,
-      Returner = 31,
-      NewAdventurer = 32,
-      AllianceLeader = 33,
-      AlliancePartyLeader = 34,
-      AlliancePartyMember = 35,
-      PartyLeader = 36,
-      PartyMember = 37,
-      PartyLeaderCrossworld = 38,
-      PartyMemberCrossworld = 39,
-      AnotherWorld = 40,
-      SharingDuty = 41,
-      SimilarDuty = 42,
-      InDuty = 43,
-      TrialAdventurer = 44,
-      FreeCompany = 45,
-      GrandCompany = 46,
-      Online = 47,
-      bool operator==( const OnlineStatus& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const OnlineStatus& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //Race.exd
-   enum class Race : uint8_t
-   {
-      Hyur = 1,
-      Elezen = 2,
-      Lalafell = 3,
-      Miqote = 4,
-      Roegadyn = 5,
-      AuRa = 6,
-      bool operator==( const Race& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const Race& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //Tribe.exd
-   enum class Tribe : uint8_t
-   {
-      Midlander = 1,
-      Highlander = 2,
-      Wildwood = 3,
-      Duskwight = 4,
-      Plainsfolk = 5,
-      Dunesfolk = 6,
-      SeekeroftheSun = 7,
-      KeeperoftheMoon = 8,
-      SeaWolf = 9,
-      Hellsguard = 10,
-      Raen = 11,
-      Xaela = 12,
-      bool operator==( const Tribe& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const Tribe& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //Town.exd
-   enum class Town : uint8_t
-   {
-      Nowheresville = 0,
-      LimsaLominsa = 1,
-      Gridania = 2,
-      Uldah = 3,
-      Ishgard = 4,
-      Kugane = 7,
-      bool operator==( const Town& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const Town& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-
-   ///////////////////////////////////////////////////////////
-   //Weather.exd
-   enum class Weather : uint8_t
-   {
-      ClearSkies = 1,
-      FairSkies = 2,
-      Clouds = 3,
-      Fog = 4,
-      Wind = 5,
-      Gales = 6,
-      Rain = 7,
-      Showers = 8,
-      Thunder = 9,
-      Thunderstorms = 10,
-      DustStorms = 11,
-      Sandstorms = 12,
-      HotSpells = 13,
-      HeatWaves = 14,
-      Snow = 15,
-      Blizzards = 16,
-      Gloom = 17,
-      Auroras = 18,
-      Darkness = 19,
-      Tension = 20,
-      Clouds1 = 21,
-      StormClouds = 22,
-      RoughSeas = 23,
-      RoughSeas1 = 24,
-      Louring = 25,
-      HeatWaves1 = 26,
-      Gloom1 = 27,
-      Gales1 = 28,
-      Eruptions = 29,
-      FairSkies1 = 30,
-      FairSkies2 = 31,
-      FairSkies3 = 32,
-      FairSkies4 = 33,
-      FairSkies5 = 34,
-      Irradiance = 35,
-      CoreRadiation = 36,
-      CoreRadiation1 = 37,
-      CoreRadiation2 = 38,
-      CoreRadiation3 = 39,
-      ShelfClouds = 40,
-      ShelfClouds1 = 41,
-      ShelfClouds2 = 42,
-      ShelfClouds3 = 43,
-      Oppression = 44,
-      Oppression1 = 45,
-      Oppression2 = 46,
-      Oppression3 = 47,
-      Oppression4 = 48,
-      UmbralWind = 49,
-      UmbralStatic = 50,
-      Smoke = 51,
-      FairSkies6 = 52,
-      RoyalLevin = 53,
-      Hyperelectricity = 54,
-      RoyalLevin1 = 55,
-      Oppression5 = 56,
-      Thunder1 = 57,
-      Thunder2 = 58,
-      CutScene = 59,
-      Multiplicity = 60,
-      Multiplicity1 = 61,
-      Rain1 = 62,
-      FairSkies7 = 63,
-      Rain2 = 64,
-      FairSkies8 = 65,
-      Dragonstorm = 66,
-      Dragonstorm1 = 67,
-      Subterrain = 68,
-      Concordance = 69,
-      Concordance1 = 70,
-      BeyondTime = 71,
-      BeyondTime1 = 72,
-      BeyondTime2 = 73,
-      DemonicInfinity = 74,
-      DemonicInfinity1 = 75,
-      DemonicInfinity2 = 76,
-      DimensionalDisruption = 77,
-      DimensionalDisruption1 = 78,
-      DimensionalDisruption2 = 79,
-      Revelstorm = 80,
-      Revelstorm1 = 81,
-      EternalBliss = 82,
-      EternalBliss1 = 83,
-      Wyrmstorm = 84,
-      Wyrmstorm1 = 85,
-      Revelstorm2 = 86,
-      Quicklevin = 87,
-      Thunder3 = 88,
-      DimensionalDisruption3 = 89,
-      FairSkies9 = 90,
-      bool operator==( const Weather& t, const uint8_t& g ) { return static_cast< uint8_t >( t ) == g; }
-      bool operator==( const uint8_t& g, const Weather& t ) { return static_cast< uint8_t >( t ) == g; }
-   };
-}
-}
-#endif
-
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlaMhigo.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlaMhigo.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeep.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeepHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AmdaporKeepHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BaelsarsWall.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BaelsarsWall.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BardamsMettle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BardamsMettle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstop.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstop.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstopHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BrayfloxsLongstopHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CastrumAbania.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CastrumAbania.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CastrumMeridianum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CastrumMeridianum.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMines.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMines.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMinesHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CopperbellMinesHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CuttersCry.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CuttersCry.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DomaCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DomaCastle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DzemaelDarkhold.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DzemaelDarkhold.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Halatali.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Halatali.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HalataliHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HalataliHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManorHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HaukkeManorHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HellsLid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HellsLid.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsleHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HullbreakerIsleHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/KuganeCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/KuganeCastle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Neverreap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Neverreap.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PharosSirius.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/PharosSirius.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PharosSiriusHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/PharosSiriusHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SaintMociannesArboretum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SaintMociannesArboretum.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Sastasha.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SastashaHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SastashaHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ShisuioftheVioletTides.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ShisuioftheVioletTides.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Snowcloak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Snowcloak.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohmAl.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SohmAl.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohmAlHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SohmAlHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SohrKhai.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SohrKhai.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAery.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAery.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAetherochemicalResearchFacility.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAetherochemicalResearchFacility.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAntitower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAntitower.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAurumVale.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAurumVale.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDrownedCityofSkalla.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheDrownedCityofSkalla.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDuskVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheDuskVigil.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuum.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuumHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFractalContinuumHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibrary.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibrary.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibraryHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheGreatGubalLibraryHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheKeeperoftheLake.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheKeeperoftheLake.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdapor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdapor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdaporHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLostCityofAmdaporHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePraetorium.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePraetorium.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSirensongSea.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSirensongSea.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigil.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigilHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStoneVigilHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarn.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarn.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarnHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSunkenTempleofQarnHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroft.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroft.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroftHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheTamTaraDeepcroftHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheTempleoftheFist.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheTempleoftheFist.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheThousandMawsofTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheThousandMawsofTotoRak.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheVault.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheVault.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalace.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalace.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalaceHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWanderersPalaceHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Xelphatol.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Xelphatol.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventI.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventI.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventII.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventIII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SpecialEventIII.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHauntedManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHauntedManor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheValentionesCeremony.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheValentionesCeremony.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AllsWellthatEndsintheWell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AllsWellthatEndsintheWell.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AnnoytheVoid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AnnoytheVoid.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyParties.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyParties.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyStrongholds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BasicTrainingEnemyStrongholds.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/FlickingSticksandTakingNames.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/FlickingSticksandTakingNames.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HeroontheHalfShell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HeroontheHalfShell.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/LongLivetheQueen.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/LongLivetheQueen.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/MorethanaFeeler.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/MorethanaFeeler.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/PullingPoisonPosies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/PullingPoisonPosies.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ShadowandClaw.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ShadowandClaw.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SolemnTrinity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SolemnTrinity.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/StingingBack.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/StingingBack.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/UndertheArmor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/UndertheArmor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WardUp.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/WardUp.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AccrueEnmityfromMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AccrueEnmityfromMultipleTargets.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AssistAlliesinDefeatingaTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AssistAlliesinDefeatingaTarget.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AvoidAreaofEffectAttacks.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AvoidAreaofEffectAttacks.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AvoidEngagedTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AvoidEngagedTargets.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DefeatanOccupiedTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DefeatanOccupiedTarget.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EngageEnemyReinforcements.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/EngageEnemyReinforcements.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EngageMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/EngageMultipleTargets.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaComboinBattle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaComboinBattle.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaCombotoIncreaseEnmity.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ExecuteaRangedAttacktoIncreaseEnmity.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/FinalExercise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/FinalExercise.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HealMultipleAllies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HealMultipleAllies.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/HealanAlly.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/HealanAlly.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InteractwiththeBattlefield.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/InteractwiththeBattlefield.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors101110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors101110.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors110.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors111120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors111120.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors1120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors1120.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors121130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors121130.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors131140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors131140.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors141150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors141150.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors151160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors151160.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors161170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors161170.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors171180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors171180.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors181190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors181190.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors191200.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors191200.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors2130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors2130.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors3140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors3140.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors4150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors4150.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors5160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors5160.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors6170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors6170.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors7180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors7180.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors8190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors8190.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors91100.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePalaceoftheDeadFloors91100.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Astragalos.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Astragalos.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SealRockSeize.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SealRockSeize.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBorderlandRuinsSecure.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBorderlandRuinsSecure.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheCarteneauFlatsHeliodrome.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheCarteneauFlatsHeliodrome.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4LightParty.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4LightParty.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Ranked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Ranked.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Training.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeast4on4Training.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchCrystalTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchCrystalTower.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchFeastingGrounds.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchLichenweed.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastCustomMatchLichenweed.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastRanked.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTeamRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTeamRanked.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTraining.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFeastTraining.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFieldsofGloryShatter.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFieldsofGloryShatter.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ABloodyReunion.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ABloodyReunion.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ASpectaclefortheAges.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ASpectaclefortheAges.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BloodDragoon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BloodDragoon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BloodontheDeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BloodontheDeck.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CuriousGorgeMeetsHisMatch.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CuriousGorgeMeetsHisMatch.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DarkwingDragon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DarkwingDragon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InThalsName.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/InThalsName.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/InterdimensionalRift.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/InterdimensionalRift.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ItsProbablyaTrap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ItsProbablyaTrap.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/MatsubaMayhem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/MatsubaMayhem.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Naadam.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Naadam.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OneLifeforOneWorld.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/OneLifeforOneWorld.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OurCompromise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/OurCompromise.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/OurUnsungHeroes.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/OurUnsungHeroes.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/RaisingtheSword.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/RaisingtheSword.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ReturnoftheBull.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ReturnoftheBull.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBattleonBekko.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBattleonBekko.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFaceofTrueEvil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFaceofTrueEvil.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHeartoftheProblem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHeartoftheProblem.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheOrphansandtheBrokenBlade.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheOrphansandtheBrokenBlade.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheResonant.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheResonant.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WhenClansCollide.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/WhenClansCollide.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/WithHeartandSteel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/WithHeartandSteel.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheArmoftheSonSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreator.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBreathoftheCreatorSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheBurdenoftheSonSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheCuffoftheSonSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreator.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheEyesoftheCreatorSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSon.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheFistoftheSonSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreator.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheHeartoftheCreatorSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreator.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AlexanderTheSouloftheCreatorSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn1.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn2.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn3.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn4.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn5.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBindingCoilofBahamutTurn5.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn1.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn2.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn3.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalCoilofBahamutTurn4.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn1.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn2.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn3.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutSavageTurn4.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn1.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn2.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn3.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSecondCoilofBahamutTurn4.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SyrcusTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SyrcusTower.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLabyrinthoftheAncients.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLabyrinthoftheAncients.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWorldofDarkness.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWorldofDarkness.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV10Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV20Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV30Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DeltascapeV40Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV10Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV20Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV30Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/SigmascapeV40Savage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalCityofRabanastre.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalCityofRabanastre.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/DunScaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/DunScaith.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheVoidArk.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheVoidArk.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWeepingCityofMhach.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWeepingCityofMhach.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheUnendingCoilofBahamutUltimate.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheAquapolis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheAquapolis.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHiddenCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHiddenCanalsofUznair.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLostCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLostCanalsofUznair.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheChimera.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheChimera.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheHydra.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ARelicReborntheHydra.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/AkhAfahAmphitheatreHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BattleintheBigKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BattleintheBigKeep.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/BattleontheBigBridge.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/BattleontheBigBridge.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/CapeWestwind.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/CapeWestwind.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/Emanation.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/Emanation.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/EmanationExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/EmanationExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbers.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbers.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheBowlofEmbersHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheChrysalis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheChrysalis.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheDragonsNeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheDragonsNeck.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheFinalStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheFinalStepsofFaith.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEye.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEye.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheHowlingEyeHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheLimitlessBlueHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladNidhoggsRage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladShinryusDomain.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladThordansReign.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladThordansReign.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladUltimasBane.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheMinstrelsBalladUltimasBane.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheNavel.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheNavelExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheNavelHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheNavelHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTribute.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTribute.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTributeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThePoolofTributeExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalMenagerie.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheRoyalMenagerie.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheSingularityReactor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheSingularityReactor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStepsofFaith.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheStrikingTreeHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheWhorleaterHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThokastThokHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ThornmarchHard.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/UrthsFount.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/UrthsFount.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoa.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoa.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoaExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/TheJadeStoaExtreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayP1T6Extreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayS1T7Extreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/instances/ContainmentBayZ1T9Extreme.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp

From 2d45e32b0893730934b09a7bc4d4ae2e153b2a18 Mon Sep 17 00:00:00 2001
From: Mordred Admin <gogs@fake.local>
Date: Tue, 27 Feb 2018 09:32:50 +0100
Subject: [PATCH 40/69] Build fix by excluding pcb_reader and
 event_object_dumper for now

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 561d4790..61e3273e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,5 +67,5 @@ add_subdirectory("src/tools/exd_common_gen")
 add_subdirectory("src/tools/exd_struct_gen")
 add_subdirectory("src/tools/exd_struct_test")
 add_subdirectory("src/tools/quest_parser")
-add_subdirectory("src/tools/pcb_reader")
-add_subdirectory("src/tools/event_object_parser")
+#add_subdirectory("src/tools/pcb_reader")
+#add_subdirectory("src/tools/event_object_parser")

From 6d6c3c0f901b10f7ad5499c92cf5c150bd7b01f2 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Tue, 27 Feb 2018 23:05:42 +1100
Subject: [PATCH 41/69] eobj state cmd and some ontalk fixes

---
 CMakeLists.txt                                |  4 +--
 src/servers/sapphire_zone/Actor/EventObject.h |  2 +-
 .../DebugCommand/DebugCommandHandler.cpp      | 22 ++------------
 .../Scripts/instances/dungeons/Sastasha.cpp   | 29 +++++++++++++++----
 .../sapphire_zone/Zone/InstanceContent.cpp    |  2 +-
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 561d4790..61e3273e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,5 +67,5 @@ add_subdirectory("src/tools/exd_common_gen")
 add_subdirectory("src/tools/exd_struct_gen")
 add_subdirectory("src/tools/exd_struct_test")
 add_subdirectory("src/tools/quest_parser")
-add_subdirectory("src/tools/pcb_reader")
-add_subdirectory("src/tools/event_object_parser")
+#add_subdirectory("src/tools/pcb_reader")
+#add_subdirectory("src/tools/event_object_parser")
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 85dd329d..42318787 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -13,7 +13,7 @@ namespace Entity
       EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
                    const std::string& givenName = "none" );
 
-      using OnTalkEventHandler = std::function< void( Entity::Player&, uint64_t ) >;
+      using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr, InstanceContentPtr, uint64_t ) >;
 
       uint32_t getMapLinkId() const;
       void setMapLinkId( uint32_t mapLinkId );
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 46241c87..6e989623 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -720,34 +720,18 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
 
       instance->setVar( static_cast< uint8_t >( index ), static_cast< uint8_t >( value ) );
    }
-   else if( subCommand == "objupdate" )
-   {
-      uint32_t objId;
-
-      sscanf( params.c_str(), "%d", &objId );
-
-      auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
-      if( !instance )
-         return;
-
-      auto obj = instance->getEObj(objId);
-      if( !obj )
-         return;
-
-      //instance->updateEObj(obj);
-   }
    else if( subCommand == "objstate" )
    {
-      uint32_t objId;
+      char objName[128];
       uint8_t state;
 
-      sscanf( params.c_str(), "%d %hhu", &objId, &state );
+      sscanf( params.c_str(), "%s %hhu", objName, &state );
 
       auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
       if( !instance )
          return;
 
-      auto obj = instance->getEObj(objId);
+      auto obj = instance->getEObjByName( objName );
       if( !obj )
          return;
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
index 20186ef2..0256b651 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@@ -3,6 +3,19 @@
 
 class Sastasha : public InstanceContentScript
 {
+private:
+   static void memoOnTalk( Entity::Player& player, Entity::EventObjectPtr object, InstanceContentPtr instance, uint64_t actorId )
+   {
+
+   }
+
+   static void switchOnTalk( Entity::Player& player, Entity::EventObjectPtr object, InstanceContentPtr instance, uint64_t actorId )
+   {
+      object->setState( 7 );
+
+      instance->getEObjByName( "Hiddendoor" )->setState( 7 );
+   }
+
 public:
    Sastasha() : InstanceContentScript( 4 )
    { }
@@ -25,17 +38,23 @@ public:
       instance->registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f }, 0.930753f );
       instance->registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f }, 0.930753f );
       instance->registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f }, 0.991789f );
-      instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f );
-      instance->registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f );
+
+      auto switchObj = instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f );
+      switchObj->setOnTalkHandler( switchOnTalk );
+
+      instance->registerEObj( "Hiddendoor", 2000217, 3653517, 5, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f );
       instance->registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f );
       instance->registerEObj( "Unknown10", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f }, 0.991789f );
       instance->registerEObj( "Unknown11", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f }, 0.991789f );
       instance->registerEObj( "Unknown12", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f }, 0.991789f );
       instance->registerEObj( "Unknown13", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f }, 1.000000f );
       instance->registerEObj( "Unknown14", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f }, 0.991789f );
-      instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
-      instance->registerEObj( "Bloodymemo", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
-      instance->registerEObj( "Bloodymemo", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+
+      auto memo = instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+      memo->setOnTalkHandler( memoOnTalk );
+      //instance->registerEObj( "Bloodymemo", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+      //instance->registerEObj( "Bloodymemo", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
+
       instance->registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f );
       instance->registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f }, 0.991789f );
       instance->registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f );
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 48457c84..0c7f1d38 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -273,7 +273,7 @@ void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t event
       return;
 
    if( auto onTalk = it->second->getOnTalkHandler() )
-      onTalk( player, actorId );
+      onTalk( player, it->second, getAsInstanceContent(), actorId );
    else
       player.sendDebug( "No onTalk handler found for interactable eobj with EObjID: " +
                         std::to_string( it->second->getObjectId() ) + ", eventId: " + std::to_string( eventId ) );

From e4d6711ad474067df77bec504d41321d4a37ec14 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Wed, 28 Feb 2018 00:03:26 +0100
Subject: [PATCH 42/69] Fixed eobjects getting incorrect ids, fixed actors not
 properly removing from cells

---
 src/servers/sapphire_zone/Actor/EventObject.cpp             | 4 ++--
 src/servers/sapphire_zone/Actor/EventObject.h               | 2 +-
 .../Script/Scripts/{quest => }/opening/OpeningGridania.cpp  | 0
 .../Script/Scripts/{quest => }/opening/OpeningLimsa.cpp     | 0
 .../Script/Scripts/{quest => }/opening/OpeningUldah.cpp     | 0
 src/servers/sapphire_zone/Zone/Zone.cpp                     | 6 ++++--
 6 files changed, 7 insertions(+), 5 deletions(-)
 rename src/servers/sapphire_zone/Script/Scripts/{quest => }/opening/OpeningGridania.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/{quest => }/opening/OpeningLimsa.cpp (100%)
 rename src/servers/sapphire_zone/Script/Scripts/{quest => }/opening/OpeningUldah.cpp (100%)

diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 26775c1b..e624c124 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -17,7 +17,7 @@ using namespace Core::Network::Packets::Server;
 extern Core::Logger g_log;
 
 
-Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId,
+Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t mapLinkId,
                                         uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
                                         const std::string& givenName ) :
    Core::Entity::Actor( ObjKind::EventObj ),
@@ -26,7 +26,7 @@ Core::Entity::EventObject::EventObject( uint32_t objectId, uint32_t mapLinkId,
    m_objectId( objectId ),
    m_name( givenName )
 {
-   m_id = objectId;
+   m_id = actorId;
    m_pos.x = pos.x;
    m_pos.y = pos.y;
    m_pos.z = pos.z;
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 42318787..2fd57a09 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -10,7 +10,7 @@ namespace Entity
    class EventObject : public Actor
    {
    public:
-      EventObject( uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
+      EventObject( uint32_t actorId, uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
                    const std::string& givenName = "none" );
 
       using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr, InstanceContentPtr, uint64_t ) >;
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningGridania.cpp
rename to src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningLimsa.cpp
rename to src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp
similarity index 100%
rename from src/servers/sapphire_zone/Script/Scripts/quest/opening/OpeningUldah.cpp
rename to src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 0aa49852..1545a098 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -55,7 +55,8 @@ Core::Zone::Zone() :
 }
 
 Core::Zone::Zone( uint16_t territoryId, uint32_t guId, const std::string& internalName, const std::string& placeName ) :
-   m_currentWeather( Weather::FairSkies )
+   m_currentWeather( Weather::FairSkies ),
+   m_nextEObjId( 0x400D0000 )
 {
    m_guId = guId;
 
@@ -539,6 +540,7 @@ void Core::Zone::updateActorPosition( Entity::Actor &actor )
          pOldCell->removeActor( actor.shared_from_this() );
 
       pCell->addActor( actor.shared_from_this() );
+      actor.setCell( pCell );
       pOldCell = pCell;
 
       // if player we need to update cell activity
@@ -692,7 +694,7 @@ uint32_t Core::Zone::getNextEObjId()
 Core::Entity::EventObjectPtr Core::Zone::registerEObj( const std::string &name, uint32_t objectId, uint32_t mapLink,
                                                        uint8_t state, FFXIVARR_POSITION3 pos, float scale )
 {
-   auto eObj = Entity::make_EventObject( objectId, mapLink, state, pos, name );
+   auto eObj = Entity::make_EventObject( getNextEObjId(), objectId, mapLink, state, pos, name );
    eObj->setScale( scale );
    registerEObj( eObj );
 

From 083a3aa2393bfabda2166832d07115e88bec6b50 Mon Sep 17 00:00:00 2001
From: Mordred Admin <gogs@fake.local>
Date: Wed, 28 Feb 2018 10:26:03 +0100
Subject: [PATCH 43/69] Rearranged includes for potential speed increases

---
 src/servers/sapphire_zone/Actor/Actor.h                |  1 +
 .../sapphire_zone/DebugCommand/DebugCommandHandler.cpp |  1 +
 .../Network/Handlers/GMCommandHandlers.cpp             |  1 +
 .../sapphire_zone/Network/Handlers/PacketHandlers.cpp  |  1 +
 src/servers/sapphire_zone/Script/NativeScriptApi.h     |  8 ++------
 .../sapphire_zone/Script/NativeScriptManager.cpp       |  3 +++
 src/servers/sapphire_zone/Script/NativeScriptManager.h |  3 ---
 src/servers/sapphire_zone/Script/ScriptManager.cpp     |  1 +
 .../Script/Scripts/instances/dungeons/Sastasha.cpp     |  3 ++-
 src/servers/sapphire_zone/Zone/InstanceContent.cpp     |  1 +
 src/servers/sapphire_zone/Zone/InstanceContent.h       | 10 ++++++----
 src/servers/sapphire_zone/Zone/TerritoryMgr.cpp        |  2 ++
 src/servers/sapphire_zone/Zone/TerritoryMgr.h          |  2 +-
 src/servers/sapphire_zone/Zone/Zone.cpp                |  1 +
 src/servers/sapphire_zone/Zone/Zone.h                  |  9 +++++++--
 15 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 54916754..5c8f7e45 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -39,6 +39,7 @@ namespace Entity {
          CardStand = 0x0E,
       };
 
+
    protected:
       /*! Position of the object */
       Common::FFXIVARR_POSITION3 m_pos;
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 6e989623..72c31d5c 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -22,6 +22,7 @@
 #include "Script/NativeScriptManager.h"
 
 #include "Actor/Player.h"
+#include "Actor/EventObject.h"
 
 #include "Zone/Zone.h"
 #include "Zone/InstanceContent.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 9fa34628..11c2a21e 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -4,6 +4,7 @@
 #include <common/Logging/Logger.h>
 #include <common/Network/PacketContainer.h>
 
+#include <unordered_map>
 #include <boost/format.hpp>
 
 #include "Network/GameConnection.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 50f38dd4..e2d7e31c 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -7,6 +7,7 @@
 #include <common/Database/DatabaseDef.h>
 
 #include <boost/format.hpp>
+#include <unordered_map>
 
 #include "Network/GameConnection.h"
 
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index f65f93f4..43edd68e 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -4,11 +4,7 @@
 #include <string>
 #include <typeinfo>
 #include <typeindex>
-
-#include <Actor/Chara.h>
-#include <Actor/Player.h>
-#include <StatusEffect/StatusEffect.h>
-#include <Zone/InstanceContent.h>
+#include "Forwards.h"
 
 #ifdef _MSC_VER
 #define EXPORT __declspec( dllexport )
@@ -125,4 +121,4 @@ public:
    virtual void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/servers/sapphire_zone/Script/NativeScriptManager.cpp b/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
index 9b487c03..cd029f6c 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
@@ -1,4 +1,7 @@
 #include "NativeScriptManager.h"
+#include <boost/filesystem.hpp>
+
+#include <common/Crypt/md5.h>
 
 namespace Core {
 namespace Scripting {
diff --git a/src/servers/sapphire_zone/Script/NativeScriptManager.h b/src/servers/sapphire_zone/Script/NativeScriptManager.h
index a793b68e..7398884d 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptManager.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptManager.h
@@ -7,9 +7,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/filesystem.hpp>
-
-#include <common/Crypt/md5.h>
 
 #include "ScriptLoader.h"
 
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 1106535a..5ab27cc0 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -5,6 +5,7 @@
 #include "NativeScriptManager.h"
 
 #include "Zone/Zone.h"
+#include "Zone/InstanceContent.h"
 #include "Actor/Player.h"
 #include "ServerZone.h"
 #include "Event/EventHandler.h"
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
index 0256b651..fcdca8ab 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@@ -1,5 +1,6 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
+#include <Actor/EventObject.h>
 
 class Sastasha : public InstanceContentScript
 {
@@ -81,4 +82,4 @@ public:
 
    }
 
-};
\ No newline at end of file
+};
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 0c7f1d38..201ac523 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -10,6 +10,7 @@
 #include "Script/ScriptManager.h"
 
 #include "Actor/Player.h"
+#include "Actor/EventObject.h"
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index 328251c4..9dcb5974 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -4,11 +4,13 @@
 #include "Zone.h"
 #include "Event/Director.h"
 #include "Forwards.h"
-#include <common/Exd/ExdDataGenerated.h>
 
 namespace Core
 {
-
+   namespace Data
+   {
+      struct InstanceContent;
+   }
 class InstanceContent : public Event::Director, public Zone
 {
 public:
@@ -40,7 +42,7 @@ public:
 
    void setVar( uint8_t index, uint8_t value );
 
-   Core::Data::ExdDataGenerated::InstanceContentPtr getInstanceContentInfo() const;
+   boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentInfo() const;
 
    uint32_t getInstanceContentId() const;
 
@@ -48,7 +50,7 @@ public:
 
 private:
    Event::DirectorPtr m_pDirector;
-   Core::Data::ExdDataGenerated::InstanceContentPtr m_instanceContentInfo;
+   boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo;
    uint32_t m_instanceContentId;
    InstanceContentState m_state;
 
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index ed4c1513..85ac8aaa 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -4,6 +4,8 @@
 #include <common/Database/DatabaseDef.h>
 #include <common/Exd/ExdDataGenerated.h>
 
+#include <unordered_map>
+
 #include "Actor/Player.h"
 
 #include "Zone.h"
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
index 52561fa9..7ed16f85 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
@@ -1,9 +1,9 @@
 #ifndef SAPPHIRE_TERRITORYMGR_H
 #define SAPPHIRE_TERRITORYMGR_H
 
-#include <common/Exd/ExdDataGenerated.h>
 #include "Forwards.h"
 #include <set>
+#include <unordered_map>
 
 namespace Core
 {
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 1545a098..1c56ad10 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -19,6 +19,7 @@
 #include "Session.h"
 #include "Actor/Chara.h"
 #include "Actor/Player.h"
+#include "Actor/EventObject.h"
 
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 7b43c772..81170219 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -6,16 +6,16 @@
 
 #include "Cell.h"
 #include "CellHandler.h"
-#include "Actor/EventObject.h"
 
 #include "Forwards.h"
 
 #include <set>
+#include <map>
 #include <boost/enable_shared_from_this.hpp>
 
 #include <stdio.h>
 #include <string.h>
-#include <common/Exd/ExdDataGenerated.h>
+
 namespace Core {
 
 class Session;
@@ -23,6 +23,11 @@ class Session;
 class ZonePosition;
 
 using SessionSet = std::set< SessionPtr >;
+namespace Data
+{
+   struct InstanceContent;
+   struct TerritoryType;
+}
 
 class Zone : public CellHandler< Cell >, public boost::enable_shared_from_this< Zone >
 {

From aca7508d0012aee3c7652a3fdc849173e8d44e13 Mon Sep 17 00:00:00 2001
From: Mordred Admin <gogs@fake.local>
Date: Wed, 28 Feb 2018 11:14:25 +0100
Subject: [PATCH 44/69] More include improvements

---
 src/servers/sapphire_zone/Action/ActionCollision.cpp  | 2 ++
 src/servers/sapphire_zone/Action/ActionCollision.h    | 3 ---
 src/servers/sapphire_zone/DebugCommand/DebugCommand.h | 1 -
 src/servers/sapphire_zone/Math/CalcBattle.h           | 2 +-
 src/servers/sapphire_zone/Math/CalcStats.h            | 2 +-
 src/servers/sapphire_zone/ServerZone.cpp              | 2 ++
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index defb184a..ddf39bfe 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -1,6 +1,8 @@
 #include <common/Util/Util.h>
 #include <common/Util/UtilMath.h>
 
+#include <common/Exd/ExdDataGenerated.h>
+
 #include "ActionCollision.h"
 #include "Actor/Actor.h"
 #include "Actor/Chara.h"
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
index 13cddd44..b020db6c 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.h
+++ b/src/servers/sapphire_zone/Action/ActionCollision.h
@@ -2,9 +2,6 @@
 #define _ACTIONCOLLISION_H
 
 #include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
-
-#include "Actor/Chara.h"
 #include "Action.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
index 03c01a30..6c8bdd40 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
@@ -3,7 +3,6 @@
 
 #include <common/Common.h>
 
-#include "Actor/Player.h"
 #include "Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.h b/src/servers/sapphire_zone/Math/CalcBattle.h
index 72a160c0..af4ee014 100644
--- a/src/servers/sapphire_zone/Math/CalcBattle.h
+++ b/src/servers/sapphire_zone/Math/CalcBattle.h
@@ -2,7 +2,7 @@
 #define _CALCBATTLE_H
 
 #include <common/Common.h>
-#include "Actor/Chara.h"
+#include "Forwards.h"
 
 using namespace Core::Entity;
 
diff --git a/src/servers/sapphire_zone/Math/CalcStats.h b/src/servers/sapphire_zone/Math/CalcStats.h
index 868d86f4..c1d5df63 100644
--- a/src/servers/sapphire_zone/Math/CalcStats.h
+++ b/src/servers/sapphire_zone/Math/CalcStats.h
@@ -2,7 +2,7 @@
 #define _CALCSTATS_H
 
 #include <common/Common.h>
-#include "Actor/Chara.h"
+#include "Forwards.h"
 
 using namespace Core::Entity;
 
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index f21c48d6..fe118a91 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -18,6 +18,8 @@
 #include <common/Database/DbWorkerPool.h>
 #include <common/Database/PreparedStatement.h>
 
+#include "Actor/Player.h"
+
 #include "Network/GameConnection.h"
 #include "Session.h"
 

From b49cbc06441d17e446a1d1f97d11c66e5d320e77 Mon Sep 17 00:00:00 2001
From: Mordred Admin <gogs@fake.local>
Date: Wed, 28 Feb 2018 11:51:44 +0100
Subject: [PATCH 45/69] Use precompiled headers for scripts and some libraries

---
 CMakeLists.txt                                |    1 +
 cmake/cotire.cmake                            | 4055 +++++++++++++++++
 src/servers/sapphire_zone/CMakeLists.txt      |    1 +
 .../Script/Scripts/CMakeLists.txt             |    3 +-
 4 files changed, 4059 insertions(+), 1 deletion(-)
 create mode 100644 cmake/cotire.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61e3273e..64baed19 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,6 +31,7 @@ set(LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/libraries")
 include( "cmake/boost.cmake" )
 include( "cmake/mysql.cmake" )
 include( "cmake/compiler.cmake" )
+include( "cmake/cotire.cmake" )
 
 ##############################
 #             Git            #
diff --git a/cmake/cotire.cmake b/cmake/cotire.cmake
new file mode 100644
index 00000000..46ef8c42
--- /dev/null
+++ b/cmake/cotire.cmake
@@ -0,0 +1,4055 @@
+# - cotire (compile time reducer)
+#
+# See the cotire manual for usage hints.
+#
+#=============================================================================
+# Copyright 2012-2017 Sascha Kratky
+#
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+#=============================================================================
+
+if(__COTIRE_INCLUDED)
+	return()
+endif()
+set(__COTIRE_INCLUDED TRUE)
+
+# call cmake_minimum_required, but prevent modification of the CMake policy stack in include mode
+# cmake_minimum_required also sets the policy version as a side effect, which we have to avoid
+if (NOT CMAKE_SCRIPT_MODE_FILE)
+	cmake_policy(PUSH)
+endif()
+cmake_minimum_required(VERSION 2.8.12)
+if (NOT CMAKE_SCRIPT_MODE_FILE)
+	cmake_policy(POP)
+endif()
+
+set (COTIRE_CMAKE_MODULE_FILE "${CMAKE_CURRENT_LIST_FILE}")
+set (COTIRE_CMAKE_MODULE_VERSION "1.7.10")
+
+# activate select policies
+if (POLICY CMP0025)
+	# Compiler id for Apple Clang is now AppleClang
+	cmake_policy(SET CMP0025 NEW)
+endif()
+
+if (POLICY CMP0026)
+	# disallow use of the LOCATION target property
+	cmake_policy(SET CMP0026 NEW)
+endif()
+
+if (POLICY CMP0038)
+	# targets may not link directly to themselves
+	cmake_policy(SET CMP0038 NEW)
+endif()
+
+if (POLICY CMP0039)
+	# utility targets may not have link dependencies
+	cmake_policy(SET CMP0039 NEW)
+endif()
+
+if (POLICY CMP0040)
+	# target in the TARGET signature of add_custom_command() must exist
+	cmake_policy(SET CMP0040 NEW)
+endif()
+
+if (POLICY CMP0045)
+	# error on non-existent target in get_target_property
+	cmake_policy(SET CMP0045 NEW)
+endif()
+
+if (POLICY CMP0046)
+	# error on non-existent dependency in add_dependencies
+	cmake_policy(SET CMP0046 NEW)
+endif()
+
+if (POLICY CMP0049)
+	# do not expand variables in target source entries
+	cmake_policy(SET CMP0049 NEW)
+endif()
+
+if (POLICY CMP0050)
+	# disallow add_custom_command SOURCE signatures
+	cmake_policy(SET CMP0050 NEW)
+endif()
+
+if (POLICY CMP0051)
+	# include TARGET_OBJECTS expressions in a target's SOURCES property
+	cmake_policy(SET CMP0051 NEW)
+endif()
+
+if (POLICY CMP0053)
+	# simplify variable reference and escape sequence evaluation
+	cmake_policy(SET CMP0053 NEW)
+endif()
+
+if (POLICY CMP0054)
+	# only interpret if() arguments as variables or keywords when unquoted
+	cmake_policy(SET CMP0054 NEW)
+endif()
+
+if (POLICY CMP0055)
+	# strict checking for break() command
+	cmake_policy(SET CMP0055 NEW)
+endif()
+
+include(CMakeParseArguments)
+include(ProcessorCount)
+
+function (cotire_get_configuration_types _configsVar)
+	set (_configs "")
+	if (CMAKE_CONFIGURATION_TYPES)
+		list (APPEND _configs ${CMAKE_CONFIGURATION_TYPES})
+	endif()
+	if (CMAKE_BUILD_TYPE)
+		list (APPEND _configs "${CMAKE_BUILD_TYPE}")
+	endif()
+	if (_configs)
+		list (REMOVE_DUPLICATES _configs)
+		set (${_configsVar} ${_configs} PARENT_SCOPE)
+	else()
+		set (${_configsVar} "None" PARENT_SCOPE)
+	endif()
+endfunction()
+
+function (cotire_get_source_file_extension _sourceFile _extVar)
+	# get_filename_component returns extension from first occurrence of . in file name
+	# this function computes the extension from last occurrence of . in file name
+	string (FIND "${_sourceFile}" "." _index REVERSE)
+	if (_index GREATER -1)
+		math (EXPR _index "${_index} + 1")
+		string (SUBSTRING "${_sourceFile}" ${_index} -1 _sourceExt)
+	else()
+		set (_sourceExt "")
+	endif()
+	set (${_extVar} "${_sourceExt}" PARENT_SCOPE)
+endfunction()
+
+macro (cotire_check_is_path_relative_to _path _isRelativeVar)
+	set (${_isRelativeVar} FALSE)
+	if (IS_ABSOLUTE "${_path}")
+		foreach (_dir ${ARGN})
+			file (RELATIVE_PATH _relPath "${_dir}" "${_path}")
+			if (NOT _relPath OR (NOT IS_ABSOLUTE "${_relPath}" AND NOT "${_relPath}" MATCHES "^\\.\\."))
+				set (${_isRelativeVar} TRUE)
+				break()
+			endif()
+		endforeach()
+	endif()
+endmacro()
+
+function (cotire_filter_language_source_files _language _target _sourceFilesVar _excludedSourceFilesVar _cotiredSourceFilesVar)
+	if (CMAKE_${_language}_SOURCE_FILE_EXTENSIONS)
+		set (_languageExtensions "${CMAKE_${_language}_SOURCE_FILE_EXTENSIONS}")
+	else()
+		set (_languageExtensions "")
+	endif()
+	if (CMAKE_${_language}_IGNORE_EXTENSIONS)
+		set (_ignoreExtensions "${CMAKE_${_language}_IGNORE_EXTENSIONS}")
+	else()
+		set (_ignoreExtensions "")
+	endif()
+	if (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS)
+		set (_excludeExtensions "${COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS}")
+	else()
+		set (_excludeExtensions "")
+	endif()
+	if (COTIRE_DEBUG AND _languageExtensions)
+		message (STATUS "${_language} source file extensions: ${_languageExtensions}")
+	endif()
+	if (COTIRE_DEBUG AND _ignoreExtensions)
+		message (STATUS "${_language} ignore extensions: ${_ignoreExtensions}")
+	endif()
+	if (COTIRE_DEBUG AND _excludeExtensions)
+		message (STATUS "${_language} exclude extensions: ${_excludeExtensions}")
+	endif()
+	if (CMAKE_VERSION VERSION_LESS "3.1.0")
+		set (_allSourceFiles ${ARGN})
+	else()
+		# as of CMake 3.1 target sources may contain generator expressions
+		# since we cannot obtain required property information about source files added
+		# through generator expressions at configure time, we filter them out
+		string (GENEX_STRIP "${ARGN}" _allSourceFiles)
+	endif()
+	set (_filteredSourceFiles "")
+	set (_excludedSourceFiles "")
+	foreach (_sourceFile ${_allSourceFiles})
+		get_source_file_property(_sourceIsHeaderOnly "${_sourceFile}" HEADER_FILE_ONLY)
+		get_source_file_property(_sourceIsExternal "${_sourceFile}" EXTERNAL_OBJECT)
+		get_source_file_property(_sourceIsSymbolic "${_sourceFile}" SYMBOLIC)
+		if (NOT _sourceIsHeaderOnly AND NOT _sourceIsExternal AND NOT _sourceIsSymbolic)
+			cotire_get_source_file_extension("${_sourceFile}" _sourceExt)
+			if (_sourceExt)
+				list (FIND _ignoreExtensions "${_sourceExt}" _ignoreIndex)
+				if (_ignoreIndex LESS 0)
+					list (FIND _excludeExtensions "${_sourceExt}" _excludeIndex)
+					if (_excludeIndex GREATER -1)
+						list (APPEND _excludedSourceFiles "${_sourceFile}")
+					else()
+						list (FIND _languageExtensions "${_sourceExt}" _sourceIndex)
+						if (_sourceIndex GREATER -1)
+							# consider source file unless it is excluded explicitly
+							get_source_file_property(_sourceIsExcluded "${_sourceFile}" COTIRE_EXCLUDED)
+							if (_sourceIsExcluded)
+								list (APPEND _excludedSourceFiles "${_sourceFile}")
+							else()
+								list (APPEND _filteredSourceFiles "${_sourceFile}")
+							endif()
+						else()
+							get_source_file_property(_sourceLanguage "${_sourceFile}" LANGUAGE)
+							if ("${_sourceLanguage}" STREQUAL "${_language}")
+								# add to excluded sources, if file is not ignored and has correct language without having the correct extension
+								list (APPEND _excludedSourceFiles "${_sourceFile}")
+							endif()
+						endif()
+					endif()
+				endif()
+			endif()
+		endif()
+	endforeach()
+	# separate filtered source files from already cotired ones
+	# the COTIRE_TARGET property of a source file may be set while a target is being processed by cotire
+	set (_sourceFiles "")
+	set (_cotiredSourceFiles "")
+	foreach (_sourceFile ${_filteredSourceFiles})
+		get_source_file_property(_sourceIsCotired "${_sourceFile}" COTIRE_TARGET)
+		if (_sourceIsCotired)
+			list (APPEND _cotiredSourceFiles "${_sourceFile}")
+		else()
+			get_source_file_property(_sourceCompileFlags "${_sourceFile}" COMPILE_FLAGS)
+			if (_sourceCompileFlags)
+				# add to excluded sources, if file has custom compile flags
+				list (APPEND _excludedSourceFiles "${_sourceFile}")
+			else()
+				list (APPEND _sourceFiles "${_sourceFile}")
+			endif()
+		endif()
+	endforeach()
+	if (COTIRE_DEBUG)
+		if (_sourceFiles)
+			message (STATUS "Filtered ${_target} ${_language} sources: ${_sourceFiles}")
+		endif()
+		if (_excludedSourceFiles)
+			message (STATUS "Excluded ${_target} ${_language} sources: ${_excludedSourceFiles}")
+		endif()
+		if (_cotiredSourceFiles)
+			message (STATUS "Cotired ${_target} ${_language} sources: ${_cotiredSourceFiles}")
+		endif()
+	endif()
+	set (${_sourceFilesVar} ${_sourceFiles} PARENT_SCOPE)
+	set (${_excludedSourceFilesVar} ${_excludedSourceFiles} PARENT_SCOPE)
+	set (${_cotiredSourceFilesVar} ${_cotiredSourceFiles} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_objects_with_property_on _filteredObjectsVar _property _type)
+	set (_filteredObjects "")
+	foreach (_object ${ARGN})
+		get_property(_isSet ${_type} "${_object}" PROPERTY ${_property} SET)
+		if (_isSet)
+			get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property})
+			if (_propertyValue)
+				list (APPEND _filteredObjects "${_object}")
+			endif()
+		endif()
+	endforeach()
+	set (${_filteredObjectsVar} ${_filteredObjects} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_objects_with_property_off _filteredObjectsVar _property _type)
+	set (_filteredObjects "")
+	foreach (_object ${ARGN})
+		get_property(_isSet ${_type} "${_object}" PROPERTY ${_property} SET)
+		if (_isSet)
+			get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property})
+			if (NOT _propertyValue)
+				list (APPEND _filteredObjects "${_object}")
+			endif()
+		endif()
+	endforeach()
+	set (${_filteredObjectsVar} ${_filteredObjects} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_file_property_values _valuesVar _property)
+	set (_values "")
+	foreach (_sourceFile ${ARGN})
+		get_source_file_property(_propertyValue "${_sourceFile}" ${_property})
+		if (_propertyValue)
+			list (APPEND _values "${_propertyValue}")
+		endif()
+	endforeach()
+	set (${_valuesVar} ${_values} PARENT_SCOPE)
+endfunction()
+
+function (cotire_resolve_config_properties _configurations _propertiesVar)
+	set (_properties "")
+	foreach (_property ${ARGN})
+		if ("${_property}" MATCHES "<CONFIG>")
+			foreach (_config ${_configurations})
+				string (TOUPPER "${_config}" _upperConfig)
+				string (REPLACE "<CONFIG>" "${_upperConfig}" _configProperty "${_property}")
+				list (APPEND _properties ${_configProperty})
+			endforeach()
+		else()
+			list (APPEND _properties ${_property})
+		endif()
+	endforeach()
+	set (${_propertiesVar} ${_properties} PARENT_SCOPE)
+endfunction()
+
+function (cotire_copy_set_properties _configurations _type _source _target)
+	cotire_resolve_config_properties("${_configurations}" _properties ${ARGN})
+	foreach (_property ${_properties})
+		get_property(_isSet ${_type} ${_source} PROPERTY ${_property} SET)
+		if (_isSet)
+			get_property(_propertyValue ${_type} ${_source} PROPERTY ${_property})
+			set_property(${_type} ${_target} PROPERTY ${_property} "${_propertyValue}")
+		endif()
+	endforeach()
+endfunction()
+
+function (cotire_get_target_usage_requirements _target _config _targetRequirementsVar)
+	set (_targetRequirements "")
+	get_target_property(_librariesToProcess ${_target} LINK_LIBRARIES)
+	while (_librariesToProcess)
+		# remove from head
+		list (GET _librariesToProcess 0 _library)
+		list (REMOVE_AT _librariesToProcess 0)
+		if (_library MATCHES "^\\$<\\$<CONFIG:${_config}>:([A-Za-z0-9_:-]+)>$")
+			set (_library "${CMAKE_MATCH_1}")
+		elseif (_config STREQUAL "None" AND _library MATCHES "^\\$<\\$<CONFIG:>:([A-Za-z0-9_:-]+)>$")
+			set (_library "${CMAKE_MATCH_1}")
+		endif()
+		if (TARGET ${_library})
+			list (FIND _targetRequirements ${_library} _index)
+			if (_index LESS 0)
+				list (APPEND _targetRequirements ${_library})
+				# BFS traversal of transitive libraries
+				get_target_property(_libraries ${_library} INTERFACE_LINK_LIBRARIES)
+				if (_libraries)
+					list (APPEND _librariesToProcess ${_libraries})
+					list (REMOVE_DUPLICATES _librariesToProcess)
+				endif()
+			endif()
+		endif()
+	endwhile()
+	set (${_targetRequirementsVar} ${_targetRequirements} PARENT_SCOPE)
+endfunction()
+
+function (cotire_filter_compile_flags _language _flagFilter _matchedOptionsVar _unmatchedOptionsVar)
+	if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+		set (_flagPrefix "[/-]")
+	else()
+		set (_flagPrefix "--?")
+	endif()
+	set (_optionFlag "")
+	set (_matchedOptions "")
+	set (_unmatchedOptions "")
+	foreach (_compileFlag ${ARGN})
+		if (_compileFlag)
+			if (_optionFlag AND NOT "${_compileFlag}" MATCHES "^${_flagPrefix}")
+				# option with separate argument
+				list (APPEND _matchedOptions "${_compileFlag}")
+				set (_optionFlag "")
+			elseif ("${_compileFlag}" MATCHES "^(${_flagPrefix})(${_flagFilter})$")
+				# remember option
+				set (_optionFlag "${CMAKE_MATCH_2}")
+			elseif ("${_compileFlag}" MATCHES "^(${_flagPrefix})(${_flagFilter})(.+)$")
+				# option with joined argument
+				list (APPEND _matchedOptions "${CMAKE_MATCH_3}")
+				set (_optionFlag "")
+			else()
+				# flush remembered option
+				if (_optionFlag)
+					list (APPEND _matchedOptions "${_optionFlag}")
+					set (_optionFlag "")
+				endif()
+				# add to unfiltered options
+				list (APPEND _unmatchedOptions "${_compileFlag}")
+			endif()
+		endif()
+	endforeach()
+	if (_optionFlag)
+		list (APPEND _matchedOptions "${_optionFlag}")
+	endif()
+	if (COTIRE_DEBUG AND _matchedOptions)
+		message (STATUS "Filter ${_flagFilter} matched: ${_matchedOptions}")
+	endif()
+	if (COTIRE_DEBUG AND _unmatchedOptions)
+		message (STATUS "Filter ${_flagFilter} unmatched: ${_unmatchedOptions}")
+	endif()
+	set (${_matchedOptionsVar} ${_matchedOptions} PARENT_SCOPE)
+	set (${_unmatchedOptionsVar} ${_unmatchedOptions} PARENT_SCOPE)
+endfunction()
+
+function (cotire_is_target_supported _target _isSupportedVar)
+	if (NOT TARGET "${_target}")
+		set (${_isSupportedVar} FALSE PARENT_SCOPE)
+		return()
+	endif()
+	get_target_property(_imported ${_target} IMPORTED)
+	if (_imported)
+		set (${_isSupportedVar} FALSE PARENT_SCOPE)
+		return()
+	endif()
+	get_target_property(_targetType ${_target} TYPE)
+	if (NOT _targetType MATCHES "EXECUTABLE|(STATIC|SHARED|MODULE|OBJECT)_LIBRARY")
+		set (${_isSupportedVar} FALSE PARENT_SCOPE)
+		return()
+	endif()
+	set (${_isSupportedVar} TRUE PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_compile_flags _config _language _target _flagsVar)
+	string (TOUPPER "${_config}" _upperConfig)
+	# collect options from CMake language variables
+	set (_compileFlags "")
+	if (CMAKE_${_language}_FLAGS)
+		set (_compileFlags "${_compileFlags} ${CMAKE_${_language}_FLAGS}")
+	endif()
+	if (CMAKE_${_language}_FLAGS_${_upperConfig})
+		set (_compileFlags "${_compileFlags} ${CMAKE_${_language}_FLAGS_${_upperConfig}}")
+	endif()
+	if (_target)
+		# add target compile flags
+		get_target_property(_targetflags ${_target} COMPILE_FLAGS)
+		if (_targetflags)
+			set (_compileFlags "${_compileFlags} ${_targetflags}")
+		endif()
+	endif()
+	if (UNIX)
+		separate_arguments(_compileFlags UNIX_COMMAND "${_compileFlags}")
+	elseif(WIN32)
+		separate_arguments(_compileFlags WINDOWS_COMMAND "${_compileFlags}")
+	else()
+		separate_arguments(_compileFlags)
+	endif()
+	# target compile options
+	if (_target)
+		get_target_property(_targetOptions ${_target} COMPILE_OPTIONS)
+		if (_targetOptions)
+			list (APPEND _compileFlags ${_targetOptions})
+		endif()
+	endif()
+	# interface compile options from linked library targets
+	if (_target)
+		set (_linkedTargets "")
+		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+		foreach (_linkedTarget ${_linkedTargets})
+			get_target_property(_targetOptions ${_linkedTarget} INTERFACE_COMPILE_OPTIONS)
+			if (_targetOptions)
+				list (APPEND _compileFlags ${_targetOptions})
+			endif()
+		endforeach()
+	endif()
+	# handle language standard properties
+	if (CMAKE_${_language}_STANDARD_DEFAULT)
+		# used compiler supports language standard levels
+		if (_target)
+			get_target_property(_targetLanguageStandard ${_target} ${_language}_STANDARD)
+			if (_targetLanguageStandard)
+				set (_type "EXTENSION")
+				get_property(_isSet TARGET ${_target} PROPERTY ${_language}_EXTENSIONS SET)
+				if (_isSet)
+					get_target_property(_targetUseLanguageExtensions ${_target} ${_language}_EXTENSIONS)
+					if (NOT _targetUseLanguageExtensions)
+						set (_type "STANDARD")
+					endif()
+				endif()
+				if (CMAKE_${_language}${_targetLanguageStandard}_${_type}_COMPILE_OPTION)
+					list (APPEND _compileFlags "${CMAKE_${_language}${_targetLanguageStandard}_${_type}_COMPILE_OPTION}")
+				endif()
+			endif()
+		endif()
+	endif()
+	# handle the POSITION_INDEPENDENT_CODE target property
+	if (_target)
+		get_target_property(_targetPIC ${_target} POSITION_INDEPENDENT_CODE)
+		if (_targetPIC)
+			get_target_property(_targetType ${_target} TYPE)
+			if (_targetType STREQUAL "EXECUTABLE" AND CMAKE_${_language}_COMPILE_OPTIONS_PIE)
+				list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_PIE}")
+			elseif (CMAKE_${_language}_COMPILE_OPTIONS_PIC)
+				list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_PIC}")
+			endif()
+		endif()
+	endif()
+	# handle visibility target properties
+	if (_target)
+		get_target_property(_targetVisibility ${_target} ${_language}_VISIBILITY_PRESET)
+		if (_targetVisibility AND CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY)
+			list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY}${_targetVisibility}")
+		endif()
+		get_target_property(_targetVisibilityInlines ${_target} VISIBILITY_INLINES_HIDDEN)
+		if (_targetVisibilityInlines AND CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN)
+			list (APPEND _compileFlags "${CMAKE_${_language}_COMPILE_OPTIONS_VISIBILITY_INLINES_HIDDEN}")
+		endif()
+	endif()
+	# platform specific flags
+	if (APPLE)
+		get_target_property(_architectures ${_target} OSX_ARCHITECTURES_${_upperConfig})
+		if (NOT _architectures)
+			get_target_property(_architectures ${_target} OSX_ARCHITECTURES)
+		endif()
+		if (_architectures)
+			foreach (_arch ${_architectures})
+				list (APPEND _compileFlags "-arch" "${_arch}")
+			endforeach()
+		endif()
+		if (CMAKE_OSX_SYSROOT)
+			if (CMAKE_${_language}_SYSROOT_FLAG)
+				list (APPEND _compileFlags "${CMAKE_${_language}_SYSROOT_FLAG}" "${CMAKE_OSX_SYSROOT}")
+			else()
+				list (APPEND _compileFlags "-isysroot" "${CMAKE_OSX_SYSROOT}")
+			endif()
+		endif()
+		if (CMAKE_OSX_DEPLOYMENT_TARGET)
+			if (CMAKE_${_language}_OSX_DEPLOYMENT_TARGET_FLAG)
+				list (APPEND _compileFlags "${CMAKE_${_language}_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")
+			else()
+				list (APPEND _compileFlags "-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+			endif()
+		endif()
+	endif()
+	if (COTIRE_DEBUG AND _compileFlags)
+		message (STATUS "Target ${_target} compile flags: ${_compileFlags}")
+	endif()
+	set (${_flagsVar} ${_compileFlags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_include_directories _config _language _target _includeDirsVar _systemIncludeDirsVar)
+	set (_includeDirs "")
+	set (_systemIncludeDirs "")
+	# default include dirs
+	if (CMAKE_INCLUDE_CURRENT_DIR)
+		list (APPEND _includeDirs "${CMAKE_CURRENT_BINARY_DIR}")
+		list (APPEND _includeDirs "${CMAKE_CURRENT_SOURCE_DIR}")
+	endif()
+	set (_targetFlags "")
+	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
+	# parse additional include directories from target compile flags
+	if (CMAKE_INCLUDE_FLAG_${_language})
+		string (STRIP "${CMAKE_INCLUDE_FLAG_${_language}}" _includeFlag)
+		string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}")
+		if (_includeFlag)
+			set (_dirs "")
+			cotire_filter_compile_flags("${_language}" "${_includeFlag}" _dirs _ignore ${_targetFlags})
+			if (_dirs)
+				list (APPEND _includeDirs ${_dirs})
+			endif()
+		endif()
+	endif()
+	# parse additional system include directories from target compile flags
+	if (CMAKE_INCLUDE_SYSTEM_FLAG_${_language})
+		string (STRIP "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" _includeFlag)
+		string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}")
+		if (_includeFlag)
+			set (_dirs "")
+			cotire_filter_compile_flags("${_language}" "${_includeFlag}" _dirs _ignore ${_targetFlags})
+			if (_dirs)
+				list (APPEND _systemIncludeDirs ${_dirs})
+			endif()
+		endif()
+	endif()
+	# target include directories
+	get_directory_property(_dirs DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" INCLUDE_DIRECTORIES)
+	if (_target)
+		get_target_property(_targetDirs ${_target} INCLUDE_DIRECTORIES)
+		if (_targetDirs)
+			list (APPEND _dirs ${_targetDirs})
+		endif()
+		get_target_property(_targetDirs ${_target} INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
+		if (_targetDirs)
+			list (APPEND _systemIncludeDirs ${_targetDirs})
+		endif()
+	endif()
+	# interface include directories from linked library targets
+	if (_target)
+		set (_linkedTargets "")
+		cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+		foreach (_linkedTarget ${_linkedTargets})
+			get_target_property(_linkedTargetType ${_linkedTarget} TYPE)
+			if (CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE AND NOT CMAKE_VERSION VERSION_LESS "3.4.0" AND
+				_linkedTargetType MATCHES "(STATIC|SHARED|MODULE|OBJECT)_LIBRARY")
+				# CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE refers to CMAKE_CURRENT_BINARY_DIR and CMAKE_CURRENT_SOURCE_DIR
+				# at the time, when the target was created. These correspond to the target properties BINARY_DIR and SOURCE_DIR
+				# which are only available with CMake 3.4 or later.
+				get_target_property(_targetDirs ${_linkedTarget} BINARY_DIR)
+				if (_targetDirs)
+					list (APPEND _dirs ${_targetDirs})
+				endif()
+				get_target_property(_targetDirs ${_linkedTarget} SOURCE_DIR)
+				if (_targetDirs)
+					list (APPEND _dirs ${_targetDirs})
+				endif()
+			endif()
+			get_target_property(_targetDirs ${_linkedTarget} INTERFACE_INCLUDE_DIRECTORIES)
+			if (_targetDirs)
+				list (APPEND _dirs ${_targetDirs})
+			endif()
+			get_target_property(_targetDirs ${_linkedTarget} INTERFACE_SYSTEM_INCLUDE_DIRECTORIES)
+			if (_targetDirs)
+				list (APPEND _systemIncludeDirs ${_targetDirs})
+			endif()
+		endforeach()
+	endif()
+	if (dirs)
+		list (REMOVE_DUPLICATES _dirs)
+	endif()
+	list (LENGTH _includeDirs _projectInsertIndex)
+	foreach (_dir ${_dirs})
+		if (CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE)
+			cotire_check_is_path_relative_to("${_dir}" _isRelative "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}")
+			if (_isRelative)
+				list (LENGTH _includeDirs _len)
+				if (_len EQUAL _projectInsertIndex)
+					list (APPEND _includeDirs "${_dir}")
+				else()
+					list (INSERT _includeDirs _projectInsertIndex "${_dir}")
+				endif()
+				math (EXPR _projectInsertIndex "${_projectInsertIndex} + 1")
+			else()
+				list (APPEND _includeDirs "${_dir}")
+			endif()
+		else()
+			list (APPEND _includeDirs "${_dir}")
+		endif()
+	endforeach()
+	list (REMOVE_DUPLICATES _includeDirs)
+	list (REMOVE_DUPLICATES _systemIncludeDirs)
+	if (CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES)
+		list (REMOVE_ITEM _includeDirs ${CMAKE_${_language}_IMPLICIT_INCLUDE_DIRECTORIES})
+	endif()
+	if (WIN32 AND NOT MINGW)
+		# convert Windows paths in include directories to CMake paths
+		if (_includeDirs)
+			set (_paths "")
+			foreach (_dir ${_includeDirs})
+				file (TO_CMAKE_PATH "${_dir}" _path)
+				list (APPEND _paths "${_path}")
+			endforeach()
+			set (_includeDirs ${_paths})
+		endif()
+		if (_systemIncludeDirs)
+			set (_paths "")
+			foreach (_dir ${_systemIncludeDirs})
+				file (TO_CMAKE_PATH "${_dir}" _path)
+				list (APPEND _paths "${_path}")
+			endforeach()
+			set (_systemIncludeDirs ${_paths})
+		endif()
+	endif()
+	if (COTIRE_DEBUG AND _includeDirs)
+		message (STATUS "Target ${_target} include dirs: ${_includeDirs}")
+	endif()
+	set (${_includeDirsVar} ${_includeDirs} PARENT_SCOPE)
+	if (COTIRE_DEBUG AND _systemIncludeDirs)
+		message (STATUS "Target ${_target} system include dirs: ${_systemIncludeDirs}")
+	endif()
+	set (${_systemIncludeDirsVar} ${_systemIncludeDirs} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_export_symbol _target _exportSymbolVar)
+	set (_exportSymbol "")
+	get_target_property(_targetType ${_target} TYPE)
+	get_target_property(_enableExports ${_target} ENABLE_EXPORTS)
+	if (_targetType MATCHES "(SHARED|MODULE)_LIBRARY" OR
+		(_targetType STREQUAL "EXECUTABLE" AND _enableExports))
+		get_target_property(_exportSymbol ${_target} DEFINE_SYMBOL)
+		if (NOT _exportSymbol)
+			set (_exportSymbol "${_target}_EXPORTS")
+		endif()
+		string (MAKE_C_IDENTIFIER "${_exportSymbol}" _exportSymbol)
+	endif()
+	set (${_exportSymbolVar} ${_exportSymbol} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_compile_definitions _config _language _target _definitionsVar)
+	string (TOUPPER "${_config}" _upperConfig)
+	set (_configDefinitions "")
+	# CMAKE_INTDIR for multi-configuration build systems
+	if (NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
+		list (APPEND _configDefinitions "CMAKE_INTDIR=\"${_config}\"")
+	endif()
+	# target export define symbol
+	cotire_get_target_export_symbol("${_target}" _defineSymbol)
+	if (_defineSymbol)
+		list (APPEND _configDefinitions "${_defineSymbol}")
+	endif()
+	# directory compile definitions
+	get_directory_property(_definitions DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMPILE_DEFINITIONS)
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	get_directory_property(_definitions DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMPILE_DEFINITIONS_${_upperConfig})
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	# target compile definitions
+	get_target_property(_definitions ${_target} COMPILE_DEFINITIONS)
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	get_target_property(_definitions ${_target} COMPILE_DEFINITIONS_${_upperConfig})
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	# interface compile definitions from linked library targets
+	set (_linkedTargets "")
+	cotire_get_target_usage_requirements(${_target} ${_config} _linkedTargets)
+	foreach (_linkedTarget ${_linkedTargets})
+		get_target_property(_definitions ${_linkedTarget} INTERFACE_COMPILE_DEFINITIONS)
+		if (_definitions)
+			list (APPEND _configDefinitions ${_definitions})
+		endif()
+	endforeach()
+	# parse additional compile definitions from target compile flags
+	# and don't look at directory compile definitions, which we already handled
+	set (_targetFlags "")
+	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
+	cotire_filter_compile_flags("${_language}" "D" _definitions _ignore ${_targetFlags})
+	if (_definitions)
+		list (APPEND _configDefinitions ${_definitions})
+	endif()
+	list (REMOVE_DUPLICATES _configDefinitions)
+	if (COTIRE_DEBUG AND _configDefinitions)
+		message (STATUS "Target ${_target} compile definitions: ${_configDefinitions}")
+	endif()
+	set (${_definitionsVar} ${_configDefinitions} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_target_compiler_flags _config _language _target _compilerFlagsVar)
+	# parse target compile flags omitting compile definitions and include directives
+	set (_targetFlags "")
+	cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
+	set (_flagFilter "D")
+	if (CMAKE_INCLUDE_FLAG_${_language})
+		string (STRIP "${CMAKE_INCLUDE_FLAG_${_language}}" _includeFlag)
+		string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}")
+		if (_includeFlag)
+			set (_flagFilter "${_flagFilter}|${_includeFlag}")
+		endif()
+	endif()
+	if (CMAKE_INCLUDE_SYSTEM_FLAG_${_language})
+		string (STRIP "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" _includeFlag)
+		string (REGEX REPLACE "^[-/]+" "" _includeFlag "${_includeFlag}")
+		if (_includeFlag)
+			set (_flagFilter "${_flagFilter}|${_includeFlag}")
+		endif()
+	endif()
+	set (_compilerFlags "")
+	cotire_filter_compile_flags("${_language}" "${_flagFilter}" _ignore _compilerFlags ${_targetFlags})
+	if (COTIRE_DEBUG AND _compilerFlags)
+		message (STATUS "Target ${_target} compiler flags: ${_compilerFlags}")
+	endif()
+	set (${_compilerFlagsVar} ${_compilerFlags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_add_sys_root_paths _pathsVar)
+	if (APPLE)
+		if (CMAKE_OSX_SYSROOT AND CMAKE_${_language}_HAS_ISYSROOT)
+			foreach (_path IN LISTS ${_pathsVar})
+				if (IS_ABSOLUTE "${_path}")
+					get_filename_component(_path "${CMAKE_OSX_SYSROOT}/${_path}" ABSOLUTE)
+					if (EXISTS "${_path}")
+						list (APPEND ${_pathsVar} "${_path}")
+					endif()
+				endif()
+			endforeach()
+		endif()
+	endif()
+	set (${_pathsVar} ${${_pathsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_extra_properties _sourceFile _pattern _resultVar)
+	set (_extraProperties ${ARGN})
+	set (_result "")
+	if (_extraProperties)
+		list (FIND _extraProperties "${_sourceFile}" _index)
+		if (_index GREATER -1)
+			math (EXPR _index "${_index} + 1")
+			list (LENGTH _extraProperties _len)
+			math (EXPR _len "${_len} - 1")
+			foreach (_index RANGE ${_index} ${_len})
+				list (GET _extraProperties ${_index} _value)
+				if (_value MATCHES "${_pattern}")
+					list (APPEND _result "${_value}")
+				else()
+					break()
+				endif()
+			endforeach()
+		endif()
+	endif()
+	set (${_resultVar} ${_result} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_compile_definitions _config _language _sourceFile _definitionsVar)
+	set (_compileDefinitions "")
+	if (NOT CMAKE_SCRIPT_MODE_FILE)
+		string (TOUPPER "${_config}" _upperConfig)
+		get_source_file_property(_definitions "${_sourceFile}" COMPILE_DEFINITIONS)
+		if (_definitions)
+			list (APPEND _compileDefinitions ${_definitions})
+		endif()
+		get_source_file_property(_definitions "${_sourceFile}" COMPILE_DEFINITIONS_${_upperConfig})
+		if (_definitions)
+			list (APPEND _compileDefinitions ${_definitions})
+		endif()
+	endif()
+	cotire_get_source_extra_properties("${_sourceFile}" "^[a-zA-Z0-9_]+(=.*)?$" _definitions ${ARGN})
+	if (_definitions)
+		list (APPEND _compileDefinitions ${_definitions})
+	endif()
+	if (COTIRE_DEBUG AND _compileDefinitions)
+		message (STATUS "Source ${_sourceFile} compile definitions: ${_compileDefinitions}")
+	endif()
+	set (${_definitionsVar} ${_compileDefinitions} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_files_compile_definitions _config _language _definitionsVar)
+	set (_configDefinitions "")
+	foreach (_sourceFile ${ARGN})
+		cotire_get_source_compile_definitions("${_config}" "${_language}" "${_sourceFile}" _sourceDefinitions)
+		if (_sourceDefinitions)
+			list (APPEND _configDefinitions "${_sourceFile}" ${_sourceDefinitions} "-")
+		endif()
+	endforeach()
+	set (${_definitionsVar} ${_configDefinitions} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_undefs _sourceFile _property _sourceUndefsVar)
+	set (_sourceUndefs "")
+	if (NOT CMAKE_SCRIPT_MODE_FILE)
+		get_source_file_property(_undefs "${_sourceFile}" ${_property})
+		if (_undefs)
+			list (APPEND _sourceUndefs ${_undefs})
+		endif()
+	endif()
+	cotire_get_source_extra_properties("${_sourceFile}" "^[a-zA-Z0-9_]+$" _undefs ${ARGN})
+	if (_undefs)
+		list (APPEND _sourceUndefs ${_undefs})
+	endif()
+	if (COTIRE_DEBUG AND _sourceUndefs)
+		message (STATUS "Source ${_sourceFile} ${_property} undefs: ${_sourceUndefs}")
+	endif()
+	set (${_sourceUndefsVar} ${_sourceUndefs} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_source_files_undefs _property _sourceUndefsVar)
+	set (_sourceUndefs "")
+	foreach (_sourceFile ${ARGN})
+		cotire_get_source_undefs("${_sourceFile}" ${_property} _undefs)
+		if (_undefs)
+			list (APPEND _sourceUndefs "${_sourceFile}" ${_undefs} "-")
+		endif()
+	endforeach()
+	set (${_sourceUndefsVar} ${_sourceUndefs} PARENT_SCOPE)
+endfunction()
+
+macro (cotire_set_cmd_to_prologue _cmdVar)
+	set (${_cmdVar} "${CMAKE_COMMAND}")
+	if (COTIRE_DEBUG)
+		list (APPEND ${_cmdVar} "--warn-uninitialized")
+	endif()
+	list (APPEND ${_cmdVar} "-DCOTIRE_BUILD_TYPE:STRING=$<CONFIGURATION>")
+	if (XCODE)
+		list (APPEND ${_cmdVar} "-DXCODE:BOOL=TRUE")
+	endif()
+	if (COTIRE_VERBOSE)
+		list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=ON")
+	elseif("${CMAKE_GENERATOR}" MATCHES "Makefiles")
+		list (APPEND ${_cmdVar} "-DCOTIRE_VERBOSE:BOOL=$(VERBOSE)")
+	endif()
+endmacro()
+
+function (cotire_init_compile_cmd _cmdVar _language _compilerLauncher _compilerExe _compilerArg1)
+	if (NOT _compilerLauncher)
+		set (_compilerLauncher ${CMAKE_${_language}_COMPILER_LAUNCHER})
+	endif()
+	if (NOT _compilerExe)
+		set (_compilerExe "${CMAKE_${_language}_COMPILER}")
+	endif()
+	if (NOT _compilerArg1)
+		set (_compilerArg1 ${CMAKE_${_language}_COMPILER_ARG1})
+	endif()
+	string (STRIP "${_compilerArg1}" _compilerArg1)
+	if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		# compiler launcher is only supported for Makefile and Ninja
+		set (${_cmdVar} ${_compilerLauncher} "${_compilerExe}" ${_compilerArg1} PARENT_SCOPE)
+	else()
+		set (${_cmdVar} "${_compilerExe}" ${_compilerArg1} PARENT_SCOPE)
+	endif()
+endfunction()
+
+macro (cotire_add_definitions_to_cmd _cmdVar _language)
+	foreach (_definition ${ARGN})
+		if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+			list (APPEND ${_cmdVar} "/D${_definition}")
+		else()
+			list (APPEND ${_cmdVar} "-D${_definition}")
+		endif()
+	endforeach()
+endmacro()
+
+function (cotire_add_includes_to_cmd _cmdVar _language _includesVar _systemIncludesVar)
+	set (_includeDirs ${${_includesVar}} ${${_systemIncludesVar}})
+	if (_includeDirs)
+		list (REMOVE_DUPLICATES _includeDirs)
+		foreach (_include ${_includeDirs})
+			if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+				file (TO_NATIVE_PATH "${_include}" _include)
+				list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+			else()
+				set (_index -1)
+				if ("${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}" MATCHES ".+")
+					list (FIND ${_systemIncludesVar} "${_include}" _index)
+				endif()
+				if (_index GREATER -1)
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_SYSTEM_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+				else()
+					list (APPEND ${_cmdVar} "${CMAKE_INCLUDE_FLAG_${_language}}${CMAKE_INCLUDE_FLAG_SEP_${_language}}${_include}")
+				endif()
+			endif()
+		endforeach()
+	endif()
+	set (${_cmdVar} ${${_cmdVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_add_frameworks_to_cmd _cmdVar _language _includesVar _systemIncludesVar)
+	if (APPLE)
+		set (_frameworkDirs "")
+		foreach (_include ${${_includesVar}})
+			if (IS_ABSOLUTE "${_include}" AND _include MATCHES "\\.framework$")
+				get_filename_component(_frameworkDir "${_include}" DIRECTORY)
+				list (APPEND _frameworkDirs "${_frameworkDir}")
+			endif()
+		endforeach()
+		set (_systemFrameworkDirs "")
+		foreach (_include ${${_systemIncludesVar}})
+			if (IS_ABSOLUTE "${_include}" AND _include MATCHES "\\.framework$")
+				get_filename_component(_frameworkDir "${_include}" DIRECTORY)
+				list (APPEND _systemFrameworkDirs "${_frameworkDir}")
+			endif()
+		endforeach()
+		if (_systemFrameworkDirs)
+			list (APPEND _frameworkDirs ${_systemFrameworkDirs})
+		endif()
+		if (_frameworkDirs)
+			list (REMOVE_DUPLICATES _frameworkDirs)
+			foreach (_frameworkDir ${_frameworkDirs})
+				set (_index -1)
+				if ("${CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG}" MATCHES ".+")
+					list (FIND _systemFrameworkDirs "${_frameworkDir}" _index)
+				endif()
+				if (_index GREATER -1)
+					list (APPEND ${_cmdVar} "${CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG}${_frameworkDir}")
+				else()
+					list (APPEND ${_cmdVar} "${CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG}${_frameworkDir}")
+				endif()
+			endforeach()
+		endif()
+	endif()
+	set (${_cmdVar} ${${_cmdVar}} PARENT_SCOPE)
+endfunction()
+
+macro (cotire_add_compile_flags_to_cmd _cmdVar)
+	foreach (_flag ${ARGN})
+		list (APPEND ${_cmdVar} "${_flag}")
+	endforeach()
+endmacro()
+
+function (cotire_check_file_up_to_date _fileIsUpToDateVar _file)
+	if (EXISTS "${_file}")
+		set (_triggerFile "")
+		foreach (_dependencyFile ${ARGN})
+			if (EXISTS "${_dependencyFile}")
+				# IS_NEWER_THAN returns TRUE if both files have the same timestamp
+				# thus we do the comparison in both directions to exclude ties
+				if ("${_dependencyFile}" IS_NEWER_THAN "${_file}" AND
+					NOT "${_file}" IS_NEWER_THAN "${_dependencyFile}")
+					set (_triggerFile "${_dependencyFile}")
+					break()
+				endif()
+			endif()
+		endforeach()
+		if (_triggerFile)
+			if (COTIRE_VERBOSE)
+				get_filename_component(_fileName "${_file}" NAME)
+				message (STATUS "${_fileName} update triggered by ${_triggerFile} change.")
+			endif()
+			set (${_fileIsUpToDateVar} FALSE PARENT_SCOPE)
+		else()
+			if (COTIRE_VERBOSE)
+				get_filename_component(_fileName "${_file}" NAME)
+				message (STATUS "${_fileName} is up-to-date.")
+			endif()
+			set (${_fileIsUpToDateVar} TRUE PARENT_SCOPE)
+		endif()
+	else()
+		if (COTIRE_VERBOSE)
+			get_filename_component(_fileName "${_file}" NAME)
+			message (STATUS "${_fileName} does not exist yet.")
+		endif()
+		set (${_fileIsUpToDateVar} FALSE PARENT_SCOPE)
+	endif()
+endfunction()
+
+macro (cotire_find_closest_relative_path _headerFile _includeDirs _relPathVar)
+	set (${_relPathVar} "")
+	foreach (_includeDir ${_includeDirs})
+		if (IS_DIRECTORY "${_includeDir}")
+			file (RELATIVE_PATH _relPath "${_includeDir}" "${_headerFile}")
+			if (NOT IS_ABSOLUTE "${_relPath}" AND NOT "${_relPath}" MATCHES "^\\.\\.")
+				string (LENGTH "${${_relPathVar}}" _closestLen)
+				string (LENGTH "${_relPath}" _relLen)
+				if (_closestLen EQUAL 0 OR _relLen LESS _closestLen)
+					set (${_relPathVar} "${_relPath}")
+				endif()
+			endif()
+		elseif ("${_includeDir}" STREQUAL "${_headerFile}")
+			# if path matches exactly, return short non-empty string
+			set (${_relPathVar} "1")
+			break()
+		endif()
+	endforeach()
+endmacro()
+
+macro (cotire_check_header_file_location _headerFile _insideIncludeDirs _outsideIncludeDirs _headerIsInside)
+	# check header path against ignored and honored include directories
+	cotire_find_closest_relative_path("${_headerFile}" "${_insideIncludeDirs}" _insideRelPath)
+	if (_insideRelPath)
+		# header is inside, but could be become outside if there is a shorter outside match
+		cotire_find_closest_relative_path("${_headerFile}" "${_outsideIncludeDirs}" _outsideRelPath)
+		if (_outsideRelPath)
+			string (LENGTH "${_insideRelPath}" _insideRelPathLen)
+			string (LENGTH "${_outsideRelPath}" _outsideRelPathLen)
+			if (_outsideRelPathLen LESS _insideRelPathLen)
+				set (${_headerIsInside} FALSE)
+			else()
+				set (${_headerIsInside} TRUE)
+			endif()
+		else()
+			set (${_headerIsInside} TRUE)
+		endif()
+	else()
+		# header is outside
+		set (${_headerIsInside} FALSE)
+	endif()
+endmacro()
+
+macro (cotire_check_ignore_header_file_path _headerFile _headerIsIgnoredVar)
+	if (NOT EXISTS "${_headerFile}")
+		set (${_headerIsIgnoredVar} TRUE)
+	elseif (IS_DIRECTORY "${_headerFile}")
+		set (${_headerIsIgnoredVar} TRUE)
+	elseif ("${_headerFile}" MATCHES "\\.\\.|[_-]fixed" AND "${_headerFile}" MATCHES "\\.h$")
+		# heuristic: ignore C headers with embedded parent directory references or "-fixed" or "_fixed" in path
+		# these often stem from using GCC #include_next tricks, which may break the precompiled header compilation
+		# with the error message "error: no include path in which to search for header.h"
+		set (${_headerIsIgnoredVar} TRUE)
+	else()
+		set (${_headerIsIgnoredVar} FALSE)
+	endif()
+endmacro()
+
+macro (cotire_check_ignore_header_file_ext _headerFile _ignoreExtensionsVar _headerIsIgnoredVar)
+	# check header file extension
+	cotire_get_source_file_extension("${_headerFile}" _headerFileExt)
+	set (${_headerIsIgnoredVar} FALSE)
+	if (_headerFileExt)
+		list (FIND ${_ignoreExtensionsVar} "${_headerFileExt}" _index)
+		if (_index GREATER -1)
+			set (${_headerIsIgnoredVar} TRUE)
+		endif()
+	endif()
+endmacro()
+
+macro (cotire_parse_line _line _headerFileVar _headerDepthVar)
+	if (MSVC)
+		# cl.exe /showIncludes output looks different depending on the language pack used, e.g.:
+		# English: "Note: including file:   C:\directory\file"
+		# German: "Hinweis: Einlesen der Datei:   C:\directory\file"
+		# We use a very general regular expression, relying on the presence of the : characters
+		if (_line MATCHES "( +)([a-zA-Z]:[^:]+)$")
+			# Visual Studio compiler output
+			string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
+			get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" ABSOLUTE)
+		else()
+			set (${_headerFileVar} "")
+			set (${_headerDepthVar} 0)
+		endif()
+	else()
+		if (_line MATCHES "^(\\.+) (.*)$")
+			# GCC like output
+			string (LENGTH "${CMAKE_MATCH_1}" ${_headerDepthVar})
+			if (IS_ABSOLUTE "${CMAKE_MATCH_2}")
+				set (${_headerFileVar} "${CMAKE_MATCH_2}")
+			else()
+				get_filename_component(${_headerFileVar} "${CMAKE_MATCH_2}" REALPATH)
+			endif()
+		else()
+			set (${_headerFileVar} "")
+			set (${_headerDepthVar} 0)
+		endif()
+	endif()
+endmacro()
+
+function (cotire_parse_includes _language _scanOutput _ignoredIncludeDirs _honoredIncludeDirs _ignoredExtensions _selectedIncludesVar _unparsedLinesVar)
+	if (WIN32)
+		# prevent CMake macro invocation errors due to backslash characters in Windows paths
+		string (REPLACE "\\" "/" _scanOutput "${_scanOutput}")
+	endif()
+	# canonize slashes
+	string (REPLACE "//" "/" _scanOutput "${_scanOutput}")
+	# prevent semicolon from being interpreted as a line separator
+	string (REPLACE ";" "\\;" _scanOutput "${_scanOutput}")
+	# then separate lines
+	string (REGEX REPLACE "\n" ";" _scanOutput "${_scanOutput}")
+	list (LENGTH _scanOutput _len)
+	# remove duplicate lines to speed up parsing
+	list (REMOVE_DUPLICATES _scanOutput)
+	list (LENGTH _scanOutput _uniqueLen)
+	if (COTIRE_VERBOSE OR COTIRE_DEBUG)
+		message (STATUS "Scanning ${_uniqueLen} unique lines of ${_len} for includes")
+		if (_ignoredExtensions)
+			message (STATUS "Ignored extensions: ${_ignoredExtensions}")
+		endif()
+		if (_ignoredIncludeDirs)
+			message (STATUS "Ignored paths: ${_ignoredIncludeDirs}")
+		endif()
+		if (_honoredIncludeDirs)
+			message (STATUS "Included paths: ${_honoredIncludeDirs}")
+		endif()
+	endif()
+	set (_sourceFiles ${ARGN})
+	set (_selectedIncludes "")
+	set (_unparsedLines "")
+	# stack keeps track of inside/outside project status of processed header files
+	set (_headerIsInsideStack "")
+	foreach (_line IN LISTS _scanOutput)
+		if (_line)
+			cotire_parse_line("${_line}" _headerFile _headerDepth)
+			if (_headerFile)
+				cotire_check_header_file_location("${_headerFile}" "${_ignoredIncludeDirs}" "${_honoredIncludeDirs}" _headerIsInside)
+				if (COTIRE_DEBUG)
+					message (STATUS "${_headerDepth}: ${_headerFile} ${_headerIsInside}")
+				endif()
+				# update stack
+				list (LENGTH _headerIsInsideStack _stackLen)
+				if (_headerDepth GREATER _stackLen)
+					math (EXPR _stackLen "${_stackLen} + 1")
+					foreach (_index RANGE ${_stackLen} ${_headerDepth})
+						list (APPEND _headerIsInsideStack ${_headerIsInside})
+					endforeach()
+				else()
+					foreach (_index RANGE ${_headerDepth} ${_stackLen})
+						list (REMOVE_AT _headerIsInsideStack -1)
+					endforeach()
+					list (APPEND _headerIsInsideStack ${_headerIsInside})
+				endif()
+				if (COTIRE_DEBUG)
+					message (STATUS "${_headerIsInsideStack}")
+				endif()
+				# header is a candidate if it is outside project
+				if (NOT _headerIsInside)
+					# get parent header file's inside/outside status
+					if (_headerDepth GREATER 1)
+						math (EXPR _index "${_headerDepth} - 2")
+						list (GET _headerIsInsideStack ${_index} _parentHeaderIsInside)
+					else()
+						set (_parentHeaderIsInside TRUE)
+					endif()
+					# select header file if parent header file is inside project
+					# (e.g., a project header file that includes a standard header file)
+					if (_parentHeaderIsInside)
+						cotire_check_ignore_header_file_path("${_headerFile}" _headerIsIgnored)
+						if (NOT _headerIsIgnored)
+							cotire_check_ignore_header_file_ext("${_headerFile}" _ignoredExtensions _headerIsIgnored)
+							if (NOT _headerIsIgnored)
+								list (APPEND _selectedIncludes "${_headerFile}")
+							else()
+								# fix header's inside status on stack, it is ignored by extension now
+								list (REMOVE_AT _headerIsInsideStack -1)
+								list (APPEND _headerIsInsideStack TRUE)
+							endif()
+						endif()
+						if (COTIRE_DEBUG)
+							message (STATUS "${_headerFile} ${_ignoredExtensions} ${_headerIsIgnored}")
+						endif()
+					endif()
+				endif()
+			else()
+				if (MSVC)
+					# for cl.exe do not keep unparsed lines which solely consist of a source file name
+					string (FIND "${_sourceFiles}" "${_line}" _index)
+					if (_index LESS 0)
+						list (APPEND _unparsedLines "${_line}")
+					endif()
+				else()
+					list (APPEND _unparsedLines "${_line}")
+				endif()
+			endif()
+		endif()
+	endforeach()
+	list (REMOVE_DUPLICATES _selectedIncludes)
+	set (${_selectedIncludesVar} ${_selectedIncludes} PARENT_SCOPE)
+	set (${_unparsedLinesVar} ${_unparsedLines} PARENT_SCOPE)
+endfunction()
+
+function (cotire_scan_includes _includesVar)
+	set(_options "")
+	set(_oneValueArgs COMPILER_ID COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_VERSION LANGUAGE UNPARSED_LINES SCAN_RESULT)
+	set(_multiValueArgs COMPILE_DEFINITIONS COMPILE_FLAGS INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES
+		IGNORE_PATH INCLUDE_PATH IGNORE_EXTENSIONS INCLUDE_PRIORITY_PATH COMPILER_LAUNCHER)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	set (_sourceFiles ${_option_UNPARSED_ARGUMENTS})
+	if (NOT _option_LANGUAGE)
+		set (_option_LANGUAGE "CXX")
+	endif()
+	if (NOT _option_COMPILER_ID)
+		set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}")
+	endif()
+	if (NOT _option_COMPILER_VERSION)
+		set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}")
+	endif()
+	cotire_init_compile_cmd(_cmd "${_option_LANGUAGE}" "${_option_COMPILER_LAUNCHER}" "${_option_COMPILER_EXECUTABLE}" "${_option_COMPILER_ARG1}")
+	cotire_add_definitions_to_cmd(_cmd "${_option_LANGUAGE}" ${_option_COMPILE_DEFINITIONS})
+	cotire_add_compile_flags_to_cmd(_cmd ${_option_COMPILE_FLAGS})
+	cotire_add_includes_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES)
+	cotire_add_frameworks_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES)
+	cotire_add_makedep_flags("${_option_LANGUAGE}" "${_option_COMPILER_ID}" "${_option_COMPILER_VERSION}" _cmd)
+	# only consider existing source files for scanning
+	set (_existingSourceFiles "")
+	foreach (_sourceFile ${_sourceFiles})
+		if (EXISTS "${_sourceFile}")
+			list (APPEND _existingSourceFiles "${_sourceFile}")
+		endif()
+	endforeach()
+	if (NOT _existingSourceFiles)
+		set (${_includesVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	list (APPEND _cmd ${_existingSourceFiles})
+	if (COTIRE_VERBOSE)
+		message (STATUS "execute_process: ${_cmd}")
+	endif()
+	if (_option_COMPILER_ID MATCHES "MSVC")
+		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
+		unset (ENV{VS_UNICODE_OUTPUT})
+	endif()
+	execute_process(
+		COMMAND ${_cmd}
+		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+		RESULT_VARIABLE _result
+		OUTPUT_QUIET
+		ERROR_VARIABLE _output)
+	if (_result)
+		message (STATUS "Result ${_result} scanning includes of ${_existingSourceFiles}.")
+	endif()
+	cotire_parse_includes(
+		"${_option_LANGUAGE}" "${_output}"
+		"${_option_IGNORE_PATH}" "${_option_INCLUDE_PATH}"
+		"${_option_IGNORE_EXTENSIONS}"
+		_includes _unparsedLines
+		${_sourceFiles})
+	if (_option_INCLUDE_PRIORITY_PATH)
+		set (_sortedIncludes "")
+		foreach (_priorityPath ${_option_INCLUDE_PRIORITY_PATH})
+			foreach (_include ${_includes})
+				string (FIND ${_include} ${_priorityPath} _position)
+				if (_position GREATER -1)
+					list (APPEND _sortedIncludes ${_include})
+				endif()
+			endforeach()
+		endforeach()
+		if (_sortedIncludes)
+			list (INSERT _includes 0 ${_sortedIncludes})
+			list (REMOVE_DUPLICATES _includes)
+		endif()
+	endif()
+	set (${_includesVar} ${_includes} PARENT_SCOPE)
+	if (_option_UNPARSED_LINES)
+		set (${_option_UNPARSED_LINES} ${_unparsedLines} PARENT_SCOPE)
+	endif()
+	if (_option_SCAN_RESULT)
+		set (${_option_SCAN_RESULT} ${_result} PARENT_SCOPE)
+	endif()
+endfunction()
+
+macro (cotire_append_undefs _contentsVar)
+	set (_undefs ${ARGN})
+	if (_undefs)
+		list (REMOVE_DUPLICATES _undefs)
+		foreach (_definition ${_undefs})
+			list (APPEND ${_contentsVar} "#undef ${_definition}")
+		endforeach()
+	endif()
+endmacro()
+
+macro (cotire_comment_str _language _commentText _commentVar)
+	if ("${_language}" STREQUAL "CMAKE")
+		set (${_commentVar} "# ${_commentText}")
+	else()
+		set (${_commentVar} "/* ${_commentText} */")
+	endif()
+endmacro()
+
+function (cotire_write_file _language _file _contents _force)
+	get_filename_component(_moduleName "${COTIRE_CMAKE_MODULE_FILE}" NAME)
+	cotire_comment_str("${_language}" "${_moduleName} ${COTIRE_CMAKE_MODULE_VERSION} generated file" _header1)
+	cotire_comment_str("${_language}" "${_file}" _header2)
+	set (_contents "${_header1}\n${_header2}\n${_contents}")
+	if (COTIRE_DEBUG)
+		message (STATUS "${_contents}")
+	endif()
+	if (_force OR NOT EXISTS "${_file}")
+		file (WRITE "${_file}" "${_contents}")
+	else()
+		file (READ "${_file}" _oldContents)
+		if (NOT "${_oldContents}" STREQUAL "${_contents}")
+			file (WRITE "${_file}" "${_contents}")
+		else()
+			if (COTIRE_DEBUG)
+				message (STATUS "${_file} unchanged")
+			endif()
+		endif()
+	endif()
+endfunction()
+
+function (cotire_generate_unity_source _unityFile)
+	set(_options "")
+	set(_oneValueArgs LANGUAGE)
+	set(_multiValueArgs
+		DEPENDS SOURCES_COMPILE_DEFINITIONS
+		PRE_UNDEFS SOURCES_PRE_UNDEFS POST_UNDEFS SOURCES_POST_UNDEFS PROLOGUE EPILOGUE)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	if (_option_DEPENDS)
+		cotire_check_file_up_to_date(_unityFileIsUpToDate "${_unityFile}" ${_option_DEPENDS})
+		if (_unityFileIsUpToDate)
+			return()
+		endif()
+	endif()
+	set (_sourceFiles ${_option_UNPARSED_ARGUMENTS})
+	if (NOT _option_PRE_UNDEFS)
+		set (_option_PRE_UNDEFS "")
+	endif()
+	if (NOT _option_SOURCES_PRE_UNDEFS)
+		set (_option_SOURCES_PRE_UNDEFS "")
+	endif()
+	if (NOT _option_POST_UNDEFS)
+		set (_option_POST_UNDEFS "")
+	endif()
+	if (NOT _option_SOURCES_POST_UNDEFS)
+		set (_option_SOURCES_POST_UNDEFS "")
+	endif()
+	set (_contents "")
+	if (_option_PROLOGUE)
+		list (APPEND _contents ${_option_PROLOGUE})
+	endif()
+	if (_option_LANGUAGE AND _sourceFiles)
+		if ("${_option_LANGUAGE}" STREQUAL "CXX")
+			list (APPEND _contents "#ifdef __cplusplus")
+		elseif ("${_option_LANGUAGE}" STREQUAL "C")
+			list (APPEND _contents "#ifndef __cplusplus")
+		endif()
+	endif()
+	set (_compileUndefinitions "")
+	foreach (_sourceFile ${_sourceFiles})
+		cotire_get_source_compile_definitions(
+			"${_option_CONFIGURATION}" "${_option_LANGUAGE}" "${_sourceFile}" _compileDefinitions
+			${_option_SOURCES_COMPILE_DEFINITIONS})
+		cotire_get_source_undefs("${_sourceFile}" COTIRE_UNITY_SOURCE_PRE_UNDEFS _sourcePreUndefs ${_option_SOURCES_PRE_UNDEFS})
+		cotire_get_source_undefs("${_sourceFile}" COTIRE_UNITY_SOURCE_POST_UNDEFS _sourcePostUndefs ${_option_SOURCES_POST_UNDEFS})
+		if (_option_PRE_UNDEFS)
+			list (APPEND _compileUndefinitions ${_option_PRE_UNDEFS})
+		endif()
+		if (_sourcePreUndefs)
+			list (APPEND _compileUndefinitions ${_sourcePreUndefs})
+		endif()
+		if (_compileUndefinitions)
+			cotire_append_undefs(_contents ${_compileUndefinitions})
+			set (_compileUndefinitions "")
+		endif()
+		if (_sourcePostUndefs)
+			list (APPEND _compileUndefinitions ${_sourcePostUndefs})
+		endif()
+		if (_option_POST_UNDEFS)
+			list (APPEND _compileUndefinitions ${_option_POST_UNDEFS})
+		endif()
+		foreach (_definition ${_compileDefinitions})
+			if (_definition MATCHES "^([a-zA-Z0-9_]+)=(.+)$")
+				list (APPEND _contents "#define ${CMAKE_MATCH_1} ${CMAKE_MATCH_2}")
+				list (INSERT _compileUndefinitions 0 "${CMAKE_MATCH_1}")
+			else()
+				list (APPEND _contents "#define ${_definition}")
+				list (INSERT _compileUndefinitions 0 "${_definition}")
+			endif()
+		endforeach()
+		# use absolute path as source file location
+		get_filename_component(_sourceFileLocation "${_sourceFile}" ABSOLUTE)
+		if (WIN32)
+			file (TO_NATIVE_PATH "${_sourceFileLocation}" _sourceFileLocation)
+		endif()
+		list (APPEND _contents "#include \"${_sourceFileLocation}\"")
+	endforeach()
+	if (_compileUndefinitions)
+		cotire_append_undefs(_contents ${_compileUndefinitions})
+		set (_compileUndefinitions "")
+	endif()
+	if (_option_LANGUAGE AND _sourceFiles)
+		list (APPEND _contents "#endif")
+	endif()
+	if (_option_EPILOGUE)
+		list (APPEND _contents ${_option_EPILOGUE})
+	endif()
+	list (APPEND _contents "")
+	string (REPLACE ";" "\n" _contents "${_contents}")
+	if (COTIRE_VERBOSE)
+		message ("${_contents}")
+	endif()
+	cotire_write_file("${_option_LANGUAGE}" "${_unityFile}" "${_contents}" TRUE)
+endfunction()
+
+function (cotire_generate_prefix_header _prefixFile)
+	set(_options "")
+	set(_oneValueArgs LANGUAGE COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_ID COMPILER_VERSION)
+	set(_multiValueArgs DEPENDS COMPILE_DEFINITIONS COMPILE_FLAGS
+		INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES IGNORE_PATH INCLUDE_PATH
+		IGNORE_EXTENSIONS INCLUDE_PRIORITY_PATH COMPILER_LAUNCHER)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	if (NOT _option_COMPILER_ID)
+		set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}")
+	endif()
+	if (NOT _option_COMPILER_VERSION)
+		set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}")
+	endif()
+	if (_option_DEPENDS)
+		cotire_check_file_up_to_date(_prefixFileIsUpToDate "${_prefixFile}" ${_option_DEPENDS})
+		if (_prefixFileIsUpToDate)
+			# create empty log file
+			set (_unparsedLinesFile "${_prefixFile}.log")
+			file (WRITE "${_unparsedLinesFile}" "")
+			return()
+		endif()
+	endif()
+	set (_prologue "")
+	set (_epilogue "")
+	if (_option_COMPILER_ID MATCHES "Clang")
+		set (_prologue "#pragma clang system_header")
+	elseif (_option_COMPILER_ID MATCHES "GNU")
+		set (_prologue "#pragma GCC system_header")
+	elseif (_option_COMPILER_ID MATCHES "MSVC")
+		set (_prologue "#pragma warning(push, 0)")
+		set (_epilogue "#pragma warning(pop)")
+	elseif (_option_COMPILER_ID MATCHES "Intel")
+		# Intel compiler requires hdrstop pragma to stop generating PCH file
+		set (_epilogue "#pragma hdrstop")
+	endif()
+	set (_sourceFiles ${_option_UNPARSED_ARGUMENTS})
+	cotire_scan_includes(_selectedHeaders ${_sourceFiles}
+		LANGUAGE "${_option_LANGUAGE}"
+		COMPILER_LAUNCHER "${_option_COMPILER_LAUNCHER}"
+		COMPILER_EXECUTABLE "${_option_COMPILER_EXECUTABLE}"
+		COMPILER_ARG1 "${_option_COMPILER_ARG1}"
+		COMPILER_ID "${_option_COMPILER_ID}"
+		COMPILER_VERSION "${_option_COMPILER_VERSION}"
+		COMPILE_DEFINITIONS ${_option_COMPILE_DEFINITIONS}
+		COMPILE_FLAGS ${_option_COMPILE_FLAGS}
+		INCLUDE_DIRECTORIES ${_option_INCLUDE_DIRECTORIES}
+		SYSTEM_INCLUDE_DIRECTORIES ${_option_SYSTEM_INCLUDE_DIRECTORIES}
+		IGNORE_PATH ${_option_IGNORE_PATH}
+		INCLUDE_PATH ${_option_INCLUDE_PATH}
+		IGNORE_EXTENSIONS ${_option_IGNORE_EXTENSIONS}
+		INCLUDE_PRIORITY_PATH ${_option_INCLUDE_PRIORITY_PATH}
+		UNPARSED_LINES _unparsedLines
+		SCAN_RESULT _scanResult)
+	cotire_generate_unity_source("${_prefixFile}"
+		PROLOGUE ${_prologue} EPILOGUE ${_epilogue} LANGUAGE "${_option_LANGUAGE}" ${_selectedHeaders})
+	set (_unparsedLinesFile "${_prefixFile}.log")
+	if (_unparsedLines)
+		if (COTIRE_VERBOSE OR _scanResult OR NOT _selectedHeaders)
+			list (LENGTH _unparsedLines _skippedLineCount)
+			message (STATUS "${_skippedLineCount} line(s) skipped, see ${_unparsedLinesFile}")
+		endif()
+		string (REPLACE ";" "\n" _unparsedLines "${_unparsedLines}")
+	endif()
+	file (WRITE "${_unparsedLinesFile}" "${_unparsedLines}")
+endfunction()
+
+function (cotire_add_makedep_flags _language _compilerID _compilerVersion _flagsVar)
+	set (_flags ${${_flagsVar}})
+	if (_compilerID MATCHES "MSVC")
+		# cl.exe options used
+		# /nologo suppresses display of sign-on banner
+		# /TC treat all files named on the command line as C source files
+		# /TP treat all files named on the command line as C++ source files
+		# /EP preprocess to stdout without #line directives
+		# /showIncludes list include files
+		set (_sourceFileTypeC "/TC")
+		set (_sourceFileTypeCXX "/TP")
+		if (_flags)
+			# append to list
+			list (APPEND _flags /nologo "${_sourceFileType${_language}}" /EP /showIncludes)
+		else()
+			# return as a flag string
+			set (_flags "${_sourceFileType${_language}} /EP /showIncludes")
+		endif()
+	elseif (_compilerID MATCHES "GNU")
+		# GCC options used
+		# -H print the name of each header file used
+		# -E invoke preprocessor
+		# -fdirectives-only do not expand macros, requires GCC >= 4.3
+		if (_flags)
+			# append to list
+			list (APPEND _flags -H -E)
+			if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0")
+				list (APPEND _flags "-fdirectives-only")
+			endif()
+		else()
+			# return as a flag string
+			set (_flags "-H -E")
+			if (NOT "${_compilerVersion}" VERSION_LESS "4.3.0")
+				set (_flags "${_flags} -fdirectives-only")
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "Clang")
+		# Clang options used
+		# -H print the name of each header file used
+		# -E invoke preprocessor
+		# -fno-color-diagnostics don't prints diagnostics in color
+		if (_flags)
+			# append to list
+			list (APPEND _flags -H -E -fno-color-diagnostics)
+		else()
+			# return as a flag string
+			set (_flags "-H -E -fno-color-diagnostics")
+		endif()
+	elseif (_compilerID MATCHES "Intel")
+		if (WIN32)
+			# Windows Intel options used
+			# /nologo do not display compiler version information
+			# /QH display the include file order
+			# /EP preprocess to stdout, omitting #line directives
+			# /TC process all source or unrecognized file types as C source files
+			# /TP process all source or unrecognized file types as C++ source files
+			set (_sourceFileTypeC "/TC")
+			set (_sourceFileTypeCXX "/TP")
+			if (_flags)
+				# append to list
+				list (APPEND _flags /nologo "${_sourceFileType${_language}}" /EP /QH)
+			else()
+				# return as a flag string
+				set (_flags "${_sourceFileType${_language}} /EP /QH")
+			endif()
+		else()
+			# Linux / Mac OS X Intel options used
+			# -H print the name of each header file used
+			# -EP preprocess to stdout, omitting #line directives
+			# -Kc++ process all source or unrecognized file types as C++ source files
+			if (_flags)
+				# append to list
+				if ("${_language}" STREQUAL "CXX")
+					list (APPEND _flags -Kc++)
+				endif()
+				list (APPEND _flags -H -EP)
+			else()
+				# return as a flag string
+				if ("${_language}" STREQUAL "CXX")
+					set (_flags "-Kc++ ")
+				endif()
+				set (_flags "${_flags}-H -EP")
+			endif()
+		endif()
+	else()
+		message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.")
+	endif()
+	set (${_flagsVar} ${_flags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_add_pch_compilation_flags _language _compilerID _compilerVersion _prefixFile _pchFile _hostFile _flagsVar)
+	set (_flags ${${_flagsVar}})
+	if (_compilerID MATCHES "MSVC")
+		file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
+		file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
+		file (TO_NATIVE_PATH "${_hostFile}" _hostFileNative)
+		# cl.exe options used
+		# /Yc creates a precompiled header file
+		# /Fp specifies precompiled header binary file name
+		# /FI forces inclusion of file
+		# /TC treat all files named on the command line as C source files
+		# /TP treat all files named on the command line as C++ source files
+		# /Zs syntax check only
+		# /Zm precompiled header memory allocation scaling factor
+		set (_sourceFileTypeC "/TC")
+		set (_sourceFileTypeCXX "/TP")
+		if (_flags)
+			# append to list
+			list (APPEND _flags /nologo "${_sourceFileType${_language}}"
+				"/Yc${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}" /Zs "${_hostFileNative}")
+			if (COTIRE_PCH_MEMORY_SCALING_FACTOR)
+				list (APPEND _flags "/Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
+			endif()
+		else()
+			# return as a flag string
+			set (_flags "/Yc\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
+			if (COTIRE_PCH_MEMORY_SCALING_FACTOR)
+				set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "GNU|Clang")
+		# GCC / Clang options used
+		# -x specify the source language
+		# -c compile but do not link
+		# -o place output in file
+		# note that we cannot use -w to suppress all warnings upon pre-compiling, because turning off a warning may
+		# alter compile flags as a side effect (e.g., -Wwrite-string implies -fconst-strings)
+		set (_xLanguage_C "c-header")
+		set (_xLanguage_CXX "c++-header")
+		if (_flags)
+			# append to list
+			list (APPEND _flags "-x" "${_xLanguage_${_language}}" "-c" "${_prefixFile}" -o "${_pchFile}")
+		else()
+			# return as a flag string
+			set (_flags "-x ${_xLanguage_${_language}} -c \"${_prefixFile}\" -o \"${_pchFile}\"")
+		endif()
+	elseif (_compilerID MATCHES "Intel")
+		if (WIN32)
+			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
+			file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
+			file (TO_NATIVE_PATH "${_hostFile}" _hostFileNative)
+			# Windows Intel options used
+			# /nologo do not display compiler version information
+			# /Yc create a precompiled header (PCH) file
+			# /Fp specify a path or file name for precompiled header files
+			# /FI tells the preprocessor to include a specified file name as the header file
+			# /TC process all source or unrecognized file types as C source files
+			# /TP process all source or unrecognized file types as C++ source files
+			# /Zs syntax check only
+			# /Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2)
+			set (_sourceFileTypeC "/TC")
+			set (_sourceFileTypeCXX "/TP")
+			if (_flags)
+				# append to list
+				list (APPEND _flags /nologo "${_sourceFileType${_language}}"
+					"/Yc" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}" /Zs "${_hostFileNative}")
+				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+					list (APPEND _flags "/Wpch-messages")
+				endif()
+			else()
+				# return as a flag string
+				set (_flags "/Yc /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
+				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+					set (_flags "${_flags} /Wpch-messages")
+				endif()
+			endif()
+		else()
+			# Linux / Mac OS X Intel options used
+			# -pch-dir location for precompiled header files
+			# -pch-create name of the precompiled header (PCH) to create
+			# -Kc++ process all source or unrecognized file types as C++ source files
+			# -fsyntax-only check only for correct syntax
+			# -Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2)
+			get_filename_component(_pchDir "${_pchFile}" DIRECTORY)
+			get_filename_component(_pchName "${_pchFile}" NAME)
+			set (_xLanguage_C "c-header")
+			set (_xLanguage_CXX "c++-header")
+			set (_pchSuppressMessages FALSE)
+			if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
+				set(_pchSuppressMessages TRUE)
+			endif()
+			if (_flags)
+				# append to list
+				if ("${_language}" STREQUAL "CXX")
+					list (APPEND _flags -Kc++)
+				endif()
+				list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-create" "${_pchName}" "-fsyntax-only" "${_hostFile}")
+				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+					if (NOT _pchSuppressMessages)
+						list (APPEND _flags "-Wpch-messages")
+					endif()
+				endif()
+			else()
+				# return as a flag string
+				set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-create \"${_pchName}\"")
+				if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+					if (NOT _pchSuppressMessages)
+						set (_flags "${_flags} -Wpch-messages")
+					endif()
+				endif()
+			endif()
+		endif()
+	else()
+		message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.")
+	endif()
+	set (${_flagsVar} ${_flags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_add_prefix_pch_inclusion_flags _language _compilerID _compilerVersion _prefixFile _pchFile _flagsVar)
+	set (_flags ${${_flagsVar}})
+	if (_compilerID MATCHES "MSVC")
+		file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
+		# cl.exe options used
+		# /Yu uses a precompiled header file during build
+		# /Fp specifies precompiled header binary file name
+		# /FI forces inclusion of file
+		# /Zm precompiled header memory allocation scaling factor
+		if (_pchFile)
+			file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
+			if (_flags)
+				# append to list
+				list (APPEND _flags "/Yu${_prefixFileNative}" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}")
+				if (COTIRE_PCH_MEMORY_SCALING_FACTOR)
+					list (APPEND _flags "/Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
+				endif()
+			else()
+				# return as a flag string
+				set (_flags "/Yu\"${_prefixFileNative}\" /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
+				if (COTIRE_PCH_MEMORY_SCALING_FACTOR)
+					set (_flags "${_flags} /Zm${COTIRE_PCH_MEMORY_SCALING_FACTOR}")
+				endif()
+			endif()
+		else()
+			# no precompiled header, force inclusion of prefix header
+			if (_flags)
+				# append to list
+				list (APPEND _flags "/FI${_prefixFileNative}")
+			else()
+				# return as a flag string
+				set (_flags "/FI\"${_prefixFileNative}\"")
+			endif()
+		endif()
+	elseif (_compilerID MATCHES "GNU")
+		# GCC options used
+		# -include process include file as the first line of the primary source file
+		# -Winvalid-pch warns if precompiled header is found but cannot be used
+		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
+		if (_flags)
+			# append to list
+			list (APPEND _flags "-Winvalid-pch" "-include" "${_prefixFile}")
+		else()
+			# return as a flag string
+			set (_flags "-Winvalid-pch -include \"${_prefixFile}\"")
+		endif()
+	elseif (_compilerID MATCHES "Clang")
+		# Clang options used
+		# -include process include file as the first line of the primary source file
+		# -include-pch include precompiled header file
+		# -Qunused-arguments don't emit warning for unused driver arguments
+		# note: ccache requires the -include flag to be used in order to process precompiled header correctly
+		if (_flags)
+			# append to list
+			list (APPEND _flags "-Qunused-arguments" "-include" "${_prefixFile}")
+		else()
+			# return as a flag string
+			set (_flags "-Qunused-arguments -include \"${_prefixFile}\"")
+		endif()
+	elseif (_compilerID MATCHES "Intel")
+		if (WIN32)
+			file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileNative)
+			# Windows Intel options used
+			# /Yu use a precompiled header (PCH) file
+			# /Fp specify a path or file name for precompiled header files
+			# /FI tells the preprocessor to include a specified file name as the header file
+			# /Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2)
+			if (_pchFile)
+				file (TO_NATIVE_PATH "${_pchFile}" _pchFileNative)
+				if (_flags)
+					# append to list
+					list (APPEND _flags "/Yu" "/Fp${_pchFileNative}" "/FI${_prefixFileNative}")
+					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+						list (APPEND _flags "/Wpch-messages")
+					endif()
+				else()
+					# return as a flag string
+					set (_flags "/Yu /Fp\"${_pchFileNative}\" /FI\"${_prefixFileNative}\"")
+					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+						set (_flags "${_flags} /Wpch-messages")
+					endif()
+				endif()
+			else()
+				# no precompiled header, force inclusion of prefix header
+				if (_flags)
+					# append to list
+					list (APPEND _flags "/FI${_prefixFileNative}")
+				else()
+					# return as a flag string
+					set (_flags "/FI\"${_prefixFileNative}\"")
+				endif()
+			endif()
+		else()
+			# Linux / Mac OS X Intel options used
+			# -pch-dir location for precompiled header files
+			# -pch-use name of the precompiled header (PCH) to use
+			# -include process include file as the first line of the primary source file
+			# -Wpch-messages enable diagnostics related to pre-compiled headers (requires Intel XE 2013 Update 2)
+			if (_pchFile)
+				get_filename_component(_pchDir "${_pchFile}" DIRECTORY)
+				get_filename_component(_pchName "${_pchFile}" NAME)
+				set (_pchSuppressMessages FALSE)
+				if ("${CMAKE_${_language}_FLAGS}" MATCHES ".*-Wno-pch-messages.*")
+					set(_pchSuppressMessages TRUE)
+				endif()
+				if (_flags)
+					# append to list
+					list (APPEND _flags "-include" "${_prefixFile}" "-pch-dir" "${_pchDir}" "-pch-use" "${_pchName}")
+					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+						if (NOT _pchSuppressMessages)
+							list (APPEND _flags "-Wpch-messages")
+						endif()
+					endif()
+				else()
+					# return as a flag string
+					set (_flags "-include \"${_prefixFile}\" -pch-dir \"${_pchDir}\" -pch-use \"${_pchName}\"")
+					if (NOT "${_compilerVersion}" VERSION_LESS "13.1.0")
+						if (NOT _pchSuppressMessages)
+							set (_flags "${_flags} -Wpch-messages")
+						endif()
+					endif()
+				endif()
+			else()
+				# no precompiled header, force inclusion of prefix header
+				if (_flags)
+					# append to list
+					list (APPEND _flags "-include" "${_prefixFile}")
+				else()
+					# return as a flag string
+					set (_flags "-include \"${_prefixFile}\"")
+				endif()
+			endif()
+		endif()
+	else()
+		message (FATAL_ERROR "cotire: unsupported ${_language} compiler ${_compilerID} version ${_compilerVersion}.")
+	endif()
+	set (${_flagsVar} ${_flags} PARENT_SCOPE)
+endfunction()
+
+function (cotire_precompile_prefix_header _prefixFile _pchFile _hostFile)
+	set(_options "")
+	set(_oneValueArgs COMPILER_EXECUTABLE COMPILER_ARG1 COMPILER_ID COMPILER_VERSION LANGUAGE)
+	set(_multiValueArgs COMPILE_DEFINITIONS COMPILE_FLAGS INCLUDE_DIRECTORIES SYSTEM_INCLUDE_DIRECTORIES SYS COMPILER_LAUNCHER)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	if (NOT _option_LANGUAGE)
+		set (_option_LANGUAGE "CXX")
+	endif()
+	if (NOT _option_COMPILER_ID)
+		set (_option_COMPILER_ID "${CMAKE_${_option_LANGUAGE}_ID}")
+	endif()
+	if (NOT _option_COMPILER_VERSION)
+		set (_option_COMPILER_VERSION "${CMAKE_${_option_LANGUAGE}_COMPILER_VERSION}")
+	endif()
+	cotire_init_compile_cmd(_cmd "${_option_LANGUAGE}" "${_option_COMPILER_LAUNCHER}" "${_option_COMPILER_EXECUTABLE}" "${_option_COMPILER_ARG1}")
+	cotire_add_definitions_to_cmd(_cmd "${_option_LANGUAGE}" ${_option_COMPILE_DEFINITIONS})
+	cotire_add_compile_flags_to_cmd(_cmd ${_option_COMPILE_FLAGS})
+	cotire_add_includes_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES)
+	cotire_add_frameworks_to_cmd(_cmd "${_option_LANGUAGE}" _option_INCLUDE_DIRECTORIES _option_SYSTEM_INCLUDE_DIRECTORIES)
+	cotire_add_pch_compilation_flags(
+		"${_option_LANGUAGE}" "${_option_COMPILER_ID}" "${_option_COMPILER_VERSION}"
+		"${_prefixFile}" "${_pchFile}" "${_hostFile}" _cmd)
+	if (COTIRE_VERBOSE)
+		message (STATUS "execute_process: ${_cmd}")
+	endif()
+	if (_option_COMPILER_ID MATCHES "MSVC")
+		# cl.exe messes with the output streams unless the environment variable VS_UNICODE_OUTPUT is cleared
+		unset (ENV{VS_UNICODE_OUTPUT})
+	elseif (_option_COMPILER_ID MATCHES "GNU|Clang")
+		if (_option_COMPILER_LAUNCHER MATCHES "ccache" OR
+			_option_COMPILER_EXECUTABLE MATCHES "ccache")
+			# Newer versions of Clang and GCC seem to embed a compilation timestamp into the precompiled header binary,
+			# which results in "file has been modified since the precompiled header was built" errors if ccache is used.
+			# We work around the problem by disabling ccache upon pre-compiling the prefix header.
+			set (ENV{CCACHE_DISABLE} "true")
+		endif()
+	endif()
+	execute_process(
+		COMMAND ${_cmd}
+		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+		RESULT_VARIABLE _result)
+	if (_result)
+		message (FATAL_ERROR "cotire: error ${_result} precompiling ${_prefixFile}.")
+	endif()
+endfunction()
+
+function (cotire_check_precompiled_header_support _language _target _msgVar)
+	set (_unsupportedCompiler
+		"Precompiled headers not supported for ${_language} compiler ${CMAKE_${_language}_COMPILER_ID}")
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC")
+		# supported since Visual Studio C++ 6.0
+		# and CMake does not support an earlier version
+		set (${_msgVar} "" PARENT_SCOPE)
+	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU")
+		# GCC PCH support requires version >= 3.4
+		if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "3.4.0")
+			set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}." PARENT_SCOPE)
+		else()
+			set (${_msgVar} "" PARENT_SCOPE)
+		endif()
+	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang")
+		# all Clang versions have PCH support
+		set (${_msgVar} "" PARENT_SCOPE)
+	elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel")
+		# Intel PCH support requires version >= 8.0.0
+		if ("${CMAKE_${_language}_COMPILER_VERSION}" VERSION_LESS "8.0.0")
+			set (${_msgVar} "${_unsupportedCompiler} version ${CMAKE_${_language}_COMPILER_VERSION}." PARENT_SCOPE)
+		else()
+			set (${_msgVar} "" PARENT_SCOPE)
+		endif()
+	else()
+		set (${_msgVar} "${_unsupportedCompiler}." PARENT_SCOPE)
+	endif()
+	get_target_property(_launcher ${_target} ${_language}_COMPILER_LAUNCHER)
+	if (CMAKE_${_language}_COMPILER MATCHES "ccache" OR _launcher MATCHES "ccache")
+		if (DEFINED ENV{CCACHE_SLOPPINESS})
+			if (NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "pch_defines" OR NOT "$ENV{CCACHE_SLOPPINESS}" MATCHES "time_macros")
+				set (${_msgVar}
+					"ccache requires the environment variable CCACHE_SLOPPINESS to be set to \"pch_defines,time_macros\"."
+					PARENT_SCOPE)
+			endif()
+		else()
+			if (_launcher MATCHES "ccache")
+				get_filename_component(_ccacheExe "${_launcher}" REALPATH)
+			else()
+				get_filename_component(_ccacheExe "${CMAKE_${_language}_COMPILER}" REALPATH)
+			endif()
+			execute_process(
+				COMMAND "${_ccacheExe}" "--print-config"
+				WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+				RESULT_VARIABLE _result
+				OUTPUT_VARIABLE _ccacheConfig OUTPUT_STRIP_TRAILING_WHITESPACE
+				ERROR_QUIET)
+			if (_result OR NOT
+				_ccacheConfig MATCHES "sloppiness.*=.*time_macros" OR NOT
+				_ccacheConfig MATCHES "sloppiness.*=.*pch_defines")
+				set (${_msgVar}
+					"ccache requires configuration setting \"sloppiness\" to be set to \"pch_defines,time_macros\"."
+					PARENT_SCOPE)
+			endif()
+		endif()
+	endif()
+	if (APPLE)
+		# PCH compilation not supported by GCC / Clang for multi-architecture builds (e.g., i386, x86_64)
+		cotire_get_configuration_types(_configs)
+		foreach (_config ${_configs})
+			set (_targetFlags "")
+			cotire_get_target_compile_flags("${_config}" "${_language}" "${_target}" _targetFlags)
+			cotire_filter_compile_flags("${_language}" "arch" _architectures _ignore ${_targetFlags})
+			list (LENGTH _architectures _numberOfArchitectures)
+			if (_numberOfArchitectures GREATER 1)
+				string (REPLACE ";" ", " _architectureStr "${_architectures}")
+				set (${_msgVar}
+					"Precompiled headers not supported on Darwin for multi-architecture builds (${_architectureStr})."
+					PARENT_SCOPE)
+				break()
+			endif()
+		endforeach()
+	endif()
+endfunction()
+
+macro (cotire_get_intermediate_dir _cotireDir)
+	# ${CMAKE_CFG_INTDIR} may reference a build-time variable when using a generator which supports configuration types
+	get_filename_component(${_cotireDir} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${COTIRE_INTDIR}" ABSOLUTE)
+endmacro()
+
+macro (cotire_setup_file_extension_variables)
+	set (_unityFileExt_C ".c")
+	set (_unityFileExt_CXX ".cxx")
+	set (_prefixFileExt_C ".h")
+	set (_prefixFileExt_CXX ".hxx")
+	set (_prefixSourceFileExt_C ".c")
+	set (_prefixSourceFileExt_CXX ".cxx")
+endmacro()
+
+function (cotire_make_single_unity_source_file_path _language _target _unityFileVar)
+	cotire_setup_file_extension_variables()
+	if (NOT DEFINED _unityFileExt_${_language})
+		set (${_unityFileVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}")
+	set (_unityFileName "${_unityFileBaseName}${_unityFileExt_${_language}}")
+	cotire_get_intermediate_dir(_baseDir)
+	set (_unityFile "${_baseDir}/${_unityFileName}")
+	set (${_unityFileVar} "${_unityFile}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_make_unity_source_file_paths _language _target _maxIncludes _unityFilesVar)
+	cotire_setup_file_extension_variables()
+	if (NOT DEFINED _unityFileExt_${_language})
+		set (${_unityFileVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}")
+	cotire_get_intermediate_dir(_baseDir)
+	set (_startIndex 0)
+	set (_index 0)
+	set (_unityFiles "")
+	set (_sourceFiles ${ARGN})
+	foreach (_sourceFile ${_sourceFiles})
+		get_source_file_property(_startNew "${_sourceFile}" COTIRE_START_NEW_UNITY_SOURCE)
+		math (EXPR _unityFileCount "${_index} - ${_startIndex}")
+		if (_startNew OR (_maxIncludes GREATER 0 AND NOT _unityFileCount LESS _maxIncludes))
+			if (_index GREATER 0)
+				# start new unity file segment
+				math (EXPR _endIndex "${_index} - 1")
+				set (_unityFileName "${_unityFileBaseName}_${_startIndex}_${_endIndex}${_unityFileExt_${_language}}")
+				list (APPEND _unityFiles "${_baseDir}/${_unityFileName}")
+			endif()
+			set (_startIndex ${_index})
+		endif()
+		math (EXPR _index "${_index} + 1")
+	endforeach()
+	list (LENGTH _sourceFiles _numberOfSources)
+	if (_startIndex EQUAL 0)
+		# there is only a single unity file
+		cotire_make_single_unity_source_file_path(${_language} ${_target} _unityFiles)
+	elseif (_startIndex LESS _numberOfSources)
+		# end with final unity file segment
+		math (EXPR _endIndex "${_index} - 1")
+		set (_unityFileName "${_unityFileBaseName}_${_startIndex}_${_endIndex}${_unityFileExt_${_language}}")
+		list (APPEND _unityFiles "${_baseDir}/${_unityFileName}")
+	endif()
+	set (${_unityFilesVar} ${_unityFiles} PARENT_SCOPE)
+	if (COTIRE_DEBUG AND _unityFiles)
+		message (STATUS "unity files: ${_unityFiles}")
+	endif()
+endfunction()
+
+function (cotire_unity_to_prefix_file_path _language _target _unityFile _prefixFileVar)
+	cotire_setup_file_extension_variables()
+	if (NOT DEFINED _unityFileExt_${_language})
+		set (${_prefixFileVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	set (_unityFileBaseName "${_target}_${_language}${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}")
+	set (_prefixFileBaseName "${_target}_${_language}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}")
+	string (REPLACE "${_unityFileBaseName}" "${_prefixFileBaseName}" _prefixFile "${_unityFile}")
+	string (REGEX REPLACE "${_unityFileExt_${_language}}$" "${_prefixFileExt_${_language}}" _prefixFile "${_prefixFile}")
+	set (${_prefixFileVar} "${_prefixFile}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_prefix_header_to_source_file_path _language _prefixHeaderFile _prefixSourceFileVar)
+	cotire_setup_file_extension_variables()
+	if (NOT DEFINED _prefixSourceFileExt_${_language})
+		set (${_prefixSourceFileVar} "" PARENT_SCOPE)
+		return()
+	endif()
+	string (REGEX REPLACE "${_prefixFileExt_${_language}}$" "${_prefixSourceFileExt_${_language}}" _prefixSourceFile "${_prefixHeaderFile}")
+	set (${_prefixSourceFileVar} "${_prefixSourceFile}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_make_prefix_file_name _language _target _prefixFileBaseNameVar _prefixFileNameVar)
+	cotire_setup_file_extension_variables()
+	if (NOT _language)
+		set (_prefixFileBaseName "${_target}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}")
+		set (_prefixFileName "${_prefixFileBaseName}${_prefixFileExt_C}")
+	elseif (DEFINED _prefixFileExt_${_language})
+		set (_prefixFileBaseName "${_target}_${_language}${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}")
+		set (_prefixFileName "${_prefixFileBaseName}${_prefixFileExt_${_language}}")
+	else()
+		set (_prefixFileBaseName "")
+		set (_prefixFileName "")
+	endif()
+	set (${_prefixFileBaseNameVar} "${_prefixFileBaseName}" PARENT_SCOPE)
+	set (${_prefixFileNameVar} "${_prefixFileName}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_make_prefix_file_path _language _target _prefixFileVar)
+	cotire_make_prefix_file_name("${_language}" "${_target}" _prefixFileBaseName _prefixFileName)
+	set (${_prefixFileVar} "" PARENT_SCOPE)
+	if (_prefixFileName)
+		if (NOT _language)
+			set (_language "C")
+		endif()
+		if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang|Intel|MSVC")
+			cotire_get_intermediate_dir(_baseDir)
+			set (${_prefixFileVar} "${_baseDir}/${_prefixFileName}" PARENT_SCOPE)
+		endif()
+	endif()
+endfunction()
+
+function (cotire_make_pch_file_path _language _target _pchFileVar)
+	cotire_make_prefix_file_name("${_language}" "${_target}" _prefixFileBaseName _prefixFileName)
+	set (${_pchFileVar} "" PARENT_SCOPE)
+	if (_prefixFileBaseName AND _prefixFileName)
+		cotire_check_precompiled_header_support("${_language}" "${_target}" _msg)
+		if (NOT _msg)
+			if (XCODE)
+				# For Xcode, we completely hand off the compilation of the prefix header to the IDE
+				return()
+			endif()
+			cotire_get_intermediate_dir(_baseDir)
+			if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC")
+				# MSVC uses the extension .pch added to the prefix header base name
+				set (${_pchFileVar} "${_baseDir}/${_prefixFileBaseName}.pch" PARENT_SCOPE)
+			elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Clang")
+				# Clang looks for a precompiled header corresponding to the prefix header with the extension .pch appended
+				set (${_pchFileVar} "${_baseDir}/${_prefixFileName}.pch" PARENT_SCOPE)
+			elseif (CMAKE_${_language}_COMPILER_ID MATCHES "GNU")
+				# GCC looks for a precompiled header corresponding to the prefix header with the extension .gch appended
+				set (${_pchFileVar} "${_baseDir}/${_prefixFileName}.gch" PARENT_SCOPE)
+			elseif (CMAKE_${_language}_COMPILER_ID MATCHES "Intel")
+				# Intel uses the extension .pchi added to the prefix header base name
+				set (${_pchFileVar} "${_baseDir}/${_prefixFileBaseName}.pchi" PARENT_SCOPE)
+			endif()
+		endif()
+	endif()
+endfunction()
+
+function (cotire_select_unity_source_files _unityFile _sourcesVar)
+	set (_sourceFiles ${ARGN})
+	if (_sourceFiles AND "${_unityFile}" MATCHES "${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}_([0-9]+)_([0-9]+)")
+		set (_startIndex ${CMAKE_MATCH_1})
+		set (_endIndex ${CMAKE_MATCH_2})
+		list (LENGTH _sourceFiles _numberOfSources)
+		if (NOT _startIndex LESS _numberOfSources)
+			math (EXPR _startIndex "${_numberOfSources} - 1")
+		endif()
+		if (NOT _endIndex LESS _numberOfSources)
+			math (EXPR _endIndex "${_numberOfSources} - 1")
+		endif()
+		set (_files "")
+		foreach (_index RANGE ${_startIndex} ${_endIndex})
+			list (GET _sourceFiles ${_index} _file)
+			list (APPEND _files "${_file}")
+		endforeach()
+	else()
+		set (_files ${_sourceFiles})
+	endif()
+	set (${_sourcesVar} ${_files} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_unity_source_dependencies _language _target _dependencySourcesVar)
+	set (_dependencySources "")
+	# depend on target's generated source files
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	cotire_get_objects_with_property_on(_generatedSources GENERATED SOURCE ${_targetSourceFiles})
+	if (_generatedSources)
+		# but omit all generated source files that have the COTIRE_EXCLUDED property set to true
+		cotire_get_objects_with_property_on(_excludedGeneratedSources COTIRE_EXCLUDED SOURCE ${_generatedSources})
+		if (_excludedGeneratedSources)
+			list (REMOVE_ITEM _generatedSources ${_excludedGeneratedSources})
+		endif()
+		# and omit all generated source files that have the COTIRE_DEPENDENCY property set to false explicitly
+		cotire_get_objects_with_property_off(_excludedNonDependencySources COTIRE_DEPENDENCY SOURCE ${_generatedSources})
+		if (_excludedNonDependencySources)
+			list (REMOVE_ITEM _generatedSources ${_excludedNonDependencySources})
+		endif()
+		if (_generatedSources)
+			list (APPEND _dependencySources ${_generatedSources})
+		endif()
+	endif()
+	if (COTIRE_DEBUG AND _dependencySources)
+		message (STATUS "${_language} ${_target} unity source dependencies: ${_dependencySources}")
+	endif()
+	set (${_dependencySourcesVar} ${_dependencySources} PARENT_SCOPE)
+endfunction()
+
+function (cotire_get_prefix_header_dependencies _language _target _dependencySourcesVar)
+	set (_dependencySources "")
+	# depend on target source files marked with custom COTIRE_DEPENDENCY property
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	cotire_get_objects_with_property_on(_dependencySources COTIRE_DEPENDENCY SOURCE ${_targetSourceFiles})
+	if (COTIRE_DEBUG AND _dependencySources)
+		message (STATUS "${_language} ${_target} prefix header dependencies: ${_dependencySources}")
+	endif()
+	set (${_dependencySourcesVar} ${_dependencySources} PARENT_SCOPE)
+endfunction()
+
+function (cotire_generate_target_script _language _configurations _target _targetScriptVar _targetConfigScriptVar)
+	set (_targetSources ${ARGN})
+	cotire_get_prefix_header_dependencies(${_language} ${_target} COTIRE_TARGET_PREFIX_DEPENDS ${_targetSources})
+	cotire_get_unity_source_dependencies(${_language} ${_target} COTIRE_TARGET_UNITY_DEPENDS ${_targetSources})
+	# set up variables to be configured
+	set (COTIRE_TARGET_LANGUAGE "${_language}")
+	get_target_property(COTIRE_TARGET_IGNORE_PATH ${_target} COTIRE_PREFIX_HEADER_IGNORE_PATH)
+	cotire_add_sys_root_paths(COTIRE_TARGET_IGNORE_PATH)
+	get_target_property(COTIRE_TARGET_INCLUDE_PATH ${_target} COTIRE_PREFIX_HEADER_INCLUDE_PATH)
+	cotire_add_sys_root_paths(COTIRE_TARGET_INCLUDE_PATH)
+	get_target_property(COTIRE_TARGET_PRE_UNDEFS ${_target} COTIRE_UNITY_SOURCE_PRE_UNDEFS)
+	get_target_property(COTIRE_TARGET_POST_UNDEFS ${_target} COTIRE_UNITY_SOURCE_POST_UNDEFS)
+	get_target_property(COTIRE_TARGET_MAXIMUM_NUMBER_OF_INCLUDES ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES)
+	get_target_property(COTIRE_TARGET_INCLUDE_PRIORITY_PATH ${_target} COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH)
+	cotire_get_source_files_undefs(COTIRE_UNITY_SOURCE_PRE_UNDEFS COTIRE_TARGET_SOURCES_PRE_UNDEFS ${_targetSources})
+	cotire_get_source_files_undefs(COTIRE_UNITY_SOURCE_POST_UNDEFS COTIRE_TARGET_SOURCES_POST_UNDEFS ${_targetSources})
+	set (COTIRE_TARGET_CONFIGURATION_TYPES "${_configurations}")
+	foreach (_config ${_configurations})
+		string (TOUPPER "${_config}" _upperConfig)
+		cotire_get_target_include_directories(
+			"${_config}" "${_language}" "${_target}" COTIRE_TARGET_INCLUDE_DIRECTORIES_${_upperConfig} COTIRE_TARGET_SYSTEM_INCLUDE_DIRECTORIES_${_upperConfig})
+		cotire_get_target_compile_definitions(
+			"${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig})
+		cotire_get_target_compiler_flags(
+			"${_config}" "${_language}" "${_target}" COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig})
+		cotire_get_source_files_compile_definitions(
+			"${_config}" "${_language}" COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig} ${_targetSources})
+	endforeach()
+	get_target_property(COTIRE_TARGET_${_language}_COMPILER_LAUNCHER ${_target} ${_language}_COMPILER_LAUNCHER)
+	# set up COTIRE_TARGET_SOURCES
+	set (COTIRE_TARGET_SOURCES "")
+	foreach (_sourceFile ${_targetSources})
+		get_source_file_property(_generated "${_sourceFile}" GENERATED)
+		if (_generated)
+			# use absolute paths for generated files only, retrieving the LOCATION property is an expensive operation
+			get_source_file_property(_sourceLocation "${_sourceFile}" LOCATION)
+			list (APPEND COTIRE_TARGET_SOURCES "${_sourceLocation}")
+		else()
+			list (APPEND COTIRE_TARGET_SOURCES "${_sourceFile}")
+		endif()
+	endforeach()
+	# copy variable definitions to cotire target script
+	get_cmake_property(_vars VARIABLES)
+	string (REGEX MATCHALL "COTIRE_[A-Za-z0-9_]+" _matchVars "${_vars}")
+	# omit COTIRE_*_INIT variables
+	string (REGEX MATCHALL "COTIRE_[A-Za-z0-9_]+_INIT" _initVars "${_matchVars}")
+	if (_initVars)
+		list (REMOVE_ITEM _matchVars ${_initVars})
+	endif()
+	# omit COTIRE_VERBOSE which is passed as a CMake define on command line
+	list (REMOVE_ITEM _matchVars COTIRE_VERBOSE)
+	set (_contents "")
+	set (_contentsHasGeneratorExpressions FALSE)
+	foreach (_var IN LISTS _matchVars ITEMS
+		XCODE MSVC CMAKE_GENERATOR CMAKE_BUILD_TYPE CMAKE_CONFIGURATION_TYPES
+		CMAKE_${_language}_COMPILER_ID CMAKE_${_language}_COMPILER_VERSION
+		CMAKE_${_language}_COMPILER_LAUNCHER CMAKE_${_language}_COMPILER CMAKE_${_language}_COMPILER_ARG1
+		CMAKE_INCLUDE_FLAG_${_language} CMAKE_INCLUDE_FLAG_SEP_${_language}
+		CMAKE_INCLUDE_SYSTEM_FLAG_${_language}
+		CMAKE_${_language}_FRAMEWORK_SEARCH_FLAG
+		CMAKE_${_language}_SYSTEM_FRAMEWORK_SEARCH_FLAG
+		CMAKE_${_language}_SOURCE_FILE_EXTENSIONS)
+		if (DEFINED ${_var})
+			string (REPLACE "\"" "\\\"" _value "${${_var}}")
+			set (_contents "${_contents}set (${_var} \"${_value}\")\n")
+			if (NOT _contentsHasGeneratorExpressions)
+				if ("${_value}" MATCHES "\\$<.*>")
+					set (_contentsHasGeneratorExpressions TRUE)
+				endif()
+			endif()
+		endif()
+	endforeach()
+	# generate target script file
+	get_filename_component(_moduleName "${COTIRE_CMAKE_MODULE_FILE}" NAME)
+	set (_targetCotireScript "${CMAKE_CURRENT_BINARY_DIR}/${_target}_${_language}_${_moduleName}")
+	cotire_write_file("CMAKE" "${_targetCotireScript}" "${_contents}" FALSE)
+	if (_contentsHasGeneratorExpressions)
+		# use file(GENERATE ...) to expand generator expressions in the target script at CMake generate-time
+		set (_configNameOrNoneGeneratorExpression "$<$<CONFIG:>:None>$<$<NOT:$<CONFIG:>>:$<CONFIGURATION>>")
+		set (_targetCotireConfigScript "${CMAKE_CURRENT_BINARY_DIR}/${_target}_${_language}_${_configNameOrNoneGeneratorExpression}_${_moduleName}")
+		file (GENERATE OUTPUT "${_targetCotireConfigScript}" INPUT "${_targetCotireScript}")
+	else()
+		set (_targetCotireConfigScript "${_targetCotireScript}")
+	endif()
+	set (${_targetScriptVar} "${_targetCotireScript}" PARENT_SCOPE)
+	set (${_targetConfigScriptVar} "${_targetCotireConfigScript}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_pch_file_compilation _language _target _targetScript _prefixFile _pchFile _hostFile)
+	set (_sourceFiles ${ARGN})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+		# for Visual Studio and Intel, we attach the precompiled header compilation to the host file
+		# the remaining files include the precompiled header, see cotire_setup_pch_file_inclusion
+		if (_sourceFiles)
+			set (_flags "")
+			cotire_add_pch_compilation_flags(
+				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+				"${_prefixFile}" "${_pchFile}" "${_hostFile}" _flags)
+			set_property (SOURCE ${_hostFile} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
+			set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_OUTPUTS "${_pchFile}")
+			# make object file generated from host file depend on prefix header
+			set_property (SOURCE ${_hostFile} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}")
+			# mark host file as cotired to prevent it from being used in another cotired target
+			set_property (SOURCE ${_hostFile} PROPERTY COTIRE_TARGET "${_target}")
+		endif()
+	elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		# for makefile based generator, we add a custom command to precompile the prefix header
+		if (_targetScript)
+			cotire_set_cmd_to_prologue(_cmds)
+			list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "precompile" "${_targetScript}" "${_prefixFile}" "${_pchFile}" "${_hostFile}")
+			if (MSVC_IDE)
+				file (TO_NATIVE_PATH "${_pchFile}" _pchFileLogPath)
+			else()
+				file (RELATIVE_PATH _pchFileLogPath "${CMAKE_BINARY_DIR}" "${_pchFile}")
+			endif()
+			# make precompiled header compilation depend on the actual compiler executable used to force
+			# re-compilation when the compiler executable is updated. This prevents "created by a different GCC executable"
+			# warnings when the precompiled header is included.
+			get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" ABSOLUTE)
+			if (COTIRE_DEBUG)
+				message (STATUS "add_custom_command: OUTPUT ${_pchFile} ${_cmds} DEPENDS ${_prefixFile} ${_realCompilerExe} IMPLICIT_DEPENDS ${_language} ${_prefixFile}")
+			endif()
+			set_property (SOURCE "${_pchFile}" PROPERTY GENERATED TRUE)
+			add_custom_command(
+				OUTPUT "${_pchFile}"
+				COMMAND ${_cmds}
+				DEPENDS "${_prefixFile}" "${_realCompilerExe}"
+				IMPLICIT_DEPENDS ${_language} "${_prefixFile}"
+				WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+				COMMENT "Building ${_language} precompiled header ${_pchFileLogPath}"
+				VERBATIM)
+		endif()
+	endif()
+endfunction()
+
+function (cotire_setup_pch_file_inclusion _language _target _wholeTarget _prefixFile _pchFile _hostFile)
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+		# for Visual Studio and Intel, we include the precompiled header in all but the host file
+		# the host file does the precompiled header compilation, see cotire_setup_pch_file_compilation
+		set (_sourceFiles ${ARGN})
+		list (LENGTH _sourceFiles _numberOfSourceFiles)
+		if (_numberOfSourceFiles GREATER 0)
+			# mark sources as cotired to prevent them from being used in another cotired target
+			set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
+			set (_flags "")
+			cotire_add_prefix_pch_inclusion_flags(
+				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+				"${_prefixFile}" "${_pchFile}" _flags)
+			set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
+			# make object files generated from source files depend on precompiled header
+			set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_pchFile}")
+		endif()
+	elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		set (_sourceFiles ${_hostFile} ${ARGN})
+		if (NOT _wholeTarget)
+			# for makefile based generator, we force the inclusion of the prefix header for a subset
+			# of the source files, if this is a multi-language target or has excluded files
+			set (_flags "")
+			cotire_add_prefix_pch_inclusion_flags(
+				"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+				"${_prefixFile}" "${_pchFile}" _flags)
+			set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
+			# mark sources as cotired to prevent them from being used in another cotired target
+			set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
+		endif()
+		# make object files generated from source files depend on precompiled header
+		set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_pchFile}")
+	endif()
+endfunction()
+
+function (cotire_setup_prefix_file_inclusion _language _target _prefixFile)
+	set (_sourceFiles ${ARGN})
+	# force the inclusion of the prefix header for the given source files
+	set (_flags "")
+	set (_pchFile "")
+	cotire_add_prefix_pch_inclusion_flags(
+		"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+		"${_prefixFile}" "${_pchFile}" _flags)
+	set_property (SOURCE ${_sourceFiles} APPEND_STRING PROPERTY COMPILE_FLAGS " ${_flags} ")
+	# mark sources as cotired to prevent them from being used in another cotired target
+	set_source_files_properties(${_sourceFiles} PROPERTIES COTIRE_TARGET "${_target}")
+	# make object files generated from source files depend on prefix header
+	set_property (SOURCE ${_sourceFiles} APPEND PROPERTY OBJECT_DEPENDS "${_prefixFile}")
+endfunction()
+
+function (cotire_get_first_set_property_value _propertyValueVar _type _object)
+	set (_properties ${ARGN})
+	foreach (_property ${_properties})
+		get_property(_propertyValue ${_type} "${_object}" PROPERTY ${_property})
+		if (_propertyValue)
+			set (${_propertyValueVar} ${_propertyValue} PARENT_SCOPE)
+			return()
+		endif()
+	endforeach()
+	set (${_propertyValueVar} "" PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_combine_command _language _targetScript _joinedFile _cmdsVar)
+	set (_files ${ARGN})
+	set (_filesPaths "")
+	foreach (_file ${_files})
+		get_filename_component(_filePath "${_file}" ABSOLUTE)
+		list (APPEND _filesPaths "${_filePath}")
+	endforeach()
+	cotire_set_cmd_to_prologue(_prefixCmd)
+	list (APPEND _prefixCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "combine")
+	if (_targetScript)
+		list (APPEND _prefixCmd "${_targetScript}")
+	endif()
+	list (APPEND _prefixCmd "${_joinedFile}" ${_filesPaths})
+	if (COTIRE_DEBUG)
+		message (STATUS "add_custom_command: OUTPUT ${_joinedFile} COMMAND ${_prefixCmd} DEPENDS ${_files}")
+	endif()
+	set_property (SOURCE "${_joinedFile}" PROPERTY GENERATED TRUE)
+	if (MSVC_IDE)
+		file (TO_NATIVE_PATH "${_joinedFile}" _joinedFileLogPath)
+	else()
+		file (RELATIVE_PATH _joinedFileLogPath "${CMAKE_BINARY_DIR}" "${_joinedFile}")
+	endif()
+	get_filename_component(_joinedFileBaseName "${_joinedFile}" NAME_WE)
+	get_filename_component(_joinedFileExt "${_joinedFile}" EXT)
+	if (_language AND _joinedFileBaseName MATCHES "${COTIRE_UNITY_SOURCE_FILENAME_SUFFIX}$")
+		set (_comment "Generating ${_language} unity source ${_joinedFileLogPath}")
+	elseif (_language AND _joinedFileBaseName MATCHES "${COTIRE_PREFIX_HEADER_FILENAME_SUFFIX}$")
+		if (_joinedFileExt MATCHES "^\\.c")
+			set (_comment "Generating ${_language} prefix source ${_joinedFileLogPath}")
+		else()
+			set (_comment "Generating ${_language} prefix header ${_joinedFileLogPath}")
+		endif()
+	else()
+		set (_comment "Generating ${_joinedFileLogPath}")
+	endif()
+	add_custom_command(
+		OUTPUT "${_joinedFile}"
+		COMMAND ${_prefixCmd}
+		DEPENDS ${_files}
+		COMMENT "${_comment}"
+		WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+		VERBATIM)
+	list (APPEND ${_cmdsVar} COMMAND ${_prefixCmd})
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_target_pch_usage _languages _target _wholeTarget)
+	if (XCODE)
+		# for Xcode, we attach a pre-build action to generate the unity sources and prefix headers
+		set (_prefixFiles "")
+		foreach (_language ${_languages})
+			get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
+			if (_prefixFile)
+				list (APPEND _prefixFiles "${_prefixFile}")
+			endif()
+		endforeach()
+		set (_cmds ${ARGN})
+		list (LENGTH _prefixFiles _numberOfPrefixFiles)
+		if (_numberOfPrefixFiles GREATER 1)
+			# we also generate a generic, single prefix header which includes all language specific prefix headers
+			set (_language "")
+			set (_targetScript "")
+			cotire_make_prefix_file_path("${_language}" ${_target} _prefixHeader)
+			cotire_setup_combine_command("${_language}" "${_targetScript}" "${_prefixHeader}" _cmds ${_prefixFiles})
+		else()
+			set (_prefixHeader "${_prefixFiles}")
+		endif()
+		if (COTIRE_DEBUG)
+			message (STATUS "add_custom_command: TARGET ${_target} PRE_BUILD ${_cmds}")
+		endif()
+		# because CMake PRE_BUILD command does not support dependencies,
+		# we check dependencies explicity in cotire script mode when the pre-build action is run
+		add_custom_command(
+			TARGET "${_target}"
+			PRE_BUILD ${_cmds}
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+			COMMENT "Updating target ${_target} prefix headers"
+			VERBATIM)
+		# make Xcode precompile the generated prefix header with ProcessPCH and ProcessPCH++
+		set_target_properties(${_target} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
+		set_target_properties(${_target} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${_prefixHeader}")
+	elseif ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		# for makefile based generator, we force inclusion of the prefix header for all target source files
+		# if this is a single-language target without any excluded files
+		if (_wholeTarget)
+			set (_language "${_languages}")
+			# for Visual Studio and Intel, precompiled header inclusion is always done on the source file level
+			# see cotire_setup_pch_file_inclusion
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+				get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
+				if (_prefixFile)
+					get_property(_pchFile TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER)
+					set (_options COMPILE_OPTIONS)
+					cotire_add_prefix_pch_inclusion_flags(
+						"${_language}" "${CMAKE_${_language}_COMPILER_ID}" "${CMAKE_${_language}_COMPILER_VERSION}"
+						"${_prefixFile}" "${_pchFile}" _options)
+					set_property(TARGET ${_target} APPEND PROPERTY ${_options})
+				endif()
+			endif()
+		endif()
+	endif()
+endfunction()
+
+function (cotire_setup_unity_generation_commands _language _target _targetScript _targetConfigScript _unityFiles _cmdsVar)
+	set (_dependencySources "")
+	cotire_get_unity_source_dependencies(${_language} ${_target} _dependencySources ${ARGN})
+	foreach (_unityFile ${_unityFiles})
+		set_property (SOURCE "${_unityFile}" PROPERTY GENERATED TRUE)
+		# set up compiled unity source dependencies via OBJECT_DEPENDS
+		# this ensures that missing source files are generated before the unity file is compiled
+		if (COTIRE_DEBUG AND _dependencySources)
+			message (STATUS "${_unityFile} OBJECT_DEPENDS ${_dependencySources}")
+		endif()
+		if (_dependencySources)
+			# the OBJECT_DEPENDS property requires a list of full paths
+			set (_objectDependsPaths "")
+			foreach (_sourceFile ${_dependencySources})
+				get_source_file_property(_sourceLocation "${_sourceFile}" LOCATION)
+				list (APPEND _objectDependsPaths "${_sourceLocation}")
+			endforeach()
+			set_property (SOURCE "${_unityFile}" PROPERTY OBJECT_DEPENDS ${_objectDependsPaths})
+		endif()
+		if (WIN32 AND CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+			# unity file compilation results in potentially huge object file, thus use /bigobj by default unter MSVC and Windows Intel
+			set_property (SOURCE "${_unityFile}" APPEND_STRING PROPERTY COMPILE_FLAGS "/bigobj")
+		endif()
+		cotire_set_cmd_to_prologue(_unityCmd)
+		list (APPEND _unityCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "unity" "${_targetConfigScript}" "${_unityFile}")
+		if (CMAKE_VERSION VERSION_LESS "3.1.0")
+			set (_unityCmdDepends "${_targetScript}")
+		else()
+			# CMake 3.1.0 supports generator expressions in arguments to DEPENDS
+			set (_unityCmdDepends "${_targetConfigScript}")
+		endif()
+		if (MSVC_IDE)
+			file (TO_NATIVE_PATH "${_unityFile}" _unityFileLogPath)
+		else()
+			file (RELATIVE_PATH _unityFileLogPath "${CMAKE_BINARY_DIR}" "${_unityFile}")
+		endif()
+		if (COTIRE_DEBUG)
+			message (STATUS "add_custom_command: OUTPUT ${_unityFile} COMMAND ${_unityCmd} DEPENDS ${_unityCmdDepends}")
+		endif()
+		add_custom_command(
+			OUTPUT "${_unityFile}"
+			COMMAND ${_unityCmd}
+			DEPENDS ${_unityCmdDepends}
+			COMMENT "Generating ${_language} unity source ${_unityFileLogPath}"
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+			VERBATIM)
+		list (APPEND ${_cmdsVar} COMMAND ${_unityCmd})
+	endforeach()
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_prefix_generation_command _language _target _targetScript _prefixFile _unityFiles _cmdsVar)
+	set (_sourceFiles ${ARGN})
+	set (_dependencySources "")
+	cotire_get_prefix_header_dependencies(${_language} ${_target} _dependencySources ${_sourceFiles})
+	cotire_set_cmd_to_prologue(_prefixCmd)
+	list (APPEND _prefixCmd -P "${COTIRE_CMAKE_MODULE_FILE}" "prefix" "${_targetScript}" "${_prefixFile}" ${_unityFiles})
+	set_property (SOURCE "${_prefixFile}" PROPERTY GENERATED TRUE)
+	# make prefix header generation depend on the actual compiler executable used to force
+	# re-generation when the compiler executable is updated. This prevents "file not found"
+	# errors for compiler version specific system header files.
+	get_filename_component(_realCompilerExe "${CMAKE_${_language}_COMPILER}" ABSOLUTE)
+	if (COTIRE_DEBUG)
+		message (STATUS "add_custom_command: OUTPUT ${_prefixFile} COMMAND ${_prefixCmd} DEPENDS ${_unityFile} ${_dependencySources} ${_realCompilerExe}")
+	endif()
+	if (MSVC_IDE)
+		file (TO_NATIVE_PATH "${_prefixFile}" _prefixFileLogPath)
+	else()
+		file (RELATIVE_PATH _prefixFileLogPath "${CMAKE_BINARY_DIR}" "${_prefixFile}")
+	endif()
+	get_filename_component(_prefixFileExt "${_prefixFile}" EXT)
+	if (_prefixFileExt MATCHES "^\\.c")
+		set (_comment "Generating ${_language} prefix source ${_prefixFileLogPath}")
+	else()
+		set (_comment "Generating ${_language} prefix header ${_prefixFileLogPath}")
+	endif()
+	# prevent pre-processing errors upon generating the prefix header when a target's generated include file does not yet exist
+	# we do not add a file-level dependency for the target's generated files though, because we only want to depend on their existence
+	# thus we make the prefix header generation depend on a custom helper target which triggers the generation of the files
+	set (_preTargetName "${_target}${COTIRE_PCH_TARGET_SUFFIX}_pre")
+	if (TARGET ${_preTargetName})
+		# custom helper target has already been generated while processing a different language
+		list (APPEND _dependencySources ${_preTargetName})
+	else()
+		get_target_property(_targetSourceFiles ${_target} SOURCES)
+		cotire_get_objects_with_property_on(_generatedSources GENERATED SOURCE ${_targetSourceFiles})
+		if (_generatedSources)
+			add_custom_target("${_preTargetName}" DEPENDS ${_generatedSources})
+			cotire_init_target("${_preTargetName}")
+			list (APPEND _dependencySources ${_preTargetName})
+		endif()
+	endif()
+	add_custom_command(
+		OUTPUT "${_prefixFile}" "${_prefixFile}.log"
+		COMMAND ${_prefixCmd}
+		DEPENDS ${_unityFiles} ${_dependencySources} "${_realCompilerExe}"
+		COMMENT "${_comment}"
+		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+		VERBATIM)
+	list (APPEND ${_cmdsVar} COMMAND ${_prefixCmd})
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_prefix_generation_from_unity_command _language _target _targetScript _prefixFile _unityFiles _cmdsVar)
+	set (_sourceFiles ${ARGN})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+		# GNU and Clang require indirect compilation of the prefix header to make them honor the system_header pragma
+		cotire_prefix_header_to_source_file_path(${_language} "${_prefixFile}" _prefixSourceFile)
+	else()
+		set (_prefixSourceFile "${_prefixFile}")
+	endif()
+	cotire_setup_prefix_generation_command(
+		${_language} ${_target} "${_targetScript}"
+		"${_prefixSourceFile}" "${_unityFiles}" ${_cmdsVar} ${_sourceFiles})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+		# set up generation of a prefix source file which includes the prefix header
+		cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixFile}" _cmds ${_prefixSourceFile})
+	endif()
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_prefix_generation_from_provided_command _language _target _targetScript _prefixFile _cmdsVar)
+	set (_prefixHeaderFiles ${ARGN})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+		# GNU and Clang require indirect compilation of the prefix header to make them honor the system_header pragma
+		cotire_prefix_header_to_source_file_path(${_language} "${_prefixFile}" _prefixSourceFile)
+	else()
+		set (_prefixSourceFile "${_prefixFile}")
+	endif()
+	cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixSourceFile}" _cmds ${_prefixHeaderFiles})
+	if (CMAKE_${_language}_COMPILER_ID MATCHES "GNU|Clang")
+		# set up generation of a prefix source file which includes the prefix header
+		cotire_setup_combine_command(${_language} "${_targetScript}" "${_prefixFile}" _cmds ${_prefixSourceFile})
+	endif()
+	set (${_cmdsVar} ${${_cmdsVar}} PARENT_SCOPE)
+endfunction()
+
+function (cotire_init_cotire_target_properties _target)
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER TRUE)
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD TRUE)
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_ADD_CLEAN SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_ADD_CLEAN FALSE)
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_SOURCE_DIR}")
+		cotire_check_is_path_relative_to("${CMAKE_BINARY_DIR}" _isRelative "${CMAKE_SOURCE_DIR}")
+		if (NOT _isRelative)
+			set_property(TARGET ${_target} APPEND PROPERTY COTIRE_PREFIX_HEADER_IGNORE_PATH "${CMAKE_BINARY_DIR}")
+		endif()
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PATH SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PATH "")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH "")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_PRE_UNDEFS SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_PRE_UNDEFS "")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_POST_UNDEFS SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_POST_UNDEFS "")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT SET)
+	if (NOT _isSet)
+		set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_LINK_LIBRARIES_INIT "COPY_UNITY")
+	endif()
+	get_property(_isSet TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES SET)
+	if (NOT _isSet)
+		if (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES)
+			set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES "${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES}")
+		else()
+			set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES "")
+		endif()
+	endif()
+endfunction()
+
+function (cotire_make_target_message _target _languages _disableMsg _targetMsgVar)
+	get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER)
+	get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD)
+	string (REPLACE ";" " " _languagesStr "${_languages}")
+	math (EXPR _numberOfExcludedFiles "${ARGC} - 4")
+	if (_numberOfExcludedFiles EQUAL 0)
+		set (_excludedStr "")
+	elseif (COTIRE_VERBOSE OR _numberOfExcludedFiles LESS 4)
+		string (REPLACE ";" ", " _excludedStr "excluding ${ARGN}")
+	else()
+		set (_excludedStr "excluding ${_numberOfExcludedFiles} files")
+	endif()
+	set (_targetMsg "")
+	if (NOT _languages)
+		set (_targetMsg "Target ${_target} cannot be cotired.")
+		if (_disableMsg)
+			set (_targetMsg "${_targetMsg} ${_disableMsg}")
+		endif()
+	elseif (NOT _targetUsePCH AND NOT _targetAddSCU)
+		set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build and precompiled header.")
+		if (_disableMsg)
+			set (_targetMsg "${_targetMsg} ${_disableMsg}")
+		endif()
+	elseif (NOT _targetUsePCH)
+		if (_excludedStr)
+			set (_targetMsg "${_languagesStr} target ${_target} cotired without precompiled header ${_excludedStr}.")
+		else()
+			set (_targetMsg "${_languagesStr} target ${_target} cotired without precompiled header.")
+		endif()
+		if (_disableMsg)
+			set (_targetMsg "${_targetMsg} ${_disableMsg}")
+		endif()
+	elseif (NOT _targetAddSCU)
+		if (_excludedStr)
+			set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build ${_excludedStr}.")
+		else()
+			set (_targetMsg "${_languagesStr} target ${_target} cotired without unity build.")
+		endif()
+	else()
+		if (_excludedStr)
+			set (_targetMsg "${_languagesStr} target ${_target} cotired ${_excludedStr}.")
+		else()
+			set (_targetMsg "${_languagesStr} target ${_target} cotired.")
+		endif()
+	endif()
+	set (${_targetMsgVar} "${_targetMsg}" PARENT_SCOPE)
+endfunction()
+
+function (cotire_choose_target_languages _target _targetLanguagesVar _wholeTargetVar)
+	set (_languages ${ARGN})
+	set (_allSourceFiles "")
+	set (_allExcludedSourceFiles "")
+	set (_allCotiredSourceFiles "")
+	set (_targetLanguages "")
+	set (_pchEligibleTargetLanguages "")
+	get_target_property(_targetType ${_target} TYPE)
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER)
+	get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD)
+	set (_disableMsg "")
+	foreach (_language ${_languages})
+		get_target_property(_prefixHeader ${_target} COTIRE_${_language}_PREFIX_HEADER)
+		get_target_property(_unityBuildFile ${_target} COTIRE_${_language}_UNITY_SOURCE)
+		if (_prefixHeader OR _unityBuildFile)
+			message (STATUS "cotire: target ${_target} has already been cotired.")
+			set (${_targetLanguagesVar} "" PARENT_SCOPE)
+			return()
+		endif()
+		if (_targetUsePCH AND "${_language}" MATCHES "^C|CXX$" AND DEFINED CMAKE_${_language}_COMPILER_ID)
+			if (CMAKE_${_language}_COMPILER_ID)
+				cotire_check_precompiled_header_support("${_language}" "${_target}" _disableMsg)
+				if (_disableMsg)
+					set (_targetUsePCH FALSE)
+				endif()
+			endif()
+		endif()
+		set (_sourceFiles "")
+		set (_excludedSources "")
+		set (_cotiredSources "")
+		cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles})
+		if (_sourceFiles OR _excludedSources OR _cotiredSources)
+			list (APPEND _targetLanguages ${_language})
+		endif()
+		if (_sourceFiles)
+			list (APPEND _allSourceFiles ${_sourceFiles})
+		endif()
+		list (LENGTH _sourceFiles _numberOfSources)
+		if (NOT _numberOfSources LESS ${COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES})
+			list (APPEND _pchEligibleTargetLanguages ${_language})
+		endif()
+		if (_excludedSources)
+			list (APPEND _allExcludedSourceFiles ${_excludedSources})
+		endif()
+		if (_cotiredSources)
+			list (APPEND _allCotiredSourceFiles ${_cotiredSources})
+		endif()
+	endforeach()
+	set (_targetMsgLevel STATUS)
+	if (NOT _targetLanguages)
+		string (REPLACE ";" " or " _languagesStr "${_languages}")
+		set (_disableMsg "No ${_languagesStr} source files.")
+		set (_targetUsePCH FALSE)
+		set (_targetAddSCU FALSE)
+	endif()
+	if (_targetUsePCH)
+		if (_allCotiredSourceFiles)
+			cotire_get_source_file_property_values(_cotireTargets COTIRE_TARGET ${_allCotiredSourceFiles})
+			list (REMOVE_DUPLICATES _cotireTargets)
+			string (REPLACE ";" ", " _cotireTargetsStr "${_cotireTargets}")
+			set (_disableMsg "Target sources already include a precompiled header for target(s) ${_cotireTargets}.")
+			set (_disableMsg "${_disableMsg} Set target property COTIRE_ENABLE_PRECOMPILED_HEADER to FALSE for targets ${_target},")
+			set (_disableMsg "${_disableMsg} ${_cotireTargetsStr} to get a workable build system.")
+			set (_targetMsgLevel SEND_ERROR)
+			set (_targetUsePCH FALSE)
+		elseif (NOT _pchEligibleTargetLanguages)
+			set (_disableMsg "Too few applicable sources.")
+			set (_targetUsePCH FALSE)
+		elseif (XCODE AND _allExcludedSourceFiles)
+			# for Xcode, we cannot apply the precompiled header to individual sources, only to the whole target
+			set (_disableMsg "Exclusion of source files not supported for generator Xcode.")
+			set (_targetUsePCH FALSE)
+		elseif (XCODE AND "${_targetType}" STREQUAL "OBJECT_LIBRARY")
+			# for Xcode, we cannot apply the required PRE_BUILD action to generate the prefix header to an OBJECT_LIBRARY target
+			set (_disableMsg "Required PRE_BUILD action not supported for OBJECT_LIBRARY targets for generator Xcode.")
+			set (_targetUsePCH FALSE)
+		endif()
+	endif()
+	set_property(TARGET ${_target} PROPERTY COTIRE_ENABLE_PRECOMPILED_HEADER ${_targetUsePCH})
+	set_property(TARGET ${_target} PROPERTY COTIRE_ADD_UNITY_BUILD ${_targetAddSCU})
+	cotire_make_target_message(${_target} "${_targetLanguages}" "${_disableMsg}" _targetMsg ${_allExcludedSourceFiles})
+	if (_targetMsg)
+		if (NOT DEFINED COTIREMSG_${_target})
+			set (COTIREMSG_${_target} "")
+		endif()
+		if (COTIRE_VERBOSE OR NOT "${_targetMsgLevel}" STREQUAL "STATUS" OR
+			NOT "${COTIREMSG_${_target}}" STREQUAL "${_targetMsg}")
+			# cache message to avoid redundant messages on re-configure
+			set (COTIREMSG_${_target} "${_targetMsg}" CACHE INTERNAL "${_target} cotire message.")
+			message (${_targetMsgLevel} "${_targetMsg}")
+		endif()
+	endif()
+	list (LENGTH _targetLanguages _numberOfLanguages)
+	if (_numberOfLanguages GREATER 1 OR _allExcludedSourceFiles)
+		set (${_wholeTargetVar} FALSE PARENT_SCOPE)
+	else()
+		set (${_wholeTargetVar} TRUE PARENT_SCOPE)
+	endif()
+	set (${_targetLanguagesVar} ${_targetLanguages} PARENT_SCOPE)
+endfunction()
+
+function (cotire_compute_unity_max_number_of_includes _target _maxIncludesVar)
+	set (_sourceFiles ${ARGN})
+	get_target_property(_maxIncludes ${_target} COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES)
+	if (_maxIncludes MATCHES "(-j|--parallel|--jobs) ?([0-9]*)")
+		set (_numberOfThreads "${CMAKE_MATCH_2}")
+		if (NOT _numberOfThreads)
+			# use all available cores
+			ProcessorCount(_numberOfThreads)
+		endif()
+		list (LENGTH _sourceFiles _numberOfSources)
+		math (EXPR _maxIncludes "(${_numberOfSources} + ${_numberOfThreads} - 1) / ${_numberOfThreads}")
+	elseif (NOT _maxIncludes MATCHES "[0-9]+")
+		set (_maxIncludes 0)
+	endif()
+	if (COTIRE_DEBUG)
+		message (STATUS "${_target} unity source max includes: ${_maxIncludes}")
+	endif()
+	set (${_maxIncludesVar} ${_maxIncludes} PARENT_SCOPE)
+endfunction()
+
+function (cotire_process_target_language _language _configurations _target _wholeTarget _cmdsVar)
+	set (${_cmdsVar} "" PARENT_SCOPE)
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	set (_sourceFiles "")
+	set (_excludedSources "")
+	set (_cotiredSources "")
+	cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles})
+	if (NOT _sourceFiles AND NOT _cotiredSources)
+		return()
+	endif()
+	set (_cmds "")
+	# check for user provided unity source file list
+	get_property(_unitySourceFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE_INIT)
+	if (NOT _unitySourceFiles)
+		set (_unitySourceFiles ${_sourceFiles} ${_cotiredSources})
+	endif()
+	cotire_generate_target_script(
+		${_language} "${_configurations}" ${_target} _targetScript _targetConfigScript ${_unitySourceFiles})
+	# set up unity files for parallel compilation
+	cotire_compute_unity_max_number_of_includes(${_target} _maxIncludes ${_unitySourceFiles})
+	cotire_make_unity_source_file_paths(${_language} ${_target} ${_maxIncludes} _unityFiles ${_unitySourceFiles})
+	list (LENGTH _unityFiles _numberOfUnityFiles)
+	if (_numberOfUnityFiles EQUAL 0)
+		return()
+	elseif (_numberOfUnityFiles GREATER 1)
+		cotire_setup_unity_generation_commands(
+			${_language} ${_target} "${_targetScript}" "${_targetConfigScript}" "${_unityFiles}" _cmds ${_unitySourceFiles})
+	endif()
+	# set up single unity file for prefix header generation
+	cotire_make_single_unity_source_file_path(${_language} ${_target} _unityFile)
+	cotire_setup_unity_generation_commands(
+		${_language} ${_target} "${_targetScript}" "${_targetConfigScript}" "${_unityFile}" _cmds ${_unitySourceFiles})
+	cotire_make_prefix_file_path(${_language} ${_target} _prefixFile)
+	# set up prefix header
+	if (_prefixFile)
+		# check for user provided prefix header files
+		get_property(_prefixHeaderFiles TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER_INIT)
+		if (_prefixHeaderFiles)
+			cotire_setup_prefix_generation_from_provided_command(
+				${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" _cmds ${_prefixHeaderFiles})
+		else()
+			cotire_setup_prefix_generation_from_unity_command(
+				${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" "${_unityFile}" _cmds ${_unitySourceFiles})
+		endif()
+		# check if selected language has enough sources at all
+		list (LENGTH _sourceFiles _numberOfSources)
+		if (_numberOfSources LESS ${COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES})
+			set (_targetUsePCH FALSE)
+		else()
+			get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER)
+		endif()
+		if (_targetUsePCH)
+			cotire_make_pch_file_path(${_language} ${_target} _pchFile)
+			if (_pchFile)
+				# first file in _sourceFiles is passed as the host file
+				cotire_setup_pch_file_compilation(
+					${_language} ${_target} "${_targetConfigScript}" "${_prefixFile}" "${_pchFile}" ${_sourceFiles})
+				cotire_setup_pch_file_inclusion(
+					${_language} ${_target} ${_wholeTarget} "${_prefixFile}" "${_pchFile}" ${_sourceFiles})
+			endif()
+		elseif (_prefixHeaderFiles)
+			# user provided prefix header must be included unconditionally
+			cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_sourceFiles})
+		endif()
+	endif()
+	# mark target as cotired for language
+	set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE "${_unityFiles}")
+	if (_prefixFile)
+		set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER "${_prefixFile}")
+		if (_targetUsePCH AND _pchFile)
+			set_property(TARGET ${_target} PROPERTY COTIRE_${_language}_PRECOMPILED_HEADER "${_pchFile}")
+		endif()
+	endif()
+	set (${_cmdsVar} ${_cmds} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_clean_target _target)
+	set (_cleanTargetName "${_target}${COTIRE_CLEAN_TARGET_SUFFIX}")
+	if (NOT TARGET "${_cleanTargetName}")
+		cotire_set_cmd_to_prologue(_cmds)
+		get_filename_component(_outputDir "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}" ABSOLUTE)
+		list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "cleanup" "${_outputDir}" "${COTIRE_INTDIR}" "${_target}")
+		add_custom_target(${_cleanTargetName}
+			COMMAND ${_cmds}
+			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+			COMMENT "Cleaning up target ${_target} cotire generated files"
+			VERBATIM)
+		cotire_init_target("${_cleanTargetName}")
+	endif()
+endfunction()
+
+function (cotire_setup_pch_target _languages _configurations _target)
+	if ("${CMAKE_GENERATOR}" MATCHES "Make|Ninja")
+		# for makefile based generators, we add a custom target to trigger the generation of the cotire related files
+		set (_dependsFiles "")
+		foreach (_language ${_languages})
+			set (_props COTIRE_${_language}_PREFIX_HEADER COTIRE_${_language}_UNITY_SOURCE)
+			if (NOT CMAKE_${_language}_COMPILER_ID MATCHES "MSVC|Intel")
+				# Visual Studio and Intel only create precompiled header as a side effect
+				list (INSERT _props 0 COTIRE_${_language}_PRECOMPILED_HEADER)
+			endif()
+			cotire_get_first_set_property_value(_dependsFile TARGET ${_target} ${_props})
+			if (_dependsFile)
+				list (APPEND _dependsFiles "${_dependsFile}")
+			endif()
+		endforeach()
+		if (_dependsFiles)
+			set (_pchTargetName "${_target}${COTIRE_PCH_TARGET_SUFFIX}")
+			add_custom_target("${_pchTargetName}" DEPENDS ${_dependsFiles})
+			cotire_init_target("${_pchTargetName}")
+			cotire_add_to_pch_all_target(${_pchTargetName})
+		endif()
+	else()
+		# for other generators, we add the "clean all" target to clean up the precompiled header
+		cotire_setup_clean_all_target()
+	endif()
+endfunction()
+
+function (cotire_filter_object_libraries _target _objectLibrariesVar)
+	set (_objectLibraries "")
+	foreach (_source ${ARGN})
+		if (_source MATCHES "^\\$<TARGET_OBJECTS:.+>$")
+			list (APPEND _objectLibraries "${_source}")
+		endif()
+	endforeach()
+	set (${_objectLibrariesVar} ${_objectLibraries} PARENT_SCOPE)
+endfunction()
+
+function (cotire_collect_unity_target_sources _target _languages _unityTargetSourcesVar)
+	get_target_property(_targetSourceFiles ${_target} SOURCES)
+	set (_unityTargetSources ${_targetSourceFiles})
+	foreach (_language ${_languages})
+		get_property(_unityFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE)
+		if (_unityFiles)
+			# remove source files that are included in the unity source
+			set (_sourceFiles "")
+			set (_excludedSources "")
+			set (_cotiredSources "")
+			cotire_filter_language_source_files(${_language} ${_target} _sourceFiles _excludedSources _cotiredSources ${_targetSourceFiles})
+			if (_sourceFiles OR _cotiredSources)
+				list (REMOVE_ITEM _unityTargetSources ${_sourceFiles} ${_cotiredSources})
+			endif()
+			# add unity source files instead
+			list (APPEND _unityTargetSources ${_unityFiles})
+		endif()
+	endforeach()
+	get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT)
+	if ("${_linkLibrariesStrategy}" MATCHES "^COPY_UNITY$")
+		cotire_filter_object_libraries(${_target} _objectLibraries ${_targetSourceFiles})
+		if (_objectLibraries)
+			cotire_map_libraries("${_linkLibrariesStrategy}" _unityObjectLibraries ${_objectLibraries})
+			list (REMOVE_ITEM _unityTargetSources ${_objectLibraries})
+			list (APPEND _unityTargetSources ${_unityObjectLibraries})
+		endif()
+	endif()
+	set (${_unityTargetSourcesVar} ${_unityTargetSources} PARENT_SCOPE)
+endfunction()
+
+function (cotire_setup_unity_target_pch_usage _languages _target)
+	foreach (_language ${_languages})
+		get_property(_unityFiles TARGET ${_target} PROPERTY COTIRE_${_language}_UNITY_SOURCE)
+		if (_unityFiles)
+			get_property(_userPrefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER_INIT)
+			get_property(_prefixFile TARGET ${_target} PROPERTY COTIRE_${_language}_PREFIX_HEADER)
+			if (_userPrefixFile AND _prefixFile)
+				# user provided prefix header must be included unconditionally by unity sources
+				cotire_setup_prefix_file_inclusion(${_language} ${_target} "${_prefixFile}" ${_unityFiles})
+			endif()
+		endif()
+	endforeach()
+endfunction()
+
+function (cotire_setup_unity_build_target _languages _configurations _target)
+	get_target_property(_unityTargetName ${_target} COTIRE_UNITY_TARGET_NAME)
+	if (NOT _unityTargetName)
+		set (_unityTargetName "${_target}${COTIRE_UNITY_BUILD_TARGET_SUFFIX}")
+	endif()
+	# determine unity target sub type
+	get_target_property(_targetType ${_target} TYPE)
+	if ("${_targetType}" STREQUAL "EXECUTABLE")
+		set (_unityTargetSubType "")
+	elseif (_targetType MATCHES "(STATIC|SHARED|MODULE|OBJECT)_LIBRARY")
+		set (_unityTargetSubType "${CMAKE_MATCH_1}")
+	else()
+		message (WARNING "cotire: target ${_target} has unknown target type ${_targetType}.")
+		return()
+	endif()
+	# determine unity target sources
+	set (_unityTargetSources "")
+	cotire_collect_unity_target_sources(${_target} "${_languages}" _unityTargetSources)
+	# handle automatic Qt processing
+	get_target_property(_targetAutoMoc ${_target} AUTOMOC)
+	get_target_property(_targetAutoUic ${_target} AUTOUIC)
+	get_target_property(_targetAutoRcc ${_target} AUTORCC)
+	if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
+		# if the original target sources are subject to CMake's automatic Qt processing,
+		# also include implicitly generated <targetname>_automoc.cpp file
+		if (CMAKE_VERSION VERSION_LESS "3.8.0")
+			list (APPEND _unityTargetSources "${_target}_automoc.cpp")
+			set_property (SOURCE "${_target}_automoc.cpp" PROPERTY GENERATED TRUE)
+		else()
+			list (APPEND _unityTargetSources "${_target}_autogen/moc_compilation.cpp")
+			set_property (SOURCE "${_target}_autogen/moc_compilation.cpp" PROPERTY GENERATED TRUE)
+		endif()
+	endif()
+	# prevent AUTOMOC, AUTOUIC and AUTORCC properties from being set when the unity target is created
+	set (CMAKE_AUTOMOC OFF)
+	set (CMAKE_AUTOUIC OFF)
+	set (CMAKE_AUTORCC OFF)
+	if (COTIRE_DEBUG)
+		message (STATUS "add target ${_targetType} ${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources}")
+	endif()
+	# generate unity target
+	if ("${_targetType}" STREQUAL "EXECUTABLE")
+		add_executable(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources})
+	else()
+		add_library(${_unityTargetName} ${_unityTargetSubType} EXCLUDE_FROM_ALL ${_unityTargetSources})
+	endif()
+	if ("${CMAKE_GENERATOR}" MATCHES "Visual Studio")
+		# depend on original target's automoc target, if it exists
+		if (TARGET ${_target}_automoc)
+			add_dependencies(${_unityTargetName} ${_target}_automoc)
+		endif()
+	else()
+		if (_targetAutoMoc OR _targetAutoUic OR _targetAutoRcc)
+			# depend on the original target's implicity generated <targetname>_automoc target
+			if (CMAKE_VERSION VERSION_LESS "3.8.0")
+				add_dependencies(${_unityTargetName} ${_target}_automoc)
+			else()
+				add_dependencies(${_unityTargetName} ${_target}_autogen)
+			endif()
+		endif()
+	endif()
+	# copy output location properties
+	set (_outputDirProperties
+		ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_<CONFIG>
+		LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_<CONFIG>
+		RUNTIME_OUTPUT_DIRECTORY RUNTIME_OUTPUT_DIRECTORY_<CONFIG>)
+	if (COTIRE_UNITY_OUTPUT_DIRECTORY)
+		set (_setDefaultOutputDir TRUE)
+		if (IS_ABSOLUTE "${COTIRE_UNITY_OUTPUT_DIRECTORY}")
+			set (_outputDir "${COTIRE_UNITY_OUTPUT_DIRECTORY}")
+		else()
+			# append relative COTIRE_UNITY_OUTPUT_DIRECTORY to target's actual output directory
+			cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName} ${_outputDirProperties})
+			cotire_resolve_config_properties("${_configurations}" _properties ${_outputDirProperties})
+			foreach (_property ${_properties})
+				get_property(_outputDir TARGET ${_target} PROPERTY ${_property})
+				if (_outputDir)
+					get_filename_component(_outputDir "${_outputDir}/${COTIRE_UNITY_OUTPUT_DIRECTORY}" ABSOLUTE)
+					set_property(TARGET ${_unityTargetName} PROPERTY ${_property} "${_outputDir}")
+					set (_setDefaultOutputDir FALSE)
+				endif()
+			endforeach()
+			if (_setDefaultOutputDir)
+				get_filename_component(_outputDir "${CMAKE_CURRENT_BINARY_DIR}/${COTIRE_UNITY_OUTPUT_DIRECTORY}" ABSOLUTE)
+			endif()
+		endif()
+		if (_setDefaultOutputDir)
+			set_target_properties(${_unityTargetName} PROPERTIES
+				ARCHIVE_OUTPUT_DIRECTORY "${_outputDir}"
+				LIBRARY_OUTPUT_DIRECTORY "${_outputDir}"
+				RUNTIME_OUTPUT_DIRECTORY "${_outputDir}")
+		endif()
+	else()
+		cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+			${_outputDirProperties})
+	endif()
+	# copy output name
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_<CONFIG>
+		LIBRARY_OUTPUT_NAME LIBRARY_OUTPUT_NAME_<CONFIG>
+		OUTPUT_NAME OUTPUT_NAME_<CONFIG>
+		RUNTIME_OUTPUT_NAME RUNTIME_OUTPUT_NAME_<CONFIG>
+		PREFIX <CONFIG>_POSTFIX SUFFIX
+		IMPORT_PREFIX IMPORT_SUFFIX)
+	# copy compile stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		COMPILE_DEFINITIONS COMPILE_DEFINITIONS_<CONFIG>
+		COMPILE_FLAGS COMPILE_OPTIONS
+		Fortran_FORMAT Fortran_MODULE_DIRECTORY
+		INCLUDE_DIRECTORIES
+		INTERPROCEDURAL_OPTIMIZATION INTERPROCEDURAL_OPTIMIZATION_<CONFIG>
+		POSITION_INDEPENDENT_CODE
+		C_COMPILER_LAUNCHER CXX_COMPILER_LAUNCHER
+		C_INCLUDE_WHAT_YOU_USE CXX_INCLUDE_WHAT_YOU_USE
+		C_VISIBILITY_PRESET CXX_VISIBILITY_PRESET VISIBILITY_INLINES_HIDDEN
+		C_CLANG_TIDY CXX_CLANG_TIDY)
+	# copy compile features
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		C_EXTENSIONS C_STANDARD C_STANDARD_REQUIRED
+		CXX_EXTENSIONS CXX_STANDARD CXX_STANDARD_REQUIRED
+		COMPILE_FEATURES)
+	# copy interface stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		COMPATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN
+		COMPATIBLE_INTERFACE_STRING
+		INTERFACE_COMPILE_DEFINITIONS INTERFACE_COMPILE_FEATURES INTERFACE_COMPILE_OPTIONS
+		INTERFACE_INCLUDE_DIRECTORIES INTERFACE_SOURCES
+		INTERFACE_POSITION_INDEPENDENT_CODE INTERFACE_SYSTEM_INCLUDE_DIRECTORIES
+		INTERFACE_AUTOUIC_OPTIONS NO_SYSTEM_FROM_IMPORTED)
+	# copy link stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		BUILD_WITH_INSTALL_RPATH INSTALL_RPATH INSTALL_RPATH_USE_LINK_PATH SKIP_BUILD_RPATH
+		LINKER_LANGUAGE LINK_DEPENDS LINK_DEPENDS_NO_SHARED
+		LINK_FLAGS LINK_FLAGS_<CONFIG>
+		LINK_INTERFACE_LIBRARIES LINK_INTERFACE_LIBRARIES_<CONFIG>
+		LINK_INTERFACE_MULTIPLICITY LINK_INTERFACE_MULTIPLICITY_<CONFIG>
+		LINK_SEARCH_START_STATIC LINK_SEARCH_END_STATIC
+		STATIC_LIBRARY_FLAGS STATIC_LIBRARY_FLAGS_<CONFIG>
+		NO_SONAME SOVERSION VERSION
+		LINK_WHAT_YOU_USE BUILD_RPATH)
+	# copy cmake stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		IMPLICIT_DEPENDS_INCLUDE_TRANSFORM RULE_LAUNCH_COMPILE RULE_LAUNCH_CUSTOM RULE_LAUNCH_LINK)
+	# copy Apple platform specific stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		BUNDLE BUNDLE_EXTENSION FRAMEWORK FRAMEWORK_VERSION INSTALL_NAME_DIR
+		MACOSX_BUNDLE MACOSX_BUNDLE_INFO_PLIST MACOSX_FRAMEWORK_INFO_PLIST MACOSX_RPATH
+		OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
+		IOS_INSTALL_COMBINED XCODE_EXPLICIT_FILE_TYPE XCODE_PRODUCT_TYPE)
+	# copy Windows platform specific stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		GNUtoMS
+		COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
+		COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_<CONFIG>
+		PDB_NAME PDB_NAME_<CONFIG> PDB_OUTPUT_DIRECTORY PDB_OUTPUT_DIRECTORY_<CONFIG>
+		VS_DESKTOP_EXTENSIONS_VERSION VS_DOTNET_REFERENCES VS_DOTNET_TARGET_FRAMEWORK_VERSION
+		VS_GLOBAL_KEYWORD VS_GLOBAL_PROJECT_TYPES VS_GLOBAL_ROOTNAMESPACE
+		VS_IOT_EXTENSIONS_VERSION VS_IOT_STARTUP_TASK
+		VS_KEYWORD VS_MOBILE_EXTENSIONS_VERSION
+		VS_SCC_AUXPATH VS_SCC_LOCALPATH VS_SCC_PROJECTNAME VS_SCC_PROVIDER
+		VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
+		VS_WINRT_COMPONENT VS_WINRT_EXTENSIONS VS_WINRT_REFERENCES
+		WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
+		DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
+		VS_SDK_REFERENCES VS_USER_PROPS VS_DEBUGGER_WORKING_DIRECTORY)
+	# copy Android platform specific stuff
+	cotire_copy_set_properties("${_configurations}" TARGET ${_target} ${_unityTargetName}
+		ANDROID_API ANDROID_API_MIN ANDROID_GUI
+		ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES
+		ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR
+		ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES
+		ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH
+		ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE)
+	# use output name from original target
+	get_target_property(_targetOutputName ${_unityTargetName} OUTPUT_NAME)
+	if (NOT _targetOutputName)
+		set_property(TARGET ${_unityTargetName} PROPERTY OUTPUT_NAME "${_target}")
+	endif()
+	# use export symbol from original target
+	cotire_get_target_export_symbol("${_target}" _defineSymbol)
+	if (_defineSymbol)
+		set_property(TARGET ${_unityTargetName} PROPERTY DEFINE_SYMBOL "${_defineSymbol}")
+		if ("${_targetType}" STREQUAL "EXECUTABLE")
+			set_property(TARGET ${_unityTargetName} PROPERTY ENABLE_EXPORTS TRUE)
+		endif()
+	endif()
+	cotire_init_target(${_unityTargetName})
+	cotire_add_to_unity_all_target(${_unityTargetName})
+	set_property(TARGET ${_target} PROPERTY COTIRE_UNITY_TARGET_NAME "${_unityTargetName}")
+endfunction(cotire_setup_unity_build_target)
+
+function (cotire_target _target)
+	set(_options "")
+	set(_oneValueArgs "")
+	set(_multiValueArgs LANGUAGES CONFIGURATIONS)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	if (NOT _option_LANGUAGES)
+		get_property (_option_LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
+	endif()
+	if (NOT _option_CONFIGURATIONS)
+		cotire_get_configuration_types(_option_CONFIGURATIONS)
+	endif()
+	# check if cotire can be applied to target at all
+	cotire_is_target_supported(${_target} _isSupported)
+	if (NOT _isSupported)
+		get_target_property(_imported ${_target} IMPORTED)
+		get_target_property(_targetType ${_target} TYPE)
+		if (_imported)
+			message (WARNING "cotire: imported ${_targetType} target ${_target} cannot be cotired.")
+		else()
+			message (STATUS "cotire: ${_targetType} target ${_target} cannot be cotired.")
+		endif()
+		return()
+	endif()
+	# resolve alias
+	get_target_property(_aliasName ${_target} ALIASED_TARGET)
+	if (_aliasName)
+		if (COTIRE_DEBUG)
+			message (STATUS "${_target} is an alias. Applying cotire to aliased target ${_aliasName} instead.")
+		endif()
+		set (_target ${_aliasName})
+	endif()
+	# check if target needs to be cotired for build type
+	# when using configuration types, the test is performed at build time
+	cotire_init_cotire_target_properties(${_target})
+	if (NOT CMAKE_CONFIGURATION_TYPES)
+		if (CMAKE_BUILD_TYPE)
+			list (FIND _option_CONFIGURATIONS "${CMAKE_BUILD_TYPE}" _index)
+		else()
+			list (FIND _option_CONFIGURATIONS "None" _index)
+		endif()
+		if (_index EQUAL -1)
+			if (COTIRE_DEBUG)
+				message (STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} not cotired (${_option_CONFIGURATIONS})")
+			endif()
+			return()
+		endif()
+	endif()
+	# when not using configuration types, immediately create cotire intermediate dir
+	if (NOT CMAKE_CONFIGURATION_TYPES)
+		cotire_get_intermediate_dir(_baseDir)
+		file (MAKE_DIRECTORY "${_baseDir}")
+	endif()
+	# choose languages that apply to the target
+	cotire_choose_target_languages("${_target}" _targetLanguages _wholeTarget ${_option_LANGUAGES})
+	if (NOT _targetLanguages)
+		return()
+	endif()
+	set (_cmds "")
+	foreach (_language ${_targetLanguages})
+		cotire_process_target_language("${_language}" "${_option_CONFIGURATIONS}" ${_target} ${_wholeTarget} _cmd)
+		if (_cmd)
+			list (APPEND _cmds ${_cmd})
+		endif()
+	endforeach()
+	get_target_property(_targetAddSCU ${_target} COTIRE_ADD_UNITY_BUILD)
+	if (_targetAddSCU)
+		cotire_setup_unity_build_target("${_targetLanguages}" "${_option_CONFIGURATIONS}" ${_target})
+	endif()
+	get_target_property(_targetUsePCH ${_target} COTIRE_ENABLE_PRECOMPILED_HEADER)
+	if (_targetUsePCH)
+		cotire_setup_target_pch_usage("${_targetLanguages}" ${_target} ${_wholeTarget} ${_cmds})
+		cotire_setup_pch_target("${_targetLanguages}" "${_option_CONFIGURATIONS}" ${_target})
+		if (_targetAddSCU)
+			cotire_setup_unity_target_pch_usage("${_targetLanguages}" ${_target})
+		endif()
+	endif()
+	get_target_property(_targetAddCleanTarget ${_target} COTIRE_ADD_CLEAN)
+	if (_targetAddCleanTarget)
+		cotire_setup_clean_target(${_target})
+	endif()
+endfunction(cotire_target)
+
+function (cotire_map_libraries _strategy _mappedLibrariesVar)
+	set (_mappedLibraries "")
+	foreach (_library ${ARGN})
+		if (_library MATCHES "^\\$<LINK_ONLY:(.+)>$")
+			set (_libraryName "${CMAKE_MATCH_1}")
+			set (_linkOnly TRUE)
+			set (_objectLibrary FALSE)
+		elseif (_library MATCHES "^\\$<TARGET_OBJECTS:(.+)>$")
+			set (_libraryName "${CMAKE_MATCH_1}")
+			set (_linkOnly FALSE)
+			set (_objectLibrary TRUE)
+		else()
+			set (_libraryName "${_library}")
+			set (_linkOnly FALSE)
+			set (_objectLibrary FALSE)
+		endif()
+		if ("${_strategy}" MATCHES "COPY_UNITY")
+			cotire_is_target_supported(${_libraryName} _isSupported)
+			if (_isSupported)
+				# use target's corresponding unity target, if available
+				get_target_property(_libraryUnityTargetName ${_libraryName} COTIRE_UNITY_TARGET_NAME)
+				if (TARGET "${_libraryUnityTargetName}")
+					if (_linkOnly)
+						list (APPEND _mappedLibraries "$<LINK_ONLY:${_libraryUnityTargetName}>")
+					elseif (_objectLibrary)
+						list (APPEND _mappedLibraries "$<TARGET_OBJECTS:${_libraryUnityTargetName}>")
+					else()
+						list (APPEND _mappedLibraries "${_libraryUnityTargetName}")
+					endif()
+				else()
+					list (APPEND _mappedLibraries "${_library}")
+				endif()
+			else()
+				list (APPEND _mappedLibraries "${_library}")
+			endif()
+		else()
+			list (APPEND _mappedLibraries "${_library}")
+		endif()
+	endforeach()
+	list (REMOVE_DUPLICATES _mappedLibraries)
+	set (${_mappedLibrariesVar} ${_mappedLibraries} PARENT_SCOPE)
+endfunction()
+
+function (cotire_target_link_libraries _target)
+	cotire_is_target_supported(${_target} _isSupported)
+	if (NOT _isSupported)
+		return()
+	endif()
+	get_target_property(_unityTargetName ${_target} COTIRE_UNITY_TARGET_NAME)
+	if (TARGET "${_unityTargetName}")
+		get_target_property(_linkLibrariesStrategy ${_target} COTIRE_UNITY_LINK_LIBRARIES_INIT)
+		if (COTIRE_DEBUG)
+			message (STATUS "unity target ${_unityTargetName} link strategy: ${_linkLibrariesStrategy}")
+		endif()
+		if ("${_linkLibrariesStrategy}" MATCHES "^(COPY|COPY_UNITY)$")
+			get_target_property(_linkLibraries ${_target} LINK_LIBRARIES)
+			if (_linkLibraries)
+				cotire_map_libraries("${_linkLibrariesStrategy}" _unityLinkLibraries ${_linkLibraries})
+				set_target_properties(${_unityTargetName} PROPERTIES LINK_LIBRARIES "${_unityLinkLibraries}")
+				if (COTIRE_DEBUG)
+					message (STATUS "unity target ${_unityTargetName} link libraries: ${_unityLinkLibraries}")
+				endif()
+			endif()
+			get_target_property(_interfaceLinkLibraries ${_target} INTERFACE_LINK_LIBRARIES)
+			if (_interfaceLinkLibraries)
+				cotire_map_libraries("${_linkLibrariesStrategy}" _unityLinkInterfaceLibraries ${_interfaceLinkLibraries})
+				set_target_properties(${_unityTargetName} PROPERTIES INTERFACE_LINK_LIBRARIES "${_unityLinkInterfaceLibraries}")
+				if (COTIRE_DEBUG)
+					message (STATUS "unity target ${_unityTargetName} interface link libraries: ${_unityLinkInterfaceLibraries}")
+				endif()
+			endif()
+		endif()
+	endif()
+endfunction(cotire_target_link_libraries)
+
+function (cotire_cleanup _binaryDir _cotireIntermediateDirName _targetName)
+	if (_targetName)
+		file (GLOB_RECURSE _cotireFiles "${_binaryDir}/${_targetName}*.*")
+	else()
+		file (GLOB_RECURSE _cotireFiles "${_binaryDir}/*.*")
+	endif()
+	# filter files in intermediate directory
+	set (_filesToRemove "")
+	foreach (_file ${_cotireFiles})
+		get_filename_component(_dir "${_file}" DIRECTORY)
+		get_filename_component(_dirName "${_dir}" NAME)
+		if ("${_dirName}" STREQUAL "${_cotireIntermediateDirName}")
+			list (APPEND _filesToRemove "${_file}")
+		endif()
+	endforeach()
+	if (_filesToRemove)
+		if (COTIRE_VERBOSE)
+			message (STATUS "cleaning up ${_filesToRemove}")
+		endif()
+		file (REMOVE ${_filesToRemove})
+	endif()
+endfunction()
+
+function (cotire_init_target _targetName)
+	if (COTIRE_TARGETS_FOLDER)
+		set_target_properties(${_targetName} PROPERTIES FOLDER "${COTIRE_TARGETS_FOLDER}")
+	endif()
+	set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_ALL TRUE)
+	if (MSVC_IDE)
+		set_target_properties(${_targetName} PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
+	endif()
+endfunction()
+
+function (cotire_add_to_pch_all_target _pchTargetName)
+	set (_targetName "${COTIRE_PCH_ALL_TARGET_NAME}")
+	if (NOT TARGET "${_targetName}")
+		add_custom_target("${_targetName}"
+			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+			VERBATIM)
+		cotire_init_target("${_targetName}")
+	endif()
+	cotire_setup_clean_all_target()
+	add_dependencies(${_targetName} ${_pchTargetName})
+endfunction()
+
+function (cotire_add_to_unity_all_target _unityTargetName)
+	set (_targetName "${COTIRE_UNITY_BUILD_ALL_TARGET_NAME}")
+	if (NOT TARGET "${_targetName}")
+		add_custom_target("${_targetName}"
+			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+			VERBATIM)
+		cotire_init_target("${_targetName}")
+	endif()
+	cotire_setup_clean_all_target()
+	add_dependencies(${_targetName} ${_unityTargetName})
+endfunction()
+
+function (cotire_setup_clean_all_target)
+	set (_targetName "${COTIRE_CLEAN_ALL_TARGET_NAME}")
+	if (NOT TARGET "${_targetName}")
+		cotire_set_cmd_to_prologue(_cmds)
+		list (APPEND _cmds -P "${COTIRE_CMAKE_MODULE_FILE}" "cleanup" "${CMAKE_BINARY_DIR}" "${COTIRE_INTDIR}")
+		add_custom_target(${_targetName}
+			COMMAND ${_cmds}
+			WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
+			COMMENT "Cleaning up all cotire generated files"
+			VERBATIM)
+		cotire_init_target("${_targetName}")
+	endif()
+endfunction()
+
+function (cotire)
+	set(_options "")
+	set(_oneValueArgs "")
+	set(_multiValueArgs LANGUAGES CONFIGURATIONS)
+	cmake_parse_arguments(_option "${_options}" "${_oneValueArgs}" "${_multiValueArgs}" ${ARGN})
+	set (_targets ${_option_UNPARSED_ARGUMENTS})
+	foreach (_target ${_targets})
+		if (TARGET ${_target})
+			cotire_target(${_target} LANGUAGES ${_option_LANGUAGES} CONFIGURATIONS ${_option_CONFIGURATIONS})
+		else()
+			message (WARNING "cotire: ${_target} is not a target.")
+		endif()
+	endforeach()
+	foreach (_target ${_targets})
+		if (TARGET ${_target})
+			cotire_target_link_libraries(${_target})
+		endif()
+	endforeach()
+endfunction()
+
+if (CMAKE_SCRIPT_MODE_FILE)
+
+	# cotire is being run in script mode
+	# locate -P on command args
+	set (COTIRE_ARGC -1)
+	foreach (_index RANGE ${CMAKE_ARGC})
+		if (COTIRE_ARGC GREATER -1)
+			set (COTIRE_ARGV${COTIRE_ARGC} "${CMAKE_ARGV${_index}}")
+			math (EXPR COTIRE_ARGC "${COTIRE_ARGC} + 1")
+		elseif ("${CMAKE_ARGV${_index}}" STREQUAL "-P")
+			set (COTIRE_ARGC 0)
+		endif()
+	endforeach()
+
+	# include target script if available
+	if ("${COTIRE_ARGV2}" MATCHES "\\.cmake$")
+		# the included target scripts sets up additional variables relating to the target (e.g., COTIRE_TARGET_SOURCES)
+		include("${COTIRE_ARGV2}")
+	endif()
+
+	if (COTIRE_DEBUG)
+		message (STATUS "${COTIRE_ARGV0} ${COTIRE_ARGV1} ${COTIRE_ARGV2} ${COTIRE_ARGV3} ${COTIRE_ARGV4} ${COTIRE_ARGV5}")
+	endif()
+
+	if (NOT COTIRE_BUILD_TYPE)
+		set (COTIRE_BUILD_TYPE "None")
+	endif()
+	string (TOUPPER "${COTIRE_BUILD_TYPE}" _upperConfig)
+	set (_includeDirs ${COTIRE_TARGET_INCLUDE_DIRECTORIES_${_upperConfig}})
+	set (_systemIncludeDirs ${COTIRE_TARGET_SYSTEM_INCLUDE_DIRECTORIES_${_upperConfig}})
+	set (_compileDefinitions ${COTIRE_TARGET_COMPILE_DEFINITIONS_${_upperConfig}})
+	set (_compileFlags ${COTIRE_TARGET_COMPILE_FLAGS_${_upperConfig}})
+	# check if target has been cotired for actual build type COTIRE_BUILD_TYPE
+	list (FIND COTIRE_TARGET_CONFIGURATION_TYPES "${COTIRE_BUILD_TYPE}" _index)
+	if (_index GREATER -1)
+		set (_sources ${COTIRE_TARGET_SOURCES})
+		set (_sourcesDefinitions ${COTIRE_TARGET_SOURCES_COMPILE_DEFINITIONS_${_upperConfig}})
+	else()
+		if (COTIRE_DEBUG)
+			message (STATUS "COTIRE_BUILD_TYPE=${COTIRE_BUILD_TYPE} not cotired (${COTIRE_TARGET_CONFIGURATION_TYPES})")
+		endif()
+		set (_sources "")
+		set (_sourcesDefinitions "")
+	endif()
+	set (_targetPreUndefs ${COTIRE_TARGET_PRE_UNDEFS})
+	set (_targetPostUndefs ${COTIRE_TARGET_POST_UNDEFS})
+	set (_sourcesPreUndefs ${COTIRE_TARGET_SOURCES_PRE_UNDEFS})
+	set (_sourcesPostUndefs ${COTIRE_TARGET_SOURCES_POST_UNDEFS})
+
+	if ("${COTIRE_ARGV1}" STREQUAL "unity")
+
+		if (XCODE)
+			# executing pre-build action under Xcode, check dependency on target script
+			set (_dependsOption DEPENDS "${COTIRE_ARGV2}")
+		else()
+			# executing custom command, no need to re-check for dependencies
+			set (_dependsOption "")
+		endif()
+
+		cotire_select_unity_source_files("${COTIRE_ARGV3}" _sources ${_sources})
+
+		cotire_generate_unity_source(
+			"${COTIRE_ARGV3}" ${_sources}
+			LANGUAGE "${COTIRE_TARGET_LANGUAGE}"
+			SOURCES_COMPILE_DEFINITIONS ${_sourcesDefinitions}
+			PRE_UNDEFS ${_targetPreUndefs}
+			POST_UNDEFS ${_targetPostUndefs}
+			SOURCES_PRE_UNDEFS ${_sourcesPreUndefs}
+			SOURCES_POST_UNDEFS ${_sourcesPostUndefs}
+			${_dependsOption})
+
+	elseif ("${COTIRE_ARGV1}" STREQUAL "prefix")
+
+		if (XCODE)
+			# executing pre-build action under Xcode, check dependency on unity file and prefix dependencies
+			set (_dependsOption DEPENDS "${COTIRE_ARGV4}" ${COTIRE_TARGET_PREFIX_DEPENDS})
+		else()
+			# executing custom command, no need to re-check for dependencies
+			set (_dependsOption "")
+		endif()
+
+		set (_files "")
+		foreach (_index RANGE 4 ${COTIRE_ARGC})
+			if (COTIRE_ARGV${_index})
+				list (APPEND _files "${COTIRE_ARGV${_index}}")
+			endif()
+		endforeach()
+
+		cotire_generate_prefix_header(
+			"${COTIRE_ARGV3}" ${_files}
+			COMPILER_LAUNCHER "${COTIRE_TARGET_${COTIRE_TARGET_LANGUAGE}_COMPILER_LAUNCHER}"
+			COMPILER_EXECUTABLE "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER}"
+			COMPILER_ARG1 ${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ARG1}
+			COMPILER_ID "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ID}"
+			COMPILER_VERSION "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_VERSION}"
+			LANGUAGE "${COTIRE_TARGET_LANGUAGE}"
+			IGNORE_PATH "${COTIRE_TARGET_IGNORE_PATH};${COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH}"
+			INCLUDE_PATH ${COTIRE_TARGET_INCLUDE_PATH}
+			IGNORE_EXTENSIONS "${CMAKE_${COTIRE_TARGET_LANGUAGE}_SOURCE_FILE_EXTENSIONS};${COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS}"
+			INCLUDE_PRIORITY_PATH ${COTIRE_TARGET_INCLUDE_PRIORITY_PATH}
+			INCLUDE_DIRECTORIES ${_includeDirs}
+			SYSTEM_INCLUDE_DIRECTORIES ${_systemIncludeDirs}
+			COMPILE_DEFINITIONS ${_compileDefinitions}
+			COMPILE_FLAGS ${_compileFlags}
+			${_dependsOption})
+
+	elseif ("${COTIRE_ARGV1}" STREQUAL "precompile")
+
+		set (_files "")
+		foreach (_index RANGE 5 ${COTIRE_ARGC})
+			if (COTIRE_ARGV${_index})
+				list (APPEND _files "${COTIRE_ARGV${_index}}")
+			endif()
+		endforeach()
+
+		cotire_precompile_prefix_header(
+			"${COTIRE_ARGV3}" "${COTIRE_ARGV4}" "${COTIRE_ARGV5}"
+			COMPILER_LAUNCHER "${COTIRE_TARGET_${COTIRE_TARGET_LANGUAGE}_COMPILER_LAUNCHER}"
+			COMPILER_EXECUTABLE "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER}"
+			COMPILER_ARG1 ${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ARG1}
+			COMPILER_ID "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_ID}"
+			COMPILER_VERSION "${CMAKE_${COTIRE_TARGET_LANGUAGE}_COMPILER_VERSION}"
+			LANGUAGE "${COTIRE_TARGET_LANGUAGE}"
+			INCLUDE_DIRECTORIES ${_includeDirs}
+			SYSTEM_INCLUDE_DIRECTORIES ${_systemIncludeDirs}
+			COMPILE_DEFINITIONS ${_compileDefinitions}
+			COMPILE_FLAGS ${_compileFlags})
+
+	elseif ("${COTIRE_ARGV1}" STREQUAL "combine")
+
+		if (COTIRE_TARGET_LANGUAGE)
+			set (_combinedFile "${COTIRE_ARGV3}")
+			set (_startIndex 4)
+		else()
+			set (_combinedFile "${COTIRE_ARGV2}")
+			set (_startIndex 3)
+		endif()
+		set (_files "")
+		foreach (_index RANGE ${_startIndex} ${COTIRE_ARGC})
+			if (COTIRE_ARGV${_index})
+				list (APPEND _files "${COTIRE_ARGV${_index}}")
+			endif()
+		endforeach()
+
+		if (XCODE)
+			# executing pre-build action under Xcode, check dependency on files to be combined
+			set (_dependsOption DEPENDS ${_files})
+		else()
+			# executing custom command, no need to re-check for dependencies
+			set (_dependsOption "")
+		endif()
+
+		if (COTIRE_TARGET_LANGUAGE)
+			cotire_generate_unity_source(
+				"${_combinedFile}" ${_files}
+				LANGUAGE "${COTIRE_TARGET_LANGUAGE}"
+				${_dependsOption})
+		else()
+			cotire_generate_unity_source("${_combinedFile}" ${_files} ${_dependsOption})
+		endif()
+
+	elseif ("${COTIRE_ARGV1}" STREQUAL "cleanup")
+
+		cotire_cleanup("${COTIRE_ARGV2}" "${COTIRE_ARGV3}" "${COTIRE_ARGV4}")
+
+	else()
+		message (FATAL_ERROR "cotire: unknown command \"${COTIRE_ARGV1}\".")
+	endif()
+
+else()
+
+	# cotire is being run in include mode
+	# set up all variable and property definitions
+
+	if (NOT DEFINED COTIRE_DEBUG_INIT)
+		if (DEFINED COTIRE_DEBUG)
+			set (COTIRE_DEBUG_INIT ${COTIRE_DEBUG})
+		else()
+			set (COTIRE_DEBUG_INIT FALSE)
+		endif()
+	endif()
+	option (COTIRE_DEBUG "Enable cotire debugging output?" ${COTIRE_DEBUG_INIT})
+
+	if (NOT DEFINED COTIRE_VERBOSE_INIT)
+		if (DEFINED COTIRE_VERBOSE)
+			set (COTIRE_VERBOSE_INIT ${COTIRE_VERBOSE})
+		else()
+			set (COTIRE_VERBOSE_INIT FALSE)
+		endif()
+	endif()
+	option (COTIRE_VERBOSE "Enable cotire verbose output?" ${COTIRE_VERBOSE_INIT})
+
+	set (COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS "inc;inl;ipp" CACHE STRING
+		"Ignore headers with the listed file extensions from the generated prefix header.")
+
+	set (COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH "" CACHE STRING
+		"Ignore headers from these directories when generating the prefix header.")
+
+	set (COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS "m;mm" CACHE STRING
+		"Ignore sources with the listed file extensions from the generated unity source.")
+
+	set (COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES "3" CACHE STRING
+		"Minimum number of sources in target required to enable use of precompiled header.")
+
+	if (NOT DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT)
+		if (DEFINED COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES)
+			set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT ${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES})
+		elseif ("${CMAKE_GENERATOR}" MATCHES "JOM|Ninja|Visual Studio")
+			# enable parallelization for generators that run multiple jobs by default
+			set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT "-j")
+		else()
+			set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT "0")
+		endif()
+	endif()
+	set (COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES "${COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES_INIT}" CACHE STRING
+		"Maximum number of source files to include in a single unity source file.")
+
+	if (NOT COTIRE_PREFIX_HEADER_FILENAME_SUFFIX)
+		set (COTIRE_PREFIX_HEADER_FILENAME_SUFFIX "_prefix")
+	endif()
+	if (NOT COTIRE_UNITY_SOURCE_FILENAME_SUFFIX)
+		set (COTIRE_UNITY_SOURCE_FILENAME_SUFFIX "_unity")
+	endif()
+	if (NOT COTIRE_INTDIR)
+		set (COTIRE_INTDIR "cotire")
+	endif()
+	if (NOT COTIRE_PCH_ALL_TARGET_NAME)
+		set (COTIRE_PCH_ALL_TARGET_NAME "all_pch")
+	endif()
+	if (NOT COTIRE_UNITY_BUILD_ALL_TARGET_NAME)
+		set (COTIRE_UNITY_BUILD_ALL_TARGET_NAME "all_unity")
+	endif()
+	if (NOT COTIRE_CLEAN_ALL_TARGET_NAME)
+		set (COTIRE_CLEAN_ALL_TARGET_NAME "clean_cotire")
+	endif()
+	if (NOT COTIRE_CLEAN_TARGET_SUFFIX)
+		set (COTIRE_CLEAN_TARGET_SUFFIX "_clean_cotire")
+	endif()
+	if (NOT COTIRE_PCH_TARGET_SUFFIX)
+		set (COTIRE_PCH_TARGET_SUFFIX "_pch")
+	endif()
+	if (MSVC)
+		# MSVC default PCH memory scaling factor of 100 percent (75 MB) is too small for template heavy C++ code
+		# use a bigger default factor of 170 percent (128 MB)
+		if (NOT DEFINED COTIRE_PCH_MEMORY_SCALING_FACTOR)
+			set (COTIRE_PCH_MEMORY_SCALING_FACTOR "170")
+		endif()
+	endif()
+	if (NOT COTIRE_UNITY_BUILD_TARGET_SUFFIX)
+		set (COTIRE_UNITY_BUILD_TARGET_SUFFIX "_unity")
+	endif()
+	if (NOT DEFINED COTIRE_TARGETS_FOLDER)
+		set (COTIRE_TARGETS_FOLDER "cotire")
+	endif()
+	if (NOT DEFINED COTIRE_UNITY_OUTPUT_DIRECTORY)
+		if ("${CMAKE_GENERATOR}" MATCHES "Ninja")
+			# generated Ninja build files do not work if the unity target produces the same output file as the cotired target
+			set (COTIRE_UNITY_OUTPUT_DIRECTORY "unity")
+		else()
+			set (COTIRE_UNITY_OUTPUT_DIRECTORY "")
+		endif()
+	endif()
+
+	# define cotire cache variables
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_PATH"
+		BRIEF_DOCS "Ignore headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"The variable can be set to a semicolon separated list of include directories."
+			"If a header file is found in one of these directories or sub-directories, it will be excluded from the generated prefix header."
+			"If not defined, defaults to empty list."
+	)
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_ADDITIONAL_PREFIX_HEADER_IGNORE_EXTENSIONS"
+		BRIEF_DOCS "Ignore includes with the listed file extensions from the generated prefix header."
+		FULL_DOCS
+			"The variable can be set to a semicolon separated list of file extensions."
+			"If a header file extension matches one in the list, it will be excluded from the generated prefix header."
+			"Includes with an extension in CMAKE_<LANG>_SOURCE_FILE_EXTENSIONS are always ignored."
+			"If not defined, defaults to inc;inl;ipp."
+	)
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_UNITY_SOURCE_EXCLUDE_EXTENSIONS"
+		BRIEF_DOCS "Exclude sources with the listed file extensions from the generated unity source."
+		FULL_DOCS
+			"The variable can be set to a semicolon separated list of file extensions."
+			"If a source file extension matches one in the list, it will be excluded from the generated unity source file."
+			"Source files with an extension in CMAKE_<LANG>_IGNORE_EXTENSIONS are always excluded."
+			"If not defined, defaults to m;mm."
+	)
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_MINIMUM_NUMBER_OF_TARGET_SOURCES"
+		BRIEF_DOCS "Minimum number of sources in target required to enable use of precompiled header."
+		FULL_DOCS
+			"The variable can be set to an integer > 0."
+			"If a target contains less than that number of source files, cotire will not enable the use of the precompiled header for the target."
+			"If not defined, defaults to 3."
+	)
+
+	define_property(
+		CACHED_VARIABLE PROPERTY "COTIRE_MAXIMUM_NUMBER_OF_UNITY_INCLUDES"
+		BRIEF_DOCS "Maximum number of source files to include in a single unity source file."
+		FULL_DOCS
+			"This may be set to an integer >= 0."
+			"If 0, cotire will only create a single unity source file."
+			"If a target contains more than that number of source files, cotire will create multiple unity source files for it."
+			"Can be set to \"-j\" to optimize the count of unity source files for the number of available processor cores."
+			"Can be set to \"-j jobs\" to optimize the number of unity source files for the given number of simultaneous jobs."
+			"Is used to initialize the target property COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES."
+			"Defaults to \"-j\" for the generators Visual Studio, JOM or Ninja. Defaults to 0 otherwise."
+	)
+
+	# define cotire directory properties
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_ENABLE_PRECOMPILED_HEADER"
+		BRIEF_DOCS "Modify build command of cotired targets added in this directory to make use of the generated precompiled header."
+		FULL_DOCS
+			"See target property COTIRE_ENABLE_PRECOMPILED_HEADER."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_ADD_UNITY_BUILD"
+		BRIEF_DOCS "Add a new target that performs a unity build for cotired targets added in this directory."
+		FULL_DOCS
+			"See target property COTIRE_ADD_UNITY_BUILD."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_ADD_CLEAN"
+		BRIEF_DOCS "Add a new target that cleans all cotire generated files for cotired targets added in this directory."
+		FULL_DOCS
+			"See target property COTIRE_ADD_CLEAN."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_IGNORE_PATH"
+		BRIEF_DOCS "Ignore headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"See target property COTIRE_PREFIX_HEADER_IGNORE_PATH."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PATH"
+		BRIEF_DOCS "Honor headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"See target property COTIRE_PREFIX_HEADER_INCLUDE_PATH."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH"
+		BRIEF_DOCS "Header paths matching one of these directories are put at the top of the prefix header."
+		FULL_DOCS
+			"See target property COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS"
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of each source file."
+		FULL_DOCS
+			"See target property COTIRE_UNITY_SOURCE_PRE_UNDEFS."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS"
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of each source file."
+		FULL_DOCS
+			"See target property COTIRE_UNITY_SOURCE_POST_UNDEFS."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES"
+		BRIEF_DOCS "Maximum number of source files to include in a single unity source file."
+		FULL_DOCS
+			"See target property COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES."
+	)
+
+	define_property(
+		DIRECTORY PROPERTY "COTIRE_UNITY_LINK_LIBRARIES_INIT"
+		BRIEF_DOCS "Define strategy for setting up the unity target's link libraries."
+		FULL_DOCS
+			"See target property COTIRE_UNITY_LINK_LIBRARIES_INIT."
+	)
+
+	# define cotire target properties
+
+	define_property(
+		TARGET PROPERTY "COTIRE_ENABLE_PRECOMPILED_HEADER" INHERITED
+		BRIEF_DOCS "Modify this target's build command to make use of the generated precompiled header."
+		FULL_DOCS
+			"If this property is set to TRUE, cotire will modify the build command to make use of the generated precompiled header."
+			"Irrespective of the value of this property, cotire will setup custom commands to generate the unity source and prefix header for the target."
+			"For makefile based generators cotire will also set up a custom target to manually invoke the generation of the precompiled header."
+			"The target name will be set to this target's name with the suffix _pch appended."
+			"Inherited from directory."
+			"Defaults to TRUE."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_ADD_UNITY_BUILD" INHERITED
+		BRIEF_DOCS "Add a new target that performs a unity build for this target."
+		FULL_DOCS
+			"If this property is set to TRUE, cotire creates a new target of the same type that uses the generated unity source file instead of the target sources."
+			"Most of the relevant target properties will be copied from this target to the new unity build target."
+			"Target dependencies and linked libraries have to be manually set up for the new unity build target."
+			"The unity target name will be set to this target's name with the suffix _unity appended."
+			"Inherited from directory."
+			"Defaults to TRUE."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_ADD_CLEAN" INHERITED
+		BRIEF_DOCS "Add a new target that cleans all cotire generated files for this target."
+		FULL_DOCS
+			"If this property is set to TRUE, cotire creates a new target that clean all files (unity source, prefix header, precompiled header)."
+			"The clean target name will be set to this target's name with the suffix _clean_cotire appended."
+			"Inherited from directory."
+			"Defaults to FALSE."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_PREFIX_HEADER_IGNORE_PATH" INHERITED
+		BRIEF_DOCS "Ignore headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"The property can be set to a list of directories."
+			"If a header file is found in one of these directories or sub-directories, it will be excluded from the generated prefix header."
+			"Inherited from directory."
+			"If not set, this property is initialized to \${CMAKE_SOURCE_DIR};\${CMAKE_BINARY_DIR}."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PATH" INHERITED
+		BRIEF_DOCS "Honor headers from these directories when generating the prefix header."
+		FULL_DOCS
+			"The property can be set to a list of directories."
+			"If a header file is found in one of these directories or sub-directories, it will be included in the generated prefix header."
+			"If a header file is both selected by COTIRE_PREFIX_HEADER_IGNORE_PATH and COTIRE_PREFIX_HEADER_INCLUDE_PATH,"
+			"the option which yields the closer relative path match wins."
+			"Inherited from directory."
+			"If not set, this property is initialized to the empty list."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_PREFIX_HEADER_INCLUDE_PRIORITY_PATH" INHERITED
+		BRIEF_DOCS "Header paths matching one of these directories are put at the top of prefix header."
+		FULL_DOCS
+			"The property can be set to a list of directories."
+			"Header file paths matching one of these directories will be inserted at the beginning of the generated prefix header."
+			"Header files are sorted according to the order of the directories in the property."
+			"If not set, this property is initialized to the empty list."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS" INHERITED
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of each target source file."
+		FULL_DOCS
+			"This may be set to a semicolon-separated list of preprocessor symbols."
+			"cotire will add corresponding #undef directives to the generated unit source file before each target source file."
+			"Inherited from directory."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS" INHERITED
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of each target source file."
+		FULL_DOCS
+			"This may be set to a semicolon-separated list of preprocessor symbols."
+			"cotire will add corresponding #undef directives to the generated unit source file after each target source file."
+			"Inherited from directory."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_SOURCE_MAXIMUM_NUMBER_OF_INCLUDES" INHERITED
+		BRIEF_DOCS "Maximum number of source files to include in a single unity source file."
+		FULL_DOCS
+			"This may be set to an integer > 0."
+			"If a target contains more than that number of source files, cotire will create multiple unity build files for it."
+			"If not set, cotire will only create a single unity source file."
+			"Inherited from directory."
+			"Defaults to empty."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_UNITY_SOURCE_INIT"
+		BRIEF_DOCS "User provided unity source file to be used instead of the automatically generated one."
+		FULL_DOCS
+			"If set, cotire will only add the given file(s) to the generated unity source file."
+			"If not set, cotire will add all the target source files to the generated unity source file."
+			"The property can be set to a user provided unity source file."
+			"Defaults to empty."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_PREFIX_HEADER_INIT"
+		BRIEF_DOCS "User provided prefix header file to be used instead of the automatically generated one."
+		FULL_DOCS
+			"If set, cotire will add the given header file(s) to the generated prefix header file."
+			"If not set, cotire will generate a prefix header by tracking the header files included by the unity source file."
+			"The property can be set to a user provided prefix header file (e.g., stdafx.h)."
+			"Defaults to empty."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_LINK_LIBRARIES_INIT" INHERITED
+		BRIEF_DOCS "Define strategy for setting up unity target's link libraries."
+		FULL_DOCS
+			"If this property is empty or set to NONE, the generated unity target's link libraries have to be set up manually."
+			"If this property is set to COPY, the unity target's link libraries will be copied from this target."
+			"If this property is set to COPY_UNITY, the unity target's link libraries will be copied from this target with considering existing unity targets."
+			"Inherited from directory."
+			"Defaults to empty."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_UNITY_SOURCE"
+		BRIEF_DOCS "Read-only property. The generated <LANG> unity source file(s)."
+		FULL_DOCS
+			"cotire sets this property to the path of the generated <LANG> single computation unit source file for the target."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_PREFIX_HEADER"
+		BRIEF_DOCS "Read-only property. The generated <LANG> prefix header file."
+		FULL_DOCS
+			"cotire sets this property to the full path of the generated <LANG> language prefix header for the target."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_<LANG>_PRECOMPILED_HEADER"
+		BRIEF_DOCS "Read-only property. The generated <LANG> precompiled header file."
+		FULL_DOCS
+			"cotire sets this property to the full path of the generated <LANG> language precompiled header binary for the target."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		TARGET PROPERTY "COTIRE_UNITY_TARGET_NAME"
+		BRIEF_DOCS "The name of the generated unity build target corresponding to this target."
+		FULL_DOCS
+			"This property can be set to the desired name of the unity target that will be created by cotire."
+			"If not set, the unity target name will be set to this target's name with the suffix _unity appended."
+			"After this target has been processed by cotire, the property is set to the actual name of the generated unity target."
+			"Defaults to empty string."
+	)
+
+	# define cotire source properties
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_EXCLUDED"
+		BRIEF_DOCS "Do not modify source file's build command."
+		FULL_DOCS
+			"If this property is set to TRUE, the source file's build command will not be modified to make use of the precompiled header."
+			"The source file will also be excluded from the generated unity source file."
+			"Source files that have their COMPILE_FLAGS property set will be excluded by default."
+			"Defaults to FALSE."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_DEPENDENCY"
+		BRIEF_DOCS "Add this source file to dependencies of the automatically generated prefix header file."
+		FULL_DOCS
+			"If this property is set to TRUE, the source file is added to dependencies of the generated prefix header file."
+			"If the file is modified, cotire will re-generate the prefix header source upon build."
+			"Defaults to FALSE."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_UNITY_SOURCE_PRE_UNDEFS"
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file before the inclusion of this source file."
+		FULL_DOCS
+			"This may be set to a semicolon-separated list of preprocessor symbols."
+			"cotire will add corresponding #undef directives to the generated unit source file before this file is included."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_UNITY_SOURCE_POST_UNDEFS"
+		BRIEF_DOCS "Preprocessor undefs to place in the generated unity source file after the inclusion of this source file."
+		FULL_DOCS
+			"This may be set to a semicolon-separated list of preprocessor symbols."
+			"cotire will add corresponding #undef directives to the generated unit source file after this file is included."
+			"Defaults to empty string."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_START_NEW_UNITY_SOURCE"
+		BRIEF_DOCS "Start a new unity source file which includes this source file as the first one."
+		FULL_DOCS
+			"If this property is set to TRUE, cotire will complete the current unity file and start a new one."
+			"The new unity source file will include this source file as the first one."
+			"This property essentially works as a separator for unity source files."
+			"Defaults to FALSE."
+	)
+
+	define_property(
+		SOURCE PROPERTY "COTIRE_TARGET"
+		BRIEF_DOCS "Read-only property. Mark this source file as cotired for the given target."
+		FULL_DOCS
+			"cotire sets this property to the name of target, that the source file's build command has been altered for."
+			"Defaults to empty string."
+	)
+
+	message (STATUS "cotire ${COTIRE_CMAKE_MODULE_VERSION} loaded.")
+
+endif()
+
diff --git a/src/servers/sapphire_zone/CMakeLists.txt b/src/servers/sapphire_zone/CMakeLists.txt
index 091791a7..b82a35e6 100644
--- a/src/servers/sapphire_zone/CMakeLists.txt
+++ b/src/servers/sapphire_zone/CMakeLists.txt
@@ -64,3 +64,4 @@ else()
 endif()
 
 target_link_libraries( sapphire_zone ${Boost_LIBRARIES} )
+cotire( sapphire_zone )
diff --git a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
index 907e3288..419d7884 100644
--- a/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
+++ b/src/servers/sapphire_zone/Script/Scripts/CMakeLists.txt
@@ -39,8 +39,9 @@ foreach(_scriptDir ${children})
             endif()
         endforeach()
 
-        add_library("script_${_name}" MODULE "${SCRIPT_BUILD_FILES}" "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
+        add_library("script_${_name}" MODULE ${SCRIPT_BUILD_FILES} "${SCRIPT_INCLUDE_FILES}" "${_scriptDir}/ScriptLoader.cpp")
         target_link_libraries("script_${_name}" sapphire_zone)
+        cotire("script_${_name}")
 
         if(MSVC)
             target_link_libraries("script_${_name}" ${Boost_LIBRARIES})

From 416366c144095886daba0775de1dadf866fd8222 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Wed, 28 Feb 2018 22:25:11 +1100
Subject: [PATCH 46/69] director sequence/branch setters & debug command

---
 .../DebugCommand/DebugCommandHandler.cpp      | 32 ++++++++++++++++---
 src/servers/sapphire_zone/Event/Director.cpp  | 10 ++++++
 src/servers/sapphire_zone/Event/Director.h    |  3 ++
 .../sapphire_zone/Zone/InstanceContent.cpp    | 20 ++++++++++++
 .../sapphire_zone/Zone/InstanceContent.h      |  2 ++
 5 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 72c31d5c..35e711cd 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -709,15 +709,13 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
    }
    else if( subCommand == "set" )
    {
-      uint32_t instanceId;
       uint32_t index;
       uint32_t value;
-      sscanf( params.c_str(), "%d %d %d", &instanceId, &index, &value );
+      sscanf( params.c_str(), "%d %d", &index, &value );
 
-      auto pInstance = g_territoryMgr.getInstanceZonePtr( instanceId );
-      if( !pInstance )
+      auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+      if( !instance )
          return;
-      auto instance = boost::dynamic_pointer_cast< InstanceContent >( pInstance );
 
       instance->setVar( static_cast< uint8_t >( index ), static_cast< uint8_t >( value ) );
    }
@@ -738,6 +736,30 @@ void Core::DebugCommandHandler::instance( char* data, Entity::Player &player, bo
 
       obj->setState( state );
    }
+   else if( subCommand == "seq" )
+   {
+      uint8_t seq;
+
+      sscanf( params.c_str(), "%hhu", &seq );
+
+      auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+      if( !instance )
+         return;
+
+      instance->setSequence( seq );
+   }
+   else if( subCommand == "branch" )
+   {
+      uint8_t branch;
+
+      sscanf( params.c_str(), "%hhu", &branch );
+
+      auto instance = boost::dynamic_pointer_cast< InstanceContent >( player.getCurrentZone() );
+      if( !instance )
+         return;
+
+      instance->setBranch( branch );
+   }
    else if( subCommand == "festival" )
    {
       uint32_t festivalId;
diff --git a/src/servers/sapphire_zone/Event/Director.cpp b/src/servers/sapphire_zone/Event/Director.cpp
index a201a5ab..9dee7702 100644
--- a/src/servers/sapphire_zone/Event/Director.cpp
+++ b/src/servers/sapphire_zone/Event/Director.cpp
@@ -168,3 +168,13 @@ void Core::Event::Director::setDirectorUI8JH( uint8_t value )
 {
    m_unionData.ui8lh.UI8JH = value;
 }
+
+void Core::Event::Director::setDirectorBranch( uint8_t value )
+{
+   m_branch = value;
+}
+
+void Core::Event::Director::setDirectorSequence( uint8_t value )
+{
+   m_sequence = value;
+}
diff --git a/src/servers/sapphire_zone/Event/Director.h b/src/servers/sapphire_zone/Event/Director.h
index f5840390..1693d47b 100644
--- a/src/servers/sapphire_zone/Event/Director.h
+++ b/src/servers/sapphire_zone/Event/Director.h
@@ -72,6 +72,9 @@ public:
    void setDirectorUI8JL( uint8_t value );
    void setDirectorUI8JH( uint8_t value );
 
+   void setDirectorSequence( uint8_t value );
+   void setDirectorBranch( uint8_t value );
+
 private:
    /*! Id of the content of the director */
    uint16_t m_contentId;
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 201ac523..92910575 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -227,6 +227,26 @@ void Core::InstanceContent::setVar( uint8_t index, uint8_t value )
    }
 }
 
+void Core::InstanceContent::setSequence( uint8_t value )
+{
+   setDirectorSequence( value );
+
+   for( const auto &playerIt : m_playerMap )
+   {
+      sendDirectorVars( *playerIt.second );
+   }
+}
+
+void Core::InstanceContent::setBranch( uint8_t value )
+{
+   setDirectorBranch( value );
+
+   for( const auto &playerIt : m_playerMap )
+   {
+      sendDirectorVars( *playerIt.second );
+   }
+}
+
 void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
 {
    if( object->getName() != "none" )
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index 9dcb5974..e2aeb8ad 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -41,6 +41,8 @@ public:
    void onRegisterEObj( Entity::EventObjectPtr object ) override;
 
    void setVar( uint8_t index, uint8_t value );
+   void setSequence( uint8_t value );
+   void setBranch( uint8_t value );
 
    boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentInfo() const;
 

From 521c62013c3a7e5d39e12f6f4fb264f830f09c6b Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Wed, 28 Feb 2018 22:25:34 +1100
Subject: [PATCH 47/69] ignore cotire generated files

---
 .gitignore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 00f3f1c8..400a9aba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -113,4 +113,8 @@ src/common/Version\.cpp
 .mtime_cache
 
 # generated script loader files
-src/servers/sapphire_zone/Script/Scripts/*/ScriptLoader.cpp
\ No newline at end of file
+src/servers/sapphire_zone/Script/Scripts/*/ScriptLoader.cpp
+
+# cotire generated files/folders
+cotire/
+*_cotire.cmake
\ No newline at end of file

From d024f0a39665a945eeb1fef62d17b2231b21020d Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Wed, 28 Feb 2018 23:53:20 +1100
Subject: [PATCH 48/69] fix eobj out of bounds allocation client crash

---
 src/common/Common.h                           |  1 +
 .../Network/PacketDef/Zone/ServerZoneDef.h    |  2 +-
 .../sapphire_zone/Actor/EventObject.cpp       |  4 ++-
 src/servers/sapphire_zone/Actor/Player.cpp    | 32 +++++++++++++++++--
 src/servers/sapphire_zone/Actor/Player.h      |  9 +++++-
 .../sapphire_zone/Zone/InstanceContent.cpp    |  3 ++
 6 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 6d5b204d..05517df7 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -16,6 +16,7 @@ namespace Common {
 
    // 99 is the last spawn id that seems to spawn any actor
    const uint8_t MAX_DISPLAYED_ACTORS = 99;
+   const uint8_t MAX_DISPLAYED_EOBJS = 40;
 
    const int32_t INVALID_GAME_OBJECT_ID = 0xE0000000;
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 985af408..8684985d 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1316,7 +1316,7 @@ struct FFXIVIpcMSQTrackerComplete : FFXIVIpcBasePacket<MSQTrackerComplete>
 
 struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket<ObjectSpawn>
 {
-   uint8_t count;
+   uint8_t spawnIndex;
    uint8_t objKind;
    uint8_t state;
    uint8_t unknown3;
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index e624c124..4592fad5 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -100,7 +100,7 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
 {
    g_log.debug( "Spawning EObj: id:" + std::to_string( getId() ) + " name:" + getName() );
    ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( getId(), pTarget->getId() );
-   eobjStatePacket.data().count = pTarget->getNextObjCount();
+   eobjStatePacket.data().spawnIndex = pTarget->getNextObjSpawnIndexForActorId( getId( ));
    eobjStatePacket.data().objKind = getObjKind();
    eobjStatePacket.data().state = getState();
    eobjStatePacket.data().objId = getObjectId();
@@ -115,6 +115,8 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
 void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget )
 {
    g_log.debug( "despawn eobj: " + std::to_string( getId() ) );
+
+   pTarget->freeObjSpawnIndexForActorId( getId( ));
 }
 
 const std::string& Core::Entity::EventObject::getName() const
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 65ab2fe5..f3f3b68a 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -1659,9 +1659,37 @@ void Core::Entity::Player::teleportQuery( uint16_t aetheryteId )
    }
 }
 
-uint8_t Core::Entity::Player::getNextObjCount()
+uint8_t Core::Entity::Player::getNextObjSpawnIndexForActorId( uint32_t actorId )
 {
-   return m_objCount++;
+   auto nextCount = m_freeObjCounts.front();
+   m_freeObjCounts.pop();
+
+   m_actorIdToObjCountMap[actorId] = nextCount;
+
+   return nextCount;
+}
+
+void Core::Entity::Player::resetObjSpawnIndex()
+{
+   while( m_freeObjCounts.empty() )
+      m_freeObjCounts.pop();
+
+   for( uint32_t i = 0; i < MAX_DISPLAYED_EOBJS; ++i )
+      m_freeObjCounts.push( i );
+
+   m_actorIdToObjCountMap.clear();
+}
+
+void Core::Entity::Player::freeObjSpawnIndexForActorId( uint32_t actorId )
+{
+   auto it = m_actorIdToObjCountMap.find( actorId );
+   if( it == m_actorIdToObjCountMap.end() )
+      return;
+
+   auto freeCount = m_actorIdToObjCountMap[actorId];
+   m_freeObjCounts.push( freeCount );
+
+   m_actorIdToObjCountMap.erase( actorId );
 }
 
 void Core::Entity::Player::setOnEnterEventDone( bool isDone )
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 7f362e6a..877de137 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -562,7 +562,12 @@ public:
    void setOnEnterEventDone( bool isDone );
    bool isOnEnterEventDone() const;
 
-   uint8_t getNextObjCount();
+   /*! gets the next available obj count */
+   uint8_t getNextObjSpawnIndexForActorId( uint32_t actorId );
+   /*! resets the players obj count */
+   void resetObjSpawnIndex();
+   /*! frees an obj count to be used by another eobj */
+   void freeObjSpawnIndexForActorId( uint32_t actorId );
 
 private:
    uint32_t m_lastWrite;
@@ -679,6 +684,8 @@ private:
 
    // counter used to index objects spawned for the player
    uint8_t m_objCount;
+   std::queue< uint8_t > m_freeObjCounts;
+   std::map< uint32_t, uint8_t > m_actorIdToObjCountMap;
 };
 
 }
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 92910575..58a6fa7c 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -221,6 +221,7 @@ void Core::InstanceContent::setVar( uint8_t index, uint8_t value )
 
    }
 
+   // todo: genericise this?
    for( const auto &playerIt : m_playerMap )
    {
       sendDirectorVars( *playerIt.second );
@@ -274,6 +275,8 @@ void Core::InstanceContent::onBeforeEnterTerritory( Core::Entity::Player &player
       player.setRot( PI );
       player.setPos( { 0.f, 0.f, 0.f } );
    }
+
+   player.resetObjSpawnIndex( );
 }
 
 Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string &name )

From af8cfeeb58f4d5c26d8ea0e502bc7cca51b58559 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Wed, 28 Feb 2018 23:58:11 +1100
Subject: [PATCH 49/69] note to self

---
 src/servers/sapphire_zone/Actor/Player.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index f3f3b68a..a5afe5b3 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -1661,6 +1661,7 @@ void Core::Entity::Player::teleportQuery( uint16_t aetheryteId )
 
 uint8_t Core::Entity::Player::getNextObjSpawnIndexForActorId( uint32_t actorId )
 {
+   // todo: fix it so the case where there's no ids available doesn't break everything :(
    auto nextCount = m_freeObjCounts.front();
    m_freeObjCounts.pop();
 

From 644d83e514343b679343e308f0f3f3afcc2b73b9 Mon Sep 17 00:00:00 2001
From: ShelbyZ <user@shagman.codes>
Date: Wed, 28 Feb 2018 20:51:47 -0800
Subject: [PATCH 50/69] Minor updates for actor_rewrite branch

- The libraries/external is not correctly mapped for windows cmake, had
an extra '../'
- add build flag for msvc for building with multiple processors /MP
---
 cmake/boost.cmake    | 6 +++---
 cmake/compiler.cmake | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/cmake/boost.cmake b/cmake/boost.cmake
index 4f3dda80..3e1c37ef 100644
--- a/cmake/boost.cmake
+++ b/cmake/boost.cmake
@@ -14,10 +14,10 @@ if(UNIX)
   endif()
 else()
 
-  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
+  if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
     message(STATUS "Using boost in /libraries/external")
-	  set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
-    set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/../src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0)
+	  set(Boost_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME})
+    set(BOOST_LIBRARYDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libraries/external/${SAPPHIRE_BOOST_FOLDER_NAME}/lib32-msvc-14.0)
   else()
       find_package(Boost ${SAPPHIRE_BOOST_VER} COMPONENTS system)
       if(Boost_FOUND)
diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index ebf42d84..20bab671 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -21,6 +21,10 @@ else()
     # incremental linking
     message(STATUS "Enabling Incremental Linking..")
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL")
+
+    # enable building with multiple processes
+    message(STATUS "Enabling Build with Multiple Processes..")
+    add_definitions(/MP)
   endif()
 endif()
 

From 220ebfd763a2527ee3844991eb0b9a6d78c091ad Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 1 Mar 2018 16:31:58 +0100
Subject: [PATCH 51/69] More include stuff

---
 src/servers/sapphire_zone/Script/Scripts/ScriptObject.h   | 4 ----
 .../sapphire_zone/Script/Scripts/action/ActionSprint3.cpp | 2 ++
 .../sapphire_zone/Script/Scripts/common/Aethernet.cpp     | 2 ++
 .../sapphire_zone/Script/Scripts/common/Aetheryte.cpp     | 3 +++
 .../Script/Scripts/common/CmnDefCutSceneReplay.cpp        | 2 ++
 .../sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp  | 2 ++
 .../Script/Scripts/common/CmnDefLinkShell.cpp             | 2 ++
 .../Script/Scripts/common/HouFurOrchestrion.cpp           | 2 ++
 .../Script/Scripts/instances/dungeons/AlaMhigo.cpp        | 1 +
 .../Script/Scripts/instances/dungeons/AmdaporKeep.cpp     | 1 +
 .../Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp | 1 +
 .../Script/Scripts/instances/dungeons/BaelsarsWall.cpp    | 1 +
 .../Script/Scripts/instances/dungeons/BardamsMettle.cpp   | 1 +
 .../Scripts/instances/dungeons/BrayfloxsLongstop.cpp      | 1 +
 .../Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp  | 1 +
 .../Script/Scripts/instances/dungeons/CastrumAbania.cpp   | 1 +
 .../Scripts/instances/dungeons/CastrumMeridianum.cpp      | 1 +
 .../Script/Scripts/instances/dungeons/CopperbellMines.cpp | 1 +
 .../Scripts/instances/dungeons/CopperbellMinesHard.cpp    | 1 +
 .../Script/Scripts/instances/dungeons/CuttersCry.cpp      | 1 +
 .../Script/Scripts/instances/dungeons/DomaCastle.cpp      | 1 +
 .../Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp | 1 +
 .../Script/Scripts/instances/dungeons/Halatali.cpp        | 1 +
 .../Script/Scripts/instances/dungeons/HalataliHard.cpp    | 1 +
 .../Script/Scripts/instances/dungeons/HaukkeManor.cpp     | 1 +
 .../Script/Scripts/instances/dungeons/HaukkeManorHard.cpp | 1 +
 .../Script/Scripts/instances/dungeons/HellsLid.cpp        | 1 +
 .../Script/Scripts/instances/dungeons/HullbreakerIsle.cpp | 1 +
 .../Scripts/instances/dungeons/HullbreakerIsleHard.cpp    | 1 +
 .../Script/Scripts/instances/dungeons/KuganeCastle.cpp    | 1 +
 .../Script/Scripts/instances/dungeons/Neverreap.cpp       | 1 +
 .../Script/Scripts/instances/dungeons/PharosSirius.cpp    | 1 +
 .../Scripts/instances/dungeons/PharosSiriusHard.cpp       | 1 +
 .../instances/dungeons/SaintMociannesArboretum.cpp        | 1 +
 .../Script/Scripts/instances/dungeons/Sastasha.cpp        | 1 +
 .../Script/Scripts/instances/dungeons/SastashaHard.cpp    | 1 +
 .../Scripts/instances/dungeons/ShisuioftheVioletTides.cpp | 1 +
 .../Script/Scripts/instances/dungeons/Snowcloak.cpp       | 1 +
 .../Script/Scripts/instances/dungeons/SohmAl.cpp          | 1 +
 .../Script/Scripts/instances/dungeons/SohmAlHard.cpp      | 1 +
 .../Script/Scripts/instances/dungeons/SohrKhai.cpp        | 1 +
 .../Script/Scripts/instances/dungeons/TheAery.cpp         | 1 +
 .../dungeons/TheAetherochemicalResearchFacility.cpp       | 1 +
 .../Script/Scripts/instances/dungeons/TheAntitower.cpp    | 1 +
 .../Script/Scripts/instances/dungeons/TheAurumVale.cpp    | 1 +
 .../Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp | 1 +
 .../Script/Scripts/instances/dungeons/TheDuskVigil.cpp    | 1 +
 .../Scripts/instances/dungeons/TheFractalContinuum.cpp    | 1 +
 .../instances/dungeons/TheFractalContinuumHard.cpp        | 1 +
 .../Scripts/instances/dungeons/TheGreatGubalLibrary.cpp   | 1 +
 .../instances/dungeons/TheGreatGubalLibraryHard.cpp       | 1 +
 .../Scripts/instances/dungeons/TheKeeperoftheLake.cpp     | 1 +
 .../Scripts/instances/dungeons/TheLostCityofAmdapor.cpp   | 1 +
 .../instances/dungeons/TheLostCityofAmdaporHard.cpp       | 1 +
 .../Script/Scripts/instances/dungeons/ThePraetorium.cpp   | 1 +
 .../Script/Scripts/instances/dungeons/TheSirensongSea.cpp | 1 +
 .../Script/Scripts/instances/dungeons/TheStoneVigil.cpp   | 1 +
 .../Scripts/instances/dungeons/TheStoneVigilHard.cpp      | 1 +
 .../Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp  | 1 +
 .../instances/dungeons/TheSunkenTempleofQarnHard.cpp      | 1 +
 .../Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp    | 1 +
 .../instances/dungeons/TheTamTaraDeepcroftHard.cpp        | 1 +
 .../Scripts/instances/dungeons/TheTempleoftheFist.cpp     | 1 +
 .../instances/dungeons/TheThousandMawsofTotoRak.cpp       | 1 +
 .../Script/Scripts/instances/dungeons/TheVault.cpp        | 1 +
 .../Scripts/instances/dungeons/TheWanderersPalace.cpp     | 1 +
 .../Scripts/instances/dungeons/TheWanderersPalaceHard.cpp | 1 +
 .../Script/Scripts/instances/dungeons/Xelphatol.cpp       | 1 +
 .../Script/Scripts/instances/events/SpecialEventI.cpp     | 1 +
 .../Script/Scripts/instances/events/SpecialEventII.cpp    | 1 +
 .../Script/Scripts/instances/events/SpecialEventIII.cpp   | 1 +
 .../Script/Scripts/instances/events/TheHauntedManor.cpp   | 1 +
 .../Scripts/instances/events/TheValentionesCeremony.cpp   | 1 +
 .../instances/guildhest/AllsWellthatEndsintheWell.cpp     | 1 +
 .../Script/Scripts/instances/guildhest/AnnoytheVoid.cpp   | 1 +
 .../instances/guildhest/BasicTrainingEnemyParties.cpp     | 1 +
 .../instances/guildhest/BasicTrainingEnemyStrongholds.cpp | 1 +
 .../instances/guildhest/FlickingSticksandTakingNames.cpp  | 1 +
 .../Scripts/instances/guildhest/HeroontheHalfShell.cpp    | 1 +
 .../Scripts/instances/guildhest/LongLivetheQueen.cpp      | 1 +
 .../Scripts/instances/guildhest/MorethanaFeeler.cpp       | 1 +
 .../Scripts/instances/guildhest/PullingPoisonPosies.cpp   | 1 +
 .../Script/Scripts/instances/guildhest/ShadowandClaw.cpp  | 1 +
 .../Script/Scripts/instances/guildhest/SolemnTrinity.cpp  | 1 +
 .../Script/Scripts/instances/guildhest/StingingBack.cpp   | 1 +
 .../Script/Scripts/instances/guildhest/UndertheArmor.cpp  | 1 +
 .../Script/Scripts/instances/guildhest/WardUp.cpp         | 1 +
 .../hallofthenovice/AccrueEnmityfromMultipleTargets.cpp   | 1 +
 .../hallofthenovice/AssistAlliesinDefeatingaTarget.cpp    | 1 +
 .../hallofthenovice/AvoidAreaofEffectAttacks.cpp          | 1 +
 .../instances/hallofthenovice/AvoidEngagedTargets.cpp     | 1 +
 .../instances/hallofthenovice/DefeatanOccupiedTarget.cpp  | 1 +
 .../hallofthenovice/EngageEnemyReinforcements.cpp         | 1 +
 .../instances/hallofthenovice/EngageMultipleTargets.cpp   | 1 +
 .../instances/hallofthenovice/ExecuteaComboinBattle.cpp   | 1 +
 .../hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp     | 1 +
 .../ExecuteaRangedAttacktoIncreaseEnmity.cpp              | 1 +
 .../Scripts/instances/hallofthenovice/FinalExercise.cpp   | 1 +
 .../instances/hallofthenovice/HealMultipleAllies.cpp      | 1 +
 .../Scripts/instances/hallofthenovice/HealanAlly.cpp      | 1 +
 .../hallofthenovice/InteractwiththeBattlefield.cpp        | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors101110.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors110.cpp        | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors111120.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors1120.cpp       | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors121130.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors131140.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors141150.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors151160.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors161170.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors171180.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors181190.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors191200.cpp     | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors2130.cpp       | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors3140.cpp       | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors4150.cpp       | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors5160.cpp       | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors6170.cpp       | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors7180.cpp       | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors8190.cpp       | 1 +
 .../instances/potd/ThePalaceoftheDeadFloors91100.cpp      | 1 +
 .../Script/Scripts/instances/pvp/Astragalos.cpp           | 1 +
 .../Script/Scripts/instances/pvp/SealRockSeize.cpp        | 1 +
 .../Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp    | 1 +
 .../Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp | 1 +
 .../Scripts/instances/pvp/TheFeast4on4LightParty.cpp      | 1 +
 .../Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp   | 1 +
 .../Script/Scripts/instances/pvp/TheFeast4on4Training.cpp | 1 +
 .../instances/pvp/TheFeastCustomMatchCrystalTower.cpp     | 1 +
 .../instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp  | 1 +
 .../instances/pvp/TheFeastCustomMatchLichenweed.cpp       | 1 +
 .../Script/Scripts/instances/pvp/TheFeastRanked.cpp       | 1 +
 .../Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp   | 1 +
 .../Script/Scripts/instances/pvp/TheFeastTraining.cpp     | 1 +
 .../Scripts/instances/pvp/TheFieldsofGloryShatter.cpp     | 1 +
 .../Scripts/instances/questbattle/ABloodyReunion.cpp      | 1 +
 .../instances/questbattle/ASpectaclefortheAges.cpp        | 1 +
 .../Script/Scripts/instances/questbattle/BloodDragoon.cpp | 1 +
 .../Scripts/instances/questbattle/BloodontheDeck.cpp      | 1 +
 .../instances/questbattle/CuriousGorgeMeetsHisMatch.cpp   | 1 +
 .../Scripts/instances/questbattle/DarkwingDragon.cpp      | 1 +
 .../Script/Scripts/instances/questbattle/InThalsName.cpp  | 1 +
 .../instances/questbattle/InterdimensionalRift.cpp        | 1 +
 .../Scripts/instances/questbattle/ItsProbablyaTrap.cpp    | 1 +
 .../Scripts/instances/questbattle/MatsubaMayhem.cpp       | 1 +
 .../Script/Scripts/instances/questbattle/Naadam.cpp       | 1 +
 .../Scripts/instances/questbattle/OneLifeforOneWorld.cpp  | 1 +
 .../Scripts/instances/questbattle/OurCompromise.cpp       | 1 +
 .../Scripts/instances/questbattle/OurUnsungHeroes.cpp     | 1 +
 .../Scripts/instances/questbattle/RaisingtheSword.cpp     | 1 +
 .../Scripts/instances/questbattle/ReturnoftheBull.cpp     | 1 +
 .../Scripts/instances/questbattle/TheBattleonBekko.cpp    | 1 +
 .../Scripts/instances/questbattle/TheFaceofTrueEvil.cpp   | 1 +
 .../instances/questbattle/TheHeartoftheProblem.cpp        | 1 +
 .../instances/questbattle/TheOrphansandtheBrokenBlade.cpp | 1 +
 .../Script/Scripts/instances/questbattle/TheResonant.cpp  | 1 +
 .../Scripts/instances/questbattle/WhenClansCollide.cpp    | 1 +
 .../Scripts/instances/questbattle/WithHeartandSteel.cpp   | 1 +
 .../raids/alexander/AlexanderTheArmoftheFather.cpp        | 1 +
 .../raids/alexander/AlexanderTheArmoftheFatherSavage.cpp  | 1 +
 .../instances/raids/alexander/AlexanderTheArmoftheSon.cpp | 1 +
 .../raids/alexander/AlexanderTheArmoftheSonSavage.cpp     | 1 +
 .../raids/alexander/AlexanderTheBreathoftheCreator.cpp    | 1 +
 .../alexander/AlexanderTheBreathoftheCreatorSavage.cpp    | 1 +
 .../raids/alexander/AlexanderTheBurdenoftheFather.cpp     | 1 +
 .../alexander/AlexanderTheBurdenoftheFatherSavage.cpp     | 1 +
 .../raids/alexander/AlexanderTheBurdenoftheSon.cpp        | 1 +
 .../raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp  | 1 +
 .../raids/alexander/AlexanderTheCuffoftheFather.cpp       | 1 +
 .../raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp | 1 +
 .../raids/alexander/AlexanderTheCuffoftheSon.cpp          | 1 +
 .../raids/alexander/AlexanderTheCuffoftheSonSavage.cpp    | 1 +
 .../raids/alexander/AlexanderTheEyesoftheCreator.cpp      | 1 +
 .../alexander/AlexanderTheEyesoftheCreatorSavage.cpp      | 1 +
 .../raids/alexander/AlexanderTheFistoftheFather.cpp       | 1 +
 .../raids/alexander/AlexanderTheFistoftheFatherSavage.cpp | 1 +
 .../raids/alexander/AlexanderTheFistoftheSon.cpp          | 1 +
 .../raids/alexander/AlexanderTheFistoftheSonSavage.cpp    | 1 +
 .../raids/alexander/AlexanderTheHeartoftheCreator.cpp     | 1 +
 .../alexander/AlexanderTheHeartoftheCreatorSavage.cpp     | 1 +
 .../raids/alexander/AlexanderTheSouloftheCreator.cpp      | 1 +
 .../alexander/AlexanderTheSouloftheCreatorSavage.cpp      | 1 +
 .../raids/coils/TheBindingCoilofBahamutTurn1.cpp          | 1 +
 .../raids/coils/TheBindingCoilofBahamutTurn2.cpp          | 1 +
 .../raids/coils/TheBindingCoilofBahamutTurn3.cpp          | 1 +
 .../raids/coils/TheBindingCoilofBahamutTurn4.cpp          | 1 +
 .../raids/coils/TheBindingCoilofBahamutTurn5.cpp          | 1 +
 .../instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp  | 1 +
 .../instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp  | 1 +
 .../instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp  | 1 +
 .../instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp  | 1 +
 .../raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp     | 1 +
 .../raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp     | 1 +
 .../raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp     | 1 +
 .../raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp     | 1 +
 .../instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp | 1 +
 .../instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp | 1 +
 .../instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp | 1 +
 .../instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp | 1 +
 .../Scripts/instances/raids/crystaltower/SyrcusTower.cpp  | 1 +
 .../raids/crystaltower/TheLabyrinthoftheAncients.cpp      | 1 +
 .../instances/raids/crystaltower/TheWorldofDarkness.cpp   | 1 +
 .../Scripts/instances/raids/omega/DeltascapeV10.cpp       | 1 +
 .../Scripts/instances/raids/omega/DeltascapeV10Savage.cpp | 1 +
 .../Scripts/instances/raids/omega/DeltascapeV20.cpp       | 1 +
 .../Scripts/instances/raids/omega/DeltascapeV20Savage.cpp | 1 +
 .../Scripts/instances/raids/omega/DeltascapeV30.cpp       | 1 +
 .../Scripts/instances/raids/omega/DeltascapeV30Savage.cpp | 1 +
 .../Scripts/instances/raids/omega/DeltascapeV40.cpp       | 1 +
 .../Scripts/instances/raids/omega/DeltascapeV40Savage.cpp | 1 +
 .../Scripts/instances/raids/omega/SigmascapeV10.cpp       | 1 +
 .../Scripts/instances/raids/omega/SigmascapeV10Savage.cpp | 1 +
 .../Scripts/instances/raids/omega/SigmascapeV20.cpp       | 1 +
 .../Scripts/instances/raids/omega/SigmascapeV20Savage.cpp | 1 +
 .../Scripts/instances/raids/omega/SigmascapeV30.cpp       | 1 +
 .../Scripts/instances/raids/omega/SigmascapeV30Savage.cpp | 1 +
 .../Scripts/instances/raids/omega/SigmascapeV40.cpp       | 1 +
 .../Scripts/instances/raids/omega/SigmascapeV40Savage.cpp | 1 +
 .../raids/returntoivalice/TheRoyalCityofRabanastre.cpp    | 1 +
 .../Scripts/instances/raids/shadowofmhach/DunScaith.cpp   | 1 +
 .../Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp  | 1 +
 .../raids/shadowofmhach/TheWeepingCityofMhach.cpp         | 1 +
 .../raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp   | 1 +
 .../Scripts/instances/treasurehunt/TheAquapolis.cpp       | 1 +
 .../instances/treasurehunt/TheHiddenCanalsofUznair.cpp    | 1 +
 .../instances/treasurehunt/TheLostCanalsofUznair.cpp      | 1 +
 .../Scripts/instances/trials/ARelicReborntheChimera.cpp   | 1 +
 .../Scripts/instances/trials/ARelicReborntheHydra.cpp     | 1 +
 .../instances/trials/AkhAfahAmphitheatreExtreme.cpp       | 1 +
 .../Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp  | 1 +
 .../Scripts/instances/trials/BattleintheBigKeep.cpp       | 1 +
 .../Scripts/instances/trials/BattleontheBigBridge.cpp     | 1 +
 .../Script/Scripts/instances/trials/CapeWestwind.cpp      | 1 +
 .../Script/Scripts/instances/trials/Emanation.cpp         | 1 +
 .../Script/Scripts/instances/trials/EmanationExtreme.cpp  | 1 +
 .../Script/Scripts/instances/trials/TheBowlofEmbers.cpp   | 1 +
 .../Scripts/instances/trials/TheBowlofEmbersExtreme.cpp   | 1 +
 .../Scripts/instances/trials/TheBowlofEmbersHard.cpp      | 1 +
 .../Script/Scripts/instances/trials/TheChrysalis.cpp      | 1 +
 .../Script/Scripts/instances/trials/TheDragonsNeck.cpp    | 1 +
 .../Scripts/instances/trials/TheFinalStepsofFaith.cpp     | 1 +
 .../Script/Scripts/instances/trials/TheHowlingEye.cpp     | 1 +
 .../Scripts/instances/trials/TheHowlingEyeExtreme.cpp     | 1 +
 .../Script/Scripts/instances/trials/TheHowlingEyeHard.cpp | 1 +
 .../Scripts/instances/trials/TheLimitlessBlueExtreme.cpp  | 1 +
 .../Scripts/instances/trials/TheLimitlessBlueHard.cpp     | 1 +
 .../instances/trials/TheMinstrelsBalladNidhoggsRage.cpp   | 1 +
 .../instances/trials/TheMinstrelsBalladShinryusDomain.cpp | 1 +
 .../instances/trials/TheMinstrelsBalladThordansReign.cpp  | 1 +
 .../instances/trials/TheMinstrelsBalladUltimasBane.cpp    | 1 +
 .../Script/Scripts/instances/trials/TheNavel.cpp          | 1 +
 .../Script/Scripts/instances/trials/TheNavelExtreme.cpp   | 1 +
 .../Script/Scripts/instances/trials/TheNavelHard.cpp      | 1 +
 .../Script/Scripts/instances/trials/ThePoolofTribute.cpp  | 1 +
 .../Scripts/instances/trials/ThePoolofTributeExtreme.cpp  | 1 +
 .../Script/Scripts/instances/trials/TheRoyalMenagerie.cpp | 1 +
 .../Scripts/instances/trials/TheSingularityReactor.cpp    | 1 +
 .../Script/Scripts/instances/trials/TheStepsofFaith.cpp   | 1 +
 .../Scripts/instances/trials/TheStrikingTreeExtreme.cpp   | 1 +
 .../Scripts/instances/trials/TheStrikingTreeHard.cpp      | 1 +
 .../Scripts/instances/trials/TheWhorleaterExtreme.cpp     | 1 +
 .../Script/Scripts/instances/trials/TheWhorleaterHard.cpp | 1 +
 .../Scripts/instances/trials/ThokastThokExtreme.cpp       | 1 +
 .../Script/Scripts/instances/trials/ThokastThokHard.cpp   | 1 +
 .../Script/Scripts/instances/trials/ThornmarchExtreme.cpp | 1 +
 .../Script/Scripts/instances/trials/ThornmarchHard.cpp    | 1 +
 .../Script/Scripts/instances/trials/UrthsFount.cpp        | 1 +
 .../Scripts/instances/trials/thefourlords/TheJadeStoa.cpp | 1 +
 .../instances/trials/thefourlords/TheJadeStoaExtreme.cpp  | 1 +
 .../instances/trials/warringtriad/ContainmentBayP1T6.cpp  | 1 +
 .../trials/warringtriad/ContainmentBayP1T6Extreme.cpp     | 1 +
 .../instances/trials/warringtriad/ContainmentBayS1T7.cpp  | 1 +
 .../trials/warringtriad/ContainmentBayS1T7Extreme.cpp     | 1 +
 .../instances/trials/warringtriad/ContainmentBayZ1T9.cpp  | 1 +
 .../trials/warringtriad/ContainmentBayZ1T9Extreme.cpp     | 1 +
 .../Script/Scripts/opening/OpeningGridania.cpp            | 2 ++
 .../sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp | 2 ++
 .../sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp | 2 ++
 .../sapphire_zone/Script/Scripts/quest/ManFst001.cpp      | 3 +++
 .../sapphire_zone/Script/Scripts/quest/ManFst002.cpp      | 3 +++
 .../sapphire_zone/Script/Scripts/quest/ManFst003.cpp      | 3 +++
 .../sapphire_zone/Script/Scripts/quest/ManFst004.cpp      | 8 +++-----
 .../sapphire_zone/Script/Scripts/quest/ManSea001.cpp      | 3 +++
 .../sapphire_zone/Script/Scripts/quest/ManSea002.cpp      | 3 +++
 .../sapphire_zone/Script/Scripts/quest/ManWil001.cpp      | 3 +++
 .../sapphire_zone/Script/Scripts/quest/ManWil002.cpp      | 3 +++
 .../Script/Scripts/quest/subquest/gridania/SubFst001.cpp  | 3 +++
 .../Script/Scripts/quest/subquest/gridania/SubFst002.cpp  | 3 +++
 .../Script/Scripts/quest/subquest/gridania/SubFst010.cpp  | 3 +++
 .../Script/Scripts/quest/subquest/gridania/SubFst013.cpp  | 3 +++
 290 files changed, 324 insertions(+), 9 deletions(-)

diff --git a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
index 3848b55c..fd0c8537 100644
--- a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
+++ b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
@@ -1,11 +1,7 @@
 #ifndef SAPPHIRE_SCRIPTOBJECT_H
 #define SAPPHIRE_SCRIPTOBJECT_H
 
-#include <Script/NativeScriptApi.h>
 #include <Forwards.h>
-#include <Actor/Chara.h>
-#include <Actor/Player.h>
-#include <Event/EventHelper.h>
 
 enum EventFlags
 {
diff --git a/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp b/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
index 428a0c60..3d5da658 100644
--- a/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/action/ActionSprint3.cpp
@@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>
 
 class ActionSprint3 : public ActionScript
 {
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp b/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
index 45b57f1b..6b8a479d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/Aethernet.cpp
@@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>
 
 #define ACTION_ATTUNE 0x13
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp b/src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp
index 51ba6cb1..c5c9a399 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/Aetheryte.cpp
@@ -1,4 +1,7 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>
+
 
 #define ACTION_ATTUNE 0x13
 #define ACTION_TELEPORT 0x4
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp
index 39bf4300..b701356b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefCutSceneReplay.cpp
@@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>
 
 class CmnDefCutSceneReplay : public EventScript
 {
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
index 714f9e55..40dc9d85 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefInnBed.cpp
@@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>
 
 class CmnDefInnBed : public EventScript
 {
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp
index f0df71f9..541032ea 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/CmnDefLinkShell.cpp
@@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>
 
 #define ACTION_CREATE 2
 #define ACTION_RENAME 3
diff --git a/src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp b/src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp
index 9e47c554..6340bc9d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/common/HouFurOrchestrion.cpp
@@ -1,4 +1,6 @@
+#include <Script/NativeScriptApi.h>
 #include "../ScriptObject.h"
+#include <Actor/Player.h>
 
 class HouFurOrchestrion : public EventScript
 {
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
index 76209b41..e4c89858 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
index 798dc4c4..df77748e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
index 3f2be9fd..3aa16ede 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
index 08f7481e..9c6e4151 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
index 51f3f14e..21d7a43e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
index 4738abef..206859c5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
index e2e58b9e..b71c36a1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
index 28de071c..63a7d371 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
index 8e6c4520..690e481b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
index 675ffb3c..440be3ad 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
index 3d351f8c..54444ba2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
index 1555b9e0..2318e3a4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
index ca287579..ec6c2ced 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
index 709a2f8a..5e476ef2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
index aa9de7cb..e1daa274 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
index 7a1ab655..3d0c85e5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
index eb599894..b918fcb9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
index 63bf962b..434e7be5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
index 6e503d7f..600b2355 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
index ddf1c94d..47cae6ab 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
index fbb5a042..308f54be 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
index 49f90833..ebcc7fc9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
index 15c5d674..8ad6f89a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
index 5b61298d..db1ae95c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
index 4e8f78eb..bc2a51e9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
index 46b0a680..174a6181 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
index fcdca8ab..0af04395 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 #include <Actor/EventObject.h>
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
index 2d87b363..581efac1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
index e79c80f9..6c3878cf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
index 2a1a5d88..9158a14d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
index df3773b8..5a2ecfa7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
index 6d31629b..288bab0b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
index ff928ffe..379776ea 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
index a45dd14a..dcc496f0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
index 079bc5a4..be2de5cb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
index 58b7ec92..bcd8a984 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
index bf4b9dae..e35380d9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
index 96f784a5..b4cfbf28 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
index 9b2be4e1..712153ef 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
index 3fd78eaa..a52618cb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
index 351e08f3..1703cfb0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
index fc0e357c..f52b62de 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
index eaf2f854..0267d35d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
index a64adf35..94710831 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
index 8b5fd51d..b00e6906 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
index b7cc6a70..881aae3a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
index eb6f5fc9..25b464fb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
index aa02ef6f..3a315a5d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
index 6aef0416..971df89c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
index 0c581ec4..8d3c26bc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
index 4c5b0c81..2a868e9c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
index 794d9a7c..5d4b010e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
index 9c75a08b..428a67b1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
index 16bea6bd..b873a31b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
index e61d0108..c0d03daf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
index f210ba9c..c16f8ee7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
index cb625442..d583a645 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
index 11b5708a..2ffcc4cc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
index 739c0f7a..28a0e67a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
index 7206d430..1ff5c78b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
index 1da20ba0..9105e586 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
index 4ddd5e24..9e740cd4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
index c5f05e52..d7bee881 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
index b038b8a0..6efaae64 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
index 90f1ee09..8bc5ca2c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
index 7657705b..16f31cdd 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
index e1545b98..bd70e01a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
index 18b9e457..f127043e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
index ac337f81..aceb90aa 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
index e5b4b041..4c450b99 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
index c1837447..e31fcc65 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
index 752b1dc0..3ab7e07a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
index 2c7e935a..b411e44c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
index b71eafe3..7adc0554 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
index 6ee45292..bae0b35f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
index 6a067978..d4e6cc13 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
index b0c6ee8a..5a28b710 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
index d9f49abe..eafa14c3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
index dd3663c9..86265b20 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
index 8db0f170..9be31086 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
index beafc103..66f53865 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
index f7f28f72..363e07ad 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
index fd841a93..18612ec4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
index 0cefd33f..c3098db6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
index 5100ef87..61ad93d3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
index 6c1607a9..a14c2a6d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
index dd23dd6c..36db3fad 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
index 0adbc4a0..6b148a27 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
index 6849bda0..90de9334 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
index 657574c3..f306fb77 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
index e4139d83..3e5c0613 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
index e59d2d6d..0090b554 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
index f51e9dc6..8ec1bb78 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
index 74118967..7d021fcf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
index 3a8bb8a5..5e865721 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
index dd655293..01db987f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
index 4932cc33..64b9c068 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
index d0b6a4bc..03a6d2dc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
index 2451e4cd..f1b856d7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
index f596415f..4b03e697 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
index 61e5593f..3f480582 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
index 2d62f760..17ff4666 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
index c26192f5..c05b73e4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
index 2c9e444f..a6cb7e5b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
index ab39e366..22f25b55 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
index 60bdee61..2160a8f5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
index 0e947a49..39b938f2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
index b9b11385..9b3c33d7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
index c3842694..47315408 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
index d1cc3100..972ddf71 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
index 9af4d977..dbc0ec95 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
index abe093ae..7ee588ef 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
index 798bd75c..056f8752 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
index cf493515..3e3f4c21 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
index 9eeec3d2..75ce3f12 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
index a4e19042..5609529f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
index 17302925..6371fc8b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
index 1ddd9c59..4fd1fca7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
index 3382f538..58ca5c57 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
index 752a9c57..9bc8619c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
index 94d4a5a9..2209e9cf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
index f0d24c0c..ae357722 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
index f9f11cea..9c3247a7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
index ea3a2663..635067fc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
index 2a3173c9..cbc85b5c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
index 7f0f9749..f5b88eb1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
index 4d9abd9b..be5e834e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
index 03dc3ed1..114557c0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
index 55c6bc02..6ca7a6f2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
index 7e432d7b..07b12dd6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
index 7992c6a4..1e2f11f2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
index b6691899..40281d56 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
index fa61f53f..b2613cc8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
index 6c39dbf2..98270057 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
index 0fa6e21d..18b845c4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
index 61fda53d..7d056db4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
index c36126e5..0fde3689 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
index fb471d26..50817943 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
index 9784a891..d012e08e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
index 7cb0f4c3..74518599 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
index 87dc0745..08a95154 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
index 5c7db071..18b6d1c0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
index 984d60b7..a1a86cda 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
index 5b133331..33272f19 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
index e2f52dd8..11dfa7b1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
index 6bafcd4a..6e09cbdb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
index 35198971..0a69bee6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
index 75a9a536..f4f252ee 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
index 84a14053..358d1bd9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
index df48a678..fb456f55 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
index 88fbc4fb..8f1980ca 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
index c0ffba55..62384554 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
index 8b91b644..a08383d4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
index 633ad833..755558d4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
index ce9b3233..98246842 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
index 338d656a..4dd688c8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
index 5eb2b3be..5c516367 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
index 6baab0fe..b64fb71b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
index 16f7333a..314bfcb7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
index c2ba29fc..2802bb44 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
index a8c8645a..0d611e53 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
index 9fd5f5d9..3881802e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
index f6cc46b6..0a449381 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
index 6ac593af..c6616fcb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
index ba79f724..10e9d8eb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
index 94556e0c..01ac3085 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
index d8713dd8..083591b3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
index 8efd9ce6..ce511ab0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
index 724d8a79..497b11ae 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
index dc4d1b3f..e522fe89 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
index b6164a90..1d74b881 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
index aba627c9..3c2dde66 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
index 8f330fa6..40b1864d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
index a5a518d7..0e494469 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
index f13b7b22..497fcb4c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
index 7c820224..15566886 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
index f44ac704..6e6c9255 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
index a8740602..57844d1f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
index 4f72c6c7..a9da20e3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
index 09c7233a..5aba616f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
index 9220669d..c7a8404c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
index ae870bbb..af59f9c2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
index 74683dcf..aa5b55bd 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
index e647cd6e..2b528fcc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
index 411f53c9..52d11b8c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
index e3fb9c50..0f7dfc99 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
index 3445d1bb..40ed1b20 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
index d258a718..af5b5c7a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
index 6d8a5501..1fe3588b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
index ce9de1c0..9831c3ac 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
index 0824f6d8..314a5345 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
index b65488ad..d1fec952 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
index b9f46df2..73c89447 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
index 12166e1c..2734ef67 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
index 963deba5..472ee9e0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
index a8780d43..8c70c978 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
index f1fe04e2..bce2cf2c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
index c5de8afa..baf44658 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
index ebc2dfc9..202f4425 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
index 269d8c9b..41f1ca73 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
index 52bcd4ab..ca9192ab 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
index 946022c6..e4ff6b4b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
index d96f3010..42236ce6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
index 4fdded9f..b9e63631 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
index 4158be21..38a8bc1f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
index dda2da3a..ede1dc51 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
index 43fcff38..47d44696 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
index b44745c7..8486fe24 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
index 0359d7a4..3e7b6bd0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
index b46323ab..b3f01ff9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
index c50f12f1..571ce0a0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
index df9c52b3..dcd0bfaa 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
index f6c2b02b..fd13241e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
index c47fe5ee..88fb0246 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
index c52e36e8..bcde3139 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
index 235b55b6..825e0630 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
index 9dfca234..8116a9ba 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
index 9fbd16b7..84f37c91 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
index 0be7715a..4b15603e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
index 2683b929..a1a13706 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
index ad01d235..ba5f162e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
index fece0c08..9680a5ab 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
index 1713f9d8..5bbd9c0e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
index 588f8377..f115a65f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
index e037af61..70067770 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
index f90e2bc5..44039c51 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
index 28c47b41..f4316fbb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
index 28e2d6b6..9dd5b35e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
index e88ecc6a..a44aacfc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
index f7023444..65e21df2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
index 37dc3012..34b4ebb1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
index d858083c..d3e1ce7f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
index ce785d73..8b0a753a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
index 3e8a5f00..ff93e39d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
index e0a8fdf6..4af8ecbf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
index bac5099d..56189028 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
index 96b9494a..3ece7f65 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
index 7c1ed631..737d7271 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
index 65c0ce03..8d9b7208 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
index 4c371537..19889690 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
index de66a6e3..0828d89c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
index a8c3de6a..668057d5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index 01f8e9f7..ebe4aa36 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
index 7f0c31e0..9cfe81f7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
index 74687de6..2b070eed 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
index fdf977ec..9a17edeb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
index 9a5c7506..ca213701 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
index 871bd02f..a9ab32aa 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
index 77820440..7752bc41 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
index 0484356d..a9ba8b6f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
index 4201b990..a323aedb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
index f2084d78..decc24bb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
index d66f2cf1..30439db6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
index 5b13841a..3a90cdcf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
index a28fe619..4bcadff3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
index 38d4285c..ea3abd56 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
index 8d7970ad..84d42bd8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
index 50d9f9a1..6fbf1f0a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
index 80c66d71..df2d3344 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
index 7545184b..4d9b24db 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
index c80cd4c5..4be07fc6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
index dde50b3a..89399d94 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
index 305e4357..b3a5299d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
index 16ade109..93099950 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
index e62111b1..dbeb8d02 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
index 859b9c10..e7db55a1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp
index 1fb71bbc..1c978f65 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp
@@ -1,3 +1,4 @@
+#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp
index 3fab8186..86775868 100644
--- a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningGridania.cpp
@@ -1,3 +1,5 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
 #include <ScriptObject.h>
 
 class OpeningGridania : public EventScript
diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp
index 3aba580e..84a1f771 100644
--- a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningLimsa.cpp
@@ -1,3 +1,5 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
 #include <ScriptObject.h>
 
 // Opening Script: OpeningLimsaLominsa
diff --git a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp
index 97374f2c..c3edda7e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/opening/OpeningUldah.cpp
@@ -1,3 +1,5 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
 #include <ScriptObject.h>
 
 class OpeningUldah : public EventScript
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst001.cpp
index b73581ac..8f03aeab 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst001.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst001.cpp
@@ -1,4 +1,7 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
 #include "../ScriptObject.h"
+#include "Event/EventHelper.h"
 
 // Quest Script: ManFst001_00039
 // Quest Name: Coming to Gridania
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp
index a2348a7e..dd99f0d3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst002.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../ScriptObject.h"
 
 // Quest Script: ManFst002_00124
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst003.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst003.cpp
index c8cd4da6..3da79b16 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst003.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst003.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../ScriptObject.h"
 
 // Quest Script: ManFst003_00123
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst004.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst004.cpp
index 18ac04b8..738444e0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManFst004.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManFst004.cpp
@@ -1,8 +1,6 @@
-// This is an automatically generated C++ script template
-// Content needs to be added by hand to make it function
-// In order for this script to be loaded, change its extension to .cpp
-// and move it to the correct folder in <root>/scripts/native/
-
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include <ScriptObject.h>
 
 // Quest Script: ManFst004_00124
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp
index aee4da80..75e528d2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../ScriptObject.h"
 
 class ManSea001 : public EventScript
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManSea002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManSea002.cpp
index 57d7dda7..8cb1b0b8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManSea002.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManSea002.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../ScriptObject.h"
 
 // Quest Script: ManSea002_00108
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp
index ee04e2aa..4b3d8d12 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../ScriptObject.h"
 
 // Quest Script: ManWil001_00594
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManWil002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManWil002.cpp
index 9f160f72..7058d743 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManWil002.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManWil002.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../ScriptObject.h"
 
 // Quest Script: ManWil002_00568
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst001.cpp
index 2aedc7f8..e8eebe8e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst001.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst001.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../../../ScriptObject.h"
 
 // Quest Script: SubFst001_00024
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst002.cpp
index 2e32fa23..1b95b44d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst002.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../../../ScriptObject.h"
 
 // Quest Script: SubFst002_00025
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst010.cpp
index e3e03582..11072820 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst010.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst010.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../../../ScriptObject.h"
 
 // Quest Script: SubFst010_00001
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst013.cpp
index 7bf4f6da..dca68559 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst013.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/subquest/gridania/SubFst013.cpp
@@ -1,3 +1,6 @@
+#include <Script/NativeScriptApi.h>
+#include <Actor/Player.h>
+#include "Event/EventHelper.h"
 #include "../../../ScriptObject.h"
 
 // Quest Script: SubFst013_00040

From 810d71f262afec94355f6375a455c0f7ec9d1027 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Fri, 2 Mar 2018 02:55:02 +1100
Subject: [PATCH 52/69] move eobj/player spawnindex generation to common
 manager

---
 src/common/Util/SpawnIndexAllocator.h         | 109 ++++++++++++++++++
 .../sapphire_zone/Actor/EventObject.cpp       |   6 +-
 src/servers/sapphire_zone/Actor/Player.cpp    |  60 +++-------
 src/servers/sapphire_zone/Actor/Player.h      |  17 ++-
 src/servers/sapphire_zone/Actor/PlayerSql.cpp |   3 -
 .../PacketWrappers/PlayerSpawnPacket.h        |   3 +
 6 files changed, 139 insertions(+), 59 deletions(-)
 create mode 100644 src/common/Util/SpawnIndexAllocator.h

diff --git a/src/common/Util/SpawnIndexAllocator.h b/src/common/Util/SpawnIndexAllocator.h
new file mode 100644
index 00000000..85875a67
--- /dev/null
+++ b/src/common/Util/SpawnIndexAllocator.h
@@ -0,0 +1,109 @@
+#ifndef SAPPHIRE_SPAWNINDEXALLOCATOR_H
+#define SAPPHIRE_SPAWNINDEXALLOCATOR_H
+
+#include <queue>
+#include <unordered_map>
+#include <type_traits>
+
+namespace Core
+{
+namespace Util
+{
+   template< typename T, typename ActorIdType = uint32_t >
+   class SpawnIndexAllocator
+   {
+   public:
+      static_assert( std::is_same< T, uint8_t >::value || std::is_same< T, uint16_t >::value ||
+                     std::is_same< T, uint32_t >::value || std::is_same< T, uint64_t >::value,
+                     "T must be uint8_t, uint16_t, uint32_t, uint64_t" );
+
+      SpawnIndexAllocator() :
+         m_maxSlotId( 0 ),
+         m_reserveFirstSlot( false )
+      { }
+
+      void init( T maxSlotId, bool reserveFirstSlot = false )
+      {
+         setupQueue();
+
+         m_maxSlotId = maxSlotId;
+         m_reserveFirstSlot = reserveFirstSlot;
+
+         // todo: reserve max slot id in map to prevent any runtime reshashing
+      }
+
+      T freeUsedSpawnIndex( ActorIdType actorId )
+      {
+         assert( m_maxSlotId != 0 );
+
+         auto it = m_actorIdToAllocatedMap.find( actorId );
+         if( it == m_actorIdToAllocatedMap.end() )
+            return 0;
+
+         auto index = it->second;
+         m_availableIds.push( index );
+         m_actorIdToAllocatedMap.erase( it );
+
+         return index;
+      }
+
+      bool getNextFreeSpawnIndex( ActorIdType actorId )
+      {
+         assert( m_maxSlotId != 0 );
+
+         if( m_availableIds.empty() )
+            return getAllocFailId();
+
+         auto nextId = m_availableIds.front();
+         m_availableIds.pop();
+
+         m_actorIdToAllocatedMap[actorId] = nextId;
+
+         return nextId;
+      }
+
+      void freeAllSpawnIndexes()
+      {
+         setupQueue();
+
+         m_actorIdToAllocatedMap.clear();
+      }
+
+      bool isSpawnIndexValid( T spawnIndex )
+      {
+         return spawnIndex != getAllocFailId();
+      }
+
+      constexpr T getAllocFailId()
+      {
+         return static_cast< T >( -1 );
+      }
+
+   protected:
+      void setupQueue()
+      {
+         while( !m_availableIds.empty() )
+            m_availableIds.pop();
+
+         uint32_t start = 0;
+
+         // slot 0 is reserved when used for spawning actors/players otherwise the local player actor spawnIndex
+         // will be used by another actor and despawn the local player
+         if( m_reserveFirstSlot )
+            start = 1;
+
+         for( uint32_t i = start; i < m_maxSlotId; i++ )
+            m_availableIds.push( i );
+      }
+
+      std::queue< T > m_availableIds;
+      std::unordered_map< ActorIdType, T > m_actorIdToAllocatedMap;
+
+      T m_maxSlotId;
+      bool m_reserveFirstSlot;
+   };
+}
+}
+
+
+#endif //SAPPHIRE_SPAWNINDEXALLOCATOR_H
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 4592fad5..ef4d784a 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -98,9 +98,13 @@ Core::InstanceContentPtr Core::Entity::EventObject::getParentInstance() const
 
 void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
 {
+   auto spawnIndex = pTarget->getNextObjSpawnIndexForActorId( getId( ) );
+   if( !pTarget->isObjSpawnIndexValid( spawnIndex ) )
+      return;
+
    g_log.debug( "Spawning EObj: id:" + std::to_string( getId() ) + " name:" + getName() );
    ZoneChannelPacket< FFXIVIpcObjectSpawn > eobjStatePacket( getId(), pTarget->getId() );
-   eobjStatePacket.data().spawnIndex = pTarget->getNextObjSpawnIndexForActorId( getId( ));
+   eobjStatePacket.data().spawnIndex = spawnIndex;
    eobjStatePacket.data().objKind = getObjKind();
    eobjStatePacket.data().state = getState();
    eobjStatePacket.data().objId = getObjectId();
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index a5afe5b3..0e2b299a 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -73,7 +73,6 @@ Core::Entity::Player::Player() :
    m_markedForRemoval( false ),
    m_mount( 0 ),
    m_directorInitialized( false ),
-   m_objCount( 0 ),
    m_onEnterEventDone( false )
 {
    m_id = 0;
@@ -90,6 +89,9 @@ Core::Entity::Player::Player() :
    memset( m_searchMessage, 0, sizeof( m_searchMessage ) );
    memset( m_classArray, 0, sizeof( m_classArray ) );
    memset( m_expArray, 0, sizeof( m_expArray ) );
+
+   m_objSpawnIndexAllocator.init( MAX_DISPLAYED_EOBJS );
+   m_actorSpawnIndexAllocator.init( MAX_DISPLAYED_ACTORS, true );
 }
 
 Core::Entity::Player::~Player()
@@ -438,43 +440,27 @@ uint8_t Core::Entity::Player::getGender() const
 
 void Core::Entity::Player::initSpawnIdQueue()
 {
-   while( !m_freeSpawnIdQueue.empty() )
-   {
-      m_freeSpawnIdQueue.pop();
-   }
-
-   for( int32_t i = 1; i < MAX_DISPLAYED_ACTORS; i++ )
-   {
-      m_freeSpawnIdQueue.push( i );
-   }
+   m_actorSpawnIndexAllocator.freeAllSpawnIndexes();
 }
 
 uint8_t Core::Entity::Player::getSpawnIdForActorId( uint32_t actorId )
 {
-   if( m_freeSpawnIdQueue.empty() )
-      return 0;
-
-   uint8_t spawnId = m_freeSpawnIdQueue.front();
-   m_freeSpawnIdQueue.pop();
-   m_playerIdToSpawnIdMap[actorId] = spawnId;
-   return spawnId;
+   return m_actorSpawnIndexAllocator.getNextFreeSpawnIndex( actorId );
 }
 
-void Core::Entity::Player::assignSpawnIdToPlayerId( uint32_t actorId, uint8_t spawnId )
+bool Core::Entity::Player::isActorSpawnIdValid( uint8_t spawnIndex )
 {
-   m_playerIdToSpawnIdMap[actorId] = spawnId;
+   return m_actorSpawnIndexAllocator.isSpawnIndexValid( spawnIndex );
 }
 
 void Core::Entity::Player::registerAetheryte( uint8_t aetheryteId )
 {
-
    uint16_t index;
    uint8_t value;
    Util::valueToFlagByteIndexValue( aetheryteId, value, index );
 
    m_aetheryte[index] |= value;
    queuePacket( ActorControlPacket143( getId(), LearnTeleport, aetheryteId, 1 ) );
-
 }
 
 bool Core::Entity::Player::isAetheryteRegistered( uint8_t aetheryteId ) const
@@ -1048,9 +1034,7 @@ void Core::Entity::Player::onMobKill( uint16_t nameId )
 
 void Core::Entity::Player::freePlayerSpawnId( uint32_t actorId )
 {
-   uint8_t spawnId = m_playerIdToSpawnIdMap[actorId];
-   m_playerIdToSpawnIdMap.erase( actorId );
-   m_freeSpawnIdQueue.push( spawnId );
+   auto spawnId = m_actorSpawnIndexAllocator.freeUsedSpawnIndex( actorId );
 
    ZoneChannelPacket< FFXIVIpcActorFreeSpawn > freeActorSpawnPacket( getId() );
    freeActorSpawnPacket.data().actorId = actorId;
@@ -1661,36 +1645,22 @@ void Core::Entity::Player::teleportQuery( uint16_t aetheryteId )
 
 uint8_t Core::Entity::Player::getNextObjSpawnIndexForActorId( uint32_t actorId )
 {
-   // todo: fix it so the case where there's no ids available doesn't break everything :(
-   auto nextCount = m_freeObjCounts.front();
-   m_freeObjCounts.pop();
-
-   m_actorIdToObjCountMap[actorId] = nextCount;
-
-   return nextCount;
+   return m_objSpawnIndexAllocator.getNextFreeSpawnIndex( actorId );
 }
 
 void Core::Entity::Player::resetObjSpawnIndex()
 {
-   while( m_freeObjCounts.empty() )
-      m_freeObjCounts.pop();
-
-   for( uint32_t i = 0; i < MAX_DISPLAYED_EOBJS; ++i )
-      m_freeObjCounts.push( i );
-
-   m_actorIdToObjCountMap.clear();
+   m_objSpawnIndexAllocator.freeAllSpawnIndexes();
 }
 
 void Core::Entity::Player::freeObjSpawnIndexForActorId( uint32_t actorId )
 {
-   auto it = m_actorIdToObjCountMap.find( actorId );
-   if( it == m_actorIdToObjCountMap.end() )
-      return;
+   m_objSpawnIndexAllocator.freeUsedSpawnIndex( actorId );
+}
 
-   auto freeCount = m_actorIdToObjCountMap[actorId];
-   m_freeObjCounts.push( freeCount );
-
-   m_actorIdToObjCountMap.erase( actorId );
+bool Core::Entity::Player::isObjSpawnIndexValid( uint8_t index )
+{
+   return m_objSpawnIndexAllocator.isSpawnIndexValid( index );
 }
 
 void Core::Entity::Player::setOnEnterEventDone( bool isDone )
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 877de137..89d4ff69 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -4,6 +4,7 @@
 #include "Forwards.h"
 
 #include <common/Common.h>
+#include <common/Util/SpawnIndexAllocator.h>
 
 #include "Chara.h"
 #include "Inventory/Inventory.h"
@@ -419,10 +420,10 @@ public:
    void initSpawnIdQueue();
    /*! get the spawn id mapped to a specific actorId */
    uint8_t getSpawnIdForActorId( uint32_t actorId );
-   /*! assigns the given spawnId to the actor */
-   void assignSpawnIdToPlayerId( uint32_t actorId, uint8_t spawnId );
    /*! frees the spawnId assigned to the given actor */
    void freePlayerSpawnId( uint32_t actorId );
+   /*! checks if the given spawn id is valid */
+   bool isActorSpawnIdValid( uint8_t spawnId );
    /*! send spawn packets to pTarget */
    void spawn( PlayerPtr pTarget ) override;
    /*! send despawn packets to pTarget */
@@ -440,8 +441,6 @@ public:
    bool hasStateFlag( Common::PlayerStateFlag flag ) const;
    /* reset a specified flag */
    void unsetStateFlag( Common::PlayerStateFlag flag );
-   /* helper function, send an empty state flag update */
-   void unlock();
 
    // Player Session Handling
    //////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -568,6 +567,8 @@ public:
    void resetObjSpawnIndex();
    /*! frees an obj count to be used by another eobj */
    void freeObjSpawnIndexForActorId( uint32_t actorId );
+   /*! checks if a spawn index is valid */
+   bool isObjSpawnIndexValid( uint8_t index );
 
 private:
    uint32_t m_lastWrite;
@@ -641,8 +642,6 @@ private:
 
    std::map< uint32_t, Event::EventHandlerPtr > m_eventHandlerMap;
 
-   std::map< uint32_t, uint8_t > m_playerIdToSpawnIdMap; // maps player to spawn id
-   std::queue< uint8_t > m_freeSpawnIdQueue; // queue with spawn ids free to be assigned
    std::queue< uint8_t > m_freeHateSlotQueue; // queue with "hate slots" free to be assigned
    std::map< uint32_t, uint8_t > m_actorIdTohateSlotMap;
 
@@ -682,10 +681,8 @@ private:
 
    uint8_t m_mount;
 
-   // counter used to index objects spawned for the player
-   uint8_t m_objCount;
-   std::queue< uint8_t > m_freeObjCounts;
-   std::map< uint32_t, uint8_t > m_actorIdToObjCountMap;
+   Util::SpawnIndexAllocator< uint8_t > m_objSpawnIndexAllocator;
+   Util::SpawnIndexAllocator< uint8_t > m_actorSpawnIndexAllocator;
 };
 
 }
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index ab127e0f..484bb27b 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -236,9 +236,6 @@ bool Core::Entity::Player::load( uint32_t charId, SessionPtr pSession )
 
    initSpawnIdQueue();
 
-   if( !m_playerIdToSpawnIdMap.empty() )
-      m_playerIdToSpawnIdMap.clear();
-
    if( !g_territoryMgr.movePlayer( pCurrZone, getAsPlayer() ) )
       return false;
 
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
index c56f9ccf..06ecc139 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/PlayerSpawnPacket.h
@@ -84,6 +84,9 @@ namespace Server {
          else
          {
             m_data.spawnIndex = target.getSpawnIdForActorId( player.getId() );
+
+            if( !target.isActorSpawnIdValid( m_data.spawnIndex ) )
+               return;
          }
          // 0x20 == spawn hidden to be displayed by the spawneffect control
          m_data.displayFlags = player.getStance();

From 78d660a1ce4d866619ecc155d0bc6c0ade333361 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Thu, 1 Mar 2018 23:17:35 +0100
Subject: [PATCH 53/69] Object despawning added

---
 src/common/Network/PacketDef/Ipcs.h               | 1 +
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 9 +++++++--
 src/servers/sapphire_zone/Actor/EventObject.cpp   | 2 +-
 src/servers/sapphire_zone/Actor/Player.cpp        | 6 +++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index fc4a1da2..76322136 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -104,6 +104,7 @@ namespace Packets {
       ActorCast                  = 0x0162, // updated 4.2
       HateList                   = 0x0165, // updated 4.2
       ObjectSpawn                = 0x0167, // updated 4.2
+      ObjectDespawn              = 0x0168, // updated 4.2
       UpdateClassInfo            = 0x0169, // updated 4.2
       InitUI                     = 0x016B, // updated 4.2
 
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 8684985d..59ebd4ab 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -414,8 +414,7 @@ struct FFXIVIpcPlayerSpawn : FFXIVIpcBasePacket<PlayerSpawn>
 */
 struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket<NpcSpawn>
 {
-   uint16_t title;
-   uint16_t u1b;
+   uint32_t mapLinkId; // needs to be existing in the map, mob will snap to it
    uint8_t u2b;
    uint8_t u2ab;
    uint8_t gmRank;
@@ -1339,6 +1338,12 @@ struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket<ObjectSpawn>
    int16_t unknown;
 };
 
+struct FFXIVIpcObjectDespawn : FFXIVIpcBasePacket<ObjectDespawn>
+{
+   uint8_t spawnIndex;
+   uint8_t padding[7];
+};
+
 
 } /* Server */
 } /* Packets */
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index ef4d784a..abc5c92e 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -120,7 +120,7 @@ void Core::Entity::EventObject::despawn( Core::Entity::PlayerPtr pTarget )
 {
    g_log.debug( "despawn eobj: " + std::to_string( getId() ) );
 
-   pTarget->freeObjSpawnIndexForActorId( getId( ));
+   pTarget->freeObjSpawnIndexForActorId( getId( ) );
 }
 
 const std::string& Core::Entity::EventObject::getName() const
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 0e2b299a..85090868 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -1655,7 +1655,11 @@ void Core::Entity::Player::resetObjSpawnIndex()
 
 void Core::Entity::Player::freeObjSpawnIndexForActorId( uint32_t actorId )
 {
-   m_objSpawnIndexAllocator.freeUsedSpawnIndex( actorId );
+   auto spawnId = m_objSpawnIndexAllocator.freeUsedSpawnIndex( actorId );
+
+   ZoneChannelPacket< FFXIVIpcObjectDespawn > freeObjectSpawnPacket( getId() );
+   freeObjectSpawnPacket.data().spawnIndex = spawnId;
+   queuePacket( freeObjectSpawnPacket );
 }
 
 bool Core::Entity::Player::isObjSpawnIndexValid( uint8_t index )

From 4e597d8acd60f4e5f1338fb663f6692e2fb759be Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Fri, 2 Mar 2018 11:39:52 +1100
Subject: [PATCH 54/69] fix stupid return type mistake

---
 src/common/Util/SpawnIndexAllocator.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/common/Util/SpawnIndexAllocator.h b/src/common/Util/SpawnIndexAllocator.h
index 85875a67..65cc826e 100644
--- a/src/common/Util/SpawnIndexAllocator.h
+++ b/src/common/Util/SpawnIndexAllocator.h
@@ -34,8 +34,6 @@ namespace Util
 
       T freeUsedSpawnIndex( ActorIdType actorId )
       {
-         assert( m_maxSlotId != 0 );
-
          auto it = m_actorIdToAllocatedMap.find( actorId );
          if( it == m_actorIdToAllocatedMap.end() )
             return 0;
@@ -47,7 +45,7 @@ namespace Util
          return index;
       }
 
-      bool getNextFreeSpawnIndex( ActorIdType actorId )
+      T getNextFreeSpawnIndex( ActorIdType actorId )
       {
          assert( m_maxSlotId != 0 );
 
@@ -82,6 +80,8 @@ namespace Util
    protected:
       void setupQueue()
       {
+         assert( m_maxSlotId != 0 );
+
          while( !m_availableIds.empty() )
             m_availableIds.pop();
 

From 8437ff3cbccbccbb87902143f8c0b4ea43342a24 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Fri, 2 Mar 2018 15:29:48 +1100
Subject: [PATCH 55/69] set weatheroverride debug command and assert fix in
 spawnindexallocator

---
 src/common/Util/SpawnIndexAllocator.h                  |  4 ++--
 .../sapphire_zone/DebugCommand/DebugCommandHandler.cpp | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/common/Util/SpawnIndexAllocator.h b/src/common/Util/SpawnIndexAllocator.h
index 65cc826e..732f652c 100644
--- a/src/common/Util/SpawnIndexAllocator.h
+++ b/src/common/Util/SpawnIndexAllocator.h
@@ -24,11 +24,11 @@ namespace Util
 
       void init( T maxSlotId, bool reserveFirstSlot = false )
       {
-         setupQueue();
-
          m_maxSlotId = maxSlotId;
          m_reserveFirstSlot = reserveFirstSlot;
 
+         setupQueue();
+
          // todo: reserve max slot id in map to prevent any runtime reshashing
       }
 
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 35e711cd..9a68f69b 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -304,6 +304,14 @@ void Core::DebugCommandHandler::set( char * data, Entity::Player& player, boost:
 
       player.sendDebug( "MSQ Guide updated " );
    }
+   else if( subCommand == "weatheroverride" || subCommand == "wo" )
+   {
+      uint32_t weatherId;
+
+      sscanf( params.c_str(), "%d", &weatherId );
+
+      player.getCurrentZone()->setWeatherOverride( static_cast< Common::Weather >( weatherId ) );
+   }
    else
    {
       player.sendUrgent( subCommand + " is not a valid SET command." );
@@ -569,7 +577,7 @@ void Core::DebugCommandHandler::nudge( char * data, Entity::Player& player, boos
 
 void Core::DebugCommandHandler::serverInfo( char * data, Entity::Player& player, boost::shared_ptr< DebugCommand > command )
 {
-   player.sendDebug( "SapphireServer " + Version::VERSION + "\nRev: " + Version::GIT_HASH );
+   player.sendDebug( "SapphireZone " + Version::VERSION + "\nRev: " + Version::GIT_HASH );
    player.sendDebug( "Compiled: " __DATE__ " " __TIME__ );
    player.sendDebug( "Sessions: " + std::to_string( g_serverZone.getSessionCount() ) );
 }

From ad082ae176293af1012e0d80c1742f93018743ae Mon Sep 17 00:00:00 2001
From: Tahir Akhlaq <xdemolish@hotmail.com>
Date: Fri, 2 Mar 2018 16:27:04 +0000
Subject: [PATCH 56/69] fixed limsa and uldah intro quest

---
 src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp | 2 --
 src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp
index 75e528d2..4ad91b50 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManSea001.cpp
@@ -63,8 +63,6 @@ private:
    {
       auto callback = [ this ]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )
       {
-         player.updateQuest( getId(), 1 );
-
          player.eventPlay( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 1, 0 );
       };
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp b/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp
index 4b3d8d12..18669bd1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/quest/ManWil001.cpp
@@ -54,7 +54,6 @@ private:
    {
       auto callback = [ this ]( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2, uint16_t param3 )
       {
-         player.updateQuest( getId(), SEQ_FINISH );
          player.eventPlay( OPENING_EVENT_HANDLER, 0x1E, HIDE_HOTBAR | NO_DEFAULT_CAMERA, 0, 0 );
       };
 

From 619d39e6f8ea3310728460cc008ed51d56980b93 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 4 Mar 2018 00:12:33 +0100
Subject: [PATCH 57/69] Fixed an inventory bug to to invalid size

---
 src/servers/sapphire_zone/Inventory/Inventory.cpp     | 4 ++--
 src/servers/sapphire_zone/Inventory/ItemContainer.cpp | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/servers/sapphire_zone/Inventory/Inventory.cpp b/src/servers/sapphire_zone/Inventory/Inventory.cpp
index e2ed60d3..83520ae1 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.cpp
+++ b/src/servers/sapphire_zone/Inventory/Inventory.cpp
@@ -723,7 +723,7 @@ bool Core::Inventory::load()
    while( bagRes->next() )
    {
       uint16_t storageId = bagRes->getUInt16( 1 );
-      for( uint32_t i = 1; i <= 25; i++ )
+      for( uint32_t i = 1; i <= 35; i++ )
       {
          uint64_t uItemId = bagRes->getUInt64( i + 1 );
          if( uItemId == 0 )
@@ -893,7 +893,7 @@ uint8_t Core::Inventory::getFreeSlotsInBags()
    uint8_t slots = 0;
    for( uint8_t container : { 0, 1, 2, 3 } )
    {
-      slots += 25 - m_inventoryMap[container]->getEntryCount();
+      slots += 34 - m_inventoryMap[container]->getEntryCount();
    }
    return slots;
 }
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
index 109cc17c..afca3af1 100644
--- a/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
+++ b/src/servers/sapphire_zone/Inventory/ItemContainer.cpp
@@ -14,7 +14,7 @@ extern Core::Logger g_log;
 
 Core::ItemContainer::ItemContainer( uint16_t locationId ) : 
    m_id( locationId ),
-   m_size( 25 )
+   m_size( 35 )
 {
 
 }

From 0e9e155e53f1787d3ed83856ba1fe8bfcd7788cf Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 4 Mar 2018 00:16:44 +0100
Subject: [PATCH 58/69] Instance parser updated to map sgb content to EObjects

---
 src/tools/event_object_parser/instance.tmpl |  2 +-
 src/tools/event_object_parser/lgb.h         |  2 +-
 src/tools/event_object_parser/main.cpp      | 96 +++++++++++++++++----
 src/tools/event_object_parser/sgb.h         | 33 ++++++-
 4 files changed, 114 insertions(+), 19 deletions(-)

diff --git a/src/tools/event_object_parser/instance.tmpl b/src/tools/event_object_parser/instance.tmpl
index 04cdb716..f01a62da 100644
--- a/src/tools/event_object_parser/instance.tmpl
+++ b/src/tools/event_object_parser/instance.tmpl
@@ -9,7 +9,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      EOBJ_INIT
+   EOBJ_INIT
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/tools/event_object_parser/lgb.h b/src/tools/event_object_parser/lgb.h
index 2b6aa003..9fe4c0f3 100644
--- a/src/tools/event_object_parser/lgb.h
+++ b/src/tools/event_object_parser/lgb.h
@@ -257,7 +257,7 @@ struct LGB_GROUP
             {
                entries.push_back( std::make_shared< LGB_BGPARTS_ENTRY >( buf, entryOffset ) );
             }
-            else if( !ignoreModels && type == LgbEntryType::Gimmick )
+            else if( type == LgbEntryType::Gimmick )
             {
                entries.push_back( std::make_shared< LGB_GIMMICK_ENTRY >( buf, entryOffset ) );
             }
diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index bb8e8188..22c4b3f1 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -236,7 +236,9 @@ void loadEobjNames()
       auto id = row.first;
       auto& fields = row.second;
       auto name = *boost::get< std::string >( &fields.at( 0 ) );
-      eobjNameMap[id] = name;
+
+      if( !name.empty() )
+         eobjNameMap[id] = name;
    }
 }
 
@@ -431,7 +433,7 @@ int main( int argc, char* argv[] )
          std::vector< LGB_FILE > lgbList{ bgLgb, planmapLgb };
          uint32_t max_index = 0;
 
-         if( ignoreModels )
+         //if( ignoreModels )
          {
             std::map< std::string, SGB_FILE > sgbFiles;
 
@@ -470,6 +472,7 @@ int main( int argc, char* argv[] )
             uint32_t count = 0;
             for( const auto& lgb : lgbList )
             {
+               std::map< std::string, uint32_t> nameMap;
                for( const auto& group : lgb.groups )
                {
                   //std::cout << "\t" << group.name << " Size " << group.header.entryCount << "\n";
@@ -494,32 +497,93 @@ int main( int argc, char* argv[] )
                         std::string typeStr;
                         uint32_t eobjlevelHierachyId = 0;
 
-                        if( pObj->getType() == LgbEntryType::EventObject )
+                        auto pEobj = reinterpret_cast< LGB_EOBJ_ENTRY* >( pObj );
+                        id = pEobj->header.eobjId;
+                        unknown = pEobj->header.unknown;
+
+
+                        typeStr = eobjStr;
+                        eobjlevelHierachyId = pEobj->header.levelHierachyId;
+
+                        std::string states = "";
+                        std::string gimmickName = "";
+                        for( const auto& pEntry1 : group.entries )
                         {
-                           auto pEobj = reinterpret_cast< LGB_EOBJ_ENTRY* >( pObj );
-                           id = pEobj->header.eobjId;
-                           unknown = pEobj->header.unknown;
-                           name = eobjNameMap[id];
-                           if( name.empty() )
-                              name = "unknown" + std::to_string( count++ );
-                           name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() );
-                           name[0] = toupper( name[0] );
-                           typeStr = eobjStr;
-                           eobjlevelHierachyId = pEobj->header.levelHierachyId;
+                           auto pGObj = pEntry1.get();
+                           if( pGObj->getType() == LgbEntryType::Gimmick )
+                           {
+                              if( pGObj->header.unknown == pEobj->header.levelHierachyId )
+                              {
+                                 auto pGObjR = reinterpret_cast< LGB_GIMMICK_ENTRY* >( pGObj );
+                                 char* dataSection = nullptr;
+                                 //std::cout << fileName << " ";
+                                    
+                                 auto file = data1->getFile( pGObjR->gimmickFileName );
+                                 auto sections = file->get_data_sections();
+                                 dataSection = &sections.at( 0 )[0];
+                                 auto sgbFile = SGB_FILE( &dataSection[0] );
+
+                                 auto pos = pGObjR->gimmickFileName.find_last_of( "/" );
+
+                                 if( pos != std::string::npos )
+                                 {
+                                    name = pGObjR->gimmickFileName.substr( pos + 1 );
+                                    name = name.substr( 0, name.length() - 4 );
+                                    gimmickName = name;
+                                 }
+
+                                 if( sgbFile.stateEntries.size() > 0 )
+                                 {
+                                    states = "      // States -> ";
+                                    for( auto entries1 : sgbFile.stateEntries )
+                                    {
+                                       states += entries1.name + " ";
+                                    }
+                                    states += "\n";
+                                 }
+
+                                 break;
+
+                              }
+                           }
                         }
                         int state = 4;
 
-                        if( id == 2000182 )
+                        if( eobjNameMap.find( id ) != eobjNameMap.end() )
+                        {
+                           name = eobjNameMap[id];
+                           name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() );
+                           name[0] = toupper( name[0] );
+                        }
+                        if( name.empty() )
+                           name = "unknown_" + std::to_string( count++ );
+
+                        if( id == 2000182 || gimmickName == "sgvf_w_lvd_b0095" )
                         {
                            state = 5;
                            name = "Entrance";
                         }
 
-                        eobjects += "\n      instance->registerEObj( \"" + name + "\", " + std::to_string( id ) + 
+                        auto count1 = 0;
+                        if( nameMap.find( name ) == nameMap.end() )
+                        {
+                           nameMap[name] = 0;
+                        }
+                        else
+                        {
+                           nameMap[name] = ++nameMap[name];
+                           count1 = nameMap[name];
+                        }
+
+                        if( count1 > 0 )
+                           name = name + "_" + std::to_string( count1 );
+
+                        eobjects += "      instance->registerEObj( \"" + name + "\", " + std::to_string( id ) + 
                                      ", " + std::to_string( eobjlevelHierachyId ) + ", " + std::to_string( state ) + ", " +
                                      "{ " + std::to_string( pObj->header.translation.x ) + "f, " 
                                      + std::to_string( pObj->header.translation.y ) + "f, " 
-                                     + std::to_string( pObj->header.translation.z ) + "f }, " + std::to_string( pObj->header.scale.x ) + "f );";
+                                     + std::to_string( pObj->header.translation.z ) + "f }, " + std::to_string( pObj->header.scale.x ) + "f );\n" + states;
+
 
                         std::string outStr(
                            std::to_string( id ) + ", " + typeStr + "\"" + name + "\", " +
diff --git a/src/tools/event_object_parser/sgb.h b/src/tools/event_object_parser/sgb.h
index 2aa675aa..beaa8bfd 100644
--- a/src/tools/event_object_parser/sgb.h
+++ b/src/tools/event_object_parser/sgb.h
@@ -160,7 +160,7 @@ struct SGB_HEADER
    int32_t offset1C;
 
    uint32_t unknown20;
-   uint32_t unknown24;
+   uint32_t statesOffset;
    uint32_t unknown28;
    uint32_t unknown2C;
 
@@ -178,10 +178,30 @@ struct SGB_HEADER
    uint32_t unknown54;
 };
 
+struct SGB_STATE_HEADER
+{
+   uint32_t id;
+   uint32_t nameOffset;
+   char unknown[0x24];
+};
+
+struct SGB_STATE_ENTRY
+{
+   SGB_STATE_HEADER header;
+   std::string name;
+
+   SGB_STATE_ENTRY( char* buf )
+   {
+      header = *reinterpret_cast< SGB_STATE_HEADER* >( buf );
+      name = std::string( buf + header.nameOffset );
+   }
+};
+
 struct SGB_FILE
 {
    SGB_HEADER header;
    std::vector<SGB_GROUP> entries;
+   std::vector<SGB_STATE_ENTRY> stateEntries;
 
    SGB_FILE()
    {
@@ -201,6 +221,17 @@ struct SGB_FILE
          entries.push_back( group );
          auto group2 = SGB_GROUP( buf, this, header.fileSize, baseOffset + header.offset1C );
          entries.push_back( group2 );
+         uint32_t stateCount = *reinterpret_cast< uint32_t* >( buf + baseOffset + header.statesOffset + 4 );
+         if( stateCount > 0 )
+         {
+            stateCount = stateCount;
+            for( int i = 0; i < stateCount; ++i )
+            {
+               auto state = SGB_STATE_ENTRY( buf + baseOffset + header.statesOffset + 8 + i * sizeof( SGB_STATE_HEADER ) );
+               stateEntries.push_back( state );
+               std::cout << state.name << "\n";
+            }
+         }
       }
       catch( std::exception& e )
       {

From 6255df16f2ff5c43d47b8b81548374407a63a016 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Sun, 4 Mar 2018 17:41:17 +1100
Subject: [PATCH 59/69] fix rotation in objectspawn ipc and send it too

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h | 6 +++---
 src/servers/sapphire_zone/Actor/EventObject.cpp   | 5 ++++-
 src/servers/sapphire_zone/Actor/EventObject.h     | 2 +-
 src/servers/sapphire_zone/Zone/Zone.cpp           | 4 ++--
 src/servers/sapphire_zone/Zone/Zone.h             | 2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 59ebd4ab..071ebc50 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -1327,15 +1327,15 @@ struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket<ObjectSpawn>
    uint32_t hierachyId;
    float scale;
    int16_t unknown20a;
-   uint16_t unknown20b;
+   uint16_t rotation;
    int16_t unknown24a;
    int16_t unknown24b;
    uint16_t unknown28a;
    int16_t unknown28c;
    uint32_t unknown2C;
    Common::FFXIVARR_POSITION3 position;
-   int16_t rotation;
-   int16_t unknown;
+   int16_t unknown3C;
+   int16_t unknown3E;
 };
 
 struct FFXIVIpcObjectDespawn : FFXIVIpcBasePacket<ObjectDespawn>
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index abc5c92e..11fa13a3 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -9,6 +9,7 @@
 #include <common/Network/CommonNetwork.h>
 #include <common/Network/PacketDef/Zone/ServerZoneDef.h>
 #include <common/Network/PacketContainer.h>
+#include <common/Util/UtilMath.h>
 
 using namespace Core::Common;
 using namespace Core::Network::Packets;
@@ -19,7 +20,7 @@ extern Core::Logger g_log;
 
 Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t mapLinkId,
                                         uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
-                                        const std::string& givenName ) :
+                                        float rotation, const std::string& givenName ) :
    Core::Entity::Actor( ObjKind::EventObj ),
    m_mapLinkId( mapLinkId ),
    m_state( initialState ),
@@ -30,6 +31,7 @@ Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uin
    m_pos.x = pos.x;
    m_pos.y = pos.y;
    m_pos.z = pos.z;
+   m_rot = rotation;
 }
 
 uint32_t Core::Entity::EventObject::getMapLinkId() const
@@ -112,6 +114,7 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
    eobjStatePacket.data().position = getPos();
    eobjStatePacket.data().scale = getScale();
    eobjStatePacket.data().actorId = getId();
+   eobjStatePacket.data().rotation = Math::Util::floatToUInt16Rot( getRot() );
    pTarget->queuePacket( eobjStatePacket );
 }
 
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 2fd57a09..f1762b52 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -11,7 +11,7 @@ namespace Entity
    {
    public:
       EventObject( uint32_t actorId, uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
-                   const std::string& givenName = "none" );
+                   float rotation, const std::string& givenName = "none" );
 
       using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr, InstanceContentPtr, uint64_t ) >;
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 1c56ad10..03c42ada 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -693,9 +693,9 @@ uint32_t Core::Zone::getNextEObjId()
 }
 
 Core::Entity::EventObjectPtr Core::Zone::registerEObj( const std::string &name, uint32_t objectId, uint32_t mapLink,
-                                                       uint8_t state, FFXIVARR_POSITION3 pos, float scale )
+                                                       uint8_t state, FFXIVARR_POSITION3 pos, float scale, float rotation )
 {
-   auto eObj = Entity::make_EventObject( getNextEObjId(), objectId, mapLink, state, pos, name );
+   auto eObj = Entity::make_EventObject( getNextEObjId(), objectId, mapLink, state, pos, rotation, name );
    eObj->setScale( scale );
    registerEObj( eObj );
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 81170219..de83e10f 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -114,7 +114,7 @@ public:
    void updateSessions( bool changedWeather );
 
    Entity::EventObjectPtr registerEObj( const std::string& name, uint32_t objectId, uint32_t mapLink,
-                                        uint8_t state, Common::FFXIVARR_POSITION3 pos, float scale );
+                                        uint8_t state, Common::FFXIVARR_POSITION3 pos, float scale, float rotation );
 
    void registerEObj( Entity::EventObjectPtr object );
    Entity::EventObjectPtr getEObj( uint32_t objId );

From 628f01e2eb9e0c053a8ff15f3be8c744fa9079cd Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Sun, 4 Mar 2018 17:49:18 +1100
Subject: [PATCH 60/69] use subfolders for instancecontenttype and export eobj
 rotation

---
 src/tools/event_object_parser/main.cpp | 50 +++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/tools/event_object_parser/main.cpp b/src/tools/event_object_parser/main.cpp
index 22c4b3f1..ac5633b0 100644
--- a/src/tools/event_object_parser/main.cpp
+++ b/src/tools/event_object_parser/main.cpp
@@ -39,6 +39,7 @@ struct instanceContent
    uint32_t id;
    std::string name;
    std::string zoneName;
+   uint8_t type;
 };
 
 std::vector< instanceContent > contentList;
@@ -309,6 +310,7 @@ void loadAllInstanceContentEntries()
       auto name = *boost::get< std::string >( &fields.at( 3 ) );
       if( name.empty() )
          continue;
+      auto type = *boost::get< uint8_t >( &fields.at( 0 ) );
       auto teri = *boost::get< uint32_t >( &fields.at( 9 ) );
       auto i = 0;
       while( ( i = name.find( ' ' ) ) != std::string::npos )
@@ -322,7 +324,7 @@ void loadAllInstanceContentEntries()
 
       name.erase( boost::remove_if( name, boost::is_any_of( "★_ '()[]-\x1a\x1\x2\x1f\x1\x3.:" ) ), name.end() );
       name[0] = toupper( name[0] );
-      contentList.push_back( { id, name, zoneNameMap[teri] } );
+      contentList.push_back( { id, name, zoneNameMap[teri], type } );
    }
    out.close();
 }
@@ -367,6 +369,24 @@ int main( int argc, char* argv[] )
       }
    }
 
+   std::map< uint8_t, std::string > contentTypeMap;
+   contentTypeMap[0] = "";
+   contentTypeMap[1] = "raids";
+   contentTypeMap[2] = "dungeons";
+   contentTypeMap[3] = "guildhests";
+   contentTypeMap[4] = "trials";
+   contentTypeMap[5] = "pvp";
+   contentTypeMap[6] = "pvp";
+   contentTypeMap[7] = "questbattles";
+   contentTypeMap[8] = "hallofthenovice";
+   contentTypeMap[9] = "deepdungeon";
+   contentTypeMap[10] = "treasurehunt";
+   contentTypeMap[11] = "events";
+   contentTypeMap[12] = "pvp";
+
+   if( !boost::filesystem::exists( "instance.tmpl" ) )
+      throw std::runtime_error( "instance.tmpl is missing in working directory" );
+
    initExd( gamePath );
    if( dumpInstances )
    {
@@ -578,11 +598,16 @@ int main( int argc, char* argv[] )
                         if( count1 > 0 )
                            name = name + "_" + std::to_string( count1 );
 
-                        eobjects += "      instance->registerEObj( \"" + name + "\", " + std::to_string( id ) + 
-                                     ", " + std::to_string( eobjlevelHierachyId ) + ", " + std::to_string( state ) + ", " +
-                                     "{ " + std::to_string( pObj->header.translation.x ) + "f, " 
-                                     + std::to_string( pObj->header.translation.y ) + "f, " 
-                                     + std::to_string( pObj->header.translation.z ) + "f }, " + std::to_string( pObj->header.scale.x ) + "f );\n" + states;
+                        eobjects += "      instance->registerEObj( \"" + name + "\", " + std::to_string( id ) +
+                                    ", " + std::to_string( eobjlevelHierachyId ) + ", " + std::to_string( state ) +
+                                    ", " +
+                                    "{ " + std::to_string( pObj->header.translation.x ) + "f, "
+                                    + std::to_string( pObj->header.translation.y ) + "f, "
+                                    + std::to_string( pObj->header.translation.z ) + "f }, " +
+                                    std::to_string( pObj->header.scale.x ) + "f, " +
+
+                                    // for whatever reason, the rotation inside the sgbs is the inverse of what the game uses
+                                    std::to_string( pObj->header.rotation.y * -1.f ) + "f ); \n" + states;
 
 
                         std::string outStr(
@@ -619,8 +644,17 @@ int main( int argc, char* argv[] )
       result = std::regex_replace( result, std::regex( "\\INSTANCE_ID" ), std::to_string( entry.id ) );
       result = std::regex_replace( result, std::regex( "\\EOBJ_INIT" ), eobjects );
 
-      
-      std::ofstream outH( entry.name + ".cpp" );
+
+      std::string subdir = "";
+
+      auto subdirIt = contentTypeMap.find( entry.type );
+      if( subdirIt != contentTypeMap.end() )
+         subdir = subdirIt->second + "/";
+
+      boost::filesystem::path outDir( "instances/" + subdir );
+      boost::filesystem::create_directories( outDir );
+
+      std::ofstream outH( outDir.string() + entry.name + ".cpp" );
       outH << result;
       outH.close();
       

From 2c6253e37c3a9ce7eb1e1110d4faec066dea0ee0 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Sun, 4 Mar 2018 17:51:32 +1100
Subject: [PATCH 61/69] new instance scripts with eobj rotation

---
 .../ThePalaceoftheDeadFloors101110.cpp        |   8 +-
 .../ThePalaceoftheDeadFloors110.cpp           |   5 +-
 .../ThePalaceoftheDeadFloors111120.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors1120.cpp          |   5 +-
 .../ThePalaceoftheDeadFloors121130.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors131140.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors141150.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors151160.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors161170.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors171180.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors181190.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors191200.cpp        |   5 +-
 .../ThePalaceoftheDeadFloors2130.cpp          |   5 +-
 .../ThePalaceoftheDeadFloors3140.cpp          |  36 +++
 .../ThePalaceoftheDeadFloors4150.cpp          |  36 +++
 .../ThePalaceoftheDeadFloors5160.cpp          |   5 +-
 .../ThePalaceoftheDeadFloors6170.cpp          |   5 +-
 .../ThePalaceoftheDeadFloors7180.cpp          |   5 +-
 .../ThePalaceoftheDeadFloors8190.cpp          |   8 +-
 .../ThePalaceoftheDeadFloors91100.cpp         |   8 +-
 .../Scripts/instances/dungeons/AlaMhigo.cpp   |  31 +--
 .../instances/dungeons/AmdaporKeep.cpp        | 207 +++++++++-------
 .../instances/dungeons/AmdaporKeepHard.cpp    |  73 +++---
 .../instances/dungeons/BaelsarsWall.cpp       |  60 ++---
 .../instances/dungeons/BardamsMettle.cpp      |  26 +-
 .../instances/dungeons/BrayfloxsLongstop.cpp  |  43 ++--
 .../dungeons/BrayfloxsLongstopHard.cpp        |  54 +++--
 .../instances/dungeons/CastrumAbania.cpp      |  58 +----
 .../instances/dungeons/CastrumMeridianum.cpp  | 129 +++++-----
 .../instances/dungeons/CopperbellMines.cpp    | 106 +++++----
 .../dungeons/CopperbellMinesHard.cpp          |  88 +++----
 .../Scripts/instances/dungeons/CuttersCry.cpp |  72 +++---
 .../Scripts/instances/dungeons/DomaCastle.cpp |  30 +--
 .../instances/dungeons/DzemaelDarkhold.cpp    | 169 +++++++------
 .../Scripts/instances/dungeons/Halatali.cpp   |  94 ++++----
 .../instances/dungeons/HalataliHard.cpp       | 108 +++++----
 .../instances/dungeons/HaukkeManor.cpp        |  80 ++++---
 .../instances/dungeons/HaukkeManorHard.cpp    | 122 ++++++----
 .../Scripts/instances/dungeons/HellsLid.cpp   |  45 +---
 .../instances/dungeons/HullbreakerIsle.cpp    | 120 ++++++----
 .../dungeons/HullbreakerIsleHard.cpp          |  59 ++---
 .../instances/dungeons/KuganeCastle.cpp       |  63 +----
 .../Scripts/instances/dungeons/Neverreap.cpp  |  42 +---
 .../instances/dungeons/PharosSirius.cpp       |  65 ++---
 .../instances/dungeons/PharosSiriusHard.cpp   |  60 ++---
 .../dungeons/SaintMociannesArboretum.cpp      |  28 +--
 .../Scripts/instances/dungeons/Sastasha.cpp   | 113 ++++-----
 .../instances/dungeons/SastashaHard.cpp       |  77 +++---
 .../dungeons/ShisuioftheVioletTides.cpp       |  44 +---
 .../Scripts/instances/dungeons/Snowcloak.cpp  |  81 ++++---
 .../Scripts/instances/dungeons/SohmAl.cpp     |  23 +-
 .../Scripts/instances/dungeons/SohmAlHard.cpp |  44 +---
 .../Scripts/instances/dungeons/SohrKhai.cpp   |  31 +--
 .../Scripts/instances/dungeons/TheAery.cpp    |  22 +-
 .../TheAetherochemicalResearchFacility.cpp    |  34 +--
 .../instances/dungeons/TheAntitower.cpp       |  53 +----
 .../instances/dungeons/TheAurumVale.cpp       |  37 +--
 .../dungeons/TheDrownedCityofSkalla.cpp       |  31 +--
 .../instances/dungeons/TheDuskVigil.cpp       |  39 +--
 .../dungeons/TheFractalContinuum.cpp          |  65 +----
 .../dungeons/TheFractalContinuumHard.cpp      |  35 +--
 .../dungeons/TheGreatGubalLibrary.cpp         |  33 +--
 .../dungeons/TheGreatGubalLibraryHard.cpp     |  46 +---
 .../instances/dungeons/TheKeeperoftheLake.cpp |  63 ++---
 .../dungeons/TheLostCityofAmdapor.cpp         | 101 ++++----
 .../dungeons/TheLostCityofAmdaporHard.cpp     |  88 +++----
 .../instances/dungeons/ThePraetorium.cpp      | 224 +++++++++---------
 .../instances/dungeons/TheSirensongSea.cpp    |  29 +--
 .../instances/dungeons/TheStoneVigil.cpp      |  63 +++--
 .../instances/dungeons/TheStoneVigilHard.cpp  |  52 ++--
 .../dungeons/TheSunkenTempleofQarn.cpp        | 120 +++++-----
 .../dungeons/TheSunkenTempleofQarnHard.cpp    | 102 ++++----
 .../dungeons/TheTamTaraDeepcroft.cpp          |  53 +++--
 .../dungeons/TheTamTaraDeepcroftHard.cpp      | 131 ++++++----
 .../instances/dungeons/TheTempleoftheFist.cpp |  39 +--
 .../dungeons/TheThousandMawsofTotoRak.cpp     | 105 ++++----
 .../Scripts/instances/dungeons/TheVault.cpp   |  40 +---
 .../instances/dungeons/TheWanderersPalace.cpp | 102 ++++----
 .../dungeons/TheWanderersPalaceHard.cpp       |  64 ++---
 .../Scripts/instances/dungeons/Xelphatol.cpp  |  35 +--
 .../instances/events/SpecialEventIII.cpp      |  41 ----
 .../instances/events/TheHauntedManor.cpp      |  35 +--
 .../events/TheValentionesCeremony.cpp         |  91 +++----
 .../instances/guildhest/LongLivetheQueen.cpp  |  42 ----
 .../instances/guildhest/ShadowandClaw.cpp     |  42 ----
 .../AllsWellthatEndsintheWell.cpp             |   7 +-
 .../AnnoytheVoid.cpp                          |   2 +-
 .../BasicTrainingEnemyParties.cpp             |   2 +-
 .../BasicTrainingEnemyStrongholds.cpp         |   9 +-
 .../FlickingSticksandTakingNames.cpp          |   4 +-
 .../HeroontheHalfShell.cpp                    |   2 +-
 .../instances/guildhests/LongLivetheQueen.cpp |  43 ++++
 .../MorethanaFeeler.cpp                       |   2 +-
 .../PullingPoisonPosies.cpp                   |   2 +-
 .../instances/guildhests/ShadowandClaw.cpp    |  43 ++++
 .../SolemnTrinity.cpp                         |   2 +-
 .../StingingBack.cpp                          |   7 +-
 .../UndertheArmor.cpp                         |   4 +-
 .../{guildhest => guildhests}/WardUp.cpp      |   2 +-
 .../AccrueEnmityfromMultipleTargets.cpp       |  21 +-
 .../AssistAlliesinDefeatingaTarget.cpp        |  21 +-
 .../AvoidAreaofEffectAttacks.cpp              |  21 +-
 .../hallofthenovice/AvoidEngagedTargets.cpp   |  21 +-
 .../DefeatanOccupiedTarget.cpp                |  21 +-
 .../EngageEnemyReinforcements.cpp             |  21 +-
 .../hallofthenovice/EngageMultipleTargets.cpp |  21 +-
 .../hallofthenovice/ExecuteaComboinBattle.cpp |  21 +-
 .../ExecuteaCombotoIncreaseEnmity.cpp         |  21 +-
 .../ExecuteaRangedAttacktoIncreaseEnmity.cpp  |  21 +-
 .../hallofthenovice/FinalExercise.cpp         |   7 +-
 .../hallofthenovice/HealMultipleAllies.cpp    |  21 +-
 .../instances/hallofthenovice/HealanAlly.cpp  |  21 +-
 .../InteractwiththeBattlefield.cpp            |  21 +-
 .../potd/ThePalaceoftheDeadFloors3140.cpp     |  34 ---
 .../potd/ThePalaceoftheDeadFloors4150.cpp     |  34 ---
 .../Scripts/instances/pvp/Astragalos.cpp      |  30 +--
 .../Scripts/instances/pvp/SealRockSeize.cpp   |  35 +--
 .../pvp/TheBorderlandRuinsSecure.cpp          |  42 ++--
 .../pvp/TheCarteneauFlatsHeliodrome.cpp       |  41 ----
 .../instances/pvp/TheFeast4on4LightParty.cpp  |  10 +-
 .../instances/pvp/TheFeast4on4Ranked.cpp      |   6 +-
 .../instances/pvp/TheFeast4on4Training.cpp    |   6 +-
 .../pvp/TheFeastCustomMatchCrystalTower.cpp   |  14 +-
 .../TheFeastCustomMatchFeastingGrounds.cpp    |  10 +-
 .../pvp/TheFeastCustomMatchLichenweed.cpp     |   6 +-
 .../Scripts/instances/pvp/TheFeastRanked.cpp  |  14 +-
 .../instances/pvp/TheFeastTeamRanked.cpp      |  14 +-
 .../instances/pvp/TheFeastTraining.cpp        |  14 +-
 .../instances/pvp/TheFieldsofGloryShatter.cpp |  27 +--
 .../instances/questbattle/ABloodyReunion.cpp  |  58 -----
 .../questbattle/ASpectaclefortheAges.cpp      |  42 ----
 .../instances/questbattle/BloodDragoon.cpp    |  50 ----
 .../instances/questbattle/DarkwingDragon.cpp  |  30 ---
 .../questbattle/InterdimensionalRift.cpp      |  36 ---
 .../questbattle/ItsProbablyaTrap.cpp          |  34 ---
 .../instances/questbattle/MatsubaMayhem.cpp   |  34 ---
 .../Scripts/instances/questbattle/Naadam.cpp  |  30 ---
 .../instances/questbattle/OurUnsungHeroes.cpp |  66 ------
 .../instances/questbattle/ReturnoftheBull.cpp |  55 -----
 .../questbattle/TheHeartoftheProblem.cpp      |  30 ---
 .../instances/questbattle/TheResonant.cpp     |  32 ---
 .../questbattle/WhenClansCollide.cpp          |  30 ---
 .../questbattle/WithHeartandSteel.cpp         | 108 ---------
 .../instances/questbattles/ABloodyReunion.cpp |  26 ++
 .../questbattles/ASpectaclefortheAges.cpp     |  43 ++++
 .../instances/questbattles/BloodDragoon.cpp   |  26 ++
 .../BloodontheDeck.cpp                        |   5 +-
 .../CuriousGorgeMeetsHisMatch.cpp             |   7 +-
 .../instances/questbattles/DarkwingDragon.cpp |  26 ++
 .../InThalsName.cpp                           |   6 +-
 .../questbattles/InterdimensionalRift.cpp     |  26 ++
 .../questbattles/ItsProbablyaTrap.cpp         |  26 ++
 .../instances/questbattles/MatsubaMayhem.cpp  |  26 ++
 .../Scripts/instances/questbattles/Naadam.cpp |  26 ++
 .../OneLifeforOneWorld.cpp                    |  11 +-
 .../OurCompromise.cpp                         |   3 +-
 .../questbattles/OurUnsungHeroes.cpp          |  72 ++++++
 .../RaisingtheSword.cpp                       |   6 +-
 .../questbattles/ReturnoftheBull.cpp          |  26 ++
 .../TheBattleonBekko.cpp                      |   4 +-
 .../TheCarteneauFlatsHeliodrome.cpp           |  51 ++++
 .../TheFaceofTrueEvil.cpp                     |   2 +-
 .../questbattles/TheHeartoftheProblem.cpp     |  26 ++
 .../TheOrphansandtheBrokenBlade.cpp           |   2 +-
 .../instances/questbattles/TheResonant.cpp    |  26 ++
 .../questbattles/WhenClansCollide.cpp         |  26 ++
 .../questbattles/WithHeartandSteel.cpp        |  26 ++
 .../raids/AlexanderTheArmoftheFather.cpp      |  26 ++
 .../AlexanderTheArmoftheFatherSavage.cpp      |  26 ++
 .../raids/AlexanderTheArmoftheSon.cpp         |  26 ++
 .../raids/AlexanderTheArmoftheSonSavage.cpp   |  26 ++
 .../raids/AlexanderTheBreathoftheCreator.cpp  |  26 ++
 .../AlexanderTheBreathoftheCreatorSavage.cpp  |  26 ++
 .../AlexanderTheBurdenoftheFather.cpp         |   5 +-
 .../AlexanderTheBurdenoftheFatherSavage.cpp   |   5 +-
 .../raids/AlexanderTheBurdenoftheSon.cpp      |  26 ++
 .../AlexanderTheBurdenoftheSonSavage.cpp      |  26 ++
 .../raids/AlexanderTheCuffoftheFather.cpp     |  26 ++
 .../AlexanderTheCuffoftheFatherSavage.cpp     |  26 ++
 .../raids/AlexanderTheCuffoftheSon.cpp        |  26 ++
 .../raids/AlexanderTheCuffoftheSonSavage.cpp  |  26 ++
 .../raids/AlexanderTheEyesoftheCreator.cpp    |  26 ++
 .../AlexanderTheEyesoftheCreatorSavage.cpp    |  26 ++
 .../raids/AlexanderTheFistoftheFather.cpp     |  26 ++
 .../AlexanderTheFistoftheFatherSavage.cpp     |  26 ++
 .../raids/AlexanderTheFistoftheSon.cpp        |  26 ++
 .../raids/AlexanderTheFistoftheSonSavage.cpp  |  26 ++
 .../raids/AlexanderTheHeartoftheCreator.cpp   |  26 ++
 .../AlexanderTheHeartoftheCreatorSavage.cpp   |  26 ++
 .../raids/AlexanderTheSouloftheCreator.cpp    |  26 ++
 .../AlexanderTheSouloftheCreatorSavage.cpp    |  26 ++
 .../Scripts/instances/raids/DeltascapeV10.cpp |  26 ++
 .../instances/raids/DeltascapeV10Savage.cpp   |  26 ++
 .../Scripts/instances/raids/DeltascapeV20.cpp |  26 ++
 .../instances/raids/DeltascapeV20Savage.cpp   |  26 ++
 .../Scripts/instances/raids/DeltascapeV30.cpp |  26 ++
 .../instances/raids/DeltascapeV30Savage.cpp   |  26 ++
 .../Scripts/instances/raids/DeltascapeV40.cpp |  26 ++
 .../instances/raids/DeltascapeV40Savage.cpp   |  26 ++
 .../Scripts/instances/raids/DunScaith.cpp     |  26 ++
 .../Scripts/instances/raids/SigmascapeV10.cpp |  26 ++
 .../instances/raids/SigmascapeV10Savage.cpp   |  26 ++
 .../Scripts/instances/raids/SigmascapeV20.cpp |  26 ++
 .../instances/raids/SigmascapeV20Savage.cpp   |  26 ++
 .../Scripts/instances/raids/SigmascapeV30.cpp |  26 ++
 .../instances/raids/SigmascapeV30Savage.cpp   |  26 ++
 .../Scripts/instances/raids/SigmascapeV40.cpp |  26 ++
 .../instances/raids/SigmascapeV40Savage.cpp   |  26 ++
 .../Scripts/instances/raids/SyrcusTower.cpp   |  94 ++++++++
 .../raids/TheBindingCoilofBahamutTurn1.cpp    |  63 +++++
 .../raids/TheBindingCoilofBahamutTurn2.cpp    |  64 +++++
 .../raids/TheBindingCoilofBahamutTurn3.cpp    |  74 ++++++
 .../raids/TheBindingCoilofBahamutTurn4.cpp    |  43 ++++
 .../raids/TheBindingCoilofBahamutTurn5.cpp    |  36 +++
 .../raids/TheFinalCoilofBahamutTurn1.cpp      |  51 ++++
 .../raids/TheFinalCoilofBahamutTurn2.cpp      |  61 +++++
 .../raids/TheFinalCoilofBahamutTurn3.cpp      |  34 +++
 .../raids/TheFinalCoilofBahamutTurn4.cpp      |  34 +++
 .../raids/TheLabyrinthoftheAncients.cpp       | 107 +++++++++
 .../raids/TheRoyalCityofRabanastre.cpp        |  26 ++
 .../TheSecondCoilofBahamutSavageTurn1.cpp     |  42 ++++
 .../TheSecondCoilofBahamutSavageTurn2.cpp     |  42 ++++
 .../TheSecondCoilofBahamutSavageTurn3.cpp     | 105 ++++++++
 .../TheSecondCoilofBahamutSavageTurn4.cpp     |  41 ++++
 .../raids/TheSecondCoilofBahamutTurn1.cpp     |  42 ++++
 .../raids/TheSecondCoilofBahamutTurn2.cpp     |  42 ++++
 .../raids/TheSecondCoilofBahamutTurn3.cpp     | 105 ++++++++
 .../raids/TheSecondCoilofBahamutTurn4.cpp     |  41 ++++
 .../TheUnendingCoilofBahamutUltimate.cpp      |  35 +++
 .../Scripts/instances/raids/TheVoidArk.cpp    |  26 ++
 .../instances/raids/TheWeepingCityofMhach.cpp |  26 ++
 .../instances/raids/TheWorldofDarkness.cpp    | 143 +++++++++++
 .../alexander/AlexanderTheArmoftheFather.cpp  |  40 ----
 .../AlexanderTheArmoftheFatherSavage.cpp      |  40 ----
 .../alexander/AlexanderTheArmoftheSon.cpp     |  69 ------
 .../AlexanderTheArmoftheSonSavage.cpp         |  69 ------
 .../AlexanderTheBreathoftheCreator.cpp        |  49 ----
 .../AlexanderTheBreathoftheCreatorSavage.cpp  |  49 ----
 .../alexander/AlexanderTheBurdenoftheSon.cpp  |  32 ---
 .../AlexanderTheBurdenoftheSonSavage.cpp      |  32 ---
 .../alexander/AlexanderTheCuffoftheFather.cpp |  50 ----
 .../AlexanderTheCuffoftheFatherSavage.cpp     |  50 ----
 .../alexander/AlexanderTheCuffoftheSon.cpp    |  49 ----
 .../AlexanderTheCuffoftheSonSavage.cpp        |  49 ----
 .../AlexanderTheEyesoftheCreator.cpp          |  51 ----
 .../AlexanderTheEyesoftheCreatorSavage.cpp    |  51 ----
 .../alexander/AlexanderTheFistoftheFather.cpp |  59 -----
 .../AlexanderTheFistoftheFatherSavage.cpp     |  59 -----
 .../alexander/AlexanderTheFistoftheSon.cpp    |  50 ----
 .../AlexanderTheFistoftheSonSavage.cpp        |  50 ----
 .../AlexanderTheHeartoftheCreator.cpp         |  56 -----
 .../AlexanderTheHeartoftheCreatorSavage.cpp   |  56 -----
 .../AlexanderTheSouloftheCreator.cpp          |  47 ----
 .../AlexanderTheSouloftheCreatorSavage.cpp    |  47 ----
 .../coils/TheBindingCoilofBahamutTurn1.cpp    |  59 -----
 .../coils/TheBindingCoilofBahamutTurn2.cpp    |  55 -----
 .../coils/TheBindingCoilofBahamutTurn3.cpp    |  73 ------
 .../coils/TheBindingCoilofBahamutTurn4.cpp    |  41 ----
 .../coils/TheBindingCoilofBahamutTurn5.cpp    |  35 ---
 .../coils/TheFinalCoilofBahamutTurn1.cpp      |  49 ----
 .../coils/TheFinalCoilofBahamutTurn2.cpp      |  58 -----
 .../coils/TheFinalCoilofBahamutTurn3.cpp      |  32 ---
 .../coils/TheFinalCoilofBahamutTurn4.cpp      |  33 ---
 .../TheSecondCoilofBahamutSavageTurn2.cpp     |  39 ---
 .../TheSecondCoilofBahamutSavageTurn3.cpp     |  75 ------
 .../coils/TheSecondCoilofBahamutTurn3.cpp     |  75 ------
 .../coils/TheSecondCoilofBahamutTurn4.cpp     |  39 ---
 .../raids/crystaltower/SyrcusTower.cpp        |  79 ------
 .../TheLabyrinthoftheAncients.cpp             |  92 -------
 .../raids/crystaltower/TheWorldofDarkness.cpp | 117 ---------
 .../instances/raids/omega/DeltascapeV10.cpp   |  31 ---
 .../raids/omega/DeltascapeV10Savage.cpp       |  31 ---
 .../instances/raids/omega/DeltascapeV20.cpp   |  30 ---
 .../raids/omega/DeltascapeV20Savage.cpp       |  30 ---
 .../instances/raids/omega/DeltascapeV30.cpp   |  45 ----
 .../raids/omega/DeltascapeV30Savage.cpp       |  45 ----
 .../instances/raids/omega/DeltascapeV40.cpp   |  35 ---
 .../raids/omega/DeltascapeV40Savage.cpp       |  35 ---
 .../instances/raids/omega/SigmascapeV10.cpp   |  46 ----
 .../raids/omega/SigmascapeV10Savage.cpp       |  46 ----
 .../instances/raids/omega/SigmascapeV20.cpp   |  44 ----
 .../raids/omega/SigmascapeV20Savage.cpp       |  44 ----
 .../instances/raids/omega/SigmascapeV30.cpp   |  39 ---
 .../raids/omega/SigmascapeV30Savage.cpp       |  39 ---
 .../instances/raids/omega/SigmascapeV40.cpp   |  44 ----
 .../raids/omega/SigmascapeV40Savage.cpp       |  44 ----
 .../TheRoyalCityofRabanastre.cpp              | 115 ---------
 .../raids/shadowofmhach/DunScaith.cpp         |  87 -------
 .../raids/shadowofmhach/TheVoidArk.cpp        |  99 --------
 .../shadowofmhach/TheWeepingCityofMhach.cpp   | 108 ---------
 .../TheUnendingCoilofBahamutUltimate.cpp      |  34 ---
 .../instances/treasurehunt/TheAquapolis.cpp   | 198 ++++++++--------
 .../treasurehunt/TheHiddenCanalsofUznair.cpp  | 117 +--------
 .../treasurehunt/TheLostCanalsofUznair.cpp    | 117 +--------
 .../trials/ARelicReborntheChimera.cpp         |  35 +--
 .../instances/trials/ARelicReborntheHydra.cpp |  94 ++++----
 .../trials/AkhAfahAmphitheatreExtreme.cpp     |  24 +-
 .../trials/AkhAfahAmphitheatreHard.cpp        |  24 +-
 .../instances/trials/BattleintheBigKeep.cpp   | 207 +++++++++-------
 .../instances/trials/BattleontheBigBridge.cpp |  22 +-
 .../Scripts/instances/trials/CapeWestwind.cpp |   9 +-
 .../instances/trials/ContainmentBayP1T6.cpp   |  26 ++
 .../trials/ContainmentBayP1T6Extreme.cpp      |  26 ++
 .../instances/trials/ContainmentBayS1T7.cpp   |  26 ++
 .../trials/ContainmentBayS1T7Extreme.cpp      |  26 ++
 .../instances/trials/ContainmentBayZ1T9.cpp   |  26 ++
 .../trials/ContainmentBayZ1T9Extreme.cpp      |  26 ++
 .../Scripts/instances/trials/Emanation.cpp    |   4 +-
 .../instances/trials/EmanationExtreme.cpp     |   4 +-
 .../{events => trials}/SpecialEventI.cpp      |   7 +-
 .../{events => trials}/SpecialEventII.cpp     |   4 +-
 .../instances/trials/SpecialEventIII.cpp      |  26 ++
 .../instances/trials/TheBowlofEmbers.cpp      |  11 +-
 .../trials/TheBowlofEmbersExtreme.cpp         |  11 +-
 .../instances/trials/TheBowlofEmbersHard.cpp  |  11 +-
 .../Scripts/instances/trials/TheChrysalis.cpp |  54 +++--
 .../instances/trials/TheDragonsNeck.cpp       | 108 +++++----
 .../instances/trials/TheFinalStepsofFaith.cpp |  13 +-
 .../instances/trials/TheHowlingEye.cpp        |  23 +-
 .../instances/trials/TheHowlingEyeExtreme.cpp |  23 +-
 .../instances/trials/TheHowlingEyeHard.cpp    |  23 +-
 .../Scripts/instances/trials/TheJadeStoa.cpp  |  26 ++
 .../instances/trials/TheJadeStoaExtreme.cpp   |  26 ++
 .../trials/TheLimitlessBlueExtreme.cpp        |  10 +-
 .../instances/trials/TheLimitlessBlueHard.cpp |  10 +-
 .../trials/TheMinstrelsBalladNidhoggsRage.cpp |  13 +-
 .../TheMinstrelsBalladShinryusDomain.cpp      |  21 +-
 .../TheMinstrelsBalladThordansReign.cpp       |  59 -----
 .../trials/TheMinstrelsBalladUltimasBane.cpp  |  19 +-
 .../Scripts/instances/trials/TheNavel.cpp     |   7 +-
 .../instances/trials/TheNavelExtreme.cpp      |   7 +-
 .../Scripts/instances/trials/TheNavelHard.cpp |   7 +-
 .../instances/trials/ThePoolofTribute.cpp     |   6 +-
 .../trials/ThePoolofTributeExtreme.cpp        |   6 +-
 .../instances/trials/TheRoyalMenagerie.cpp    |  17 +-
 .../trials/TheSingularityReactor.cpp          |  59 -----
 .../instances/trials/TheStepsofFaith.cpp      |  52 ++--
 .../trials/TheStrikingTreeExtreme.cpp         |   7 +-
 .../instances/trials/TheStrikingTreeHard.cpp  |   7 +-
 .../instances/trials/TheWhorleaterExtreme.cpp |  17 +-
 .../instances/trials/TheWhorleaterHard.cpp    |  17 +-
 .../instances/trials/ThokastThokExtreme.cpp   |  48 ----
 .../instances/trials/ThokastThokHard.cpp      |  48 ----
 .../instances/trials/ThornmarchExtreme.cpp    |   7 +-
 .../instances/trials/ThornmarchHard.cpp       |   7 +-
 .../Scripts/instances/trials/UrthsFount.cpp   |   7 +-
 .../trials/thefourlords/TheJadeStoa.cpp       |  31 ---
 .../thefourlords/TheJadeStoaExtreme.cpp       |  31 ---
 .../warringtriad/ContainmentBayP1T6.cpp       |  34 ---
 .../ContainmentBayP1T6Extreme.cpp             |  34 ---
 .../warringtriad/ContainmentBayS1T7.cpp       |  41 ----
 .../ContainmentBayS1T7Extreme.cpp             |  41 ----
 .../warringtriad/ContainmentBayZ1T9.cpp       |  40 ----
 .../ContainmentBayZ1T9Extreme.cpp             |  40 ----
 354 files changed, 6128 insertions(+), 8106 deletions(-)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors101110.cpp (55%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors110.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors111120.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors1120.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors121130.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors131140.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors141150.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors151160.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors161170.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors171180.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors181190.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors191200.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors2130.cpp (71%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors5160.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors6170.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors7180.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors8190.cpp (55%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{potd => deepdungeon}/ThePalaceoftheDeadFloors91100.cpp (55%)
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/AllsWellthatEndsintheWell.cpp (79%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/AnnoytheVoid.cpp (98%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/BasicTrainingEnemyParties.cpp (98%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/BasicTrainingEnemyStrongholds.cpp (61%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/FlickingSticksandTakingNames.cpp (80%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/HeroontheHalfShell.cpp (98%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/MorethanaFeeler.cpp (98%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/PullingPoisonPosies.cpp (98%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/SolemnTrinity.cpp (98%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/StingingBack.cpp (79%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/UndertheArmor.cpp (79%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{guildhest => guildhests}/WardUp.cpp (98%)
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/BloodontheDeck.cpp (71%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/CuriousGorgeMeetsHisMatch.cpp (79%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/InThalsName.cpp (74%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/OneLifeforOneWorld.cpp (67%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/OurCompromise.cpp (79%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/RaisingtheSword.cpp (74%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/TheBattleonBekko.cpp (67%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/TheFaceofTrueEvil.cpp (98%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{questbattle => questbattles}/TheOrphansandtheBrokenBlade.cpp (98%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/raids/{alexander => }/AlexanderTheBurdenoftheFather.cpp (60%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/raids/{alexander => }/AlexanderTheBurdenoftheFatherSavage.cpp (60%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
 rename src/servers/sapphire_zone/Script/Scripts/instances/{events => trials}/SpecialEventI.cpp (79%)
 rename src/servers/sapphire_zone/Script/Scripts/instances/{events => trials}/SpecialEventII.cpp (68%)
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp

diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
similarity index 55%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
index 7d021fcf..f2fdd991 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors101110.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
@@ -10,9 +10,11 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+      instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
index 5e865721..af9f4768 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors110.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2002872, 6324883, 4, { -300.000000f, -0.000010f, -220.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
index 01db987f..e2a130f0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors111120.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
index 64b9c068..e49c1e32 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors1120.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6353850, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
index 03a6d2dc..eb763806 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors121130.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535115, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
index f1b856d7..f044bfa1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors131140.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
index 4b03e697..f4ba0593 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors141150.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6535683, 4, { -300.000000f, -0.000205f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
index 3f480582..defb3212 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors151160.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
index 17ff4666..14110134 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors161170.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
index c05b73e4..57b9d6c4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors171180.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
index a6cb7e5b..9e9b6050 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors181190.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
index 22f25b55..512b331c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors191200.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6534547, 4, { -301.179504f, 0.130118f, -301.014709f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
index 2160a8f5..438a2aa5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors2130.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2002872, 6387948, 4, { -300.000000f, -0.116918f, -237.513199f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
new file mode 100644
index 00000000..bbe7a4f2
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
@@ -0,0 +1,36 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors3140 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors3140() : InstanceContentScript( 60004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+      instance->registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+      instance->registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
new file mode 100644
index 00000000..3dc32d7c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
@@ -0,0 +1,36 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThePalaceoftheDeadFloors4150 : public InstanceContentScript
+{
+public:
+   ThePalaceoftheDeadFloors4150() : InstanceContentScript( 60005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+      instance->registerEObj( "sgvf_w_lvd_b0959_1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+      instance->registerEObj( "unknown_0", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
index 47315408..2ba12023 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors5160.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
index 972ddf71..dfe9ca7f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors6170.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
index dbc0ec95..a476ade3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors7180.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6521120, 4, { -300.000000f, 3.189805f, -241.061096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
similarity index 55%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
index 7ee588ef..b4ca9e73 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors8190.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
@@ -10,9 +10,11 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+      instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
similarity index 55%
rename from src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
index 056f8752..77f1ad35 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors91100.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
@@ -10,9 +10,11 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0959", 2000608, 6527847, 4, { -300.000000f, 0.000026f, -237.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+      instance->registerEObj( "sgvf_w_lvd_b0959_1", 2000608, 6544382, 4, { 301.149902f, -0.045413f, 285.247589f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_on2off vf_bextwall_off 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
index e4c89858..80cce950 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
@@ -10,36 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6894813, 4, { -209.363495f, 35.017460f, 72.069672f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6894812, 4, { -172.226807f, 35.017342f, 72.369667f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -210.219406f, 35.017460f, 72.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2008685, 0, 4, { -192.767105f, 34.867069f, 71.984734f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6894833, 4, { 250.000000f, 106.496902f, -50.489590f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6894834, 4, { 250.000000f, 106.496902f, -89.516243f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 250.000000f, 106.496902f, -50.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002872, 6895342, 4, { 248.500000f, 122.000000f, -329.291107f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6865535, 4, { 249.561295f, 121.995796f, -352.681793f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007457, 6895343, 4, { 249.487595f, 122.005699f, -330.083801f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002872, 6904529, 4, { 248.937500f, 122.000000f, -377.252899f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2008350, 0, 4, { 250.000000f, 122.000000f, -353.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007168, 0, 4, { 250.018997f, 121.995796f, -353.109009f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6879593, 5, { -408.611298f, 2.500000f, 233.977905f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -398.118408f, 2.500000f, 236.857193f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 250.007294f, 122.000000f, -370.492889f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2008319, 6844583, 4, { -342.881104f, 24.000010f, 149.680099f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2008319, 6844584, 4, { -258.130402f, 27.000010f, 99.970268f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 6840800, 4, { -100.167801f, 44.750629f, 73.001747f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 6853103, 4, { 193.710297f, 106.000000f, 128.847397f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6847102, 4, { 263.424286f, 106.400002f, -8.750051f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007457, 6847104, 4, { 249.800797f, 106.428101f, -108.873100f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2008335, 6844579, 4, { 233.630905f, 109.971703f, -155.596298f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2008335, 6844578, 4, { 233.295197f, 109.971703f, -144.792892f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2008335, 6844581, 4, { 224.912094f, 120.000000f, -248.707504f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2008335, 6844580, 4, { 210.809296f, 120.000000f, -248.716202f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2008336, 6845038, 4, { 249.895905f, 122.099899f, -294.475403f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007457, 6942278, 4, { 233.967697f, 110.000000f, -150.215607f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007457, 6942279, 4, { 217.761505f, 119.889999f, -247.455597f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
index df77748e..0be67f38 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
@@ -10,89 +10,130 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000491, 4246565, 4, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f );
-      instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown30", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown31", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f );
-      instance->registerEObj( "Unknown33", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f );
-      instance->registerEObj( "Unknown39", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f );
-      instance->registerEObj( "Unknown40", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown41", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown42", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown43", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f );
-      instance->registerEObj( "Unknown44", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f );
-      instance->registerEObj( "Unknown45", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f );
-      instance->registerEObj( "Unknown46", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f );
-      instance->registerEObj( "Unknown47", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f );
-      instance->registerEObj( "Unknown48", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f );
-      instance->registerEObj( "Unknown49", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f );
-      instance->registerEObj( "Unknown50", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f );
-      instance->registerEObj( "Unknown51", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f );
-      instance->registerEObj( "Unknown52", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown53", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown54", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown55", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f );
-      instance->registerEObj( "Unknown56", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f );
-      instance->registerEObj( "Unknown57", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f );
-      instance->registerEObj( "Unknown58", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f );
-      instance->registerEObj( "Unknown59", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f );
-      instance->registerEObj( "Unknown60", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f );
-      instance->registerEObj( "Unknown62", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f );
-      instance->registerEObj( "Unknown64", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f );
-      instance->registerEObj( "Unknown65", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f );
-      instance->registerEObj( "Unknown66", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f );
-      instance->registerEObj( "Unknown67", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown68", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f );
-      instance->registerEObj( "Aetherialflow", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f );
-      instance->registerEObj( "Unknown69", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown70", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown71", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown72", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown73", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown74", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f );
+      instance->registerEObj( "sgbg_f1d3_a1_gar2", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f, 0.000000f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f, 0.000000f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f, 0.000000f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f, 0.000000f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "Entrance", 2000491, 4246565, 5, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_0", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_htras1_on vf_htras1_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0249", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_f1d1_b0008", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria1_off vf_baria_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_1", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_2", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_3", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_4", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_5", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_6", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_7", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_8", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_9", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_10", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_11", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_12", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_13", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_14", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_15", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_16", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_17", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_18", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_19", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_20", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_21", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_22", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_23", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_4", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_5", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_6", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_7", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_8", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_9", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_10", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_11", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_12", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_13", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_14", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_15", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_16", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_17", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_18", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_19", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_20", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_21", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_22", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_23", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_24", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_25", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_26", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_27", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "Entrance_1", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Exit_1", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_f1d3_bo189", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Aetherialflow_1", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_1", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_2", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_3", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_4", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_5", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_6", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
index 3aa16ede..3f650277 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
@@ -10,38 +10,47 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 5040923, 4, { 203.452301f, 0.116688f, 208.657593f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 199.471802f, 0.116693f, 210.128204f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005153, 5619221, 4, { 198.706802f, -20.000010f, 229.113907f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004696, 5009720, 4, { -200.316895f, -4.301562f, -43.621670f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004697, 5009721, 4, { -47.771290f, -0.000000f, -71.658272f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004698, 5031991, 4, { -125.087196f, -2.000000f, 28.417601f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2004699, 5031992, 4, { -104.790604f, -2.000000f, 47.174728f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004700, 0, 4, { 2.343430f, 48.179089f, -2.083742f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004702, 5009732, 4, { 125.604897f, 43.999989f, 3.999085f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004701, 0, 4, { 149.666000f, 44.200001f, -0.006115f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004703, 5010816, 4, { 196.927399f, 44.000019f, -101.381798f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004704, 5032163, 4, { 199.696106f, 44.000000f, -181.197006f }, 1.000000f );
-      instance->registerEObj( "Aetherialflow", 2004705, 5032164, 4, { 199.682800f, 44.163898f, -180.392395f }, 1.000000f );
-      instance->registerEObj( "Fellorb", 2004706, 5009746, 4, { 200.094101f, -0.000008f, 0.050249f }, 1.000000f );
-      instance->registerEObj( "Aetherialflow", 2004707, 5033533, 4, { 199.899506f, 0.000000f, -3.297300f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004768, 5033548, 4, { 210.649307f, 0.116687f, -6.120441f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004769, 5033549, 4, { 189.489807f, 0.116688f, -6.804901f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2004770, 5033551, 4, { 204.506500f, 0.116687f, 9.902725f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2004708, 5034801, 4, { -119.510101f, -2.400002f, 18.885540f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002872, 5034800, 4, { -130.314606f, -2.400000f, -18.221069f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2002735, 0, 4, { -125.041801f, -1.964380f, -20.543480f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2004996, 5390927, 4, { -112.845497f, -2.400000f, 12.122500f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2004997, 5390928, 4, { -112.845497f, -2.400000f, -12.378100f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2004998, 5390929, 4, { -137.250000f, -2.400000f, 12.122500f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2004999, 5390930, 4, { -137.396194f, -2.400000f, -12.366500f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2004782, 5038257, 4, { 198.459198f, 43.991699f, -172.369705f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2002872, 5038255, 4, { 197.802597f, 43.991699f, -125.932701f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002735, 0, 4, { 199.511703f, 44.022221f, -130.601303f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5018466, 5, { -255.724792f, -9.199999f, -5.249732f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -252.173401f, -9.199999f, 5.737248f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 200.798599f, -0.000008f, 240.880905f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5040923, 4, { 203.452301f, 0.116688f, 208.657593f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { 199.471802f, 0.116693f, 210.128204f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1d7_a4_scy01", 2005153, 5619221, 4, { 198.706802f, -20.000010f, 229.113907f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004696, 5009720, 4, { -200.316895f, -4.301562f, -43.621670f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004697, 5009721, 4, { -47.771290f, -0.000000f, -71.658272f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1d7_a1_evl01", 2004698, 5031991, 4, { -125.087196f, -2.000000f, 28.417601f }, 1.000000f, -0.000000f ); 
+      // States -> evils_def evils_off_anim evils_on evils_on_anim 
+      instance->registerEObj( "sgvf_f1d7_b0574", 2004699, 5031992, 4, { -104.790604f, -2.000000f, 47.174728f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria1_off vf_baria_on 
+      instance->registerEObj( "unknown_3", 2004700, 0, 4, { 2.343430f, 48.179089f, -2.083742f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2004702, 5009732, 4, { 125.604897f, 43.999989f, 3.999085f }, 1.000000f, 0.005971f ); 
+      instance->registerEObj( "unknown_5", 2004701, 0, 4, { 149.666000f, 44.200001f, -0.006115f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2004703, 5010816, 4, { 196.927399f, 44.000019f, -101.381798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1d7_a1_evl01_1", 2004704, 5032163, 4, { 199.696106f, 44.000000f, -181.197006f }, 1.000000f, 0.000000f ); 
+      // States -> evils_def evils_off_anim evils_on evils_on_anim 
+      instance->registerEObj( "Aetherialflow", 2004705, 5032164, 4, { 199.682800f, 44.163898f, -180.392395f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Fellorb", 2004706, 5009746, 4, { 200.094101f, -0.000008f, 0.050249f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Aetherialflow_1", 2004707, 5033533, 4, { 199.899506f, 0.000000f, -3.297300f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_7", 2004768, 5033548, 4, { 210.649307f, 0.116687f, -6.120441f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2004769, 5033549, 4, { 189.489807f, 0.116688f, -6.804901f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2004770, 5033551, 4, { 204.506500f, 0.116687f, 9.902725f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2004708, 5034801, 4, { -119.510101f, -2.400002f, 18.885540f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5034800, 4, { -130.314606f, -2.400000f, -18.221069f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_10", 2002735, 0, 4, { -125.041801f, -1.964380f, -20.543480f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1d7_a1_gar0", 2004996, 5390927, 4, { -112.845497f, -2.400000f, 12.122500f }, 1.000000f, 0.785314f ); 
+      instance->registerEObj( "sgpl_f1d7_a1_gar0_1", 2004997, 5390928, 4, { -112.845497f, -2.400000f, -12.378100f }, 1.000000f, 0.785457f ); 
+      instance->registerEObj( "sgpl_f1d7_a1_gar0_2", 2004998, 5390929, 4, { -137.250000f, -2.400000f, 12.122500f }, 1.000000f, -0.785410f ); 
+      instance->registerEObj( "sgpl_f1d7_a1_gar0_3", 2004999, 5390930, 4, { -137.396194f, -2.400000f, -12.366500f }, 1.000000f, -0.785398f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2004782, 5038257, 4, { 198.459198f, 43.991699f, -172.369705f }, 1.000000f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5038255, 4, { 197.802597f, 43.991699f, -125.932701f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_11", 2002735, 0, 4, { 199.511703f, 44.022221f, -130.601303f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 5018466, 5, { -255.724792f, -9.199999f, -5.249732f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -252.173401f, -9.199999f, 5.737248f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 200.798599f, -0.000008f, 240.880905f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
index 9c6e4151..c7049531 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
@@ -10,33 +10,39 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -173.966797f, 3.049999f, 52.443710f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6588628, 4, { -173.612198f, 3.049997f, 52.688000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 6588629, 4, { -154.029907f, 3.049906f, 72.262756f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 95.577843f, -300.028412f, 0.707827f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6588652, 4, { 95.163948f, -300.028198f, 0.952097f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6588653, 4, { 135.748398f, -300.000092f, 0.172490f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 6588667, 4, { 371.527588f, 212.000000f, 391.566010f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 371.795685f, 212.000000f, 391.643097f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -230.764297f, -0.932137f, -173.143600f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 352.071411f, 212.000000f, 391.988892f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6562675, 5, { -228.044006f, -0.901261f, -183.153198f }, 1.000000f );
-      instance->registerEObj( "Imperialidentificationkey", 2007567, 0, 4, { -202.837997f, -0.966086f, -62.488140f }, 1.000000f );
-      instance->registerEObj( "Securityterminal", 2007571, 6640773, 4, { -206.023102f, 2.815013f, -48.897739f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007575, 6501039, 4, { -203.861694f, 1.804717f, -49.827511f }, 1.000000f );
-      instance->registerEObj( "Imperialidentificationkey", 2007568, 0, 4, { -176.569397f, 2.150000f, 17.400681f }, 1.000000f );
-      instance->registerEObj( "Securityterminal", 2007572, 6516973, 4, { -187.083206f, 2.707914f, 19.031469f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007576, 6502290, 4, { -174.854904f, 2.100000f, 23.458460f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007776, 6500492, 4, { -126.770897f, 2.000089f, 72.952606f }, 1.000000f );
-      instance->registerEObj( "Controlpanel", 2007580, 0, 4, { -0.003809f, -299.760315f, 0.024599f }, 2.000000f );
-      instance->registerEObj( "Controlpanel", 2007581, 0, 4, { 177.511993f, -298.963196f, 4.224624f }, 0.991760f );
-      instance->registerEObj( "Controlpanel", 2007582, 6523203, 4, { 177.434006f, -298.072601f, 6.243333f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007601, 6516974, 4, { 176.321396f, -299.105713f, 0.250570f }, 1.000000f );
-      instance->registerEObj( "Imperialidentificationkey", 2007569, 0, 4, { 317.032288f, 169.000107f, 230.153503f }, 1.000000f );
-      instance->registerEObj( "Securityterminal", 2007573, 6488516, 4, { 320.921600f, 169.867996f, 243.976807f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007577, 6488509, 4, { 328.225189f, 169.000107f, 244.581894f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007578, 6777152, 4, { 382.790100f, 203.000000f, 357.169403f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -173.966797f, 3.049999f, 52.443710f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6588628, 4, { -173.612198f, 3.049997f, 52.688000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6588629, 4, { -154.029907f, 3.049906f, 72.262756f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { 95.577843f, -300.028412f, 0.707827f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6588652, 4, { 95.163948f, -300.028198f, 0.952097f }, 1.000000f, -1.570451f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6588653, 4, { 135.748398f, -300.000092f, 0.172490f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6588667, 4, { 371.527588f, 212.000000f, 391.566010f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { 371.795685f, 212.000000f, 391.643097f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -230.764297f, -0.932137f, -173.143600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 352.071411f, 212.000000f, 391.988892f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 6562675, 5, { -228.044006f, -0.901261f, -183.153198f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Imperialidentificationkey", 2007567, 0, 4, { -202.837997f, -0.966086f, -62.488140f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Securityterminal", 2007571, 6640773, 4, { -206.023102f, 2.815013f, -48.897739f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007575, 6501039, 4, { -203.861694f, 1.804717f, -49.827511f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Imperialidentificationkey_1", 2007568, 0, 4, { -176.569397f, 2.150000f, 17.400681f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Securityterminal_1", 2007572, 6516973, 4, { -187.083206f, 2.707914f, 19.031469f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007576, 6502290, 4, { -174.854904f, 2.100000f, 23.458460f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007776, 6500492, 4, { -126.770897f, 2.000089f, 72.952606f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Controlpanel", 2007580, 0, 4, { -0.003809f, -299.760315f, 0.024599f }, 2.000000f, 0.000048f ); 
+      instance->registerEObj( "Controlpanel_1", 2007581, 0, 4, { 177.511993f, -298.963196f, 4.224624f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Controlpanel_2", 2007582, 6523203, 4, { 177.434006f, -298.072601f, 6.243333f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2007601, 6516974, 4, { 176.321396f, -299.105713f, 0.250570f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Imperialidentificationkey_2", 2007569, 0, 4, { 317.032288f, 169.000107f, 230.153503f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Securityterminal_2", 2007573, 6488516, 4, { 320.921600f, 169.867996f, 243.976807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2007577, 6488509, 4, { 328.225189f, 169.000107f, 244.581894f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2007578, 6777152, 4, { 382.790100f, 203.000000f, 357.169403f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
index 21d7a43e..7bf74848 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
@@ -10,31 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007896, 6803926, 4, { 3.704567f, -0.506593f, 225.007507f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6805825, 4, { 4.867329f, -0.098875f, 275.309509f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 4.932000f, -0.320500f, 274.559509f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007899, 6802026, 4, { -28.138130f, -45.000000f, -32.892731f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6806775, 4, { -28.390051f, -45.148991f, 8.165403f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -28.551781f, -45.222500f, 5.617400f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007903, 6773193, 4, { -18.557831f, -44.964081f, -0.932714f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007904, 6773192, 4, { -30.723289f, -45.025860f, 1.953206f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007905, 6773194, 4, { -42.383171f, -44.962471f, -5.125507f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2008196, 0, 4, { -37.125240f, -45.059940f, -9.414856f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2008310, 6879064, 4, { -23.194941f, -45.000000f, -3.016589f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7008362, 4, { -28.500000f, -45.000000f, -14.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002872, 6806776, 4, { 24.174879f, -167.392899f, -453.406586f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 24.419100f, -167.350601f, -455.580109f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007894, 6525794, 4, { -36.023540f, 4.305134f, 406.807404f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007895, 6525806, 4, { 4.331786f, 1.464790f, 289.456207f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007897, 6540078, 4, { -49.525101f, -45.174839f, 117.206200f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007898, 6540093, 4, { -14.321400f, -42.200001f, 42.272179f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007900, 6525664, 4, { -19.668949f, -188.037003f, -235.950302f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2007901, 6525665, 4, { 25.192631f, -172.808502f, -362.417114f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2007902, 6525180, 4, { 23.936859f, -172.125198f, -405.882996f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6797774, 5, { -23.838560f, 8.289917f, 482.742615f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -20.252930f, 8.134582f, 489.817200f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 23.942671f, -167.617996f, -486.860809f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
index 206859c5..215eed85 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
@@ -10,25 +10,30 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2001694, 0, 4, { -36.384769f, 34.915119f, -234.568405f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2001461, 0, 4, { 142.567200f, -1.266762f, 67.804497f }, 0.991760f );
-      instance->registerEObj( "RunstopHeadgate", 2001462, 3996541, 4, { 105.920601f, 1.745684f, 11.445460f }, 1.000000f );
-      instance->registerEObj( "RunstopGutgate", 2001463, 3970152, 4, { 113.391296f, -0.849704f, -33.166710f }, 1.000000f );
-      instance->registerEObj( "RunstopBackgate", 2001464, 3970154, 4, { -19.424801f, 7.919373f, -71.122383f }, 0.991760f );
-      instance->registerEObj( "LongstopHeadgate", 2001465, 3970153, 4, { -113.634499f, 1.332127f, -58.144779f }, 1.000000f );
-      instance->registerEObj( "LongstopGutgate", 2001466, 3976772, 4, { -89.831360f, 14.042510f, -96.676224f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2001584, 4086949, 4, { 106.822800f, -1.629326f, 2.541263f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001585, 0, 4, { 110.429604f, -1.663330f, 3.311157f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2001586, 4088979, 4, { 8.021301f, 5.921407f, -69.090309f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001587, 0, 4, { 6.458210f, 5.902269f, -67.560417f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001588, 4088985, 4, { -106.298798f, -2.123102f, -10.585170f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001589, 0, 4, { -105.172897f, -2.123102f, -10.865350f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001590, 4088991, 4, { -68.039551f, 33.716820f, -232.938904f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001591, 0, 4, { -68.693542f, 33.682091f, -234.070496f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4097104, 5, { 122.445702f, -1.119082f, 68.403687f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.256897f, -1.172536f, 59.115589f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -8.639429f, 35.641689f, -234.813797f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2001694, 0, 4, { -36.384769f, 34.915119f, -234.568405f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2001461, 0, 4, { 142.567200f, -1.266762f, 67.804497f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "RunstopHeadgate", 2001462, 3996541, 4, { 105.920601f, 1.745684f, 11.445460f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "RunstopGutgate", 2001463, 3970152, 4, { 113.391296f, -0.849704f, -33.166710f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "RunstopBackgate", 2001464, 3970154, 4, { -19.424801f, 7.919373f, -71.122383f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "LongstopHeadgate", 2001465, 3970153, 4, { -113.634499f, 1.332127f, -58.144779f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "LongstopGutgate", 2001466, 3976772, 4, { -89.831360f, 14.042510f, -96.676224f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001584, 4086949, 4, { 106.822800f, -1.629326f, 2.541263f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2001585, 0, 4, { 110.429604f, -1.663330f, 3.311157f }, 0.991760f, 0.214809f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001586, 4088979, 4, { 8.021301f, 5.921407f, -69.090309f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_3", 2001587, 0, 4, { 6.458210f, 5.902269f, -67.560417f }, 1.000000f, -0.788830f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001588, 4088985, 4, { -106.298798f, -2.123102f, -10.585170f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_4", 2001589, 0, 4, { -105.172897f, -2.123102f, -10.865350f }, 1.000000f, -0.043989f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2001590, 4088991, 4, { -68.039551f, 33.716820f, -232.938904f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_5", 2001591, 0, 4, { -68.693542f, 33.682091f, -234.070496f }, 1.000000f, -1.318638f ); 
+      instance->registerEObj( "Entrance", 2000182, 4097104, 5, { 122.445702f, -1.119082f, 68.403687f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.256897f, -1.172536f, 59.115589f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -8.639429f, 35.641689f, -234.813797f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
index b71c36a1..bde71066 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
@@ -10,30 +10,36 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2003103, 0, 4, { -16.800230f, 25.375731f, -171.007904f }, 0.991760f );
-      instance->registerEObj( "RunstopHeadgate", 2002182, 4542379, 4, { 105.912804f, 1.724182f, 11.428960f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002183, 4621964, 4, { 111.650299f, 0.228821f, -49.790279f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -75.025421f, -1.210333f, 73.659332f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4543753, 5, { -77.622681f, 0.605630f, 95.628304f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2002326, 0, 4, { -3.491464f, -0.354560f, -24.718349f }, 1.000000f );
-      instance->registerEObj( "Tinykey", 2002325, 0, 4, { -62.769581f, -0.332854f, 36.199650f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 4543726, 4, { 111.888000f, -2.109839f, -6.942894f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 114.658699f, -2.093417f, -6.149437f }, 1.100000f );
-      instance->registerEObj( "Unknown6", 2002109, 4549243, 4, { 92.977211f, 5.002774f, -110.975502f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002150, 4549448, 4, { 30.497520f, 8.248112f, -82.096916f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2002180, 4549459, 4, { 27.134510f, 7.114878f, -120.719704f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002181, 4574849, 4, { 45.695850f, 7.015042f, -129.344604f }, 1.000000f );
-      instance->registerEObj( "Stolenwares", 2002262, 4598415, 4, { -28.610241f, 25.192631f, -174.631195f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002735, 0, 4, { 44.686901f, 7.015000f, -131.547394f }, 0.500000f );
-      instance->registerEObj( "Unknown11", 2002872, 4543729, 4, { 44.232769f, 7.015042f, -129.352997f }, 0.991760f );
-      instance->registerEObj( "ブレイフロクスの抜道", 2003429, 0, 4, { 44.358749f, 7.554582f, -132.341095f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -25.894650f, 35.019409f, -222.949600f }, 0.991760f );
-      instance->registerEObj( "SwiftmakeCheckgate", 2002184, 4549240, 4, { -95.264717f, 12.888430f, -122.593300f }, 1.000000f );
-      instance->registerEObj( "SwiftmakeCheckgate", 2002665, 4549241, 4, { -100.273201f, 20.310730f, -163.513397f }, 1.000000f );
-      instance->registerEObj( "SwiftmakeCheckgate", 2002884, 4572942, 4, { -102.647499f, 21.011600f, -187.365494f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2002872, 4543735, 4, { -48.175251f, 34.706921f, -234.463196f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2002735, 0, 4, { -48.271229f, 34.918541f, -235.574203f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2003103, 0, 4, { -16.800230f, 25.375731f, -171.007904f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "RunstopHeadgate", 2002182, 4542379, 4, { 105.912804f, 1.724182f, 11.428960f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002183, 4621964, 4, { 111.650299f, 0.228821f, -49.790279f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -75.025421f, -1.210333f, 73.659332f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4543753, 5, { -77.622681f, 0.605630f, 95.628304f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_1", 2002326, 0, 4, { -3.491464f, -0.354560f, -24.718349f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Tinykey", 2002325, 0, 4, { -62.769581f, -0.332854f, 36.199650f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_b0118_wide", 2002872, 4543726, 4, { 111.888000f, -2.109839f, -6.942894f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { 114.658699f, -2.093417f, -6.149437f }, 1.100000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2002109, 4549243, 4, { 92.977211f, 5.002774f, -110.975502f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2002150, 4549448, 4, { 30.497520f, 8.248112f, -82.096916f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2002180, 4549459, 4, { 27.134510f, 7.114878f, -120.719704f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2002181, 4574849, 4, { 45.695850f, 7.015042f, -129.344604f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Stolenwares", 2002262, 4598415, 4, { -28.610241f, 25.192631f, -174.631195f }, 0.991760f, -0.000527f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2002735, 0, 4, { 44.686901f, 7.015000f, -131.547394f }, 0.500000f, -0.532325f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4543729, 4, { 44.232769f, 7.015042f, -129.352997f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "ブレイフロクスの抜道", 2003429, 0, 4, { 44.358749f, 7.554582f, -132.341095f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -25.894650f, 35.019409f, -222.949600f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "SwiftmakeCheckgate", 2002184, 4549240, 4, { -95.264717f, 12.888430f, -122.593300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "SwiftmakeCheckgate_1", 2002665, 4549241, 4, { -100.273201f, 20.310730f, -163.513397f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "SwiftmakeCheckgate_2", 2002884, 4572942, 4, { -102.647499f, 21.011600f, -187.365494f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 4543735, 4, { -48.175251f, 34.706921f, -234.463196f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_8", 2002735, 0, 4, { -48.271229f, 34.918541f, -235.574203f }, 1.000000f, -1.497719f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
index 63a7d371..396ae93d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
@@ -10,63 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 277.157013f, 20.000000f, -7.932621f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6841714, 4, { 276.710388f, 20.000000f, -6.315289f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 286.855713f, 20.000000f, -43.546181f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6777074, 4, { 281.592285f, 20.000000f, -45.737782f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6828612, 5, { -406.401794f, -17.924580f, 314.141907f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -414.573212f, -18.000120f, 306.364807f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2008027, 6738153, 4, { -362.172913f, -10.025270f, 237.292999f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2008029, 6739981, 4, { -291.220795f, -6.000043f, 108.329102f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2008030, 6739980, 4, { -298.753113f, -6.000044f, 108.051498f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2008031, 6739979, 4, { -305.840515f, -6.000044f, 107.763603f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2008032, 6739982, 4, { -281.123505f, -6.000060f, 118.299301f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2008033, 6739984, 4, { -280.565704f, -6.000067f, 125.491203f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2008034, 6739983, 4, { -280.552185f, -6.000068f, 132.687302f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2008035, 6869663, 4, { -273.854889f, -6.000038f, 100.620499f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2008036, 6740009, 4, { -213.504593f, -6.129103f, 82.266739f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2008037, 6740016, 4, { -213.045807f, -1.999959f, 131.946198f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2008038, 6914793, 4, { -179.395294f, 2.138688f, 279.671387f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2008041, 6752603, 4, { -167.801697f, 2.138688f, 273.763214f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2008042, 6752604, 4, { -167.091507f, 2.138688f, 278.924805f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2008043, 6752601, 4, { -180.179504f, 2.138688f, 292.024200f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2008044, 6752602, 4, { -184.772797f, 2.138688f, 291.367188f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2008047, 6752608, 4, { -166.154602f, 2.000032f, 293.249298f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2008039, 6914794, 4, { -101.486900f, 6.138662f, 311.254791f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2008050, 6752644, 4, { -81.520500f, 6.000006f, 290.652313f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2008051, 6752643, 4, { -81.142883f, 6.000006f, 332.866211f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2008048, 6752633, 4, { -80.650719f, 6.138662f, 311.338989f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2008040, 6914795, 4, { -22.122820f, 10.138660f, 278.146912f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2008045, 6752689, 4, { -27.394449f, 10.138660f, 265.483795f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2008046, 6752679, 4, { -16.694490f, 10.138650f, 265.926208f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2008070, 6752690, 4, { -9.852131f, 10.138650f, 272.919403f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2008089, 6752691, 4, { -9.914229f, 10.138650f, 283.758392f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2008052, 6752695, 4, { -21.991831f, 9.999999f, 250.500702f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2008053, 6752694, 4, { 5.133811f, 9.999997f, 278.283295f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2008049, 6752681, 4, { -8.415267f, 9.999998f, 264.128204f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2008320, 6869673, 4, { -84.465187f, 6.000006f, 311.371613f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2008054, 6785102, 4, { 22.499630f, 14.184900f, 175.166702f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2008056, 6741815, 4, { 110.871597f, 26.000059f, 144.405807f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2008055, 6698733, 4, { 178.971298f, 20.000139f, 81.701027f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2008057, 6717638, 4, { 154.867996f, 20.000160f, 106.733902f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2008058, 6717639, 4, { 165.172699f, 20.000019f, 86.256683f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2008059, 6717640, 4, { 195.091507f, 20.000170f, 51.864651f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2008060, 6717641, 4, { 200.323502f, 20.000179f, 46.925930f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2008061, 6717642, 4, { 203.790298f, 20.000200f, 59.565971f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2008062, 6717643, 4, { 209.140793f, 20.000191f, 54.901482f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2008063, 6772873, 4, { 172.971100f, 20.100290f, 82.304329f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2008064, 6773603, 4, { 267.862396f, 20.100000f, 30.848459f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2008455, 6790661, 4, { 294.476715f, 20.000000f, -39.619999f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2008527, 6914797, 4, { 21.803070f, 14.184900f, 182.260696f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2007457, 6842146, 4, { 205.204193f, 20.000271f, 41.332821f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2007457, 6842148, 4, { 214.202393f, 20.000271f, 49.597000f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2002735, 0, 4, { -212.960007f, -2.000000f, 167.038193f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2002872, 6841858, 4, { -212.643799f, -2.000000f, 164.712097f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2008071, 6841865, 4, { -212.474792f, -1.815126f, 204.927307f }, 1.000000f );
-      instance->registerEObj( "Unknown51", 2002872, 6841875, 4, { 10.483370f, 14.000030f, 208.476395f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2002735, 0, 4, { 10.447360f, 14.000030f, 206.708298f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2008072, 6841959, 4, { 28.276699f, 14.184900f, 186.737000f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
index 690e481b..182694a1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
@@ -10,64 +10,77 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000593, 4249703, 4, { -67.576859f, 70.350082f, -36.382999f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000594, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f );
-      instance->registerEObj( "Magitekmissile", 2000662, 0, 4, { -108.687798f, 70.343590f, -8.558592f }, 1.400000f );
-      instance->registerEObj( "Magitekmissile", 2000663, 0, 4, { -116.665100f, 70.390266f, -53.063919f }, 1.400000f );
-      instance->registerEObj( "Unknown2", 2001149, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000591, 4249720, 4, { -25.465830f, 83.385536f, -254.529602f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000592, 0, 4, { -25.038260f, 81.798767f, -248.906296f }, 1.100000f );
-      instance->registerEObj( "Imperialidentificationkey", 2000870, 0, 4, { -67.439163f, 81.798767f, -231.079102f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000588, 0, 4, { 34.634392f, 71.755402f, -45.910198f }, 0.900000f );
-      instance->registerEObj( "Unknown6", 2000587, 4249693, 4, { 36.526970f, 70.598427f, -46.207680f }, 1.000000f );
-      instance->registerEObj( "Imperialidentificationkey", 2000869, 0, 4, { -7.280443f, 69.781212f, 27.170691f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000590, 0, 4, { -7.938801f, 70.550377f, 55.590679f }, 1.100000f );
-      instance->registerEObj( "Unknown8", 2000589, 4249713, 4, { -5.998041f, 70.281548f, 58.349812f }, 1.000000f );
-      instance->registerEObj( "Searchlightterminal", 2000564, 3169670, 4, { 213.829102f, 89.024597f, -107.133797f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000565, 4204866, 4, { 210.588501f, 88.962471f, -106.430901f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000603, 0, 4, { 242.256302f, 87.579422f, -95.018204f }, 0.991760f );
-      instance->registerEObj( "Disposalchute", 2000597, 0, 4, { 40.790581f, 71.410004f, -11.781850f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2000860, 3168876, 4, { 197.143005f, 92.716309f, -155.744797f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000861, 3168877, 4, { 211.024704f, 89.452042f, -70.152588f }, 1.000000f );
-      instance->registerEObj( "Searchlightterminal", 2000873, 4317191, 4, { 206.509399f, 90.986397f, -79.219772f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000566, 4204867, 4, { -62.804321f, 72.657097f, 180.368805f }, 1.000000f );
-      instance->registerEObj( "Searchlightterminal", 2000567, 4204869, 4, { -71.896492f, 74.742790f, 151.474503f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000569, 4204871, 4, { 1.863623f, 71.927399f, 89.175919f }, 1.000000f );
-      instance->registerEObj( "Unstablepaneling", 2000571, 3956106, 4, { 95.737846f, 64.963051f, 103.147400f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000573, 3149745, 4, { 93.090912f, 66.531853f, 117.642097f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2000572, 4065604, 4, { 83.071327f, 60.587688f, 116.300903f }, 1.000000f );
-      instance->registerEObj( "Unstablepaneling", 2000574, 3956104, 4, { 104.309601f, 64.941147f, 67.240013f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2000575, 4065628, 4, { 93.616432f, 60.529831f, 51.407162f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2000576, 3149747, 4, { 101.933800f, 66.905586f, 52.199631f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2000577, 3642024, 4, { 20.799950f, 70.334259f, 4.277452f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2000862, 3149816, 4, { -77.378540f, 78.416023f, 130.266205f }, 0.991760f );
-      instance->registerEObj( "Incendiary#37", 2000570, 0, 4, { 109.141098f, 64.757690f, 62.367512f }, 0.991760f );
-      instance->registerEObj( "Incendiary#37", 2001113, 0, 4, { 124.726898f, 64.689621f, 62.085869f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2001206, 0, 4, { 104.233803f, 66.103699f, 68.343483f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2001205, 0, 4, { 95.566910f, 66.188728f, 101.984398f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2000578, 3642033, 4, { 5.540902f, 70.172447f, -68.735893f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2000586, 3169187, 4, { -84.639374f, 86.075699f, -294.635010f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000582, 0, 4, { -62.063919f, 69.259163f, -89.851593f }, 1.500000f );
-      instance->registerEObj( "Magitekterminal", 2000583, 0, 4, { -43.080639f, 69.331673f, -84.657654f }, 1.480042f );
-      instance->registerEObj( "Unknown24", 2000584, 3642010, 4, { -53.516090f, 69.940781f, -85.333992f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2000863, 3169178, 4, { 31.803410f, 83.652863f, -168.188904f }, 1.000000f );
-      instance->registerEObj( "Searchlightterminal", 2000568, 4204872, 4, { 24.724890f, 77.701874f, -154.365402f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2000874, 4317259, 4, { 10.967040f, 74.960777f, -139.438599f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2001136, 4265914, 4, { -18.308630f, 81.798767f, -204.730896f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2001160, 4200584, 4, { 5.338250f, 70.502319f, -87.827461f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2001159, 4200444, 4, { 21.572090f, 70.516617f, 9.031565f }, 1.000000f );
-      instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000595, 0, 4, { -66.151108f, 69.594437f, -20.559780f }, 0.991760f );
-      instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000600, 0, 4, { -70.083420f, 69.122810f, -65.019180f }, 0.991760f );
-      instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000601, 0, 4, { -44.756939f, 67.998627f, -39.293011f }, 0.991760f );
-      instance->registerEObj( "Unknown30", 2000865, 3169123, 4, { -27.982929f, 79.754509f, -48.873550f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2000865, 3284996, 4, { -19.120440f, 79.754509f, -11.464200f }, 1.000000f );
-      instance->registerEObj( "Searchlightterminal", 2000580, 4204877, 4, { -26.230459f, 79.754509f, -42.167561f }, 0.991760f );
-      instance->registerEObj( "Searchlightterminal", 2000581, 4265903, 4, { -23.853939f, 79.754509f, -15.348020f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2000875, 4317262, 4, { -45.087860f, 67.998833f, -39.263939f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2000562, 4247977, 4, { 257.286194f, 87.030891f, -99.538628f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2000563, 0, 4, { 260.508087f, 86.897049f, -89.411842f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000596, 0, 4, { -121.432404f, 70.350082f, -28.426470f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2000593, 4249703, 4, { -67.576859f, 70.350082f, -36.382999f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2000594, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f, 1.406840f ); 
+      instance->registerEObj( "Magitekmissile", 2000662, 0, 4, { -108.687798f, 70.343590f, -8.558592f }, 1.400000f, -0.605074f ); 
+      instance->registerEObj( "Magitekmissile_1", 2000663, 0, 4, { -116.665100f, 70.390266f, -53.063919f }, 1.400000f, -0.849513f ); 
+      instance->registerEObj( "unknown_1", 2001149, 0, 4, { -72.778549f, 70.163177f, -38.339291f }, 1.000000f, 1.406839f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000591, 4249720, 4, { -25.465830f, 83.385536f, -254.529602f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2000592, 0, 4, { -25.038260f, 81.798767f, -248.906296f }, 1.100000f, 0.000000f ); 
+      instance->registerEObj( "Imperialidentificationkey", 2000870, 0, 4, { -67.439163f, 81.798767f, -231.079102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2000588, 0, 4, { 34.634392f, 71.755402f, -45.910198f }, 0.900000f, 1.543478f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000587, 4249693, 4, { 36.526970f, 70.598427f, -46.207680f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Imperialidentificationkey_1", 2000869, 0, 4, { -7.280443f, 69.781212f, 27.170691f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000590, 0, 4, { -7.938801f, 70.550377f, 55.590679f }, 1.100000f, -0.213036f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000589, 4249713, 4, { -5.998041f, 70.281548f, 58.349812f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Searchlightterminal", 2000564, 3169670, 4, { 213.829102f, 89.024597f, -107.133797f }, 1.000000f, 1.045186f ); 
+      // States -> blue_on red_on white_on 
+      instance->registerEObj( "sgbg_w_emp_015_01a", 2000565, 4204866, 4, { 210.588501f, 88.962471f, -106.430901f }, 0.991760f, 0.000048f ); 
+      // States -> blue_on red_on light_off 
+      instance->registerEObj( "Shortcut", 2000603, 0, 4, { 242.256302f, 87.579422f, -95.018204f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Disposalchute", 2000597, 0, 4, { 40.790581f, 71.410004f, -11.781850f }, 0.991760f, 1.191010f ); 
+      instance->registerEObj( "unknown_5", 2000860, 3168876, 4, { 197.143005f, 92.716309f, -155.744797f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2000861, 3168877, 4, { 211.024704f, 89.452042f, -70.152588f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Searchlightterminal_1", 2000873, 4317191, 4, { 206.509399f, 90.986397f, -79.219772f }, 1.000000f, 1.466079f ); 
+      // States -> blue_on red_on white_on 
+      instance->registerEObj( "unknown_7", 2000566, 4204867, 4, { -62.804321f, 72.657097f, 180.368805f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Searchlightterminal_2", 2000567, 4204869, 4, { -71.896492f, 74.742790f, 151.474503f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000569, 4204871, 4, { 1.863623f, 71.927399f, 89.175919f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Unstablepaneling", 2000571, 3956106, 4, { 95.737846f, 64.963051f, 103.147400f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2000573, 3149745, 4, { 93.090912f, 66.531853f, 117.642097f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000572, 4065604, 4, { 83.071327f, 60.587688f, 116.300903f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Unstablepaneling_1", 2000574, 3956104, 4, { 104.309601f, 64.941147f, 67.240013f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000575, 4065628, 4, { 93.616432f, 60.529831f, 51.407162f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2000576, 3149747, 4, { 101.933800f, 66.905586f, 52.199631f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2000577, 3642024, 4, { 20.799950f, 70.334259f, 4.277452f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2000862, 3149816, 4, { -77.378540f, 78.416023f, 130.266205f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Incendiary#37", 2000570, 0, 4, { 109.141098f, 64.757690f, 62.367512f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Incendiary#37_1", 2001113, 0, 4, { 124.726898f, 64.689621f, 62.085869f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2001206, 0, 4, { 104.233803f, 66.103699f, 68.343483f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2001205, 0, 4, { 95.566910f, 66.188728f, 101.984398f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2000578, 3642033, 4, { 5.540902f, 70.172447f, -68.735893f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2000586, 3169187, 4, { -84.639374f, 86.075699f, -294.635010f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal", 2000582, 0, 4, { -62.063919f, 69.259163f, -89.851593f }, 1.500000f, 0.261981f ); 
+      instance->registerEObj( "Magitekterminal_1", 2000583, 0, 4, { -43.080639f, 69.331673f, -84.657654f }, 1.480042f, 0.271375f ); 
+      instance->registerEObj( "unknown_19", 2000584, 3642010, 4, { -53.516090f, 69.940781f, -85.333992f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2000863, 3169178, 4, { 31.803410f, 83.652863f, -168.188904f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Searchlightterminal_3", 2000568, 4204872, 4, { 24.724890f, 77.701874f, -154.365402f }, 0.991760f, 0.795709f ); 
+      // States -> blue_on red_on white_on 
+      instance->registerEObj( "sgbg_w_emp_015_01a_1", 2000874, 4317259, 4, { 10.967040f, 74.960777f, -139.438599f }, 1.000000f, 0.000000f ); 
+      // States -> blue_on red_on light_off 
+      instance->registerEObj( "unknown_21", 2001136, 4265914, 4, { -18.308630f, 81.798767f, -204.730896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2001160, 4200584, 4, { 5.338250f, 70.502319f, -87.827461f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_23", 2001159, 4200444, 4, { 21.572090f, 70.516617f, 9.031565f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "MarkXLIIIantiaircraftcannon", 2000595, 0, 4, { -66.151108f, 69.594437f, -20.559780f }, 0.991760f, 1.356260f ); 
+      instance->registerEObj( "MarkXLIIIantiaircraftcannon_1", 2000600, 0, 4, { -70.083420f, 69.122810f, -65.019180f }, 0.991760f, 0.891590f ); 
+      instance->registerEObj( "MarkXLIIIantiaircraftcannon_2", 2000601, 0, 4, { -44.756939f, 67.998627f, -39.293011f }, 0.991760f, 1.490808f ); 
+      instance->registerEObj( "unknown_24", 2000865, 3169123, 4, { -27.982929f, 79.754509f, -48.873550f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_25", 2000865, 3284996, 4, { -19.120440f, 79.754509f, -11.464200f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Searchlightterminal_4", 2000580, 4204877, 4, { -26.230459f, 79.754509f, -42.167561f }, 0.991760f, 1.557559f ); 
+      // States -> blue_on red_on white_on 
+      instance->registerEObj( "Searchlightterminal_5", 2000581, 4265903, 4, { -23.853939f, 79.754509f, -15.348020f }, 0.991760f, 0.000048f ); 
+      // States -> blue_on red_on white_on 
+      instance->registerEObj( "sgbg_w_emp_015_01a_2", 2000875, 4317262, 4, { -45.087860f, 67.998833f, -39.263939f }, 1.000000f, 0.000000f ); 
+      // States -> blue_on red_on light_off 
+      instance->registerEObj( "Entrance", 2000562, 4247977, 5, { 257.286194f, 87.030891f, -99.538628f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_26", 2000563, 0, 4, { 260.508087f, 86.897049f, -89.411842f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000596, 0, 4, { -121.432404f, 70.350082f, -28.426470f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
index 440be3ad..75eebc03 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
@@ -10,57 +10,61 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000068, 0, 4, { 44.405670f, -9.596272f, -115.661201f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2001526, 4056196, 4, { 42.862770f, -9.734462f, -118.006302f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000069, 0, 4, { 35.776779f, -38.010250f, 86.627357f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001527, 4056695, 4, { 34.781620f, -38.026581f, 85.051003f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001528, 4056696, 4, { -93.129417f, -57.842449f, 54.637360f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000037, 0, 4, { -90.569702f, -57.860081f, 55.157581f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000266, 3163462, 4, { -73.202423f, -55.895020f, 1.983328f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000267, 3163472, 4, { -123.490501f, -56.689388f, 36.337471f }, 0.991760f );
-      instance->registerEObj( "Improvedblastingdevice", 2000184, 4093714, 4, { 30.553780f, -37.974628f, 110.802399f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000239, 4093740, 4, { 34.836300f, -38.021832f, 115.035202f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2000186, 3163464, 4, { -127.532204f, -56.557701f, 13.108460f }, 1.000000f );
-      instance->registerEObj( "Tinykey", 2000159, 0, 4, { -209.307999f, 23.619301f, -210.254105f }, 0.991760f );
-      instance->registerEObj( "Sealedblastingdoor", 2000160, 4025573, 4, { -205.498901f, 23.819269f, -208.536697f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2000161, 4024332, 4, { -184.037094f, 13.828580f, -208.114502f }, 0.991760f );
-      instance->registerEObj( "Liftlever", 2000162, 4018210, 4, { -191.827606f, 23.433090f, -205.127106f }, 0.991760f );
-      instance->registerEObj( "Liftlever", 2000163, 0, 4, { -183.969498f, 24.006029f, -205.712097f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2001559, 4023678, 4, { -189.593399f, 23.392031f, -208.209396f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4085080, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2000167, 0, 4, { -81.437439f, -5.447510f, -171.343597f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2000168, 3163094, 4, { -74.540337f, -5.935791f, -162.462799f }, 0.991760f );
-      instance->registerEObj( "Firesand", 2000169, 0, 4, { -20.828609f, -8.071711f, -161.638901f }, 0.991760f );
-      instance->registerEObj( "Blastingdevice", 2000170, 4053820, 4, { 41.374290f, -9.249741f, -135.238800f }, 1.000000f );
-      instance->registerEObj( "Firesand", 2000172, 0, 4, { 53.101452f, -3.845266f, -153.826401f }, 0.991760f );
-      instance->registerEObj( "Sealedblastingdoor", 2000173, 4025574, 4, { 43.376751f, -9.109680f, -58.134281f }, 0.991760f );
-      instance->registerEObj( "Liftlever", 2000174, 4018213, 4, { 55.344479f, -8.804504f, -1.751919f }, 0.991760f );
-      instance->registerEObj( "Liftlever", 2000175, 0, 4, { 55.965420f, -8.264337f, 6.017679f }, 0.991760f );
-      instance->registerEObj( "Liftlever", 2000166, 0, 4, { -183.969498f, -6.008533f, -205.992905f }, 0.991760f );
-      instance->registerEObj( "Liftlever", 2000165, 4018211, 4, { -176.318695f, -6.546204f, -210.956100f }, 0.991760f );
-      instance->registerEObj( "Tinykey", 2000178, 0, 4, { 42.903980f, -9.979086f, -69.086594f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2001529, 4024331, 4, { 58.267658f, -19.085461f, 6.177349f }, 1.000000f );
-      instance->registerEObj( "Powderchamber", 2001536, 0, 4, { 43.821098f, -8.847800f, -128.329102f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2001560, 4023676, 4, { -178.386200f, -6.605137f, -207.831696f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2001561, 4023677, 4, { 58.670898f, -8.835022f, 0.472961f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2000171, 3163067, 4, { 43.472900f, -9.262273f, -126.115898f }, 0.991789f );
-      instance->registerEObj( "Liftlever", 2000176, 4018212, 4, { 61.119492f, -37.911671f, 13.438640f }, 1.000000f );
-      instance->registerEObj( "Liftlever", 2000177, 0, 4, { 55.985229f, -38.263531f, 6.003702f }, 0.991760f );
-      instance->registerEObj( "Firesand", 2000179, 0, 4, { 14.572330f, -42.069149f, 43.503422f }, 0.991760f );
-      instance->registerEObj( "Blastingdevice", 2000180, 4053821, 4, { 56.726372f, -37.999741f, 47.990452f }, 0.991760f );
-      instance->registerEObj( "Firesand", 2001531, 0, 4, { 93.184647f, -41.640049f, 67.395599f }, 1.000000f );
-      instance->registerEObj( "Firesand", 2001532, 0, 4, { 38.064529f, -38.712662f, 60.511768f }, 1.000000f );
-      instance->registerEObj( "Firesand", 2001533, 0, 4, { 31.755930f, -37.938789f, 114.646599f }, 1.000000f );
-      instance->registerEObj( "Blastingdevice", 2001534, 4053822, 4, { 10.162710f, -36.846409f, 106.696999f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2001535, 3163445, 4, { 5.569519f, -38.040829f, 111.711197f }, 0.991760f );
-      instance->registerEObj( "Powderchamber", 2001537, 0, 4, { 58.852821f, -37.774250f, 55.076962f }, 0.991760f );
-      instance->registerEObj( "Powderchamber", 2001538, 0, 4, { 6.485046f, -37.171558f, 113.633904f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2001562, 4023675, 4, { 57.846920f, -38.864811f, 11.550960f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2000181, 3163079, 4, { 57.479050f, -38.038540f, 56.536980f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2000185, 3163454, 4, { -55.588661f, -37.033691f, 94.193893f }, 0.991789f );
+      instance->registerEObj( "unknown_0", 2000068, 0, 4, { 44.405670f, -9.596272f, -115.661201f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001526, 4056196, 4, { 42.862770f, -9.734462f, -118.006302f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2000069, 0, 4, { 35.776779f, -38.010250f, 86.627357f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001527, 4056695, 4, { 34.781620f, -38.026581f, 85.051003f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001528, 4056696, 4, { -93.129417f, -57.842449f, 54.637360f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2000037, 0, 4, { -90.569702f, -57.860081f, 55.157581f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2000266, 3163462, 4, { -73.202423f, -55.895020f, 1.983328f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000267, 3163472, 4, { -123.490501f, -56.689388f, 36.337471f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Improvedblastingdevice", 2000184, 4093714, 4, { 30.553780f, -37.974628f, 110.802399f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2000239, 4093740, 4, { 34.836300f, -38.021832f, 115.035202f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_6", 2000186, 3163464, 4, { -127.532204f, -56.557701f, 13.108460f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Tinykey", 2000159, 0, 4, { -209.307999f, 23.619301f, -210.254105f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Sealedblastingdoor", 2000160, 4025573, 4, { -205.498901f, 23.819269f, -208.536697f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_7", 2000161, 4024332, 4, { -184.037094f, 13.828580f, -208.114502f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Liftlever", 2000162, 4018210, 4, { -191.827606f, 23.433090f, -205.127106f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Liftlever_1", 2000163, 0, 4, { -183.969498f, 24.006029f, -205.712097f }, 0.991760f, 1.570451f ); 
+      instance->registerEObj( "unknown_8", 2001559, 4023678, 4, { -189.593399f, 23.392031f, -208.209396f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4085080, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2000167, 0, 4, { -81.437439f, -5.447510f, -171.343597f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2000168, 3163094, 4, { -74.540337f, -5.935791f, -162.462799f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Firesand", 2000169, 0, 4, { -20.828609f, -8.071711f, -161.638901f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Blastingdevice", 2000170, 4053820, 4, { 41.374290f, -9.249741f, -135.238800f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Firesand_1", 2000172, 0, 4, { 53.101452f, -3.845266f, -153.826401f }, 0.991760f, 0.901467f ); 
+      instance->registerEObj( "Sealedblastingdoor_1", 2000173, 4025574, 4, { 43.376751f, -9.109680f, -58.134281f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Liftlever_2", 2000174, 4018213, 4, { 55.344479f, -8.804504f, -1.751919f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Liftlever_3", 2000175, 0, 4, { 55.965420f, -8.264337f, 6.017679f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Liftlever_4", 2000166, 0, 4, { -183.969498f, -6.008533f, -205.992905f }, 0.991760f, -1.570451f ); 
+      instance->registerEObj( "Liftlever_5", 2000165, 4018211, 4, { -176.318695f, -6.546204f, -210.956100f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Tinykey_1", 2000178, 0, 4, { 42.903980f, -9.979086f, -69.086594f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_11", 2001529, 4024331, 4, { 58.267658f, -19.085461f, 6.177349f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Powderchamber", 2001536, 0, 4, { 43.821098f, -8.847800f, -128.329102f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2001560, 4023676, 4, { -178.386200f, -6.605137f, -207.831696f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2001561, 4023677, 4, { 58.670898f, -8.835022f, 0.472961f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_14", 2000171, 3163067, 4, { 43.472900f, -9.262273f, -126.115898f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Liftlever_6", 2000176, 4018212, 4, { 61.119492f, -37.911671f, 13.438640f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Liftlever_7", 2000177, 0, 4, { 55.985229f, -38.263531f, 6.003702f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Firesand_2", 2000179, 0, 4, { 14.572330f, -42.069149f, 43.503422f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Blastingdevice_1", 2000180, 4053821, 4, { 56.726372f, -37.999741f, 47.990452f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Firesand_3", 2001531, 0, 4, { 93.184647f, -41.640049f, 67.395599f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Firesand_4", 2001532, 0, 4, { 38.064529f, -38.712662f, 60.511768f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Firesand_5", 2001533, 0, 4, { 31.755930f, -37.938789f, 114.646599f }, 1.000000f, -1.263692f ); 
+      instance->registerEObj( "Blastingdevice_2", 2001534, 4053822, 4, { 10.162710f, -36.846409f, 106.696999f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_15", 2001535, 3163445, 4, { 5.569519f, -38.040829f, 111.711197f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Powderchamber_1", 2001537, 0, 4, { 58.852821f, -37.774250f, 55.076962f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Powderchamber_2", 2001538, 0, 4, { 6.485046f, -37.171558f, 113.633904f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2001562, 4023675, 4, { 57.846920f, -38.864811f, 11.550960f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_17", 2000181, 3163079, 4, { 57.479050f, -38.038540f, 56.536980f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2000185, 3163454, 4, { -55.588661f, -37.033691f, 94.193893f }, 0.991789f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
index 54444ba2..f41e5586 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
@@ -10,47 +10,53 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002930, 0, 4, { -90.674911f, -57.698959f, 55.099388f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002929, 4481287, 4, { -93.494362f, -57.942631f, 52.914669f }, 1.000000f );
-      instance->registerEObj( "Crystallizedrock", 2002947, 0, 4, { -104.992798f, -53.764061f, -21.253201f }, 1.000000f );
-      instance->registerEObj( "Crystallizedrock", 2003150, 0, 4, { -131.401993f, -56.204762f, 0.851171f }, 0.991760f );
-      instance->registerEObj( "Crystallizedrock", 2003151, 0, 4, { -62.481171f, -59.339249f, 24.728519f }, 0.991760f );
-      instance->registerEObj( "Crystallizedrock", 2003152, 0, 4, { -86.379723f, -58.526180f, 47.109539f }, 0.991760f );
-      instance->registerEObj( "Crystallizedrock", 2003153, 0, 4, { -114.249298f, -57.590469f, 38.164780f }, 0.991760f );
-      instance->registerEObj( "Crystallizedrock", 2003154, 0, 4, { -78.472977f, -56.144230f, -6.125785f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 66.489433f, -9.196375f, -91.109978f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002872, 4481282, 4, { 69.178787f, -9.885409f, -91.345154f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 4497376, 4, { 64.314568f, -9.885409f, -48.220890f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002866, 4498423, 4, { 73.371529f, -11.611810f, -91.558388f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002867, 4498424, 4, { 79.777977f, -11.999900f, -79.149048f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002868, 4498425, 4, { 91.175873f, -12.124900f, -66.404877f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002869, 4498426, 4, { 77.390869f, -12.124900f, -55.604710f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002735, 0, 4, { 35.741501f, -38.003502f, 86.637199f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 4481286, 4, { 34.816029f, -37.807098f, 89.653633f }, 1.000000f );
-      instance->registerEObj( "Improvedblastingdevice", 2002870, 4500271, 4, { 39.532532f, -37.026131f, 113.598297f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002948, 4508121, 4, { 6.729187f, -37.796692f, 112.748901f }, 0.991760f );
-      instance->registerEObj( "Liftlever", 2002902, 0, 4, { -184.034393f, 23.988701f, -205.737198f }, 1.000000f );
-      instance->registerEObj( "Liftlever", 2002904, 0, 4, { -183.968002f, -6.010950f, -205.991592f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002905, 4478636, 4, { -192.156906f, 22.842710f, -208.392502f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2002900, 4498399, 4, { -209.037796f, 23.594311f, -208.732300f }, 1.000000f );
-      instance->registerEObj( "Liftlever", 2002901, 4478628, 4, { -191.601700f, 23.360180f, -205.152100f }, 1.000000f );
-      instance->registerEObj( "Liftlever", 2002903, 4478629, 4, { -176.329803f, -6.592807f, -210.900894f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2002906, 4478634, 4, { -177.598907f, -6.741823f, -208.024597f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2002907, 4478650, 4, { -183.958496f, 8.816254f, -208.023193f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002908, 4498400, 4, { -50.309021f, -3.189148f, -200.885101f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2002909, 4498416, 4, { 21.741100f, -9.932099f, -141.413300f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2002910, 4498406, 4, { -12.649780f, -6.958161f, -219.043304f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2002911, 4498409, 4, { 18.035469f, -6.958161f, -209.711594f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2002912, 4498410, 4, { 17.977119f, -7.000057f, -185.896194f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2002923, 4498451, 4, { 60.402431f, -38.719849f, 51.888512f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2002924, 4498457, 4, { 65.252907f, -38.455730f, 39.846581f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2002925, 4498456, 4, { 55.235111f, -38.564739f, 39.248360f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002926, 4500996, 4, { -82.288239f, -39.313419f, 101.057198f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4481330, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2002899, 0, 4, { -267.241791f, 23.005880f, -170.712494f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2002930, 0, 4, { -90.674911f, -57.698959f, 55.099388f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002929, 4481287, 4, { -93.494362f, -57.942631f, 52.914669f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Crystallizedrock", 2002947, 0, 4, { -104.992798f, -53.764061f, -21.253201f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Crystallizedrock_1", 2003150, 0, 4, { -131.401993f, -56.204762f, 0.851171f }, 0.991760f, -0.745382f ); 
+      instance->registerEObj( "Crystallizedrock_2", 2003151, 0, 4, { -62.481171f, -59.339249f, 24.728519f }, 0.991760f, 1.004150f ); 
+      instance->registerEObj( "Crystallizedrock_3", 2003152, 0, 4, { -86.379723f, -58.526180f, 47.109539f }, 0.991760f, 0.098224f ); 
+      instance->registerEObj( "Crystallizedrock_4", 2003153, 0, 4, { -114.249298f, -57.590469f, 38.164780f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Crystallizedrock_5", 2003154, 0, 4, { -78.472977f, -56.144230f, -6.125785f }, 0.991760f, 0.703581f ); 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { 66.489433f, -9.196375f, -91.109978f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4481282, 4, { 69.178787f, -9.885409f, -91.345154f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4497376, 4, { 64.314568f, -9.885409f, -48.220890f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002866, 4498423, 4, { 73.371529f, -11.611810f, -91.558388f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2002867, 4498424, 4, { 79.777977f, -11.999900f, -79.149048f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2002868, 4498425, 4, { 91.175873f, -12.124900f, -66.404877f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2002869, 4498426, 4, { 77.390869f, -12.124900f, -55.604710f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2002735, 0, 4, { 35.741501f, -38.003502f, 86.637199f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4481286, 4, { 34.816029f, -37.807098f, 89.653633f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Improvedblastingdevice", 2002870, 4500271, 4, { 39.532532f, -37.026131f, 113.598297f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002948, 4508121, 4, { 6.729187f, -37.796692f, 112.748901f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Liftlever", 2002902, 0, 4, { -184.034393f, 23.988701f, -205.737198f }, 1.000000f, -1.554668f ); 
+      instance->registerEObj( "Liftlever_1", 2002904, 0, 4, { -183.968002f, -6.010950f, -205.991592f }, 1.000000f, 1.545402f ); 
+      instance->registerEObj( "unknown_7", 2002905, 4478636, 4, { -192.156906f, 22.842710f, -208.392502f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_8", 2002900, 4498399, 4, { -209.037796f, 23.594311f, -208.732300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Liftlever_2", 2002901, 4478628, 4, { -191.601700f, 23.360180f, -205.152100f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Liftlever_3", 2002903, 4478629, 4, { -176.329803f, -6.592807f, -210.900894f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2002906, 4478634, 4, { -177.598907f, -6.741823f, -208.024597f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2002907, 4478650, 4, { -183.958496f, 8.816254f, -208.023193f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2002908, 4498400, 4, { -50.309021f, -3.189148f, -200.885101f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2002909, 4498416, 4, { 21.741100f, -9.932099f, -141.413300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2002910, 4498406, 4, { -12.649780f, -6.958161f, -219.043304f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_14", 2002911, 4498409, 4, { 18.035469f, -6.958161f, -209.711594f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2002912, 4498410, 4, { 17.977119f, -7.000057f, -185.896194f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2002923, 4498451, 4, { 60.402431f, -38.719849f, 51.888512f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2002924, 4498457, 4, { 65.252907f, -38.455730f, 39.846581f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2002925, 4498456, 4, { 55.235111f, -38.564739f, 39.248360f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2002926, 4500996, 4, { -82.288239f, -39.313419f, 101.057198f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4481330, 5, { -253.156403f, 23.528379f, -174.613998f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -100.877403f, -56.042820f, -15.206130f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -237.184906f, 21.988159f, -166.420502f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_20", 2002899, 0, 4, { -267.241791f, 23.005880f, -170.712494f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
index 2318e3a4..86697d36 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
@@ -10,37 +10,47 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000659, 0, 4, { -190.040604f, -4.267580f, -210.611801f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2001133, 4323450, 4, { 268.610687f, -4.089700f, 104.917397f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2001133, 4323451, 4, { 250.254807f, -3.751600f, 99.675102f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001133, 4323452, 4, { 268.589386f, -2.609000f, 88.017700f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001133, 4323453, 4, { 105.129799f, -0.534200f, 147.850800f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001133, 4323454, 4, { 119.166603f, 0.308000f, 155.483704f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001133, 4323455, 4, { 103.312500f, -0.406300f, 194.717194f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001133, 4323456, 4, { 73.898598f, 0.574600f, 187.497803f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001133, 4323457, 4, { 72.064903f, 0.259800f, 157.992203f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001133, 4323458, 4, { 116.819603f, -0.614000f, 179.620300f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2001133, 4323459, 4, { -11.408770f, -1.184585f, 148.053894f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2001133, 4323460, 4, { -46.669281f, 0.651785f, 135.550003f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2001133, 4323462, 4, { -24.331600f, -1.221600f, 145.870697f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2001133, 4323464, 4, { 15.181000f, -0.706100f, 126.443100f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2001133, 4323468, 4, { -92.665901f, 4.399500f, 112.625504f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4222581, 5, { 263.888306f, -0.101790f, 157.188995f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.520508f, 0.002038f, 142.558197f }, 1.000000f );
-      instance->registerEObj( "Shiftingsands", 2000460, 4279880, 4, { 259.501709f, -3.500300f, 88.085403f }, 1.000000f );
-      instance->registerEObj( "Shiftingsands", 2000461, 4279889, 4, { 79.087517f, 0.289220f, 152.208694f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2000462, 4222616, 4, { -46.215149f, 6.077029f, 159.979706f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2000463, 0, 4, { -48.096859f, 5.781024f, 159.723999f }, 1.000000f );
-      instance->registerEObj( "Shiftingsands", 2000464, 4279890, 4, { -8.133057f, -5.813782f, 215.716797f }, 0.991760f );
-      instance->registerEObj( "Shiftingsands", 2000465, 4279892, 4, { 301.838593f, -0.717224f, -111.039902f }, 0.991760f );
-      instance->registerEObj( "Shiftingsands", 2000466, 4279893, 4, { 319.020294f, 0.259338f, -232.654297f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2000467, 4374288, 4, { -146.843597f, -0.005151f, 184.227493f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2000468, 0, 4, { -144.488297f, -0.192320f, 184.547104f }, 1.000000f );
-      instance->registerEObj( "Shiftingsands", 2000469, 4279894, 4, { -144.457199f, -3.646973f, 134.843994f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2000471, 4222648, 4, { -182.117905f, -0.203522f, -160.895706f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2000472, 0, 4, { -179.869202f, -0.089300f, -160.548294f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -180.661194f, -4.240662f, -222.797607f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2000659, 0, 4, { -190.040604f, -4.267580f, -210.611801f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221", 2001133, 4323450, 4, { 268.610687f, -4.089700f, 104.917397f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_1", 2001133, 4323451, 4, { 250.254807f, -3.751600f, 99.675102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_2", 2001133, 4323452, 4, { 268.589386f, -2.609000f, 88.017700f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_3", 2001133, 4323453, 4, { 105.129799f, -0.534200f, 147.850800f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_4", 2001133, 4323454, 4, { 119.166603f, 0.308000f, 155.483704f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_5", 2001133, 4323455, 4, { 103.312500f, -0.406300f, 194.717194f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_6", 2001133, 4323456, 4, { 73.898598f, 0.574600f, 187.497803f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_7", 2001133, 4323457, 4, { 72.064903f, 0.259800f, 157.992203f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_8", 2001133, 4323458, 4, { 116.819603f, -0.614000f, 179.620300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_9", 2001133, 4323459, 4, { -11.408770f, -1.184585f, 148.053894f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_10", 2001133, 4323460, 4, { -46.669281f, 0.651785f, 135.550003f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_11", 2001133, 4323462, 4, { -24.331600f, -1.221600f, 145.870697f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_12", 2001133, 4323464, 4, { 15.181000f, -0.706100f, 126.443100f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0221_13", 2001133, 4323468, 4, { -92.665901f, 4.399500f, 112.625504f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4222581, 5, { 263.888306f, -0.101790f, 157.188995f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.520508f, 0.002038f, 142.558197f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shiftingsands", 2000460, 4279880, 4, { 259.501709f, -3.500300f, 88.085403f }, 1.000000f, 0.000000f ); 
+      // States -> vf_on disp_on disp_of 
+      instance->registerEObj( "Shiftingsands_1", 2000461, 4279889, 4, { 79.087517f, 0.289220f, 152.208694f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on disp_on disp_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000462, 4222616, 4, { -46.215149f, 6.077029f, 159.979706f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2000463, 0, 4, { -48.096859f, 5.781024f, 159.723999f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shiftingsands_2", 2000464, 4279890, 4, { -8.133057f, -5.813782f, 215.716797f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on disp_on disp_of 
+      instance->registerEObj( "Shiftingsands_3", 2000465, 4279892, 4, { 301.838593f, -0.717224f, -111.039902f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on disp_on disp_of 
+      instance->registerEObj( "Shiftingsands_4", 2000466, 4279893, 4, { 319.020294f, 0.259338f, -232.654297f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on disp_on disp_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000467, 4374288, 4, { -146.843597f, -0.005151f, 184.227493f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2000468, 0, 4, { -144.488297f, -0.192320f, 184.547104f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shiftingsands_5", 2000469, 4279894, 4, { -144.457199f, -3.646973f, 134.843994f }, 0.991760f, 0.000048f ); 
+      // States -> vf_on disp_on disp_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000471, 4222648, 4, { -182.117905f, -0.203522f, -160.895706f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_3", 2000472, 0, 4, { -179.869202f, -0.089300f, -160.548294f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -180.661194f, -4.240662f, -222.797607f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
index ec6c2ced..90b60bc8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
@@ -10,35 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6889640, 4, { -239.375000f, 67.999496f, -175.164597f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007791, 0, 4, { -240.158905f, 67.039032f, -177.843399f }, 0.750000f );
-      instance->registerEObj( "Unknown2", 2007457, 6889642, 4, { -241.910706f, 67.000000f, -215.185699f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6794570, 4, { 287.722412f, 21.499981f, 115.300598f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6739699, 4, { 262.936493f, 21.500010f, 110.142799f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6777815, 4, { 261.315491f, 25.500010f, -10.943810f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6851198, 4, { 248.248901f, 20.000000f, 78.568604f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2007457, 6928399, 4, { 264.958405f, 24.750000f, 121.939598f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6952007, 4, { 285.857391f, 24.500000f, 90.541313f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007457, 6973643, 4, { 189.428497f, 36.749840f, 50.824680f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6735489, 4, { 33.135330f, 40.000000f, 88.297363f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6679193, 4, { -183.423004f, 44.000000f, 125.024200f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6735529, 4, { -193.153900f, 46.551128f, 128.625107f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2007457, 6732692, 4, { -240.779297f, 64.000023f, -93.377197f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6732698, 4, { -240.802704f, 66.000023f, -140.615494f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2007457, 6880936, 4, { -243.716507f, 48.000000f, 37.417641f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 6739904, 4, { -239.397202f, 45.467159f, 60.631378f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 6901296, 4, { -239.515396f, 44.299999f, 93.293831f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6928755, 4, { -243.442398f, 56.000000f, -37.595749f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2002872, 6889553, 4, { 148.284103f, 41.499981f, 20.913610f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007791, 0, 4, { 145.028793f, 40.575001f, 21.644630f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007457, 6889570, 4, { 110.384399f, 41.489140f, 13.189620f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2002872, 6889631, 4, { -222.430801f, 45.500000f, 129.655899f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2007791, 0, 4, { -219.254501f, 45.500000f, 130.342697f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007457, 6889633, 4, { -242.418503f, 45.500000f, 113.102501f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6881291, 5, { 341.375793f, 13.500000f, 180.479599f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 336.598785f, 16.739140f, 178.515305f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -239.781799f, 67.000000f, -212.105698f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
index 5e476ef2..f4c420b0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
@@ -10,74 +10,107 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "埋門", 2000033, 3328371, 4, { 79.909241f, 1.268266f, 161.509598f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000066, 3328664, 4, { 144.020004f, -6.834667f, 162.001907f }, 1.000000f );
-      instance->registerEObj( "Grandhallgate", 2000438, 3328665, 4, { 98.210373f, -6.834594f, 111.974403f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2000453, 0, 4, { 79.384338f, -10.733530f, 106.701599f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000452, 4229638, 4, { 76.745064f, -11.090400f, 105.321198f }, 1.000000f );
-      instance->registerEObj( "Magitektransporter", 2000458, 0, 4, { 23.358509f, -12.304620f, 57.612831f }, 1.000000f );
-      instance->registerEObj( "MagitekterminalI", 2000476, 4256808, 4, { 80.927979f, 1.365243f, 173.289703f }, 1.000000f );
-      instance->registerEObj( "MagitekterminalIII", 2000478, 4256810, 4, { 124.023804f, -13.794070f, 123.296898f }, 1.000000f );
-      instance->registerEObj( "MagitekterminalIV", 2000479, 4256811, 4, { 140.853195f, -11.962310f, 113.256302f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000276, 4255636, 4, { 36.155140f, 8.079000f, 207.374298f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000276, 4255639, 4, { 112.091797f, -3.877179f, 176.216904f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000276, 4255640, 4, { 139.427399f, -10.726720f, 108.501404f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000276, 4255644, 4, { 67.860687f, -14.328120f, 84.076920f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000276, 4255645, 4, { 51.562908f, -11.769940f, 111.841400f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000276, 4255646, 4, { 18.496250f, -15.965690f, 87.930252f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000276, 4255648, 4, { 19.309570f, -10.954800f, 51.356911f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000279, 4247600, 4, { 35.302368f, 8.108457f, 206.288605f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000279, 4247601, 4, { 111.093102f, -3.403727f, 176.495895f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000279, 4247603, 4, { 68.310699f, -14.257320f, 83.756592f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000279, 4247604, 4, { 52.317631f, -11.815490f, 110.621300f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000279, 4247605, 4, { 18.860821f, -14.036660f, 88.283234f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000279, 4247606, 4, { 20.972610f, -11.172370f, 51.726391f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2000279, 4247602, 4, { 138.802094f, -10.764680f, 110.383400f }, 1.000000f );
-      instance->registerEObj( "Magitektransporter", 2000474, 0, 4, { -96.800278f, -30.000010f, -41.821941f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2000455, 0, 4, { -106.309601f, -26.688049f, -16.372990f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2000454, 4233746, 4, { -107.679703f, -26.639919f, -15.815070f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2000487, 4184823, 4, { -111.157799f, -22.833250f, 2.271249f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2000490, 4255705, 4, { -242.711304f, -24.146959f, -32.381401f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2000490, 4255691, 4, { -261.321289f, -25.547960f, -34.986919f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2000490, 4255694, 4, { -261.811310f, -26.640051f, -20.854830f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2000490, 4255706, 4, { -237.266907f, -48.000000f, -0.833767f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2000490, 4255707, 4, { -217.921600f, -18.200211f, 20.315559f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2000490, 4255708, 4, { -169.460999f, -33.749729f, 51.753731f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2000490, 4255709, 4, { -166.205704f, -33.174091f, 41.379780f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2000490, 4255710, 4, { -136.133698f, -24.761801f, 11.194330f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2000280, 4247607, 4, { -260.415710f, -25.404510f, -36.083500f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2000280, 4247608, 4, { -262.467896f, -26.663879f, -21.408119f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2000280, 4247609, 4, { -241.470901f, -24.060431f, -29.972530f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2000280, 4247611, 4, { -238.320496f, -47.903111f, -3.008399f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2000280, 4247610, 4, { -219.957108f, -17.854340f, 18.911011f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2000280, 4247613, 4, { -168.223907f, -33.658329f, 50.704330f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2000280, 4247612, 4, { -165.114899f, -32.678890f, 41.844219f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2000280, 4247614, 4, { -133.651001f, -24.416229f, 10.934760f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2000488, 4233760, 4, { 13.842580f, -15.160090f, -143.072693f }, 1.000000f );
-      instance->registerEObj( "MagitekterminalVIII", 2000483, 4256818, 4, { -16.049601f, -17.297310f, -177.329498f }, 0.991760f );
-      instance->registerEObj( "MagitekterminalIX", 2000484, 4256819, 4, { -14.914310f, -21.075211f, -144.145996f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2000457, 0, 4, { 56.778809f, -36.148682f, -150.835495f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2000456, 4233771, 4, { 55.222290f, -35.782471f, -150.255600f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2000490, 4255718, 4, { -48.459080f, -19.742540f, -176.405197f }, 0.991760f );
-      instance->registerEObj( "Unknown39", 2000490, 4255720, 4, { -11.239590f, -21.204630f, -144.906204f }, 0.991760f );
-      instance->registerEObj( "Unknown40", 2000490, 4255721, 4, { -15.353870f, -17.228140f, -178.818893f }, 0.991760f );
-      instance->registerEObj( "Unknown41", 2000490, 4255722, 4, { 29.525160f, -23.532890f, -108.452202f }, 0.991760f );
-      instance->registerEObj( "Unknown42", 2000490, 4255723, 4, { 27.773970f, -23.532040f, -114.936401f }, 0.991760f );
-      instance->registerEObj( "Unknown43", 2000490, 4255725, 4, { 64.981979f, -38.499950f, -172.408997f }, 0.991760f );
-      instance->registerEObj( "Unknown44", 2000490, 4255728, 4, { 70.785149f, -37.665981f, -203.212097f }, 0.991760f );
-      instance->registerEObj( "Unknown45", 2000490, 4255729, 4, { 105.072098f, -38.024330f, -158.260803f }, 0.991760f );
-      instance->registerEObj( "Unknown46", 2000280, 4246846, 4, { -45.950432f, -19.312410f, -177.762207f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2000280, 4246848, 4, { -14.610830f, -21.218700f, -145.140900f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2000280, 4246847, 4, { -16.411739f, -16.383909f, -180.914902f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2000280, 4246849, 4, { 26.993160f, -23.453131f, -107.682999f }, 0.991760f );
-      instance->registerEObj( "Unknown50", 2000280, 0, 4, { 32.493099f, -24.000099f, -113.021797f }, 1.000000f );
-      instance->registerEObj( "Unknown51", 2000280, 4246850, 4, { 66.021332f, -38.500019f, -172.238098f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2000280, 4246851, 4, { 70.452782f, -37.655048f, -202.913803f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2000280, 4246852, 4, { 103.330498f, -38.100510f, -159.167999f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 79.243332f, -38.930771f, -182.480194f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4229601, 5, { -48.620270f, 19.892130f, 221.013596f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -44.993790f, 14.002300f, 204.521896f }, 1.000000f );
+      instance->registerEObj( "埋門", 2000033, 3328371, 4, { 79.909241f, 1.268266f, 161.509598f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000066, 3328664, 4, { 144.020004f, -6.834667f, 162.001907f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Grandhallgate", 2000438, 3328665, 4, { 98.210373f, -6.834594f, 111.974403f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2000453, 0, 4, { 79.384338f, -10.733530f, 106.701599f }, 1.000000f, -0.706750f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000452, 4229638, 4, { 76.745064f, -11.090400f, 105.321198f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Magitektransporter", 2000458, 0, 4, { 23.358509f, -12.304620f, 57.612831f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "MagitekterminalI", 2000476, 4256808, 4, { 80.927979f, 1.365243f, 173.289703f }, 1.000000f, 0.000000f ); 
+      // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of 
+      instance->registerEObj( "MagitekterminalIII", 2000478, 4256810, 4, { 124.023804f, -13.794070f, 123.296898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of 
+      instance->registerEObj( "MagitekterminalIV", 2000479, 4256811, 4, { 140.853195f, -11.962310f, 113.256302f }, 1.000000f, 0.000000f ); 
+      // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of 
+      instance->registerEObj( "sgvf_r1r1_b0173", 2000276, 4255636, 4, { 36.155140f, 8.079000f, 207.374298f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on vfbright_b_off 
+      instance->registerEObj( "sgvf_r1r1_b0173_1", 2000276, 4255639, 4, { 112.091797f, -3.877179f, 176.216904f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on vfbright_b_off 
+      instance->registerEObj( "sgvf_r1r1_b0173_2", 2000276, 4255640, 4, { 139.427399f, -10.726720f, 108.501404f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on vfbright_b_off 
+      instance->registerEObj( "sgvf_r1r1_b0173_3", 2000276, 4255644, 4, { 67.860687f, -14.328120f, 84.076920f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on vfbright_b_off 
+      instance->registerEObj( "sgvf_r1r1_b0173_4", 2000276, 4255645, 4, { 51.562908f, -11.769940f, 111.841400f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on vfbright_b_off 
+      instance->registerEObj( "sgvf_r1r1_b0173_5", 2000276, 4255646, 4, { 18.496250f, -15.965690f, 87.930252f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on vfbright_b_off 
+      instance->registerEObj( "sgvf_r1r1_b0173_6", 2000276, 4255648, 4, { 19.309570f, -10.954800f, 51.356911f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_b_on vfbright_b_off 
+      instance->registerEObj( "unknown_1", 2000279, 4247600, 4, { 35.302368f, 8.108457f, 206.288605f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2000279, 4247601, 4, { 111.093102f, -3.403727f, 176.495895f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2000279, 4247603, 4, { 68.310699f, -14.257320f, 83.756592f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000279, 4247604, 4, { 52.317631f, -11.815490f, 110.621300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2000279, 4247605, 4, { 18.860821f, -14.036660f, 88.283234f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2000279, 4247606, 4, { 20.972610f, -11.172370f, 51.726391f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2000279, 4247602, 4, { 138.802094f, -10.764680f, 110.383400f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitektransporter_1", 2000474, 0, 4, { -96.800278f, -30.000010f, -41.821941f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000455, 0, 4, { -106.309601f, -26.688049f, -16.372990f }, 0.991760f, 0.737616f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000454, 4233746, 4, { -107.679703f, -26.639919f, -15.815070f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_9", 2000487, 4184823, 4, { -111.157799f, -22.833250f, 2.271249f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_r1r1_b0174", 2000490, 4255705, 4, { -242.711304f, -24.146959f, -32.381401f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_1", 2000490, 4255691, 4, { -261.321289f, -25.547960f, -34.986919f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_2", 2000490, 4255694, 4, { -261.811310f, -26.640051f, -20.854830f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_3", 2000490, 4255706, 4, { -237.266907f, -48.000000f, -0.833767f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_4", 2000490, 4255707, 4, { -217.921600f, -18.200211f, 20.315559f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_5", 2000490, 4255708, 4, { -169.460999f, -33.749729f, 51.753731f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_6", 2000490, 4255709, 4, { -166.205704f, -33.174091f, 41.379780f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_7", 2000490, 4255710, 4, { -136.133698f, -24.761801f, 11.194330f }, 1.000000f, 0.000000f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "unknown_10", 2000280, 4247607, 4, { -260.415710f, -25.404510f, -36.083500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000280, 4247608, 4, { -262.467896f, -26.663879f, -21.408119f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2000280, 4247609, 4, { -241.470901f, -24.060431f, -29.972530f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2000280, 4247611, 4, { -238.320496f, -47.903111f, -3.008399f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2000280, 4247610, 4, { -219.957108f, -17.854340f, 18.911011f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2000280, 4247613, 4, { -168.223907f, -33.658329f, 50.704330f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2000280, 4247612, 4, { -165.114899f, -32.678890f, 41.844219f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2000280, 4247614, 4, { -133.651001f, -24.416229f, 10.934760f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_emp_b0021", 2000488, 4233760, 4, { 13.842580f, -15.160090f, -143.072693f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria_on vf_baria_off 
+      instance->registerEObj( "MagitekterminalVIII", 2000483, 4256818, 4, { -16.049601f, -17.297310f, -177.329498f }, 0.991760f, 0.000048f ); 
+      // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of 
+      instance->registerEObj( "MagitekterminalIX", 2000484, 4256819, 4, { -14.914310f, -21.075211f, -144.145996f }, 1.000000f, 0.000000f ); 
+      // States -> vf_tarmn1_on vf_tarmn1_of vf_tarmn2_on vf_bg_on vf_bg_of 
+      instance->registerEObj( "unknown_18", 2000457, 0, 4, { 56.778809f, -36.148682f, -150.835495f }, 0.991760f, 0.957075f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000456, 4233771, 4, { 55.222290f, -35.782471f, -150.255600f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_r1r1_b0174_8", 2000490, 4255718, 4, { -48.459080f, -19.742540f, -176.405197f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_9", 2000490, 4255720, 4, { -11.239590f, -21.204630f, -144.906204f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_10", 2000490, 4255721, 4, { -15.353870f, -17.228140f, -178.818893f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_11", 2000490, 4255722, 4, { 29.525160f, -23.532890f, -108.452202f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_12", 2000490, 4255723, 4, { 27.773970f, -23.532040f, -114.936401f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_13", 2000490, 4255725, 4, { 64.981979f, -38.499950f, -172.408997f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_14", 2000490, 4255728, 4, { 70.785149f, -37.665981f, -203.212097f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "sgvf_r1r1_b0174_15", 2000490, 4255729, 4, { 105.072098f, -38.024330f, -158.260803f }, 0.991760f, 0.000048f ); 
+      // States -> vfbright_o_on vfbright_o_off 
+      instance->registerEObj( "unknown_19", 2000280, 4246846, 4, { -45.950432f, -19.312410f, -177.762207f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2000280, 4246848, 4, { -14.610830f, -21.218700f, -145.140900f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2000280, 4246847, 4, { -16.411739f, -16.383909f, -180.914902f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2000280, 4246849, 4, { 26.993160f, -23.453131f, -107.682999f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_23", 2000280, 0, 4, { 32.493099f, -24.000099f, -113.021797f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2000280, 4246850, 4, { 66.021332f, -38.500019f, -172.238098f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_25", 2000280, 4246851, 4, { 70.452782f, -37.655048f, -202.913803f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_26", 2000280, 4246852, 4, { 103.330498f, -38.100510f, -159.167999f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit_1", 2000139, 0, 4, { 79.243332f, -38.930771f, -182.480194f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4229601, 5, { -48.620270f, 19.892130f, 221.013596f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -44.993790f, 14.002300f, 204.521896f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
index e1daa274..7d1a1133 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
@@ -10,48 +10,58 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2001649, 4097866, 4, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f );
-      instance->registerEObj( "Exit", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f );
-      instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f );
-      instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f );
-      instance->registerEObj( "Aetherialflow", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance_1", 2001649, 4097866, 5, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit_1", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f, 0.000000f ); 
+      // States -> vf_htras1_on vf_htras1_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_2", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch_1", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch_2", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch_3", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch_4", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Aetherialflow_1", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f, 0.000048f ); 
+      // States -> tornade_off tornade_on 
+      instance->registerEObj( "unknown_18", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_19", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
index 3d0c85e5..06bab2c8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
@@ -10,57 +10,63 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f );
-      instance->registerEObj( "Unknown0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f );
-      instance->registerEObj( "Thalsscepter", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f );
-      instance->registerEObj( "Thalsscepter", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f );
-      instance->registerEObj( "Thalsscepter", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f );
-      instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f );
-      instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f );
-      instance->registerEObj( "Shadowyorb", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f );
-      instance->registerEObj( "Shadowyorb", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f );
-      instance->registerEObj( "Shadowyorb", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f );
-      instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f );
+      instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Thalsscepter_1", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Thalsscepter_2", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Thalsscepter_3", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shadowyorb_1", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shadowyorb_2", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shadowyorb_3", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f, 0.000048f ); 
+      // States -> vf_htras1_on vf_htras1_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_3", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f, -1.265160f ); 
+      instance->registerEObj( "unknown_4", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f, -1.005012f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f, -1.062825f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_5", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f, 1.129171f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_6", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f, -1.486617f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_11", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_22", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_23", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_24", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_25", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_26", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_27", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_28", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_29", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_30", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_31", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_32", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance_1", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit_1", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
index b918fcb9..6fb21e4e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
@@ -10,41 +10,51 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Voidlamp", 2000366, 3873151, 4, { 19.527651f, 17.000000f, 22.036671f }, 0.991789f );
-      instance->registerEObj( "Voidlamp", 2000367, 3873152, 4, { -24.524000f, 16.999901f, 22.023741f }, 1.000000f );
-      instance->registerEObj( "Voidlamp", 2000368, 3873153, 4, { 19.541849f, 16.999950f, -13.996940f }, 1.000000f );
-      instance->registerEObj( "Voidlamp", 2000369, 3873154, 4, { -24.503330f, 16.999889f, -14.014120f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000370, 0, 4, { -2.517786f, 16.952730f, 21.011629f }, 0.930753f );
-      instance->registerEObj( "Unknown0", 2000371, 0, 4, { 81.895119f, 0.228838f, -0.106860f }, 0.900235f );
-      instance->registerEObj( "Tinykey", 2000302, 0, 4, { 71.396912f, -0.001627f, 28.641140f }, 0.869717f );
-      instance->registerEObj( "Tinykey", 2000303, 0, 4, { -26.322651f, -0.005771f, 50.722679f }, 0.778163f );
-      instance->registerEObj( "Tinykey", 2000304, 0, 4, { -52.424351f, -0.002903f, 22.515909f }, 0.930753f );
-      instance->registerEObj( "Tinykey", 2000305, 0, 4, { -68.498917f, -16.795919f, -8.967492f }, 0.869717f );
-      instance->registerEObj( "Tinykey", 2000306, 0, 4, { -46.234051f, -18.800501f, 38.557331f }, 0.900235f );
-      instance->registerEObj( "Tinykey", 2000307, 0, 4, { 14.015370f, -18.796499f, -43.227589f }, 0.900235f );
-      instance->registerEObj( "Tinykey", 2000308, 0, 4, { -11.804590f, -18.800249f, -50.647060f }, 0.991789f );
-      instance->registerEObj( "Lockeddoor", 2000329, 3457073, 4, { 0.509394f, 0.143553f, 56.976101f }, 0.991789f );
-      instance->registerEObj( "Lockeddoor", 2000331, 3457076, 4, { -16.586599f, 0.172088f, 84.043991f }, 0.961271f );
-      instance->registerEObj( "Lockeddoor", 2000337, 3457070, 4, { -48.657558f, 0.174862f, -36.017189f }, 0.991789f );
-      instance->registerEObj( "Lockeddoor", 2000338, 3457071, 4, { -48.701061f, 0.167371f, 36.007271f }, 0.930753f );
-      instance->registerEObj( "Lockeddoor", 2000339, 3457083, 4, { -25.116051f, -18.616779f, -34.637550f }, 0.961271f );
-      instance->registerEObj( "Lockeddoor", 2000343, 3457090, 4, { -1.899940f, -18.615101f, 34.620899f }, 0.961271f );
-      instance->registerEObj( "Lockeddoor", 2000344, 3457093, 4, { 25.192600f, -18.692350f, 34.531120f }, 0.930753f );
-      instance->registerEObj( "IvyDoor", 2000355, 3457081, 4, { -48.382030f, 0.425044f, -0.015306f }, 0.961271f );
-      instance->registerEObj( "CarnationDoor", 2000356, 3457082, 4, { -25.558910f, -18.570280f, -0.076342f }, 0.930753f );
-      instance->registerEObj( "LilyDoor", 2000357, 3449005, 4, { 22.842710f, 17.196871f, -0.015306f }, 0.991789f );
-      instance->registerEObj( "Unknown1", 2001080, 0, 4, { 22.000000f, 17.000000f, 0.000000f }, 0.575000f );
-      instance->registerEObj( "Unknown2", 2001236, 3852702, 4, { 24.498400f, 0.449216f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Sealedbarrier", 2001233, 3909497, 4, { 46.699810f, 9.875019f, -0.253856f }, 1.000000f );
-      instance->registerEObj( "Yellowkey", 2000325, 0, 4, { -12.348700f, -18.803230f, 52.290878f }, 1.000000f );
-      instance->registerEObj( "Lockeddoor", 2000345, 3457077, 4, { 16.464439f, 17.135830f, 84.153458f }, 0.930753f );
-      instance->registerEObj( "Unknown3", 2001604, 4103506, 4, { -23.510660f, -0.000664f, 0.588553f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001605, 4103511, 4, { -23.446470f, -0.000633f, -0.525669f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001606, 4103508, 4, { -24.734859f, -18.800381f, 0.630995f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001607, 4103512, 4, { -24.765221f, -18.800400f, -0.546668f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4143756, 5, { 73.330597f, 0.000000f, 0.000000f }, 0.991760f );
-      instance->registerEObj( "Greenkey", 2000324, 0, 4, { 1.500000f, 0.007936f, -0.000000f }, 0.961271f );
+      instance->registerEObj( "Voidlamp", 2000366, 3873151, 4, { 19.527651f, 17.000000f, 22.036671f }, 0.991789f, 0.785398f ); 
+      // States -> vf_slamp_on vf_slamp_of 
+      instance->registerEObj( "Voidlamp_1", 2000367, 3873152, 4, { -24.524000f, 16.999901f, 22.023741f }, 1.000000f, -0.785398f ); 
+      // States -> vf_slamp_on vf_slamp_of 
+      instance->registerEObj( "Voidlamp_2", 2000368, 3873153, 4, { 19.541849f, 16.999950f, -13.996940f }, 1.000000f, 0.785398f ); 
+      // States -> vf_slamp_on vf_slamp_of 
+      instance->registerEObj( "Voidlamp_3", 2000369, 3873154, 4, { -24.503330f, 16.999889f, -14.014120f }, 1.000000f, -0.785398f ); 
+      // States -> vf_slamp_on vf_slamp_of 
+      instance->registerEObj( "Exit", 2000370, 0, 4, { -2.517786f, 16.952730f, 21.011629f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "unknown_0", 2000371, 0, 4, { 81.895119f, 0.228838f, -0.106860f }, 0.900235f, 0.000336f ); 
+      instance->registerEObj( "Tinykey", 2000302, 0, 4, { 71.396912f, -0.001627f, 28.641140f }, 0.869717f, 0.932147f ); 
+      instance->registerEObj( "Tinykey_1", 2000303, 0, 4, { -26.322651f, -0.005771f, 50.722679f }, 0.778163f, -0.528574f ); 
+      instance->registerEObj( "Tinykey_2", 2000304, 0, 4, { -52.424351f, -0.002903f, 22.515909f }, 0.930753f, 0.987942f ); 
+      instance->registerEObj( "Tinykey_3", 2000305, 0, 4, { -68.498917f, -16.795919f, -8.967492f }, 0.869717f, 1.115077f ); 
+      instance->registerEObj( "Tinykey_4", 2000306, 0, 4, { -46.234051f, -18.800501f, 38.557331f }, 0.900235f, 0.549108f ); 
+      instance->registerEObj( "Tinykey_5", 2000307, 0, 4, { 14.015370f, -18.796499f, -43.227589f }, 0.900235f, 0.868678f ); 
+      instance->registerEObj( "Tinykey_6", 2000308, 0, 4, { -11.804590f, -18.800249f, -50.647060f }, 0.991789f, 0.312732f ); 
+      instance->registerEObj( "Lockeddoor", 2000329, 3457073, 4, { 0.509394f, 0.143553f, 56.976101f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Lockeddoor_1", 2000331, 3457076, 4, { -16.586599f, 0.172088f, 84.043991f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "Lockeddoor_2", 2000337, 3457070, 4, { -48.657558f, 0.174862f, -36.017189f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Lockeddoor_3", 2000338, 3457071, 4, { -48.701061f, 0.167371f, 36.007271f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "Lockeddoor_4", 2000339, 3457083, 4, { -25.116051f, -18.616779f, -34.637550f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "Lockeddoor_5", 2000343, 3457090, 4, { -1.899940f, -18.615101f, 34.620899f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "Lockeddoor_6", 2000344, 3457093, 4, { 25.192600f, -18.692350f, 34.531120f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "IvyDoor", 2000355, 3457081, 4, { -48.382030f, 0.425044f, -0.015306f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "CarnationDoor", 2000356, 3457082, 4, { -25.558910f, -18.570280f, -0.076342f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "LilyDoor", 2000357, 3449005, 4, { 22.842710f, 17.196871f, -0.015306f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2001080, 0, 4, { 22.000000f, 17.000000f, 0.000000f }, 0.575000f, -1.570451f ); 
+      instance->registerEObj( "unknown_2", 2001236, 3852702, 4, { 24.498400f, 0.449216f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sealedbarrier", 2001233, 3909497, 4, { 46.699810f, 9.875019f, -0.253856f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria1_off vf_baria_on 
+      instance->registerEObj( "Yellowkey", 2000325, 0, 4, { -12.348700f, -18.803230f, 52.290878f }, 1.000000f, -0.839410f ); 
+      instance->registerEObj( "Lockeddoor_7", 2000345, 3457077, 4, { 16.464439f, 17.135830f, 84.153458f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2001604, 4103506, 4, { -23.510660f, -0.000664f, 0.588553f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001605, 4103511, 4, { -23.446470f, -0.000633f, -0.525669f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001606, 4103508, 4, { -24.734859f, -18.800381f, 0.630995f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2001607, 4103512, 4, { -24.765221f, -18.800400f, -0.546668f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Entrance", 2000182, 4143756, 5, { 73.330597f, 0.000000f, 0.000000f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Greenkey", 2000324, 0, 4, { 1.500000f, 0.007936f, -0.000000f }, 0.961271f, 0.638080f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
index 434e7be5..01d5cd02 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
@@ -10,57 +10,77 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -26.487801f, 17.000000f, -0.008300f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 4497628, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002873, 4498555, 4, { -1.869557f, 17.000000f, 15.055300f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002874, 4498556, 4, { -5.211004f, 17.000000f, -10.575720f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2003318, 4484553, 4, { 23.178410f, 16.983280f, 0.137329f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 25.786711f, 0.000000f, 0.119909f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 4505837, 4, { 23.084200f, 0.000000f, -1.591900f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2003126, 4521780, 4, { -20.141510f, -0.000000f, -0.141697f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { -24.169260f, -18.905939f, -0.137390f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2002872, 4509134, 4, { -22.072941f, -18.814390f, -0.320496f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002997, 0, 4, { -20.433430f, -18.936470f, 0.755735f }, 1.000000f );
-      instance->registerEObj( "LilyDoor", 2002915, 4484551, 4, { -28.152889f, 16.983280f, 0.015198f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2002917, 4505698, 4, { -36.195190f, 16.983280f, -5.685384f }, 0.991760f );
-      instance->registerEObj( "Crystalball", 2002916, 4488372, 4, { 28.044069f, 16.983280f, 0.168350f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2003319, 4544200, 4, { -36.143250f, 17.000000f, 7.445584f }, 1.000000f );
-      instance->registerEObj( "Lockeddoor", 2003315, 4484546, 4, { 15.988830f, 17.000000f, -82.166763f }, 1.000000f );
-      instance->registerEObj( "Tinykey", 2003312, 0, 4, { 23.053480f, 17.000000f, -63.610909f }, 1.000000f );
-      instance->registerEObj( "Lockeddoor", 2003316, 4484554, 4, { 0.701762f, 17.000000f, -96.124260f }, 1.000000f );
-      instance->registerEObj( "Lockeddoor", 2003317, 4484573, 4, { -15.941600f, 17.000000f, -86.214546f }, 1.000000f );
-      instance->registerEObj( "Tinykey", 2003314, 0, 4, { 11.497100f, 17.000000f, -97.655212f }, 1.000000f );
-      instance->registerEObj( "Tinykey", 2003430, 0, 4, { -10.688510f, 17.000000f, -98.849060f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2002938, 4484560, 4, { 16.478939f, 0.000000f, -83.923622f }, 1.000000f );
-      instance->registerEObj( "Crystalball", 2002941, 4488371, 4, { -43.455170f, -0.000000f, 13.580270f }, 1.000000f );
-      instance->registerEObj( "RoseDoor", 2002943, 0, 4, { 27.084721f, -0.015320f, 0.045776f }, 0.991760f );
-      instance->registerEObj( "Redkey", 2002942, 0, 4, { 58.672710f, 0.000000f, -30.483391f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2002937, 4484569, 4, { -16.476231f, 0.000000f, -69.988670f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2002944, 4499358, 4, { -16.603889f, 0.000000f, -68.606903f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002945, 4499362, 4, { 16.527910f, 0.000000f, -85.147072f }, 1.000000f );
-      instance->registerEObj( "Voidlamp", 2002939, 4488368, 4, { -29.871300f, -0.015320f, -70.456650f }, 0.991760f );
-      instance->registerEObj( "Voidlamp", 2002940, 4488367, 4, { -17.039709f, 0.000000f, -84.537079f }, 1.000000f );
-      instance->registerEObj( "Sealedbarrier", 2003321, 4545173, 4, { 29.337740f, 0.000000f, -1.101776f }, 1.000000f );
-      instance->registerEObj( "Lockeddoor", 2003320, 4484571, 4, { 46.738281f, -0.015320f, -35.965580f }, 0.991760f );
-      instance->registerEObj( "Tinykey", 2003313, 0, 4, { 43.982948f, 0.000000f, -34.342270f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2003463, 4588435, 4, { -5.889304f, 0.000000f, -71.199730f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2003464, 4588440, 4, { 6.823740f, 0.000000f, -82.895660f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2003465, 4588441, 4, { 16.834749f, 0.000000f, -70.555031f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2003466, 4588442, 4, { 27.007900f, 0.000000f, -82.771332f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2003467, 4588444, 4, { 34.488140f, -0.000000f, -61.907959f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2003468, 4588448, 4, { 48.546879f, 0.000000f, -53.979691f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2003469, 4588445, 4, { 24.192520f, 0.000000f, -55.798260f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002951, 4486667, 4, { -25.301229f, -18.799990f, -33.673420f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2002952, 4486668, 4, { 1.978515f, -18.799990f, -34.167542f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2002953, 0, 4, { 25.467291f, -18.814390f, 33.859741f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2002954, 4486671, 4, { -2.139196f, -18.799990f, 34.235821f }, 1.000000f );
-      instance->registerEObj( "Sealedbarrier", 2002955, 4508183, 4, { -25.881571f, -18.799999f, 0.041033f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2003322, 4486669, 4, { 28.549561f, -18.799999f, -33.402039f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4488394, 5, { 73.319580f, -0.015320f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 17.397711f, -18.804060f, 0.066881f }, 0.900200f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 72.756577f, 0.000000f, 5.215310f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2002913, 0, 4, { 81.361702f, 0.249998f, -0.409441f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -26.487801f, 17.000000f, -0.008300f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002872, 4497628, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgbg_f1d4_c1_ori01", 2002873, 4498555, 4, { -1.869557f, 17.000000f, 15.055300f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on0 vf_fire_on vf_fire_oｆ0 vf_fire_oｆ 
+      instance->registerEObj( "sgbg_f1d4_c1_ori01_1", 2002874, 4498556, 4, { -5.211004f, 17.000000f, -10.575720f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on0 vf_fire_on vf_fire_oｆ0 vf_fire_oｆ 
+      instance->registerEObj( "unknown_1", 2003318, 4484553, 4, { 23.178410f, 16.983280f, 0.137329f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { 25.786711f, 0.000000f, 0.119909f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4505837, 4, { 23.084200f, 0.000000f, -1.591900f }, 1.000000f, -1.570796f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2003126, 4521780, 4, { -20.141510f, -0.000000f, -0.141697f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_3", 2002735, 0, 4, { -24.169260f, -18.905939f, -0.137390f }, 0.991760f, -1.551983f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4509134, 4, { -22.072941f, -18.814390f, -0.320496f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_4", 2002997, 0, 4, { -20.433430f, -18.936470f, 0.755735f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "LilyDoor", 2002915, 4484551, 4, { -28.152889f, 16.983280f, 0.015198f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d4_d1_gago1", 2002917, 4505698, 4, { -36.195190f, 16.983280f, -5.685384f }, 0.991760f, 0.000048f ); 
+      // States -> bg_gago1_on bg_gago1_oｆｆ bg_gago1_out 
+      instance->registerEObj( "Crystalball", 2002916, 4488372, 4, { 28.044069f, 16.983280f, 0.168350f }, 0.991760f, 0.811345f ); 
+      instance->registerEObj( "sgbg_f1d4_d1_gago1_1", 2003319, 4544200, 4, { -36.143250f, 17.000000f, 7.445584f }, 1.000000f, 0.000000f ); 
+      // States -> bg_gago1_on bg_gago1_oｆｆ bg_gago1_out 
+      instance->registerEObj( "Lockeddoor", 2003315, 4484546, 4, { 15.988830f, 17.000000f, -82.166763f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Tinykey", 2003312, 0, 4, { 23.053480f, 17.000000f, -63.610909f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Lockeddoor_1", 2003316, 4484554, 4, { 0.701762f, 17.000000f, -96.124260f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Lockeddoor_2", 2003317, 4484573, 4, { -15.941600f, 17.000000f, -86.214546f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Tinykey_1", 2003314, 0, 4, { 11.497100f, 17.000000f, -97.655212f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Tinykey_2", 2003430, 0, 4, { -10.688510f, 17.000000f, -98.849060f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2002938, 4484560, 4, { 16.478939f, 0.000000f, -83.923622f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Crystalball_1", 2002941, 4488371, 4, { -43.455170f, -0.000000f, 13.580270f }, 1.000000f, -1.392958f ); 
+      instance->registerEObj( "RoseDoor", 2002943, 0, 4, { 27.084721f, -0.015320f, 0.045776f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Redkey", 2002942, 0, 4, { 58.672710f, 0.000000f, -30.483391f }, 1.000000f, -0.000345f ); 
+      instance->registerEObj( "unknown_6", 2002937, 4484569, 4, { -16.476231f, 0.000000f, -69.988670f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2002944, 4499358, 4, { -16.603889f, 0.000000f, -68.606903f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2002945, 4499362, 4, { 16.527910f, 0.000000f, -85.147072f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Voidlamp", 2002939, 4488368, 4, { -29.871300f, -0.015320f, -70.456650f }, 0.991760f, 1.074421f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "Voidlamp_1", 2002940, 4488367, 4, { -17.039709f, 0.000000f, -84.537079f }, 1.000000f, -1.569551f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "Sealedbarrier", 2003321, 4545173, 4, { 29.337740f, 0.000000f, -1.101776f }, 1.000000f, 0.000000f ); 
+      // States -> bg_barrier1_on bg_barrier1_off bg_barrier1_out 
+      instance->registerEObj( "Lockeddoor_3", 2003320, 4484571, 4, { 46.738281f, -0.015320f, -35.965580f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Tinykey_3", 2003313, 0, 4, { 43.982948f, 0.000000f, -34.342270f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1d4_v1_lmp1", 2003463, 4588435, 4, { -5.889304f, 0.000000f, -71.199730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "sgbg_f1d4_v1_lmp1_1", 2003464, 4588440, 4, { 6.823740f, 0.000000f, -82.895660f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "sgbg_f1d4_v1_lmp1_2", 2003465, 4588441, 4, { 16.834749f, 0.000000f, -70.555031f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "sgbg_f1d4_v1_lmp1_3", 2003466, 4588442, 4, { 27.007900f, 0.000000f, -82.771332f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "sgbg_f1d4_v1_lmp1_4", 2003467, 4588444, 4, { 34.488140f, -0.000000f, -61.907959f }, 1.000000f, 0.010569f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "sgbg_f1d4_v1_lmp1_5", 2003468, 4588448, 4, { 48.546879f, 0.000000f, -53.979691f }, 1.000000f, 0.009430f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "sgbg_f1d4_v1_lmp1_6", 2003469, 4588445, 4, { 24.192520f, 0.000000f, -55.798260f }, 1.000000f, 0.000000f ); 
+      // States -> vf_slamp_on0 vf_slamp_of vf_slamp_hide vf_slamp_on1 
+      instance->registerEObj( "unknown_9", 2002951, 4486667, 4, { -25.301229f, -18.799990f, -33.673420f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2002952, 4486668, 4, { 1.978515f, -18.799990f, -34.167542f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2002953, 0, 4, { 25.467291f, -18.814390f, 33.859741f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2002954, 4486671, 4, { -2.139196f, -18.799990f, 34.235821f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sealedbarrier_1", 2002955, 4508183, 4, { -25.881571f, -18.799999f, 0.041033f }, 1.000000f, 0.000000f ); 
+      // States -> bg_barrier1_on bg_barrier1_off bg_barrier1_out 
+      instance->registerEObj( "unknown_13", 2003322, 4486669, 4, { 28.549561f, -18.799999f, -33.402039f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4488394, 5, { 73.319580f, -0.015320f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 17.397711f, -18.804060f, 0.066881f }, 0.900200f, 0.000335f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 72.756577f, 0.000000f, 5.215310f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2002913, 0, 4, { 81.361702f, 0.249998f, -0.409441f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
index 600b2355..552c196b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
@@ -10,50 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7170401, 4, { -71.824219f, 36.942020f, 308.278015f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007457, 7170402, 4, { -74.204651f, 2.975464f, 288.624390f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2007457, 7170403, 4, { -74.725868f, 2.999996f, 204.499496f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7253595, 4, { -82.098160f, 3.000000f, 259.118103f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7253596, 4, { -82.556618f, 3.000000f, 259.252808f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7253597, 4, { -82.556618f, 3.000000f, 259.252808f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 7253612, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2007457, 7253613, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2007457, 7253614, 4, { -63.482540f, 2.975464f, 256.192291f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007457, 7253621, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 7253622, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7253623, 4, { -83.775871f, 3.000000f, 228.598297f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 7253630, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 7253631, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 7253632, 4, { -63.137959f, 2.999996f, 217.910294f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2002735, 0, 4, { -70.236214f, -2.994005f, 150.513504f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2007457, 7173420, 4, { -67.025093f, -3.000000f, 145.419205f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 7173423, 4, { -67.025078f, -2.956286f, 106.833702f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 7229619, 4, { -78.515167f, -3.000000f, 126.046402f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007457, 7229620, 4, { -65.781677f, -3.006042f, 126.756599f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2007457, 7229622, 4, { -78.080513f, -3.006042f, 134.996597f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2007457, 7229623, 4, { -63.370731f, -3.006042f, 134.752396f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2007457, 7242616, 4, { -45.700809f, -8.255188f, 23.636169f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2007457, 7245584, 4, { 26.736940f, -16.665211f, 27.040310f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2007457, 7167237, 4, { 55.466431f, -16.525570f, 30.044920f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2007457, 7167239, 4, { 57.053471f, -25.528379f, -52.079102f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2002735, 0, 4, { 59.280998f, -26.000000f, -100.623596f }, 1.250000f );
-      instance->registerEObj( "Unknown27", 2007457, 7173646, 4, { 63.367290f, -26.500000f, -104.259499f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007457, 7173648, 4, { 61.874378f, -26.500059f, -136.133804f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007457, 7167248, 4, { 60.837650f, -96.757507f, -322.591003f }, 0.991760f );
-      instance->registerEObj( "Unknown30", 2007457, 7167249, 4, { 61.997311f, -93.000023f, -421.408386f }, 0.991760f );
-      instance->registerEObj( "Unknown31", 2002735, 0, 4, { 62.119381f, -88.000000f, -455.242706f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2007457, 7174030, 4, { 62.878109f, -88.000000f, -458.344788f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007457, 7207905, 4, { 57.755989f, -88.029297f, -476.778687f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2009378, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2009379, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2009380, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2009381, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2009382, 0, 4, { 61.997311f, -90.013000f, -475.028595f }, 0.991760f );
-      instance->registerEObj( "Unknown39", 2009383, 0, 4, { 62.000000f, -90.000000f, -475.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 7167443, 5, { -121.331703f, 65.000000f, 474.948303f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 62.058472f, -88.000000f, -489.921387f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -113.603500f, 65.000000f, 469.016510f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
index 47cae6ab..9323e209 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
@@ -10,57 +10,75 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2004341, 4797423, 4, { -368.761902f, 1.900000f, 20.220869f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004342, 4797424, 4, { -367.525085f, 1.900000f, 26.995680f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004343, 4797425, 4, { -371.746185f, 1.900000f, 32.584270f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004338, 4797426, 4, { -362.507385f, 1.900000f, 48.482269f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004339, 4797427, 4, { -355.184601f, 1.899924f, 47.853260f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004340, 4797428, 4, { -349.628601f, 1.899914f, 52.138340f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2004335, 4797429, 4, { -334.406708f, 1.899990f, 43.799950f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004336, 4797430, 4, { -336.870087f, 1.900000f, 37.104382f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004337, 4797431, 4, { -332.837006f, 1.900000f, 30.666309f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004344, 4797421, 4, { -341.024414f, 1.880961f, 15.649740f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004345, 4797419, 4, { -348.232788f, 1.900000f, 15.852800f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004346, 4797422, 4, { -353.540588f, 1.899946f, 11.553900f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4685106, 5, { 320.642792f, 3.735552f, 302.314301f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 220.874298f, 64.988159f, 13.046390f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2002872, 4685143, 4, { 220.800797f, 64.801514f, 13.539410f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2004050, 4685147, 4, { 219.745102f, 64.682983f, -33.707211f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2004049, 4685157, 4, { 219.958694f, 65.018677f, 47.991199f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2002735, 0, 4, { -60.079769f, 44.339741f, -124.669800f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2002872, 4685162, 4, { -61.990799f, 44.123230f, -125.263000f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2004051, 4685163, 4, { -98.791832f, 44.299992f, -124.783699f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2002735, 0, 4, { -315.480286f, 1.957748f, 33.432499f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2002872, 4685167, 4, { -314.885803f, 1.999334f, 32.833080f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 325.360901f, 6.499028f, 292.726807f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2004052, 4584550, 4, { 165.269104f, 52.440060f, -190.280197f }, 1.000000f );
-      instance->registerEObj( "Stonepedestal", 2004057, 4588393, 4, { 163.784195f, 52.706680f, -185.027100f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2004053, 4584553, 4, { -35.849411f, 44.986191f, -124.177696f }, 1.000000f );
-      instance->registerEObj( "Stonepedestal", 2004058, 4588617, 4, { -32.145729f, 44.996059f, -118.336502f }, 1.000000f );
-      instance->registerEObj( "Stonepedestal", 2004059, 4588610, 4, { -32.404221f, 44.937031f, -128.964096f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -326.989685f, 2.000000f, 43.114891f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2004074, 0, 4, { 191.947693f, 59.006939f, -163.899307f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2004075, 0, 4, { 194.472900f, 59.156731f, -165.022003f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2004076, 0, 4, { 196.017197f, 59.853050f, -161.548294f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2004077, 0, 4, { 198.798004f, 60.096630f, -162.115204f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2004078, 0, 4, { 199.929993f, 60.852970f, -158.189896f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2004079, 0, 4, { 203.014206f, 61.084290f, -158.453995f }, 1.000000f );
-      instance->registerEObj( "Wildbananatree", 2004062, 4706914, 4, { 206.036896f, 65.302567f, -27.040119f }, 0.991760f );
-      instance->registerEObj( "Wildbananatree", 2004063, 4722842, 4, { 199.376907f, 64.682983f, -11.735090f }, 0.991760f );
-      instance->registerEObj( "Wildbananatree", 2004064, 4706915, 4, { 205.968002f, 64.690811f, 3.866779f }, 0.991760f );
-      instance->registerEObj( "Wildbananatree", 2004065, 4706916, 4, { 236.652100f, 64.927116f, -28.061340f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2004066, 0, 4, { 206.655502f, 65.036621f, -25.903111f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2004067, 0, 4, { 200.604294f, 64.690804f, -10.987260f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2004068, 0, 4, { 206.716095f, 64.690811f, 3.346290f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2004069, 0, 4, { 235.736603f, 64.682983f, -27.115360f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2004060, 4585424, 4, { -218.153107f, -0.000002f, -6.398464f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2004061, 4585624, 4, { -307.270905f, 4.409851f, 14.023010f }, 0.991760f );
-      instance->registerEObj( "Wildbananatree", 2004070, 4722840, 4, { 241.380005f, 64.956383f, -12.841170f }, 1.000000f );
-      instance->registerEObj( "Wildbananatree", 2004071, 4706917, 4, { 234.644501f, 64.824364f, 2.652663f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2004072, 0, 4, { 239.884903f, 64.690811f, -12.610960f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2004073, 0, 4, { 233.623596f, 64.760551f, 2.089992f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2004129, 0, 4, { -80.000000f, 44.200001f, -124.500000f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_btl_b0485", 2004341, 4797423, 4, { -368.761902f, 1.900000f, 20.220869f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_1", 2004342, 4797424, 4, { -367.525085f, 1.900000f, 26.995680f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_2", 2004343, 4797425, 4, { -371.746185f, 1.900000f, 32.584270f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_3", 2004338, 4797426, 4, { -362.507385f, 1.900000f, 48.482269f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_4", 2004339, 4797427, 4, { -355.184601f, 1.899924f, 47.853260f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_5", 2004340, 4797428, 4, { -349.628601f, 1.899914f, 52.138340f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_6", 2004335, 4797429, 4, { -334.406708f, 1.899990f, 43.799950f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_7", 2004336, 4797430, 4, { -336.870087f, 1.900000f, 37.104382f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_8", 2004337, 4797431, 4, { -332.837006f, 1.900000f, 30.666309f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_9", 2004344, 4797421, 4, { -341.024414f, 1.880961f, 15.649740f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_10", 2004345, 4797419, 4, { -348.232788f, 1.900000f, 15.852800f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "sgvf_w_btl_b0485_11", 2004346, 4797422, 4, { -353.540588f, 1.899946f, 11.553900f }, 1.000000f, -0.000000f ); 
+      // States -> omen fukidasi end_0f end_anm omen1 
+      instance->registerEObj( "Entrance", 2000182, 4685106, 5, { 320.642792f, 3.735552f, 302.314301f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { 220.874298f, 64.988159f, 13.046390f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4685143, 4, { 220.800797f, 64.801514f, 13.539410f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2004050, 4685147, 4, { 219.745102f, 64.682983f, -33.707211f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_w_transparent05", 2004049, 4685157, 4, { 219.958694f, 65.018677f, 47.991199f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { -60.079769f, 44.339741f, -124.669800f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4685162, 4, { -61.990799f, 44.123230f, -125.263000f }, 1.000000f, -1.570451f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004051, 4685163, 4, { -98.791832f, 44.299992f, -124.783699f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { -315.480286f, 1.957748f, 33.432499f }, 0.991760f, -1.184874f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4685167, 4, { -314.885803f, 1.999334f, 32.833080f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 325.360901f, 6.499028f, 292.726807f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2004052, 4584550, 4, { 165.269104f, 52.440060f, -190.280197f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Stonepedestal", 2004057, 4588393, 4, { 163.784195f, 52.706680f, -185.027100f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2004053, 4584553, 4, { -35.849411f, 44.986191f, -124.177696f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Stonepedestal_1", 2004058, 4588617, 4, { -32.145729f, 44.996059f, -118.336502f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Stonepedestal_2", 2004059, 4588610, 4, { -32.404221f, 44.937031f, -128.964096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -326.989685f, 2.000000f, 43.114891f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer", 2004074, 0, 4, { 191.947693f, 59.006939f, -163.899307f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_1", 2004075, 0, 4, { 194.472900f, 59.156731f, -165.022003f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_2", 2004076, 0, 4, { 196.017197f, 59.853050f, -161.548294f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_3", 2004077, 0, 4, { 198.798004f, 60.096630f, -162.115204f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_4", 2004078, 0, 4, { 199.929993f, 60.852970f, -158.189896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_5", 2004079, 0, 4, { 203.014206f, 61.084290f, -158.453995f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Wildbananatree", 2004062, 4706914, 4, { 206.036896f, 65.302567f, -27.040119f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wildbananatree_1", 2004063, 4722842, 4, { 199.376907f, 64.682983f, -11.735090f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wildbananatree_2", 2004064, 4706915, 4, { 205.968002f, 64.690811f, 3.866779f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wildbananatree_3", 2004065, 4706916, 4, { 236.652100f, 64.927116f, -28.061340f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2004066, 0, 4, { 206.655502f, 65.036621f, -25.903111f }, 0.991760f, -1.260904f ); 
+      instance->registerEObj( "unknown_6", 2004067, 0, 4, { 200.604294f, 64.690804f, -10.987260f }, 0.991760f, -0.736456f ); 
+      instance->registerEObj( "unknown_7", 2004068, 0, 4, { 206.716095f, 64.690811f, 3.346290f }, 0.991760f, -0.921409f ); 
+      instance->registerEObj( "unknown_8", 2004069, 0, 4, { 235.736603f, 64.682983f, -27.115360f }, 0.991760f, 0.613842f ); 
+      instance->registerEObj( "unknown_9", 2004060, 4585424, 4, { -218.153107f, -0.000002f, -6.398464f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2004061, 4585624, 4, { -307.270905f, 4.409851f, 14.023010f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wildbananatree_4", 2004070, 4722840, 4, { 241.380005f, 64.956383f, -12.841170f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Wildbananatree_5", 2004071, 4706917, 4, { 234.644501f, 64.824364f, 2.652663f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2004072, 0, 4, { 239.884903f, 64.690811f, -12.610960f }, 1.000000f, 0.600320f ); 
+      instance->registerEObj( "unknown_12", 2004073, 0, 4, { 233.623596f, 64.760551f, 2.089992f }, 1.000000f, 0.684586f ); 
+      instance->registerEObj( "unknown_13", 2004129, 0, 4, { -80.000000f, 44.200001f, -124.500000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
index 308f54be..521e7d51 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
@@ -10,33 +10,38 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -343.904602f, 7.822294f, 39.109711f }, 0.500000f );
-      instance->registerEObj( "Unknown1", 2002872, 6253922, 4, { -342.837006f, 6.196667f, 36.610142f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -360.775909f, 7.864089f, 68.887756f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2007257, 0, 4, { -350.992401f, 7.892528f, 56.902512f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2007258, 0, 4, { -354.052490f, 7.892528f, 54.626640f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007359, 0, 4, { -352.179810f, 7.927567f, 63.128880f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6245769, 5, { 322.891693f, 3.635096f, 313.253510f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.376587f, 5.844693f, 298.411591f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007025, 6235928, 4, { 307.237701f, 11.852150f, 276.543915f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007026, 6240784, 4, { 286.591309f, 19.136169f, 239.456497f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007027, 6239711, 4, { 306.575897f, 31.887329f, 181.107697f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007028, 6244799, 4, { 220.128998f, 63.509621f, 114.498398f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007156, 6249693, 4, { 308.747314f, 51.440979f, 125.671898f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007157, 6249706, 4, { 313.862793f, 51.438110f, 123.826897f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2007030, 6244507, 4, { 60.801022f, 85.774963f, -64.387527f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007034, 6232348, 4, { -35.186840f, 44.985500f, -123.946198f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007035, 6243845, 4, { -235.700607f, 0.607149f, 8.445139f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007036, 6243848, 4, { -284.362396f, 0.606121f, 11.598470f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007037, 6243852, 4, { -334.528412f, 1.244455f, 21.911160f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 222.214600f, 65.079712f, 11.398440f }, 1.400000f );
-      instance->registerEObj( "Unknown16", 2002872, 6253107, 4, { 221.229599f, 65.079712f, 13.333970f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2007072, 6241286, 4, { 198.155396f, 64.976288f, -11.912840f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2002735, 0, 4, { -60.746220f, 44.327389f, -123.705002f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2002872, 6253215, 4, { -58.605789f, 45.157280f, -124.548203f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007073, 6253218, 4, { -102.000999f, 45.915119f, -123.827301f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007260, 6252642, 4, { -76.831734f, 44.106281f, -123.152199f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -343.904602f, 7.822294f, 39.109711f }, 0.500000f, 0.498864f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6253922, 4, { -342.837006f, 6.196667f, 36.610142f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -360.775909f, 7.864089f, 68.887756f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer", 2007257, 0, 4, { -350.992401f, 7.892528f, 56.902512f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_1", 2007258, 0, 4, { -354.052490f, 7.892528f, 54.626640f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007359, 0, 4, { -352.179810f, 7.927567f, 63.128880f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6245769, 5, { 322.891693f, 3.635096f, 313.253510f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.376587f, 5.844693f, 298.411591f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007025, 6235928, 4, { 307.237701f, 11.852150f, 276.543915f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007026, 6240784, 4, { 286.591309f, 19.136169f, 239.456497f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007027, 6239711, 4, { 306.575897f, 31.887329f, 181.107697f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007028, 6244799, 4, { 220.128998f, 63.509621f, 114.498398f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2007156, 6249693, 4, { 308.747314f, 51.440979f, 125.671898f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2007157, 6249706, 4, { 313.862793f, 51.438110f, 123.826897f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_8", 2007030, 6244507, 4, { 60.801022f, 85.774963f, -64.387527f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2007034, 6232348, 4, { -35.186840f, 44.985500f, -123.946198f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2007035, 6243845, 4, { -235.700607f, 0.607149f, 8.445139f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2007036, 6243848, 4, { -284.362396f, 0.606121f, 11.598470f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2007037, 6243852, 4, { -334.528412f, 1.244455f, 21.911160f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2002735, 0, 4, { 222.214600f, 65.079712f, 11.398440f }, 1.400000f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6253107, 4, { 221.229599f, 65.079712f, 13.333970f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_14", 2007072, 6241286, 4, { 198.155396f, 64.976288f, -11.912840f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2002735, 0, 4, { -60.746220f, 44.327389f, -123.705002f }, 0.991760f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6253215, 4, { -58.605789f, 45.157280f, -124.548203f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2007073, 6253218, 4, { -102.000999f, 45.915119f, -123.827301f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_16", 2007260, 6252642, 4, { -76.831734f, 44.106281f, -123.152199f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
index ebcc7fc9..62bef405 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
@@ -10,68 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6891156, 4, { 280.110413f, -75.860001f, 341.057800f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 280.000000f, -75.860001f, 338.900696f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 280.000000f, -75.860001f, 375.299988f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 0, 4, { 280.179993f, -75.859993f, 363.578888f }, 1.000000f );
-      instance->registerEObj( "Pileofgold", 2007814, 0, 4, { 289.943695f, -75.859993f, 360.566986f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007815, 0, 4, { 279.957306f, -75.883118f, 375.295685f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { -110.000000f, 0.000003f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6886643, 4, { -108.904198f, 0.000003f, -0.184188f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 6886655, 4, { -147.474503f, 0.100000f, -0.110550f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 280.000000f, -90.771896f, 28.200001f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6795321, 4, { 294.636414f, -90.775902f, 64.530403f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007457, 6795322, 4, { 284.810699f, -90.771896f, 64.853622f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6795323, 4, { 275.195496f, -90.771896f, 64.375351f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6795324, 4, { 264.569000f, -90.771896f, 65.125214f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6795325, 4, { 295.691193f, -90.771896f, 55.563641f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6795326, 4, { 284.563385f, -90.771896f, 57.046230f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6795327, 4, { 274.879486f, -90.771896f, 57.698601f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6795328, 4, { 264.951508f, -90.771896f, 57.270260f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 6795329, 4, { 294.813904f, -90.771896f, 45.369381f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 6795330, 4, { 284.412811f, -90.775940f, 44.846191f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2007457, 6795331, 4, { 274.009003f, -90.771896f, 44.232479f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007457, 6795332, 4, { 264.546387f, -90.771896f, 44.505569f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007457, 6795333, 4, { 294.721802f, -90.771896f, 35.522999f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007457, 6795334, 4, { 284.550293f, -90.771896f, 35.573021f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007457, 6795335, 4, { 274.647095f, -90.775940f, 36.026489f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2007457, 6795336, 4, { 265.028992f, -90.771896f, 35.466030f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002872, 6972248, 4, { 279.929291f, -90.862122f, 25.802130f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2002872, 6972249, 4, { 279.425995f, -90.862122f, 73.752983f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007457, 6795811, 4, { -18.923059f, -4.000000f, -47.771740f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007457, 6795812, 4, { -82.884247f, 0.000003f, -0.161598f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007457, 6795813, 4, { -179.231201f, 4.000000f, -0.161991f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007812, 0, 4, { -60.365211f, -6.291489f, 11.147480f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2007812, 0, 4, { -60.697491f, -6.291489f, -12.243330f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2007812, 0, 4, { -64.355148f, -6.291490f, 11.308300f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2007812, 0, 4, { -64.521027f, -6.291490f, -11.570270f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007812, 0, 4, { -55.949509f, -6.291489f, 9.962895f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2007812, 0, 4, { -56.575081f, -6.291490f, -10.074280f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2007457, 6993778, 4, { -11.244300f, -5.961200f, -57.744499f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2007457, 6994112, 4, { -17.911301f, -5.796600f, -65.317596f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2007812, 0, 4, { -49.310871f, -6.291489f, 10.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2007812, 0, 4, { -49.310860f, -6.291490f, -10.674300f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2007457, 6795420, 4, { 248.664993f, -94.824402f, -117.732498f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2007457, 6795421, 4, { 279.489410f, -92.996399f, 3.845758f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2007457, 6795419, 4, { 280.175507f, -92.998596f, 93.664139f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2007813, 0, 4, { 248.706802f, -94.834801f, -131.982498f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2007813, 0, 4, { 286.988312f, -92.855598f, -10.582000f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2007813, 0, 4, { 273.011108f, -92.855598f, -10.581000f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2007813, 0, 4, { 279.995697f, -92.851196f, -21.638639f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2007813, 0, 4, { 279.987701f, -92.881706f, -7.278625f }, 0.991760f );
-      instance->registerEObj( "Unknown47", 2007457, 6795337, 4, { 279.713104f, -83.786652f, 143.480499f }, 0.991760f );
-      instance->registerEObj( "Unknown48", 2007457, 6795422, 4, { 280.061096f, -73.914101f, 313.413391f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2007457, 6795342, 4, { 289.140198f, -73.914101f, 284.393890f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2007457, 6795343, 4, { 288.888214f, -73.914200f, 303.585907f }, 1.000000f );
-      instance->registerEObj( "Unknown51", 2007457, 6795341, 4, { 271.105591f, -73.914101f, 284.355804f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2007457, 6795345, 4, { 271.048309f, -73.914200f, 302.845795f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2007457, 6795344, 4, { 289.058899f, -73.914101f, 291.958588f }, 1.000000f );
-      instance->registerEObj( "Unknown54", 2007457, 6795346, 4, { 288.715912f, -73.914299f, 310.894012f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2007457, 6795338, 4, { 271.824585f, -73.914101f, 292.335999f }, 1.000000f );
-      instance->registerEObj( "Unknown56", 2007457, 6795339, 4, { 271.103790f, -73.914299f, 311.710388f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6881046, 5, { 66.323036f, -6.000000f, -68.720047f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 49.699169f, -6.000000f, -60.817249f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
index 8ad6f89a..00ef14bb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
@@ -10,47 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Vanutotem", 2005373, 0, 4, { 171.495407f, 64.000000f, -17.861130f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005374, 0, 4, { 172.963303f, 64.000000f, -17.254971f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005375, 0, 4, { 173.628693f, 64.000000f, -16.836420f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005376, 0, 4, { 173.837097f, 64.000000f, -15.707030f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005377, 0, 4, { 172.736298f, 64.000000f, -15.517540f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005378, 0, 4, { 172.030807f, 64.000000f, -15.895150f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005379, 0, 4, { 171.188904f, 64.000000f, -16.423241f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005380, 0, 4, { 170.423996f, 64.000000f, -18.803040f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005381, 0, 4, { 169.871201f, 64.000000f, -17.785959f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005382, 0, 4, { 170.450607f, 64.000000f, -15.978460f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005383, 0, 4, { 169.593307f, 64.000000f, -15.827410f }, 1.000000f );
-      instance->registerEObj( "Vanutotem", 2005384, 0, 4, { 170.206100f, 64.000000f, -15.102260f }, 1.000000f );
-      instance->registerEObj( "Cloudaltar", 2005130, 5786938, 4, { -160.917892f, 5.000000f, 291.800598f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2005135, 5887646, 4, { -160.814896f, 4.989685f, 291.432007f }, 0.991760f );
-      instance->registerEObj( "Cloudaltar", 2005131, 5786940, 4, { -87.421448f, 21.000000f, 290.602692f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005136, 5887670, 4, { -97.348267f, 21.000000f, 290.468292f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005137, 5887709, 4, { -1.889378f, 43.351429f, 215.919601f }, 1.000000f );
-      instance->registerEObj( "Cloudaltar", 2005132, 5786943, 4, { -4.570463f, 44.541019f, 216.505707f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2002872, 5778078, 4, { 74.175919f, 38.000000f, 213.378998f }, 1.000000f );
-      instance->registerEObj( "Cloudaltar", 2005133, 5786946, 4, { 77.225830f, 37.979610f, 211.596802f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002872, 5789280, 4, { -5.153300f, 43.220901f, 215.814102f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002587, 0, 4, { -5.153300f, 43.138199f, 214.261093f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005137, 5887710, 4, { 79.964493f, 38.000000f, 209.654800f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005139, 5606925, 4, { 132.122696f, 55.455528f, 135.050995f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005140, 5606936, 4, { 142.889496f, 67.000000f, 67.840523f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002872, 5777608, 4, { 165.085007f, 63.500000f, 10.671380f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 5777614, 4, { 178.430206f, 64.000000f, -23.500389f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 163.308899f, 63.926491f, 9.173799f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2005142, 0, 4, { 177.194199f, 60.250000f, -155.280502f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 172.014893f, 58.670898f, -358.327606f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2002872, 5615523, 4, { 175.494003f, 59.281250f, -305.348297f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2002587, 0, 4, { 175.127701f, 59.281250f, -310.170197f }, 0.991760f );
-      instance->registerEObj( "Cloudaltar", 2005134, 5786958, 4, { 164.310806f, 60.349369f, -127.550201f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2005143, 5900091, 4, { 164.190903f, 61.358318f, -219.399506f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2005146, 5894450, 4, { 175.280396f, 59.281250f, -309.102112f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2005144, 5893679, 4, { 158.342804f, 60.440922f, -191.393906f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2005145, 5893776, 4, { 162.635193f, 59.999939f, -271.153412f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2005141, 5764461, 4, { 165.941803f, 60.440899f, -205.985107f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5614672, 5, { -195.491302f, -0.022185f, 305.059296f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -179.874603f, 2.417616f, 306.529602f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
index db1ae95c..15b36219 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
@@ -10,35 +10,42 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002718, 4378108, 4, { 88.730026f, 0.300000f, 69.993042f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002719, 0, 4, { 118.749496f, 0.300000f, 70.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -18.275600f, 193.987900f, 0.000000f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 42.000000f, 30.001560f, -31.911860f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002720, 4378115, 4, { 41.977539f, 30.001610f, -32.837688f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002723, 4391376, 4, { 23.849791f, 29.984011f, -56.015869f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 21.750000f, 90.008011f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002721, 4378121, 4, { 20.298759f, 90.000008f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002724, 4378123, 4, { -20.870550f, 90.000008f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 25.750000f, 194.136505f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002722, 4378127, 4, { 24.286779f, 194.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 76.644943f, 0.300000f, 66.422493f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002725, 4392603, 4, { -42.923710f, 29.984011f, -56.504211f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2002726, 4392604, 4, { -19.028080f, 36.148560f, -22.110350f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2002727, 4392605, 4, { 17.898800f, 44.388432f, -22.415590f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2002728, 4392606, 4, { 26.840580f, 52.091381f, 10.055660f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2002729, 4404469, 4, { -41.947140f, 29.984011f, 55.924320f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 0.000000f, 140.000000f, 21.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002744, 4390583, 4, { 0.213522f, 139.893402f, 22.075270f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2002743, 4390585, 4, { -0.033084f, 140.000000f, -20.026180f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2002742, 4390546, 4, { -11.093380f, 1.388489f, -23.453131f }, 0.991760f );
-      instance->registerEObj( "Aethervalve", 2002730, 4392611, 4, { -0.015320f, 119.981598f, -32.913761f }, 0.991760f );
-      instance->registerEObj( "Aethervalve", 2002731, 4392612, 4, { -0.076355f, 139.970901f, 42.618408f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2002787, 4395239, 4, { -38.345951f, 60.593510f, 21.011600f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2003436, 4406574, 4, { 41.813019f, 29.999941f, -29.969271f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2003032, 0, 4, { 42.000000f, 30.000771f, -59.314499f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2003033, 0, 4, { 42.000000f, 30.000771f, -56.244320f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2003034, 0, 4, { 42.000000f, 30.000771f, -51.724258f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2002718, 4378108, 5, { 88.730026f, 0.300000f, 69.993042f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_0", 2002719, 0, 4, { 118.749496f, 0.300000f, 70.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -18.275600f, 193.987900f, 0.000000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { 42.000000f, 30.001560f, -31.911860f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2002720, 4378115, 4, { 41.977539f, 30.001610f, -32.837688f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002723, 4391376, 4, { 23.849791f, 29.984011f, -56.015869f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2002735, 0, 4, { 21.750000f, 90.008011f, 0.000000f }, 1.000000f, -1.570796f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002721, 4378121, 4, { 20.298759f, 90.000008f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002724, 4378123, 4, { -20.870550f, 90.000008f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_4", 2002735, 0, 4, { 25.750000f, 194.136505f, 0.000000f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002722, 4378127, 4, { 24.286779f, 194.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 76.644943f, 0.300000f, 66.422493f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2002725, 4392603, 4, { -42.923710f, 29.984011f, -56.504211f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_6", 2002726, 4392604, 4, { -19.028080f, 36.148560f, -22.110350f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_7", 2002727, 4392605, 4, { 17.898800f, 44.388432f, -22.415590f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_8", 2002728, 4392606, 4, { 26.840580f, 52.091381f, 10.055660f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2002729, 4404469, 4, { -41.947140f, 29.984011f, 55.924320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2002735, 0, 4, { 0.000000f, 140.000000f, 21.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002744, 4390583, 4, { 0.213522f, 139.893402f, 22.075270f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002743, 4390585, 4, { -0.033084f, 140.000000f, -20.026180f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_11", 2002742, 4390546, 4, { -11.093380f, 1.388489f, -23.453131f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Aethervalve", 2002730, 4392611, 4, { -0.015320f, 119.981598f, -32.913761f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Aethervalve_1", 2002731, 4392612, 4, { -0.076355f, 139.970901f, 42.618408f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2002787, 4395239, 4, { -38.345951f, 60.593510f, 21.011600f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_13", 2003436, 4406574, 4, { 41.813019f, 29.999941f, -29.969271f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2003032, 0, 4, { 42.000000f, 30.000771f, -59.314499f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2003033, 0, 4, { 42.000000f, 30.000771f, -56.244320f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2003034, 0, 4, { 42.000000f, 30.000771f, -51.724258f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
index bc2a51e9..56199728 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
@@ -10,33 +10,39 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 5963936, 4, { -1.480164f, 93.003777f, -23.788879f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -0.228943f, 93.016541f, -22.052860f }, 0.869751f );
-      instance->registerEObj( "Unknown2", 2002872, 5963943, 4, { 21.051910f, 90.039482f, -0.641622f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006551, 0, 4, { 6.820740f, 90.135010f, -0.717224f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002872, 5963945, 4, { 20.515039f, 30.001440f, -55.973820f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 21.438900f, 30.001369f, -55.832821f }, 0.869751f );
-      instance->registerEObj( "Unknown6", 2002872, 5963948, 4, { 60.977539f, 30.000811f, -56.096581f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2006563, 0, 4, { 42.160641f, 29.984011f, -60.227360f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2002872, 5963970, 4, { -95.386551f, -5.551003f, -272.570099f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2002735, 0, 4, { -95.423126f, -5.551003f, -271.765991f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5963633, 5, { 39.155338f, 189.990097f, -2.100519f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 39.255451f, 188.130096f, -17.964260f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -95.418854f, -5.446677f, -305.998199f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2006461, 5961306, 4, { -42.092682f, 170.000000f, 1.321840f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006462, 5961309, 4, { 0.142279f, 160.000000f, 41.544201f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006463, 5965424, 4, { 1.331733f, 158.160294f, 25.044350f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006464, 5964060, 4, { 0.116699f, 139.949997f, -18.497431f }, 1.000000f );
-      instance->registerEObj( "Candlekeepkey", 2006467, 0, 4, { 13.504210f, 29.984011f, -54.795170f }, 0.991760f );
-      instance->registerEObj( "Lockeddoor", 2006470, 5955784, 4, { 15.219990f, 31.371090f, -56.250301f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006465, 5963843, 4, { 32.070061f, 72.230629f, -55.058460f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006466, 5965844, 4, { -0.253021f, 39.999969f, -21.544781f }, 1.000000f );
-      instance->registerEObj( "Port3526", 2006471, 5960472, 4, { -16.647579f, 7.686357f, -153.002304f }, 0.991760f );
-      instance->registerEObj( "Port3524", 2006472, 5960468, 4, { -94.266373f, -0.598898f, -227.302200f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2006528, 5967682, 4, { 10.338900f, 10.519330f, -124.110298f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006564, 5967692, 4, { -3.081049f, 5.016401f, -212.859802f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2002618, 5993225, 4, { 0.231439f, 90.039482f, -21.072599f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5963936, 4, { -1.480164f, 93.003777f, -23.788879f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -0.228943f, 93.016541f, -22.052860f }, 0.869751f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5963943, 4, { 21.051910f, 90.039482f, -0.641622f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2006551, 0, 4, { 6.820740f, 90.135010f, -0.717224f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5963945, 4, { 20.515039f, 30.001440f, -55.973820f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { 21.438900f, 30.001369f, -55.832821f }, 0.869751f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5963948, 4, { 60.977539f, 30.000811f, -56.096581f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_3", 2006563, 0, 4, { 42.160641f, 29.984011f, -60.227360f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5963970, 4, { -95.386551f, -5.551003f, -272.570099f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_4", 2002735, 0, 4, { -95.423126f, -5.551003f, -271.765991f }, 1.000000f, -0.005750f ); 
+      instance->registerEObj( "Entrance", 2000182, 5963633, 5, { 39.155338f, 189.990097f, -2.100519f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 39.255451f, 188.130096f, -17.964260f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -95.418854f, -5.446677f, -305.998199f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2006461, 5961306, 4, { -42.092682f, 170.000000f, 1.321840f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2006462, 5961309, 4, { 0.142279f, 160.000000f, 41.544201f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2006463, 5965424, 4, { 1.331733f, 158.160294f, 25.044350f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2006464, 5964060, 4, { 0.116699f, 139.949997f, -18.497431f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Candlekeepkey", 2006467, 0, 4, { 13.504210f, 29.984011f, -54.795170f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Lockeddoor", 2006470, 5955784, 4, { 15.219990f, 31.371090f, -56.250301f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2006465, 5963843, 4, { 32.070061f, 72.230629f, -55.058460f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2006466, 5965844, 4, { -0.253021f, 39.999969f, -21.544781f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Port3526", 2006471, 5960472, 4, { -16.647579f, 7.686357f, -153.002304f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Port3524", 2006472, 5960468, 4, { -94.266373f, -0.598898f, -227.302200f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_11", 2006528, 5967682, 4, { 10.338900f, 10.519330f, -124.110298f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2006564, 5967692, 4, { -3.081049f, 5.016401f, -212.859802f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 5993225, 4, { 0.231439f, 90.039482f, -21.072599f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
index 174a6181..829d781e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
@@ -10,33 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6038834, 4, { -14.984150f, -350.000000f, -10.860330f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 10.788090f, -350.026703f, 7.522644f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -16.401690f, -350.000000f, -11.633360f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2006520, 6041801, 4, { 113.481300f, 2.975464f, 19.363649f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2006521, 6047538, 4, { 67.640343f, 0.000000f, -71.112350f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2006586, 0, 4, { 85.017906f, -0.020000f, -58.585030f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2006522, 5966533, 4, { -125.780197f, -12.375120f, -188.891495f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2006523, 6037786, 4, { -234.627304f, -29.692921f, -182.589401f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2006594, 6068325, 4, { -244.373505f, -37.105370f, -163.858002f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006524, 6046538, 4, { -102.066101f, -349.342285f, 55.198681f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2006526, 6046053, 4, { -86.535728f, -356.521301f, -4.785355f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2006527, 6046055, 4, { -104.847900f, -356.059692f, 4.146202f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006525, 6046572, 4, { -47.545761f, -359.815613f, -33.600189f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006596, 6058396, 4, { -262.334015f, -39.551819f, -111.790802f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006597, 6077036, 4, { -248.226898f, -46.000000f, -133.086304f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006598, 6077035, 4, { -283.791992f, -46.000000f, -122.796700f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006609, 6084794, 4, { -242.938904f, -44.861469f, -84.336670f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2002872, 6037810, 4, { 15.731990f, 3.000000f, -89.860413f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2002735, 0, 4, { 18.234501f, 3.097534f, -90.928528f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2006531, 6037814, 4, { -17.876730f, 3.000000f, -82.649872f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2002872, 6041100, 4, { -245.545395f, -36.853828f, -164.052200f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2002735, 0, 4, { -245.869705f, -36.958050f, -162.887695f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2006532, 6082449, 4, { -260.975098f, -44.815800f, -108.476402f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2006566, 0, 4, { -263.891296f, -44.889751f, -114.578796f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6034530, 5, { 0.231333f, 0.000002f, 140.623901f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 4.219861f, 0.000001f, 131.545197f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
index 0af04395..d1e24153 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@@ -1,76 +1,67 @@
 #include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
-#include <Actor/EventObject.h>
 
 class Sastasha : public InstanceContentScript
 {
-private:
-   static void memoOnTalk( Entity::Player& player, Entity::EventObjectPtr object, InstanceContentPtr instance, uint64_t actorId )
-   {
-
-   }
-
-   static void switchOnTalk( Entity::Player& player, Entity::EventObjectPtr object, InstanceContentPtr instance, uint64_t actorId )
-   {
-      object->setState( 7 );
-
-      instance->getEObjByName( "Hiddendoor" )->setState( 7 );
-   }
-
 public:
    Sastasha() : InstanceContentScript( 4 )
    { }
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000211, 0, 4, { 367.827087f, 47.400051f, -226.694305f }, 4.714991f );
-      instance->registerEObj( "Unknown1", 2001504, 4323996, 4, { 94.597588f, 26.865030f, -68.584061f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2001505, 4323997, 4, { 95.510597f, 26.620729f, -67.853653f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001506, 3653862, 4, { -9.239832f, 24.789940f, 35.778252f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2001507, 4035750, 4, { -2.841087f, 23.114571f, 38.090420f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2001539, 3653864, 4, { -158.560898f, 8.099012f, 214.344803f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2001540, 4056793, 4, { -163.598602f, 8.026373f, 214.030106f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2001508, 4236989, 4, { -303.983612f, 5.576412f, 276.214111f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001509, 4236990, 4, { -305.302002f, 5.542851f, 275.750885f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4096706, 5, { 361.881714f, 46.092751f, -225.181305f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 344.705688f, 43.781551f, -217.365997f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -314.279114f, 5.630589f, 348.735596f }, 0.900235f );
-      instance->registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f }, 0.930753f );
-      instance->registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f }, 0.930753f );
-      instance->registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f }, 0.991789f );
+      instance->registerEObj( "unknown_0", 2000211, 0, 4, { 367.827087f, 47.400051f, -226.694305f }, 4.714991f, 0.000432f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2001504, 4323996, 4, { 94.597588f, 26.865030f, -68.584061f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0249", 2001505, 4323997, 4, { 95.510597f, 26.620729f, -67.853653f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "unknown_1", 2001506, 3653862, 4, { -9.239832f, 24.789940f, 35.778252f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2001507, 4035750, 4, { -2.841087f, 23.114571f, 38.090420f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "unknown_2", 2001539, 3653864, 4, { -158.560898f, 8.099012f, 214.344803f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001540, 4056793, 4, { -163.598602f, 8.026373f, 214.030106f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgpl_s1d1_bosswall", 2001508, 4236989, 4, { -303.983612f, 5.576412f, 276.214111f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1d1_bossline", 2001509, 4236990, 4, { -305.302002f, 5.542851f, 275.750885f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4096706, 5, { 361.881714f, 46.092751f, -225.181305f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 344.705688f, 43.781551f, -217.365997f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -314.279114f, 5.630589f, 348.735596f }, 0.900235f, 0.000336f ); 
+      instance->registerEObj( "Bluecoralformation", 2000213, 3668215, 4, { 75.869797f, 35.101421f, -32.537209f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "Redcoralformation", 2000214, 3668214, 4, { 88.769371f, 31.135691f, -40.869640f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "Greencoralformation", 2000215, 3668216, 4, { 64.988159f, 33.672821f, -56.690559f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f, -1.396264f ); 
+      instance->registerEObj( "Hiddendoor", 2000217, 3653517, 4, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f, -2.007129f ); 
+      instance->registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f, -0.862350f ); 
+      // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close 
+      instance->registerEObj( "sgbg_s1d1_p1_shel1", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f }, 0.991789f, 0.481030f ); 
+      // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close 
+      instance->registerEObj( "sgbg_s1d1_p1_shel1_1", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f }, 0.991789f, 1.471638f ); 
+      // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close 
+      instance->registerEObj( "sgbg_s1d1_p1_shel1_2", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f }, 0.991789f, -0.375975f ); 
+      // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close 
+      instance->registerEObj( "sgbg_s1d1_p1_shel1_3", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f }, 1.000000f, 0.020540f ); 
+      // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close 
+      instance->registerEObj( "sgbg_s1d1_p1_shel1_4", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f }, 0.991789f, -0.618915f ); 
+      // States -> vf_kai_off vf_kai_on vf_kai_pop close_open open_close 
+      instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
+      instance->registerEObj( "Bloodymemo_1", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
+      instance->registerEObj( "Bloodymemo_2", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f, -0.898762f ); 
+      instance->registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f, -2.007129f ); 
+      instance->registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f, -2.007129f ); 
+      instance->registerEObj( "TheHole", 2000232, 3656260, 4, { -36.000000f, 16.500000f, 163.300003f }, 1.000000f, 1.047198f ); 
+      instance->registerEObj( "Rambadedoor_1", 2000236, 3655908, 4, { -190.000000f, 7.000000f, 252.000000f }, 1.000000f, -2.443461f ); 
+      instance->registerEObj( "unknown_3", 2000235, 3656262, 4, { -156.500000f, 8.600000f, 252.500000f }, 1.000000f, 1.134464f ); 
+      instance->registerEObj( "WaveriderGatekey", 2000255, 0, 4, { -95.515343f, 20.000000f, 177.197800f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "KeytotheHole", 2000256, 0, 4, { -38.076599f, 17.232731f, 158.839401f }, 0.991760f, 1.561760f ); 
+      instance->registerEObj( "Captainsquarterskey", 2000250, 0, 4, { -100.625000f, 15.600010f, 137.150696f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1d1_sghit_ctrl", 2000223, 4200832, 4, { -24.018980f, 18.475060f, 111.404900f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Unnaturalripples", 2000405, 3992454, 4, { -301.973206f, 6.500000f, 300.029388f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Unnaturalripples_1", 2000406, 3992452, 4, { -302.037598f, 6.500000f, 336.047302f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Unnaturalripples_2", 2000407, 3992449, 4, { -338.036499f, 6.500000f, 300.206512f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Unnaturalripples_3", 2000408, 3992453, 4, { -337.929596f, 6.500000f, 335.975311f }, 1.000000f, 0.000000f ); 
 
-      auto switchObj = instance->registerEObj( "Inconspicuousswitch", 2000216, 3653858, 4, { 62.907951f, 33.969521f, -31.172279f }, 1.000000f );
-      switchObj->setOnTalkHandler( switchOnTalk );
-
-      instance->registerEObj( "Hiddendoor", 2000217, 3653517, 5, { 59.000000f, 32.000000f, -35.000000f }, 1.000000f );
-      instance->registerEObj( "Giantclam", 2000222, 4208408, 4, { 181.170303f, 32.104599f, -128.069000f }, 0.991789f );
-      instance->registerEObj( "Unknown10", 2000260, 4208409, 4, { 166.318695f, 30.735420f, -128.312103f }, 0.991789f );
-      instance->registerEObj( "Unknown11", 2000261, 4208410, 4, { 158.800598f, 28.586321f, -76.340927f }, 0.991789f );
-      instance->registerEObj( "Unknown12", 2000262, 4208411, 4, { 125.463402f, 29.260550f, -51.934608f }, 0.991789f );
-      instance->registerEObj( "Unknown13", 2000263, 4208412, 4, { 126.070198f, 28.913260f, -99.908722f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000264, 4208413, 4, { 97.055313f, 27.081551f, -70.264381f }, 0.991789f );
-
-      auto memo = instance->registerEObj( "Bloodymemo", 2000212, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
-      memo->setOnTalkHandler( memoOnTalk );
-      //instance->registerEObj( "Bloodymemo", 2001548, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
-      //instance->registerEObj( "Bloodymemo", 2001549, 0, 4, { 320.812988f, 47.862450f, -130.776306f }, 0.600000f );
-
-      instance->registerEObj( "Rambadedoor", 2000225, 3653865, 4, { -35.299999f, 24.000000f, 60.799999f }, 1.000000f );
-      instance->registerEObj( "Captainsquarters", 2000227, 3687697, 4, { -95.044670f, 20.513069f, 172.039597f }, 0.991789f );
-      instance->registerEObj( "WaveriderGate", 2000231, 3655909, 4, { -130.600006f, 16.000000f, 156.800003f }, 1.000000f );
-      instance->registerEObj( "TheHole", 2000232, 3656260, 4, { -36.000000f, 16.500000f, 163.300003f }, 1.000000f );
-      instance->registerEObj( "Rambadedoor", 2000236, 3655908, 4, { -190.000000f, 7.000000f, 252.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2000235, 3656262, 4, { -156.500000f, 8.600000f, 252.500000f }, 1.000000f );
-      instance->registerEObj( "WaveriderGatekey", 2000255, 0, 4, { -95.515343f, 20.000000f, 177.197800f }, 1.000000f );
-      instance->registerEObj( "KeytotheHole", 2000256, 0, 4, { -38.076599f, 17.232731f, 158.839401f }, 0.991760f );
-      instance->registerEObj( "Captainsquarterskey", 2000250, 0, 4, { -100.625000f, 15.600010f, 137.150696f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2000223, 4200832, 4, { -24.018980f, 18.475060f, 111.404900f }, 1.000000f );
-      instance->registerEObj( "Unnaturalripples", 2000405, 3992454, 4, { -301.973206f, 6.500000f, 300.029388f }, 0.991789f );
-      instance->registerEObj( "Unnaturalripples", 2000406, 3992452, 4, { -302.037598f, 6.500000f, 336.047302f }, 1.000000f );
-      instance->registerEObj( "Unnaturalripples", 2000407, 3992449, 4, { -338.036499f, 6.500000f, 300.206512f }, 0.991789f );
-      instance->registerEObj( "Unnaturalripples", 2000408, 3992453, 4, { -337.929596f, 6.500000f, 335.975311f }, 1.000000f );
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
@@ -83,4 +74,4 @@ public:
 
    }
 
-};
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
index 581efac1..ab41e16d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
@@ -10,42 +10,47 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 157.165298f, 14.000000f, -65.283813f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 4887881, 4, { 157.156601f, 14.074050f, -62.918228f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 4887882, 4, { 143.947693f, 14.031430f, -75.422539f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { -103.378998f, 15.750010f, 113.646400f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002872, 4887934, 4, { -102.988998f, 14.900710f, 111.903198f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 4868757, 4, { -120.026100f, 15.610280f, 152.360199f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -300.099213f, 5.569519f, 278.309296f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -326.124603f, 5.082251f, 320.072388f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004421, 4769863, 4, { 228.091507f, 40.730598f, -164.119293f }, 1.000000f );
-      instance->registerEObj( "Drainagepump", 2004406, 4768296, 4, { 179.233200f, 33.911160f, -25.225599f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004405, 4768239, 4, { 164.693695f, 26.418791f, -51.467159f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004407, 4877642, 4, { 116.227898f, 13.992490f, -60.624149f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2004408, 4867860, 4, { 94.502289f, 14.098320f, -72.764816f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004409, 4867859, 4, { 61.426201f, 16.933029f, -87.107803f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004410, 4878592, 4, { -14.773780f, 12.568780f, -21.590240f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004411, 4878584, 4, { -34.366249f, 12.620500f, -10.794950f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2004412, 4878593, 4, { -38.197849f, 12.744050f, -32.694260f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2004422, 4770074, 4, { -47.051659f, 12.731530f, -15.329430f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2004413, 4878605, 4, { -75.129097f, 7.724828f, -3.396252f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2004414, 4878604, 4, { -67.776993f, 7.424381f, 10.125570f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2004415, 4878603, 4, { -74.879089f, 7.540010f, 24.726391f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2004416, 4878609, 4, { -92.286110f, 7.701883f, 26.123421f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2004417, 4878523, 4, { -103.974098f, 8.528216f, 17.928379f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2004418, 4878606, 4, { -107.137001f, 7.762873f, 7.250639f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2004419, 4878607, 4, { -97.134842f, 7.622185f, -4.976304f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2004420, 4878608, 4, { -83.913422f, 7.926591f, -9.813313f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2004423, 4770075, 4, { -84.640503f, 7.804197f, 29.907909f }, 1.000000f );
-      instance->registerEObj( "DoortoDeadMansDrink", 2004424, 4765267, 4, { -96.240341f, 19.268089f, 87.404861f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2004425, 4761283, 4, { -188.014496f, 7.483281f, 252.162704f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2004426, 4762024, 4, { -299.676086f, 5.576687f, 280.853699f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2004429, 0, 4, { -302.662689f, 5.569519f, 269.489502f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2004441, 4765263, 4, { -130.635300f, 16.327169f, 156.933502f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2004428, 4890021, 4, { -295.493286f, 5.576687f, 275.610901f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4878710, 5, { 347.674713f, 44.019909f, -221.552002f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.774994f, 44.119980f, -229.481705f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { 157.165298f, 14.000000f, -65.283813f }, 1.000000f, 0.443513f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4887881, 4, { 157.156601f, 14.074050f, -62.918228f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4887882, 4, { 143.947693f, 14.031430f, -75.422539f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { -103.378998f, 15.750010f, 113.646400f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4887934, 4, { -102.988998f, 14.900710f, 111.903198f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002872, 4868757, 4, { -120.026100f, 15.610280f, 152.360199f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2002735, 0, 4, { -300.099213f, 5.569519f, 278.309296f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -326.124603f, 5.082251f, 320.072388f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2004421, 4769863, 4, { 228.091507f, 40.730598f, -164.119293f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Drainagepump", 2004406, 4768296, 4, { 179.233200f, 33.911160f, -25.225599f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2004405, 4768239, 4, { 164.693695f, 26.418791f, -51.467159f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2004407, 4877642, 4, { 116.227898f, 13.992490f, -60.624149f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_7", 2004408, 4867860, 4, { 94.502289f, 14.098320f, -72.764816f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2004409, 4867859, 4, { 61.426201f, 16.933029f, -87.107803f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2004410, 4878592, 4, { -14.773780f, 12.568780f, -21.590240f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2004411, 4878584, 4, { -34.366249f, 12.620500f, -10.794950f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2004412, 4878593, 4, { -38.197849f, 12.744050f, -32.694260f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2004422, 4770074, 4, { -47.051659f, 12.731530f, -15.329430f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2004413, 4878605, 4, { -75.129097f, 7.724828f, -3.396252f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2004414, 4878604, 4, { -67.776993f, 7.424381f, 10.125570f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2004415, 4878603, 4, { -74.879089f, 7.540010f, 24.726391f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2004416, 4878609, 4, { -92.286110f, 7.701883f, 26.123421f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2004417, 4878523, 4, { -103.974098f, 8.528216f, 17.928379f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2004418, 4878606, 4, { -107.137001f, 7.762873f, 7.250639f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2004419, 4878607, 4, { -97.134842f, 7.622185f, -4.976304f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2004420, 4878608, 4, { -83.913422f, 7.926591f, -9.813313f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2004423, 4770075, 4, { -84.640503f, 7.804197f, 29.907909f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "DoortoDeadMansDrink", 2004424, 4765267, 4, { -96.240341f, 19.268089f, 87.404861f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2004425, 4761283, 4, { -188.014496f, 7.483281f, 252.162704f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_23", 2004426, 4762024, 4, { -299.676086f, 5.576687f, 280.853699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2004429, 0, 4, { -302.662689f, 5.569519f, 269.489502f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_25", 2004441, 4765263, 4, { -130.635300f, 16.327169f, 156.933502f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_board_col_on_off", 2004428, 4890021, 4, { -295.493286f, 5.576687f, 275.610901f }, 1.000000f, 0.000000f ); 
+      // States -> col_on col_off 
+      instance->registerEObj( "Entrance", 2000182, 4878710, 5, { 347.674713f, 44.019909f, -221.552002f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 328.774994f, 44.119980f, -229.481705f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
index 6c3878cf..069956f0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
@@ -10,49 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 6526609, 5, { 8.208527f, 11.171570f, 362.661407f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 12.390300f, 9.221273f, 350.790100f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6709633, 4, { 0.322443f, 45.921879f, -411.857788f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -0.011370f, 45.921879f, -412.896698f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.069154f, 45.921871f, -447.611115f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2008110, 6865017, 4, { -0.060144f, 45.921879f, -430.535889f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6890670, 4, { 5.646293f, 45.921879f, -440.096588f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6709518, 4, { -0.364792f, 18.299490f, 91.107010f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 0.033326f, 18.500010f, 89.883667f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007771, 6709586, 4, { -0.180471f, 18.500010f, 50.377258f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2008311, 0, 4, { -7.074059f, 18.500019f, 72.067329f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2008312, 0, 4, { 5.212873f, 18.500019f, 72.435066f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 6709598, 4, { 0.399389f, 26.954840f, -187.217804f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007772, 6709615, 4, { -17.157890f, 27.250010f, -208.294098f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002735, 0, 4, { 0.044392f, 27.249910f, -188.679199f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2008106, 6869249, 4, { -8.237946f, 27.250010f, -216.909500f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2008107, 6869206, 4, { -7.564978f, 27.250010f, -199.660095f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2008108, 6869244, 4, { 8.748951f, 27.249981f, -199.725601f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2008109, 6869228, 4, { 8.554644f, 27.250010f, -216.964706f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007745, 6496157, 4, { 6.118062f, 6.997511f, 335.203186f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2007746, 6502056, 4, { 29.832279f, -1.756603f, 291.307404f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007747, 6502057, 4, { 0.594021f, -3.646973f, 227.895996f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2007748, 6502133, 4, { 19.059891f, -3.462188f, 230.198303f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007749, 6502058, 4, { -3.533240f, -5.778060f, 244.420105f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007750, 6502145, 4, { -55.424740f, 7.160790f, 138.440201f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007751, 6502143, 4, { -40.800652f, 6.339986f, 152.161407f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007752, 6502138, 4, { -42.255699f, 6.735332f, 144.687607f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007762, 6502139, 4, { -58.166401f, 3.768957f, 197.653702f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007763, 6502141, 4, { -46.675800f, 6.647403f, 136.313400f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007764, 0, 4, { -25.192690f, 6.973328f, 142.992203f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2007753, 6502709, 4, { -9.730975f, -4.657778f, 229.435501f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007754, 6502794, 4, { -19.627199f, 7.090509f, 140.629501f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2007767, 6526733, 4, { -52.219410f, 6.701191f, 142.932297f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2007770, 6514679, 4, { 0.421847f, 21.000000f, 23.917980f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2007768, 6708902, 4, { -42.045250f, 6.286057f, 150.394806f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007769, 6708901, 4, { -56.005989f, 6.588723f, 144.949600f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2007755, 6504391, 4, { 0.527385f, 26.000010f, -18.338779f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2007756, 6504406, 4, { 0.118717f, 26.000010f, -49.912861f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2007757, 6504429, 4, { 0.465194f, 26.078131f, -80.333969f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2007758, 6504452, 4, { -0.073714f, 26.078131f, -165.829300f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2007759, 6517284, 4, { 9.887736f, 30.921881f, -285.783295f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2007760, 6517285, 4, { 0.046282f, 40.921879f, -372.485901f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
index 9158a14d..a55ebaee 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
@@ -10,40 +10,53 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -25.554501f, 40.000000f, 65.525902f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 4729361, 4, { -29.985430f, 40.000000f, 65.539711f }, 1.000000f );
-      instance->registerEObj( "DoortoSilence", 2004203, 4680394, 4, { 57.114368f, 4.480070f, -45.937630f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004204, 4682554, 4, { 40.009041f, 0.491693f, -60.195160f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004206, 4725471, 4, { 32.621071f, -4.715674f, -117.578201f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004206, 4731431, 4, { 5.652817f, -1.779197f, -107.755600f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004208, 4895362, 4, { -30.982800f, -10.047770f, -162.841003f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2004209, 4685130, 4, { -39.827599f, -10.619430f, -155.585907f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004210, 4895363, 4, { -53.244961f, 3.577940f, -135.326797f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004211, 4685137, 4, { -57.355659f, 4.520907f, -101.443703f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004212, 4731432, 4, { -50.192619f, 6.129761f, -94.793358f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004692, 5018298, 4, { 1.842873f, -9.975479f, -135.724899f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004214, 4680578, 4, { -76.946297f, 28.400000f, -25.080601f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004215, 4680579, 4, { -76.355118f, 28.400000f, -0.768542f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004216, 4680574, 4, { -71.720413f, 28.400000f, 2.866590f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2004217, 4680909, 4, { -59.031670f, 28.399969f, 6.586658f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2004218, 4680572, 4, { -46.184601f, 27.650000f, 1.393153f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2004219, 4680571, 4, { -41.333439f, 28.400000f, -9.966988f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2004220, 4680577, 4, { -81.969833f, 38.540291f, -11.185970f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2004221, 4680576, 4, { -82.257988f, 38.540291f, -0.033865f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2004222, 4680575, 4, { -73.807869f, 38.540279f, 8.961772f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2004223, 4680573, 4, { -44.264439f, 38.540291f, 9.105038f }, 1.000000f );
-      instance->registerEObj( "DoortoOblivion", 2004224, 4680395, 4, { -52.060501f, 40.000000f, 65.066193f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2002735, 0, 4, { 46.358002f, -2.246400f, -72.299896f }, 0.800000f );
-      instance->registerEObj( "Unknown22", 2002872, 4725552, 4, { 48.054039f, -2.500000f, -74.312141f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2004205, 4725555, 4, { 59.417969f, -1.480164f, -102.836304f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2004577, 4982369, 4, { 44.252331f, -2.500000f, -89.438400f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2002735, 0, 4, { -79.379898f, 10.614600f, -109.116402f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2002872, 4725659, 4, { -83.147453f, 10.501150f, -112.069199f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2004213, 4725660, 4, { -107.265800f, 10.450760f, -103.052803f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4725473, 5, { 116.416702f, -9.665442f, 114.240799f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 117.194199f, -11.854060f, 106.498703f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 18.403561f, 40.000000f, 67.026413f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -25.554501f, 40.000000f, 65.525902f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4729361, 4, { -29.985430f, 40.000000f, 65.539711f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "DoortoSilence", 2004203, 4680394, 4, { 57.114368f, 4.480070f, -45.937630f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004204, 4682554, 4, { 40.009041f, 0.491693f, -60.195160f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1d3_t2_ball1", 2004206, 4725471, 4, { 32.621071f, -4.715674f, -117.578201f }, 1.000000f, 0.000000f ); 
+      // States -> s_ball_def s_ball_anim 
+      instance->registerEObj( "sgbg_r1d3_t2_ball1_1", 2004206, 4731431, 4, { 5.652817f, -1.779197f, -107.755600f }, 1.000000f, 0.000000f ); 
+      // States -> s_ball_def s_ball_anim 
+      instance->registerEObj( "sgvf_r1d3_b0435", 2004208, 4895362, 4, { -30.982800f, -10.047770f, -162.841003f }, 1.000000f, 0.000000f ); 
+      // States -> wind_sw_anim wind_def wind_strong wind_ws_anim 
+      instance->registerEObj( "unknown_2", 2004209, 4685130, 4, { -39.827599f, -10.619430f, -155.585907f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_r1d3_b0435_1", 2004210, 4895363, 4, { -53.244961f, 3.577940f, -135.326797f }, 1.000000f, 0.000000f ); 
+      // States -> wind_sw_anim wind_def wind_strong wind_ws_anim 
+      instance->registerEObj( "unknown_3", 2004211, 4685137, 4, { -57.355659f, 4.520907f, -101.443703f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1d3_t2_ball1_2", 2004212, 4731432, 4, { -50.192619f, 6.129761f, -94.793358f }, 1.000000f, 0.000000f ); 
+      // States -> s_ball_def s_ball_anim 
+      instance->registerEObj( "sgvf_r1d3_b0435_2", 2004692, 5018298, 4, { 1.842873f, -9.975479f, -135.724899f }, 1.000000f, 0.000000f ); 
+      // States -> wind_sw_anim wind_def wind_strong wind_ws_anim 
+      instance->registerEObj( "unknown_4", 2004214, 4680578, 4, { -76.946297f, 28.400000f, -25.080601f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2004215, 4680579, 4, { -76.355118f, 28.400000f, -0.768542f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2004216, 4680574, 4, { -71.720413f, 28.400000f, 2.866590f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2004217, 4680909, 4, { -59.031670f, 28.399969f, 6.586658f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2004218, 4680572, 4, { -46.184601f, 27.650000f, 1.393153f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2004219, 4680571, 4, { -41.333439f, 28.400000f, -9.966988f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2004220, 4680577, 4, { -81.969833f, 38.540291f, -11.185970f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2004221, 4680576, 4, { -82.257988f, 38.540291f, -0.033865f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2004222, 4680575, 4, { -73.807869f, 38.540279f, 8.961772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2004223, 4680573, 4, { -44.264439f, 38.540291f, 9.105038f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "DoortoOblivion", 2004224, 4680395, 4, { -52.060501f, 40.000000f, 65.066193f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2002735, 0, 4, { 46.358002f, -2.246400f, -72.299896f }, 0.800000f, 0.554992f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4725552, 4, { 48.054039f, -2.500000f, -74.312141f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004205, 4725555, 4, { 59.417969f, -1.480164f, -102.836304f }, 0.991760f, 0.126302f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_r1d3_b0498", 2004577, 4982369, 4, { 44.252331f, -2.500000f, -89.438400f }, 1.000000f, 0.000000f ); 
+      // States -> ring_off ring_off_anim ring_pop ring_pop_anim 
+      instance->registerEObj( "unknown_15", 2002735, 0, 4, { -79.379898f, 10.614600f, -109.116402f }, 1.000000f, -1.195699f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4725659, 4, { -83.147453f, 10.501150f, -112.069199f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2004213, 4725660, 4, { -107.265800f, 10.450760f, -103.052803f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Entrance", 2000182, 4725473, 5, { 116.416702f, -9.665442f, 114.240799f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 117.194199f, -11.854060f, 106.498703f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 18.403561f, 40.000000f, 67.026413f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
index 5a2ecfa7..b8b0d15e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
@@ -10,28 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -142.306107f, 11.741690f, 188.300797f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 5777776, 4, { -146.759598f, 9.382987f, 191.177994f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 5777778, 4, { -126.024696f, 11.736150f, 144.580200f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 165.208603f, 137.478806f, -62.228100f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 5777792, 4, { 166.178696f, 137.607697f, -62.706631f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 5777793, 4, { 180.090302f, 138.237793f, -115.812103f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -112.464798f, 348.165985f, -368.176514f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002872, 5777990, 4, { -112.426399f, 348.165985f, -371.392487f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002872, 5777991, 4, { -89.965149f, 348.204498f, -416.112213f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -92.610641f, 348.164886f, -410.511993f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2005284, 5773453, 4, { -274.538086f, -4.016628f, 191.237701f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2005278, 5772621, 4, { -253.212296f, -2.894600f, 189.267303f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2005285, 5773460, 4, { -196.123306f, 3.106796f, 187.990906f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2005286, 5773461, 4, { -171.931305f, 2.815973f, 206.485794f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2005279, 5772623, 4, { -165.063995f, 4.074061f, 197.945007f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2005280, 5852453, 4, { 335.063385f, 114.335999f, -89.093300f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2005281, 5777403, 4, { 247.495102f, 126.954300f, -30.577419f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2005282, 5773504, 4, { -173.859894f, 324.834686f, -273.653503f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005283, 5773503, 4, { -191.639694f, 329.656799f, -321.158691f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5777084, 5, { -267.602997f, -18.376320f, 282.751190f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -278.421387f, -17.669189f, 277.700714f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
index 288bab0b..11c60590 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
@@ -10,49 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6610531, 4, { 171.484497f, 137.748795f, 239.483704f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 174.120697f, 137.590607f, 236.701706f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2007599, 6610540, 4, { 162.998398f, 137.748596f, 274.239502f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002872, 6613704, 4, { 299.153107f, 111.986000f, 138.189499f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 301.151306f, 112.000000f, 141.222107f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2007600, 6613798, 4, { 284.901794f, 112.000000f, 109.136398f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007648, 6621383, 4, { 128.328293f, 107.293800f, -303.903107f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007649, 0, 4, { 169.258698f, 106.695999f, -298.126007f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2007650, 0, 4, { 168.423599f, 108.900002f, -315.103485f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007651, 0, 4, { 167.744797f, 109.165802f, -335.555908f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002872, 6631462, 4, { 128.893707f, 107.000000f, -274.034393f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 127.962402f, 107.223801f, -277.597412f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2007706, 6653690, 4, { -198.779297f, 329.243896f, 33.463009f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2007706, 6653700, 4, { -206.605194f, 329.253998f, 59.786411f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2007706, 6653718, 4, { -190.572800f, 329.253998f, 54.758789f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2007706, 6653721, 4, { -169.511398f, 324.396088f, 88.214813f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2007706, 6653723, 4, { -154.978302f, 324.396088f, 84.108612f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2007706, 6653726, 4, { -115.709198f, 318.959412f, 108.811996f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2007735, 6572900, 4, { -188.843201f, 329.253998f, 66.614899f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007736, 6572901, 4, { -95.983841f, 318.012787f, 134.955994f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007765, 0, 4, { -166.002899f, 324.396088f, 99.648300f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2007785, 6735263, 4, { -113.389900f, 346.242401f, -11.429080f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2007784, 0, 4, { -185.825699f, 329.150208f, 67.756607f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007784, 0, 4, { -95.353699f, 317.812805f, 138.109406f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2007737, 6572914, 4, { 271.778503f, 120.866699f, 247.657700f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2007738, 6572915, 4, { 318.409912f, 114.000099f, 174.170197f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2007784, 0, 4, { 271.381592f, 121.015800f, 246.143295f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2007784, 0, 4, { 317.092896f, 114.000000f, 172.080200f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2007739, 6583747, 4, { 170.824707f, 125.108597f, -116.025803f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2007740, 6583766, 4, { 87.968140f, 114.976700f, -165.190399f }, 0.991760f );
-      instance->registerEObj( "Unknown30", 2007741, 6583828, 4, { 128.564804f, 107.608704f, -252.169403f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2007761, 0, 4, { 107.591301f, 114.427399f, -119.840599f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2007773, 6583797, 4, { 137.386398f, 120.578796f, -148.604599f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007774, 6583799, 4, { 91.874512f, 115.007202f, -129.728394f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2007775, 6648314, 4, { 79.667358f, 113.878098f, -201.079605f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2007776, 6648318, 4, { 104.478500f, 109.971703f, -225.310898f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2007785, 6735374, 4, { 202.686295f, 126.422096f, -89.904701f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2007784, 0, 4, { 87.159088f, 115.000000f, -167.944199f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2007784, 0, 4, { 128.283905f, 106.994301f, -255.937302f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6610262, 5, { -108.575996f, 348.171692f, -39.539310f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -115.366699f, 348.201599f, -26.746000f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 127.929398f, 107.364899f, -323.381989f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
index 379776ea..e3553cb1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
@@ -10,36 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6258645, 4, { 400.881195f, -19.484011f, -332.214996f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 400.118713f, -18.543800f, -338.582886f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007078, 6220718, 4, { -400.506195f, 0.390429f, 82.229874f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007079, 6220719, 4, { -400.289886f, 0.381470f, -77.470093f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007189, 0, 4, { -425.070587f, -0.015320f, 5.569519f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2007084, 6241486, 4, { 377.864990f, 0.390429f, 352.375702f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007087, 6242639, 4, { 399.851196f, -58.700001f, -128.611893f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007088, 6242640, 4, { 363.607697f, -38.700001f, -242.258194f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007089, 6242641, 4, { 400.331604f, -18.700001f, -336.562897f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007090, 6229304, 4, { 423.391998f, -40.024479f, -205.523697f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002872, 6258669, 4, { -400.654388f, 9.235634f, -135.696106f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007082, 6258670, 4, { -400.434387f, 8.000000f, -177.220200f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002735, 0, 4, { -400.177612f, 8.431900f, -137.820801f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007083, 6238460, 4, { -401.279297f, 9.299995f, -184.260300f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2002872, 6258680, 4, { 399.753113f, 9.358741f, 161.151505f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 400.071198f, 9.620000f, 156.602402f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007085, 6242340, 4, { 397.968506f, 9.664823f, 157.574600f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007086, 6241485, 4, { 398.938812f, 24.959961f, 85.423576f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007158, 6241490, 4, { 407.500000f, 24.959999f, 89.161400f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007159, 6241491, 4, { 407.500000f, 24.959999f, 99.161400f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007160, 6241492, 4, { 407.500000f, 24.959999f, 109.161400f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007161, 6241493, 4, { 407.500000f, 24.959999f, 119.161400f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007162, 6241489, 4, { 392.500000f, 24.959999f, 89.161400f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007163, 6241488, 4, { 392.500000f, 24.959999f, 99.161400f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007164, 6241487, 4, { 392.500000f, 24.959999f, 109.161400f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007165, 6241484, 4, { 392.500000f, 24.959999f, 119.161400f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6258660, 5, { -406.742615f, -8.000000f, 164.927795f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -393.089386f, -8.000000f, 150.811401f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 399.538910f, -50.000011f, -494.319092f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
index dcc496f0..0122c08c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
@@ -10,27 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 5754325, 4, { 346.791687f, 93.919189f, -178.606903f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2005233, 5754326, 4, { 317.558105f, 93.945251f, -180.372498f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 345.215607f, 93.945251f, -178.963303f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002872, 5795105, 4, { 40.665161f, 59.433842f, 65.873169f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2005234, 5795134, 4, { -14.039410f, 61.140190f, 54.695210f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002587, 0, 4, { 39.169510f, 59.433949f, 66.247253f }, 1.300000f );
-      instance->registerEObj( "Unknown6", 2002872, 5762428, 4, { 37.260880f, 148.068100f, -236.237595f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 35.001831f, 148.194504f, -233.032303f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005542, 0, 4, { 36.301151f, 148.393906f, -242.999893f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2006454, 0, 4, { 32.698120f, 148.397095f, -251.838501f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5724494, 5, { 136.459106f, 67.985649f, 171.436401f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 144.406906f, 67.985611f, 177.100906f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 21.307430f, 148.274002f, -283.827087f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2005222, 5685356, 4, { 267.117188f, 64.682983f, 47.219650f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2005223, 5685357, 4, { 358.511414f, 81.162720f, -120.381798f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2005224, 5821951, 4, { 131.793304f, 5.889650f, -103.881500f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2005225, 5821943, 4, { 50.821239f, 55.531479f, 63.561810f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2005438, 5851315, 4, { -77.756859f, 91.481842f, -15.425310f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2005439, 5851342, 4, { 82.891663f, 108.510201f, -49.804409f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005540, 5864523, 4, { 33.827099f, 134.430405f, -194.964005f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
index be2de5cb..65050a04 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
@@ -10,39 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -133.497498f, 394.924286f, -295.299713f }, 1.400000f );
-      instance->registerEObj( "Unknown1", 2002872, 5786705, 4, { -140.602203f, 394.529388f, -295.997314f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005310, 5698551, 4, { -81.047653f, 394.430786f, -296.243713f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2006038, 5891863, 4, { -103.765701f, 394.988708f, -312.957214f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2006039, 5891860, 4, { -102.201103f, 394.988708f, -278.118988f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 228.611694f, 225.066895f, 272.124695f }, 1.400000f );
-      instance->registerEObj( "Unknown6", 2002872, 5786711, 4, { 220.192200f, 224.639603f, 271.691895f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002872, 5786715, 4, { 265.170685f, 225.066895f, 271.760712f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 230.175598f, -96.457947f, -160.689804f }, 1.400000f );
-      instance->registerEObj( "Unknown9", 2002872, 5786724, 4, { 231.302200f, -96.512398f, -143.853394f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2006040, 5855034, 4, { 230.235901f, -96.457947f, -181.102600f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 230.936203f, -456.457886f, 65.952606f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 229.505203f, -456.329193f, 99.828033f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002872, 5859273, 4, { 229.632996f, -456.457886f, 93.179420f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007177, 6268147, 4, { 230.075500f, -456.357605f, 58.431438f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007178, 6275911, 4, { 230.467407f, -456.457886f, 79.306190f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007168, 0, 4, { 248.035400f, 225.116302f, 271.869995f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2005295, 5698524, 4, { -232.841797f, 402.044098f, -353.718689f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005296, 5698521, 4, { -177.212006f, 398.044098f, -361.393311f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2005297, 5698523, 4, { -162.152802f, 398.044098f, -369.069885f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2005298, 5698522, 4, { -176.852295f, 398.044098f, -382.745087f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2005299, 5886628, 4, { -168.304993f, 394.044098f, -296.534088f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2005300, 5686456, 4, { 28.763180f, 209.979401f, 211.474701f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2005301, 5686457, 4, { 100.159401f, 220.000000f, 272.267090f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2005293, 5889119, 4, { 28.122299f, 209.979401f, 220.050293f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2005294, 5889137, 4, { 111.924896f, 219.958694f, 271.931000f }, 1.000000f );
-      instance->registerEObj( "Liftterminal", 2005308, 0, 4, { 203.525803f, -28.163019f, 195.849503f }, 0.991760f );
-      instance->registerEObj( "Liftterminal", 2005309, 0, 4, { 229.755005f, -59.269020f, 94.956909f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2005306, 5815811, 4, { -359.609406f, -299.984009f, -249.805496f }, 0.991760f );
-      instance->registerEObj( "Liftterminal", 2005307, 0, 4, { -351.717102f, -299.983887f, -250.003098f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -309.444885f, 400.000000f, -287.942108f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5782651, 5, { -332.999207f, 400.000000f, -297.435211f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
index bcd8a984..490bcc22 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
@@ -10,58 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 252.045807f, -9.475893f, -181.933304f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002872, 6169321, 4, { 255.394501f, -8.467778f, -179.715897f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 6169306, 4, { -367.917297f, 325.000000f, -225.755905f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { -365.057709f, 325.000000f, -230.778107f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2006816, 6169309, 4, { -367.727386f, 325.000000f, -267.544891f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2006858, 0, 4, { -364.583893f, 324.971405f, -250.263199f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2006817, 6169316, 4, { 207.573303f, -22.000000f, 137.064407f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002872, 6169315, 4, { 163.478195f, -21.493710f, 135.478806f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 165.865494f, -22.000000f, 137.572006f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2006767, 6215870, 4, { -319.905396f, 220.000000f, 144.542892f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2006771, 6215871, 4, { -351.689087f, 255.000000f, 14.809160f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006778, 6215872, 4, { -361.023285f, 290.000000f, -120.754402f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006781, 6112286, 4, { 202.549393f, 2.000032f, 188.466202f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006782, 6112287, 4, { 190.864197f, 1.999979f, 180.727493f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006783, 6112293, 4, { 181.429306f, 1.899876f, 187.239197f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006786, 6112290, 4, { 138.231400f, -16.006710f, 145.799896f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2006787, 6112291, 4, { 125.191902f, -16.000000f, 143.181503f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006788, 6112288, 4, { 124.527199f, -16.000000f, 132.912994f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006789, 6112289, 4, { 137.132797f, -16.006710f, 128.862396f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2006790, 6168912, 4, { 143.049393f, -16.000000f, 136.666702f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2006994, 6220274, 4, { 156.748901f, -3.960001f, 175.039703f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2006995, 6220275, 4, { 151.476196f, -3.952148f, 182.940308f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2006996, 6220281, 4, { 154.570801f, -3.951959f, 179.952393f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2006997, 6220282, 4, { 132.225601f, -15.960000f, 142.602600f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007012, 6107601, 4, { 215.289795f, -22.099991f, 137.138306f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2006791, 6215456, 4, { 141.712997f, 22.840740f, -75.213570f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2006792, 6215659, 4, { 143.769394f, 22.262880f, -82.780273f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2006793, 6215458, 4, { 176.529694f, 12.734810f, -76.608017f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2006794, 6215660, 4, { 175.971298f, 13.065370f, -83.629440f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2006795, 6140680, 4, { 262.401794f, -0.700000f, -74.295052f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2006796, 6140674, 4, { 262.532196f, -0.700000f, -86.662819f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2006797, 6123756, 4, { 262.633514f, -0.700000f, -79.584007f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2006798, 0, 4, { 291.762695f, -2.200014f, -76.847649f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2006799, 0, 4, { 298.066406f, -2.151550f, -76.649200f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2006800, 0, 4, { 298.579895f, -2.037392f, -84.721710f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2006801, 6215463, 4, { 298.707794f, -2.062215f, -111.243301f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2006802, 6215464, 4, { 291.473785f, -2.200000f, -111.318298f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2006803, 6215465, 4, { 298.705597f, -2.065336f, -116.301102f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2006804, 6215466, 4, { 291.648193f, -2.200000f, -116.725502f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2006805, 6215467, 4, { 303.031708f, -0.700000f, -133.974594f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2006806, 6215468, 4, { 286.195709f, -0.700000f, -132.797195f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2006807, 6215469, 4, { 303.791687f, -0.717224f, -138.384094f }, 0.991760f );
-      instance->registerEObj( "Unknown42", 2006808, 6215470, 4, { 286.152313f, -0.717224f, -136.736099f }, 0.991760f );
-      instance->registerEObj( "Unknown43", 2006809, 6215471, 4, { 303.913788f, -0.717224f, -142.473495f }, 0.991760f );
-      instance->registerEObj( "Unknown44", 2006810, 6215472, 4, { 286.518585f, -0.717224f, -140.550903f }, 0.991760f );
-      instance->registerEObj( "Unknown45", 2006811, 6140683, 4, { 300.845215f, -0.700000f, -149.810699f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2006812, 6140685, 4, { 289.275787f, -0.700000f, -149.729401f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2006813, 6123759, 4, { 294.959503f, -0.700000f, -149.563904f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6168791, 5, { -303.646912f, 230.000000f, 280.401703f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -293.381012f, 230.000000f, 269.617188f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 216.878998f, -9.458686f, -181.220200f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
index e35380d9..93fd3e75 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
@@ -10,20 +10,29 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4246303, 5, { 158.558304f, -0.023911f, 81.249123f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -410.069702f, -33.063400f, -116.395897f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 151.384796f, -1.596331f, 86.655884f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2000272, 3643401, 4, { -44.571659f, -16.218571f, -112.108101f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2000779, 4259184, 4, { 58.213131f, -9.300029f, -0.564636f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2000780, 4259186, 4, { 58.539280f, -8.801913f, 4.282087f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000785, 4259185, 4, { 34.952770f, -9.096572f, -23.527361f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000273, 4248891, 4, { -333.089203f, -32.733212f, -161.730392f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2000781, 4259189, 4, { -127.598099f, -30.310749f, -139.019302f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000782, 4259188, 4, { -126.660500f, -30.285540f, -134.096695f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000786, 4259190, 4, { -169.906296f, -27.704550f, -169.152496f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000783, 4246452, 4, { -374.789612f, -32.153561f, -140.808197f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000784, 4246451, 4, { -372.679901f, -32.341091f, -136.354401f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4246303, 5, { 158.558304f, -0.023911f, 81.249123f }, 1.000000f, 1.503130f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -410.069702f, -33.063400f, -116.395897f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 151.384796f, -1.596331f, 86.655884f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_0", 2000272, 3643401, 4, { -44.571659f, -16.218571f, -112.108101f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000779, 4259184, 4, { 58.213131f, -9.300029f, -0.564636f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2000780, 4259186, 4, { 58.539280f, -8.801913f, 4.282087f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2000785, 4259185, 4, { 34.952770f, -9.096572f, -23.527361f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2000273, 4248891, 4, { -333.089203f, -32.733212f, -161.730392f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000781, 4259189, 4, { -127.598099f, -30.310749f, -139.019302f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2000782, 4259188, 4, { -126.660500f, -30.285540f, -134.096695f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000786, 4259190, 4, { -169.906296f, -27.704550f, -169.152496f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2000783, 4246452, 4, { -374.789612f, -32.153561f, -140.808197f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_2", 2000784, 4246451, 4, { -372.679901f, -32.341091f, -136.354401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
index b4cfbf28..1c1d1151 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
@@ -10,36 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 7068116, 4, { 459.000000f, -14.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 459.000000f, -14.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 491.000000f, -14.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 7068596, 4, { -245.000000f, -2.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002872, 7068599, 4, { -194.500000f, -2.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7072874, 4, { -220.044601f, -2.000000f, 3.151932f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2009045, 0, 4, { -224.806396f, -2.000000f, 8.647594f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -245.000000f, -2.000000f, 4.000000f }, 1.400000f );
-      instance->registerEObj( "Unknown7", 2002872, 7068491, 4, { 95.000000f, 9.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 95.000000f, 9.000000f, 4.000000f }, 1.400000f );
-      instance->registerEObj( "Unknown9", 2002872, 7068496, 4, { 135.000000f, 9.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2009046, 0, 4, { 111.907600f, 9.000000f, 4.017264f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7075163, 4, { -335.663391f, 1.815782f, -38.379379f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 7075164, 4, { -324.520203f, 1.008244f, -28.697809f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 7032771, 4, { -380.099701f, 5.500000f, -16.441790f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 7075174, 4, { -298.365204f, 1.706293f, -25.538429f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 7075175, 4, { -290.733002f, 1.250000f, -27.983721f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 7065309, 4, { -273.437195f, 1.281705f, 3.216716f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 7132450, 4, { -322.497589f, 1.008244f, -34.442020f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 7132455, 4, { -293.498108f, 1.972912f, -19.170090f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007457, 7132456, 4, { -287.911407f, 1.972912f, -26.723471f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007457, 7034067, 4, { -67.254761f, 3.500000f, -34.435638f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007457, 7065310, 4, { 68.873291f, 7.500000f, 3.740700f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007457, 0, 4, { 133.644806f, 9.000000f, 3.453697f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007457, 7029084, 4, { 272.652802f, -12.000000f, 48.014309f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007457, 7032009, 4, { 276.325592f, -12.008910f, -34.378601f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2007457, 7034222, 4, { 433.853088f, -15.937500f, 3.644273f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 7042417, 5, { -488.282501f, -3.750000f, 2.201033f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -457.918304f, -3.860892f, 14.784940f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
index 712153ef..c36b6d5f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
@@ -10,44 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 5658893, 4, { -0.378468f, -0.000006f, 19.173130f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -0.473083f, -0.015320f, 21.194759f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2005189, 5658883, 4, { 0.051215f, 0.000000f, -19.347589f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 191.935699f, -8.000000f, -97.548279f }, 1.143130f );
-      instance->registerEObj( "Unknown4", 2002872, 5670058, 4, { 191.873398f, -8.000000f, -94.706589f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2005190, 5670071, 4, { 192.629501f, -8.000000f, -145.825104f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005319, 0, 4, { 191.294998f, -8.000000f, -126.640503f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { -69.815361f, 32.171459f, -368.314209f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2002872, 5670105, 4, { -69.864067f, 32.000050f, -370.484314f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005395, 0, 4, { -72.186203f, 32.000000f, -389.922302f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -119.582703f, -47.846481f, 223.251007f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -69.846916f, 32.000000f, -403.795990f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5653670, 5, { -135.662598f, -48.859058f, 229.988297f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2005169, 5674328, 4, { -66.894547f, -5.577260f, 129.660202f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2005170, 5674333, 4, { -28.173691f, -5.988469f, 165.738907f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2005171, 5674334, 4, { 32.157242f, -8.242720f, 98.301018f }, 0.991760f );
-      instance->registerEObj( "Coldsteellever", 2005172, 0, 4, { 9.864166f, -0.650611f, 48.260380f }, 0.991760f );
-      instance->registerEObj( "Damagedwinch", 2005173, 5660757, 4, { -3.958177f, 1.907400f, 32.349579f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2005174, 5584415, 4, { -0.076084f, -0.115606f, 34.058880f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006185, 5912762, 4, { -131.761703f, -48.569462f, 225.451996f }, 0.991760f );
-      instance->registerEObj( "Tornjournalpage", 2005180, 0, 4, { 66.788696f, -3.996225f, -52.994629f }, 0.991760f );
-      instance->registerEObj( "Tornjournalpage", 2005181, 0, 4, { 96.351990f, -8.050000f, -30.383080f }, 1.000000f );
-      instance->registerEObj( "Tornjournalpage", 2005182, 0, 4, { 151.468704f, -7.345456f, -48.435421f }, 1.000000f );
-      instance->registerEObj( "Tornjournalpage", 2005183, 0, 4, { 170.853394f, -7.671008f, -20.209290f }, 1.000000f );
-      instance->registerEObj( "Tornjournalpage", 2005184, 0, 4, { 208.382401f, -8.050000f, -58.810051f }, 0.991760f );
-      instance->registerEObj( "Barracksdoor", 2005177, 5584421, 4, { 158.730606f, -8.011047f, -24.266649f }, 0.991760f );
-      instance->registerEObj( "Lordcommandersseat", 2005178, 5584424, 4, { 192.164307f, -8.050052f, -70.690117f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2005179, 5584425, 4, { 191.948196f, -8.000000f, -159.505096f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005185, 5584476, 4, { 96.173714f, 24.000000f, -222.821701f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2005186, 5584485, 4, { 21.875490f, 28.000000f, -217.942505f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2005187, 5584486, 4, { -35.156700f, 32.000000f, -286.161285f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2005320, 5800343, 4, { 179.680298f, 16.000111f, -261.236206f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2005321, 5800818, 4, { 127.707603f, 20.323111f, -262.321411f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2005322, 5800840, 4, { 5.201134f, 28.557409f, -289.850006f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2005323, 5800842, 4, { -21.532181f, 32.000061f, -289.092407f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2005353, 5584312, 4, { -73.144119f, 32.000000f, -405.536011f }, 1.000000f );
-      instance->registerEObj( "Chapeldoor", 2005357, 5584428, 4, { -69.550163f, 31.950060f, -291.505493f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
index a52618cb..6a835f69 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
@@ -10,70 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 5777077, 4, { 140.603302f, 2.700000f, 34.720928f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005259, 5777078, 4, { 106.765198f, 2.700000f, 53.335590f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 138.876297f, 2.700000f, 35.495899f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002872, 5777135, 4, { -185.039200f, -0.000010f, 97.665123f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2005260, 5777136, 4, { -143.174301f, -0.000001f, 86.487961f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -179.727097f, -0.015191f, 96.334610f }, 0.790818f );
-      instance->registerEObj( "Biomassincubator", 2005480, 5627459, 4, { -143.238602f, 2.285363f, 101.305000f }, 1.000000f );
-      instance->registerEObj( "Biomassincubator", 2005481, 5632316, 4, { -150.372604f, 2.650113f, 73.551849f }, 1.000000f );
-      instance->registerEObj( "Biomassincubator", 2005482, 5627460, 4, { -170.712601f, 2.379743f, 108.801201f }, 1.000000f );
-      instance->registerEObj( "Biomassincubator", 2005483, 5632317, 4, { -178.309097f, 2.550030f, 81.099091f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005476, 5852048, 4, { -143.988998f, 0.000000f, 100.704399f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005477, 5852047, 4, { -150.881500f, 0.000000f, 74.554863f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005478, 5852050, 4, { -170.231705f, 0.000000f, 108.158203f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005479, 5852049, 4, { -177.203705f, 0.000000f, 81.434868f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002735, 0, 4, { -0.027993f, 46.596539f, -329.937805f }, 1.701462f );
-      instance->registerEObj( "Unknown11", 2002872, 5777412, 4, { -0.735815f, 46.585819f, -331.464386f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 4.587201f, 0.167401f, 228.424301f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.198364f, 46.585819f, -364.727509f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5615534, 5, { 1.419067f, -0.015320f, 234.058105f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2005242, 5722042, 4, { 36.979809f, 1.210160f, 215.020599f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2005251, 5754030, 4, { 0.697166f, -0.000000f, 210.678497f }, 1.000000f );
-      instance->registerEObj( "Guidepanel", 2005252, 0, 4, { 189.739594f, 2.452829f, 125.865196f }, 0.991760f );
-      instance->registerEObj( "Guidepanel", 2005253, 0, 4, { 225.485703f, 3.355857f, 61.434238f }, 1.000000f );
-      instance->registerEObj( "Guidepanel", 2005254, 0, 4, { 158.995697f, 4.255857f, 31.260679f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2005246, 5607049, 4, { 230.547394f, 0.900000f, 95.770508f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2005247, 5607052, 4, { 228.780106f, 1.800000f, 59.805061f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2005248, 5607058, 4, { 184.888702f, 1.800000f, 26.321140f }, 1.000000f );
-      instance->registerEObj( "Allaganteleporter", 2005243, 5722173, 4, { 65.541313f, 3.869573f, 77.942459f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2005261, 5722056, 4, { 1.617853f, 1.549526f, 178.122406f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2005257, 5581056, 4, { 130.087601f, 2.694753f, 39.807980f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2005425, 5829636, 4, { 124.304901f, 2.666066f, 55.191471f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2005250, 5810989, 4, { 2.160641f, 0.030060f, 207.184006f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2005249, 5614162, 4, { -211.984406f, 0.000000f, 104.404701f }, 1.000000f );
-      instance->registerEObj( "Allaganteleporter", 2005244, 5722174, 4, { -103.539803f, 1.217043f, 76.015160f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2005358, 5763607, 4, { -352.642700f, 1.499993f, 119.149300f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2005359, 5763630, 4, { -351.399994f, 1.480042f, 110.398903f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2005360, 5763608, 4, { -349.473907f, 1.499977f, 99.800461f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2005364, 5650881, 4, { -352.015686f, 1.499995f, 116.202499f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2005365, 5650883, 4, { -350.711609f, 1.499995f, 107.232002f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2005366, 5819525, 4, { -348.442902f, 1.499981f, 98.183548f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2005361, 5814450, 4, { -288.068115f, -2.700021f, 113.654198f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2005362, 5814433, 4, { -272.828888f, -2.700021f, 111.659203f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2005363, 5814516, 4, { -268.089691f, -2.700021f, 117.225700f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2005367, 5819526, 4, { -286.325989f, -2.700022f, 113.195000f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2005368, 5650635, 4, { -271.312897f, -2.700021f, 112.812401f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2005369, 5819527, 4, { -266.722595f, -2.700022f, 118.620300f }, 1.000000f );
-      instance->registerEObj( "Informationpanel", 2005255, 0, 4, { -230.635101f, 1.639121f, 176.464996f }, 1.000000f );
-      instance->registerEObj( "Informationpanel", 2005256, 0, 4, { -348.181610f, 1.613136f, 135.909897f }, 0.991760f );
-      instance->registerEObj( "Informationpanel", 2005674, 0, 4, { -345.653900f, 1.626497f, 98.636726f }, 0.991760f );
-      instance->registerEObj( "Informationpanel", 2005675, 0, 4, { -324.880798f, 1.642515f, 68.081039f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2005268, 5652510, 4, { -51.865479f, 53.147091f, -208.636703f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2005269, 5652511, 4, { 54.518261f, 53.147091f, -208.602707f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2005270, 5643840, 4, { -149.095901f, 53.147091f, -378.377991f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2005271, 5652506, 4, { -96.421806f, 53.147091f, -467.216003f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2005272, 5652515, 4, { 149.401093f, 53.147091f, -378.561096f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2005273, 5652509, 4, { 98.842590f, 53.164989f, -466.923706f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2005318, 0, 4, { -8.227161f, 53.165001f, -195.021896f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2005329, 5670473, 4, { 130.894806f, 53.165001f, -422.856415f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2005330, 5670424, 4, { 3.461859f, 53.165001f, -200.625595f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2005331, 5670459, 4, { -131.889603f, 53.165001f, -421.513885f }, 1.000000f );
-      instance->registerEObj( "Emeraldcontrolunit", 2005262, 5819696, 4, { 127.567200f, 55.922291f, -423.497711f }, 0.991760f );
-      instance->registerEObj( "Violetcontrolunit", 2005263, 5819695, 4, { -0.232653f, 56.361301f, -203.010300f }, 0.991760f );
-      instance->registerEObj( "Crimsoncontrolunit", 2005264, 5819698, 4, { -126.342796f, 55.969429f, -423.260895f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
index 1703cfb0..9ff0b996 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
@@ -10,40 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -0.015320f, 46.585819f, -330.098389f }, 1.693726f );
-      instance->registerEObj( "Unknown1", 2002872, 7178420, 4, { 0.000000f, 46.597000f, -330.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7154681, 4, { -336.809601f, -4.091716f, 270.330200f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7154670, 4, { -356.951599f, -4.091716f, 262.314697f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7154683, 4, { -357.732788f, -4.091716f, 240.942001f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 7178527, 4, { -322.993408f, -14.000000f, 237.739197f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -323.681213f, -13.915580f, 238.152405f }, 0.520000f );
-      instance->registerEObj( "Unknown7", 2002872, 7178530, 4, { -363.058411f, -14.000000f, 250.964600f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2009284, 0, 4, { -334.828705f, -13.901060f, 251.636505f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2009285, 0, 4, { -348.204712f, -13.892940f, 243.150803f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2009286, 0, 4, { -341.067108f, -13.892940f, 237.005600f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002872, 7178955, 4, { -0.015300f, -0.015300f, 318.593109f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2002735, 0, 4, { -0.015320f, -0.015320f, 318.593109f }, 1.388489f );
-      instance->registerEObj( "Entrance", 2000182, 7170984, 5, { -168.370193f, 53.116581f, -447.149506f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -165.940704f, 53.142620f, -435.801300f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, 285.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 7141324, 4, { -0.193053f, 53.508301f, -157.354904f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2007457, 7174264, 4, { 57.117458f, 53.142620f, -213.119202f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 7170395, 4, { -0.015320f, 46.597000f, -350.082092f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2009278, 0, 4, { 0.002865f, 46.599701f, -377.001007f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2007457, 7141398, 4, { -147.123795f, 53.529110f, -369.004913f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2007457, 7141397, 4, { -82.715157f, 42.516201f, -199.536606f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2007457, 7141396, 4, { 57.117241f, 53.527908f, -213.116699f }, 0.991760f );
-      instance->registerEObj( "Tornnavigatorslogpage", 2009412, 0, 4, { -132.524704f, 53.177608f, -407.217499f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2007457, 7141895, 4, { -305.774811f, -0.751164f, 94.720772f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007457, 7167075, 4, { -291.432098f, -0.015320f, 191.088593f }, 0.991760f );
-      instance->registerEObj( "Tornnavigatorslogpage", 2009413, 0, 4, { -202.481003f, 0.052476f, 171.440704f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007457, 7170446, 4, { 78.733200f, 20.000000f, 245.622299f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2007457, 7170445, 4, { 29.878000f, 12.000000f, 404.197998f }, 1.000000f );
-      instance->registerEObj( "Securityterminal", 2009276, 7188820, 4, { 67.426903f, 12.000000f, 331.441711f }, 1.000000f );
-      instance->registerEObj( "Securityterminal", 2009277, 7188819, 4, { 0.000000f, 12.000000f, 370.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007457, 7336140, 4, { 69.068199f, 12.000000f, 332.207001f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007457, 7336141, 4, { 0.000000f, 12.000000f, 371.396515f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
index f52b62de..3edc22b4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
@@ -10,38 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 353.541412f, -39.250000f, -59.553089f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 5419624, 4, { 350.673187f, -39.000000f, -60.588070f }, 1.000000f );
-      instance->registerEObj( "OnGarleanHierarchyVolume1", 2005891, 0, 4, { -199.611694f, 6.900000f, -56.354649f }, 1.000000f );
-      instance->registerEObj( "OnGarleanHierarchyVolume2", 2005892, 0, 4, { -72.116417f, 0.900000f, -9.577726f }, 1.000000f );
-      instance->registerEObj( "Essences&Permutations", 2005893, 0, 4, { 54.309052f, -8.099999f, 62.262531f }, 1.000000f );
-      instance->registerEObj( "OvertheHorizon", 2005894, 0, 4, { 113.656601f, -8.153534f, 83.276863f }, 1.000000f );
-      instance->registerEObj( "Leatherbounddiary", 2005895, 0, 4, { 253.342499f, -24.000000f, -16.578369f }, 1.000000f );
-      instance->registerEObj( "Leatherbounddiary", 2005896, 0, 4, { 252.532898f, -40.000000f, -78.517921f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 5419606, 4, { -22.327221f, 0.000000f, -0.318492f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2005019, 5419607, 4, { 22.309731f, 0.000000f, -0.124082f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { -20.486000f, 0.000000f, 0.109200f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2005316, 5774736, 4, { -11.221270f, 0.000000f, -6.534676f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005328, 5815254, 4, { -10.516900f, 0.000000f, -1.875240f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002872, 5419612, 4, { 178.337997f, -8.000000f, 53.739559f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005020, 5419614, 4, { 179.630203f, -8.000000f, 0.354116f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002735, 0, 4, { 177.873505f, -8.000000f, 52.121300f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2005354, 5852274, 4, { 177.539993f, -7.995000f, 32.977421f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004942, 5033535, 4, { -316.612915f, -0.015320f, 0.045776f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2004949, 5033537, 4, { -173.408096f, 12.000000f, -33.362572f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2004956, 5033536, 4, { -48.355900f, -0.015320f, 0.747620f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2004957, 5033538, 4, { 43.900150f, -0.015320f, -1.083435f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2004958, 5004619, 4, { 82.139282f, -8.011047f, 69.748901f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2004959, 5004620, 4, { 117.387604f, -9.018127f, 69.291138f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2004960, 5336977, 4, { 138.888000f, -9.018127f, 87.533859f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2004962, 5033543, 4, { 156.328598f, -9.018127f, 95.628304f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2004963, 5004621, 4, { 176.257004f, -8.011047f, -9.414856f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2004964, 5773506, 4, { 297.779785f, -24.002501f, -43.308731f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2004965, 5004586, 4, { 325.666107f, -39.017399f, -59.098209f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5330520, 5, { -387.057098f, -0.015320f, 4.592957f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -381.085205f, -0.015320f, 6.094601f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 393.697998f, -39.047909f, -59.586491f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
index 0267d35d..c1ce2025 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
@@ -10,51 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6493754, 4, { 337.666901f, -0.015320f, -154.009293f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 337.666901f, -0.015320f, -154.009293f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 381.624786f, 0.033357f, -154.061295f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007511, 6493828, 4, { 387.818298f, 0.057078f, -146.448898f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007513, 6401215, 4, { 361.552795f, 0.056058f, -150.124802f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007512, 0, 4, { 375.502197f, 0.033357f, -161.256607f }, 1.000000f );
-      instance->registerEObj( "TheBoyandtheDragonGay", 2007490, 0, 4, { -171.036804f, 11.988180f, -36.461899f }, 0.991760f );
-      instance->registerEObj( "OfLovesUnrequited", 2007491, 0, 4, { -59.891842f, 0.931515f, 7.942907f }, 0.991760f );
-      instance->registerEObj( "OvertheHorizonRedux", 2007492, 0, 4, { 61.203861f, -8.102600f, 81.803589f }, 0.991760f );
-      instance->registerEObj( "OntheCulinaryApplicationsofCoblyns", 2007493, 0, 4, { 148.354507f, -20.004641f, 27.979099f }, 0.991760f );
-      instance->registerEObj( "ProceedingsoftheCouncilofMagi", 2007494, 0, 4, { 91.658020f, -14.648220f, -87.438591f }, 0.991760f );
-      instance->registerEObj( "TheBoyandtheDragonGayALiteraryAnalysis", 2007495, 0, 4, { 261.494995f, -2.524073f, -175.726593f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002872, 6331565, 4, { -22.327221f, 0.000000f, -0.318492f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -20.486000f, 0.000000f, 0.109200f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007475, 6331566, 4, { 23.113720f, 0.000000f, -0.647191f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002872, 6331601, 4, { 178.337997f, -8.000000f, -0.391663f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002735, 0, 4, { 177.825394f, -8.000000f, 2.100500f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007479, 6331602, 4, { 178.545807f, -8.011047f, 54.734009f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2007510, 6402810, 4, { 172.105392f, -7.900000f, 35.499100f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007509, 6545426, 4, { 177.732605f, -7.900000f, 35.055210f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007546, 0, 4, { 177.791000f, -7.900000f, 27.118000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007473, 6399834, 4, { -172.812195f, 12.000000f, -33.611160f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007474, 6399835, 4, { -49.912289f, -0.015320f, 0.167786f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2007478, 6400099, 4, { 162.976501f, -20.000000f, -2.988169f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007477, 6399813, 4, { 76.753242f, -8.000000f, 70.675980f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007476, 6399648, 4, { 80.002747f, -4.000000f, -0.293232f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007486, 6403597, 4, { 182.834000f, -7.950000f, -154.079605f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007480, 6400740, 4, { 167.797897f, -7.950000f, -161.345093f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007481, 6400741, 4, { 166.957901f, -7.949998f, -145.330505f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007482, 6400744, 4, { 168.266495f, -7.950000f, -153.578705f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007483, 6400763, 4, { 171.314407f, -7.950000f, -162.037598f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007484, 6400774, 4, { 171.048599f, -7.950000f, -145.992599f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007485, 6400779, 4, { 171.229401f, -7.950000f, -153.966995f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007487, 6401038, 4, { 249.953903f, -3.950001f, -153.130600f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007488, 6400896, 4, { 278.625397f, -3.950001f, -153.498093f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007489, 6485974, 4, { 378.746613f, 0.033356f, -154.978699f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007552, 6573181, 4, { 365.530090f, 0.056058f, -151.957199f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2007553, 6573293, 4, { 163.576996f, -7.950000f, -161.503799f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2007554, 6573290, 4, { 167.881699f, -7.950000f, -147.169601f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2007555, 6573294, 4, { 163.131195f, -7.950000f, -146.200302f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007558, 6573550, 4, { 138.722900f, -7.950000f, -161.914902f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2007559, 6573551, 4, { 138.516602f, -7.950000f, -145.595200f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6331751, 5, { -387.057098f, -0.015320f, 4.592957f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -381.085205f, -0.015320f, 6.094601f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
index 94710831..c5ecc79c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
@@ -10,33 +10,42 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -40.786701f, 641.215271f, -59.415600f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 5097808, 4, { -40.752449f, 641.160522f, -54.934898f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004825, 5040985, 4, { 194.842896f, -0.000001f, -91.318947f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004826, 5097903, 4, { 139.959106f, 4.489269f, -37.319328f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004828, 5041736, 4, { -97.215271f, 329.152313f, -129.564407f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2004829, 5073686, 4, { -104.691200f, 328.877686f, -135.171402f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2004830, 5054264, 4, { -85.465736f, 329.158203f, -114.917397f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2004831, 5054260, 4, { -74.450752f, 350.933899f, -163.969894f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004832, 5054262, 4, { -68.565010f, 338.613892f, -210.672806f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004833, 5041738, 4, { -36.703850f, 338.613892f, -209.867294f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2004834, 5073702, 4, { -33.987030f, 338.612915f, -200.545197f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2004835, 5041733, 4, { -102.992203f, 338.700012f, -173.230301f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004836, 5041740, 4, { -91.617867f, 338.742096f, -191.340103f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004837, 5041734, 4, { -56.932819f, 338.613800f, -220.085907f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004838, 5041739, 4, { -58.661549f, 338.321289f, -231.786407f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2004840, 5097049, 4, { 60.261662f, 608.420776f, -64.327179f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2004842, 5097050, 4, { -42.140709f, 637.801575f, -13.313470f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 36.823841f, 26.884010f, -25.290840f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002872, 5072855, 4, { 40.635441f, 24.890421f, -26.286221f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2004827, 5072856, 4, { 5.803720f, 26.994020f, -14.402020f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2002735, 0, 4, { 8.333900f, 345.993805f, -169.028107f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2002872, 5076365, 4, { 9.495131f, 345.449799f, -172.095505f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2004839, 5076366, 4, { 7.837297f, 345.993805f, -134.142197f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5072285, 5, { 294.405701f, 3.332572f, -157.864304f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -48.338951f, 641.026917f, -87.713493f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 279.041687f, 2.095404f, -159.624695f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -40.786701f, 641.215271f, -59.415600f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5097808, 4, { -40.752449f, 641.160522f, -54.934898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2004825, 5040985, 4, { 194.842896f, -0.000001f, -91.318947f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_l1d1_q1_arm04", 2004826, 5097903, 4, { 139.959106f, 4.489269f, -37.319328f }, 1.000000f, 0.000000f ); 
+      // States -> arm04_def arm04_def_anim arm04_down arm04_down_anim 
+      instance->registerEObj( "unknown_2", 2004828, 5041736, 4, { -97.215271f, 329.152313f, -129.564407f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal", 2004829, 5073686, 4, { -104.691200f, 328.877686f, -135.171402f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2004830, 5054264, 4, { -85.465736f, 329.158203f, -114.917397f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2004831, 5054260, 4, { -74.450752f, 350.933899f, -163.969894f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2004832, 5054262, 4, { -68.565010f, 338.613892f, -210.672806f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2004833, 5041738, 4, { -36.703850f, 338.613892f, -209.867294f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_1", 2004834, 5073702, 4, { -33.987030f, 338.612915f, -200.545197f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_7", 2004835, 5041733, 4, { -102.992203f, 338.700012f, -173.230301f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2004836, 5041740, 4, { -91.617867f, 338.742096f, -191.340103f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2004837, 5041734, 4, { -56.932819f, 338.613800f, -220.085907f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2004838, 5041739, 4, { -58.661549f, 338.321289f, -231.786407f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_l1d1_q1_arm02", 2004840, 5097049, 4, { 60.261662f, 608.420776f, -64.327179f }, 1.000000f, 0.000000f ); 
+      // States -> arm02_def arm02_def_anim arm02_des arm02_des_anim 
+      instance->registerEObj( "sgbg_l1d1_q1_arm03", 2004842, 5097050, 4, { -42.140709f, 637.801575f, -13.313470f }, 1.000000f, 0.000000f ); 
+      // States -> arm03_def arm03_def_anim arm03_des arm03_des_anim 
+      instance->registerEObj( "unknown_11", 2002735, 0, 4, { 36.823841f, 26.884010f, -25.290840f }, 1.000000f, 1.175128f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5072855, 4, { 40.635441f, 24.890421f, -26.286221f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004827, 5072856, 4, { 5.803720f, 26.994020f, -14.402020f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_12", 2002735, 0, 4, { 8.333900f, 345.993805f, -169.028107f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5076365, 4, { 9.495131f, 345.449799f, -172.095505f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2004839, 5076366, 4, { 7.837297f, 345.993805f, -134.142197f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Entrance", 2000182, 5072285, 5, { 294.405701f, 3.332572f, -157.864304f }, 1.000000f, 0.079727f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -48.338951f, 641.026917f, -87.713493f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 279.041687f, 2.095404f, -159.624695f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
index b00e6906..bcbad845 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
@@ -10,51 +10,62 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 4579298, 4, { 9.791200f, -279.967285f, 21.616301f }, 0.700000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 8.967742f, -279.844086f, 22.640949f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -6.668615f, -279.989990f, -16.121090f }, 1.000000f );
-      instance->registerEObj( "Diabolicalgate", 2003262, 0, 4, { -11.735310f, -279.600006f, 1.146639f }, 1.000000f );
-      instance->registerEObj( "Diabolicalgate", 2003263, 0, 4, { -5.801897f, -279.600006f, -2.180922f }, 1.000000f );
-      instance->registerEObj( "Diabolicalgate", 2003264, 0, 4, { -9.593593f, -279.600006f, 5.704061f }, 1.000000f );
-      instance->registerEObj( "Diabolicalgate", 2003265, 0, 4, { -3.149769f, -279.600006f, 2.478353f }, 1.000000f );
-      instance->registerEObj( "Dubiouscoffer", 2003266, 0, 4, { 8.612234f, -279.989990f, -20.760429f }, 1.000000f );
-      instance->registerEObj( "Dubiouscoffer", 2003267, 0, 4, { 20.769291f, -279.989990f, -8.610124f }, 1.000000f );
-      instance->registerEObj( "Dubiouscoffer", 2003268, 0, 4, { -20.776131f, -279.989990f, 8.642863f }, 0.991760f );
-      instance->registerEObj( "Dubiouscoffer", 2003269, 0, 4, { -20.738871f, -279.989990f, -8.552890f }, 1.000000f );
-      instance->registerEObj( "Dubiouscoffer", 2003270, 0, 4, { 20.683531f, -279.989990f, 8.612939f }, 1.000000f );
-      instance->registerEObj( "Dubiouscoffer", 2003271, 0, 4, { -8.611513f, -279.989990f, 20.715059f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003361, 4538596, 4, { 146.386597f, 68.131821f, -32.655411f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2003431, 4577623, 4, { 141.929794f, 66.690971f, -22.680590f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2003362, 4577620, 4, { 124.650101f, 58.000000f, 21.475590f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2003800, 0, 4, { 125.169800f, 58.259232f, 24.765381f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2003364, 4538597, 4, { 1.248910f, 34.305920f, -96.145103f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2003432, 4577625, 4, { 7.652231f, 33.999989f, -83.909409f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2003365, 4572307, 4, { 16.420071f, 30.172510f, -53.162449f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2003366, 4629067, 4, { 13.762910f, 27.170670f, -29.499069f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2003367, 4577622, 4, { -35.077301f, 20.181410f, -5.543382f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2003368, 4572310, 4, { -36.282841f, 10.771230f, 27.777269f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2003369, 4629073, 4, { -38.452469f, 10.771230f, 26.955620f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2003370, 4538791, 4, { 11.000470f, 7.980469f, 18.231581f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2003371, 4572309, 4, { 15.090590f, 6.133745f, 32.735611f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2003372, 4629074, 4, { 11.812460f, 6.045094f, 32.012810f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2003433, 4577626, 4, { 25.308140f, 6.141701f, 43.055359f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2003801, 0, 4, { -39.169922f, 18.680960f, -1.968445f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2003374, 4583478, 4, { 23.827320f, -252.500000f, -65.956993f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2003375, 4583476, 4, { 9.536644f, -252.394394f, -55.117130f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2003376, 4583473, 4, { 47.898071f, -270.801910f, 54.428829f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2003377, 4583472, 4, { 35.751831f, -270.679901f, 43.045650f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2003378, 4583471, 4, { 42.832031f, -270.801910f, 35.995972f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2003379, 4583474, 4, { 54.564331f, -270.899994f, 47.591949f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2002872, 4577505, 4, { 100.376602f, 43.960560f, 2.708986f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2002735, 0, 4, { 97.980797f, 42.137150f, -0.222000f }, 0.900000f );
-      instance->registerEObj( "Unknown24", 2003363, 4578411, 4, { 86.630951f, 42.801220f, -47.240730f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2003373, 4578103, 4, { -38.428570f, 12.100000f, 70.544273f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2002872, 4578066, 4, { 6.156913f, 11.249960f, 70.316727f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2002735, 0, 4, { 4.235116f, 12.085570f, 69.965263f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2003360, 0, 4, { 284.752808f, 100.000000f, -31.765209f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4574610, 5, { 270.581207f, 100.000000f, -17.202379f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.173615f, 100.000000f, -32.604542f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4579298, 4, { 9.791200f, -279.967285f, 21.616301f }, 0.700000f, -0.494801f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { 8.967742f, -279.844086f, 22.640949f }, 1.000000f, -0.407391f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -6.668615f, -279.989990f, -16.121090f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Diabolicalgate", 2003262, 0, 4, { -11.735310f, -279.600006f, 1.146639f }, 1.000000f, -0.357945f ); 
+      instance->registerEObj( "Diabolicalgate_1", 2003263, 0, 4, { -5.801897f, -279.600006f, -2.180922f }, 1.000000f, -0.579334f ); 
+      instance->registerEObj( "Diabolicalgate_2", 2003264, 0, 4, { -9.593593f, -279.600006f, 5.704061f }, 1.000000f, -0.499409f ); 
+      instance->registerEObj( "Diabolicalgate_3", 2003265, 0, 4, { -3.149769f, -279.600006f, 2.478353f }, 1.000000f, -0.520267f ); 
+      instance->registerEObj( "Dubiouscoffer", 2003266, 0, 4, { 8.612234f, -279.989990f, -20.760429f }, 1.000000f, 0.406471f ); 
+      instance->registerEObj( "Dubiouscoffer_1", 2003267, 0, 4, { 20.769291f, -279.989990f, -8.610124f }, 1.000000f, 1.180338f ); 
+      instance->registerEObj( "Dubiouscoffer_2", 2003268, 0, 4, { -20.776131f, -279.989990f, 8.642863f }, 0.991760f, -1.160291f ); 
+      instance->registerEObj( "Dubiouscoffer_3", 2003269, 0, 4, { -20.738871f, -279.989990f, -8.552890f }, 1.000000f, -1.185745f ); 
+      instance->registerEObj( "Dubiouscoffer_4", 2003270, 0, 4, { 20.683531f, -279.989990f, 8.612939f }, 1.000000f, 1.247274f ); 
+      instance->registerEObj( "Dubiouscoffer_5", 2003271, 0, 4, { -8.611513f, -279.989990f, 20.715059f }, 1.000000f, -0.423025f ); 
+      instance->registerEObj( "unknown_1", 2003361, 4538596, 4, { 146.386597f, 68.131821f, -32.655411f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2003431, 4577623, 4, { 141.929794f, 66.690971f, -22.680590f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2003362, 4577620, 4, { 124.650101f, 58.000000f, 21.475590f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer", 2003800, 0, 4, { 125.169800f, 58.259232f, 24.765381f }, 0.991760f, -1.568190f ); 
+      instance->registerEObj( "unknown_4", 2003364, 4538597, 4, { 1.248910f, 34.305920f, -96.145103f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2003432, 4577625, 4, { 7.652231f, 33.999989f, -83.909409f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1d5_a3_kin03", 2003365, 4572307, 4, { 16.420071f, 30.172510f, -53.162449f }, 1.000000f, 0.000000f ); 
+      // States -> plant_def plant_action_anim 
+      instance->registerEObj( "sgvf_f1d5_b0360", 2003366, 4629067, 4, { 13.762910f, 27.170670f, -29.499069f }, 1.000000f, 0.000000f ); 
+      // States -> liq_def liq_on liq_on_anim liq_off_anim 
+      instance->registerEObj( "unknown_6", 2003367, 4577622, 4, { -35.077301f, 20.181410f, -5.543382f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1d5_a3_kin03_1", 2003368, 4572310, 4, { -36.282841f, 10.771230f, 27.777269f }, 1.000000f, 0.000000f ); 
+      // States -> plant_def plant_action_anim 
+      instance->registerEObj( "sgvf_f1d5_b0359", 2003369, 4629073, 4, { -38.452469f, 10.771230f, 26.955620f }, 1.000000f, 0.000000f ); 
+      // States -> liq_def liq_on liq_on_anim liq_off_anim 
+      instance->registerEObj( "unknown_7", 2003370, 4538791, 4, { 11.000470f, 7.980469f, 18.231581f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d5_a3_kin03_2", 2003371, 4572309, 4, { 15.090590f, 6.133745f, 32.735611f }, 1.000000f, 0.000000f ); 
+      // States -> plant_def plant_action_anim 
+      instance->registerEObj( "sgvf_f1d5_b0358", 2003372, 4629074, 4, { 11.812460f, 6.045094f, 32.012810f }, 1.000000f, 0.000000f ); 
+      // States -> liq_def liq_on liq_on_anim liq_off_anim 
+      instance->registerEObj( "unknown_8", 2003433, 4577626, 4, { 25.308140f, 6.141701f, 43.055359f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_1", 2003801, 0, 4, { -39.169922f, 18.680960f, -1.968445f }, 0.991760f, -0.789868f ); 
+      instance->registerEObj( "unknown_9", 2003374, 4583478, 4, { 23.827320f, -252.500000f, -65.956993f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2003375, 4583476, 4, { 9.536644f, -252.394394f, -55.117130f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2003376, 4583473, 4, { 47.898071f, -270.801910f, 54.428829f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2003377, 4583472, 4, { 35.751831f, -270.679901f, 43.045650f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_13", 2003378, 4583471, 4, { 42.832031f, -270.801910f, 35.995972f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_14", 2003379, 4583474, 4, { 54.564331f, -270.899994f, 47.591949f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4577505, 4, { 100.376602f, 43.960560f, 2.708986f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_15", 2002735, 0, 4, { 97.980797f, 42.137150f, -0.222000f }, 0.900000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2003363, 4578411, 4, { 86.630951f, 42.801220f, -47.240730f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2003373, 4578103, 4, { -38.428570f, 12.100000f, 70.544273f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4578066, 4, { 6.156913f, 11.249960f, 70.316727f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_17", 2002735, 0, 4, { 4.235116f, 12.085570f, 69.965263f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "unknown_18", 2003360, 0, 4, { 284.752808f, 100.000000f, -31.765209f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4574610, 5, { 270.581207f, 100.000000f, -17.202379f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 265.173615f, 100.000000f, -32.604542f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
index 881aae3a..08fa7611 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
@@ -10,47 +10,53 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f );
-      instance->registerEObj( "Unknown6", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f );
-      instance->registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f );
-      instance->registerEObj( "Guardianstatue", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f );
-      instance->registerEObj( "Guardianstatue", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070313f, 100.000000f, -376.644592f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f );
-      instance->registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f }, 0.991760f );
-      instance->registerEObj( "Unknown31", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f }, 0.991760f );
-      instance->registerEObj( "Unknown33", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f );
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f }, 1.000000f, -0.424392f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f, -0.511830f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_3", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_6", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f }, 0.991760f, -0.424392f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f, -0.272621f ); 
+      instance->registerEObj( "unknown_8", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_11", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_13", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Guardianstatue_1", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Guardianstatue_2", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070312f, 100.000000f, -376.644592f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f, -0.919204f ); 
+      instance->registerEObj( "unknown_14", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_15", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_17", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_18", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_19", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_23", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_w_qic_004_03a", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f }, 0.991760f, -0.424392f ); 
+      instance->registerEObj( "unknown_24", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f, -0.272621f ); 
+      instance->registerEObj( "sgbg_w_qic_004_03a_1", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_25", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
index 25b464fb..e90639fb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
@@ -10,113 +10,123 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000828, 4305694, 4, { -784.536987f, -344.000000f, 0.121873f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000829, 0, 4, { -781.198120f, -344.000000f, 0.127798f }, 0.900000f );
-      instance->registerEObj( "Shortcut", 2000848, 0, 4, { -788.420593f, -400.046387f, -601.281189f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2000832, 4303065, 4, { -703.485413f, -185.734299f, 461.314697f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2000833, 4303324, 4, { -721.744019f, -185.531204f, 478.978302f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2000834, 4303325, 4, { -704.359924f, -185.731995f, 498.390015f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2000831, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f );
-      instance->registerEObj( "Unknown6", 2002538, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f );
-      instance->registerEObj( "Unknown7", 2000828, 4305491, 4, { 212.974304f, 75.866501f, -0.668073f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000829, 0, 4, { 215.905304f, 76.000000f, -0.131676f }, 0.700000f );
-      instance->registerEObj( "Unknown9", 2000822, 4305462, 4, { -135.017593f, -103.976402f, -1.129792f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000823, 0, 4, { -129.654205f, -104.027000f, -0.290400f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000826, 4305555, 4, { -216.218002f, -103.997398f, -3.836082f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000827, 0, 4, { -208.879593f, -103.997398f, -0.252325f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000848, 0, 4, { -577.757813f, -268.000000f, 218.871399f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000876, 4317513, 4, { 180.458893f, 76.089233f, -0.360356f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000976, 0, 4, { 180.548401f, 76.089943f, 0.959593f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2001134, 4326317, 4, { -166.447800f, -104.221901f, 16.976521f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2001135, 4326381, 4, { -196.318497f, -104.078903f, -0.786835f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2001766, 4175265, 4, { -570.270081f, -268.000000f, 217.461197f }, 1.000000f );
-      instance->registerEObj( "仮シド指令", 2000806, 0, 4, { 217.957397f, 46.000000f, -11.597380f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000851, 0, 4, { 133.745193f, 22.964720f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2000852, 0, 4, { 134.477707f, 7.614197f, -0.045776f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2000856, 0, 4, { 145.769394f, 21.988159f, 7.095398f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2000813, 0, 4, { 136.430801f, 22.354429f, -0.137390f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2000858, 0, 4, { 121.995796f, -104.020798f, 3.707886f }, 0.991760f );
-      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 12.002250f, -107.811699f, -78.686447f }, 2.578735f );
-      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 108.952103f, -106.029999f, -7.573757f }, 2.578735f );
-      instance->registerEObj( "Unknown19", 2000791, 4118536, 4, { 226.850998f, 155.775497f, 3.640267f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2000836, 4178897, 4, { 230.933899f, 156.818100f, 25.887810f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000792, 0, 4, { 240.527893f, 155.626495f, 4.989798f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2000793, 4243244, 4, { 187.994705f, 152.227097f, -80.103348f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2000794, 4178131, 4, { 157.029907f, 155.725204f, -56.634510f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2000795, 4118533, 4, { 171.986206f, 160.259903f, -32.392151f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2000796, 4317691, 4, { 177.690002f, 155.500000f, -35.500401f }, 1.000000f );
-      instance->registerEObj( "Imperialidentificationkey", 2000837, 0, 4, { 226.065094f, 155.807800f, 7.053694f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2000855, 4178132, 4, { 224.098007f, 156.000000f, -26.999870f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2000845, 4316977, 4, { 221.255707f, 156.000000f, 6.591867f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2001145, 4329956, 4, { 196.345398f, 186.275101f, -3.980006f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2001146, 4329960, 4, { 196.312805f, 155.999893f, 4.083439f }, 1.000000f );
-      instance->registerEObj( "Magitektransporter", 2001147, 0, 4, { 204.421494f, 120.000000f, -60.006229f }, 1.000000f );
-      instance->registerEObj( "Magitektransporter", 2001148, 0, 4, { 228.831696f, 71.500000f, -28.156210f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2002628, 4305528, 4, { 221.126099f, 153.428696f, -69.269623f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2000871, 0, 4, { 174.414993f, 102.515198f, -88.973930f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2000797, 4118552, 4, { 227.155396f, 72.000000f, -43.219952f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2000798, 4119463, 4, { 190.957703f, 72.355438f, -64.773132f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000799, 0, 4, { 268.474396f, 67.031410f, -49.967129f }, 0.991760f );
-      instance->registerEObj( "Imperialidentificationkey", 2000838, 0, 4, { 263.129395f, 66.381569f, -71.274437f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2000667, 4119461, 4, { 271.022614f, 68.049881f, -45.787529f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2000800, 4124814, 4, { 237.461395f, 72.250000f, 33.809959f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2000843, 4119464, 4, { 190.731094f, 67.877243f, -85.008949f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2000844, 0, 4, { 254.749405f, 72.098747f, -36.545410f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2000841, 0, 4, { 234.100006f, 72.101990f, -5.516209f }, 1.000000f );
-      instance->registerEObj( "Imperialidentificationkey", 2000840, 0, 4, { 242.130798f, 72.250000f, 26.153481f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2000842, 4186210, 4, { 224.041794f, 75.715820f, -0.347510f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000802, 4299253, 4, { 177.904907f, 76.066162f, -5.569580f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2000803, 0, 4, { 173.805496f, 76.081238f, 4.123073f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2000804, 4175899, 4, { 172.537292f, 76.600563f, -0.941921f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000849, 0, 4, { 173.793900f, 47.632881f, 4.163035f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2001020, 4119459, 4, { 236.713104f, 68.589233f, 77.256348f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2001021, 4119458, 4, { 214.862198f, 47.531738f, 39.169922f }, 0.991760f );
-      instance->registerEObj( "Unknown39", 2000877, 4317555, 4, { 178.867599f, 76.089233f, -0.117565f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2000878, 4317536, 4, { 168.665405f, 46.519169f, 1.801311f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2002629, 4305536, 4, { 241.707993f, 66.877907f, -82.835068f }, 0.991760f );
-      instance->registerEObj( "Unknown42", 2002630, 4305537, 4, { 112.046898f, 67.002319f, 46.555180f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2000805, 4299251, 4, { 167.034500f, 46.199989f, 8.192681f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2000811, 4175901, 4, { 149.577499f, 46.799969f, -30.579741f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2000807, 4309445, 4, { 146.929092f, 45.975342f, -50.736271f }, 0.991760f );
-      instance->registerEObj( "Identificationkeyreader", 2000808, 4182427, 4, { 128.409805f, 47.799999f, -49.366180f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000809, 4298905, 4, { 150.029999f, 46.723068f, -39.001339f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000810, 0, 4, { 154.199600f, 46.894550f, -34.215000f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2000812, 4119481, 4, { 208.043594f, 43.053101f, 0.003599f }, 1.000000f );
-      instance->registerEObj( "Imperialidentificationkey", 2000839, 0, 4, { 155.484695f, 46.000000f, -57.763378f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2000850, 0, 4, { 154.192307f, 101.909103f, -34.226189f }, 0.991760f );
-      instance->registerEObj( "Magitekterminal", 2000857, 0, 4, { 142.995895f, 46.047619f, -53.038639f }, 0.991760f );
-      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 140.619904f, 102.000000f, -50.628609f }, 2.600000f );
-      instance->registerEObj( "Magitekterminal", 2000904, 4298910, 4, { 150.108398f, 102.204201f, -39.998730f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2000879, 4317581, 4, { 145.143005f, 46.118488f, -33.631050f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2000880, 4317584, 4, { 144.416595f, 102.000000f, -35.715260f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2002539, 4323543, 4, { 191.892395f, 46.000000f, -42.993431f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2001205, 0, 4, { 134.810394f, 21.910000f, -0.001021f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2001205, 0, 4, { 133.078400f, -102.979202f, 0.123506f }, 1.000000f );
-      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 129.111298f, 68.261063f, -59.929440f }, 2.578735f );
-      instance->registerEObj( "Unknown51", 2000815, 4190796, 4, { 81.888397f, -107.400002f, -45.959042f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2000816, 4323560, 4, { 38.618160f, -107.400002f, -72.955917f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2000817, 4190794, 4, { 37.580742f, -107.400002f, -70.481018f }, 1.000000f );
-      instance->registerEObj( "Unknown54", 2000819, 4323562, 4, { -38.041451f, -103.786201f, 0.069122f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2000818, 4200594, 4, { -31.718330f, -103.400002f, 2.561740f }, 1.000000f );
-      instance->registerEObj( "Unknown56", 2000820, 4190789, 4, { -31.696360f, -103.400002f, -2.409777f }, 1.000000f );
-      instance->registerEObj( "Unknown57", 2000821, 4189149, 4, { -68.916000f, -102.759399f, -0.015143f }, 0.991760f );
-      instance->registerEObj( "Unknown58", 2000824, 4119565, 4, { -184.609695f, -104.221901f, -2.135104f }, 1.000000f );
-      instance->registerEObj( "Magitekterminal", 2000825, 0, 4, { -238.152893f, -104.051300f, -19.744539f }, 0.991760f );
-      instance->registerEObj( "Unknown59", 2000854, 4119564, 4, { -117.637398f, -103.993301f, 0.252331f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000853, 0, 4, { -228.197906f, -103.997398f, 0.789458f }, 0.991760f );
-      instance->registerEObj( "Unknown60", 2000814, 4323557, 4, { 84.611214f, -107.408302f, -51.255131f }, 0.991760f );
-      instance->registerEObj( "Unknown61", 2001138, 4125125, 4, { -249.059494f, -104.000000f, -3.238936f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000846, 0, 4, { -787.271912f, -344.000000f, 2.392201f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000847, 0, 4, { -787.513977f, -344.014587f, -1.791996f }, 1.000000f );
-      instance->registerEObj( "PortaDecumanaentryway", 2001045, 0, 4, { -792.387329f, -343.440887f, -0.126096f }, 1.500000f );
-      instance->registerEObj( "Unknown62", 2001139, 4328790, 4, { -765.431274f, -343.997589f, 1.749690f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2000787, 0, 4, { 147.015701f, 186.100006f, -4.199400f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000788, 0, 4, { -721.074524f, -185.731598f, 478.324890f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000789, 0, 4, { 167.870895f, 186.000000f, -0.104399f }, 1.000000f );
-      instance->registerEObj( "Unknown64", 2000790, 4301608, 4, { 152.054794f, 187.039200f, 3.392751f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000789, 0, 4, { -237.161896f, -104.020897f, -21.575460f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000789, 0, 4, { 115.949501f, 67.588867f, -74.186333f }, 0.991760f );
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000828, 4305694, 4, { -784.536987f, -344.000000f, 0.121873f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2000829, 0, 4, { -781.198120f, -344.000000f, 0.127798f }, 0.900000f, -1.570451f ); 
+      instance->registerEObj( "Shortcut", 2000848, 0, 4, { -788.420593f, -400.046387f, -601.281189f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2000832, 4303065, 4, { -703.485413f, -185.734299f, 461.314697f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2000833, 4303324, 4, { -721.744019f, -185.531204f, 478.978302f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2000834, 4303325, 4, { -704.359924f, -185.731995f, 498.390015f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2000831, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f, -1.570451f ); 
+      instance->registerEObj( "unknown_5", 2002538, 0, 4, { -781.198120f, -344.000000f, 0.127800f }, 0.900000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000828, 4305491, 4, { 212.974304f, 75.866501f, -0.668073f }, 1.000000f, 1.568613f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_6", 2000829, 0, 4, { 215.905304f, 76.000000f, -0.131676f }, 0.700000f, 1.568640f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000822, 4305462, 4, { -135.017593f, -103.976402f, -1.129792f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2000823, 0, 4, { -129.654205f, -104.027000f, -0.290400f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2000826, 4305555, 4, { -216.218002f, -103.997398f, -3.836082f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_8", 2000827, 0, 4, { -208.879593f, -103.997398f, -0.252325f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "Shortcut_1", 2000848, 0, 4, { -577.757812f, -268.000000f, 218.871399f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w1d5_bossA_lvd_b0118", 2000876, 4317513, 4, { 180.458893f, 76.089233f, -0.360356f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_9", 2000976, 0, 4, { 180.548401f, 76.089943f, 0.959593f }, 1.000000f, -0.000248f ); 
+      instance->registerEObj( "sgvf_w_btl_b0216", 2001134, 4326317, 4, { -166.447800f, -104.221901f, 16.976521f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2001135, 4326381, 4, { -196.318497f, -104.078903f, -0.786835f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_10", 2001766, 4175265, 4, { -570.270081f, -268.000000f, 217.461197f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "仮シド指令", 2000806, 0, 4, { 217.957397f, 46.000000f, -11.597380f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal", 2000851, 0, 4, { 133.745193f, 22.964720f, -0.015320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal_1", 2000852, 0, 4, { 134.477707f, 7.614197f, -0.045776f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal_2", 2000856, 0, 4, { 145.769394f, 21.988159f, 7.095398f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_11", 2000813, 0, 4, { 136.430801f, 22.354429f, -0.137390f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal_3", 2000858, 0, 4, { 121.995796f, -104.020798f, 3.707886f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekarmor", 2000872, 0, 4, { 12.002250f, -107.811699f, -78.686447f }, 2.578735f, -1.562172f ); 
+      instance->registerEObj( "Magitekarmor_1", 2000872, 0, 4, { 108.952103f, -106.029999f, -7.573757f }, 2.578735f, -0.369535f ); 
+      instance->registerEObj( "unknown_12", 2000791, 4118536, 4, { 226.850998f, 155.775497f, 3.640267f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2000836, 4178897, 4, { 230.933899f, 156.818100f, 25.887810f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_4", 2000792, 0, 4, { 240.527893f, 155.626495f, 4.989798f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_14", 2000793, 4243244, 4, { 187.994705f, 152.227097f, -80.103348f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2000794, 4178131, 4, { 157.029907f, 155.725204f, -56.634510f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2000795, 4118533, 4, { 171.986206f, 160.259903f, -32.392151f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_transparent06", 2000796, 4317691, 4, { 177.690002f, 155.500000f, -35.500401f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Imperialidentificationkey", 2000837, 0, 4, { 226.065094f, 155.807800f, 7.053694f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2000855, 4178132, 4, { 224.098007f, 156.000000f, -26.999870f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_transparent04", 2000845, 4316977, 4, { 221.255707f, 156.000000f, 6.591867f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_5", 2001145, 4329956, 4, { 196.345398f, 186.275101f, -3.980006f }, 1.000000f, 0.000000f ); 
+      // States -> ele_off ele_on 
+      instance->registerEObj( "Magitekterminal_6", 2001146, 4329960, 4, { 196.312805f, 155.999893f, 4.083439f }, 1.000000f, 0.000000f ); 
+      // States -> ele_off ele_on 
+      instance->registerEObj( "Magitektransporter", 2001147, 0, 4, { 204.421494f, 120.000000f, -60.006229f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitektransporter_1", 2001148, 0, 4, { 228.831696f, 71.500000f, -28.156210f }, 1.000000f, 0.827528f ); 
+      instance->registerEObj( "unknown_18", 2002628, 4305528, 4, { 221.126099f, 153.428696f, -69.269623f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2000871, 0, 4, { 174.414993f, 102.515198f, -88.973930f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2000797, 4118552, 4, { 227.155396f, 72.000000f, -43.219952f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2000798, 4119463, 4, { 190.957703f, 72.355438f, -64.773132f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_7", 2000799, 0, 4, { 268.474396f, 67.031410f, -49.967129f }, 0.991760f, -0.501567f ); 
+      instance->registerEObj( "Imperialidentificationkey_1", 2000838, 0, 4, { 263.129395f, 66.381569f, -71.274437f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2000667, 4119461, 4, { 271.022614f, 68.049881f, -45.787529f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_23", 2000800, 4124814, 4, { 237.461395f, 72.250000f, 33.809959f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2000843, 4119464, 4, { 190.731094f, 67.877243f, -85.008949f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_25", 2000844, 0, 4, { 254.749405f, 72.098747f, -36.545410f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal_8", 2000841, 0, 4, { 234.100006f, 72.101990f, -5.516209f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Imperialidentificationkey_2", 2000840, 0, 4, { 242.130798f, 72.250000f, 26.153481f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_26", 2000842, 4186210, 4, { 224.041794f, 75.715820f, -0.347510f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_9", 2000802, 4299253, 4, { 177.904907f, 76.066162f, -5.569580f }, 0.991760f, -0.010379f ); 
+      instance->registerEObj( "Magitekterminal_10", 2000803, 0, 4, { 173.805496f, 76.081238f, 4.123073f }, 1.000000f, 0.729448f ); 
+      instance->registerEObj( "unknown_27", 2000804, 4175899, 4, { 172.537292f, 76.600563f, -0.941921f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_11", 2000849, 0, 4, { 173.793900f, 47.632881f, 4.163035f }, 0.991760f, 0.694225f ); 
+      instance->registerEObj( "unknown_28", 2001020, 4119459, 4, { 236.713104f, 68.589233f, 77.256348f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_29", 2001021, 4119458, 4, { 214.862198f, 47.531738f, 39.169922f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_transparent05", 2000877, 4317555, 4, { 178.867599f, 76.089233f, -0.117565f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_transparent05_1", 2000878, 4317536, 4, { 168.665405f, 46.519169f, 1.801311f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_30", 2002629, 4305536, 4, { 241.707993f, 66.877907f, -82.835068f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_31", 2002630, 4305537, 4, { 112.046898f, 67.002319f, 46.555180f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal_12", 2000805, 4299251, 4, { 167.034500f, 46.199989f, 8.192681f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_32", 2000811, 4175901, 4, { 149.577499f, 46.799969f, -30.579741f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_33", 2000807, 4309445, 4, { 146.929092f, 45.975342f, -50.736271f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Identificationkeyreader", 2000808, 4182427, 4, { 128.409805f, 47.799999f, -49.366180f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_13", 2000809, 4298905, 4, { 150.029999f, 46.723068f, -39.001339f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_14", 2000810, 0, 4, { 154.199600f, 46.894550f, -34.215000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_34", 2000812, 4119481, 4, { 208.043594f, 43.053101f, 0.003599f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Imperialidentificationkey_3", 2000839, 0, 4, { 155.484695f, 46.000000f, -57.763378f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal_15", 2000850, 0, 4, { 154.192307f, 101.909103f, -34.226189f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal_16", 2000857, 0, 4, { 142.995895f, 46.047619f, -53.038639f }, 0.991760f, -0.743907f ); 
+      instance->registerEObj( "Magitekarmor_2", 2000872, 0, 4, { 140.619904f, 102.000000f, -50.628609f }, 2.600000f, -0.817672f ); 
+      instance->registerEObj( "Magitekterminal_17", 2000904, 4298910, 4, { 150.108398f, 102.204201f, -39.998730f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_transparent05_2", 2000879, 4317581, 4, { 145.143005f, 46.118488f, -33.631050f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_transparent05_3", 2000880, 4317584, 4, { 144.416595f, 102.000000f, -35.715260f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_35", 2002539, 4323543, 4, { 191.892395f, 46.000000f, -42.993431f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_36", 2001205, 0, 4, { 134.810394f, 21.910000f, -0.001021f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_37", 2001205, 0, 4, { 133.078400f, -102.979202f, 0.123506f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekarmor_3", 2000872, 0, 4, { 129.111298f, 68.261063f, -59.929440f }, 2.578735f, -0.094404f ); 
+      instance->registerEObj( "unknown_38", 2000815, 4190796, 4, { 81.888397f, -107.400002f, -45.959042f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_transparent05_4", 2000816, 4323560, 4, { 38.618160f, -107.400002f, -72.955917f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_39", 2000817, 4190794, 4, { 37.580742f, -107.400002f, -70.481018f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_transparent05_5", 2000819, 4323562, 4, { -38.041451f, -103.786201f, 0.069122f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_40", 2000818, 4200594, 4, { -31.718330f, -103.400002f, 2.561740f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_41", 2000820, 4190789, 4, { -31.696360f, -103.400002f, -2.409777f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_42", 2000821, 4189149, 4, { -68.916000f, -102.759399f, -0.015143f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_43", 2000824, 4119565, 4, { -184.609695f, -104.221901f, -2.135104f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekterminal_18", 2000825, 0, 4, { -238.152893f, -104.051300f, -19.744539f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_44", 2000854, 4119564, 4, { -117.637398f, -103.993301f, 0.252331f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut_2", 2000853, 0, 4, { -228.197906f, -103.997398f, 0.789458f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_transparent05_6", 2000814, 4323557, 4, { 84.611214f, -107.408302f, -51.255131f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_45", 2001138, 4125125, 4, { -249.059494f, -104.000000f, -3.238936f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut_3", 2000846, 0, 4, { -787.271912f, -344.000000f, 2.392201f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut_4", 2000847, 0, 4, { -787.513977f, -344.014587f, -1.791996f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "PortaDecumanaentryway", 2001045, 0, 4, { -792.387329f, -343.440887f, -0.126096f }, 1.500000f, -1.570451f ); 
+      instance->registerEObj( "sgbg_w1d5_q6_lift2", 2001139, 4328790, 4, { -765.431274f, -343.997589f, 1.749690f }, 1.000000f, 0.000000f ); 
+      // States -> down_Ncut arrival_Ncut upstairs gate1_open gate1_close gate2_open gate2_close start stop ele_off ele_on down_Ncut_hide hide 
+      instance->registerEObj( "unknown_46", 2000787, 0, 4, { 147.015701f, 186.100006f, -4.199400f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000788, 0, 4, { -721.074524f, -185.731598f, 478.324890f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut_5", 2000789, 0, 4, { 167.870895f, 186.000000f, -0.104399f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000790, 4301608, 5, { 152.054794f, 187.039200f, 3.392751f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut_6", 2000789, 0, 4, { -237.161896f, -104.020897f, -21.575460f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut_7", 2000789, 0, 4, { 115.949501f, 67.588867f, -74.186333f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
index 3a315a5d..ddc6d6dc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
@@ -10,34 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6819364, 4, { -44.318520f, 7.751197f, 441.540314f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -44.500000f, 7.751200f, 442.849213f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -44.500000f, 7.751197f, 479.639496f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007807, 6538465, 4, { -47.414162f, 7.761197f, 460.423798f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007808, 0, 4, { -47.907341f, 7.761197f, 468.566406f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6799021, 4, { -0.932950f, 2.896456f, -244.606796f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007805, 6799028, 4, { -3.967087f, 2.901603f, -197.601196f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -0.941400f, 2.840884f, -239.721100f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002872, 6815429, 4, { -2.123292f, 4.050672f, 57.244740f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007805, 6815430, 4, { -8.575331f, 3.826778f, 103.254997f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002735, 0, 4, { -1.497813f, 4.446609f, 60.548241f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007793, 6532641, 4, { 2.243042f, 18.326050f, -408.926514f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2007794, 6563600, 4, { 41.646648f, 2.171033f, -286.870514f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007796, 6532642, 4, { 3.723403f, 2.665442f, -271.541992f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007800, 6532643, 4, { -60.279049f, 11.703340f, -43.075298f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007792, 6532645, 4, { -22.236191f, 16.347031f, 23.168619f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007809, 0, 4, { 22.290779f, 4.298793f, -79.014076f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007801, 6531305, 4, { -9.013880f, 2.088060f, 112.314201f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007802, 6531303, 4, { -11.146170f, 0.410454f, 129.890305f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007803, 6536676, 4, { -27.389811f, -1.621430f, 174.494598f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007804, 6536677, 4, { 8.575519f, -2.552741f, 200.835098f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007795, 6536431, 4, { 14.781270f, -3.423584f, 241.748199f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007797, 6786442, 4, { 11.182830f, 9.875385f, 302.008087f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007798, 6786460, 4, { -44.133888f, 5.932619f, 395.955688f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007799, 6516590, 4, { -45.003849f, 7.341055f, 413.088501f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6793848, 5, { 0.380240f, 21.347240f, -469.744507f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 0.000000f, 21.511560f, -462.178009f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
index 971df89c..5e9597ae 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
@@ -10,31 +10,44 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000611, 0, 4, { 0.015198f, 0.350891f, -246.784195f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2001869, 4239670, 4, { -0.000510f, 3.949623f, 307.392395f }, 2.000000f );
-      instance->registerEObj( "Unknown2", 2001870, 0, 4, { 0.015198f, 3.949618f, 317.179199f }, 0.991760f );
-      instance->registerEObj( "Exit", 2001871, 4239710, 4, { 0.004404f, 0.076945f, -268.716095f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001872, 4239719, 4, { -0.106873f, 3.860474f, 136.491898f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2001873, 4239720, 4, { -0.625671f, 3.829956f, 136.461395f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2001874, 4239769, 4, { 20.620710f, 3.949919f, -80.003052f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2001875, 4239782, 4, { 20.559681f, 3.949919f, -80.277771f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2001876, 4239833, 4, { -0.197872f, 4.844441f, -223.182404f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001877, 4239838, 4, { 0.816688f, 4.854907f, -223.199707f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.484173f, 4.000121f, 298.130005f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001878, 4239736, 4, { 0.228821f, 3.982544f, 95.231567f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2001879, 4239917, 4, { -0.137390f, -0.076355f, -90.104553f }, 0.991760f );
-      instance->registerEObj( "Strongroomgate", 2001880, 4172415, 4, { -0.022534f, 4.052033f, -215.388901f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2001881, 4240140, 4, { 24.443140f, -0.000003f, -16.325529f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2001882, 4240143, 4, { 24.207170f, -0.386616f, -119.586502f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2001883, 4240145, 4, { 24.277100f, -0.015320f, -168.047699f }, 0.991760f );
-      instance->registerEObj( "Bertha", 2001884, 0, 4, { 56.748291f, 4.989685f, -86.472900f }, 0.991760f );
-      instance->registerEObj( "Bertha", 2001885, 0, 4, { 58.899940f, 4.989685f, -79.857857f }, 0.991760f );
-      instance->registerEObj( "Bertha", 2001886, 0, 4, { 56.935600f, 5.003687f, -73.150261f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2002618, 4334349, 4, { -0.221096f, 4.007471f, 137.674500f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2002618, 4334437, 4, { 0.000000f, 5.259686f, -221.867004f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002618, 4334925, 4, { -0.016311f, 0.434590f, -224.636993f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2002618, 4334973, 4, { 0.117383f, 0.135054f, -224.822800f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2000611, 0, 4, { 0.015198f, 0.350891f, -246.784195f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2001869, 4239670, 5, { -0.000510f, 3.949623f, 307.392395f }, 2.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_1", 2001870, 0, 4, { 0.015198f, 3.949618f, 317.179199f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit", 2001871, 4239710, 4, { 0.004404f, 0.076945f, -268.716095f }, 1.000000f, 0.000000f ); 
+      // States -> vf_htras1_on vf_htras1_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2001872, 4239719, 4, { -0.106873f, 3.860474f, 136.491898f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_r1d1", 2001873, 4239720, 4, { -0.625671f, 3.829956f, 136.461395f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001874, 4239769, 4, { 20.620710f, 3.949919f, -80.003052f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001875, 4239782, 4, { 20.559681f, 3.949919f, -80.277771f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_2", 2001876, 4239833, 4, { -0.197872f, 4.844441f, -223.182404f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_r1d1_1", 2001877, 4239838, 4, { 0.816688f, 4.854907f, -223.199707f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.484173f, 4.000121f, 298.130005f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1d1_t1_fwal1", 2001878, 4239736, 4, { 0.228821f, 3.982544f, 95.231567f }, 0.991760f, 0.000048f ); 
+      // States -> fire_on fire_of 
+      instance->registerEObj( "sgbg_r1d1_t1_fwal1_1", 2001879, 4239917, 4, { -0.137390f, -0.076355f, -90.104553f }, 0.991760f, 0.000048f ); 
+      // States -> fire_on fire_of 
+      instance->registerEObj( "Strongroomgate", 2001880, 4172415, 4, { -0.022534f, 4.052033f, -215.388901f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_r1d1_b0172", 2001881, 4240140, 4, { 24.443140f, -0.000003f, -16.325529f }, 1.000000f, 0.000000f ); 
+      // States -> snow_of snow_on 
+      instance->registerEObj( "sgvf_r1d1_b0172_1", 2001882, 4240143, 4, { 24.207170f, -0.386616f, -119.586502f }, 1.000000f, 0.000000f ); 
+      // States -> snow_of snow_on 
+      instance->registerEObj( "sgvf_r1d1_b0172_2", 2001883, 4240145, 4, { 24.277100f, -0.015320f, -168.047699f }, 0.991760f, 0.000048f ); 
+      // States -> snow_of snow_on 
+      instance->registerEObj( "Bertha", 2001884, 0, 4, { 56.748291f, 4.989685f, -86.472900f }, 0.991760f, 1.040362f ); 
+      instance->registerEObj( "Bertha_1", 2001885, 0, 4, { 58.899940f, 4.989685f, -79.857857f }, 0.991760f, 1.535637f ); 
+      instance->registerEObj( "Bertha_2", 2001886, 0, 4, { 56.935600f, 5.003687f, -73.150261f }, 0.991760f, 1.076136f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 4334349, 4, { -0.221096f, 4.007471f, 137.674500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only_1", 2002618, 4334437, 4, { 0.000000f, 5.259686f, -221.867004f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only_2", 2002618, 4334925, 4, { -0.016311f, 0.434590f, -224.636993f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only_3", 2002618, 4334973, 4, { 0.117383f, 0.135054f, -224.822800f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
index 8d3c26bc..5a13d57a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
@@ -10,27 +10,37 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -138.305603f, -7.970538f, -56.005821f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -103.660202f, -7.970543f, -55.945332f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 4724293, 4, { -105.613098f, -7.970541f, -56.019131f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -47.933350f, -3.938287f, 35.426449f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2002872, 4725733, 4, { -47.291790f, -3.999902f, 33.349419f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 4725734, 4, { -38.530239f, -3.999901f, 23.897659f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -0.189037f, 3.895030f, -223.430893f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 4724833, 4, { 0.361240f, 3.879290f, -226.177200f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001869, 4559005, 4, { 131.881805f, 4.081586f, 116.103600f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.577202f, 8.000000f, 113.037003f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2002872, 4864542, 4, { -24.639549f, -0.050003f, 47.771549f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004182, 4933921, 4, { -0.990592f, 0.027524f, 96.986580f }, 1.000000f );
-      instance->registerEObj( "Bertha", 2003540, 0, 4, { 31.943810f, 0.326915f, -151.623703f }, 1.000000f );
-      instance->registerEObj( "Bertha", 2003541, 0, 4, { 34.257309f, 0.068675f, -143.886703f }, 1.000000f );
-      instance->registerEObj( "Bertha", 2003542, 0, 4, { 31.738079f, 0.068675f, -136.270004f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2003543, 4635871, 4, { 24.398520f, -0.049999f, -178.281799f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2003544, 4724326, 4, { -7.216811f, 0.000001f, -183.345200f }, 1.000000f );
-      instance->registerEObj( "Mainstoragevaultgate", 2003547, 4556427, 4, { -96.021538f, -1.183108f, -56.314732f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004183, 4933927, 4, { -48.010059f, -0.050043f, -85.297096f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004184, 4947920, 4, { -43.944740f, -0.050000f, -96.101196f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -138.305603f, -7.970538f, -56.005821f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -103.660202f, -7.970543f, -55.945332f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 4724293, 4, { -105.613098f, -7.970541f, -56.019131f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { -47.933350f, -3.938287f, 35.426449f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4725733, 4, { -47.291790f, -3.999902f, 33.349419f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_r1d2_b0442", 2002872, 4725734, 4, { -38.530239f, -3.999901f, 23.897659f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on vf_fire_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { -0.189037f, 3.895030f, -223.430893f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4724833, 4, { 0.361240f, 3.879290f, -226.177200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Entrance", 2001869, 4559005, 5, { 131.881805f, 4.081586f, 116.103600f }, 1.000000f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 113.577202f, 8.000000f, 113.037003f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_r1d2_b0442_1", 2002872, 4864542, 4, { -24.639549f, -0.050003f, 47.771549f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on vf_fire_of 
+      instance->registerEObj( "sgvf_r1d2_b0442_2", 2004182, 4933921, 4, { -0.990592f, 0.027524f, 96.986580f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on vf_fire_of 
+      instance->registerEObj( "Bertha", 2003540, 0, 4, { 31.943810f, 0.326915f, -151.623703f }, 1.000000f, -1.363030f ); 
+      instance->registerEObj( "Bertha_1", 2003541, 0, 4, { 34.257309f, 0.068675f, -143.886703f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "Bertha_2", 2003542, 0, 4, { 31.738079f, 0.068675f, -136.270004f }, 1.000000f, -1.400810f ); 
+      instance->registerEObj( "unknown_3", 2003543, 4635871, 4, { 24.398520f, -0.049999f, -178.281799f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_r1d2_b0442_3", 2003544, 4724326, 4, { -7.216811f, 0.000001f, -183.345200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on vf_fire_of 
+      instance->registerEObj( "Mainstoragevaultgate", 2003547, 4556427, 4, { -96.021538f, -1.183108f, -56.314732f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_r1d2_b0442_4", 2004183, 4933927, 4, { -48.010059f, -0.050043f, -85.297096f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on vf_fire_of 
+      instance->registerEObj( "sgvf_r1d2_b0442_5", 2004184, 4947920, 4, { -43.944740f, -0.050000f, -96.101196f }, 1.000000f, 0.000000f ); 
+      // States -> vf_fire_on vf_fire_of 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
index 2a868e9c..5d21fa02 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
@@ -10,62 +10,70 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000413, 0, 4, { -211.000000f, 0.000002f, 2.000000f }, 1.000000f );
-      instance->registerEObj( "TheWarden", 2000414, 0, 4, { -111.221802f, 14.346200f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "TheFlameofMagic", 2000415, 3878710, 4, { 8.987488f, -17.399031f, 53.998150f }, 1.000000f );
-      instance->registerEObj( "TheFruitofKnowledge", 2000416, 3878713, 4, { 9.005134f, -17.409531f, -53.991970f }, 1.000000f );
-      instance->registerEObj( "TheGemofAffluence", 2000417, 3878714, 4, { -151.210800f, -10.391200f, -62.004131f }, 1.000000f );
-      instance->registerEObj( "TheHelmofMight", 2000418, 3878715, 4, { -151.162506f, -7.407125f, 61.966801f }, 1.000000f );
-      instance->registerEObj( "Stonepedestal", 2000419, 0, 4, { 117.361099f, -3.708839f, -23.835030f }, 1.000000f );
-      instance->registerEObj( "DoortotheVaultofAether", 2000420, 3692635, 4, { 125.343102f, -0.964693f, -20.363819f }, 1.000000f );
-      instance->registerEObj( "Stonepedestal", 2000421, 0, 4, { 117.353203f, -3.713329f, 23.859619f }, 1.000000f );
-      instance->registerEObj( "DoortotheVaultofSecrets", 2000422, 3692636, 4, { 125.292603f, -1.268839f, 20.414270f }, 1.000000f );
-      instance->registerEObj( "Stonepedestal", 2000423, 0, 4, { 61.900841f, -17.710569f, 22.327250f }, 1.000000f );
-      instance->registerEObj( "DoortotheVaultofWealth", 2000424, 3692634, 4, { 70.569122f, -15.302040f, 21.475040f }, 1.000000f );
-      instance->registerEObj( "Stonepedestal", 2000425, 0, 4, { 61.907928f, -17.695210f, -22.335239f }, 1.000000f );
-      instance->registerEObj( "DoortotheVaultofSteel", 2000426, 3692631, 4, { 70.709091f, -15.224650f, -21.394239f }, 1.000000f );
-      instance->registerEObj( "Leftpan", 2000427, 0, 4, { 190.478394f, -4.200000f, -0.796000f }, 1.000000f );
-      instance->registerEObj( "ThePathtoRetribution", 2000429, 3692668, 4, { 206.461700f, 0.128704f, 0.089424f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000430, 3693498, 4, { 191.008408f, -0.694424f, -14.489020f }, 1.000000f );
-      instance->registerEObj( "Sealeddoor", 2000431, 3692650, 4, { -9.500046f, -15.008410f, 0.079636f }, 1.000000f );
-      instance->registerEObj( "Sealeddoor", 2000432, 3689141, 4, { 9.008017f, -16.388670f, -27.499990f }, 1.000000f );
-      instance->registerEObj( "Sealeddoor", 2000433, 3692625, 4, { 8.971441f, -16.420650f, 27.488810f }, 1.000000f );
-      instance->registerEObj( "Sealedentryway", 2000434, 3692683, 4, { 75.484787f, -8.687153f, 0.065771f }, 1.000000f );
-      instance->registerEObj( "Sealeddoor", 2000435, 3692667, 4, { 132.458893f, -1.129695f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "InnerSanctumgate", 2000436, 3689097, 4, { -62.922180f, -9.678907f, -43.500019f }, 1.000000f );
-      instance->registerEObj( "LowerSanctumgate", 2000437, 3692684, 4, { 48.112701f, -45.229740f, 19.500000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4208417, 5, { -202.000000f, 0.000002f, 2.000000f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -173.000000f, 12.000000f, 4.500000f }, 1.000000f );
-      instance->registerEObj( "Rightpan", 2000428, 0, 4, { 190.478394f, -4.200000f, 0.831205f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000443, 4208428, 4, { -96.278473f, -11.750040f, -58.418720f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000444, 0, 4, { -95.744789f, -11.997100f, -61.865219f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000445, 4208432, 4, { 65.669456f, -45.004108f, -34.907001f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000446, 0, 4, { 68.223022f, -44.998901f, -35.050049f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2000447, 4208435, 4, { 208.815399f, -4.000029f, 3.424202f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000448, 0, 4, { 208.268402f, -4.000159f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 255.000000f, -3.999998f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "TheScalesofJudgment", 2000658, 0, 4, { 190.569901f, -2.364499f, 0.034341f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001156, 4069463, 4, { 190.000000f, -4.000078f, -0.800000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2001157, 4069468, 4, { 190.000000f, -4.000021f, 0.800000f }, 1.000000f );
-      instance->registerEObj( "Leftpan", 2001165, 0, 4, { 190.478394f, -4.170000f, -0.796000f }, 1.000000f );
-      instance->registerEObj( "Rightpan", 2001166, 0, 4, { 190.478394f, -4.170000f, 0.831200f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2001765, 4334159, 4, { -10.000000f, -18.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000281, 4323974, 4, { 228.750000f, -3.999998f, -9.250000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000281, 4323976, 4, { 247.250000f, -3.999998f, -9.250000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000281, 4323978, 4, { 228.750000f, -3.999998f, 9.250000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2000281, 4323979, 4, { 247.250000f, -3.999998f, 9.250000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2000655, 3947232, 4, { 225.699997f, -2.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2000656, 3947235, 4, { 238.000000f, -2.000000f, 12.250000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2000657, 3947234, 4, { 238.000000f, -2.000000f, -12.250000f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2000866, 4309073, 4, { -82.750000f, -11.000000f, -61.680000f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2000867, 4309075, 4, { -69.175003f, -11.000000f, -52.720001f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2000868, 4309074, 4, { -55.514999f, -11.000000f, -61.680000f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2000650, 3879215, 4, { -20.000000f, -16.500000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2000651, 3879238, 4, { 9.000000f, -17.000000f, -15.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2000652, 3879240, 4, { 9.000000f, -17.000000f, 15.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2000653, 3879241, 4, { 50.000000f, -17.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2000654, 3879249, 4, { 124.500000f, -2.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2000413, 0, 4, { -211.000000f, 0.000002f, 2.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "TheWarden", 2000414, 0, 4, { -111.221802f, 14.346200f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "TheFlameofMagic", 2000415, 3878710, 4, { 8.987488f, -17.399031f, 53.998150f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "TheFruitofKnowledge", 2000416, 3878713, 4, { 9.005134f, -17.409531f, -53.991970f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "TheGemofAffluence", 2000417, 3878714, 4, { -151.210800f, -10.391200f, -62.004131f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "TheHelmofMight", 2000418, 3878715, 4, { -151.162506f, -7.407125f, 61.966801f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Stonepedestal", 2000419, 0, 4, { 117.361099f, -3.708839f, -23.835030f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "DoortotheVaultofAether", 2000420, 3692635, 4, { 125.343102f, -0.964693f, -20.363819f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Stonepedestal_1", 2000421, 0, 4, { 117.353203f, -3.713329f, 23.859619f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "DoortotheVaultofSecrets", 2000422, 3692636, 4, { 125.292603f, -1.268839f, 20.414270f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Stonepedestal_2", 2000423, 0, 4, { 61.900841f, -17.710569f, 22.327250f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "DoortotheVaultofWealth", 2000424, 3692634, 4, { 70.569122f, -15.302040f, 21.475040f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Stonepedestal_3", 2000425, 0, 4, { 61.907928f, -17.695210f, -22.335239f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "DoortotheVaultofSteel", 2000426, 3692631, 4, { 70.709091f, -15.224650f, -21.394239f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Leftpan", 2000427, 0, 4, { 190.478394f, -4.200000f, -0.796000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "ThePathtoRetribution", 2000429, 3692668, 4, { 206.461700f, 0.128704f, 0.089424f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2000430, 3693498, 4, { 191.008408f, -0.694424f, -14.489020f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sealeddoor", 2000431, 3692650, 4, { -9.500046f, -15.008410f, 0.079636f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sealeddoor_1", 2000432, 3689141, 4, { 9.008017f, -16.388670f, -27.499990f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sealeddoor_2", 2000433, 3692625, 4, { 8.971441f, -16.420650f, 27.488810f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sealedentryway", 2000434, 3692683, 4, { 75.484787f, -8.687153f, 0.065771f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sealeddoor_3", 2000435, 3692667, 4, { 132.458893f, -1.129695f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "InnerSanctumgate", 2000436, 3689097, 4, { -62.922180f, -9.678907f, -43.500019f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "LowerSanctumgate", 2000437, 3692684, 4, { 48.112701f, -45.229740f, 19.500000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4208417, 5, { -202.000000f, 0.000002f, 2.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -173.000000f, 12.000000f, 4.500000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Rightpan", 2000428, 0, 4, { 190.478394f, -4.200000f, 0.831205f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000443, 4208428, 4, { -96.278473f, -11.750040f, -58.418720f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2000444, 0, 4, { -95.744789f, -11.997100f, -61.865219f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2000445, 4208432, 4, { 65.669456f, -45.004108f, -34.907001f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_3", 2000446, 0, 4, { 68.223022f, -44.998901f, -35.050049f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_b0250_w1d3", 2000447, 4208435, 4, { 208.815399f, -4.000029f, 3.424202f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_4", 2000448, 0, 4, { 208.268402f, -4.000159f, 0.000000f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 255.000000f, -3.999998f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "TheScalesofJudgment", 2000658, 0, 4, { 190.569901f, -2.364499f, 0.034341f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_5", 2001156, 4069463, 4, { 190.000000f, -4.000078f, -0.800000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001157, 4069468, 4, { 190.000000f, -4.000021f, 0.800000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Leftpan_1", 2001165, 0, 4, { 190.478394f, -4.170000f, -0.796000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Rightpan_1", 2001166, 0, 4, { 190.478394f, -4.170000f, 0.831200f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_w_lvd_w1d3_wall", 2001765, 4334159, 4, { -10.000000f, -18.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0197", 2000281, 4323974, 4, { 228.750000f, -3.999998f, -9.250000f }, 1.000000f, 0.000000f ); 
+      // States -> floor_on floor_of wall_on wall_of col_0f 
+      instance->registerEObj( "sgvf_w_btl_b0197_1", 2000281, 4323976, 4, { 247.250000f, -3.999998f, -9.250000f }, 1.000000f, 0.000000f ); 
+      // States -> floor_on floor_of wall_on wall_of col_0f 
+      instance->registerEObj( "sgvf_w_btl_b0197_2", 2000281, 4323978, 4, { 228.750000f, -3.999998f, 9.250000f }, 1.000000f, 0.000000f ); 
+      // States -> floor_on floor_of wall_on wall_of col_0f 
+      instance->registerEObj( "sgvf_w_btl_b0197_3", 2000281, 4323979, 4, { 247.250000f, -3.999998f, 9.250000f }, 1.000000f, 0.000000f ); 
+      // States -> floor_on floor_of wall_on wall_of col_0f 
+      instance->registerEObj( "unknown_7", 2000655, 3947232, 4, { 225.699997f, -2.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000656, 3947235, 4, { 238.000000f, -2.000000f, 12.250000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2000657, 3947234, 4, { 238.000000f, -2.000000f, -12.250000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000866, 4309073, 4, { -82.750000f, -11.000000f, -61.680000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000867, 4309075, 4, { -69.175003f, -11.000000f, -52.720001f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2000868, 4309074, 4, { -55.514999f, -11.000000f, -61.680000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2000650, 3879215, 4, { -20.000000f, -16.500000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2000651, 3879238, 4, { 9.000000f, -17.000000f, -15.500000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2000652, 3879240, 4, { 9.000000f, -17.000000f, 15.500000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2000653, 3879241, 4, { 50.000000f, -17.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2000654, 3879249, 4, { 124.500000f, -2.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
index 5d4b010e..b4596d34 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
@@ -10,53 +10,61 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4876828, 5, { -201.196701f, 0.682657f, 0.238411f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000603, 0, 4, { -172.011398f, 12.472960f, 3.615232f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 128.831894f, -3.999020f, -0.076355f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2004381, 4688136, 4, { -62.950489f, -9.042180f, -43.471519f }, 1.000000f );
-      instance->registerEObj( "Lockeddoor", 2004382, 4686911, 4, { -52.102619f, -15.747660f, 0.003015f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004383, 4880940, 4, { -32.646118f, -15.322760f, -0.535999f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004384, 4688144, 4, { -9.445859f, -15.431120f, 0.091173f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { -24.503120f, -51.014042f, -2.151611f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002872, 4877209, 4, { -24.127260f, -49.149910f, -1.216785f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2004385, 4877211, 4, { -33.270012f, -49.495350f, -17.436060f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2004576, 4880984, 4, { -32.350761f, -15.369120f, 1.208490f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004386, 4877345, 4, { 47.455811f, -46.541481f, 18.191370f }, 1.000000f );
-      instance->registerEObj( "Lockeddoor", 2004388, 4688151, 4, { 166.535797f, -43.147060f, 0.015993f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2004402, 4877619, 4, { 213.946701f, -42.801571f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2004389, 4688148, 4, { 207.414703f, -1.759183f, 0.009065f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 256.782104f, -3.999999f, 0.025025f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002872, 4877953, 4, { 257.319305f, -2.265031f, 0.350891f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2004431, 4879695, 4, { 218.928802f, -2.699499f, 0.015198f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2004391, 4742442, 4, { -44.851521f, -16.474951f, -61.569599f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2004392, 4742441, 4, { -34.082909f, -16.222090f, -39.745499f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2004403, 4688145, 4, { -9.412401f, -14.700150f, -48.979301f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2004393, 4685534, 4, { 13.954340f, -16.478741f, -36.432899f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2004394, 4688137, 4, { 8.975560f, -14.432130f, -28.492041f }, 0.991760f );
-      instance->registerEObj( "Magickedpedestal", 2004396, 4688166, 4, { 53.655460f, -15.371500f, 0.015198f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2004397, 4688139, 4, { 70.286049f, -14.700250f, -20.531210f }, 0.991760f );
-      instance->registerEObj( "Magickedpedestal", 2004398, 4685848, 4, { 79.511627f, -15.096250f, -36.674881f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2004399, 4688140, 4, { 70.381950f, -14.689050f, 20.486361f }, 0.991760f );
-      instance->registerEObj( "Magickedpedestal", 2004400, 4685849, 4, { 79.392357f, -14.749610f, 36.721691f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2002872, 4981816, 4, { 97.856079f, -4.013123f, -1.052917f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2004772, 4878447, 4, { 98.950607f, -4.000012f, -2.245166f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2004602, 0, 4, { 133.195908f, -4.013123f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2004603, 0, 4, { 133.195908f, -4.013123f, 12.924380f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2004709, 0, 4, { 128.074203f, -4.000000f, 18.223900f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2004710, 0, 4, { 115.087196f, -4.000000f, 18.223900f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2004711, 0, 4, { 102.068398f, -4.000000f, 18.223900f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2004712, 0, 4, { 97.276253f, -4.013123f, 12.893800f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2004713, 0, 4, { 97.276253f, -4.013123f, -0.045776f }, 0.991760f );
-      instance->registerEObj( "Unknown30", 2004714, 0, 4, { 97.293999f, -4.000000f, -12.961500f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2004715, 0, 4, { 102.037003f, -4.013123f, -17.868410f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2004716, 0, 4, { 115.069099f, -4.000000f, -17.860500f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2004717, 0, 4, { 128.038498f, -4.013123f, -17.898861f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2004718, 0, 4, { 133.195908f, -4.013123f, -12.954960f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2004604, 0, 4, { 130.266205f, -4.013123f, 15.518430f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2004719, 0, 4, { 99.982773f, -4.000000f, 15.879740f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2004720, 0, 4, { 100.288803f, -4.000000f, -15.013530f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2004721, 0, 4, { 130.501694f, -4.000000f, -14.939790f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4876828, 5, { -201.196701f, 0.682657f, 0.238411f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000603, 0, 4, { -172.011398f, 12.472960f, 3.615232f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 128.831894f, -3.999020f, -0.076355f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_0", 2004381, 4688136, 4, { -62.950489f, -9.042180f, -43.471519f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Lockeddoor", 2004382, 4686911, 4, { -52.102619f, -15.747660f, 0.003015f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004383, 4880940, 4, { -32.646118f, -15.322760f, -0.535999f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004384, 4688144, 4, { -9.445859f, -15.431120f, 0.091173f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2002735, 0, 4, { -24.503120f, -51.014042f, -2.151611f }, 0.991760f, 1.469946f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4877209, 4, { -24.127260f, -49.149910f, -1.216785f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2004385, 4877211, 4, { -33.270012f, -49.495350f, -17.436060f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_4", 2004576, 4880984, 4, { -32.350761f, -15.369120f, 1.208490f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w1d8_b0492", 2004386, 4877345, 4, { 47.455811f, -46.541481f, 18.191370f }, 1.000000f, 0.000000f ); 
+      // States -> vf_wall_off vf_wall_fade vf_wall_on 
+      instance->registerEObj( "Lockeddoor_1", 2004388, 4688151, 4, { 166.535797f, -43.147060f, 0.015993f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w1d8_b0492_1", 2004402, 4877619, 4, { 213.946701f, -42.801571f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_wall_off vf_wall_fade vf_wall_on 
+      instance->registerEObj( "unknown_5", 2004389, 4688148, 4, { 207.414703f, -1.759183f, 0.009065f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2002735, 0, 4, { 256.782104f, -3.999999f, 0.025025f }, 1.000000f, 1.556998f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4877953, 4, { 257.319305f, -2.265031f, 0.350891f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2004431, 4879695, 4, { 218.928802f, -2.699499f, 0.015198f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2004391, 4742442, 4, { -44.851521f, -16.474951f, -61.569599f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_8", 2004392, 4742441, 4, { -34.082909f, -16.222090f, -39.745499f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2004403, 4688145, 4, { -9.412401f, -14.700150f, -48.979301f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2004393, 4685534, 4, { 13.954340f, -16.478741f, -36.432899f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_11", 2004394, 4688137, 4, { 8.975560f, -14.432130f, -28.492041f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magickedpedestal", 2004396, 4688166, 4, { 53.655460f, -15.371500f, 0.015198f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2004397, 4688139, 4, { 70.286049f, -14.700250f, -20.531210f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magickedpedestal_1", 2004398, 4685848, 4, { 79.511627f, -15.096250f, -36.674881f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_13", 2004399, 4688140, 4, { 70.381950f, -14.689050f, 20.486361f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magickedpedestal_2", 2004400, 4685849, 4, { 79.392357f, -14.749610f, 36.721691f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w1d8_b0118_boss_wall", 2002872, 4981816, 4, { 97.856079f, -4.013123f, -1.052917f }, 0.991760f, 0.000048f ); 
+      // States -> on off 
+      instance->registerEObj( "sgpl_w1d8_b0094_boss_line", 2004772, 4878447, 4, { 98.950607f, -4.000012f, -2.245166f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2004602, 0, 4, { 133.195908f, -4.013123f, -0.015320f }, 0.991760f, 1.570451f ); 
+      instance->registerEObj( "unknown_15", 2004603, 0, 4, { 133.195908f, -4.013123f, 12.924380f }, 0.991760f, 1.570451f ); 
+      instance->registerEObj( "unknown_16", 2004709, 0, 4, { 128.074203f, -4.000000f, 18.223900f }, 1.000000f, 0.000488f ); 
+      instance->registerEObj( "unknown_17", 2004710, 0, 4, { 115.087196f, -4.000000f, 18.223900f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2004711, 0, 4, { 102.068398f, -4.000000f, 18.223900f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2004712, 0, 4, { 97.276253f, -4.013123f, 12.893800f }, 0.991760f, -1.570451f ); 
+      instance->registerEObj( "unknown_20", 2004713, 0, 4, { 97.276253f, -4.013123f, -0.045776f }, 0.991760f, -1.570451f ); 
+      instance->registerEObj( "unknown_21", 2004714, 0, 4, { 97.293999f, -4.000000f, -12.961500f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "unknown_22", 2004715, 0, 4, { 102.037003f, -4.013123f, -17.868410f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_23", 2004716, 0, 4, { 115.069099f, -4.000000f, -17.860500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2004717, 0, 4, { 128.038498f, -4.013123f, -17.898861f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_25", 2004718, 0, 4, { 133.195908f, -4.013123f, -12.954960f }, 0.991760f, 1.570451f ); 
+      instance->registerEObj( "unknown_26", 2004604, 0, 4, { 130.266205f, -4.013123f, 15.518430f }, 0.991760f, 0.785937f ); 
+      instance->registerEObj( "unknown_27", 2004719, 0, 4, { 99.982773f, -4.000000f, 15.879740f }, 1.000000f, -0.785398f ); 
+      instance->registerEObj( "unknown_28", 2004720, 0, 4, { 100.288803f, -4.000000f, -15.013530f }, 1.000000f, -0.785398f ); 
+      instance->registerEObj( "unknown_29", 2004721, 0, 4, { 130.501694f, -4.000000f, -14.939790f }, 1.000000f, 0.785398f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
index 428a67b1..a6c5c9dd 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
@@ -10,27 +10,38 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Cultistorb", 2000061, 3816929, 4, { -8.115554f, 31.427530f, -15.950320f }, 1.000000f );
-      instance->registerEObj( "Cultistorb", 2000062, 3817025, 4, { -22.784361f, 25.526300f, 20.482220f }, 1.000000f );
-      instance->registerEObj( "Sealedbarrier", 2000060, 2065984, 4, { -103.196800f, 16.825590f, 15.152160f }, 0.950000f );
-      instance->registerEObj( "Cultistrosary", 2000057, 0, 4, { -179.952606f, 14.711600f, -4.996500f }, 0.750000f );
-      instance->registerEObj( "Cultistorb", 2000063, 3817039, 4, { -89.733833f, 15.701490f, 13.923830f }, 0.991789f );
-      instance->registerEObj( "Cultistorb", 2000067, 3817052, 4, { -94.766899f, 15.709600f, 3.820237f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2000054, 0, 4, { -53.345570f, 49.647820f, -146.799103f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f );
-      instance->registerEObj( "Unknown2", 2001697, 4108043, 4, { 13.157160f, 29.280100f, -7.370761f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001698, 4108046, 4, { -18.524361f, 23.342850f, 42.375740f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001699, 4108055, 4, { 19.811380f, 30.119770f, -20.717630f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001700, 0, 4, { 19.739401f, 30.119801f, -19.838511f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001701, 4108071, 4, { -3.087158f, 23.754129f, 40.895020f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001702, 0, 4, { -3.984208f, 23.754129f, 41.874859f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001703, 4108078, 4, { -95.779678f, 14.524550f, 45.017761f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001704, 0, 4, { -97.035683f, 14.524550f, 44.317101f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2001741, 3860684, 4, { -64.365189f, 15.049010f, -4.720837f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f );
-      instance->registerEObj( "Entrance", 2000182, 4108136, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f );
+      instance->registerEObj( "Cultistorb", 2000061, 3816929, 4, { -8.115554f, 31.427530f, -15.950320f }, 1.000000f, -1.570451f ); 
+      // States -> vf_beam1_on vf_beam1_off all_off 
+      instance->registerEObj( "Cultistorb_1", 2000062, 3817025, 4, { -22.784361f, 25.526300f, 20.482220f }, 1.000000f, -0.625840f ); 
+      // States -> vf_beam2_off vf_beam2_on all_off 
+      instance->registerEObj( "Sealedbarrier", 2000060, 2065984, 4, { -103.196800f, 16.825590f, 15.152160f }, 0.950000f, -1.044062f ); 
+      instance->registerEObj( "Cultistrosary", 2000057, 0, 4, { -179.952606f, 14.711600f, -4.996500f }, 0.750000f, -1.570796f ); 
+      instance->registerEObj( "Cultistorb_2", 2000063, 3817039, 4, { -89.733833f, 15.701490f, 13.923830f }, 0.991789f, 0.925052f ); 
+      // States -> vf_beam3_off vf_beam3_on all_off 
+      instance->registerEObj( "Cultistorb_3", 2000067, 3817052, 4, { -94.766899f, 15.709600f, 3.820237f }, 1.000000f, 1.227256f ); 
+      // States -> vf_beam3_off vf_beam3_on all_off 
+      instance->registerEObj( "unknown_0", 2000054, 0, 4, { -53.345570f, 49.647820f, -146.799103f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f, 1.095248f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001697, 4108043, 4, { 13.157160f, 29.280100f, -7.370761f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001698, 4108046, 4, { -18.524361f, 23.342850f, 42.375740f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001699, 4108055, 4, { 19.811380f, 30.119770f, -20.717630f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2001700, 0, 4, { 19.739401f, 30.119801f, -19.838511f }, 1.000000f, 1.409320f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2001701, 4108071, 4, { -3.087158f, 23.754129f, 40.895020f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_3", 2001702, 0, 4, { -3.984208f, 23.754129f, 41.874859f }, 1.000000f, -0.675014f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2001703, 4108078, 4, { -95.779678f, 14.524550f, 45.017761f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_4", 2001704, 0, 4, { -97.035683f, 14.524550f, 44.317101f }, 1.000000f, 0.656244f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_5", 2001741, 3860684, 4, { -64.365189f, 15.049010f, -4.720837f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f, 0.000144f ); 
+      instance->registerEObj( "Entrance", 2000182, 4108136, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
index b873a31b..4db8149d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
@@ -10,58 +10,85 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f );
-      instance->registerEObj( "Unknown1", 2002872, 4660133, 4, { -67.088028f, 14.657070f, -5.210713f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004286, 4745117, 4, { -60.778740f, 14.055000f, -22.019831f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004287, 4745111, 4, { -42.778549f, 14.055000f, -12.943500f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004288, 4745124, 4, { -48.035992f, 14.055000f, -5.265638f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004289, 4745125, 4, { -57.996319f, 14.055000f, -5.661358f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2004290, 4745126, 4, { -59.234348f, 14.055000f, -15.781390f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004291, 4745127, 4, { -50.008671f, 14.055000f, -22.601339f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004285, 4867481, 4, { -55.031620f, 14.055000f, 5.443754f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004285, 4867482, 4, { -41.704861f, 14.055000f, 2.969403f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004285, 4867483, 4, { -33.780270f, 14.055000f, -9.729918f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004285, 4867484, 4, { -39.301521f, 14.055000f, -26.615370f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004285, 4867485, 4, { -55.347961f, 14.055000f, -30.450310f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004285, 4867486, 4, { -65.834686f, 14.055000f, -19.944820f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2002872, 4660142, 4, { 19.425310f, 16.400459f, 72.640419f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2004084, 4660138, 4, { 47.314381f, 16.403030f, 108.679100f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002735, 0, 4, { 20.629601f, 16.280300f, 75.420700f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2002735, 0, 4, { 88.048500f, 22.493870f, -21.533701f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2002872, 4660145, 4, { 88.376717f, 21.338551f, -19.283840f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2004285, 4771300, 4, { 84.103310f, 22.101000f, -58.390091f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2004285, 4771301, 4, { 96.234253f, 22.101000f, -56.482040f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2004285, 4771302, 4, { 105.255798f, 22.101000f, -44.764778f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2004285, 4771303, 4, { 102.038200f, 22.101000f, -32.837021f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2004285, 4771304, 4, { 91.888603f, 22.101000f, -25.882389f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2004285, 4771305, 4, { 80.039169f, 22.101000f, -26.985500f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2004285, 4771306, 4, { 71.290688f, 22.101000f, -37.049461f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2004285, 4771307, 4, { 71.819580f, 22.079769f, -49.945210f }, 0.991760f );
-      instance->registerEObj( "Tornfolio", 2004297, 0, 4, { -47.454521f, 44.378349f, -68.195801f }, 0.991760f );
-      instance->registerEObj( "Tornfolio", 2004298, 0, 4, { -11.833840f, 29.549919f, -15.995260f }, 1.000000f );
-      instance->registerEObj( "Tornfolio", 2004299, 0, 4, { -28.185230f, 24.286421f, 20.665119f }, 0.991760f );
-      instance->registerEObj( "Tornfolio", 2004300, 0, 4, { 72.129387f, 16.396311f, 132.066803f }, 0.991760f );
-      instance->registerEObj( "Tornfolio", 2004301, 0, 4, { 80.744392f, 16.907101f, 57.719940f }, 1.000000f );
-      instance->registerEObj( "Tornfolio", 2004302, 0, 4, { 147.103104f, 18.005850f, 69.150192f }, 1.000000f );
-      instance->registerEObj( "Tornfolio", 2004303, 0, 4, { -147.644699f, 15.900680f, 113.328697f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2004086, 4656964, 4, { -7.602334f, 30.454849f, -18.853220f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2004088, 4656965, 4, { -20.840630f, 24.342739f, 19.409069f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2004087, 4671678, 4, { 11.105700f, 29.275560f, -8.141251f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2004089, 4671683, 4, { -6.673915f, 23.630680f, 39.042259f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2004093, 4671679, 4, { 74.836761f, 16.445829f, 108.252800f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2004094, 4671680, 4, { 100.083900f, 17.257870f, 47.440189f }, 0.991760f );
-      instance->registerEObj( "Defiledcoffin", 2004090, 4695648, 4, { 78.676689f, 17.793221f, 150.248901f }, 1.000000f );
-      instance->registerEObj( "Defiledcoffin", 2004091, 4671204, 4, { 72.424454f, 18.387079f, 48.386349f }, 0.991760f );
-      instance->registerEObj( "Defiledcoffin", 2004092, 4668899, 4, { 146.684906f, 17.990360f, 69.562866f }, 0.991760f );
-      instance->registerEObj( "Aetherialflow", 2004095, 4696055, 4, { 96.409500f, 22.100000f, -49.506569f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2004099, 0, 4, { -85.344437f, 15.048210f, 7.188452f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2004096, 4656966, 4, { -89.972237f, 14.236630f, 16.250851f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2004097, 4656967, 4, { -97.824608f, 14.083040f, 2.446555f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2004098, 4660132, 4, { -89.234444f, 13.859010f, 8.573526f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f );
-      instance->registerEObj( "Entrance", 2000182, 4660224, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2001085, 0, 4, { -68.771881f, 15.144450f, -3.840616f }, 0.539465f, 1.095248f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4660133, 4, { -67.088028f, 14.657070f, -5.210713f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2004286, 4745117, 4, { -60.778740f, 14.055000f, -22.019831f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004287, 4745111, 4, { -42.778549f, 14.055000f, -12.943500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2004288, 4745124, 4, { -48.035992f, 14.055000f, -5.265638f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2004289, 4745125, 4, { -57.996319f, 14.055000f, -5.661358f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2004290, 4745126, 4, { -59.234348f, 14.055000f, -15.781390f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2004291, 4745127, 4, { -50.008671f, 14.055000f, -22.601339f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_void01_large", 2004285, 4867481, 4, { -55.031620f, 14.055000f, 5.443754f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_1", 2004285, 4867482, 4, { -41.704861f, 14.055000f, 2.969403f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_2", 2004285, 4867483, 4, { -33.780270f, 14.055000f, -9.729918f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_3", 2004285, 4867484, 4, { -39.301521f, 14.055000f, -26.615370f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_4", 2004285, 4867485, 4, { -55.347961f, 14.055000f, -30.450310f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_5", 2004285, 4867486, 4, { -65.834686f, 14.055000f, -19.944820f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4660142, 4, { 19.425310f, 16.400459f, 72.640419f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2004084, 4660138, 4, { 47.314381f, 16.403030f, 108.679100f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2002735, 0, 4, { 20.629601f, 16.280300f, 75.420700f }, 1.000000f, 0.688908f ); 
+      instance->registerEObj( "unknown_8", 2002735, 0, 4, { 88.048500f, 22.493870f, -21.533701f }, 1.000000f, -0.001870f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 4660145, 4, { 88.376717f, 21.338551f, -19.283840f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_6", 2004285, 4771300, 4, { 84.103310f, 22.101000f, -58.390091f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_7", 2004285, 4771301, 4, { 96.234253f, 22.101000f, -56.482040f }, 1.000000f, 0.723667f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_8", 2004285, 4771302, 4, { 105.255798f, 22.101000f, -44.764778f }, 1.000000f, 1.518654f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_9", 2004285, 4771303, 4, { 102.038200f, 22.101000f, -32.837021f }, 1.000000f, 0.857277f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_10", 2004285, 4771304, 4, { 91.888603f, 22.101000f, -25.882389f }, 1.000000f, -0.007381f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_11", 2004285, 4771305, 4, { 80.039169f, 22.101000f, -26.985500f }, 1.000000f, -0.690998f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_12", 2004285, 4771306, 4, { 71.290688f, 22.101000f, -37.049461f }, 1.000000f, -1.482906f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgpl_w_lvd_void01_large_13", 2004285, 4771307, 4, { 71.819580f, 22.079769f, -49.945210f }, 0.991760f, -0.798114f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "Tornfolio", 2004297, 0, 4, { -47.454521f, 44.378349f, -68.195801f }, 0.991760f, -1.194174f ); 
+      instance->registerEObj( "Tornfolio_1", 2004298, 0, 4, { -11.833840f, 29.549919f, -15.995260f }, 1.000000f, 1.058869f ); 
+      instance->registerEObj( "Tornfolio_2", 2004299, 0, 4, { -28.185230f, 24.286421f, 20.665119f }, 0.991760f, -0.909425f ); 
+      instance->registerEObj( "Tornfolio_3", 2004300, 0, 4, { 72.129387f, 16.396311f, 132.066803f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Tornfolio_4", 2004301, 0, 4, { 80.744392f, 16.907101f, 57.719940f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Tornfolio_5", 2004302, 0, 4, { 147.103104f, 18.005850f, 69.150192f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Tornfolio_6", 2004303, 0, 4, { -147.644699f, 15.900680f, 113.328697f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2004086, 4656964, 4, { -7.602334f, 30.454849f, -18.853220f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2004088, 4656965, 4, { -20.840630f, 24.342739f, 19.409069f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1d6_lvd_barr1", 2004087, 4671678, 4, { 11.105700f, 29.275560f, -8.141251f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgbg_f1d6_barr2", 2004089, 4671683, 4, { -6.673915f, 23.630680f, 39.042259f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgbg_f1d6_barr1", 2004093, 4671679, 4, { 74.836761f, 16.445829f, 108.252800f }, 1.000000f, 0.000000f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "sgbg_f1d6_barr1_1", 2004094, 4671680, 4, { 100.083900f, 17.257870f, 47.440189f }, 0.991760f, 0.000048f ); 
+      // States -> vfx_on vfx_off 
+      instance->registerEObj( "Defiledcoffin", 2004090, 4695648, 4, { 78.676689f, 17.793221f, 150.248901f }, 1.000000f, 0.000000f ); 
+      // States -> vf_moya_on vf_moya_off vf_moya_off2 
+      instance->registerEObj( "Defiledcoffin_1", 2004091, 4671204, 4, { 72.424454f, 18.387079f, 48.386349f }, 0.991760f, 0.000048f ); 
+      // States -> vf_moya_on vf_moya_off vf_moya_off2 
+      instance->registerEObj( "Defiledcoffin_2", 2004092, 4668899, 4, { 146.684906f, 17.990360f, 69.562866f }, 0.991760f, 0.000048f ); 
+      // States -> vf_moya_on vf_moya_off vf_moya_off2 
+      instance->registerEObj( "Aetherialflow", 2004095, 4696055, 4, { 96.409500f, 22.100000f, -49.506569f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2004099, 0, 4, { -85.344437f, 15.048210f, 7.188452f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2004096, 4656966, 4, { -89.972237f, 14.236630f, 16.250851f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_13", 2004097, 4656967, 4, { -97.824608f, 14.083040f, 2.446555f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_f1b6_b0446", 2004098, 4660132, 4, { -89.234444f, 13.859010f, 8.573526f }, 1.000000f, 0.000000f ); 
+      // States -> mayu_on mayu_off mayu_off_anim 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -42.771080f, 14.067750f, -17.288521f }, 0.991789f, 0.000144f ); 
+      instance->registerEObj( "Entrance", 2000182, 4660224, 5, { -57.606178f, 49.507038f, -142.170105f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -57.755428f, 47.653931f, -120.622597f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
index c0d03daf..368ccd22 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
@@ -10,44 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 423.422485f, 65.445923f, 441.737213f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002872, 6797376, 4, { 423.331299f, 65.474983f, 444.327301f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 6797378, 4, { 442.370697f, 65.474983f, 460.851013f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { -249.873398f, 296.000000f, -77.899078f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6797503, 4, { -249.992004f, 296.000000f, -75.599426f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6797504, 4, { -250.001602f, 296.000000f, -116.498398f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2008209, 6769836, 4, { -249.829300f, 296.000000f, -95.249687f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { -249.652893f, 275.999908f, -441.789886f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2002872, 6797511, 4, { -249.766495f, 275.999603f, -438.543091f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 380.357208f, 48.477909f, 199.450607f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6797015, 5, { 384.232910f, 48.477909f, 190.203598f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -250.049606f, 275.999908f, -476.951202f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2007880, 6741864, 4, { 336.278503f, 53.817650f, 313.365601f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007881, 6653501, 4, { 424.189697f, 65.474983f, 415.504608f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007882, 6797118, 4, { 339.809296f, 54.757198f, 321.431305f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2007883, 6742023, 4, { 363.048401f, 59.017422f, 336.516998f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007884, 6742029, 4, { 377.123596f, 62.271931f, 343.185791f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007885, 6797120, 4, { 384.602997f, 66.764778f, 371.233795f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007886, 6797121, 4, { 410.327301f, 66.278519f, 376.253693f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007887, 6797122, 4, { 424.830414f, 66.366417f, 401.730988f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007888, 6765334, 4, { -344.965302f, 288.858490f, 3.678721f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007889, 6779339, 4, { -250.141205f, 295.979187f, -44.449520f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2008288, 6852038, 4, { -371.378693f, 270.328491f, 112.430801f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2008288, 6852040, 4, { -371.275787f, 270.243988f, 109.578796f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2008288, 6852041, 4, { -370.932190f, 270.135010f, 106.583000f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2008288, 6852045, 4, { -371.375702f, 270.360413f, 99.153847f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2008288, 6852043, 4, { -370.707001f, 270.230713f, 95.389702f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2008288, 6852044, 4, { -370.509613f, 270.239685f, 92.297852f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2008288, 6773554, 4, { -365.927399f, 288.163910f, 5.884438f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2008288, 6852047, 4, { -362.804993f, 288.071808f, 5.945870f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2008288, 6852048, 4, { -359.589600f, 287.859314f, 5.824460f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2008288, 6852051, 4, { -352.795807f, 287.719910f, 5.701195f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2008288, 6852050, 4, { -349.930786f, 287.818604f, 5.373718f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2008288, 6852052, 4, { -346.784210f, 287.961914f, 5.057184f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2007890, 6796543, 4, { -226.703293f, 299.977112f, -260.456207f }, 0.991760f );
-      instance->registerEObj( "Unknown33", 2007891, 6796598, 4, { -250.507401f, 292.000000f, -384.725800f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2007892, 6771621, 4, { -250.875107f, 292.000000f, -436.964691f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
index c16f8ee7..e7beb440 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
@@ -10,57 +10,60 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000404, 0, 4, { 216.937500f, -35.568851f, -142.076797f }, 0.961304f );
-      instance->registerEObj( "Unknown1", 2000133, 0, 4, { 185.564896f, -34.195511f, -144.640305f }, 0.900235f );
-      instance->registerEObj( "Exit", 2000683, 0, 4, { 237.565506f, -38.900299f, -144.195099f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000041, 3879345, 4, { 191.261795f, -36.122822f, -143.910904f }, 1.267374f );
-      instance->registerEObj( "Unknown3", 2000040, 0, 4, { 191.150696f, -36.117340f, -144.592300f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001005, 0, 4, { 188.864594f, -35.987011f, -144.216095f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000131, 4126014, 4, { -117.593002f, -4.171226f, 107.608299f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2000132, 4127292, 4, { -76.504066f, -8.171217f, -41.161350f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000137, 4127387, 4, { -119.798599f, -4.165526f, 104.508904f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2000138, 4127414, 4, { -78.310173f, -8.133030f, -44.002850f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001152, 4374098, 4, { 197.405899f, -39.475101f, -147.966705f }, 0.991760f );
-      instance->registerEObj( "Waterstainednote", 2000093, 0, 4, { -241.596100f, 4.936373f, -72.770317f }, 0.930753f );
-      instance->registerEObj( "Waterstainednote", 2000094, 0, 4, { -211.121002f, 2.082635f, -67.117737f }, 0.991789f );
-      instance->registerEObj( "Waterstainednote", 2000095, 0, 4, { -204.427002f, -1.617569f, 21.831829f }, 1.000000f );
-      instance->registerEObj( "Waterstainednote", 2000096, 0, 4, { -149.074097f, -2.569309f, 101.795403f }, 0.930753f );
-      instance->registerEObj( "Magitekphotocell", 2000100, 0, 4, { -202.105804f, 0.318934f, -79.179108f }, 0.991789f );
-      instance->registerEObj( "Magitekphotocell", 2000101, 0, 4, { -221.659195f, -4.425579f, 54.985451f }, 0.869717f );
-      instance->registerEObj( "Magitekphotocell", 2000102, 0, 4, { -204.699799f, -4.926546f, 88.822723f }, 0.900235f );
-      instance->registerEObj( "Magitekphotocell", 2000103, 0, 4, { -104.023300f, -3.463795f, 104.075897f }, 0.839199f );
-      instance->registerEObj( "Magitekterminal", 2000116, 0, 4, { -112.013199f, -4.132327f, 112.031403f }, 0.991789f );
-      instance->registerEObj( "Unknown10", 2000117, 1699196, 4, { -95.990372f, -4.125101f, 111.985901f }, 0.991789f );
-      instance->registerEObj( "Magitekterminal", 2000118, 0, 4, { -80.026077f, -8.132326f, -47.971760f }, 0.961271f );
-      instance->registerEObj( "Unknown11", 2000121, 1699201, 4, { -95.538803f, -8.133920f, -48.020191f }, 0.991789f );
-      instance->registerEObj( "Accusationchamberdoor", 2000384, 3302267, 4, { -207.996994f, 0.110343f, -95.749359f }, 0.961271f );
-      instance->registerEObj( "Abacinationchamberdoor", 2000385, 3302270, 4, { 96.210892f, -19.927860f, -112.002098f }, 0.961271f );
-      instance->registerEObj( "Unknown12", 2000389, 3302276, 4, { -223.993698f, 2.170142f, -111.314598f }, 0.900235f );
-      instance->registerEObj( "Unknown13", 2000390, 3302281, 4, { 15.396310f, -12.161490f, -31.967699f }, 0.961271f );
-      instance->registerEObj( "Unknown14", 2000391, 3302277, 4, { -111.986000f, -11.694670f, -63.677799f }, 0.961271f );
-      instance->registerEObj( "Unknown15", 2000392, 3302279, 4, { -54.326931f, -12.619540f, -135.517899f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2000393, 3302283, 4, { 127.918297f, -24.124969f, -112.616798f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2000397, 3302282, 4, { -66.330208f, -8.057444f, -48.020191f }, 0.961271f );
-      instance->registerEObj( "Unknown18", 2000398, 3302278, 4, { -103.188698f, -12.587360f, -137.701004f }, 0.991789f );
-      instance->registerEObj( "Unknown19", 2000399, 3302280, 4, { -7.119315f, -12.783910f, -137.865402f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2000400, 3302275, 4, { 175.723206f, -34.137970f, -140.074005f }, 0.930753f );
-      instance->registerEObj( "Magitekphotocell", 2000104, 0, 4, { -130.358597f, -8.977930f, -71.240982f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2000111, 0, 4, { -221.057495f, -0.076355f, -113.847603f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2000112, 0, 4, { 18.393040f, -12.250300f, -28.183680f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2000113, 0, 4, { -109.852501f, -11.441870f, -58.962391f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2000114, 0, 4, { -55.111301f, -12.534730f, -140.141006f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2000115, 0, 4, { 121.910698f, -23.325809f, -110.515297f }, 1.000000f );
-      instance->registerEObj( "Magitekphotocell", 2000105, 0, 4, { -130.724106f, -9.414856f, -68.131592f }, 0.991760f );
-      instance->registerEObj( "Magitekphotocell", 2000106, 0, 4, { -130.418900f, -9.567444f, -67.856873f }, 0.991760f );
-      instance->registerEObj( "Magitekphotocell", 2000107, 0, 4, { -130.101807f, -9.739193f, -67.526657f }, 0.991789f );
-      instance->registerEObj( "Magitekphotocell", 2000107, 0, 4, { -129.796707f, -9.914070f, -67.221481f }, 0.991789f );
-      instance->registerEObj( "Magitekphotocell", 2000039, 0, 4, { -73.754570f, -6.333896f, 21.536640f }, 0.991789f );
-      instance->registerEObj( "Magitekphotocell", 2000108, 0, 4, { -186.655807f, -0.160111f, -10.531350f }, 1.000000f );
-      instance->registerEObj( "Magitekphotocell", 2000109, 0, 4, { -143.922195f, 0.079653f, 1.801933f }, 0.961271f );
-      instance->registerEObj( "Magitekphotocell", 2000110, 0, 4, { -233.539398f, -0.167908f, -103.013702f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -311.485504f, 9.496978f, -76.989082f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4127435, 5, { -322.238495f, 11.991770f, -78.470192f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2000404, 0, 4, { 216.937500f, -35.568851f, -142.076797f }, 0.961304f, 0.000144f ); 
+      instance->registerEObj( "unknown_1", 2000133, 0, 4, { 185.564896f, -34.195511f, -144.640305f }, 0.900235f, 0.000336f ); 
+      instance->registerEObj( "Exit", 2000683, 0, 4, { 237.565506f, -38.900299f, -144.195099f }, 1.000000f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000041, 3879345, 4, { 191.261795f, -36.122822f, -143.910904f }, 1.267374f, -1.570451f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2000040, 0, 4, { 191.150696f, -36.117340f, -144.592300f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "unknown_3", 2001005, 0, 4, { 188.864594f, -35.987011f, -144.216095f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1r1_subboss1line", 2000131, 4126014, 4, { -117.593002f, -4.171226f, 107.608299f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_f1r1_subboss2line", 2000132, 4127292, 4, { -76.504066f, -8.171217f, -41.161350f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1r1_subboss1wall", 2000137, 4127387, 4, { -119.798599f, -4.165526f, 104.508904f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_f1r1_subboss2wall", 2000138, 4127414, 4, { -78.310173f, -8.133030f, -44.002850f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1r1_bossplusfloor", 2001152, 4374098, 4, { 197.405899f, -39.475101f, -147.966705f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Waterstainednote", 2000093, 0, 4, { -241.596100f, 4.936373f, -72.770317f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "Waterstainednote_1", 2000094, 0, 4, { -211.121002f, 2.082635f, -67.117737f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Waterstainednote_2", 2000095, 0, 4, { -204.427002f, -1.617569f, 21.831829f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Waterstainednote_3", 2000096, 0, 4, { -149.074097f, -2.569309f, 101.795403f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "Magitekphotocell", 2000100, 0, 4, { -202.105804f, 0.318934f, -79.179108f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Magitekphotocell_1", 2000101, 0, 4, { -221.659195f, -4.425579f, 54.985451f }, 0.869717f, 0.000432f ); 
+      instance->registerEObj( "Magitekphotocell_2", 2000102, 0, 4, { -204.699799f, -4.926546f, 88.822723f }, 0.900235f, 0.000336f ); 
+      instance->registerEObj( "Magitekphotocell_3", 2000103, 0, 4, { -104.023300f, -3.463795f, 104.075897f }, 0.839199f, 0.000527f ); 
+      instance->registerEObj( "Magitekterminal", 2000116, 0, 4, { -112.013199f, -4.132327f, 112.031403f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2000117, 1699196, 4, { -95.990372f, -4.125101f, 111.985901f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Magitekterminal_1", 2000118, 0, 4, { -80.026077f, -8.132326f, -47.971760f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "unknown_5", 2000121, 1699201, 4, { -95.538803f, -8.133920f, -48.020191f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Accusationchamberdoor", 2000384, 3302267, 4, { -207.996994f, 0.110343f, -95.749359f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "Abacinationchamberdoor", 2000385, 3302270, 4, { 96.210892f, -19.927860f, -112.002098f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "unknown_6", 2000389, 3302276, 4, { -223.993698f, 2.170142f, -111.314598f }, 0.900235f, 0.000336f ); 
+      instance->registerEObj( "unknown_7", 2000390, 3302281, 4, { 15.396310f, -12.161490f, -31.967699f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "unknown_8", 2000391, 3302277, 4, { -111.986000f, -11.694670f, -63.677799f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "unknown_9", 2000392, 3302279, 4, { -54.326931f, -12.619540f, -135.517899f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000393, 3302283, 4, { 127.918297f, -24.124969f, -112.616798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000397, 3302282, 4, { -66.330208f, -8.057444f, -48.020191f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "unknown_12", 2000398, 3302278, 4, { -103.188698f, -12.587360f, -137.701004f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "unknown_13", 2000399, 3302280, 4, { -7.119315f, -12.783910f, -137.865402f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2000400, 3302275, 4, { 175.723206f, -34.137970f, -140.074005f }, 0.930753f, 0.000240f ); 
+      instance->registerEObj( "Magitekphotocell_4", 2000104, 0, 4, { -130.358597f, -8.977930f, -71.240982f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_15", 2000111, 0, 4, { -221.057495f, -0.076355f, -113.847603f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2000112, 0, 4, { 18.393040f, -12.250300f, -28.183680f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2000113, 0, 4, { -109.852501f, -11.441870f, -58.962391f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2000114, 0, 4, { -55.111301f, -12.534730f, -140.141006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2000115, 0, 4, { 121.910698f, -23.325809f, -110.515297f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekphotocell_5", 2000105, 0, 4, { -130.724106f, -9.414856f, -68.131592f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekphotocell_6", 2000106, 0, 4, { -130.418900f, -9.567444f, -67.856873f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Magitekphotocell_7", 2000107, 0, 4, { -130.101807f, -9.739193f, -67.526657f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Magitekphotocell_8", 2000107, 0, 4, { -129.796707f, -9.914070f, -67.221481f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Magitekphotocell_9", 2000039, 0, 4, { -73.754570f, -6.333896f, 21.536640f }, 0.991789f, 0.000048f ); 
+      instance->registerEObj( "Magitekphotocell_10", 2000108, 0, 4, { -186.655807f, -0.160111f, -10.531350f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magitekphotocell_11", 2000109, 0, 4, { -143.922195f, 0.079653f, 1.801933f }, 0.961271f, 0.000144f ); 
+      instance->registerEObj( "Magitekphotocell_12", 2000110, 0, 4, { -233.539398f, -0.167908f, -103.013702f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -311.485504f, 9.496978f, -76.989082f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4127435, 5, { -322.238495f, 11.991770f, -78.470192f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
index d583a645..200829c9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
@@ -10,45 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002872, 5588600, 4, { 0.359463f, 300.000000f, 26.171600f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { 0.428600f, 300.000000f, 24.562250f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005580, 5873754, 4, { 0.360928f, 300.000000f, -15.306860f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006743, 5474300, 4, { 39.139400f, -300.007690f, 29.587160f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2006744, 5474303, 4, { 43.961182f, -299.855103f, -30.197689f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2006745, 6143050, 4, { -34.927921f, -300.007690f, -80.460876f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2006746, 6147782, 4, { -38.559631f, -300.007690f, -72.068359f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2006747, 6147781, 4, { -38.986820f, -300.007690f, -30.014530f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2006748, 6143048, 4, { 52.795311f, -299.984589f, -36.063671f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2006749, 6147791, 4, { 0.604760f, -291.999908f, -117.413803f }, 1.000000f );
-      instance->registerEObj( "Bonds", 2006752, 0, 4, { -52.262211f, -300.000793f, -27.878300f }, 0.991760f );
-      instance->registerEObj( "Bonds", 2006752, 0, 4, { 56.960300f, -299.984589f, -73.657806f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002872, 5581166, 4, { -18.416611f, -292.000000f, -99.614120f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002735, 0, 4, { -20.099001f, -292.000000f, -98.859291f }, 0.700000f );
-      instance->registerEObj( "Unknown12", 2005106, 5581173, 4, { -0.494135f, -292.000000f, -117.713799f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 18.757099f, 0.000000f, 72.079903f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2002872, 5583050, 4, { 17.161560f, 0.000000f, 73.880867f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2005087, 5474300, 4, { 37.735470f, -300.007690f, 30.228149f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2005088, 5499954, 4, { 51.884090f, -300.000000f, -35.577080f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005089, 5474303, 4, { 44.255379f, -300.000000f, -31.015051f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2005090, 5474308, 4, { -36.242680f, -300.000000f, -29.871010f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2005091, 5474306, 4, { -37.591751f, -300.000000f, -69.819733f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2005092, 5499959, 4, { -33.701191f, -300.000000f, -79.843872f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2005093, 5499966, 4, { 6.953651f, -281.975708f, -150.744995f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2005094, 5476161, 4, { 101.518402f, -263.140503f, -12.115350f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2005095, 5476162, 4, { 101.390800f, -263.204315f, 11.842000f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2005096, 5474532, 4, { 99.222763f, -264.000000f, -0.362554f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2005097, 5499987, 4, { 22.634041f, 0.000000f, 71.960167f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2005098, 5499980, 4, { -17.585621f, 0.000000f, 72.136276f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2005099, 5444302, 4, { -92.607063f, -0.015320f, 0.076233f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2005100, 5499663, 4, { -52.663239f, 291.000000f, 42.623951f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2005101, 5499660, 4, { -67.359016f, 291.000000f, 42.656231f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2005102, 5499645, 4, { -66.869476f, 291.000000f, 55.587841f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2005103, 5499653, 4, { -53.398609f, 291.000000f, 55.570320f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2005104, 5499600, 4, { -46.140011f, 291.000000f, 48.667049f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5578486, 5, { -5.010592f, -300.000000f, 86.198753f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 11.135890f, -300.000000f, 78.862717f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.136796f, 299.977112f, -9.654591f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
index 2ffcc4cc..8ecc11ea 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
@@ -10,53 +10,61 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2001809, 0, 4, { 134.115601f, -17.997431f, 473.641693f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 137.299393f, -17.990360f, 454.401398f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4177700, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2001822, 4086687, 4, { 125.014000f, -9.459579f, 64.149277f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001811, 4259124, 4, { 127.094200f, -12.000000f, 125.826500f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001810, 4259126, 4, { 124.986603f, -12.039370f, 125.401100f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2000277, 4259125, 4, { 125.461502f, -12.000000f, 89.079697f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001114, 4323503, 4, { 118.000000f, -8.700125f, 65.370102f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001823, 4323504, 4, { 117.995003f, -7.766907f, 65.232300f }, 0.991760f );
-      instance->registerEObj( "Nymiandevice", 2001123, 4126926, 4, { 117.995003f, -9.001419f, 65.378754f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2002790, 4405761, 4, { 125.029999f, -13.277490f, 181.098602f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001813, 4259128, 4, { 45.925018f, 0.000000f, -212.411499f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2001812, 4259127, 4, { 43.121960f, -0.015320f, -212.616592f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2001824, 4086767, 4, { 43.140591f, 0.499020f, -29.383511f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2001827, 4086770, 4, { 43.011742f, 0.540422f, -152.602997f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000278, 4259129, 4, { 43.493420f, -0.100058f, -248.056198f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2001115, 4323510, 4, { 35.000000f, 1.250271f, -5.876968f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2001116, 4323508, 4, { 35.000000f, 1.249865f, -28.099899f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2001117, 4323512, 4, { 43.000000f, 1.300663f, -58.799179f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2001118, 4323515, 4, { 54.099178f, 9.249764f, -95.999512f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2001119, 4323518, 4, { 122.099899f, 1.250139f, -145.999405f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2001120, 4323522, 4, { 36.000000f, 1.299810f, -151.049896f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2001825, 4323511, 4, { 35.027500f, 2.231338f, -5.969540f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2001826, 4323509, 4, { 34.988789f, 2.301583f, -28.158291f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2001828, 4323513, 4, { 43.003689f, 2.351689f, -58.849869f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2001829, 4323516, 4, { 54.100830f, 10.258660f, -95.915703f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2001830, 4323519, 4, { 121.982201f, 2.305465f, -145.991302f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2001831, 4323523, 4, { 35.995869f, 2.276821f, -151.081100f }, 0.991760f );
-      instance->registerEObj( "RustedNymiandevice", 2001124, 4126931, 4, { 34.988892f, 0.930786f, -6.393555f }, 0.991760f );
-      instance->registerEObj( "RustedNymiandevice", 2001125, 4126938, 4, { 34.988892f, 0.930786f, -27.634159f }, 0.991760f );
-      instance->registerEObj( "RustedNymiandevice", 2001126, 4126941, 4, { 42.984619f, 0.991760f, -58.335270f }, 0.991760f );
-      instance->registerEObj( "Nymiandevice", 2001127, 4126947, 4, { 53.613361f, 8.952527f, -95.999352f }, 1.000000f );
-      instance->registerEObj( "RustedNymiandevice", 2001128, 4126952, 4, { 121.629601f, 0.930786f, -146.013596f }, 0.991760f );
-      instance->registerEObj( "RustedNymiandevice", 2001129, 4126956, 4, { 35.995972f, 0.991760f, -150.591400f }, 0.991760f );
-      instance->registerEObj( "Lanternoil", 2002789, 0, 4, { 35.621380f, -0.164260f, -23.125179f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2001832, 4086777, 4, { 73.005737f, 10.540420f, -380.487610f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2001814, 4239448, 4, { 72.890900f, 9.976854f, -400.332489f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2001815, 4239449, 4, { 74.758614f, 9.976894f, -400.332489f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2001121, 4323530, 4, { 80.979607f, 11.245850f, -380.117493f }, 0.991760f );
-      instance->registerEObj( "Unknown30", 2001122, 4323528, 4, { 65.000000f, 11.249720f, -380.099792f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2001833, 4323531, 4, { 81.010132f, 12.313960f, -380.117493f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2001834, 4323529, 4, { 65.001831f, 12.381110f, -380.103790f }, 1.000000f );
-      instance->registerEObj( "RustedNymiandevice", 2001130, 4126964, 4, { 80.979607f, 10.940670f, -379.629211f }, 0.991760f );
-      instance->registerEObj( "RustedNymiandevice", 2001131, 4126966, 4, { 64.988159f, 10.940670f, -379.629211f }, 0.991760f );
-      instance->registerEObj( "Unknown33", 2005197, 5674883, 4, { 73.492577f, 6.000000f, -464.485596f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2001809, 0, 4, { 134.115601f, -17.997431f, 473.641693f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 137.299393f, -17.990360f, 454.401398f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4177700, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_1", 2001822, 4086687, 4, { 125.014000f, -9.459579f, 64.149277f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001811, 4259124, 4, { 127.094200f, -12.000000f, 125.826500f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2001810, 4259126, 4, { 124.986603f, -12.039370f, 125.401100f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2000277, 4259125, 4, { 125.461502f, -12.000000f, 89.079697f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2001114, 4323503, 4, { 118.000000f, -8.700125f, 65.370102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2001823, 4323504, 4, { 117.995003f, -7.766907f, 65.232300f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Nymiandevice", 2001123, 4126926, 4, { 117.995003f, -9.001419f, 65.378754f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2002790, 4405761, 4, { 125.029999f, -13.277490f, 181.098602f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001813, 4259128, 4, { 45.925018f, 0.000000f, -212.411499f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001812, 4259127, 4, { 43.121960f, -0.015320f, -212.616592f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "unknown_5", 2001824, 4086767, 4, { 43.140591f, 0.499020f, -29.383511f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001827, 4086770, 4, { 43.011742f, 0.540422f, -152.602997f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000278, 4259129, 4, { 43.493420f, -0.100058f, -248.056198f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2001115, 4323510, 4, { 35.000000f, 1.250271f, -5.876968f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2001116, 4323508, 4, { 35.000000f, 1.249865f, -28.099899f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2001117, 4323512, 4, { 43.000000f, 1.300663f, -58.799179f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2001118, 4323515, 4, { 54.099178f, 9.249764f, -95.999512f }, 1.000000f, 1.570451f ); 
+      instance->registerEObj( "unknown_11", 2001119, 4323518, 4, { 122.099899f, 1.250139f, -145.999405f }, 1.000000f, 1.570451f ); 
+      instance->registerEObj( "unknown_12", 2001120, 4323522, 4, { 36.000000f, 1.299810f, -151.049896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2001825, 4323511, 4, { 35.027500f, 2.231338f, -5.969540f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_14", 2001826, 4323509, 4, { 34.988789f, 2.301583f, -28.158291f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2001828, 4323513, 4, { 43.003689f, 2.351689f, -58.849869f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2001829, 4323516, 4, { 54.100830f, 10.258660f, -95.915703f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_17", 2001830, 4323519, 4, { 121.982201f, 2.305465f, -145.991302f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_18", 2001831, 4323523, 4, { 35.995869f, 2.276821f, -151.081100f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "RustedNymiandevice", 2001124, 4126931, 4, { 34.988892f, 0.930786f, -6.393555f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "RustedNymiandevice_1", 2001125, 4126938, 4, { 34.988892f, 0.930786f, -27.634159f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "RustedNymiandevice_2", 2001126, 4126941, 4, { 42.984619f, 0.991760f, -58.335270f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Nymiandevice_1", 2001127, 4126947, 4, { 53.613361f, 8.952527f, -95.999352f }, 1.000000f, 1.570451f ); 
+      instance->registerEObj( "RustedNymiandevice_3", 2001128, 4126952, 4, { 121.629601f, 0.930786f, -146.013596f }, 0.991760f, 1.570451f ); 
+      instance->registerEObj( "RustedNymiandevice_4", 2001129, 4126956, 4, { 35.995972f, 0.991760f, -150.591400f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Lanternoil", 2002789, 0, 4, { 35.621380f, -0.164260f, -23.125179f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2001832, 4086777, 4, { 73.005737f, 10.540420f, -380.487610f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1d3_bossline", 2001814, 4239448, 4, { 72.890900f, 9.976854f, -400.332489f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1d3_bosswall", 2001815, 4239449, 4, { 74.758614f, 9.976894f, -400.332489f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2001121, 4323530, 4, { 80.979607f, 11.245850f, -380.117493f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_21", 2001122, 4323528, 4, { 65.000000f, 11.249720f, -380.099792f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2001833, 4323531, 4, { 81.010132f, 12.313960f, -380.117493f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_23", 2001834, 4323529, 4, { 65.001831f, 12.381110f, -380.103790f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "RustedNymiandevice_5", 2001130, 4126964, 4, { 80.979607f, 10.940670f, -379.629211f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "RustedNymiandevice_6", 2001131, 4126966, 4, { 64.988159f, 10.940670f, -379.629211f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2005197, 5674883, 4, { 73.492577f, 6.000000f, -464.485596f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
index 28a0e67a..b67ad33a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
@@ -10,34 +10,42 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000277, 4898030, 4, { 125.461502f, -12.000000f, 89.079697f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2001810, 4898029, 4, { 124.986603f, -12.039370f, 125.401100f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2001811, 4898028, 4, { 127.094200f, -12.000000f, 125.826500f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001812, 4898056, 4, { 43.121960f, -0.015320f, -212.616592f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2001813, 4898057, 4, { 45.925018f, 0.000000f, -212.411499f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000278, 4898058, 4, { 43.472900f, -0.106873f, -248.065994f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2001815, 4898090, 4, { 74.753906f, 9.964111f, -400.351013f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2001814, 4898089, 4, { 72.890900f, 9.976854f, -400.332489f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005119, 0, 4, { 68.684860f, 6.000000f, -449.635315f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005196, 5674432, 4, { 72.966209f, 6.000000f, -464.577209f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 137.285400f, -17.990419f, 454.398407f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4898005, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004551, 5018234, 4, { 184.679901f, -14.023070f, 304.066406f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2004552, 5018233, 4, { 125.230698f, -14.053590f, 244.800400f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2004553, 5018223, 4, { 124.956100f, -14.023070f, 183.581207f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2004554, 5018182, 4, { 42.770088f, -0.167908f, -26.822309f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2004555, 5018205, 4, { 42.862549f, 0.442505f, -150.225098f }, 0.991760f );
-      instance->registerEObj( "Asylumcell", 2004556, 5019054, 4, { 71.785713f, -11.783800f, -311.787598f }, 0.991760f );
-      instance->registerEObj( "Asylumcell", 2004557, 5019055, 4, { 71.870552f, -11.659170f, -324.391602f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2004558, 5019051, 4, { 94.316040f, -12.008810f, -312.062286f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2004559, 5019004, 4, { 161.119995f, -8.011047f, -353.322693f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2004560, 5018224, 4, { 73.226128f, 10.390440f, -379.721588f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2004561, 5034792, 4, { 120.347900f, -12.000000f, -338.826599f }, 0.991760f );
-      instance->registerEObj( "Drainagevalve", 2004562, 5022359, 4, { 124.002098f, -10.704290f, -341.825287f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2004564, 5018828, 4, { 141.315598f, -11.750000f, -326.359711f }, 1.000000f );
-      instance->registerEObj( "Nymiandevice", 2004565, 4896865, 4, { 156.023407f, -6.851379f, -351.735809f }, 0.991760f );
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2000277, 4898030, 4, { 125.461502f, -12.000000f, 89.079697f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2001810, 4898029, 4, { 124.986603f, -12.039370f, 125.401100f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001811, 4898028, 4, { 127.094200f, -12.000000f, 125.826500f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001812, 4898056, 4, { 43.121960f, -0.015320f, -212.616592f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001813, 4898057, 4, { 45.925018f, 0.000000f, -212.411499f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2000278, 4898058, 4, { 43.472900f, -0.106873f, -248.065994f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_s1d3_bosswall", 2001815, 4898090, 4, { 74.753906f, 9.964111f, -400.351013f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_s1d3_bossline", 2001814, 4898089, 4, { 72.890900f, 9.976854f, -400.332489f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2005119, 0, 4, { 68.684860f, 6.000000f, -449.635315f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2005196, 5674432, 4, { 72.966209f, 6.000000f, -464.577209f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 137.285400f, -17.990419f, 454.398407f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 73.105957f, 9.994568f, -475.590790f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4898005, 5, { 130.745697f, -17.983120f, 461.438293f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_1", 2004551, 5018234, 4, { 184.679901f, -14.023070f, 304.066406f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2004552, 5018233, 4, { 125.230698f, -14.053590f, 244.800400f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2004553, 5018223, 4, { 124.956100f, -14.023070f, 183.581207f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2004554, 5018182, 4, { 42.770088f, -0.167908f, -26.822309f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2004555, 5018205, 4, { 42.862549f, 0.442505f, -150.225098f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Asylumcell", 2004556, 5019054, 4, { 71.785713f, -11.783800f, -311.787598f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Asylumcell_1", 2004557, 5019055, 4, { 71.870552f, -11.659170f, -324.391602f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_6", 2004558, 5019051, 4, { 94.316040f, -12.008810f, -312.062286f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_7", 2004559, 5019004, 4, { 161.119995f, -8.011047f, -353.322693f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_8", 2004560, 5018224, 4, { 73.226128f, 10.390440f, -379.721588f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2004561, 5034792, 4, { 120.347900f, -12.000000f, -338.826599f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Drainagevalve", 2004562, 5022359, 4, { 124.002098f, -10.704290f, -341.825287f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2004564, 5018828, 4, { 141.315598f, -11.750000f, -326.359711f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Nymiandevice", 2004565, 4896865, 4, { 156.023407f, -6.851379f, -351.735809f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
index 1ff5c78b..4850a4b2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
@@ -10,40 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -84.755379f, 28.000000f, -51.118382f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6403264, 4, { -82.540977f, 28.000000f, -53.644989f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007376, 6403259, 4, { -59.964069f, 28.000000f, -78.522522f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 223.705399f, 113.500000f, 35.108238f }, 0.500000f );
-      instance->registerEObj( "Unknown4", 2002872, 6403502, 4, { 224.909500f, 113.199997f, 33.535221f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007377, 6403509, 4, { 264.503998f, 113.199997f, -5.542618f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007431, 6384823, 4, { 245.262695f, 113.500000f, 13.527060f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 336.690308f, 166.643707f, -409.414886f }, 0.472961f );
-      instance->registerEObj( "Unknown8", 2002872, 6403539, 4, { 335.712402f, 166.653793f, -410.036194f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007441, 6425251, 4, { 321.753204f, 166.653793f, -415.372711f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -204.533798f, -33.742210f, 271.416107f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 306.067810f, 166.653793f, -420.100494f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6399475, 5, { -219.983398f, -34.117180f, 275.020111f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2007371, 6572085, 4, { -124.008698f, -10.048470f, 151.735703f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2007372, 6572086, 4, { -88.521538f, 27.655760f, -44.885460f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007366, 6384146, 4, { 70.443916f, 25.187500f, -55.889919f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007367, 6384285, 4, { 178.158096f, 99.562508f, -3.919224f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007364, 6384308, 4, { 78.279350f, 25.190849f, -47.949661f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007365, 6384356, 4, { 178.228394f, 99.500000f, 8.238135f }, 1.000000f );
-      instance->registerEObj( "Liftlever", 2007388, 0, 4, { 180.229706f, 56.749981f, -76.583313f }, 1.000000f );
-      instance->registerEObj( "Liftlever", 2007389, 0, 4, { 180.245193f, 86.749977f, -76.529610f }, 1.000000f );
-      instance->registerEObj( "Liftlever", 2007390, 0, 4, { 188.720001f, 56.749981f, -68.098488f }, 1.000000f );
-      instance->registerEObj( "Liftlever", 2007391, 0, 4, { 188.709198f, 86.749977f, -68.041428f }, 1.000000f );
-      instance->registerEObj( "Imposinggate", 2007373, 6382783, 4, { 168.614197f, 55.750000f, -60.833012f }, 1.000000f );
-      instance->registerEObj( "Bonekey", 2007397, 0, 4, { 143.135406f, 52.677929f, -35.654629f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007370, 6383173, 4, { 97.740517f, 26.124990f, -40.661610f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007405, 6527474, 4, { 351.622009f, 163.753799f, -404.382599f }, 0.991760f );
-      instance->registerEObj( "Airstone", 2007398, 0, 4, { 316.850586f, 142.878403f, -142.151505f }, 1.000000f );
-      instance->registerEObj( "Airstone", 2007399, 0, 4, { 420.029205f, 149.955597f, -271.014801f }, 1.000000f );
-      instance->registerEObj( "Tailwindrelic", 2007400, 6422938, 4, { 342.708191f, 145.153397f, -162.585800f }, 1.000000f );
-      instance->registerEObj( "Tailwindrelic", 2007401, 6422940, 4, { 414.549988f, 152.457504f, -298.508392f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2007524, 6493432, 4, { 341.786896f, 144.853806f, -164.354904f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2007525, 6493431, 4, { 412.853699f, 152.110397f, -297.974396f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
deleted file mode 100644
index d7bee881..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventIII.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SpecialEventIII : public InstanceContentScript
-{
-public:
-   SpecialEventIII() : InstanceContentScript( 20016 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
index 6efaae64..6836a767 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
@@ -10,23 +10,24 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Pumpkinchest", 2007385, 0, 4, { 72.176666f, -0.000001f, 8.325592f }, 1.000000f );
-      instance->registerEObj( "Crypticnote", 2007394, 0, 4, { 77.017143f, 0.000000f, 7.811212f }, 1.000000f );
-      instance->registerEObj( "Curiousswitch", 2007406, 0, 4, { 75.432663f, 0.000000f, 9.083635f }, 1.000000f );
-      instance->registerEObj( "Goldbasket", 2007407, 0, 4, { 67.265839f, -0.000000f, 8.740001f }, 1.000000f );
-      instance->registerEObj( "Silverbasket", 2007408, 0, 4, { 69.001480f, 0.000000f, 7.453632f }, 1.000000f );
-      instance->registerEObj( "Bronzebasket", 2007409, 0, 4, { 65.439072f, 0.000000f, 7.248850f }, 1.000000f );
-      instance->registerEObj( "Jackolantern", 2007410, 0, 4, { 61.411270f, 0.000000f, 12.014820f }, 1.000000f );
-      instance->registerEObj( "Smolderingcoal", 2007411, 0, 4, { 58.469200f, -0.000000f, 11.999350f }, 1.000000f );
-      instance->registerEObj( "Truesightsmokebomb", 2007412, 0, 4, { 55.969971f, 0.000000f, 12.118080f }, 1.000000f );
-      instance->registerEObj( "Pumpkincoffer", 2007413, 0, 4, { 53.116581f, -0.015320f, 12.344480f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 15.229340f, -18.678320f, -0.619758f }, 1.000000f );
-      instance->registerEObj( "Obfuscationcharm", 2007414, 0, 4, { 54.995380f, 0.000000f, 9.411625f }, 1.000000f );
-      instance->registerEObj( "Jackinthebox", 2007547, 0, 4, { 69.704788f, 0.000000f, 10.012170f }, 1.000000f );
-      instance->registerEObj( "Suspiciouspumpkin", 2007548, 0, 4, { 67.828171f, 0.000000f, 10.094330f }, 1.000000f );
-      instance->registerEObj( "Suspiciouschest", 2007562, 0, 4, { 3.501173f, -18.779980f, -0.195926f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6381325, 5, { 73.499107f, -0.000000f, 4.652901f }, 1.000000f );
+      instance->registerEObj( "Pumpkinchest", 2007385, 0, 4, { 72.176666f, -0.000001f, 8.325592f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Crypticnote", 2007394, 0, 4, { 77.017143f, 0.000000f, 7.811212f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Curiousswitch", 2007406, 0, 4, { 75.432663f, 0.000000f, 9.083635f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Goldbasket", 2007407, 0, 4, { 67.265839f, -0.000000f, 8.740001f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Silverbasket", 2007408, 0, 4, { 69.001480f, 0.000000f, 7.453632f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Bronzebasket", 2007409, 0, 4, { 65.439072f, 0.000000f, 7.248850f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Jackolantern", 2007410, 0, 4, { 61.411270f, 0.000000f, 12.014820f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Smolderingcoal", 2007411, 0, 4, { 58.469200f, -0.000000f, 11.999350f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Truesightsmokebomb", 2007412, 0, 4, { 55.969971f, 0.000000f, 12.118080f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Pumpkincoffer", 2007413, 0, 4, { 53.116581f, -0.015320f, 12.344480f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 15.229340f, -18.678320f, -0.619758f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Obfuscationcharm", 2007414, 0, 4, { 54.995380f, 0.000000f, 9.411625f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Jackinthebox", 2007547, 0, 4, { 69.704788f, 0.000000f, 10.012170f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Suspiciouspumpkin", 2007548, 0, 4, { 67.828171f, 0.000000f, 10.094330f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Suspiciouschest", 2007562, 0, 4, { 3.501173f, -18.779980f, -0.195926f }, 1.000000f, 1.568754f ); 
+      instance->registerEObj( "Entrance", 2000182, 6381325, 5, { 73.499107f, -0.000000f, 4.652901f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
index 8bc5ca2c..aed60a05 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
@@ -10,51 +10,52 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7231658, 4, { -3.500000f, -6.000000f, -42.000000f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007457, 7231654, 4, { 17.466560f, -6.000000f, -45.513531f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2007457, 7231667, 4, { 18.500000f, -6.000000f, -59.500000f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2007457, 7231666, 4, { -9.500000f, -6.000000f, -68.500000f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007457, 7231668, 4, { -18.500000f, -6.000000f, -59.500000f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2007457, 7231669, 4, { 11.489990f, -6.027344f, -68.528320f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2007457, 7231672, 4, { 15.495000f, -6.027344f, -77.500671f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2007457, 7231671, 4, { -16.500000f, -6.000000f, -71.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 7231673, 4, { 8.500000f, -8.000000f, -95.199997f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 7231674, 4, { -6.515625f, -8.011047f, -92.729057f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2007457, 7231677, 4, { -6.500000f, -8.000000f, -89.699997f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7231676, 4, { 8.475829f, -8.011047f, -101.701401f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2007457, 7231678, 4, { -18.500000f, -8.000000f, -112.699997f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 7231679, 4, { 14.500000f, -8.000000f, -111.699997f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 7231681, 4, { 10.000000f, -8.000000f, -134.699997f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2007457, 7231680, 4, { -15.500000f, -8.000000f, -127.699997f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 7231683, 4, { -16.500000f, -10.000000f, -160.699997f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 7231684, 4, { 3.558000f, -10.000000f, -150.699997f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 7231686, 4, { 6.499207f, -10.025270f, -172.723999f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2007457, 7231687, 4, { -17.471680f, -10.025270f, -170.716904f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2007457, 7231689, 4, { 18.500000f, -10.000000f, -190.199997f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007457, 7231688, 4, { -3.550100f, -10.000000f, -186.699997f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007457, 7231690, 4, { -18.500000f, -10.000000f, -190.199997f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007457, 7231691, 4, { 3.550100f, -10.000000f, -186.699997f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007457, 7171421, 4, { -0.007954f, -11.881100f, -230.514008f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007457, 7231843, 4, { 0.006785f, -11.881100f, -253.447296f }, 1.000000f );
-      instance->registerEObj( "ValentionesDaycard", 2009385, 7231795, 4, { -5.426984f, -11.917360f, -260.462494f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009387, 7231796, 4, { -9.668927f, -11.917360f, -260.401611f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009388, 7231797, 4, { -6.021372f, -11.917360f, -253.618393f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009389, 7231798, 4, { -10.334230f, -11.917360f, -253.545105f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009390, 7231799, 4, { -4.210987f, -11.917360f, -246.692703f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009391, 7231800, 4, { -8.330921f, -11.917360f, -246.662094f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009392, 7231801, 4, { 5.258507f, -11.917360f, -260.425812f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009393, 7231802, 4, { 9.500511f, -11.917360f, -260.425812f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009394, 7231803, 4, { 6.041663f, -11.881100f, -253.545105f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009395, 7231804, 4, { 10.315010f, -11.881100f, -253.545105f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009396, 7231805, 4, { 3.961101f, -11.917360f, -246.662094f }, 0.991760f );
-      instance->registerEObj( "ValentionesDaycard", 2009397, 7231806, 4, { 8.203044f, -11.917360f, -246.662094f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 7186874, 5, { -0.017344f, 0.700000f, 15.850460f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.151178f, -11.881100f, -262.439209f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007457, 7167001, 4, { -0.198283f, 0.437501f, 3.359166f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007457, 7167005, 4, { -10.222270f, -6.000000f, -25.717331f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007457, 7167002, 4, { 10.259260f, -6.000000f, -25.717331f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2007457, 7154005, 4, { -0.045776f, -11.734250f, -210.009903f }, 0.991760f );
+      instance->registerEObj( "sgbg_f1e9_g1_swt01", 2007457, 7231658, 4, { -3.500000f, -6.000000f, -42.000000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03", 2007457, 7231654, 4, { 17.466560f, -6.000000f, -45.513531f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_1", 2007457, 7231667, 4, { 18.500000f, -6.000000f, -59.500000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_1", 2007457, 7231666, 4, { -9.500000f, -6.000000f, -68.500000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_2", 2007457, 7231668, 4, { -18.500000f, -6.000000f, -59.500000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_2", 2007457, 7231669, 4, { 11.489990f, -6.027344f, -68.528320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_3", 2007457, 7231672, 4, { 15.495000f, -6.027344f, -77.500671f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_3", 2007457, 7231671, 4, { -16.500000f, -6.000000f, -71.500000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_4", 2007457, 7231673, 4, { 8.500000f, -8.000000f, -95.199997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_4", 2007457, 7231674, 4, { -6.515625f, -8.011047f, -92.729057f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_5", 2007457, 7231677, 4, { -6.500000f, -8.000000f, -89.699997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_5", 2007457, 7231676, 4, { 8.475829f, -8.011047f, -101.701401f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_6", 2007457, 7231678, 4, { -18.500000f, -8.000000f, -112.699997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_6", 2007457, 7231679, 4, { 14.500000f, -8.000000f, -111.699997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_7", 2007457, 7231681, 4, { 10.000000f, -8.000000f, -134.699997f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_7", 2007457, 7231680, 4, { -15.500000f, -8.000000f, -127.699997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_8", 2007457, 7231683, 4, { -16.500000f, -10.000000f, -160.699997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_8", 2007457, 7231684, 4, { 3.558000f, -10.000000f, -150.699997f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_9", 2007457, 7231686, 4, { 6.499207f, -10.025270f, -172.723999f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_9", 2007457, 7231687, 4, { -17.471680f, -10.025270f, -170.716904f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_10", 2007457, 7231689, 4, { 18.500000f, -10.000000f, -190.199997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_10", 2007457, 7231688, 4, { -3.550100f, -10.000000f, -186.699997f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_swt01_11", 2007457, 7231690, 4, { -18.500000f, -10.000000f, -190.199997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgbg_f1e9_g1_gat03_11", 2007457, 7231691, 4, { 3.550100f, -10.000000f, -186.699997f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_0", 2007457, 7171421, 4, { -0.007954f, -11.881100f, -230.514008f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_f1e9_b1321", 2007457, 7231843, 4, { 0.006785f, -11.881100f, -253.447296f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "ValentionesDaycard", 2009385, 7231795, 4, { -5.426984f, -11.917360f, -260.462494f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_1", 2009387, 7231796, 4, { -9.668927f, -11.917360f, -260.401611f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_2", 2009388, 7231797, 4, { -6.021372f, -11.917360f, -253.618393f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_3", 2009389, 7231798, 4, { -10.334230f, -11.917360f, -253.545105f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_4", 2009390, 7231799, 4, { -4.210987f, -11.917360f, -246.692703f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_5", 2009391, 7231800, 4, { -8.330921f, -11.917360f, -246.662094f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_6", 2009392, 7231801, 4, { 5.258507f, -11.917360f, -260.425812f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_7", 2009393, 7231802, 4, { 9.500511f, -11.917360f, -260.425812f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_8", 2009394, 7231803, 4, { 6.041663f, -11.881100f, -253.545105f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_9", 2009395, 7231804, 4, { 10.315010f, -11.881100f, -253.545105f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_10", 2009396, 7231805, 4, { 3.961101f, -11.917360f, -246.662094f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "ValentionesDaycard_11", 2009397, 7231806, 4, { 8.203044f, -11.917360f, -246.662094f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 7186874, 5, { -0.017344f, 0.700000f, 15.850460f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.151178f, -11.881100f, -262.439209f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007457, 7167001, 4, { -0.198283f, 0.437501f, 3.359166f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007457, 7167005, 4, { -10.222270f, -6.000000f, -25.717331f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007457, 7167002, 4, { 10.259260f, -6.000000f, -25.717331f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007457, 7154005, 4, { -0.045776f, -11.734250f, -210.009903f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
deleted file mode 100644
index 3ab7e07a..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/LongLivetheQueen.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class LongLivetheQueen : public InstanceContentScript
-{
-public:
-   LongLivetheQueen() : InstanceContentScript( 10012 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
deleted file mode 100644
index bae0b35f..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/ShadowandClaw.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ShadowandClaw : public InstanceContentScript
-{
-public:
-   ShadowandClaw() : InstanceContentScript( 10011 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
similarity index 79%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
index 16f31cdd..7ca4d0e4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AllsWellthatEndsintheWell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp
index bd70e01a..2da7a753 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/AnnoytheVoid.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
index f127043e..cb223a74 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyParties.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
similarity index 61%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
index aceb90aa..087b3075 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/BasicTrainingEnemyStrongholds.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
@@ -10,10 +10,11 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000604, 4262798, 4, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000604, 4262798, 5, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
similarity index 80%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
index 4c450b99..5a432c18 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/FlickingSticksandTakingNames.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
@@ -10,8 +10,8 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f, -0.000006f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp
index e31fcc65..b90e01ef 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/HeroontheHalfShell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp
new file mode 100644
index 00000000..83dce6ae
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp
@@ -0,0 +1,43 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class LongLivetheQueen : public InstanceContentScript
+{
+public:
+   LongLivetheQueen() : InstanceContentScript( 10012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp
index b411e44c..96cf1e2d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/MorethanaFeeler.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp
index 7adc0554..094b913e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/PullingPoisonPosies.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp
new file mode 100644
index 00000000..879388df
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp
@@ -0,0 +1,43 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ShadowandClaw : public InstanceContentScript
+{
+public:
+   ShadowandClaw() : InstanceContentScript( 10011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp
index d4e6cc13..c67cae31 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/SolemnTrinity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp
similarity index 79%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp
index 5a28b710..5ac7f920 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/StingingBack.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp
similarity index 79%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp
index eafa14c3..143a50a8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/UndertheArmor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp
@@ -10,8 +10,8 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2005192, 5760474, 4, { -51.493111f, 0.309087f, 71.436897f }, 1.000000f, -0.000006f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp
index 86265b20..d9985af1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhest/WardUp.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
index 9be31086..549a201c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
index 66f53865..2713a571 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
index 363e07ad..ed3cf961 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
index 18612ec4..c5a98e62 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
index c3098db6..0aa6a01d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
index 61ad93d3..f3c5ca75 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
index a14c2a6d..d2c54dca 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
index 36db3fad..8bcaa097 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
index 6b148a27..806d25ae 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
index 90de9334..38d3f4e6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
index f306fb77..9521065a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 6228959, 5, { 457.583801f, 5.680784f, 280.512787f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000608, 2807920, 4, { -95.322441f, -25.054260f, 61.518002f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 6228959, 5, { 457.583801f, 5.680784f, 280.512787f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_0", 2000608, 2807920, 4, { -95.322441f, -25.054260f, 61.518002f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
index 3e5c0613..4c09822a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
index 0090b554..c8389db8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
index 8ec1bb78..3f914056 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
@@ -10,16 +10,17 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f );
-      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007001, 0, 4, { -5.135936f, -0.986339f, -0.059807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007004, 0, 4, { -6.501123f, -0.986346f, 2.121102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007005, 0, 4, { -5.178086f, -0.986341f, -0.227772f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007006, 0, 4, { -7.272448f, -0.986346f, -2.204096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007007, 6216275, 4, { -30.849630f, 0.697522f, -1.415699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Gatelever", 2007008, 0, 4, { -31.199289f, 1.850766f, -7.087492f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6215534, 5, { 44.100491f, 1.056062f, 1.068363f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_5", 2001403, 3968682, 4, { 30.986059f, 0.993235f, 1.480142f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001404, 3968585, 4, { -31.243280f, 1.043213f, 1.580577f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
deleted file mode 100644
index 39b938f2..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors3140.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ThePalaceoftheDeadFloors3140 : public InstanceContentScript
-{
-public:
-   ThePalaceoftheDeadFloors3140() : InstanceContentScript( 60004 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
deleted file mode 100644
index 9b3c33d7..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/potd/ThePalaceoftheDeadFloors4150.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ThePalaceoftheDeadFloors4150 : public InstanceContentScript
-{
-public:
-   ThePalaceoftheDeadFloors4150() : InstanceContentScript( 60005 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6367892, 4, { -300.000000f, 0.000000f, -225.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6392196, 4, { 300.000000f, 0.000000f, 374.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007351, 6277715, 4, { 300.036102f, 0.000000f, 373.916687f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007352, 6394671, 4, { 307.159912f, 0.000000f, 370.556702f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007353, 6394677, 4, { 305.303894f, 0.000000f, 380.231415f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007354, 6394673, 4, { 296.024109f, -0.000000f, 381.100189f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007355, 6394675, 4, { 291.561890f, 0.000000f, 372.412689f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007356, 6394674, 4, { 298.511902f, 0.000000f, 366.134003f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
index 3e3f4c21..12850715 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
@@ -10,21 +10,21 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7033316, 4, { -140.058197f, 45.799999f, -133.960495f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 7033315, 4, { -123.008400f, 16.299999f, 103.779503f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7033317, 4, { 105.712799f, 16.299980f, 114.356003f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7033318, 4, { 183.420807f, 45.799980f, -111.239098f }, 1.000000f );
-      instance->registerEObj( "Powergenerator", 2009034, 7032566, 4, { 6.485046f, 46.386410f, -10.055730f }, 0.991760f );
-      instance->registerEObj( "Hangarterminal", 2009035, 7032549, 4, { -258.015198f, 44.361351f, 21.038191f }, 1.000000f );
-      instance->registerEObj( "Hangarterminal", 2009062, 7032550, 4, { -262.674988f, 44.773441f, -32.764599f }, 1.000000f );
-      instance->registerEObj( "Hangarterminal", 2009063, 7032561, 4, { 276.628510f, 44.544209f, 18.968180f }, 1.000000f );
-      instance->registerEObj( "Hangarterminal", 2009064, 7032562, 4, { 258.262787f, 44.210709f, 69.718079f }, 1.000000f );
-      instance->registerEObj( "Ceruleumtank", 2009031, 0, 4, { 8.651855f, 46.280640f, -142.595596f }, 0.991760f );
-      instance->registerEObj( "Steamcannon", 2009032, 0, 4, { -181.307602f, 47.593700f, -28.846230f }, 1.000000f );
-      instance->registerEObj( "Steamcannon", 2009033, 0, 4, { -178.482193f, 47.593700f, 2.992350f }, 1.000000f );
-      instance->registerEObj( "Steamcannon", 2009040, 0, 4, { 186.000504f, 47.578602f, 31.721189f }, 0.991760f );
-      instance->registerEObj( "Steamcannon", 2009041, 0, 4, { 196.952606f, 47.593700f, 1.659642f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007457, 7033316, 4, { -140.058197f, 45.799999f, -133.960495f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007457, 7033315, 4, { -123.008400f, 16.299999f, 103.779503f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007457, 7033317, 4, { 105.712799f, 16.299980f, 114.356003f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007457, 7033318, 4, { 183.420807f, 45.799980f, -111.239098f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Powergenerator", 2009034, 7032566, 4, { 6.485046f, 46.386410f, -10.055730f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Hangarterminal", 2009035, 7032549, 4, { -258.015198f, 44.361351f, 21.038191f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Hangarterminal_1", 2009062, 7032550, 4, { -262.674988f, 44.773441f, -32.764599f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Hangarterminal_2", 2009063, 7032561, 4, { 276.628510f, 44.544209f, 18.968180f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Hangarterminal_3", 2009064, 7032562, 4, { 258.262787f, 44.210709f, 69.718079f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Ceruleumtank", 2009031, 0, 4, { 8.651855f, 46.280640f, -142.595596f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Steamcannon", 2009032, 0, 4, { -181.307602f, 47.593700f, -28.846230f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Steamcannon_1", 2009033, 0, 4, { -178.482193f, 47.593700f, 2.992350f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Steamcannon_2", 2009040, 0, 4, { 186.000504f, 47.578602f, 31.721189f }, 0.991760f, -0.454976f ); 
+      instance->registerEObj( "Steamcannon_3", 2009041, 0, 4, { 196.952606f, 47.593700f, 1.659642f }, 1.000000f, -0.455053f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
index 75ce3f12..345d14aa 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
@@ -10,40 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2005325, 5810980, 4, { 187.869202f, 8.108603f, 250.084000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005326, 5810982, 4, { 57.053249f, 17.165449f, -249.904694f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005327, 5810983, 4, { -314.464996f, 41.657890f, 126.635803f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithA1", 2005338, 5821682, 4, { 18.148529f, 18.849100f, 267.572693f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2005502, 5821737, 4, { 18.255230f, 16.804850f, 267.227814f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithA2", 2005339, 5821685, 4, { 8.120948f, 21.013821f, 167.772705f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2005503, 5821738, 4, { 8.225257f, 19.763350f, 167.312195f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithA3", 2005340, 5821686, 4, { 96.414833f, 34.135899f, 108.177002f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2005504, 5821739, 4, { 96.322990f, 33.288559f, 107.972397f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithA4", 2005341, 5821687, 4, { 200.335693f, 30.775141f, 68.234734f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2005505, 5821740, 4, { 200.310593f, 29.688540f, 68.217537f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithB1", 2005342, 5821688, 4, { 157.733093f, 4.437783f, -49.087921f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2005506, 5821741, 4, { 157.696793f, 2.356474f, -49.159088f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithB2", 2005343, 5821689, 4, { 51.290970f, 32.733749f, -82.673607f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2005507, 5821743, 4, { 51.310070f, 31.154039f, -82.935127f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithB3", 2005344, 5821690, 4, { 74.829063f, 13.976150f, -16.412930f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2005508, 5821744, 4, { 74.846779f, 11.294810f, -16.719721f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithB4", 2005345, 5821691, 4, { -47.222630f, 31.708929f, -92.240723f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2005509, 5821746, 4, { -47.175869f, 29.272760f, -92.573776f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithC2", 2005346, 5821693, 4, { -163.868805f, 46.920021f, 1.751138f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2005510, 5821747, 4, { -164.055405f, 45.557041f, 1.093665f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithD2", 2005347, 5821695, 4, { -32.930420f, 18.645050f, 19.141041f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2005511, 5821748, 4, { -32.986580f, 17.328630f, 18.981670f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithD3", 2005348, 5821697, 4, { -62.119572f, 40.360111f, 48.813599f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2005512, 5821749, 4, { -62.187111f, 38.493420f, 48.440479f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithC4", 2005349, 5821698, 4, { -148.508499f, 43.280338f, 161.458603f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2005513, 5821750, 4, { -148.519196f, 41.333549f, 161.070908f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithC3", 2005350, 5821699, 4, { -167.072998f, 26.487570f, 71.059898f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2005514, 5821751, 4, { -167.089294f, 24.449400f, 70.683212f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithC1", 2005351, 5821700, 4, { -120.087196f, 28.019110f, -46.859772f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2005515, 5821752, 4, { -120.122597f, 27.122120f, -47.061981f }, 1.000000f );
-      instance->registerEObj( "AllagantomelithD1", 2005352, 5821701, 4, { 15.841110f, 19.797770f, 101.591301f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2005516, 5821753, 4, { 15.812600f, 18.748220f, 101.435699f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
index 5609529f..8be7341c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
@@ -10,22 +10,32 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2005084, 5573690, 4, { -0.015320f, -15.426880f, -162.924103f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2005085, 5573691, 4, { 19.010229f, -15.416970f, -200.015396f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005086, 5573692, 4, { -18.994471f, -15.426880f, -199.992905f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2004187, 4724282, 4, { -0.007111f, 12.000000f, -386.299896f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004188, 4724284, 4, { 335.025513f, 12.000000f, 193.711899f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004189, 4724283, 4, { -334.556213f, 12.000000f, 193.274796f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f }, 1.000000f );
-      instance->registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f );
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_6", 2005084, 5573690, 4, { -0.015320f, -15.426880f, -162.924103f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_7", 2005085, 5573691, 4, { 19.010229f, -15.416970f, -200.015396f }, 1.000000f, 0.000000f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_8", 2005086, 5573692, 4, { -18.994471f, -15.426880f, -199.992905f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "unknown_0", 2004187, 4724282, 4, { -0.007111f, 12.000000f, -386.299896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004188, 4724284, 4, { 335.025513f, 12.000000f, 193.711899f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004189, 4724283, 4, { -334.556213f, 12.000000f, 193.274796f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_l1p1_lvd_b0441", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f }, 1.000000f, 0.000000f ); 
+      // States -> STAGE_def STAGE_pop_anim 
+      instance->registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
deleted file mode 100644
index 6371fc8b..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheCarteneauFlatsHeliodrome.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheCarteneauFlatsHeliodrome : public InstanceContentScript
-{
-public:
-   TheCarteneauFlatsHeliodrome() : InstanceContentScript( 5004 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2005084, 5573690, 4, { -0.015320f, -15.426880f, -162.924103f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2005085, 5573691, 4, { 19.010229f, -15.416970f, -200.015396f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005086, 5573692, 4, { -18.994471f, -15.426880f, -199.992905f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2004187, 4724282, 4, { -0.007111f, 12.000000f, -386.299896f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004188, 4724284, 4, { 335.025513f, 12.000000f, 193.711899f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004189, 4724283, 4, { -334.556213f, 12.000000f, 193.274796f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f }, 1.000000f );
-      instance->registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
index 4fd1fca7..67573c4a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
@@ -10,11 +10,11 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only_1", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
index 58ca5c57..6fe46e93 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
@@ -10,9 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
index 9bc8619c..a5186fc4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
@@ -10,9 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
index 2209e9cf..1cb84c1b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
@@ -10,13 +10,13 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
index ae357722..cabd04a5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
@@ -10,11 +10,11 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2006819, 6218908, 4, { -89.012909f, 8.477110f, -0.326954f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2006818, 6218909, 4, { 95.872437f, 8.468750f, -0.320496f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only", 2002618, 6220121, 4, { -78.605072f, 0.920299f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_collison_only_1", 2002618, 6220123, 4, { 79.651703f, 0.811267f, -0.306571f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
index 9c3247a7..1997f24b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
@@ -10,9 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f );
+      instance->registerEObj( "unknown_0", 2007657, 6632432, 4, { -64.289970f, 8.262049f, 13.375790f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2007658, 6632431, 4, { 39.169922f, 8.194031f, -45.822941f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
index 635067fc..2746e969 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
@@ -10,13 +10,13 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
index cbc85b5c..19723a22 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
@@ -10,13 +10,13 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
index f5b88eb1..2a8cdbcf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
@@ -10,13 +10,13 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2008986, 7240684, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_1", 2008987, 7240683, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007457, 7164689, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007457, 7164690, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007457, 7164691, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007457, 7164692, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
index be5e834e..89f4ccfc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
@@ -10,32 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007022, 6245702, 4, { -263.444885f, 52.175270f, -209.921402f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007023, 6245745, 4, { -91.249367f, 27.082781f, 248.251297f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007024, 6245744, 4, { 262.704590f, 7.555402f, -83.636391f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2007038, 6246503, 4, { -33.290001f, 8.500000f, -64.930000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007039, 6246502, 4, { -29.181200f, 4.895900f, -181.130005f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007040, 6246500, 4, { 49.409801f, 1.000000f, 95.446404f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007041, 6246488, 4, { -139.203201f, 2.000000f, 42.698399f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007042, 6246517, 4, { 10.250100f, 7.501600f, -73.703102f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007126, 6260293, 4, { -21.009300f, 6.445800f, -124.468399f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007044, 6246516, 4, { -57.941700f, 7.532000f, -89.861702f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007043, 6246515, 4, { -28.053699f, 7.586800f, -20.808001f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007124, 6260291, 4, { -81.065201f, 8.327300f, -23.711300f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007122, 6260289, 4, { 17.876400f, 7.001300f, 11.047300f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007053, 6246513, 4, { -126.529999f, 35.526501f, -132.360001f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007125, 6260292, 4, { -224.454102f, 30.212000f, -33.290001f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007052, 6246514, 4, { -148.077499f, 48.772800f, -3.141700f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007051, 6246505, 4, { -195.641693f, 37.440800f, 80.677399f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007123, 6260290, 4, { -107.700996f, 10.249100f, 150.690598f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007050, 6246507, 4, { -8.180000f, 31.300200f, 107.550003f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007049, 6246508, 4, { 75.684898f, 35.111000f, 149.223801f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007048, 6246509, 4, { 174.059998f, 30.587099f, 122.660004f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007047, 6246510, 4, { 175.149307f, 0.118000f, 8.585100f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007046, 6246511, 4, { 121.235901f, 29.898701f, -190.225006f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007121, 6260294, 4, { 29.201799f, 37.825001f, -217.776505f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007045, 6246512, 4, { -43.203499f, 42.615501f, -229.343597f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
deleted file mode 100644
index 114557c0..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ABloodyReunion.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ABloodyReunion : public InstanceContentScript
-{
-public:
-   ABloodyReunion() : InstanceContentScript( 5002 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -133.497498f, 394.924286f, -295.299713f }, 1.400000f );
-      instance->registerEObj( "Unknown1", 2002872, 5786705, 4, { -140.602203f, 394.529388f, -295.997314f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005310, 5698551, 4, { -81.047653f, 394.430786f, -296.243713f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2006038, 5891863, 4, { -103.765701f, 394.988708f, -312.957214f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2006039, 5891860, 4, { -102.201103f, 394.988708f, -278.118988f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 228.611694f, 225.066895f, 272.124695f }, 1.400000f );
-      instance->registerEObj( "Unknown6", 2002872, 5786711, 4, { 220.192200f, 224.639603f, 271.691895f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002872, 5786715, 4, { 265.170685f, 225.066895f, 271.760712f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 230.175598f, -96.457947f, -160.689804f }, 1.400000f );
-      instance->registerEObj( "Unknown9", 2002872, 5786724, 4, { 231.302200f, -96.512398f, -143.853394f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2006040, 5855034, 4, { 230.235901f, -96.457947f, -181.102600f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 230.936203f, -456.457886f, 65.952606f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002735, 0, 4, { 229.505203f, -456.329193f, 99.828033f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002872, 5859273, 4, { 229.632996f, -456.457886f, 93.179420f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007177, 6268147, 4, { 230.075500f, -456.357605f, 58.431438f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007178, 6275911, 4, { 230.467407f, -456.457886f, 79.306190f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007168, 0, 4, { 248.035400f, 225.116302f, 271.869995f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2005295, 5698524, 4, { -232.841797f, 402.044098f, -353.718689f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005296, 5698521, 4, { -177.212006f, 398.044098f, -361.393311f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2005297, 5698523, 4, { -162.152802f, 398.044098f, -369.069885f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2005298, 5698522, 4, { -176.852295f, 398.044098f, -382.745087f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2005299, 5886628, 4, { -168.304993f, 394.044098f, -296.534088f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2005300, 5686456, 4, { 28.763180f, 209.979401f, 211.474701f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2005301, 5686457, 4, { 100.159401f, 220.000000f, 272.267090f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2005293, 5889119, 4, { 28.122299f, 209.979401f, 220.050293f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2005294, 5889137, 4, { 111.924896f, 219.958694f, 271.931000f }, 1.000000f );
-      instance->registerEObj( "Liftterminal", 2005308, 0, 4, { 203.525803f, -28.163019f, 195.849503f }, 0.991760f );
-      instance->registerEObj( "Liftterminal", 2005309, 0, 4, { 229.755005f, -59.269020f, 94.956909f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2005306, 5815811, 4, { -359.609406f, -299.984009f, -249.805496f }, 0.991760f );
-      instance->registerEObj( "Liftterminal", 2005307, 0, 4, { -351.717102f, -299.983887f, -250.003098f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -309.444885f, 400.000000f, -287.942108f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5782651, 5, { -332.999207f, 400.000000f, -297.435211f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
deleted file mode 100644
index 6ca7a6f2..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ASpectaclefortheAges.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ASpectaclefortheAges : public InstanceContentScript
-{
-public:
-   ASpectaclefortheAges() : InstanceContentScript( 5001 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
deleted file mode 100644
index 07b12dd6..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodDragoon.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class BloodDragoon : public InstanceContentScript
-{
-public:
-   BloodDragoon() : InstanceContentScript( 5021 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007896, 6803926, 4, { 3.704567f, -0.506593f, 225.007507f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6805825, 4, { 4.867329f, -0.098875f, 275.309509f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { 4.932000f, -0.320500f, 274.559509f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007899, 6802026, 4, { -28.138130f, -45.000000f, -32.892731f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6806775, 4, { -28.390051f, -45.148991f, 8.165403f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -28.551781f, -45.222500f, 5.617400f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007903, 6773193, 4, { -18.557831f, -44.964081f, -0.932714f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007904, 6773192, 4, { -30.723289f, -45.025860f, 1.953206f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007905, 6773194, 4, { -42.383171f, -44.962471f, -5.125507f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2008196, 0, 4, { -37.125240f, -45.059940f, -9.414856f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2008310, 6879064, 4, { -23.194941f, -45.000000f, -3.016589f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7008362, 4, { -28.500000f, -45.000000f, -14.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002872, 6806776, 4, { 24.174879f, -167.392899f, -453.406586f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 24.419100f, -167.350601f, -455.580109f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007894, 6525794, 4, { -36.023540f, 4.305134f, 406.807404f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007895, 6525806, 4, { 4.331786f, 1.464790f, 289.456207f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007897, 6540078, 4, { -49.525101f, -45.174839f, 117.206200f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007898, 6540093, 4, { -14.321400f, -42.200001f, 42.272179f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007900, 6525664, 4, { -19.668949f, -188.037003f, -235.950302f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2007901, 6525665, 4, { 25.192631f, -172.808502f, -362.417114f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2007902, 6525180, 4, { 23.936859f, -172.125198f, -405.882996f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6797774, 5, { -23.838560f, 8.289917f, 482.742615f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -20.252930f, 8.134582f, 489.817200f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 23.942671f, -167.617996f, -486.860809f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
deleted file mode 100644
index b2613cc8..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/DarkwingDragon.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DarkwingDragon : public InstanceContentScript
-{
-public:
-   DarkwingDragon() : InstanceContentScript( 5016 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f );
-      instance->registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f );
-      instance->registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
deleted file mode 100644
index 18b845c4..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InterdimensionalRift.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class InterdimensionalRift : public InstanceContentScript
-{
-public:
-   InterdimensionalRift() : InstanceContentScript( 5023 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6944598, 4, { -14.915330f, -256.500000f, 385.545197f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6944604, 4, { -280.000000f, -239.750000f, 196.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6944605, 4, { -255.313797f, -226.000000f, -187.394394f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6944606, 4, { -246.604706f, -226.000000f, -192.211807f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000046, 0, 4, { 843.573914f, 427.000000f, 948.472290f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000046, 0, 4, { -207.965302f, -224.000000f, -147.401306f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007457, 6889957, 4, { 1.846330f, -271.700012f, 428.457886f }, 0.991760f );
-      instance->registerEObj( "Matterrelocationdevice", 2008501, 6938814, 4, { -16.956310f, -256.250000f, 382.407898f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2007457, 6954336, 4, { -7.878613f, -256.250000f, 385.557495f }, 1.000000f );
-      instance->registerEObj( "Matterrelocationdevice", 2000048, 6938826, 4, { -286.946014f, -239.764999f, 192.797699f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
deleted file mode 100644
index 7d056db4..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ItsProbablyaTrap.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ItsProbablyaTrap : public InstanceContentScript
-{
-public:
-   ItsProbablyaTrap() : InstanceContentScript( 5005 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6538194, 4, { -27.571140f, -3.000000f, 46.619968f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000608, 6538193, 4, { -28.307659f, 3.999977f, 61.762589f }, 1.000000f );
-      instance->registerEObj( "ClanHuntboard", 2008655, 6422886, 4, { -31.520060f, 0.076252f, -43.853790f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2002872, 6799085, 4, { -79.087517f, -3.006042f, 41.336670f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2002872, 6799087, 4, { -61.668732f, -3.014119f, 84.855003f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007457, 6611234, 4, { 137.621094f, 14.816470f, 92.484863f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2007457, 6538193, 4, { -27.894131f, 3.999977f, 61.384491f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6538194, 4, { -28.259020f, -3.000000f, 46.489510f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
deleted file mode 100644
index 0fde3689..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/MatsubaMayhem.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class MatsubaMayhem : public InstanceContentScript
-{
-public:
-   MatsubaMayhem() : InstanceContentScript( 5011 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2000608, 6538194, 4, { -27.571140f, -3.000000f, 46.619968f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000608, 6538193, 4, { -28.307659f, 3.999977f, 61.762589f }, 1.000000f );
-      instance->registerEObj( "ClanHuntboard", 2008655, 6422886, 4, { -31.520060f, 0.076252f, -43.853790f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2002872, 6799085, 4, { -79.087517f, -3.006042f, 41.336670f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2002872, 6799087, 4, { -61.668732f, -3.014119f, 84.855003f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007457, 6611234, 4, { 137.621094f, 14.816470f, 92.484863f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2007457, 6538193, 4, { -27.894131f, 3.999977f, 61.384491f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6538194, 4, { -28.259020f, -3.000000f, 46.489510f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
deleted file mode 100644
index 50817943..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/Naadam.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class Naadam : public InstanceContentScript
-{
-public:
-   Naadam() : InstanceContentScript( 5008 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f );
-      instance->registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f );
-      instance->registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
deleted file mode 100644
index 08a95154..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurUnsungHeroes.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class OurUnsungHeroes : public InstanceContentScript
-{
-public:
-   OurUnsungHeroes() : InstanceContentScript( 5014 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f );
-      instance->registerEObj( "Unknown6", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f );
-      instance->registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f );
-      instance->registerEObj( "Guardianstatue", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f );
-      instance->registerEObj( "Guardianstatue", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070313f, 100.000000f, -376.644592f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f );
-      instance->registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f }, 0.991760f );
-      instance->registerEObj( "Unknown31", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f }, 0.991760f );
-      instance->registerEObj( "Unknown33", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
deleted file mode 100644
index a1a86cda..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/ReturnoftheBull.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ReturnoftheBull : public InstanceContentScript
-{
-public:
-   ReturnoftheBull() : InstanceContentScript( 5024 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6894813, 4, { -209.363495f, 35.017460f, 72.069672f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6894812, 4, { -172.226807f, 35.017342f, 72.369667f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -210.219406f, 35.017460f, 72.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2008685, 0, 4, { -192.767105f, 34.867069f, 71.984734f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6894833, 4, { 250.000000f, 106.496902f, -50.489590f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6894834, 4, { 250.000000f, 106.496902f, -89.516243f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 250.000000f, 106.496902f, -50.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002872, 6895342, 4, { 248.500000f, 122.000000f, -329.291107f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6865535, 4, { 249.561295f, 121.995796f, -352.681793f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007457, 6895343, 4, { 249.487595f, 122.005699f, -330.083801f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002872, 6904529, 4, { 248.937500f, 122.000000f, -377.252899f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2008350, 0, 4, { 250.000000f, 122.000000f, -353.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007168, 0, 4, { 250.018997f, 121.995796f, -353.109009f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6879593, 5, { -408.611298f, 2.500000f, 233.977905f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -398.118408f, 2.500000f, 236.857193f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 250.007294f, 122.000000f, -370.492889f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2008319, 6844583, 4, { -342.881104f, 24.000010f, 149.680099f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2008319, 6844584, 4, { -258.130402f, 27.000010f, 99.970268f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 6840800, 4, { -100.167801f, 44.750629f, 73.001747f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 6853103, 4, { 193.710297f, 106.000000f, 128.847397f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6847102, 4, { 263.424286f, 106.400002f, -8.750051f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007457, 6847104, 4, { 249.800797f, 106.428101f, -108.873100f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2008335, 6844579, 4, { 233.630905f, 109.971703f, -155.596298f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2008335, 6844578, 4, { 233.295197f, 109.971703f, -144.792892f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2008335, 6844581, 4, { 224.912094f, 120.000000f, -248.707504f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2008335, 6844580, 4, { 210.809296f, 120.000000f, -248.716202f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2008336, 6845038, 4, { 249.895905f, 122.099899f, -294.475403f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007457, 6942278, 4, { 233.967697f, 110.000000f, -150.215607f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007457, 6942279, 4, { 217.761505f, 119.889999f, -247.455597f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
deleted file mode 100644
index 6e09cbdb..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheHeartoftheProblem.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheHeartoftheProblem : public InstanceContentScript
-{
-public:
-   TheHeartoftheProblem() : InstanceContentScript( 5015 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f );
-      instance->registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f );
-      instance->registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
deleted file mode 100644
index f4f252ee..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheResonant.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheResonant : public InstanceContentScript
-{
-public:
-   TheResonant() : InstanceContentScript( 5017 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6927333, 4, { 503.255096f, 70.000000f, 589.613708f }, 1.000000f );
-      instance->registerEObj( "Gatewinch", 2008907, 0, 4, { 508.261505f, 71.415131f, 575.156982f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007457, 7012282, 4, { 702.654602f, 70.000000f, 532.514282f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2008678, 0, 4, { -139.654007f, 69.993042f, 667.066772f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2008678, 0, 4, { -187.638397f, 69.993042f, 634.666504f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2008678, 0, 4, { -73.946472f, 69.993042f, 652.456177f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
deleted file mode 100644
index 358d1bd9..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WhenClansCollide.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class WhenClansCollide : public InstanceContentScript
-{
-public:
-   WhenClansCollide() : InstanceContentScript( 5022 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2008290, 6894789, 4, { 375.272888f, -4.893838f, 290.605011f }, 1.000000f );
-      instance->registerEObj( "Yol", 2008330, 0, 4, { 466.995514f, 21.157949f, -328.188995f }, 1.000000f );
-      instance->registerEObj( "Ovoo", 2008289, 6872570, 4, { 354.000000f, -0.790344f, 296.500000f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2004967, 0, 4, { -187.899506f, 1.653982f, 760.298279f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
deleted file mode 100644
index fb456f55..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/WithHeartandSteel.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class WithHeartandSteel : public InstanceContentScript
-{
-public:
-   WithHeartandSteel() : InstanceContentScript( 5007 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 16.000000f, -0.599972f, -25.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6255278, 4, { 15.499620f, -0.600000f, -32.576271f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 6255280, 4, { 16.000000f, -0.599986f, -84.500000f }, 1.200000f );
-      instance->registerEObj( "Unknown3", 2007130, 6259583, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007131, 6271618, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007127, 6263439, 4, { 2.786298f, 1.130917f, -81.495903f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007128, 6263438, 4, { 44.322010f, 1.937706f, -52.936489f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2007129, 6263356, 4, { -1.414551f, 2.361187f, -31.816429f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002872, 6256300, 4, { -298.284485f, -74.099991f, -394.606812f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 6252961, 4, { -298.284485f, -74.000061f, -446.164307f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007174, 0, 4, { -301.925903f, -74.099998f, -434.771606f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007175, 6275855, 4, { -305.091309f, -74.099998f, -434.266205f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007176, 6275857, 4, { -299.330200f, -74.099998f, -441.272186f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000034, 6252960, 4, { -301.382507f, -74.111649f, -397.150391f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2000035, 0, 4, { -300.012909f, -74.111687f, -411.038788f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002735, 0, 4, { 280.000000f, -468.750000f, -352.734314f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2002872, 6256312, 4, { 279.076385f, -468.799988f, -346.734894f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007092, 6246904, 4, { 271.681488f, -269.434998f, 263.484192f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007093, 6246906, 4, { 299.983093f, -269.438812f, 263.439911f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007094, 6246909, 4, { 328.133606f, -269.459900f, 263.349915f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007095, 6246905, 4, { 272.007813f, -270.624695f, 249.703201f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007096, 6246907, 4, { 299.972198f, -270.615295f, 249.808594f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007097, 6246910, 4, { 327.886597f, -270.637299f, 249.556503f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007098, 6276590, 4, { 271.976288f, -270.275513f, 254.027298f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007099, 6276603, 4, { 300.073914f, -270.279907f, 253.881897f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007100, 6276618, 4, { 328.117798f, -270.282501f, 253.919098f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007101, 6277276, 4, { 300.580688f, -329.902802f, 215.101807f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007102, 0, 4, { 313.999695f, -254.436203f, 249.057007f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007091, 6253623, 4, { 280.196686f, -468.799988f, -340.444214f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2000015, 6323645, 4, { 280.035004f, -444.700012f, -381.003815f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2000015, 6323651, 4, { 255.731705f, -444.700012f, -423.649811f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2000015, 6323650, 4, { 304.734985f, -444.700012f, -424.385590f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007350, 6405524, 4, { 280.000000f, -446.006287f, -410.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2002618, 6405504, 4, { 271.693695f, -445.000000f, -398.334412f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2002618, 6413337, 4, { 284.413513f, -444.945587f, -428.864410f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2002735, 0, 4, { -300.007690f, -436.179108f, -3.677429f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2002872, 6256352, 4, { -299.044006f, -436.200012f, 1.934000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -300.007690f, -436.057098f, -56.789539f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2000019, 6223041, 4, { -293.815094f, -436.100006f, -36.657909f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2007363, 6403167, 4, { -300.000000f, -436.100006f, -34.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2007381, 0, 4, { -288.659698f, -436.100006f, -36.228500f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2007104, 6253621, 4, { -293.853302f, -417.190002f, 338.020691f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2007105, 6262270, 4, { 279.377411f, -481.421112f, -273.999298f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2007106, 6253622, 4, { 282.739197f, -506.212494f, -377.761414f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2007630, 0, 4, { -307.311310f, -74.111656f, -404.095490f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2007457, 6873350, 4, { -287.981812f, -74.111671f, -418.439789f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2007457, 7008372, 4, { -286.682404f, -74.111656f, -414.302185f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2000034, 6252960, 4, { -299.669098f, -74.111687f, -422.791412f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2008306, 6873007, 4, { -299.592712f, -123.000000f, -313.306885f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2002872, 6873032, 4, { -298.298706f, -74.113159f, -394.613586f }, 0.991760f );
-      instance->registerEObj( "Unknown51", 2007112, 6252937, 4, { -258.522614f, -114.655602f, -231.454193f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2007112, 6403165, 4, { -360.672485f, -116.000198f, -271.268707f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2008452, 6889796, 4, { -239.520905f, -116.014397f, -230.853806f }, 0.991760f );
-      instance->registerEObj( "Unknown54", 2007457, 6941894, 4, { -299.583099f, -75.000023f, -353.118500f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2007108, 6252917, 4, { 52.989189f, 8.000000f, 109.725502f }, 1.000000f );
-      instance->registerEObj( "Unknown56", 2007109, 6252933, 4, { 40.849979f, 7.999999f, 54.685509f }, 1.000000f );
-      instance->registerEObj( "Unknown57", 2007110, 6258888, 4, { -217.946503f, -116.000000f, -210.519608f }, 0.991760f );
-      instance->registerEObj( "Unknown58", 2007111, 6258889, 4, { -351.721313f, -116.000000f, -260.105499f }, 1.000000f );
-      instance->registerEObj( "Unknown59", 2007112, 6252937, 4, { -249.593796f, -116.000000f, -229.014603f }, 1.000000f );
-      instance->registerEObj( "Unknown60", 2007112, 6403165, 4, { -354.681885f, -116.000298f, -278.960693f }, 1.000000f );
-      instance->registerEObj( "Unknown61", 2002735, 0, 4, { -185.956604f, -394.699890f, 235.090607f }, 1.000000f );
-      instance->registerEObj( "Unknown62", 2002872, 6259368, 4, { -189.835297f, -394.768494f, 236.985107f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2002872, 6259369, 4, { -152.910706f, -394.522003f, 215.716797f }, 0.991760f );
-      instance->registerEObj( "Unknown64", 2007114, 6265979, 4, { -179.125702f, -394.522003f, 205.950897f }, 0.991760f );
-      instance->registerEObj( "Unknown65", 2007115, 6265980, 4, { -157.763107f, -394.522003f, 242.664200f }, 0.991760f );
-      instance->registerEObj( "Unknown66", 2007116, 6265977, 4, { -181.536697f, -394.522003f, 201.556396f }, 0.991760f );
-      instance->registerEObj( "Unknown67", 2007117, 6275728, 4, { -180.590607f, -394.522003f, 231.158905f }, 0.991760f );
-      instance->registerEObj( "Unknown68", 2007118, 6262272, 4, { -156.623795f, -394.500092f, 244.445908f }, 1.000000f );
-      instance->registerEObj( "Unknown69", 2007119, 6264911, 4, { -168.688507f, -391.866913f, 224.567001f }, 0.991760f );
-      instance->registerEObj( "Unknown70", 2007378, 6404242, 4, { -170.886597f, -394.500092f, 228.890305f }, 1.000000f );
-      instance->registerEObj( "Unknown71", 2007379, 6404243, 4, { -174.892807f, -394.500092f, 226.853806f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007054, 6277013, 4, { 29.465090f, 12.072440f, 173.291306f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2007055, 6277014, 4, { 10.055660f, 10.610950f, 59.293789f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2007056, 6277015, 4, { 21.985451f, -1.159537f, -124.736298f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007057, 6277012, 4, { -290.684998f, -71.292747f, -368.263885f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007058, 6235460, 4, { -244.833099f, -390.428986f, 258.731689f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007059, 6235461, 4, { 276.184296f, -461.318604f, -294.996796f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007060, 6235463, 4, { -304.521301f, -435.890594f, 23.143780f }, 1.000000f );
-      instance->registerEObj( "Unknown72", 2007103, 6259793, 4, { 16.303080f, -3.864367f, -114.426003f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6247654, 5, { 81.884888f, 13.000000f, 208.698303f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp
new file mode 100644
index 00000000..03cf2e1f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ABloodyReunion : public InstanceContentScript
+{
+public:
+   ABloodyReunion() : InstanceContentScript( 5002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
new file mode 100644
index 00000000..331adc0a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
@@ -0,0 +1,43 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ASpectaclefortheAges : public InstanceContentScript
+{
+public:
+   ASpectaclefortheAges() : InstanceContentScript( 5001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp
new file mode 100644
index 00000000..3d30a3da
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class BloodDragoon : public InstanceContentScript
+{
+public:
+   BloodDragoon() : InstanceContentScript( 5021 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp
similarity index 71%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp
index 1e2f11f2..8b34e322 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/BloodontheDeck.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp
@@ -10,8 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6904219, 4, { 5.684449f, 16.347240f, 3.782750f }, 1.000000f );
+      instance->registerEObj( "sgbg_w_qic_004_01a", 2007457, 6904219, 4, { 5.684449f, 16.347240f, 3.782750f }, 1.000000f, 0.000000f ); 
+      // States -> cage01_close_01 cage01_open_01 cage01_open_02 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
similarity index 79%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
index 40281d56..888d4d16 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/CuriousGorgeMeetsHisMatch.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Summoningbell", 2000401, 4260827, 4, { 14.143430f, 5.238082f, 13.664930f }, 1.000000f );
-      instance->registerEObj( "Teamboard", 2009097, 4302533, 4, { 15.508660f, 6.051773f, -14.767720f }, 1.000000f );
+      instance->registerEObj( "Summoningbell", 2000401, 4260827, 4, { 14.143430f, 5.238082f, 13.664930f }, 1.000000f, 0.000000f ); 
+      // States -> vf_rtbell_on 
+      instance->registerEObj( "Teamboard", 2009097, 4302533, 4, { 15.508660f, 6.051773f, -14.767720f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp
new file mode 100644
index 00000000..be86d270
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DarkwingDragon : public InstanceContentScript
+{
+public:
+   DarkwingDragon() : InstanceContentScript( 5016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp
similarity index 74%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp
index 98270057..4fe6dc4b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/InThalsName.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp
@@ -10,9 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f );
-      instance->registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f, -0.343160f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp
new file mode 100644
index 00000000..60b8e561
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class InterdimensionalRift : public InstanceContentScript
+{
+public:
+   InterdimensionalRift() : InstanceContentScript( 5023 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
new file mode 100644
index 00000000..84b98648
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ItsProbablyaTrap : public InstanceContentScript
+{
+public:
+   ItsProbablyaTrap() : InstanceContentScript( 5005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp
new file mode 100644
index 00000000..90b6ef77
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class MatsubaMayhem : public InstanceContentScript
+{
+public:
+   MatsubaMayhem() : InstanceContentScript( 5011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp
new file mode 100644
index 00000000..33942bb8
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class Naadam : public InstanceContentScript
+{
+public:
+   Naadam() : InstanceContentScript( 5008 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
similarity index 67%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
index d012e08e..875cdea7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OneLifeforOneWorld.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
@@ -10,11 +10,12 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp
similarity index 79%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp
index 74518599..b8f3f929 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/OurCompromise.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp
@@ -10,8 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6941254, 4, { -613.766602f, 59.266399f, -460.085205f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp
new file mode 100644
index 00000000..bc6d98b0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp
@@ -0,0 +1,72 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class OurUnsungHeroes : public InstanceContentScript
+{
+public:
+   OurUnsungHeroes() : InstanceContentScript( 5014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6159060, 4, { -199.881607f, 11.999990f, -280.139313f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -200.009201f, 12.116690f, -280.037506f }, 0.991760f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2003373, 6159063, 4, { -238.928894f, 12.100000f, -279.455688f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2006848, 0, 4, { -227.145905f, 11.978270f, -284.676086f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6158913, 4, { -262.326813f, -278.432312f, -241.982407f }, 1.000000f, -0.424392f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { -261.926788f, -278.586792f, -242.680695f }, 0.800000f, -0.511830f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2006850, 6161174, 4, { -281.669495f, -278.783203f, -207.507401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_3", 2006851, 0, 4, { -287.205292f, -278.675507f, -219.428604f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2006852, 0, 4, { -285.709991f, -278.675507f, -222.022598f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2006853, 0, 4, { -284.489288f, -278.675507f, -217.719604f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_6", 2006854, 0, 4, { -282.932892f, -278.675507f, -220.527298f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6177873, 4, { 236.391098f, -854.348206f, 388.999908f }, 0.991760f, -0.424392f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f, -0.272621f ); 
+      instance->registerEObj( "unknown_8", 2006855, 0, 4, { 245.654495f, -854.500000f, 408.186615f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2006856, 0, 4, { 245.602402f, -854.500000f, 408.203186f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2006857, 0, 4, { 217.570694f, -854.500000f, 414.970306f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_11", 2006867, 0, 4, { 238.696899f, -854.398376f, 400.472900f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2006868, 0, 4, { 225.070404f, -854.520508f, 402.559692f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_13", 2007000, 6217077, 4, { 230.880493f, -854.459717f, 414.889313f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Guardianstatue", 2006976, 0, 4, { 231.118698f, -852.800171f, 414.090088f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Guardianstatue_1", 2006977, 0, 4, { 231.113907f, -852.801514f, 414.085785f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Guardianstatue_2", 2006978, 0, 4, { 231.101898f, -852.801514f, 414.089111f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6159123, 5, { 73.070312f, 100.000000f, -376.644592f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 65.173607f, 100.000000f, -382.604614f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 228.895599f, -854.546082f, 420.274109f }, 0.991760f, -0.919204f ); 
+      instance->registerEObj( "unknown_14", 2006825, 6173434, 4, { -45.716091f, 57.999512f, -311.654205f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_15", 2006826, 6173447, 4, { -174.685303f, 6.271362f, -302.651215f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2006827, 6173458, 4, { -174.227493f, 6.973328f, -299.721588f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_17", 2006828, 6155704, 4, { -74.714241f, 58.247410f, -327.713287f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_18", 2006829, 6184879, 4, { -170.839996f, -252.613205f, -408.640503f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_19", 2006830, 6184881, 4, { -163.902496f, -272.319397f, -294.726501f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2006831, 6162191, 4, { -243.942093f, -280.660706f, -273.564789f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Stoneoftransference", 2006834, 6173379, 4, { -295.032104f, -273.037506f, -185.082397f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2006832, 6177949, 4, { 166.001007f, -844.999817f, 265.365814f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2006833, 6177947, 4, { 226.690002f, -856.247681f, 262.675415f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_23", 2006835, 6202096, 4, { 255.720200f, -865.873474f, 319.853210f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_w_qic_004_03a", 2002872, 6904891, 4, { 236.391205f, -854.348083f, 388.999908f }, 0.991760f, -0.424392f ); 
+      instance->registerEObj( "unknown_24", 2002735, 0, 4, { 236.928299f, -854.301025f, 388.437988f }, 0.991760f, -0.272621f ); 
+      instance->registerEObj( "sgbg_w_qic_004_03a_1", 2007457, 6904603, 4, { 249.195099f, -856.351624f, 343.526215f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_25", 2007457, 6217077, 4, { 233.497299f, -854.546021f, 414.179413f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp
similarity index 74%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp
index 18b6d1c0..b0e6abb4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/RaisingtheSword.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp
@@ -10,9 +10,9 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f );
-      instance->registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2004364, 0, 4, { -93.101089f, -13.129550f, 6.845694f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Companychest", 2000470, 4255822, 4, { 128.974701f, 5.067919f, -40.913502f }, 1.000000f, -0.343160f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp
new file mode 100644
index 00000000..2a14b968
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ReturnoftheBull : public InstanceContentScript
+{
+public:
+   ReturnoftheBull() : InstanceContentScript( 5024 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp
similarity index 67%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp
index 33272f19..76234e6a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheBattleonBekko.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp
@@ -10,9 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2008480, 6894787, 4, { 564.783630f, -60.304729f, -136.444901f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004541, 0, 4, { 800.087585f, 0.000000f, 44.317749f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
new file mode 100644
index 00000000..21d49360
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
@@ -0,0 +1,51 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheCarteneauFlatsHeliodrome : public InstanceContentScript
+{
+public:
+   TheCarteneauFlatsHeliodrome() : InstanceContentScript( 5004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1", 2005078, 5573675, 4, { -150.601807f, -15.195440f, 86.396042f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_1", 2005079, 5573676, 4, { -160.177505f, -15.426880f, 111.877502f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_2", 2005080, 5573677, 4, { -178.133102f, -15.426880f, 85.038406f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_3", 2005081, 5573687, 4, { 147.790497f, -15.205700f, 85.606216f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_4", 2005082, 5573688, 4, { 181.170303f, -15.426880f, 81.284790f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_5", 2005083, 5573689, 4, { 160.730392f, -15.457460f, 117.518303f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_6", 2005084, 5573690, 4, { -0.015320f, -15.426880f, -162.924103f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_7", 2005085, 5573691, 4, { 19.010229f, -15.416970f, -200.015396f }, 1.000000f, 0.000000f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "sgbg_l1p1_q3_swhu1_8", 2005086, 5573692, 4, { -18.994471f, -15.426880f, -199.992905f }, 0.991760f, 0.000048f ); 
+      // States -> magic_go magic_down magic_2down magic_on magic_2on 
+      instance->registerEObj( "unknown_0", 2004187, 4724282, 4, { -0.007111f, 12.000000f, -386.299896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004188, 4724284, 4, { 335.025513f, 12.000000f, 193.711899f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004189, 4724283, 4, { -334.556213f, 12.000000f, 193.274796f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_l1p1_lvd_b0441", 2004202, 4797506, 4, { -0.101569f, 30.000000f, 1.413736f }, 1.000000f, 0.000000f ); 
+      // States -> STAGE_def STAGE_pop_anim 
+      instance->registerEObj( "Magitekreaper", 2007710, 0, 4, { -0.135500f, 28.501801f, 18.021700f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007722, 6642830, 4, { 7.805808f, 29.000000f, 0.239120f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
index 11dfa7b1..b557b3f4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheFaceofTrueEvil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
new file mode 100644
index 00000000..7da03526
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheHeartoftheProblem : public InstanceContentScript
+{
+public:
+   TheHeartoftheProblem() : InstanceContentScript( 5015 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
similarity index 98%
rename from src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
index 0a69bee6..c000d167 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattle/TheOrphansandtheBrokenBlade.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
@@ -10,7 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp
new file mode 100644
index 00000000..63518837
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheResonant : public InstanceContentScript
+{
+public:
+   TheResonant() : InstanceContentScript( 5017 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp
new file mode 100644
index 00000000..c2ff0eb4
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class WhenClansCollide : public InstanceContentScript
+{
+public:
+   WhenClansCollide() : InstanceContentScript( 5022 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp
new file mode 100644
index 00000000..7ce1c530
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class WithHeartandSteel : public InstanceContentScript
+{
+public:
+   WithHeartandSteel() : InstanceContentScript( 5007 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
new file mode 100644
index 00000000..c0c1f818
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheArmoftheFather : public InstanceContentScript
+{
+public:
+   AlexanderTheArmoftheFather() : InstanceContentScript( 30023 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
new file mode 100644
index 00000000..e426dcde
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheArmoftheFatherSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheArmoftheFatherSavage() : InstanceContentScript( 30027 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
new file mode 100644
index 00000000..b8fd4c5a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheArmoftheSon : public InstanceContentScript
+{
+public:
+   AlexanderTheArmoftheSon() : InstanceContentScript( 30032 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
new file mode 100644
index 00000000..dff083a4
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheArmoftheSonSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheArmoftheSonSavage() : InstanceContentScript( 30036 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
new file mode 100644
index 00000000..2c077f71
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBreathoftheCreator : public InstanceContentScript
+{
+public:
+   AlexanderTheBreathoftheCreator() : InstanceContentScript( 30040 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
new file mode 100644
index 00000000..6bd7f50b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBreathoftheCreatorSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheBreathoftheCreatorSavage() : InstanceContentScript( 30044 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
similarity index 60%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
index 5c516367..ce0a0c02 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
@@ -10,10 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2005494, 5863691, 4, { 102.000000f, 43.646099f, 16.000000f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5788043, 5, { -0.001985f, 10.900000f, 20.255680f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 10.561610f, -23.025881f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
similarity index 60%
rename from src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
index b64fb71b..4028b812 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
@@ -10,10 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2005494, 5863691, 4, { 102.000000f, 43.646099f, 16.000000f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5788043, 5, { -0.001985f, 10.900000f, 20.255680f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 10.561610f, -23.025881f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
new file mode 100644
index 00000000..44714ddf
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBurdenoftheSon : public InstanceContentScript
+{
+public:
+   AlexanderTheBurdenoftheSon() : InstanceContentScript( 30033 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
new file mode 100644
index 00000000..21cb733f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheBurdenoftheSonSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheBurdenoftheSonSavage() : InstanceContentScript( 30037 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
new file mode 100644
index 00000000..44dc3861
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheCuffoftheFather : public InstanceContentScript
+{
+public:
+   AlexanderTheCuffoftheFather() : InstanceContentScript( 30022 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
new file mode 100644
index 00000000..e8204ae4
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheCuffoftheFatherSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheCuffoftheFatherSavage() : InstanceContentScript( 30026 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
new file mode 100644
index 00000000..748c50c0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheCuffoftheSon : public InstanceContentScript
+{
+public:
+   AlexanderTheCuffoftheSon() : InstanceContentScript( 30031 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
new file mode 100644
index 00000000..5f1ad5b9
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheCuffoftheSonSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheCuffoftheSonSavage() : InstanceContentScript( 30035 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
new file mode 100644
index 00000000..c3f70830
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheEyesoftheCreator : public InstanceContentScript
+{
+public:
+   AlexanderTheEyesoftheCreator() : InstanceContentScript( 30039 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
new file mode 100644
index 00000000..c2cd75e0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheEyesoftheCreatorSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheEyesoftheCreatorSavage() : InstanceContentScript( 30043 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
new file mode 100644
index 00000000..aa05cd54
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheFistoftheFather : public InstanceContentScript
+{
+public:
+   AlexanderTheFistoftheFather() : InstanceContentScript( 30021 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
new file mode 100644
index 00000000..42e0dec6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheFistoftheFatherSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheFistoftheFatherSavage() : InstanceContentScript( 30025 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
new file mode 100644
index 00000000..1fabc5bb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheFistoftheSon : public InstanceContentScript
+{
+public:
+   AlexanderTheFistoftheSon() : InstanceContentScript( 30030 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
new file mode 100644
index 00000000..5186dd23
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheFistoftheSonSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheFistoftheSonSavage() : InstanceContentScript( 30034 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
new file mode 100644
index 00000000..7bb2a980
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheHeartoftheCreator : public InstanceContentScript
+{
+public:
+   AlexanderTheHeartoftheCreator() : InstanceContentScript( 30041 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
new file mode 100644
index 00000000..189ed482
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheHeartoftheCreatorSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheHeartoftheCreatorSavage() : InstanceContentScript( 30045 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
new file mode 100644
index 00000000..7c86de2b
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheSouloftheCreator : public InstanceContentScript
+{
+public:
+   AlexanderTheSouloftheCreator() : InstanceContentScript( 30042 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
new file mode 100644
index 00000000..17328aaf
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class AlexanderTheSouloftheCreatorSavage : public InstanceContentScript
+{
+public:
+   AlexanderTheSouloftheCreatorSavage() : InstanceContentScript( 30046 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp
new file mode 100644
index 00000000..5a1289a6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV10 : public InstanceContentScript
+{
+public:
+   DeltascapeV10() : InstanceContentScript( 30049 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp
new file mode 100644
index 00000000..3605ff34
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV10Savage : public InstanceContentScript
+{
+public:
+   DeltascapeV10Savage() : InstanceContentScript( 30053 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp
new file mode 100644
index 00000000..82afc2d2
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV20 : public InstanceContentScript
+{
+public:
+   DeltascapeV20() : InstanceContentScript( 30050 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp
new file mode 100644
index 00000000..6f27bdc8
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV20Savage : public InstanceContentScript
+{
+public:
+   DeltascapeV20Savage() : InstanceContentScript( 30054 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp
new file mode 100644
index 00000000..b3773f59
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV30 : public InstanceContentScript
+{
+public:
+   DeltascapeV30() : InstanceContentScript( 30051 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp
new file mode 100644
index 00000000..d4a2fb40
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV30Savage : public InstanceContentScript
+{
+public:
+   DeltascapeV30Savage() : InstanceContentScript( 30055 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp
new file mode 100644
index 00000000..a2cc82b6
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV40 : public InstanceContentScript
+{
+public:
+   DeltascapeV40() : InstanceContentScript( 30052 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp
new file mode 100644
index 00000000..e6ba7730
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DeltascapeV40Savage : public InstanceContentScript
+{
+public:
+   DeltascapeV40Savage() : InstanceContentScript( 30056 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp
new file mode 100644
index 00000000..ebbf975e
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class DunScaith : public InstanceContentScript
+{
+public:
+   DunScaith() : InstanceContentScript( 30047 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp
new file mode 100644
index 00000000..70001b19
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV10 : public InstanceContentScript
+{
+public:
+   SigmascapeV10() : InstanceContentScript( 30059 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp
new file mode 100644
index 00000000..0045814f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV10Savage : public InstanceContentScript
+{
+public:
+   SigmascapeV10Savage() : InstanceContentScript( 30063 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp
new file mode 100644
index 00000000..d9801eef
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV20 : public InstanceContentScript
+{
+public:
+   SigmascapeV20() : InstanceContentScript( 30060 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp
new file mode 100644
index 00000000..6e39309a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV20Savage : public InstanceContentScript
+{
+public:
+   SigmascapeV20Savage() : InstanceContentScript( 30064 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp
new file mode 100644
index 00000000..e03b7d58
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV30 : public InstanceContentScript
+{
+public:
+   SigmascapeV30() : InstanceContentScript( 30061 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp
new file mode 100644
index 00000000..b167b055
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV30Savage : public InstanceContentScript
+{
+public:
+   SigmascapeV30Savage() : InstanceContentScript( 30065 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp
new file mode 100644
index 00000000..ce4e8014
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV40 : public InstanceContentScript
+{
+public:
+   SigmascapeV40() : InstanceContentScript( 30062 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp
new file mode 100644
index 00000000..d3b6b7c0
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SigmascapeV40Savage : public InstanceContentScript
+{
+public:
+   SigmascapeV40Savage() : InstanceContentScript( 30066 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp
new file mode 100644
index 00000000..a9f74a77
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp
@@ -0,0 +1,94 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SyrcusTower : public InstanceContentScript
+{
+public:
+   SyrcusTower() : InstanceContentScript( 30011 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2002587, 0, 4, { -370.000000f, 500.115387f, -199.956299f }, 0.700000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 4738783, 4, { -394.730194f, 500.000000f, -199.572800f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -415.668213f, 500.000000f, -200.003296f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_l1r2_d2_mete2", 2004244, 4757482, 4, { -390.384705f, 500.000000f, -194.533203f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout 
+      instance->registerEObj( "sgbg_l1r2_d2_mete2_1", 2004292, 4757483, 4, { -401.338287f, 500.000000f, -196.787003f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout 
+      instance->registerEObj( "sgbg_l1r2_d2_mete2_2", 2004293, 4757484, 4, { -403.504913f, 500.000000f, -196.539597f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout 
+      instance->registerEObj( "sgbg_l1r2_d2_mete2_3", 2004294, 4757485, 4, { -405.170593f, 500.000000f, -202.118393f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout 
+      instance->registerEObj( "sgbg_l1r2_d2_mete2_4", 2004295, 4757486, 4, { -400.173798f, 500.000000f, -200.892807f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout 
+      instance->registerEObj( "sgbg_l1r2_d2_mete2_5", 2004296, 4757487, 4, { -395.280304f, 500.000000f, -200.854401f }, 1.000000f, 0.000000f ); 
+      // States -> b4_come_off_01 b4_come_off_02 b4_come_on_01 b4_come_off_03 b4_come_on_02 b4_come_on_03 b4_come_on_04 b4_come_on_05 b4_come_on_06 b4_come_fdout 
+      instance->registerEObj( "sgbg_l1r2_d2_mete1", 2004243, 4757498, 4, { -400.242615f, 500.000000f, -197.116501f }, 1.000000f, 0.000000f ); 
+      // States -> b4_mete_off_01 b4_mete_off_02 b4_mete_on_01 b4_mete_off_03 b4_mete_on_02 b4_mete_on_03 b4_mete_on_04 b4_mete_on_05 b4_mete_on_06 b4_mete_fdout 
+      instance->registerEObj( "unknown_1", 2004354, 0, 4, { -397.029785f, 500.000000f, -196.979202f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004355, 0, 4, { -459.071411f, 506.001801f, -196.468506f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2004236, 4759659, 4, { -1.397732f, -589.900085f, -194.801498f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2004237, 0, 4, { 2.182007f, -589.929077f, -198.077499f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2002587, 0, 4, { -0.015320f, -590.000000f, -152.513794f }, 0.686646f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250_1", 2002872, 4725495, 4, { 0.228821f, -590.000000f, -174.995300f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_6", 2002587, 0, 4, { -0.883440f, -4.000000f, -141.001801f }, 0.700000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250_2", 2002872, 4738653, 4, { -0.991882f, 0.000000f, -196.720993f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2004245, 4711823, 4, { -0.379705f, 0.000000f, -145.342300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2004246, 4711824, 4, { 0.710614f, 0.000000f, -199.171204f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2004247, 4711825, 4, { 0.439319f, 0.000001f, -201.553802f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2004248, 4711828, 4, { 0.202690f, 0.000000f, -199.270599f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2004250, 4867789, 4, { -0.142451f, -0.000001f, -199.916000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2004251, 4771487, 4, { 6.207808f, 0.025001f, -197.716293f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2004252, 4771488, 4, { 0.912855f, 0.000000f, -200.229401f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2004253, 4771264, 4, { -0.249095f, 0.000000f, -200.632095f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2004540, 0, 4, { 2.310606f, 0.000000f, -199.315903f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2002587, 0, 4, { 16.500000f, 600.000000f, -175.000000f }, 0.700000f, -0.584685f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250_3", 2002872, 4738751, 4, { 6.038667f, 600.000000f, -191.625595f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_17", 2004249, 0, 4, { 0.534058f, 600.000000f, -204.089493f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_18", 2004372, 0, 4, { 2.491530f, 600.000000f, -197.343201f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2004498, 0, 4, { 7.797371f, 600.000000f, -197.855301f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2002587, 0, 4, { 0.000000f, -700.000000f, 79.955803f }, 0.700000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250_4", 2002872, 4725557, 4, { -0.328611f, -700.000000f, 53.732899f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_21", 2002587, 0, 4, { 29.805300f, -400.000000f, -200.000000f }, 0.700000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250_5", 2002872, 4725580, 4, { 5.249963f, -400.000000f, -199.878006f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_22", 2002587, 0, 4, { 0.000000f, 200.000000f, -229.757797f }, 0.700000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250_6", 2002872, 4738682, 4, { 0.542766f, 199.899994f, -231.713898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Entrance", 2000182, 4723157, 5, { -0.325782f, -897.940918f, 371.584106f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Allaganteleporter", 2004154, 4645409, 4, { -5.014030f, -894.781982f, 324.891296f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Allaganteleporter_1", 2004155, 4645410, 4, { 8.084772f, -708.339111f, 175.045898f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Allaganteleporter_2", 2004158, 4645412, 4, { 7.971835f, -598.362915f, -76.990211f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Allaganteleporter_3", 2004156, 4652344, 4, { 72.370857f, -402.456696f, -206.931000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Allaganteleporter_4", 2004159, 4645415, 4, { -6.906353f, -2.365848f, -126.353897f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Allaganteleporter_5", 2004157, 4645417, 4, { -6.845924f, 197.827805f, -274.836700f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Allaganteleporter_6", 2004160, 4651219, 4, { 29.220949f, 599.725220f, -140.581406f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Allaganteleporter_7", 2004161, 4636419, 4, { -317.290192f, 500.821808f, -189.288193f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_23", 2004164, 4738634, 4, { 0.448093f, -700.000000f, 104.558601f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2004173, 4720323, 4, { 0.019809f, -590.000000f, -150.897903f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_25", 2004167, 4711138, 4, { 44.295219f, -403.598602f, -199.389694f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_26", 2004176, 4710992, 4, { 0.045776f, 0.000000f, -180.284607f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_27", 2004170, 4710494, 4, { 0.449279f, 196.100006f, -262.072296f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_28", 2004179, 4742340, 4, { 28.708071f, 598.000183f, -156.658600f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
new file mode 100644
index 00000000..4a85bfeb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
@@ -0,0 +1,63 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn1 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn1() : InstanceContentScript( 30002 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000620, 4293369, 4, { -1.810616f, 13.164380f, 57.682442f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2000619, 4293368, 4, { -3.276026f, 13.164380f, 57.488449f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "unknown_0", 2000680, 0, 4, { 0.000000f, 5.245687f, 4.314113f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1b1_bosswall", 2000620, 4293633, 4, { 8.673634f, 4.398203f, -361.720886f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0249", 2000619, 4293632, 4, { 7.539745f, 4.948945f, -366.654388f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "unknown_1", 2001137, 0, 4, { -8.048342f, 1.700000f, -412.088593f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2001696, 0, 4, { -23.791620f, 1.300000f, -414.239990f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -45.330261f, 25.136589f, 134.093399f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1b1_door_col", 2000486, 4374535, 4, { -5.435945f, 12.209330f, 0.953091f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2000746, 4312523, 4, { 57.321320f, 2.000001f, -254.168396f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000746, 4312527, 4, { 36.303661f, 2.815034f, -341.235992f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2001154, 4083745, 4, { -38.633110f, 0.899952f, -414.162201f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2001167, 4329693, 4, { -50.832001f, 59.871399f, -332.417511f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1b1_lightwall", 2002712, 4374479, 4, { 52.174641f, 2.740428f, -248.752899f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_s1b1_lightwall_1", 2002712, 4374482, 4, { 44.598309f, 1.549361f, -340.584991f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1r1_bossplusfloor", 2001152, 4374713, 4, { -4.591531f, 4.500000f, -379.052795f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1r1_bossplusfloor_1", 2001152, 4374714, 4, { -47.199150f, 4.900000f, -430.581299f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_f1r1_bossplusfloor_2", 2001152, 4374715, 4, { -12.391370f, -0.160584f, -378.187805f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_f1r1_bossplusfloor_3", 2001152, 4374749, 4, { -12.091370f, -0.160584f, -376.087799f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_6", 2000681, 4312291, 4, { 0.534759f, 4.500000f, -374.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2000681, 4312292, 4, { -7.437989f, 0.900002f, -387.547607f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000681, 4312293, 4, { -23.117430f, 0.472961f, -387.472412f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2000681, 4312297, 4, { -46.428509f, 0.500000f, -400.448212f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000681, 4312296, 4, { -30.738091f, 0.099998f, -400.874908f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000681, 4312295, 4, { -14.994600f, -0.299999f, -400.505615f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2000681, 4312294, 4, { 0.589670f, -0.700001f, -400.720093f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2000681, 4312298, 4, { -7.442382f, 1.700001f, -414.361389f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2000681, 4312299, 4, { -22.934330f, 1.296936f, -414.053589f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_15", 2000681, 4312300, 4, { -38.631561f, 0.900004f, -414.153595f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2000681, 4312303, 4, { -49.847839f, 4.899996f, -429.440002f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2000681, 4312302, 4, { -30.867050f, 2.500000f, -428.009308f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2000681, 4312301, 4, { -15.123560f, 2.100006f, -427.852295f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000627, 4293311, 5, { -57.085258f, 25.136589f, 146.983200f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
new file mode 100644
index 00000000..87659029
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
@@ -0,0 +1,64 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn2 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn2() : InstanceContentScript( 30003 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2000668, 4307413, 4, { -16.838060f, -60.912392f, 116.477898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgpl_s1b2_bosswall_c", 2000669, 4307414, 4, { -16.655029f, -61.041161f, 117.352303f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_s1b2_bossline2", 2000670, 4306762, 4, { -65.538063f, -38.998699f, 90.104332f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1b2_bosswall_r", 2000671, 4306763, 4, { -66.396652f, -38.998539f, 88.058296f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2000680, 0, 4, { -48.355518f, -38.578499f, 86.879211f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_s1b2_bossline3", 2000672, 4293655, 4, { -51.865479f, -18.020941f, 35.080441f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_s1b2_bosswall_r_1", 2000673, 4293656, 4, { -50.583679f, -18.020941f, 35.538212f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0249", 2000674, 4331576, 4, { 0.736900f, 0.033629f, 31.115801f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2000675, 4331583, 4, { 1.580210f, 0.032013f, 29.906660f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_s1b2_bossline5", 2000676, 4306493, 4, { 52.177799f, -21.010019f, 34.437031f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1b2_bosswall_r_2", 2000677, 4306494, 4, { 51.183399f, -21.011810f, 34.504452f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_s1b2_bosswall_r_3", 2000679, 4306772, 4, { 60.934231f, -41.989620f, 101.246002f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_s1b2_bossline6", 2000678, 4306771, 4, { 59.622169f, -41.994068f, 98.767616f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_s1b2_bossline", 2000621, 4307578, 4, { 0.106751f, -65.934273f, 82.291870f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_s1b2_bosswall", 2000622, 4307579, 4, { -0.320496f, -65.934273f, 82.322388f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2000640, 4092173, 4, { -14.019790f, -0.010602f, 31.855391f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2000641, 4092174, 4, { 15.101930f, -0.029503f, 31.798840f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2000638, 4092177, 4, { -58.677170f, -18.016920f, 47.536171f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000639, 4092181, 4, { -27.060640f, -18.102751f, 58.292858f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2000642, 4092183, 4, { 58.277191f, -20.996519f, 62.605671f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2000643, 4092178, 4, { 30.274019f, -20.952881f, 58.602650f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2000644, 4092182, 4, { 29.367611f, -41.975361f, 110.864998f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000635, 4092184, 4, { 0.539888f, -62.460609f, 100.908897f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2000636, 4092179, 4, { -55.941719f, -38.998539f, 78.436340f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000637, 4092180, 4, { -51.528130f, -38.998749f, 109.805901f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000645, 4092175, 4, { 0.474554f, -65.943604f, 68.078178f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2001161, 4107517, 4, { -0.118857f, -102.612297f, 0.534058f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2001152, 4107515, 4, { 2.090964f, 0.000001f, 22.575050f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000628, 4293644, 5, { 0.852533f, 0.148087f, 20.254930f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
new file mode 100644
index 00000000..e6ebfd9a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
@@ -0,0 +1,74 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn3 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn3() : InstanceContentScript( 30004 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2001046, 4204647, 4, { -38.434280f, 0.755630f, 27.186541f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2001047, 4204649, 4, { -22.930870f, -38.074230f, 51.622608f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2001048, 4204652, 4, { 17.410521f, -36.911560f, 65.506958f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2001049, 4204654, 4, { 43.230721f, -36.854370f, 41.278610f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2001050, 4204661, 4, { 41.756340f, -37.405720f, 11.258040f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2001051, 4204644, 4, { 18.406361f, -75.101082f, 30.246229f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001052, 4204665, 4, { -30.734369f, -111.808601f, 16.055771f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2001053, 4204660, 4, { 28.263350f, -74.681847f, -39.544411f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2001054, 4204664, 4, { -8.499553f, -113.039597f, -34.010311f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2001055, 4204662, 4, { -15.483490f, -112.471001f, -20.925671f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Silentterminal", 2001132, 4322464, 4, { -6.976719f, -112.013496f, 23.202400f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -16.955231f, -0.864158f, 0.593589f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2001152, 4238687, 4, { -1.707294f, 0.000000f, 3.048101f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2001056, 4204669, 4, { -14.240080f, -150.417404f, 1.736771f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2001057, 4204678, 4, { -29.648090f, -188.419907f, -3.748357f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2001058, 4204672, 4, { -12.738200f, -187.302002f, 51.141499f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2001059, 4204697, 4, { 0.332115f, -225.076202f, 50.155842f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2001060, 4204703, 4, { 52.345329f, -224.740707f, 37.453941f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2001061, 4204709, 4, { 46.480949f, -262.093811f, 5.845346f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2001062, 4204723, 4, { 28.585011f, -299.527008f, 19.833670f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2001063, 4204712, 4, { -15.037280f, -262.281311f, 51.584450f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2001064, 4204725, 4, { -15.719740f, -300.085785f, -22.829020f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2001065, 4204720, 4, { -0.428782f, -300.866394f, 22.938450f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2001066, 4204671, 4, { 9.075709f, -150.864899f, -17.327230f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2001067, 4204680, 4, { -25.603180f, -188.390701f, -25.489799f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_23", 2001068, 4204687, 4, { 28.229540f, -188.408707f, -2.975939f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2001069, 4204684, 4, { 37.952412f, -187.292603f, -39.644798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_25", 2001070, 4204707, 4, { -5.330157f, -225.534607f, -50.912369f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_26", 2001071, 4204688, 4, { 23.554840f, -223.922607f, -46.970329f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_27", 2001072, 4204689, 4, { -44.635330f, -225.534607f, -27.836760f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_28", 2001073, 4204715, 4, { -24.786400f, -262.708405f, -39.642220f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_29", 2001074, 4204716, 4, { -0.141846f, -262.624695f, -63.058170f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Silentterminal_1", 2001140, 4328681, 4, { -8.207968f, -300.679108f, -11.383970f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_30", 2001075, 4204730, 4, { -27.307819f, -347.278900f, 23.850750f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_31", 2001076, 4204722, 4, { -32.117531f, -347.483307f, -18.936440f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_32", 2001077, 4204728, 4, { -0.090805f, -348.068695f, -13.361250f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_33", 2001078, 4204719, 4, { 27.568150f, -347.808289f, 23.699249f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_34", 2001106, 4204738, 4, { -64.801163f, -383.539886f, -16.602329f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_35", 2001107, 4204740, 4, { -34.187149f, -383.967804f, -51.634480f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_36", 2001108, 4204732, 4, { 58.207191f, -383.523010f, -18.762280f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_37", 2001109, 4204735, 4, { 27.461531f, -384.122589f, 40.984268f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_38", 2001110, 4204746, 4, { 22.577141f, -422.501587f, 53.173019f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_39", 2001111, 4204744, 4, { -46.433231f, -422.842804f, 34.744751f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_40", 2001112, 4204747, 4, { 17.206091f, -423.418488f, -16.318670f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2001162, 4317929, 4, { -15.875440f, -423.430511f, 18.778770f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Silentterminal_2", 2002600, 4334493, 4, { -24.909149f, -423.472595f, 41.999378f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000629, 4294859, 5, { -0.075790f, 0.000000f, 0.310051f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
new file mode 100644
index 00000000..bf8f7051
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
@@ -0,0 +1,43 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn4 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn4() : InstanceContentScript( 30005 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "Silentterminal", 2000633, 4974723, 4, { -16.904461f, 1.700597f, 17.125530f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Silentterminal_1", 2000634, 4974724, 4, { 17.103741f, 1.662121f, 16.896111f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2001153, 4254608, 4, { 7.917505f, 0.058137f, -7.647632f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2001153, 4254609, 4, { 8.217505f, 0.058137f, -6.747632f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2001153, 4254607, 4, { 8.517506f, 0.000000f, -5.847631f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2001153, 4254606, 4, { 8.817506f, 0.000000f, -4.947631f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2001155, 4974722, 4, { -16.599979f, 0.058137f, -16.803070f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2001155, 4974721, 4, { 16.776859f, 0.058137f, -16.643490f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001764, 3961628, 4, { -0.983059f, 0.058134f, 3.319265f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2001764, 4974712, 4, { -2.906071f, 0.058134f, 2.796373f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2001764, 3962580, 4, { -4.811448f, 0.000001f, 9.066607f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2001764, 4330325, 4, { 2.346304f, 0.058136f, 5.385328f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2001764, 4330326, 4, { 4.663461f, 0.058136f, 4.726402f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000630, 4294847, 5, { -12.531030f, 0.000001f, 12.592170f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "sgvf_w_lvd_b0055", 2000615, 4374568, 4, { -15.534740f, 0.058137f, -15.601170f }, 1.000000f, 0.000000f ); 
+      // States -> vf_dext01_of vf_dext01_on 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
new file mode 100644
index 00000000..2db5319e
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
@@ -0,0 +1,36 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheBindingCoilofBahamutTurn5 : public InstanceContentScript
+{
+public:
+   TheBindingCoilofBahamutTurn5() : InstanceContentScript( 30006 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2000623, 4328290, 4, { -7.770457f, 54.493511f, -29.083250f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2000666, 4323972, 4, { -3.001781f, 50.022308f, -7.576328f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2000682, 0, 4, { -0.531223f, 50.025429f, 6.100062f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2001151, 0, 4, { 11.681320f, 50.085152f, -0.915123f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2001150, 0, 4, { 14.631230f, 50.087898f, 1.687731f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2001168, 0, 4, { 17.845060f, 50.181900f, -0.676077f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2002664, 0, 4, { -7.768790f, 50.005032f, -4.092178f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2001163, 4328464, 4, { 51.910549f, 48.460838f, 72.757553f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000631, 4294944, 5, { -26.751080f, 100.099998f, -128.204498f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
new file mode 100644
index 00000000..f858ba61
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
@@ -0,0 +1,51 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalCoilofBahamutTurn1 : public InstanceContentScript
+{
+public:
+   TheFinalCoilofBahamutTurn1() : InstanceContentScript( 30016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2004612, 0, 4, { -0.116493f, -0.000001f, -293.875214f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004613, 0, 4, { -5.014206f, -0.000001f, -285.730896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4894214, 5, { 0.172209f, 1.707170f, 221.425903f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -6.029538f, -0.000005f, 188.016205f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003679, 4868598, 4, { -0.125790f, 0.523954f, 167.023605f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2004605, 4852714, 4, { -0.194780f, -0.000003f, 177.104095f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2003849, 4881763, 4, { 0.031929f, -19.494820f, 141.135101f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2003905, 4868599, 4, { -0.095059f, -7.275987f, 79.729607f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2004605, 4879813, 4, { -10.904620f, -18.183340f, 116.685303f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2004605, 4879797, 4, { 11.416480f, -18.931650f, 116.685303f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2004605, 4879805, 4, { 11.416480f, -19.000000f, 103.064003f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2004605, 4879822, 4, { -11.312880f, -19.000000f, 103.064003f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2004116, 4881762, 4, { 0.171127f, -19.487169f, 30.039690f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2004117, 4868600, 4, { 0.009460f, -29.465590f, 10.045650f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2004605, 4879838, 4, { 0.047739f, -29.000000f, 19.918270f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2004605, 4879850, 4, { 0.018590f, -29.000000f, 19.923750f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2004118, 4881761, 4, { 0.003261f, -4.463747f, -152.984604f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2004119, 4868601, 4, { 0.003693f, -4.463205f, -166.994400f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2002735, 0, 4, { 0.007116f, -5.000001f, -171.749207f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4895024, 4, { -0.005186f, -4.890112f, -171.362305f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_17", 2004305, 4841650, 4, { 0.086417f, 0.090680f, -300.234711f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2004141, 4841682, 4, { 0.003672f, 1.083544f, -337.998596f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_colwithnavi", 2004137, 4895069, 4, { 3.638081f, 0.152056f, -331.675415f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
new file mode 100644
index 00000000..c9f16742
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
@@ -0,0 +1,61 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalCoilofBahamutTurn2 : public InstanceContentScript
+{
+public:
+   TheFinalCoilofBahamutTurn2() : InstanceContentScript( 30017 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2004618, 0, 4, { 8.377602f, -4.963000f, 2.130980f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w1b2_b0338", 2004622, 5004388, 4, { 0.000000f, -4.963000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> brr_off brr_on2off brr_on brr_off2on 
+      instance->registerEObj( "unknown_1", 2004138, 4985190, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -8.983331f, -89.405617f, 340.705505f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4895376, 5, { -2.304138f, -95.841980f, 373.883514f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_2", 2004138, 4772070, 4, { -3.471196f, -85.362328f, 329.862915f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2004138, 0, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2004138, 4772073, 4, { 82.671562f, 89.558182f, 312.686188f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2004138, 4772071, 4, { -87.694283f, 61.779518f, 322.880798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2004138, 4772074, 4, { 68.781647f, 74.135750f, 257.001312f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2004138, 4772072, 4, { -71.265640f, 50.681782f, 262.029907f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2004138, 0, 4, { 3.045514f, -50.605240f, 198.785202f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2004131, 4772088, 4, { -0.320496f, -61.905880f, 240.100693f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2004131, 4772089, 4, { -0.150618f, -58.926769f, 229.063507f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2004130, 4903493, 4, { 0.167786f, -56.382141f, 216.998505f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2004138, 4772084, 4, { 5.588670f, -50.254120f, 198.785202f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2004138, 4985729, 4, { -1.068177f, -50.250832f, 198.785202f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2004138, 4772077, 4, { 93.772713f, 2.760812f, 164.237198f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2004138, 4772078, 4, { 62.832458f, 2.703932f, 109.635002f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2004138, 4772079, 4, { -101.804497f, -15.054380f, 174.336105f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2004138, 4772080, 4, { -68.094177f, -9.272421f, 114.627701f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2004131, 4772085, 4, { -33.952530f, 1.069616f, 57.437080f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2004131, 4772087, 4, { 34.497631f, 1.062853f, 57.576210f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2004130, 4903494, 4, { -18.231251f, 0.578985f, 63.141258f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2004130, 4903495, 4, { 18.776350f, 0.578991f, 63.349949f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2004138, 4772081, 4, { 0.088281f, 0.909978f, 67.335487f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_23", 2004138, 4772082, 4, { -66.984283f, 1.029588f, -0.043371f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2004138, 4772083, 4, { 67.627632f, 1.029588f, -0.043371f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_25", 2002735, 0, 4, { 0.046454f, 0.339829f, 55.289249f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4896001, 4, { -0.021759f, 0.578989f, 57.955990f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Allaganterminal", 2004142, 4797408, 4, { 0.001913f, -4.224863f, -30.000130f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_colwithnavi", 2004137, 4895798, 4, { -0.366558f, -4.738363f, -24.911970f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
new file mode 100644
index 00000000..431b560d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
@@ -0,0 +1,34 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalCoilofBahamutTurn3 : public InstanceContentScript
+{
+public:
+   TheFinalCoilofBahamutTurn3() : InstanceContentScript( 30018 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2004611, 0, 4, { -7.491028f, -53.235149f, -153.215500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004610, 0, 4, { 22.322800f, -53.235241f, -154.775101f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w1b3_b0502", 2004627, 5009741, 4, { 0.000000f, -53.682961f, -160.000000f }, 1.000000f, 0.000000f ); 
+      // States -> brr_off brr_on2off brr_on brr_off2on 
+      instance->registerEObj( "unknown_2", 2004638, 0, 4, { -14.415940f, -53.682961f, -162.090302f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4895872, 5, { 0.005331f, -53.234989f, -140.846207f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Entrypoint", 2004650, 0, 4, { -0.019161f, -53.626511f, -182.364700f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
new file mode 100644
index 00000000..45095b23
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
@@ -0,0 +1,34 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheFinalCoilofBahamutTurn4 : public InstanceContentScript
+{
+public:
+   TheFinalCoilofBahamutTurn4() : InstanceContentScript( 30019 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2004578, 0, 4, { 452.681213f, 0.000000f, 6.016883f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004579, 0, 4, { 450.366699f, -0.000000f, 5.948895f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004580, 0, 4, { 443.205688f, 0.000000f, 4.024448f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4895882, 5, { 450.000000f, 0.000000f, 21.250090f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_3", 2004785, 5039563, 4, { 450.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2004649, 5018241, 4, { 448.419403f, 0.000000f, 4.765350f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2004651, 0, 4, { 450.000000f, 0.000000f, 29.273590f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
new file mode 100644
index 00000000..77bd162c
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
@@ -0,0 +1,107 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheLabyrinthoftheAncients : public InstanceContentScript
+{
+public:
+   TheLabyrinthoftheAncients() : InstanceContentScript( 30001 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2002108, 0, 4, { -109.946503f, 44.168140f, -165.619995f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4317322, 5, { -110.032799f, 30.372690f, 417.614990f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Allaganteleporter", 2001023, 3445281, 4, { -117.450104f, 45.942120f, 317.195892f }, 0.778198f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0294", 2002793, 4493308, 4, { -148.301498f, 48.301128f, 279.915802f }, 1.000000f, 0.000000f ); 
+      // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop 
+      instance->registerEObj( "sgvf_w_lvd_b0294_1", 2002794, 4493309, 4, { -109.977203f, 48.251709f, 243.024094f }, 0.991760f, 0.000048f ); 
+      // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop 
+      instance->registerEObj( "sgvf_w_lvd_b0294_2", 2002795, 4493310, 4, { -71.722931f, 48.301121f, 280.086487f }, 1.000000f, 0.000000f ); 
+      // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop 
+      instance->registerEObj( "unknown_1", 2001024, 4199521, 4, { -451.214386f, 41.580811f, 182.050903f }, 1.000000f, 0.000048f ); 
+      instance->registerEObj( "sgpl_l1r1_boss1wall", 2001025, 4303928, 4, { -451.373688f, 24.800070f, 73.862427f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2001026, 0, 4, { -451.305206f, 24.873600f, 73.806000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2002798, 0, 4, { -355.665405f, 41.884102f, 279.420288f }, 1.550000f, -1.570796f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2002801, 4478011, 4, { -346.181488f, 42.801510f, 279.988708f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_4", 2002799, 0, 4, { -415.959198f, 42.400002f, 280.898804f }, 1.550000f, -1.570796f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250_1", 2002802, 4478013, 4, { -415.761597f, 42.400002f, 279.982788f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_5", 2002800, 0, 4, { -452.406799f, 42.400002f, 239.395096f }, 1.550000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250_2", 2002803, 4478015, 4, { -451.081909f, 41.580811f, 243.305099f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0269", 2002839, 4493435, 4, { -413.650909f, 42.000000f, 279.285889f }, 0.991760f, 0.000048f ); 
+      // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop 
+      instance->registerEObj( "sgvf_w_lvd_b0269_1", 2002840, 4493436, 4, { -450.220612f, 41.580811f, 247.690399f }, 0.991760f, 0.000048f ); 
+      // States -> barrier_2loop barrier_stop barrier_loop barrier_2stop 
+      instance->registerEObj( "Allaganteleporter_1", 2002807, 3445282, 4, { -301.062592f, 54.375320f, 290.201904f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Allaganteleporter_2", 2002808, 3974161, 4, { -457.203400f, 38.418018f, 104.051903f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut", 2002804, 0, 4, { -451.176910f, 25.504910f, 18.912251f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_l1r1_trash2wall", 2001027, 4304910, 4, { 191.423996f, 51.658699f, 280.097992f }, 0.400000f, 0.000000f ); 
+      // States -> on off 
+      instance->registerEObj( "sgpl_l1r1_trash2line", 2001028, 4304912, 4, { 191.145798f, 51.767059f, 279.359497f }, 0.400000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001032, 0, 4, { 409.496094f, 66.240303f, 280.004395f }, 0.800000f, -1.570451f ); 
+      instance->registerEObj( "sgpl_l1r1_boss2wall", 2001031, 4304071, 4, { 438.027588f, 69.382690f, 281.602203f }, 0.778198f, -1.570451f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Allaganteleporter_3", 2002809, 3445284, 4, { 115.688499f, 65.110123f, 280.018311f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_7", 2002813, 4199883, 4, { 253.669495f, 51.066391f, 244.695007f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2002814, 4199882, 4, { 253.676102f, 51.066399f, 279.965607f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2002815, 4199881, 4, { 253.683899f, 51.066360f, 315.213013f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2002816, 4199880, 4, { 213.707596f, 51.052799f, 244.895493f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2002817, 4199878, 4, { 213.688202f, 51.052799f, 280.125214f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2002818, 4199879, 4, { 213.723404f, 51.052799f, 315.105286f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganteleporter_4", 2002810, 3974166, 4, { 349.215515f, 60.567490f, 268.536591f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut_1", 2002805, 0, 4, { 455.122894f, 66.249268f, 279.987701f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_13", 2001030, 4199894, 4, { 264.739899f, 50.679981f, 279.921509f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_l1r1_boss3wall", 2001033, 4305031, 4, { -110.210899f, 44.083248f, -116.227997f }, 0.381470f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_14", 2001034, 0, 4, { -110.254898f, 44.168098f, -111.387901f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2001035, 4317566, 4, { -110.054497f, 46.072929f, -214.578705f }, 0.400000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_l1r1_boss3wall_1", 2001036, 4305191, 4, { -111.224899f, 67.886620f, -344.147797f }, 0.400000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_16", 2001037, 0, 4, { -109.930298f, 67.892403f, -338.731415f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Energytowerconsole", 2001038, 0, 4, { -85.032784f, 70.241432f, -343.493713f }, 0.800000f, 1.570451f ); 
+      instance->registerEObj( "Energytowerconsole_1", 2001039, 0, 4, { -85.044861f, 70.240898f, -393.307587f }, 0.800000f, 0.000000f ); 
+      instance->registerEObj( "Energytowerconsole_2", 2001040, 0, 4, { -134.983994f, 70.240898f, -343.431213f }, 0.800000f, 0.000000f ); 
+      instance->registerEObj( "Energytowerconsole_3", 2001041, 0, 4, { -134.925201f, 70.240898f, -393.378296f }, 0.800000f, -1.570451f ); 
+      instance->registerEObj( "Allaganteleporter_5", 2002811, 3445283, 4, { -117.500000f, 39.417461f, -60.409302f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2002819, 4317548, 4, { -109.942200f, 44.168140f, -140.697403f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2002820, 4317564, 4, { -109.933800f, 44.168140f, -190.218903f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganteleporter_6", 2002812, 3974167, 4, { -117.461098f, 57.435680f, -288.075104f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut_2", 2002806, 0, 4, { -109.976601f, 68.215019f, -378.115906f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2002821, 4407451, 4, { -110.134598f, 68.248489f, -367.669708f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganteleporter_7", 2002822, 4322323, 4, { -123.763496f, 650.608582f, 254.596695f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_l1r1_boss4wall", 2001042, 4491496, 4, { -110.122498f, 650.015808f, 227.968597f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_20", 2001043, 0, 4, { -110.052299f, 650.020020f, 227.514893f }, 0.800000f, 0.000048f ); 
+      instance->registerEObj( "unknown_21", 2001044, 4497411, 4, { -109.941299f, 650.720886f, 194.445694f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_22", 2002823, 4101871, 4, { -86.638451f, 650.731018f, 191.568298f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_23", 2002824, 4101872, 4, { -109.887199f, 650.970886f, 207.029099f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2002825, 4101873, 4, { -132.905304f, 650.731018f, 191.279907f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_25", 2002826, 0, 4, { -78.160004f, 649.940125f, 206.024597f }, 0.800000f, -0.634151f ); 
+      instance->registerEObj( "unknown_26", 2002832, 0, 4, { -85.569000f, 649.940125f, 213.420593f }, 0.800000f, -0.911137f ); 
+      instance->registerEObj( "unknown_27", 2002833, 0, 4, { -94.658401f, 649.940125f, 218.672806f }, 0.800000f, -1.177247f ); 
+      instance->registerEObj( "unknown_28", 2002834, 0, 4, { -125.350403f, 649.940125f, 218.672806f }, 0.800000f, -1.153363f ); 
+      instance->registerEObj( "unknown_29", 2002835, 0, 4, { -134.429901f, 649.940125f, 213.420593f }, 0.800000f, -0.918754f ); 
+      instance->registerEObj( "unknown_30", 2002836, 0, 4, { -141.827698f, 649.940125f, 206.024597f }, 0.800000f, -0.639576f ); 
+      instance->registerEObj( "unknown_31", 2002837, 4478584, 4, { -89.563782f, 650.019226f, 209.632706f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_32", 2002838, 4478586, 4, { -131.352798f, 650.019226f, 210.327194f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -110.009903f, 650.972229f, 157.832199f }, 0.793408f, 0.000048f ); 
+      instance->registerEObj( "unknown_33", 2001029, 4499125, 4, { -109.987602f, 650.731018f, 181.576202f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
new file mode 100644
index 00000000..9ab02280
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheRoyalCityofRabanastre : public InstanceContentScript
+{
+public:
+   TheRoyalCityofRabanastre() : InstanceContentScript( 30058 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
new file mode 100644
index 00000000..04c26d77
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
@@ -0,0 +1,42 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutSavageTurn1 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutSavageTurn1() : InstanceContentScript( 30012 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1b2_bosswall", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_5", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_b0118_col_char", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_6", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
new file mode 100644
index 00000000..eca46db7
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
@@ -0,0 +1,42 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutSavageTurn2 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutSavageTurn2() : InstanceContentScript( 30013 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_colwithnavi", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_f1b2_bosswall", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_w_lvd_b0118_col_char", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
new file mode 100644
index 00000000..7efb6c7d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
@@ -0,0 +1,105 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutSavageTurn3 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutSavageTurn3() : InstanceContentScript( 30014 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Destination_1", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f, -1.570796f ); 
+      // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5 
+      instance->registerEObj( "Destination_2", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f, 0.000000f ); 
+      // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5 
+      instance->registerEObj( "Destination_3", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f, 1.570796f ); 
+      // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5 
+      instance->registerEObj( "Destination_4", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f, -3.141593f ); 
+      // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5 
+      instance->registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_f1b3_b0384", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_1", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_2", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_3", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_4", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_5", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_6", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_7", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_8", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_9", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_10", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_11", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_12", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_13", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_14", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_15", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_16", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_17", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_18", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_19", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_20", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_21", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_22", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_23", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "unknown_0", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Boxofcrystals_1", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Boxofcrystals_2", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1b3_bosswall", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_6", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1b3_boss_col", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_board_col_only", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
new file mode 100644
index 00000000..addffbbb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
@@ -0,0 +1,41 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutSavageTurn4 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutSavageTurn4() : InstanceContentScript( 30015 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0427", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      // States -> on off 
+      instance->registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
new file mode 100644
index 00000000..57496420
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
@@ -0,0 +1,42 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutTurn1 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutTurn1() : InstanceContentScript( 30007 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1b2_bosswall", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f }, 1.000000f, -0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_5", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_b0118_col_char", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_6", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
new file mode 100644
index 00000000..d2878a08
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
@@ -0,0 +1,42 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutTurn2 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutTurn2() : InstanceContentScript( 30008 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_w_lvd_colwithnavi", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgpl_f1b2_bosswall", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgpl_w_lvd_b0118_col_char", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
new file mode 100644
index 00000000..1420d58a
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
@@ -0,0 +1,105 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutTurn3 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutTurn3() : InstanceContentScript( 30009 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Destination_1", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f, -1.570796f ); 
+      // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5 
+      instance->registerEObj( "Destination_2", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f, 0.000000f ); 
+      // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5 
+      instance->registerEObj( "Destination_3", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f, 1.570796f ); 
+      // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5 
+      instance->registerEObj( "Destination_4", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f, -3.141593f ); 
+      // States -> tower_off tower_on2off tower_up tower_off2up tower_on tower_up2on tower_step1 tower_step0_1 tower_step2 tower_step1_2 tower_step3 tower_step2_3 tower_step4 tower_step3_4 tower_step5 tower_step4_5 
+      instance->registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_f1b3_b0384", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_1", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_2", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_3", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_4", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_5", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_6", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_7", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_8", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_9", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_10", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_11", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_12", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_13", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_14", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_15", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_16", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_17", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_18", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_19", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_20", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_21", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_22", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "sgvf_f1b3_b0384_23", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lese_on 
+      instance->registerEObj( "unknown_0", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Boxofcrystals_1", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Boxofcrystals_2", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1b3_bosswall", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_6", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_f1b3_boss_col", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgpl_w_lvd_board_col_only", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
new file mode 100644
index 00000000..22c5beb3
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
@@ -0,0 +1,41 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSecondCoilofBahamutTurn4 : public InstanceContentScript
+{
+public:
+   TheSecondCoilofBahamutTurn4() : InstanceContentScript( 30010 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0427", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, -0.000000f ); 
+      // States -> on off 
+      instance->registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
new file mode 100644
index 00000000..9666db85
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
@@ -0,0 +1,35 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheUnendingCoilofBahamutUltimate : public InstanceContentScript
+{
+public:
+   TheUnendingCoilofBahamutUltimate() : InstanceContentScript( 30057 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "unknown_0", 2007457, 7040178, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007457, 7040443, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007457, 7040473, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007457, 7144982, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007457, 7075281, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2007457, 7144855, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -20.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 7068018, 5, { 0.000000f, 0.000000f, 18.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp
new file mode 100644
index 00000000..3590821f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheVoidArk : public InstanceContentScript
+{
+public:
+   TheVoidArk() : InstanceContentScript( 30029 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp
new file mode 100644
index 00000000..39200a71
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheWeepingCityofMhach : public InstanceContentScript
+{
+public:
+   TheWeepingCityofMhach() : InstanceContentScript( 30038 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp
new file mode 100644
index 00000000..882eed3d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp
@@ -0,0 +1,143 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheWorldofDarkness : public InstanceContentScript
+{
+public:
+   TheWorldofDarkness() : InstanceContentScript( 30020 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 5033058, 4, { -148.309006f, 25.000000f, 327.505005f }, 1.000000f, -0.785398f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -147.190506f, 34.000000f, 326.593597f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5033059, 4, { -116.020401f, 25.000000f, 291.514313f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2004749, 5022919, 4, { -150.811707f, 33.999840f, 292.778412f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004750, 5022920, 4, { -143.519608f, 34.000000f, 294.027710f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2004751, 5022915, 4, { -143.096893f, 34.000000f, 301.814209f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2004752, 5022916, 4, { -151.221893f, 34.000000f, 301.291809f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2004753, 5034307, 4, { -153.117905f, 34.000000f, 292.031494f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_6", 2004754, 5034303, 4, { -141.245300f, 34.000000f, 291.586212f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2004755, 5034301, 4, { -141.807693f, 34.000000f, 303.198395f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2004756, 5034306, 4, { -151.877304f, 34.000000f, 303.085297f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2004748, 5033636, 4, { -149.922104f, 34.000000f, 293.955414f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2004774, 5033642, 4, { -144.841095f, 34.000000f, 295.275208f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2004775, 5033641, 4, { -144.940308f, 34.000000f, 300.121399f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2004776, 5033639, 4, { -150.097397f, 34.000000f, 299.867798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_l1r3_b0541a", 2005026, 5444436, 4, { -147.017593f, 34.000000f, 317.352814f }, 1.000000f, 0.000000f ); 
+      // States -> boss_pop_off_a boss_pop_on_a boss_pop_on_c 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 5033193, 4, { 200.082001f, 81.974503f, 211.096603f }, 1.000000f, -0.785398f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_13", 2002735, 0, 4, { 200.000000f, 82.124329f, 208.778595f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5035970, 4, { 167.647797f, 81.909058f, 178.824493f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_14", 2004777, 0, 4, { 192.319397f, 82.000000f, 182.835999f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2004778, 0, 4, { 197.039703f, 81.986687f, 184.863007f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2004779, 0, 4, { 204.338196f, 82.000000f, 183.053802f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2004780, 0, 4, { 189.642700f, 82.000000f, 176.451202f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2005018, 0, 4, { 199.442200f, 82.000000f, 183.869598f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2002587, 0, 4, { 0.000000f, 129.250000f, -157.414307f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 5040833, 4, { -0.855141f, 129.250000f, -164.190598f }, 0.991760f, -0.785362f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_20", 2002872, 5039743, 4, { 0.048592f, 128.906403f, -155.346100f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Openfetter", 2004787, 0, 4, { 2.542549f, 129.250000f, -205.570496f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Openfetter_1", 2004789, 0, 4, { 3.817404f, 129.250000f, -207.100800f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magickedfetter", 2004790, 5039668, 4, { -17.519341f, 129.250000f, -235.697693f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Magickedfetter_1", 2004791, 5039667, 4, { 17.275551f, 129.198105f, -235.656799f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_21", 2004808, 5039717, 4, { -10.696810f, -497.601990f, -204.956100f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2004809, 5039714, 4, { 6.635397f, -498.601898f, -210.257507f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_23", 2004810, 5039710, 4, { 11.312720f, -498.093597f, -196.581207f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_24", 2004811, 5039721, 4, { -9.022294f, -499.107513f, -190.416397f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_25", 2004548, 0, 4, { 1.212110f, 129.300003f, -202.733398f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_26", 2002735, 0, 4, { -0.000000f, 143.250000f, -314.710114f }, 1.000000f, 0.000048f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_5", 2002872, 5041153, 4, { -0.147327f, 143.250000f, -328.516998f }, 0.991760f, -0.785362f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_27", 2004732, 5039981, 4, { -0.015320f, 143.236298f, -316.334808f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -299.977112f, 279.987701f, -420.645508f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_28", 2004814, 0, 4, { -300.240906f, 280.000000f, -402.510712f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_29", 2004815, 0, 4, { -300.687103f, 280.000000f, -398.160706f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_30", 2004620, 0, 4, { 0.203211f, 129.250000f, -202.244904f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_btl_b0528", 2004816, 5041561, 4, { -304.280212f, 279.987701f, -415.243805f }, 0.991760f, 0.000048f ); 
+      // States -> baria_off baria_omen_a baria_omen_b baria_a baria_b baria_c 
+      instance->registerEObj( "sgvf_w_btl_b0528_1", 2004817, 5041563, 4, { -286.856506f, 280.000000f, -392.695404f }, 1.000000f, 0.000000f ); 
+      // States -> baria_off baria_omen_a baria_omen_b baria_a baria_b baria_c 
+      instance->registerEObj( "sgvf_w_btl_b0528_2", 2004818, 5041562, 4, { -313.290710f, 280.000000f, -392.472412f }, 1.000000f, 0.000000f ); 
+      // States -> baria_off baria_omen_a baria_omen_b baria_a baria_b baria_c 
+      instance->registerEObj( "sgvf_w_lvd_b0118_6", 2002872, 5032353, 4, { -54.450321f, 16.000000f, 406.409088f }, 1.000000f, -0.785398f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_31", 2002735, 0, 4, { -56.151901f, 16.000000f, 403.855896f }, 1.000000f, -0.785398f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_7", 2002872, 5032356, 4, { -102.950996f, 16.000000f, 383.202911f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_l1r3_b0541b", 2004735, 5437119, 4, { -76.985458f, 16.000000f, 382.746613f }, 1.000000f, 0.000000f ); 
+      // States -> boss_pop2_off_a boss_pop2_on_a 
+      instance->registerEObj( "unknown_32", 2004736, 0, 4, { -74.916229f, 16.000000f, 380.485291f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_33", 2002735, 0, 4, { 99.718719f, 63.999989f, 265.143799f }, 1.000000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_8", 2002872, 5035968, 4, { 95.926514f, 63.980949f, 265.796906f }, 0.991760f, -0.785362f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_9", 2002872, 5035969, 4, { 167.944199f, 65.533363f, 264.945587f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Treasurecoffer", 2004745, 0, 4, { 130.000000f, 63.999989f, 264.710388f }, 1.000000f, 1.570796f ); 
+      instance->registerEObj( "sgvf_l1r3_b0541b_1", 2004738, 5437120, 4, { 130.000000f, 65.431679f, 264.710388f }, 0.991760f, 0.000048f ); 
+      // States -> boss_pop2_off_a boss_pop2_on_a 
+      instance->registerEObj( "sgvf_w_lvd_b0556", 2004739, 5037994, 4, { 138.468002f, 63.999989f, 275.781311f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a void_off_b void_on_a void_omen 
+      instance->registerEObj( "sgvf_w_lvd_b0556_1", 2004740, 5037996, 4, { 129.901001f, 63.999729f, 278.588593f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a void_off_b void_on_a void_omen 
+      instance->registerEObj( "sgvf_w_lvd_b0556_2", 2004741, 5037997, 4, { 121.644699f, 63.999729f, 275.762695f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a void_off_b void_on_a void_omen 
+      instance->registerEObj( "sgvf_w_lvd_b0556_3", 2004742, 5037998, 4, { 138.356506f, 63.999989f, 250.555603f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a void_off_b void_on_a void_omen 
+      instance->registerEObj( "sgvf_w_lvd_b0556_4", 2004743, 5037999, 4, { 129.881393f, 64.000031f, 250.721893f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a void_off_b void_on_a void_omen 
+      instance->registerEObj( "sgvf_w_lvd_b0556_5", 2004744, 5038000, 4, { 121.628601f, 63.999989f, 250.572296f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a void_off_b void_on_a void_omen 
+      instance->registerEObj( "sgvf_w_lvd_b0557", 2004746, 5037995, 4, { 130.020493f, 63.999748f, 279.027191f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a void_off_b void_on_a void_omen 
+      instance->registerEObj( "sgvf_w_lvd_b0557_1", 2004747, 5038001, 4, { 130.056702f, 63.999989f, 249.980301f }, 1.000000f, 0.000000f ); 
+      // States -> void_off_a void_off_b void_on_a void_omen 
+      instance->registerEObj( "unknown_34", 2002735, 0, 4, { 0.000000f, 94.750053f, 84.669502f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_35", 2004788, 5499560, 4, { 0.320374f, 95.231567f, 31.296261f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_36", 2004792, 5038584, 4, { -28.578890f, 95.250008f, 39.174721f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_37", 2004793, 5038586, 4, { -21.418350f, 95.250008f, 51.649750f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_38", 2004794, 5038587, 4, { -33.994980f, 95.250008f, 58.976070f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_39", 2004795, 5038580, 4, { -41.014271f, 95.250008f, 46.442242f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_40", 2004796, 5038588, 4, { 7.240406f, 95.250008f, -12.319770f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_41", 2004797, 5038590, 4, { 7.179711f, 95.250008f, 2.152661f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_42", 2004798, 5038589, 4, { -7.245643f, 95.250008f, 2.096094f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_43", 2004799, 5038570, 4, { -7.080731f, 95.250008f, -12.155750f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_44", 2004800, 5038591, 4, { 41.068710f, 95.250008f, 46.325569f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_45", 2004801, 5038592, 4, { 33.762070f, 95.250008f, 58.721840f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_46", 2004802, 5038593, 4, { 21.204290f, 95.250008f, 51.578461f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_47", 2004803, 5038571, 4, { 28.640770f, 95.250008f, 39.349319f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2002872, 5038256, 4, { -0.165812f, 94.731613f, 85.317574f }, 0.991760f, -0.785362f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_48", 2004784, 5489265, 4, { 0.294310f, 90.349991f, 22.469700f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_49", 2005042, 5476812, 4, { -0.380919f, 99.969032f, 29.779119f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 5032012, 5, { 0.112444f, 1.000004f, 460.032898f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Wormholegenerator", 2004722, 4985258, 4, { -9.284863f, 0.332117f, 436.627411f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wormholegenerator_1", 2004723, 4985259, 4, { -157.081207f, 25.477930f, 382.938385f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wormholegenerator_2", 2004724, 4985260, 4, { 65.994957f, 65.452766f, 265.003998f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wormholegenerator_3", 2004725, 4985261, 4, { 210.040405f, 73.397346f, 264.987091f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wormholegenerator_4", 2004726, 4985262, 4, { 9.958203f, 96.762039f, 104.047096f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wormholegenerator_5", 2004727, 4985263, 4, { -9.978291f, 128.313095f, -121.979301f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Wormholegenerator_6", 2004728, 4985264, 4, { 9.998364f, 128.645798f, -274.001892f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_50", 2004729, 5034813, 4, { -91.447388f, 32.791962f, 296.223389f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_51", 2004730, 5034821, 4, { 143.374405f, 80.799957f, 179.826706f }, 1.000000f, 0.000000f ); 
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
deleted file mode 100644
index 8f1980ca..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFather.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheArmoftheFather : public InstanceContentScript
-{
-public:
-   AlexanderTheArmoftheFather() : InstanceContentScript( 30023 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005400, 0, 4, { 39.638931f, -9.000000f, -67.173187f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005314, 5878653, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005314, 6048829, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006094, 5864098, 4, { 58.027489f, -0.000134f, -20.193150f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 58.000000f, -0.000003f, -20.943159f }, 0.600000f );
-      instance->registerEObj( "Unknown5", 2002872, 5787963, 4, { 58.043961f, -0.000054f, -20.107550f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 100.941902f, -10.500000f, -63.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 0, 4, { 87.814133f, -9.000000f, -61.109859f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005911, 5814854, 4, { 58.000000f, -8.999999f, -63.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006095, 5905878, 4, { 58.000000f, -9.000000f, -63.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5787948, 5, { -0.015320f, -0.015320f, 43.037189f }, 0.778198f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.252589f, 0.000000f, 30.523800f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5911899, 5, { 58.000000f, -0.000049f, -11.175000f }, 0.800000f );
-      instance->registerEObj( "Unknown11", 2000608, 5911895, 4, { 58.000000f, 0.841694f, -1.705941f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
deleted file mode 100644
index 62384554..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheFatherSavage.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheArmoftheFatherSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheArmoftheFatherSavage() : InstanceContentScript( 30027 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005400, 0, 4, { 39.638931f, -9.000000f, -67.173187f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005314, 5878653, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005314, 6048829, 4, { 17.839520f, 42.000000f, 14.681990f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006094, 5864098, 4, { 58.027489f, -0.000134f, -20.193150f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 58.000000f, -0.000003f, -20.943159f }, 0.600000f );
-      instance->registerEObj( "Unknown5", 2002872, 5787963, 4, { 58.043961f, -0.000054f, -20.107550f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 100.941902f, -10.500000f, -63.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 0, 4, { 87.814133f, -9.000000f, -61.109859f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005911, 5814854, 4, { 58.000000f, -8.999999f, -63.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006095, 5905878, 4, { 58.000000f, -9.000000f, -63.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5787948, 5, { -0.015320f, -0.015320f, 43.037189f }, 0.778198f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.252589f, 0.000000f, 30.523800f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5911899, 5, { 58.000000f, -0.000049f, -11.175000f }, 0.800000f );
-      instance->registerEObj( "Unknown11", 2000608, 5911895, 4, { 58.000000f, 0.841694f, -1.705941f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
deleted file mode 100644
index a08383d4..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSon.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheArmoftheSon : public InstanceContentScript
-{
-public:
-   AlexanderTheArmoftheSon() : InstanceContentScript( 30032 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006968, 6185537, 4, { 131.518402f, 80.000000f, 274.864899f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006968, 6185538, 4, { 175.156296f, 80.000000f, 241.302505f }, 1.000000f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166806, 4, { 200.016602f, 120.459198f, 366.976898f }, 1.000000f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166805, 4, { 205.097305f, 120.459297f, 361.868408f }, 1.000000f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166804, 4, { 209.928207f, 120.459297f, 357.120789f }, 1.000000f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166803, 4, { 214.981201f, 120.459297f, 352.151215f }, 1.000000f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166799, 4, { 240.142395f, 120.459198f, 367.151886f }, 1.000000f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166800, 4, { 235.272293f, 120.459198f, 362.214691f }, 1.000000f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166801, 4, { 230.089401f, 120.459198f, 357.031799f }, 1.000000f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166802, 4, { 224.994095f, 120.439499f, 352.101807f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2006968, 6185540, 4, { 67.856812f, 44.968262f, 161.486206f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2006968, 6185539, 4, { 109.369904f, 44.998779f, 135.606796f }, 0.991760f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166815, 4, { 125.322304f, 79.972527f, 221.637207f }, 0.991760f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166816, 4, { 123.289001f, 79.972527f, 227.745804f }, 0.991760f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166817, 4, { 122.181702f, 79.972527f, 234.485397f }, 0.991760f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166818, 4, { 121.125298f, 79.972527f, 240.497803f }, 0.991760f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166810, 4, { 128.984406f, 79.972527f, 220.023499f }, 0.991760f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166809, 4, { 135.454193f, 79.972527f, 221.574799f }, 0.991760f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166808, 4, { 141.527298f, 79.972527f, 223.192398f }, 0.991760f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166807, 4, { 148.760101f, 79.972527f, 224.975006f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 51.013248f, 39.939819f, 88.328903f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6184075, 4, { 51.497959f, 39.939819f, 88.859413f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2006969, 6168354, 4, { 51.316040f, 39.993900f, 88.853271f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2006954, 6169546, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006968, 6242752, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2006968, 6242751, 4, { 76.247543f, 42.568901f, 132.191803f }, 100.000000f );
-      instance->registerEObj( "Unknown10", 2006954, 6162743, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006955, 6197901, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006958, 0, 4, { 0.447336f, 0.000000f, 4.119453f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006611, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006612, 0, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006650, 0, 4, { -23.000000f, 0.000000f, 23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006698, 0, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006964, 6215558, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006964, 6215559, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2006964, 6215560, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2006964, 6215561, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 6185488, 4, { -0.329697f, 0.000000f, -28.830790f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2006979, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 220.005096f, 120.491501f, 359.291504f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6177872, 5, { 220.000000f, 120.000000f, 383.467712f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6184212, 5, { 62.804680f, 40.200001f, 108.771896f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -29.143539f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
deleted file mode 100644
index 755558d4..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheArmoftheSonSavage.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheArmoftheSonSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheArmoftheSonSavage() : InstanceContentScript( 30036 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006968, 6185537, 4, { 131.518402f, 80.000000f, 274.864899f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006968, 6185538, 4, { 175.156296f, 80.000000f, 241.302505f }, 1.000000f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166806, 4, { 200.016602f, 120.459198f, 366.976898f }, 1.000000f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166805, 4, { 205.097305f, 120.459297f, 361.868408f }, 1.000000f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166804, 4, { 209.928207f, 120.459297f, 357.120789f }, 1.000000f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166803, 4, { 214.981201f, 120.459297f, 352.151215f }, 1.000000f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166799, 4, { 240.142395f, 120.459198f, 367.151886f }, 1.000000f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166800, 4, { 235.272293f, 120.459198f, 362.214691f }, 1.000000f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166801, 4, { 230.089401f, 120.459198f, 357.031799f }, 1.000000f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166802, 4, { 224.994095f, 120.439499f, 352.101807f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2006968, 6185540, 4, { 67.856812f, 44.968262f, 161.486206f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2006968, 6185539, 4, { 109.369904f, 44.998779f, 135.606796f }, 0.991760f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166815, 4, { 125.322304f, 79.972527f, 221.637207f }, 0.991760f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166816, 4, { 123.289001f, 79.972527f, 227.745804f }, 0.991760f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166817, 4, { 122.181702f, 79.972527f, 234.485397f }, 0.991760f );
-      instance->registerEObj( "Exhaustductβ", 2006967, 6166818, 4, { 121.125298f, 79.972527f, 240.497803f }, 0.991760f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166810, 4, { 128.984406f, 79.972527f, 220.023499f }, 0.991760f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166809, 4, { 135.454193f, 79.972527f, 221.574799f }, 0.991760f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166808, 4, { 141.527298f, 79.972527f, 223.192398f }, 0.991760f );
-      instance->registerEObj( "Exhaustductα", 2006966, 6166807, 4, { 148.760101f, 79.972527f, 224.975006f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 51.013248f, 39.939819f, 88.328903f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6184075, 4, { 51.497959f, 39.939819f, 88.859413f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2006969, 6168354, 4, { 51.316040f, 39.993900f, 88.853271f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2006954, 6169546, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006968, 6242752, 4, { 76.247498f, 42.568901f, 132.191803f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2006968, 6242751, 4, { 76.247543f, 42.568901f, 132.191803f }, 100.000000f );
-      instance->registerEObj( "Unknown10", 2006954, 6162743, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006955, 6197901, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006958, 0, 4, { 0.447336f, 0.000000f, 4.119453f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006611, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006612, 0, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006650, 0, 4, { -23.000000f, 0.000000f, 23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006698, 0, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006964, 6215558, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006964, 6215559, 4, { 23.000000f, 0.000000f, 23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2006964, 6215560, 4, { -23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2006964, 6215561, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 6185488, 4, { -0.329697f, 0.000000f, -28.830790f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2006979, 0, 4, { 23.000000f, 0.000000f, -23.000000f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 220.005096f, 120.491501f, 359.291504f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6177872, 5, { 220.000000f, 120.000000f, 383.467712f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6184212, 5, { 62.804680f, 40.200001f, 108.771896f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -29.143539f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
deleted file mode 100644
index 98246842..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreator.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheBreathoftheCreator : public InstanceContentScript
-{
-public:
-   AlexanderTheBreathoftheCreator() : InstanceContentScript( 30040 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6424853, 4, { 0.000000f, -114.849998f, 12.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6424863, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6424869, 4, { 0.000000f, -114.849998f, -12.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6418872, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6421358, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6421505, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6421506, 4, { 0.000000f, -114.849998f, -10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007496, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6515444, 4, { 0.680462f, -115.000000f, 1.219872f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007498, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 0, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6538404, 4, { 0.000000f, -115.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6538406, 4, { 0.000000f, -115.000000f, -4.000006f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6294347, 4, { -17.866249f, -10.500000f, 148.102402f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6294348, 4, { -44.597561f, -10.500000f, 101.743698f }, 1.000000f );
-      instance->registerEObj( "Exhaustvent", 2007470, 6367742, 4, { 1.716182f, -18.500000f, 37.358582f }, 1.000000f );
-      instance->registerEObj( "Ingress", 2007471, 0, 4, { 1.998901f, -16.647579f, 36.697880f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 2.000000f, -18.940580f, 37.027279f }, 0.500000f );
-      instance->registerEObj( "Unknown16", 2002872, 6487232, 4, { 1.792570f, -18.500000f, 38.188919f }, 1.000000f );
-      instance->registerEObj( "Exit", 2006235, 0, 4, { 11.500000f, -115.007301f, -18.204100f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6449464, 5, { -0.025814f, -10.500000f, 188.076599f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 2.874061f, -10.500000f, 177.815994f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449481, 5, { -7.931533f, -18.500000f, 50.286880f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
deleted file mode 100644
index 4dd688c8..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBreathoftheCreatorSavage.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheBreathoftheCreatorSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheBreathoftheCreatorSavage() : InstanceContentScript( 30044 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6424853, 4, { 0.000000f, -114.849998f, 12.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6424863, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6424869, 4, { 0.000000f, -114.849998f, -12.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6418872, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6421358, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6421505, 4, { 0.000000f, -114.849998f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6421506, 4, { 0.000000f, -114.849998f, -10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007496, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6515444, 4, { 0.680462f, -115.000000f, 1.219872f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007498, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 0, 4, { 0.000000f, -114.849998f, 10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6538404, 4, { 0.000000f, -115.000000f, 4.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6538406, 4, { 0.000000f, -115.000000f, -4.000006f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6294347, 4, { -17.866249f, -10.500000f, 148.102402f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6294348, 4, { -44.597561f, -10.500000f, 101.743698f }, 1.000000f );
-      instance->registerEObj( "Exhaustvent", 2007470, 6367742, 4, { 1.716182f, -18.500000f, 37.358582f }, 1.000000f );
-      instance->registerEObj( "Ingress", 2007471, 0, 4, { 1.998901f, -16.647579f, 36.697880f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2002735, 0, 4, { 2.000000f, -18.940580f, 37.027279f }, 0.500000f );
-      instance->registerEObj( "Unknown16", 2002872, 6487232, 4, { 1.792570f, -18.500000f, 38.188919f }, 1.000000f );
-      instance->registerEObj( "Exit", 2006235, 0, 4, { 11.500000f, -115.007301f, -18.204100f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6449464, 5, { -0.025814f, -10.500000f, 188.076599f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 2.874061f, -10.500000f, 177.815994f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449481, 5, { -7.931533f, -18.500000f, 50.286880f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
deleted file mode 100644
index 314bfcb7..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSon.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheBurdenoftheSon : public InstanceContentScript
-{
-public:
-   AlexanderTheBurdenoftheSon() : InstanceContentScript( 30033 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 10.705920f, -21.985399f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2006984, 6164617, 4, { -0.231898f, 10.500000f, -1.988388f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006989, 6234571, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2006974, 0, 4, { -16.291439f, 10.500000f, 4.361944f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 6076667, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6177907, 5, { 0.000000f, 10.500000f, 19.500000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
deleted file mode 100644
index 2802bb44..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheBurdenoftheSonSavage.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheBurdenoftheSonSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheBurdenoftheSonSavage() : InstanceContentScript( 30037 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 10.705920f, -21.985399f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2006984, 6164617, 4, { -0.231898f, 10.500000f, -1.988388f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006989, 6234571, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2006974, 0, 4, { -16.291439f, 10.500000f, 4.361944f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 6076667, 4, { 0.000000f, 10.500000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6177907, 5, { 0.000000f, 10.500000f, 19.500000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
deleted file mode 100644
index 0d611e53..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFather.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheCuffoftheFather : public InstanceContentScript
-{
-public:
-   AlexanderTheCuffoftheFather() : InstanceContentScript( 30022 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -23.299919f, -27.250000f, -93.915253f }, 2.500000f );
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005474, 0, 4, { -25.869850f, -27.250000f, -91.505951f }, 2.500000f );
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005475, 0, 4, { -28.364830f, -27.250000f, -89.139442f }, 2.500000f );
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -24.477819f, -27.250000f, -93.315643f }, 2.500000f );
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005474, 0, 4, { -27.127260f, -27.250000f, -90.671631f }, 2.500000f );
-      instance->registerEObj( "Unknown0", 2005047, 5796486, 4, { -16.006710f, 28.995720f, 121.127502f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2005047, 5796475, 4, { -15.991690f, 25.994120f, 104.104698f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005047, 5796479, 4, { -0.042969f, -15.876210f, 39.414860f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2005047, 5796481, 4, { -0.042969f, -22.069151f, 4.294098f }, 1.000000f );
-      instance->registerEObj( "Steamspoutingcontraption", 2005048, 5828187, 4, { -20.999439f, 28.890051f, 120.379700f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2005428, 5828194, 4, { -20.812780f, 25.885040f, 102.729103f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2005428, 5828205, 4, { -5.111024f, -22.178221f, 3.677231f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -19.655809f, 31.065201f, 144.212204f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005047, 5962936, 4, { -16.018070f, 27.033091f, 118.517899f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005047, 5962937, 4, { 4.629210f, -8.535899f, 53.038620f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 0.000000f, -28.000000f, -53.246899f }, 0.750000f );
-      instance->registerEObj( "Unknown9", 2002872, 5787859, 4, { -0.137953f, -26.000000f, -52.603008f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 5787862, 4, { 0.000000f, -26.000000f, -96.909851f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006105, 5883005, 4, { 0.000000f, -28.000000f, -75.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 5908620, 4, { 0.000000f, -26.000000f, -110.560898f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -27.991100f, -115.007500f }, 1.000000f );
-      instance->registerEObj( "Steamspoutingcontraption", 2005427, 5828202, 4, { -5.000190f, -15.985280f, 39.105530f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5787826, 5, { -16.006710f, 36.148560f, 161.008804f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5908672, 5, { 0.002526f, -28.000019f, -23.439610f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
deleted file mode 100644
index 3881802e..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheFatherSavage.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheCuffoftheFatherSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheCuffoftheFatherSavage() : InstanceContentScript( 30026 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -23.299919f, -27.250000f, -93.915253f }, 2.500000f );
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005474, 0, 4, { -25.869850f, -27.250000f, -91.505951f }, 2.500000f );
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005475, 0, 4, { -28.364830f, -27.250000f, -89.139442f }, 2.500000f );
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005126, 0, 4, { -24.477819f, -27.250000f, -93.315643f }, 2.500000f );
-      instance->registerEObj( "MagitekgobwalkerGVII", 2005474, 0, 4, { -27.127260f, -27.250000f, -90.671631f }, 2.500000f );
-      instance->registerEObj( "Unknown0", 2005047, 5796486, 4, { -16.006710f, 28.995720f, 121.127502f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2005047, 5796475, 4, { -15.991690f, 25.994120f, 104.104698f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005047, 5796479, 4, { -0.042969f, -15.876210f, 39.414860f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2005047, 5796481, 4, { -0.042969f, -22.069151f, 4.294098f }, 1.000000f );
-      instance->registerEObj( "Steamspoutingcontraption", 2005048, 5828187, 4, { -20.999439f, 28.890051f, 120.379700f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2005428, 5828194, 4, { -20.812780f, 25.885040f, 102.729103f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2005428, 5828205, 4, { -5.111024f, -22.178221f, 3.677231f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -19.655809f, 31.065201f, 144.212204f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005047, 5962936, 4, { -16.018070f, 27.033091f, 118.517899f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005047, 5962937, 4, { 4.629210f, -8.535899f, 53.038620f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { 0.000000f, -28.000000f, -53.246899f }, 0.750000f );
-      instance->registerEObj( "Unknown9", 2002872, 5787859, 4, { -0.137953f, -26.000000f, -52.603008f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 5787862, 4, { 0.000000f, -26.000000f, -96.909851f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006105, 5883005, 4, { 0.000000f, -28.000000f, -75.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 5908620, 4, { 0.000000f, -26.000000f, -110.560898f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -27.991100f, -115.007500f }, 1.000000f );
-      instance->registerEObj( "Steamspoutingcontraption", 2005427, 5828202, 4, { -5.000190f, -15.985280f, 39.105530f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5787826, 5, { -16.006710f, 36.148560f, 161.008804f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5908672, 5, { 0.002526f, -28.000019f, -23.439610f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
deleted file mode 100644
index 0a449381..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSon.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheCuffoftheSon : public InstanceContentScript
-{
-public:
-   AlexanderTheCuffoftheSon() : InstanceContentScript( 30031 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005400, 0, 4, { -0.062597f, -7.999998f, -318.102112f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004356, 6075850, 4, { 16.000000f, 17.661369f, 68.195396f }, 1.000000f );
-      instance->registerEObj( "Steamspoutingcontraption", 2004357, 6075772, 4, { 21.013269f, 19.288509f, 69.098198f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004356, 6183194, 4, { 16.000000f, 17.933451f, 69.738426f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004362, 6075779, 4, { 21.207670f, 12.939710f, 41.993370f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6183959, 4, { 0.000000f, -26.000000f, -99.284462f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6185722, 4, { 0.000000f, -25.918800f, -139.159302f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 0.000000f, -25.959690f, -100.169899f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 0.000000f, -19.459700f, -163.887405f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002872, 6185721, 4, { 0.000000f, -19.913139f, -203.123398f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002872, 6183975, 4, { 0.000000f, -20.000000f, -163.001999f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002735, 0, 4, { 0.000000f, -13.500000f, -227.525406f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002872, 6185576, 4, { 0.000000f, -14.000000f, -267.622406f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002872, 6183981, 4, { 0.000000f, -14.000000f, -226.639999f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 0.000000f, -8.000000f, -286.936798f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2002872, 6183985, 4, { 0.000000f, -8.000000f, -286.051392f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 6186651, 4, { -0.636187f, -7.999998f, -335.408813f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -7.921236f, -335.377502f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006984, 6210606, 4, { -0.151275f, -14.000000f, -248.039703f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006989, 6234539, 4, { 1.000000f, -20.000000f, -184.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6177892, 5, { 16.000000f, 21.783440f, 91.573517f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 10.387650f, 18.918310f, 75.899696f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6184206, 5, { 0.000000f, -26.000000f, -65.141693f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
deleted file mode 100644
index c6616fcb..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheCuffoftheSonSavage.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheCuffoftheSonSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheCuffoftheSonSavage() : InstanceContentScript( 30035 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005400, 0, 4, { -0.062597f, -7.999998f, -318.102112f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004356, 6075850, 4, { 16.000000f, 17.661369f, 68.195396f }, 1.000000f );
-      instance->registerEObj( "Steamspoutingcontraption", 2004357, 6075772, 4, { 21.013269f, 19.288509f, 69.098198f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004356, 6183194, 4, { 16.000000f, 17.933451f, 69.738426f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004362, 6075779, 4, { 21.207670f, 12.939710f, 41.993370f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002872, 6183959, 4, { 0.000000f, -26.000000f, -99.284462f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 6185722, 4, { 0.000000f, -25.918800f, -139.159302f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { 0.000000f, -25.959690f, -100.169899f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 0.000000f, -19.459700f, -163.887405f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002872, 6185721, 4, { 0.000000f, -19.913139f, -203.123398f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002872, 6183975, 4, { 0.000000f, -20.000000f, -163.001999f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002735, 0, 4, { 0.000000f, -13.500000f, -227.525406f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002872, 6185576, 4, { 0.000000f, -14.000000f, -267.622406f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002872, 6183981, 4, { 0.000000f, -14.000000f, -226.639999f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2002735, 0, 4, { 0.000000f, -8.000000f, -286.936798f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2002872, 6183985, 4, { 0.000000f, -8.000000f, -286.051392f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 6186651, 4, { -0.636187f, -7.999998f, -335.408813f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -7.921236f, -335.377502f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006984, 6210606, 4, { -0.151275f, -14.000000f, -248.039703f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006989, 6234539, 4, { 1.000000f, -20.000000f, -184.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6177892, 5, { 16.000000f, 21.783440f, 91.573517f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 10.387650f, 18.918310f, 75.899696f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6184206, 5, { 0.000000f, -26.000000f, -65.141693f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
deleted file mode 100644
index 10e9d8eb..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreator.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheEyesoftheCreator : public InstanceContentScript
-{
-public:
-   AlexanderTheEyesoftheCreator() : InstanceContentScript( 30039 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6430458, 4, { 8.200209f, -250.000000f, -257.340210f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6430459, 4, { 8.200209f, -250.000000f, -242.154495f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6430457, 4, { -9.317612f, -250.000000f, -257.340210f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6430456, 4, { -9.317612f, -250.000000f, -242.154495f }, 1.000000f );
-      instance->registerEObj( "Powergenerator", 2007469, 0, 4, { 13.381770f, -250.000000f, -248.034500f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6513582, 4, { 10.437510f, -250.000000f, -260.791412f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6513579, 4, { 10.437510f, -250.000000f, -238.786697f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6513584, 4, { -11.731350f, -250.000000f, -260.791412f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6511025, 4, { -11.731350f, -250.000000f, -238.786697f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6516007, 4, { 0.000000f, -249.000000f, -250.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6412089, 4, { -124.346802f, -26.965401f, -70.917450f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6492511, 4, { -124.346802f, -26.965401f, -70.917503f }, 1.000000f );
-      instance->registerEObj( "Ingress", 2007456, 0, 4, { -40.238098f, 116.186600f, 3.921570f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2002735, 0, 4, { -40.738098f, 114.683800f, 6.860600f }, 0.750000f );
-      instance->registerEObj( "Unknown12", 2002872, 6480419, 4, { -40.263161f, 114.683800f, 4.312012f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, -246.936798f, -289.430511f }, 0.991760f );
-      instance->registerEObj( "Cranialhatch", 2007455, 6401919, 4, { -40.885181f, 114.683899f, 3.853281f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2002872, 6488523, 4, { -41.825008f, 114.671501f, -5.474617f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2007457, 6480499, 4, { 0.029205f, -250.000000f, -269.982300f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6422309, 4, { 0.029205f, -249.000000f, -271.779205f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002587, 0, 4, { -36.774879f, 114.683701f, -18.658051f }, 1.200000f );
-      instance->registerEObj( "Unknown17", 2002872, 6502657, 4, { -36.910030f, 114.683701f, -17.920090f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449051, 5, { -133.348099f, -24.805401f, -98.991310f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -133.531906f, -24.595860f, -91.717850f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6449334, 5, { -36.523010f, 114.683701f, -20.849701f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
deleted file mode 100644
index 01ac3085..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheEyesoftheCreatorSavage.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheEyesoftheCreatorSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheEyesoftheCreatorSavage() : InstanceContentScript( 30043 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6430458, 4, { 8.200209f, -250.000000f, -257.340210f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6430459, 4, { 8.200209f, -250.000000f, -242.154495f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6430457, 4, { -9.317612f, -250.000000f, -257.340210f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6430456, 4, { -9.317612f, -250.000000f, -242.154495f }, 1.000000f );
-      instance->registerEObj( "Powergenerator", 2007469, 0, 4, { 13.381770f, -250.000000f, -248.034500f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6513582, 4, { 10.437510f, -250.000000f, -260.791412f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6513579, 4, { 10.437510f, -250.000000f, -238.786697f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6513584, 4, { -11.731350f, -250.000000f, -260.791412f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6511025, 4, { -11.731350f, -250.000000f, -238.786697f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6516007, 4, { 0.000000f, -249.000000f, -250.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6412089, 4, { -124.346802f, -26.965401f, -70.917450f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6492511, 4, { -124.346802f, -26.965401f, -70.917503f }, 1.000000f );
-      instance->registerEObj( "Ingress", 2007456, 0, 4, { -40.238098f, 116.186600f, 3.921570f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2002735, 0, 4, { -40.738098f, 114.683800f, 6.860600f }, 0.750000f );
-      instance->registerEObj( "Unknown12", 2002872, 6480419, 4, { -40.263161f, 114.683800f, 4.312012f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, -246.936798f, -289.430511f }, 0.991760f );
-      instance->registerEObj( "Cranialhatch", 2007455, 6401919, 4, { -40.885181f, 114.683899f, 3.853281f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2002872, 6488523, 4, { -41.825008f, 114.671501f, -5.474617f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2007457, 6480499, 4, { 0.029205f, -250.000000f, -269.982300f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6422309, 4, { 0.029205f, -249.000000f, -271.779205f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002587, 0, 4, { -36.774879f, 114.683701f, -18.658051f }, 1.200000f );
-      instance->registerEObj( "Unknown17", 2002872, 6502657, 4, { -36.910030f, 114.683701f, -17.920090f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449051, 5, { -133.348099f, -24.805401f, -98.991310f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -133.531906f, -24.595860f, -91.717850f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6449334, 5, { -36.523010f, 114.683701f, -20.849701f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
deleted file mode 100644
index 083591b3..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFather.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheFistoftheFather : public InstanceContentScript
-{
-public:
-   AlexanderTheFistoftheFather() : InstanceContentScript( 30021 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005032, 0, 4, { -10.154560f, -23.900000f, -171.851105f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005046, 0, 4, { -13.656920f, -24.002501f, -180.132797f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2005033, 0, 4, { -16.466789f, -24.000000f, -176.308197f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 0.000000f, 8.000000f, -39.386002f }, 0.750000f );
-      instance->registerEObj( "Unknown4", 2002872, 5787765, 4, { -0.007763f, 8.000001f, -38.723202f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 5787769, 4, { -0.007763f, 8.000002f, -76.255096f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005148, 5835158, 4, { -5.000000f, -4.351456f, 18.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005149, 5835159, 4, { 5.000000f, -4.368736f, 18.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005150, 5835148, 4, { -4.000000f, -3.485719f, 13.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005151, 5835149, 4, { 4.000000f, -3.483227f, 13.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2005315, 5835144, 4, { -4.000000f, -2.619212f, 8.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006035, 5835145, 4, { 4.000000f, -2.621703f, 8.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006053, 5835143, 4, { -3.000000f, -1.918940f, 4.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006054, 5835135, 4, { 3.000000f, -1.911465f, 4.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006055, 5835141, 4, { -3.000000f, -1.231334f, 0.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006056, 5835136, 4, { 3.000000f, -1.231335f, 0.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006057, 5835153, 4, { -9.000000f, -3.642947f, 14.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006058, 5835152, 4, { -9.000000f, -3.309154f, 12.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006059, 5835151, 4, { 9.000000f, -3.666079f, 14.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2006060, 5835150, 4, { 9.000000f, -3.310075f, 12.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2006093, 5858144, 4, { -0.006211f, 12.000000f, -107.218903f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2002872, 5787778, 4, { 0.000000f, 12.000000f, -107.839302f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.035584f, -24.311769f, -187.660599f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2005402, 5815199, 4, { 1.317244f, -23.900000f, -173.937302f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2005401, 5837182, 4, { -0.350596f, -23.900000f, -171.328796f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 5908619, 4, { 0.000000f, -23.476339f, -186.888397f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002735, 0, 4, { 0.000000f, 11.993800f, -108.070297f }, 0.500000f );
-      instance->registerEObj( "Entrance", 2000182, 5786793, 5, { -0.057753f, -21.358721f, 88.563942f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -1.141299f, -16.781481f, 74.122673f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2005147, 5905927, 4, { -0.186450f, -20.599979f, 84.260910f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5911084, 5, { -0.057753f, 8.090733f, -31.639650f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2000608, 5911088, 4, { -0.300161f, 5.743856f, -19.072269f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2005147, 5912244, 4, { -0.186450f, 8.755365f, -27.952221f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
deleted file mode 100644
index ce511ab0..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheFatherSavage.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheFistoftheFatherSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheFistoftheFatherSavage() : InstanceContentScript( 30025 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005032, 0, 4, { -10.154560f, -23.900000f, -171.851105f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005046, 0, 4, { -13.656920f, -24.002501f, -180.132797f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2005033, 0, 4, { -16.466789f, -24.000000f, -176.308197f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002735, 0, 4, { 0.000000f, 8.000000f, -39.386002f }, 0.750000f );
-      instance->registerEObj( "Unknown4", 2002872, 5787765, 4, { -0.007763f, 8.000001f, -38.723202f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 5787769, 4, { -0.007763f, 8.000002f, -76.255096f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005148, 5835158, 4, { -5.000000f, -4.351456f, 18.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005149, 5835159, 4, { 5.000000f, -4.368736f, 18.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005150, 5835148, 4, { -4.000000f, -3.485719f, 13.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005151, 5835149, 4, { 4.000000f, -3.483227f, 13.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2005315, 5835144, 4, { -4.000000f, -2.619212f, 8.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006035, 5835145, 4, { 4.000000f, -2.621703f, 8.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006053, 5835143, 4, { -3.000000f, -1.918940f, 4.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006054, 5835135, 4, { 3.000000f, -1.911465f, 4.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006055, 5835141, 4, { -3.000000f, -1.231334f, 0.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006056, 5835136, 4, { 3.000000f, -1.231335f, 0.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006057, 5835153, 4, { -9.000000f, -3.642947f, 14.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006058, 5835152, 4, { -9.000000f, -3.309154f, 12.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006059, 5835151, 4, { 9.000000f, -3.666079f, 14.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2006060, 5835150, 4, { 9.000000f, -3.310075f, 12.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2006093, 5858144, 4, { -0.006211f, 12.000000f, -107.218903f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2002872, 5787778, 4, { 0.000000f, 12.000000f, -107.839302f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.035584f, -24.311769f, -187.660599f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2005402, 5815199, 4, { 1.317244f, -23.900000f, -173.937302f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2005401, 5837182, 4, { -0.350596f, -23.900000f, -171.328796f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 5908619, 4, { 0.000000f, -23.476339f, -186.888397f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002735, 0, 4, { 0.000000f, 11.993800f, -108.070297f }, 0.500000f );
-      instance->registerEObj( "Entrance", 2000182, 5786793, 5, { -0.057753f, -21.358721f, 88.563942f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -1.141299f, -16.781481f, 74.122673f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2005147, 5905927, 4, { -0.186450f, -20.599979f, 84.260910f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5911084, 5, { -0.057753f, 8.090733f, -31.639650f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2000608, 5911088, 4, { -0.300161f, 5.743856f, -19.072269f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2005147, 5912244, 4, { -0.186450f, 8.755365f, -27.952221f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
deleted file mode 100644
index 497b11ae..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSon.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheFistoftheSon : public InstanceContentScript
-{
-public:
-   AlexanderTheFistoftheSon() : InstanceContentScript( 30030 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006093, 0, 4, { -0.030479f, -18.000000f, -87.654160f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6179766, 4, { 0.048718f, -8.000000f, -25.550190f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 6179771, 4, { 0.348718f, -8.000000f, -62.819778f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002587, 0, 4, { 0.000000f, -7.796605f, -27.253839f }, 1.400000f );
-      instance->registerEObj( "Unknown4", 2002872, 6179774, 4, { 0.000000f, -18.000000f, -86.751549f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 0.000000f, -18.000000f, -88.696098f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -10.159560f, -10.000000f, -208.556000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2006965, 6200579, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004870, 6200506, 4, { -0.400928f, -10.000000f, -198.953598f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005111, 6200497, 4, { 9.766629f, -10.000000f, -190.029099f }, 1.000000f );
-      instance->registerEObj( "Koboldkey", 2006468, 6200507, 4, { -9.431794f, -10.000000f, -190.472397f }, 1.000000f );
-      instance->registerEObj( "Koboldkey", 2006469, 6200508, 4, { 0.206919f, -10.000000f, -180.011597f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004363, 0, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004367, 0, 4, { 0.000000f, -10.000000f, -206.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004368, 0, 4, { 16.000000f, -10.000000f, -190.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004369, 0, 4, { -16.000000f, -10.000000f, -190.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004575, 0, 4, { 0.000000f, -10.000000f, -174.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 6180367, 4, { -8.545354f, -9.800000f, -209.792007f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6177861, 5, { 0.000000f, -60.199001f, 70.921097f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 1.189643f, -53.337769f, 57.917198f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006105, 6185484, 4, { 0.000000f, -58.108219f, 65.176361f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6184198, 5, { 4.589292f, -3.826589f, 1.082808f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.135107f, -6.123573f, -3.436843f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006105, 6198124, 4, { 4.362909f, -6.098227f, -3.232224f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
deleted file mode 100644
index e522fe89..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheFistoftheSonSavage.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheFistoftheSonSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheFistoftheSonSavage() : InstanceContentScript( 30034 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006093, 0, 4, { -0.030479f, -18.000000f, -87.654160f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6179766, 4, { 0.048718f, -8.000000f, -25.550190f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 6179771, 4, { 0.348718f, -8.000000f, -62.819778f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002587, 0, 4, { 0.000000f, -7.796605f, -27.253839f }, 1.400000f );
-      instance->registerEObj( "Unknown4", 2002872, 6179774, 4, { 0.000000f, -18.000000f, -86.751549f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { 0.000000f, -18.000000f, -88.696098f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -10.159560f, -10.000000f, -208.556000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2006965, 6200579, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004870, 6200506, 4, { -0.400928f, -10.000000f, -198.953598f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005111, 6200497, 4, { 9.766629f, -10.000000f, -190.029099f }, 1.000000f );
-      instance->registerEObj( "Koboldkey", 2006468, 6200507, 4, { -9.431794f, -10.000000f, -190.472397f }, 1.000000f );
-      instance->registerEObj( "Koboldkey", 2006469, 6200508, 4, { 0.206919f, -10.000000f, -180.011597f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004363, 0, 4, { 0.000000f, -10.000000f, -190.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004367, 0, 4, { 0.000000f, -10.000000f, -206.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004368, 0, 4, { 16.000000f, -10.000000f, -190.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004369, 0, 4, { -16.000000f, -10.000000f, -190.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004575, 0, 4, { 0.000000f, -10.000000f, -174.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2005313, 6180367, 4, { -8.545354f, -9.800000f, -209.792007f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6177861, 5, { 0.000000f, -60.199001f, 70.921097f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 1.189643f, -53.337769f, 57.917198f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006105, 6185484, 4, { 0.000000f, -58.108219f, 65.176361f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6184198, 5, { 4.589292f, -3.826589f, 1.082808f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.135107f, -6.123573f, -3.436843f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006105, 6198124, 4, { 4.362909f, -6.098227f, -3.232224f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
deleted file mode 100644
index 1d74b881..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreator.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheHeartoftheCreator : public InstanceContentScript
-{
-public:
-   AlexanderTheHeartoftheCreator() : InstanceContentScript( 30041 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 42.000000f }, 1.000000f );
-      instance->registerEObj( "Openduct", 2007466, 0, 4, { 10.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 62.000000f }, 1.000000f );
-      instance->registerEObj( "Openduct", 2007466, 0, 4, { -10.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2007457, 6516055, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6516054, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6516050, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6516150, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6516057, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6516049, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6516058, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6516056, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6433752, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6498824, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6494083, 4, { -12.120000f, -79.986076f, 45.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6494060, 4, { 12.120000f, -79.986076f, 45.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6494084, 4, { 0.000000f, -79.986076f, 66.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007497, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6572855, 4, { 0.000000f, -80.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6573190, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007507, 0, 4, { 0.000000f, -79.986076f, 2.957292f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 6433738, 4, { 26.696230f, 0.000000f, 11.513790f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6433741, 4, { -57.433731f, -40.000000f, -0.807872f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -79.986076f, 40.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2002872, 6485880, 4, { -58.072899f, -39.959671f, -0.860951f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2002735, 0, 4, { -59.879780f, -40.078049f, 0.248821f }, 0.500000f );
-      instance->registerEObj( "Unknown21", 2006981, 6588684, 4, { 0.000000f, -80.000000f, 51.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449497, 5, { 5.000000f, 0.060100f, 29.472811f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 15.893050f, -0.000000f, 20.165380f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449499, 5, { -46.692200f, -40.000000f, -16.064711f }, 2.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
deleted file mode 100644
index 3c2dde66..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheHeartoftheCreatorSavage.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheHeartoftheCreatorSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheHeartoftheCreatorSavage() : InstanceContentScript( 30045 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 42.000000f }, 1.000000f );
-      instance->registerEObj( "Openduct", 2007466, 0, 4, { 10.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Openduct", 2007466, 0, 4, { 0.000000f, -79.986076f, 62.000000f }, 1.000000f );
-      instance->registerEObj( "Openduct", 2007466, 0, 4, { -10.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2007457, 6516055, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6516054, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6516050, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6516150, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6516057, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6516049, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6516058, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6516056, 4, { 0.000000f, -79.986099f, 38.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6433752, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6498824, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6494083, 4, { -12.120000f, -79.986076f, 45.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6494060, 4, { 12.120000f, -79.986076f, 45.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6494084, 4, { 0.000000f, -79.986076f, 66.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007497, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6572855, 4, { 0.000000f, -80.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6573190, 4, { 0.000000f, -79.986076f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007507, 0, 4, { 0.000000f, -79.986076f, 2.957292f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 6433738, 4, { 26.696230f, 0.000000f, 11.513790f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6433741, 4, { -57.433731f, -40.000000f, -0.807872f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -79.986076f, 40.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2002872, 6485880, 4, { -58.072899f, -39.959671f, -0.860951f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2002735, 0, 4, { -59.879780f, -40.078049f, 0.248821f }, 0.500000f );
-      instance->registerEObj( "Unknown21", 2006981, 6588684, 4, { 0.000000f, -80.000000f, 51.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449497, 5, { 5.000000f, 0.060100f, 29.472811f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 15.893050f, -0.000000f, 20.165380f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449499, 5, { -46.692200f, -40.000000f, -16.064711f }, 2.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
deleted file mode 100644
index 40b1864d..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreator.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheSouloftheCreator : public InstanceContentScript
-{
-public:
-   AlexanderTheSouloftheCreator() : InstanceContentScript( 30042 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 400.000000f, -21.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007468, 0, 4, { 14.140000f, 400.049988f, 14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007468, 0, 4, { -14.140000f, 400.049988f, -14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007468, 0, 4, { -14.140000f, 400.049988f, 14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007519, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007520, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007521, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6421491, 4, { 0.000000f, 400.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007516, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6487368, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6487369, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6487367, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6487366, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6483882, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6421479, 4, { 0.000000f, 400.168701f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007499, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007534, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6539545, 4, { 0.024963f, -480.000000f, 52.037621f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449508, 5, { -0.015367f, 400.000000f, 21.278250f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
deleted file mode 100644
index 0e494469..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/alexander/AlexanderTheSouloftheCreatorSavage.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class AlexanderTheSouloftheCreatorSavage : public InstanceContentScript
-{
-public:
-   AlexanderTheSouloftheCreatorSavage() : InstanceContentScript( 30046 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 400.000000f, -21.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007468, 0, 4, { 14.140000f, 400.049988f, -14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007468, 0, 4, { 14.140000f, 400.049988f, 14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007468, 0, 4, { -14.140000f, 400.049988f, -14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007468, 0, 4, { -14.140000f, 400.049988f, 14.140000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007519, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007520, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007521, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6421491, 4, { 0.000000f, 400.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007516, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6487368, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6487369, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6487367, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6487366, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6483882, 4, { 0.000000f, -470.000000f, 52.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6421479, 4, { 0.000000f, 400.168701f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007499, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007534, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6539545, 4, { 0.024963f, -480.000000f, 52.037621f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6449508, 5, { -0.015367f, 400.000000f, 21.278250f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
deleted file mode 100644
index 497fcb4c..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn1.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheBindingCoilofBahamutTurn1 : public InstanceContentScript
-{
-public:
-   TheBindingCoilofBahamutTurn1() : InstanceContentScript( 30002 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2000620, 4293369, 4, { -1.810616f, 13.164380f, 57.682442f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000619, 4293368, 4, { -3.276026f, 13.164380f, 57.488449f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000680, 0, 4, { 0.000000f, 5.245687f, 4.314113f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000620, 4293633, 4, { 8.673634f, 4.398203f, -361.720886f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000619, 4293632, 4, { 7.539745f, 4.948945f, -366.654388f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2001137, 0, 4, { -8.048342f, 1.700000f, -412.088593f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001696, 0, 4, { -23.791620f, 1.300000f, -414.239990f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -45.330261f, 25.136589f, 134.093399f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000486, 4374535, 4, { -5.435945f, 12.209330f, 0.953091f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2000746, 4312523, 4, { 57.321320f, 2.000001f, -254.168396f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000746, 4312527, 4, { 36.303661f, 2.815034f, -341.235992f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2001154, 4083745, 4, { -38.633110f, 0.899952f, -414.162201f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2001167, 4329693, 4, { -50.832001f, 59.871399f, -332.417511f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002712, 4374479, 4, { 52.174641f, 2.740428f, -248.752899f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2002712, 4374482, 4, { 44.598309f, 1.549361f, -340.584991f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2001152, 4374713, 4, { -4.591531f, 4.500000f, -379.052795f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2001152, 4374714, 4, { -47.199150f, 4.900000f, -430.581299f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2001152, 4374715, 4, { -12.391370f, -0.160584f, -378.187805f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2001152, 4374749, 4, { -12.091370f, -0.160584f, -376.087799f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2000681, 4312291, 4, { 0.534759f, 4.500000f, -374.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2000681, 4312292, 4, { -7.437989f, 0.900002f, -387.547607f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2000681, 4312293, 4, { -23.117430f, 0.472961f, -387.472412f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2000681, 4312297, 4, { -46.428509f, 0.500000f, -400.448212f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2000681, 4312296, 4, { -30.738091f, 0.099998f, -400.874908f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2000681, 4312295, 4, { -14.994600f, -0.299999f, -400.505615f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2000681, 4312294, 4, { 0.589670f, -0.700001f, -400.720093f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2000681, 4312298, 4, { -7.442382f, 1.700001f, -414.361389f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2000681, 4312299, 4, { -22.934330f, 1.296936f, -414.053589f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2000681, 4312300, 4, { -38.631561f, 0.900004f, -414.153595f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2000681, 4312303, 4, { -49.847839f, 4.899996f, -429.440002f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2000681, 4312302, 4, { -30.867050f, 2.500000f, -428.009308f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2000681, 4312301, 4, { -15.123560f, 2.100006f, -427.852295f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2000627, 4293311, 4, { -57.085258f, 25.136589f, 146.983200f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
deleted file mode 100644
index 15566886..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn2.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheBindingCoilofBahamutTurn2 : public InstanceContentScript
-{
-public:
-   TheBindingCoilofBahamutTurn2() : InstanceContentScript( 30003 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2000668, 4307413, 4, { -16.838060f, -60.912392f, 116.477898f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000669, 4307414, 4, { -16.655029f, -61.041161f, 117.352303f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000670, 4306762, 4, { -65.538063f, -38.998699f, 90.104332f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000671, 4306763, 4, { -66.396652f, -38.998539f, 88.058296f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000680, 0, 4, { -48.355518f, -38.578499f, 86.879211f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2000672, 4293655, 4, { -51.865479f, -18.020941f, 35.080441f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2000673, 4293656, 4, { -50.583679f, -18.020941f, 35.538212f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2000674, 4331576, 4, { 0.736900f, 0.033629f, 31.115801f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000675, 4331583, 4, { 1.580210f, 0.032013f, 29.906660f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000676, 4306493, 4, { 52.177799f, -21.010019f, 34.437031f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000677, 4306494, 4, { 51.183399f, -21.011810f, 34.504452f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000679, 4306772, 4, { 60.934231f, -41.989620f, 101.246002f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000678, 4306771, 4, { 59.622169f, -41.994068f, 98.767616f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000621, 4307578, 4, { 0.106751f, -65.934273f, 82.291870f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2000622, 4307579, 4, { -0.320496f, -65.934273f, 82.322388f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2000640, 4092173, 4, { -14.019790f, -0.010602f, 31.855391f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2000641, 4092174, 4, { 15.101930f, -0.029503f, 31.798840f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2000638, 4092177, 4, { -58.677170f, -18.016920f, 47.536171f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2000639, 4092181, 4, { -27.060640f, -18.102751f, 58.292858f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2000642, 4092183, 4, { 58.277191f, -20.996519f, 62.605671f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2000643, 4092178, 4, { 30.274019f, -20.952881f, 58.602650f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2000644, 4092182, 4, { 29.367611f, -41.975361f, 110.864998f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2000635, 4092184, 4, { 0.539888f, -62.460609f, 100.908897f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2000636, 4092179, 4, { -55.941719f, -38.998539f, 78.436340f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2000637, 4092180, 4, { -51.528130f, -38.998749f, 109.805901f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2000645, 4092175, 4, { 0.474554f, -65.943604f, 68.078178f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2001161, 4107517, 4, { -0.118857f, -102.612297f, 0.534058f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2001152, 4107515, 4, { 2.090964f, 0.000001f, 22.575050f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2000628, 4293644, 4, { 0.852533f, 0.148087f, 20.254930f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
deleted file mode 100644
index 6e6c9255..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn3.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheBindingCoilofBahamutTurn3 : public InstanceContentScript
-{
-public:
-   TheBindingCoilofBahamutTurn3() : InstanceContentScript( 30004 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2001046, 4204647, 4, { -38.434280f, 0.755630f, 27.186541f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2001047, 4204649, 4, { -22.930870f, -38.074230f, 51.622608f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2001048, 4204652, 4, { 17.410521f, -36.911560f, 65.506958f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2001049, 4204654, 4, { 43.230721f, -36.854370f, 41.278610f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001050, 4204661, 4, { 41.756340f, -37.405720f, 11.258040f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001051, 4204644, 4, { 18.406361f, -75.101082f, 30.246229f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001052, 4204665, 4, { -30.734369f, -111.808601f, 16.055771f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001053, 4204660, 4, { 28.263350f, -74.681847f, -39.544411f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001054, 4204664, 4, { -8.499553f, -113.039597f, -34.010311f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001055, 4204662, 4, { -15.483490f, -112.471001f, -20.925671f }, 1.000000f );
-      instance->registerEObj( "Silentterminal", 2001132, 4322464, 4, { -6.976719f, -112.013496f, 23.202400f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -16.955231f, -0.864158f, 0.593589f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2001152, 4238687, 4, { -1.707294f, 0.000000f, 3.048101f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2001056, 4204669, 4, { -14.240080f, -150.417404f, 1.736771f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2001057, 4204678, 4, { -29.648090f, -188.419907f, -3.748357f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2001058, 4204672, 4, { -12.738200f, -187.302002f, 51.141499f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2001059, 4204697, 4, { 0.332115f, -225.076202f, 50.155842f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2001060, 4204703, 4, { 52.345329f, -224.740707f, 37.453941f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2001061, 4204709, 4, { 46.480949f, -262.093811f, 5.845346f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2001062, 4204723, 4, { 28.585011f, -299.527008f, 19.833670f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2001063, 4204712, 4, { -15.037280f, -262.281311f, 51.584450f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2001064, 4204725, 4, { -15.719740f, -300.085785f, -22.829020f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2001065, 4204720, 4, { -0.428782f, -300.866394f, 22.938450f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2001066, 4204671, 4, { 9.075709f, -150.864899f, -17.327230f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2001067, 4204680, 4, { -25.603180f, -188.390701f, -25.489799f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2001068, 4204687, 4, { 28.229540f, -188.408707f, -2.975939f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2001069, 4204684, 4, { 37.952412f, -187.292603f, -39.644798f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2001070, 4204707, 4, { -5.330157f, -225.534607f, -50.912369f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2001071, 4204688, 4, { 23.554840f, -223.922607f, -46.970329f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2001072, 4204689, 4, { -44.635330f, -225.534607f, -27.836760f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2001073, 4204715, 4, { -24.786400f, -262.708405f, -39.642220f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2001074, 4204716, 4, { -0.141846f, -262.624695f, -63.058170f }, 1.000000f );
-      instance->registerEObj( "Silentterminal", 2001140, 4328681, 4, { -8.207968f, -300.679108f, -11.383970f }, 0.991760f );
-      instance->registerEObj( "Unknown30", 2001075, 4204730, 4, { -27.307819f, -347.278900f, 23.850750f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2001076, 4204722, 4, { -32.117531f, -347.483307f, -18.936440f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2001077, 4204728, 4, { -0.090805f, -348.068695f, -13.361250f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2001078, 4204719, 4, { 27.568150f, -347.808289f, 23.699249f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2001106, 4204738, 4, { -64.801163f, -383.539886f, -16.602329f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2001107, 4204740, 4, { -34.187149f, -383.967804f, -51.634480f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2001108, 4204732, 4, { 58.207191f, -383.523010f, -18.762280f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2001109, 4204735, 4, { 27.461531f, -384.122589f, 40.984268f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2001110, 4204746, 4, { 22.577141f, -422.501587f, 53.173019f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2001111, 4204744, 4, { -46.433231f, -422.842804f, 34.744751f }, 0.991760f );
-      instance->registerEObj( "Unknown40", 2001112, 4204747, 4, { 17.206091f, -423.418488f, -16.318670f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2001162, 4317929, 4, { -15.875440f, -423.430511f, 18.778770f }, 1.000000f );
-      instance->registerEObj( "Silentterminal", 2002600, 4334493, 4, { -24.909149f, -423.472595f, 41.999378f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2000629, 4294859, 4, { -0.075790f, 0.000000f, 0.310051f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
deleted file mode 100644
index 57844d1f..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn4.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheBindingCoilofBahamutTurn4 : public InstanceContentScript
-{
-public:
-   TheBindingCoilofBahamutTurn4() : InstanceContentScript( 30005 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Silentterminal", 2000633, 4974723, 4, { -16.904461f, 1.700597f, 17.125530f }, 1.000000f );
-      instance->registerEObj( "Silentterminal", 2000634, 4974724, 4, { 17.103741f, 1.662121f, 16.896111f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2001153, 4254608, 4, { 7.917505f, 0.058137f, -7.647632f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2001153, 4254609, 4, { 8.217505f, 0.058137f, -6.747632f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2001153, 4254607, 4, { 8.517506f, 0.000000f, -5.847631f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001153, 4254606, 4, { 8.817506f, 0.000000f, -4.947631f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001155, 4974722, 4, { -16.599979f, 0.058137f, -16.803070f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001155, 4974721, 4, { 16.776859f, 0.058137f, -16.643490f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001764, 3961628, 4, { -0.983059f, 0.058134f, 3.319265f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001764, 4974712, 4, { -2.906071f, 0.058134f, 2.796373f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001764, 3962580, 4, { -4.811448f, 0.000001f, 9.066607f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2001764, 4330325, 4, { 2.346304f, 0.058136f, 5.385328f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2001764, 4330326, 4, { 4.663461f, 0.058136f, 4.726402f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000630, 4294847, 4, { -12.531030f, 0.000001f, 12.592170f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000615, 4374568, 4, { -15.534740f, 0.058137f, -15.601170f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
deleted file mode 100644
index a9da20e3..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheBindingCoilofBahamutTurn5.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheBindingCoilofBahamutTurn5 : public InstanceContentScript
-{
-public:
-   TheBindingCoilofBahamutTurn5() : InstanceContentScript( 30006 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2000623, 4328290, 4, { -7.770457f, 54.493511f, -29.083250f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000666, 4323972, 4, { -3.001781f, 50.022308f, -7.576328f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000682, 0, 4, { -0.531223f, 50.025429f, 6.100062f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001151, 0, 4, { 11.681320f, 50.085152f, -0.915123f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2001150, 0, 4, { 14.631230f, 50.087898f, 1.687731f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001168, 0, 4, { 17.845060f, 50.181900f, -0.676077f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002664, 0, 4, { -7.768790f, 50.005032f, -4.092178f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2001163, 4328464, 4, { 51.910549f, 48.460838f, 72.757553f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000631, 4294944, 4, { -26.751080f, 100.099998f, -128.204498f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
deleted file mode 100644
index 5aba616f..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn1.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheFinalCoilofBahamutTurn1 : public InstanceContentScript
-{
-public:
-   TheFinalCoilofBahamutTurn1() : InstanceContentScript( 30016 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2004612, 0, 4, { -0.116493f, -0.000001f, -293.875214f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004613, 0, 4, { -5.014206f, -0.000001f, -285.730896f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4894214, 5, { 0.172209f, 1.707170f, 221.425903f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -6.029538f, -0.000005f, 188.016205f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003679, 4868598, 4, { -0.125790f, 0.523954f, 167.023605f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004605, 4852714, 4, { -0.194780f, -0.000003f, 177.104095f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2003849, 4881763, 4, { 0.031929f, -19.494820f, 141.135101f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2003905, 4868599, 4, { -0.095059f, -7.275987f, 79.729607f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004605, 4879813, 4, { -10.904620f, -18.183340f, 116.685303f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004605, 4879797, 4, { 11.416480f, -18.931650f, 116.685303f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004605, 4879805, 4, { 11.416480f, -19.000000f, 103.064003f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004605, 4879822, 4, { -11.312880f, -19.000000f, 103.064003f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004116, 4881762, 4, { 0.171127f, -19.487169f, 30.039690f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004117, 4868600, 4, { 0.009460f, -29.465590f, 10.045650f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004605, 4879838, 4, { 0.047739f, -29.000000f, 19.918270f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2004605, 4879850, 4, { 0.018590f, -29.000000f, 19.923750f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2004118, 4881761, 4, { 0.003261f, -4.463747f, -152.984604f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2004119, 4868601, 4, { 0.003693f, -4.463205f, -166.994400f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2002735, 0, 4, { 0.007116f, -5.000001f, -171.749207f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2002872, 4895024, 4, { -0.005186f, -4.890112f, -171.362305f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2004305, 4841650, 4, { 0.086417f, 0.090680f, -300.234711f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2004141, 4841682, 4, { 0.003672f, 1.083544f, -337.998596f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2004137, 4895069, 4, { 3.638081f, 0.152056f, -331.675415f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
deleted file mode 100644
index c7a8404c..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn2.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheFinalCoilofBahamutTurn2 : public InstanceContentScript
-{
-public:
-   TheFinalCoilofBahamutTurn2() : InstanceContentScript( 30017 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2004618, 0, 4, { 8.377602f, -4.963000f, 2.130980f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004622, 5004388, 4, { 0.000000f, -4.963000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004138, 4985190, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -8.983331f, -89.405617f, 340.705505f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4895376, 5, { -2.304138f, -95.841980f, 373.883514f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2004138, 4772070, 4, { -3.471196f, -85.362328f, 329.862915f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2004138, 0, 4, { 3.028988f, -85.357613f, 329.862915f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2004138, 4772073, 4, { 82.671562f, 89.558182f, 312.686188f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004138, 4772071, 4, { -87.694283f, 61.779518f, 322.880798f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004138, 4772074, 4, { 68.781647f, 74.135750f, 257.001312f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004138, 4772072, 4, { -71.265640f, 50.681782f, 262.029907f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004138, 0, 4, { 3.045514f, -50.605240f, 198.785202f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004131, 4772088, 4, { -0.320496f, -61.905880f, 240.100693f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2004131, 4772089, 4, { -0.150618f, -58.926769f, 229.063507f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004130, 4903493, 4, { 0.167786f, -56.382141f, 216.998505f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2004138, 4772084, 4, { 5.588670f, -50.254120f, 198.785202f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2004138, 4985729, 4, { -1.068177f, -50.250832f, 198.785202f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2004138, 4772077, 4, { 93.772713f, 2.760812f, 164.237198f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2004138, 4772078, 4, { 62.832458f, 2.703932f, 109.635002f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2004138, 4772079, 4, { -101.804497f, -15.054380f, 174.336105f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2004138, 4772080, 4, { -68.094177f, -9.272421f, 114.627701f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2004131, 4772085, 4, { -33.952530f, 1.069616f, 57.437080f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2004131, 4772087, 4, { 34.497631f, 1.062853f, 57.576210f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2004130, 4903494, 4, { -18.231251f, 0.578985f, 63.141258f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2004130, 4903495, 4, { 18.776350f, 0.578991f, 63.349949f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2004138, 4772081, 4, { 0.088281f, 0.909978f, 67.335487f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2004138, 4772082, 4, { -66.984283f, 1.029588f, -0.043371f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2004138, 4772083, 4, { 67.627632f, 1.029588f, -0.043371f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2002735, 0, 4, { 0.046454f, 0.339829f, 55.289249f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2002872, 4896001, 4, { -0.021759f, 0.578989f, 57.955990f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2004142, 4797408, 4, { 0.001913f, -4.224863f, -30.000130f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2004137, 4895798, 4, { -0.366558f, -4.738363f, -24.911970f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
deleted file mode 100644
index af59f9c2..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn3.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheFinalCoilofBahamutTurn3 : public InstanceContentScript
-{
-public:
-   TheFinalCoilofBahamutTurn3() : InstanceContentScript( 30018 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2004611, 0, 4, { -7.491028f, -53.235149f, -153.215500f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004610, 0, 4, { 22.322800f, -53.235241f, -154.775101f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004627, 5009741, 4, { 0.000000f, -53.682961f, -160.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004638, 0, 4, { -14.415940f, -53.682961f, -162.090302f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4895872, 5, { 0.005331f, -53.234989f, -140.846207f }, 1.000000f );
-      instance->registerEObj( "Entrypoint", 2004650, 0, 4, { -0.019161f, -53.626511f, -182.364700f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
deleted file mode 100644
index aa5b55bd..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheFinalCoilofBahamutTurn4.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheFinalCoilofBahamutTurn4 : public InstanceContentScript
-{
-public:
-   TheFinalCoilofBahamutTurn4() : InstanceContentScript( 30019 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2004578, 0, 4, { 452.681213f, 0.000000f, 6.016883f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004579, 0, 4, { 450.366699f, -0.000000f, 5.948895f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004580, 0, 4, { 443.205688f, 0.000000f, 4.024448f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4895882, 5, { 450.000000f, 0.000000f, 21.250090f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004785, 5039563, 4, { 450.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004649, 5018241, 4, { 448.419403f, 0.000000f, 4.765350f }, 1.000000f );
-      instance->registerEObj( "Exit", 2004651, 0, 4, { 450.000000f, 0.000000f, 29.273590f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
deleted file mode 100644
index 52d11b8c..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn2.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSecondCoilofBahamutSavageTurn2 : public InstanceContentScript
-{
-public:
-   TheSecondCoilofBahamutSavageTurn2() : InstanceContentScript( 30013 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f );
-      instance->registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f );
-      instance->registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
deleted file mode 100644
index 0f7dfc99..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn3.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSecondCoilofBahamutSavageTurn3 : public InstanceContentScript
-{
-public:
-   TheSecondCoilofBahamutSavageTurn3() : InstanceContentScript( 30014 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f );
-      instance->registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f );
-      instance->registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f );
-      instance->registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f }, 0.991760f );
-      instance->registerEObj( "Boxofcrystals", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f }, 1.000000f );
-      instance->registerEObj( "Boxofcrystals", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f }, 1.000000f );
-      instance->registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
deleted file mode 100644
index 9831c3ac..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn3.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSecondCoilofBahamutTurn3 : public InstanceContentScript
-{
-public:
-   TheSecondCoilofBahamutTurn3() : InstanceContentScript( 30009 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Fragrantbloom", 2003342, 0, 4, { 5.540659f, -506.930115f, 105.670197f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003387, 0, 4, { 5.248638f, -506.929993f, 104.130501f }, 1.000000f );
-      instance->registerEObj( "Sylphpodling", 2003348, 0, 4, { 4.584954f, -506.929993f, 106.997597f }, 1.000000f );
-      instance->registerEObj( "Skybulb", 2003358, 0, 4, { 3.469964f, -506.929993f, 104.900299f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003289, 4681305, 4, { -28.488001f, -506.700012f, 105.307297f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003289, 4681302, 4, { -2.644600f, -506.700012f, 79.710602f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003289, 4681303, 4, { 23.007401f, -506.700012f, 105.309097f }, 1.000000f );
-      instance->registerEObj( "Destination", 2003289, 4681304, 4, { -2.685100f, -506.700012f, 131.011307f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4649322, 5, { 71.763351f, -505.710297f, -183.265305f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 78.751831f, -508.192688f, -166.063995f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2003117, 4649426, 4, { 71.787033f, -523.938416f, -91.769341f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003149, 4649428, 4, { 71.647507f, -539.766907f, -10.543050f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003178, 4649429, 4, { -72.118347f, -523.848206f, -91.955490f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2003179, 4649430, 4, { -71.857773f, -539.706909f, -11.043210f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2003180, 4649427, 4, { 32.211380f, -491.286011f, -105.322304f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2003187, 4649436, 4, { 31.604389f, -498.100800f, -68.374847f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2003188, 4649435, 4, { 31.776440f, -506.867188f, -22.942039f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2003196, 4649437, 4, { 31.800430f, -514.005920f, 12.637740f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2003198, 4649442, 4, { -32.055038f, -491.285187f, -104.874397f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2003200, 4649444, 4, { -31.019110f, -497.691315f, -68.166161f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2003201, 4649443, 4, { -32.114700f, -507.132690f, -23.686880f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2003202, 4649445, 4, { -32.647800f, -514.520386f, 12.987520f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2003203, 4649441, 4, { 39.004780f, -451.620209f, -100.687401f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2003204, 4649439, 4, { 36.536411f, -459.008911f, -57.215809f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2003211, 4649440, 4, { 36.232590f, -468.665405f, -16.744450f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2003212, 4649438, 4, { 39.456009f, -475.805695f, 24.956329f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2003220, 4649449, 4, { -38.816181f, -450.369904f, -100.764801f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2003272, 4649447, 4, { -39.033329f, -459.976013f, -57.518230f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2003273, 4649448, 4, { -38.558640f, -467.593109f, -20.011221f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2003274, 4649446, 4, { -39.651970f, -475.626709f, 24.849569f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2003275, 4649434, 4, { 72.266907f, -442.713989f, -75.343910f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2003286, 4649431, 4, { 71.894348f, -458.468506f, 5.267881f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2003287, 4649432, 4, { -71.852654f, -442.697113f, -75.916992f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2003288, 4649433, 4, { -71.777451f, -458.403107f, 4.927437f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2002473, 4649110, 4, { 71.824219f, -515.343018f, -132.707794f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2002474, 4649108, 4, { 71.847183f, -531.168091f, -51.265450f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2002579, 4649109, 4, { 71.850891f, -546.907227f, 29.809669f }, 0.991760f );
-      instance->registerEObj( "Boxofcrystals", 2002592, 4649105, 4, { -71.854797f, -515.314209f, -132.724899f }, 0.991760f );
-      instance->registerEObj( "Boxofcrystals", 2002593, 4649103, 4, { -71.848587f, -531.122681f, -51.389240f }, 1.000000f );
-      instance->registerEObj( "Boxofcrystals", 2002594, 4649104, 4, { -71.852577f, -547.315125f, 29.686489f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2002885, 4649106, 4, { -0.000875f, -482.805389f, -84.219566f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2002886, 4649107, 4, { -0.003072f, -498.601105f, -3.013031f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2003453, 4672990, 4, { 0.015892f, -506.314087f, 46.485531f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2002872, 4649551, 4, { -2.840854f, -506.553986f, 68.877274f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2002735, 0, 4, { -2.788200f, -507.313385f, 68.893646f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2003418, 4672991, 4, { -2.071490f, -506.798004f, 144.172394f }, 1.000000f );
-      instance->registerEObj( "Frontalbulkhead", 2003420, 4649112, 4, { -0.091233f, -505.180695f, 26.463760f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2003422, 4651265, 4, { -2.657619f, -506.929993f, 124.653297f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2003677, 4681484, 4, { -2.678503f, -506.980103f, 84.769417f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
deleted file mode 100644
index 314a5345..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn4.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSecondCoilofBahamutTurn4 : public InstanceContentScript
-{
-public:
-   TheSecondCoilofBahamutTurn4() : InstanceContentScript( 30010 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
deleted file mode 100644
index d1fec952..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/SyrcusTower.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SyrcusTower : public InstanceContentScript
-{
-public:
-   SyrcusTower() : InstanceContentScript( 30011 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002587, 0, 4, { -370.000000f, 500.115387f, -199.956299f }, 0.700000f );
-      instance->registerEObj( "Unknown1", 2002872, 4738783, 4, { -394.730194f, 500.000000f, -199.572800f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -415.668213f, 500.000000f, -200.003296f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004244, 4757482, 4, { -390.384705f, 500.000000f, -194.533203f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004292, 4757483, 4, { -401.338287f, 500.000000f, -196.787003f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004293, 4757484, 4, { -403.504913f, 500.000000f, -196.539597f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004294, 4757485, 4, { -405.170593f, 500.000000f, -202.118393f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2004295, 4757486, 4, { -400.173798f, 500.000000f, -200.892807f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004296, 4757487, 4, { -395.280304f, 500.000000f, -200.854401f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2004243, 4757498, 4, { -400.242615f, 500.000000f, -197.116501f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004354, 0, 4, { -397.029785f, 500.000000f, -196.979202f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004355, 0, 4, { -459.071411f, 506.001801f, -196.468506f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004236, 4759659, 4, { -1.397732f, -589.900085f, -194.801498f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004237, 0, 4, { 2.182007f, -589.929077f, -198.077499f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2002587, 0, 4, { -0.015320f, -590.000000f, -152.513794f }, 0.686646f );
-      instance->registerEObj( "Unknown14", 2002872, 4725495, 4, { 0.228821f, -590.000000f, -174.995300f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2002587, 0, 4, { -0.883440f, -4.000000f, -141.001801f }, 0.700000f );
-      instance->registerEObj( "Unknown16", 2002872, 4738653, 4, { -0.991882f, 0.000000f, -196.720993f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2004245, 4711823, 4, { -0.379705f, 0.000000f, -145.342300f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2004246, 4711824, 4, { 0.710614f, 0.000000f, -199.171204f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2004247, 4711825, 4, { 0.439319f, 0.000001f, -201.553802f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2004248, 4711828, 4, { 0.202690f, 0.000000f, -199.270599f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2004250, 4867789, 4, { -0.142451f, -0.000001f, -199.916000f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2004251, 4771487, 4, { 6.207808f, 0.025001f, -197.716293f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2004252, 4771488, 4, { 0.912855f, 0.000000f, -200.229401f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2004253, 4771264, 4, { -0.249095f, 0.000000f, -200.632095f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2004540, 0, 4, { 2.310606f, 0.000000f, -199.315903f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2002587, 0, 4, { 16.500000f, 600.000000f, -175.000000f }, 0.700000f );
-      instance->registerEObj( "Unknown27", 2002872, 4738751, 4, { 6.038667f, 600.000000f, -191.625595f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2004249, 0, 4, { 0.534058f, 600.000000f, -204.089493f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2004372, 0, 4, { 2.491530f, 600.000000f, -197.343201f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2004498, 0, 4, { 7.797371f, 600.000000f, -197.855301f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2002587, 0, 4, { 0.000000f, -700.000000f, 79.955803f }, 0.700000f );
-      instance->registerEObj( "Unknown32", 2002872, 4725557, 4, { -0.328611f, -700.000000f, 53.732899f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2002587, 0, 4, { 29.805300f, -400.000000f, -200.000000f }, 0.700000f );
-      instance->registerEObj( "Unknown34", 2002872, 4725580, 4, { 5.249963f, -400.000000f, -199.878006f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2002587, 0, 4, { 0.000000f, 200.000000f, -229.757797f }, 0.700000f );
-      instance->registerEObj( "Unknown36", 2002872, 4738682, 4, { 0.542766f, 199.899994f, -231.713898f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4723157, 5, { -0.325782f, -897.940918f, 371.584106f }, 1.000000f );
-      instance->registerEObj( "Allaganteleporter", 2004154, 4645409, 4, { -5.014030f, -894.781982f, 324.891296f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2004155, 4645410, 4, { 8.084772f, -708.339111f, 175.045898f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2004158, 4645412, 4, { 7.971835f, -598.362915f, -76.990211f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2004156, 4652344, 4, { 72.370857f, -402.456696f, -206.931000f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2004159, 4645415, 4, { -6.906353f, -2.365848f, -126.353897f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2004157, 4645417, 4, { -6.845924f, 197.827805f, -274.836700f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2004160, 4651219, 4, { 29.220949f, 599.725220f, -140.581406f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2004161, 4636419, 4, { -317.290192f, 500.821808f, -189.288193f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2004164, 4738634, 4, { 0.448093f, -700.000000f, 104.558601f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2004173, 4720323, 4, { 0.019809f, -590.000000f, -150.897903f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2004167, 4711138, 4, { 44.295219f, -403.598602f, -199.389694f }, 0.991760f );
-      instance->registerEObj( "Unknown41", 2004176, 4710992, 4, { 0.045776f, 0.000000f, -180.284607f }, 0.991760f );
-      instance->registerEObj( "Unknown42", 2004170, 4710494, 4, { 0.449279f, 196.100006f, -262.072296f }, 0.991760f );
-      instance->registerEObj( "Unknown43", 2004179, 4742340, 4, { 28.708071f, 598.000183f, -156.658600f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
deleted file mode 100644
index 73c89447..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheLabyrinthoftheAncients.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheLabyrinthoftheAncients : public InstanceContentScript
-{
-public:
-   TheLabyrinthoftheAncients() : InstanceContentScript( 30001 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002108, 0, 4, { -109.946503f, 44.168140f, -165.619995f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4317322, 5, { -110.032799f, 30.372690f, 417.614990f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2001023, 3445281, 4, { -117.450104f, 45.942120f, 317.195892f }, 0.778198f );
-      instance->registerEObj( "Unknown2", 2002793, 4493308, 4, { -148.301498f, 48.301128f, 279.915802f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002794, 4493309, 4, { -109.977203f, 48.251709f, 243.024094f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002795, 4493310, 4, { -71.722931f, 48.301121f, 280.086487f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001024, 4199521, 4, { -451.214386f, 41.580811f, 182.050903f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001025, 4303928, 4, { -451.373688f, 24.800070f, 73.862427f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2001026, 0, 4, { -451.305206f, 24.873600f, 73.806000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002798, 0, 4, { -355.665405f, 41.884102f, 279.420288f }, 1.550000f );
-      instance->registerEObj( "Unknown9", 2002801, 4478011, 4, { -346.181488f, 42.801510f, 279.988708f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002799, 0, 4, { -415.959198f, 42.400002f, 280.898804f }, 1.550000f );
-      instance->registerEObj( "Unknown11", 2002802, 4478013, 4, { -415.761597f, 42.400002f, 279.982788f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002800, 0, 4, { -452.406799f, 42.400002f, 239.395096f }, 1.550000f );
-      instance->registerEObj( "Unknown13", 2002803, 4478015, 4, { -451.081909f, 41.580811f, 243.305099f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2002839, 4493435, 4, { -413.650909f, 42.000000f, 279.285889f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2002840, 4493436, 4, { -450.220612f, 41.580811f, 247.690399f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2002807, 3445282, 4, { -301.062592f, 54.375320f, 290.201904f }, 0.991760f );
-      instance->registerEObj( "Allaganteleporter", 2002808, 3974161, 4, { -457.203400f, 38.418018f, 104.051903f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2002804, 0, 4, { -451.176910f, 25.504910f, 18.912251f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2001027, 4304910, 4, { 191.423996f, 51.658699f, 280.097992f }, 0.400000f );
-      instance->registerEObj( "Unknown17", 2001028, 4304912, 4, { 191.145798f, 51.767059f, 279.359497f }, 0.400000f );
-      instance->registerEObj( "Unknown18", 2001032, 0, 4, { 409.496094f, 66.240303f, 280.004395f }, 0.800000f );
-      instance->registerEObj( "Unknown19", 2001031, 4304071, 4, { 438.027588f, 69.382690f, 281.602203f }, 0.778198f );
-      instance->registerEObj( "Allaganteleporter", 2002809, 3445284, 4, { 115.688499f, 65.110123f, 280.018311f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2002813, 4199883, 4, { 253.669495f, 51.066391f, 244.695007f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2002814, 4199882, 4, { 253.676102f, 51.066399f, 279.965607f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2002815, 4199881, 4, { 253.683899f, 51.066360f, 315.213013f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2002816, 4199880, 4, { 213.707596f, 51.052799f, 244.895493f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002817, 4199878, 4, { 213.688202f, 51.052799f, 280.125214f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2002818, 4199879, 4, { 213.723404f, 51.052799f, 315.105286f }, 1.000000f );
-      instance->registerEObj( "Allaganteleporter", 2002810, 3974166, 4, { 349.215515f, 60.567490f, 268.536591f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2002805, 0, 4, { 455.122894f, 66.249268f, 279.987701f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2001030, 4199894, 4, { 264.739899f, 50.679981f, 279.921509f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2001033, 4305031, 4, { -110.210899f, 44.083248f, -116.227997f }, 0.381470f );
-      instance->registerEObj( "Unknown28", 2001034, 0, 4, { -110.254898f, 44.168098f, -111.387901f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2001035, 4317566, 4, { -110.054497f, 46.072929f, -214.578705f }, 0.400000f );
-      instance->registerEObj( "Unknown30", 2001036, 4305191, 4, { -111.224899f, 67.886620f, -344.147797f }, 0.400000f );
-      instance->registerEObj( "Unknown31", 2001037, 0, 4, { -109.930298f, 67.892403f, -338.731415f }, 1.000000f );
-      instance->registerEObj( "Energytowerconsole", 2001038, 0, 4, { -85.032784f, 70.241432f, -343.493713f }, 0.800000f );
-      instance->registerEObj( "Energytowerconsole", 2001039, 0, 4, { -85.044861f, 70.240898f, -393.307587f }, 0.800000f );
-      instance->registerEObj( "Energytowerconsole", 2001040, 0, 4, { -134.983994f, 70.240898f, -343.431213f }, 0.800000f );
-      instance->registerEObj( "Energytowerconsole", 2001041, 0, 4, { -134.925201f, 70.240898f, -393.378296f }, 0.800000f );
-      instance->registerEObj( "Allaganteleporter", 2002811, 3445283, 4, { -117.500000f, 39.417461f, -60.409302f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2002819, 4317548, 4, { -109.942200f, 44.168140f, -140.697403f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2002820, 4317564, 4, { -109.933800f, 44.168140f, -190.218903f }, 1.000000f );
-      instance->registerEObj( "Allaganteleporter", 2002812, 3974167, 4, { -117.461098f, 57.435680f, -288.075104f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2002806, 0, 4, { -109.976601f, 68.215019f, -378.115906f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2002821, 4407451, 4, { -110.134598f, 68.248489f, -367.669708f }, 1.000000f );
-      instance->registerEObj( "Allaganteleporter", 2002822, 4322323, 4, { -123.763496f, 650.608582f, 254.596695f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2001042, 4491496, 4, { -110.122498f, 650.015808f, 227.968597f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2001043, 0, 4, { -110.052299f, 650.020020f, 227.514893f }, 0.800000f );
-      instance->registerEObj( "Unknown37", 2001044, 4497411, 4, { -109.941299f, 650.720886f, 194.445694f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2002823, 4101871, 4, { -86.638451f, 650.731018f, 191.568298f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2002824, 4101872, 4, { -109.887199f, 650.970886f, 207.029099f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2002825, 4101873, 4, { -132.905304f, 650.731018f, 191.279907f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2002826, 0, 4, { -78.160004f, 649.940125f, 206.024597f }, 0.800000f );
-      instance->registerEObj( "Unknown42", 2002832, 0, 4, { -85.569000f, 649.940125f, 213.420593f }, 0.800000f );
-      instance->registerEObj( "Unknown43", 2002833, 0, 4, { -94.658401f, 649.940125f, 218.672806f }, 0.800000f );
-      instance->registerEObj( "Unknown44", 2002834, 0, 4, { -125.350403f, 649.940125f, 218.672806f }, 0.800000f );
-      instance->registerEObj( "Unknown45", 2002835, 0, 4, { -134.429901f, 649.940125f, 213.420593f }, 0.800000f );
-      instance->registerEObj( "Unknown46", 2002836, 0, 4, { -141.827698f, 649.940125f, 206.024597f }, 0.800000f );
-      instance->registerEObj( "Unknown47", 2002837, 4478584, 4, { -89.563782f, 650.019226f, 209.632706f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2002838, 4478586, 4, { -131.352798f, 650.019226f, 210.327194f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -110.009903f, 650.972229f, 157.832199f }, 0.793408f );
-      instance->registerEObj( "Unknown49", 2001029, 4499125, 4, { -109.987602f, 650.731018f, 181.576202f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
deleted file mode 100644
index 2734ef67..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/crystaltower/TheWorldofDarkness.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheWorldofDarkness : public InstanceContentScript
-{
-public:
-   TheWorldofDarkness() : InstanceContentScript( 30020 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002872, 5033058, 4, { -148.309006f, 25.000000f, 327.505005f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002735, 0, 4, { -147.190506f, 34.000000f, 326.593597f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 5033059, 4, { -116.020401f, 25.000000f, 291.514313f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004749, 5022919, 4, { -150.811707f, 33.999840f, 292.778412f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004750, 5022920, 4, { -143.519608f, 34.000000f, 294.027710f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004751, 5022915, 4, { -143.096893f, 34.000000f, 301.814209f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2004752, 5022916, 4, { -151.221893f, 34.000000f, 301.291809f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2004753, 5034307, 4, { -153.117905f, 34.000000f, 292.031494f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2004754, 5034303, 4, { -141.245300f, 34.000000f, 291.586212f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2004755, 5034301, 4, { -141.807693f, 34.000000f, 303.198395f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2004756, 5034306, 4, { -151.877304f, 34.000000f, 303.085297f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2004748, 5033636, 4, { -149.922104f, 34.000000f, 293.955414f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2004774, 5033642, 4, { -144.841095f, 34.000000f, 295.275208f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2004775, 5033641, 4, { -144.940308f, 34.000000f, 300.121399f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2004776, 5033639, 4, { -150.097397f, 34.000000f, 299.867798f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2005026, 5444436, 4, { -147.017593f, 34.000000f, 317.352814f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002872, 5033193, 4, { 200.082001f, 81.974503f, 211.096603f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2002735, 0, 4, { 200.000000f, 82.124329f, 208.778595f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2002872, 5035970, 4, { 167.647797f, 81.909058f, 178.824493f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2004777, 0, 4, { 192.319397f, 82.000000f, 182.835999f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2004778, 0, 4, { 197.039703f, 81.986687f, 184.863007f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2004779, 0, 4, { 204.338196f, 82.000000f, 183.053802f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2004780, 0, 4, { 189.642700f, 82.000000f, 176.451202f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2005018, 0, 4, { 199.442200f, 82.000000f, 183.869598f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002587, 0, 4, { 0.000000f, 129.250000f, -157.414307f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2002872, 5040833, 4, { -0.855141f, 129.250000f, -164.190598f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2002872, 5039743, 4, { 0.048592f, 128.906403f, -155.346100f }, 1.000000f );
-      instance->registerEObj( "Openfetter", 2004787, 0, 4, { 2.542549f, 129.250000f, -205.570496f }, 1.000000f );
-      instance->registerEObj( "Openfetter", 2004789, 0, 4, { 3.817404f, 129.250000f, -207.100800f }, 1.000000f );
-      instance->registerEObj( "Magickedfetter", 2004790, 5039668, 4, { -17.519341f, 129.250000f, -235.697693f }, 1.000000f );
-      instance->registerEObj( "Magickedfetter", 2004791, 5039667, 4, { 17.275551f, 129.198105f, -235.656799f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2004808, 5039717, 4, { -10.696810f, -497.601990f, -204.956100f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2004809, 5039714, 4, { 6.635397f, -498.601898f, -210.257507f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2004810, 5039710, 4, { 11.312720f, -498.093597f, -196.581207f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2004811, 5039721, 4, { -9.022294f, -499.107513f, -190.416397f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2004548, 0, 4, { 1.212110f, 129.300003f, -202.733398f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2002735, 0, 4, { -0.000000f, 143.250000f, -314.710114f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2002872, 5041153, 4, { -0.147327f, 143.250000f, -328.516998f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2004732, 5039981, 4, { -0.015320f, 143.236298f, -316.334808f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -299.977112f, 279.987701f, -420.645508f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2004814, 0, 4, { -300.240906f, 280.000000f, -402.510712f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2004815, 0, 4, { -300.687103f, 280.000000f, -398.160706f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2004620, 0, 4, { 0.203211f, 129.250000f, -202.244904f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2004816, 5041561, 4, { -304.280212f, 279.987701f, -415.243805f }, 0.991760f );
-      instance->registerEObj( "Unknown39", 2004817, 5041563, 4, { -286.856506f, 280.000000f, -392.695404f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2004818, 5041562, 4, { -313.290710f, 280.000000f, -392.472412f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2002872, 5032353, 4, { -54.450321f, 16.000000f, 406.409088f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2002735, 0, 4, { -56.151901f, 16.000000f, 403.855896f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2002872, 5032356, 4, { -102.950996f, 16.000000f, 383.202911f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2004735, 5437119, 4, { -76.985458f, 16.000000f, 382.746613f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2004736, 0, 4, { -74.916229f, 16.000000f, 380.485291f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2002735, 0, 4, { 99.718719f, 63.999989f, 265.143799f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2002872, 5035968, 4, { 95.926514f, 63.980949f, 265.796906f }, 0.991760f );
-      instance->registerEObj( "Unknown48", 2002872, 5035969, 4, { 167.944199f, 65.533363f, 264.945587f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2004745, 0, 4, { 130.000000f, 63.999989f, 264.710388f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2004738, 5437120, 4, { 130.000000f, 65.431679f, 264.710388f }, 0.991760f );
-      instance->registerEObj( "Unknown50", 2004739, 5037994, 4, { 138.468002f, 63.999989f, 275.781311f }, 1.000000f );
-      instance->registerEObj( "Unknown51", 2004740, 5037996, 4, { 129.901001f, 63.999729f, 278.588593f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2004741, 5037997, 4, { 121.644699f, 63.999729f, 275.762695f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2004742, 5037998, 4, { 138.356506f, 63.999989f, 250.555603f }, 1.000000f );
-      instance->registerEObj( "Unknown54", 2004743, 5037999, 4, { 129.881393f, 64.000031f, 250.721893f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2004744, 5038000, 4, { 121.628601f, 63.999989f, 250.572296f }, 1.000000f );
-      instance->registerEObj( "Unknown56", 2004746, 5037995, 4, { 130.020493f, 63.999748f, 279.027191f }, 1.000000f );
-      instance->registerEObj( "Unknown57", 2004747, 5038001, 4, { 130.056702f, 63.999989f, 249.980301f }, 1.000000f );
-      instance->registerEObj( "Unknown58", 2002735, 0, 4, { 0.000000f, 94.750053f, 84.669502f }, 0.991760f );
-      instance->registerEObj( "Unknown59", 2004788, 5499560, 4, { 0.320374f, 95.231567f, 31.296261f }, 0.991760f );
-      instance->registerEObj( "Unknown60", 2004792, 5038584, 4, { -28.578890f, 95.250008f, 39.174721f }, 1.000000f );
-      instance->registerEObj( "Unknown61", 2004793, 5038586, 4, { -21.418350f, 95.250008f, 51.649750f }, 1.000000f );
-      instance->registerEObj( "Unknown62", 2004794, 5038587, 4, { -33.994980f, 95.250008f, 58.976070f }, 0.991760f );
-      instance->registerEObj( "Unknown63", 2004795, 5038580, 4, { -41.014271f, 95.250008f, 46.442242f }, 1.000000f );
-      instance->registerEObj( "Unknown64", 2004796, 5038588, 4, { 7.240406f, 95.250008f, -12.319770f }, 1.000000f );
-      instance->registerEObj( "Unknown65", 2004797, 5038590, 4, { 7.179711f, 95.250008f, 2.152661f }, 1.000000f );
-      instance->registerEObj( "Unknown66", 2004798, 5038589, 4, { -7.245643f, 95.250008f, 2.096094f }, 1.000000f );
-      instance->registerEObj( "Unknown67", 2004799, 5038570, 4, { -7.080731f, 95.250008f, -12.155750f }, 1.000000f );
-      instance->registerEObj( "Unknown68", 2004800, 5038591, 4, { 41.068710f, 95.250008f, 46.325569f }, 1.000000f );
-      instance->registerEObj( "Unknown69", 2004801, 5038592, 4, { 33.762070f, 95.250008f, 58.721840f }, 1.000000f );
-      instance->registerEObj( "Unknown70", 2004802, 5038593, 4, { 21.204290f, 95.250008f, 51.578461f }, 1.000000f );
-      instance->registerEObj( "Unknown71", 2004803, 5038571, 4, { 28.640770f, 95.250008f, 39.349319f }, 1.000000f );
-      instance->registerEObj( "Unknown72", 2002872, 5038256, 4, { -0.165812f, 94.731613f, 85.317574f }, 0.991760f );
-      instance->registerEObj( "Unknown73", 2004784, 5489265, 4, { 0.294310f, 90.349991f, 22.469700f }, 0.991760f );
-      instance->registerEObj( "Unknown74", 2005042, 5476812, 4, { -0.380919f, 99.969032f, 29.779119f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5032012, 5, { 0.112444f, 1.000004f, 460.032898f }, 1.000000f );
-      instance->registerEObj( "Wormholegenerator", 2004722, 4985258, 4, { -9.284863f, 0.332117f, 436.627411f }, 0.991760f );
-      instance->registerEObj( "Wormholegenerator", 2004723, 4985259, 4, { -157.081207f, 25.477930f, 382.938385f }, 0.991760f );
-      instance->registerEObj( "Wormholegenerator", 2004724, 4985260, 4, { 65.994957f, 65.452766f, 265.003998f }, 0.991760f );
-      instance->registerEObj( "Wormholegenerator", 2004725, 4985261, 4, { 210.040405f, 73.397346f, 264.987091f }, 0.991760f );
-      instance->registerEObj( "Wormholegenerator", 2004726, 4985262, 4, { 9.958203f, 96.762039f, 104.047096f }, 0.991760f );
-      instance->registerEObj( "Wormholegenerator", 2004727, 4985263, 4, { -9.978291f, 128.313095f, -121.979301f }, 0.991760f );
-      instance->registerEObj( "Wormholegenerator", 2004728, 4985264, 4, { 9.998364f, 128.645798f, -274.001892f }, 0.991760f );
-      instance->registerEObj( "Unknown76", 2004729, 5034813, 4, { -91.447388f, 32.791962f, 296.223389f }, 0.991760f );
-      instance->registerEObj( "Unknown77", 2004730, 5034821, 4, { 143.374405f, 80.799957f, 179.826706f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
deleted file mode 100644
index 472ee9e0..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DeltascapeV10 : public InstanceContentScript
-{
-public:
-   DeltascapeV10() : InstanceContentScript( 30049 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6791878, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6885561, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6852121, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6910535, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
deleted file mode 100644
index 8c70c978..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV10Savage.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DeltascapeV10Savage : public InstanceContentScript
-{
-public:
-   DeltascapeV10Savage() : InstanceContentScript( 30053 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6791878, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6885561, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6852121, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6910535, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
deleted file mode 100644
index bce2cf2c..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DeltascapeV20 : public InstanceContentScript
-{
-public:
-   DeltascapeV20() : InstanceContentScript( 30050 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2008482, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6872632, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6910926, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
deleted file mode 100644
index baf44658..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV20Savage.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DeltascapeV20Savage : public InstanceContentScript
-{
-public:
-   DeltascapeV20Savage() : InstanceContentScript( 30054 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2008482, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6872632, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6910926, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
deleted file mode 100644
index 202f4425..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DeltascapeV30 : public InstanceContentScript
-{
-public:
-   DeltascapeV30() : InstanceContentScript( 30051 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Matterrelocationdevice", 2008501, 6913059, 4, { 230.975693f, 231.836197f, -19.028080f }, 0.991760f );
-      instance->registerEObj( "Unknown0", 2007457, 6792212, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6847573, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6848219, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6953156, 4, { 250.000000f, 250.995605f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6929138, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6847577, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6853325, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6853774, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6846630, 4, { -15.000000f, 0.000001f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6846632, 4, { -5.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6846634, 4, { 5.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6846637, 4, { 15.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6846642, 4, { -15.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6846643, 4, { -5.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6846644, 4, { 5.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6846645, 4, { 15.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6912959, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
deleted file mode 100644
index 41f1ca73..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV30Savage.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DeltascapeV30Savage : public InstanceContentScript
-{
-public:
-   DeltascapeV30Savage() : InstanceContentScript( 30055 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Matterrelocationdevice", 2008501, 6913059, 4, { 230.975693f, 231.836197f, -19.028080f }, 0.991760f );
-      instance->registerEObj( "Unknown0", 2007457, 6792212, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6847573, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6848219, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6953156, 4, { 250.000000f, 250.995605f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6929138, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6847577, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6853325, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6853774, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6846630, 4, { -15.000000f, 0.000001f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6846632, 4, { -5.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6846634, 4, { 5.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6846637, 4, { 15.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6846642, 4, { -15.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6846643, 4, { -5.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6846644, 4, { 5.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6846645, 4, { 15.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6912959, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
deleted file mode 100644
index ca9192ab..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DeltascapeV40 : public InstanceContentScript
-{
-public:
-   DeltascapeV40() : InstanceContentScript( 30052 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6925502, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6925503, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6925504, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6936015, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6865650, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6872744, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2008483, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -17.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6914211, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
deleted file mode 100644
index e4ff6b4b..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/DeltascapeV40Savage.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DeltascapeV40Savage : public InstanceContentScript
-{
-public:
-   DeltascapeV40Savage() : InstanceContentScript( 30056 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 6925502, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6925503, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6925504, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6936015, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6865650, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6872744, 4, { 0.000000f, 0.000000f, 0.038952f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2008483, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -17.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6914211, 5, { 0.000000f, 0.000000f, 15.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
deleted file mode 100644
index 42236ce6..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SigmascapeV10 : public InstanceContentScript
-{
-public:
-   SigmascapeV10() : InstanceContentScript( 30059 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7230603, 4, { -6.335131f, 0.049939f, -10.559780f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 7230604, 4, { -5.699108f, 0.049922f, -2.387848f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7230605, 4, { -6.369749f, 0.050002f, 7.711805f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7230606, 4, { -6.234384f, 0.050004f, 17.721371f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2009408, 7231049, 4, { -3.117226f, 0.050002f, 9.861297f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2009409, 7231069, 4, { -25.851500f, 16.520651f, 22.008921f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 7274404, 4, { -22.963020f, -2.647718f, 8.151876f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 7297633, 4, { -30.500000f, 0.552600f, 43.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2009384, 0, 4, { 220.569107f, -108.812103f, 5.081238f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009400, 7231089, 4, { 144.482300f, -110.000000f, -71.090813f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009401, 7231090, 4, { 144.468994f, -110.000000f, -23.514120f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009402, 7231091, 4, { 144.456100f, -110.000000f, 23.836590f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009403, 7231092, 4, { 144.470901f, -110.000000f, 71.062202f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009404, 7231093, 4, { 215.991302f, -110.000000f, -71.152832f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009405, 7231096, 4, { 215.991302f, -110.000000f, -23.514160f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009406, 7231097, 4, { 215.991302f, -110.000000f, 23.880310f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009407, 7231098, 4, { 215.991302f, -110.000000f, 71.061279f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007457, 7297634, 4, { 178.511902f, -110.002403f, -0.198364f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2007457, 7181869, 4, { -3.537696f, 0.000001f, 18.750830f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -0.015320f, -9.170715f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
deleted file mode 100644
index b9e63631..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV10Savage.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SigmascapeV10Savage : public InstanceContentScript
-{
-public:
-   SigmascapeV10Savage() : InstanceContentScript( 30063 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7230603, 4, { -6.335131f, 0.049939f, -10.559780f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 7230604, 4, { -5.699108f, 0.049922f, -2.387848f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7230605, 4, { -6.369749f, 0.050002f, 7.711805f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7230606, 4, { -6.234384f, 0.050004f, 17.721371f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2009408, 7231049, 4, { -3.117226f, 0.050002f, 9.861297f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2009409, 7231069, 4, { -25.851500f, 16.520651f, 22.008921f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 7274404, 4, { -22.963020f, -2.647718f, 8.151876f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 7297633, 4, { -30.500000f, 0.552600f, 43.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2009384, 0, 4, { 220.569107f, -108.812103f, 5.081238f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009400, 7231089, 4, { 144.482300f, -110.000000f, -71.090813f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009401, 7231090, 4, { 144.468994f, -110.000000f, -23.514120f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009402, 7231091, 4, { 144.456100f, -110.000000f, 23.836590f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009403, 7231092, 4, { 144.470901f, -110.000000f, 71.062202f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009404, 7231093, 4, { 215.991302f, -110.000000f, -71.152832f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009405, 7231096, 4, { 215.991302f, -110.000000f, -23.514160f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009406, 7231097, 4, { 215.991302f, -110.000000f, 23.880310f }, 0.991760f );
-      instance->registerEObj( "Aetherialstream", 2009407, 7231098, 4, { 215.991302f, -110.000000f, 71.061279f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007457, 7297634, 4, { 178.511902f, -110.002403f, -0.198364f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2007457, 7181869, 4, { -3.537696f, 0.000001f, 18.750830f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -0.015320f, -9.170715f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
deleted file mode 100644
index 38a8bc1f..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SigmascapeV20 : public InstanceContentScript
-{
-public:
-   SigmascapeV20() : InstanceContentScript( 30060 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7244294, 4, { -6.511937f, 0.003125f, -4.958800f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 7181375, 4, { 12.476670f, -0.015002f, 6.948618f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2007457, 7181377, 4, { 12.570220f, -0.015320f, -9.693607f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2007457, 7329867, 4, { -4.318359f, -0.015320f, 5.722107f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007457, 7187344, 4, { -1.960858f, 0.001128f, 0.319698f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7174526, 4, { -6.872698f, 0.004465f, 1.843464f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 7174523, 4, { 11.220570f, 0.054783f, -1.564175f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 7174518, 4, { 8.520967f, 0.009985f, -8.679861f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 7174519, 4, { 9.028366f, 0.055644f, 3.513119f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 7180548, 4, { 2.311234f, 0.003611f, 3.656348f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 7244420, 4, { 2.385169f, 0.003358f, 3.242888f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7181938, 4, { 15.676980f, 0.010429f, -11.942520f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 7181940, 4, { 16.526520f, 0.010429f, 11.441620f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 7181939, 4, { -16.083740f, 0.010429f, 11.147680f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 7181937, 4, { -16.250851f, -0.015320f, -11.795230f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 7179724, 5, { -1.443299f, 0.007087f, 6.836350f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -11.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 7171885, 4, { 4.955309f, 0.000000f, -52.142441f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
deleted file mode 100644
index ede1dc51..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV20Savage.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SigmascapeV20Savage : public InstanceContentScript
-{
-public:
-   SigmascapeV20Savage() : InstanceContentScript( 30064 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7244294, 4, { -6.511937f, 0.003125f, -4.958800f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 7181375, 4, { 12.476670f, -0.015002f, 6.948618f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2007457, 7181377, 4, { 12.570220f, -0.015320f, -9.693607f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2007457, 7329867, 4, { -4.318359f, -0.015320f, 5.722107f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007457, 7187344, 4, { -1.960858f, 0.001128f, 0.319698f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7174526, 4, { -6.872698f, 0.004465f, 1.843464f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 7174523, 4, { 11.220570f, 0.054783f, -1.564175f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 7174518, 4, { 8.520967f, 0.009985f, -8.679861f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 7174519, 4, { 9.028366f, 0.055644f, 3.513119f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 7180548, 4, { 2.311234f, 0.003611f, 3.656348f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 7244420, 4, { 2.385169f, 0.003358f, 3.242888f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7181938, 4, { 15.676980f, 0.010429f, -11.942520f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 7181940, 4, { 16.526520f, 0.010429f, 11.441620f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 7181939, 4, { -16.083740f, 0.010429f, 11.147680f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 7181937, 4, { -16.250851f, -0.015320f, -11.795230f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 7179724, 5, { -1.443299f, 0.007087f, 6.836350f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -11.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 7171885, 4, { 4.955309f, 0.000000f, -52.142441f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
deleted file mode 100644
index 47d44696..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SigmascapeV30 : public InstanceContentScript
-{
-public:
-   SigmascapeV30() : InstanceContentScript( 30061 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Entrance", 2000182, 7174192, 5, { -0.028109f, 0.000000f, 12.665810f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2009292, 7185733, 4, { -7.736383f, 3.268075f, -35.776291f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2009293, 7185734, 4, { 10.155860f, 3.268075f, -35.738319f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2009294, 0, 4, { 18.075230f, 0.000000f, -16.894060f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2009295, 0, 4, { 15.384740f, 0.000000f, -8.198026f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2009296, 0, 4, { 17.399639f, 0.000000f, -8.148316f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2009297, 0, 4, { 10.133680f, 0.000000f, -9.799342f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2009298, 0, 4, { 12.524550f, 0.000000f, -0.314495f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2009299, 0, 4, { 4.409851f, -0.015320f, -0.839294f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2009300, 0, 4, { 10.240340f, 0.000000f, 2.827696f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2009301, 0, 4, { 12.606230f, 0.000000f, 7.149309f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2009302, 7178404, 4, { 0.616980f, 0.000000f, 0.677854f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
deleted file mode 100644
index 8486fe24..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV30Savage.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SigmascapeV30Savage : public InstanceContentScript
-{
-public:
-   SigmascapeV30Savage() : InstanceContentScript( 30065 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Entrance", 2000182, 7174192, 5, { -0.028109f, 0.000000f, 12.665810f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2009292, 7185733, 4, { -7.736383f, 3.268075f, -35.776291f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2009293, 7185734, 4, { 10.155860f, 3.268075f, -35.738319f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2009294, 0, 4, { 18.075230f, 0.000000f, -16.894060f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2009295, 0, 4, { 15.384740f, 0.000000f, -8.198026f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2009296, 0, 4, { 17.399639f, 0.000000f, -8.148316f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2009297, 0, 4, { 10.133680f, 0.000000f, -9.799342f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2009298, 0, 4, { 12.524550f, 0.000000f, -0.314495f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2009299, 0, 4, { 4.409851f, -0.015320f, -0.839294f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2009300, 0, 4, { 10.240340f, 0.000000f, 2.827696f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2009301, 0, 4, { 12.606230f, 0.000000f, 7.149309f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2009302, 7178404, 4, { 0.616980f, 0.000000f, 0.677854f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
deleted file mode 100644
index 3e7b6bd0..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SigmascapeV40 : public InstanceContentScript
-{
-public:
-   SigmascapeV40() : InstanceContentScript( 30062 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7307403, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2008982, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2008978, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2008979, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2008980, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2008981, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2008976, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2008977, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 7296769, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000051, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000052, 0, 4, { 0.000000f, 0.000000f, -5.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2008626, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2008627, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2008629, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2008630, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006821, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 7181990, 5, { 0.000000f, 0.000000f, 14.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
deleted file mode 100644
index b3f01ff9..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/omega/SigmascapeV40Savage.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class SigmascapeV40Savage : public InstanceContentScript
-{
-public:
-   SigmascapeV40Savage() : InstanceContentScript( 30066 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7307403, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2008982, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2008978, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2008979, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2008980, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2008981, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2008976, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2008977, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 7296769, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000051, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000052, 0, 4, { 0.000000f, 0.000000f, -5.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2008626, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2008627, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2008629, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2008630, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006821, 0, 4, { -0.015320f, -0.015320f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 7181990, 5, { 0.000000f, 0.000000f, 14.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
deleted file mode 100644
index 571ce0a0..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/returntoivalice/TheRoyalCityofRabanastre.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheRoyalCityofRabanastre : public InstanceContentScript
-{
-public:
-   TheRoyalCityofRabanastre() : InstanceContentScript( 30058 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -319.173004f, 9.994568f, 320.515686f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007457, 7069100, 4, { -319.896515f, 10.000000f, 325.206085f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7075766, 4, { -320.000000f, 1.230700f, 221.199997f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7075769, 4, { -320.351501f, 1.230694f, 262.307892f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7075770, 4, { -346.200012f, 1.229800f, 238.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2009060, 0, 4, { -311.306702f, 1.230747f, 242.805496f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2009061, 0, 4, { -316.517914f, 1.205444f, 246.509399f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2007457, 7069107, 4, { -319.661407f, 10.000000f, -11.625690f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2009055, 0, 4, { -336.110504f, 9.964111f, -51.682369f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2009057, 0, 4, { -306.355408f, 9.964111f, -48.539001f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 7075611, 4, { -320.081390f, 10.000000f, -69.048653f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7075799, 4, { -320.000702f, 10.000000f, -56.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 7075800, 4, { -310.799988f, 10.000000f, -41.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 7075801, 4, { -329.200012f, 10.000000f, -41.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 7076220, 4, { -315.688690f, 10.000000f, -47.888401f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 7075820, 4, { -316.520996f, 10.000000f, -31.534470f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 7077538, 4, { -338.909393f, 10.000000f, -32.073681f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007791, 0, 4, { -319.963013f, 10.052400f, -16.952101f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2009242, 0, 4, { -332.255402f, 10.108630f, -33.994350f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007457, 7080565, 4, { 106.000000f, -694.000000f, -128.399994f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007791, 0, 4, { 106.000000f, -694.000000f, -128.399994f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007457, 7082088, 4, { 108.221199f, -694.000000f, -208.120697f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007457, 7082089, 4, { 121.728897f, -694.000000f, -183.748199f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007457, 7082090, 4, { 94.008781f, -694.000000f, -182.456207f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009076, 0, 4, { 83.147507f, -694.000000f, -193.267899f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009203, 0, 4, { 83.057159f, -694.000000f, -182.946304f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009204, 0, 4, { 89.546783f, -694.000000f, -172.278000f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009205, 0, 4, { 96.837830f, -694.000000f, -165.190094f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009206, 0, 4, { 105.990601f, -694.000000f, -164.696304f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009207, 0, 4, { 117.216599f, -694.000000f, -169.060196f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009208, 0, 4, { 125.204498f, -694.000000f, -175.811493f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009209, 0, 4, { 130.969604f, -694.000000f, -185.265594f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009210, 0, 4, { 130.999893f, -694.000000f, -195.328003f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009211, 0, 4, { 124.798302f, -694.000000f, -204.280807f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009212, 0, 4, { 114.994301f, -694.000000f, -210.576996f }, 1.000000f );
-      instance->registerEObj( "Darkcircle", 2009213, 0, 4, { 103.221703f, -694.000000f, -213.151794f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007457, 7079402, 4, { 104.478500f, -679.000000f, -322.819489f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2007791, 0, 4, { 106.449997f, -679.000000f, -328.250000f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2009068, 0, 4, { 97.794479f, -679.000000f, -387.672394f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2009069, 0, 4, { 101.213097f, -679.000000f, -388.533600f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2009070, 0, 4, { 104.362602f, -679.000000f, -388.768097f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007457, 7081152, 4, { 101.446701f, -679.000000f, -398.626587f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2007457, 7081153, 4, { 114.988701f, -679.000000f, -399.119598f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2007457, 7081154, 4, { 105.230202f, -679.000000f, -389.831512f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2007457, 7151392, 4, { 105.983803f, -679.025024f, -386.058899f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2009221, 7094307, 4, { -323.781189f, 9.994568f, 322.467499f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2009222, 7094363, 4, { -325.789886f, 1.230697f, 217.839005f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2007457, 7041438, 4, { -274.571594f, 2.310245f, 37.022179f }, 1.000000f );
-      instance->registerEObj( "Waterwaygatelever", 2009184, 7080218, 4, { 338.918091f, -262.287415f, 267.698608f }, 0.991760f );
-      instance->registerEObj( "Waterwaygatelever", 2009186, 7080217, 4, { 337.924988f, -322.267212f, 299.494385f }, 1.000000f );
-      instance->registerEObj( "Waterwaygatelever", 2009188, 7080216, 4, { 338.580200f, -292.267212f, 331.283905f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2007457, 7080221, 4, { 323.797211f, -262.267395f, 275.364105f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2007457, 7080220, 4, { 324.137909f, -322.267303f, 308.012604f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2007457, 7080219, 4, { 325.866394f, -292.267212f, 339.968201f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2007457, 7080213, 4, { 205.647507f, -374.000092f, 339.617889f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2007457, 7080215, 4, { 164.959000f, -374.000092f, 324.108002f }, 1.000000f );
-      instance->registerEObj( "Passagecontrols", 2009200, 0, 4, { 189.533096f, -373.602295f, 305.302490f }, 1.000000f );
-      instance->registerEObj( "Passagecontrols", 2009201, 0, 4, { 162.416901f, -373.621887f, 283.383911f }, 1.000000f );
-      instance->registerEObj( "Passagecontrols", 2009202, 0, 4, { 167.371002f, -373.190186f, 332.672913f }, 1.000000f );
-      instance->registerEObj( "Scratchedlettering", 2009271, 0, 4, { 272.859009f, -490.182709f, 293.584595f }, 0.991760f );
-      instance->registerEObj( "Scratchedlettering", 2009272, 0, 4, { 212.923599f, -491.264191f, 290.957306f }, 0.991760f );
-      instance->registerEObj( "Scratchedlettering", 2009273, 0, 4, { 211.674301f, -491.485199f, 242.033600f }, 0.991760f );
-      instance->registerEObj( "Skypiratesscrawlings", 2009435, 0, 4, { 222.766403f, -333.455414f, 360.799591f }, 0.991760f );
-      instance->registerEObj( "Unknown41", 2009223, 7102857, 4, { 101.048698f, -694.000000f, -122.909698f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2009224, 7102858, 4, { 99.562241f, -694.000000f, -216.590393f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2009225, 7102860, 4, { 99.290398f, -679.011230f, -323.639587f }, 0.991760f );
-      instance->registerEObj( "Unknown44", 2009190, 0, 4, { -298.663086f, -4.197479f, 44.907139f }, 0.991760f );
-      instance->registerEObj( "Unknown45", 2009191, 0, 4, { -301.684296f, -4.350000f, 41.550209f }, 0.991760f );
-      instance->registerEObj( "Unknown46", 2009192, 0, 4, { -304.369995f, -4.219625f, 44.113739f }, 0.991760f );
-      instance->registerEObj( "Unknown47", 2009193, 0, 4, { -316.182190f, -4.226807f, 42.099609f }, 0.991760f );
-      instance->registerEObj( "Unknown48", 2009194, 0, 4, { -319.364990f, -4.219666f, 44.197979f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2009195, 0, 4, { -322.700989f, -4.219666f, 42.268631f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2009196, 0, 4, { -331.298615f, -4.379395f, 42.587891f }, 0.991760f );
-      instance->registerEObj( "Unknown51", 2009197, 0, 4, { -334.136810f, -4.379395f, 39.322510f }, 0.991760f );
-      instance->registerEObj( "Unknown52", 2009198, 0, 4, { -337.097107f, -4.379391f, 41.112068f }, 0.991760f );
-      instance->registerEObj( "Unknown53", 2009199, 0, 4, { -320.000000f, 19.928169f, -182.845596f }, 1.000000f );
-      instance->registerEObj( "Unknown54", 2002735, 0, 4, { -320.106812f, 19.946039f, -144.699493f }, 1.750000f );
-      instance->registerEObj( "Unknown55", 2007457, 7099082, 4, { -320.132294f, 19.899990f, -145.586395f }, 1.000000f );
-      instance->registerEObj( "Unknown56", 2007457, 7099092, 4, { -319.884003f, 19.900000f, -202.859207f }, 1.000000f );
-      instance->registerEObj( "Teleportationcrystal", 2009176, 7102798, 4, { -326.309998f, 5.729747f, 406.047699f }, 0.991760f );
-      instance->registerEObj( "Teleportationcrystal", 2009177, 7102799, 4, { -326.251099f, 9.753006f, 115.489799f }, 1.000000f );
-      instance->registerEObj( "Teleportationcrystal", 2009178, 7102800, 4, { -326.389801f, 10.000000f, -10.478860f }, 1.000000f );
-      instance->registerEObj( "Teleportationcrystal", 2009179, 7102801, 4, { -312.818115f, 19.899851f, -141.350296f }, 1.000000f );
-      instance->registerEObj( "Teleportationcrystal", 2009180, 7102802, 4, { 439.169189f, -229.561905f, 292.789886f }, 1.000000f );
-      instance->registerEObj( "Teleportationcrystal", 2009181, 7102803, 4, { 133.837006f, -374.000092f, 311.904785f }, 1.000000f );
-      instance->registerEObj( "Teleportationcrystal", 2009182, 7102804, 4, { 114.414299f, -694.000000f, -113.204399f }, 1.000000f );
-      instance->registerEObj( "Teleportationcrystal", 2009183, 7102805, 4, { 97.279610f, -679.000000f, -305.258087f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 7069095, 5, { -328.378906f, 0.730057f, 439.144012f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 106.318901f, -679.000000f, -398.354614f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
deleted file mode 100644
index dcd0bfaa..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/DunScaith.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class DunScaith : public InstanceContentScript
-{
-public:
-   DunScaith() : InstanceContentScript( 30047 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002872, 6610729, 4, { 331.572388f, 2.765574f, 418.256012f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007602, 6610730, 4, { 266.946014f, 2.765530f, 420.309692f }, 0.991760f );
-      instance->registerEObj( "Unknown2", 2007609, 6612545, 4, { 276.236511f, 2.869957f, 402.357910f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007610, 6612547, 4, { 291.404297f, 2.869957f, 402.158112f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007611, 6612549, 4, { 306.464600f, 2.869963f, 402.176208f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007612, 6612551, 4, { 321.436493f, 2.869970f, 402.213196f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007613, 6612544, 4, { 276.728699f, 2.869961f, 417.200195f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007614, 6612546, 4, { 291.491791f, 2.869957f, 417.279388f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007615, 6612548, 4, { 306.298187f, 2.869963f, 417.075897f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007616, 6612550, 4, { 321.398895f, 2.869969f, 417.089905f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007603, 6612604, 4, { 279.000000f, 2.869900f, 398.600006f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007604, 6612605, 4, { 305.000000f, 2.870000f, 398.600006f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007605, 6612606, 4, { 319.000000f, 2.870000f, 398.600006f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007606, 6612608, 4, { 287.000000f, 2.869900f, 420.600006f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007607, 6612609, 4, { 305.000000f, 2.870000f, 420.600006f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007608, 6612611, 4, { 315.000000f, 2.870000f, 420.600006f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007619, 6613747, 4, { 299.266815f, 2.869962f, 409.699585f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007617, 6584508, 4, { 255.549805f, 2.765237f, 401.452301f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007783, 0, 4, { 316.110107f, 2.869910f, 411.214813f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007791, 0, 4, { 329.623108f, 2.825000f, 409.616913f }, 1.250000f );
-      instance->registerEObj( "Unknown20", 2002872, 6613229, 4, { -348.000000f, -7.000000f, 256.488800f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2002587, 0, 4, { -350.000000f, -7.000000f, 255.088806f }, 1.400000f );
-      instance->registerEObj( "Unknown22", 2007620, 0, 4, { -366.689606f, -7.003906f, 224.200806f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2007621, 0, 4, { -361.958405f, -7.000000f, 224.734894f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2002872, 6620377, 4, { -0.071279f, -600.000000f, -18.220051f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007630, 0, 4, { -4.827496f, -600.000000f, -58.405430f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007631, 0, 4, { 7.122071f, -600.000000f, -58.051449f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007636, 6563525, 4, { -16.708380f, -600.000000f, -41.601891f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007637, 6588851, 4, { -18.625420f, -600.000000f, -43.212120f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007791, 0, 4, { 0.000000f, -600.000000f, -20.142851f }, 0.750000f );
-      instance->registerEObj( "Unknown30", 2002872, 6620064, 4, { -317.914093f, 1.360948f, -445.124115f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2002587, 0, 4, { -320.546295f, 0.991760f, -444.693695f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2007630, 0, 4, { -351.186401f, 0.991760f, -466.178406f }, 0.991760f );
-      instance->registerEObj( "Unknown33", 2007631, 0, 4, { -366.506500f, 0.991760f, -461.936401f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2007632, 0, 4, { -359.822998f, 0.991760f, -429.373688f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2007633, 0, 4, { -347.127502f, 0.991760f, -428.549713f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2007638, 6586142, 4, { 343.046997f, -300.000000f, -447.157593f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2007653, 6637716, 4, { -335.860596f, 1.000000f, -437.835388f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2007654, 6629695, 4, { -335.609100f, 1.000000f, -440.386108f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2007655, 6629831, 4, { -332.752014f, 1.000000f, -437.575012f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2007656, 6637880, 4, { -332.460205f, 1.000000f, -440.058685f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2007697, 0, 4, { -346.146393f, 1.000000f, -424.946991f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2007787, 6752662, 4, { -368.030212f, 0.974755f, -434.419312f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007660, 6610748, 4, { 231.338699f, -6.515625f, 346.216797f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2007661, 6610750, 4, { -356.222900f, -7.000000f, 287.132996f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007699, 0, 4, { 397.550415f, 2.656644f, 398.343109f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2007667, 6606266, 4, { 188.339996f, -6.500000f, 359.549011f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2007668, 6606267, 4, { 19.479019f, -6.500000f, 316.675598f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2007669, 6606268, 4, { -110.310303f, 1.500000f, 315.310303f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2007670, 6606273, 4, { -357.075592f, -7.000000f, 201.676895f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007662, 6610755, 4, { -357.847107f, 12.985350f, 16.963461f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2007663, 6610756, 4, { -342.946594f, 13.000000f, -123.268700f }, 0.991760f );
-      instance->registerEObj( "Unknown47", 2007671, 6601719, 4, { -356.908508f, 13.000000f, 12.522250f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2007672, 6601720, 4, { -356.563599f, 1.000000f, -74.405586f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2007698, 0, 4, { -94.983139f, 1.500000f, 320.626312f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2007703, 0, 4, { -94.909897f, 1.500000f, 313.278015f }, 1.000000f );
-      instance->registerEObj( "Unknown51", 2007702, 0, 4, { -364.034485f, 0.991760f, -43.015259f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6610725, 5, { 386.739899f, 2.618790f, 416.983307f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -371.922791f, 1.000000f, -444.704590f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2002872, 6638848, 4, { -344.433014f, 13.000000f, 7.243163f }, 1.000000f );
-      instance->registerEObj( "Unknown54", 2002587, 0, 4, { -350.500793f, 13.000000f, 5.113899f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
deleted file mode 100644
index fd13241e..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheVoidArk.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheVoidArk : public InstanceContentScript
-{
-public:
-   TheVoidArk() : InstanceContentScript( 30029 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -288.000000f, 196.497299f, 30.140800f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 5965588, 4, { -288.643890f, 196.450897f, 30.140779f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 5965606, 4, { -315.195099f, 196.497299f, 1.375446f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006489, 5961744, 4, { -289.112610f, 196.497299f, -1.589648f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002735, 0, 4, { 0.220062f, -191.999893f, 170.174606f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002872, 5965590, 4, { 0.354952f, -191.297607f, 150.971207f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 6047090, 4, { -0.028858f, -192.000000f, 97.337067f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2006559, 5996197, 4, { -0.306469f, -192.000000f, 68.934158f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006595, 6067109, 4, { 0.064018f, -192.000107f, 129.936996f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002735, 0, 4, { 288.000000f, -400.000000f, 205.443207f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 5965591, 4, { 287.996399f, -400.000000f, 205.904694f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006503, 6046596, 4, { 288.000000f, -415.885803f, 122.751602f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006504, 6046597, 4, { 304.000000f, -415.885803f, 138.751602f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006505, 6046598, 4, { 288.000000f, -415.885803f, 154.751602f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006506, 6046599, 4, { 272.000000f, -415.885803f, 138.751602f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006507, 5960467, 4, { 287.856598f, -415.885803f, 143.716400f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006508, 5960881, 4, { 285.596008f, -415.885803f, 140.864807f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006509, 6046600, 4, { 302.141998f, -415.885803f, 124.609596f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006510, 6046601, 4, { 302.141998f, -415.885803f, 152.893600f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2006511, 6046603, 4, { 273.858002f, -415.885803f, 152.893600f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2006512, 6046605, 4, { 273.858002f, -415.885803f, 124.609596f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2006557, 0, 4, { 287.799805f, -404.548615f, 195.221893f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2002735, 0, 4, { 288.000000f, -384.162506f, -95.628960f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2002872, 5965592, 4, { 288.000000f, -384.162506f, -95.628960f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 288.126709f, -384.000000f, -148.276505f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2006553, 5963619, 4, { 315.121185f, -383.995300f, -124.638199f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2006554, 5963620, 4, { 306.932800f, -383.996399f, -105.577400f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2006555, 5963624, 4, { 269.917114f, -383.996613f, -104.726303f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2006556, 5963623, 4, { 260.673615f, -383.995697f, -124.058601f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2006558, 5962617, 4, { 290.482605f, -383.959595f, -120.825897f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2002618, 6081545, 4, { -299.194611f, 190.131699f, 168.493698f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2006480, 6038921, 4, { 0.900612f, -170.857101f, -94.333923f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2006481, 6038938, 4, { -0.336078f, -173.837097f, -233.919296f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2006482, 6038951, 4, { 288.027313f, -389.776489f, 270.818390f }, 0.991760f );
-      instance->registerEObj( "Unknown33", 2006483, 6038992, 4, { 287.894806f, -401.574585f, 187.283997f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2006484, 6038994, 4, { 284.993500f, -415.823212f, 86.327766f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2006485, 6039015, 4, { 287.921509f, -390.522614f, 3.389776f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2002872, 5965364, 4, { -300.557312f, 212.000000f, 117.936600f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2002872, 5965516, 4, { -278.075989f, 212.000000f, 79.110680f }, 1.000000f );
-      instance->registerEObj( "Unknown38", 2006486, 6035569, 4, { -315.424896f, 212.000000f, 174.253601f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2006487, 6034672, 4, { -258.244904f, 212.000000f, 126.032799f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2006488, 6048680, 4, { -328.040894f, 212.000000f, 55.589699f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2002735, 0, 4, { -419.231812f, 186.000000f, -74.560600f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2002872, 5965586, 4, { -419.093201f, 186.000000f, -73.534798f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2006513, 6035498, 4, { -419.235107f, 186.000000f, -161.599701f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2006514, 0, 4, { -431.485107f, 186.000000f, -119.195801f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2006515, 6035399, 4, { -436.306396f, 186.750000f, -119.027199f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2006516, 6035398, 4, { -435.929291f, 186.750000f, -118.520103f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2006517, 6035400, 4, { -436.270203f, 186.750000f, -119.108101f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2006518, 6035453, 4, { -456.071899f, 186.169495f, -117.249802f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2006519, 6046161, 4, { -422.286713f, 186.000000f, -116.948799f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2002735, 0, 4, { 0.000000f, -191.204102f, -65.541000f }, 1.000000f );
-      instance->registerEObj( "Unknown51", 2002872, 5965587, 4, { -0.369300f, -191.254105f, -64.493927f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2006490, 5960825, 4, { 0.213054f, -159.951599f, -180.332703f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2006491, 5960830, 4, { -8.808896f, -159.965195f, -172.749893f }, 1.000000f );
-      instance->registerEObj( "Unknown54", 2006492, 5960829, 4, { 0.816076f, -160.000000f, -164.794800f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2006493, 5960826, 4, { 9.567483f, -160.000000f, -172.413895f }, 1.000000f );
-      instance->registerEObj( "Unknown56", 2006494, 5960831, 4, { 11.416360f, -160.000000f, -185.623001f }, 1.000000f );
-      instance->registerEObj( "Unknown57", 2006495, 5960837, 4, { 21.345461f, -160.000000f, -178.053101f }, 1.000000f );
-      instance->registerEObj( "Unknown58", 2006496, 5960835, 4, { 21.132700f, -159.955307f, -155.512405f }, 1.000000f );
-      instance->registerEObj( "Unknown59", 2006497, 5960832, 4, { 10.413970f, -159.959305f, -145.012100f }, 1.000000f );
-      instance->registerEObj( "Unknown60", 2006498, 5960833, 4, { -11.132170f, -159.967697f, -145.107101f }, 1.000000f );
-      instance->registerEObj( "Unknown61", 2006499, 5960834, 4, { -23.702101f, -159.669800f, -155.260895f }, 1.000000f );
-      instance->registerEObj( "Unknown62", 2006500, 5960836, 4, { -22.808531f, -160.000000f, -178.798004f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2006501, 5960817, 4, { -11.047090f, -159.967697f, -185.956802f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2006473, 5939346, 4, { -319.478088f, 216.000000f, 222.247696f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2006474, 5939357, 4, { -288.014099f, 196.138107f, 47.531738f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2006475, 5938845, 4, { -429.923004f, 190.000000f, -34.653320f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2006476, 5938846, 4, { 10.635500f, -192.000000f, 224.872192f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2006477, 5937335, 4, { 4.501404f, -192.000000f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2006478, 5941617, 4, { 283.497314f, -400.000000f, 229.022598f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2006479, 5941618, 4, { 292.469604f, -400.000000f, 48.325321f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5965017, 5, { -312.459290f, 216.000000f, 229.715897f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
deleted file mode 100644
index 88fb0246..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/shadowofmhach/TheWeepingCityofMhach.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheWeepingCityofMhach : public InstanceContentScript
-{
-public:
-   TheWeepingCityofMhach() : InstanceContentScript( 30038 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 16.000000f, -0.599972f, -25.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6255278, 4, { 15.499620f, -0.600000f, -32.576271f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002872, 6255280, 4, { 16.000000f, -0.599986f, -84.500000f }, 1.200000f );
-      instance->registerEObj( "Unknown3", 2007130, 6259583, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007131, 6271618, 4, { 16.141850f, -0.600000f, -58.088329f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007127, 6263439, 4, { 2.786298f, 1.130917f, -81.495903f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007128, 6263438, 4, { 44.322010f, 1.937706f, -52.936489f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2007129, 6263356, 4, { -1.414551f, 2.361187f, -31.816429f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2002872, 6256300, 4, { -298.284485f, -74.099991f, -394.606812f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 6252961, 4, { -298.284485f, -74.000061f, -446.164307f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007174, 0, 4, { -301.925903f, -74.099998f, -434.771606f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007175, 6275855, 4, { -305.091309f, -74.099998f, -434.266205f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007176, 6275857, 4, { -299.330200f, -74.099998f, -441.272186f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000034, 6252960, 4, { -301.382507f, -74.111649f, -397.150391f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2000035, 0, 4, { -300.012909f, -74.111687f, -411.038788f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2002735, 0, 4, { 280.000000f, -468.750000f, -352.734314f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2002872, 6256312, 4, { 279.076385f, -468.799988f, -346.734894f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007092, 6246904, 4, { 271.681488f, -269.434998f, 263.484192f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007093, 6246906, 4, { 299.983093f, -269.438812f, 263.439911f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2007094, 6246909, 4, { 328.133606f, -269.459900f, 263.349915f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2007095, 6246905, 4, { 272.007813f, -270.624695f, 249.703201f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007096, 6246907, 4, { 299.972198f, -270.615295f, 249.808594f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007097, 6246910, 4, { 327.886597f, -270.637299f, 249.556503f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007098, 6276590, 4, { 271.976288f, -270.275513f, 254.027298f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007099, 6276603, 4, { 300.073914f, -270.279907f, 253.881897f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007100, 6276618, 4, { 328.117798f, -270.282501f, 253.919098f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007101, 6277276, 4, { 300.580688f, -329.902802f, 215.101807f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007102, 0, 4, { 313.999695f, -254.436203f, 249.057007f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2007091, 6253623, 4, { 280.196686f, -468.799988f, -340.444214f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2000015, 6323645, 4, { 280.035004f, -444.700012f, -381.003815f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2000015, 6323651, 4, { 255.731705f, -444.700012f, -423.649811f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2000015, 6323650, 4, { 304.734985f, -444.700012f, -424.385590f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007350, 6405524, 4, { 280.000000f, -446.006287f, -410.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2002618, 6405504, 4, { 271.693695f, -445.000000f, -398.334412f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2002618, 6413337, 4, { 284.413513f, -444.945587f, -428.864410f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2002735, 0, 4, { -300.007690f, -436.179108f, -3.677429f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2002872, 6256352, 4, { -299.044006f, -436.200012f, 1.934000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -300.007690f, -436.057098f, -56.789539f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2000019, 6223041, 4, { -293.815094f, -436.100006f, -36.657909f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2007363, 6403167, 4, { -300.000000f, -436.100006f, -34.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2007381, 0, 4, { -288.659698f, -436.100006f, -36.228500f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2007104, 6253621, 4, { -293.853302f, -417.190002f, 338.020691f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2007105, 6262270, 4, { 279.377411f, -481.421112f, -273.999298f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2007106, 6253622, 4, { 282.739197f, -506.212494f, -377.761414f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2007630, 0, 4, { -307.311310f, -74.111656f, -404.095490f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2007457, 6873350, 4, { -287.981812f, -74.111671f, -418.439789f }, 1.000000f );
-      instance->registerEObj( "Unknown46", 2007457, 7008372, 4, { -286.682404f, -74.111656f, -414.302185f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2000034, 6252960, 4, { -299.669098f, -74.111687f, -422.791412f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2008306, 6873007, 4, { -299.592712f, -123.000000f, -313.306885f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2002735, 0, 4, { -300.000000f, -73.990967f, -386.829315f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2002872, 6873032, 4, { -298.298706f, -74.113159f, -394.613586f }, 0.991760f );
-      instance->registerEObj( "Unknown51", 2007112, 6252937, 4, { -258.522614f, -114.655602f, -231.454193f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2007112, 6403165, 4, { -360.672485f, -116.000198f, -271.268707f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2008452, 6889796, 4, { -239.520905f, -116.014397f, -230.853806f }, 0.991760f );
-      instance->registerEObj( "Unknown54", 2007457, 6941894, 4, { -299.583099f, -75.000023f, -353.118500f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2007108, 6252917, 4, { 52.989189f, 8.000000f, 109.725502f }, 1.000000f );
-      instance->registerEObj( "Unknown56", 2007109, 6252933, 4, { 40.849979f, 7.999999f, 54.685509f }, 1.000000f );
-      instance->registerEObj( "Unknown57", 2007110, 6258888, 4, { -217.946503f, -116.000000f, -210.519608f }, 0.991760f );
-      instance->registerEObj( "Unknown58", 2007111, 6258889, 4, { -351.721313f, -116.000000f, -260.105499f }, 1.000000f );
-      instance->registerEObj( "Unknown59", 2007112, 6252937, 4, { -249.593796f, -116.000000f, -229.014603f }, 1.000000f );
-      instance->registerEObj( "Unknown60", 2007112, 6403165, 4, { -354.681885f, -116.000298f, -278.960693f }, 1.000000f );
-      instance->registerEObj( "Unknown61", 2002735, 0, 4, { -185.956604f, -394.699890f, 235.090607f }, 1.000000f );
-      instance->registerEObj( "Unknown62", 2002872, 6259368, 4, { -189.835297f, -394.768494f, 236.985107f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2002872, 6259369, 4, { -152.910706f, -394.522003f, 215.716797f }, 0.991760f );
-      instance->registerEObj( "Unknown64", 2007114, 6265979, 4, { -179.125702f, -394.522003f, 205.950897f }, 0.991760f );
-      instance->registerEObj( "Unknown65", 2007115, 6265980, 4, { -157.763107f, -394.522003f, 242.664200f }, 0.991760f );
-      instance->registerEObj( "Unknown66", 2007116, 6265977, 4, { -181.536697f, -394.522003f, 201.556396f }, 0.991760f );
-      instance->registerEObj( "Unknown67", 2007117, 6275728, 4, { -180.590607f, -394.522003f, 231.158905f }, 0.991760f );
-      instance->registerEObj( "Unknown68", 2007118, 6262272, 4, { -156.623795f, -394.500092f, 244.445908f }, 1.000000f );
-      instance->registerEObj( "Unknown69", 2007119, 6264911, 4, { -168.688507f, -391.866913f, 224.567001f }, 0.991760f );
-      instance->registerEObj( "Unknown70", 2007378, 6404242, 4, { -170.886597f, -394.500092f, 228.890305f }, 1.000000f );
-      instance->registerEObj( "Unknown71", 2007379, 6404243, 4, { -174.892807f, -394.500092f, 226.853806f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007054, 6277013, 4, { 29.465090f, 12.072440f, 173.291306f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2007055, 6277014, 4, { 10.055660f, 10.610950f, 59.293789f }, 0.991760f );
-      instance->registerEObj( "Basicconveyanceunit", 2007056, 6277015, 4, { 21.985451f, -1.159537f, -124.736298f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007057, 6277012, 4, { -290.684998f, -71.292747f, -368.263885f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007058, 6235460, 4, { -244.833099f, -390.428986f, 258.731689f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007059, 6235461, 4, { 276.184296f, -461.318604f, -294.996796f }, 1.000000f );
-      instance->registerEObj( "Basicconveyanceunit", 2007060, 6235463, 4, { -304.521301f, -435.890594f, 23.143780f }, 1.000000f );
-      instance->registerEObj( "Unknown72", 2007103, 6259793, 4, { 16.303080f, -3.864367f, -114.426003f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6247654, 5, { 81.884888f, 13.000000f, 208.698303f }, 0.991760f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
deleted file mode 100644
index bcde3139..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/ultimate/TheUnendingCoilofBahamutUltimate.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheUnendingCoilofBahamutUltimate : public InstanceContentScript
-{
-public:
-   TheUnendingCoilofBahamutUltimate() : InstanceContentScript( 30057 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007457, 7040178, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 7040443, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7040473, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7144982, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7075281, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7144855, 4, { 0.000000f, 0.017127f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -20.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 7068018, 5, { 0.000000f, 0.000000f, 18.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
index 825e0630..6c936042 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
@@ -10,101 +10,109 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Treasurecoffer", 2007190, 0, 4, { 0.001130f, 0.200000f, 340.004486f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2007191, 0, 4, { 0.002947f, -7.800000f, 215.005096f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2007192, 0, 4, { 0.002900f, -15.800000f, 90.001167f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2007193, 0, 4, { -0.000139f, -23.819401f, -34.999279f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2007194, 0, 4, { 0.001485f, -31.815121f, -160.003693f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2007195, 0, 4, { 0.004197f, -39.810791f, -284.993011f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2007196, 0, 4, { 0.000420f, -47.806580f, -409.995514f }, 0.991760f );
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { -0.122746f, 0.000000f, 361.538513f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002872, 6288992, 4, { 0.686486f, 0.049996f, 362.050415f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007203, 6287388, 4, { -18.243860f, 0.099997f, 321.842285f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007204, 6287665, 4, { 18.988001f, 0.099997f, 321.533508f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007287, 6288229, 4, { -25.275770f, 0.000000f, 340.210388f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007288, 6288231, 4, { 0.185137f, 0.000000f, 312.600098f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007289, 6288233, 4, { 25.078310f, 0.000000f, 339.623596f }, 1.000000f );
-      instance->registerEObj( "Vaultkey", 2007282, 0, 4, { 0.829522f, 0.220668f, 337.850708f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007316, 6288699, 4, { -18.478701f, -5.661133f, 279.285889f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2007317, 6286455, 4, { 15.609920f, -6.088379f, 277.302094f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2007328, 6383033, 4, { -16.922300f, 0.076233f, 321.705902f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2007329, 6383032, 4, { 18.844851f, 0.076233f, 322.468903f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2007343, 6289147, 4, { 3.738403f, 0.198364f, 339.833588f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2002735, 0, 4, { -0.120655f, -7.700002f, 236.767395f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2002872, 6289205, 4, { -0.442505f, -7.827942f, 237.140396f }, 0.991760f );
-      instance->registerEObj( "Vaultdoor", 2007205, 6288210, 4, { -18.722839f, -7.827942f, 196.063095f }, 0.991760f );
-      instance->registerEObj( "Vaultdoor", 2007206, 6288211, 4, { 18.844851f, -7.827942f, 196.185196f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2007290, 6288342, 4, { -25.317570f, -7.980009f, 215.039398f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007291, 6288340, 4, { 0.322333f, -7.980009f, 189.283798f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007292, 6288337, 4, { 24.222750f, -7.980009f, 215.066498f }, 1.000000f );
-      instance->registerEObj( "Vaultkey", 2007311, 0, 4, { -3.870050f, -7.800000f, 213.458496f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007318, 6288701, 4, { -16.983280f, -13.870480f, 153.185303f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2007319, 6286451, 4, { 16.678040f, -13.962040f, 152.574997f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2007330, 6383034, 4, { -17.685249f, -7.797425f, 197.619507f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2007331, 6383035, 4, { 18.509090f, -7.827942f, 197.497406f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2007344, 6289152, 4, { -1.286773f, -7.800001f, 215.448593f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2002872, 6289228, 4, { -0.142505f, -15.800000f, 112.190002f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2002735, 0, 4, { 0.053155f, -15.700000f, 111.576698f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007207, 6288213, 4, { -18.719660f, -15.805200f, 71.150551f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007208, 6288215, 4, { 18.666090f, -15.800000f, 71.347427f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2007293, 6288400, 4, { -25.407360f, -15.950010f, 89.850311f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007294, 6288402, 4, { 0.914349f, -15.950010f, 64.629997f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007295, 6288404, 4, { 24.828060f, -15.950010f, 89.997643f }, 1.000000f );
-      instance->registerEObj( "Vaultkey", 2007312, 0, 4, { 0.302402f, -15.800000f, 94.839752f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007320, 6288702, 4, { -17.441099f, -21.797001f, 28.519039f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2007321, 6286453, 4, { 16.342409f, -21.896730f, 28.458010f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2007332, 6383037, 4, { -16.861271f, -15.915160f, 70.694946f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2007333, 6383036, 4, { 18.326050f, -15.915160f, 72.465088f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2007345, 6289153, 4, { 4.112751f, -15.800000f, 94.003380f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2002872, 6289248, 4, { -0.327447f, -23.797190f, -12.626270f }, 0.991760f );
-      instance->registerEObj( "Unknown31", 2002735, 0, 4, { -0.005597f, -23.697189f, -13.437240f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007209, 6288216, 4, { -18.686550f, -23.797190f, -53.735790f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007210, 6288218, 4, { 18.561710f, -23.797190f, -53.381920f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2007296, 6288442, 4, { -24.187929f, -23.863649f, -34.945591f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007297, 6288444, 4, { 0.165738f, -23.873119f, -62.594398f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2007298, 6288446, 4, { 25.276409f, -23.913509f, -35.549301f }, 1.000000f );
-      instance->registerEObj( "Vaultkey", 2007313, 0, 4, { -2.565299f, -23.799999f, -37.906879f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2007322, 6288703, 4, { -16.708679f, -29.892460f, -96.391296f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2007323, 6288689, 4, { 15.640440f, -30.075560f, -97.917236f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2007334, 6383039, 4, { -17.044371f, -23.910950f, -54.093319f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2007335, 6383038, 4, { 18.326050f, -23.910950f, -52.323238f }, 0.991760f );
-      instance->registerEObj( "Unknown39", 2007346, 6289154, 4, { 1.893377f, -23.785940f, -36.201401f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2002872, 6289271, 4, { -0.402360f, -31.785391f, -137.661194f }, 0.991760f );
-      instance->registerEObj( "Unknown41", 2002735, 0, 4, { 0.026965f, -31.685390f, -138.459503f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007211, 6288221, 4, { -18.820810f, -31.785391f, -179.046600f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007212, 6288219, 4, { 18.590670f, -31.785391f, -178.683807f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2007299, 6288471, 4, { -25.063971f, -31.928049f, -159.375900f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2007300, 6288469, 4, { -0.225626f, -31.950010f, -184.941803f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2007301, 6288473, 4, { 24.164009f, -31.929609f, -159.852798f }, 1.000000f );
-      instance->registerEObj( "Vaultkey", 2007314, 0, 4, { -1.933799f, -31.799999f, -161.905502f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2007324, 6288704, 4, { -15.976260f, -38.010250f, -222.247696f }, 0.991760f );
-      instance->registerEObj( "Unknown46", 2007325, 6288690, 4, { 15.274170f, -38.071289f, -222.339203f }, 0.991760f );
-      instance->registerEObj( "Unknown47", 2007336, 6383042, 4, { -17.596230f, -31.900000f, -178.846298f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2007337, 6383041, 4, { 18.875370f, -31.906679f, -177.538803f }, 0.991760f );
-      instance->registerEObj( "Unknown49", 2007347, 6289155, 4, { 1.494756f, -31.797430f, -156.976593f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2002872, 6289287, 4, { -0.102360f, -39.780590f, -262.818298f }, 0.991760f );
-      instance->registerEObj( "Unknown51", 2002735, 0, 4, { -0.061376f, -39.680592f, -263.631805f }, 1.000000f );
-      instance->registerEObj( "Vaultdoor", 2007213, 6288224, 4, { -18.631350f, -39.810791f, -303.547699f }, 0.991760f );
-      instance->registerEObj( "Vaultdoor", 2007214, 6288223, 4, { 18.847080f, -39.780579f, -304.087585f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2007302, 6288508, 4, { -24.544001f, -39.909939f, -284.787201f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2007303, 6288524, 4, { -0.272618f, -39.928360f, -310.519714f }, 1.000000f );
-      instance->registerEObj( "Unknown54", 2007304, 6288522, 4, { 24.354900f, -39.900742f, -285.109314f }, 1.000000f );
-      instance->registerEObj( "Vaultkey", 2007315, 0, 4, { -2.969681f, -39.799999f, -286.637512f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2007326, 6288705, 4, { -15.793150f, -45.975460f, -346.730804f }, 0.991760f );
-      instance->registerEObj( "Unknown56", 2007327, 6288694, 4, { 16.555969f, -46.005981f, -347.859894f }, 0.991760f );
-      instance->registerEObj( "Unknown57", 2007338, 6383044, 4, { -17.091330f, -39.875000f, -302.618896f }, 1.000000f );
-      instance->registerEObj( "Unknown58", 2007339, 6383045, 4, { 17.074829f, -39.902340f, -303.334198f }, 0.991760f );
-      instance->registerEObj( "Unknown59", 2007348, 6289156, 4, { 1.662274f, -39.779591f, -284.155792f }, 1.000000f );
-      instance->registerEObj( "Unknown60", 2002872, 6289300, 4, { 0.019862f, -47.800430f, -387.795288f }, 0.991760f );
-      instance->registerEObj( "Unknown61", 2002735, 0, 4, { 0.060846f, -47.799999f, -388.568115f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -47.887440f, -427.461304f }, 0.991760f );
-      instance->registerEObj( "Unknown62", 2007305, 6288552, 4, { -24.623159f, -47.927639f, -409.027313f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2007306, 6288548, 4, { -0.124747f, -47.950401f, -433.348785f }, 1.000000f );
-      instance->registerEObj( "Unknown64", 2007307, 6288550, 4, { 23.612570f, -47.899090f, -409.669586f }, 1.000000f );
-      instance->registerEObj( "Unknown65", 2007349, 6395686, 4, { 2.822051f, -47.754410f, -409.509888f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6289067, 5, { 1.346699f, 0.199998f, 429.462097f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.438223f, -0.100000f, 415.292694f }, 1.000000f );
+      instance->registerEObj( "Treasurecoffer", 2007190, 0, 4, { 0.001130f, 0.200000f, 340.004486f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_1", 2007191, 0, 4, { 0.002947f, -7.800000f, 215.005096f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_2", 2007192, 0, 4, { 0.002900f, -15.800000f, 90.001167f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Treasurecoffer_3", 2007193, 0, 4, { -0.000139f, -23.819401f, -34.999279f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Treasurecoffer_4", 2007194, 0, 4, { 0.001485f, -31.815121f, -160.003693f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Treasurecoffer_5", 2007195, 0, 4, { 0.004197f, -39.810791f, -284.993011f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Treasurecoffer_6", 2007196, 0, 4, { 0.000420f, -47.806580f, -409.995514f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { -0.122746f, 0.000000f, 361.538513f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 6288992, 4, { 0.686486f, 0.049996f, 362.050415f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Vaultdoor", 2007203, 6287388, 4, { -18.243860f, 0.099997f, 321.842285f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultdoor_1", 2007204, 6287665, 4, { 18.988001f, 0.099997f, 321.533508f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007287, 6288229, 4, { -25.275770f, 0.000000f, 340.210388f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007288, 6288231, 4, { 0.185137f, 0.000000f, 312.600098f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2007289, 6288233, 4, { 25.078310f, 0.000000f, 339.623596f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultkey", 2007282, 0, 4, { 0.829522f, 0.220668f, 337.850708f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2007316, 6288699, 4, { -18.478701f, -5.661133f, 279.285889f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2007317, 6286455, 4, { 15.609920f, -6.088379f, 277.302094f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_6", 2007328, 6383033, 4, { -16.922300f, 0.076233f, 321.705902f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_7", 2007329, 6383032, 4, { 18.844851f, 0.076233f, 322.468903f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_8", 2007343, 6289147, 4, { 3.738403f, 0.198364f, 339.833588f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2002735, 0, 4, { -0.120655f, -7.700002f, 236.767395f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 6289205, 4, { -0.442505f, -7.827942f, 237.140396f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Vaultdoor_2", 2007205, 6288210, 4, { -18.722839f, -7.827942f, 196.063095f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Vaultdoor_3", 2007206, 6288211, 4, { 18.844851f, -7.827942f, 196.185196f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2007290, 6288342, 4, { -25.317570f, -7.980009f, 215.039398f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2007291, 6288340, 4, { 0.322333f, -7.980009f, 189.283798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2007292, 6288337, 4, { 24.222750f, -7.980009f, 215.066498f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultkey_1", 2007311, 0, 4, { -3.870050f, -7.800000f, 213.458496f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2007318, 6288701, 4, { -16.983280f, -13.870480f, 153.185303f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_14", 2007319, 6286451, 4, { 16.678040f, -13.962040f, 152.574997f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_15", 2007330, 6383034, 4, { -17.685249f, -7.797425f, 197.619507f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2007331, 6383035, 4, { 18.509090f, -7.827942f, 197.497406f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_17", 2007344, 6289152, 4, { -1.286773f, -7.800001f, 215.448593f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 6289228, 4, { -0.142505f, -15.800000f, 112.190002f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_18", 2002735, 0, 4, { 0.053155f, -15.700000f, 111.576698f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Vaultdoor_4", 2007207, 6288213, 4, { -18.719660f, -15.805200f, 71.150551f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultdoor_5", 2007208, 6288215, 4, { 18.666090f, -15.800000f, 71.347427f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2007293, 6288400, 4, { -25.407360f, -15.950010f, 89.850311f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2007294, 6288402, 4, { 0.914349f, -15.950010f, 64.629997f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2007295, 6288404, 4, { 24.828060f, -15.950010f, 89.997643f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultkey_2", 2007312, 0, 4, { 0.302402f, -15.800000f, 94.839752f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_22", 2007320, 6288702, 4, { -17.441099f, -21.797001f, 28.519039f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_23", 2007321, 6286453, 4, { 16.342409f, -21.896730f, 28.458010f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_24", 2007332, 6383037, 4, { -16.861271f, -15.915160f, 70.694946f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_25", 2007333, 6383036, 4, { 18.326050f, -15.915160f, 72.465088f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_26", 2007345, 6289153, 4, { 4.112751f, -15.800000f, 94.003380f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 6289248, 4, { -0.327447f, -23.797190f, -12.626270f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_27", 2002735, 0, 4, { -0.005597f, -23.697189f, -13.437240f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Vaultdoor_6", 2007209, 6288216, 4, { -18.686550f, -23.797190f, -53.735790f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultdoor_7", 2007210, 6288218, 4, { 18.561710f, -23.797190f, -53.381920f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_28", 2007296, 6288442, 4, { -24.187929f, -23.863649f, -34.945591f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_29", 2007297, 6288444, 4, { 0.165738f, -23.873119f, -62.594398f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_30", 2007298, 6288446, 4, { 25.276409f, -23.913509f, -35.549301f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultkey_3", 2007313, 0, 4, { -2.565299f, -23.799999f, -37.906879f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_31", 2007322, 6288703, 4, { -16.708679f, -29.892460f, -96.391296f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_32", 2007323, 6288689, 4, { 15.640440f, -30.075560f, -97.917236f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_33", 2007334, 6383039, 4, { -17.044371f, -23.910950f, -54.093319f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_34", 2007335, 6383038, 4, { 18.326050f, -23.910950f, -52.323238f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_35", 2007346, 6289154, 4, { 1.893377f, -23.785940f, -36.201401f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_4", 2002872, 6289271, 4, { -0.402360f, -31.785391f, -137.661194f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_36", 2002735, 0, 4, { 0.026965f, -31.685390f, -138.459503f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Vaultdoor_8", 2007211, 6288221, 4, { -18.820810f, -31.785391f, -179.046600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultdoor_9", 2007212, 6288219, 4, { 18.590670f, -31.785391f, -178.683807f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_37", 2007299, 6288471, 4, { -25.063971f, -31.928049f, -159.375900f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_38", 2007300, 6288469, 4, { -0.225626f, -31.950010f, -184.941803f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_39", 2007301, 6288473, 4, { 24.164009f, -31.929609f, -159.852798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultkey_4", 2007314, 0, 4, { -1.933799f, -31.799999f, -161.905502f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_40", 2007324, 6288704, 4, { -15.976260f, -38.010250f, -222.247696f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_41", 2007325, 6288690, 4, { 15.274170f, -38.071289f, -222.339203f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_42", 2007336, 6383042, 4, { -17.596230f, -31.900000f, -178.846298f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_43", 2007337, 6383041, 4, { 18.875370f, -31.906679f, -177.538803f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_44", 2007347, 6289155, 4, { 1.494756f, -31.797430f, -156.976593f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_5", 2002872, 6289287, 4, { -0.102360f, -39.780590f, -262.818298f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_45", 2002735, 0, 4, { -0.061376f, -39.680592f, -263.631805f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Vaultdoor_10", 2007213, 6288224, 4, { -18.631350f, -39.810791f, -303.547699f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Vaultdoor_11", 2007214, 6288223, 4, { 18.847080f, -39.780579f, -304.087585f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_46", 2007302, 6288508, 4, { -24.544001f, -39.909939f, -284.787201f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_47", 2007303, 6288524, 4, { -0.272618f, -39.928360f, -310.519714f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_48", 2007304, 6288522, 4, { 24.354900f, -39.900742f, -285.109314f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Vaultkey_5", 2007315, 0, 4, { -2.969681f, -39.799999f, -286.637512f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_49", 2007326, 6288705, 4, { -15.793150f, -45.975460f, -346.730804f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_50", 2007327, 6288694, 4, { 16.555969f, -46.005981f, -347.859894f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_51", 2007338, 6383044, 4, { -17.091330f, -39.875000f, -302.618896f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_52", 2007339, 6383045, 4, { 17.074829f, -39.902340f, -303.334198f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_53", 2007348, 6289156, 4, { 1.662274f, -39.779591f, -284.155792f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_6", 2002872, 6289300, 4, { 0.019862f, -47.800430f, -387.795288f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_54", 2002735, 0, 4, { 0.060846f, -47.799999f, -388.568115f }, 1.000000f, -0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.076233f, -47.887440f, -427.461304f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_55", 2007305, 6288552, 4, { -24.623159f, -47.927639f, -409.027313f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_56", 2007306, 6288548, 4, { -0.124747f, -47.950401f, -433.348785f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_57", 2007307, 6288550, 4, { 23.612570f, -47.899090f, -409.669586f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_58", 2007349, 6395686, 4, { 2.822051f, -47.754410f, -409.509888f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6289067, 5, { 1.346699f, 0.199998f, 429.462097f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 3.438223f, -0.100000f, 415.292694f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
index 8116a9ba..62ff6526 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
@@ -10,122 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Sluicegate", 2008671, 6880327, 4, { 0.568258f, 100.300003f, 274.168488f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008672, 6880319, 4, { 0.269765f, 50.299999f, 154.680405f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2007457, 6879916, 4, { -1.092401f, 100.300003f, 275.638214f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6879843, 4, { -1.524224f, 50.299999f, 155.176193f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008673, 6880331, 4, { 0.313768f, 0.272164f, 33.151051f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008674, 6880926, 4, { -0.058978f, -49.700001f, -85.039810f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008675, 6880353, 4, { -0.094499f, -99.699997f, -204.539307f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008676, 6880364, 4, { -0.132713f, -149.699997f, -325.173187f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6878453, 4, { -0.983721f, 0.299997f, 33.876339f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6878661, 4, { -1.446076f, -49.700001f, -85.301064f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6878563, 4, { -1.907748f, -99.699997f, -205.542297f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6874398, 4, { 0.861505f, -149.699997f, -323.648102f }, 1.000000f );
-      instance->registerEObj( "High", 2008960, 7005817, 4, { 0.995313f, 100.400002f, 303.008911f }, 1.000000f );
-      instance->registerEObj( "Low", 2008961, 7005818, 4, { 2.977269f, 100.400002f, 303.015686f }, 1.000000f );
-      instance->registerEObj( "High", 2008962, 7005819, 4, { 1.004384f, 50.369999f, 183.038193f }, 0.991760f );
-      instance->registerEObj( "Low", 2008963, 7005820, 4, { 3.018387f, 50.400009f, 183.009003f }, 1.000000f );
-      instance->registerEObj( "High", 2008964, 7005821, 4, { 1.013391f, 0.381469f, 63.020931f }, 0.991760f );
-      instance->registerEObj( "Low", 2008965, 7005822, 4, { 3.000382f, 0.400042f, 63.011879f }, 1.000000f );
-      instance->registerEObj( "High", 2008966, 7005823, 4, { 0.999980f, -49.628479f, -56.984692f }, 0.991760f );
-      instance->registerEObj( "Low", 2008967, 7005824, 4, { 2.994332f, -49.599289f, -56.969849f }, 1.000000f );
-      instance->registerEObj( "High", 2008968, 7005825, 4, { 0.976013f, -99.617447f, -176.984695f }, 0.991760f );
-      instance->registerEObj( "Low", 2008969, 7005826, 4, { 3.016492f, -99.599678f, -176.996704f }, 1.000000f );
-      instance->registerEObj( "High", 2008970, 7005827, 4, { 1.002942f, -149.605804f, -296.980713f }, 0.991760f );
-      instance->registerEObj( "Low", 2008971, 7005828, 4, { 3.024055f, -149.599503f, -297.002808f }, 1.000000f );
-      instance->registerEObj( "High", 2008972, 7005829, 4, { 1.005902f, -199.603302f, -416.980988f }, 0.991760f );
-      instance->registerEObj( "Low", 2008973, 7005830, 4, { 3.005575f, -199.600403f, -416.998596f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6996412, 4, { -4.068258f, 100.300003f, 294.718903f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6996413, 4, { 3.038667f, 100.300003f, 294.803009f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6996415, 4, { -4.038448f, 50.400009f, 176.206604f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6996416, 4, { 3.159257f, 50.400009f, 176.996399f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6996417, 4, { -5.237320f, 0.309626f, 53.443291f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6996418, 4, { 1.048808f, 0.300000f, 53.069832f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6996420, 4, { -4.622195f, -49.700001f, -65.730782f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6996419, 4, { 3.246223f, -49.700001f, -66.129990f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6996421, 4, { -4.211632f, -99.699997f, -185.489395f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6996422, 4, { 3.121258f, -99.697990f, -185.125397f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 6996424, 4, { -3.555968f, -149.663605f, -304.656311f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 6996423, 4, { 2.999705f, -149.599503f, -304.547394f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6996425, 4, { -3.452516f, -199.699997f, -425.304108f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007457, 6996426, 4, { 3.398586f, -199.699997f, -425.457886f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6904134, 5, { 2.648753f, 150.300003f, 421.065491f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 4.024228f, 150.300003f, 411.372498f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2002735, 0, 4, { 0.000000f, 100.300003f, 317.628296f }, 1.200000f );
-      instance->registerEObj( "Unknown22", 2002872, 6904820, 4, { 0.778198f, 99.992310f, 319.020294f }, 0.991760f );
-      instance->registerEObj( "Sluicegate", 2008593, 6880322, 4, { -17.906931f, 99.999687f, 282.242706f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008594, 6880329, 4, { 18.638870f, 99.999748f, 281.840912f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2008566, 0, 4, { 0.000000f, 100.400002f, 300.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007457, 6837839, 4, { -24.428419f, 99.999702f, 299.505890f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007457, 6837819, 4, { 3.431039f, 99.999771f, 274.684387f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007457, 6837820, 4, { 24.678801f, 99.999672f, 300.109589f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007457, 6837843, 4, { 1.030507f, 100.399696f, 298.205200f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007457, 6879918, 4, { -19.918140f, 99.999687f, 285.122803f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007457, 6879917, 4, { 16.073009f, 99.999748f, 280.430511f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2002735, 0, 4, { -0.000000f, 50.299999f, 197.665695f }, 1.200000f );
-      instance->registerEObj( "Unknown30", 2002872, 6908678, 4, { 0.647792f, 49.999809f, 199.196106f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008595, 6880321, 4, { -18.062990f, 49.999699f, 162.414703f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008596, 6880320, 4, { 18.482809f, 49.999790f, 162.012894f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2008567, 0, 4, { 0.000000f, 50.399700f, 180.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2007457, 6859376, 4, { -24.584480f, 49.999680f, 179.677902f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2007457, 6859374, 4, { 3.274982f, 49.999809f, 154.856400f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007457, 6859375, 4, { 24.522739f, 49.999729f, 180.281601f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2007457, 6859377, 4, { 0.874450f, 50.399719f, 178.377197f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2007457, 6879845, 4, { -20.074200f, 49.999729f, 165.294800f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2007457, 6879844, 4, { 15.916950f, 49.999790f, 160.602493f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2002735, 0, 4, { -0.000000f, 0.300000f, 77.670822f }, 1.200000f );
-      instance->registerEObj( "Unknown38", 2002872, 6908750, 4, { 0.647792f, -0.000183f, 79.265778f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008597, 6880336, 4, { -18.062990f, -0.000261f, 42.484371f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008598, 6880333, 4, { 18.482809f, -0.000181f, 42.082581f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2008568, 0, 4, { 0.000000f, 0.399994f, 60.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2007457, 6859445, 4, { -24.584480f, -0.000300f, 59.747551f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2007457, 6859443, 4, { 3.274982f, -0.000159f, 34.926048f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2007457, 6859444, 4, { 24.522739f, -0.000267f, 60.351250f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2007457, 6880919, 4, { 0.874450f, 0.399750f, 58.446869f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2007457, 6878455, 4, { -20.074200f, -0.000246f, 45.364471f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2007457, 6878454, 4, { 15.916950f, -0.000182f, 40.672180f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2002735, 0, 4, { -0.000000f, -49.700001f, -42.294621f }, 1.200000f );
-      instance->registerEObj( "Unknown46", 2002872, 6910488, 4, { 0.647793f, -49.999901f, -40.657509f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008599, 6880352, 4, { -18.062990f, -49.999981f, -77.438744f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008600, 6880349, 4, { 18.478640f, -50.003849f, -77.866821f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2008569, 0, 4, { 0.000000f, -49.600010f, -60.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2007457, 6859528, 4, { -24.584480f, -50.000099f, -60.175560f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2007457, 6859530, 4, { 3.275066f, -50.000000f, -84.997147f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2007457, 6859529, 4, { 24.522739f, -49.999950f, -59.571861f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2007457, 6859527, 4, { 0.874527f, -49.599991f, -61.476238f }, 1.000000f );
-      instance->registerEObj( "Unknown51", 2007457, 6878662, 4, { -20.074200f, -49.999969f, -74.558640f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2007457, 6878660, 4, { 15.916950f, -49.999950f, -79.250931f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2002735, 0, 4, { 0.000000f, -99.699997f, -162.569397f }, 1.200000f );
-      instance->registerEObj( "Unknown54", 2002872, 6910585, 4, { 0.625610f, -100.000000f, -160.942093f }, 0.991760f );
-      instance->registerEObj( "Sluicegate", 2008601, 6880358, 4, { -18.062990f, -100.000000f, -197.715500f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008602, 6880354, 4, { 18.478640f, -100.022903f, -198.168900f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2008570, 0, 4, { 0.000000f, -99.600014f, -180.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2007457, 6843688, 4, { -24.612850f, -100.000099f, -180.473694f }, 0.991760f );
-      instance->registerEObj( "Unknown56", 2007457, 6843689, 4, { 3.250122f, -100.000000f, -205.284805f }, 0.991760f );
-      instance->registerEObj( "Unknown57", 2007457, 6843686, 4, { 24.521240f, -100.000000f, -179.863297f }, 0.991760f );
-      instance->registerEObj( "Unknown58", 2007457, 6843671, 4, { 0.869751f, -99.600113f, -181.755402f }, 0.991760f );
-      instance->registerEObj( "Unknown59", 2007457, 6878564, 4, { -20.096189f, -100.000000f, -194.847595f }, 0.991760f );
-      instance->registerEObj( "Unknown60", 2007457, 6878562, 4, { 15.915160f, -100.000000f, -199.547394f }, 0.991760f );
-      instance->registerEObj( "Unknown61", 2002735, 0, 4, { 0.000000f, -149.699997f, -282.259888f }, 1.200000f );
-      instance->registerEObj( "Unknown62", 2002872, 6910763, 4, { 0.625622f, -150.000107f, -281.035614f }, 0.991760f );
-      instance->registerEObj( "Sluicegate", 2008603, 6880362, 4, { -18.081970f, -150.000107f, -317.830200f }, 0.991760f );
-      instance->registerEObj( "Sluicegate", 2008604, 6880366, 4, { 17.127180f, -150.000107f, -317.622009f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2008571, 0, 4, { 0.000000f, -149.600006f, -300.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2007457, 6859613, 4, { -24.612820f, -150.000198f, -300.567108f }, 0.991760f );
-      instance->registerEObj( "Unknown64", 2007457, 6859615, 4, { 3.250126f, -150.000107f, -325.378296f }, 0.991760f );
-      instance->registerEObj( "Unknown65", 2007457, 6859614, 4, { 24.521259f, -150.000107f, -299.956696f }, 0.991760f );
-      instance->registerEObj( "Unknown66", 2007457, 6859612, 4, { 0.869759f, -149.600204f, -301.848907f }, 0.991760f );
-      instance->registerEObj( "Unknown67", 2007457, 6874400, 4, { -20.096189f, -150.000107f, -314.941101f }, 0.991760f );
-      instance->registerEObj( "Unknown68", 2007457, 6874396, 4, { 15.915160f, -150.000107f, -319.640900f }, 0.991760f );
-      instance->registerEObj( "Unknown69", 2002735, 0, 4, { 0.000000f, -199.699997f, -402.035004f }, 1.200000f );
-      instance->registerEObj( "Unknown70", 2002872, 6910821, 4, { 0.625622f, -200.000305f, -400.930389f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.069897f, -200.000305f, -436.982697f }, 1.000000f );
-      instance->registerEObj( "Unknown71", 2007457, 6859698, 4, { -24.612860f, -200.000504f, -420.461792f }, 0.991760f );
-      instance->registerEObj( "Unknown72", 2007457, 6859700, 4, { 3.250122f, -200.000397f, -445.273010f }, 0.991760f );
-      instance->registerEObj( "Unknown73", 2007457, 6859699, 4, { 24.521210f, -200.000305f, -419.851410f }, 0.991760f );
-      instance->registerEObj( "Unknown74", 2007457, 6859697, 4, { 0.869759f, -199.600403f, -421.743500f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
index 84f37c91..635f0dd5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
@@ -10,122 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Sluicegate", 2008671, 6880327, 4, { 0.568258f, 100.300003f, 274.168488f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008672, 6880319, 4, { 0.269765f, 50.299999f, 154.680405f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2007457, 6879916, 4, { -1.092401f, 100.300003f, 275.638214f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 6879843, 4, { -1.524224f, 50.299999f, 155.176193f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008673, 6880331, 4, { 0.313768f, 0.272164f, 33.151051f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008674, 6880926, 4, { -0.058978f, -49.700001f, -85.039810f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008675, 6880353, 4, { -0.094499f, -99.699997f, -204.539307f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008676, 6880364, 4, { -0.132713f, -149.699997f, -325.173187f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6878453, 4, { -0.983721f, 0.299997f, 33.876339f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6878661, 4, { -1.446076f, -49.700001f, -85.301064f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6878563, 4, { -1.907748f, -99.699997f, -205.542297f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6874398, 4, { 0.861505f, -149.699997f, -323.648102f }, 1.000000f );
-      instance->registerEObj( "High", 2008960, 7005817, 4, { 0.995313f, 100.400002f, 303.008911f }, 1.000000f );
-      instance->registerEObj( "Low", 2008961, 7005818, 4, { 2.977269f, 100.400002f, 303.015686f }, 1.000000f );
-      instance->registerEObj( "High", 2008962, 7005819, 4, { 1.004384f, 50.369999f, 183.038193f }, 0.991760f );
-      instance->registerEObj( "Low", 2008963, 7005820, 4, { 3.018387f, 50.400009f, 183.009003f }, 1.000000f );
-      instance->registerEObj( "High", 2008964, 7005821, 4, { 1.013391f, 0.381469f, 63.020931f }, 0.991760f );
-      instance->registerEObj( "Low", 2008965, 7005822, 4, { 3.000382f, 0.400042f, 63.011879f }, 1.000000f );
-      instance->registerEObj( "High", 2008966, 7005823, 4, { 0.999980f, -49.628479f, -56.984692f }, 0.991760f );
-      instance->registerEObj( "Low", 2008967, 7005824, 4, { 2.994332f, -49.599289f, -56.969849f }, 1.000000f );
-      instance->registerEObj( "High", 2008968, 7005825, 4, { 0.976013f, -99.617447f, -176.984695f }, 0.991760f );
-      instance->registerEObj( "Low", 2008969, 7005826, 4, { 3.016492f, -99.599678f, -176.996704f }, 1.000000f );
-      instance->registerEObj( "High", 2008970, 7005827, 4, { 1.002942f, -149.605804f, -296.980713f }, 0.991760f );
-      instance->registerEObj( "Low", 2008971, 7005828, 4, { 3.024055f, -149.599503f, -297.002808f }, 1.000000f );
-      instance->registerEObj( "High", 2008972, 7005829, 4, { 1.005902f, -199.603302f, -416.980988f }, 0.991760f );
-      instance->registerEObj( "Low", 2008973, 7005830, 4, { 3.005575f, -199.600403f, -416.998596f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6996412, 4, { -4.068258f, 100.300003f, 294.718903f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6996413, 4, { 3.038667f, 100.300003f, 294.803009f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6996415, 4, { -4.038448f, 50.400009f, 176.206604f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6996416, 4, { 3.159257f, 50.400009f, 176.996399f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6996417, 4, { -5.237320f, 0.309626f, 53.443291f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6996418, 4, { 1.048808f, 0.300000f, 53.069832f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6996420, 4, { -4.622195f, -49.700001f, -65.730782f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 6996419, 4, { 3.246223f, -49.700001f, -66.129990f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 6996421, 4, { -4.211632f, -99.699997f, -185.489395f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2007457, 6996422, 4, { 3.121258f, -99.697990f, -185.125397f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2007457, 6996424, 4, { -3.555968f, -149.663605f, -304.656311f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2007457, 6996423, 4, { 2.999705f, -149.599503f, -304.547394f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2007457, 6996425, 4, { -3.452516f, -199.699997f, -425.304108f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2007457, 6996426, 4, { 3.398586f, -199.699997f, -425.457886f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6904134, 5, { 2.648753f, 150.300003f, 421.065491f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 4.024228f, 150.300003f, 411.372498f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2002735, 0, 4, { 0.000000f, 100.300003f, 317.628296f }, 1.200000f );
-      instance->registerEObj( "Unknown22", 2002872, 6904820, 4, { 0.778198f, 99.992310f, 319.020294f }, 0.991760f );
-      instance->registerEObj( "Sluicegate", 2008593, 6880322, 4, { -17.906931f, 99.999687f, 282.242706f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008594, 6880329, 4, { 18.638870f, 99.999748f, 281.840912f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2008566, 0, 4, { 0.000000f, 100.400002f, 300.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2007457, 6837839, 4, { -24.428419f, 99.999702f, 299.505890f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2007457, 6837819, 4, { 3.431039f, 99.999771f, 274.684387f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2007457, 6837820, 4, { 24.678801f, 99.999672f, 300.109589f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2007457, 6837843, 4, { 1.030507f, 100.399696f, 298.205200f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2007457, 6879918, 4, { -19.918140f, 99.999687f, 285.122803f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2007457, 6879917, 4, { 16.073009f, 99.999748f, 280.430511f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2002735, 0, 4, { -0.000000f, 50.299999f, 197.665695f }, 1.200000f );
-      instance->registerEObj( "Unknown30", 2002872, 6908678, 4, { 0.647792f, 49.999809f, 199.196106f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008595, 6880321, 4, { -18.062990f, 49.999699f, 162.414703f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008596, 6880320, 4, { 18.482809f, 49.999790f, 162.012894f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2008567, 0, 4, { 0.000000f, 50.399700f, 180.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2007457, 6859376, 4, { -24.584480f, 49.999680f, 179.677902f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2007457, 6859374, 4, { 3.274982f, 49.999809f, 154.856400f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2007457, 6859375, 4, { 24.522739f, 49.999729f, 180.281601f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2007457, 6859377, 4, { 0.874450f, 50.399719f, 178.377197f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2007457, 6879845, 4, { -20.074200f, 49.999729f, 165.294800f }, 1.000000f );
-      instance->registerEObj( "Unknown36", 2007457, 6879844, 4, { 15.916950f, 49.999790f, 160.602493f }, 1.000000f );
-      instance->registerEObj( "Unknown37", 2002735, 0, 4, { -0.000000f, 0.300000f, 77.670822f }, 1.200000f );
-      instance->registerEObj( "Unknown38", 2002872, 6908750, 4, { 0.647792f, -0.000183f, 79.265778f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008597, 6880336, 4, { -18.062990f, -0.000261f, 42.484371f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008598, 6880333, 4, { 18.482809f, -0.000181f, 42.082581f }, 1.000000f );
-      instance->registerEObj( "Treasurecoffer", 2008568, 0, 4, { 0.000000f, 0.399994f, 60.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown39", 2007457, 6859445, 4, { -24.584480f, -0.000300f, 59.747551f }, 1.000000f );
-      instance->registerEObj( "Unknown40", 2007457, 6859443, 4, { 3.274982f, -0.000159f, 34.926048f }, 1.000000f );
-      instance->registerEObj( "Unknown41", 2007457, 6859444, 4, { 24.522739f, -0.000267f, 60.351250f }, 1.000000f );
-      instance->registerEObj( "Unknown42", 2007457, 6880919, 4, { 0.874450f, 0.399750f, 58.446869f }, 1.000000f );
-      instance->registerEObj( "Unknown43", 2007457, 6878455, 4, { -20.074200f, -0.000246f, 45.364471f }, 1.000000f );
-      instance->registerEObj( "Unknown44", 2007457, 6878454, 4, { 15.916950f, -0.000182f, 40.672180f }, 1.000000f );
-      instance->registerEObj( "Unknown45", 2002735, 0, 4, { -0.000000f, -49.700001f, -42.294621f }, 1.200000f );
-      instance->registerEObj( "Unknown46", 2002872, 6910488, 4, { 0.647793f, -49.999901f, -40.657509f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008599, 6880352, 4, { -18.062990f, -49.999981f, -77.438744f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008600, 6880349, 4, { 18.478640f, -50.003849f, -77.866821f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2008569, 0, 4, { 0.000000f, -49.600010f, -60.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown47", 2007457, 6859528, 4, { -24.584480f, -50.000099f, -60.175560f }, 1.000000f );
-      instance->registerEObj( "Unknown48", 2007457, 6859530, 4, { 3.275066f, -50.000000f, -84.997147f }, 1.000000f );
-      instance->registerEObj( "Unknown49", 2007457, 6859529, 4, { 24.522739f, -49.999950f, -59.571861f }, 1.000000f );
-      instance->registerEObj( "Unknown50", 2007457, 6859527, 4, { 0.874527f, -49.599991f, -61.476238f }, 1.000000f );
-      instance->registerEObj( "Unknown51", 2007457, 6878662, 4, { -20.074200f, -49.999969f, -74.558640f }, 1.000000f );
-      instance->registerEObj( "Unknown52", 2007457, 6878660, 4, { 15.916950f, -49.999950f, -79.250931f }, 1.000000f );
-      instance->registerEObj( "Unknown53", 2002735, 0, 4, { 0.000000f, -99.699997f, -162.569397f }, 1.200000f );
-      instance->registerEObj( "Unknown54", 2002872, 6910585, 4, { 0.625610f, -100.000000f, -160.942093f }, 0.991760f );
-      instance->registerEObj( "Sluicegate", 2008601, 6880358, 4, { -18.062990f, -100.000000f, -197.715500f }, 1.000000f );
-      instance->registerEObj( "Sluicegate", 2008602, 6880354, 4, { 18.478640f, -100.022903f, -198.168900f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2008570, 0, 4, { 0.000000f, -99.600014f, -180.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown55", 2007457, 6843688, 4, { -24.612850f, -100.000099f, -180.473694f }, 0.991760f );
-      instance->registerEObj( "Unknown56", 2007457, 6843689, 4, { 3.250122f, -100.000000f, -205.284805f }, 0.991760f );
-      instance->registerEObj( "Unknown57", 2007457, 6843686, 4, { 24.521240f, -100.000000f, -179.863297f }, 0.991760f );
-      instance->registerEObj( "Unknown58", 2007457, 6843671, 4, { 0.869751f, -99.600113f, -181.755402f }, 0.991760f );
-      instance->registerEObj( "Unknown59", 2007457, 6878564, 4, { -20.096189f, -100.000000f, -194.847595f }, 0.991760f );
-      instance->registerEObj( "Unknown60", 2007457, 6878562, 4, { 15.915160f, -100.000000f, -199.547394f }, 0.991760f );
-      instance->registerEObj( "Unknown61", 2002735, 0, 4, { 0.000000f, -149.699997f, -282.259888f }, 1.200000f );
-      instance->registerEObj( "Unknown62", 2002872, 6910763, 4, { 0.625622f, -150.000107f, -281.035614f }, 0.991760f );
-      instance->registerEObj( "Sluicegate", 2008603, 6880362, 4, { -18.081970f, -150.000107f, -317.830200f }, 0.991760f );
-      instance->registerEObj( "Sluicegate", 2008604, 6880366, 4, { 17.127180f, -150.000107f, -317.622009f }, 0.991760f );
-      instance->registerEObj( "Treasurecoffer", 2008571, 0, 4, { 0.000000f, -149.600006f, -300.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2007457, 6859613, 4, { -24.612820f, -150.000198f, -300.567108f }, 0.991760f );
-      instance->registerEObj( "Unknown64", 2007457, 6859615, 4, { 3.250126f, -150.000107f, -325.378296f }, 0.991760f );
-      instance->registerEObj( "Unknown65", 2007457, 6859614, 4, { 24.521259f, -150.000107f, -299.956696f }, 0.991760f );
-      instance->registerEObj( "Unknown66", 2007457, 6859612, 4, { 0.869759f, -149.600204f, -301.848907f }, 0.991760f );
-      instance->registerEObj( "Unknown67", 2007457, 6874400, 4, { -20.096189f, -150.000107f, -314.941101f }, 0.991760f );
-      instance->registerEObj( "Unknown68", 2007457, 6874396, 4, { 15.915160f, -150.000107f, -319.640900f }, 0.991760f );
-      instance->registerEObj( "Unknown69", 2002735, 0, 4, { 0.000000f, -199.699997f, -402.035004f }, 1.200000f );
-      instance->registerEObj( "Unknown70", 2002872, 6910821, 4, { 0.625622f, -200.000305f, -400.930389f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.069897f, -200.000305f, -436.982697f }, 1.000000f );
-      instance->registerEObj( "Unknown71", 2007457, 6859698, 4, { -24.612860f, -200.000504f, -420.461792f }, 0.991760f );
-      instance->registerEObj( "Unknown72", 2007457, 6859700, 4, { 3.250122f, -200.000397f, -445.273010f }, 0.991760f );
-      instance->registerEObj( "Unknown73", 2007457, 6859699, 4, { 24.521210f, -200.000305f, -419.851410f }, 0.991760f );
-      instance->registerEObj( "Unknown74", 2007457, 6859697, 4, { 0.869759f, -199.600403f, -421.743500f }, 0.991760f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
index 4b15603e..678f8da9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
@@ -10,23 +10,24 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f );
+      instance->registerEObj( "sgbg_w_qic_001_04a", 2006993, 6235274, 4, { -35.822102f, 298.899994f, -205.263199f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2006952, 0, 4, { -35.712589f, 298.899994f, -204.878006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 556.049377f, 348.102509f, -752.435730f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4600289, 5, { 523.532471f, 348.223389f, -736.685730f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_1", 2002332, 0, 4, { 533.090881f, 348.691895f, -742.750916f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2002333, 0, 4, { 539.940430f, 348.836395f, -734.401489f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_3", 2000608, 3967803, 4, { 202.369598f, 257.761108f, 80.435272f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2000608, 3976993, 4, { 273.634705f, 254.600204f, 106.048500f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2000608, 3986797, 4, { 205.504898f, 246.188995f, 194.875702f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2000608, 3986798, 4, { 326.313385f, 239.193497f, 221.138901f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2000608, 2718481, 4, { 240.552307f, 302.769714f, -199.979996f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2000608, 4065433, 4, { 204.970001f, 302.119995f, -216.311600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2000608, 2814617, 4, { 205.869995f, 302.219086f, -276.681396f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2000608, 2763112, 4, { -433.000000f, 211.007706f, -216.148605f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2000608, 4187649, 4, { -453.000000f, 211.000000f, -281.046600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2000608, 4187961, 4, { -416.000000f, 210.788193f, -279.813812f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
index a1a13706..25b395e3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
@@ -10,48 +10,58 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2001649, 4097866, 4, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f );
-      instance->registerEObj( "Exit", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f );
-      instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f );
-      instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f );
-      instance->registerEObj( "Chainwinch", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f );
-      instance->registerEObj( "Aetherialflow", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4600269, 5, { -245.383194f, 17.225630f, 16.103081f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -279.773407f, 17.233170f, 19.434681f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2001609, 0, 4, { 241.292603f, 11.057950f, 9.784212f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance_1", 2001649, 4097866, 5, { 238.950500f, 9.900879f, -1.209344f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit_1", 2001610, 4097973, 4, { -280.512299f, 17.240601f, 20.057501f }, 1.000000f, 0.000000f ); 
+      // States -> vf_htras1_on vf_htras1_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2001611, 4097992, 4, { 19.113859f, 0.900208f, 98.170502f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2001612, 4098036, 4, { 17.948280f, 0.925217f, 99.310219f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2001613, 4098064, 4, { -120.074501f, -5.801239f, -111.402496f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2001614, 4098077, 4, { -121.598503f, -5.727614f, -112.049599f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_2", 2001615, 4098237, 4, { -228.286301f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2001616, 4098241, 4, { -229.136703f, 17.565599f, 16.208900f }, 1.000000f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2001618, 4014394, 4, { 29.098881f, 1.785278f, 130.418793f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Aetherialflow", 2001619, 0, 4, { 32.968849f, 3.815735f, 131.179199f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2001620, 2815987, 4, { 120.471397f, -0.516086f, -57.500610f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2001621, 4098194, 4, { -95.942581f, -9.659227f, -101.942596f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2001622, 4043181, 4, { -94.468628f, -2.151611f, -68.864014f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Ludusdoor", 2001623, 4005252, 4, { -172.249695f, 12.559910f, 12.742130f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch", 2001624, 4016950, 4, { 74.518059f, -10.988300f, -107.067703f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch_1", 2001625, 4016951, 4, { 42.154171f, -10.941640f, -84.664078f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch_2", 2001626, 4016952, 4, { 17.515020f, -10.957320f, -190.023102f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch_3", 2001627, 4016953, 4, { -39.127491f, -11.066550f, -129.097504f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Chainwinch_4", 2001628, 4016954, 4, { -82.474548f, -10.952540f, -113.137199f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_5", 2001634, 4082420, 4, { -129.441193f, 9.833186f, -0.625334f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2001635, 3629276, 4, { -3.044897f, 0.927666f, 144.884506f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_7", 2001636, 3629274, 4, { 27.769211f, 0.954134f, 166.929398f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2001637, 3629277, 4, { 69.039284f, 0.968122f, 137.080902f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_9", 2001638, 4016486, 4, { -19.781490f, 2.187618f, 152.349899f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_10", 2001639, 4016487, 4, { 24.469919f, 2.233563f, 180.853195f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_11", 2001640, 4016488, 4, { 89.225769f, 2.247621f, 140.072006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_12", 2001641, 4018090, 4, { -277.600494f, 17.568609f, 40.599701f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2001642, 4018091, 4, { -255.703506f, 17.578291f, 47.590672f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2001643, 4018092, 4, { -237.108002f, 17.604349f, 38.970459f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2001644, 4018089, 4, { -279.140015f, 17.555901f, -2.742105f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_16", 2001645, 4018088, 4, { -261.194214f, 17.568060f, -11.064940f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2001646, 4018087, 4, { -239.163101f, 17.568661f, -4.435994f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Aetherialflow_1", 2001647, 4103310, 4, { -177.996506f, -14.694460f, -133.043503f }, 0.991760f, 0.000048f ); 
+      // States -> tornade_off tornade_on 
+      instance->registerEObj( "unknown_18", 2001648, 4105956, 4, { -171.435196f, -14.633480f, -127.946999f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_19", 2001650, 0, 4, { -230.125793f, 17.157061f, 16.380630f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 242.225601f, 9.970665f, -11.333600f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2001712, 0, 4, { -131.216003f, 10.073990f, -1.326215f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2000210, 0, 4, { -256.084503f, 17.537910f, 17.740490f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
index ba5f162e..4efac5d8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
@@ -10,15 +10,21 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_r1fc_b0472", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f, 0.000000f ); 
+      // States -> wind_def wind_def_anim wind_pop wind_pop_anim 
+      instance->registerEObj( "sgvf_r1fc_b0471", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f, 0.793709f ); 
+      // States -> magi_def magi_def_anim magi_pop magi_pop_anim 
+      instance->registerEObj( "sgvf_r1fc_b0471_1", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def magi_def_anim magi_pop magi_pop_anim 
+      instance->registerEObj( "sgvf_r1fc_b0471_2", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def magi_def_anim magi_pop magi_pop_anim 
+      instance->registerEObj( "sgvf_r1fc_b0471_3", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def magi_def_anim magi_pop magi_pop_anim 
+      instance->registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
index 9680a5ab..1dfed492 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
@@ -10,15 +10,21 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2004238, 4772738, 4, { -1.210436f, 0.000000f, -0.715586f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_r1fc_b0472", 2004239, 4797573, 4, { 1.181316f, -0.000000f, 1.563968f }, 1.000000f, 0.000000f ); 
+      // States -> wind_def wind_def_anim wind_pop wind_pop_anim 
+      instance->registerEObj( "sgvf_r1fc_b0471", 2004240, 4841629, 4, { 11.000000f, 0.000000f, -11.000000f }, 1.000000f, 0.793709f ); 
+      // States -> magi_def magi_def_anim magi_pop magi_pop_anim 
+      instance->registerEObj( "sgvf_r1fc_b0471_1", 2004349, 4841631, 4, { 12.811310f, -0.000000f, 9.376424f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def magi_def_anim magi_pop magi_pop_anim 
+      instance->registerEObj( "sgvf_r1fc_b0471_2", 2004350, 4841632, 4, { -8.033875f, 0.000000f, 10.406790f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def magi_def_anim magi_pop magi_pop_anim 
+      instance->registerEObj( "sgvf_r1fc_b0471_3", 2004351, 4841633, 4, { -8.319038f, -0.000001f, -10.997720f }, 1.000000f, 0.000000f ); 
+      // States -> magi_def magi_def_anim magi_pop magi_pop_anim 
+      instance->registerEObj( "Entrance", 2000182, 4738599, 5, { 9.717670f, 0.000000f, 14.522430f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -15.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
index 5bbd9c0e..5b19a73c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
@@ -10,89 +10,130 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000491, 4246565, 4, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f );
-      instance->registerEObj( "Unknown10", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f );
-      instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f );
-      instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown18", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f );
-      instance->registerEObj( "Unknown22", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f );
-      instance->registerEObj( "Unknown23", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f );
-      instance->registerEObj( "Unknown24", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f );
-      instance->registerEObj( "Unknown25", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown30", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown31", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f );
-      instance->registerEObj( "Unknown32", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f );
-      instance->registerEObj( "Unknown33", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f );
-      instance->registerEObj( "Unknown34", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f );
-      instance->registerEObj( "Unknown35", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f );
-      instance->registerEObj( "Unknown37", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f );
-      instance->registerEObj( "Unknown38", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f );
-      instance->registerEObj( "Unknown39", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f );
-      instance->registerEObj( "Unknown40", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown41", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown42", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown43", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f );
-      instance->registerEObj( "Unknown44", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f );
-      instance->registerEObj( "Unknown45", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f );
-      instance->registerEObj( "Unknown46", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f );
-      instance->registerEObj( "Unknown47", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f );
-      instance->registerEObj( "Unknown48", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f );
-      instance->registerEObj( "Unknown49", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f );
-      instance->registerEObj( "Unknown50", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f );
-      instance->registerEObj( "Unknown51", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f );
-      instance->registerEObj( "Unknown52", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown53", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown54", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f );
-      instance->registerEObj( "Unknown55", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f );
-      instance->registerEObj( "Unknown56", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f );
-      instance->registerEObj( "Unknown57", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f );
-      instance->registerEObj( "Unknown58", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f );
-      instance->registerEObj( "Unknown59", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f );
-      instance->registerEObj( "Unknown60", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f );
-      instance->registerEObj( "Unknown62", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f );
-      instance->registerEObj( "Unknown63", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f );
-      instance->registerEObj( "Unknown64", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f );
-      instance->registerEObj( "Unknown65", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f );
-      instance->registerEObj( "Unknown66", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f );
-      instance->registerEObj( "Unknown67", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown68", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f );
-      instance->registerEObj( "Aetherialflow", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f );
-      instance->registerEObj( "Unknown69", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown70", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown71", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown72", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown73", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f );
-      instance->registerEObj( "Unknown74", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f );
+      instance->registerEObj( "sgbg_f1d3_a1_gar2", 2000551, 4277027, 4, { -3.577190f, 48.000000f, -12.625050f }, 1.000000f, 0.000000f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_1", 2000552, 4277005, 4, { 21.455280f, 48.000011f, -12.604770f }, 1.000000f, 0.000000f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_2", 2000553, 4277029, 4, { -3.963791f, 48.000000f, 9.699657f }, 1.000000f, 0.000000f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_3", 2000554, 4277028, 4, { 21.081841f, 47.999920f, 9.731779f }, 1.000000f, 0.000000f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "Entrance", 2000491, 4246565, 5, { -254.388702f, -8.857766f, -0.323940f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_0", 2000492, 0, 4, { -266.179810f, -9.200000f, -0.162207f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2000493, 4246574, 4, { -12.466670f, 48.285069f, -0.015320f }, 0.991760f, 0.000048f ); 
+      // States -> vf_htras1_on vf_htras1_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094", 2000494, 4246576, 4, { -81.527344f, 0.000003f, -1.602537f }, 1.000000f, 0.000000f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2000495, 4246594, 4, { -81.412201f, 0.000003f, 0.186550f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0094_1", 2000496, 4246595, 4, { 199.816895f, 21.957701f, -104.781303f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgpl_w_lvd_b0118_f1d2", 2000497, 4246596, 4, { 200.915497f, 21.957701f, -104.598198f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0249", 2000498, 4246617, 4, { 34.775269f, 48.081181f, 0.381470f }, 0.991760f, 0.000048f ); 
+      // States -> vf_line_on vf_line_of 
+      instance->registerEObj( "sgvf_w_lvd_b0250", 2000499, 4246618, 4, { 34.775269f, 48.081181f, -0.839294f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -246.833496f, -8.499996f, 4.016408f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Aetherialflow", 2000500, 4247835, 4, { -10.236110f, -0.000000f, -0.015320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "PresenceChamberdoor", 2000502, 4308888, 4, { 60.483269f, 48.174511f, -0.015320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "BloodyTranseptdoor", 2000687, 4308274, 4, { 199.985397f, 22.200001f, -103.389503f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_f1d1_b0008", 2002741, 4388278, 4, { -82.462273f, 0.000002f, 0.045686f }, 1.000000f, 0.000000f ); 
+      // States -> vf_baria1_off vf_baria_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1", 2000509, 4271520, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_1", 2000510, 4271522, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_2", 2000511, 4271529, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_3", 2000512, 4271531, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_4", 2000513, 4271532, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_5", 2000514, 4271533, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_6", 2000521, 4274657, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_7", 2000522, 4274656, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_8", 2000523, 4274655, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_9", 2000524, 4274661, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_10", 2000525, 4274660, 4, { 206.286697f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_11", 2000526, 4274659, 4, { 206.286697f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_12", 2000533, 4274648, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_13", 2000534, 4274649, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_14", 2000535, 4274650, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_15", 2000536, 4274651, 4, { 241.931793f, 22.079769f, 6.240906f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_16", 2000537, 4274652, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_17", 2000538, 4274653, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_18", 2000545, 4274662, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_19", 2000546, 4274667, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_20", 2000547, 4274666, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_21", 2000548, 4274663, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_22", 2000549, 4274665, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar1_23", 2000550, 4274664, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_4", 2000503, 4274671, 4, { 134.111496f, 22.079769f, -5.935791f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_5", 2000504, 4274672, 4, { 142.229202f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_6", 2000505, 4274673, 4, { 158.129196f, 22.079769f, -6.088379f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_7", 2000506, 4274674, 4, { 133.958893f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_8", 2000507, 4274675, 4, { 142.015594f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_9", 2000508, 4274676, 4, { 158.190201f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_10", 2000515, 4274685, 4, { 193.987900f, 22.110291f, 42.099609f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_11", 2000516, 4274684, 4, { 193.804794f, 22.079769f, 57.938480f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_12", 2000517, 4274683, 4, { 193.804794f, 22.079769f, 65.964722f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_13", 2000518, 4274688, 4, { 206.317093f, 22.079769f, 42.038570f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_14", 2000519, 4274687, 4, { 206.317093f, 22.079769f, 57.968990f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_15", 2000520, 4274686, 4, { 206.317093f, 22.079769f, 65.995239f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_16", 2000527, 4274677, 4, { 241.992798f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_17", 2000528, 4274678, 4, { 258.075806f, 22.079769f, -6.332520f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_18", 2000529, 4274679, 4, { 265.949493f, 22.079769f, -6.271484f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_19", 2000530, 4274680, 4, { 241.931793f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_20", 2000531, 4274681, 4, { 258.075806f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_21", 2000532, 4274682, 4, { 266.071503f, 22.079769f, 6.271362f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_22", 2000539, 4274689, 4, { 193.804794f, 22.079769f, -34.042912f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_23", 2000540, 4274694, 4, { 193.804794f, 22.079769f, -42.008121f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_24", 2000541, 4274693, 4, { 193.804794f, 22.079769f, -58.335270f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_25", 2000542, 4274690, 4, { 206.317093f, 22.079769f, -33.890320f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_26", 2000543, 4274692, 4, { 206.317093f, 22.079769f, -41.916561f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "sgbg_f1d3_a1_gar2_27", 2000544, 4274691, 4, { 206.317093f, 22.079769f, -58.274231f }, 0.991760f, 0.000048f ); 
+      // States -> on off vfx_on 
+      instance->registerEObj( "Entrance_1", 2000182, 5608623, 5, { -156.520401f, -2.800003f, -5.140180f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 5608617, 4, { -154.662003f, -2.800003f, 5.028913f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { -151.232193f, -2.822998f, 0.289556f }, 1.174927f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2005128, 5608619, 4, { -112.240501f, -2.800003f, -0.701091f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_2", 2002735, 0, 4, { -46.585720f, 0.045776f, 0.190301f }, 1.179312f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_3", 2002872, 5608620, 4, { -46.476231f, 0.000000f, -0.510445f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Exit_1", 2000139, 0, 4, { -7.766907f, -0.015320f, 0.015198f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgvf_f1d3_bo189", 2000561, 4248559, 4, { 200.121902f, 21.988159f, -114.000000f }, 1.000000f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00", 2000555, 4249099, 4, { 200.000000f, 21.988159f, -151.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Aetherialflow_1", 2000501, 4247838, 4, { 200.061005f, 22.000000f, -165.266006f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_1", 2000556, 4249100, 4, { 200.000000f, 21.988159f, -146.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_2", 2000557, 4249101, 4, { 200.000000f, 21.988159f, -141.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_3", 2000560, 4249104, 4, { 200.000000f, 21.988159f, -126.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_4", 2000602, 4253048, 4, { 200.000000f, 21.988159f, -121.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_5", 2000559, 4249103, 4, { 200.000000f, 21.988159f, -131.822800f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "sgbg_col_wall_00_6", 2000558, 4249102, 4, { 200.000000f, 21.957701f, -136.838501f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
index f115a65f..b547b347 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
@@ -10,15 +10,19 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002735, 0, 4, { 106.355499f, -5.000003f, -0.049812f }, 0.404395f );
-      instance->registerEObj( "Unknown1", 2002872, 4630952, 4, { 109.916496f, -5.000003f, -0.035030f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002735, 0, 4, { -75.653900f, 1.999997f, 0.149403f }, 0.500000f );
-      instance->registerEObj( "Unknown3", 2002872, 4635071, 4, { -72.579193f, 1.999997f, 0.830825f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2003902, 4635078, 4, { -37.106110f, 2.000000f, 1.552188f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4630929, 5, { -141.564804f, 1.314597f, 3.459962f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 143.814301f, -5.000000f, -0.081344f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -136.750107f, 1.329580f, 5.374416f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2002735, 0, 4, { 106.355499f, -5.000003f, -0.049812f }, 0.404395f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4630952, 4, { 109.916496f, -5.000003f, -0.035030f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_1", 2002735, 0, 4, { -75.653900f, 1.999997f, 0.149403f }, 0.500000f, -1.570451f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4635071, 4, { -72.579193f, 1.999997f, 0.830825f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2003902, 4635078, 4, { -37.106110f, 2.000000f, 1.552188f }, 1.000000f, 0.000000f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "Entrance", 2000182, 4630929, 5, { -141.564804f, 1.314597f, 3.459962f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 143.814301f, -5.000000f, -0.081344f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -136.750107f, 1.329580f, 5.374416f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
index 70067770..3bd35bb1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
@@ -10,10 +10,11 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000604, 4262798, 4, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f );
+      instance->registerEObj( "Exit", 2000605, 0, 4, { -715.942383f, 69.420113f, -830.370300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2000606, 3861081, 4, { -670.462280f, 63.293751f, -801.510986f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000604, 4262798, 5, { -677.634888f, 64.116386f, -803.174927f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp
new file mode 100644
index 00000000..146f71e5
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayP1T6 : public InstanceContentScript
+{
+public:
+   ContainmentBayP1T6() : InstanceContentScript( 20041 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
new file mode 100644
index 00000000..eab436eb
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayP1T6Extreme : public InstanceContentScript
+{
+public:
+   ContainmentBayP1T6Extreme() : InstanceContentScript( 20042 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp
new file mode 100644
index 00000000..ec28c8d3
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayS1T7 : public InstanceContentScript
+{
+public:
+   ContainmentBayS1T7() : InstanceContentScript( 20037 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
new file mode 100644
index 00000000..5f4e2c02
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayS1T7Extreme : public InstanceContentScript
+{
+public:
+   ContainmentBayS1T7Extreme() : InstanceContentScript( 20038 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp
new file mode 100644
index 00000000..0b82f1fc
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayZ1T9 : public InstanceContentScript
+{
+public:
+   ContainmentBayZ1T9() : InstanceContentScript( 20043 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
new file mode 100644
index 00000000..bee2d9ad
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ContainmentBayZ1T9Extreme : public InstanceContentScript
+{
+public:
+   ContainmentBayZ1T9Extreme() : InstanceContentScript( 20044 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
index 44039c51..d665f285 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
@@ -10,9 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 6894521, 5, { 0.000796f, 0.035467f, 12.032630f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.062970f, -12.000000f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
index f4316fbb..93d7f364 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
@@ -10,9 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 6894521, 5, { 0.000796f, 0.035467f, 12.032630f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.062970f, -12.000000f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp
similarity index 79%
rename from src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp
index 9105e586..c9472d9a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventI.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp
similarity index 68%
rename from src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
rename to src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp
index 9e740cd4..85526d94 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/SpecialEventII.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp
@@ -10,9 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 6430385, 5, { -7.331871f, 0.000000f, 23.153120f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.017054f, 0.000000f, -17.456369f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp
new file mode 100644
index 00000000..933cb121
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class SpecialEventIII : public InstanceContentScript
+{
+public:
+   SpecialEventIII() : InstanceContentScript( 20016 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
index 9dd5b35e..6ca4d4c2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
@@ -10,11 +10,12 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
index a44aacfc..c91bd613 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
@@ -10,11 +10,12 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
index 65e21df2..9613aafe 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
@@ -10,11 +10,12 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f );
+      instance->registerEObj( "Entrance", 2000182, 4177874, 5, { -16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 16.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_0", 2007452, 0, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "BladeofLight", 2007454, 0, 4, { 0.000000f, 0.000000f, 11.300000f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
index 34b4ebb1..e0e3ee10 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
@@ -10,26 +10,40 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2005209, 5689928, 4, { -0.866003f, 0.000000f, -29.632271f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5649517, 5, { -0.064617f, 0.000000f, 21.704861f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -22.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005160, 5652375, 4, { -1.683807f, -0.002888f, -0.074251f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2005158, 0, 4, { 220.000000f, -0.045776f, 0.000000f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2005159, 0, 4, { 229.899994f, -0.013268f, 9.900000f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2004550, 0, 4, { 0.068370f, -0.002887f, -0.230858f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005161, 5652362, 4, { 219.837494f, -0.000000f, -20.737341f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005198, 5675943, 4, { 234.366592f, -0.000818f, -14.481080f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005199, 5675944, 4, { 238.872803f, -0.002887f, -0.791933f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005200, 5675945, 4, { 233.135101f, -0.002692f, 13.732260f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2005201, 5675946, 4, { 220.264893f, -0.002887f, 18.895180f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2005202, 5675947, 4, { 206.385605f, -0.002087f, 13.131840f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2005203, 5675948, 4, { 201.101196f, -0.002887f, -0.591635f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2005204, 5675951, 4, { 206.584305f, -0.002887f, -14.412730f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2005205, 5675952, 4, { 227.781204f, -0.002888f, -8.587747f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2005206, 5675953, 4, { 227.676605f, -0.002889f, 8.141966f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2005207, 5675954, 4, { 211.709396f, -0.002890f, 7.657639f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005208, 5675955, 4, { 211.825500f, -0.001177f, -9.651319f }, 1.000000f );
+      instance->registerEObj( "sgvf_z1e9_b0606", 2005209, 5689928, 4, { -0.866003f, 0.000000f, -29.632271f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 5649517, 5, { -0.064617f, 0.000000f, 21.704861f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -22.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_z1e9_t1_yuka1", 2005160, 5652375, 4, { -1.683807f, -0.002888f, -0.074251f }, 1.000000f, 0.000000f ); 
+      // States -> d_def d_def_anim d_01 d_01_anim d_02 d_02_anim d_03 d_03_anim d_04 d_04_anim 
+      instance->registerEObj( "unknown_0", 2005158, 0, 4, { 220.000000f, -0.045776f, 0.000000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_1", 2005159, 0, 4, { 229.899994f, -0.013268f, 9.900000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_2", 2004550, 0, 4, { 0.068370f, -0.002887f, -0.230858f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_z1e1_b0598", 2005161, 5652362, 4, { 219.837494f, -0.000000f, -20.737341f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_1", 2005198, 5675943, 4, { 234.366592f, -0.000818f, -14.481080f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_2", 2005199, 5675944, 4, { 238.872803f, -0.002887f, -0.791933f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_3", 2005200, 5675945, 4, { 233.135101f, -0.002692f, 13.732260f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_4", 2005201, 5675946, 4, { 220.264893f, -0.002887f, 18.895180f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_5", 2005202, 5675947, 4, { 206.385605f, -0.002087f, 13.131840f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_6", 2005203, 5675948, 4, { 201.101196f, -0.002887f, -0.591635f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_7", 2005204, 5675951, 4, { 206.584305f, -0.002887f, -14.412730f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_8", 2005205, 5675952, 4, { 227.781204f, -0.002888f, -8.587747f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_9", 2005206, 5675953, 4, { 227.676605f, -0.002889f, 8.141966f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_10", 2005207, 5675954, 4, { 211.709396f, -0.002890f, 7.657639f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+      instance->registerEObj( "sgvf_z1e1_b0598_11", 2005208, 5675955, 4, { 211.825500f, -0.001177f, -9.651319f }, 1.000000f, 0.000000f ); 
+      // States -> crack_def crack_01 crack_01_anim crack_02 crack_02_anim crack_03 crack_03_anim crack_04 crack_04_anim 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
index d3e1ce7f..87d7900c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
@@ -10,57 +10,63 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f );
-      instance->registerEObj( "Unknown0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f );
-      instance->registerEObj( "Thalsscepter", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f );
-      instance->registerEObj( "Thalsscepter", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f );
-      instance->registerEObj( "Thalsscepter", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f );
-      instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f );
-      instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f );
-      instance->registerEObj( "Shadowyorb", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f );
-      instance->registerEObj( "Shadowyorb", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f );
-      instance->registerEObj( "Shadowyorb", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f );
-      instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f );
-      instance->registerEObj( "Unknown9", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f );
-      instance->registerEObj( "Unknown11", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f );
-      instance->registerEObj( "Unknown14", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f );
-      instance->registerEObj( "Unknown15", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f );
-      instance->registerEObj( "Unknown16", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f );
-      instance->registerEObj( "Unknown20", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f );
-      instance->registerEObj( "Unknown21", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f );
-      instance->registerEObj( "Unknown26", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f );
-      instance->registerEObj( "Unknown27", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f );
-      instance->registerEObj( "Unknown28", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f );
-      instance->registerEObj( "Unknown29", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f );
-      instance->registerEObj( "Unknown31", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f );
-      instance->registerEObj( "Unknown32", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f );
-      instance->registerEObj( "Unknown33", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f );
-      instance->registerEObj( "Unknown34", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f );
-      instance->registerEObj( "Unknown35", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f );
-      instance->registerEObj( "Unknown36", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f );
+      instance->registerEObj( "Thalsscepter", 2003646, 0, 4, { -270.088409f, 17.593571f, 31.956100f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_0", 2003695, 4617495, 4, { -280.035614f, 17.622829f, 22.302071f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2003696, 4563389, 4, { -286.231689f, 17.622749f, 20.657721f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Thalsscepter_1", 2003674, 0, 4, { -271.908386f, 17.593571f, 6.173567f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Thalsscepter_2", 2003675, 0, 4, { -244.251801f, 17.593571f, 30.251480f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Thalsscepter_3", 2003676, 0, 4, { -246.038696f, 17.593571f, 4.371015f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Mammetactivator", 2003641, 4616318, 4, { -84.695412f, -10.178000f, -91.555862f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shadowyorb", 2003642, 0, 4, { 163.469803f, 6.240906f, 219.745102f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shadowyorb_1", 2003643, 0, 4, { 154.283905f, 6.240900f, 239.520905f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shadowyorb_2", 2003644, 0, 4, { 143.742905f, 6.240900f, 210.525208f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Shadowyorb_3", 2003645, 0, 4, { 134.607193f, 6.240900f, 230.328094f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003569, 4603298, 4, { 148.951706f, 4.509544f, 224.628006f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Exit", 2001610, 4569374, 4, { -278.262390f, 17.622650f, 19.181259f }, 0.991760f, 0.000048f ); 
+      // States -> vf_htras1_on vf_htras1_of 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { 139.879395f, -0.228372f, -31.551029f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Entrance", 2000182, 4569369, 5, { 149.187393f, -0.228943f, -35.111019f }, 0.991760f, 0.000048f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "unknown_3", 2002575, 0, 4, { 160.775299f, -1.641945f, -10.606120f }, 0.991760f, -1.265160f ); 
+      instance->registerEObj( "unknown_4", 2002735, 0, 4, { -50.385818f, -10.178000f, -114.820198f }, 0.991760f, -1.005012f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118", 2002872, 4569384, 4, { -48.920971f, -10.792460f, -116.285103f }, 0.991760f, -1.062825f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_5", 2002735, 0, 4, { 129.072403f, 4.509535f, 216.306305f }, 1.000000f, 1.129171f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_1", 2002872, 4569379, 4, { 130.018494f, 4.509536f, 217.130295f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_6", 2002735, 0, 4, { -233.786301f, 17.622999f, 16.764700f }, 1.000000f, -1.486617f ); 
+      instance->registerEObj( "sgvf_w_lvd_b0118_2", 2002872, 4569389, 4, { -233.389206f, 17.622990f, 16.739140f }, 0.991760f, 0.000048f ); 
+      // States -> vf_bextwall_on vf_bextwall_of 
+      instance->registerEObj( "unknown_7", 2003506, 4594991, 4, { 101.606300f, -4.171019f, -69.914146f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_8", 2003507, 4598981, 4, { -41.245178f, -10.879700f, -121.934898f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_9", 2003508, 4603945, 4, { -52.140079f, -10.696590f, -91.691528f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_10", 2003509, 4564172, 4, { 130.022095f, -0.534058f, 5.172791f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_11", 2003510, 4594992, 4, { 123.552200f, -2.731445f, 25.131590f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_12", 2003511, 4598084, 4, { 89.130997f, -3.711910f, 78.724213f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_13", 2003512, 4599477, 4, { 73.157578f, -3.335556f, 178.491302f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_14", 2003513, 4594999, 4, { 100.220802f, 0.477127f, 203.242798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_15", 2003514, 4616527, 4, { 167.865707f, 4.509536f, 233.584396f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_16", 2003515, 4567234, 4, { -191.532196f, 4.456180f, 94.520203f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_17", 2003516, 4567237, 4, { -128.869400f, 12.073380f, 96.752960f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_18", 2003517, 4567232, 4, { -66.065460f, 14.565810f, 26.350080f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_19", 2003518, 4567230, 4, { -171.754501f, 12.467810f, 12.301850f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_20", 2003519, 4596306, 4, { -198.995102f, 11.315890f, 13.488570f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_21", 2003520, 4565306, 4, { 96.452271f, -3.738525f, 39.688599f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_22", 2003521, 4565309, 4, { 127.885902f, -3.738525f, 60.807129f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_23", 2003522, 4565307, 4, { 82.383423f, -3.646973f, 59.189701f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_24", 2003523, 4565308, 4, { 108.323700f, -3.738525f, 80.552368f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_25", 2003524, 4565302, 4, { -2.324507f, 0.927634f, 144.329300f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_26", 2003525, 4565303, 4, { 27.311819f, 0.927548f, 166.238098f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_27", 2003526, 4565305, 4, { 68.331223f, 0.927661f, 136.889404f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_28", 2003527, 4595900, 4, { 77.372299f, -10.608900f, -91.074203f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_29", 2003528, 4595901, 4, { 36.027271f, -9.635880f, -104.808601f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_30", 2003529, 4595903, 4, { 2.165477f, -11.282240f, -188.867599f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_31", 2003530, 4618276, 4, { -10.216280f, -11.049250f, -152.788300f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_32", 2003531, 4595904, 4, { -21.241859f, -11.023320f, -136.299393f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance_1", 2000182, 4970117, 5, { -243.015701f, 19.074579f, 10.923530f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit_1", 2000139, 0, 4, { -272.688904f, 19.074579f, 18.222231f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
index 8b0a753a..e78bc016 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
@@ -10,12 +10,13 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
index ff93e39d..d68235af 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
@@ -10,17 +10,18 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000274, 4246117, 4, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f );
+      instance->registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
index 4af8ecbf..652473a0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
@@ -10,17 +10,18 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000274, 4246117, 4, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f );
+      instance->registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
index 56189028..c5d38f2b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
@@ -10,17 +10,18 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2000274, 4246117, 4, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f );
+      instance->registerEObj( "sgbg_r1fa_a_rockcol", 2000646, 4256721, 4, { -4.592406f, -1.261766f, 4.724565f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_1", 2000647, 4256725, 4, { 7.587256f, -1.233237f, 6.169516f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_2", 2000648, 4256726, 4, { -6.329784f, 3.332559f, -6.736721f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_3", 2000649, 4256727, 4, { 5.895649f, 3.275768f, -6.217119f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_4", 2000646, 4488538, 4, { -7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_5", 2000647, 4488545, 4, { 7.000000f, 0.000000f, 7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_6", 2000648, 4488546, 4, { -7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgbg_r1fa_a_rockcol_7", 2000649, 4488548, 4, { 7.000000f, 0.000000f, -7.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000274, 4246117, 5, { 0.506547f, -1.935848f, 14.110570f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000275, 0, 4, { 1.078937f, -2.041544f, -18.363190f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp
new file mode 100644
index 00000000..54b05f33
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheJadeStoa : public InstanceContentScript
+{
+public:
+   TheJadeStoa() : InstanceContentScript( 20051 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp
new file mode 100644
index 00000000..a50111ac
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp
@@ -0,0 +1,26 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheJadeStoaExtreme : public InstanceContentScript
+{
+public:
+   TheJadeStoaExtreme() : InstanceContentScript( 20052 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
index 3ece7f65..d275b155 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
@@ -10,15 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Magitekfieldgenerator", 2005541, 0, 4, { -15.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Dragonkiller", 2005544, 0, 4, { -13.000000f, 0.182584f, -17.700001f }, 1.000000f );
-      instance->registerEObj( "Dragonkiller", 2005545, 0, 4, { -14.150000f, 0.168036f, 19.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2005847, 5865535, 4, { -5.185479f, 0.084680f, 0.234906f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005958, 5898723, 4, { -3.398252f, 0.016719f, -0.449336f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005965, 5874950, 4, { -14.475140f, 0.010675f, 5.614964f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5778232, 5, { -26.139870f, 0.000001f, -0.197510f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -4.281307f, 0.000000f, 0.000000f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
index 737d7271..639f4bea 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
@@ -10,15 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Magitekfieldgenerator", 2005541, 0, 4, { -15.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Dragonkiller", 2005544, 0, 4, { -13.000000f, 0.182584f, -17.700001f }, 1.000000f );
-      instance->registerEObj( "Dragonkiller", 2005545, 0, 4, { -14.150000f, 0.168036f, 19.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown0", 2005847, 5865535, 4, { -5.185479f, 0.084680f, 0.234906f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005958, 5898723, 4, { -3.398252f, 0.016719f, -0.449336f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005965, 5874950, 4, { -14.475140f, 0.010675f, 5.614964f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5778232, 5, { -26.139870f, 0.000001f, -0.197510f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -4.281307f, 0.000000f, 0.000000f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
index 8d9b7208..d3f10b96 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
@@ -10,12 +10,13 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2007132, 0, 4, { 1.180504f, -0.000001f, -5.348264f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2007360, 0, 4, { 0.893822f, -0.000029f, 9.867915f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 6243772, 5, { 5.791933f, 0.049998f, 17.147869f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.802442f, 0.050000f, -16.948071f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2007393, 6279966, 4, { 0.867247f, -0.000024f, 9.141238f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
index 19889690..ffea8947 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
@@ -10,26 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 7034110, 5, { -21.048290f, -380.000092f, 1.297991f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 620.000000f, 20.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007457, 7023869, 4, { -16.594919f, -380.000092f, -17.432211f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7023871, 4, { -0.213646f, -380.000092f, -17.432211f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 7023870, 4, { 19.761841f, -380.000092f, -17.432211f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 7023865, 4, { -16.594919f, -380.000092f, 0.746161f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 7023864, 4, { 20.591261f, -380.000092f, 1.852063f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 7023866, 4, { -16.594919f, -380.000092f, 20.030439f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 7023868, 4, { 1.859938f, -380.000092f, 20.168671f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 7023867, 4, { 21.489799f, -380.000092f, 20.306919f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 7023863, 4, { 0.270193f, -380.000092f, 0.884399f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 7024624, 4, { -5.336151f, -380.000000f, 8.195240f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 7024837, 4, { 17.385090f, 620.000000f, -3.965453f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 7024899, 4, { 15.077030f, 620.000000f, -79.248016f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2007457, 7032157, 4, { 7.331779f, 620.000000f, 0.488136f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2007457, 7032193, 4, { 9.743866f, 620.000000f, -5.475266f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2009049, 0, 4, { 20.000000f, 620.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2009065, 0, 4, { -0.015030f, 619.988770f, -6.068220f }, 0.991760f );
-      instance->registerEObj( "Unknown17", 2009073, 0, 4, { -20.000000f, 620.000000f, 0.000000f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
deleted file mode 100644
index 0828d89c..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheMinstrelsBalladThordansReign : public InstanceContentScript
-{
-public:
-   TheMinstrelsBalladThordansReign() : InstanceContentScript( 20036 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006312, 5922953, 4, { -7.224293f, 0.039305f, -2.496346f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005944, 5895686, 4, { 12.728000f, 0.012478f, -12.728000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005945, 5895687, 4, { 12.728000f, 0.012478f, 12.728000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2005946, 5895690, 4, { -12.728000f, 0.012478f, 12.728000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2005947, 5895691, 4, { -12.728000f, 0.012478f, -12.728000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2005915, 5894863, 4, { 9.000000f, 0.012478f, -16.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005916, 5894864, 4, { 18.000000f, 0.012478f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005917, 5894866, 4, { 9.000000f, 0.012478f, 16.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005918, 5894867, 4, { -9.000000f, 0.012478f, 16.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005919, 5894868, 4, { -18.000000f, 0.012478f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2005920, 5894869, 4, { -9.000000f, 0.012478f, -16.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2005914, 5894871, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2005913, 5894872, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006575, 6061720, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006576, 6061721, 4, { 0.000000f, 0.039305f, -19.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006577, 6061722, 4, { 19.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006578, 6061723, 4, { 0.000000f, 0.039305f, 19.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006579, 6061724, 4, { -19.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006580, 6061725, 4, { 8.485300f, 0.039305f, -8.485300f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2006581, 6061727, 4, { 8.485300f, 0.039304f, 9.619522f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2006582, 6061728, 4, { -8.499329f, 0.015198f, 9.174744f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2006583, 6061730, 4, { -8.485300f, 0.039305f, -8.485300f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2006567, 6046991, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2006568, 6059913, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2006569, 6059911, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2006570, 6047214, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2006571, 6059909, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2006572, 6047213, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2006573, 6059910, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2006574, 6059912, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2006587, 6056540, 4, { -0.607457f, 0.039305f, -0.008893f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5854853, 5, { 0.035266f, 0.012478f, 11.380060f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.012478f, -18.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
index 668057d5..49b620a1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
@@ -10,15 +10,16 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2002745, 4391076, 4, { 7.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2002746, 4391074, 4, { -7.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2002747, 4976890, 4, { 0.000000f, -0.131581f, -18.566719f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2002748, 4391072, 4, { 17.676531f, -0.144861f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2002749, 4976892, 4, { 0.000000f, 0.000000f, 17.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002750, 4976891, 4, { -17.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4391941, 5, { -6.677185f, 0.068419f, 12.835030f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.316700f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2002745, 4391076, 4, { 7.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2002746, 4391074, 4, { -7.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2002747, 4976890, 4, { 0.000000f, -0.131581f, -18.566719f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2002748, 4391072, 4, { 17.676531f, -0.144861f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_4", 2002749, 4976892, 4, { 0.000000f, 0.000000f, 17.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2002750, 4976891, 4, { -17.000000f, 0.000000f, 0.000000f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4391941, 5, { -6.677185f, 0.068419f, 12.835030f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.316700f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index ebe4aa36..2efd3da7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
index 9cfe81f7..4c1e97ed 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
index 2b070eed..5dd7fdf2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4236868, 5, { 0.000000f, 0.000000f, 24.000000f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
index 9a17edeb..405eecc2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
@@ -10,11 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Bladesshadow", 2008185, 6849163, 4, { -0.015320f, 0.206439f, -5.020264f }, 0.991760f );
-      instance->registerEObj( "Unknown0", 2008184, 6843593, 4, { -4.501404f, 0.200000f, 8.957031f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6847132, 5, { -3.489120f, 0.200000f, 16.024530f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.357571f, 0.200000f, -11.800290f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
index ca213701..a47acfd6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
@@ -10,11 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Bladesshadow", 2008185, 6849163, 4, { -0.015320f, 0.206439f, -5.020264f }, 0.991760f );
-      instance->registerEObj( "Unknown0", 2008184, 6843593, 4, { -4.501404f, 0.200000f, 8.957031f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 6847132, 5, { -3.489120f, 0.200000f, 16.024530f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.357571f, 0.200000f, -11.800290f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
index a9ab32aa..ac6b2f6a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
@@ -10,22 +10,7 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 6842660, 5, { -12.652360f, -380.000000f, 1.417362f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.015320f, 620.000000f, -6.698792f }, 0.991760f );
-      instance->registerEObj( "Barrelsoffiresand", 2003127, 0, 4, { -0.108200f, -380.000000f, 0.890151f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2007457, 6858507, 4, { -0.819489f, -380.000000f, 1.685981f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 6953496, 4, { -1.111895f, -380.000000f, 11.857690f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007457, 6797912, 4, { -13.550160f, 620.000000f, -23.367689f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007457, 6797914, 4, { -6.156202f, 620.000000f, -24.638531f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2007457, 6797913, 4, { 14.468520f, 620.000000f, -17.925461f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007457, 6797908, 4, { -13.109160f, 620.000000f, -3.235081f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007457, 6797907, 4, { 14.608040f, 620.000000f, 0.876270f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007457, 6797909, 4, { -13.849610f, 620.000000f, 15.100500f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007457, 6797911, 4, { 7.597056f, 620.000000f, 16.291180f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007457, 6797910, 4, { 14.168900f, 620.000000f, 15.941650f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007457, 6797906, 4, { 6.113630f, 620.000000f, 5.558393f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007457, 6925491, 4, { 8.519539f, 620.000000f, 7.842079f }, 1.000000f );
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
deleted file mode 100644
index 7752bc41..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSingularityReactor : public InstanceContentScript
-{
-public:
-   TheSingularityReactor() : InstanceContentScript( 20035 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006312, 5922953, 4, { -7.224293f, 0.039305f, -2.496346f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005944, 5895686, 4, { 12.728000f, 0.012478f, -12.728000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005945, 5895687, 4, { 12.728000f, 0.012478f, 12.728000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2005946, 5895690, 4, { -12.728000f, 0.012478f, 12.728000f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2005947, 5895691, 4, { -12.728000f, 0.012478f, -12.728000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2005915, 5894863, 4, { 9.000000f, 0.012478f, -16.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005916, 5894864, 4, { 18.000000f, 0.012478f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005917, 5894866, 4, { 9.000000f, 0.012478f, 16.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005918, 5894867, 4, { -9.000000f, 0.012478f, 16.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005919, 5894868, 4, { -18.000000f, 0.012478f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2005920, 5894869, 4, { -9.000000f, 0.012478f, -16.600000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2005914, 5894871, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2005913, 5894872, 4, { 0.000000f, 0.012478f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown13", 2006575, 6061720, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2006576, 6061721, 4, { 0.000000f, 0.039305f, -19.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2006577, 6061722, 4, { 19.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2006578, 6061723, 4, { 0.000000f, 0.039305f, 19.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2006579, 6061724, 4, { -19.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2006580, 6061725, 4, { 8.485300f, 0.039305f, -8.485300f }, 1.000000f );
-      instance->registerEObj( "Unknown19", 2006581, 6061727, 4, { 8.485300f, 0.039304f, 9.619522f }, 1.000000f );
-      instance->registerEObj( "Unknown20", 2006582, 6061728, 4, { -8.499329f, 0.015198f, 9.174744f }, 0.991760f );
-      instance->registerEObj( "Unknown21", 2006583, 6061730, 4, { -8.485300f, 0.039305f, -8.485300f }, 1.000000f );
-      instance->registerEObj( "Unknown22", 2006567, 6046991, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown23", 2006568, 6059913, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown24", 2006569, 6059911, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown25", 2006570, 6047214, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown26", 2006571, 6059909, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown27", 2006572, 6047213, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown28", 2006573, 6059910, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown29", 2006574, 6059912, 4, { 0.000000f, 0.039305f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown30", 2006587, 6056540, 4, { -0.607457f, 0.039305f, -0.008893f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5854853, 5, { 0.035266f, 0.012478f, 11.380060f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.012478f, -18.000000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
index a9ba8b6f..224ae0ad 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
@@ -10,30 +10,34 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Dragonkiller", 2004760, 4999878, 4, { 43.311161f, 37.600201f, 35.701099f }, 1.000000f );
-      instance->registerEObj( "Dragonkiller", 2004761, 4999884, 4, { -43.632969f, 37.582890f, -115.844101f }, 0.991760f );
-      instance->registerEObj( "Dragonkiller", 2004762, 4999881, 4, { 43.015141f, 37.582890f, -284.251709f }, 0.991760f );
-      instance->registerEObj( "Unknown0", 2004767, 4886787, 4, { -3.110714f, 0.000000f, -348.303711f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2004757, 0, 4, { 2.667883f, 0.324675f, 123.758301f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2004758, 0, 4, { 4.085252f, 0.000000f, -28.159849f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2004759, 0, 4, { 1.381998f, 0.000000f, -194.763107f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2004763, 5038552, 4, { 0.000000f, -0.000000f, 45.788021f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2004764, 5038553, 4, { -0.015320f, -0.015320f, -114.274803f }, 0.991760f );
-      instance->registerEObj( "Unknown6", 2004765, 5038554, 4, { -0.015320f, -0.000000f, -276.691895f }, 0.991760f );
-      instance->registerEObj( "Snare", 2005115, 0, 4, { -18.000000f, 0.045776f, -155.000000f }, 0.991760f );
-      instance->registerEObj( "Snare", 2005116, 0, 4, { 18.000000f, 0.045776f, -155.016403f }, 0.991760f );
-      instance->registerEObj( "Snare", 2005117, 0, 4, { -18.000000f, 0.045776f, -315.022491f }, 0.991760f );
-      instance->registerEObj( "Snare", 2005118, 0, 4, { 18.000000f, 0.045776f, -315.022491f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2005215, 5698814, 4, { 46.280449f, 37.600201f, 45.540260f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005216, 5698815, 4, { -42.818661f, 37.600201f, -120.297798f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005217, 5698817, 4, { 43.612808f, 37.600201f, -279.243195f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 5035236, 5, { 5.791933f, 0.049998f, 253.589600f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, -350.057312f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -5.264404f, 0.045776f, 248.188004f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000104f, 125.000000f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.079958f, -35.000000f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -195.000000f }, 0.991760f );
+      instance->registerEObj( "Dragonkiller", 2004760, 4999878, 4, { 43.311161f, 37.600201f, 35.701099f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Dragonkiller_1", 2004761, 4999884, 4, { -43.632969f, 37.582890f, -115.844101f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Dragonkiller_2", 2004762, 4999881, 4, { 43.015141f, 37.582890f, -284.251709f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_0", 2004767, 4886787, 4, { -3.110714f, 0.000000f, -348.303711f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2004757, 0, 4, { 2.667883f, 0.324675f, 123.758301f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2004758, 0, 4, { 4.085252f, 0.000000f, -28.159849f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2004759, 0, 4, { 1.381998f, 0.000000f, -194.763107f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "sgvf_r1fd_b0536", 2004763, 5038552, 4, { 0.000000f, -0.000000f, 45.788021f }, 1.000000f, 0.000000f ); 
+      // States -> bal_t_def bal_t_def_anim bal_t_pop bal_t_pop_anim 
+      instance->registerEObj( "sgvf_r1fd_b0536_1", 2004764, 5038553, 4, { -0.015320f, -0.015320f, -114.274803f }, 0.991760f, 0.000048f ); 
+      // States -> bal_t_def bal_t_def_anim bal_t_pop bal_t_pop_anim 
+      instance->registerEObj( "sgvf_r1fd_b0536_2", 2004765, 5038554, 4, { -0.015320f, -0.000000f, -276.691895f }, 0.991760f, 0.000048f ); 
+      // States -> bal_t_def bal_t_def_anim bal_t_pop bal_t_pop_anim 
+      instance->registerEObj( "Snare", 2005115, 0, 4, { -18.000000f, 0.045776f, -155.000000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Snare_1", 2005116, 0, 4, { 18.000000f, 0.045776f, -155.016403f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Snare_2", 2005117, 0, 4, { -18.000000f, 0.045776f, -315.022491f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Snare_3", 2005118, 0, 4, { 18.000000f, 0.045776f, -315.022491f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "unknown_4", 2005215, 5698814, 4, { 46.280449f, 37.600201f, 45.540260f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_5", 2005216, 5698815, 4, { -42.818661f, 37.600201f, -120.297798f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_6", 2005217, 5698817, 4, { 43.612808f, 37.600201f, -279.243195f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 5035236, 5, { 5.791933f, 0.049998f, 253.589600f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, -0.000000f, -350.057312f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -5.264404f, 0.045776f, 248.188004f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit_1", 2000139, 0, 4, { 0.000000f, -0.000104f, 125.000000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit_2", 2000139, 0, 4, { 0.000000f, -0.079958f, -35.000000f }, 0.991760f, 0.000048f ); 
+      instance->registerEObj( "Exit_3", 2000139, 0, 4, { 0.000000f, 0.000000f, -195.000000f }, 0.991760f, 0.000048f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
index a323aedb..bc0aea28 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
index decc24bb..d866046c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4712008, 5, { 5.026201f, 74.994751f, 16.039301f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 75.000000f, -7.671923f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
index 30439db6..2ce3763e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
@@ -10,14 +10,15 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f );
-      instance->registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
index 3a90cdcf..6c23fa40 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
@@ -10,14 +10,15 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Unknown0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f );
-      instance->registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f );
+      instance->registerEObj( "unknown_0", 2003496, 4600311, 4, { 4.240293f, 0.025694f, 2.306607f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_1", 2003497, 4600310, 4, { 0.072974f, 0.025694f, 3.729535f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Elementalconverter", 2003498, 4600308, 4, { -0.068011f, 0.025694f, 18.829760f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_2", 2003499, 4600477, 4, { -0.427824f, 0.025694f, -1.602400f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "unknown_3", 2003503, 4536477, 4, { -4.721506f, 0.025694f, -0.558033f }, 1.000000f, 0.000000f ); 
+      instance->registerEObj( "Entrance", 2000182, 4600244, 5, { 2.559847f, 0.025694f, 16.605810f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.025694f, -15.000000f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
deleted file mode 100644
index 4bcadff3..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ThokastThokExtreme : public InstanceContentScript
-{
-public:
-   ThokastThokExtreme() : InstanceContentScript( 20032 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005385, 5674976, 4, { -1.192890f, 0.000000f, 17.474220f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005386, 5675419, 4, { -13.222250f, 0.000000f, 12.212180f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005387, 5675420, 4, { -18.468269f, 0.000000f, 0.628434f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2005388, 5675421, 4, { -13.285940f, 0.000000f, -12.470450f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2005389, 5675422, 4, { 0.342176f, 0.000000f, -18.571230f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2005390, 5675423, 4, { 12.720200f, 0.000000f, -12.658900f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005391, 5675424, 4, { 17.782970f, 0.000000f, -0.534297f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005392, 5687664, 4, { 13.452240f, 0.000000f, 12.733450f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005393, 5797622, 4, { -8.704693f, 0.000000f, 1.700043f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005394, 5797549, 4, { -1.334651f, 0.000000f, -2.316425f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2005385, 5674976, 4, { 3.622319f, -0.000001f, 15.464100f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2005386, 5675419, 4, { -11.612120f, -0.015320f, 13.595760f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2005387, 5675420, 4, { -17.196960f, -0.015320f, 2.304016f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2005388, 5675421, 4, { -13.697780f, 0.000000f, -10.715490f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2005389, 5675422, 4, { -2.138674f, 0.000000f, -16.784149f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2005390, 5675423, 4, { 12.378810f, 0.000000f, -10.929330f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2005391, 5675424, 4, { 17.679670f, 0.000000f, 1.168503f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005392, 5687664, 4, { 12.017570f, 0.000000f, 13.670370f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2005393, 5797622, 4, { -10.360960f, -0.015320f, 2.975464f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2005394, 5797549, 4, { -9.475891f, -0.015320f, 4.837097f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5774826, 5, { -4.440430f, -0.015320f, 14.846980f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.068703f, -0.000001f, -13.884950f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
deleted file mode 100644
index ea3abd56..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ThokastThokHard : public InstanceContentScript
-{
-public:
-   ThokastThokHard() : InstanceContentScript( 20031 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2005385, 5674976, 4, { -1.192890f, 0.000000f, 17.474220f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2005386, 5675419, 4, { -13.222250f, 0.000000f, 12.212180f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2005387, 5675420, 4, { -18.468269f, 0.000000f, 0.628434f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2005388, 5675421, 4, { -13.285940f, 0.000000f, -12.470450f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2005389, 5675422, 4, { 0.342176f, 0.000000f, -18.571230f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2005390, 5675423, 4, { 12.720200f, 0.000000f, -12.658900f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2005391, 5675424, 4, { 17.782970f, 0.000000f, -0.534297f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2005392, 5687664, 4, { 13.452240f, 0.000000f, 12.733450f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2005393, 5797622, 4, { -8.704693f, 0.000000f, 1.700043f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2005394, 5797549, 4, { -1.334651f, 0.000000f, -2.316425f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2005385, 5674976, 4, { 3.622319f, -0.000001f, 15.464100f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2005386, 5675419, 4, { -11.612120f, -0.015320f, 13.595760f }, 0.991760f );
-      instance->registerEObj( "Unknown12", 2005387, 5675420, 4, { -17.196960f, -0.015320f, 2.304016f }, 0.991760f );
-      instance->registerEObj( "Unknown13", 2005388, 5675421, 4, { -13.697780f, 0.000000f, -10.715490f }, 1.000000f );
-      instance->registerEObj( "Unknown14", 2005389, 5675422, 4, { -2.138674f, 0.000000f, -16.784149f }, 1.000000f );
-      instance->registerEObj( "Unknown15", 2005390, 5675423, 4, { 12.378810f, 0.000000f, -10.929330f }, 1.000000f );
-      instance->registerEObj( "Unknown16", 2005391, 5675424, 4, { 17.679670f, 0.000000f, 1.168503f }, 1.000000f );
-      instance->registerEObj( "Unknown17", 2005392, 5687664, 4, { 12.017570f, 0.000000f, 13.670370f }, 1.000000f );
-      instance->registerEObj( "Unknown18", 2005393, 5797622, 4, { -10.360960f, -0.015320f, 2.975464f }, 0.991760f );
-      instance->registerEObj( "Unknown19", 2005394, 5797549, 4, { -9.475891f, -0.015320f, 4.837097f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 5774826, 5, { -4.440430f, -0.015320f, 14.846980f }, 0.991760f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { -0.068703f, -0.000001f, -13.884950f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
index 84d42bd8..6c22edf9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
index 6fbf1f0a..45b79f67 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 4377976, 5, { -5.269677f, 0.467326f, 14.257640f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.014298f, -0.000000f, -17.786249f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
index df2d3344..46ff5b78 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
@@ -10,9 +10,10 @@ public:
 
    void onInit( InstanceContentPtr instance ) override
    {
-      
-      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f );
+      instance->registerEObj( "Entrance", 2000182, 5021407, 5, { 623.000000f, 23.872311f, 94.505638f }, 1.000000f, 0.000000f ); 
+      // States -> vf_lock_on vf_lock_of 
+      instance->registerEObj( "Exit", 2000139, 0, 4, { 623.000000f, 23.656260f, 61.956181f }, 1.000000f, 0.000000f ); 
+
    }
 
    void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
deleted file mode 100644
index 4d9b24db..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoa.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheJadeStoa : public InstanceContentScript
-{
-public:
-   TheJadeStoa() : InstanceContentScript( 20051 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2009431, 0, 4, { -2.722647f, -0.000001f, 7.311604f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 7174720, 5, { 5.504887f, 0.000000f, 14.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7181535, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2009214, 0, 4, { 2.987230f, 0.000000f, -2.908927f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
deleted file mode 100644
index 4be07fc6..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/thefourlords/TheJadeStoaExtreme.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheJadeStoaExtreme : public InstanceContentScript
-{
-public:
-   TheJadeStoaExtreme() : InstanceContentScript( 20052 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2009431, 0, 4, { -2.722647f, -0.000001f, 7.311604f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 7174720, 5, { 5.504887f, 0.000000f, 14.000000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007457, 7181535, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2009214, 0, 4, { 2.987230f, 0.000000f, -2.908927f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
deleted file mode 100644
index 89399d94..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ContainmentBayP1T6 : public InstanceContentScript
-{
-public:
-   ContainmentBayP1T6() : InstanceContentScript( 20041 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007340, 6383469, 4, { -0.194161f, 0.000000f, 3.451970f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007442, 6424145, 4, { -5.251681f, 0.000000f, -1.313751f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007443, 0, 4, { -4.046182f, 0.000000f, 3.618896f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007449, 0, 4, { 2.914429f, -0.015320f, -2.731445f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007464, 0, 4, { -0.015320f, -0.015320f, -14.419800f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002618, 6563705, 4, { 6.090889f, 0.000000f, -1.422338f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6392588, 5, { 0.132306f, 0.592461f, 10.611330f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.001971f, 0.000000f, -11.776730f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
deleted file mode 100644
index b3a5299d..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayP1T6Extreme.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ContainmentBayP1T6Extreme : public InstanceContentScript
-{
-public:
-   ContainmentBayP1T6Extreme() : InstanceContentScript( 20042 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007340, 6383469, 4, { -0.194161f, 0.000000f, 3.451970f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007442, 6424145, 4, { -5.251681f, 0.000000f, -1.313751f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007443, 0, 4, { -4.046182f, 0.000000f, 3.618896f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007449, 0, 4, { 2.914429f, -0.015320f, -2.731445f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2007464, 0, 4, { -0.015320f, -0.015320f, -14.419800f }, 0.991760f );
-      instance->registerEObj( "Unknown5", 2002618, 6563705, 4, { 6.090889f, 0.000000f, -1.422338f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6392588, 5, { 0.132306f, 0.592461f, 10.611330f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.001971f, 0.000000f, -11.776730f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
deleted file mode 100644
index 93099950..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ContainmentBayS1T7 : public InstanceContentScript
-{
-public:
-   ContainmentBayS1T7() : InstanceContentScript( 20037 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
deleted file mode 100644
index dbeb8d02..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayS1T7Extreme.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ContainmentBayS1T7Extreme : public InstanceContentScript
-{
-public:
-   ContainmentBayS1T7Extreme() : InstanceContentScript( 20038 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2006840, 6175219, 4, { 0.000000f, 0.000000f, -10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2006841, 6175220, 4, { 7.071130f, 0.000000f, -7.071100f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2006842, 6175221, 4, { 10.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2006843, 6175222, 4, { 7.071130f, 0.000000f, 7.071130f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2006844, 6175223, 4, { 0.000000f, 0.000000f, 10.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2006845, 6175224, 4, { -7.071130f, 0.000000f, 7.071100f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2006846, 6175225, 4, { -10.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2006847, 6175226, 4, { -7.071130f, 0.000000f, -7.071130f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2006837, 6174136, 4, { 0.000000f, 0.052026f, -19.799999f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2006839, 6164929, 4, { 0.000000f, 0.002934f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2006838, 6171564, 4, { 0.116409f, 0.002934f, -0.768936f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2006840, 6175957, 4, { -0.836018f, 0.050520f, -2.055523f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2006983, 6219989, 4, { 0.000000f, 0.043380f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6173855, 5, { -0.006781f, 0.052026f, 13.691250f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -16.500000f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
deleted file mode 100644
index e7db55a1..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ContainmentBayZ1T9 : public InstanceContentScript
-{
-public:
-   ContainmentBayZ1T9() : InstanceContentScript( 20043 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007719, 0, 4, { 5.447040f, 0.000002f, -9.308832f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007720, 0, 4, { 9.576125f, 0.000002f, -3.402662f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007716, 0, 4, { 11.420000f, 0.000004f, 11.783210f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007717, 0, 4, { -11.656410f, -0.000002f, 12.218210f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007718, 0, 4, { -17.805031f, 0.000000f, 4.207765f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6625715, 5, { 0.000000f, 0.000000f, 14.500000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007689, 6621345, 4, { -3.765648f, 0.000001f, 14.953240f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007690, 6643541, 4, { -12.141200f, -0.000001f, 4.715301f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007691, 6621347, 4, { 5.404188f, 0.000000f, -14.762600f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007692, 6621352, 4, { 14.969930f, 0.000002f, -2.525420f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007693, 6621398, 4, { -1.996956f, 0.000000f, 6.613101f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007694, 6621516, 4, { 5.478731f, 0.000000f, 9.952977f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007695, 0, 4, { 5.515548f, 0.000000f, 11.770850f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp
deleted file mode 100644
index 1c978f65..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/warringtriad/ContainmentBayZ1T9Extreme.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class ContainmentBayZ1T9Extreme : public InstanceContentScript
-{
-public:
-   ContainmentBayZ1T9Extreme() : InstanceContentScript( 20044 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2007719, 0, 4, { 5.447040f, 0.000002f, -9.308832f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2007720, 0, 4, { 9.576125f, 0.000002f, -3.402662f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2007716, 0, 4, { 11.420000f, 0.000004f, 11.783210f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2007717, 0, 4, { -11.656410f, -0.000002f, 12.218210f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2007718, 0, 4, { -17.805031f, 0.000000f, 4.207765f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 6625715, 5, { 0.000000f, 0.000000f, 14.500000f }, 1.000000f );
-      instance->registerEObj( "Exit", 2000139, 0, 4, { 0.000000f, 0.000000f, -14.500000f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2007689, 6621345, 4, { -3.765648f, 0.000001f, 14.953240f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2007690, 6643541, 4, { -12.141200f, -0.000001f, 4.715301f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2007691, 6621347, 4, { 5.404188f, 0.000000f, -14.762600f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2007692, 6621352, 4, { 14.969930f, 0.000002f, -2.525420f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2007693, 6621398, 4, { -1.996956f, 0.000000f, 6.613101f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2007694, 6621516, 4, { 5.478731f, 0.000000f, 9.952977f }, 1.000000f );
-      instance->registerEObj( "Unknown12", 2007695, 0, 4, { 5.515548f, 0.000000f, 11.770850f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file

From 2f126e8dece561d6c1ee4aab13822ec58d624018 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Sun, 4 Mar 2018 18:13:05 +1100
Subject: [PATCH 62/69] build fix?

---
 .../sapphire_zone/Script/ScriptLoader.h       |  3 +-
 .../Script/Scripts/ScriptObject.h             |  1 +
 .../ThePalaceoftheDeadFloors101110.cpp        |  1 -
 .../ThePalaceoftheDeadFloors110.cpp           |  1 -
 .../ThePalaceoftheDeadFloors111120.cpp        |  1 -
 .../ThePalaceoftheDeadFloors1120.cpp          |  1 -
 .../ThePalaceoftheDeadFloors121130.cpp        |  1 -
 .../ThePalaceoftheDeadFloors131140.cpp        |  1 -
 .../ThePalaceoftheDeadFloors141150.cpp        |  1 -
 .../ThePalaceoftheDeadFloors151160.cpp        |  1 -
 .../ThePalaceoftheDeadFloors161170.cpp        |  1 -
 .../ThePalaceoftheDeadFloors171180.cpp        |  1 -
 .../ThePalaceoftheDeadFloors181190.cpp        |  1 -
 .../ThePalaceoftheDeadFloors191200.cpp        |  1 -
 .../ThePalaceoftheDeadFloors2130.cpp          |  1 -
 .../ThePalaceoftheDeadFloors3140.cpp          |  1 -
 .../ThePalaceoftheDeadFloors4150.cpp          |  1 -
 .../ThePalaceoftheDeadFloors5160.cpp          |  1 -
 .../ThePalaceoftheDeadFloors6170.cpp          |  1 -
 .../ThePalaceoftheDeadFloors7180.cpp          |  1 -
 .../ThePalaceoftheDeadFloors8190.cpp          |  1 -
 .../ThePalaceoftheDeadFloors91100.cpp         |  1 -
 .../Scripts/instances/dungeons/AlaMhigo.cpp   |  1 -
 .../instances/dungeons/AmdaporKeep.cpp        |  1 -
 .../instances/dungeons/AmdaporKeepHard.cpp    |  1 -
 .../instances/dungeons/BaelsarsWall.cpp       |  1 -
 .../instances/dungeons/BardamsMettle.cpp      |  1 -
 .../instances/dungeons/BrayfloxsLongstop.cpp  |  1 -
 .../dungeons/BrayfloxsLongstopHard.cpp        |  1 -
 .../instances/dungeons/CastrumAbania.cpp      |  1 -
 .../instances/dungeons/CastrumMeridianum.cpp  |  1 -
 .../instances/dungeons/CopperbellMines.cpp    |  1 -
 .../dungeons/CopperbellMinesHard.cpp          |  1 -
 .../Scripts/instances/dungeons/CuttersCry.cpp |  1 -
 .../Scripts/instances/dungeons/DomaCastle.cpp |  1 -
 .../instances/dungeons/DzemaelDarkhold.cpp    |  1 -
 .../Scripts/instances/dungeons/Halatali.cpp   |  1 -
 .../instances/dungeons/HalataliHard.cpp       |  1 -
 .../instances/dungeons/HaukkeManor.cpp        |  1 -
 .../instances/dungeons/HaukkeManorHard.cpp    |  1 -
 .../Scripts/instances/dungeons/HellsLid.cpp   |  1 -
 .../instances/dungeons/HullbreakerIsle.cpp    |  1 -
 .../dungeons/HullbreakerIsleHard.cpp          |  1 -
 .../instances/dungeons/KuganeCastle.cpp       |  1 -
 .../Scripts/instances/dungeons/Neverreap.cpp  |  1 -
 .../instances/dungeons/PharosSirius.cpp       |  1 -
 .../instances/dungeons/PharosSiriusHard.cpp   |  1 -
 .../dungeons/SaintMociannesArboretum.cpp      |  1 -
 .../Scripts/instances/dungeons/Sastasha.cpp   |  1 -
 .../instances/dungeons/SastashaHard.cpp       |  1 -
 .../dungeons/ShisuioftheVioletTides.cpp       |  1 -
 .../Scripts/instances/dungeons/Snowcloak.cpp  |  1 -
 .../Scripts/instances/dungeons/SohmAl.cpp     |  1 -
 .../Scripts/instances/dungeons/SohmAlHard.cpp |  1 -
 .../Scripts/instances/dungeons/SohrKhai.cpp   |  1 -
 .../Scripts/instances/dungeons/TheAery.cpp    |  1 -
 .../TheAetherochemicalResearchFacility.cpp    |  1 -
 .../instances/dungeons/TheAntitower.cpp       |  1 -
 .../instances/dungeons/TheAurumVale.cpp       |  1 -
 .../dungeons/TheDrownedCityofSkalla.cpp       |  1 -
 .../instances/dungeons/TheDuskVigil.cpp       |  1 -
 .../dungeons/TheFractalContinuum.cpp          |  1 -
 .../dungeons/TheFractalContinuumHard.cpp      |  1 -
 .../dungeons/TheGreatGubalLibrary.cpp         |  1 -
 .../dungeons/TheGreatGubalLibraryHard.cpp     |  1 -
 .../instances/dungeons/TheKeeperoftheLake.cpp |  1 -
 .../dungeons/TheLostCityofAmdapor.cpp         |  1 -
 .../dungeons/TheLostCityofAmdaporHard.cpp     |  1 -
 .../instances/dungeons/ThePraetorium.cpp      |  1 -
 .../instances/dungeons/TheSirensongSea.cpp    |  1 -
 .../instances/dungeons/TheStoneVigil.cpp      |  1 -
 .../instances/dungeons/TheStoneVigilHard.cpp  |  1 -
 .../dungeons/TheSunkenTempleofQarn.cpp        |  1 -
 .../dungeons/TheSunkenTempleofQarnHard.cpp    |  1 -
 .../dungeons/TheTamTaraDeepcroft.cpp          |  1 -
 .../dungeons/TheTamTaraDeepcroftHard.cpp      |  1 -
 .../instances/dungeons/TheTempleoftheFist.cpp |  1 -
 .../dungeons/TheThousandMawsofTotoRak.cpp     |  1 -
 .../Scripts/instances/dungeons/TheVault.cpp   |  1 -
 .../instances/dungeons/TheWanderersPalace.cpp |  1 -
 .../dungeons/TheWanderersPalaceHard.cpp       |  1 -
 .../Scripts/instances/dungeons/Xelphatol.cpp  |  1 -
 .../instances/events/TheHauntedManor.cpp      |  1 -
 .../events/TheValentionesCeremony.cpp         |  1 -
 .../guildhests/AllsWellthatEndsintheWell.cpp  |  1 -
 .../instances/guildhests/AnnoytheVoid.cpp     |  1 -
 .../guildhests/BasicTrainingEnemyParties.cpp  |  1 -
 .../BasicTrainingEnemyStrongholds.cpp         |  1 -
 .../FlickingSticksandTakingNames.cpp          |  1 -
 .../guildhests/HeroontheHalfShell.cpp         |  1 -
 .../instances/guildhests/LongLivetheQueen.cpp |  1 -
 .../instances/guildhests/MorethanaFeeler.cpp  |  1 -
 .../guildhests/PullingPoisonPosies.cpp        |  1 -
 .../instances/guildhests/ShadowandClaw.cpp    |  1 -
 .../instances/guildhests/SolemnTrinity.cpp    |  1 -
 .../instances/guildhests/StingingBack.cpp     |  1 -
 .../instances/guildhests/UndertheArmor.cpp    |  1 -
 .../Scripts/instances/guildhests/WardUp.cpp   |  1 -
 .../AccrueEnmityfromMultipleTargets.cpp       |  1 -
 .../AssistAlliesinDefeatingaTarget.cpp        |  1 -
 .../AvoidAreaofEffectAttacks.cpp              |  1 -
 .../hallofthenovice/AvoidEngagedTargets.cpp   |  1 -
 .../DefeatanOccupiedTarget.cpp                |  1 -
 .../EngageEnemyReinforcements.cpp             |  1 -
 .../hallofthenovice/EngageMultipleTargets.cpp |  1 -
 .../hallofthenovice/ExecuteaComboinBattle.cpp |  1 -
 .../ExecuteaCombotoIncreaseEnmity.cpp         |  1 -
 .../ExecuteaRangedAttacktoIncreaseEnmity.cpp  |  1 -
 .../hallofthenovice/FinalExercise.cpp         |  1 -
 .../hallofthenovice/HealMultipleAllies.cpp    |  1 -
 .../instances/hallofthenovice/HealanAlly.cpp  |  1 -
 .../InteractwiththeBattlefield.cpp            |  1 -
 .../Scripts/instances/pvp/Astragalos.cpp      |  1 -
 .../Scripts/instances/pvp/SealRockSeize.cpp   |  1 -
 .../pvp/TheBorderlandRuinsSecure.cpp          |  1 -
 .../instances/pvp/TheFeast4on4LightParty.cpp  |  1 -
 .../instances/pvp/TheFeast4on4Ranked.cpp      |  1 -
 .../instances/pvp/TheFeast4on4Training.cpp    |  1 -
 .../pvp/TheFeastCustomMatchCrystalTower.cpp   |  1 -
 .../TheFeastCustomMatchFeastingGrounds.cpp    |  1 -
 .../pvp/TheFeastCustomMatchLichenweed.cpp     |  1 -
 .../Scripts/instances/pvp/TheFeastRanked.cpp  |  1 -
 .../instances/pvp/TheFeastTeamRanked.cpp      |  1 -
 .../instances/pvp/TheFeastTraining.cpp        |  1 -
 .../instances/pvp/TheFieldsofGloryShatter.cpp |  1 -
 .../instances/questbattles/ABloodyReunion.cpp |  1 -
 .../questbattles/ASpectaclefortheAges.cpp     |  1 -
 .../instances/questbattles/BloodDragoon.cpp   |  1 -
 .../instances/questbattles/BloodontheDeck.cpp |  1 -
 .../CuriousGorgeMeetsHisMatch.cpp             |  1 -
 .../instances/questbattles/DarkwingDragon.cpp |  1 -
 .../instances/questbattles/InThalsName.cpp    |  1 -
 .../questbattles/InterdimensionalRift.cpp     |  1 -
 .../questbattles/ItsProbablyaTrap.cpp         |  1 -
 .../instances/questbattles/MatsubaMayhem.cpp  |  1 -
 .../Scripts/instances/questbattles/Naadam.cpp |  1 -
 .../questbattles/OneLifeforOneWorld.cpp       |  1 -
 .../instances/questbattles/OurCompromise.cpp  |  1 -
 .../questbattles/OurUnsungHeroes.cpp          |  1 -
 .../questbattles/RaisingtheSword.cpp          |  1 -
 .../questbattles/ReturnoftheBull.cpp          |  1 -
 .../questbattles/TheBattleonBekko.cpp         |  1 -
 .../TheCarteneauFlatsHeliodrome.cpp           |  1 -
 .../questbattles/TheFaceofTrueEvil.cpp        |  1 -
 .../questbattles/TheHeartoftheProblem.cpp     |  1 -
 .../TheOrphansandtheBrokenBlade.cpp           |  1 -
 .../instances/questbattles/TheResonant.cpp    |  1 -
 .../questbattles/WhenClansCollide.cpp         |  1 -
 .../questbattles/WithHeartandSteel.cpp        |  1 -
 .../raids/AlexanderTheArmoftheFather.cpp      |  1 -
 .../AlexanderTheArmoftheFatherSavage.cpp      |  1 -
 .../raids/AlexanderTheArmoftheSon.cpp         |  1 -
 .../raids/AlexanderTheArmoftheSonSavage.cpp   |  1 -
 .../raids/AlexanderTheBreathoftheCreator.cpp  |  1 -
 .../AlexanderTheBreathoftheCreatorSavage.cpp  |  1 -
 .../raids/AlexanderTheBurdenoftheFather.cpp   |  1 -
 .../AlexanderTheBurdenoftheFatherSavage.cpp   |  1 -
 .../raids/AlexanderTheBurdenoftheSon.cpp      |  1 -
 .../AlexanderTheBurdenoftheSonSavage.cpp      |  1 -
 .../raids/AlexanderTheCuffoftheFather.cpp     |  1 -
 .../AlexanderTheCuffoftheFatherSavage.cpp     |  1 -
 .../raids/AlexanderTheCuffoftheSon.cpp        |  1 -
 .../raids/AlexanderTheCuffoftheSonSavage.cpp  |  1 -
 .../raids/AlexanderTheEyesoftheCreator.cpp    |  1 -
 .../AlexanderTheEyesoftheCreatorSavage.cpp    |  1 -
 .../raids/AlexanderTheFistoftheFather.cpp     |  1 -
 .../AlexanderTheFistoftheFatherSavage.cpp     |  1 -
 .../raids/AlexanderTheFistoftheSon.cpp        |  1 -
 .../raids/AlexanderTheFistoftheSonSavage.cpp  |  1 -
 .../raids/AlexanderTheHeartoftheCreator.cpp   |  1 -
 .../AlexanderTheHeartoftheCreatorSavage.cpp   |  1 -
 .../raids/AlexanderTheSouloftheCreator.cpp    |  1 -
 .../AlexanderTheSouloftheCreatorSavage.cpp    |  1 -
 .../Scripts/instances/raids/DeltascapeV10.cpp |  1 -
 .../instances/raids/DeltascapeV10Savage.cpp   |  1 -
 .../Scripts/instances/raids/DeltascapeV20.cpp |  1 -
 .../instances/raids/DeltascapeV20Savage.cpp   |  1 -
 .../Scripts/instances/raids/DeltascapeV30.cpp |  1 -
 .../instances/raids/DeltascapeV30Savage.cpp   |  1 -
 .../Scripts/instances/raids/DeltascapeV40.cpp |  1 -
 .../instances/raids/DeltascapeV40Savage.cpp   |  1 -
 .../Scripts/instances/raids/DunScaith.cpp     |  1 -
 .../Scripts/instances/raids/SigmascapeV10.cpp |  1 -
 .../instances/raids/SigmascapeV10Savage.cpp   |  1 -
 .../Scripts/instances/raids/SigmascapeV20.cpp |  1 -
 .../instances/raids/SigmascapeV20Savage.cpp   |  1 -
 .../Scripts/instances/raids/SigmascapeV30.cpp |  1 -
 .../instances/raids/SigmascapeV30Savage.cpp   |  1 -
 .../Scripts/instances/raids/SigmascapeV40.cpp |  1 -
 .../instances/raids/SigmascapeV40Savage.cpp   |  1 -
 .../Scripts/instances/raids/SyrcusTower.cpp   |  1 -
 .../raids/TheBindingCoilofBahamutTurn1.cpp    |  1 -
 .../raids/TheBindingCoilofBahamutTurn2.cpp    |  1 -
 .../raids/TheBindingCoilofBahamutTurn3.cpp    |  1 -
 .../raids/TheBindingCoilofBahamutTurn4.cpp    |  1 -
 .../raids/TheBindingCoilofBahamutTurn5.cpp    |  1 -
 .../raids/TheFinalCoilofBahamutTurn1.cpp      |  1 -
 .../raids/TheFinalCoilofBahamutTurn2.cpp      |  1 -
 .../raids/TheFinalCoilofBahamutTurn3.cpp      |  1 -
 .../raids/TheFinalCoilofBahamutTurn4.cpp      |  1 -
 .../raids/TheLabyrinthoftheAncients.cpp       |  1 -
 .../raids/TheRoyalCityofRabanastre.cpp        |  1 -
 .../TheSecondCoilofBahamutSavageTurn1.cpp     |  1 -
 .../TheSecondCoilofBahamutSavageTurn2.cpp     |  1 -
 .../TheSecondCoilofBahamutSavageTurn3.cpp     |  1 -
 .../TheSecondCoilofBahamutSavageTurn4.cpp     |  1 -
 .../raids/TheSecondCoilofBahamutTurn1.cpp     |  1 -
 .../raids/TheSecondCoilofBahamutTurn2.cpp     |  1 -
 .../raids/TheSecondCoilofBahamutTurn3.cpp     |  1 -
 .../raids/TheSecondCoilofBahamutTurn4.cpp     |  1 -
 .../TheUnendingCoilofBahamutUltimate.cpp      |  1 -
 .../Scripts/instances/raids/TheVoidArk.cpp    |  1 -
 .../instances/raids/TheWeepingCityofMhach.cpp |  1 -
 .../instances/raids/TheWorldofDarkness.cpp    |  1 -
 .../TheSecondCoilofBahamutSavageTurn1.cpp     | 39 -------------------
 .../TheSecondCoilofBahamutSavageTurn4.cpp     | 39 -------------------
 .../coils/TheSecondCoilofBahamutTurn1.cpp     | 39 -------------------
 .../coils/TheSecondCoilofBahamutTurn2.cpp     | 39 -------------------
 .../instances/treasurehunt/TheAquapolis.cpp   |  1 -
 .../treasurehunt/TheHiddenCanalsofUznair.cpp  |  1 -
 .../treasurehunt/TheLostCanalsofUznair.cpp    |  1 -
 .../trials/ARelicReborntheChimera.cpp         |  1 -
 .../instances/trials/ARelicReborntheHydra.cpp |  1 -
 .../trials/AkhAfahAmphitheatreExtreme.cpp     |  1 -
 .../trials/AkhAfahAmphitheatreHard.cpp        |  1 -
 .../instances/trials/BattleintheBigKeep.cpp   |  1 -
 .../instances/trials/BattleontheBigBridge.cpp |  1 -
 .../Scripts/instances/trials/CapeWestwind.cpp |  1 -
 .../instances/trials/ContainmentBayP1T6.cpp   |  1 -
 .../trials/ContainmentBayP1T6Extreme.cpp      |  1 -
 .../instances/trials/ContainmentBayS1T7.cpp   |  1 -
 .../trials/ContainmentBayS1T7Extreme.cpp      |  1 -
 .../instances/trials/ContainmentBayZ1T9.cpp   |  1 -
 .../trials/ContainmentBayZ1T9Extreme.cpp      |  1 -
 .../Scripts/instances/trials/Emanation.cpp    |  1 -
 .../instances/trials/EmanationExtreme.cpp     |  1 -
 .../instances/trials/SpecialEventI.cpp        |  1 -
 .../instances/trials/SpecialEventII.cpp       |  1 -
 .../instances/trials/SpecialEventIII.cpp      |  1 -
 .../instances/trials/TheBowlofEmbers.cpp      |  1 -
 .../trials/TheBowlofEmbersExtreme.cpp         |  1 -
 .../instances/trials/TheBowlofEmbersHard.cpp  |  1 -
 .../Scripts/instances/trials/TheChrysalis.cpp |  1 -
 .../instances/trials/TheDragonsNeck.cpp       |  1 -
 .../instances/trials/TheFinalStepsofFaith.cpp |  1 -
 .../instances/trials/TheHowlingEye.cpp        |  1 -
 .../instances/trials/TheHowlingEyeExtreme.cpp |  1 -
 .../instances/trials/TheHowlingEyeHard.cpp    |  1 -
 .../Scripts/instances/trials/TheJadeStoa.cpp  |  1 -
 .../instances/trials/TheJadeStoaExtreme.cpp   |  1 -
 .../trials/TheLimitlessBlueExtreme.cpp        |  1 -
 .../instances/trials/TheLimitlessBlueHard.cpp |  1 -
 .../trials/TheMinstrelsBalladNidhoggsRage.cpp |  1 -
 .../TheMinstrelsBalladShinryusDomain.cpp      |  1 -
 .../TheMinstrelsBalladThordansReign.cpp       | 25 ++++++++++++
 .../trials/TheMinstrelsBalladUltimasBane.cpp  |  1 -
 .../Scripts/instances/trials/TheNavel.cpp     |  1 -
 .../instances/trials/TheNavelExtreme.cpp      |  1 -
 .../Scripts/instances/trials/TheNavelHard.cpp |  1 -
 .../instances/trials/ThePoolofTribute.cpp     |  1 -
 .../trials/ThePoolofTributeExtreme.cpp        |  1 -
 .../instances/trials/TheRoyalMenagerie.cpp    |  1 -
 .../trials/TheSingularityReactor.cpp          | 25 ++++++++++++
 .../instances/trials/TheStepsofFaith.cpp      |  1 -
 .../trials/TheStrikingTreeExtreme.cpp         |  1 -
 .../instances/trials/TheStrikingTreeHard.cpp  |  1 -
 .../instances/trials/TheWhorleaterExtreme.cpp |  1 -
 .../instances/trials/TheWhorleaterHard.cpp    |  1 -
 .../instances/trials/ThokastThokExtreme.cpp   | 25 ++++++++++++
 .../instances/trials/ThokastThokHard.cpp      | 25 ++++++++++++
 .../instances/trials/ThornmarchExtreme.cpp    |  1 -
 .../instances/trials/ThornmarchHard.cpp       |  1 -
 .../Scripts/instances/trials/UrthsFount.cpp   |  1 -
 273 files changed, 103 insertions(+), 420 deletions(-)
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
 delete mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
 create mode 100644 src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp

diff --git a/src/servers/sapphire_zone/Script/ScriptLoader.h b/src/servers/sapphire_zone/Script/ScriptLoader.h
index 1e99d86e..6cd1efa4 100644
--- a/src/servers/sapphire_zone/Script/ScriptLoader.h
+++ b/src/servers/sapphire_zone/Script/ScriptLoader.h
@@ -9,7 +9,8 @@
 #include "ScriptInfo.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#define WIN32_LEAN_AND_MEAN
+#include <winbase.h>
 typedef HMODULE ModuleHandle;
 #else
 #include <dlfcn.h>
diff --git a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
index fd0c8537..a2ad2f9d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
+++ b/src/servers/sapphire_zone/Script/Scripts/ScriptObject.h
@@ -2,6 +2,7 @@
 #define SAPPHIRE_SCRIPTOBJECT_H
 
 #include <Forwards.h>
+#include <Script/NativeScriptApi.h>
 
 enum EventFlags
 {
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
index f2fdd991..de850179 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors101110.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
index af9f4768..1c25a60f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors110.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
index e2a130f0..b87eed6a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors111120.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
index e49c1e32..eb9351c4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors1120.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
index eb763806..c2e42eb6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors121130.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
index f044bfa1..9ee44ddd 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors131140.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
index f4ba0593..66849a89 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors141150.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
index defb3212..9acc04d7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors151160.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
index 14110134..63fb7730 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors161170.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
index 57b9d6c4..8e2d2dd6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors171180.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
index 9e9b6050..16f8221a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors181190.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
index 512b331c..6669f0d4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors191200.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
index 438a2aa5..b73a152c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors2130.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
index bbe7a4f2..be1b135f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors3140.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
index 3dc32d7c..33731057 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors4150.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
index 2ba12023..e37a1fbf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors5160.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
index dfe9ca7f..76d13804 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors6170.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
index a476ade3..0423fd4d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors7180.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
index b4ca9e73..c4d2325c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors8190.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
index 77f1ad35..ec178993 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/deepdungeon/ThePalaceoftheDeadFloors91100.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
index 80cce950..e2a4b4c1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AlaMhigo.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
index 0be67f38..96e289e1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeep.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
index 3f650277..c9f94f9e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/AmdaporKeepHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
index c7049531..e15fd097 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BaelsarsWall.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
index 7bf74848..2883817c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BardamsMettle.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
index 215eed85..7491e30b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstop.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
index bde71066..4ca4e515 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/BrayfloxsLongstopHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
index 396ae93d..8fda1a59 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumAbania.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
index 182694a1..eb5f3f7d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CastrumMeridianum.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
index 75eebc03..e9a3fcf3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMines.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
index f41e5586..c709a97d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CopperbellMinesHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
index 86697d36..19f9c0c4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/CuttersCry.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
index 90b60bc8..11984570 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DomaCastle.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
index f4c420b0..11e96c5d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/DzemaelDarkhold.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
index 7d1a1133..01d6a55f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Halatali.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
index 06bab2c8..b4ed9722 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HalataliHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
index 6fb21e4e..0928015d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManor.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
index 01d5cd02..2209df6e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HaukkeManorHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
index 552c196b..e692ceef 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HellsLid.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
index 9323e209..246a85c0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsle.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
index 521e7d51..cf3d839a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/HullbreakerIsleHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
index 62bef405..54d14361 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/KuganeCastle.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
index 00ef14bb..98ead40a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Neverreap.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
index 15b36219..dd17eb61 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSirius.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
index 56199728..3087fe9a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/PharosSiriusHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
index 829d781e..beb7637b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SaintMociannesArboretum.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
index d1e24153..e08c8f9a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
index ab41e16d..19e0cab6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SastashaHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
index 069956f0..f5763e03 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ShisuioftheVioletTides.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
index a55ebaee..5ecf8597 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Snowcloak.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
index b8b0d15e..9d96a514 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAl.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
index 11c60590..8f706c4a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohmAlHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
index e3553cb1..5a24be1b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/SohrKhai.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
index 0122c08c..0905d8f2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAery.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
index 65050a04..812849dd 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAetherochemicalResearchFacility.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
index 490bcc22..e3aa86a0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAntitower.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
index 93fd3e75..dc08a97f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheAurumVale.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
index 1c1d1151..9fee4f1d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDrownedCityofSkalla.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
index c36b6d5f..44e04c89 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheDuskVigil.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
index 6a835f69..e1efa206 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuum.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
index 9ff0b996..a2215725 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheFractalContinuumHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
index 3edc22b4..2e6baa96 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibrary.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
index c1ce2025..657f41a0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheGreatGubalLibraryHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
index c5ecc79c..c1bb1f22 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheKeeperoftheLake.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
index bcbad845..17ea1412 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdapor.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
index 08fa7611..ea9f09ed 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheLostCityofAmdaporHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
index e90639fb..90a050e9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/ThePraetorium.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
index ddc6d6dc..a5933eae 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSirensongSea.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
index 5e9597ae..192a5bfd 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigil.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
index 5a13d57a..53324047 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheStoneVigilHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
index 5d21fa02..df2d147f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarn.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
index b4596d34..9d5fdd05 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheSunkenTempleofQarnHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
index a6c5c9dd..cd96d466 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroft.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
index 4db8149d..19758edf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTamTaraDeepcroftHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
index 368ccd22..72465331 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheTempleoftheFist.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
index e7beb440..da49748f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheThousandMawsofTotoRak.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
index 200829c9..c5349672 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheVault.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
index 8ecc11ea..c7806459 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalace.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
index b67ad33a..0605608f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/TheWanderersPalaceHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
index 4850a4b2..b8ee60bc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Xelphatol.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
index 6836a767..7f57dcd4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheHauntedManor.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
index aed60a05..bcf500ec 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/events/TheValentionesCeremony.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
index 7ca4d0e4..a2c65ba8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AllsWellthatEndsintheWell.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp
index 2da7a753..b79dae1f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/AnnoytheVoid.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
index cb223a74..1d104af6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyParties.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
index 087b3075..fe587bff 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/BasicTrainingEnemyStrongholds.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
index 5a432c18..176639d1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/FlickingSticksandTakingNames.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp
index b90e01ef..f6aa26ae 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/HeroontheHalfShell.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp
index 83dce6ae..040f5ea3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/LongLivetheQueen.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp
index 96cf1e2d..cd53622c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/MorethanaFeeler.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp
index 094b913e..8f65e8fa 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/PullingPoisonPosies.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp
index 879388df..06faa408 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/ShadowandClaw.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp
index c67cae31..08819387 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/SolemnTrinity.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp
index 5ac7f920..5aadaca6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/StingingBack.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp
index 143a50a8..1b4bcff5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/UndertheArmor.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp
index d9985af1..2d3605c4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/guildhests/WardUp.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
index 549a201c..d0f6e3b8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AccrueEnmityfromMultipleTargets.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
index 2713a571..9d16d7ad 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AssistAlliesinDefeatingaTarget.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
index ed3cf961..fa3a624d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidAreaofEffectAttacks.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
index c5a98e62..5651a5ec 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/AvoidEngagedTargets.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
index 0aa6a01d..97c20479 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/DefeatanOccupiedTarget.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
index f3c5ca75..b9e37ef9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageEnemyReinforcements.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
index d2c54dca..fbe3a627 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/EngageMultipleTargets.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
index 8bcaa097..c1ecf99f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaComboinBattle.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
index 806d25ae..397ea203 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaCombotoIncreaseEnmity.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
index 38d3f4e6..f0853bd1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/ExecuteaRangedAttacktoIncreaseEnmity.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
index 9521065a..4a1ecdf2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/FinalExercise.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
index 4c09822a..00791972 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealMultipleAllies.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
index c8389db8..a298b73b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/HealanAlly.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
index 3f914056..6e43c2e5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/hallofthenovice/InteractwiththeBattlefield.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
index 12850715..6c5fb87b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/Astragalos.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
index 345d14aa..e1f95258 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/SealRockSeize.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
index 8be7341c..d7692ac7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheBorderlandRuinsSecure.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
index 67573c4a..18376f34 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4LightParty.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
index 6fe46e93..19d81862 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Ranked.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
index a5186fc4..8215cc27 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeast4on4Training.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
index 1cb84c1b..d5e2d7ea 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchCrystalTower.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
index cabd04a5..6c2a3c35 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchFeastingGrounds.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
index 1997f24b..1f369875 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastCustomMatchLichenweed.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
index 2746e969..8fa5bb96 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastRanked.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
index 19723a22..a10fce7e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTeamRanked.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
index 2a8cdbcf..00f2e7a8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFeastTraining.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
index 89f4ccfc..035dbdeb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/pvp/TheFieldsofGloryShatter.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp
index 03cf2e1f..dabfa0b9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ABloodyReunion.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
index 331adc0a..e98adce1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ASpectaclefortheAges.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp
index 3d30a3da..8a2ee812 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodDragoon.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp
index 8b34e322..0b131b3b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/BloodontheDeck.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
index 888d4d16..249a1a03 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/CuriousGorgeMeetsHisMatch.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp
index be86d270..b6c5068c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/DarkwingDragon.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp
index 4fe6dc4b..ce6c34a7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InThalsName.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp
index 60b8e561..dff5ac16 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/InterdimensionalRift.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
index 84b98648..99f100c4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ItsProbablyaTrap.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp
index 90b6ef77..22a64e03 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/MatsubaMayhem.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp
index 33942bb8..adbdf71d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/Naadam.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
index 875cdea7..c654d1e1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OneLifeforOneWorld.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp
index b8f3f929..7bac4fcb 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurCompromise.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp
index bc6d98b0..999767c2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/OurUnsungHeroes.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp
index b0e6abb4..dec3526a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/RaisingtheSword.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp
index 2a14b968..fe3c37c9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/ReturnoftheBull.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp
index 76234e6a..ec276d56 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheBattleonBekko.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
index 21d49360..fbc8f8ae 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheCarteneauFlatsHeliodrome.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
index b557b3f4..fc2d41f8 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheFaceofTrueEvil.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
index 7da03526..2534603d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheHeartoftheProblem.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
index c000d167..3212bfa4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheOrphansandtheBrokenBlade.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp
index 63518837..86809778 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/TheResonant.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp
index c2ff0eb4..b318d638 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WhenClansCollide.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp
index 7ce1c530..294437aa 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/questbattles/WithHeartandSteel.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
index c0c1f818..3c982512 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFather.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
index e426dcde..f62468e7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheFatherSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
index b8fd4c5a..4ab0396a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSon.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
index dff083a4..0d536523 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheArmoftheSonSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
index 2c077f71..ac2e03e0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreator.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
index 6bd7f50b..34124213 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBreathoftheCreatorSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
index ce0a0c02..72ff8a23 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFather.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
index 4028b812..938f47bc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheFatherSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
index 44714ddf..8941bd9d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSon.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
index 21cb733f..cd3029df 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheBurdenoftheSonSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
index 44dc3861..ca940a2a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFather.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
index e8204ae4..e3080497 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheFatherSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
index 748c50c0..706bec7f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSon.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
index 5f1ad5b9..66883bbd 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheCuffoftheSonSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
index c3f70830..1decebf5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreator.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
index c2cd75e0..1eebf5ea 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheEyesoftheCreatorSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
index aa05cd54..052c43b4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFather.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
index 42e0dec6..f7ddbc42 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheFatherSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
index 1fabc5bb..c16d30a7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSon.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
index 5186dd23..804c2b18 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheFistoftheSonSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
index 7bb2a980..6439230c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreator.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
index 189ed482..c346add5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheHeartoftheCreatorSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
index 7c86de2b..1a057c21 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreator.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
index 17328aaf..4d211068 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/AlexanderTheSouloftheCreatorSavage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp
index 5a1289a6..6794f5ae 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp
index 3605ff34..2a08c009 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV10Savage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp
index 82afc2d2..eefb3431 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp
index 6f27bdc8..4c6ffffe 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV20Savage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp
index b3773f59..5d61a429 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp
index d4a2fb40..9e5d96d6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV30Savage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp
index a2cc82b6..519da6f1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp
index e6ba7730..21590579 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DeltascapeV40Savage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp
index ebbf975e..ebb9fd58 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/DunScaith.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp
index 70001b19..888331cc 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp
index 0045814f..9170dbc6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV10Savage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp
index d9801eef..456719f2 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp
index 6e39309a..4907cef1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV20Savage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp
index e03b7d58..10f08cf4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp
index b167b055..630e851a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV30Savage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp
index ce4e8014..1e670e34 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp
index d3b6b7c0..ec4001c4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SigmascapeV40Savage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp
index a9f74a77..1a8ae8fa 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/SyrcusTower.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
index 4a85bfeb..ab94dc12 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn1.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
index 87659029..1f929643 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn2.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
index e6ebfd9a..f72046d7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn3.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
index bf8f7051..5d4f4c81 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn4.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
index 2db5319e..cefd6220 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheBindingCoilofBahamutTurn5.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
index f858ba61..4cbadec0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn1.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
index c9f16742..c7016a05 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn2.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
index 431b560d..b6141096 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn3.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
index 45095b23..486cc0d6 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheFinalCoilofBahamutTurn4.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
index 77bd162c..a5f72ce0 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheLabyrinthoftheAncients.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
index 9ab02280..5a1880c3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheRoyalCityofRabanastre.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
index 04c26d77..f6d3c144 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn1.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
index eca46db7..0c448267 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn2.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
index 7efb6c7d..41fb4285 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn3.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
index addffbbb..b0b4156c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutSavageTurn4.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
index 57496420..9d9569b5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn1.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
index d2878a08..24e6fdbf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn2.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
index 1420d58a..66630243 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn3.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
index 22c5beb3..cfa9eecf 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheSecondCoilofBahamutTurn4.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
index 9666db85..ad4c09d4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheUnendingCoilofBahamutUltimate.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp
index 3590821f..9248406f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheVoidArk.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp
index 39200a71..0f7347e5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWeepingCityofMhach.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp
index 882eed3d..bb99fb85 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/raids/TheWorldofDarkness.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
deleted file mode 100644
index 2b528fcc..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn1.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSecondCoilofBahamutSavageTurn1 : public InstanceContentScript
-{
-public:
-   TheSecondCoilofBahamutSavageTurn1() : InstanceContentScript( 30012 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f );
-      instance->registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
deleted file mode 100644
index 40ed1b20..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutSavageTurn4.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSecondCoilofBahamutSavageTurn4 : public InstanceContentScript
-{
-public:
-   TheSecondCoilofBahamutSavageTurn4() : InstanceContentScript( 30015 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2003412, 0, 4, { -1.586798f, 0.000000f, 6.322940f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2003413, 4592650, 4, { 0.246630f, 0.000000f, -0.575616f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003414, 4596280, 4, { 2.330916f, 0.000000f, 1.675908f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003411, 4585907, 4, { -0.036626f, -0.000000f, -0.514996f }, 1.000000f );
-      instance->registerEObj( "Unknown4", 2003392, 4632812, 4, { 0.000000f, -0.000002f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2003393, 0, 4, { 16.296391f, -0.000002f, -4.751545f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2003394, 0, 4, { 11.781120f, -0.000001f, 4.780689f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2003391, 0, 4, { 8.938168f, 0.060000f, -11.440830f }, 1.000000f );
-      instance->registerEObj( "Unknown8", 2003427, 4664504, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4614314, 5, { -0.059309f, -0.000001f, 15.090750f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2003419, 4682784, 4, { -15.104980f, 0.572263f, -27.316570f }, 1.000000f );
-      instance->registerEObj( "Unknown10", 2003452, 4615853, 4, { 0.000000f, 0.000000f, 0.000000f }, 1.000000f );
-      instance->registerEObj( "Unknown11", 2003678, 4663755, 4, { 16.207529f, 0.571903f, 28.091551f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
deleted file mode 100644
index af5b5c7a..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn1.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSecondCoilofBahamutTurn1 : public InstanceContentScript
-{
-public:
-   TheSecondCoilofBahamutTurn1() : InstanceContentScript( 30007 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2003012, 0, 4, { -266.882690f, 10.421330f, 43.491699f }, 1.000000f );
-      instance->registerEObj( "Unknown1", 2003043, 0, 4, { -261.309113f, 10.383500f, 37.739429f }, 1.000000f );
-      instance->registerEObj( "Unknown2", 2003044, 0, 4, { -259.553802f, 10.421330f, 31.442730f }, 1.000000f );
-      instance->registerEObj( "Unknown3", 2003045, 0, 4, { -262.154510f, 10.421330f, 23.808010f }, 1.000000f );
-      instance->registerEObj( "Entrance", 2000182, 4614306, 5, { -120.168602f, 11.010820f, -99.074913f }, 1.000000f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -131.611206f, 9.156082f, -82.660057f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2001269, 4544126, 4, { -137.669403f, 9.502172f, -11.353470f }, 1.000000f );
-      instance->registerEObj( "Destination", 2002372, 4579467, 4, { -171.978897f, -49.907219f, -10.220380f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002872, 4616656, 4, { -248.873596f, 10.236450f, 33.155060f }, 1.000000f );
-      instance->registerEObj( "Unknown7", 2002735, 0, 4, { -246.919006f, 9.938496f, 34.239399f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2003416, 4664435, 4, { -314.106995f, 9.414734f, 43.198238f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2003421, 4651262, 4, { -292.780701f, 10.351920f, 39.414989f }, 1.000000f );
-      instance->registerEObj( "Unknown9", 2003428, 4615269, 4, { -120.556702f, 8.820233f, -76.764412f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
deleted file mode 100644
index 1fe3588b..00000000
--- a/src/servers/sapphire_zone/Script/Scripts/instances/raids/coils/TheSecondCoilofBahamutTurn2.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <Script/NativeScriptApi.h>
-#include <ScriptObject.h>
-#include <Zone/InstanceContent.h>
-
-class TheSecondCoilofBahamutTurn2 : public InstanceContentScript
-{
-public:
-   TheSecondCoilofBahamutTurn2() : InstanceContentScript( 30008 )
-   { }
-
-   void onInit( InstanceContentPtr instance ) override
-   {
-      
-      instance->registerEObj( "Unknown0", 2003299, 4646804, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f );
-      instance->registerEObj( "Unknown1", 2003311, 4646803, 4, { -449.999908f, 800.027222f, 69.995354f }, 0.991760f );
-      instance->registerEObj( "Ripenedbulb", 2003293, 4646806, 4, { -449.999908f, 800.027222f, 69.995399f }, 0.991760f );
-      instance->registerEObj( "Entrance", 2000182, 4646962, 5, { -358.417694f, -270.655487f, -0.875555f }, 0.991760f );
-      instance->registerEObj( "Shortcut", 2000700, 0, 4, { -384.512085f, -270.435699f, -2.731445f }, 0.991760f );
-      instance->registerEObj( "Unknown3", 2002469, 4646048, 4, { -447.239197f, 799.923584f, 70.054077f }, 0.991760f );
-      instance->registerEObj( "Unknown4", 2002470, 4646986, 4, { -448.371613f, 800.000000f, 20.807449f }, 1.000000f );
-      instance->registerEObj( "Unknown5", 2002471, 4646049, 4, { -372.196899f, -270.740997f, -1.014158f }, 0.991760f );
-      instance->registerEObj( "Innerbulkhead", 2003415, 0, 4, { -375.434814f, -268.802399f, -0.859896f }, 1.000000f );
-      instance->registerEObj( "Allaganterminal", 2003417, 4682781, 4, { -450.001099f, 799.969971f, 143.447495f }, 1.000000f );
-      instance->registerEObj( "Unknown6", 2002735, 0, 4, { -449.981689f, 800.000000f, 47.625530f }, 0.991760f );
-      instance->registerEObj( "Unknown7", 2002872, 4646969, 4, { -449.981689f, 801.188416f, 47.036610f }, 0.991760f );
-      instance->registerEObj( "Unknown8", 2002472, 4646987, 4, { -449.121704f, 800.000000f, 91.049332f }, 1.000000f );
-   }
-
-   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
-   {
-
-   }
-
-   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
-   {
-
-   }
-
-};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
index 6c936042..6f649610 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheAquapolis.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
index 62ff6526..e0be9b22 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheHiddenCanalsofUznair.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
index 635f0dd5..cb3eb7b1 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/treasurehunt/TheLostCanalsofUznair.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
index 678f8da9..7e6ec5e9 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheChimera.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
index 25b395e3..e617486e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ARelicReborntheHydra.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
index 4efac5d8..be319d50 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
index 1dfed492..c93ef664 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/AkhAfahAmphitheatreHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
index 5b19a73c..17e97166 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleintheBigKeep.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
index b547b347..517d0de5 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/BattleontheBigBridge.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
index 3bd35bb1..45730407 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/CapeWestwind.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp
index 146f71e5..5537f963 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
index eab436eb..a4c7506d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayP1T6Extreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp
index ec28c8d3..9edfb173 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
index 5f4e2c02..66872c68 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayS1T7Extreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp
index 0b82f1fc..9486e2c3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
index bee2d9ad..3e2aaa42 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ContainmentBayZ1T9Extreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
index d665f285..d363053d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/Emanation.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
index 93d7f364..61b68bbd 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/EmanationExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp
index c9472d9a..605e8185 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventI.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp
index 85526d94..f48f0576 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventII.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp
index 933cb121..096d954f 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/SpecialEventIII.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
index 6ca4d4c2..89bdc5ab 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbers.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
index c91bd613..be3a4d4a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
index 9613aafe..08fcb11b 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheBowlofEmbersHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
index e0e3ee10..d8b99b94 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheChrysalis.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
index 87d7900c..163578d4 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheDragonsNeck.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
index e78bc016..ddac1a17 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheFinalStepsofFaith.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
index d68235af..d06ff180 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEye.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
index 652473a0..df6a70fe 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
index c5d38f2b..67cd6a49 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheHowlingEyeHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp
index 54b05f33..aa247c9c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoa.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp
index a50111ac..903af5ee 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheJadeStoaExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
index d275b155..a5d005ef 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
index 639f4bea..0fa086f7 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheLimitlessBlueHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
index d3f10b96..04655911 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladNidhoggsRage.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
index ffea8947..b75dc05c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladShinryusDomain.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
new file mode 100644
index 00000000..4ed8839f
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladThordansReign.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheMinstrelsBalladThordansReign : public InstanceContentScript
+{
+public:
+   TheMinstrelsBalladThordansReign() : InstanceContentScript( 20036 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
index 49b620a1..b9b6fab3 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheMinstrelsBalladUltimasBane.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
index 2efd3da7..82c45dda 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavel.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
index 4c1e97ed..4f851089 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
index 5dd7fdf2..3c0fff47 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheNavelHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
index 405eecc2..f9ab0d24 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTribute.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
index a47acfd6..c5124b54 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThePoolofTributeExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
index ac6b2f6a..80293d3e 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheRoyalMenagerie.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
new file mode 100644
index 00000000..26dda762
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheSingularityReactor.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class TheSingularityReactor : public InstanceContentScript
+{
+public:
+   TheSingularityReactor() : InstanceContentScript( 20035 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
index 224ae0ad..3036724c 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStepsofFaith.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
index bc0aea28..84f24747 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
index d866046c..25dc5004 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheStrikingTreeHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
index 2ce3763e..2ab09363 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
index 6c23fa40..c37f7792 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/TheWhorleaterHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
new file mode 100644
index 00000000..5f808dc2
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokExtreme.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThokastThokExtreme : public InstanceContentScript
+{
+public:
+   ThokastThokExtreme() : InstanceContentScript( 20032 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
new file mode 100644
index 00000000..5f3b225d
--- /dev/null
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThokastThokHard.cpp
@@ -0,0 +1,25 @@
+#include <ScriptObject.h>
+#include <Zone/InstanceContent.h>
+
+class ThokastThokHard : public InstanceContentScript
+{
+public:
+   ThokastThokHard() : InstanceContentScript( 20031 )
+   { }
+
+   void onInit( InstanceContentPtr instance ) override
+   {
+
+   }
+
+   void onUpdate( InstanceContentPtr instance, uint32_t currTime ) override
+   {
+
+   }
+
+   void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
+   {
+
+   }
+
+};
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
index 6c22edf9..11b7d129 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchExtreme.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
index 45b79f67..105ffe6d 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/ThornmarchHard.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
index 46ff5b78..58c2215a 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/trials/UrthsFount.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
 

From be46ec837d64419075f2ca044b85b1c241c91c07 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sun, 4 Mar 2018 17:53:40 +0100
Subject: [PATCH 63/69] Fixed boundByDuty state so duty menu works in instance

---
 src/common/Common.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/common/Common.h b/src/common/Common.h
index 05517df7..d1a8810d 100644
--- a/src/common/Common.h
+++ b/src/common/Common.h
@@ -390,10 +390,8 @@ namespace Common {
 
       InNpcEvent1 = 10, // Sent together with InNpcEvent, when waiting for input? just a guess...
 
-      BoundByDuty = 11,
-
       BetweenAreas = 24,
-
+      BoundByDuty = 28,
       WatchingCutscene = 50, // this is actually just a dummy, this id is different
 
 

From b26a6f3317ead2177a4c086057a1eb17add30ccb Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Mon, 5 Mar 2018 17:01:37 +1100
Subject: [PATCH 64/69] add zone opcode

---
 src/common/Network/PacketDef/Ipcs.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 76322136..49b67bd9 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -73,6 +73,7 @@ namespace Packets {
       Playtime                   = 0x00DF, // updated 4.2
       CFRegistered               = 0x00B8, // updated 4.1
       SocialRequestResponse      = 0x00BB, // updated 4.1
+      CancelAllianceForming      = 0x00C6, // updated 4.2
       Chat                       = 0x00E1, // updated 4.2
       SocialList                 = 0x00E7, // updated 4.2
 

From 8fd1a2e3df249750e5e762ef6e0fd156b8be7855 Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Mon, 5 Mar 2018 22:10:14 +1100
Subject: [PATCH 65/69] fix onEnterTerritory events

---
 src/servers/sapphire_zone/Actor/Player.cpp          | 13 ++++++++++---
 src/servers/sapphire_zone/Actor/Player.h            |  2 ++
 .../Network/Handlers/EventHandlers.cpp              |  5 ++++-
 src/servers/sapphire_zone/Script/ScriptManager.cpp  | 12 ++++++++++++
 src/servers/sapphire_zone/Script/ScriptManager.h    |  1 +
 src/servers/sapphire_zone/Zone/InstanceContent.cpp  | 11 ++++++++---
 src/servers/sapphire_zone/Zone/InstanceContent.h    |  5 +++--
 src/servers/sapphire_zone/Zone/Zone.cpp             |  7 ++++++-
 src/servers/sapphire_zone/Zone/Zone.h               |  5 +++--
 9 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 85090868..5d94a554 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -98,6 +98,13 @@ Core::Entity::Player::~Player()
 {
 }
 
+void Core::Entity::Player::injectPacket( std::string path )
+{
+   auto session = g_serverZone.getSession( getId() );
+   if( session )
+      session->getZoneConnection()->injectPacket( path, *this );
+}
+
 // TODO: add a proper calculation based on race / job / level / gear
 uint32_t Core::Entity::Player::getMaxHp()
 {
@@ -1480,7 +1487,7 @@ uint32_t Core::Entity::Player::getTerritoryId() const
 
 void Core::Entity::Player::sendZonePackets()
 {
-   getCurrentZone()->onBeforeEnterTerritory( *this );
+   getCurrentZone()->onBeforePlayerZoneIn( *this );
 
    ZoneChannelPacket< FFXIVIpcInit > initPacket( getId() );
    initPacket.data().charId = getId();
@@ -1490,7 +1497,7 @@ void Core::Entity::Player::sendZonePackets()
 
    if( isLogin() )
    {
-      queuePacket(ActorControlPacket143( getId(), SetCharaGearParamUI, m_equipDisplayFlags, 1 ) );
+      queuePacket( ActorControlPacket143( getId(), SetCharaGearParamUI, m_equipDisplayFlags, 1 ) );
    }
 
    // set flags, will be reset automatically by zoning ( only on client side though )
@@ -1547,7 +1554,7 @@ void Core::Entity::Player::sendZonePackets()
    if( getLastPing() == 0 )
       sendQuestInfo();
 
-   getCurrentZone()->onEnterTerritory( *this );
+   getCurrentZone()->onPlayerZoneIn( *this );
 
    m_bMarkedForZoning = false;
 }
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 89d4ff69..0bf3bf15 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -45,6 +45,8 @@ public:
 
    void autoAttack( CharaPtr pTarget ) override;
 
+   void injectPacket( std::string path );
+
    // EventHandlers
    //////////////////////////////////////////////////////////////////////////////////////////////////////
    /*! start an event action */
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index d44e0241..59fb2e3a 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -160,7 +160,10 @@ void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::G
 
    player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId() );
 
-   g_scriptMgr.onEnterTerritory( player, eventId, param1, param2 );
+   if( auto instance = player.getCurrentInstance() )
+      instance->onEnterTerritory( player, eventId, param1, param2 );
+   else
+      g_scriptMgr.onEnterTerritory( player, eventId, param1, param2 );
 
    player.checkEvent( eventId );
 }
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 5ab27cc0..99d77499 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -360,6 +360,18 @@ bool Core::Scripting::ScriptManager::onInstanceUpdate( InstanceContentPtr instan
    return false;
 }
 
+bool Core::Scripting::ScriptManager::onInstanceEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
+{
+   auto script = m_nativeScriptManager->getScript< InstanceContentScript >( instance->getDirectorId() );
+   if( script )
+   {
+      script->onEnterTerritory( player, eventId, param1, param2 );
+      return true;
+   }
+
+   return false;
+}
+
 Scripting::NativeScriptManager& Core::Scripting::ScriptManager::getNativeScriptHandler()
 {
    return *m_nativeScriptManager;
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.h b/src/servers/sapphire_zone/Script/ScriptManager.h
index 39b702cb..e872d9f2 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.h
+++ b/src/servers/sapphire_zone/Script/ScriptManager.h
@@ -59,6 +59,7 @@ namespace Core
 
          bool onInstanceInit( InstanceContentPtr instance );
          bool onInstanceUpdate( InstanceContentPtr instance, uint32_t currTime );
+         bool onInstanceEnterTerritory( InstanceContentPtr instance, Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 );
 
          void loadDir( const std::string& dirname, std::set<std::string> &files, const std::string& ext );
 
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 58a6fa7c..99a130f2 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -63,9 +63,9 @@ Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInsta
    return m_instanceContentInfo;
 }
 
-void Core::InstanceContent::onEnterTerritory( Entity::Player& player )
+void Core::InstanceContent::onPlayerZoneIn( Entity::Player &player )
 {
-   g_log.debug( "InstanceContent::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|"
+   g_log.debug( "InstanceContent::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|"
                                                            + std::to_string( getInstanceContentId() ) +
                                                            + ", Entity#" + std::to_string( player.getId() ) );
 
@@ -263,7 +263,7 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
       g_log.error( "InstanceContent::onRegisterEObj Zone " + m_internalName + ": No EObj data found for EObj with ID: " + std::to_string( object->getObjectId() ) );
 }
 
-void Core::InstanceContent::onBeforeEnterTerritory( Core::Entity::Player &player )
+void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player &player )
 {
    if( m_pEntranceEObj != nullptr )
    {
@@ -302,3 +302,8 @@ void Core::InstanceContent::onTalk( Core::Entity::Player& player, uint32_t event
       player.sendDebug( "No onTalk handler found for interactable eobj with EObjID: " +
                         std::to_string( it->second->getObjectId() ) + ", eventId: " + std::to_string( eventId ) );
 }
+
+void Core::InstanceContent::onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
+{
+   g_scriptMgr.onInstanceEnterTerritory( getAsInstanceContent(), player, eventId, param1, param2 );
+}
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index e2aeb8ad..2d2c5bcb 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -30,13 +30,14 @@ public:
    virtual ~InstanceContent();
 
    bool init() override;
-   void onBeforeEnterTerritory( Entity::Player& player ) override;
-   void onEnterTerritory( Entity::Player& player ) override;
+   void onBeforePlayerZoneIn( Entity::Player &player ) override;
+   void onPlayerZoneIn( Entity::Player &player ) override;
    void onLeaveTerritory( Entity::Player& player ) override;
    void onFinishLoading( Entity::Player& player ) override;
    void onInitDirector( Entity::Player& player ) override;
    void onUpdate( uint32_t currTime ) override;
    void onTalk( Entity::Player& player, uint32_t eventId, uint64_t actorId );
+   void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override;
 
    void onRegisterEObj( Entity::EventObjectPtr object ) override;
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 03c42ada..aded0dbc 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -631,7 +631,7 @@ void Core::Zone::updateInRangeSet( Entity::ActorPtr pActor, Cell* pCell )
    }
 }
 
-void Core::Zone::onEnterTerritory( Entity::Player& player )
+void Core::Zone::onPlayerZoneIn( Entity::Player &player )
 {
    g_log.debug( "Zone::onEnterTerritory: Zone#" + std::to_string( getGuId() ) + "|" + std::to_string( getTerritoryId() ) +
                                                 + ", Entity#" + std::to_string( player.getId() ) );
@@ -658,6 +658,11 @@ void Core::Zone::onInitDirector( Entity::Player& player )
 
 }
 
+void Core::Zone::onEnterTerritory( Core::Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 )
+{
+
+}
+
 void Core::Zone::registerEObj( Entity::EventObjectPtr object )
 {
    if( !object )
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index de83e10f..ae747869 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -73,13 +73,14 @@ public:
 
    virtual void loadCellCache();
    virtual uint32_t getTerritoryId() const;
-   virtual void onBeforeEnterTerritory( Entity::Player& player ) {};
-   virtual void onEnterTerritory( Entity::Player& player );
+   virtual void onBeforePlayerZoneIn( Entity::Player &player ) {};
+   virtual void onPlayerZoneIn( Entity::Player &player );
    virtual void onFinishLoading( Entity::Player& player );
    virtual void onInitDirector( Entity::Player& player );
    virtual void onLeaveTerritory( Entity::Player& player );
    virtual void onUpdate( uint32_t currTime );
    virtual void onRegisterEObj( Entity::EventObjectPtr object ) {};
+   virtual void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 );
 
    Common::Weather getNextWeather();
 

From 0de9fb05cf5a63f60228b63dbe54913aa3e7f3cc Mon Sep 17 00:00:00 2001
From: Adam <adam@notadam.me>
Date: Mon, 5 Mar 2018 22:40:11 +1100
Subject: [PATCH 66/69] better handling of EventStart IPC for instances

---
 src/common/Network/PacketDef/Zone/ServerZoneDef.h    |  2 +-
 src/servers/sapphire_zone/Actor/Player.h             |  2 +-
 src/servers/sapphire_zone/Actor/PlayerEvent.cpp      |  4 ++--
 .../sapphire_zone/Network/Handlers/EventHandlers.cpp | 12 +++++++++++-
 .../Network/PacketWrappers/EventStartPacket.h        |  9 ++++++---
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 071ebc50..4cd5349b 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -999,7 +999,7 @@ struct FFXIVIpcEventStart : FFXIVIpcBasePacket<EventStart>
    /* 000D */ uint8_t param2;
    /* 000E */ uint16_t padding;
    /* 0010 */ uint32_t param3;
-   /* 0014 */ uint32_t padding1;
+   /* 0014 */ uint32_t contentId;
 };
 
 
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 0bf3bf15..39806a55 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -54,7 +54,7 @@ public:
    /*! start an event item action */
    void eventItemActionStart( uint32_t eventId, uint32_t action, ActionCallback finishCallback, ActionCallback interruptCallback, uint64_t additional );
    /*! start/register a normal event */
-   void eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1, uint32_t eventParam2 );
+   void eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1, uint32_t eventParam2, uint32_t contentId = 0 );
    /*! play a subevent */
    void eventPlay( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
    /*! play a subevent */
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index b0ba4679..c9f25c82 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -77,7 +77,7 @@ void Core::Entity::Player::checkEvent( uint32_t eventId )
 
 void Core::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId, 
                                        Event::EventHandler::EventType eventType, uint8_t eventParam1,
-                                       uint32_t eventParam2 )
+                                       uint32_t eventParam2, uint32_t contentId )
 {
 
    auto newEvent = Event::make_EventHandler( this, actorId, eventId, eventType, eventParam2 );
@@ -86,7 +86,7 @@ void Core::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId,
 
    setStateFlag( PlayerStateFlag::InNpcEvent );
 
-   EventStartPacket eventStart( getId(), actorId, eventId, eventType, eventParam1, eventParam2 );
+   EventStartPacket eventStart( getId(), actorId, eventId, eventType, eventParam1, eventParam2, contentId );
    
    queuePacket( eventStart );
    
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index 59fb2e3a..a04288b9 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -158,12 +158,22 @@ void Core::Network::GameConnection::eventHandlerEnterTerritory( const Packets::G
 
    player.sendDebug( "Calling: " + objName + "." + eventName + " - " + std::to_string( eventId ) );
 
-   player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId() );
+   player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId(), 0 );
 
    if( auto instance = player.getCurrentInstance() )
+   {
+      // param2 of eventStart
+      // 0 = default state?
+      // 1 = restore state?
+
+      player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId(), instance->getDirectorId() & 0xFFFF );
       instance->onEnterTerritory( player, eventId, param1, param2 );
+   }
    else
+   {
+      player.eventStart( player.getId(), eventId, Event::EventHandler::EnterTerritory, 0, player.getZoneId() );
       g_scriptMgr.onEnterTerritory( player, eventId, param1, param2 );
+   }
 
    player.checkEvent( eventId );
 }
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
index 2109c856..963c138f 100644
--- a/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/EventStartPacket.h
@@ -20,10 +20,11 @@ public:
                      uint32_t eventId,
                      uint8_t param1 = 0,
                      uint8_t param2 = 0,
-                     uint32_t param3 = 0 ) :
+                     uint32_t param3 = 0,
+                     uint32_t contentId = 0 ) :
       ZoneChannelPacket< FFXIVIpcEventStart >( playerId, playerId )
    {
-      initialize( actorId, eventId, param1, param2, param3 );
+      initialize( actorId, eventId, param1, param2, param3, contentId );
    };
 
 private:
@@ -31,13 +32,15 @@ private:
                     uint32_t eventId,
                     uint8_t param1,
                     uint8_t param2,
-                    uint32_t param3 )
+                    uint32_t param3,
+                    uint32_t contentId )
    {
       m_data.actorId = actorId;
       m_data.eventId = eventId;
       m_data.param1 = param1;
       m_data.param2 = param2;
       m_data.param3 = param3;
+      m_data.contentId = contentId;
 
    };
 };

From df29f674dfda23591262829dfd69dc45b2067924 Mon Sep 17 00:00:00 2001
From: Mordred <30826167+SapphireMordred@users.noreply.github.com>
Date: Mon, 5 Mar 2018 14:34:34 +0100
Subject: [PATCH 67/69] formatting

---
 .../sapphire_zone/Zone/InstanceContent.cpp       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 99a130f2..14bb06b1 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -63,7 +63,7 @@ Core::Data::ExdDataGenerated::InstanceContentPtr Core::InstanceContent::getInsta
    return m_instanceContentInfo;
 }
 
-void Core::InstanceContent::onPlayerZoneIn( Entity::Player &player )
+void Core::InstanceContent::onPlayerZoneIn( Entity::Player& player )
 {
    g_log.debug( "InstanceContent::onPlayerZoneIn: Zone#" + std::to_string( getGuId() ) + "|"
                                                            + std::to_string( getInstanceContentId() ) +
@@ -102,7 +102,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
          if( m_playerMap.size() < 1 )
             return;
 
-         for( const auto &playerIt : m_playerMap )
+         for( const auto& playerIt : m_playerMap )
          {
             if( !playerIt.second->isLoadingComplete() ||
                 !playerIt.second->isDirectorInitialized() ||
@@ -110,7 +110,7 @@ void Core::InstanceContent::onUpdate( uint32_t currTime )
                return;
          }
 
-         for( const auto &playerIt : m_playerMap )
+         for( const auto& playerIt : m_playerMap )
          {
             auto pPlayer = playerIt.second;
             pPlayer->queuePacket(
@@ -222,7 +222,7 @@ void Core::InstanceContent::setVar( uint8_t index, uint8_t value )
    }
 
    // todo: genericise this?
-   for( const auto &playerIt : m_playerMap )
+   for( const auto& playerIt : m_playerMap )
    {
       sendDirectorVars( *playerIt.second );
    }
@@ -232,7 +232,7 @@ void Core::InstanceContent::setSequence( uint8_t value )
 {
    setDirectorSequence( value );
 
-   for( const auto &playerIt : m_playerMap )
+   for( const auto& playerIt : m_playerMap )
    {
       sendDirectorVars( *playerIt.second );
    }
@@ -242,7 +242,7 @@ void Core::InstanceContent::setBranch( uint8_t value )
 {
    setDirectorBranch( value );
 
-   for( const auto &playerIt : m_playerMap )
+   for( const auto& playerIt : m_playerMap )
    {
       sendDirectorVars( *playerIt.second );
    }
@@ -263,7 +263,7 @@ void Core::InstanceContent::onRegisterEObj( Entity::EventObjectPtr object )
       g_log.error( "InstanceContent::onRegisterEObj Zone " + m_internalName + ": No EObj data found for EObj with ID: " + std::to_string( object->getObjectId() ) );
 }
 
-void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player &player )
+void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player& player )
 {
    if( m_pEntranceEObj != nullptr )
    {
@@ -279,7 +279,7 @@ void Core::InstanceContent::onBeforePlayerZoneIn( Core::Entity::Player &player )
    player.resetObjSpawnIndex( );
 }
 
-Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string &name )
+Core::Entity::EventObjectPtr Core::InstanceContent::getEObjByName( const std::string& name )
 {
    auto it = m_eventObjectMap.find( name );
    if( it == m_eventObjectMap.end() )

From 97ae0ac742b1526b3f76bd9e5d9ef1b209508e71 Mon Sep 17 00:00:00 2001
From: Mordred <30826167+SapphireMordred@users.noreply.github.com>
Date: Mon, 5 Mar 2018 14:35:03 +0100
Subject: [PATCH 68/69] formatting

---
 src/servers/sapphire_zone/Zone/InstanceContent.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index 2d2c5bcb..fb5305e5 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -30,8 +30,8 @@ public:
    virtual ~InstanceContent();
 
    bool init() override;
-   void onBeforePlayerZoneIn( Entity::Player &player ) override;
-   void onPlayerZoneIn( Entity::Player &player ) override;
+   void onBeforePlayerZoneIn( Entity::Player& player ) override;
+   void onPlayerZoneIn( Entity::Player& player ) override;
    void onLeaveTerritory( Entity::Player& player ) override;
    void onFinishLoading( Entity::Player& player ) override;
    void onInitDirector( Entity::Player& player ) override;

From 22402651e91891c609b20f1aa2e492d3cbdba618 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Mon, 5 Mar 2018 23:01:55 +0100
Subject: [PATCH 69/69] Basic event play for directors, still buggy. Also some
 small fixes all around

---
 src/common/Network/PacketDef/Ipcs.h           |  9 ++-
 .../Network/PacketDef/Zone/ServerZoneDef.h    | 26 +++++++--
 src/servers/sapphire_zone/Actor/Chara.cpp     |  3 +
 .../sapphire_zone/Actor/EventObject.cpp       | 14 ++---
 src/servers/sapphire_zone/Actor/EventObject.h |  8 +--
 src/servers/sapphire_zone/Actor/Player.cpp    |  6 +-
 src/servers/sapphire_zone/Actor/Player.h      |  3 +
 .../sapphire_zone/Actor/PlayerEvent.cpp       | 22 ++++++++
 .../Network/Handlers/ActionHandler.cpp        |  7 +++
 .../PacketWrappers/DirectorPlayScenePacket.h  | 55 +++++++++++++++++++
 .../Scripts/instances/dungeons/Sastasha.cpp   |  3 +-
 .../sapphire_zone/Zone/InstanceContent.cpp    |  6 ++
 .../sapphire_zone/Zone/InstanceContent.h      |  1 +
 src/servers/sapphire_zone/Zone/Zone.h         |  1 +
 14 files changed, 143 insertions(+), 21 deletions(-)
 create mode 100644 src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h

diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h
index 49b67bd9..fe3785af 100644
--- a/src/common/Network/PacketDef/Ipcs.h
+++ b/src/common/Network/PacketDef/Ipcs.h
@@ -102,16 +102,18 @@ namespace Packets {
       NpcSpawn                   = 0x015D, // updated 4.2
       ActorMove                  = 0x015E, // updated 4.2
       ActorSetPos                = 0x0160, // updated 4.2
+
       ActorCast                  = 0x0162, // updated 4.2
+
       HateList                   = 0x0165, // updated 4.2
+
       ObjectSpawn                = 0x0167, // updated 4.2
       ObjectDespawn              = 0x0168, // updated 4.2
       UpdateClassInfo            = 0x0169, // updated 4.2
+
       InitUI                     = 0x016B, // updated 4.2
-
-      ActorOwner                 = 0x016D, // updated 4.2 ?
-
       PlayerStats                = 0x016C, // updated 4.2
+      ActorOwner                 = 0x016D, // updated 4.2 ?
       PlayerStateFlags           = 0x016E, // updated 4.2
       PlayerClassInfo            = 0x016F, // updated 4.2
       ModelEquip                 = 0x0170, // updated 4.2
@@ -126,6 +128,7 @@ namespace Packets {
       UpdateInventorySlot        = 0x0181, // updated 4.2
 
       EventPlay                  = 0x018E, // updated 4.2
+      DirectorPlayScene          = 0x0192, // updated 4.2
 
       EventStart                 = 0x0198, // updated 4.2
       EventFinish                = 0x0199, // updated 4.2
diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
index 4cd5349b..55f83697 100644
--- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h
+++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h
@@ -188,7 +188,7 @@ struct FFXIVIpcLinkshellList : FFXIVIpcBasePacket<LinkshellList>
 struct FFXIVIpcStatusEffectList : FFXIVIpcBasePacket<StatusEffectList>
 {
    uint8_t classId;
-   uint8_t classId1;
+   uint8_t level1;
    uint16_t level;
    uint32_t current_hp;
    uint32_t max_hp;
@@ -414,7 +414,7 @@ struct FFXIVIpcPlayerSpawn : FFXIVIpcBasePacket<PlayerSpawn>
 */
 struct FFXIVIpcNpcSpawn : FFXIVIpcBasePacket<NpcSpawn>
 {
-   uint32_t mapLinkId; // needs to be existing in the map, mob will snap to it
+   uint32_t gimmickId; // needs to be existing in the map, mob will snap to it
    uint8_t u2b;
    uint8_t u2ab;
    uint8_t gmRank;
@@ -565,7 +565,7 @@ struct FFXIVIpcHateList : FFXIVIpcBasePacket<HateList>
 struct FFXIVIpcUpdateClassInfo : FFXIVIpcBasePacket<UpdateClassInfo>
 {
    uint8_t classId;
-   uint8_t classId1;
+   uint8_t level1;
    uint16_t level;
    uint32_t nextLevelIndex;
    uint32_t currentExp;
@@ -1021,6 +1021,24 @@ struct FFXIVIpcEventPlay : FFXIVIpcBasePacket<EventPlay>
    uint8_t unknown[8];
 };
 
+   /**
+* Structural representation of the packet sent by the server
+* to play an event
+*/
+struct FFXIVIpcDirectorPlayScene : FFXIVIpcBasePacket<DirectorPlayScene>
+{
+   uint64_t actorId;
+   uint32_t eventId;
+   uint16_t scene;
+   uint16_t padding;
+   uint32_t flags;
+   uint32_t param3;
+   uint8_t param4;
+   uint8_t padding1[3];
+   uint32_t param5;
+   uint8_t unknown[0x40];
+};
+
 /**
 * Structural representation of the packet sent by the server
 * to finish an event
@@ -1324,7 +1342,7 @@ struct FFXIVIpcObjectSpawn : FFXIVIpcBasePacket<ObjectSpawn>
    uint32_t levelId;
    uint32_t unknown10;
    uint32_t someActorId14;
-   uint32_t hierachyId;
+   uint32_t gimmickId;
    float scale;
    int16_t unknown20a;
    uint16_t rotation;
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index eb6e0896..425fa411 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -663,6 +663,9 @@ void Core::Entity::Chara::sendStatusEffectUpdate()
 
    ZoneChannelPacket< Server::FFXIVIpcStatusEffectList > statusEffectList( getId() );
 
+   statusEffectList.data().classId = static_cast< uint8_t >( getClass() );
+   statusEffectList.data().level = getLevel();
+   statusEffectList.data().level1 = getLevel();
    statusEffectList.data().current_hp = getHp();
    statusEffectList.data().current_mp = getMp();
    statusEffectList.data().currentTp = getTp();
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 11fa13a3..1f683ec0 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -18,11 +18,11 @@ using namespace Core::Network::Packets::Server;
 extern Core::Logger g_log;
 
 
-Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t mapLinkId,
+Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uint32_t gimmickId,
                                         uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
                                         float rotation, const std::string& givenName ) :
    Core::Entity::Actor( ObjKind::EventObj ),
-   m_mapLinkId( mapLinkId ),
+   m_gimmickId( gimmickId ),
    m_state( initialState ),
    m_objectId( objectId ),
    m_name( givenName )
@@ -34,9 +34,9 @@ Core::Entity::EventObject::EventObject( uint32_t actorId, uint32_t objectId, uin
    m_rot = rotation;
 }
 
-uint32_t Core::Entity::EventObject::getMapLinkId() const
+uint32_t Core::Entity::EventObject::getGimmickId() const
 {
-   return m_mapLinkId;
+   return m_gimmickId;
 }
 
 uint32_t Core::Entity::EventObject::getObjectId() const
@@ -64,9 +64,9 @@ void Core::Entity::EventObject::setOnTalkHandler( Core::Entity::EventObject::OnT
    m_onTalkEventHandler = handler;
 }
 
-void Core::Entity::EventObject::setMapLinkId( uint32_t mapLinkId )
+void Core::Entity::EventObject::setGimmickId( uint32_t gimmickId )
 {
-   m_mapLinkId = mapLinkId;
+   m_gimmickId = gimmickId;
 }
 
 uint8_t Core::Entity::EventObject::getState() const
@@ -110,7 +110,7 @@ void Core::Entity::EventObject::spawn( Core::Entity::PlayerPtr pTarget )
    eobjStatePacket.data().objKind = getObjKind();
    eobjStatePacket.data().state = getState();
    eobjStatePacket.data().objId = getObjectId();
-   eobjStatePacket.data().hierachyId = getMapLinkId();
+   eobjStatePacket.data().gimmickId = getGimmickId();
    eobjStatePacket.data().position = getPos();
    eobjStatePacket.data().scale = getScale();
    eobjStatePacket.data().actorId = getId();
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index f1762b52..363d5077 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -10,13 +10,13 @@ namespace Entity
    class EventObject : public Actor
    {
    public:
-      EventObject( uint32_t actorId, uint32_t objectId, uint32_t mapLinkId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
+      EventObject( uint32_t actorId, uint32_t objectId, uint32_t gimmickId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
                    float rotation, const std::string& givenName = "none" );
 
       using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr, InstanceContentPtr, uint64_t ) >;
 
-      uint32_t getMapLinkId() const;
-      void setMapLinkId( uint32_t mapLinkId );
+      uint32_t getGimmickId() const;
+      void setGimmickId( uint32_t gimmickId );
 
       uint8_t getState() const;
       void setState( uint8_t state );
@@ -38,7 +38,7 @@ namespace Entity
       void despawn( PlayerPtr pTarget ) override;
 
    protected:
-      uint32_t m_mapLinkId;
+      uint32_t m_gimmickId;
       uint32_t m_objectId;
       uint8_t m_state;
       float m_scale;
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 5d94a554..61566635 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -630,7 +630,7 @@ void Core::Entity::Player::gainLevel()
 
    ZoneChannelPacket< FFXIVIpcStatusEffectList > effectListPacket( getId() );
    effectListPacket.data().classId = static_cast< uint8_t > ( getClass() );
-   effectListPacket.data().classId1 = static_cast< uint8_t > ( getClass() );
+   effectListPacket.data().level1 = getLevel();
    effectListPacket.data().level = getLevel();
    effectListPacket.data().current_hp = getMaxHp();
    effectListPacket.data().current_mp = getMaxMp();
@@ -645,7 +645,7 @@ void Core::Entity::Player::gainLevel()
 
    ZoneChannelPacket< FFXIVIpcUpdateClassInfo > classInfoPacket( getId() );
    classInfoPacket.data().classId = static_cast< uint8_t > ( getClass() );
-   classInfoPacket.data().classId1 = static_cast< uint8_t > ( getClass() );
+   classInfoPacket.data().level1 = getLevel();
    classInfoPacket.data().level = getLevel();
    classInfoPacket.data().nextLevelIndex = getLevel();
    classInfoPacket.data().currentExp = getExp();
@@ -1683,3 +1683,5 @@ bool Core::Entity::Player::isOnEnterEventDone() const
 {
    return m_onEnterEventDone;
 }
+
+
diff --git a/src/servers/sapphire_zone/Actor/Player.h b/src/servers/sapphire_zone/Actor/Player.h
index 39806a55..89233164 100644
--- a/src/servers/sapphire_zone/Actor/Player.h
+++ b/src/servers/sapphire_zone/Actor/Player.h
@@ -57,6 +57,9 @@ public:
    void eventStart( uint64_t actorId, uint32_t eventId, Event::EventHandler::EventType eventParam, uint8_t eventParam1, uint32_t eventParam2, uint32_t contentId = 0 );
    /*! play a subevent */
    void eventPlay( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
+
+   void directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2, uint32_t eventParam3 );
+
    /*! play a subevent */
    void eventPlay( uint32_t eventId, uint32_t scene, uint32_t flags,
                    uint32_t eventParam2, uint32_t eventParam3, Event::EventHandler::SceneReturnCallback eventReturnCallback );
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index c9f25c82..d7de126a 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -17,6 +17,7 @@
 #include "Network/PacketWrappers/EventStartPacket.h"
 #include "Network/PacketWrappers/EventPlayPacket.h"
 #include "Network/PacketWrappers/EventFinishPacket.h"
+#include "Network/PacketWrappers/DirectorPlayScenePacket.h"
 
 #include "Action/EventAction.h"
 #include "Action/EventItemAction.h"
@@ -75,6 +76,27 @@ void Core::Entity::Player::checkEvent( uint32_t eventId )
 }
 
 
+void Core::Entity::Player::directorPlayScene( uint32_t eventId, uint32_t scene, uint32_t flags, uint32_t eventParam2,
+                                              uint32_t eventParam3 )
+{
+   if( flags & 0x02 )
+      setStateFlag( PlayerStateFlag::WatchingCutscene );
+
+   auto pEvent = getEvent( eventId );
+   if( !pEvent )
+   {
+      g_log.error( "Could not find event " + std::to_string( eventId ) + ", event has not been started!" );
+      return;
+   }
+
+   pEvent->setPlayedScene( true );
+   pEvent->setEventReturnCallback( nullptr );
+   DirectorPlayScenePacket eventPlay( getId(), getId(), pEvent->getId(),
+                                      scene, flags, eventParam2, eventParam3 );
+
+   queuePacket( eventPlay );
+}
+
 void Core::Entity::Player::eventStart( uint64_t actorId, uint32_t eventId, 
                                        Event::EventHandler::EventType eventType, uint8_t eventParam1,
                                        uint32_t eventParam2, uint32_t contentId )
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 6915f69b..b7bda7da 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -88,6 +88,8 @@ enum ClientTrigger
 
    DirectorInitFinish = 0x321,
 
+   SomeDirectorEvent = 0x328, // unsure what exactly triggers it, starts director when returning to instance though
+
    EnterTerritoryEventFinished = 0x330,
 
    AchievementCritReq = 0x3E8,
@@ -254,6 +256,11 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
            player.getCurrentZone()->onInitDirector( player );
            break;
         }
+       case ClientTrigger::SomeDirectorEvent: // Director init finish
+       {
+          player.getCurrentZone()->onSomeDirectorEvent( player );
+          break;
+       }
         case ClientTrigger::EnterTerritoryEventFinished:// this may still be something else. I think i have seen it elsewhere
         {
            player.setOnEnterEventDone( true );
diff --git a/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h b/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
new file mode 100644
index 00000000..1c37c123
--- /dev/null
+++ b/src/servers/sapphire_zone/Network/PacketWrappers/DirectorPlayScenePacket.h
@@ -0,0 +1,55 @@
+#ifndef _DIRECTORPLAYSCENE_H
+#define _DIRECTORPLAYSCENE_H
+
+#include <common/Network/GamePacketNew.h>
+#include "Forwards.h"
+
+namespace Core {
+namespace Network {
+namespace Packets {
+namespace Server {
+
+/**
+* @brief The packet sent to play an event.
+*/
+class DirectorPlayScenePacket :  public ZoneChannelPacket< FFXIVIpcDirectorPlayScene >
+{
+public:
+   DirectorPlayScenePacket( uint32_t playerId,
+                    uint64_t actorId,
+                    uint32_t eventId,
+                    uint16_t scene,
+                    uint32_t flags,
+                    uint8_t param3,
+                    uint32_t param4 = 0,
+                    uint32_t param5 = 0 ) :
+           ZoneChannelPacket< FFXIVIpcDirectorPlayScene >( playerId, playerId )
+   {
+      initialize( actorId, eventId, scene, flags, param3, param4, param5 );
+   };
+
+private:
+   void initialize( uint64_t actorId,
+                    uint32_t eventId,
+                    uint16_t scene,
+                    uint32_t flags,
+                    uint8_t param3,
+                    uint32_t param4,
+                    uint32_t param5 )
+   {
+      m_data.actorId = actorId;
+      m_data.eventId = eventId;
+      m_data.scene = scene;
+      m_data.flags = flags;
+      m_data.param3 = param3;
+      m_data.param4 = param4;
+      m_data.param5 = param5;
+   };
+};
+
+}
+}
+}
+}
+
+#endif /*_EVENTPLAY_H*/
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
index e08c8f9a..9a2d1377 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@@ -1,5 +1,6 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
+#include <Actor/Player.h>
 
 class Sastasha : public InstanceContentScript
 {
@@ -70,7 +71,7 @@ public:
 
    void onEnterTerritory( Entity::Player &player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override
    {
-
+      player.directorPlayScene( getId(), 1, NO_DEFAULT_CAMERA | HIDE_HOTBAR, 0, 0xA );
    }
 
 };
\ No newline at end of file
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 14bb06b1..c25121d9 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -151,6 +151,12 @@ void Core::InstanceContent::onInitDirector( Entity::Player& player )
    player.setDirectorInitialized( true );
 }
 
+void Core::InstanceContent::onSomeDirectorEvent( Entity::Player& player )
+{
+   player.queuePacket( ActorControlPacket143( player.getId(), DirectorUpdate, 0x00110001, 0x80000000, 1 ) );
+}
+
+
 void Core::InstanceContent::setVar( uint8_t index, uint8_t value )
 {
    if( index > 19 )
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index fb5305e5..d487f86f 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -35,6 +35,7 @@ public:
    void onLeaveTerritory( Entity::Player& player ) override;
    void onFinishLoading( Entity::Player& player ) override;
    void onInitDirector( Entity::Player& player ) override;
+   void onSomeDirectorEvent( Entity::Player& player ) override;
    void onUpdate( uint32_t currTime ) override;
    void onTalk( Entity::Player& player, uint32_t eventId, uint64_t actorId );
    void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) override;
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index ae747869..58e165a4 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -77,6 +77,7 @@ public:
    virtual void onPlayerZoneIn( Entity::Player &player );
    virtual void onFinishLoading( Entity::Player& player );
    virtual void onInitDirector( Entity::Player& player );
+   virtual void onSomeDirectorEvent( Entity::Player& player ) {};
    virtual void onLeaveTerritory( Entity::Player& player );
    virtual void onUpdate( uint32_t currTime );
    virtual void onRegisterEObj( Entity::EventObjectPtr object ) {};