diff --git a/zone/CMakeLists.txt b/zone/CMakeLists.txt
index 66a789cc2..30a3206c0 100644
--- a/zone/CMakeLists.txt
+++ b/zone/CMakeLists.txt
@@ -311,6 +311,68 @@ set_target_properties(perl_zone PROPERTIES UNITY_BUILD ON UNITY_BUILD_BATCH_SIZE
 set(gm_command_sources
     command.cpp
     bot_command.cpp
+    bot_commands/bot_actionable.cpp
+    bot_commands/bot_appearance.cpp
+    bot_commands/bot_apply_poison.cpp
+    bot_commands/bot_apply_potion.cpp
+    bot_commands/bot_attack.cpp
+    bot_commands/bot_behind_mob.cpp
+    bot_commands/bot_blocked_buffs.cpp
+    bot_commands/bot_bot.cpp
+    bot_commands/bot_bot_settings.cpp
+    bot_commands/bot_cast.cpp
+    bot_commands/bot_class_race_list.cpp
+    bot_commands/bot_click_item.cpp
+    bot_commands/bot_copy_settings.cpp
+    bot_commands/bot_default_settings.cpp
+    bot_commands/bot_depart.cpp
+    bot_commands/bot_discipline.cpp
+    bot_commands/bot_distance_ranged.cpp
+    bot_commands/bot_find_aliases.cpp
+    bot_commands/bot_follow.cpp
+    bot_commands/bot_guard.cpp
+    bot_commands/bot_heal_rotation.cpp
+    bot_commands/bot_help.cpp
+    bot_commands/bot_hold.cpp
+    bot_commands/bot_illusion_block.cpp
+    bot_commands/bot_inventory.cpp
+    bot_commands/bot_item_use.cpp
+    bot_commands/bot_max_melee_range.cpp
+    bot_commands/bot_name.cpp
+    bot_commands/bot_owner_option.cpp
+    bot_commands/bot_pet.cpp
+    bot_commands/bot_pick_lock.cpp
+    bot_commands/bot_pickpocket.cpp
+    bot_commands/bot_precombat.cpp
+    bot_commands/bot_pull.cpp
+    bot_commands/bot_release.cpp
+    bot_commands/bot_set_assistee.cpp
+    bot_commands/bot_sit_hp_percent.cpp
+    bot_commands/bot_sit_in_combat.cpp
+    bot_commands/bot_sit_mana_percent.cpp
+    bot_commands/bot_spell.cpp
+    bot_commands/bot_spell_aggro_checks.cpp
+    bot_commands/bot_spell_announce_cast.cpp
+    bot_commands/bot_spell_delays.cpp
+    bot_commands/bot_spell_engaged_priority.cpp
+    bot_commands/bot_spell_holds.cpp
+    bot_commands/bot_spell_idle_priority.cpp
+    bot_commands/bot_spell_max_hp_pct.cpp
+    bot_commands/bot_spell_max_mana_pct.cpp
+    bot_commands/bot_spell_max_thresholds.cpp
+    bot_commands/bot_spell_min_hp_pct.cpp
+    bot_commands/bot_spell_min_mana_pct.cpp
+    bot_commands/bot_spell_min_thresholds.cpp
+    bot_commands/bot_spell_pursue_priority.cpp
+    bot_commands/bot_spell_resist_limits.cpp
+    bot_commands/bot_spell_target_count.cpp
+    bot_commands/bot_spelltypes.cpp
+    bot_commands/bot_summon.cpp
+    bot_commands/bot_suspend.cpp
+    bot_commands/bot_taunt.cpp
+    bot_commands/bot_timer.cpp
+    bot_commands/bot_track.cpp
+    bot_commands/bot_view_combos.cpp
     gm_commands/acceptrules.cpp
     gm_commands/advnpcspawn.cpp
     gm_commands/aggrozone.cpp
diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp
index a697fc6bb..0e202540c 100644
--- a/zone/bot_command.cpp
+++ b/zone/bot_command.cpp
@@ -863,65 +863,3 @@ void SendSpellTypeWindow(Client* c, const Seperator* sep) {
 	c->SendPopupToClient("Spell Types", popup_text.c_str());
 }
 
-#include "bot_commands/actionable.cpp"
-#include "bot_commands/appearance.cpp"
-#include "bot_commands/apply_poison.cpp"
-#include "bot_commands/apply_potion.cpp"
-#include "bot_commands/attack.cpp"
-#include "bot_commands/behind_mob.cpp"
-#include "bot_commands/blocked_buffs.cpp"
-#include "bot_commands/bot.cpp"
-#include "bot_commands/bot_settings.cpp"
-#include "bot_commands/cast.cpp"
-#include "bot_commands/class_race_list.cpp"
-#include "bot_commands/click_item.cpp"
-#include "bot_commands/copy_settings.cpp"
-#include "bot_commands/default_settings.cpp"
-#include "bot_commands/depart.cpp"
-#include "bot_commands/discipline.cpp"
-#include "bot_commands/distance_ranged.cpp"
-#include "bot_commands/find_aliases.cpp"
-#include "bot_commands/follow.cpp"
-#include "bot_commands/guard.cpp"
-#include "bot_commands/heal_rotation.cpp"
-#include "bot_commands/help.cpp"
-#include "bot_commands/hold.cpp"
-#include "bot_commands/illusion_block.cpp"
-#include "bot_commands/inventory.cpp"
-#include "bot_commands/item_use.cpp"
-#include "bot_commands/max_melee_range.cpp"
-#include "bot_commands/name.cpp"
-#include "bot_commands/owner_option.cpp"
-#include "bot_commands/pet.cpp"
-#include "bot_commands/pick_lock.cpp"
-#include "bot_commands/pickpocket.cpp"
-#include "bot_commands/precombat.cpp"
-#include "bot_commands/pull.cpp"
-#include "bot_commands/release.cpp"
-#include "bot_commands/set_assistee.cpp"
-#include "bot_commands/sit_hp_percent.cpp"
-#include "bot_commands/sit_in_combat.cpp"
-#include "bot_commands/sit_mana_percent.cpp"
-#include "bot_commands/spell.cpp"
-#include "bot_commands/spell_aggro_checks.cpp"
-#include "bot_commands/spell_announce_cast.cpp"
-#include "bot_commands/spell_delays.cpp"
-#include "bot_commands/spell_engaged_priority.cpp"
-#include "bot_commands/spell_holds.cpp"
-#include "bot_commands/spell_idle_priority.cpp"
-#include "bot_commands/spell_max_hp_pct.cpp"
-#include "bot_commands/spell_max_mana_pct.cpp"
-#include "bot_commands/spell_max_thresholds.cpp"
-#include "bot_commands/spell_min_hp_pct.cpp"
-#include "bot_commands/spell_min_mana_pct.cpp"
-#include "bot_commands/spell_min_thresholds.cpp"
-#include "bot_commands/spell_pursue_priority.cpp"
-#include "bot_commands/spell_resist_limits.cpp"
-#include "bot_commands/spell_target_count.cpp"
-#include "bot_commands/spelltypes.cpp"
-#include "bot_commands/summon.cpp"
-#include "bot_commands/suspend.cpp"
-#include "bot_commands/taunt.cpp"
-#include "bot_commands/timer.cpp"
-#include "bot_commands/track.cpp"
-#include "bot_commands/view_combos.cpp"
diff --git a/zone/bot_commands/actionable.cpp b/zone/bot_commands/bot_actionable.cpp
similarity index 100%
rename from zone/bot_commands/actionable.cpp
rename to zone/bot_commands/bot_actionable.cpp
diff --git a/zone/bot_commands/appearance.cpp b/zone/bot_commands/bot_appearance.cpp
similarity index 100%
rename from zone/bot_commands/appearance.cpp
rename to zone/bot_commands/bot_appearance.cpp
diff --git a/zone/bot_commands/apply_poison.cpp b/zone/bot_commands/bot_apply_poison.cpp
similarity index 100%
rename from zone/bot_commands/apply_poison.cpp
rename to zone/bot_commands/bot_apply_poison.cpp
diff --git a/zone/bot_commands/apply_potion.cpp b/zone/bot_commands/bot_apply_potion.cpp
similarity index 100%
rename from zone/bot_commands/apply_potion.cpp
rename to zone/bot_commands/bot_apply_potion.cpp
diff --git a/zone/bot_commands/attack.cpp b/zone/bot_commands/bot_attack.cpp
similarity index 100%
rename from zone/bot_commands/attack.cpp
rename to zone/bot_commands/bot_attack.cpp
diff --git a/zone/bot_commands/behind_mob.cpp b/zone/bot_commands/bot_behind_mob.cpp
similarity index 100%
rename from zone/bot_commands/behind_mob.cpp
rename to zone/bot_commands/bot_behind_mob.cpp
diff --git a/zone/bot_commands/blocked_buffs.cpp b/zone/bot_commands/bot_blocked_buffs.cpp
similarity index 100%
rename from zone/bot_commands/blocked_buffs.cpp
rename to zone/bot_commands/bot_blocked_buffs.cpp
diff --git a/zone/bot_commands/bot.cpp b/zone/bot_commands/bot_bot.cpp
similarity index 100%
rename from zone/bot_commands/bot.cpp
rename to zone/bot_commands/bot_bot.cpp
diff --git a/zone/bot_commands/bot_settings.cpp b/zone/bot_commands/bot_bot_settings.cpp
similarity index 100%
rename from zone/bot_commands/bot_settings.cpp
rename to zone/bot_commands/bot_bot_settings.cpp
diff --git a/zone/bot_commands/cast.cpp b/zone/bot_commands/bot_cast.cpp
similarity index 100%
rename from zone/bot_commands/cast.cpp
rename to zone/bot_commands/bot_cast.cpp
diff --git a/zone/bot_commands/class_race_list.cpp b/zone/bot_commands/bot_class_race_list.cpp
similarity index 100%
rename from zone/bot_commands/class_race_list.cpp
rename to zone/bot_commands/bot_class_race_list.cpp
diff --git a/zone/bot_commands/click_item.cpp b/zone/bot_commands/bot_click_item.cpp
similarity index 100%
rename from zone/bot_commands/click_item.cpp
rename to zone/bot_commands/bot_click_item.cpp
diff --git a/zone/bot_commands/copy_settings.cpp b/zone/bot_commands/bot_copy_settings.cpp
similarity index 100%
rename from zone/bot_commands/copy_settings.cpp
rename to zone/bot_commands/bot_copy_settings.cpp
diff --git a/zone/bot_commands/default_settings.cpp b/zone/bot_commands/bot_default_settings.cpp
similarity index 100%
rename from zone/bot_commands/default_settings.cpp
rename to zone/bot_commands/bot_default_settings.cpp
diff --git a/zone/bot_commands/depart.cpp b/zone/bot_commands/bot_depart.cpp
similarity index 100%
rename from zone/bot_commands/depart.cpp
rename to zone/bot_commands/bot_depart.cpp
diff --git a/zone/bot_commands/discipline.cpp b/zone/bot_commands/bot_discipline.cpp
similarity index 100%
rename from zone/bot_commands/discipline.cpp
rename to zone/bot_commands/bot_discipline.cpp
diff --git a/zone/bot_commands/distance_ranged.cpp b/zone/bot_commands/bot_distance_ranged.cpp
similarity index 100%
rename from zone/bot_commands/distance_ranged.cpp
rename to zone/bot_commands/bot_distance_ranged.cpp
diff --git a/zone/bot_commands/find_aliases.cpp b/zone/bot_commands/bot_find_aliases.cpp
similarity index 100%
rename from zone/bot_commands/find_aliases.cpp
rename to zone/bot_commands/bot_find_aliases.cpp
diff --git a/zone/bot_commands/follow.cpp b/zone/bot_commands/bot_follow.cpp
similarity index 100%
rename from zone/bot_commands/follow.cpp
rename to zone/bot_commands/bot_follow.cpp
diff --git a/zone/bot_commands/guard.cpp b/zone/bot_commands/bot_guard.cpp
similarity index 100%
rename from zone/bot_commands/guard.cpp
rename to zone/bot_commands/bot_guard.cpp
diff --git a/zone/bot_commands/heal_rotation.cpp b/zone/bot_commands/bot_heal_rotation.cpp
similarity index 100%
rename from zone/bot_commands/heal_rotation.cpp
rename to zone/bot_commands/bot_heal_rotation.cpp
diff --git a/zone/bot_commands/help.cpp b/zone/bot_commands/bot_help.cpp
similarity index 100%
rename from zone/bot_commands/help.cpp
rename to zone/bot_commands/bot_help.cpp
diff --git a/zone/bot_commands/hold.cpp b/zone/bot_commands/bot_hold.cpp
similarity index 100%
rename from zone/bot_commands/hold.cpp
rename to zone/bot_commands/bot_hold.cpp
diff --git a/zone/bot_commands/illusion_block.cpp b/zone/bot_commands/bot_illusion_block.cpp
similarity index 100%
rename from zone/bot_commands/illusion_block.cpp
rename to zone/bot_commands/bot_illusion_block.cpp
diff --git a/zone/bot_commands/inventory.cpp b/zone/bot_commands/bot_inventory.cpp
similarity index 100%
rename from zone/bot_commands/inventory.cpp
rename to zone/bot_commands/bot_inventory.cpp
diff --git a/zone/bot_commands/item_use.cpp b/zone/bot_commands/bot_item_use.cpp
similarity index 100%
rename from zone/bot_commands/item_use.cpp
rename to zone/bot_commands/bot_item_use.cpp
diff --git a/zone/bot_commands/max_melee_range.cpp b/zone/bot_commands/bot_max_melee_range.cpp
similarity index 100%
rename from zone/bot_commands/max_melee_range.cpp
rename to zone/bot_commands/bot_max_melee_range.cpp
diff --git a/zone/bot_commands/name.cpp b/zone/bot_commands/bot_name.cpp
similarity index 100%
rename from zone/bot_commands/name.cpp
rename to zone/bot_commands/bot_name.cpp
diff --git a/zone/bot_commands/owner_option.cpp b/zone/bot_commands/bot_owner_option.cpp
similarity index 100%
rename from zone/bot_commands/owner_option.cpp
rename to zone/bot_commands/bot_owner_option.cpp
diff --git a/zone/bot_commands/pet.cpp b/zone/bot_commands/bot_pet.cpp
similarity index 100%
rename from zone/bot_commands/pet.cpp
rename to zone/bot_commands/bot_pet.cpp
diff --git a/zone/bot_commands/pick_lock.cpp b/zone/bot_commands/bot_pick_lock.cpp
similarity index 98%
rename from zone/bot_commands/pick_lock.cpp
rename to zone/bot_commands/bot_pick_lock.cpp
index 7815833ee..49096a8f5 100644
--- a/zone/bot_commands/pick_lock.cpp
+++ b/zone/bot_commands/bot_pick_lock.cpp
@@ -1,4 +1,5 @@
 #include "../bot_command.h"
+#include "../doors.h"
 
 void bot_command_pick_lock(Client *c, const Seperator *sep)
 {
diff --git a/zone/bot_commands/pickpocket.cpp b/zone/bot_commands/bot_pickpocket.cpp
similarity index 100%
rename from zone/bot_commands/pickpocket.cpp
rename to zone/bot_commands/bot_pickpocket.cpp
diff --git a/zone/bot_commands/precombat.cpp b/zone/bot_commands/bot_precombat.cpp
similarity index 100%
rename from zone/bot_commands/precombat.cpp
rename to zone/bot_commands/bot_precombat.cpp
diff --git a/zone/bot_commands/pull.cpp b/zone/bot_commands/bot_pull.cpp
similarity index 100%
rename from zone/bot_commands/pull.cpp
rename to zone/bot_commands/bot_pull.cpp
diff --git a/zone/bot_commands/release.cpp b/zone/bot_commands/bot_release.cpp
similarity index 100%
rename from zone/bot_commands/release.cpp
rename to zone/bot_commands/bot_release.cpp
diff --git a/zone/bot_commands/set_assistee.cpp b/zone/bot_commands/bot_set_assistee.cpp
similarity index 100%
rename from zone/bot_commands/set_assistee.cpp
rename to zone/bot_commands/bot_set_assistee.cpp
diff --git a/zone/bot_commands/sit_hp_percent.cpp b/zone/bot_commands/bot_sit_hp_percent.cpp
similarity index 100%
rename from zone/bot_commands/sit_hp_percent.cpp
rename to zone/bot_commands/bot_sit_hp_percent.cpp
diff --git a/zone/bot_commands/sit_in_combat.cpp b/zone/bot_commands/bot_sit_in_combat.cpp
similarity index 100%
rename from zone/bot_commands/sit_in_combat.cpp
rename to zone/bot_commands/bot_sit_in_combat.cpp
diff --git a/zone/bot_commands/sit_mana_percent.cpp b/zone/bot_commands/bot_sit_mana_percent.cpp
similarity index 100%
rename from zone/bot_commands/sit_mana_percent.cpp
rename to zone/bot_commands/bot_sit_mana_percent.cpp
diff --git a/zone/bot_commands/spell.cpp b/zone/bot_commands/bot_spell.cpp
similarity index 100%
rename from zone/bot_commands/spell.cpp
rename to zone/bot_commands/bot_spell.cpp
diff --git a/zone/bot_commands/spell_aggro_checks.cpp b/zone/bot_commands/bot_spell_aggro_checks.cpp
similarity index 100%
rename from zone/bot_commands/spell_aggro_checks.cpp
rename to zone/bot_commands/bot_spell_aggro_checks.cpp
diff --git a/zone/bot_commands/spell_announce_cast.cpp b/zone/bot_commands/bot_spell_announce_cast.cpp
similarity index 100%
rename from zone/bot_commands/spell_announce_cast.cpp
rename to zone/bot_commands/bot_spell_announce_cast.cpp
diff --git a/zone/bot_commands/spell_delays.cpp b/zone/bot_commands/bot_spell_delays.cpp
similarity index 100%
rename from zone/bot_commands/spell_delays.cpp
rename to zone/bot_commands/bot_spell_delays.cpp
diff --git a/zone/bot_commands/spell_engaged_priority.cpp b/zone/bot_commands/bot_spell_engaged_priority.cpp
similarity index 100%
rename from zone/bot_commands/spell_engaged_priority.cpp
rename to zone/bot_commands/bot_spell_engaged_priority.cpp
diff --git a/zone/bot_commands/spell_holds.cpp b/zone/bot_commands/bot_spell_holds.cpp
similarity index 100%
rename from zone/bot_commands/spell_holds.cpp
rename to zone/bot_commands/bot_spell_holds.cpp
diff --git a/zone/bot_commands/spell_idle_priority.cpp b/zone/bot_commands/bot_spell_idle_priority.cpp
similarity index 100%
rename from zone/bot_commands/spell_idle_priority.cpp
rename to zone/bot_commands/bot_spell_idle_priority.cpp
diff --git a/zone/bot_commands/spell_max_hp_pct.cpp b/zone/bot_commands/bot_spell_max_hp_pct.cpp
similarity index 100%
rename from zone/bot_commands/spell_max_hp_pct.cpp
rename to zone/bot_commands/bot_spell_max_hp_pct.cpp
diff --git a/zone/bot_commands/spell_max_mana_pct.cpp b/zone/bot_commands/bot_spell_max_mana_pct.cpp
similarity index 100%
rename from zone/bot_commands/spell_max_mana_pct.cpp
rename to zone/bot_commands/bot_spell_max_mana_pct.cpp
diff --git a/zone/bot_commands/spell_max_thresholds.cpp b/zone/bot_commands/bot_spell_max_thresholds.cpp
similarity index 100%
rename from zone/bot_commands/spell_max_thresholds.cpp
rename to zone/bot_commands/bot_spell_max_thresholds.cpp
diff --git a/zone/bot_commands/spell_min_hp_pct.cpp b/zone/bot_commands/bot_spell_min_hp_pct.cpp
similarity index 100%
rename from zone/bot_commands/spell_min_hp_pct.cpp
rename to zone/bot_commands/bot_spell_min_hp_pct.cpp
diff --git a/zone/bot_commands/spell_min_mana_pct.cpp b/zone/bot_commands/bot_spell_min_mana_pct.cpp
similarity index 100%
rename from zone/bot_commands/spell_min_mana_pct.cpp
rename to zone/bot_commands/bot_spell_min_mana_pct.cpp
diff --git a/zone/bot_commands/spell_min_thresholds.cpp b/zone/bot_commands/bot_spell_min_thresholds.cpp
similarity index 100%
rename from zone/bot_commands/spell_min_thresholds.cpp
rename to zone/bot_commands/bot_spell_min_thresholds.cpp
diff --git a/zone/bot_commands/spell_pursue_priority.cpp b/zone/bot_commands/bot_spell_pursue_priority.cpp
similarity index 100%
rename from zone/bot_commands/spell_pursue_priority.cpp
rename to zone/bot_commands/bot_spell_pursue_priority.cpp
diff --git a/zone/bot_commands/spell_resist_limits.cpp b/zone/bot_commands/bot_spell_resist_limits.cpp
similarity index 100%
rename from zone/bot_commands/spell_resist_limits.cpp
rename to zone/bot_commands/bot_spell_resist_limits.cpp
diff --git a/zone/bot_commands/spell_target_count.cpp b/zone/bot_commands/bot_spell_target_count.cpp
similarity index 100%
rename from zone/bot_commands/spell_target_count.cpp
rename to zone/bot_commands/bot_spell_target_count.cpp
diff --git a/zone/bot_commands/spelltypes.cpp b/zone/bot_commands/bot_spelltypes.cpp
similarity index 100%
rename from zone/bot_commands/spelltypes.cpp
rename to zone/bot_commands/bot_spelltypes.cpp
diff --git a/zone/bot_commands/summon.cpp b/zone/bot_commands/bot_summon.cpp
similarity index 100%
rename from zone/bot_commands/summon.cpp
rename to zone/bot_commands/bot_summon.cpp
diff --git a/zone/bot_commands/suspend.cpp b/zone/bot_commands/bot_suspend.cpp
similarity index 100%
rename from zone/bot_commands/suspend.cpp
rename to zone/bot_commands/bot_suspend.cpp
diff --git a/zone/bot_commands/taunt.cpp b/zone/bot_commands/bot_taunt.cpp
similarity index 100%
rename from zone/bot_commands/taunt.cpp
rename to zone/bot_commands/bot_taunt.cpp
diff --git a/zone/bot_commands/timer.cpp b/zone/bot_commands/bot_timer.cpp
similarity index 100%
rename from zone/bot_commands/timer.cpp
rename to zone/bot_commands/bot_timer.cpp
diff --git a/zone/bot_commands/track.cpp b/zone/bot_commands/bot_track.cpp
similarity index 100%
rename from zone/bot_commands/track.cpp
rename to zone/bot_commands/bot_track.cpp
diff --git a/zone/bot_commands/view_combos.cpp b/zone/bot_commands/bot_view_combos.cpp
similarity index 100%
rename from zone/bot_commands/view_combos.cpp
rename to zone/bot_commands/bot_view_combos.cpp
diff --git a/zone/gm_commands/find/find_spell.cpp b/zone/gm_commands/find/find_spell.cpp
index ddfc83270..b5f1a88e8 100644
--- a/zone/gm_commands/find/find_spell.cpp
+++ b/zone/gm_commands/find/find_spell.cpp
@@ -1,5 +1,7 @@
 #include "../../client.h"
 
+uint8 GetCommandStatus(std::string command_name);
+
 void FindSpell(Client *c, const Seperator *sep)
 {
 	if (SPDAT_RECORDS <= 0) {
diff --git a/zone/gm_commands/find/find_task.cpp b/zone/gm_commands/find/find_task.cpp
index c51f1892d..0873ebe30 100644
--- a/zone/gm_commands/find/find_task.cpp
+++ b/zone/gm_commands/find/find_task.cpp
@@ -1,5 +1,7 @@
 #include "../../client.h"
 
+uint8 GetCommandStatus(std::string command_name);
+
 void FindTask(Client *c, const Seperator *sep)
 {
 	if (!RuleB(TaskSystem, EnableTaskSystem)) {
diff --git a/zone/gm_commands/fixmob.cpp b/zone/gm_commands/fixmob.cpp
index 14cf3e980..d691b0f2e 100755
--- a/zone/gm_commands/fixmob.cpp
+++ b/zone/gm_commands/fixmob.cpp
@@ -1,5 +1,21 @@
 #include "../client.h"
 
+void SendFixMobSubCommands(Client* c)
+{
+	c->Message(Chat::White, "Usage: #fixmob beard [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob beard_color [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob drakkin_details [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob drakkin_heritage [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob drakkin_tattoo [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob face [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob gender [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob hair [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob hair_color [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob helm [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob race [Next|Previous]");
+	c->Message(Chat::White, "Usage: #fixmob texture [Next|Previous]");
+}
+
 void command_fixmob(Client *c, const Seperator *sep)
 {
 	const int arguments = sep->argnum;
@@ -269,18 +285,3 @@ void command_fixmob(Client *c, const Seperator *sep)
 	);
 }
 
-void SendFixMobSubCommands(Client *c)
-{
-	c->Message(Chat::White, "Usage: #fixmob beard [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob beard_color [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob drakkin_details [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob drakkin_heritage [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob drakkin_tattoo [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob face [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob gender [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob hair [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob hair_color [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob helm [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob race [Next|Previous]");
-	c->Message(Chat::White, "Usage: #fixmob texture [Next|Previous]");
-}
diff --git a/zone/gm_commands/set/set_zone.cpp b/zone/gm_commands/set/set_zone.cpp
index 0ff3c24cb..d2bfecaed 100644
--- a/zone/gm_commands/set/set_zone.cpp
+++ b/zone/gm_commands/set/set_zone.cpp
@@ -1,4 +1,7 @@
 #include "../../client.h"
+#include "../../worldserver.h"
+
+extern WorldServer worldserver;
 
 void SetZoneData(Client *c, const Seperator *sep)
 {