diff --git a/common/patches/rof.cpp b/common/patches/rof.cpp
index cb8eddced..d0fa44773 100644
--- a/common/patches/rof.cpp
+++ b/common/patches/rof.cpp
@@ -5146,16 +5146,19 @@ namespace RoF
 			ob.write((const char*)&evotop, sizeof(RoF::structs::EvolvingItem));
 		}
 
-		//ORNAMENT IDFILE / ICON
-		int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
-		uint32 ornaIcon = 0;
-		uint32 heroModel = 0;
+		/**
+		 * Ornamentation
+		 */
+		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
+		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
+		uint32 hero_model                 = 0;
 
-		if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon()) {
-			ornaIcon = inst->GetOrnamentationIcon();
-			heroModel = inst->GetOrnamentHeroModel(EQEmu::InventoryProfile::CalcMaterialFromSlot(slot_id_in));
+		if (inst->GetOrnamentationIDFile()) {
+			hero_model = inst->GetOrnamentHeroModel(EQEmu::InventoryProfile::CalcMaterialFromSlot(slot_id_in));
 
-			char tmp[30]; memset(tmp, 0x0, 30); sprintf(tmp, "IT%d", inst->GetOrnamentationIDFile());
+			char tmp[30];
+			memset(tmp, 0x0, 30);
+			sprintf(tmp, "IT%d", inst->GetOrnamentationIDFile());
 
 			//Mainhand
 			ob.write(tmp, strlen(tmp));
@@ -5172,9 +5175,9 @@ namespace RoF
 
 		RoF::structs::ItemSerializationHeaderFinish hdrf;
 
-		hdrf.ornamentIcon = ornaIcon;
+		hdrf.ornamentIcon = ornamentation_icon;
 		hdrf.unknowna1 = 0xffffffff;
-		hdrf.ornamentHeroModel = heroModel;
+		hdrf.ornamentHeroModel = hero_model;
 		hdrf.unknown063 = 0;
 		hdrf.unknowna3 = 0;
 		hdrf.unknowna4 = 0xffffffff;
diff --git a/common/patches/rof2.cpp b/common/patches/rof2.cpp
index cb9e468fb..949cd1db3 100644
--- a/common/patches/rof2.cpp
+++ b/common/patches/rof2.cpp
@@ -5443,16 +5443,19 @@ namespace RoF2
 			ob.write((const char*)&evotop, sizeof(RoF2::structs::EvolvingItem));
 		}
 
-		//ORNAMENT IDFILE / ICON
-		int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
-		uint32 ornaIcon = 0;
-		uint32 heroModel = 0;
+		/**
+		 * Ornamentation
+		 */
+		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
+		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
+		uint32 hero_model                 = 0;
 
-		if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon()) {
-			ornaIcon = inst->GetOrnamentationIcon();
-			heroModel = inst->GetOrnamentHeroModel(EQEmu::InventoryProfile::CalcMaterialFromSlot(slot_id_in));
+		if (inst->GetOrnamentationIDFile()) {
+			hero_model = inst->GetOrnamentHeroModel(EQEmu::InventoryProfile::CalcMaterialFromSlot(slot_id_in));
 
-			char tmp[30]; memset(tmp, 0x0, 30); sprintf(tmp, "IT%d", inst->GetOrnamentationIDFile());
+			char tmp[30];
+			memset(tmp, 0x0, 30);
+			sprintf(tmp, "IT%d", inst->GetOrnamentationIDFile());
 
 			//Mainhand
 			ob.write(tmp, strlen(tmp));
@@ -5469,9 +5472,9 @@ namespace RoF2
 
 		RoF2::structs::ItemSerializationHeaderFinish hdrf;
 
-		hdrf.ornamentIcon = ornaIcon;
+		hdrf.ornamentIcon = ornamentation_icon;
 		hdrf.unknowna1 = 0xffffffff;
-		hdrf.ornamentHeroModel = heroModel;
+		hdrf.ornamentHeroModel = hero_model;
 		hdrf.unknown063 = 0;
 		hdrf.Copied = 0;
 		hdrf.unknowna4 = 0xffffffff;
diff --git a/zone/client.cpp b/zone/client.cpp
index bb43a3e4f..e4b81cdf7 100644
--- a/zone/client.cpp
+++ b/zone/client.cpp
@@ -9021,7 +9021,48 @@ bool Client::IsDevToolsWindowEnabled() const
 	return dev_tools_window_enabled;
 }
 
+/**
+ * @param in_dev_tools_window_enabled
+ */
 void Client::SetDevToolsWindowEnabled(bool in_dev_tools_window_enabled)
 {
 	Client::dev_tools_window_enabled = in_dev_tools_window_enabled;
+}
+
+/**
+ * @param model_id
+ */
+void Client::SetPrimaryWeaponOrnamentation(uint32 model_id)
+{
+	if (GetItemIDAt(EQEmu::invslot::slotPrimary) > 0) {
+		database.QueryDatabase(
+			StringFormat(
+				"UPDATE `inventory` SET `ornamentidfile` = %i WHERE `charid` = %i AND `slotid` = %i",
+				model_id,
+				character_id,
+				EQEmu::invslot::slotPrimary
+			));
+
+		WearChange(EQEmu::textures::weaponPrimary, static_cast<uint16>(model_id), 0);
+		Message(15, "Your primary weapon appearance has been modified, changes will fully take affect next time you zone");
+	}
+}
+
+/**
+ * @param model_id
+ */
+void Client::SetSecondaryWeaponOrnamentation(uint32 model_id)
+{
+	if (GetItemIDAt(EQEmu::invslot::slotSecondary) > 0) {
+		database.QueryDatabase(
+			StringFormat(
+				"UPDATE `inventory` SET `ornamentidfile` = %i WHERE `charid` = %i AND `slotid` = %i",
+				model_id,
+				character_id,
+				EQEmu::invslot::slotSecondary
+			));
+
+		WearChange(EQEmu::textures::weaponSecondary, static_cast<uint16>(model_id), 0);
+		Message(15, "Your secondary weapon appearance has been modified, changes will fully take affect next time you zone");
+	}
 }
\ No newline at end of file
diff --git a/zone/client.h b/zone/client.h
index 48efba685..96b386a85 100644
--- a/zone/client.h
+++ b/zone/client.h
@@ -252,6 +252,9 @@ public:
 	bool IsDevToolsWindowEnabled() const;
 	void SetDevToolsWindowEnabled(bool dev_tools_window_enabled);
 
+	void SetPrimaryWeaponOrnamentation(uint32 model_id);
+	void SetSecondaryWeaponOrnamentation(uint32 model_id);
+
 	//abstract virtual function implementations required by base abstract class
 	virtual bool Death(Mob* killerMob, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill);
 	virtual void Damage(Mob* from, int32 damage, uint16 spell_id, EQEmu::skills::SkillType attack_skill, bool avoidable = true, int8 buffslot = -1, bool iBuffTic = false, eSpecialAttacks special = eSpecialAttacks::None);
diff --git a/zone/command.cpp b/zone/command.cpp
index f6e40e7e7..2645e7ece 100755
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -2826,15 +2826,12 @@ void command_test(Client *c, const Seperator *sep)
 {
 	c->Message(15, "Triggering test command");
 
-	// EQEmu::ItemInstance* fake_weapon_secondary = database.CreateItem(static_cast<uint32>(c->GetItemIDAt(EQEmu::invslot::slotSecondary)));
-	// fake_weapon_secondary->SetNewIDFile(c->GetEquipmentMaterial(EQEmu::textures::weaponSecondary));
-	// c->SendItemPacket(EQEmu::invslot::slotSecondary, fake_weapon_secondary, ItemPacketTrade);
-	// safe_delete(fake_weapon_secondary);
-
-	EQEmu::ItemInstance* fake_weapon = database.CreateItem(static_cast<uint32>(c->GetItemIDAt(EQEmu::invslot::slotPrimary)));
-	fake_weapon->SetNewIDFile(c->GetEquipmentMaterial(EQEmu::textures::weaponPrimary));
-	c->SendItemPacket(EQEmu::invslot::slotPrimary, fake_weapon, ItemPacketTrade);
-	safe_delete(fake_weapon);
+	if (sep->arg[1]) {
+		c->SetPrimaryWeaponOrnamentation(atoi(sep->arg[1]));
+	}
+	if (sep->arg[2]) {
+		c->SetSecondaryWeaponOrnamentation(atoi(sep->arg[2]));
+	}
 }
 
 void command_texture(Client *c, const Seperator *sep)
diff --git a/zone/lua_client.cpp b/zone/lua_client.cpp
index 7a8d954d8..a8991f97a 100644
--- a/zone/lua_client.cpp
+++ b/zone/lua_client.cpp
@@ -1486,6 +1486,16 @@ void Lua_Client::DisableAreaRegens()
 	self->DisableAreaRegens();
 }
 
