diff --git a/Map Server/Actors/Chara/Ai/State/ItemState.cs b/Map Server/Actors/Chara/Ai/State/ItemState.cs
index 94ea645b..e9c34019 100644
--- a/Map Server/Actors/Chara/Ai/State/ItemState.cs	
+++ b/Map Server/Actors/Chara/Ai/State/ItemState.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Map.Actors;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 
 namespace Meteor.Map.actors.chara.ai.state
 {
diff --git a/Map Server/Actors/Chara/Character.cs b/Map Server/Actors/Chara/Character.cs
index 914a7895..b7fa3242 100644
--- a/Map Server/Actors/Chara/Character.cs	
+++ b/Map Server/Actors/Chara/Character.cs	
@@ -24,7 +24,7 @@ using Meteor.Common;
 using Meteor.Map.actors.chara.player;
 using Meteor.Map.actors.group;
 using Meteor.Map.Actors.Chara;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.actor;
 using Meteor.Map.packets.send.actor.inventory;
 using Meteor.Map.utils;
diff --git a/Map Server/Actors/Chara/ItemPackage.cs b/Map Server/Actors/Chara/ItemPackage.cs
index 39beea0a..e14e89d5 100644
--- a/Map Server/Actors/Chara/ItemPackage.cs	
+++ b/Map Server/Actors/Chara/ItemPackage.cs	
@@ -22,7 +22,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 using Meteor.Common;
 using Meteor.Map.actors.chara.npc;
 using Meteor.Map.Actors;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.actor.inventory;
 using System;
 using System.Collections.Generic;
diff --git a/Map Server/Actors/Chara/Player/Player.cs b/Map Server/Actors/Chara/Player/Player.cs
index 2f0e6abb..2a80d930 100644
--- a/Map Server/Actors/Chara/Player/Player.cs	
+++ b/Map Server/Actors/Chara/Player/Player.cs	
@@ -23,8 +23,8 @@ using Meteor.Common;
 using System;
 using System.Collections.Generic;
 using MoonSharp.Interpreter;
-using Meteor.Map.dataobjects;
-using Meteor.Map.dataobjects.chara;
+using Meteor.Map.DataObjects;
+using Meteor.Map.DataObjects.chara;
 using Meteor.Map.lua;
 using Meteor.Map.packets.WorldPackets.Send.Group;
 using Meteor.Map.utils;
@@ -147,6 +147,7 @@ namespace Meteor.Map.Actors
         //Quest Actors (MUST MATCH playerWork.questScenario/questGuildleve)
         public Quest[] questScenario = new Quest[16];
         public uint[] questGuildleve = new uint[8];
+        public QuestStateManager questStateManager;
 
         //Aetheryte
         public uint homepoint = 0;
@@ -274,6 +275,9 @@ namespace Meteor.Map.Actors
             this.aiContainer = new AIContainer(this, new PlayerController(this), null, new TargetFind(this));
             allegiance = CharacterTargetingAllegiance.Player;
             CalculateBaseStats();
+
+            questStateManager = new QuestStateManager(this);
+            questStateManager.Init();
         }
 
         public List<SubPacket> Create0x132Packets()
@@ -400,9 +404,10 @@ namespace Meteor.Map.Actors
             if (CurrentArea.isInn)
             {
                 SetCutsceneBookPacket cutsceneBookPacket = new SetCutsceneBookPacket();
+                bool[] testComplete = new bool[2048]; //TODO: Change to playerwork.scenarioComplete
                 for (int i = 0; i < 2048; i++)
-                    cutsceneBookPacket.cutsceneFlags[i] = true;
-                QueuePacket(cutsceneBookPacket.BuildPacket(Id, "<Path Companion>", 11, 1, 1));
+                    testComplete[i] = true;
+                QueuePacket(cutsceneBookPacket.BuildPacket(Id, "<Path Companion>", 11, 1, 1, testComplete));
                 QueuePacket(SetPlayerDreamPacket.BuildPacket(Id, 0x16, GetInnCode()));
             }
 
@@ -1730,11 +1735,16 @@ namespace Meteor.Map.Actors
             return null;
         }
 
-        public Quest[] GetQuestsForNpc(Npc npc)
+        public Quest[] GetJournalQuestsForNpc(Npc npc)
         {
             return Array.FindAll(questScenario, e => e != null && e.IsQuestENPC(this, npc));
         }
 
