diff --git a/dCommon/dConfig.h b/dCommon/dConfig.h
index a6dd5df7..562c1ce9 100644
--- a/dCommon/dConfig.h
+++ b/dCommon/dConfig.h
@@ -24,7 +24,6 @@ public:
 	 * Reloads the config file to reset values
 	 */
 	void ReloadConfig();
-
 private:
 	void ProcessLine(const std::string& line);
 
diff --git a/dCommon/dEnums/MissionState.h b/dCommon/dEnums/MissionState.h
index fb1841d3..f040d33a 100644
--- a/dCommon/dEnums/MissionState.h
+++ b/dCommon/dEnums/MissionState.h
@@ -6,7 +6,7 @@
 /**
  * Represents the possible states a mission can be in
  */
-enum class MissionState : int {
+enum class MissionState : int32_t {
 	/**
 	 * The mission state is unknown
 	 */
diff --git a/dCommon/PermissionMap.h b/dCommon/dEnums/PermissionMap.h
similarity index 100%
rename from dCommon/PermissionMap.h
rename to dCommon/dEnums/PermissionMap.h
diff --git a/dCommon/dEnums/dCommonVars.h b/dCommon/dEnums/dCommonVars.h
index 1fd5d071..9bf824e0 100644
--- a/dCommon/dEnums/dCommonVars.h
+++ b/dCommon/dEnums/dCommonVars.h
@@ -366,7 +366,7 @@ enum eControlSceme {
 	SCHEME_WEAR_A_ROBOT //== freecam?
 };
 
-enum eStunState {
+enum class eStateChangeType : uint32_t {
 	PUSH,
 	POP
 };
diff --git a/dCommon/dEnums/dMessageIdentifiers.h b/dCommon/dEnums/dMessageIdentifiers.h
index 129585a0..c1afc497 100644
--- a/dCommon/dEnums/dMessageIdentifiers.h
+++ b/dCommon/dEnums/dMessageIdentifiers.h
@@ -293,6 +293,7 @@ enum GAME_MSG : unsigned short {
 	GAME_MSG_POP_EQUIPPED_ITEMS_STATE = 192,
 	GAME_MSG_SET_GM_LEVEL = 193,
 	GAME_MSG_SET_STUNNED = 198,
+	GAME_MSG_SET_STUN_IMMUNITY = 200,
 	GAME_MSG_KNOCKBACK = 202,
 	GAME_MSG_REBUILD_CANCEL = 209,
 	GAME_MSG_ENABLE_REBUILD = 213,
@@ -373,6 +374,8 @@ enum GAME_MSG : unsigned short {
 	GAME_MSG_PET_TAMING_TRY_BUILD_RESULT = 668,
 	GAME_MSG_NOTIFY_TAMING_BUILD_SUCCESS = 673,
 	GAME_MSG_NOTIFY_TAMING_MODEL_LOADED_ON_SERVER = 674,
+	GAME_MSG_ACTIVATE_BUBBLE_BUFF = 678,
+	GAME_MSG_DEACTIVATE_BUBBLE_BUFF = 679,
 	GAME_MSG_ADD_PET_TO_PLAYER = 681,
 	GAME_MSG_REQUEST_SET_PET_NAME = 683,
 	GAME_MSG_SET_PET_NAME = 684,
@@ -385,7 +388,10 @@ enum GAME_MSG : unsigned short {
 	GAME_MSG_QUERY_PROPERTY_DATA = 717,
 	GAME_MSG_PROPERTY_EDITOR_BEGIN = 724,
 	GAME_MSG_PROPERTY_EDITOR_END = 725,
-	GAME_MSG_START_PATHING = 735,
+	GAME_MSG_IS_MINIFIG_IN_A_BUBBLE = 729,
+	GAME_MSG_START_PATHING = 733,
+	GAME_MSG_ACTIVATE_BUBBLE_BUFF_FROM_SERVER = 734,
+	GAME_MSG_DEACTIVATE_BUBBLE_BUFF_FROM_SERVER = 735,
 	GAME_MSG_NOTIFY_CLIENT_ZONE_OBJECT = 737,
 	GAME_MSG_UPDATE_REPUTATION = 746,
 	GAME_MSG_PROPERTY_RENTAL_RESPONSE = 750,
@@ -512,6 +518,7 @@ enum GAME_MSG : unsigned short {
 	GAME_MSG_UPDATE_CHAT_MODE = 1395,
 	GAME_MSG_VEHICLE_NOTIFY_FINISHED_RACE = 1396,
 	GAME_MSG_SET_CONSUMABLE_ITEM = 1409,
+	GAME_MSG_SET_STATUS_IMMUNITY = 1435,
 	GAME_MSG_SET_PET_NAME_MODERATED = 1448,
 	GAME_MSG_MODIFY_LEGO_SCORE = 1459,
 	GAME_MSG_RESTORE_TO_POST_LOAD_STATS = 1468,
diff --git a/dCommon/eBlueprintSaveResponseType.h b/dCommon/dEnums/eBlueprintSaveResponseType.h
similarity index 100%
rename from dCommon/eBlueprintSaveResponseType.h
rename to dCommon/dEnums/eBlueprintSaveResponseType.h
diff --git a/dCommon/dEnums/eBubbleType.h b/dCommon/dEnums/eBubbleType.h
new file mode 100644
index 00000000..4aa6fad1
--- /dev/null
+++ b/dCommon/dEnums/eBubbleType.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#ifndef __EBUBBLETYPE__H__
+#define __EBUBBLETYPE__H__
+
+#include <cstdint>
+
+enum class eBubbleType : uint32_t {
+	DEFAULT = 0,
+	ENERGY = 1,
+	SKUNK = 2,
+};
+
+#endif  //!__EBUBBLETYPE__H__
diff --git a/dCommon/dEnums/eMovementPlatformState.h b/dCommon/dEnums/eMovementPlatformState.h
new file mode 100644
index 00000000..1df437d8
--- /dev/null
+++ b/dCommon/dEnums/eMovementPlatformState.h
@@ -0,0 +1,16 @@
+#ifndef __EMOVEMENTPLATFORMSTATE__H__
+#define __EMOVEMENTPLATFORMSTATE__H__
+
+#include <cstdint>
+
+/**
+ * The different types of platform movement state, supposedly a bitmap
+ */
+enum class eMovementPlatformState : uint32_t
+{
+	Moving = 0b00010,
+	Stationary = 0b11001,
+	Stopped = 0b01100
+};
+
+#endif  //!__EMOVEMENTPLATFORMSTATE__H__
diff --git a/dDatabase/Tables/CDActivitiesTable.cpp b/dDatabase/Tables/CDActivitiesTable.cpp
index 835ca3d2..d6fa354e 100644
--- a/dDatabase/Tables/CDActivitiesTable.cpp
+++ b/dDatabase/Tables/CDActivitiesTable.cpp
@@ -21,25 +21,25 @@ CDActivitiesTable::CDActivitiesTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Activities");
 	while (!tableData.eof()) {
 		CDActivities entry;
-		entry.ActivityID = tableData.getIntField(0, -1);
-		entry.locStatus = tableData.getIntField(1, -1);
-		entry.instanceMapID = tableData.getIntField(2, -1);
-		entry.minTeams = tableData.getIntField(3, -1);
-		entry.maxTeams = tableData.getIntField(4, -1);
-		entry.minTeamSize = tableData.getIntField(5, -1);
-		entry.maxTeamSize = tableData.getIntField(6, -1);
-		entry.waitTime = tableData.getIntField(7, -1);
-		entry.startDelay = tableData.getIntField(8, -1);
-		entry.requiresUniqueData = tableData.getIntField(9, -1);
-		entry.leaderboardType = tableData.getIntField(10, -1);
-		entry.localize = tableData.getIntField(11, -1);
-		entry.optionalCostLOT = tableData.getIntField(12, -1);
-		entry.optionalCostCount = tableData.getIntField(13, -1);
-		entry.showUIRewards = tableData.getIntField(14, -1);
-		entry.CommunityActivityFlagID = tableData.getIntField(15, -1);
-		entry.gate_version = tableData.getStringField(16, "");
-		entry.noTeamLootOnDeath = tableData.getIntField(17, -1);
-		entry.optionalPercentage = tableData.getFloatField(18, -1.0f);
+		entry.ActivityID = tableData.getIntField("ActivityID", -1);
+		entry.locStatus = tableData.getIntField("locStatus", -1);
+		entry.instanceMapID = tableData.getIntField("instanceMapID", -1);
+		entry.minTeams = tableData.getIntField("minTeams", -1);
+		entry.maxTeams = tableData.getIntField("maxTeams", -1);
+		entry.minTeamSize = tableData.getIntField("minTeamSize", -1);
+		entry.maxTeamSize = tableData.getIntField("maxTeamSize", -1);
+		entry.waitTime = tableData.getIntField("waitTime", -1);
+		entry.startDelay = tableData.getIntField("startDelay", -1);
+		entry.requiresUniqueData = tableData.getIntField("requiresUniqueData", -1);
+		entry.leaderboardType = tableData.getIntField("leaderboardType", -1);
+		entry.localize = tableData.getIntField("localize", -1);
+		entry.optionalCostLOT = tableData.getIntField("optionalCostLOT", -1);
+		entry.optionalCostCount = tableData.getIntField("optionalCostCount", -1);
+		entry.showUIRewards = tableData.getIntField("showUIRewards", -1);
+		entry.CommunityActivityFlagID = tableData.getIntField("CommunityActivityFlagID", -1);
+		entry.gate_version = tableData.getStringField("gate_version", "");
+		entry.noTeamLootOnDeath = tableData.getIntField("noTeamLootOnDeath", -1);
+		entry.optionalPercentage = tableData.getFloatField("optionalPercentage", -1.0f);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -70,3 +70,4 @@ std::vector<CDActivities> CDActivitiesTable::Query(std::function<bool(CDActiviti
 std::vector<CDActivities> CDActivitiesTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDActivityRewardsTable.cpp b/dDatabase/Tables/CDActivityRewardsTable.cpp
index f1719204..3922d9fb 100644
--- a/dDatabase/Tables/CDActivityRewardsTable.cpp
+++ b/dDatabase/Tables/CDActivityRewardsTable.cpp
@@ -21,13 +21,13 @@ CDActivityRewardsTable::CDActivityRewardsTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ActivityRewards");
 	while (!tableData.eof()) {
 		CDActivityRewards entry;
-		entry.objectTemplate = tableData.getIntField(0, -1);
-		entry.ActivityRewardIndex = tableData.getIntField(1, -1);
-		entry.activityRating = tableData.getIntField(2, -1);
-		entry.LootMatrixIndex = tableData.getIntField(3, -1);
-		entry.CurrencyIndex = tableData.getIntField(4, -1);
-		entry.ChallengeRating = tableData.getIntField(5, -1);
-		entry.description = tableData.getStringField(6, "");
+		entry.objectTemplate = tableData.getIntField("objectTemplate", -1);
+		entry.ActivityRewardIndex = tableData.getIntField("ActivityRewardIndex", -1);
+		entry.activityRating = tableData.getIntField("activityRating", -1);
+		entry.LootMatrixIndex = tableData.getIntField("LootMatrixIndex", -1);
+		entry.CurrencyIndex = tableData.getIntField("CurrencyIndex", -1);
+		entry.ChallengeRating = tableData.getIntField("ChallengeRating", -1);
+		entry.description = tableData.getStringField("description", "");
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -58,3 +58,4 @@ std::vector<CDActivityRewards> CDActivityRewardsTable::Query(std::function<bool(
 std::vector<CDActivityRewards> CDActivityRewardsTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDAnimationsTable.cpp b/dDatabase/Tables/CDAnimationsTable.cpp
index 399804f8..e21d44c5 100644
--- a/dDatabase/Tables/CDAnimationsTable.cpp
+++ b/dDatabase/Tables/CDAnimationsTable.cpp
@@ -21,19 +21,19 @@ CDAnimationsTable::CDAnimationsTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Animations");
 	while (!tableData.eof()) {
 		CDAnimations entry;
-		entry.animationGroupID = tableData.getIntField(0, -1);
-		entry.animation_type = tableData.getStringField(1, "");
-		entry.animation_name = tableData.getStringField(2, "");
-		entry.chance_to_play = tableData.getFloatField(3, -1.0f);
-		entry.min_loops = tableData.getIntField(4, -1);
-		entry.max_loops = tableData.getIntField(5, -1);
-		entry.animation_length = tableData.getFloatField(6, -1.0f);
-		entry.hideEquip = tableData.getIntField(7, -1) == 1 ? true : false;
-		entry.ignoreUpperBody = tableData.getIntField(8, -1) == 1 ? true : false;
-		entry.restartable = tableData.getIntField(9, -1) == 1 ? true : false;
-		entry.face_animation_name = tableData.getStringField(10, "");
-		entry.priority = tableData.getFloatField(11, -1.0f);
-		entry.blendTime = tableData.getFloatField(12, -1.0f);
+		entry.animationGroupID = tableData.getIntField("animationGroupID", -1);
+		entry.animation_type = tableData.getStringField("animation_type", "");
+		entry.animation_name = tableData.getStringField("animation_name", "");
+		entry.chance_to_play = tableData.getFloatField("chance_to_play", -1.0f);
+		entry.min_loops = tableData.getIntField("min_loops", -1);
+		entry.max_loops = tableData.getIntField("max_loops", -1);
+		entry.animation_length = tableData.getFloatField("animation_length", -1.0f);
+		entry.hideEquip = tableData.getIntField("hideEquip", -1) == 1 ? true : false;
+		entry.ignoreUpperBody = tableData.getIntField("ignoreUpperBody", -1) == 1 ? true : false;
+		entry.restartable = tableData.getIntField("restartable", -1) == 1 ? true : false;
+		entry.face_animation_name = tableData.getStringField("face_animation_name", "");
+		entry.priority = tableData.getFloatField("priority", -1.0f);
+		entry.blendTime = tableData.getFloatField("blendTime", -1.0f);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -64,3 +64,4 @@ std::vector<CDAnimations> CDAnimationsTable::Query(std::function<bool(CDAnimatio
 std::vector<CDAnimations> CDAnimationsTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDBehaviorParameterTable.cpp b/dDatabase/Tables/CDBehaviorParameterTable.cpp
index d09a71b2..b894688b 100644
--- a/dDatabase/Tables/CDBehaviorParameterTable.cpp
+++ b/dDatabase/Tables/CDBehaviorParameterTable.cpp
@@ -8,8 +8,8 @@ CDBehaviorParameterTable::CDBehaviorParameterTable(void) {
 	uint64_t hash = 0;
 	while (!tableData.eof()) {
 		CDBehaviorParameter entry;
-		entry.behaviorID = tableData.getIntField(0, -1);
-		auto candidateStringToAdd = std::string(tableData.getStringField(1, ""));
+		entry.behaviorID = tableData.getIntField("behaviorID", -1);
+		auto candidateStringToAdd = std::string(tableData.getStringField("parameterID", ""));
 		auto parameter = m_ParametersList.find(candidateStringToAdd);
 		if (parameter != m_ParametersList.end()) {
 			entry.parameterID = parameter;
@@ -19,7 +19,7 @@ CDBehaviorParameterTable::CDBehaviorParameterTable(void) {
 		}
 		hash = entry.behaviorID;
 		hash = (hash << 31U) | entry.parameterID->second;
-		entry.value = tableData.getFloatField(2, -1.0f);
+		entry.value = tableData.getFloatField("value", -1.0f);
 
 		m_Entries.insert(std::make_pair(hash, entry));
 
@@ -62,3 +62,4 @@ std::map<std::string, float> CDBehaviorParameterTable::GetParametersByBehaviorID
 	}
 	return returnInfo;
 }
+
diff --git a/dDatabase/Tables/CDBehaviorTemplateTable.cpp b/dDatabase/Tables/CDBehaviorTemplateTable.cpp
index 1628756f..4adb9bce 100644
--- a/dDatabase/Tables/CDBehaviorTemplateTable.cpp
+++ b/dDatabase/Tables/CDBehaviorTemplateTable.cpp
@@ -21,9 +21,9 @@ CDBehaviorTemplateTable::CDBehaviorTemplateTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BehaviorTemplate");
 	while (!tableData.eof()) {
 		CDBehaviorTemplate entry;
-		entry.behaviorID = tableData.getIntField(0, -1);
-		entry.templateID = tableData.getIntField(1, -1);
-		entry.effectID = tableData.getIntField(2, -1);
+		entry.behaviorID = tableData.getIntField("behaviorID", -1);
+		entry.templateID = tableData.getIntField("templateID", -1);
+		entry.effectID = tableData.getIntField("effectID", -1);
 		auto candidateToAdd = tableData.getStringField(3, "");
 		auto parameter = m_EffectHandles.find(candidateToAdd);
 		if (parameter != m_EffectHandles.end()) {
@@ -75,3 +75,4 @@ const CDBehaviorTemplate CDBehaviorTemplateTable::GetByBehaviorID(uint32_t behav
 		return entry->second;
 	}
 }
+
diff --git a/dDatabase/Tables/CDBrickIDTableTable.cpp b/dDatabase/Tables/CDBrickIDTableTable.cpp
index 9dbdf2c0..7cd3e86f 100644
--- a/dDatabase/Tables/CDBrickIDTableTable.cpp
+++ b/dDatabase/Tables/CDBrickIDTableTable.cpp
@@ -21,8 +21,8 @@ CDBrickIDTableTable::CDBrickIDTableTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM BrickIDTable");
 	while (!tableData.eof()) {
 		CDBrickIDTable entry;
-		entry.NDObjectID = tableData.getIntField(0, -1);
-		entry.LEGOBrickID = tableData.getIntField(1, -1);
+		entry.NDObjectID = tableData.getIntField("NDObjectID", -1);
+		entry.LEGOBrickID = tableData.getIntField("LEGOBrickID", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -53,3 +53,4 @@ std::vector<CDBrickIDTable> CDBrickIDTableTable::Query(std::function<bool(CDBric
 std::vector<CDBrickIDTable> CDBrickIDTableTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDComponentsRegistryTable.cpp b/dDatabase/Tables/CDComponentsRegistryTable.cpp
index 8e5ae108..987c66ab 100644
--- a/dDatabase/Tables/CDComponentsRegistryTable.cpp
+++ b/dDatabase/Tables/CDComponentsRegistryTable.cpp
@@ -24,9 +24,9 @@ CDComponentsRegistryTable::CDComponentsRegistryTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ComponentsRegistry");
 	while (!tableData.eof()) {
 		CDComponentsRegistry entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.component_type = tableData.getIntField(1, -1);
-		entry.component_id = tableData.getIntField(2, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.component_type = tableData.getIntField("component_type", -1);
+		entry.component_id = tableData.getIntField("component_id", -1);
 
 		this->mappedEntries.insert_or_assign(((uint64_t)entry.component_type) << 32 | ((uint64_t)entry.id), entry.component_id);
 
@@ -91,9 +91,9 @@ int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, uint32_t componen
 	auto tableData = CDClientDatabase::ExecuteQuery(query.str());
 	while (!tableData.eof()) {
 		CDComponentsRegistry entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.component_type = tableData.getIntField(1, -1);
-		entry.component_id = tableData.getIntField(2, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.component_type = tableData.getIntField("component_type", -1);
+		entry.component_id = tableData.getIntField("component_id", -1);
 
 		//this->entries.push_back(entry);
 
@@ -126,3 +126,4 @@ int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, uint32_t componen
 	return defaultValue;
 #endif
 }
+
diff --git a/dDatabase/Tables/CDCurrencyTableTable.cpp b/dDatabase/Tables/CDCurrencyTableTable.cpp
index a1923a73..21870f00 100644
--- a/dDatabase/Tables/CDCurrencyTableTable.cpp
+++ b/dDatabase/Tables/CDCurrencyTableTable.cpp
@@ -21,11 +21,11 @@ CDCurrencyTableTable::CDCurrencyTableTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM CurrencyTable");
 	while (!tableData.eof()) {
 		CDCurrencyTable entry;
-		entry.currencyIndex = tableData.getIntField(0, -1);
-		entry.npcminlevel = tableData.getIntField(1, -1);
-		entry.minvalue = tableData.getIntField(2, -1);
-		entry.maxvalue = tableData.getIntField(3, -1);
-		entry.id = tableData.getIntField(4, -1);
+		entry.currencyIndex = tableData.getIntField("currencyIndex", -1);
+		entry.npcminlevel = tableData.getIntField("npcminlevel", -1);
+		entry.minvalue = tableData.getIntField("minvalue", -1);
+		entry.maxvalue = tableData.getIntField("maxvalue", -1);
+		entry.id = tableData.getIntField("id", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -56,3 +56,4 @@ std::vector<CDCurrencyTable> CDCurrencyTableTable::Query(std::function<bool(CDCu
 std::vector<CDCurrencyTable> CDCurrencyTableTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDDestructibleComponentTable.cpp b/dDatabase/Tables/CDDestructibleComponentTable.cpp
index d7438fc7..2480fc24 100644
--- a/dDatabase/Tables/CDDestructibleComponentTable.cpp
+++ b/dDatabase/Tables/CDDestructibleComponentTable.cpp
@@ -21,20 +21,20 @@ CDDestructibleComponentTable::CDDestructibleComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM DestructibleComponent");
 	while (!tableData.eof()) {
 		CDDestructibleComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.faction = tableData.getIntField(1, -1);
-		entry.factionList = tableData.getStringField(2, "");
-		entry.life = tableData.getIntField(3, -1);
-		entry.imagination = tableData.getIntField(4, -1);
-		entry.LootMatrixIndex = tableData.getIntField(5, -1);
-		entry.CurrencyIndex = tableData.getIntField(6, -1);
-		entry.level = tableData.getIntField(7, -1);
-		entry.armor = tableData.getFloatField(8, -1.0f);
-		entry.death_behavior = tableData.getIntField(9, -1);
-		entry.isnpc = tableData.getIntField(10, -1) == 1 ? true : false;
-		entry.attack_priority = tableData.getIntField(11, -1);
-		entry.isSmashable = tableData.getIntField(12, -1) == 1 ? true : false;
-		entry.difficultyLevel = tableData.getIntField(13, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.faction = tableData.getIntField("faction", -1);
+		entry.factionList = tableData.getStringField("factionList", "");
+		entry.life = tableData.getIntField("life", -1);
+		entry.imagination = tableData.getIntField("imagination", -1);
+		entry.LootMatrixIndex = tableData.getIntField("LootMatrixIndex", -1);
+		entry.CurrencyIndex = tableData.getIntField("CurrencyIndex", -1);
+		entry.level = tableData.getIntField("level", -1);
+		entry.armor = tableData.getFloatField("armor", -1.0f);
+		entry.death_behavior = tableData.getIntField("death_behavior", -1);
+		entry.isnpc = tableData.getIntField("isnpc", -1) == 1 ? true : false;
+		entry.attack_priority = tableData.getIntField("attack_priority", -1);
+		entry.isSmashable = tableData.getIntField("isSmashable", -1) == 1 ? true : false;
+		entry.difficultyLevel = tableData.getIntField("difficultyLevel", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -65,3 +65,4 @@ std::vector<CDDestructibleComponent> CDDestructibleComponentTable::Query(std::fu
 std::vector<CDDestructibleComponent> CDDestructibleComponentTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDEmoteTable.cpp b/dDatabase/Tables/CDEmoteTable.cpp
index e3898422..b97e02e8 100644
--- a/dDatabase/Tables/CDEmoteTable.cpp
+++ b/dDatabase/Tables/CDEmoteTable.cpp
@@ -5,14 +5,14 @@ CDEmoteTableTable::CDEmoteTableTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Emotes");
 	while (!tableData.eof()) {
 		CDEmoteTable* entry = new CDEmoteTable();
-		entry->ID = tableData.getIntField(0, -1);
-		entry->animationName = tableData.getStringField(1, "");
-		entry->iconFilename = tableData.getStringField(2, "");
-		entry->channel = tableData.getIntField(3, -1);
-		entry->locked = tableData.getIntField(5, -1) != 0;
-		entry->localize = tableData.getIntField(6, -1) != 0;
-		entry->locState = tableData.getIntField(7, -1);
-		entry->gateVersion = tableData.getIntField(8, -1);
+		entry->ID = tableData.getIntField("id", -1);
+		entry->animationName = tableData.getStringField("animationName", "");
+		entry->iconFilename = tableData.getStringField("iconFilename", "");
+		entry->channel = tableData.getIntField("channel", -1);
+		entry->locked = tableData.getIntField("locked", -1) != 0;
+		entry->localize = tableData.getIntField("localize", -1) != 0;
+		entry->locState = tableData.getIntField("locStatus", -1);
+		entry->gateVersion = tableData.getStringField("gate_version", "");
 
 		entries.insert(std::make_pair(entry->ID, entry));
 		tableData.nextRow();
@@ -42,3 +42,4 @@ CDEmoteTable* CDEmoteTableTable::GetEmote(int id) {
 
 	return nullptr;
 }
+
diff --git a/dDatabase/Tables/CDEmoteTable.h b/dDatabase/Tables/CDEmoteTable.h
index a22ae23e..1f4fb246 100644
--- a/dDatabase/Tables/CDEmoteTable.h
+++ b/dDatabase/Tables/CDEmoteTable.h
@@ -19,7 +19,7 @@ struct CDEmoteTable {
 		channel = -1;
 		locked = false;
 		localize = false;
-		gateVersion = -1;
+		gateVersion = "";
 	}
 
 	int ID;
@@ -29,7 +29,7 @@ struct CDEmoteTable {
 	int channel;
 	bool locked;
 	bool localize;
-	int gateVersion;
+	std::string gateVersion;
 };
 
 //! CDEmoteTable table
diff --git a/dDatabase/Tables/CDFeatureGatingTable.cpp b/dDatabase/Tables/CDFeatureGatingTable.cpp
index dfc65387..0abcdb25 100644
--- a/dDatabase/Tables/CDFeatureGatingTable.cpp
+++ b/dDatabase/Tables/CDFeatureGatingTable.cpp
@@ -21,11 +21,11 @@ CDFeatureGatingTable::CDFeatureGatingTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM FeatureGating");
 	while (!tableData.eof()) {
 		CDFeatureGating entry;
-		entry.featureName = tableData.getStringField(0, "");
-		entry.major = tableData.getIntField(1, -1);
-		entry.current = tableData.getIntField(2, -1);
-		entry.minor = tableData.getIntField(3, -1);
-		entry.description = tableData.getStringField(4, "");
+		entry.featureName = tableData.getStringField("featureName", "");
+		entry.major = tableData.getIntField("major", -1);
+		entry.current = tableData.getIntField("current", -1);
+		entry.minor = tableData.getIntField("minor", -1);
+		entry.description = tableData.getStringField("description", "");
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -66,3 +66,4 @@ bool CDFeatureGatingTable::FeatureUnlocked(const std::string& feature) const {
 std::vector<CDFeatureGating> CDFeatureGatingTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDInventoryComponentTable.cpp b/dDatabase/Tables/CDInventoryComponentTable.cpp
index 65f09c9b..cf956775 100644
--- a/dDatabase/Tables/CDInventoryComponentTable.cpp
+++ b/dDatabase/Tables/CDInventoryComponentTable.cpp
@@ -21,10 +21,10 @@ CDInventoryComponentTable::CDInventoryComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM InventoryComponent");
 	while (!tableData.eof()) {
 		CDInventoryComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.itemid = tableData.getIntField(1, -1);
-		entry.count = tableData.getIntField(2, -1);
-		entry.equip = tableData.getIntField(3, -1) == 1 ? true : false;
+		entry.id = tableData.getIntField("id", -1);
+		entry.itemid = tableData.getIntField("itemid", -1);
+		entry.count = tableData.getIntField("count", -1);
+		entry.equip = tableData.getIntField("equip", -1) == 1 ? true : false;
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -55,3 +55,4 @@ std::vector<CDInventoryComponent> CDInventoryComponentTable::Query(std::function
 std::vector<CDInventoryComponent> CDInventoryComponentTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDItemComponentTable.cpp b/dDatabase/Tables/CDItemComponentTable.cpp
index 6ff192fd..a3cb4159 100644
--- a/dDatabase/Tables/CDItemComponentTable.cpp
+++ b/dDatabase/Tables/CDItemComponentTable.cpp
@@ -23,48 +23,48 @@ CDItemComponentTable::CDItemComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ItemComponent");
 	while (!tableData.eof()) {
 		CDItemComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.equipLocation = tableData.getStringField(1, "");
-		entry.baseValue = tableData.getIntField(2, -1);
-		entry.isKitPiece = tableData.getIntField(3, -1) == 1 ? true : false;
-		entry.rarity = tableData.getIntField(4, 0);
-		entry.itemType = tableData.getIntField(5, -1);
-		entry.itemInfo = tableData.getInt64Field(6, -1);
-		entry.inLootTable = tableData.getIntField(7, -1) == 1 ? true : false;
-		entry.inVendor = tableData.getIntField(8, -1) == 1 ? true : false;
-		entry.isUnique = tableData.getIntField(9, -1) == 1 ? true : false;
-		entry.isBOP = tableData.getIntField(10, -1) == 1 ? true : false;
-		entry.isBOE = tableData.getIntField(11, -1) == 1 ? true : false;
-		entry.reqFlagID = tableData.getIntField(12, -1);
-		entry.reqSpecialtyID = tableData.getIntField(13, -1);
-		entry.reqSpecRank = tableData.getIntField(14, -1);
-		entry.reqAchievementID = tableData.getIntField(15, -1);
-		entry.stackSize = tableData.getIntField(16, -1);
-		entry.color1 = tableData.getIntField(17, -1);
-		entry.decal = tableData.getIntField(18, -1);
-		entry.offsetGroupID = tableData.getIntField(19, -1);
-		entry.buildTypes = tableData.getIntField(20, -1);
-		entry.reqPrecondition = tableData.getStringField(21, "");
-		entry.animationFlag = tableData.getIntField(22, 0);
-		entry.equipEffects = tableData.getIntField(23, -1);
-		entry.readyForQA = tableData.getIntField(24, -1) == 1 ? true : false;
-		entry.itemRating = tableData.getIntField(25, -1);
-		entry.isTwoHanded = tableData.getIntField(26, -1) == 1 ? true : false;
-		entry.minNumRequired = tableData.getIntField(27, -1);
-		entry.delResIndex = tableData.getIntField(28, -1);
-		entry.currencyLOT = tableData.getIntField(29, -1);
-		entry.altCurrencyCost = tableData.getIntField(30, -1);
-		entry.subItems = tableData.getStringField(31, "");
-		entry.audioEventUse = tableData.getStringField(32, "");
-		entry.noEquipAnimation = tableData.getIntField(33, -1) == 1 ? true : false;
-		entry.commendationLOT = tableData.getIntField(34, -1);
-		entry.commendationCost = tableData.getIntField(35, -1);
-		entry.audioEquipMetaEventSet = tableData.getStringField(36, "");
-		entry.currencyCosts = tableData.getStringField(37, "");
-		entry.ingredientInfo = tableData.getStringField(38, "");
-		entry.locStatus = tableData.getIntField(39, -1);
-		entry.forgeType = tableData.getIntField(40, -1);
-		entry.SellMultiplier = tableData.getFloatField(41, -1.0f);
+		entry.id = tableData.getIntField("id", -1);
+		entry.equipLocation = tableData.getStringField("equipLocation", "");
+		entry.baseValue = tableData.getIntField("baseValue", -1);
+		entry.isKitPiece = tableData.getIntField("isKitPiece", -1) == 1 ? true : false;
+		entry.rarity = tableData.getIntField("rarity", 0);
+		entry.itemType = tableData.getIntField("itemType", -1);
+		entry.itemInfo = tableData.getInt64Field("itemInfo", -1);
+		entry.inLootTable = tableData.getIntField("inLootTable", -1) == 1 ? true : false;
+		entry.inVendor = tableData.getIntField("inVendor", -1) == 1 ? true : false;
+		entry.isUnique = tableData.getIntField("isUnique", -1) == 1 ? true : false;
+		entry.isBOP = tableData.getIntField("isBOP", -1) == 1 ? true : false;
+		entry.isBOE = tableData.getIntField("isBOE", -1) == 1 ? true : false;
+		entry.reqFlagID = tableData.getIntField("reqFlagID", -1);
+		entry.reqSpecialtyID = tableData.getIntField("reqSpecialtyID", -1);
+		entry.reqSpecRank = tableData.getIntField("reqSpecRank", -1);
+		entry.reqAchievementID = tableData.getIntField("reqAchievementID", -1);
+		entry.stackSize = tableData.getIntField("stackSize", -1);
+		entry.color1 = tableData.getIntField("color1", -1);
+		entry.decal = tableData.getIntField("decal", -1);
+		entry.offsetGroupID = tableData.getIntField("offsetGroupID", -1);
+		entry.buildTypes = tableData.getIntField("buildTypes", -1);
+		entry.reqPrecondition = tableData.getStringField("reqPrecondition", "");
+		entry.animationFlag = tableData.getIntField("animationFlag", 0);
+		entry.equipEffects = tableData.getIntField("equipEffects", -1);
+		entry.readyForQA = tableData.getIntField("readyForQA", -1) == 1 ? true : false;
+		entry.itemRating = tableData.getIntField("itemRating", -1);
+		entry.isTwoHanded = tableData.getIntField("isTwoHanded", -1) == 1 ? true : false;
+		entry.minNumRequired = tableData.getIntField("minNumRequired", -1);
+		entry.delResIndex = tableData.getIntField("delResIndex", -1);
+		entry.currencyLOT = tableData.getIntField("currencyLOT", -1);
+		entry.altCurrencyCost = tableData.getIntField("altCurrencyCost", -1);
+		entry.subItems = tableData.getStringField("subItems", "");
+		entry.audioEventUse = tableData.getStringField("audioEventUse", "");
+		entry.noEquipAnimation = tableData.getIntField("noEquipAnimation", -1) == 1 ? true : false;
+		entry.commendationLOT = tableData.getIntField("commendationLOT", -1);
+		entry.commendationCost = tableData.getIntField("commendationCost", -1);
+		entry.audioEquipMetaEventSet = tableData.getStringField("audioEquipMetaEventSet", "");
+		entry.currencyCosts = tableData.getStringField("currencyCosts", "");
+		entry.ingredientInfo = tableData.getStringField("ingredientInfo", "");
+		entry.locStatus = tableData.getIntField("locStatus", -1);
+		entry.forgeType = tableData.getIntField("forgeType", -1);
+		entry.SellMultiplier = tableData.getFloatField("SellMultiplier", -1.0f);
 
 		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
@@ -101,48 +101,48 @@ const CDItemComponent& CDItemComponentTable::GetItemComponentByID(unsigned int s
 
 	while (!tableData.eof()) {
 		CDItemComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.equipLocation = tableData.getStringField(1, "");
-		entry.baseValue = tableData.getIntField(2, -1);
-		entry.isKitPiece = tableData.getIntField(3, -1) == 1 ? true : false;
-		entry.rarity = tableData.getIntField(4, 0);
-		entry.itemType = tableData.getIntField(5, -1);
-		entry.itemInfo = tableData.getInt64Field(6, -1);
-		entry.inLootTable = tableData.getIntField(7, -1) == 1 ? true : false;
-		entry.inVendor = tableData.getIntField(8, -1) == 1 ? true : false;
-		entry.isUnique = tableData.getIntField(9, -1) == 1 ? true : false;
-		entry.isBOP = tableData.getIntField(10, -1) == 1 ? true : false;
-		entry.isBOE = tableData.getIntField(11, -1) == 1 ? true : false;
-		entry.reqFlagID = tableData.getIntField(12, -1);
-		entry.reqSpecialtyID = tableData.getIntField(13, -1);
-		entry.reqSpecRank = tableData.getIntField(14, -1);
-		entry.reqAchievementID = tableData.getIntField(15, -1);
-		entry.stackSize = tableData.getIntField(16, -1);
-		entry.color1 = tableData.getIntField(17, -1);
-		entry.decal = tableData.getIntField(18, -1);
-		entry.offsetGroupID = tableData.getIntField(19, -1);
-		entry.buildTypes = tableData.getIntField(20, -1);
-		entry.reqPrecondition = tableData.getStringField(21, "");
-		entry.animationFlag = tableData.getIntField(22, 0);
-		entry.equipEffects = tableData.getIntField(23, -1);
-		entry.readyForQA = tableData.getIntField(24, -1) == 1 ? true : false;
-		entry.itemRating = tableData.getIntField(25, -1);
-		entry.isTwoHanded = tableData.getIntField(26, -1) == 1 ? true : false;
-		entry.minNumRequired = tableData.getIntField(27, -1);
-		entry.delResIndex = tableData.getIntField(28, -1);
-		entry.currencyLOT = tableData.getIntField(29, -1);
-		entry.altCurrencyCost = tableData.getIntField(30, -1);
-		entry.subItems = tableData.getStringField(31, "");
-		UNUSED(entry.audioEventUse = tableData.getStringField(32, ""));
-		entry.noEquipAnimation = tableData.getIntField(33, -1) == 1 ? true : false;
-		entry.commendationLOT = tableData.getIntField(34, -1);
-		entry.commendationCost = tableData.getIntField(35, -1);
-		UNUSED(entry.audioEquipMetaEventSet = tableData.getStringField(36, ""));
-		entry.currencyCosts = tableData.getStringField(37, "");
-		UNUSED(entry.ingredientInfo = tableData.getStringField(38, ""));
-		entry.locStatus = tableData.getIntField(39, -1);
-		entry.forgeType = tableData.getIntField(40, -1);
-		entry.SellMultiplier = tableData.getFloatField(41, -1.0f);
+		entry.id = tableData.getIntField("id", -1);
+		entry.equipLocation = tableData.getStringField("equipLocation", "");
+		entry.baseValue = tableData.getIntField("baseValue", -1);
+		entry.isKitPiece = tableData.getIntField("isKitPiece", -1) == 1 ? true : false;
+		entry.rarity = tableData.getIntField("rarity", 0);
+		entry.itemType = tableData.getIntField("itemType", -1);
+		entry.itemInfo = tableData.getInt64Field("itemInfo", -1);
+		entry.inLootTable = tableData.getIntField("inLootTable", -1) == 1 ? true : false;
+		entry.inVendor = tableData.getIntField("inVendor", -1) == 1 ? true : false;
+		entry.isUnique = tableData.getIntField("isUnique", -1) == 1 ? true : false;
+		entry.isBOP = tableData.getIntField("isBOP", -1) == 1 ? true : false;
+		entry.isBOE = tableData.getIntField("isBOE", -1) == 1 ? true : false;
+		entry.reqFlagID = tableData.getIntField("reqFlagID", -1);
+		entry.reqSpecialtyID = tableData.getIntField("reqSpecialtyID", -1);
+		entry.reqSpecRank = tableData.getIntField("reqSpecRank", -1);
+		entry.reqAchievementID = tableData.getIntField("reqAchievementID", -1);
+		entry.stackSize = tableData.getIntField("stackSize", -1);
+		entry.color1 = tableData.getIntField("color1", -1);
+		entry.decal = tableData.getIntField("decal", -1);
+		entry.offsetGroupID = tableData.getIntField("offsetGroupID", -1);
+		entry.buildTypes = tableData.getIntField("buildTypes", -1);
+		entry.reqPrecondition = tableData.getStringField("reqPrecondition", "");
+		entry.animationFlag = tableData.getIntField("animationFlag", 0);
+		entry.equipEffects = tableData.getIntField("equipEffects", -1);
+		entry.readyForQA = tableData.getIntField("readyForQA", -1) == 1 ? true : false;
+		entry.itemRating = tableData.getIntField("itemRating", -1);
+		entry.isTwoHanded = tableData.getIntField("isTwoHanded", -1) == 1 ? true : false;
+		entry.minNumRequired = tableData.getIntField("minNumRequired", -1);
+		entry.delResIndex = tableData.getIntField("delResIndex", -1);
+		entry.currencyLOT = tableData.getIntField("currencyLOT", -1);
+		entry.altCurrencyCost = tableData.getIntField("altCurrencyCost", -1);
+		entry.subItems = tableData.getStringField("subItems", "");
+		UNUSED(entry.audioEventUse = tableData.getStringField("audioEventUse", ""));
+		entry.noEquipAnimation = tableData.getIntField("noEquipAnimation", -1) == 1 ? true : false;
+		entry.commendationLOT = tableData.getIntField("commendationLOT", -1);
+		entry.commendationCost = tableData.getIntField("commendationCost", -1);
+		UNUSED(entry.audioEquipMetaEventSet = tableData.getStringField("audioEquipMetaEventSet", ""));
+		entry.currencyCosts = tableData.getStringField("currencyCosts", "");
+		UNUSED(entry.ingredientInfo = tableData.getStringField("ingredientInfo", ""));
+		entry.locStatus = tableData.getIntField("locStatus", -1);
+		entry.forgeType = tableData.getIntField("forgeType", -1);
+		entry.SellMultiplier = tableData.getFloatField("SellMultiplier", -1.0f);
 
 		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
@@ -177,3 +177,4 @@ std::map<LOT, uint32_t> CDItemComponentTable::ParseCraftingCurrencies(const CDIt
 
 	return currencies;
 }
+
diff --git a/dDatabase/Tables/CDItemSetSkillsTable.cpp b/dDatabase/Tables/CDItemSetSkillsTable.cpp
index e94cf527..107e25d9 100644
--- a/dDatabase/Tables/CDItemSetSkillsTable.cpp
+++ b/dDatabase/Tables/CDItemSetSkillsTable.cpp
@@ -21,9 +21,9 @@ CDItemSetSkillsTable::CDItemSetSkillsTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ItemSetSkills");
 	while (!tableData.eof()) {
 		CDItemSetSkills entry;
-		entry.SkillSetID = tableData.getIntField(0, -1);
-		entry.SkillID = tableData.getIntField(1, -1);
-		entry.SkillCastType = tableData.getIntField(2, -1);
+		entry.SkillSetID = tableData.getIntField("SkillSetID", -1);
+		entry.SkillID = tableData.getIntField("SkillID", -1);
+		entry.SkillCastType = tableData.getIntField("SkillCastType", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -65,3 +65,4 @@ std::vector<CDItemSetSkills> CDItemSetSkillsTable::GetBySkillID(unsigned int Ski
 
 	return toReturn;
 }
+
diff --git a/dDatabase/Tables/CDItemSetsTable.cpp b/dDatabase/Tables/CDItemSetsTable.cpp
index 606e0cf9..1f9d7409 100644
--- a/dDatabase/Tables/CDItemSetsTable.cpp
+++ b/dDatabase/Tables/CDItemSetsTable.cpp
@@ -21,21 +21,21 @@ CDItemSetsTable::CDItemSetsTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ItemSets");
 	while (!tableData.eof()) {
 		CDItemSets entry;
-		entry.setID = tableData.getIntField(0, -1);
-		entry.locStatus = tableData.getIntField(1, -1);
-		entry.itemIDs = tableData.getStringField(2, "");
-		entry.kitType = tableData.getIntField(3, -1);
-		entry.kitRank = tableData.getIntField(4, -1);
-		entry.kitImage = tableData.getIntField(5, -1);
-		entry.skillSetWith2 = tableData.getIntField(6, -1);
-		entry.skillSetWith3 = tableData.getIntField(7, -1);
-		entry.skillSetWith4 = tableData.getIntField(8, -1);
-		entry.skillSetWith5 = tableData.getIntField(9, -1);
-		entry.skillSetWith6 = tableData.getIntField(10, -1);
-		entry.localize = tableData.getIntField(11, -1) == 1 ? true : false;
-		entry.gate_version = tableData.getStringField(12, "");
-		entry.kitID = tableData.getIntField(13, -1);
-		entry.priority = tableData.getFloatField(14, -1.0f);
+		entry.setID = tableData.getIntField("setID", -1);
+		entry.locStatus = tableData.getIntField("locStatus", -1);
+		entry.itemIDs = tableData.getStringField("itemIDs", "");
+		entry.kitType = tableData.getIntField("kitType", -1);
+		entry.kitRank = tableData.getIntField("kitRank", -1);
+		entry.kitImage = tableData.getIntField("kitImage", -1);
+		entry.skillSetWith2 = tableData.getIntField("skillSetWith2", -1);
+		entry.skillSetWith3 = tableData.getIntField("skillSetWith3", -1);
+		entry.skillSetWith4 = tableData.getIntField("skillSetWith4", -1);
+		entry.skillSetWith5 = tableData.getIntField("skillSetWith5", -1);
+		entry.skillSetWith6 = tableData.getIntField("skillSetWith6", -1);
+		entry.localize = tableData.getIntField("localize", -1) == 1 ? true : false;
+		entry.gate_version = tableData.getStringField("gate_version", "");
+		entry.kitID = tableData.getIntField("kitID", -1);
+		entry.priority = tableData.getFloatField("priority", -1.0f);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -66,3 +66,4 @@ std::vector<CDItemSets> CDItemSetsTable::Query(std::function<bool(CDItemSets)> p
 std::vector<CDItemSets> CDItemSetsTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDLevelProgressionLookupTable.cpp b/dDatabase/Tables/CDLevelProgressionLookupTable.cpp
index 121c9f62..b3231308 100644
--- a/dDatabase/Tables/CDLevelProgressionLookupTable.cpp
+++ b/dDatabase/Tables/CDLevelProgressionLookupTable.cpp
@@ -21,9 +21,9 @@ CDLevelProgressionLookupTable::CDLevelProgressionLookupTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM LevelProgressionLookup");
 	while (!tableData.eof()) {
 		CDLevelProgressionLookup entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.requiredUScore = tableData.getIntField(1, -1);
-		entry.BehaviorEffect = tableData.getStringField(2, "");
+		entry.id = tableData.getIntField("id", -1);
+		entry.requiredUScore = tableData.getIntField("requiredUScore", -1);
+		entry.BehaviorEffect = tableData.getStringField("BehaviorEffect", "");
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -54,3 +54,4 @@ std::vector<CDLevelProgressionLookup> CDLevelProgressionLookupTable::Query(std::
 std::vector<CDLevelProgressionLookup> CDLevelProgressionLookupTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDLootMatrixTable.cpp b/dDatabase/Tables/CDLootMatrixTable.cpp
index d47c081b..93a2fda1 100644
--- a/dDatabase/Tables/CDLootMatrixTable.cpp
+++ b/dDatabase/Tables/CDLootMatrixTable.cpp
@@ -21,15 +21,15 @@ CDLootMatrixTable::CDLootMatrixTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM LootMatrix");
 	while (!tableData.eof()) {
 		CDLootMatrix entry;
-		entry.LootMatrixIndex = tableData.getIntField(0, -1);
-		entry.LootTableIndex = tableData.getIntField(1, -1);
-		entry.RarityTableIndex = tableData.getIntField(2, -1);
-		entry.percent = tableData.getFloatField(3, -1.0f);
-		entry.minToDrop = tableData.getIntField(4, -1);
-		entry.maxToDrop = tableData.getIntField(5, -1);
-		entry.id = tableData.getIntField(6, -1);
-		entry.flagID = tableData.getIntField(7, -1);
-		UNUSED(entry.gate_version = tableData.getStringField(8, ""));
+		entry.LootMatrixIndex = tableData.getIntField("LootMatrixIndex", -1);
+		entry.LootTableIndex = tableData.getIntField("LootTableIndex", -1);
+		entry.RarityTableIndex = tableData.getIntField("RarityTableIndex", -1);
+		entry.percent = tableData.getFloatField("percent", -1.0f);
+		entry.minToDrop = tableData.getIntField("minToDrop", -1);
+		entry.maxToDrop = tableData.getIntField("maxToDrop", -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.flagID = tableData.getIntField("flagID", -1);
+		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -60,3 +60,4 @@ std::vector<CDLootMatrix> CDLootMatrixTable::Query(std::function<bool(CDLootMatr
 const std::vector<CDLootMatrix>& CDLootMatrixTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDLootTableTable.cpp b/dDatabase/Tables/CDLootTableTable.cpp
index da8c824b..91cced47 100644
--- a/dDatabase/Tables/CDLootTableTable.cpp
+++ b/dDatabase/Tables/CDLootTableTable.cpp
@@ -21,12 +21,12 @@ CDLootTableTable::CDLootTableTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM LootTable");
 	while (!tableData.eof()) {
 		CDLootTable entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.itemid = tableData.getIntField(0, -1);
-		entry.LootTableIndex = tableData.getIntField(1, -1);
-		entry.id = tableData.getIntField(2, -1);
-		entry.MissionDrop = tableData.getIntField(3, -1) == 1 ? true : false;
-		entry.sortPriority = tableData.getIntField(4, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.itemid = tableData.getIntField("itemid", -1);
+		entry.LootTableIndex = tableData.getIntField("LootTableIndex", -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.MissionDrop = tableData.getIntField("MissionDrop", -1) == 1 ? true : false;
+		entry.sortPriority = tableData.getIntField("sortPriority", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -57,3 +57,4 @@ std::vector<CDLootTable> CDLootTableTable::Query(std::function<bool(CDLootTable)
 const std::vector<CDLootTable>& CDLootTableTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDMissionEmailTable.cpp b/dDatabase/Tables/CDMissionEmailTable.cpp
index a8beb95b..4fac7be2 100644
--- a/dDatabase/Tables/CDMissionEmailTable.cpp
+++ b/dDatabase/Tables/CDMissionEmailTable.cpp
@@ -21,14 +21,14 @@ CDMissionEmailTable::CDMissionEmailTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM MissionEmail");
 	while (!tableData.eof()) {
 		CDMissionEmail entry;
-		entry.ID = tableData.getIntField(0, -1);
-		entry.messageType = tableData.getIntField(1, -1);
-		entry.notificationGroup = tableData.getIntField(2, -1);
-		entry.missionID = tableData.getIntField(3, -1);
-		entry.attachmentLOT = tableData.getIntField(4, 0);
-		entry.localize = (bool)tableData.getIntField(5, -1);
-		entry.locStatus = tableData.getIntField(6, -1);
-		entry.gate_version = tableData.getStringField(7, "");
+		entry.ID = tableData.getIntField("ID", -1);
+		entry.messageType = tableData.getIntField("messageType", -1);
+		entry.notificationGroup = tableData.getIntField("notificationGroup", -1);
+		entry.missionID = tableData.getIntField("missionID", -1);
+		entry.attachmentLOT = tableData.getIntField("attachmentLOT", 0);
+		entry.localize = (bool)tableData.getIntField("localize", -1);
+		entry.locStatus = tableData.getIntField("locStatus", -1);
+		entry.gate_version = tableData.getStringField("gate_version", "");
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -59,3 +59,4 @@ std::vector<CDMissionEmail> CDMissionEmailTable::Query(std::function<bool(CDMiss
 std::vector<CDMissionEmail> CDMissionEmailTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDMissionNPCComponentTable.cpp b/dDatabase/Tables/CDMissionNPCComponentTable.cpp
index e2589890..461cc909 100644
--- a/dDatabase/Tables/CDMissionNPCComponentTable.cpp
+++ b/dDatabase/Tables/CDMissionNPCComponentTable.cpp
@@ -21,11 +21,11 @@ CDMissionNPCComponentTable::CDMissionNPCComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM MissionNPCComponent");
 	while (!tableData.eof()) {
 		CDMissionNPCComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.missionID = tableData.getIntField(1, -1);
-		entry.offersMission = tableData.getIntField(2, -1) == 1 ? true : false;
-		entry.acceptsMission = tableData.getIntField(3, -1) == 1 ? true : false;
-		entry.gate_version = tableData.getStringField(4, "");
+		entry.id = tableData.getIntField("id", -1);
+		entry.missionID = tableData.getIntField("missionID", -1);
+		entry.offersMission = tableData.getIntField("offersMission", -1) == 1 ? true : false;
+		entry.acceptsMission = tableData.getIntField("acceptsMission", -1) == 1 ? true : false;
+		entry.gate_version = tableData.getStringField("gate_version", "");
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -56,3 +56,4 @@ std::vector<CDMissionNPCComponent> CDMissionNPCComponentTable::Query(std::functi
 std::vector<CDMissionNPCComponent> CDMissionNPCComponentTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDMissionTasksTable.cpp b/dDatabase/Tables/CDMissionTasksTable.cpp
index 81de2088..c22da1ef 100644
--- a/dDatabase/Tables/CDMissionTasksTable.cpp
+++ b/dDatabase/Tables/CDMissionTasksTable.cpp
@@ -21,19 +21,19 @@ CDMissionTasksTable::CDMissionTasksTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM MissionTasks");
 	while (!tableData.eof()) {
 		CDMissionTasks entry;
-		entry.id = tableData.getIntField(0, -1);
-		UNUSED(entry.locStatus = tableData.getIntField(1, -1));
-		entry.taskType = tableData.getIntField(2, -1);
-		entry.target = tableData.getIntField(3, -1);
-		entry.targetGroup = tableData.getStringField(4, "");
-		entry.targetValue = tableData.getIntField(5, -1);
-		entry.taskParam1 = tableData.getStringField(6, "");
-		UNUSED(entry.largeTaskIcon = tableData.getStringField(7, ""));
-		UNUSED(entry.IconID = tableData.getIntField(8, -1));
-		entry.uid = tableData.getIntField(9, -1);
-		UNUSED(entry.largeTaskIconID = tableData.getIntField(10, -1));
-		UNUSED(entry.localize = tableData.getIntField(11, -1) == 1 ? true : false);
-		UNUSED(entry.gate_version = tableData.getStringField(12, ""));
+		entry.id = tableData.getIntField("id", -1);
+		UNUSED(entry.locStatus = tableData.getIntField("locStatus", -1));
+		entry.taskType = tableData.getIntField("taskType", -1);
+		entry.target = tableData.getIntField("target", -1);
+		entry.targetGroup = tableData.getStringField("targetGroup", "");
+		entry.targetValue = tableData.getIntField("targetValue", -1);
+		entry.taskParam1 = tableData.getStringField("taskParam1", "");
+		UNUSED(entry.largeTaskIcon = tableData.getStringField("largeTaskIcon", ""));
+		UNUSED(entry.IconID = tableData.getIntField("IconID", -1));
+		entry.uid = tableData.getIntField("uid", -1);
+		UNUSED(entry.largeTaskIconID = tableData.getIntField("largeTaskIconID", -1));
+		UNUSED(entry.localize = tableData.getIntField("localize", -1) == 1 ? true : false);
+		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -78,3 +78,4 @@ std::vector<CDMissionTasks*> CDMissionTasksTable::GetByMissionID(uint32_t missio
 const std::vector<CDMissionTasks>& CDMissionTasksTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDMissionsTable.cpp b/dDatabase/Tables/CDMissionsTable.cpp
index 7e59657d..a87b4327 100644
--- a/dDatabase/Tables/CDMissionsTable.cpp
+++ b/dDatabase/Tables/CDMissionsTable.cpp
@@ -23,58 +23,58 @@ CDMissionsTable::CDMissionsTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Missions");
 	while (!tableData.eof()) {
 		CDMissions entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.defined_type = tableData.getStringField(1, "");
-		entry.defined_subtype = tableData.getStringField(2, "");
-		entry.UISortOrder = tableData.getIntField(3, -1);
-		entry.offer_objectID = tableData.getIntField(4, -1);
-		entry.target_objectID = tableData.getIntField(5, -1);
-		entry.reward_currency = tableData.getInt64Field(6, -1);
-		entry.LegoScore = tableData.getIntField(7, -1);
-		entry.reward_reputation = tableData.getIntField(8, -1);
-		entry.isChoiceReward = tableData.getIntField(9, -1) == 1 ? true : false;
-		entry.reward_item1 = tableData.getIntField(10, 0);
-		entry.reward_item1_count = tableData.getIntField(11, 0);
-		entry.reward_item2 = tableData.getIntField(12, 0);
-		entry.reward_item2_count = tableData.getIntField(13, 0);
-		entry.reward_item3 = tableData.getIntField(14, 0);
-		entry.reward_item3_count = tableData.getIntField(15, 0);
-		entry.reward_item4 = tableData.getIntField(16, 0);
-		entry.reward_item4_count = tableData.getIntField(17, 0);
-		entry.reward_emote = tableData.getIntField(18, -1);
-		entry.reward_emote2 = tableData.getIntField(19, -1);
-		entry.reward_emote3 = tableData.getIntField(20, -1);
-		entry.reward_emote4 = tableData.getIntField(21, -1);
-		entry.reward_maximagination = tableData.getIntField(22, -1);
-		entry.reward_maxhealth = tableData.getIntField(23, -1);
-		entry.reward_maxinventory = tableData.getIntField(24, -1);
-		entry.reward_maxmodel = tableData.getIntField(25, -1);
-		entry.reward_maxwidget = tableData.getIntField(26, -1);
-		entry.reward_maxwallet = tableData.getIntField(27, -1);
-		entry.repeatable = tableData.getIntField(28, -1) == 1 ? true : false;
-		entry.reward_currency_repeatable = tableData.getIntField(29, -1);
-		entry.reward_item1_repeatable = tableData.getIntField(30, -1);
-		entry.reward_item1_repeat_count = tableData.getIntField(31, -1);
-		entry.reward_item2_repeatable = tableData.getIntField(32, -1);
-		entry.reward_item2_repeat_count = tableData.getIntField(33, -1);
-		entry.reward_item3_repeatable = tableData.getIntField(34, -1);
-		entry.reward_item3_repeat_count = tableData.getIntField(35, -1);
-		entry.reward_item4_repeatable = tableData.getIntField(36, -1);
-		entry.reward_item4_repeat_count = tableData.getIntField(37, -1);
-		entry.time_limit = tableData.getIntField(38, -1);
-		entry.isMission = tableData.getIntField(39, -1) ? true : false;
-		entry.missionIconID = tableData.getIntField(40, -1);
-		entry.prereqMissionID = tableData.getStringField(41, "");
-		entry.localize = tableData.getIntField(42, -1) == 1 ? true : false;
-		entry.inMOTD = tableData.getIntField(43, -1) == 1 ? true : false;
-		entry.cooldownTime = tableData.getInt64Field(44, -1);
-		entry.isRandom = tableData.getIntField(45, -1) == 1 ? true : false;
-		entry.randomPool = tableData.getStringField(46, "");
-		entry.UIPrereqID = tableData.getIntField(47, -1);
-		UNUSED(entry.gate_version = tableData.getStringField(48, ""));
-		UNUSED(entry.HUDStates = tableData.getStringField(49, ""));
-		UNUSED(entry.locStatus = tableData.getIntField(50, -1));
-		entry.reward_bankinventory = tableData.getIntField(51, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.defined_type = tableData.getStringField("defined_type", "");
+		entry.defined_subtype = tableData.getStringField("defined_subtype", "");
+		entry.UISortOrder = tableData.getIntField("UISortOrder", -1);
+		entry.offer_objectID = tableData.getIntField("offer_objectID", -1);
+		entry.target_objectID = tableData.getIntField("target_objectID", -1);
+		entry.reward_currency = tableData.getInt64Field("reward_currency", -1);
+		entry.LegoScore = tableData.getIntField("LegoScore", -1);
+		entry.reward_reputation = tableData.getIntField("reward_reputation", -1);
+		entry.isChoiceReward = tableData.getIntField("isChoiceReward", -1) == 1 ? true : false;
+		entry.reward_item1 = tableData.getIntField("reward_item1", 0);
+		entry.reward_item1_count = tableData.getIntField("reward_item1_count", 0);
+		entry.reward_item2 = tableData.getIntField("reward_item2", 0);
+		entry.reward_item2_count = tableData.getIntField("reward_item2_count", 0);
+		entry.reward_item3 = tableData.getIntField("reward_item3", 0);
+		entry.reward_item3_count = tableData.getIntField("reward_item3_count", 0);
+		entry.reward_item4 = tableData.getIntField("reward_item4", 0);
+		entry.reward_item4_count = tableData.getIntField("reward_item4_count", 0);
+		entry.reward_emote = tableData.getIntField("reward_emote", -1);
+		entry.reward_emote2 = tableData.getIntField("reward_emote2", -1);
+		entry.reward_emote3 = tableData.getIntField("reward_emote3", -1);
+		entry.reward_emote4 = tableData.getIntField("reward_emote4", -1);
+		entry.reward_maximagination = tableData.getIntField("reward_maximagination", -1);
+		entry.reward_maxhealth = tableData.getIntField("reward_maxhealth", -1);
+		entry.reward_maxinventory = tableData.getIntField("reward_maxinventory", -1);
+		entry.reward_maxmodel = tableData.getIntField("reward_maxmodel", -1);
+		entry.reward_maxwidget = tableData.getIntField("reward_maxwidget", -1);
+		entry.reward_maxwallet = tableData.getIntField("reward_maxwallet", -1);
+		entry.repeatable = tableData.getIntField("repeatable", -1) == 1 ? true : false;
+		entry.reward_currency_repeatable = tableData.getIntField("reward_currency_repeatable", -1);
+		entry.reward_item1_repeatable = tableData.getIntField("reward_item1_repeatable", -1);
+		entry.reward_item1_repeat_count = tableData.getIntField("reward_item1_repeat_count", -1);
+		entry.reward_item2_repeatable = tableData.getIntField("reward_item2_repeatable", -1);
+		entry.reward_item2_repeat_count = tableData.getIntField("reward_item2_repeat_count", -1);
+		entry.reward_item3_repeatable = tableData.getIntField("reward_item3_repeatable", -1);
+		entry.reward_item3_repeat_count = tableData.getIntField("reward_item3_repeat_count", -1);
+		entry.reward_item4_repeatable = tableData.getIntField("reward_item4_repeatable", -1);
+		entry.reward_item4_repeat_count = tableData.getIntField("reward_item4_repeat_count", -1);
+		entry.time_limit = tableData.getIntField("time_limit", -1);
+		entry.isMission = tableData.getIntField("isMission", -1) ? true : false;
+		entry.missionIconID = tableData.getIntField("missionIconID", -1);
+		entry.prereqMissionID = tableData.getStringField("prereqMissionID", "");
+		entry.localize = tableData.getIntField("localize", -1) == 1 ? true : false;
+		entry.inMOTD = tableData.getIntField("inMOTD", -1) == 1 ? true : false;
+		entry.cooldownTime = tableData.getInt64Field("cooldownTime", -1);
+		entry.isRandom = tableData.getIntField("isRandom", -1) == 1 ? true : false;
+		entry.randomPool = tableData.getStringField("randomPool", "");
+		entry.UIPrereqID = tableData.getIntField("UIPrereqID", -1);
+		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
+		UNUSED(entry.HUDStates = tableData.getStringField("HUDStates", ""));
+		UNUSED(entry.locStatus = tableData.getIntField("locStatus", -1));
+		entry.reward_bankinventory = tableData.getIntField("reward_bankinventory", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -131,3 +131,4 @@ const CDMissions& CDMissionsTable::GetByMissionID(uint32_t missionID, bool& foun
 
 	return Default;
 }
+
diff --git a/dDatabase/Tables/CDMovementAIComponentTable.cpp b/dDatabase/Tables/CDMovementAIComponentTable.cpp
index a98be8ba..333ec202 100644
--- a/dDatabase/Tables/CDMovementAIComponentTable.cpp
+++ b/dDatabase/Tables/CDMovementAIComponentTable.cpp
@@ -21,14 +21,14 @@ CDMovementAIComponentTable::CDMovementAIComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM MovementAIComponent");
 	while (!tableData.eof()) {
 		CDMovementAIComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.MovementType = tableData.getStringField(1, "");
-		entry.WanderChance = tableData.getFloatField(2, -1.0f);
-		entry.WanderDelayMin = tableData.getFloatField(3, -1.0f);
-		entry.WanderDelayMax = tableData.getFloatField(4, -1.0f);
-		entry.WanderSpeed = tableData.getFloatField(5, -1.0f);
-		entry.WanderRadius = tableData.getFloatField(6, -1.0f);
-		entry.attachedPath = tableData.getStringField(7, "");
+		entry.id = tableData.getIntField("id", -1);
+		entry.MovementType = tableData.getStringField("MovementType", "");
+		entry.WanderChance = tableData.getFloatField("WanderChance", -1.0f);
+		entry.WanderDelayMin = tableData.getFloatField("WanderDelayMin", -1.0f);
+		entry.WanderDelayMax = tableData.getFloatField("WanderDelayMax", -1.0f);
+		entry.WanderSpeed = tableData.getFloatField("WanderSpeed", -1.0f);
+		entry.WanderRadius = tableData.getFloatField("WanderRadius", -1.0f);
+		entry.attachedPath = tableData.getStringField("attachedPath", "");
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -59,3 +59,4 @@ std::vector<CDMovementAIComponent> CDMovementAIComponentTable::Query(std::functi
 std::vector<CDMovementAIComponent> CDMovementAIComponentTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDObjectSkillsTable.cpp b/dDatabase/Tables/CDObjectSkillsTable.cpp
index 1a5c4790..dc797529 100644
--- a/dDatabase/Tables/CDObjectSkillsTable.cpp
+++ b/dDatabase/Tables/CDObjectSkillsTable.cpp
@@ -21,10 +21,10 @@ CDObjectSkillsTable::CDObjectSkillsTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ObjectSkills");
 	while (!tableData.eof()) {
 		CDObjectSkills entry;
-		entry.objectTemplate = tableData.getIntField(0, -1);
-		entry.skillID = tableData.getIntField(1, -1);
-		entry.castOnType = tableData.getIntField(2, -1);
-		entry.AICombatWeight = tableData.getIntField(3, -1);
+		entry.objectTemplate = tableData.getIntField("objectTemplate", -1);
+		entry.skillID = tableData.getIntField("skillID", -1);
+		entry.castOnType = tableData.getIntField("castOnType", -1);
+		entry.AICombatWeight = tableData.getIntField("AICombatWeight", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -55,3 +55,4 @@ std::vector<CDObjectSkills> CDObjectSkillsTable::Query(std::function<bool(CDObje
 std::vector<CDObjectSkills> CDObjectSkillsTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDObjectsTable.cpp b/dDatabase/Tables/CDObjectsTable.cpp
index 03979af2..5133becc 100644
--- a/dDatabase/Tables/CDObjectsTable.cpp
+++ b/dDatabase/Tables/CDObjectsTable.cpp
@@ -18,20 +18,20 @@ CDObjectsTable::CDObjectsTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Objects");
 	while (!tableData.eof()) {
 		CDObjects entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.name = tableData.getStringField(1, "");
-		entry.placeable = tableData.getIntField(2, -1);
-		entry.type = tableData.getStringField(3, "");
-		entry.description = tableData.getStringField(4, "");
-		entry.localize = tableData.getIntField(5, -1);
-		entry.npcTemplateID = tableData.getIntField(6, -1);
-		entry.displayName = tableData.getStringField(7, "");
-		entry.interactionDistance = tableData.getFloatField(8, -1.0f);
-		entry.nametag = tableData.getIntField(9, -1);
-		entry._internalNotes = tableData.getStringField(10, "");
-		entry.locStatus = tableData.getIntField(11, -1);
-		entry.gate_version = tableData.getStringField(12, "");
-		entry.HQ_valid = tableData.getIntField(13, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.name = tableData.getStringField("name", "");
+		entry.placeable = tableData.getIntField("placeable", -1);
+		entry.type = tableData.getStringField("type", "");
+		entry.description = tableData.getStringField("description", "");
+		entry.localize = tableData.getIntField("localize", -1);
+		entry.npcTemplateID = tableData.getIntField("npcTemplateID", -1);
+		entry.displayName = tableData.getStringField("displayName", "");
+		entry.interactionDistance = tableData.getFloatField("interactionDistance", -1.0f);
+		entry.nametag = tableData.getIntField("nametag", -1);
+		entry._internalNotes = tableData.getStringField("_internalNotes", "");
+		entry.locStatus = tableData.getIntField("locStatus", -1);
+		entry.gate_version = tableData.getStringField("gate_version", "");
+		entry.HQ_valid = tableData.getIntField("HQ_valid", -1);
 
 		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
@@ -71,20 +71,20 @@ const CDObjects& CDObjectsTable::GetByID(unsigned int LOT) {
 	// Now get the data
 	while (!tableData.eof()) {
 		CDObjects entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.name = tableData.getStringField(1, "");
-		UNUSED(entry.placeable = tableData.getIntField(2, -1));
-		entry.type = tableData.getStringField(3, "");
+		entry.id = tableData.getIntField("id", -1);
+		entry.name = tableData.getStringField("name", "");
+		UNUSED(entry.placeable = tableData.getIntField("placeable", -1));
+		entry.type = tableData.getStringField("type", "");
 		UNUSED(ntry.description = tableData.getStringField(4, ""));
-		UNUSED(entry.localize = tableData.getIntField(5, -1));
-		UNUSED(entry.npcTemplateID = tableData.getIntField(6, -1));
-		UNUSED(entry.displayName = tableData.getStringField(7, ""));
-		entry.interactionDistance = tableData.getFloatField(8, -1.0f);
-		UNUSED(entry.nametag = tableData.getIntField(9, -1));
-		UNUSED(entry._internalNotes = tableData.getStringField(10, ""));
-		UNUSED(entry.locStatus = tableData.getIntField(11, -1));
-		UNUSED(entry.gate_version = tableData.getStringField(12, ""));
-		UNUSED(entry.HQ_valid = tableData.getIntField(13, -1));
+		UNUSED(entry.localize = tableData.getIntField("localize", -1));
+		UNUSED(entry.npcTemplateID = tableData.getIntField("npcTemplateID", -1));
+		UNUSED(entry.displayName = tableData.getStringField("displayName", ""));
+		entry.interactionDistance = tableData.getFloatField("interactionDistance", -1.0f);
+		UNUSED(entry.nametag = tableData.getIntField("nametag", -1));
+		UNUSED(entry._internalNotes = tableData.getStringField("_internalNotes", ""));
+		UNUSED(entry.locStatus = tableData.getIntField("locStatus", -1));
+		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
+		UNUSED(entry.HQ_valid = tableData.getIntField("HQ_valid", -1));
 
 		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
@@ -100,3 +100,4 @@ const CDObjects& CDObjectsTable::GetByID(unsigned int LOT) {
 
 	return m_default;
 }
+
diff --git a/dDatabase/Tables/CDPackageComponentTable.cpp b/dDatabase/Tables/CDPackageComponentTable.cpp
index 83673c6f..eabe68da 100644
--- a/dDatabase/Tables/CDPackageComponentTable.cpp
+++ b/dDatabase/Tables/CDPackageComponentTable.cpp
@@ -21,9 +21,9 @@ CDPackageComponentTable::CDPackageComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM PackageComponent");
 	while (!tableData.eof()) {
 		CDPackageComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.LootMatrixIndex = tableData.getIntField(1, -1);
-		entry.packageType = tableData.getIntField(2, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.LootMatrixIndex = tableData.getIntField("LootMatrixIndex", -1);
+		entry.packageType = tableData.getIntField("packageType", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -54,3 +54,4 @@ std::vector<CDPackageComponent> CDPackageComponentTable::Query(std::function<boo
 std::vector<CDPackageComponent> CDPackageComponentTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDPhysicsComponentTable.cpp b/dDatabase/Tables/CDPhysicsComponentTable.cpp
index 8cb7a3b0..f85d83c4 100644
--- a/dDatabase/Tables/CDPhysicsComponentTable.cpp
+++ b/dDatabase/Tables/CDPhysicsComponentTable.cpp
@@ -4,22 +4,22 @@ CDPhysicsComponentTable::CDPhysicsComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM PhysicsComponent");
 	while (!tableData.eof()) {
 		CDPhysicsComponent* entry = new CDPhysicsComponent();
-		entry->id = tableData.getIntField(0, -1);
-		entry->bStatic = tableData.getIntField(1, -1) != 0;
-		entry->physicsAsset = tableData.getStringField(2, "");
-		UNUSED(entry->jump = tableData.getIntField(3, -1) != 0);
-		UNUSED(entry->doublejump = tableData.getIntField(4, -1) != 0);
-		entry->speed = tableData.getFloatField(5, -1);
-		UNUSED(entry->rotSpeed = tableData.getFloatField(6, -1));
-		entry->playerHeight = tableData.getFloatField(7);
-		entry->playerRadius = tableData.getFloatField(8);
-		entry->pcShapeType = tableData.getIntField(9);
-		entry->collisionGroup = tableData.getIntField(10);
-		UNUSED(entry->airSpeed = tableData.getFloatField(11));
-		UNUSED(entry->boundaryAsset = tableData.getStringField(12));
-		UNUSED(entry->jumpAirSpeed = tableData.getFloatField(13));
-		UNUSED(entry->friction = tableData.getFloatField(14));
-		UNUSED(entry->gravityVolumeAsset = tableData.getStringField(15));
+		entry->id = tableData.getIntField("id", -1);
+		entry->bStatic = tableData.getIntField("static", -1) != 0;
+		entry->physicsAsset = tableData.getStringField("physics_asset", "");
+		UNUSED(entry->jump = tableData.getIntField("jump", -1) != 0);
+		UNUSED(entry->doublejump = tableData.getIntField("doublejump", -1) != 0);
+		entry->speed = tableData.getFloatField("speed", -1);
+		UNUSED(entry->rotSpeed = tableData.getFloatField("rotSpeed", -1));
+		entry->playerHeight = tableData.getFloatField("playerHeight");
+		entry->playerRadius = tableData.getFloatField("playerRadius");
+		entry->pcShapeType = tableData.getIntField("pcShapeType");
+		entry->collisionGroup = tableData.getIntField("collisionGroup");
+		UNUSED(entry->airSpeed = tableData.getFloatField("airSpeed"));
+		UNUSED(entry->boundaryAsset = tableData.getStringField("boundaryAsset"));
+		UNUSED(entry->jumpAirSpeed = tableData.getFloatField("jumpAirSpeed"));
+		UNUSED(entry->friction = tableData.getFloatField("friction"));
+		UNUSED(entry->gravityVolumeAsset = tableData.getStringField("gravityVolumeAsset"));
 
 		m_entries.insert(std::make_pair(entry->id, entry));
 		tableData.nextRow();
@@ -47,3 +47,4 @@ CDPhysicsComponent* CDPhysicsComponentTable::GetByID(unsigned int componentID) {
 
 	return nullptr;
 }
+
diff --git a/dDatabase/Tables/CDPropertyEntranceComponentTable.cpp b/dDatabase/Tables/CDPropertyEntranceComponentTable.cpp
index 01a2ae37..127ebc9d 100644
--- a/dDatabase/Tables/CDPropertyEntranceComponentTable.cpp
+++ b/dDatabase/Tables/CDPropertyEntranceComponentTable.cpp
@@ -18,11 +18,11 @@ CDPropertyEntranceComponentTable::CDPropertyEntranceComponentTable() {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM PropertyEntranceComponent;");
 	while (!tableData.eof()) {
 		auto entry = CDPropertyEntranceComponent{
-			static_cast<uint32_t>(tableData.getIntField(0, -1)),
-			static_cast<uint32_t>(tableData.getIntField(1, -1)),
-			tableData.getStringField(2, ""),
-			static_cast<bool>(tableData.getIntField(3, false)),
-			tableData.getStringField(4, "")
+			static_cast<uint32_t>(tableData.getIntField("id", -1)),
+			static_cast<uint32_t>(tableData.getIntField("mapID", -1)),
+			tableData.getStringField("propertyName", ""),
+			static_cast<bool>(tableData.getIntField("isOnProperty", false)),
+			tableData.getStringField("groupType", "")
 		};
 
 		this->entries.push_back(entry);
@@ -46,3 +46,4 @@ CDPropertyEntranceComponent CDPropertyEntranceComponentTable::GetByID(uint32_t i
 
 	return defaultEntry;
 }
+
diff --git a/dDatabase/Tables/CDPropertyTemplateTable.cpp b/dDatabase/Tables/CDPropertyTemplateTable.cpp
index 7dd118eb..bf56da7b 100644
--- a/dDatabase/Tables/CDPropertyTemplateTable.cpp
+++ b/dDatabase/Tables/CDPropertyTemplateTable.cpp
@@ -17,10 +17,10 @@ CDPropertyTemplateTable::CDPropertyTemplateTable() {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM PropertyTemplate;");
 	while (!tableData.eof()) {
 		auto entry = CDPropertyTemplate{
-				static_cast<uint32_t>(tableData.getIntField(0, -1)),
-				static_cast<uint32_t>(tableData.getIntField(1, -1)),
-				static_cast<uint32_t>(tableData.getIntField(2, -1)),
-				tableData.getStringField(3, "")
+				static_cast<uint32_t>(tableData.getIntField("id", -1)),
+				static_cast<uint32_t>(tableData.getIntField("mapID", -1)),
+				static_cast<uint32_t>(tableData.getIntField("vendorMapID", -1)),
+				tableData.getStringField("spawnName", "")
 		};
 
 		this->entries.push_back(entry);
@@ -44,3 +44,4 @@ CDPropertyTemplate CDPropertyTemplateTable::GetByMapID(uint32_t mapID) {
 
 	return defaultEntry;
 }
+
diff --git a/dDatabase/Tables/CDProximityMonitorComponentTable.cpp b/dDatabase/Tables/CDProximityMonitorComponentTable.cpp
index 092f3ca1..98cde098 100644
--- a/dDatabase/Tables/CDProximityMonitorComponentTable.cpp
+++ b/dDatabase/Tables/CDProximityMonitorComponentTable.cpp
@@ -21,10 +21,10 @@ CDProximityMonitorComponentTable::CDProximityMonitorComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ProximityMonitorComponent");
 	while (!tableData.eof()) {
 		CDProximityMonitorComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.Proximities = tableData.getStringField(1, "");
-		entry.LoadOnClient = tableData.getIntField(2, -1);
-		entry.LoadOnServer = tableData.getIntField(3, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.Proximities = tableData.getStringField("Proximities", "");
+		entry.LoadOnClient = tableData.getIntField("LoadOnClient", -1);
+		entry.LoadOnServer = tableData.getIntField("LoadOnServer", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -55,3 +55,4 @@ std::vector<CDProximityMonitorComponent> CDProximityMonitorComponentTable::Query
 std::vector<CDProximityMonitorComponent> CDProximityMonitorComponentTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDRailActivatorComponent.cpp b/dDatabase/Tables/CDRailActivatorComponent.cpp
index 4c141256..4d1b5e7e 100644
--- a/dDatabase/Tables/CDRailActivatorComponent.cpp
+++ b/dDatabase/Tables/CDRailActivatorComponent.cpp
@@ -6,35 +6,35 @@ CDRailActivatorComponentTable::CDRailActivatorComponentTable() {
 	while (!tableData.eof()) {
 		CDRailActivatorComponent entry;
 
-		entry.id = tableData.getIntField(0);
+		entry.id = tableData.getIntField("id", 0);
 
-		entry.startAnimation = GeneralUtils::ASCIIToUTF16(tableData.getStringField(1, ""));
-		entry.loopAnimation = GeneralUtils::ASCIIToUTF16(tableData.getStringField(2, ""));
-		entry.stopAnimation = GeneralUtils::ASCIIToUTF16(tableData.getStringField(3, ""));
-		entry.startSound = GeneralUtils::ASCIIToUTF16(tableData.getStringField(4, ""));
-		entry.loopSound = GeneralUtils::ASCIIToUTF16(tableData.getStringField(5, ""));
-		entry.stopSound = GeneralUtils::ASCIIToUTF16(tableData.getStringField(6, ""));
+		entry.startAnimation = GeneralUtils::ASCIIToUTF16(tableData.getStringField("startAnim", ""));
+		entry.loopAnimation = GeneralUtils::ASCIIToUTF16(tableData.getStringField("loopAnim", ""));
+		entry.stopAnimation = GeneralUtils::ASCIIToUTF16(tableData.getStringField("stopAnim", ""));
+		entry.startSound = GeneralUtils::ASCIIToUTF16(tableData.getStringField("startSound", ""));
+		entry.loopSound = GeneralUtils::ASCIIToUTF16(tableData.getStringField("loopSound", ""));
+		entry.stopSound = GeneralUtils::ASCIIToUTF16(tableData.getStringField("stopSound", ""));
 
-		std::string loopEffectString(tableData.getStringField(7, ""));
+		std::string loopEffectString(tableData.getStringField("effectIDs", ""));
 		entry.loopEffectID = EffectPairFromString(loopEffectString);
 
-		entry.preconditions = tableData.getStringField(8, "-1");
+		entry.preconditions = tableData.getStringField("preconditions", "-1");
 
-		entry.playerCollision = tableData.getIntField(9, 0);
+		entry.playerCollision = tableData.getIntField("playerCollision", 0);
 
-		entry.cameraLocked = tableData.getIntField(10, 0);
+		entry.cameraLocked = tableData.getIntField("cameraLocked", 0);
 
-		std::string startEffectString(tableData.getStringField(11, ""));
+		std::string startEffectString(tableData.getStringField("StartEffectID", ""));
 		entry.startEffectID = EffectPairFromString(startEffectString);
 
-		std::string stopEffectString(tableData.getStringField(12, ""));
+		std::string stopEffectString(tableData.getStringField("StopEffectID", ""));
 		entry.stopEffectID = EffectPairFromString(stopEffectString);
 
-		entry.damageImmune = tableData.getIntField(13, 0);
+		entry.damageImmune = tableData.getIntField("DamageImmune", 0);
 
-		entry.noAggro = tableData.getIntField(14, 0);
+		entry.noAggro = tableData.getIntField("NoAggro", 0);
 
-		entry.showNameBillboard = tableData.getIntField(15, 0);
+		entry.showNameBillboard = tableData.getIntField("ShowNameBillboard", 0);
 
 		m_Entries.push_back(entry);
 		tableData.nextRow();
@@ -70,3 +70,4 @@ std::pair<uint32_t, std::u16string> CDRailActivatorComponentTable::EffectPairFro
 
 	return {};
 }
+
diff --git a/dDatabase/Tables/CDRarityTableTable.cpp b/dDatabase/Tables/CDRarityTableTable.cpp
index 67878cd2..cfa8d01c 100644
--- a/dDatabase/Tables/CDRarityTableTable.cpp
+++ b/dDatabase/Tables/CDRarityTableTable.cpp
@@ -21,10 +21,10 @@ CDRarityTableTable::CDRarityTableTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM RarityTable");
 	while (!tableData.eof()) {
 		CDRarityTable entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.randmax = tableData.getFloatField(1, -1);
-		entry.rarity = tableData.getIntField(2, -1);
-		entry.RarityTableIndex = tableData.getIntField(3, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.randmax = tableData.getFloatField("randmax", -1);
+		entry.rarity = tableData.getIntField("rarity", -1);
+		entry.RarityTableIndex = tableData.getIntField("RarityTableIndex", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -55,3 +55,4 @@ std::vector<CDRarityTable> CDRarityTableTable::Query(std::function<bool(CDRarity
 const std::vector<CDRarityTable>& CDRarityTableTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDRebuildComponentTable.cpp b/dDatabase/Tables/CDRebuildComponentTable.cpp
index c4299b98..111592d4 100644
--- a/dDatabase/Tables/CDRebuildComponentTable.cpp
+++ b/dDatabase/Tables/CDRebuildComponentTable.cpp
@@ -21,16 +21,16 @@ CDRebuildComponentTable::CDRebuildComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM RebuildComponent");
 	while (!tableData.eof()) {
 		CDRebuildComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.reset_time = tableData.getFloatField(1, -1.0f);
-		entry.complete_time = tableData.getFloatField(2, -1.0f);
-		entry.take_imagination = tableData.getIntField(3, -1);
-		entry.interruptible = tableData.getIntField(4, -1) == 1 ? true : false;
-		entry.self_activator = tableData.getIntField(5, -1) == 1 ? true : false;
-		entry.custom_modules = tableData.getStringField(6, "");
-		entry.activityID = tableData.getIntField(7, -1);
-		entry.post_imagination_cost = tableData.getIntField(8, -1);
-		entry.time_before_smash = tableData.getFloatField(9, -1.0f);
+		entry.id = tableData.getIntField("id", -1);
+		entry.reset_time = tableData.getFloatField("reset_time", -1.0f);
+		entry.complete_time = tableData.getFloatField("complete_time", -1.0f);
+		entry.take_imagination = tableData.getIntField("take_imagination", -1);
+		entry.interruptible = tableData.getIntField("interruptible", -1) == 1 ? true : false;
+		entry.self_activator = tableData.getIntField("self_activator", -1) == 1 ? true : false;
+		entry.custom_modules = tableData.getStringField("custom_modules", "");
+		entry.activityID = tableData.getIntField("activityID", -1);
+		entry.post_imagination_cost = tableData.getIntField("post_imagination_cost", -1);
+		entry.time_before_smash = tableData.getFloatField("time_before_smash", -1.0f);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -61,3 +61,4 @@ std::vector<CDRebuildComponent> CDRebuildComponentTable::Query(std::function<boo
 std::vector<CDRebuildComponent> CDRebuildComponentTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDRewardsTable.cpp b/dDatabase/Tables/CDRewardsTable.cpp
index 99d56f26..a53e02b5 100644
--- a/dDatabase/Tables/CDRewardsTable.cpp
+++ b/dDatabase/Tables/CDRewardsTable.cpp
@@ -4,12 +4,12 @@ CDRewardsTable::CDRewardsTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Rewards");
 	while (!tableData.eof()) {
 		CDRewards* entry = new CDRewards();
-		entry->id = tableData.getIntField(0, -1);
-		entry->levelID = tableData.getIntField(1, -1);
-		entry->missionID = tableData.getIntField(2, -1);
-		entry->rewardType = tableData.getIntField(3, -1);
-		entry->value = tableData.getIntField(4, -1);
-		entry->count = tableData.getIntField(5, -1);
+		entry->id = tableData.getIntField("id", -1);
+		entry->levelID = tableData.getIntField("LevelID", -1);
+		entry->missionID = tableData.getIntField("MissionID", -1);
+		entry->rewardType = tableData.getIntField("RewardType", -1);
+		entry->value = tableData.getIntField("value", -1);
+		entry->count = tableData.getIntField("count", -1);
 
 		m_entries.insert(std::make_pair(entry->id, entry));
 		tableData.nextRow();
@@ -38,3 +38,4 @@ std::vector<CDRewards*> CDRewardsTable::GetByLevelID(uint32_t levelID) {
 
 	return result;
 }
+
diff --git a/dDatabase/Tables/CDScriptComponentTable.cpp b/dDatabase/Tables/CDScriptComponentTable.cpp
index b34f96f1..d91dcee9 100644
--- a/dDatabase/Tables/CDScriptComponentTable.cpp
+++ b/dDatabase/Tables/CDScriptComponentTable.cpp
@@ -18,9 +18,9 @@ CDScriptComponentTable::CDScriptComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ScriptComponent");
 	while (!tableData.eof()) {
 		CDScriptComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.script_name = tableData.getStringField(1, "");
-		entry.client_script_name = tableData.getStringField(2, "");
+		entry.id = tableData.getIntField("id", -1);
+		entry.script_name = tableData.getStringField("script_name", "");
+		entry.client_script_name = tableData.getStringField("client_script_name", "");
 
 		this->entries.insert(std::make_pair(entry.id, entry));
 		tableData.nextRow();
@@ -45,3 +45,4 @@ const CDScriptComponent& CDScriptComponentTable::GetByID(unsigned int id) {
 
 	return m_ToReturnWhenNoneFound;
 }
+
diff --git a/dDatabase/Tables/CDSkillBehaviorTable.cpp b/dDatabase/Tables/CDSkillBehaviorTable.cpp
index e3986578..b6b601a1 100644
--- a/dDatabase/Tables/CDSkillBehaviorTable.cpp
+++ b/dDatabase/Tables/CDSkillBehaviorTable.cpp
@@ -23,25 +23,25 @@ CDSkillBehaviorTable::CDSkillBehaviorTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM SkillBehavior");
 	while (!tableData.eof()) {
 		CDSkillBehavior entry;
-		entry.skillID = tableData.getIntField(0, -1);
-		UNUSED(entry.locStatus = tableData.getIntField(1, -1));
-		entry.behaviorID = tableData.getIntField(2, -1);
-		entry.imaginationcost = tableData.getIntField(3, -1);
-		entry.cooldowngroup = tableData.getIntField(4, -1);
-		entry.cooldown = tableData.getFloatField(5, -1.0f);
-		UNUSED(entry.isNpcEditor = tableData.getIntField(6, -1) == 1 ? true : false);
-		UNUSED(entry.skillIcon = tableData.getIntField(7, -1));
-		UNUSED(entry.oomSkillID = tableData.getStringField(8, ""));
-		UNUSED(entry.oomBehaviorEffectID = tableData.getIntField(9, -1));
-		UNUSED(entry.castTypeDesc = tableData.getIntField(10, -1));
-		UNUSED(entry.imBonusUI = tableData.getIntField(11, -1));
-		UNUSED(entry.lifeBonusUI = tableData.getIntField(12, -1));
-		UNUSED(entry.armorBonusUI = tableData.getIntField(13, -1));
-		UNUSED(entry.damageUI = tableData.getIntField(14, -1));
-		UNUSED(entry.hideIcon = tableData.getIntField(15, -1) == 1 ? true : false);
-		UNUSED(entry.localize = tableData.getIntField(16, -1) == 1 ? true : false);
-		UNUSED(entry.gate_version = tableData.getStringField(17, ""));
-		UNUSED(entry.cancelType = tableData.getIntField(18, -1));
+		entry.skillID = tableData.getIntField("skillID", -1);
+		UNUSED(entry.locStatus = tableData.getIntField("locStatus", -1));
+		entry.behaviorID = tableData.getIntField("behaviorID", -1);
+		entry.imaginationcost = tableData.getIntField("imaginationcost", -1);
+		entry.cooldowngroup = tableData.getIntField("cooldowngroup", -1);
+		entry.cooldown = tableData.getFloatField("cooldown", -1.0f);
+		UNUSED(entry.isNpcEditor = tableData.getIntField("isNpcEditor", -1) == 1 ? true : false);
+		UNUSED(entry.skillIcon = tableData.getIntField("skillIcon", -1));
+		UNUSED(entry.oomSkillID = tableData.getStringField("oomSkillID", ""));
+		UNUSED(entry.oomBehaviorEffectID = tableData.getIntField("oomBehaviorEffectID", -1));
+		UNUSED(entry.castTypeDesc = tableData.getIntField("castTypeDesc", -1));
+		UNUSED(entry.imBonusUI = tableData.getIntField("imBonusUI", -1));
+		UNUSED(entry.lifeBonusUI = tableData.getIntField("lifeBonusUI", -1));
+		UNUSED(entry.armorBonusUI = tableData.getIntField("armorBonusUI", -1));
+		UNUSED(entry.damageUI = tableData.getIntField("damageUI", -1));
+		UNUSED(entry.hideIcon = tableData.getIntField("hideIcon", -1) == 1 ? true : false);
+		UNUSED(entry.localize = tableData.getIntField("localize", -1) == 1 ? true : false);
+		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
+		UNUSED(entry.cancelType = tableData.getIntField("cancelType", -1));
 
 		this->entries.insert(std::make_pair(entry.skillID, entry));
 		//this->entries.push_back(entry);
@@ -82,3 +82,4 @@ const CDSkillBehavior& CDSkillBehaviorTable::GetSkillByID(unsigned int skillID)
 
 	return m_empty;
 }
+
diff --git a/dDatabase/Tables/CDVendorComponentTable.cpp b/dDatabase/Tables/CDVendorComponentTable.cpp
index f1dd96db..86d87d4b 100644
--- a/dDatabase/Tables/CDVendorComponentTable.cpp
+++ b/dDatabase/Tables/CDVendorComponentTable.cpp
@@ -21,11 +21,11 @@ CDVendorComponentTable::CDVendorComponentTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM VendorComponent");
 	while (!tableData.eof()) {
 		CDVendorComponent entry;
-		entry.id = tableData.getIntField(0, -1);
-		entry.buyScalar = tableData.getFloatField(1, -1.0f);
-		entry.sellScalar = tableData.getFloatField(2, -1.0f);
-		entry.refreshTimeSeconds = tableData.getFloatField(3, -1.0f);
-		entry.LootMatrixIndex = tableData.getIntField(4, -1);
+		entry.id = tableData.getIntField("id", -1);
+		entry.buyScalar = tableData.getFloatField("buyScalar", -1.0f);
+		entry.sellScalar = tableData.getFloatField("sellScalar", -1.0f);
+		entry.refreshTimeSeconds = tableData.getFloatField("refreshTimeSeconds", -1.0f);
+		entry.LootMatrixIndex = tableData.getIntField("LootMatrixIndex", -1);
 
 		this->entries.push_back(entry);
 		tableData.nextRow();
@@ -56,3 +56,4 @@ std::vector<CDVendorComponent> CDVendorComponentTable::Query(std::function<bool(
 std::vector<CDVendorComponent> CDVendorComponentTable::GetEntries(void) const {
 	return this->entries;
 }
+
diff --git a/dDatabase/Tables/CDZoneTableTable.cpp b/dDatabase/Tables/CDZoneTableTable.cpp
index e172f79a..04f7d102 100644
--- a/dDatabase/Tables/CDZoneTableTable.cpp
+++ b/dDatabase/Tables/CDZoneTableTable.cpp
@@ -18,33 +18,33 @@ CDZoneTableTable::CDZoneTableTable(void) {
 	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM ZoneTable");
 	while (!tableData.eof()) {
 		CDZoneTable entry;
-		entry.zoneID = tableData.getIntField(0, -1);
-		entry.locStatus = tableData.getIntField(1, -1);
-		entry.zoneName = tableData.getStringField(2, "");
-		entry.scriptID = tableData.getIntField(3, -1);
-		entry.ghostdistance_min = tableData.getFloatField(4, -1.0f);
-		entry.ghostdistance = tableData.getFloatField(5, -1.0f);
-		entry.population_soft_cap = tableData.getIntField(6, -1);
-		entry.population_hard_cap = tableData.getIntField(7, -1);
-		UNUSED(entry.DisplayDescription = tableData.getStringField(8, ""));
-		UNUSED(entry.mapFolder = tableData.getStringField(9, ""));
-		entry.smashableMinDistance = tableData.getFloatField(10, -1.0f);
-		entry.smashableMaxDistance = tableData.getFloatField(11, -1.0f);
-		UNUSED(entry.mixerProgram = tableData.getStringField(12, ""));
-		UNUSED(entry.clientPhysicsFramerate = tableData.getStringField(13, ""));
-		UNUSED(entry.serverPhysicsFramerate = tableData.getStringField(14, ""));
-		entry.zoneControlTemplate = tableData.getIntField(15, -1);
-		entry.widthInChunks = tableData.getIntField(16, -1);
-		entry.heightInChunks = tableData.getIntField(17, -1);
-		entry.petsAllowed = tableData.getIntField(18, -1) == 1 ? true : false;
-		entry.localize = tableData.getIntField(19, -1) == 1 ? true : false;
-		entry.fZoneWeight = tableData.getFloatField(20, -1.0f);
-		UNUSED(entry.thumbnail = tableData.getStringField(21, ""));
-		entry.PlayerLoseCoinsOnDeath = tableData.getIntField(22, -1) == 1 ? true : false;
-		UNUSED(entry.disableSaveLoc = tableData.getIntField(23, -1) == 1 ? true : false);
-		entry.teamRadius = tableData.getFloatField(24, -1.0f);
-		UNUSED(entry.gate_version = tableData.getStringField(25, ""));
-		UNUSED(entry.mountsAllowed = tableData.getIntField(26, -1) == 1 ? true : false);
+		entry.zoneID = tableData.getIntField("zoneID", -1);
+		entry.locStatus = tableData.getIntField("locStatus", -1);
+		entry.zoneName = tableData.getStringField("zoneName", "");
+		entry.scriptID = tableData.getIntField("scriptID", -1);
+		entry.ghostdistance_min = tableData.getFloatField("ghostdistance_min", -1.0f);
+		entry.ghostdistance = tableData.getFloatField("ghostdistance", -1.0f);
+		entry.population_soft_cap = tableData.getIntField("population_soft_cap", -1);
+		entry.population_hard_cap = tableData.getIntField("population_hard_cap", -1);
+		UNUSED(entry.DisplayDescription = tableData.getStringField("DisplayDescription", ""));
+		UNUSED(entry.mapFolder = tableData.getStringField("mapFolder", ""));
+		entry.smashableMinDistance = tableData.getFloatField("smashableMinDistance", -1.0f);
+		entry.smashableMaxDistance = tableData.getFloatField("smashableMaxDistance", -1.0f);
+		UNUSED(entry.mixerProgram = tableData.getStringField("mixerProgram", ""));
+		UNUSED(entry.clientPhysicsFramerate = tableData.getStringField("clientPhysicsFramerate", ""));
+		UNUSED(entry.serverPhysicsFramerate = tableData.getStringField("serverPhysicsFramerate", ""));
+		entry.zoneControlTemplate = tableData.getIntField("zoneControlTemplate", -1);
+		entry.widthInChunks = tableData.getIntField("widthInChunks", -1);
+		entry.heightInChunks = tableData.getIntField("heightInChunks", -1);
+		entry.petsAllowed = tableData.getIntField("petsAllowed", -1) == 1 ? true : false;
+		entry.localize = tableData.getIntField("localize", -1) == 1 ? true : false;
+		entry.fZoneWeight = tableData.getFloatField("fZoneWeight", -1.0f);
+		UNUSED(entry.thumbnail = tableData.getStringField("thumbnail", ""));
+		entry.PlayerLoseCoinsOnDeath = tableData.getIntField("PlayerLoseCoinsOnDeath", -1) == 1 ? true : false;
+		UNUSED(entry.disableSaveLoc = tableData.getIntField("disableSaveLoc", -1) == 1 ? true : false);
+		entry.teamRadius = tableData.getFloatField("teamRadius", -1.0f);
+		UNUSED(entry.gate_version = tableData.getStringField("gate_version", ""));
+		UNUSED(entry.mountsAllowed = tableData.getIntField("mountsAllowed", -1) == 1 ? true : false);
 
 		this->m_Entries.insert(std::make_pair(entry.zoneID, entry));
 		tableData.nextRow();
@@ -71,3 +71,4 @@ const CDZoneTable* CDZoneTableTable::Query(unsigned int zoneID) {
 
 	return nullptr;
 }
+
diff --git a/dGame/Entity.cpp b/dGame/Entity.cpp
index 16b2c5a1..c0f71324 100644
--- a/dGame/Entity.cpp
+++ b/dGame/Entity.cpp
@@ -17,6 +17,11 @@
 #include "UserManager.h"
 #include "dpWorld.h"
 #include "Player.h"
+#include "LUTriggers.h"
+#include "User.h"
+#include "EntityTimer.h"
+#include "EntityCallbackTimer.h"
+#include "Loot.h"
 
 //Component includes:
 #include "Component.h"
diff --git a/dGame/Entity.h b/dGame/Entity.h
index e0d38308..248018c0 100644
--- a/dGame/Entity.h
+++ b/dGame/Entity.h
@@ -4,30 +4,35 @@
 #include <functional>
 #include <typeinfo>
 #include <type_traits>
+#include <unordered_map>
 #include <vector>
 
-#include "../thirdparty/raknet/Source/Replica.h"
-#include "../thirdparty/raknet/Source/ReplicaManager.h"
-
-#include "dCommonVars.h"
-#include "User.h"
 #include "NiPoint3.h"
 #include "NiQuaternion.h"
 #include "LDFFormat.h"
-#include "Loot.h"
-#include "Zone.h"
 
-#include "EntityTimer.h"
-#include "EntityCallbackTimer.h"
-#include "EntityInfo.h"
+namespace Loot {
+	class Info;
+};
+
+namespace tinyxml2 {
+	class XMLDocument;
+};
+namespace LUTriggers {
+	struct Trigger;
+};
 
 class Player;
+class EntityInfo;
+class User;
 class Spawner;
 class ScriptComponent;
 class dpEntity;
+class EntityTimer;
 class Component;
 class Item;
 class Character;
+class EntityCallbackTimer;
 
 namespace CppScripts {
 	class Script;
diff --git a/dGame/EntityManager.cpp b/dGame/EntityManager.cpp
index 02b8b59e..99ead79d 100644
--- a/dGame/EntityManager.cpp
+++ b/dGame/EntityManager.cpp
@@ -17,6 +17,7 @@
 #include "MissionComponent.h"
 #include "Game.h"
 #include "dLogger.h"
+#include "MessageIdentifiers.h"
 
 EntityManager* EntityManager::m_Address = nullptr;
 
diff --git a/dGame/EntityManager.h b/dGame/EntityManager.h
index 40a98076..36bc5962 100644
--- a/dGame/EntityManager.h
+++ b/dGame/EntityManager.h
@@ -2,15 +2,17 @@
 #define ENTITYMANAGER_H
 
 #include "dCommonVars.h"
-#include "../thirdparty/raknet/Source/Replica.h"
 #include <map>
 #include <stack>
-
-#include "Entity.h"
 #include <vector>
+#include <unordered_map>
+
+class Entity;
+class EntityInfo;
+class Player;
+class User;
 
 struct SystemAddress;
-class User;
 
 class EntityManager {
 public:
diff --git a/dGame/Player.cpp b/dGame/Player.cpp
index 5306584e..4f4bc951 100644
--- a/dGame/Player.cpp
+++ b/dGame/Player.cpp
@@ -13,7 +13,9 @@
 #include "dZoneManager.h"
 #include "CharacterComponent.h"
 #include "Mail.h"
+#include "User.h"
 #include "CppScripts.h"
+#include "Loot.h"
 
 std::vector<Player*> Player::m_Players = {};
 
diff --git a/dGame/UserManager.cpp b/dGame/UserManager.cpp
index 70e76016..93469daa 100644
--- a/dGame/UserManager.cpp
+++ b/dGame/UserManager.cpp
@@ -22,6 +22,7 @@
 #include "SkillComponent.h"
 #include "AssetManager.h"
 #include "CDClientDatabase.h"
+#include "dMessageIdentifiers.h"
 
 UserManager* UserManager::m_Address = nullptr;
 
diff --git a/dGame/dBehaviors/Behavior.cpp b/dGame/dBehaviors/Behavior.cpp
index 40c37a95..c8c1a1de 100644
--- a/dGame/dBehaviors/Behavior.cpp
+++ b/dGame/dBehaviors/Behavior.cpp
@@ -48,6 +48,7 @@
 #include "PlayEffectBehavior.h"
 #include "DamageAbsorptionBehavior.h"
 #include "VentureVisionBehavior.h"
+#include "PropertyTeleportBehavior.h"
 #include "BlockBehavior.h"
 #include "ClearTargetBehavior.h"
 #include "PullToPointBehavior.h"
@@ -263,7 +264,9 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) {
 	case BehaviorTemplates::BEHAVIOR_DAMAGE_REDUCTION:
 		behavior = new DamageReductionBehavior(behaviorId);
 		break;
-	case BehaviorTemplates::BEHAVIOR_PROPERTY_TELEPORT: break;
+	case BehaviorTemplates::BEHAVIOR_PROPERTY_TELEPORT:
+		behavior = new PropertyTeleportBehavior(behaviorId);
+		break;
 	case BehaviorTemplates::BEHAVIOR_PROPERTY_CLEAR_TARGET:
 		behavior = new ClearTargetBehavior(behaviorId);
 		break;
diff --git a/dGame/dBehaviors/BehaviorContext.cpp b/dGame/dBehaviors/BehaviorContext.cpp
index ebed10ba..26d1e9e6 100644
--- a/dGame/dBehaviors/BehaviorContext.cpp
+++ b/dGame/dBehaviors/BehaviorContext.cpp
@@ -10,8 +10,9 @@
 
 #include <sstream>
 
-
+#include "dMessageIdentifiers.h"
 #include "DestroyableComponent.h"
+#include "EchoSyncSkill.h"
 #include "PhantomPhysicsComponent.h"
 #include "RebuildComponent.h"
 
@@ -216,7 +217,7 @@ bool BehaviorContext::CalculateUpdate(const float deltaTime) {
 		}
 
 		// Echo sync
-		GameMessages::EchoSyncSkill echo;
+		EchoSyncSkill echo;
 
 		echo.bDone = true;
 		echo.uiBehaviorHandle = entry.handle;
diff --git a/dGame/dBehaviors/CMakeLists.txt b/dGame/dBehaviors/CMakeLists.txt
index e274872d..7b331fe0 100644
--- a/dGame/dBehaviors/CMakeLists.txt
+++ b/dGame/dBehaviors/CMakeLists.txt
@@ -35,6 +35,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"OverTimeBehavior.cpp"
 	"PlayEffectBehavior.cpp"
 	"ProjectileAttackBehavior.cpp"
+	"PropertyTeleportBehavior.cpp"
 	"PullToPointBehavior.cpp"
 	"RemoveBuffBehavior.cpp"
 	"RepairBehavior.cpp"
diff --git a/dGame/dBehaviors/ImmunityBehavior.cpp b/dGame/dBehaviors/ImmunityBehavior.cpp
index 69c652f9..f4a41c52 100644
--- a/dGame/dBehaviors/ImmunityBehavior.cpp
+++ b/dGame/dBehaviors/ImmunityBehavior.cpp
@@ -6,28 +6,47 @@
 #include "Game.h"
 #include "dLogger.h"
 #include "DestroyableComponent.h"
+#include "ControllablePhysicsComponent.h"
 
 void ImmunityBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, const BehaviorBranchContext branch) {
 	auto* target = EntityManager::Instance()->GetEntity(branch.target);
 
-	if (target == nullptr) {
+	if (!target) {
 		Game::logger->Log("DamageAbsorptionBehavior", "Failed to find target (%llu)!", branch.target);
-
 		return;
 	}
 
-	auto* destroyable = static_cast<DestroyableComponent*>(target->GetComponent(COMPONENT_TYPE_DESTROYABLE));
-
-	if (destroyable == nullptr) {
-		return;
+	auto* destroyableComponent = target->GetComponent<DestroyableComponent>();
+	if (destroyableComponent) {
+		destroyableComponent->SetStatusImmunity(
+			eStateChangeType::PUSH,
+			this->m_ImmuneToBasicAttack,
+			this->m_ImmuneToDamageOverTime,
+			this->m_ImmuneToKnockback,
+			this->m_ImmuneToInterrupt,
+			this->m_ImmuneToSpeed,
+			this->m_ImmuneToImaginationGain,
+			this->m_ImmuneToImaginationLoss,
+			this->m_ImmuneToQuickbuildInterrupt,
+			this->m_ImmuneToPullToPoint
+		);
 	}
 
-	if (!this->m_immuneBasicAttack) {
-		return;
+	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
+	if (controllablePhysicsComponent) {
+		controllablePhysicsComponent->SetStunImmunity(
+			eStateChangeType::PUSH,
+			context->caster,
+			this->m_ImmuneToStunAttack,
+			this->m_ImmuneToStunEquip,
+			this->m_ImmuneToStunInteract,
+			this->m_ImmuneToStunJump,
+			this->m_ImmuneToStunMove,
+			this->m_ImmuneToStunTurn,
+			this->m_ImmuneToStunUseItem
+		);
 	}
 
-	destroyable->PushImmunity();
-
 	context->RegisterTimerBehavior(this, branch, target->GetObjectID());
 }
 
@@ -38,21 +57,60 @@ void ImmunityBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bi
 void ImmunityBehavior::Timer(BehaviorContext* context, BehaviorBranchContext branch, const LWOOBJID second) {
 	auto* target = EntityManager::Instance()->GetEntity(second);
 
-	if (target == nullptr) {
+	if (!target) {
 		Game::logger->Log("DamageAbsorptionBehavior", "Failed to find target (%llu)!", second);
-
 		return;
 	}
 
-	auto* destroyable = static_cast<DestroyableComponent*>(target->GetComponent(COMPONENT_TYPE_DESTROYABLE));
-
-	if (destroyable == nullptr) {
-		return;
+	auto* destroyableComponent = target->GetComponent<DestroyableComponent>();
+	if (destroyableComponent) {
+		destroyableComponent->SetStatusImmunity(
+			eStateChangeType::POP,
+			this->m_ImmuneToBasicAttack,
+			this->m_ImmuneToDamageOverTime,
+			this->m_ImmuneToKnockback,
+			this->m_ImmuneToInterrupt,
+			this->m_ImmuneToSpeed,
+			this->m_ImmuneToImaginationGain,
+			this->m_ImmuneToImaginationLoss,
+			this->m_ImmuneToQuickbuildInterrupt,
+			this->m_ImmuneToPullToPoint
+		);
+	}
+
+	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
+	if (controllablePhysicsComponent) {
+		controllablePhysicsComponent->SetStunImmunity(
+			eStateChangeType::POP,
+			context->caster,
+			this->m_ImmuneToStunAttack,
+			this->m_ImmuneToStunEquip,
+			this->m_ImmuneToStunInteract,
+			this->m_ImmuneToStunJump,
+			this->m_ImmuneToStunMove,
+			this->m_ImmuneToStunTurn,
+			this->m_ImmuneToStunUseItem
+		);
 	}
 
-	destroyable->PopImmunity();
 }
 
 void ImmunityBehavior::Load() {
-	this->m_immuneBasicAttack = GetBoolean("immune_basic_attack");
+	//Stun
+	this->m_ImmuneToStunAttack = GetBoolean("immune_stun_attack", false);
+	this->m_ImmuneToStunEquip = GetBoolean("immune_stun_equip", false);
+	this->m_ImmuneToStunInteract = GetBoolean("immune_stun_interact", false);
+	this->m_ImmuneToStunMove = GetBoolean("immune_stun_move", false);
+	this->m_ImmuneToStunTurn = GetBoolean("immune_stun_rotate", false);
+
+	// Status
+	this->m_ImmuneToBasicAttack = GetBoolean("immune_basic_attack", false);
+	this->m_ImmuneToDamageOverTime = GetBoolean("immune_damage_over_time", false);
+	this->m_ImmuneToKnockback = GetBoolean("immune_knockback", false);
+	this->m_ImmuneToInterrupt = GetBoolean("immune_interrupt", false);
+	this->m_ImmuneToSpeed = GetBoolean("immune_speed", false);
+	this->m_ImmuneToImaginationGain = GetBoolean("immune_imagination_gain", false);
+	this->m_ImmuneToImaginationLoss = GetBoolean("immune_imagination_loss", false);
+	this->m_ImmuneToQuickbuildInterrupt = GetBoolean("immune_quickbuild_interrupts", false);
+	this->m_ImmuneToPullToPoint = GetBoolean("immune_pulltopoint", false);
 }
diff --git a/dGame/dBehaviors/ImmunityBehavior.h b/dGame/dBehaviors/ImmunityBehavior.h
index f9409e4c..02cc0fae 100644
--- a/dGame/dBehaviors/ImmunityBehavior.h
+++ b/dGame/dBehaviors/ImmunityBehavior.h
@@ -4,8 +4,6 @@
 class ImmunityBehavior final : public Behavior
 {
 public:
-	uint32_t m_immuneBasicAttack;
-
 	/*
 	 * Inherited
 	 */
@@ -20,4 +18,25 @@ public:
 	void Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
 
 	void Load() override;
+
+private:
+	// stuns
+	bool m_ImmuneToStunAttack = false;
+	bool m_ImmuneToStunEquip = false;
+	bool m_ImmuneToStunInteract = false;
+	bool m_ImmuneToStunJump = false; // Unused
+	bool m_ImmuneToStunMove = false;
+	bool m_ImmuneToStunTurn = false;
+	bool m_ImmuneToStunUseItem = false; // Unused
+
+	//status
+	bool m_ImmuneToBasicAttack = false;
+	bool m_ImmuneToDamageOverTime = false;
+	bool m_ImmuneToKnockback = false;
+	bool m_ImmuneToInterrupt = false;
+	bool m_ImmuneToSpeed = false;
+	bool m_ImmuneToImaginationGain = false;
+	bool m_ImmuneToImaginationLoss = false;
+	bool m_ImmuneToQuickbuildInterrupt = false;
+	bool m_ImmuneToPullToPoint = false; // Unused in cdclient, but used in client
 };
diff --git a/dGame/dBehaviors/PropertyTeleportBehavior.cpp b/dGame/dBehaviors/PropertyTeleportBehavior.cpp
new file mode 100644
index 00000000..447b085b
--- /dev/null
+++ b/dGame/dBehaviors/PropertyTeleportBehavior.cpp
@@ -0,0 +1,61 @@
+#include "PropertyTeleportBehavior.h"
+
+#include "BehaviorBranchContext.h"
+#include "BehaviorContext.h"
+#include "Character.h"
+#include "CharacterComponent.h"
+#include "ChatPackets.h"
+#include "WorldPackets.h"
+#include "EntityManager.h"
+#include "Game.h"
+#include "ZoneInstanceManager.h"
+#include "dZoneManager.h"
+
+void PropertyTeleportBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
+	auto* caster = EntityManager::Instance()->GetEntity(context->caster);
+	if (!caster) return;
+
+	auto* character = caster->GetCharacter();
+	if (!character) return;
+
+	LWOOBJID objId = caster->GetObjectID();
+
+	LWOMAPID targetMapId = m_MapId;
+	LWOCLONEID targetCloneId = character->GetPropertyCloneID();
+
+	if (dZoneManager::Instance()->GetZoneID().GetCloneID() == character->GetPropertyCloneID()) {
+		targetMapId = character->GetLastNonInstanceZoneID();
+		targetCloneId = 0;
+	} else {
+		character->SetLastNonInstanceZoneID(dZoneManager::Instance()->GetZoneID().GetMapID());
+	}
+
+	ZoneInstanceManager::Instance()->RequestZoneTransfer(Game::server, targetMapId, targetCloneId, false, [objId](bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, std::string serverIP, uint16_t serverPort) {
+
+		auto* entity = EntityManager::Instance()->GetEntity(objId);
+		if (!entity) return;
+
+		const auto sysAddr = entity->GetSystemAddress();
+
+		if (zoneClone != 0) ChatPackets::SendSystemMessage(sysAddr, u"Transfering to your property!");
+		else ChatPackets::SendSystemMessage(sysAddr, u"Transfering back to previous world!");
+
+		Game::logger->Log("PropertyTeleportBehavior", "Transferring %s to Zone %i (Instance %i | Clone %i | Mythran Shift: %s) with IP %s and Port %i", sysAddr.ToString(), zoneID, zoneInstance, zoneClone, mythranShift == true ? "true" : "false", serverIP.c_str(), serverPort);
+		if (entity->GetCharacter()) {
+			entity->GetCharacter()->SetZoneID(zoneID);
+			entity->GetCharacter()->SetZoneInstance(zoneInstance);
+			entity->GetCharacter()->SetZoneClone(zoneClone);
+			entity->GetComponent<CharacterComponent>()->SetLastRocketConfig(u"");
+		}
+
+		entity->GetCharacter()->SaveXMLToDatabase();
+
+		WorldPackets::SendTransferToWorld(sysAddr, serverIP, serverPort, mythranShift);
+		return;
+		});
+}
+
+void PropertyTeleportBehavior::Load() {
+	this->m_CancelIfInteracting = GetBoolean("cancel_if_interacting"); // TODO unused
+	this->m_MapId = LWOMAPID(GetInt("mapID"));
+}
diff --git a/dGame/dBehaviors/PropertyTeleportBehavior.h b/dGame/dBehaviors/PropertyTeleportBehavior.h
new file mode 100644
index 00000000..74eed03b
--- /dev/null
+++ b/dGame/dBehaviors/PropertyTeleportBehavior.h
@@ -0,0 +1,21 @@
+#pragma once
+#include "Behavior.h"
+
+class PropertyTeleportBehavior final : public Behavior
+{
+public:
+	/*
+	 * Inherited
+	 */
+
+	explicit PropertyTeleportBehavior(const uint32_t behavior_id) : Behavior(behavior_id) {
+	}
+
+	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
+
+	void Load() override;
+
+private:
+	LWOMAPID m_MapId;
+	bool m_CancelIfInteracting;
+};
diff --git a/dGame/dBehaviors/SpawnBehavior.cpp b/dGame/dBehaviors/SpawnBehavior.cpp
index ac7bb797..8b2020b1 100644
--- a/dGame/dBehaviors/SpawnBehavior.cpp
+++ b/dGame/dBehaviors/SpawnBehavior.cpp
@@ -7,6 +7,8 @@
 #include "dLogger.h"
 #include "DestroyableComponent.h"
 #include "RebuildComponent.h"
+#include "Entity.h"
+#include "EntityInfo.h"
 
 void SpawnBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
 	auto* origin = EntityManager::Instance()->GetEntity(context->originator);
diff --git a/dGame/dComponents/CharacterComponent.cpp b/dGame/dComponents/CharacterComponent.cpp
index 424be0ac..ecd5e7b2 100644
--- a/dGame/dComponents/CharacterComponent.cpp
+++ b/dGame/dComponents/CharacterComponent.cpp
@@ -13,6 +13,7 @@
 #include "VehiclePhysicsComponent.h"
 #include "GameMessages.h"
 #include "Item.h"
+#include "AMFFormat.h"
 
 CharacterComponent::CharacterComponent(Entity* parent, Character* character) : Component(parent) {
 	m_Character = character;
diff --git a/dGame/dComponents/ControllablePhysicsComponent.cpp b/dGame/dComponents/ControllablePhysicsComponent.cpp
index a5e447c8..6a6d69ce 100644
--- a/dGame/dComponents/ControllablePhysicsComponent.cpp
+++ b/dGame/dComponents/ControllablePhysicsComponent.cpp
@@ -31,10 +31,25 @@ ControllablePhysicsComponent::ControllablePhysicsComponent(Entity* entity) : Com
 	m_GravityScale = 1;
 	m_DirtyCheats = false;
 	m_IgnoreMultipliers = false;
+
+	m_DirtyEquippedItemInfo = true;
 	m_PickupRadius = 0.0f;
-	m_DirtyPickupRadiusScale = true;
+
+	m_DirtyBubble = false;
+	m_IsInBubble = false;
+	m_SpecialAnims = false;
+	m_BubbleType = eBubbleType::DEFAULT;
+
 	m_IsTeleporting = false;
 
+	m_ImmuneToStunAttackCount = 0;
+	m_ImmuneToStunEquipCount = 0;
+	m_ImmuneToStunInteractCount = 0;
+	m_ImmuneToStunJumpCount = 0;
+	m_ImmuneToStunMoveCount = 0;
+	m_ImmuneToStunTurnCount = 0;
+	m_ImmuneToStunUseItemCount = 0;
+
 	if (entity->GetLOT() != 1) // Other physics entities we care about will be added by BaseCombatAI
 		return;
 
@@ -71,7 +86,14 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bo
 			outBitStream->Write(m_JetpackBypassChecks);
 		}
 
-		outBitStream->Write0(); //This contains info about immunities, but for now I'm leaving it out.
+		outBitStream->Write1(); // always write these on construction
+		outBitStream->Write(m_ImmuneToStunMoveCount);
+		outBitStream->Write(m_ImmuneToStunJumpCount);
+		outBitStream->Write(m_ImmuneToStunTurnCount);
+		outBitStream->Write(m_ImmuneToStunAttackCount);
+		outBitStream->Write(m_ImmuneToStunUseItemCount);
+		outBitStream->Write(m_ImmuneToStunEquipCount);
+		outBitStream->Write(m_ImmuneToStunInteractCount);
 	}
 
 	if (m_IgnoreMultipliers) m_DirtyCheats = false;
@@ -84,14 +106,22 @@ void ControllablePhysicsComponent::Serialize(RakNet::BitStream* outBitStream, bo
 		m_DirtyCheats = false;
 	}
 
-	outBitStream->Write(m_DirtyPickupRadiusScale);
-	if (m_DirtyPickupRadiusScale) {
+	outBitStream->Write(m_DirtyEquippedItemInfo);
+	if (m_DirtyEquippedItemInfo) {
 		outBitStream->Write(m_PickupRadius);
-		outBitStream->Write0(); //No clue what this is so im leaving it false.
-		m_DirtyPickupRadiusScale = false;
+		outBitStream->Write(m_InJetpackMode);
+		m_DirtyEquippedItemInfo = false;
 	}
 
-	outBitStream->Write0();
+	outBitStream->Write(m_DirtyBubble);
+	if (m_DirtyBubble) {
+		outBitStream->Write(m_IsInBubble);
+		if (m_IsInBubble) {
+			outBitStream->Write(m_BubbleType);
+			outBitStream->Write(m_SpecialAnims);
+		}
+		m_DirtyBubble = false;
+	}
 
 	outBitStream->Write(m_DirtyPosition || bIsInitialUpdate);
 	if (m_DirtyPosition || bIsInitialUpdate) {
@@ -248,7 +278,7 @@ void ControllablePhysicsComponent::AddPickupRadiusScale(float value) {
 	m_ActivePickupRadiusScales.push_back(value);
 	if (value > m_PickupRadius) {
 		m_PickupRadius = value;
-		m_DirtyPickupRadiusScale = true;
+		m_DirtyEquippedItemInfo = true;
 	}
 }
 
@@ -264,7 +294,7 @@ void ControllablePhysicsComponent::RemovePickupRadiusScale(float value) {
 
 	// Recalculate pickup radius since we removed one by now
 	m_PickupRadius = 0.0f;
-	m_DirtyPickupRadiusScale = true;
+	m_DirtyEquippedItemInfo = true;
 	for (uint32_t i = 0; i < m_ActivePickupRadiusScales.size(); i++) {
 		auto candidateRadius = m_ActivePickupRadiusScales[i];
 		if (m_PickupRadius < candidateRadius) m_PickupRadius = candidateRadius;
@@ -298,3 +328,62 @@ void ControllablePhysicsComponent::RemoveSpeedboost(float value) {
 	SetSpeedMultiplier(m_SpeedBoost / 500.0f); // 500 being the base speed
 	EntityManager::Instance()->SerializeEntity(m_Parent);
 }
+
+void ControllablePhysicsComponent::ActivateBubbleBuff(eBubbleType bubbleType, bool specialAnims){
+	if (m_IsInBubble) {
+		Game::logger->Log("ControllablePhysicsComponent", "Already in bubble");
+		return;
+	}
+	m_BubbleType = bubbleType;
+	m_IsInBubble = true;
+	m_DirtyBubble = true;
+	m_SpecialAnims = specialAnims;
+	EntityManager::Instance()->SerializeEntity(m_Parent);
+}
+
+void ControllablePhysicsComponent::DeactivateBubbleBuff(){
+	m_DirtyBubble = true;
+	m_IsInBubble = false;
+	EntityManager::Instance()->SerializeEntity(m_Parent);
+};
+
+void ControllablePhysicsComponent::SetStunImmunity(
+	const eStateChangeType state,
+	const LWOOBJID originator,
+	const bool bImmuneToStunAttack,
+	const bool bImmuneToStunEquip,
+	const bool bImmuneToStunInteract,
+	const bool bImmuneToStunJump,
+	const bool bImmuneToStunMove,
+	const bool bImmuneToStunTurn,
+	const bool bImmuneToStunUseItem){
+
+	if (state == eStateChangeType::POP){
+		if (bImmuneToStunAttack && m_ImmuneToStunAttackCount > 0) 		m_ImmuneToStunAttackCount -= 1;
+		if (bImmuneToStunEquip && m_ImmuneToStunEquipCount > 0) 		m_ImmuneToStunEquipCount -= 1;
+		if (bImmuneToStunInteract && m_ImmuneToStunInteractCount > 0) 	m_ImmuneToStunInteractCount -= 1;
+		if (bImmuneToStunJump && m_ImmuneToStunJumpCount > 0) 			m_ImmuneToStunJumpCount -= 1;
+		if (bImmuneToStunMove && m_ImmuneToStunMoveCount > 0) 			m_ImmuneToStunMoveCount -= 1;
+		if (bImmuneToStunTurn && m_ImmuneToStunTurnCount > 0) 			m_ImmuneToStunTurnCount -= 1;
+		if (bImmuneToStunUseItem && m_ImmuneToStunUseItemCount > 0) 	m_ImmuneToStunUseItemCount -= 1;
+	} else if (state == eStateChangeType::PUSH) {
+		if (bImmuneToStunAttack) 	m_ImmuneToStunAttackCount += 1;
+		if (bImmuneToStunEquip) 	m_ImmuneToStunEquipCount += 1;
+		if (bImmuneToStunInteract) 	m_ImmuneToStunInteractCount += 1;
+		if (bImmuneToStunJump) 		m_ImmuneToStunJumpCount += 1;
+		if (bImmuneToStunMove) 		m_ImmuneToStunMoveCount += 1;
+		if (bImmuneToStunTurn) 		m_ImmuneToStunTurnCount += 1;
+		if (bImmuneToStunUseItem)	m_ImmuneToStunUseItemCount += 1;
+	}
+
+	GameMessages::SendSetStunImmunity(
+		m_Parent->GetObjectID(), state, m_Parent->GetSystemAddress(), originator,
+		bImmuneToStunAttack,
+		bImmuneToStunEquip,
+		bImmuneToStunInteract,
+		bImmuneToStunJump,
+		bImmuneToStunMove,
+		bImmuneToStunTurn,
+		bImmuneToStunUseItem
+	);
+}
diff --git a/dGame/dComponents/ControllablePhysicsComponent.h b/dGame/dComponents/ControllablePhysicsComponent.h
index e029d607..a05a11fd 100644
--- a/dGame/dComponents/ControllablePhysicsComponent.h
+++ b/dGame/dComponents/ControllablePhysicsComponent.h
@@ -9,6 +9,7 @@
 #include "Component.h"
 #include "dpCollisionChecks.h"
 #include "PhantomPhysicsComponent.h"
+#include "eBubbleType.h"
 
 class Entity;
 class dpEntity;
@@ -257,13 +258,63 @@ public:
 	 */
 	std::vector<float> GetActivePickupRadiusScales() { return m_ActivePickupRadiusScales; };
 
-
+	/**
+	 * Add a Speed boost to the entity
+	 * This will recalculate the speed boost based on what is being added
+	 */
 	void AddSpeedboost(float value);
 
+	/**
+	 * Remove speed boost from entity
+	 * This will recalculate the speed boost based on what is the last one in te vector
+	 */
 	void RemoveSpeedboost(float value);
 
+	/**
+	 * The speed boosts of this component.
+	 * @return All active Speed boosts for this component.
+	 */
 	std::vector<float> GetActiveSpeedboosts() { return m_ActivePickupRadiusScales; };
 
+	/**
+	* Activates the Bubble Buff
+	*/
+	void ActivateBubbleBuff(eBubbleType bubbleType = eBubbleType::DEFAULT, bool specialAnims = true);
+
+	/**
+	* Deactivates the Bubble Buff
+	*/
+	void DeactivateBubbleBuff();
+
+	/**
+	 * Gets if the Entity is in a bubble
+	 */
+	bool GetIsInBubble(){ return m_IsInBubble; };
+
+  /**
+	 * Push or Pop a layer of stun immunity to this entity
+	 */
+	void SetStunImmunity(
+		const eStateChangeType state,
+		const LWOOBJID originator = LWOOBJID_EMPTY,
+		const bool bImmuneToStunAttack = false,
+		const bool bImmuneToStunEquip = false,
+		const bool bImmuneToStunInteract = false,
+		const bool bImmuneToStunJump = false,
+		const bool bImmuneToStunMove = false,
+		const bool bImmuneToStunTurn = false,
+		const bool bImmuneToStunUseItem = false
+	);
+
+	// getters for stun immunities
+	const bool GetImmuneToStunAttack() { return m_ImmuneToStunAttackCount > 0;};
+	const bool GetImmuneToStunEquip() { return m_ImmuneToStunEquipCount > 0;};
+	const bool GetImmuneToStunInteract() { return m_ImmuneToStunInteractCount > 0;};
+	const bool GetImmuneToStunJump() { return m_ImmuneToStunJumpCount > 0;};
+	const bool GetImmuneToStunMove() { return m_ImmuneToStunMoveCount > 0;};
+	const bool GetImmuneToStunTurn() { return m_ImmuneToStunTurnCount > 0;};
+	const bool GetImmuneToStunUseItem() { return m_ImmuneToStunUseItemCount > 0;};
+
 private:
 	/**
 	 * The entity that owns this component
@@ -363,7 +414,7 @@ private:
 	/**
 	 * Whether the pickup scale is dirty.
 	 */
-	bool m_DirtyPickupRadiusScale;
+	bool m_DirtyEquippedItemInfo;
 
 	/**
 	 * The list of pickup radius scales for this entity
@@ -389,6 +440,37 @@ private:
 	 * The active speed boost for this entity
 	 */
 	float m_SpeedBoost;
+
+	/*
+	* If Bubble info is dirty
+	*/
+	bool m_DirtyBubble;
+
+	/*
+	* If the entity is in a bubble
+	*/
+	bool m_IsInBubble;
+
+	/*
+	* The type of bubble the entity has
+	*/
+	eBubbleType m_BubbleType;
+
+	/*
+	* If the entity should be using the special animations
+	*/
+	bool m_SpecialAnims;
+
+  /**
+	 * stun immunity counters
+	 */
+	int32_t m_ImmuneToStunAttackCount;
+	int32_t m_ImmuneToStunEquipCount;
+	int32_t m_ImmuneToStunInteractCount;
+	int32_t m_ImmuneToStunJumpCount;
+	int32_t m_ImmuneToStunMoveCount;
+	int32_t m_ImmuneToStunTurnCount;
+	int32_t m_ImmuneToStunUseItemCount;
 };
 
 #endif // CONTROLLABLEPHYSICSCOMPONENT_H
diff --git a/dGame/dComponents/DestroyableComponent.cpp b/dGame/dComponents/DestroyableComponent.cpp
index 1b127c41..3e146335 100644
--- a/dGame/dComponents/DestroyableComponent.cpp
+++ b/dGame/dComponents/DestroyableComponent.cpp
@@ -55,8 +55,17 @@ DestroyableComponent::DestroyableComponent(Entity* parent) : Component(parent) {
 	m_LootMatrixID = 0;
 	m_MinCoins = 0;
 	m_MaxCoins = 0;
-	m_ImmuneStacks = 0;
 	m_DamageReduction = 0;
+
+	m_ImmuneToBasicAttackCount = 0;
+	m_ImmuneToDamageOverTimeCount = 0;
+	m_ImmuneToKnockbackCount = 0;
+	m_ImmuneToInterruptCount = 0;
+	m_ImmuneToSpeedCount = 0;
+	m_ImmuneToImaginationGainCount = 0;
+	m_ImmuneToImaginationLossCount = 0;
+	m_ImmuneToQuickbuildInterruptCount = 0;
+	m_ImmuneToPullToPointCount = 0;
 }
 
 DestroyableComponent::~DestroyableComponent() {
@@ -106,7 +115,16 @@ void DestroyableComponent::Reinitialize(LOT templateID) {
 
 void DestroyableComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, uint32_t& flags) {
 	if (bIsInitialUpdate) {
-		outBitStream->Write0(); //Contains info about immunities this object has, but it's left out for now.
+		outBitStream->Write1(); // always write these on construction
+		outBitStream->Write(m_ImmuneToBasicAttackCount);
+		outBitStream->Write(m_ImmuneToDamageOverTimeCount);
+		outBitStream->Write(m_ImmuneToKnockbackCount);
+		outBitStream->Write(m_ImmuneToInterruptCount);
+		outBitStream->Write(m_ImmuneToSpeedCount);
+		outBitStream->Write(m_ImmuneToImaginationGainCount);
+		outBitStream->Write(m_ImmuneToImaginationLossCount);
+		outBitStream->Write(m_ImmuneToQuickbuildInterruptCount);
+		outBitStream->Write(m_ImmuneToPullToPointCount);
 	}
 
 	outBitStream->Write(m_DirtyHealth || bIsInitialUpdate);
@@ -336,7 +354,7 @@ void DestroyableComponent::SetDamageReduction(int32_t value) {
 
 void DestroyableComponent::SetIsImmune(bool value) {
 	m_DirtyHealth = true;
-	m_ImmuneStacks = value ? 1 : 0;
+	m_ImmuneToBasicAttackCount = value ? 1 : 0;
 }
 
 void DestroyableComponent::SetIsGMImmune(bool value) {
@@ -439,7 +457,7 @@ void DestroyableComponent::SetAttacksToBlock(const uint32_t value) {
 }
 
 bool DestroyableComponent::IsImmune() const {
-	return m_ImmuneStacks > 0 || m_IsGMImmune;
+	return m_IsGMImmune || m_ImmuneToBasicAttackCount > 0;
 }
 
 bool DestroyableComponent::IsKnockbackImmune() const {
@@ -804,12 +822,53 @@ void DestroyableComponent::SetFaction(int32_t factionID, bool ignoreChecks) {
 	AddFaction(factionID, ignoreChecks);
 }
 
-void DestroyableComponent::PushImmunity(int32_t stacks) {
-	m_ImmuneStacks += stacks;
-}
+void DestroyableComponent::SetStatusImmunity(
+		const eStateChangeType state,
+		const bool bImmuneToBasicAttack,
+		const bool bImmuneToDamageOverTime,
+		const bool bImmuneToKnockback,
+		const bool bImmuneToInterrupt,
+		const bool bImmuneToSpeed,
+		const bool bImmuneToImaginationGain,
+		const bool bImmuneToImaginationLoss,
+		const bool bImmuneToQuickbuildInterrupt,
+		const bool bImmuneToPullToPoint) {
 
-void DestroyableComponent::PopImmunity(int32_t stacks) {
-	m_ImmuneStacks -= stacks;
+	if (state == eStateChangeType::POP) {
+		if (bImmuneToBasicAttack && m_ImmuneToBasicAttackCount > 0) 				m_ImmuneToBasicAttackCount -= 1;
+		if (bImmuneToDamageOverTime && m_ImmuneToDamageOverTimeCount > 0) 			m_ImmuneToDamageOverTimeCount -= 1;
+		if (bImmuneToKnockback && m_ImmuneToKnockbackCount > 0) 					m_ImmuneToKnockbackCount -= 1;
+		if (bImmuneToInterrupt && m_ImmuneToInterruptCount > 0) 					m_ImmuneToInterruptCount -= 1;
+		if (bImmuneToSpeed && m_ImmuneToSpeedCount > 0) 							m_ImmuneToSpeedCount -= 1;
+		if (bImmuneToImaginationGain && m_ImmuneToImaginationGainCount > 0) 		m_ImmuneToImaginationGainCount -= 1;
+		if (bImmuneToImaginationLoss && m_ImmuneToImaginationLossCount > 0) 		m_ImmuneToImaginationLossCount -= 1;
+		if (bImmuneToQuickbuildInterrupt && m_ImmuneToQuickbuildInterruptCount > 0) m_ImmuneToQuickbuildInterruptCount -= 1;
+		if (bImmuneToPullToPoint && m_ImmuneToPullToPointCount > 0) 				m_ImmuneToPullToPointCount -= 1;
+
+	} else if (state == eStateChangeType::PUSH){
+		if (bImmuneToBasicAttack) 			m_ImmuneToBasicAttackCount += 1;
+		if (bImmuneToDamageOverTime) 		m_ImmuneToDamageOverTimeCount += 1;
+		if (bImmuneToKnockback) 			m_ImmuneToKnockbackCount += 1;
+		if (bImmuneToInterrupt) 			m_ImmuneToInterruptCount += 1;
+		if (bImmuneToSpeed) 				m_ImmuneToSpeedCount += 1;
+		if (bImmuneToImaginationGain) 		m_ImmuneToImaginationGainCount += 1;
+		if (bImmuneToImaginationLoss) 		m_ImmuneToImaginationLossCount += 1;
+		if (bImmuneToQuickbuildInterrupt) 	m_ImmuneToQuickbuildInterruptCount += 1;
+		if (bImmuneToPullToPoint) 			m_ImmuneToPullToPointCount += 1;
+	}
+
+	GameMessages::SendSetStatusImmunity(
+		m_Parent->GetObjectID(), state, m_Parent->GetSystemAddress(),
+		bImmuneToBasicAttack,
+		bImmuneToDamageOverTime,
+		bImmuneToKnockback,
+		bImmuneToInterrupt,
+		bImmuneToSpeed,
+		bImmuneToImaginationGain,
+		bImmuneToImaginationLoss,
+		bImmuneToQuickbuildInterrupt,
+		bImmuneToPullToPoint
+	);
 }
 
 void DestroyableComponent::FixStats() {
diff --git a/dGame/dComponents/DestroyableComponent.h b/dGame/dComponents/DestroyableComponent.h
index 5bb990a7..2736f47c 100644
--- a/dGame/dComponents/DestroyableComponent.h
+++ b/dGame/dComponents/DestroyableComponent.h
@@ -396,16 +396,31 @@ public:
 	void Smash(LWOOBJID source, eKillType killType = eKillType::VIOLENT, const std::u16string& deathType = u"", uint32_t skillID = 0);
 
 	/**
-	 * Pushes a layer of immunity to this entity, making it immune for longer
-	 * @param stacks the amount of immunity to add
+	 * Push or Pop a layer of status immunity to this entity
 	 */
-	void PushImmunity(int32_t stacks = 1);
+	void SetStatusImmunity(
+		const eStateChangeType state,
+		const bool bImmuneToBasicAttack = false,
+		const bool bImmuneToDamageOverTime = false,
+		const bool bImmuneToKnockback = false,
+		const bool bImmuneToInterrupt = false,
+		const bool bImmuneToSpeed = false,
+		const bool bImmuneToImaginationGain = false,
+		const bool bImmuneToImaginationLoss = false,
+		const bool bImmuneToQuickbuildInterrupt = false,
+		const bool bImmuneToPullToPoint = false
+	);
 
-	/**
-	 * Pops layers of immunity, making it immune for less longer
-	 * @param stacks the number of layers of immunity to remove
-	 */
-	void PopImmunity(int32_t stacks = 1);
+	// Getters for status immunities
+	const bool GetImmuneToBasicAttack() {return m_ImmuneToBasicAttackCount > 0;};
+	const bool GetImmuneToDamageOverTime() {return m_ImmuneToDamageOverTimeCount > 0;};
+	const bool GetImmuneToKnockback() {return m_ImmuneToKnockbackCount > 0;};
+	const bool GetImmuneToInterrupt() {return m_ImmuneToInterruptCount > 0;};
+	const bool GetImmuneToSpeed() {return m_ImmuneToSpeedCount > 0;};
+	const bool GetImmuneToImaginationGain() {return m_ImmuneToImaginationGainCount > 0;};
+	const bool GetImmuneToImaginationLoss() {return m_ImmuneToImaginationLossCount > 0;};
+	const bool GetImmuneToQuickbuildInterrupt() {return m_ImmuneToQuickbuildInterruptCount > 0;};
+	const bool GetImmuneToPullToPoint() {return m_ImmuneToPullToPointCount > 0;};
 
 	/**
 	 * Utility to reset all stats to the default stats based on items and completed missions
@@ -428,7 +443,7 @@ public:
 
 	/**
 	 * Notify subscribed scripts of Damage actions.
-	 * 
+	 *
 	 * @param attacker The attacking Entity
 	 * @param damage The amount of damage that was done
 	 */
@@ -493,11 +508,6 @@ private:
 	 */
 	uint32_t m_AttacksToBlock;
 
-	/**
-	 * The layers of immunity this entity has left
-	 */
-	int32_t m_ImmuneStacks;
-
 	/**
 	 * The amount of damage that should be reduced from every attack
 	 */
@@ -577,6 +587,19 @@ private:
 	 * The list of scripts subscribed to this components actions
 	 */
 	std::map<LWOOBJID, CppScripts::Script*> m_SubscribedScripts;
+
+	/**
+	 * status immunity counters
+	 */
+	uint32_t m_ImmuneToBasicAttackCount;
+	uint32_t m_ImmuneToDamageOverTimeCount;
+	uint32_t m_ImmuneToKnockbackCount;
+	uint32_t m_ImmuneToInterruptCount;
+	uint32_t m_ImmuneToSpeedCount;
+	uint32_t m_ImmuneToImaginationGainCount;
+	uint32_t m_ImmuneToImaginationLossCount;
+	uint32_t m_ImmuneToQuickbuildInterruptCount;
+	uint32_t m_ImmuneToPullToPointCount;
 };
 
 #endif // DESTROYABLECOMPONENT_H
diff --git a/dGame/dComponents/InventoryComponent.cpp b/dGame/dComponents/InventoryComponent.cpp
index 6247f32d..e5ff2f2a 100644
--- a/dGame/dComponents/InventoryComponent.cpp
+++ b/dGame/dComponents/InventoryComponent.cpp
@@ -959,7 +959,7 @@ void InventoryComponent::HandlePossession(Item* item) {
 		return;
 	}
 
-	GameMessages::SendSetStunned(m_Parent->GetObjectID(), eStunState::PUSH, m_Parent->GetSystemAddress(), LWOOBJID_EMPTY, true, false, true, false, false, false, false, true, true, true, true, true, true, true, true, true);
+	GameMessages::SendSetStunned(m_Parent->GetObjectID(), eStateChangeType::PUSH, m_Parent->GetSystemAddress(), LWOOBJID_EMPTY, true, false, true, false, false, false, false, true, true, true, true, true, true, true, true, true);
 
 	// Set the mount Item ID so that we know what were handling
 	possessorComponent->SetMountItemID(item->GetId());
diff --git a/dGame/dComponents/MovingPlatformComponent.cpp b/dGame/dComponents/MovingPlatformComponent.cpp
index 42699672..2666c60c 100644
--- a/dGame/dComponents/MovingPlatformComponent.cpp
+++ b/dGame/dComponents/MovingPlatformComponent.cpp
@@ -12,11 +12,12 @@
 #include "GameMessages.h"
 #include "CppScripts.h"
 #include "SimplePhysicsComponent.h"
+#include "Zone.h"
 
 MoverSubComponent::MoverSubComponent(const NiPoint3& startPos) {
 	mPosition = {};
 
-	mState = MovementPlatformState::Stopped;
+	mState = eMovementPlatformState::Stopped;
 	mDesiredWaypointIndex = 0; // -1;
 	mInReverse = false;
 	mShouldStopAtDesiredWaypoint = false;
@@ -127,7 +128,7 @@ void MovingPlatformComponent::OnCompleteRebuild() {
 	StartPathing();
 }
 
-void MovingPlatformComponent::SetMovementState(MovementPlatformState value) {
+void MovingPlatformComponent::SetMovementState(eMovementPlatformState value) {
 	auto* subComponent = static_cast<MoverSubComponent*>(m_MoverSubComponent);
 
 	subComponent->mState = value;
@@ -152,7 +153,7 @@ void MovingPlatformComponent::StartPathing() {
 	auto* subComponent = static_cast<MoverSubComponent*>(m_MoverSubComponent);
 
 	subComponent->mShouldStopAtDesiredWaypoint = true;
-	subComponent->mState = MovementPlatformState::Stationary;
+	subComponent->mState = eMovementPlatformState::Stationary;
 
 	NiPoint3 targetPosition;
 
@@ -174,7 +175,7 @@ void MovingPlatformComponent::StartPathing() {
 	}
 
 	m_Parent->AddCallbackTimer(subComponent->mWaitTime, [this] {
-		SetMovementState(MovementPlatformState::Moving);
+		SetMovementState(eMovementPlatformState::Moving);
 		});
 
 	const auto travelTime = Vector3::Distance(targetPosition, subComponent->mPosition) / subComponent->mSpeed + 1.5f;
@@ -199,7 +200,7 @@ void MovingPlatformComponent::StartPathing() {
 void MovingPlatformComponent::ContinuePathing() {
 	auto* subComponent = static_cast<MoverSubComponent*>(m_MoverSubComponent);
 
-	subComponent->mState = MovementPlatformState::Stationary;
+	subComponent->mState = eMovementPlatformState::Stationary;
 
 	subComponent->mCurrentWaypointIndex = subComponent->mNextWaypointIndex;
 
@@ -282,7 +283,7 @@ void MovingPlatformComponent::ContinuePathing() {
 	m_Parent->CancelCallbackTimers();
 
 	m_Parent->AddCallbackTimer(subComponent->mWaitTime, [this] {
-		SetMovementState(MovementPlatformState::Moving);
+		SetMovementState(eMovementPlatformState::Moving);
 		});
 
 	auto travelTime = Vector3::Distance(targetPosition, subComponent->mPosition) / subComponent->mSpeed + 1.5;
@@ -313,7 +314,7 @@ void MovingPlatformComponent::StopPathing() {
 
 	m_PathingStopped = true;
 
-	subComponent->mState = MovementPlatformState::Stopped;
+	subComponent->mState = eMovementPlatformState::Stopped;
 	subComponent->mDesiredWaypointIndex = -1;
 	subComponent->mShouldStopAtDesiredWaypoint = false;
 
diff --git a/dGame/dComponents/MovingPlatformComponent.h b/dGame/dComponents/MovingPlatformComponent.h
index efa3a4cf..38b15143 100644
--- a/dGame/dComponents/MovingPlatformComponent.h
+++ b/dGame/dComponents/MovingPlatformComponent.h
@@ -13,6 +13,9 @@
 #include "dCommonVars.h"
 #include "EntityManager.h"
 #include "Component.h"
+#include "eMovementPlatformState.h"
+
+class Path;
 
  /**
   * Different types of available platforms
@@ -26,16 +29,6 @@ enum class eMoverSubComponentType : uint32_t {
 	 simpleMover = 5,
 };
 
-/**
- * The different types of platform movement state, supposedly a bitmap
- */
-enum class MovementPlatformState : uint32_t
-{
-	Moving = 0b00010,
-	Stationary = 0b11001,
-	Stopped = 0b01100
-};
-
 /**
  * Sub component for moving platforms that determine the actual current movement state
  */
@@ -49,7 +42,7 @@ public:
 	/**
 	 * The state the platform is currently in
 	 */
-	MovementPlatformState mState = MovementPlatformState::Stationary;
+	eMovementPlatformState mState = eMovementPlatformState::Stationary;
 
 	/**
 	 * The waypoint this platform currently wants to traverse to
@@ -133,7 +126,7 @@ public:
 	 * Updates the movement state for the moving platform
 	 * @param value the movement state to set
 	 */
-	void SetMovementState(MovementPlatformState value);
+	void SetMovementState(eMovementPlatformState value);
 
 	/**
 	 * Instructs the moving platform to go to some waypoint
diff --git a/dGame/dComponents/PetComponent.cpp b/dGame/dComponents/PetComponent.cpp
index d11331e7..771a9cc1 100644
--- a/dGame/dComponents/PetComponent.cpp
+++ b/dGame/dComponents/PetComponent.cpp
@@ -20,6 +20,7 @@
 #include "dConfig.h"
 #include "dChatFilter.h"
 #include "Database.h"
+#include "EntityInfo.h"
 
 std::unordered_map<LOT, PetComponent::PetPuzzleData> PetComponent::buildCache{};
 std::unordered_map<LWOOBJID, LWOOBJID> PetComponent::currentActivities{};
diff --git a/dGame/dComponents/PhantomPhysicsComponent.cpp b/dGame/dComponents/PhantomPhysicsComponent.cpp
index cef9cc36..aa3ced46 100644
--- a/dGame/dComponents/PhantomPhysicsComponent.cpp
+++ b/dGame/dComponents/PhantomPhysicsComponent.cpp
@@ -19,6 +19,7 @@
 #include "CDComponentsRegistryTable.h"
 #include "CDPhysicsComponentTable.h"
 #include "dServer.h"
+#include "EntityInfo.h"
 
 #include "dpWorld.h"
 #include "dpEntity.h"
diff --git a/dGame/dComponents/PossessorComponent.cpp b/dGame/dComponents/PossessorComponent.cpp
index f0cad5ca..69046c3b 100644
--- a/dGame/dComponents/PossessorComponent.cpp
+++ b/dGame/dComponents/PossessorComponent.cpp
@@ -54,7 +54,7 @@ void PossessorComponent::Mount(Entity* mount) {
 	// GM's to send
 	GameMessages::SendSetJetPackMode(m_Parent, false);
 	GameMessages::SendVehicleUnlockInput(mount->GetObjectID(), false, m_Parent->GetSystemAddress());
-	GameMessages::SendSetStunned(m_Parent->GetObjectID(), eStunState::PUSH, m_Parent->GetSystemAddress(), LWOOBJID_EMPTY, true, false, true, false, false, false, false, true, true, true, true, true, true, true, true, true);
+	GameMessages::SendSetStunned(m_Parent->GetObjectID(), eStateChangeType::PUSH, m_Parent->GetSystemAddress(), LWOOBJID_EMPTY, true, false, true, false, false, false, false, true, true, true, true, true, true, true, true, true);
 
 	EntityManager::Instance()->SerializeEntity(m_Parent);
 	EntityManager::Instance()->SerializeEntity(mount);
diff --git a/dGame/dComponents/PropertyEntranceComponent.cpp b/dGame/dComponents/PropertyEntranceComponent.cpp
index e6540417..9498a903 100644
--- a/dGame/dComponents/PropertyEntranceComponent.cpp
+++ b/dGame/dComponents/PropertyEntranceComponent.cpp
@@ -11,6 +11,7 @@
 #include "CharacterComponent.h"
 #include "UserManager.h"
 #include "dLogger.h"
+#include "AMFFormat.h"
 
 PropertyEntranceComponent::PropertyEntranceComponent(uint32_t componentID, Entity* parent) : Component(parent) {
 	this->propertyQueries = {};
diff --git a/dGame/dComponents/RacingControlComponent.cpp b/dGame/dComponents/RacingControlComponent.cpp
index 4b5743cd..f64dbc15 100644
--- a/dGame/dComponents/RacingControlComponent.cpp
+++ b/dGame/dComponents/RacingControlComponent.cpp
@@ -21,6 +21,7 @@
 #include "dServer.h"
 #include "dZoneManager.h"
 #include "dConfig.h"
+#include "Loot.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327950288
diff --git a/dGame/dComponents/RailActivatorComponent.cpp b/dGame/dComponents/RailActivatorComponent.cpp
index 1b94fc4a..25fad26e 100644
--- a/dGame/dComponents/RailActivatorComponent.cpp
+++ b/dGame/dComponents/RailActivatorComponent.cpp
@@ -95,7 +95,7 @@ void RailActivatorComponent::OnUse(Entity* originator) {
 
 void RailActivatorComponent::OnRailMovementReady(Entity* originator) const {
 	// Stun the originator
-	GameMessages::SendSetStunned(originator->GetObjectID(), PUSH, originator->GetSystemAddress(), LWOOBJID_EMPTY,
+	GameMessages::SendSetStunned(originator->GetObjectID(), eStateChangeType::PUSH, originator->GetSystemAddress(), LWOOBJID_EMPTY,
 		true, true, true, true, true, true, true
 	);
 
@@ -123,7 +123,7 @@ void RailActivatorComponent::OnRailMovementReady(Entity* originator) const {
 
 void RailActivatorComponent::OnCancelRailMovement(Entity* originator) {
 	// Remove the stun from the originator
-	GameMessages::SendSetStunned(originator->GetObjectID(), POP, originator->GetSystemAddress(), LWOOBJID_EMPTY,
+	GameMessages::SendSetStunned(originator->GetObjectID(), eStateChangeType::POP, originator->GetSystemAddress(), LWOOBJID_EMPTY,
 		true, true, true, true, true, true, true
 	);
 
diff --git a/dGame/dComponents/RebuildComponent.cpp b/dGame/dComponents/RebuildComponent.cpp
index c7c4e3a5..83ae818e 100644
--- a/dGame/dComponents/RebuildComponent.cpp
+++ b/dGame/dComponents/RebuildComponent.cpp
@@ -14,6 +14,7 @@
 #include "Spawner.h"
 #include "MovingPlatformComponent.h"
 #include "Preconditions.h"
+#include "Loot.h"
 #include "TeamManager.h"
 
 #include "CppScripts.h"
diff --git a/dGame/dComponents/ScriptedActivityComponent.cpp b/dGame/dComponents/ScriptedActivityComponent.cpp
index ee7ca22e..a03dddbe 100644
--- a/dGame/dComponents/ScriptedActivityComponent.cpp
+++ b/dGame/dComponents/ScriptedActivityComponent.cpp
@@ -18,6 +18,8 @@
 #include "dConfig.h"
 #include "InventoryComponent.h"
 #include "DestroyableComponent.h"
+#include "dMessageIdentifiers.h"
+#include "Loot.h"
 
 ScriptedActivityComponent::ScriptedActivityComponent(Entity* parent, int activityID) : Component(parent) {
 	m_ActivityID = activityID;
diff --git a/dGame/dComponents/SkillComponent.cpp b/dGame/dComponents/SkillComponent.cpp
index 0608c63b..562c284a 100644
--- a/dGame/dComponents/SkillComponent.cpp
+++ b/dGame/dComponents/SkillComponent.cpp
@@ -19,7 +19,9 @@
 #include "BaseCombatAIComponent.h"
 #include "ScriptComponent.h"
 #include "BuffComponent.h"
-
+#include "EchoStartSkill.h"
+#include "dMessageIdentifiers.h"
+#include "DoClientProjectileImpact.h"
 
 ProjectileSyncEntry::ProjectileSyncEntry() {
 }
@@ -240,7 +242,7 @@ SkillExecutionResult SkillComponent::CalculateBehavior(const uint32_t skillId, c
 
 	if (!clientInitalized) {
 		// Echo start skill
-		GameMessages::EchoStartSkill start;
+		EchoStartSkill start;
 
 		start.iCastType = 0;
 		start.skillID = skillId;
@@ -384,7 +386,7 @@ void SkillComponent::SyncProjectileCalculation(const ProjectileSyncEntry& entry)
 
 	behavior->Calculate(entry.context, bitStream, entry.branchContext);
 
-	GameMessages::DoClientProjectileImpact projectileImpact;
+	DoClientProjectileImpact projectileImpact;
 
 	projectileImpact.sBitStream.assign((char*)bitStream->GetData(), bitStream->GetNumberOfBytesUsed());
 	projectileImpact.i64OwnerID = this->m_Parent->GetObjectID();
diff --git a/dGame/dGameMessages/DoClientProjectileImpact.h b/dGame/dGameMessages/DoClientProjectileImpact.h
new file mode 100644
index 00000000..436e3dd2
--- /dev/null
+++ b/dGame/dGameMessages/DoClientProjectileImpact.h
@@ -0,0 +1,83 @@
+#ifndef __DOCLIENTPROJECTILEIMPACT__H__
+#define __DOCLIENTPROJECTILEIMPACT__H__
+
+#include "dMessageIdentifiers.h"
+#include "dCommonVars.h"
+
+/*  Tell a client local projectile to impact */
+class DoClientProjectileImpact {
+	static const GAME_MSG MsgID = GAME_MSG_DO_CLIENT_PROJECTILE_IMPACT;
+
+public:
+	DoClientProjectileImpact() {
+		i64OrgID = LWOOBJID_EMPTY;
+		i64OwnerID = LWOOBJID_EMPTY;
+		i64TargetID = LWOOBJID_EMPTY;
+	}
+
+	DoClientProjectileImpact(std::string _sBitStream, LWOOBJID _i64OrgID = LWOOBJID_EMPTY, LWOOBJID _i64OwnerID = LWOOBJID_EMPTY, LWOOBJID _i64TargetID = LWOOBJID_EMPTY) {
+		i64OrgID = _i64OrgID;
+		i64OwnerID = _i64OwnerID;
+		i64TargetID = _i64TargetID;
+		sBitStream = _sBitStream;
+	}
+
+	DoClientProjectileImpact(RakNet::BitStream* stream) : DoClientProjectileImpact() {
+		Deserialize(stream);
+	}
+
+	~DoClientProjectileImpact() {
+	}
+
+	void Serialize(RakNet::BitStream* stream) {
+		stream->Write(MsgID);
+
+		stream->Write(i64OrgID != LWOOBJID_EMPTY);
+		if (i64OrgID != LWOOBJID_EMPTY) stream->Write(i64OrgID);
+
+		stream->Write(i64OwnerID != LWOOBJID_EMPTY);
+		if (i64OwnerID != LWOOBJID_EMPTY) stream->Write(i64OwnerID);
+
+		stream->Write(i64TargetID != LWOOBJID_EMPTY);
+		if (i64TargetID != LWOOBJID_EMPTY) stream->Write(i64TargetID);
+
+		uint32_t sBitStreamLength = sBitStream.length();
+		stream->Write(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			stream->Write(sBitStream[k]);
+		}
+
+	}
+
+	bool Deserialize(RakNet::BitStream* stream) {
+		bool i64OrgIDIsDefault{};
+		stream->Read(i64OrgIDIsDefault);
+		if (i64OrgIDIsDefault != 0) stream->Read(i64OrgID);
+
+		bool i64OwnerIDIsDefault{};
+		stream->Read(i64OwnerIDIsDefault);
+		if (i64OwnerIDIsDefault != 0) stream->Read(i64OwnerID);
+
+		bool i64TargetIDIsDefault{};
+		stream->Read(i64TargetIDIsDefault);
+		if (i64TargetIDIsDefault != 0) stream->Read(i64TargetID);
+
+		uint32_t sBitStreamLength{};
+		stream->Read(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			unsigned char character;
+			stream->Read(character);
+			sBitStream.push_back(character);
+		}
+
+
+		return true;
+	}
+
+	LWOOBJID i64OrgID;
+	LWOOBJID i64OwnerID;
+	LWOOBJID i64TargetID;
+	std::string sBitStream;
+};
+
+#endif  //!__DOCLIENTPROJECTILEIMPACT__H__
diff --git a/dGame/dGameMessages/EchoStartSkill.h b/dGame/dGameMessages/EchoStartSkill.h
new file mode 100644
index 00000000..6d912798
--- /dev/null
+++ b/dGame/dGameMessages/EchoStartSkill.h
@@ -0,0 +1,132 @@
+#ifndef __ECHOSTARTSKILL__H__
+#define __ECHOSTARTSKILL__H__
+
+#include "dCommonVars.h"
+#include "dMessageIdentifiers.h"
+#include "NiPoint3.h"
+#include "NiQuaternion.h"
+
+/*  Same as start skill but with different network options. An echo down to other clients that need to play the skill. */
+class EchoStartSkill {
+	static const GAME_MSG MsgID = GAME_MSG_ECHO_START_SKILL;
+
+public:
+	EchoStartSkill() {
+		bUsedMouse = false;
+		fCasterLatency = 0.0f;
+		iCastType = 0;
+		lastClickedPosit = NiPoint3::ZERO;
+		optionalTargetID = LWOOBJID_EMPTY;
+		originatorRot = NiQuaternion::IDENTITY;
+		uiSkillHandle = 0;
+	}
+
+	EchoStartSkill(LWOOBJID _optionalOriginatorID, std::string _sBitStream, TSkillID _skillID, bool _bUsedMouse = false, float _fCasterLatency = 0.0f, int32_t _iCastType = 0, NiPoint3 _lastClickedPosit = NiPoint3::ZERO, LWOOBJID _optionalTargetID = LWOOBJID_EMPTY, NiQuaternion _originatorRot = NiQuaternion::IDENTITY, uint32_t _uiSkillHandle = 0) {
+		bUsedMouse = _bUsedMouse;
+		fCasterLatency = _fCasterLatency;
+		iCastType = _iCastType;
+		lastClickedPosit = _lastClickedPosit;
+		optionalOriginatorID = _optionalOriginatorID;
+		optionalTargetID = _optionalTargetID;
+		originatorRot = _originatorRot;
+		sBitStream = _sBitStream;
+		skillID = _skillID;
+		uiSkillHandle = _uiSkillHandle;
+	}
+
+	EchoStartSkill(RakNet::BitStream* stream) : EchoStartSkill() {
+		Deserialize(stream);
+	}
+
+	~EchoStartSkill() {
+	}
+
+	void Serialize(RakNet::BitStream* stream) {
+		stream->Write(MsgID);
+
+		stream->Write(bUsedMouse);
+
+		stream->Write(fCasterLatency != 0.0f);
+		if (fCasterLatency != 0.0f) stream->Write(fCasterLatency);
+
+		stream->Write(iCastType != 0);
+		if (iCastType != 0) stream->Write(iCastType);
+
+		stream->Write(lastClickedPosit != NiPoint3::ZERO);
+		if (lastClickedPosit != NiPoint3::ZERO) stream->Write(lastClickedPosit);
+
+		stream->Write(optionalOriginatorID);
+
+		stream->Write(optionalTargetID != LWOOBJID_EMPTY);
+		if (optionalTargetID != LWOOBJID_EMPTY) stream->Write(optionalTargetID);
+
+		stream->Write(originatorRot != NiQuaternion::IDENTITY);
+		if (originatorRot != NiQuaternion::IDENTITY) stream->Write(originatorRot);
+
+		uint32_t sBitStreamLength = sBitStream.length();
+		stream->Write(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			stream->Write(sBitStream[k]);
+		}
+
+		stream->Write(skillID);
+
+		stream->Write(uiSkillHandle != 0);
+		if (uiSkillHandle != 0) stream->Write(uiSkillHandle);
+	}
+
+	bool Deserialize(RakNet::BitStream* stream) {
+		stream->Read(bUsedMouse);
+
+		bool fCasterLatencyIsDefault{};
+		stream->Read(fCasterLatencyIsDefault);
+		if (fCasterLatencyIsDefault != 0) stream->Read(fCasterLatency);
+
+		bool iCastTypeIsDefault{};
+		stream->Read(iCastTypeIsDefault);
+		if (iCastTypeIsDefault != 0) stream->Read(iCastType);
+
+		bool lastClickedPositIsDefault{};
+		stream->Read(lastClickedPositIsDefault);
+		if (lastClickedPositIsDefault != 0) stream->Read(lastClickedPosit);
+
+		stream->Read(optionalOriginatorID);
+
+		bool optionalTargetIDIsDefault{};
+		stream->Read(optionalTargetIDIsDefault);
+		if (optionalTargetIDIsDefault != 0) stream->Read(optionalTargetID);
+
+		bool originatorRotIsDefault{};
+		stream->Read(originatorRotIsDefault);
+		if (originatorRotIsDefault != 0) stream->Read(originatorRot);
+
+		uint32_t sBitStreamLength{};
+		stream->Read(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			unsigned char character;
+			stream->Read(character);
+			sBitStream.push_back(character);
+		}
+
+		stream->Read(skillID);
+
+		bool uiSkillHandleIsDefault{};
+		stream->Read(uiSkillHandleIsDefault);
+		if (uiSkillHandleIsDefault != 0) stream->Read(uiSkillHandle);
+
+		return true;
+	}
+
+	bool bUsedMouse;
+	float fCasterLatency;
+	int32_t iCastType;
+	NiPoint3 lastClickedPosit;
+	LWOOBJID optionalOriginatorID;
+	LWOOBJID optionalTargetID;
+	NiQuaternion originatorRot;
+	std::string sBitStream;
+	TSkillID skillID;
+	uint32_t uiSkillHandle;
+};
+
+#endif  //!__ECHOSTARTSKILL__H__
diff --git a/dGame/dGameMessages/EchoSyncSkill.h b/dGame/dGameMessages/EchoSyncSkill.h
new file mode 100644
index 00000000..b56beae8
--- /dev/null
+++ b/dGame/dGameMessages/EchoSyncSkill.h
@@ -0,0 +1,70 @@
+#ifndef __ECHOSYNCSKILL__H__
+#define __ECHOSYNCSKILL__H__
+
+#include <string>
+
+#include "BitStream.h"
+
+#include "dMessageIdentifiers.h"
+
+/*  Message to synchronize a skill cast */
+class EchoSyncSkill {
+	static const GAME_MSG MsgID = GAME_MSG_ECHO_SYNC_SKILL;
+
+public:
+	EchoSyncSkill() {
+		bDone = false;
+	}
+
+	EchoSyncSkill(std::string _sBitStream, uint32_t _uiBehaviorHandle, uint32_t _uiSkillHandle, bool _bDone = false) {
+		bDone = _bDone;
+		sBitStream = _sBitStream;
+		uiBehaviorHandle = _uiBehaviorHandle;
+		uiSkillHandle = _uiSkillHandle;
+	}
+
+	EchoSyncSkill(RakNet::BitStream* stream) : EchoSyncSkill() {
+		Deserialize(stream);
+	}
+
+	~EchoSyncSkill() {
+	}
+
+	void Serialize(RakNet::BitStream* stream) {
+		stream->Write(MsgID);
+
+		stream->Write(bDone);
+		uint32_t sBitStreamLength = sBitStream.length();
+		stream->Write(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			stream->Write(sBitStream[k]);
+		}
+
+		stream->Write(uiBehaviorHandle);
+		stream->Write(uiSkillHandle);
+	}
+
+	bool Deserialize(RakNet::BitStream* stream) {
+		stream->Read(bDone);
+
+		uint32_t sBitStreamLength{};
+		stream->Read(sBitStreamLength);
+		for (unsigned int k = 0; k < sBitStreamLength; k++) {
+			unsigned char character;
+			stream->Read(character);
+			sBitStream.push_back(character);
+		}
+
+		stream->Read(uiBehaviorHandle);
+		stream->Read(uiSkillHandle);
+
+		return true;
+	}
+
+	bool bDone{};
+	std::string sBitStream{};
+	uint32_t uiBehaviorHandle{};
+	uint32_t uiSkillHandle{};
+};
+
+#endif  //!__ECHOSYNCSKILL__H__
diff --git a/dGame/dGameMessages/GameMessageHandler.cpp b/dGame/dGameMessages/GameMessageHandler.cpp
index b7687c19..a91a1e2a 100644
--- a/dGame/dGameMessages/GameMessageHandler.cpp
+++ b/dGame/dGameMessages/GameMessageHandler.cpp
@@ -26,6 +26,11 @@
 #include "CDSkillBehaviorTable.h"
 #include "SkillComponent.h"
 #include "RacingControlComponent.h"
+#include "RequestServerProjectileImpact.h"
+#include "SyncSkill.h"
+#include "StartSkill.h"
+#include "EchoStartSkill.h"
+#include "EchoSyncSkill.h"
 
 using namespace std;
 
@@ -251,7 +256,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 
 	case GAME_MSG_REQUEST_SERVER_PROJECTILE_IMPACT:
 	{
-		auto message = GameMessages::RequestServerProjectileImpact();
+		auto message = RequestServerProjectileImpact();
 
 		message.Deserialize(inStream);
 
@@ -269,7 +274,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 	}
 
 	case GAME_MSG_START_SKILL: {
-		GameMessages::StartSkill startSkill = GameMessages::StartSkill();
+		StartSkill startSkill = StartSkill();
 		startSkill.Deserialize(inStream); // inStream replaces &bitStream
 
 		if (startSkill.skillID == 1561 || startSkill.skillID == 1562 || startSkill.skillID == 1541) return;
@@ -309,7 +314,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 			PacketUtils::WriteHeader(bitStreamLocal, CLIENT, MSG_CLIENT_GAME_MSG);
 			bitStreamLocal.Write(entity->GetObjectID());
 
-			GameMessages::EchoStartSkill echoStartSkill;
+			EchoStartSkill echoStartSkill;
 			echoStartSkill.bUsedMouse = startSkill.bUsedMouse;
 			echoStartSkill.fCasterLatency = startSkill.fCasterLatency;
 			echoStartSkill.iCastType = startSkill.iCastType;
@@ -333,7 +338,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		//bitStreamLocal.Write((unsigned short)GAME_MSG_ECHO_SYNC_SKILL);
 		//bitStreamLocal.Write(inStream);
 
-		GameMessages::SyncSkill sync = GameMessages::SyncSkill(inStream); // inStream replaced &bitStream
+		SyncSkill sync = SyncSkill(inStream); // inStream replaced &bitStream
 		//sync.Serialize(&bitStreamLocal);
 
 		ostringstream buffer;
@@ -356,7 +361,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 			delete bs;
 		}
 
-		GameMessages::EchoSyncSkill echo = GameMessages::EchoSyncSkill();
+		EchoSyncSkill echo = EchoSyncSkill();
 		echo.bDone = sync.bDone;
 		echo.sBitStream = sync.sBitStream;
 		echo.uiBehaviorHandle = sync.uiBehaviorHandle;
@@ -660,9 +665,14 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 	case GAME_MSG_DISMOUNT_COMPLETE:
 		GameMessages::HandleDismountComplete(inStream, entity, sysAddr);
 		break;
-
+	case GAME_MSG_DEACTIVATE_BUBBLE_BUFF:
+		GameMessages::HandleDeactivateBubbleBuff(inStream, entity);
+		break;
+	case GAME_MSG_ACTIVATE_BUBBLE_BUFF:
+		GameMessages::HandleActivateBubbleBuff(inStream, entity);
+		break;
 	default:
-		//Game::logger->Log("GameMessageHandler", "Unknown game message ID: %X", messageID);
+		// Game::logger->Log("GameMessageHandler", "Unknown game message ID: %i", messageID);
 		break;
 	}
 }
diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp
index 2423915e..7e9ea898 100644
--- a/dGame/dGameMessages/GameMessages.cpp
+++ b/dGame/dGameMessages/GameMessages.cpp
@@ -25,9 +25,12 @@
 #include "dConfig.h"
 #include "TeamManager.h"
 #include "ChatPackets.h"
-#include "GameConfig.h"
 #include "RocketLaunchLupComponent.h"
 #include "eUnequippableActiveType.h"
+#include "eMovementPlatformState.h"
+#include "LeaderboardManager.h"
+#include "AMFFormat.h"
+#include "Loot.h"
 #include "RacingTaskParam.h"
 
 #include <sstream>
@@ -73,6 +76,7 @@
 #include "ControlBehaviors.h"
 #include "AMFDeserialize.h"
 #include "eBlueprintSaveResponseType.h"
+#include "eAninmationFlags.h"
 
 void GameMessages::SendFireEventClientSide(const LWOOBJID& objectID, const SystemAddress& sysAddr, std::u16string args, const LWOOBJID& object, int64_t param1, int param2, const LWOOBJID& sender) {
 	CBITSTREAM;
@@ -330,7 +334,7 @@ void GameMessages::SendStartPathing(Entity* entity) {
 
 void GameMessages::SendPlatformResync(Entity* entity, const SystemAddress& sysAddr, bool bStopAtDesiredWaypoint,
 	int iIndex, int iDesiredWaypointIndex, int nextIndex,
-	MovementPlatformState movementState) {
+	eMovementPlatformState movementState) {
 	CBITSTREAM;
 	CMSGHEADER;
 
@@ -341,7 +345,7 @@ void GameMessages::SendPlatformResync(Entity* entity, const SystemAddress& sysAd
 		iIndex = 0;
 		nextIndex = 0;
 		bStopAtDesiredWaypoint = true;
-		movementState = MovementPlatformState::Stationary;
+		movementState = eMovementPlatformState::Stationary;
 	}
 
 	bitStream.Write(entity->GetObjectID());
@@ -575,7 +579,7 @@ void GameMessages::SendModifyLEGOScore(Entity* entity, const SystemAddress& sysA
 	SEND_PACKET;
 }
 
-void GameMessages::SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, NDGFxValue args) {
+void GameMessages::SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, AMFValue* args) {
 	CBITSTREAM;
 	CMSGHEADER;
 
@@ -593,7 +597,7 @@ void GameMessages::SendUIMessageServerToSingleClient(Entity* entity, const Syste
 	SEND_PACKET;
 }
 
-void GameMessages::SendUIMessageServerToAllClients(const std::string& message, NDGFxValue args) {
+void GameMessages::SendUIMessageServerToAllClients(const std::string& message, AMFValue* args) {
 	CBITSTREAM;
 	CMSGHEADER;
 
@@ -1000,7 +1004,7 @@ void GameMessages::SendSetNetworkScriptVar(Entity* entity, const SystemAddress&
 }
 
 void GameMessages::SendDropClientLoot(Entity* entity, const LWOOBJID& sourceID, LOT item, int currency, NiPoint3 spawnPos, int count) {
-	if (GameConfig::GetValue<int32_t>("no_drops") == 1) {
+	if (Game::config->GetValue("disable_drops") == "1") {
 		return;
 	}
 
@@ -2900,7 +2904,7 @@ void GameMessages::HandleCinematicUpdate(RakNet::BitStream* inStream, Entity* en
 	}
 }
 
-void GameMessages::SendSetStunned(LWOOBJID objectId, eStunState stateChangeType, const SystemAddress& sysAddr,
+void GameMessages::SendSetStunned(LWOOBJID objectId, eStateChangeType stateChangeType, const SystemAddress& sysAddr,
 	LWOOBJID originator, bool bCantAttack, bool bCantEquip,
 	bool bCantInteract, bool bCantJump, bool bCantMove, bool bCantTurn,
 	bool bCantUseItem, bool bDontTerminateInteract, bool bIgnoreImmunity,
@@ -2948,6 +2952,69 @@ void GameMessages::SendSetStunned(LWOOBJID objectId, eStunState stateChangeType,
 	SEND_PACKET;
 }
 
+void GameMessages::SendSetStunImmunity(LWOOBJID target, eStateChangeType state, const SystemAddress& sysAddr,
+		LWOOBJID originator,
+		bool bImmuneToStunAttack,
+		bool bImmuneToStunEquip,
+		bool bImmuneToStunInteract,
+		bool bImmuneToStunJump,
+		bool bImmuneToStunMove,
+		bool bImmuneToStunTurn,
+		bool bImmuneToStunUseItem) {
+	CBITSTREAM;
+	CMSGHEADER;
+
+	bitStream.Write(target);
+	bitStream.Write(GAME_MSG::GAME_MSG_SET_STUN_IMMUNITY);
+
+	bitStream.Write(originator != LWOOBJID_EMPTY);
+	if (originator != LWOOBJID_EMPTY) bitStream.Write(originator);
+
+	bitStream.Write(state);
+
+	bitStream.Write(bImmuneToStunAttack);
+	bitStream.Write(bImmuneToStunEquip);
+	bitStream.Write(bImmuneToStunInteract);
+	bitStream.Write(bImmuneToStunJump);
+	bitStream.Write(bImmuneToStunMove);
+	bitStream.Write(bImmuneToStunTurn);
+	bitStream.Write(bImmuneToStunUseItem);
+
+	if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST;
+	SEND_PACKET;
+}
+
+void GameMessages::SendSetStatusImmunity(LWOOBJID objectId, eStateChangeType state, const SystemAddress& sysAddr,
+		bool bImmuneToBasicAttack,
+		bool bImmuneToDamageOverTime,
+		bool bImmuneToKnockback,
+		bool bImmuneToInterrupt,
+		bool bImmuneToSpeed,
+		bool bImmuneToImaginationGain,
+		bool bImmuneToImaginationLoss,
+		bool bImmuneToQuickbuildInterrupt,
+		bool bImmuneToPullToPoint) {
+	CBITSTREAM;
+	CMSGHEADER;
+
+	bitStream.Write(objectId);
+	bitStream.Write(GAME_MSG::GAME_MSG_SET_STATUS_IMMUNITY);
+
+	bitStream.Write(state);
+
+	bitStream.Write(bImmuneToBasicAttack);
+	bitStream.Write(bImmuneToDamageOverTime);
+	bitStream.Write(bImmuneToKnockback);
+	bitStream.Write(bImmuneToInterrupt);
+	bitStream.Write(bImmuneToSpeed);
+	bitStream.Write(bImmuneToImaginationGain);
+	bitStream.Write(bImmuneToImaginationLoss);
+	bitStream.Write(bImmuneToQuickbuildInterrupt);
+	bitStream.Write(bImmuneToPullToPoint);
+
+	if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST;
+	SEND_PACKET;
+}
 
 void GameMessages::SendOrientToAngle(LWOOBJID objectId, bool bRelativeToCurrent, float fAngle, const SystemAddress& sysAddr) {
 	CBITSTREAM;
@@ -3987,7 +4054,7 @@ void GameMessages::HandleDismountComplete(RakNet::BitStream* inStream, Entity* e
 			EntityManager::Instance()->SerializeEntity(entity);
 
 			// We aren't mounted so remove the stun
-			GameMessages::SendSetStunned(entity->GetObjectID(), eStunState::POP, UNASSIGNED_SYSTEM_ADDRESS, LWOOBJID_EMPTY, true, false, true, false, false, false, false, true, true, true, true, true, true, true, true, true);
+			GameMessages::SendSetStunned(entity->GetObjectID(), eStateChangeType::POP, UNASSIGNED_SYSTEM_ADDRESS, LWOOBJID_EMPTY, true, false, true, false, false, false, false, true, true, true, true, true, true, true, true, true);
 		}
 	}
 }
@@ -6017,3 +6084,43 @@ void GameMessages::HandleUpdatePlayerStatistic(RakNet::BitStream* inStream, Enti
 		characterComponent->UpdatePlayerStatistic((StatisticID)updateID, (uint64_t)std::max(updateValue, int64_t(0)));
 	}
 }
+
+void GameMessages::HandleDeactivateBubbleBuff(RakNet::BitStream* inStream, Entity* entity) {
+	auto controllablePhysicsComponent = entity->GetComponent<ControllablePhysicsComponent>();
+	if (controllablePhysicsComponent) controllablePhysicsComponent->DeactivateBubbleBuff();
+}
+
+void GameMessages::HandleActivateBubbleBuff(RakNet::BitStream* inStream, Entity* entity) {
+	bool specialAnimations;
+	if (!inStream->Read(specialAnimations)) return;
+
+	std::u16string type = GeneralUtils::ReadWString(inStream);
+	auto bubbleType = eBubbleType::DEFAULT;
+	if (type == u"skunk") bubbleType = eBubbleType::SKUNK;
+	else if (type == u"energy") bubbleType = eBubbleType::ENERGY;
+
+	auto controllablePhysicsComponent = entity->GetComponent<ControllablePhysicsComponent>();
+	if (controllablePhysicsComponent) controllablePhysicsComponent->ActivateBubbleBuff(bubbleType, specialAnimations);
+}
+
+void GameMessages::SendActivateBubbleBuffFromServer(LWOOBJID objectId, const SystemAddress& sysAddr) {
+	CBITSTREAM;
+	CMSGHEADER;
+
+	bitStream.Write(objectId);
+	bitStream.Write(GAME_MSG::GAME_MSG_ACTIVATE_BUBBLE_BUFF_FROM_SERVER);
+
+	if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST;
+	SEND_PACKET;
+}
+
+void GameMessages::SendDeactivateBubbleBuffFromServer(LWOOBJID objectId, const SystemAddress& sysAddr) {
+	CBITSTREAM;
+	CMSGHEADER;
+
+	bitStream.Write(objectId);
+	bitStream.Write(GAME_MSG::GAME_MSG_DEACTIVATE_BUBBLE_BUFF_FROM_SERVER);
+
+	if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST;
+	SEND_PACKET;
+}
diff --git a/dGame/dGameMessages/GameMessages.h b/dGame/dGameMessages/GameMessages.h
index 8a1c2fe5..0675ae76 100644
--- a/dGame/dGameMessages/GameMessages.h
+++ b/dGame/dGameMessages/GameMessages.h
@@ -1,27 +1,26 @@
-
 #ifndef GAMEMESSAGES_H
 #define GAMEMESSAGES_H
 
 #include "dCommonVars.h"
-#include "RakNetTypes.h"
+#include <map>
 #include <string>
-#include "dMessageIdentifiers.h"
-#include "AMFFormat.h"
-#include "AMFFormat_BitStream.h"
-#include "NiQuaternion.h"
-#include "PropertySelectQueryProperty.h"
-#include "TradingManager.h"
-#include "LeaderboardManager.h"
-#include "MovingPlatformComponent.h"
-#include "eAninmationFlags.h"
+#include <vector>
+#include "eMovementPlatformState.h"
+#include "NiPoint3.h"
 
+class AMFValue;
+class Entity;
+class Item;
 class NiQuaternion;
 class User;
-class Entity;
-class NiPoint3;
+class Leaderboard;
+class PropertySelectQueryProperty;
+class TradeItem;
+
+enum class eAnimationFlags : uint32_t;
+
 enum class eUnequippableActiveType;
 enum eInventoryType : uint32_t;
-class Item;
 
 namespace GameMessages {
 	class PropertyDataMessage;
@@ -57,7 +56,7 @@ namespace GameMessages {
 	void SendStartPathing(Entity* entity);
 	void SendPlatformResync(Entity* entity, const SystemAddress& sysAddr, bool bStopAtDesiredWaypoint = false,
 		int iIndex = 0, int iDesiredWaypointIndex = 1, int nextIndex = 1,
-		MovementPlatformState movementState = MovementPlatformState::Moving);
+		eMovementPlatformState movementState = eMovementPlatformState::Moving);
 
 	void SendRestoreToPostLoadStats(Entity* entity, const SystemAddress& sysAddr);
 	void SendServerDoneLoadingAllObjects(Entity* entity, const SystemAddress& sysAddr);
@@ -74,8 +73,8 @@ namespace GameMessages {
 	void NotifyLevelRewards(LWOOBJID objectID, const SystemAddress& sysAddr, int level, bool sending_rewards);
 
 	void SendModifyLEGOScore(Entity* entity, const SystemAddress& sysAddr, int64_t score, eLootSourceType sourceType);
-	void SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, NDGFxValue args);
-	void SendUIMessageServerToAllClients(const std::string& message, NDGFxValue args);
+	void SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, AMFValue* args);
+	void SendUIMessageServerToAllClients(const std::string& message, AMFValue* args);
 
 	void SendPlayEmbeddedEffectOnAllClientsNearObject(Entity* entity, std::u16string effectName, const LWOOBJID& fromObjectID, float radius);
 	void SendPlayFXEffect(Entity* entity, int32_t effectID, const std::u16string& effectType, const std::string& name, LWOOBJID secondary, float priority = 1, float scale = 1, bool serialize = true);
@@ -269,7 +268,7 @@ namespace GameMessages {
 		float leadOut = -1.0f, bool leavePlayerLocked = false);
 	void HandleCinematicUpdate(RakNet::BitStream* inStream, Entity* entity, const SystemAddress& sysAddr);
 
-	void SendSetStunned(LWOOBJID objectId, eStunState stateChangeType, const SystemAddress& sysAddr,
+	void SendSetStunned(LWOOBJID objectId, eStateChangeType stateChangeType, const SystemAddress& sysAddr,
 		LWOOBJID originator = LWOOBJID_EMPTY, bool bCantAttack = false, bool bCantEquip = false,
 		bool bCantInteract = false, bool bCantJump = false, bool bCantMove = false, bool bCantTurn = false,
 		bool bCantUseItem = false, bool bDontTerminateInteract = false, bool bIgnoreImmunity = true,
@@ -278,6 +277,35 @@ namespace GameMessages {
 		bool bCantMoveOutChangeWasApplied = false, bool bCantTurnOutChangeWasApplied = false,
 		bool bCantUseItemOutChangeWasApplied = false);
 
+	void SendSetStunImmunity(
+		LWOOBJID target,
+		eStateChangeType state,
+		const SystemAddress& sysAddr,
+		LWOOBJID originator = LWOOBJID_EMPTY,
+		bool bImmuneToStunAttack = false,
+		bool bImmuneToStunEquip = false,
+		bool bImmuneToStunInteract = false,
+		bool bImmuneToStunJump = false,
+		bool bImmuneToStunMove = false,
+		bool bImmuneToStunTurn = false,
+		bool bImmuneToStunUseItem = false
+	);
+
+	void SendSetStatusImmunity(
+		LWOOBJID objectId,
+		eStateChangeType state,
+		const SystemAddress& sysAddr,
+		bool bImmuneToBasicAttack = false,
+		bool bImmuneToDamageOverTime = false,
+		bool bImmuneToKnockback = false,
+		bool bImmuneToInterrupt = false,
+		bool bImmuneToSpeed = false,
+		bool bImmuneToImaginationGain = false,
+		bool bImmuneToImaginationLoss = false,
+		bool bImmuneToQuickbuildInterrupt = false,
+		bool bImmuneToPullToPoint = false
+	);
+
 	void SendOrientToAngle(LWOOBJID objectId, bool bRelativeToCurrent, float fAngle, const SystemAddress& sysAddr);
 
 	void SendAddRunSpeedModifier(LWOOBJID objectId, LWOOBJID caster, uint32_t modifier, const SystemAddress& sysAddr);
@@ -589,550 +617,15 @@ namespace GameMessages {
 	void HandleReportBug(RakNet::BitStream* inStream, Entity* entity);
 
 	void SendRemoveBuff(Entity* entity, bool fromUnEquip, bool removeImmunity, uint32_t buffId);
+  
+	// bubble
+	void HandleDeactivateBubbleBuff(RakNet::BitStream* inStream, Entity* entity);
 
-	/*  Message to synchronize a skill cast */
-	class EchoSyncSkill {
-		static const GAME_MSG MsgID = GAME_MSG_ECHO_SYNC_SKILL;
+	void HandleActivateBubbleBuff(RakNet::BitStream* inStream, Entity* entity);
 
-	public:
-		EchoSyncSkill() {
-			bDone = false;
-		}
+	void SendActivateBubbleBuffFromServer(LWOOBJID objectId, const SystemAddress& sysAddr);
 
-		EchoSyncSkill(std::string _sBitStream, unsigned int _uiBehaviorHandle, unsigned int _uiSkillHandle, bool _bDone = false) {
-			bDone = _bDone;
-			sBitStream = _sBitStream;
-			uiBehaviorHandle = _uiBehaviorHandle;
-			uiSkillHandle = _uiSkillHandle;
-		}
-
-		EchoSyncSkill(RakNet::BitStream* stream) {
-			bDone = false;
-
-			Deserialize(stream);
-		}
-
-		~EchoSyncSkill() {
-		}
-
-		void Serialize(RakNet::BitStream* stream) {
-			stream->Write((unsigned short)MsgID);
-
-			stream->Write(bDone);
-			uint32_t sBitStreamLength = sBitStream.length();
-			stream->Write(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				stream->Write(sBitStream[k]);
-			}
-
-			stream->Write(uiBehaviorHandle);
-			stream->Write(uiSkillHandle);
-		}
-
-		bool Deserialize(RakNet::BitStream* stream) {
-			stream->Read(bDone);
-			uint32_t sBitStreamLength{};
-			stream->Read(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				unsigned char character;
-				stream->Read(character);
-				sBitStream.push_back(character);
-			}
-
-			stream->Read(uiBehaviorHandle);
-			stream->Read(uiSkillHandle);
-
-			return true;
-		}
-
-		bool bDone{};
-		std::string sBitStream{};
-		unsigned int uiBehaviorHandle{};
-		unsigned int uiSkillHandle{};
-	};
-
-	/*  Message to synchronize a skill cast */
-	class SyncSkill {
-		static const GAME_MSG MsgID = GAME_MSG_SYNC_SKILL;
-
-	public:
-		SyncSkill() {
-			bDone = false;
-		}
-
-		SyncSkill(std::string _sBitStream, unsigned int _uiBehaviorHandle, unsigned int _uiSkillHandle, bool _bDone = false) {
-			bDone = _bDone;
-			sBitStream = _sBitStream;
-			uiBehaviorHandle = _uiBehaviorHandle;
-			uiSkillHandle = _uiSkillHandle;
-		}
-
-		SyncSkill(RakNet::BitStream* stream) {
-			bDone = false;
-			Deserialize(stream);
-		}
-
-		~SyncSkill() {
-		}
-
-		void Serialize(RakNet::BitStream* stream) {
-			stream->Write((unsigned short)MsgID);
-
-			stream->Write(bDone);
-			uint32_t sBitStreamLength = sBitStream.length();
-			stream->Write(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				stream->Write(sBitStream[k]);
-			}
-
-			stream->Write(uiBehaviorHandle);
-			stream->Write(uiSkillHandle);
-		}
-
-		bool Deserialize(RakNet::BitStream* stream) {
-			stream->Read(bDone);
-			uint32_t sBitStreamLength{};
-			stream->Read(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				unsigned char character;
-				stream->Read(character);
-				sBitStream.push_back(character);
-			}
-
-			stream->Read(uiBehaviorHandle);
-			stream->Read(uiSkillHandle);
-
-			return true;
-		}
-
-		bool bDone{};
-		std::string sBitStream{};
-		unsigned int uiBehaviorHandle{};
-		unsigned int uiSkillHandle{};
-	};
-
-	/*  Notifying the server that a locally owned projectil impacted. Sent to the caster of the projectile
-		should always be the local char. */
-	class RequestServerProjectileImpact {
-		static const GAME_MSG MsgID = GAME_MSG_REQUEST_SERVER_PROJECTILE_IMPACT;
-
-	public:
-		RequestServerProjectileImpact() {
-			i64LocalID = LWOOBJID_EMPTY;
-			i64TargetID = LWOOBJID_EMPTY;
-		}
-
-		RequestServerProjectileImpact(std::string _sBitStream, LWOOBJID _i64LocalID = LWOOBJID_EMPTY, LWOOBJID _i64TargetID = LWOOBJID_EMPTY) {
-			i64LocalID = _i64LocalID;
-			i64TargetID = _i64TargetID;
-			sBitStream = _sBitStream;
-		}
-
-		RequestServerProjectileImpact(RakNet::BitStream* stream) {
-			i64LocalID = LWOOBJID_EMPTY;
-			i64TargetID = LWOOBJID_EMPTY;
-
-			Deserialize(stream);
-		}
-
-		~RequestServerProjectileImpact() {
-		}
-
-		void Serialize(RakNet::BitStream* stream) {
-			stream->Write((unsigned short)MsgID);
-
-			stream->Write(i64LocalID != LWOOBJID_EMPTY);
-			if (i64LocalID != LWOOBJID_EMPTY) stream->Write(i64LocalID);
-
-			stream->Write(i64TargetID != LWOOBJID_EMPTY);
-			if (i64TargetID != LWOOBJID_EMPTY) stream->Write(i64TargetID);
-
-			uint32_t sBitStreamLength = sBitStream.length();
-			stream->Write(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				stream->Write(sBitStream[k]);
-			}
-
-		}
-
-		bool Deserialize(RakNet::BitStream* stream) {
-			bool i64LocalIDIsDefault{};
-			stream->Read(i64LocalIDIsDefault);
-			if (i64LocalIDIsDefault != 0) stream->Read(i64LocalID);
-
-			bool i64TargetIDIsDefault{};
-			stream->Read(i64TargetIDIsDefault);
-			if (i64TargetIDIsDefault != 0) stream->Read(i64TargetID);
-
-			uint32_t sBitStreamLength{};
-			stream->Read(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				unsigned char character;
-				stream->Read(character);
-				sBitStream.push_back(character);
-			}
-
-
-			return true;
-		}
-
-		LWOOBJID i64LocalID;
-		LWOOBJID i64TargetID;
-		std::string sBitStream;
-	};
-
-	/*  Tell a client local projectile to impact */
-	class DoClientProjectileImpact {
-		static const GAME_MSG MsgID = GAME_MSG_DO_CLIENT_PROJECTILE_IMPACT;
-
-	public:
-		DoClientProjectileImpact() {
-			i64OrgID = LWOOBJID_EMPTY;
-			i64OwnerID = LWOOBJID_EMPTY;
-			i64TargetID = LWOOBJID_EMPTY;
-		}
-
-		DoClientProjectileImpact(std::string _sBitStream, LWOOBJID _i64OrgID = LWOOBJID_EMPTY, LWOOBJID _i64OwnerID = LWOOBJID_EMPTY, LWOOBJID _i64TargetID = LWOOBJID_EMPTY) {
-			i64OrgID = _i64OrgID;
-			i64OwnerID = _i64OwnerID;
-			i64TargetID = _i64TargetID;
-			sBitStream = _sBitStream;
-		}
-
-		DoClientProjectileImpact(RakNet::BitStream* stream) {
-			i64OrgID = LWOOBJID_EMPTY;
-			i64OwnerID = LWOOBJID_EMPTY;
-			i64TargetID = LWOOBJID_EMPTY;
-
-			Deserialize(stream);
-		}
-
-		~DoClientProjectileImpact() {
-		}
-
-		void Serialize(RakNet::BitStream* stream) {
-			stream->Write((unsigned short)MsgID);
-
-			stream->Write(i64OrgID != LWOOBJID_EMPTY);
-			if (i64OrgID != LWOOBJID_EMPTY) stream->Write(i64OrgID);
-
-			stream->Write(i64OwnerID != LWOOBJID_EMPTY);
-			if (i64OwnerID != LWOOBJID_EMPTY) stream->Write(i64OwnerID);
-
-			stream->Write(i64TargetID != LWOOBJID_EMPTY);
-			if (i64TargetID != LWOOBJID_EMPTY) stream->Write(i64TargetID);
-
-			uint32_t sBitStreamLength = sBitStream.length();
-			stream->Write(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				stream->Write(sBitStream[k]);
-			}
-
-		}
-
-		bool Deserialize(RakNet::BitStream* stream) {
-			bool i64OrgIDIsDefault{};
-			stream->Read(i64OrgIDIsDefault);
-			if (i64OrgIDIsDefault != 0) stream->Read(i64OrgID);
-
-			bool i64OwnerIDIsDefault{};
-			stream->Read(i64OwnerIDIsDefault);
-			if (i64OwnerIDIsDefault != 0) stream->Read(i64OwnerID);
-
-			bool i64TargetIDIsDefault{};
-			stream->Read(i64TargetIDIsDefault);
-			if (i64TargetIDIsDefault != 0) stream->Read(i64TargetID);
-
-			uint32_t sBitStreamLength{};
-			stream->Read(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				unsigned char character;
-				stream->Read(character);
-				sBitStream.push_back(character);
-			}
-
-
-			return true;
-		}
-
-		LWOOBJID i64OrgID;
-		LWOOBJID i64OwnerID;
-		LWOOBJID i64TargetID;
-		std::string sBitStream;
-	};
-
-	/*  Same as start skill but with different network options. An echo down to other clients that need to play the skill. */
-	class EchoStartSkill {
-		static const GAME_MSG MsgID = GAME_MSG_ECHO_START_SKILL;
-
-	public:
-		EchoStartSkill() {
-			bUsedMouse = false;
-			fCasterLatency = 0.0f;
-			iCastType = 0;
-			lastClickedPosit = NiPoint3::ZERO;
-			optionalTargetID = LWOOBJID_EMPTY;
-			originatorRot = NiQuaternion::IDENTITY;
-			uiSkillHandle = 0;
-		}
-
-		EchoStartSkill(LWOOBJID _optionalOriginatorID, std::string _sBitStream, TSkillID _skillID, bool _bUsedMouse = false, float _fCasterLatency = 0.0f, int _iCastType = 0, NiPoint3 _lastClickedPosit = NiPoint3::ZERO, LWOOBJID _optionalTargetID = LWOOBJID_EMPTY, NiQuaternion _originatorRot = NiQuaternion::IDENTITY, unsigned int _uiSkillHandle = 0) {
-			bUsedMouse = _bUsedMouse;
-			fCasterLatency = _fCasterLatency;
-			iCastType = _iCastType;
-			lastClickedPosit = _lastClickedPosit;
-			optionalOriginatorID = _optionalOriginatorID;
-			optionalTargetID = _optionalTargetID;
-			originatorRot = _originatorRot;
-			sBitStream = _sBitStream;
-			skillID = _skillID;
-			uiSkillHandle = _uiSkillHandle;
-		}
-
-		EchoStartSkill(RakNet::BitStream* stream) {
-			bUsedMouse = false;
-			fCasterLatency = 0.0f;
-			iCastType = 0;
-			lastClickedPosit = NiPoint3::ZERO;
-			optionalTargetID = LWOOBJID_EMPTY;
-			originatorRot = NiQuaternion::IDENTITY;
-			uiSkillHandle = 0;
-
-			Deserialize(stream);
-		}
-
-		~EchoStartSkill() {
-		}
-
-		void Serialize(RakNet::BitStream* stream) {
-			stream->Write((unsigned short)MsgID);
-
-			stream->Write(bUsedMouse);
-
-			stream->Write(fCasterLatency != 0.0f);
-			if (fCasterLatency != 0.0f) stream->Write(fCasterLatency);
-
-			stream->Write(iCastType != 0);
-			if (iCastType != 0) stream->Write(iCastType);
-
-			stream->Write(lastClickedPosit != NiPoint3::ZERO);
-			if (lastClickedPosit != NiPoint3::ZERO) stream->Write(lastClickedPosit);
-
-			stream->Write(optionalOriginatorID);
-
-			stream->Write(optionalTargetID != LWOOBJID_EMPTY);
-			if (optionalTargetID != LWOOBJID_EMPTY) stream->Write(optionalTargetID);
-
-			stream->Write(originatorRot != NiQuaternion::IDENTITY);
-			if (originatorRot != NiQuaternion::IDENTITY) stream->Write(originatorRot);
-
-			uint32_t sBitStreamLength = sBitStream.length();
-			stream->Write(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				stream->Write(sBitStream[k]);
-			}
-
-			stream->Write(skillID);
-
-			stream->Write(uiSkillHandle != 0);
-			if (uiSkillHandle != 0) stream->Write(uiSkillHandle);
-		}
-
-		bool Deserialize(RakNet::BitStream* stream) {
-			stream->Read(bUsedMouse);
-
-			bool fCasterLatencyIsDefault{};
-			stream->Read(fCasterLatencyIsDefault);
-			if (fCasterLatencyIsDefault != 0) stream->Read(fCasterLatency);
-
-			bool iCastTypeIsDefault{};
-			stream->Read(iCastTypeIsDefault);
-			if (iCastTypeIsDefault != 0) stream->Read(iCastType);
-
-			bool lastClickedPositIsDefault{};
-			stream->Read(lastClickedPositIsDefault);
-			if (lastClickedPositIsDefault != 0) stream->Read(lastClickedPosit);
-
-			stream->Read(optionalOriginatorID);
-
-			bool optionalTargetIDIsDefault{};
-			stream->Read(optionalTargetIDIsDefault);
-			if (optionalTargetIDIsDefault != 0) stream->Read(optionalTargetID);
-
-			bool originatorRotIsDefault{};
-			stream->Read(originatorRotIsDefault);
-			if (originatorRotIsDefault != 0) stream->Read(originatorRot);
-
-			uint32_t sBitStreamLength{};
-			stream->Read(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				unsigned char character;
-				stream->Read(character);
-				sBitStream.push_back(character);
-			}
-
-			stream->Read(skillID);
-
-			bool uiSkillHandleIsDefault{};
-			stream->Read(uiSkillHandleIsDefault);
-			if (uiSkillHandleIsDefault != 0) stream->Read(uiSkillHandle);
-
-			return true;
-		}
-
-		bool bUsedMouse;
-		float fCasterLatency;
-		int iCastType;
-		NiPoint3 lastClickedPosit;
-		LWOOBJID optionalOriginatorID;
-		LWOOBJID optionalTargetID;
-		NiQuaternion originatorRot;
-		std::string sBitStream;
-		TSkillID skillID;
-		unsigned int uiSkillHandle;
-	};
-
-	/*  Same as sync skill but with different network options. An echo down to other clients that need to play the skill. */
-	class StartSkill {
-		static const GAME_MSG MsgID = GAME_MSG_START_SKILL;
-
-	public:
-		StartSkill() {
-			bUsedMouse = false;
-			consumableItemID = LWOOBJID_EMPTY;
-			fCasterLatency = 0.0f;
-			iCastType = 0;
-			lastClickedPosit = NiPoint3::ZERO;
-			optionalTargetID = LWOOBJID_EMPTY;
-			originatorRot = NiQuaternion::IDENTITY;
-			uiSkillHandle = 0;
-		}
-
-		StartSkill(LWOOBJID _optionalOriginatorID, std::string _sBitStream, TSkillID _skillID, bool _bUsedMouse = false, LWOOBJID _consumableItemID = LWOOBJID_EMPTY, float _fCasterLatency = 0.0f, int _iCastType = 0, NiPoint3 _lastClickedPosit = NiPoint3::ZERO, LWOOBJID _optionalTargetID = LWOOBJID_EMPTY, NiQuaternion _originatorRot = NiQuaternion::IDENTITY, unsigned int _uiSkillHandle = 0) {
-			bUsedMouse = _bUsedMouse;
-			consumableItemID = _consumableItemID;
-			fCasterLatency = _fCasterLatency;
-			iCastType = _iCastType;
-			lastClickedPosit = _lastClickedPosit;
-			optionalOriginatorID = _optionalOriginatorID;
-			optionalTargetID = _optionalTargetID;
-			originatorRot = _originatorRot;
-			sBitStream = _sBitStream;
-			skillID = _skillID;
-			uiSkillHandle = _uiSkillHandle;
-		}
-
-		StartSkill(RakNet::BitStream* stream) {
-			bUsedMouse = false;
-			consumableItemID = LWOOBJID_EMPTY;
-			fCasterLatency = 0.0f;
-			iCastType = 0;
-			lastClickedPosit = NiPoint3::ZERO;
-			optionalTargetID = LWOOBJID_EMPTY;
-			originatorRot = NiQuaternion::IDENTITY;
-			uiSkillHandle = 0;
-
-			Deserialize(stream);
-		}
-
-		~StartSkill() {
-		}
-
-		void Serialize(RakNet::BitStream* stream) {
-			stream->Write((unsigned short)MsgID);
-
-			stream->Write(bUsedMouse);
-
-			stream->Write(consumableItemID != LWOOBJID_EMPTY);
-			if (consumableItemID != LWOOBJID_EMPTY) stream->Write(consumableItemID);
-
-			stream->Write(fCasterLatency != 0.0f);
-			if (fCasterLatency != 0.0f) stream->Write(fCasterLatency);
-
-			stream->Write(iCastType != 0);
-			if (iCastType != 0) stream->Write(iCastType);
-
-			stream->Write(lastClickedPosit != NiPoint3::ZERO);
-			if (lastClickedPosit != NiPoint3::ZERO) stream->Write(lastClickedPosit);
-
-			stream->Write(optionalOriginatorID);
-
-			stream->Write(optionalTargetID != LWOOBJID_EMPTY);
-			if (optionalTargetID != LWOOBJID_EMPTY) stream->Write(optionalTargetID);
-
-			stream->Write(originatorRot != NiQuaternion::IDENTITY);
-			if (originatorRot != NiQuaternion::IDENTITY) stream->Write(originatorRot);
-
-			uint32_t sBitStreamLength = sBitStream.length();
-			stream->Write(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				stream->Write(sBitStream[k]);
-			}
-
-			stream->Write(skillID);
-
-			stream->Write(uiSkillHandle != 0);
-			if (uiSkillHandle != 0) stream->Write(uiSkillHandle);
-		}
-
-		bool Deserialize(RakNet::BitStream* stream) {
-			stream->Read(bUsedMouse);
-
-			bool consumableItemIDIsDefault{};
-			stream->Read(consumableItemIDIsDefault);
-			if (consumableItemIDIsDefault != 0) stream->Read(consumableItemID);
-
-			bool fCasterLatencyIsDefault{};
-			stream->Read(fCasterLatencyIsDefault);
-			if (fCasterLatencyIsDefault != 0) stream->Read(fCasterLatency);
-
-			bool iCastTypeIsDefault{};
-			stream->Read(iCastTypeIsDefault);
-			if (iCastTypeIsDefault != 0) stream->Read(iCastType);
-
-			bool lastClickedPositIsDefault{};
-			stream->Read(lastClickedPositIsDefault);
-			if (lastClickedPositIsDefault != 0) stream->Read(lastClickedPosit);
-
-			stream->Read(optionalOriginatorID);
-
-			bool optionalTargetIDIsDefault{};
-			stream->Read(optionalTargetIDIsDefault);
-			if (optionalTargetIDIsDefault != 0) stream->Read(optionalTargetID);
-
-			bool originatorRotIsDefault{};
-			stream->Read(originatorRotIsDefault);
-			if (originatorRotIsDefault != 0) stream->Read(originatorRot);
-
-			uint32_t sBitStreamLength{};
-			stream->Read(sBitStreamLength);
-			for (unsigned int k = 0; k < sBitStreamLength; k++) {
-				unsigned char character;
-				stream->Read(character);
-				sBitStream.push_back(character);
-			}
-
-			stream->Read(skillID);
-
-			bool uiSkillHandleIsDefault{};
-			stream->Read(uiSkillHandleIsDefault);
-			if (uiSkillHandleIsDefault != 0) stream->Read(uiSkillHandle);
-
-			return true;
-		}
-
-		bool bUsedMouse = false;
-		LWOOBJID consumableItemID{};
-		float fCasterLatency{};
-		int iCastType{};
-		NiPoint3 lastClickedPosit{};
-		LWOOBJID optionalOriginatorID{};
-		LWOOBJID optionalTargetID{};
-		NiQuaternion originatorRot{};
-		std::string sBitStream = "";
-		TSkillID skillID = 0;
-		unsigned int uiSkillHandle = 0;
-	};
+	void SendDeactivateBubbleBuffFromServer(LWOOBJID objectId, const SystemAddress& sysAddr);
 };
 
 #endif // GAMEMESSAGES_H
diff --git a/dGame/dGameMessages/RequestServerProjectileImpact.h b/dGame/dGameMessages/RequestServerProjectileImpact.h
new file mode 100644
index 00000000..01426361
--- /dev/null
+++ b/dGame/dGameMessages/RequestServerProjectileImpact.h
@@ -0,0 +1,74 @@
+#ifndef __REQUESTSERVERPROJECTILEIMPACT__H__
+#define __REQUESTSERVERPROJECTILEIMPACT__H__
+
+#include "dCommonVars.h"
+#include "dMessageIdentifiers.h"
+
+/*  Notifying the server that a locally owned projectile impacted. Sent to the caster of the projectile
+		should always be the local char. */
+class RequestServerProjectileImpact {
+	static const GAME_MSG MsgID = GAME_MSG_REQUEST_SERVER_PROJECTILE_IMPACT;
+
+public:
+	RequestServerProjectileImpact() {
+		i64LocalID = LWOOBJID_EMPTY;
+		i64TargetID = LWOOBJID_EMPTY;
+	}
+
+	RequestServerProjectileImpact(std::string _sBitStream, LWOOBJID _i64LocalID = LWOOBJID_EMPTY, LWOOBJID _i64TargetID = LWOOBJID_EMPTY) {
+		i64LocalID = _i64LocalID;
+		i64TargetID = _i64TargetID;
+		sBitStream = _sBitStream;
+	}
+
+	RequestServerProjectileImpact(RakNet::BitStream* stream) : RequestServerProjectileImpact() {
+		Deserialize(stream);
+	}
+
+	~RequestServerProjectileImpact() {
+	}
+
+	void Serialize(RakNet::BitStream* stream) {
+		stream->Write(MsgID);
+
+		stream->Write(i64LocalID != LWOOBJID_EMPTY);
+		if (i64LocalID != LWOOBJID_EMPTY) stream->Write(i64LocalID);
+
+		stream->Write(i64TargetID != LWOOBJID_EMPTY);
+		if (i64TargetID != LWOOBJID_EMPTY) stream->Write(i64TargetID);
+
+		uint32_t sBitStreamLength = sBitStream.length();
+		stream->Write(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			stream->Write(sBitStream[k]);
+		}
+
+	}
+
+	bool Deserialize(RakNet::BitStream* stream) {
+		bool i64LocalIDIsDefault{};
+		stream->Read(i64LocalIDIsDefault);
+		if (i64LocalIDIsDefault != 0) stream->Read(i64LocalID);
+
+		bool i64TargetIDIsDefault{};
+		stream->Read(i64TargetIDIsDefault);
+		if (i64TargetIDIsDefault != 0) stream->Read(i64TargetID);
+
+		uint32_t sBitStreamLength{};
+		stream->Read(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			unsigned char character;
+			stream->Read(character);
+			sBitStream.push_back(character);
+		}
+
+
+		return true;
+	}
+
+	LWOOBJID i64LocalID;
+	LWOOBJID i64TargetID;
+	std::string sBitStream;
+};
+
+#endif  //!__REQUESTSERVERPROJECTILEIMPACT__H__
diff --git a/dGame/dGameMessages/StartSkill.h b/dGame/dGameMessages/StartSkill.h
new file mode 100644
index 00000000..af82a9b4
--- /dev/null
+++ b/dGame/dGameMessages/StartSkill.h
@@ -0,0 +1,144 @@
+#ifndef __STARTSKILL__H__
+#define __STARTSKILL__H__
+
+#include "dCommonVars.h"
+#include "dMessageIdentifiers.h"
+#include "NiPoint3.h"
+#include "NiQuaternion.h"
+
+/**
+ * Same as sync skill but with different network options. An echo down to other clients that need to play the skill.
+ */
+class StartSkill {
+	static const GAME_MSG MsgID = GAME_MSG_START_SKILL;
+
+public:
+	StartSkill() {
+		bUsedMouse = false;
+		consumableItemID = LWOOBJID_EMPTY;
+		fCasterLatency = 0.0f;
+		iCastType = 0;
+		lastClickedPosit = NiPoint3::ZERO;
+		optionalTargetID = LWOOBJID_EMPTY;
+		originatorRot = NiQuaternion::IDENTITY;
+		uiSkillHandle = 0;
+	}
+
+	StartSkill(LWOOBJID _optionalOriginatorID, std::string _sBitStream, TSkillID _skillID, bool _bUsedMouse = false, LWOOBJID _consumableItemID = LWOOBJID_EMPTY, float _fCasterLatency = 0.0f, int32_t _iCastType = 0, NiPoint3 _lastClickedPosit = NiPoint3::ZERO, LWOOBJID _optionalTargetID = LWOOBJID_EMPTY, NiQuaternion _originatorRot = NiQuaternion::IDENTITY, uint32_t _uiSkillHandle = 0) {
+		bUsedMouse = _bUsedMouse;
+		consumableItemID = _consumableItemID;
+		fCasterLatency = _fCasterLatency;
+		iCastType = _iCastType;
+		lastClickedPosit = _lastClickedPosit;
+		optionalOriginatorID = _optionalOriginatorID;
+		optionalTargetID = _optionalTargetID;
+		originatorRot = _originatorRot;
+		sBitStream = _sBitStream;
+		skillID = _skillID;
+		uiSkillHandle = _uiSkillHandle;
+	}
+
+	StartSkill(RakNet::BitStream* stream) : StartSkill() {
+		Deserialize(stream);
+	}
+
+	~StartSkill() {
+	}
+
+	void Serialize(RakNet::BitStream* stream) {
+		stream->Write(MsgID);
+
+		stream->Write(bUsedMouse);
+
+		stream->Write(consumableItemID != LWOOBJID_EMPTY);
+		if (consumableItemID != LWOOBJID_EMPTY) stream->Write(consumableItemID);
+
+		stream->Write(fCasterLatency != 0.0f);
+		if (fCasterLatency != 0.0f) stream->Write(fCasterLatency);
+
+		stream->Write(iCastType != 0);
+		if (iCastType != 0) stream->Write(iCastType);
+
+		stream->Write(lastClickedPosit != NiPoint3::ZERO);
+		if (lastClickedPosit != NiPoint3::ZERO) stream->Write(lastClickedPosit);
+
+		stream->Write(optionalOriginatorID);
+
+		stream->Write(optionalTargetID != LWOOBJID_EMPTY);
+		if (optionalTargetID != LWOOBJID_EMPTY) stream->Write(optionalTargetID);
+
+		stream->Write(originatorRot != NiQuaternion::IDENTITY);
+		if (originatorRot != NiQuaternion::IDENTITY) stream->Write(originatorRot);
+
+		uint32_t sBitStreamLength = sBitStream.length();
+		stream->Write(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			stream->Write(sBitStream[k]);
+		}
+
+		stream->Write(skillID);
+
+		stream->Write(uiSkillHandle != 0);
+		if (uiSkillHandle != 0) stream->Write(uiSkillHandle);
+	}
+
+	bool Deserialize(RakNet::BitStream* stream) {
+		stream->Read(bUsedMouse);
+
+		bool consumableItemIDIsDefault{};
+		stream->Read(consumableItemIDIsDefault);
+		if (consumableItemIDIsDefault != 0) stream->Read(consumableItemID);
+
+		bool fCasterLatencyIsDefault{};
+		stream->Read(fCasterLatencyIsDefault);
+		if (fCasterLatencyIsDefault != 0) stream->Read(fCasterLatency);
+
+		bool iCastTypeIsDefault{};
+		stream->Read(iCastTypeIsDefault);
+		if (iCastTypeIsDefault != 0) stream->Read(iCastType);
+
+		bool lastClickedPositIsDefault{};
+		stream->Read(lastClickedPositIsDefault);
+		if (lastClickedPositIsDefault != 0) stream->Read(lastClickedPosit);
+
+		stream->Read(optionalOriginatorID);
+
+		bool optionalTargetIDIsDefault{};
+		stream->Read(optionalTargetIDIsDefault);
+		if (optionalTargetIDIsDefault != 0) stream->Read(optionalTargetID);
+
+		bool originatorRotIsDefault{};
+		stream->Read(originatorRotIsDefault);
+		if (originatorRotIsDefault != 0) stream->Read(originatorRot);
+
+		uint32_t sBitStreamLength{};
+		stream->Read(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			unsigned char character;
+			stream->Read(character);
+			sBitStream.push_back(character);
+		}
+
+		stream->Read(skillID);
+
+		bool uiSkillHandleIsDefault{};
+		stream->Read(uiSkillHandleIsDefault);
+		if (uiSkillHandleIsDefault != 0) stream->Read(uiSkillHandle);
+
+		return true;
+	}
+
+	bool bUsedMouse = false;
+	LWOOBJID consumableItemID{};
+	float fCasterLatency{};
+	int32_t iCastType{};
+	NiPoint3 lastClickedPosit{};
+	LWOOBJID optionalOriginatorID{};
+	LWOOBJID optionalTargetID{};
+	NiQuaternion originatorRot{};
+	std::string sBitStream = "";
+	TSkillID skillID = 0;
+	uint32_t uiSkillHandle = 0;
+};
+
+#endif  //!__STARTSKILL__H__
diff --git a/dGame/dGameMessages/SyncSkill.h b/dGame/dGameMessages/SyncSkill.h
new file mode 100644
index 00000000..72a88839
--- /dev/null
+++ b/dGame/dGameMessages/SyncSkill.h
@@ -0,0 +1,68 @@
+#ifndef __SYNCSKILL__H__
+#define __SYNCSKILL__H__
+
+#include <cstdint>
+#include <string>
+
+#include "BitStream.h"
+
+/*  Message to synchronize a skill cast */
+class SyncSkill {
+	static const GAME_MSG MsgID = GAME_MSG_SYNC_SKILL;
+
+public:
+	SyncSkill() {
+		bDone = false;
+	}
+
+	SyncSkill(std::string _sBitStream, uint32_t _uiBehaviorHandle, uint32_t _uiSkillHandle, bool _bDone = false) {
+		bDone = _bDone;
+		sBitStream = _sBitStream;
+		uiBehaviorHandle = _uiBehaviorHandle;
+		uiSkillHandle = _uiSkillHandle;
+	}
+
+	SyncSkill(RakNet::BitStream* stream) : SyncSkill() {
+		Deserialize(stream);
+	}
+
+	~SyncSkill() {
+	}
+
+	void Serialize(RakNet::BitStream* stream) {
+		stream->Write(MsgID);
+
+		stream->Write(bDone);
+		uint32_t sBitStreamLength = sBitStream.length();
+		stream->Write(sBitStreamLength);
+		for (unsigned int k = 0; k < sBitStreamLength; k++) {
+			stream->Write(sBitStream[k]);
+		}
+
+		stream->Write(uiBehaviorHandle);
+		stream->Write(uiSkillHandle);
+	}
+
+	bool Deserialize(RakNet::BitStream* stream) {
+		stream->Read(bDone);
+		uint32_t sBitStreamLength{};
+		stream->Read(sBitStreamLength);
+		for (uint32_t k = 0; k < sBitStreamLength; k++) {
+			unsigned char character;
+			stream->Read(character);
+			sBitStream.push_back(character);
+		}
+
+		stream->Read(uiBehaviorHandle);
+		stream->Read(uiSkillHandle);
+
+		return true;
+	}
+
+	bool bDone{};
+	std::string sBitStream{};
+	uint32_t uiBehaviorHandle{};
+	uint32_t uiSkillHandle{};
+};
+
+#endif  //!__SYNCSKILL__H__
diff --git a/dGame/dInventory/Item.cpp b/dGame/dInventory/Item.cpp
index 4f3626e3..d6721bdd 100644
--- a/dGame/dInventory/Item.cpp
+++ b/dGame/dInventory/Item.cpp
@@ -15,6 +15,7 @@
 #include "eItemType.h"
 #include "AssetManager.h"
 #include "InventoryComponent.h"
+#include "Loot.h"
 
 Item::Item(const LWOOBJID id, const LOT lot, Inventory* inventory, const uint32_t slot, const uint32_t count, const bool bound, const std::vector<LDFBaseData*>& config, const LWOOBJID parent, LWOOBJID subKey, eLootSourceType lootSourceType) {
 	if (!Inventory::IsValidItem(lot)) {
diff --git a/dGame/dMission/Mission.cpp b/dGame/dMission/Mission.cpp
index a1ae724a..df1b16d7 100644
--- a/dGame/dMission/Mission.cpp
+++ b/dGame/dMission/Mission.cpp
@@ -17,6 +17,7 @@
 #include "dServer.h"
 #include "dZoneManager.h"
 #include "InventoryComponent.h"
+#include "User.h"
 #include "Database.h"
 #include "WorldConfig.h"
 
diff --git a/dGame/dMission/Mission.h b/dGame/dMission/Mission.h
index b8892f3d..f9902a06 100644
--- a/dGame/dMission/Mission.h
+++ b/dGame/dMission/Mission.h
@@ -13,6 +13,10 @@
 #include "MissionState.h"
 #include "MissionLockState.h"
 
+namespace tinyxml2 {
+	class XMLElement;
+};
+
 class MissionComponent;
 
 /**
@@ -223,7 +227,7 @@ public:
 
 	/**
 	 * @brief Returns the unique mission order ID
-	 * 
+	 *
 	 * @return The unique order ID
 	 */
 	uint32_t GetUniqueMissionOrderID() { return m_UniqueMissionID; };
diff --git a/dGame/dPropertyBehaviors/ControlBehaviors.cpp b/dGame/dPropertyBehaviors/ControlBehaviors.cpp
index d5b71a3a..278b6929 100644
--- a/dGame/dPropertyBehaviors/ControlBehaviors.cpp
+++ b/dGame/dPropertyBehaviors/ControlBehaviors.cpp
@@ -7,6 +7,7 @@
 #include "ModelComponent.h"
 #include "../../dWorldServer/ObjectIDManager.h"
 #include "dLogger.h"
+#include "User.h"
 
 uint32_t GetBehaviorIDFromArgument(AMFArrayValue* arguments, const std::string& key = "BehaviorID") {
 	auto* behaviorIDValue = arguments->FindValue<AMFStringValue>(key);
diff --git a/dGame/dUtilities/BrickDatabase.cpp b/dGame/dUtilities/BrickDatabase.cpp
index 6d1e380c..a6c43d52 100644
--- a/dGame/dUtilities/BrickDatabase.cpp
+++ b/dGame/dUtilities/BrickDatabase.cpp
@@ -4,6 +4,7 @@
 #include "BrickDatabase.h"
 #include "Game.h"
 #include "AssetManager.h"
+#include "tinyxml2.h"
 
 std::vector<Brick> BrickDatabase::emptyCache{};
 BrickDatabase* BrickDatabase::m_Address = nullptr;
diff --git a/dGame/dUtilities/CMakeLists.txt b/dGame/dUtilities/CMakeLists.txt
index 2c453a2e..55ca5797 100644
--- a/dGame/dUtilities/CMakeLists.txt
+++ b/dGame/dUtilities/CMakeLists.txt
@@ -1,5 +1,4 @@
 set(DGAME_DUTILITIES_SOURCES "BrickDatabase.cpp"
-	"GameConfig.cpp"
 	"GUID.cpp"
 	"Loot.cpp"
 	"Mail.cpp"
diff --git a/dGame/dUtilities/GameConfig.cpp b/dGame/dUtilities/GameConfig.cpp
deleted file mode 100644
index ad201e6f..00000000
--- a/dGame/dUtilities/GameConfig.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-#include "GameConfig.h"
-#include <sstream>
-
-std::map<std::string, std::string> GameConfig::m_Config{};
-std::string GameConfig::m_EmptyString{};
-
-void GameConfig::Load(const std::string& filepath) {
-	m_EmptyString = "";
-	std::ifstream in(filepath);
-	if (!in.good()) return;
-
-	std::string line;
-	while (std::getline(in, line)) {
-		if (line.length() > 0) {
-			if (line[0] != '#') ProcessLine(line);
-		}
-	}
-}
-
-const std::string& GameConfig::GetValue(const std::string& key) {
-	const auto& it = m_Config.find(key);
-
-	if (it != m_Config.end()) {
-		return it->second;
-	}
-
-	return m_EmptyString;
-}
-
-void GameConfig::SetValue(const std::string& key, const std::string& value) {
-	m_Config.insert_or_assign(key, value);
-}
-
-void GameConfig::ProcessLine(const std::string& line) {
-	std::stringstream ss(line);
-	std::string segment;
-	std::vector<std::string> seglist;
-
-	while (std::getline(ss, segment, '=')) {
-		seglist.push_back(segment);
-	}
-
-	if (seglist.size() != 2) return;
-
-	//Make sure that on Linux, we remove special characters:
-	if (!seglist[1].empty() && seglist[1][seglist[1].size() - 1] == '\r')
-		seglist[1].erase(seglist[1].size() - 1);
-
-	m_Config.insert_or_assign(seglist[0], seglist[1]);
-}
diff --git a/dGame/dUtilities/GameConfig.h b/dGame/dUtilities/GameConfig.h
deleted file mode 100644
index 55089f89..00000000
--- a/dGame/dUtilities/GameConfig.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-#include <fstream>
-#include <string>
-#include <vector>
-#include <map>
-
-#include "GeneralUtils.h"
-
-class GameConfig {
-public:
-	static void Load(const std::string& filepath);
-
-	static const std::string& GetValue(const std::string& key);
-
-	static void SetValue(const std::string& key, const std::string& value);
-
-	template <typename T>
-	static T GetValue(const std::string& key) {
-		T value;
-
-		if (GeneralUtils::TryParse(GetValue(key), value)) {
-			return value;
-		}
-
-		return T();
-	}
-
-	template <typename T>
-	static void SetValue(const std::string& key, const T& value) {
-		SetValue(key, std::to_string(value));
-	}
-
-private:
-	static void ProcessLine(const std::string& line);
-
-	static std::map<std::string, std::string> m_Config;
-	static std::string m_EmptyString;
-};
diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
index 9a63f83c..cc1c82a9 100644
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -50,6 +50,9 @@
 #include "Item.h"
 #include "PropertyManagementComponent.h"
 #include "PacketUtils.h"
+#include "Loot.h"
+#include "EntityInfo.h"
+#include "LUTriggers.h"
 #include "Player.h"
 #include "PhantomPhysicsComponent.h"
 #include "ProximityMonitorComponent.h"
@@ -60,12 +63,15 @@
 #include "BuffComponent.h"
 #include "SkillComponent.h"
 #include "VanityUtilities.h"
-#include "GameConfig.h"
 #include "ScriptedActivityComponent.h"
 #include "LevelProgressionComponent.h"
 #include "AssetManager.h"
 #include "BinaryPathFinder.h"
 #include "dConfig.h"
+#include "eBubbleType.h"
+#include "AMFFormat.h"
+#include "MovingPlatformComponent.h"
+#include "dMessageIdentifiers.h"
 
 void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entity* entity, const SystemAddress& sysAddr) {
 	std::string chatCommand;
@@ -1192,11 +1198,17 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		EntityManager::Instance()->SerializeEntity(entity);
 	}
 
-	if (chatCommand == "lookup" && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER && args.size() == 1) {
+	if (chatCommand == "lookup" && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) {
 		auto query = CDClientDatabase::CreatePreppedStmt(
 			"SELECT `id`, `name` FROM `Objects` WHERE `displayName` LIKE ?1 OR `name` LIKE ?1 OR `description` LIKE ?1 LIMIT 50");
+		// Concatenate all of the arguments into a single query so a multi word query can be used properly.
+		std::string conditional = args[0];
+		args.erase(args.begin());
+		for (auto& argument : args) {
+			conditional += ' ' + argument;
+		}
 
-		const std::string query_text = "%" + args[0] + "%";
+		const std::string query_text = "%" + conditional + "%";
 		query.bind(1, query_text.c_str());
 
 		auto tables = query.execQuery();
@@ -1695,25 +1707,6 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		return;
 	}
 
-	if (chatCommand == "config-set" && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER && args.size() >= 2) {
-		GameConfig::SetValue(args[0], args[1]);
-
-		ChatPackets::SendSystemMessage(
-			sysAddr, u"Set config value: " + GeneralUtils::UTF8ToUTF16(args[0]) + u" to " + GeneralUtils::UTF8ToUTF16(args[1])
-		);
-	}
-
-	if (chatCommand == "config-get" && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER && args.size() >= 1) {
-		const auto& value = GameConfig::GetValue(args[0]);
-
-		std::u16string u16key = GeneralUtils::UTF8ToUTF16(args[0]);
-		if (value.empty()) {
-			ChatPackets::SendSystemMessage(sysAddr, u"No value found for " + u16key);
-		} else {
-			ChatPackets::SendSystemMessage(sysAddr, u"Value for " + u16key + u": " + GeneralUtils::UTF8ToUTF16(value));
-		}
-	}
-
 	if (chatCommand == "metrics" && entity->GetGMLevel() >= GAME_MASTER_LEVEL_DEVELOPER) {
 		for (const auto variable : Metrics::GetAllMetrics()) {
 			auto* metric = Metrics::GetMetric(variable);
diff --git a/dGame/dUtilities/VanityUtilities.cpp b/dGame/dUtilities/VanityUtilities.cpp
index 3a1259a2..74fd0f67 100644
--- a/dGame/dUtilities/VanityUtilities.cpp
+++ b/dGame/dUtilities/VanityUtilities.cpp
@@ -14,6 +14,7 @@
 #include "Game.h"
 #include "dLogger.h"
 #include "BinaryPathFinder.h"
+#include "EntityInfo.h"
 
 #include <fstream>
 
diff --git a/dNet/ClientPackets.cpp b/dNet/ClientPackets.cpp
index 39e835d2..61267971 100644
--- a/dNet/ClientPackets.cpp
+++ b/dNet/ClientPackets.cpp
@@ -31,7 +31,7 @@
 #include "dConfig.h"
 #include "CharacterComponent.h"
 #include "Database.h"
-
+#include "dMessageIdentifiers.h"
 
 
 void ClientPackets::HandleChatMessage(const SystemAddress& sysAddr, Packet* packet) {
diff --git a/dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp b/dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp
index 9e0570ef..28ba0044 100644
--- a/dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp
+++ b/dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp
@@ -5,6 +5,8 @@
 #include "GameMessages.h"
 #include "SkillComponent.h"
 #include "BaseCombatAIComponent.h"
+#include "EntityInfo.h"
+#include "eAninmationFlags.h"
 
 void AmDarklingDragon::OnStartup(Entity* self) {
 	self->SetVar<int32_t>(u"weakspot", 0);
diff --git a/dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp b/dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp
index ec513694..e78f537f 100644
--- a/dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp
+++ b/dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp
@@ -3,6 +3,8 @@
 #include "SkillComponent.h"
 #include "BaseCombatAIComponent.h"
 #include "DestroyableComponent.h"
+#include "eAninmationFlags.h"
+#include "EntityInfo.h"
 
 void FvMaelstromDragon::OnStartup(Entity* self) {
 	self->SetVar<int32_t>(u"weakspot", 0);
diff --git a/dScripts/02_server/Enemy/General/BaseEnemyApe.cpp b/dScripts/02_server/Enemy/General/BaseEnemyApe.cpp
index 96419c08..ea3ce9b8 100644
--- a/dScripts/02_server/Enemy/General/BaseEnemyApe.cpp
+++ b/dScripts/02_server/Enemy/General/BaseEnemyApe.cpp
@@ -3,7 +3,9 @@
 #include "DestroyableComponent.h"
 #include "GameMessages.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 #include "SkillComponent.h"
+#include "eAninmationFlags.h"
 
 void BaseEnemyApe::OnStartup(Entity* self) {
 	self->SetVar<uint32_t>(u"timesStunned", 2);
@@ -129,7 +131,7 @@ void BaseEnemyApe::StunApe(Entity* self, bool stunState) {
 			skillComponent->Interrupt();
 		}
 
-		GameMessages::SendSetStunned(self->GetObjectID(), stunState ? PUSH : POP, UNASSIGNED_SYSTEM_ADDRESS, self->GetObjectID(),
+		GameMessages::SendSetStunned(self->GetObjectID(), stunState ? eStateChangeType::PUSH : eStateChangeType::POP, UNASSIGNED_SYSTEM_ADDRESS, self->GetObjectID(),
 			true, true, true, true, true,
 			true, true, true, true);
 
diff --git a/dScripts/02_server/Enemy/General/BaseEnemyMech.cpp b/dScripts/02_server/Enemy/General/BaseEnemyMech.cpp
index 8017be2c..8c200566 100644
--- a/dScripts/02_server/Enemy/General/BaseEnemyMech.cpp
+++ b/dScripts/02_server/Enemy/General/BaseEnemyMech.cpp
@@ -3,6 +3,7 @@
 #include "ControllablePhysicsComponent.h"
 #include "EntityManager.h"
 #include "dpWorld.h"
+#include "EntityInfo.h"
 #include "GeneralUtils.h"
 #include "DestroyableComponent.h"
 
diff --git a/dScripts/02_server/Enemy/General/TreasureChestDragonServer.cpp b/dScripts/02_server/Enemy/General/TreasureChestDragonServer.cpp
index 15f0709c..19788677 100644
--- a/dScripts/02_server/Enemy/General/TreasureChestDragonServer.cpp
+++ b/dScripts/02_server/Enemy/General/TreasureChestDragonServer.cpp
@@ -2,6 +2,7 @@
 #include "ScriptedActivityComponent.h"
 #include "TeamManager.h"
 #include "EntityManager.h"
+#include "Loot.h"
 
 void TreasureChestDragonServer::OnStartup(Entity* self) {
 
diff --git a/dScripts/02_server/Equipment/BootyDigServer.cpp b/dScripts/02_server/Equipment/BootyDigServer.cpp
index d38791d8..73d96b1f 100644
--- a/dScripts/02_server/Equipment/BootyDigServer.cpp
+++ b/dScripts/02_server/Equipment/BootyDigServer.cpp
@@ -3,6 +3,7 @@
 #include "RenderComponent.h"
 #include "MissionComponent.h"
 #include "MissionTaskType.h"
+#include "Loot.h"
 
 void BootyDigServer::OnStartup(Entity* self) {
 	auto* zoneControlObject = EntityManager::Instance()->GetZoneControlEntity();
diff --git a/dScripts/02_server/Map/AG/NpcPirateServer.cpp b/dScripts/02_server/Map/AG/NpcPirateServer.cpp
index 47571fa6..154fe2bc 100644
--- a/dScripts/02_server/Map/AG/NpcPirateServer.cpp
+++ b/dScripts/02_server/Map/AG/NpcPirateServer.cpp
@@ -1,4 +1,5 @@
 #include "NpcPirateServer.h"
+#include "MissionState.h"
 #include "InventoryComponent.h"
 
 void NpcPirateServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) {
diff --git a/dScripts/02_server/Map/AG/NpcWispServer.cpp b/dScripts/02_server/Map/AG/NpcWispServer.cpp
index cd4a4d9c..d6eab34c 100644
--- a/dScripts/02_server/Map/AG/NpcWispServer.cpp
+++ b/dScripts/02_server/Map/AG/NpcWispServer.cpp
@@ -3,6 +3,7 @@
 #include "EntityManager.h"
 #include "Entity.h"
 #include "GameMessages.h"
+#include "MissionState.h"
 
 void NpcWispServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) {
 	if (missionID != 1849 && missionID != 1883)
diff --git a/dScripts/02_server/Map/AG/RemoveRentalGear.cpp b/dScripts/02_server/Map/AG/RemoveRentalGear.cpp
index 06d964b9..fbb00c79 100644
--- a/dScripts/02_server/Map/AG/RemoveRentalGear.cpp
+++ b/dScripts/02_server/Map/AG/RemoveRentalGear.cpp
@@ -1,6 +1,7 @@
 #include "RemoveRentalGear.h"
 #include "InventoryComponent.h"
 #include "Item.h"
+#include "MissionState.h"
 #include "Character.h"
 
 /*
diff --git a/dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp b/dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp
index ea517448..5996548f 100644
--- a/dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp
+++ b/dScripts/02_server/Map/AG_Spider_Queen/ZoneAgSpiderQueen.cpp
@@ -3,6 +3,7 @@
 #include "EntityManager.h"
 #include "ZoneAgProperty.h"
 #include "DestroyableComponent.h"
+#include "EntityInfo.h"
 
 void ZoneAgSpiderQueen::SetGameVariables(Entity* self) {
 	ZoneAgProperty::SetGameVariables(self);
diff --git a/dScripts/02_server/Map/AM/AmBlueX.cpp b/dScripts/02_server/Map/AM/AmBlueX.cpp
index 97f80e77..8e32694c 100644
--- a/dScripts/02_server/Map/AM/AmBlueX.cpp
+++ b/dScripts/02_server/Map/AM/AmBlueX.cpp
@@ -1,6 +1,7 @@
 #include "AmBlueX.h"
 #include "SkillComponent.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 #include "Character.h"
 
 void AmBlueX::OnUse(Entity* self, Entity* user) {
diff --git a/dScripts/02_server/Map/AM/AmShieldGenerator.cpp b/dScripts/02_server/Map/AM/AmShieldGenerator.cpp
index d16acb87..5d1b7d08 100644
--- a/dScripts/02_server/Map/AM/AmShieldGenerator.cpp
+++ b/dScripts/02_server/Map/AM/AmShieldGenerator.cpp
@@ -2,6 +2,7 @@
 #include "EntityManager.h"
 #include "DestroyableComponent.h"
 #include "GameMessages.h"
+#include "EntityInfo.h"
 #include "MovementAIComponent.h"
 #include "BaseCombatAIComponent.h"
 #include "SkillComponent.h"
diff --git a/dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.cpp b/dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.cpp
index 9f27b904..3188db33 100644
--- a/dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.cpp
+++ b/dScripts/02_server/Map/AM/AmShieldGeneratorQuickbuild.cpp
@@ -5,6 +5,7 @@
 #include "MovementAIComponent.h"
 #include "BaseCombatAIComponent.h"
 #include "SkillComponent.h"
+#include "EntityInfo.h"
 #include "RebuildComponent.h"
 #include "MissionComponent.h"
 
diff --git a/dScripts/02_server/Map/AM/AmSkullkinDrill.cpp b/dScripts/02_server/Map/AM/AmSkullkinDrill.cpp
index 321660e2..da1954d6 100644
--- a/dScripts/02_server/Map/AM/AmSkullkinDrill.cpp
+++ b/dScripts/02_server/Map/AM/AmSkullkinDrill.cpp
@@ -4,6 +4,7 @@
 #include "DestroyableComponent.h"
 #include "ProximityMonitorComponent.h"
 #include "MissionComponent.h"
+#include "EntityInfo.h"
 
 void AmSkullkinDrill::OnStartup(Entity* self) {
 	self->SetNetworkVar(u"bIsInUse", false);
@@ -146,21 +147,21 @@ void AmSkullkinDrill::OnUse(Entity* self, Entity* user) {
 }
 
 void AmSkullkinDrill::FreezePlayer(Entity* self, Entity* player, bool bFreeze) {
-	eStunState eChangeType = POP;
+	auto StateChangeType = eStateChangeType::POP;
 
 	if (bFreeze) {
 		if (player->GetIsDead()) {
 			return;
 		}
 
-		eChangeType = PUSH;
+		StateChangeType = eStateChangeType::PUSH;
 	} else {
 		if (player->GetIsDead()) {
 			//
 		}
 	}
 
-	GameMessages::SendSetStunned(player->GetObjectID(), eChangeType, player->GetSystemAddress(), self->GetObjectID(),
+	GameMessages::SendSetStunned(player->GetObjectID(), StateChangeType, player->GetSystemAddress(), self->GetObjectID(),
 		true, false, true, false, true, false, true
 	);
 }
diff --git a/dScripts/02_server/Map/AM/AmSkullkinTower.cpp b/dScripts/02_server/Map/AM/AmSkullkinTower.cpp
index 180bbdac..01acdeaf 100644
--- a/dScripts/02_server/Map/AM/AmSkullkinTower.cpp
+++ b/dScripts/02_server/Map/AM/AmSkullkinTower.cpp
@@ -2,6 +2,7 @@
 #include "EntityManager.h"
 #include "DestroyableComponent.h"
 #include "MovingPlatformComponent.h"
+#include "EntityInfo.h"
 #include "GameMessages.h"
 #include "MissionComponent.h"
 
diff --git a/dScripts/02_server/Map/FV/EnemyRoninSpawner.cpp b/dScripts/02_server/Map/FV/EnemyRoninSpawner.cpp
index b6cae3bb..cfc58fa0 100644
--- a/dScripts/02_server/Map/FV/EnemyRoninSpawner.cpp
+++ b/dScripts/02_server/Map/FV/EnemyRoninSpawner.cpp
@@ -1,6 +1,7 @@
 #include "EnemyRoninSpawner.h"
 #include "SkillComponent.h"
 #include "RenderComponent.h"
+#include "EntityInfo.h"
 #include "EntityManager.h"
 
 void EnemyRoninSpawner::OnStartup(Entity* self) {
diff --git a/dScripts/02_server/Map/GF/GfCaptainsCannon.cpp b/dScripts/02_server/Map/GF/GfCaptainsCannon.cpp
index 7d67c781..eeabeef6 100644
--- a/dScripts/02_server/Map/GF/GfCaptainsCannon.cpp
+++ b/dScripts/02_server/Map/GF/GfCaptainsCannon.cpp
@@ -13,7 +13,7 @@ void GfCaptainsCannon::OnUse(Entity* self, Entity* user) {
 	self->SetVar<bool>(u"bIsInUse", true);
 	self->SetNetworkVar<bool>(u"bIsInUse", true);
 
-	GameMessages::SendSetStunned(user->GetObjectID(), PUSH, user->GetSystemAddress(),
+	GameMessages::SendSetStunned(user->GetObjectID(), eStateChangeType::PUSH, user->GetSystemAddress(),
 		LWOOBJID_EMPTY, true, true, true, true, true, true, true, true
 	);
 
@@ -63,7 +63,7 @@ void GfCaptainsCannon::OnTimerDone(Entity* self, std::string timerName) {
 
 		GameMessages::SendPlay2DAmbientSound(player, "{7457d85c-4537-4317-ac9d-2f549219ea87}");
 	} else if (timerName == "cinematicTimer") {
-		GameMessages::SendSetStunned(playerId, POP, player->GetSystemAddress(),
+		GameMessages::SendSetStunned(playerId, eStateChangeType::POP, player->GetSystemAddress(),
 			LWOOBJID_EMPTY, true, true, true, true, true, true, true, true
 		);
 
diff --git a/dScripts/02_server/Map/GF/MastTeleport.cpp b/dScripts/02_server/Map/GF/MastTeleport.cpp
index ebde7b20..dac5783c 100644
--- a/dScripts/02_server/Map/GF/MastTeleport.cpp
+++ b/dScripts/02_server/Map/GF/MastTeleport.cpp
@@ -16,7 +16,7 @@ void MastTeleport::OnRebuildComplete(Entity* self, Entity* target) {
 	if (Preconditions::Check(target, 154) && Preconditions::Check(target, 44)) {
 		self->SetVar<LWOOBJID>(u"userID", target->GetObjectID());
 
-		GameMessages::SendSetStunned(target->GetObjectID(), PUSH, target->GetSystemAddress(),
+		GameMessages::SendSetStunned(target->GetObjectID(), eStateChangeType::PUSH, target->GetSystemAddress(),
 			LWOOBJID_EMPTY, true, true, true, true, true, true, true
 		);
 
@@ -81,7 +81,7 @@ void MastTeleport::OnTimerDone(Entity* self, std::string timerName) {
 
 		GameMessages::SendTeleport(playerId, position, NiQuaternion::IDENTITY, player->GetSystemAddress());
 
-		GameMessages::SendSetStunned(playerId, POP, player->GetSystemAddress(),
+		GameMessages::SendSetStunned(playerId, eStateChangeType::POP, player->GetSystemAddress(),
 			LWOOBJID_EMPTY, true, true, true, true, true, true, true
 		);
 	}
diff --git a/dScripts/02_server/Map/General/BankInteractServer.cpp b/dScripts/02_server/Map/General/BankInteractServer.cpp
index db5ebb98..b96187cf 100644
--- a/dScripts/02_server/Map/General/BankInteractServer.cpp
+++ b/dScripts/02_server/Map/General/BankInteractServer.cpp
@@ -1,5 +1,7 @@
 #include "BankInteractServer.h"
 #include "GameMessages.h"
+#include "Entity.h"
+#include "AMFFormat.h"
 
 void BankInteractServer::OnUse(Entity* self, Entity* user) {
 	AMFArrayValue args;
diff --git a/dScripts/02_server/Map/General/GrowingFlower.cpp b/dScripts/02_server/Map/General/GrowingFlower.cpp
index 7b495841..61bfbc30 100644
--- a/dScripts/02_server/Map/General/GrowingFlower.cpp
+++ b/dScripts/02_server/Map/General/GrowingFlower.cpp
@@ -1,5 +1,6 @@
 #include "GrowingFlower.h"
 #include "MissionComponent.h"
+#include "Loot.h"
 
 void GrowingFlower::OnSkillEventFired(Entity* self, Entity* target, const std::string& message) {
 	if (!self->GetVar<bool>(u"blooming") && (message == "waterspray" || message == "shovelgrow")) {
diff --git a/dScripts/02_server/Map/General/PetDigServer.cpp b/dScripts/02_server/Map/General/PetDigServer.cpp
index e26b079a..0d62ff04 100644
--- a/dScripts/02_server/Map/General/PetDigServer.cpp
+++ b/dScripts/02_server/Map/General/PetDigServer.cpp
@@ -4,6 +4,7 @@
 #include "EntityManager.h"
 #include "Character.h"
 #include "PetComponent.h"
+#include "User.h"
 
 std::vector<LWOOBJID> PetDigServer::treasures{};
 
diff --git a/dScripts/02_server/Map/General/PropertyPlatform.cpp b/dScripts/02_server/Map/General/PropertyPlatform.cpp
index 89687ac3..902b9646 100644
--- a/dScripts/02_server/Map/General/PropertyPlatform.cpp
+++ b/dScripts/02_server/Map/General/PropertyPlatform.cpp
@@ -1,6 +1,7 @@
 #include "PropertyPlatform.h"
 #include "RebuildComponent.h"
 #include "GameMessages.h"
+#include "MovingPlatformComponent.h"
 
 void PropertyPlatform::OnRebuildComplete(Entity* self, Entity* target) {
 	//    auto* movingPlatform = self->GetComponent<MovingPlatformComponent>();
@@ -9,7 +10,7 @@ void PropertyPlatform::OnRebuildComplete(Entity* self, Entity* target) {
 	//        movingPlatform->SetNoAutoStart(true);
 	//    }
 	GameMessages::SendPlatformResync(self, UNASSIGNED_SYSTEM_ADDRESS, true, 0,
-		0, 0, MovementPlatformState::Stationary);
+		0, 0, eMovementPlatformState::Stationary);
 }
 
 void PropertyPlatform::OnUse(Entity* self, Entity* user) {
@@ -20,7 +21,7 @@ void PropertyPlatform::OnUse(Entity* self, Entity* user) {
 		//            movingPlatform->GotoWaypoint(1);
 		//        }
 		GameMessages::SendPlatformResync(self, UNASSIGNED_SYSTEM_ADDRESS, true, 0,
-			1, 1, MovementPlatformState::Moving);
+			1, 1, eMovementPlatformState::Moving);
 
 		self->AddCallbackTimer(movementDelay + effectDelay, [self, this]() {
 			self->SetNetworkVar<float_t>(u"startEffect", dieDelay);
diff --git a/dScripts/02_server/Map/General/QbSpawner.cpp b/dScripts/02_server/Map/General/QbSpawner.cpp
index edee6148..d5c9d001 100644
--- a/dScripts/02_server/Map/General/QbSpawner.cpp
+++ b/dScripts/02_server/Map/General/QbSpawner.cpp
@@ -1,5 +1,6 @@
 #include "QbSpawner.h"
 #include "BaseCombatAIComponent.h"
+#include "EntityInfo.h"
 #include "MovementAIComponent.h"
 
 void QbSpawner::OnStartup(Entity* self) {
@@ -133,4 +134,3 @@ void QbSpawner::AggroTargetObject(Entity* self, Entity* enemy) {
 	}
 
 }
-
diff --git a/dScripts/02_server/Map/General/WishingWellServer.cpp b/dScripts/02_server/Map/General/WishingWellServer.cpp
index 8ac9e0b2..fa3e13e0 100644
--- a/dScripts/02_server/Map/General/WishingWellServer.cpp
+++ b/dScripts/02_server/Map/General/WishingWellServer.cpp
@@ -1,6 +1,8 @@
 #include "WishingWellServer.h"
 #include "ScriptedActivityComponent.h"
 #include "GameMessages.h"
+#include "Loot.h"
+#include "EntityManager.h"
 
 void WishingWellServer::OnStartup(Entity* self) {
 }
diff --git a/dScripts/02_server/Map/NS/NsConcertChoiceBuildManager.cpp b/dScripts/02_server/Map/NS/NsConcertChoiceBuildManager.cpp
index 33436525..a338d9c9 100644
--- a/dScripts/02_server/Map/NS/NsConcertChoiceBuildManager.cpp
+++ b/dScripts/02_server/Map/NS/NsConcertChoiceBuildManager.cpp
@@ -1,4 +1,5 @@
 #include "NsConcertChoiceBuildManager.h"
+#include "EntityInfo.h"
 #include "EntityManager.h"
 
 const std::vector<Crate> NsConcertChoiceBuildManager::crates{
diff --git a/dScripts/02_server/Map/NS/NsLegoClubDoor.h b/dScripts/02_server/Map/NS/NsLegoClubDoor.h
index 0a7a6ee0..db1dcae4 100644
--- a/dScripts/02_server/Map/NS/NsLegoClubDoor.h
+++ b/dScripts/02_server/Map/NS/NsLegoClubDoor.h
@@ -2,6 +2,7 @@
 #include "CppScripts.h"
 #include "ChooseYourDestinationNsToNt.h"
 #include "BaseConsoleTeleportServer.h"
+#include "AMFFormat.h"
 
 class NsLegoClubDoor : public CppScripts::Script, ChooseYourDestinationNsToNt, BaseConsoleTeleportServer
 {
diff --git a/dScripts/02_server/Map/NS/NsLupTeleport.h b/dScripts/02_server/Map/NS/NsLupTeleport.h
index 35edf0bc..28bab016 100644
--- a/dScripts/02_server/Map/NS/NsLupTeleport.h
+++ b/dScripts/02_server/Map/NS/NsLupTeleport.h
@@ -2,6 +2,7 @@
 #include "CppScripts.h"
 #include "ChooseYourDestinationNsToNt.h"
 #include "BaseConsoleTeleportServer.h"
+#include "AMFFormat.h"
 
 class NsLupTeleport : public CppScripts::Script, ChooseYourDestinationNsToNt, BaseConsoleTeleportServer
 {
diff --git a/dScripts/02_server/Map/NT/NtAssemblyTubeServer.cpp b/dScripts/02_server/Map/NT/NtAssemblyTubeServer.cpp
index f30f4fc7..5410047d 100644
--- a/dScripts/02_server/Map/NT/NtAssemblyTubeServer.cpp
+++ b/dScripts/02_server/Map/NT/NtAssemblyTubeServer.cpp
@@ -36,7 +36,7 @@ void NtAssemblyTubeServer::RunAssemblyTube(Entity* self, Entity* player) {
 	if (player->IsPlayer() && !bPlayerBeingTeleported) {
 		auto teleCinematic = self->GetVar<std::u16string>(u"Cinematic");
 
-		GameMessages::SendSetStunned(playerID, PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
+		GameMessages::SendSetStunned(playerID, eStateChangeType::PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
 			true, true, true, true, true, true, true
 		);
 
@@ -108,7 +108,7 @@ void NtAssemblyTubeServer::UnlockPlayer(Entity* self, Entity* player) {
 
 	m_TeleportingPlayerTable[playerID] = false;
 
-	GameMessages::SendSetStunned(playerID, POP, player->GetSystemAddress(), LWOOBJID_EMPTY,
+	GameMessages::SendSetStunned(playerID, eStateChangeType::POP, player->GetSystemAddress(), LWOOBJID_EMPTY,
 		true, true, true, true, true, true, true
 	);
 }
diff --git a/dScripts/02_server/Map/NT/NtCombatChallengeServer.cpp b/dScripts/02_server/Map/NT/NtCombatChallengeServer.cpp
index 2b88ccf8..d27ac1f6 100644
--- a/dScripts/02_server/Map/NT/NtCombatChallengeServer.cpp
+++ b/dScripts/02_server/Map/NT/NtCombatChallengeServer.cpp
@@ -1,6 +1,7 @@
 #include "NtCombatChallengeServer.h"
 #include "GameMessages.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 #include "InventoryComponent.h"
 #include "MissionComponent.h"
 
diff --git a/dScripts/02_server/Map/NT/NtParadoxPanelServer.cpp b/dScripts/02_server/Map/NT/NtParadoxPanelServer.cpp
index 06482c82..8d14050b 100644
--- a/dScripts/02_server/Map/NT/NtParadoxPanelServer.cpp
+++ b/dScripts/02_server/Map/NT/NtParadoxPanelServer.cpp
@@ -34,11 +34,11 @@ void NtParadoxPanelServer::OnUse(Entity* self, Entity* user) {
 			GameMessages::SendPlayAnimation(player, u"rebuild-celebrate");
 
 			GameMessages::SendNotifyClientObject(self->GetObjectID(), u"SparkStop", 0, 0, player->GetObjectID(), "", player->GetSystemAddress());
-			GameMessages::SendSetStunned(player->GetObjectID(), eStunState::POP, player->GetSystemAddress(), LWOOBJID_EMPTY, false, false, true, false, true, true, false, false, true);
+			GameMessages::SendSetStunned(player->GetObjectID(), eStateChangeType::POP, player->GetSystemAddress(), LWOOBJID_EMPTY, false, false, true, false, true, true, false, false, true);
 			self->SetVar(u"bActive", false);
 			});
 		GameMessages::SendPlayAnimation(user, u"nexus-powerpanel", 6.0f);
-		GameMessages::SendSetStunned(user->GetObjectID(), eStunState::PUSH, user->GetSystemAddress(), LWOOBJID_EMPTY, false, false, true, false, true, true, false, false, true);
+		GameMessages::SendSetStunned(user->GetObjectID(), eStateChangeType::PUSH, user->GetSystemAddress(), LWOOBJID_EMPTY, false, false, true, false, true, true, false, false, true);
 		return;
 	}
 
diff --git a/dScripts/02_server/Map/NT/NtParadoxTeleServer.cpp b/dScripts/02_server/Map/NT/NtParadoxTeleServer.cpp
index 8003e93f..64af4d34 100644
--- a/dScripts/02_server/Map/NT/NtParadoxTeleServer.cpp
+++ b/dScripts/02_server/Map/NT/NtParadoxTeleServer.cpp
@@ -22,7 +22,7 @@ void NtParadoxTeleServer::OnProximityUpdate(Entity* self, Entity* entering, std:
 	const auto bPlayerBeingTeleported = m_TeleportingPlayerTable[playerID];
 
 	if (player->IsPlayer() && !bPlayerBeingTeleported) {
-		GameMessages::SendSetStunned(playerID, PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
+		GameMessages::SendSetStunned(playerID, eStateChangeType::PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
 			true, true, true, true, true, true, true
 		);
 
@@ -100,7 +100,7 @@ void NtParadoxTeleServer::UnlockPlayer(Entity* self, Entity* player) {
 
 	m_TeleportingPlayerTable[playerID] = false;
 
-	GameMessages::SendSetStunned(playerID, POP, player->GetSystemAddress(), LWOOBJID_EMPTY,
+	GameMessages::SendSetStunned(playerID, eStateChangeType::POP, player->GetSystemAddress(), LWOOBJID_EMPTY,
 		true, true, true, true, true, true, true
 	);
 
diff --git a/dScripts/02_server/Map/NT/NtVandaServer.cpp b/dScripts/02_server/Map/NT/NtVandaServer.cpp
index bfc35203..e5653005 100644
--- a/dScripts/02_server/Map/NT/NtVandaServer.cpp
+++ b/dScripts/02_server/Map/NT/NtVandaServer.cpp
@@ -1,5 +1,6 @@
 #include "NtVandaServer.h"
 #include "InventoryComponent.h"
+#include "MissionState.h"
 
 void NtVandaServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) {
 
diff --git a/dScripts/02_server/Map/NT/NtVentureCannonServer.cpp b/dScripts/02_server/Map/NT/NtVentureCannonServer.cpp
index d7f4cb99..e6cd2df6 100644
--- a/dScripts/02_server/Map/NT/NtVentureCannonServer.cpp
+++ b/dScripts/02_server/Map/NT/NtVentureCannonServer.cpp
@@ -14,7 +14,7 @@ void NtVentureCannonServer::OnUse(Entity* self, Entity* user) {
 
 	self->SetNetworkVar(u"bIsInUse", true);
 
-	GameMessages::SendSetStunned(playerID, PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
+	GameMessages::SendSetStunned(playerID, eStateChangeType::PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
 		true, true, true, true, true, true, true
 	);
 
@@ -92,7 +92,7 @@ void NtVentureCannonServer::ExitCannonEnded(Entity* self, Entity* player) {
 }
 
 void NtVentureCannonServer::UnlockCannonPlayer(Entity* self, Entity* player) {
-	GameMessages::SendSetStunned(player->GetObjectID(), POP, player->GetSystemAddress(), LWOOBJID_EMPTY,
+	GameMessages::SendSetStunned(player->GetObjectID(), eStateChangeType::POP, player->GetSystemAddress(), LWOOBJID_EMPTY,
 		true, true, true, true, true, true, true
 	);
 
diff --git a/dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.cpp b/dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.cpp
index 96302a33..695bd92f 100644
--- a/dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.cpp
+++ b/dScripts/02_server/Map/Property/AG_Small/EnemySpiderSpawner.cpp
@@ -1,6 +1,7 @@
 #include "EnemySpiderSpawner.h"
 #include "GameMessages.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 #include "DestroyableComponent.h"
 
 //----------------------------------------------
diff --git a/dScripts/02_server/Map/Property/PropertyBankInteract.cpp b/dScripts/02_server/Map/Property/PropertyBankInteract.cpp
index 788768ca..9e727f39 100644
--- a/dScripts/02_server/Map/Property/PropertyBankInteract.cpp
+++ b/dScripts/02_server/Map/Property/PropertyBankInteract.cpp
@@ -1,6 +1,7 @@
 #include "PropertyBankInteract.h"
 #include "EntityManager.h"
 #include "GameMessages.h"
+#include "AMFFormat.h"
 
 void PropertyBankInteract::OnStartup(Entity* self) {
 	auto* zoneControl = EntityManager::Instance()->GetZoneControlEntity();
diff --git a/dScripts/02_server/Map/VE/VeEpsilonServer.cpp b/dScripts/02_server/Map/VE/VeEpsilonServer.cpp
index cc6ecafe..4a2f1bbf 100644
--- a/dScripts/02_server/Map/VE/VeEpsilonServer.cpp
+++ b/dScripts/02_server/Map/VE/VeEpsilonServer.cpp
@@ -2,6 +2,8 @@
 #include "Character.h"
 #include "EntityManager.h"
 #include "GameMessages.h"
+#include "MissionState.h"
+#include "Entity.h"
 
 void VeEpsilonServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) {
 	auto* character = target->GetCharacter();
diff --git a/dScripts/02_server/Map/VE/VeMissionConsole.cpp b/dScripts/02_server/Map/VE/VeMissionConsole.cpp
index 2a424c4d..534f8c06 100644
--- a/dScripts/02_server/Map/VE/VeMissionConsole.cpp
+++ b/dScripts/02_server/Map/VE/VeMissionConsole.cpp
@@ -2,6 +2,7 @@
 #include "InventoryComponent.h"
 #include "Character.h"
 #include "GameMessages.h"
+#include "Loot.h"
 
 void VeMissionConsole::OnUse(Entity* self, Entity* user) {
 	LootGenerator::Instance().DropActivityLoot(user, self, 12551);
diff --git a/dScripts/02_server/Map/njhub/EnemySkeletonSpawner.cpp b/dScripts/02_server/Map/njhub/EnemySkeletonSpawner.cpp
index 451fa1d5..0e2e4005 100644
--- a/dScripts/02_server/Map/njhub/EnemySkeletonSpawner.cpp
+++ b/dScripts/02_server/Map/njhub/EnemySkeletonSpawner.cpp
@@ -2,6 +2,7 @@
 #include "SkillComponent.h"
 #include "RenderComponent.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 
 void EnemySkeletonSpawner::OnStartup(Entity* self) {
 	self->SetProximityRadius(15, "ronin");
diff --git a/dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.cpp b/dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.cpp
index fa4d8556..be9fcbd9 100644
--- a/dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.cpp
+++ b/dScripts/02_server/Map/njhub/NjDragonEmblemChestServer.cpp
@@ -1,5 +1,8 @@
 #include "NjDragonEmblemChestServer.h"
 #include "Character.h"
+#include "EntityInfo.h"
+#include "Loot.h"
+#include "Entity.h"
 #include "DestroyableComponent.h"
 
 void NjDragonEmblemChestServer::OnUse(Entity* self, Entity* user) {
diff --git a/dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.cpp b/dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.cpp
index 19f5f42a..69838dc8 100644
--- a/dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.cpp
+++ b/dScripts/02_server/Map/njhub/NjNPCMissionSpinjitzuServer.cpp
@@ -1,6 +1,7 @@
 #include "NjNPCMissionSpinjitzuServer.h"
 #include "Character.h"
 #include "EntityManager.h"
+#include "MissionState.h"
 
 void NjNPCMissionSpinjitzuServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID,
 	MissionState missionState) {
diff --git a/dScripts/02_server/Map/njhub/RainOfArrows.cpp b/dScripts/02_server/Map/njhub/RainOfArrows.cpp
index 141cd3ab..b7c4c074 100644
--- a/dScripts/02_server/Map/njhub/RainOfArrows.cpp
+++ b/dScripts/02_server/Map/njhub/RainOfArrows.cpp
@@ -1,6 +1,7 @@
 #include "RainOfArrows.h"
 #include "EntityManager.h"
 #include "SkillComponent.h"
+#include "EntityInfo.h"
 #include "GameMessages.h"
 
 void RainOfArrows::OnStartup(Entity* self) {
diff --git a/dScripts/02_server/Minigame/General/MinigameTreasureChestServer.cpp b/dScripts/02_server/Minigame/General/MinigameTreasureChestServer.cpp
index 66222d59..7df8fc12 100644
--- a/dScripts/02_server/Minigame/General/MinigameTreasureChestServer.cpp
+++ b/dScripts/02_server/Minigame/General/MinigameTreasureChestServer.cpp
@@ -3,6 +3,7 @@
 #include "TeamManager.h"
 #include "EntityManager.h"
 #include "dZoneManager.h"
+#include "Loot.h"
 
 void MinigameTreasureChestServer::OnUse(Entity* self, Entity* user) {
 	auto* sac = self->GetComponent<ScriptedActivityComponent>();
diff --git a/dScripts/02_server/Objects/StinkyFishTarget.cpp b/dScripts/02_server/Objects/StinkyFishTarget.cpp
index 19dbce88..21d92fac 100644
--- a/dScripts/02_server/Objects/StinkyFishTarget.cpp
+++ b/dScripts/02_server/Objects/StinkyFishTarget.cpp
@@ -1,5 +1,6 @@
 #include "StinkyFishTarget.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 
 void StinkyFishTarget::OnStartup(Entity* self) {
 	auto position = self->GetPosition();
diff --git a/dScripts/ActivityManager.cpp b/dScripts/ActivityManager.cpp
index 36e85b11..078a7a02 100644
--- a/dScripts/ActivityManager.cpp
+++ b/dScripts/ActivityManager.cpp
@@ -5,6 +5,7 @@
 #include "GameMessages.h"
 #include <algorithm>
 #include "dLogger.h"
+#include "Loot.h"
 
 bool ActivityManager::IsPlayerInActivity(Entity* self, LWOOBJID playerID) {
 	const auto* sac = self->GetComponent<ScriptedActivityComponent>();
diff --git a/dScripts/BaseConsoleTeleportServer.cpp b/dScripts/BaseConsoleTeleportServer.cpp
index a8538de5..d0162e9c 100644
--- a/dScripts/BaseConsoleTeleportServer.cpp
+++ b/dScripts/BaseConsoleTeleportServer.cpp
@@ -15,7 +15,8 @@ void BaseConsoleTeleportServer::BaseOnMessageBoxResponse(Entity* self, Entity* s
 
 	if (button == 1) {
 
-		GameMessages::SendSetStunned(player->GetObjectID(), PUSH, player->GetSystemAddress(), player->GetObjectID(),
+		GameMessages::SendSetStunned(
+			player->GetObjectID(), eStateChangeType::PUSH, player->GetSystemAddress(), player->GetObjectID(),
 			true, true, true, true, true, true, true
 		);
 
@@ -82,11 +83,10 @@ void BaseConsoleTeleportServer::TransferPlayer(Entity* self, Entity* player, int
 		return;
 	}
 
-	// Ignoring extra effects for now
-
-	/*GameMessages::SendSetStunned(player->GetObjectID(), POP, player->GetSystemAddress(), player->GetObjectID(),
+	GameMessages::SendSetStunned(
+		player->GetObjectID(), eStateChangeType::POP, player->GetSystemAddress(), player->GetObjectID(),
 		true, true, true, true, true, true, true
-	);*/
+	);
 
 	GameMessages::SendTerminateInteraction(player->GetObjectID(), FROM_INTERACTION, player->GetObjectID());
 
diff --git a/dScripts/CppScripts.h b/dScripts/CppScripts.h
index e4a6d655..eb9b7a04 100644
--- a/dScripts/CppScripts.h
+++ b/dScripts/CppScripts.h
@@ -1,12 +1,13 @@
 #pragma once
-#include "dCommonVars.h"
-#include "MissionState.h"
+
+#include <cstdint>
 #include <string>
 #include <vector>
 
 class User;
 class Entity;
 class NiPoint3;
+enum class MissionState : int32_t;
 
 namespace CppScripts {
 	/**
diff --git a/dScripts/EquipmentScripts/PersonalFortress.cpp b/dScripts/EquipmentScripts/PersonalFortress.cpp
index e7e89e80..f5062f9b 100644
--- a/dScripts/EquipmentScripts/PersonalFortress.cpp
+++ b/dScripts/EquipmentScripts/PersonalFortress.cpp
@@ -2,49 +2,56 @@
 #include "GameMessages.h"
 #include "SkillComponent.h"
 #include "DestroyableComponent.h"
+#include "ControllablePhysicsComponent.h"
 #include "EntityManager.h"
 
 void PersonalFortress::OnStartup(Entity* self) {
 	auto* owner = self->GetOwner();
 	self->AddTimer("FireSkill", 1.5);
-	GameMessages::SendSetStunned(owner->GetObjectID(), PUSH, owner->GetSystemAddress(), LWOOBJID_EMPTY,
-		true, true, true, true, true, true, true, true, true
-	);
 
 	auto* destroyableComponent = owner->GetComponent<DestroyableComponent>();
+	if (destroyableComponent) destroyableComponent->SetStatusImmunity(
+			eStateChangeType::PUSH,
+			true, true, true, true, true, false, true, false, false
+		);
 
-	if (destroyableComponent != nullptr) {
-		destroyableComponent->PushImmunity();
-	}
+	auto* controllablePhysicsComponent = owner->GetComponent<ControllablePhysicsComponent>();
+	if (controllablePhysicsComponent) controllablePhysicsComponent->SetStunImmunity(
+			eStateChangeType::PUSH, LWOOBJID_EMPTY,
+			true, true, true, true, true, true
+		);
+
+	GameMessages::SendSetStunned(owner->GetObjectID(), eStateChangeType::PUSH, owner->GetSystemAddress(), LWOOBJID_EMPTY,
+		true, true, true, true, true, true, true, true, true
+	);
 
 	EntityManager::Instance()->SerializeEntity(owner);
 }
 
 void PersonalFortress::OnDie(Entity* self, Entity* killer) {
 	auto* owner = self->GetOwner();
-	GameMessages::SendSetStunned(owner->GetObjectID(), POP, owner->GetSystemAddress(), LWOOBJID_EMPTY,
+	auto* destroyableComponent = owner->GetComponent<DestroyableComponent>();
+	if (destroyableComponent) destroyableComponent->SetStatusImmunity(
+			eStateChangeType::POP,
+			true, true, true, true, true, false, true, false, false
+		);
+
+	auto* controllablePhysicsComponent = owner->GetComponent<ControllablePhysicsComponent>();
+	if (controllablePhysicsComponent) controllablePhysicsComponent->SetStunImmunity(
+			eStateChangeType::POP, LWOOBJID_EMPTY,
+			true, true, true, true, true, true
+		);
+
+	GameMessages::SendSetStunned(owner->GetObjectID(), eStateChangeType::POP, owner->GetSystemAddress(), LWOOBJID_EMPTY,
 		true, true, true, true, true, true, true, true, true
 	);
 
-	auto* destroyableComponent = owner->GetComponent<DestroyableComponent>();
-
-	if (destroyableComponent != nullptr) {
-		destroyableComponent->PopImmunity();
-	}
-
 	EntityManager::Instance()->SerializeEntity(owner);
 }
 
 void PersonalFortress::OnTimerDone(Entity* self, std::string timerName) {
 	if (timerName == "FireSkill") {
-		auto* owner = self->GetOwner();
-
 		auto* skillComponent = self->GetComponent<SkillComponent>();
-
-		if (skillComponent == nullptr) {
-			return;
-		}
-
-		skillComponent->CalculateBehavior(650, 13364, LWOOBJID_EMPTY, true, false);
+		if (skillComponent) skillComponent->CalculateBehavior(650, 13364, LWOOBJID_EMPTY, true, false);
 	}
 }
diff --git a/dScripts/NPCAddRemoveItem.cpp b/dScripts/NPCAddRemoveItem.cpp
index ce47b12a..1985a02b 100644
--- a/dScripts/NPCAddRemoveItem.cpp
+++ b/dScripts/NPCAddRemoveItem.cpp
@@ -1,5 +1,6 @@
 #include "NPCAddRemoveItem.h"
 #include "InventoryComponent.h"
+#include "MissionState.h"
 
 void NPCAddRemoveItem::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) {
 	auto* inventory = target->GetComponent<InventoryComponent>();
diff --git a/dScripts/ScriptedPowerupSpawner.cpp b/dScripts/ScriptedPowerupSpawner.cpp
index 730e65ba..3c1d1cca 100644
--- a/dScripts/ScriptedPowerupSpawner.cpp
+++ b/dScripts/ScriptedPowerupSpawner.cpp
@@ -1,6 +1,7 @@
 #include "ScriptedPowerupSpawner.h"
 #include "RenderComponent.h"
 #include "EntityManager.h"
+#include "Loot.h"
 
 void ScriptedPowerupSpawner::OnTemplateStartup(Entity* self) {
 	self->SetVar<uint32_t>(u"currentCycle", 1);
diff --git a/dScripts/SpawnPetBaseServer.cpp b/dScripts/SpawnPetBaseServer.cpp
index 1d73a5b8..d3c87288 100644
--- a/dScripts/SpawnPetBaseServer.cpp
+++ b/dScripts/SpawnPetBaseServer.cpp
@@ -2,6 +2,7 @@
 #include "GameMessages.h"
 #include "EntityManager.h"
 #include "PetComponent.h"
+#include "EntityInfo.h"
 
 void SpawnPetBaseServer::OnStartup(Entity* self) {
 	SetVariables(self);
diff --git a/dScripts/ai/AG/AgImagSmashable.cpp b/dScripts/ai/AG/AgImagSmashable.cpp
index 593294e5..195f7b9a 100644
--- a/dScripts/ai/AG/AgImagSmashable.cpp
+++ b/dScripts/ai/AG/AgImagSmashable.cpp
@@ -2,6 +2,7 @@
 #include "EntityManager.h"
 #include "GeneralUtils.h"
 #include "GameMessages.h"
+#include "EntityInfo.h"
 #include "DestroyableComponent.h"
 
 void AgImagSmashable::OnDie(Entity* self, Entity* killer) {
diff --git a/dScripts/ai/AG/AgPicnicBlanket.cpp b/dScripts/ai/AG/AgPicnicBlanket.cpp
index 30fb2950..d2a54d57 100644
--- a/dScripts/ai/AG/AgPicnicBlanket.cpp
+++ b/dScripts/ai/AG/AgPicnicBlanket.cpp
@@ -1,5 +1,7 @@
 #include "AgPicnicBlanket.h"
+#include "Loot.h"
 #include "GameMessages.h"
+#include "Entity.h"
 
 void AgPicnicBlanket::OnUse(Entity* self, Entity* user) {
 	GameMessages::SendTerminateInteraction(user->GetObjectID(), FROM_INTERACTION, self->GetObjectID());
diff --git a/dScripts/ai/AG/AgQbElevator.cpp b/dScripts/ai/AG/AgQbElevator.cpp
index ccb4d3b1..f1ac7bb5 100644
--- a/dScripts/ai/AG/AgQbElevator.cpp
+++ b/dScripts/ai/AG/AgQbElevator.cpp
@@ -15,7 +15,7 @@ void AgQbElevator::OnRebuildComplete(Entity* self, Entity* target) {
 	if (delayTime < 1) delayTime = 1;
 
 	GameMessages::SendPlatformResync(self, UNASSIGNED_SYSTEM_ADDRESS, true, 0,
-		0, 0, MovementPlatformState::Stationary);
+		0, 0, eMovementPlatformState::Stationary);
 
 	//add a timer that will kill the QB if no players get on in the killTime
 	self->AddTimer("startKillTimer", killTime);
@@ -33,7 +33,7 @@ void AgQbElevator::OnProximityUpdate(Entity* self, Entity* entering, std::string
 			self->CancelTimer("StartElevator");
 
 			GameMessages::SendPlatformResync(self, UNASSIGNED_SYSTEM_ADDRESS, true, 0,
-				1, 1, MovementPlatformState::Moving);
+				1, 1, eMovementPlatformState::Moving);
 		} else if (!self->GetBoolean(u"StartTimer")) {
 			self->SetBoolean(u"StartTimer", true);
 			self->AddTimer("StartElevator", startTime);
@@ -45,7 +45,7 @@ void AgQbElevator::OnTimerDone(Entity* self, std::string timerName) {
 
 	if (timerName == "StartElevator") {
 		GameMessages::SendPlatformResync(self, UNASSIGNED_SYSTEM_ADDRESS, true, 0,
-			1, 1, MovementPlatformState::Moving);
+			1, 1, eMovementPlatformState::Moving);
 	} else if (timerName == "startKillTimer") {
 		killTimerStartup(self);
 	} else if (timerName == "KillTimer") {
diff --git a/dScripts/ai/AG/AgSpaceStuff.cpp b/dScripts/ai/AG/AgSpaceStuff.cpp
index 80a87e70..30929ebf 100644
--- a/dScripts/ai/AG/AgSpaceStuff.cpp
+++ b/dScripts/ai/AG/AgSpaceStuff.cpp
@@ -1,4 +1,5 @@
 #include "AgSpaceStuff.h"
+#include "EntityInfo.h"
 #include "GeneralUtils.h"
 #include "GameMessages.h"
 #include "EntityManager.h"
diff --git a/dScripts/ai/FV/FvPandaSpawnerServer.cpp b/dScripts/ai/FV/FvPandaSpawnerServer.cpp
index e1f3fb96..d7dcabcd 100644
--- a/dScripts/ai/FV/FvPandaSpawnerServer.cpp
+++ b/dScripts/ai/FV/FvPandaSpawnerServer.cpp
@@ -2,6 +2,7 @@
 #include "Character.h"
 #include "EntityManager.h"
 #include "GameMessages.h"
+#include "EntityInfo.h"
 #include "ScriptedActivityComponent.h"
 
 void FvPandaSpawnerServer::OnCollisionPhantom(Entity* self, Entity* target) {
diff --git a/dScripts/ai/GF/GfBanana.cpp b/dScripts/ai/GF/GfBanana.cpp
index 3a71eded..95a831cd 100644
--- a/dScripts/ai/GF/GfBanana.cpp
+++ b/dScripts/ai/GF/GfBanana.cpp
@@ -2,6 +2,7 @@
 
 #include "Entity.h"
 #include "DestroyableComponent.h"
+#include "EntityInfo.h"
 #include "EntityManager.h"
 
 void GfBanana::SpawnBanana(Entity* self) {
diff --git a/dScripts/ai/GF/PetDigBuild.cpp b/dScripts/ai/GF/PetDigBuild.cpp
index ae159575..32e5b2e3 100644
--- a/dScripts/ai/GF/PetDigBuild.cpp
+++ b/dScripts/ai/GF/PetDigBuild.cpp
@@ -1,5 +1,6 @@
 #include "PetDigBuild.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 #include "MissionComponent.h"
 
 void PetDigBuild::OnRebuildComplete(Entity* self, Entity* target) {
diff --git a/dScripts/ai/GF/PirateRep.cpp b/dScripts/ai/GF/PirateRep.cpp
index eb4cf510..81d69672 100644
--- a/dScripts/ai/GF/PirateRep.cpp
+++ b/dScripts/ai/GF/PirateRep.cpp
@@ -1,5 +1,7 @@
 #include "PirateRep.h"
 #include "Character.h"
+#include "MissionState.h"
+#include "Entity.h"
 
 void PirateRep::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) {
 	if (missionID == m_PirateRepMissionID && missionState >= MissionState::MISSION_STATE_READY_TO_COMPLETE) {
diff --git a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
index 47bca374..f9146ec4 100644
--- a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
+++ b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
@@ -11,6 +11,7 @@
 #include "MovementAIComponent.h"
 #include "../dWorldServer/ObjectIDManager.h"
 #include "MissionComponent.h"
+#include "Loot.h"
 #include "InventoryComponent.h"
 
 void SGCannon::OnStartup(Entity* self) {
@@ -76,7 +77,7 @@ void SGCannon::OnActivityStateChangeRequest(Entity* self, LWOOBJID senderID, int
 		auto* player = EntityManager::Instance()->GetEntity(self->GetVar<LWOOBJID>(PlayerIDVariable));
 		if (player != nullptr) {
 			Game::logger->Log("SGCannon", "Player is ready");
-			/*GameMessages::SendSetStunned(player->GetObjectID(), PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
+			/*GameMessages::SendSetStunned(player->GetObjectID(), eStateChangeType::PUSH, player->GetSystemAddress(), LWOOBJID_EMPTY,
 										 true, true, true, true, true, true, true);*/
 
 			Game::logger->Log("SGCannon", "Sending ActivityEnter");
diff --git a/dScripts/ai/NS/WH/RockHydrantSmashable.cpp b/dScripts/ai/NS/WH/RockHydrantSmashable.cpp
index d76eca8d..b3a01567 100644
--- a/dScripts/ai/NS/WH/RockHydrantSmashable.cpp
+++ b/dScripts/ai/NS/WH/RockHydrantSmashable.cpp
@@ -1,5 +1,6 @@
 #include "RockHydrantSmashable.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 #include "GeneralUtils.h"
 
 void RockHydrantSmashable::OnDie(Entity* self, Entity* killer) {
diff --git a/dScripts/ai/PETS/HydrantSmashable.cpp b/dScripts/ai/PETS/HydrantSmashable.cpp
index 20baa58b..1ff082ea 100644
--- a/dScripts/ai/PETS/HydrantSmashable.cpp
+++ b/dScripts/ai/PETS/HydrantSmashable.cpp
@@ -1,5 +1,6 @@
 #include "HydrantSmashable.h"
 #include "EntityManager.h"
+#include "EntityInfo.h"
 #include "GeneralUtils.h"
 
 void HydrantSmashable::OnDie(Entity* self, Entity* killer) {
diff --git a/dScripts/ai/PROPERTY/AgPropguards.cpp b/dScripts/ai/PROPERTY/AgPropguards.cpp
index 674c4bdd..2bcfcf94 100644
--- a/dScripts/ai/PROPERTY/AgPropguards.cpp
+++ b/dScripts/ai/PROPERTY/AgPropguards.cpp
@@ -3,6 +3,7 @@
 #include "GameMessages.h"
 #include "EntityManager.h"
 #include "dZoneManager.h"
+#include "MissionState.h"
 
 void AgPropguards::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, MissionState missionState) {
 	auto* character = target->GetCharacter();
diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp
index 73157c09..b655bef3 100644
--- a/dWorldServer/WorldServer.cpp
+++ b/dWorldServer/WorldServer.cpp
@@ -42,6 +42,9 @@
 #include "CharacterComponent.h"
 
 #include "EntityManager.h"
+#include "EntityInfo.h"
+#include "User.h"
+#include "Loot.h"
 #include "Entity.h"
 #include "Character.h"
 #include "ChatPackets.h"
@@ -58,6 +61,8 @@
 #include "AssetManager.h"
 #include "LevelProgressionComponent.h"
 #include "eBlueprintSaveResponseType.h"
+#include "AMFFormat.h"
+#include "NiPoint3.h"
 
 #include "ZCompression.h"
 
diff --git a/dZoneManager/LUTriggers.h b/dZoneManager/LUTriggers.h
new file mode 100644
index 00000000..1869b4c3
--- /dev/null
+++ b/dZoneManager/LUTriggers.h
@@ -0,0 +1,30 @@
+#ifndef __LUTRIGGERS__H__
+#define __LUTRIGGERS__H__
+
+#include <string>
+#include <vector>
+
+class Command;
+class Event;
+
+namespace LUTriggers {
+	struct Command {
+		std::string id;
+		std::string target;
+		std::string targetName;
+		std::string args;
+	};
+
+	struct Event {
+		std::string eventID;
+		std::vector<Command*> commands;
+	};
+
+	struct Trigger {
+		uint32_t id;
+		bool enabled;
+		std::vector<Event*> events;
+	};
+};
+
+#endif  //!__LUTRIGGERS__H__
diff --git a/dZoneManager/Spawner.h b/dZoneManager/Spawner.h
index 908bb3a3..a42c8a65 100644
--- a/dZoneManager/Spawner.h
+++ b/dZoneManager/Spawner.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <functional>
 #include "LDFFormat.h"
+#include "EntityInfo.h"
 
 struct SpawnerNode {
 	NiPoint3 position = NiPoint3::ZERO;
diff --git a/dZoneManager/Zone.cpp b/dZoneManager/Zone.cpp
index ec73237e..79d940af 100644
--- a/dZoneManager/Zone.cpp
+++ b/dZoneManager/Zone.cpp
@@ -6,6 +6,7 @@
 #include "dLogger.h"
 #include "GeneralUtils.h"
 #include "BinaryIO.h"
+#include "LUTriggers.h"
 
 #include "AssetManager.h"
 #include "CDClientManager.h"
diff --git a/dZoneManager/Zone.h b/dZoneManager/Zone.h
index 978438aa..9c5322a1 100644
--- a/dZoneManager/Zone.h
+++ b/dZoneManager/Zone.h
@@ -1,35 +1,18 @@
 #pragma once
+
 #include "dZMCommon.h"
 #include "LDFFormat.h"
-#include "../thirdparty/tinyxml2/tinyxml2.h"
+#include "tinyxml2.h"
 #include <string>
 #include <vector>
 #include <map>
 
-class Level;
-
-class LUTriggers {
-public:
-
-	struct Command {
-		std::string id;
-		std::string target;
-		std::string targetName;
-		std::string args;
-	};
-
-	struct Event {
-		std::string eventID;
-		std::vector<Command*> commands;
-	};
-
-	struct Trigger {
-		uint32_t id;
-		bool enabled;
-		std::vector<Event*> events;
-	};
+namespace LUTriggers {
+	struct Trigger;
 };
 
+class Level;
+
 struct SceneRef {
 	std::string filename;
 	uint32_t id;
@@ -110,11 +93,11 @@ enum class PropertyPathType : int32_t {
 	GenetatedRectangle = 2
 };
 
-enum class PropertyType : int32_t{
+enum class PropertyType : int32_t {
 	Premiere = 0,
-    Prize = 1,
-    LUP = 2,
-    Headspace = 3
+	Prize = 1,
+	LUP = 2,
+	Headspace = 3
 };
 
 enum class PropertyRentalTimeUnit : int32_t {
@@ -222,7 +205,7 @@ public:
 
 	uint32_t GetWorldID() const { return m_WorldID; }
 	[[nodiscard]] std::string GetZoneName() const { return m_ZoneName; }
-	std::string GetZoneRawPath() const { return m_ZoneRawPath;}
+	std::string GetZoneRawPath() const { return m_ZoneRawPath; }
 	std::string GetZonePath() const { return m_ZonePath; }
 
 	const NiPoint3& GetSpawnPos() const { return m_Spawnpoint; }
@@ -254,7 +237,7 @@ private:
 
 	uint32_t m_PathDataLength;
 	uint32_t m_PathChunkVersion;
- 	std::vector<Path> m_Paths;
+	std::vector<Path> m_Paths;
 
 	std::map<LWOSCENEID, uint32_t, mapCompareLwoSceneIDs> m_MapRevisions; //rhs is the revision!
 
diff --git a/docs/Commands.md b/docs/Commands.md
index 060c2ba0..7dc11ff1 100644
--- a/docs/Commands.md
+++ b/docs/Commands.md
@@ -36,8 +36,6 @@
 |Command|Usage|Description|Admin Level Requirement|
 |--- |--- |--- |--- |
 |announce|`/announce`|Sends a announcement. `/setanntitle` and `/setannmsg` must be called first to configure the announcement.|8|
-|config-set|`/config-set <key> <value>`|Set configuration item.|8|
-|config-get|`/config-get <key>`|Get current value of a configuration item.|8|
 |kill|`/kill <username>`|Smashes the character whom the given user is playing.|8|
 |metrics|`/metrics`|Prints some information about the server's performance.|8|
 |setannmsg|`/setannmsg <title>`|Sets the message of an announcement.|8|
@@ -80,7 +78,7 @@ These commands are primarily for development and testing. The usage of many of t
 |inspect|`/inspect <component> (-m <waypoint> \| -a <animation> \| -s \| -p \| -f (faction) \| -t)`|Finds the closest entity with the given component or LDF variable (ignoring players and racing cars), printing its ID, distance from the player, and whether it is sleeping, as well as the the IDs of all components the entity has. See [Detailed `/inspect` Usage](#detailed-inspect-usage) below.|8|
 |list-spawns|`/list-spawns`|Lists all the character spawn points in the zone. Additionally, this command will display the current scene that plays when the character lands in the next zone, if there is one.|8|
 |locrow|`/locrow`|Prints the your current position and rotation information to the console.|8|
-|lookup|`/lookup <query>`|Searches through the Objects table in the client SQLite database for items whose display name, name, or description contains the query.|8|
+|lookup|`/lookup <query>`|Searches through the Objects table in the client SQLite database for items whose display name, name, or description contains the query.  Query can be multiple words delimited by spaces.|8|
 |playanimation|`/playanimation <id>`|Plays animation with given ID. Alias: `/playanim`.|8|
 |playeffect|`/playeffect <effect id> <effect type> <effect name>`|Plays an effect.|8|
 |playlvlfx|`/playlvlfx`|Plays the level up animation on your character.|8|
diff --git a/resources/worldconfig.ini b/resources/worldconfig.ini
index ee6b6651..0c24c447 100644
--- a/resources/worldconfig.ini
+++ b/resources/worldconfig.ini
@@ -43,3 +43,6 @@ pets_take_imagination=1
 # If you would like to increase the maximum number of best friends a player can have on the server
 # Change the value below to what you would like this to be (5 is live accurate)
 max_number_of_best_friends=5
+
+# Disables loot drops
+disable_drops=0
diff --git a/tests/dGameTests/GameDependencies.h b/tests/dGameTests/GameDependencies.h
index ee52dec6..81875ab6 100644
--- a/tests/dGameTests/GameDependencies.h
+++ b/tests/dGameTests/GameDependencies.h
@@ -4,6 +4,7 @@
 #include "Game.h"
 #include "dLogger.h"
 #include "dServer.h"
+#include "EntityInfo.h"
 #include "EntityManager.h"
 #include <gtest/gtest.h>
 
diff --git a/tests/dGameTests/dComponentsTests/DestroyableComponentTests.cpp b/tests/dGameTests/dComponentsTests/DestroyableComponentTests.cpp
index 97288909..5448a4c2 100644
--- a/tests/dGameTests/dComponentsTests/DestroyableComponentTests.cpp
+++ b/tests/dGameTests/dComponentsTests/DestroyableComponentTests.cpp
@@ -41,10 +41,19 @@ protected:
 TEST_F(DestroyableTest, DestroyableComponentSerializeConstructionTest) {
 	destroyableComponent->Serialize(&bitStream, true, flags);
 	// Assert that the full number of bits are present
-	ASSERT_EQ(bitStream.GetNumberOfUnreadBits(), 460);
+	ASSERT_EQ(bitStream.GetNumberOfUnreadBits(), 748);
 	{
 		// Now read in the full serialized construction BitStream
-		bool optionStatusImmunityInfo{}; // Values under this option are unused.
+		bool optionStatusImmunityInfo{};
+		uint32_t ImmuneToBasicAttackCount{};
+		uint32_t ImmuneToDamageOverTimeCount{};
+		uint32_t ImmuneToKnockbackCount{};
+		uint32_t ImmuneToInterruptCount{};
+		uint32_t ImmuneToSpeedCount{};
+		uint32_t ImmuneToImaginationGainCount{};
+		uint32_t ImmuneToImaginationLossCount{};
+		uint32_t ImmuneToQuickbuildInterruptCount{};
+		uint32_t ImmuneToPullToPointCount{};
 		bool optionStatsInfo{};
 		uint32_t currentHealth{};
 		float maxHealth{};
@@ -70,7 +79,15 @@ TEST_F(DestroyableTest, DestroyableComponentSerializeConstructionTest) {
 		bool optionIsOnThreatList{};
 		bool isThreatened{};
 		bitStream.Read(optionStatusImmunityInfo);
-
+		bitStream.Read(ImmuneToBasicAttackCount);
+		bitStream.Read(ImmuneToDamageOverTimeCount);
+		bitStream.Read(ImmuneToKnockbackCount);
+		bitStream.Read(ImmuneToInterruptCount);
+		bitStream.Read(ImmuneToSpeedCount);
+		bitStream.Read(ImmuneToImaginationGainCount);
+		bitStream.Read(ImmuneToImaginationLossCount);
+		bitStream.Read(ImmuneToQuickbuildInterruptCount);
+		bitStream.Read(ImmuneToPullToPointCount);
 		bitStream.Read(optionStatsInfo);
 		bitStream.Read(currentHealth);
 		bitStream.Read(maxHealth);
@@ -101,7 +118,16 @@ TEST_F(DestroyableTest, DestroyableComponentSerializeConstructionTest) {
 
 		bitStream.Read(optionIsOnThreatList);
 		bitStream.Read(isThreatened);
-		EXPECT_EQ(optionStatusImmunityInfo, false);
+		EXPECT_EQ(optionStatusImmunityInfo, true);
+		EXPECT_EQ(ImmuneToBasicAttackCount, 0);
+		EXPECT_EQ(ImmuneToDamageOverTimeCount, 0);
+		EXPECT_EQ(ImmuneToKnockbackCount, 0);
+		EXPECT_EQ(ImmuneToInterruptCount, 0);
+		EXPECT_EQ(ImmuneToSpeedCount, 0);
+		EXPECT_EQ(ImmuneToImaginationGainCount, 0);
+		EXPECT_EQ(ImmuneToImaginationLossCount, 0);
+		EXPECT_EQ(ImmuneToQuickbuildInterruptCount, 0);
+		EXPECT_EQ(ImmuneToPullToPointCount, 0);
 
 		EXPECT_EQ(optionStatsInfo, true);
 		EXPECT_EQ(currentHealth, 23);
@@ -298,3 +324,208 @@ TEST_F(DestroyableTest, DestroyableComponentValiditiyTest) {
 	EXPECT_FALSE(destroyableComponent->IsFriend(enemyEntity));
 	delete enemyEntity;
 }
+
+TEST_F(DestroyableTest, DestroyableComponentImmunityTest) {
+	// assert to show that they are empty
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	// set them all to true (count 1) and check
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, true, true, true, true, true, true, true, true, true);
+	ASSERT_TRUE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToPullToPoint());
+
+	// remove them to check that they get removed properly
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, true, true, true, true, true, true, true, true, true);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+
+	// should not crash to remove them again
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, true, true, true, true, true, true, true, true, true);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+
+	// just do one
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, true);
+	ASSERT_TRUE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	// now stack it to 2 on basic attack
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, true);
+	ASSERT_TRUE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	// remove one and still shoudl be true
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, true);
+	ASSERT_TRUE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	// go back to 0
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, true);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	// check individual ones now
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, true, false, false, false, false, false, false, false, false);
+	ASSERT_TRUE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, true, false, false, false, false, false, false, false, false);
+
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, false, true, false, false, false, false, false, false, false);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, false, true, false, false, false, false, false, false, false);
+
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, false, false, true, false, false, false, false, false, false);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, false, false, true, false, false, false, false, false, false);
+
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, false, false, false, true, false, false, false, false, false);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, false, false, false, true, false, false, false, false, false);
+
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, false, false, false, false, true, false, false, false, false);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, false, false, false, false, true, false, false, false, false);
+
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, false, false, false, false, false, true, false, false, false);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, false, false, false, false, false, true, false, false, false);
+
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, false, false, false, false, false, false, true, false, false);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, false, false, false, false, false, false, true, false, false);
+
+
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, false, false, false, false, false, false, false, true, false);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, false, false, false, false, false, false, false, true, false);
+
+
+	destroyableComponent->SetStatusImmunity(eStateChangeType::PUSH, false, false, false, false, false, false, false, false, true);
+	ASSERT_FALSE(destroyableComponent->GetImmuneToBasicAttack());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToDamageOverTime());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToKnockback());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToInterrupt());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToSpeed());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationGain());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToImaginationLoss());
+	ASSERT_FALSE(destroyableComponent->GetImmuneToQuickbuildInterrupt());
+	ASSERT_TRUE(destroyableComponent->GetImmuneToPullToPoint());
+	destroyableComponent->SetStatusImmunity(eStateChangeType::POP, false, false, false, false, false, false, false, false, true);
+
+}
+