+void Lua_Client::SetPrimaryWeaponOrnamentation(uint32 model_id) {
+	Lua_Safe_Call_Void();
+	self->SetPrimaryWeaponOrnamentation(model_id);
+}
+
+void Lua_Client::SetSecondaryWeaponOrnamentation(uint32 model_id) {
+	Lua_Safe_Call_Void();
+	self->SetSecondaryWeaponOrnamentation(model_id);
+}
+
 luabind::scope lua_register_client() {
 	return luabind::class_<Lua_Client, Lua_Mob>("Client")
 		.def(luabind::constructor<>())
@@ -1548,6 +1558,8 @@ luabind::scope lua_register_client() {
 		.def("GetBindHeading", (float(Lua_Client::*)(int))&Lua_Client::GetBindHeading)
 		.def("GetBindZoneID", (uint32(Lua_Client::*)(void))&Lua_Client::GetBindZoneID)
 		.def("GetBindZoneID", (uint32(Lua_Client::*)(int))&Lua_Client::GetBindZoneID)
+		.def("SetPrimaryWeaponOrnamentation", (void(Lua_Client::*)(uint32))&Lua_Client::SetPrimaryWeaponOrnamentation)
+		.def("SetSecondaryWeaponOrnamentation", (void(Lua_Client::*)(uint32))&Lua_Client::SetSecondaryWeaponOrnamentation)
 		.def("MovePC", (void(Lua_Client::*)(int,float,float,float,float))&Lua_Client::MovePC)
 		.def("MovePCInstance", (void(Lua_Client::*)(int,int,float,float,float,float))&Lua_Client::MovePCInstance)
 		.def("ChangeLastName", (void(Lua_Client::*)(const char *in))&Lua_Client::ChangeLastName)
diff --git a/zone/lua_client.h b/zone/lua_client.h
index 10e766b5c..715ea141d 100644
--- a/zone/lua_client.h
+++ b/zone/lua_client.h
@@ -309,6 +309,10 @@ public:
 	void DisableAreaEndRegen();
 	void EnableAreaRegens(int value);
 	void DisableAreaRegens();
+
+
+	void SetPrimaryWeaponOrnamentation(uint32 model_id);
+	void SetSecondaryWeaponOrnamentation(uint32 model_id);
 };
 
 #endif
diff --git a/zone/perl_client.cpp b/zone/perl_client.cpp
index 74c95f5d2..fcdeca352 100644
--- a/zone/perl_client.cpp
+++ b/zone/perl_client.cpp
@@ -6126,6 +6126,59 @@ XS(XS_Client_Popup2) {
 	XSRETURN_EMPTY;
 }
 
+XS(XS_Client_SetPrimaryWeaponOrnamentation); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_SetPrimaryWeaponOrnamentation)
+{
+	dXSARGS;
+	if (items != 2) {
+		Perl_croak(aTHX_ "Usage: Client::SetPrimaryWeaponOrnamentation(THIS, model_id)");
+	}
+	{
+		Client *THIS;
+		uint32 model_id = (uint32) SvUV(ST(1));
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Client *, tmp);
+		}
+		else {
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		}
+		if (THIS == nullptr) {
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+		}
+
+		THIS->SetPrimaryWeaponOrnamentation(model_id);
+	}
+	XSRETURN_EMPTY;
+}
+
+XS(XS_Client_SetSecondaryWeaponOrnamentation); /* prototype to pass -Wmissing-prototypes */
+XS(XS_Client_SetSecondaryWeaponOrnamentation)
+{
+	dXSARGS;
+	if (items != 2) {
+		Perl_croak(aTHX_ "Usage: Client::SetSecondaryWeaponOrnamentation(THIS, model_id)");
+	}
+	{
+		Client *THIS;
+		uint32 model_id = (uint32) SvUV(ST(1));
+
+		if (sv_derived_from(ST(0), "Client")) {
+			IV tmp = SvIV((SV *) SvRV(ST(0)));
+			THIS = INT2PTR(Client *, tmp);
+		}
+		else {
+			Perl_croak(aTHX_ "THIS is not of type Client");
+		}
+		if (THIS == nullptr) {
+			Perl_croak(aTHX_ "THIS is nullptr, avoiding crash.");
+		}
+
+		THIS->SetSecondaryWeaponOrnamentation(model_id);
+	}
+	XSRETURN_EMPTY;
+}
 
 #ifdef __cplusplus
 extern "C"