+        public Quest[] GetQuestsForNpc(Npc npc)
+        {
+            return questStateManager.GetQuestsForNpc(npc);
+        }
+
         public void HandleNpcLS(uint id)
         {
             foreach (Quest quest in questScenario)
diff --git a/Map Server/Actors/Chara/Player/PlayerWork.cs b/Map Server/Actors/Chara/Player/PlayerWork.cs
index ebe46ebd..3851e106 100644
--- a/Map Server/Actors/Chara/Player/PlayerWork.cs	
+++ b/Map Server/Actors/Chara/Player/PlayerWork.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-namespace Meteor.Map.dataobjects.chara
+namespace Meteor.Map.DataObjects.chara
 {
     class PlayerWork
     {
diff --git a/Map Server/Actors/Chara/ReferencedItemPackage.cs b/Map Server/Actors/Chara/ReferencedItemPackage.cs
index 4e37b0de..e21d4582 100644
--- a/Map Server/Actors/Chara/ReferencedItemPackage.cs	
+++ b/Map Server/Actors/Chara/ReferencedItemPackage.cs	
@@ -21,7 +21,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 
 using Meteor.Map.actors.chara.player;
 using Meteor.Map.Actors;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.actor.inventory;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/Map Server/Actors/Director/GuildleveDirector.cs b/Map Server/Actors/Director/GuildleveDirector.cs
index 55b29063..1c59909a 100644
--- a/Map Server/Actors/Director/GuildleveDirector.cs	
+++ b/Map Server/Actors/Director/GuildleveDirector.cs	
@@ -22,7 +22,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 using Meteor.Common;
 using Meteor.Map.actors.director.Work;
 using Meteor.Map.Actors;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.utils;
 using System;
 using System.Collections.Generic;
diff --git a/Map Server/Actors/Group/ContentGroup.cs b/Map Server/Actors/Group/ContentGroup.cs
index d1588725..5a0844f2 100644
--- a/Map Server/Actors/Group/ContentGroup.cs	
+++ b/Map Server/Actors/Group/ContentGroup.cs	
@@ -23,7 +23,7 @@ using Meteor.Common;
 using Meteor.Map.actors.director;
 using Meteor.Map.actors.group.Work;
 using Meteor.Map.Actors;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.group;
 using Meteor.Map.packets.send.groups;
 using System.Collections.Generic;
diff --git a/Map Server/Actors/Group/Group.cs b/Map Server/Actors/Group/Group.cs
index 8c31a019..be81989e 100644
--- a/Map Server/Actors/Group/Group.cs	
+++ b/Map Server/Actors/Group/Group.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.group;
 using Meteor.Map.packets.send.groups;
 using System;
diff --git a/Map Server/Actors/Group/MonsterParty.cs b/Map Server/Actors/Group/MonsterParty.cs
index fc91b31a..a3d0dbc1 100644
--- a/Map Server/Actors/Group/MonsterParty.cs	
+++ b/Map Server/Actors/Group/MonsterParty.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.group;
 using Meteor.Map.packets.send.groups;
 using System.Collections.Generic;
diff --git a/Map Server/Actors/Group/RelationGroup.cs b/Map Server/Actors/Group/RelationGroup.cs
index c8e154a8..4c66dadf 100644
--- a/Map Server/Actors/Group/RelationGroup.cs	
+++ b/Map Server/Actors/Group/RelationGroup.cs	
@@ -21,7 +21,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 
 using Meteor.Common;
 using Meteor.Map.actors.group.Work;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.group;
 using Meteor.Map.packets.send.groups;
 using System.Collections.Generic;
diff --git a/Map Server/Actors/Group/RetainerMeetingRelationGroup.cs b/Map Server/Actors/Group/RetainerMeetingRelationGroup.cs
index 047a3bc0..37058c70 100644
--- a/Map Server/Actors/Group/RetainerMeetingRelationGroup.cs	
+++ b/Map Server/Actors/Group/RetainerMeetingRelationGroup.cs	
@@ -22,7 +22,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 using Meteor.Common;
 using Meteor.Map.actors.chara.npc;
 using Meteor.Map.Actors;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.group;
 using Meteor.Map.packets.send.groups;
 using System.Collections.Generic;
diff --git a/Map Server/Actors/Group/TradeGroup.cs b/Map Server/Actors/Group/TradeGroup.cs
index 941b99ed..c9149038 100644
--- a/Map Server/Actors/Group/TradeGroup.cs	
+++ b/Map Server/Actors/Group/TradeGroup.cs	
@@ -21,7 +21,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 
 using Meteor.Common;
 using Meteor.Map.actors.group.Work;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.send.group;
 using Meteor.Map.packets.send.groups;
 using System.Collections.Generic;
diff --git a/Map Server/CommandProcessor.cs b/Map Server/CommandProcessor.cs
index 9918d46a..66e28b44 100644
--- a/Map Server/CommandProcessor.cs	
+++ b/Map Server/CommandProcessor.cs	
@@ -22,7 +22,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 
 using System.IO;
 using Meteor.Map.packets.send;
diff --git a/Map Server/DataObjects/GuildleveData.cs b/Map Server/DataObjects/GuildleveData.cs
index 07a93c19..3845e96f 100644
--- a/Map Server/DataObjects/GuildleveData.cs	
+++ b/Map Server/DataObjects/GuildleveData.cs	
@@ -21,7 +21,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 
 using MySql.Data.MySqlClient;
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
     class GuildleveData
     {
diff --git a/Map Server/DataObjects/InventoryItem.cs b/Map Server/DataObjects/InventoryItem.cs
index 3b4f7a48..b331c4b2 100644
--- a/Map Server/DataObjects/InventoryItem.cs	
+++ b/Map Server/DataObjects/InventoryItem.cs	
@@ -25,7 +25,7 @@ using MySql.Data.MySqlClient;
 using System;
 using System.IO;
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
     class InventoryItem
     {
diff --git a/Map Server/DataObjects/ItemData.cs b/Map Server/DataObjects/ItemData.cs
index 07ad2f86..ceb182eb 100644
--- a/Map Server/DataObjects/ItemData.cs	
+++ b/Map Server/DataObjects/ItemData.cs	
@@ -22,7 +22,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 using MySql.Data.MySqlClient;
 using System;
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
     class ItemData
     {
diff --git a/Map Server/DataObjects/QuestData.cs b/Map Server/DataObjects/QuestData.cs
new file mode 100644
index 00000000..3054f64f
--- /dev/null
+++ b/Map Server/DataObjects/QuestData.cs	
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Meteor.Map.DataObjects
+{
+    class QuestData
+    {
+        public uint Id { get; }
+        public string ClassName { get; }
+        public string Name { get; }
+        public uint PrerequisiteQuest { get; }
+        public int MinLevel { get; }
+        public int MinGCRank { get; }
+
+        public QuestData(uint id, string className, string name, uint prereq, int minLv, int minGcRank)
+        {
+            Id = id;
+            ClassName = className;
+            Name = Name;
+            PrerequisiteQuest = prereq;
+            MinLevel = minLv;
+            MinGCRank = minGcRank;
+        }
+    }
+}
diff --git a/Map Server/DataObjects/RecruitmentDetails.cs b/Map Server/DataObjects/RecruitmentDetails.cs
index 76723e15..077e69fb 100644
--- a/Map Server/DataObjects/RecruitmentDetails.cs	
+++ b/Map Server/DataObjects/RecruitmentDetails.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
     class RecruitmentDetails
     {
diff --git a/Map Server/DataObjects/SeamlessBoundry.cs b/Map Server/DataObjects/SeamlessBoundry.cs
index 9d9319a3..a543a01b 100644
--- a/Map Server/DataObjects/SeamlessBoundry.cs	
+++ b/Map Server/DataObjects/SeamlessBoundry.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
     class SeamlessBoundry
     {
diff --git a/Map Server/DataObjects/SearchEntry.cs b/Map Server/DataObjects/SearchEntry.cs
index 6f092e11..ce145375 100644
--- a/Map Server/DataObjects/SearchEntry.cs	
+++ b/Map Server/DataObjects/SearchEntry.cs	
@@ -23,7 +23,7 @@ using System;
 using System.IO;
 using System.Text;
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
     class SearchEntry
     {
diff --git a/Map Server/DataObjects/Session.cs b/Map Server/DataObjects/Session.cs
index 1c93f276..299fa72c 100644
--- a/Map Server/DataObjects/Session.cs	
+++ b/Map Server/DataObjects/Session.cs	
@@ -26,8 +26,9 @@ using Meteor.Map.packets.send.actor;
 using System.Collections.Generic;
 using Meteor.Map.actors.chara.npc;
 using static Meteor.Map.Actors.Quest;
+using static Meteor.Map.Actors.QuestState;
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
     class Session
     {
@@ -167,7 +168,7 @@ namespace Meteor.Map.dataobjects
                         Quest[] quests = playerActor.GetQuestsForNpc(npc);
                         if (quests.Length != 0)
                         {
-                            ENpcQuestInstance questInstance = quests[0].GetENpcInstance(npc.GetActorClassId());
+                            QuestENpc questInstance = quests[0].GetQuestState().GetENpc(npc.GetActorClassId());
                             QueuePacket(npc.GetSetEventStatusPackets());
                             QueuePacket(SetActorQuestGraphicPacket.BuildPacket(npc.Id, questInstance.questFlagType));                            
                         }
@@ -179,7 +180,7 @@ namespace Meteor.Map.dataobjects
             }
         }
 
-        public void UpdateQuestNpcInInstance(ENpcQuestInstance questInstance, bool clearInstance = false)
+        public void UpdateQuestNpcInInstance(QuestENpc questInstance, bool clearInstance = false)
         {
             LockUpdates(true);
             Actor actor = actorInstanceList.Find(x => x is Npc npc && npc.GetActorClassId().Equals(questInstance.actorClassId));
diff --git a/Map Server/DataObjects/TradeTransaction.cs b/Map Server/DataObjects/TradeTransaction.cs
index 57181fa1..6b096b91 100644
--- a/Map Server/DataObjects/TradeTransaction.cs	
+++ b/Map Server/DataObjects/TradeTransaction.cs	
@@ -19,6 +19,6 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
 }
diff --git a/Map Server/DataObjects/ZoneConnection.cs b/Map Server/DataObjects/ZoneConnection.cs
index c681b15a..793b58fc 100644
--- a/Map Server/DataObjects/ZoneConnection.cs	
+++ b/Map Server/DataObjects/ZoneConnection.cs	
@@ -27,7 +27,7 @@ using System.Collections.Concurrent;
 using System.Net;
 using Meteor.Map.packets.WorldPackets.Send;
 
-namespace Meteor.Map.dataobjects
+namespace Meteor.Map.DataObjects
 {
     class ZoneConnection
     {
diff --git a/Map Server/Lua/LuaEngine.cs b/Map Server/Lua/LuaEngine.cs
index b10f090e..2a05fbd7 100644
--- a/Map Server/Lua/LuaEngine.cs	
+++ b/Map Server/Lua/LuaEngine.cs	
@@ -22,7 +22,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 
 using Meteor.Map.actors.director;
 using Meteor.Map.Actors;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using Meteor.Map.packets.receive.events;
 using Meteor.Map.packets.send;
 using Meteor.Map.packets.send.events;
@@ -40,7 +40,7 @@ using Meteor.Map.actors.chara.ai.controllers;
 using Meteor.Map.DataObjects;
 using Meteor.Map.actors.chara.player;
 using Meteor.Map.Actors.Chara;
-using Meteor.Map.dataobjects.chara;
+using Meteor.Map.DataObjects.chara;
 using Meteor.Map.actors.chara;
 
 namespace Meteor.Map.lua
diff --git a/Map Server/Packets/Send/Actor/Inventory/InventoryItemEndPacket.cs b/Map Server/Packets/Send/Actor/Inventory/InventoryItemEndPacket.cs
index 29a64880..bddba142 100644
--- a/Map Server/Packets/Send/Actor/Inventory/InventoryItemEndPacket.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/InventoryItemEndPacket.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/Map Server/Packets/Send/Actor/Inventory/InventoryItemPacket.cs b/Map Server/Packets/Send/Actor/Inventory/InventoryItemPacket.cs
index 96e56d49..3cf40a0e 100644
--- a/Map Server/Packets/Send/Actor/Inventory/InventoryItemPacket.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/InventoryItemPacket.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/Map Server/Packets/Send/Actor/Inventory/InventoryListX01Packet.cs b/Map Server/Packets/Send/Actor/Inventory/InventoryListX01Packet.cs
index f7c2c16f..bec8da3b 100644
--- a/Map Server/Packets/Send/Actor/Inventory/InventoryListX01Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/InventoryListX01Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System.IO;
 
 using Meteor.Common;
diff --git a/Map Server/Packets/Send/Actor/Inventory/InventoryListX08Packet.cs b/Map Server/Packets/Send/Actor/Inventory/InventoryListX08Packet.cs
index 88400896..22f54b29 100644
--- a/Map Server/Packets/Send/Actor/Inventory/InventoryListX08Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/InventoryListX08Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Map Server/Packets/Send/Actor/Inventory/InventoryListX16Packet.cs b/Map Server/Packets/Send/Actor/Inventory/InventoryListX16Packet.cs
index 143658b1..96cfe0a0 100644
--- a/Map Server/Packets/Send/Actor/Inventory/InventoryListX16Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/InventoryListX16Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/Map Server/Packets/Send/Actor/Inventory/InventoryListX32Packet.cs b/Map Server/Packets/Send/Actor/Inventory/InventoryListX32Packet.cs
index dbcadaa4..0710b630 100644
--- a/Map Server/Packets/Send/Actor/Inventory/InventoryListX32Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/InventoryListX32Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/Map Server/Packets/Send/Actor/Inventory/InventoryListX64Packet.cs b/Map Server/Packets/Send/Actor/Inventory/InventoryListX64Packet.cs
index 0fe22ff3..8d6278b4 100644
--- a/Map Server/Packets/Send/Actor/Inventory/InventoryListX64Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/InventoryListX64Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX01Packet.cs b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX01Packet.cs
index f90d749d..78697fc3 100644
--- a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX01Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX01Packet.cs	
@@ -23,7 +23,7 @@ using System;
 using System.IO;
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 
 namespace  Meteor.Map.packets.send.actor.inventory
 {
diff --git a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX08Packet.cs b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX08Packet.cs
index e54442a3..2addbb7b 100644
--- a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX08Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX08Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX16Packet.cs b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX16Packet.cs
index 3d1e00a5..d9e867c6 100644
--- a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX16Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX16Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX32Packet.cs b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX32Packet.cs
index 2aa30ab3..dde58f04 100644
--- a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX32Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX32Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX64Packet.cs b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX64Packet.cs
index b23a39b1..82f8b891 100644
--- a/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX64Packet.cs	
+++ b/Map Server/Packets/Send/Actor/Inventory/LinkedItemListX64Packet.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Map Server/Packets/Send/Player/SetCutsceneBookPacket.cs b/Map Server/Packets/Send/Player/SetCutsceneBookPacket.cs
index 2a08adbb..4050f87a 100644
--- a/Map Server/Packets/Send/Player/SetCutsceneBookPacket.cs	
+++ b/Map Server/Packets/Send/Player/SetCutsceneBookPacket.cs	
@@ -79,9 +79,7 @@ namespace Meteor.Map.packets.send.player
         public const ushort OPCODE = 0x01A3;
         public const uint PACKET_SIZE = 0x150;
 
-        public bool[] cutsceneFlags = new bool[2048];
-
-        public SubPacket BuildPacket(uint sourceActorId, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality)
+        public SubPacket BuildPacket(uint sourceActorId, string sNpcName, short sNpcActorIdOffset, byte sNpcSkin, byte sNpcPersonality, bool[] completedQuests)
         {
             byte[] data = new byte[PACKET_SIZE - 0x20];
 
@@ -89,7 +87,7 @@ namespace Meteor.Map.packets.send.player
             {
                 using (BinaryWriter binWriter = new BinaryWriter(mem))
                 {
-                    byte[] binStream = Utils.ConvertBoolArrayToBinaryStream(cutsceneFlags);
+                    byte[] binStream = Utils.ConvertBoolArrayToBinaryStream(completedQuests);
                     
                     //Temp Path Companion SNPC Stuff
                     binWriter.Seek(0x01 ,SeekOrigin.Begin);
diff --git a/Map Server/Packets/Send/Recruitment/CurrentRecruitmentDetailsPacket.cs b/Map Server/Packets/Send/Recruitment/CurrentRecruitmentDetailsPacket.cs
index 38602168..7f3d36f6 100644
--- a/Map Server/Packets/Send/Recruitment/CurrentRecruitmentDetailsPacket.cs	
+++ b/Map Server/Packets/Send/Recruitment/CurrentRecruitmentDetailsPacket.cs	
@@ -19,7 +19,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 ===========================================================================
 */
 
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 using System.Text;
diff --git a/Map Server/Packets/WorldPackets/Send/Group/CreateLinkshellPacket.cs b/Map Server/Packets/WorldPackets/Send/Group/CreateLinkshellPacket.cs
index e08a5f80..1eb7f045 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/CreateLinkshellPacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/CreateLinkshellPacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 using System.Text;
diff --git a/Map Server/Packets/WorldPackets/Send/Group/DeleteLinkshellPacket.cs b/Map Server/Packets/WorldPackets/Send/Group/DeleteLinkshellPacket.cs
index 1aec3b84..e88d70bb 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/DeleteLinkshellPacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/DeleteLinkshellPacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System.IO;
 using System.Text;
 
diff --git a/Map Server/Packets/WorldPackets/Send/Group/GroupInviteResultPacket.cs b/Map Server/Packets/WorldPackets/Send/Group/GroupInviteResultPacket.cs
index 21b4c89b..f6f5b06c 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/GroupInviteResultPacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/GroupInviteResultPacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 
diff --git a/Map Server/Packets/WorldPackets/Send/Group/LinkshellChangePacket.cs b/Map Server/Packets/WorldPackets/Send/Group/LinkshellChangePacket.cs
index 34cb1a97..acbb9e0a 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/LinkshellChangePacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/LinkshellChangePacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System.IO;
 using System.Text;
 
diff --git a/Map Server/Packets/WorldPackets/Send/Group/LinkshellInviteCancelPacket.cs b/Map Server/Packets/WorldPackets/Send/Group/LinkshellInviteCancelPacket.cs
index 52ed6900..ae8c9a26 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/LinkshellInviteCancelPacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/LinkshellInviteCancelPacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 
 namespace Meteor.Map.packets.WorldPackets.Send.Group
 {
diff --git a/Map Server/Packets/WorldPackets/Send/Group/LinkshellInvitePacket.cs b/Map Server/Packets/WorldPackets/Send/Group/LinkshellInvitePacket.cs
index 3c904196..f262110e 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/LinkshellInvitePacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/LinkshellInvitePacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 using System.Text;
diff --git a/Map Server/Packets/WorldPackets/Send/Group/LinkshellLeavePacket.cs b/Map Server/Packets/WorldPackets/Send/Group/LinkshellLeavePacket.cs
index 4d75fb55..8637d14a 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/LinkshellLeavePacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/LinkshellLeavePacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 using System.Text;
diff --git a/Map Server/Packets/WorldPackets/Send/Group/LinkshellRankChangePacket.cs b/Map Server/Packets/WorldPackets/Send/Group/LinkshellRankChangePacket.cs
index b246e57c..46804a8c 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/LinkshellRankChangePacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/LinkshellRankChangePacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 using System.Text;
diff --git a/Map Server/Packets/WorldPackets/Send/Group/ModifyLinkshellPacket.cs b/Map Server/Packets/WorldPackets/Send/Group/ModifyLinkshellPacket.cs
index 079ec4bb..0a70745a 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/ModifyLinkshellPacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/ModifyLinkshellPacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 using System.Text;
diff --git a/Map Server/Packets/WorldPackets/Send/Group/PartyInvitePacket.cs b/Map Server/Packets/WorldPackets/Send/Group/PartyInvitePacket.cs
index 81fd9c95..8cb6239f 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/PartyInvitePacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/PartyInvitePacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 using System.Text;
diff --git a/Map Server/Packets/WorldPackets/Send/Group/PartyLeavePacket.cs b/Map Server/Packets/WorldPackets/Send/Group/PartyLeavePacket.cs
index 9c80ced8..dc9ae4ed 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/PartyLeavePacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/PartyLeavePacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 
diff --git a/Map Server/Packets/WorldPackets/Send/Group/PartyModifyPacket.cs b/Map Server/Packets/WorldPackets/Send/Group/PartyModifyPacket.cs
index 4b7ece29..a7745ce2 100644
--- a/Map Server/Packets/WorldPackets/Send/Group/PartyModifyPacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/Group/PartyModifyPacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 using System.Text;
diff --git a/Map Server/Packets/WorldPackets/Send/SessionBeginConfirmPacket.cs b/Map Server/Packets/WorldPackets/Send/SessionBeginConfirmPacket.cs
index 2ee8159c..11481336 100644
--- a/Map Server/Packets/WorldPackets/Send/SessionBeginConfirmPacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/SessionBeginConfirmPacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;
 
diff --git a/Map Server/Packets/WorldPackets/Send/SessionEndConfirmPacket.cs b/Map Server/Packets/WorldPackets/Send/SessionEndConfirmPacket.cs
index eb47c299..4f697e0c 100644
--- a/Map Server/Packets/WorldPackets/Send/SessionEndConfirmPacket.cs	
+++ b/Map Server/Packets/WorldPackets/Send/SessionEndConfirmPacket.cs	
@@ -20,7 +20,7 @@ along with Project Meteor Server. If not, see <https:www.gnu.org/licenses/>.
 */
 
 using Meteor.Common;
-using Meteor.Map.dataobjects;
+using Meteor.Map.DataObjects;
 using System;
 using System.IO;