@@ -6147,240 +6200,241 @@ XS(boot_Client) {
 
 	XS_VERSION_BOOTCHECK;
 
-	newXSproto(strcpy(buf, "SendSound"), XS_Client_SendSound, file, "$");
-	newXSproto(strcpy(buf, "Save"), XS_Client_Save, file, "$$");
-	newXSproto(strcpy(buf, "SaveBackup"), XS_Client_SaveBackup, file, "$");
+	newXSproto(strcpy(buf, "AccountID"), XS_Client_AccountID, file, "$");
+	newXSproto(strcpy(buf, "AccountName"), XS_Client_AccountName, file, "$");
+	newXSproto(strcpy(buf, "AddAAPoints"), XS_Client_AddAAPoints, file, "$$");
+	newXSproto(strcpy(buf, "AddAlternateCurrencyValue"), XS_Client_AddAlternateCurrencyValue, file, "$$$");
+	newXSproto(strcpy(buf, "AddCrystals"), XS_Client_AddCrystals, file, "$$");
+	newXSproto(strcpy(buf, "AddEXP"), XS_Client_AddEXP, file, "$$;$$");
+	newXSproto(strcpy(buf, "AddLevelBasedExp"), XS_Client_AddLevelBasedExp, file, "$$;$");
+	newXSproto(strcpy(buf, "AddMoneyToPP"), XS_Client_AddMoneyToPP, file, "$$$$$$");
+	newXSproto(strcpy(buf, "AddPVPPoints"), XS_Client_AddPVPPoints, file, "$$");
+	newXSproto(strcpy(buf, "AddSkill"), XS_Client_AddSkill, file, "$$$");
+	newXSproto(strcpy(buf, "Admin"), XS_Client_Admin, file, "$");
+	newXSproto(strcpy(buf, "AssignTask"), XS_Client_AssignTask, file, "$$$;$");
+	newXSproto(strcpy(buf, "AssignToInstance"), XS_Client_AssignToInstance, file, "$$");
+	newXSproto(strcpy(buf, "AutoSplitEnabled"), XS_Client_AutoSplitEnabled, file, "$");
+	newXSproto(strcpy(buf, "BreakInvis"), XS_Client_BreakInvis, file, "$");
+	newXSproto(strcpy(buf, "CalcEXP"), XS_Client_CalcEXP, file, "$");
+	newXSproto(strcpy(buf, "CalcPriceMod"), XS_Client_CalcPriceMod, file, "$;$$");
+	newXSproto(strcpy(buf, "CanHaveSkill"), XS_Client_CanHaveSkill, file, "$$");
+	newXSproto(strcpy(buf, "ChangeLastName"), XS_Client_ChangeLastName, file, "$$");
+	newXSproto(strcpy(buf, "CharacterID"), XS_Client_CharacterID, file, "$");
+	newXSproto(strcpy(buf, "CheckIncreaseSkill"), XS_Client_CheckIncreaseSkill, file, "$$;$");
+	newXSproto(strcpy(buf, "CheckSpecializeIncrease"), XS_Client_CheckSpecializeIncrease, file, "$$");
+	newXSproto(strcpy(buf, "ClearCompassMark"), XS_Client_ClearCompassMark, file, "$");
+	newXSproto(strcpy(buf, "ClearZoneFlag"), XS_Client_ClearZoneFlag, file, "$$");
 	newXSproto(strcpy(buf, "Connected"), XS_Client_Connected, file, "$");
-	newXSproto(strcpy(buf, "InZone"), XS_Client_InZone, file, "$");
-	newXSproto(strcpy(buf, "Kick"), XS_Client_Kick, file, "$");
+	newXSproto(strcpy(buf, "DecreaseByID"), XS_Client_DecreaseByID, file, "$$$");
+	newXSproto(strcpy(buf, "DeleteItemInInventory"), XS_Client_DeleteItemInInventory, file, "$$;$$");
 	newXSproto(strcpy(buf, "Disconnect"), XS_Client_Disconnect, file, "$");
-	newXSproto(strcpy(buf, "IsLD"), XS_Client_IsLD, file, "$");
-	newXSproto(strcpy(buf, "WorldKick"), XS_Client_WorldKick, file, "$");
-	newXSproto(strcpy(buf, "GetAnon"), XS_Client_GetAnon, file, "$");
+	newXSproto(strcpy(buf, "DropItem"), XS_Client_DropItem, file, "$$");
 	newXSproto(strcpy(buf, "Duck"), XS_Client_Duck, file, "$");
-	newXSproto(strcpy(buf, "Stand"), XS_Client_Stand, file, "$");
-	newXSproto(strcpy(buf, "SetGM"), XS_Client_SetGM, file, "$$");
-	newXSproto(strcpy(buf, "SetPVP"), XS_Client_SetPVP, file, "$$");
-	newXSproto(strcpy(buf, "GetPVP"), XS_Client_GetPVP, file, "$");
-	newXSproto(strcpy(buf, "GetGM"), XS_Client_GetGM, file, "$");
-	newXSproto(strcpy(buf, "SetBaseClass"), XS_Client_SetBaseClass, file, "$$");
-	newXSproto(strcpy(buf, "SetBaseRace"), XS_Client_SetBaseRace, file, "$$");
-	newXSproto(strcpy(buf, "SetBaseGender"), XS_Client_SetBaseGender, file, "$$");
-	newXSproto(strcpy(buf, "GetBaseFace"), XS_Client_GetBaseFace, file, "$");
-	newXSproto(strcpy(buf, "GetLanguageSkill"), XS_Client_GetLanguageSkill, file, "$$");
-	newXSproto(strcpy(buf, "GetLastName"), XS_Client_GetLastName, file, "$");
-	newXSproto(strcpy(buf, "GetLDoNPointsTheme"), XS_Client_GetLDoNPointsTheme, file, "$");
-	newXSproto(strcpy(buf, "GetBaseSTR"), XS_Client_GetBaseSTR, file, "$");
-	newXSproto(strcpy(buf, "GetBaseSTA"), XS_Client_GetBaseSTA, file, "$");
+	newXSproto(strcpy(buf, "Escape"), XS_Client_Escape, file, "$");
+	newXSproto(strcpy(buf, "ExpeditionMessage"), XS_Client_ExpeditionMessage, file, "$$$");
+	newXSproto(strcpy(buf, "FailTask"), XS_Client_FailTask, file, "$$");
+	newXSproto(strcpy(buf, "ForageItem"), XS_Client_ForageItem, file, "$");
+	newXSproto(strcpy(buf, "Freeze"), XS_Client_Freeze, file, "$");
+	newXSproto(strcpy(buf, "GetAAExp"), XS_Client_GetAAExp, file, "$");
+	newXSproto(strcpy(buf, "GetAALevel"), XS_Client_GetAALevel, file, "$$");
+	newXSproto(strcpy(buf, "GetAAPercent"), XS_Client_GetAAPercent, file, "$");
+	newXSproto(strcpy(buf, "GetAAPoints"), XS_Client_GetAAPoints, file, "$$");
+	newXSproto(strcpy(buf, "GetAccountAge"), XS_Client_GetAccountAge, file, "$");
+	newXSproto(strcpy(buf, "GetAccountFlag"), XS_Client_GetAccountFlag, file, "$$");
+	newXSproto(strcpy(buf, "GetAggroCount"), XS_Client_GetAggroCount, file, "$");
+	newXSproto(strcpy(buf, "GetAllMoney"), XS_Client_GetAllMoney, file, "$");
+	newXSproto(strcpy(buf, "GetAnon"), XS_Client_GetAnon, file, "$");
+	newXSproto(strcpy(buf, "GetAugmentAt"), XS_Client_GetAugmentAt, file, "$$$");
+	newXSproto(strcpy(buf, "GetAugmentIDAt"), XS_Client_GetAugmentIDAt, file, "$$$");
+	newXSproto(strcpy(buf, "GetBaseAGI"), XS_Client_GetBaseAGI, file, "$");
 	newXSproto(strcpy(buf, "GetBaseCHA"), XS_Client_GetBaseCHA, file, "$");
 	newXSproto(strcpy(buf, "GetBaseDEX"), XS_Client_GetBaseDEX, file, "$");
+	newXSproto(strcpy(buf, "GetBaseFace"), XS_Client_GetBaseFace, file, "$");
 	newXSproto(strcpy(buf, "GetBaseINT"), XS_Client_GetBaseINT, file, "$");
-	newXSproto(strcpy(buf, "GetBaseAGI"), XS_Client_GetBaseAGI, file, "$");
+	newXSproto(strcpy(buf, "GetBaseSTA"), XS_Client_GetBaseSTA, file, "$");
+	newXSproto(strcpy(buf, "GetBaseSTR"), XS_Client_GetBaseSTR, file, "$");
 	newXSproto(strcpy(buf, "GetBaseWIS"), XS_Client_GetBaseWIS, file, "$");
-	newXSproto(strcpy(buf, "GetWeight"), XS_Client_GetWeight, file, "$");
-	newXSproto(strcpy(buf, "GetEXP"), XS_Client_GetEXP, file, "$");
-	newXSproto(strcpy(buf, "GetAAExp"), XS_Client_GetAAExp, file, "$");
-	newXSproto(strcpy(buf, "GetAAPercent"), XS_Client_GetAAPercent, file, "$");
-	newXSproto(strcpy(buf, "GetTotalSecondsPlayed"), XS_Client_GetTotalSecondsPlayed, file, "$");
-	newXSproto(strcpy(buf, "UpdateLDoNPoints"), XS_Client_UpdateLDoNPoints, file, "$$$");
-	newXSproto(strcpy(buf, "SetDeity"), XS_Client_SetDeity, file, "$$");
-	newXSproto(strcpy(buf, "AddEXP"), XS_Client_AddEXP, file, "$$;$$");
-	newXSproto(strcpy(buf, "SetEXP"), XS_Client_SetEXP, file, "$$$;$");
-	newXSproto(strcpy(buf, "SetBindPoint"), XS_Client_SetBindPoint, file, "$;$$$$$");
+	newXSproto(strcpy(buf, "GetBecomeNPCLevel"), XS_Client_GetBecomeNPCLevel, file, "$");
+	newXSproto(strcpy(buf, "GetBindHeading"), XS_Client_GetBindHeading, file, "$$");
 	newXSproto(strcpy(buf, "GetBindX"), XS_Client_GetBindX, file, "$$");
 	newXSproto(strcpy(buf, "GetBindY"), XS_Client_GetBindY, file, "$$");
 	newXSproto(strcpy(buf, "GetBindZ"), XS_Client_GetBindZ, file, "$$");
-	newXSproto(strcpy(buf, "GetBindHeading"), XS_Client_GetBindHeading, file, "$$");
 	newXSproto(strcpy(buf, "GetBindZoneID"), XS_Client_GetBindZoneID, file, "$$");
-	newXSproto(strcpy(buf, "MovePC"), XS_Client_MovePC, file, "$$$$$$");
-	newXSproto(strcpy(buf, "MovePCInstance"), XS_Client_MovePCInstance, file, "$$$$$$$");
-	newXSproto(strcpy(buf, "ChangeLastName"), XS_Client_ChangeLastName, file, "$$");
-	newXSproto(strcpy(buf, "GetFactionLevel"), XS_Client_GetFactionLevel, file, "$$$$$$$$");
-	newXSproto(strcpy(buf, "SetFactionLevel"), XS_Client_SetFactionLevel, file, "$$$$$$");
-	newXSproto(strcpy(buf, "SetFactionLevel2"), XS_Client_SetFactionLevel2, file, "$$$$$$$");
-	newXSproto(strcpy(buf, "GetRawItemAC"), XS_Client_GetRawItemAC, file, "$");
-	newXSproto(strcpy(buf, "AccountID"), XS_Client_AccountID, file, "$");
-	newXSproto(strcpy(buf, "AccountName"), XS_Client_AccountName, file, "$");
-	newXSproto(strcpy(buf, "Admin"), XS_Client_Admin, file, "$");
-	newXSproto(strcpy(buf, "CharacterID"), XS_Client_CharacterID, file, "$");
-	newXSproto(strcpy(buf, "UpdateAdmin"), XS_Client_UpdateAdmin, file, "$;$");
-	newXSproto(strcpy(buf, "UpdateWho"), XS_Client_UpdateWho, file, "$;$");
-	newXSproto(strcpy(buf, "GuildRank"), XS_Client_GuildRank, file, "$");
-	newXSproto(strcpy(buf, "GuildID"), XS_Client_GuildID, file, "$");
-	newXSproto(strcpy(buf, "GetFace"), XS_Client_GetFace, file, "$");
-	newXSproto(strcpy(buf, "TakeMoneyFromPP"), XS_Client_TakeMoneyFromPP, file, "$$;$");
-	newXSproto(strcpy(buf, "AddMoneyToPP"), XS_Client_AddMoneyToPP, file, "$$$$$$");
-	newXSproto(strcpy(buf, "TGB"), XS_Client_TGB, file, "$");
-	newXSproto(strcpy(buf, "GetSkillPoints"), XS_Client_GetSkillPoints, file, "$");
-	newXSproto(strcpy(buf, "SetSkillPoints"), XS_Client_SetSkillPoints, file, "$$");
-	newXSproto(strcpy(buf, "IncreaseSkill"), XS_Client_IncreaseSkill, file, "$$;$");
-	newXSproto(strcpy(buf, "IncreaseLanguageSkill"), XS_Client_IncreaseLanguageSkill, file, "$$;$");
-	newXSproto(strcpy(buf, "GetSkill"), XS_Client_GetSkill, file, "$$");
-	newXSproto(strcpy(buf, "GetRawSkill"), XS_Client_GetRawSkill, file, "$$");
-	newXSproto(strcpy(buf, "HasSkill"), XS_Client_HasSkill, file, "$$");
-	newXSproto(strcpy(buf, "CanHaveSkill"), XS_Client_CanHaveSkill, file, "$$");
-	newXSproto(strcpy(buf, "SetSkill"), XS_Client_SetSkill, file, "$$$");
-	newXSproto(strcpy(buf, "AddSkill"), XS_Client_AddSkill, file, "$$$");
-	newXSproto(strcpy(buf, "CheckSpecializeIncrease"), XS_Client_CheckSpecializeIncrease, file, "$$");
-	newXSproto(strcpy(buf, "CheckIncreaseSkill"), XS_Client_CheckIncreaseSkill, file, "$$;$");
-	newXSproto(strcpy(buf, "SetLanguageSkill"), XS_Client_SetLanguageSkill, file, "$$$");
-	newXSproto(strcpy(buf, "MaxSkill"), XS_Client_MaxSkill, file, "$$;$$");
-	newXSproto(strcpy(buf, "GMKill"), XS_Client_GMKill, file, "$");
-	newXSproto(strcpy(buf, "IsMedding"), XS_Client_IsMedding, file, "$");
-	newXSproto(strcpy(buf, "GetDuelTarget"), XS_Client_GetDuelTarget, file, "$");
-	newXSproto(strcpy(buf, "IsDueling"), XS_Client_IsDueling, file, "$");
-	newXSproto(strcpy(buf, "SetDuelTarget"), XS_Client_SetDuelTarget, file, "$$");
-	newXSproto(strcpy(buf, "SetDueling"), XS_Client_SetDueling, file, "$$");
-	newXSproto(strcpy(buf, "ResetAA"), XS_Client_ResetAA, file, "$");
-	newXSproto(strcpy(buf, "MemSpell"), XS_Client_MemSpell, file, "$$$;$");
-	newXSproto(strcpy(buf, "UnmemSpell"), XS_Client_UnmemSpell, file, "$$;$");
-	newXSproto(strcpy(buf, "UnmemSpellBySpellID"), XS_Client_UnmemSpellBySpellID, file, "$$");
-	newXSproto(strcpy(buf, "UnmemSpellAll"), XS_Client_UnmemSpellAll, file, "$;$");
-	newXSproto(strcpy(buf, "ScribeSpell"), XS_Client_ScribeSpell, file, "$$$;$");
-	newXSproto(strcpy(buf, "UnscribeSpell"), XS_Client_UnscribeSpell, file, "$$;$");
-	newXSproto(strcpy(buf, "UnscribeSpellAll"), XS_Client_UnscribeSpellAll, file, "$;$");
-	newXSproto(strcpy(buf, "TrainDiscBySpellID"), XS_Client_TrainDiscBySpellID, file, "$$");
-	newXSproto(strcpy(buf, "GetDiscSlotBySpellID"), XS_Client_GetDiscSlotBySpellID, file, "$$");
-	newXSproto(strcpy(buf, "UntrainDisc"), XS_Client_UntrainDisc, file, "$$;$");
-	newXSproto(strcpy(buf, "UntrainDiscAll"), XS_Client_UntrainDiscAll, file, "$;$");
-	newXSproto(strcpy(buf, "IsSitting"), XS_Client_IsSitting, file, "$");
-	newXSproto(strcpy(buf, "IsBecomeNPC"), XS_Client_IsBecomeNPC, file, "$");
-	newXSproto(strcpy(buf, "GetBecomeNPCLevel"), XS_Client_GetBecomeNPCLevel, file, "$");
-	newXSproto(strcpy(buf, "SetBecomeNPC"), XS_Client_SetBecomeNPC, file, "$$");
-	newXSproto(strcpy(buf, "SetBecomeNPCLevel"), XS_Client_SetBecomeNPCLevel, file, "$$");
-	newXSproto(strcpy(buf, "SetFeigned"), XS_Client_SetFeigned, file, "$$");
-	newXSproto(strcpy(buf, "GetFeigned"), XS_Client_GetFeigned, file, "$");
-	newXSproto(strcpy(buf, "AutoSplitEnabled"), XS_Client_AutoSplitEnabled, file, "$");
-	newXSproto(strcpy(buf, "SetHorseId"), XS_Client_SetHorseId, file, "$$");
-	newXSproto(strcpy(buf, "GetHorseId"), XS_Client_GetHorseId, file, "$");
-	newXSproto(strcpy(buf, "NukeItem"), XS_Client_NukeItem, file, "$$;$");
-	newXSproto(strcpy(buf, "SetTint"), XS_Client_SetTint, file, "$$$");
-	newXSproto(strcpy(buf, "SetMaterial"), XS_Client_SetMaterial, file, "$$$");
-	newXSproto(strcpy(buf, "Undye"), XS_Client_Undye, file, "$");
-	newXSproto(strcpy(buf, "GetItemIDAt"), XS_Client_GetItemIDAt, file, "$$");
-	newXSproto(strcpy(buf, "GetAugmentIDAt"), XS_Client_GetAugmentIDAt, file, "$$$");
-	newXSproto(strcpy(buf, "DeleteItemInInventory"), XS_Client_DeleteItemInInventory, file, "$$;$$");
-	newXSproto(strcpy(buf, "SummonItem"), XS_Client_SummonItem, file, "$$;$$$$$$$$");
-	newXSproto(strcpy(buf, "SetStats"), XS_Client_SetStats, file, "$$$");
-	newXSproto(strcpy(buf, "IncStats"), XS_Client_IncStats, file, "$$$");
-	newXSproto(strcpy(buf, "DropItem"), XS_Client_DropItem, file, "$$");
-	newXSproto(strcpy(buf, "BreakInvis"), XS_Client_BreakInvis, file, "$");
-	newXSproto(strcpy(buf, "GetGroup"), XS_Client_GetGroup, file, "$");
-	newXSproto(strcpy(buf, "LeaveGroup"), XS_Client_LeaveGroup, file, "$");
-	newXSproto(strcpy(buf, "GetRaid"), XS_Client_GetRaid, file, "$");
-	newXSproto(strcpy(buf, "IsGrouped"), XS_Client_IsGrouped, file, "$");
-	newXSproto(strcpy(buf, "IsRaidGrouped"), XS_Client_IsRaidGrouped, file, "$");
-	newXSproto(strcpy(buf, "Hungry"), XS_Client_Hungry, file, "$");
-	newXSproto(strcpy(buf, "Thirsty"), XS_Client_Thirsty, file, "$");
-	newXSproto(strcpy(buf, "GetInstrumentMod"), XS_Client_GetInstrumentMod, file, "$$");
-	newXSproto(strcpy(buf, "DecreaseByID"), XS_Client_DecreaseByID, file, "$$$");
-	newXSproto(strcpy(buf, "SlotConvert2"), XS_Client_SlotConvert2, file, "$$");
-	newXSproto(strcpy(buf, "Escape"), XS_Client_Escape, file, "$");
-	newXSproto(strcpy(buf, "RemoveNoRent"), XS_Client_RemoveNoRent, file, "$");
-	newXSproto(strcpy(buf, "GoFish"), XS_Client_GoFish, file, "$");
-	newXSproto(strcpy(buf, "ForageItem"), XS_Client_ForageItem, file, "$");
-	newXSproto(strcpy(buf, "CalcPriceMod"), XS_Client_CalcPriceMod, file, "$;$$");
-	newXSproto(strcpy(buf, "ResetTrade"), XS_Client_ResetTrade, file, "$");
-	newXSproto(strcpy(buf, "UseDiscipline"), XS_Client_UseDiscipline, file, "$$$");
+	newXSproto(strcpy(buf, "GetCarriedMoney"), XS_Client_GetCarriedMoney, file, "$");
 	newXSproto(strcpy(buf, "GetCharacterFactionLevel"), XS_Client_GetCharacterFactionLevel, file, "$$");
-	newXSproto(strcpy(buf, "SetZoneFlag"), XS_Client_SetZoneFlag, file, "$$");
-	newXSproto(strcpy(buf, "ClearZoneFlag"), XS_Client_ClearZoneFlag, file, "$$");
-	newXSproto(strcpy(buf, "HasZoneFlag"), XS_Client_HasZoneFlag, file, "$$");
-	newXSproto(strcpy(buf, "SendZoneFlagInfo"), XS_Client_SendZoneFlagInfo, file, "$$");
-	newXSproto(strcpy(buf, "LoadZoneFlags"), XS_Client_LoadZoneFlags, file, "$");
-	newXSproto(strcpy(buf, "SetAATitle"), XS_Client_SetAATitle, file, "$$;$");
 	newXSproto(strcpy(buf, "GetClientVersion"), XS_Client_GetClientVersion, file, "$");
 	newXSproto(strcpy(buf, "GetClientVersionBit"), XS_Client_GetClientVersionBit, file, "$");
-	newXSproto(strcpy(buf, "SetTitleSuffix"), XS_Client_SetTitleSuffix, file, "$$;$");
-	newXSproto(strcpy(buf, "SetAAPoints"), XS_Client_SetAAPoints, file, "$$");
-	newXSproto(strcpy(buf, "GetAAPoints"), XS_Client_GetAAPoints, file, "$$");
-	newXSproto(strcpy(buf, "GetSpentAA"), XS_Client_GetSpentAA, file, "$$");
-	newXSproto(strcpy(buf, "AddAAPoints"), XS_Client_AddAAPoints, file, "$$");
-	newXSproto(strcpy(buf, "RefundAA"), XS_Client_RefundAA, file, "$$");
-	newXSproto(strcpy(buf, "GetModCharacterFactionLevel"), XS_Client_GetModCharacterFactionLevel, file, "$$");
-	newXSproto(strcpy(buf, "GetLDoNWins"), XS_Client_GetLDoNWins, file, "$");
-	newXSproto(strcpy(buf, "GetLDoNLosses"), XS_Client_GetLDoNLosses, file, "$");
-	newXSproto(strcpy(buf, "GetLDoNWinsTheme"), XS_Client_GetLDoNWinsTheme, file, "$$");
-	newXSproto(strcpy(buf, "GetLDoNLossesTheme"), XS_Client_GetLDoNLossesTheme, file, "$$");
-	newXSproto(strcpy(buf, "GetItemAt"), XS_Client_GetItemAt, file, "$$");
-	newXSproto(strcpy(buf, "GetAugmentAt"), XS_Client_GetAugmentAt, file, "$$$");
-	newXSproto(strcpy(buf, "GetStartZone"), XS_Client_GetStartZone, file, "$");
-	newXSproto(strcpy(buf, "SetStartZone"), XS_Client_SetStartZone, file, "$$");
-	newXSproto(strcpy(buf, "KeyRingAdd"), XS_Client_KeyRingAdd, file, "$$");
-	newXSproto(strcpy(buf, "KeyRingCheck"), XS_Client_KeyRingCheck, file, "$$");
-	newXSproto(strcpy(buf, "AddPVPPoints"), XS_Client_AddPVPPoints, file, "$$");
-	newXSproto(strcpy(buf, "AddCrystals"), XS_Client_AddCrystals, file, "$$");
-	newXSproto(strcpy(buf, "GetPVPPoints"), XS_Client_GetPVPPoints, file, "$");
-	newXSproto(strcpy(buf, "GetRadiantCrystals"), XS_Client_GetRadiantCrystals, file, "$");
-	newXSproto(strcpy(buf, "GetEbonCrystals"), XS_Client_GetEbonCrystals, file, "$");
-	newXSproto(strcpy(buf, "ReadBook"), XS_Client_ReadBook, file, "$$$");
-	newXSproto(strcpy(buf, "UpdateGroupAAs"), XS_Client_UpdateGroupAAs, file, "$$$");
-	newXSproto(strcpy(buf, "GetGroupPoints"), XS_Client_GetGroupPoints, file, "$");
-	newXSproto(strcpy(buf, "GetRaidPoints"), XS_Client_GetRaidPoints, file, "$");
-	newXSproto(strcpy(buf, "LearnRecipe"), XS_Client_LearnRecipe, file, "$$");
-	newXSproto(strcpy(buf, "GetEndurance"), XS_Client_GetEndurance, file, "$");
-	newXSproto(strcpy(buf, "GetMaxEndurance"), XS_Client_GetMaxEndurance, file, "$");
-	newXSproto(strcpy(buf, "GetEnduranceRatio"), XS_Client_GetEnduranceRatio, file, "$");
-	newXSproto(strcpy(buf, "SetEndurance"), XS_Client_SetEndurance, file, "$$");
-	newXSproto(strcpy(buf, "SendOPTranslocateConfirm"), XS_Client_SendOPTranslocateConfirm, file, "$$$");
-	newXSproto(strcpy(buf, "NPCSpawn"), XS_Client_NPCSpawn, file, "$$$;$");
-	newXSproto(strcpy(buf, "GetIP"), XS_Client_GetIP, file, "$");
-	newXSproto(strcpy(buf, "AddLevelBasedExp"), XS_Client_AddLevelBasedExp, file, "$$;$");
-	newXSproto(strcpy(buf, "IncrementAA"), XS_Client_IncrementAA, file, "$$");
-	newXSproto(strcpy(buf, "GrantAlternateAdvancementAbility"), XS_Client_GrantAlternateAdvancementAbility, file,
-	           "$$$;$");
-	newXSproto(strcpy(buf, "GetAALevel"), XS_Client_GetAALevel, file, "$$");
-	newXSproto(strcpy(buf, "MarkCompassLoc"), XS_Client_MarkCompassLoc, file, "$$$$");
-	newXSproto(strcpy(buf, "ClearCompassMark"), XS_Client_ClearCompassMark, file, "$");
-	newXSproto(strcpy(buf, "GetFreeSpellBookSlot"), XS_Client_GetFreeSpellBookSlot, file, "$;$");
-	newXSproto(strcpy(buf, "GetSpellBookSlotBySpellID"), XS_Client_GetSpellBookSlotBySpellID, file, "$$");
-	newXSproto(strcpy(buf, "UpdateTaskActivity"), XS_Client_UpdateTaskActivity, file, "$$$$;$");
-	newXSproto(strcpy(buf, "AssignTask"), XS_Client_AssignTask, file, "$$$;$");
-	newXSproto(strcpy(buf, "FailTask"), XS_Client_FailTask, file, "$$");
-	newXSproto(strcpy(buf, "IsTaskCompleted"), XS_Client_IsTaskCompleted, file, "$$");
-	newXSproto(strcpy(buf, "IsTaskActive"), XS_Client_IsTaskActive, file, "$$");
-	newXSproto(strcpy(buf, "IsTaskActivityActive"), XS_Client_IsTaskActivityActive, file, "$$$");
-	newXSproto(strcpy(buf, "GetTaskActivityDoneCount"), XS_Client_GetTaskActivityDoneCount, file, "$$$");
 	newXSproto(strcpy(buf, "GetCorpseCount"), XS_Client_GetCorpseCount, file, "$");
 	newXSproto(strcpy(buf, "GetCorpseID"), XS_Client_GetCorpseID, file, "$$");
 	newXSproto(strcpy(buf, "GetCorpseItemAt"), XS_Client_GetCorpseItemAt, file, "$$$");
-	newXSproto(strcpy(buf, "AssignToInstance"), XS_Client_AssignToInstance, file, "$$");
-	newXSproto(strcpy(buf, "Freeze"), XS_Client_Freeze, file, "$");
-	newXSproto(strcpy(buf, "UnFreeze"), XS_Client_UnFreeze, file, "$");
-	newXSproto(strcpy(buf, "GetAggroCount"), XS_Client_GetAggroCount, file, "$");
-	newXSproto(strcpy(buf, "GetCarriedMoney"), XS_Client_GetCarriedMoney, file, "$");
-	newXSproto(strcpy(buf, "GetAllMoney"), XS_Client_GetAllMoney, file, "$");
-	newXSproto(strcpy(buf, "GetItemInInventory"), XS_Client_GetItemInInventory, file, "$$");
-	newXSproto(strcpy(buf, "SetCustomItemData"), XS_Client_SetCustomItemData, file, "$$$$");
 	newXSproto(strcpy(buf, "GetCustomItemData"), XS_Client_GetCustomItemData, file, "$$$");
-	newXSproto(strcpy(buf, "OpenLFGuildWindow"), XS_Client_OpenLFGuildWindow, file, "$");
-	newXSproto(strcpy(buf, "SignalClient"), XS_Client_SignalClient, file, "$");
-	newXSproto(strcpy(buf, "AddAlternateCurrencyValue"), XS_Client_AddAlternateCurrencyValue, file, "$$$");
-	newXSproto(strcpy(buf, "SendWebLink"), XS_Client_SendWebLink, file, "$:$");
-	newXSproto(strcpy(buf, "GetInstanceID"), XS_Client_GetInstanceID, file, "$$");
-	newXSproto(strcpy(buf, "HasSpellScribed"), XS_Client_HasSkill, file, "$$");
-	newXSproto(strcpy(buf, "SetAccountFlag"), XS_Client_SetAccountFlag, file, "$$");
-	newXSproto(strcpy(buf, "GetAccountFlag"), XS_Client_GetAccountFlag, file, "$$");
+	newXSproto(strcpy(buf, "GetDiscSlotBySpellID"), XS_Client_GetDiscSlotBySpellID, file, "$$");
+	newXSproto(strcpy(buf, "GetDuelTarget"), XS_Client_GetDuelTarget, file, "$");
+	newXSproto(strcpy(buf, "GetEbonCrystals"), XS_Client_GetEbonCrystals, file, "$");
+	newXSproto(strcpy(buf, "GetEndurance"), XS_Client_GetEndurance, file, "$");
+	newXSproto(strcpy(buf, "GetEnduranceRatio"), XS_Client_GetEnduranceRatio, file, "$");
+	newXSproto(strcpy(buf, "GetEXP"), XS_Client_GetEXP, file, "$");
+	newXSproto(strcpy(buf, "GetFace"), XS_Client_GetFace, file, "$");
+	newXSproto(strcpy(buf, "GetFactionLevel"), XS_Client_GetFactionLevel, file, "$$$$$$$$");
+	newXSproto(strcpy(buf, "GetFeigned"), XS_Client_GetFeigned, file, "$");
+	newXSproto(strcpy(buf, "GetFreeSpellBookSlot"), XS_Client_GetFreeSpellBookSlot, file, "$;$");
+	newXSproto(strcpy(buf, "GetGM"), XS_Client_GetGM, file, "$");
+	newXSproto(strcpy(buf, "GetGroup"), XS_Client_GetGroup, file, "$");
+	newXSproto(strcpy(buf, "GetGroupPoints"), XS_Client_GetGroupPoints, file, "$");
+	newXSproto(strcpy(buf, "GetHorseId"), XS_Client_GetHorseId, file, "$");
 	newXSproto(strcpy(buf, "GetHunger"), XS_Client_GetHunger, file, "$$");
-	newXSproto(strcpy(buf, "GetThirst"), XS_Client_GetThirst, file, "$$");
-	newXSproto(strcpy(buf, "SetHunger"), XS_Client_SetHunger, file, "$$");
-	newXSproto(strcpy(buf, "SetThirst"), XS_Client_SetThirst, file, "$$");
-	newXSproto(strcpy(buf, "SetConsumption"), XS_Client_SetConsumption, file, "$$$");
-	newXSproto(strcpy(buf, "SilentMessage"), XS_Client_SilentMessage, file, "$$");
-	newXSproto(strcpy(buf, "PlayMP3"), XS_Client_PlayMP3, file, "$;$");
-	newXSproto(strcpy(buf, "SendTargetCommand"), XS_Client_SendTargetCommand, file, "$$");
-	newXSproto(strcpy(buf, "ExpeditionMessage"), XS_Client_ExpeditionMessage, file, "$$$");
-	newXSproto(strcpy(buf, "SendMarqueeMessage"), XS_Client_SendMarqueeMessage, file, "$$$$$$$");
-	newXSproto(strcpy(buf, "SendColoredText"), XS_Client_SendColoredText, file, "$$$");
-	newXSproto(strcpy(buf, "SendSpellAnim"), XS_Client_SendSpellAnim, file, "$$$");
+	newXSproto(strcpy(buf, "GetInstanceID"), XS_Client_GetInstanceID, file, "$$");
+	newXSproto(strcpy(buf, "GetInstrumentMod"), XS_Client_GetInstrumentMod, file, "$$");
+	newXSproto(strcpy(buf, "GetIP"), XS_Client_GetIP, file, "$");
+	newXSproto(strcpy(buf, "GetItemAt"), XS_Client_GetItemAt, file, "$$");
+	newXSproto(strcpy(buf, "GetItemIDAt"), XS_Client_GetItemIDAt, file, "$$");
+	newXSproto(strcpy(buf, "GetItemInInventory"), XS_Client_GetItemInInventory, file, "$$");
+	newXSproto(strcpy(buf, "GetLanguageSkill"), XS_Client_GetLanguageSkill, file, "$$");
+	newXSproto(strcpy(buf, "GetLastName"), XS_Client_GetLastName, file, "$");
+	newXSproto(strcpy(buf, "GetLDoNLosses"), XS_Client_GetLDoNLosses, file, "$");
+	newXSproto(strcpy(buf, "GetLDoNLossesTheme"), XS_Client_GetLDoNLossesTheme, file, "$$");
+	newXSproto(strcpy(buf, "GetLDoNPointsTheme"), XS_Client_GetLDoNPointsTheme, file, "$");
+	newXSproto(strcpy(buf, "GetLDoNWins"), XS_Client_GetLDoNWins, file, "$");
+	newXSproto(strcpy(buf, "GetLDoNWinsTheme"), XS_Client_GetLDoNWinsTheme, file, "$$");
+	newXSproto(strcpy(buf, "GetMaxEndurance"), XS_Client_GetMaxEndurance, file, "$");
+	newXSproto(strcpy(buf, "GetModCharacterFactionLevel"), XS_Client_GetModCharacterFactionLevel, file, "$$");
+	newXSproto(strcpy(buf, "GetMoney"), XS_Client_GetMoney, file, "$$$");
+	newXSproto(strcpy(buf, "GetPVP"), XS_Client_GetPVP, file, "$");
+	newXSproto(strcpy(buf, "GetPVPPoints"), XS_Client_GetPVPPoints, file, "$");
+	newXSproto(strcpy(buf, "GetRadiantCrystals"), XS_Client_GetRadiantCrystals, file, "$");
+	newXSproto(strcpy(buf, "GetRaid"), XS_Client_GetRaid, file, "$");
+	newXSproto(strcpy(buf, "GetRaidPoints"), XS_Client_GetRaidPoints, file, "$");
+	newXSproto(strcpy(buf, "GetRawItemAC"), XS_Client_GetRawItemAC, file, "$");
+	newXSproto(strcpy(buf, "GetRawSkill"), XS_Client_GetRawSkill, file, "$$");
+	newXSproto(strcpy(buf, "GetSkill"), XS_Client_GetSkill, file, "$$");
+	newXSproto(strcpy(buf, "GetSkillPoints"), XS_Client_GetSkillPoints, file, "$");
+	newXSproto(strcpy(buf, "GetSpellBookSlotBySpellID"), XS_Client_GetSpellBookSlotBySpellID, file, "$$");
+	newXSproto(strcpy(buf, "GetSpentAA"), XS_Client_GetSpentAA, file, "$$");
+	newXSproto(strcpy(buf, "GetStartZone"), XS_Client_GetStartZone, file, "$");
 	newXSproto(strcpy(buf, "GetTargetRingX"), XS_Client_GetTargetRingX, file, "$$");
 	newXSproto(strcpy(buf, "GetTargetRingY"), XS_Client_GetTargetRingY, file, "$$");
 	newXSproto(strcpy(buf, "GetTargetRingZ"), XS_Client_GetTargetRingZ, file, "$$");
-	newXSproto(strcpy(buf, "QuestReward"), XS_Client_QuestReward, file, "$$;$$$$$$$");
-	newXSproto(strcpy(buf, "CalcEXP"), XS_Client_CalcEXP, file, "$");
-	newXSproto(strcpy(buf, "GetMoney"), XS_Client_GetMoney, file, "$$$");
-	newXSproto(strcpy(buf, "GetAccountAge"), XS_Client_GetAccountAge, file, "$");
+	newXSproto(strcpy(buf, "GetTaskActivityDoneCount"), XS_Client_GetTaskActivityDoneCount, file, "$$$");
+	newXSproto(strcpy(buf, "GetThirst"), XS_Client_GetThirst, file, "$$");
+	newXSproto(strcpy(buf, "GetTotalSecondsPlayed"), XS_Client_GetTotalSecondsPlayed, file, "$");
+	newXSproto(strcpy(buf, "GetWeight"), XS_Client_GetWeight, file, "$");
+	newXSproto(strcpy(buf, "GMKill"), XS_Client_GMKill, file, "$");
+	newXSproto(strcpy(buf, "GoFish"), XS_Client_GoFish, file, "$");
+	newXSproto(strcpy(buf, "GrantAlternateAdvancementAbility"), XS_Client_GrantAlternateAdvancementAbility, file, "$$$;$");
+	newXSproto(strcpy(buf, "GuildID"), XS_Client_GuildID, file, "$");
+	newXSproto(strcpy(buf, "GuildRank"), XS_Client_GuildRank, file, "$");
+	newXSproto(strcpy(buf, "HasSkill"), XS_Client_HasSkill, file, "$$");
+	newXSproto(strcpy(buf, "HasSpellScribed"), XS_Client_HasSkill, file, "$$");
+	newXSproto(strcpy(buf, "HasZoneFlag"), XS_Client_HasZoneFlag, file, "$$");
+	newXSproto(strcpy(buf, "Hungry"), XS_Client_Hungry, file, "$");
+	newXSproto(strcpy(buf, "IncreaseLanguageSkill"), XS_Client_IncreaseLanguageSkill, file, "$$;$");
+	newXSproto(strcpy(buf, "IncreaseSkill"), XS_Client_IncreaseSkill, file, "$$;$");
+	newXSproto(strcpy(buf, "IncrementAA"), XS_Client_IncrementAA, file, "$$");
+	newXSproto(strcpy(buf, "IncStats"), XS_Client_IncStats, file, "$$$");
+	newXSproto(strcpy(buf, "InZone"), XS_Client_InZone, file, "$");
+	newXSproto(strcpy(buf, "IsBecomeNPC"), XS_Client_IsBecomeNPC, file, "$");
+	newXSproto(strcpy(buf, "IsDueling"), XS_Client_IsDueling, file, "$");
+	newXSproto(strcpy(buf, "IsGrouped"), XS_Client_IsGrouped, file, "$");
+	newXSproto(strcpy(buf, "IsLD"), XS_Client_IsLD, file, "$");
+	newXSproto(strcpy(buf, "IsMedding"), XS_Client_IsMedding, file, "$");
+	newXSproto(strcpy(buf, "IsRaidGrouped"), XS_Client_IsRaidGrouped, file, "$");
+	newXSproto(strcpy(buf, "IsSitting"), XS_Client_IsSitting, file, "$");
+	newXSproto(strcpy(buf, "IsTaskActive"), XS_Client_IsTaskActive, file, "$$");
+	newXSproto(strcpy(buf, "IsTaskActivityActive"), XS_Client_IsTaskActivityActive, file, "$$$");
+	newXSproto(strcpy(buf, "IsTaskCompleted"), XS_Client_IsTaskCompleted, file, "$$");
+	newXSproto(strcpy(buf, "KeyRingAdd"), XS_Client_KeyRingAdd, file, "$$");
+	newXSproto(strcpy(buf, "KeyRingCheck"), XS_Client_KeyRingCheck, file, "$$");
+	newXSproto(strcpy(buf, "Kick"), XS_Client_Kick, file, "$");
+	newXSproto(strcpy(buf, "LearnRecipe"), XS_Client_LearnRecipe, file, "$$");
+	newXSproto(strcpy(buf, "LeaveGroup"), XS_Client_LeaveGroup, file, "$");
+	newXSproto(strcpy(buf, "LoadZoneFlags"), XS_Client_LoadZoneFlags, file, "$");
+	newXSproto(strcpy(buf, "MarkCompassLoc"), XS_Client_MarkCompassLoc, file, "$$$$");
+	newXSproto(strcpy(buf, "MaxSkill"), XS_Client_MaxSkill, file, "$$;$$");
+	newXSproto(strcpy(buf, "MemSpell"), XS_Client_MemSpell, file, "$$$;$");
+	newXSproto(strcpy(buf, "MovePC"), XS_Client_MovePC, file, "$$$$$$");
+	newXSproto(strcpy(buf, "MovePCInstance"), XS_Client_MovePCInstance, file, "$$$$$$$");
+	newXSproto(strcpy(buf, "NPCSpawn"), XS_Client_NPCSpawn, file, "$$$;$");
+	newXSproto(strcpy(buf, "NukeItem"), XS_Client_NukeItem, file, "$$;$");
+	newXSproto(strcpy(buf, "OpenLFGuildWindow"), XS_Client_OpenLFGuildWindow, file, "$");
+	newXSproto(strcpy(buf, "PlayMP3"), XS_Client_PlayMP3, file, "$;$");
 	newXSproto(strcpy(buf, "Popup2"), XS_Client_Popup2, file, "$$$;$$$$$$$");
+	newXSproto(strcpy(buf, "QuestReward"), XS_Client_QuestReward, file, "$$;$$$$$$$");
+	newXSproto(strcpy(buf, "ReadBook"), XS_Client_ReadBook, file, "$$$");
+	newXSproto(strcpy(buf, "RefundAA"), XS_Client_RefundAA, file, "$$");
+	newXSproto(strcpy(buf, "RemoveNoRent"), XS_Client_RemoveNoRent, file, "$");
+	newXSproto(strcpy(buf, "ResetAA"), XS_Client_ResetAA, file, "$");
+	newXSproto(strcpy(buf, "ResetTrade"), XS_Client_ResetTrade, file, "$");
+	newXSproto(strcpy(buf, "Save"), XS_Client_Save, file, "$$");
+	newXSproto(strcpy(buf, "SaveBackup"), XS_Client_SaveBackup, file, "$");
+	newXSproto(strcpy(buf, "ScribeSpell"), XS_Client_ScribeSpell, file, "$$$;$");
+	newXSproto(strcpy(buf, "SendColoredText"), XS_Client_SendColoredText, file, "$$$");
+	newXSproto(strcpy(buf, "SendMarqueeMessage"), XS_Client_SendMarqueeMessage, file, "$$$$$$$");
+	newXSproto(strcpy(buf, "SendOPTranslocateConfirm"), XS_Client_SendOPTranslocateConfirm, file, "$$$");
+	newXSproto(strcpy(buf, "SendSound"), XS_Client_SendSound, file, "$");
+	newXSproto(strcpy(buf, "SendSpellAnim"), XS_Client_SendSpellAnim, file, "$$$");
+	newXSproto(strcpy(buf, "SendTargetCommand"), XS_Client_SendTargetCommand, file, "$$");
+	newXSproto(strcpy(buf, "SendWebLink"), XS_Client_SendWebLink, file, "$:$");
+	newXSproto(strcpy(buf, "SendZoneFlagInfo"), XS_Client_SendZoneFlagInfo, file, "$$");
+	newXSproto(strcpy(buf, "SetAAPoints"), XS_Client_SetAAPoints, file, "$$");
+	newXSproto(strcpy(buf, "SetAATitle"), XS_Client_SetAATitle, file, "$$;$");
+	newXSproto(strcpy(buf, "SetAccountFlag"), XS_Client_SetAccountFlag, file, "$$");
+	newXSproto(strcpy(buf, "SetBaseClass"), XS_Client_SetBaseClass, file, "$$");
+	newXSproto(strcpy(buf, "SetBaseGender"), XS_Client_SetBaseGender, file, "$$");
+	newXSproto(strcpy(buf, "SetBaseRace"), XS_Client_SetBaseRace, file, "$$");
+	newXSproto(strcpy(buf, "SetBecomeNPC"), XS_Client_SetBecomeNPC, file, "$$");
+	newXSproto(strcpy(buf, "SetBecomeNPCLevel"), XS_Client_SetBecomeNPCLevel, file, "$$");
+	newXSproto(strcpy(buf, "SetBindPoint"), XS_Client_SetBindPoint, file, "$;$$$$$");
+	newXSproto(strcpy(buf, "SetConsumption"), XS_Client_SetConsumption, file, "$$$");
+	newXSproto(strcpy(buf, "SetCustomItemData"), XS_Client_SetCustomItemData, file, "$$$$");
+	newXSproto(strcpy(buf, "SetDeity"), XS_Client_SetDeity, file, "$$");
+	newXSproto(strcpy(buf, "SetDueling"), XS_Client_SetDueling, file, "$$");
+	newXSproto(strcpy(buf, "SetDuelTarget"), XS_Client_SetDuelTarget, file, "$$");
+	newXSproto(strcpy(buf, "SetEndurance"), XS_Client_SetEndurance, file, "$$");
+	newXSproto(strcpy(buf, "SetEXP"), XS_Client_SetEXP, file, "$$$;$");
+	newXSproto(strcpy(buf, "SetFactionLevel"), XS_Client_SetFactionLevel, file, "$$$$$$");
+	newXSproto(strcpy(buf, "SetFactionLevel2"), XS_Client_SetFactionLevel2, file, "$$$$$$$");
+	newXSproto(strcpy(buf, "SetFeigned"), XS_Client_SetFeigned, file, "$$");
+	newXSproto(strcpy(buf, "SetGM"), XS_Client_SetGM, file, "$$");
+	newXSproto(strcpy(buf, "SetHorseId"), XS_Client_SetHorseId, file, "$$");
+	newXSproto(strcpy(buf, "SetHunger"), XS_Client_SetHunger, file, "$$");
+	newXSproto(strcpy(buf, "SetLanguageSkill"), XS_Client_SetLanguageSkill, file, "$$$");
+	newXSproto(strcpy(buf, "SetMaterial"), XS_Client_SetMaterial, file, "$$$");
+	newXSproto(strcpy(buf, "SetPrimaryWeaponOrnamentation"), XS_Client_SetPrimaryWeaponOrnamentation, file, "$$");
+	newXSproto(strcpy(buf, "SetPVP"), XS_Client_SetPVP, file, "$$");
+	newXSproto(strcpy(buf, "SetSecondaryWeaponOrnamentation"), XS_Client_SetSecondaryWeaponOrnamentation, file, "$$");
+	newXSproto(strcpy(buf, "SetSkill"), XS_Client_SetSkill, file, "$$$");
+	newXSproto(strcpy(buf, "SetSkillPoints"), XS_Client_SetSkillPoints, file, "$$");
+	newXSproto(strcpy(buf, "SetStartZone"), XS_Client_SetStartZone, file, "$$");
+	newXSproto(strcpy(buf, "SetStats"), XS_Client_SetStats, file, "$$$");
+	newXSproto(strcpy(buf, "SetThirst"), XS_Client_SetThirst, file, "$$");
+	newXSproto(strcpy(buf, "SetTint"), XS_Client_SetTint, file, "$$$");
+	newXSproto(strcpy(buf, "SetTitleSuffix"), XS_Client_SetTitleSuffix, file, "$$;$");
+	newXSproto(strcpy(buf, "SetZoneFlag"), XS_Client_SetZoneFlag, file, "$$");
+	newXSproto(strcpy(buf, "SignalClient"), XS_Client_SignalClient, file, "$");
+	newXSproto(strcpy(buf, "SilentMessage"), XS_Client_SilentMessage, file, "$$");
+	newXSproto(strcpy(buf, "SlotConvert2"), XS_Client_SlotConvert2, file, "$$");
+	newXSproto(strcpy(buf, "Stand"), XS_Client_Stand, file, "$");
+	newXSproto(strcpy(buf, "SummonItem"), XS_Client_SummonItem, file, "$$;$$$$$$$$");
+	newXSproto(strcpy(buf, "TakeMoneyFromPP"), XS_Client_TakeMoneyFromPP, file, "$$;$");
+	newXSproto(strcpy(buf, "TGB"), XS_Client_TGB, file, "$");
+	newXSproto(strcpy(buf, "Thirsty"), XS_Client_Thirsty, file, "$");
+	newXSproto(strcpy(buf, "TrainDiscBySpellID"), XS_Client_TrainDiscBySpellID, file, "$$");
+	newXSproto(strcpy(buf, "Undye"), XS_Client_Undye, file, "$");
+	newXSproto(strcpy(buf, "UnFreeze"), XS_Client_UnFreeze, file, "$");
+	newXSproto(strcpy(buf, "UnmemSpell"), XS_Client_UnmemSpell, file, "$$;$");
+	newXSproto(strcpy(buf, "UnmemSpellAll"), XS_Client_UnmemSpellAll, file, "$;$");
+	newXSproto(strcpy(buf, "UnmemSpellBySpellID"), XS_Client_UnmemSpellBySpellID, file, "$$");
+	newXSproto(strcpy(buf, "UnscribeSpell"), XS_Client_UnscribeSpell, file, "$$;$");
+	newXSproto(strcpy(buf, "UnscribeSpellAll"), XS_Client_UnscribeSpellAll, file, "$;$");
+	newXSproto(strcpy(buf, "UntrainDisc"), XS_Client_UntrainDisc, file, "$$;$");
+	newXSproto(strcpy(buf, "UntrainDiscAll"), XS_Client_UntrainDiscAll, file, "$;$");
+	newXSproto(strcpy(buf, "UpdateAdmin"), XS_Client_UpdateAdmin, file, "$;$");
+	newXSproto(strcpy(buf, "UpdateGroupAAs"), XS_Client_UpdateGroupAAs, file, "$$$");
+	newXSproto(strcpy(buf, "UpdateLDoNPoints"), XS_Client_UpdateLDoNPoints, file, "$$$");
+	newXSproto(strcpy(buf, "UpdateTaskActivity"), XS_Client_UpdateTaskActivity, file, "$$$$;$");
+	newXSproto(strcpy(buf, "UpdateWho"), XS_Client_UpdateWho, file, "$;$");
+	newXSproto(strcpy(buf, "UseDiscipline"), XS_Client_UseDiscipline, file, "$$$");
+	newXSproto(strcpy(buf, "WorldKick"), XS_Client_WorldKick, file, "$");
 	XSRETURN_YES;
 }
 
diff --git a/zone/zonedb.h b/zone/zonedb.h
index 78f78ab83..843bdace5 100644
--- a/zone/zonedb.h
+++ b/zone/zonedb.h
@@ -271,7 +271,12 @@ public:
 	void DeleteBuyLines(uint32 CharID);
 	void UpdateBuyLine(uint32 CharID, uint32 BuySlot, uint32 Quantity);
 
-	/* General Character Related Stuff  */
+	/**
+	 ************************************************
+	 * Character
+	 ************************************************
+	 */
+
 	bool	SetServerFilters(char* name, ServerSideFilters_Struct *ssfs);
 	uint32	GetServerFilters(char* name, ServerSideFilters_Struct *ssfs);
 
@@ -284,46 +289,43 @@ public:
 	void RemoveTempFactions(Client *c);
 	void UpdateItemRecastTimestamps(uint32 char_id, uint32 recast_type, uint32 timestamp);
 
-	/* Character Data Loaders  */
-	bool	LoadCharacterFactionValues(uint32 character_id, faction_map & val_list);
-	bool	LoadCharacterSpellBook(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterMemmedSpells(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterLanguages(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterDisciplines(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterSkills(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterData(uint32 character_id, PlayerProfile_Struct* pp, ExtendedProfile_Struct* m_epp);
-	bool	LoadCharacterCurrency(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterBindPoint(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterMaterialColor(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterBandolier(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterTribute(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterPotions(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	LoadCharacterLeadershipAA(uint32 character_id, PlayerProfile_Struct* pp);
+	bool DeleteCharacterAAs(uint32 character_id);
+	bool DeleteCharacterBandolier(uint32 character_id, uint32 band_id);
+	bool DeleteCharacterDisc(uint32 character_id, uint32 slot_id);
+	bool DeleteCharacterDye(uint32 character_id);
+	bool DeleteCharacterLeadershipAAs(uint32 character_id);
+	bool DeleteCharacterMemorizedSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
+	bool DeleteCharacterSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
 
-	/* Character Data Saves  */
-	bool	SaveCharacterBindPoint(uint32 character_id, const BindStruct &bind, uint32 bind_num);
-	bool	SaveCharacterCurrency(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	SaveCharacterData(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp, ExtendedProfile_Struct* m_epp);
-	bool	SaveCharacterAA(uint32 character_id, uint32 aa_id, uint32 current_level, uint32 charges);
-	bool	SaveCharacterSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
-	bool	SaveCharacterMemorizedSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
-	bool	SaveCharacterMaterialColor(uint32 character_id, uint32 slot_id, uint32 color);
-	bool	SaveCharacterSkill(uint32 character_id, uint32 skill_id, uint32 value);
-	bool	SaveCharacterLanguage(uint32 character_id, uint32 lang_id, uint32 value);
-	bool	SaveCharacterDisc(uint32 character_id, uint32 slot_id, uint32 disc_id);
-	bool	SaveCharacterTribute(uint32 character_id, PlayerProfile_Struct* pp);
-	bool	SaveCharacterBandolier(uint32 character_id, uint8 bandolier_id, uint8 bandolier_slot, uint32 item_id, uint32 icon, const char* bandolier_name);
-	bool	SaveCharacterPotionBelt(uint32 character_id, uint8 potion_id, uint32 item_id, uint32 icon);
-	bool	SaveCharacterLeadershipAA(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterBandolier(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterBindPoint(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterCurrency(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterData(uint32 character_id, PlayerProfile_Struct* pp, ExtendedProfile_Struct* m_epp);
+	bool LoadCharacterDisciplines(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterFactionValues(uint32 character_id, faction_map & val_list);
+	bool LoadCharacterLanguages(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterLeadershipAA(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterMaterialColor(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterMemmedSpells(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterPotions(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterSkills(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterSpellBook(uint32 character_id, PlayerProfile_Struct* pp);
+	bool LoadCharacterTribute(uint32 character_id, PlayerProfile_Struct* pp);
 
-	/* Character Data Deletes   */
-	bool	DeleteCharacterSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
-	bool	DeleteCharacterMemorizedSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
-	bool	DeleteCharacterDisc(uint32 character_id, uint32 slot_id);
-	bool	DeleteCharacterBandolier(uint32 character_id, uint32 band_id);
-	bool	DeleteCharacterLeadershipAAs(uint32 character_id);
-	bool	DeleteCharacterAAs(uint32 character_id);
-	bool	DeleteCharacterDye(uint32 character_id);
+	bool SaveCharacterAA(uint32 character_id, uint32 aa_id, uint32 current_level, uint32 charges);
+	bool SaveCharacterBandolier(uint32 character_id, uint8 bandolier_id, uint8 bandolier_slot, uint32 item_id, uint32 icon, const char* bandolier_name);
+	bool SaveCharacterBindPoint(uint32 character_id, const BindStruct &bind, uint32 bind_num);
+	bool SaveCharacterCurrency(uint32 character_id, PlayerProfile_Struct* pp);
+	bool SaveCharacterData(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp, ExtendedProfile_Struct* m_epp);
+	bool SaveCharacterDisc(uint32 character_id, uint32 slot_id, uint32 disc_id);
+	bool SaveCharacterLanguage(uint32 character_id, uint32 lang_id, uint32 value);
+	bool SaveCharacterLeadershipAA(uint32 character_id, PlayerProfile_Struct* pp);
+	bool SaveCharacterMaterialColor(uint32 character_id, uint32 slot_id, uint32 color);
+	bool SaveCharacterMemorizedSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
+	bool SaveCharacterPotionBelt(uint32 character_id, uint8 potion_id, uint32 item_id, uint32 icon);
+	bool SaveCharacterSkill(uint32 character_id, uint32 skill_id, uint32 value);
+	bool SaveCharacterSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
+	bool SaveCharacterTribute(uint32 character_id, PlayerProfile_Struct* pp);
 
 	/* Character Inventory  */
 	bool	NoRentExpired(const char* name);