diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 28387b850..3379e2de6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,77 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="0dbfe935-8085-4dde-9815-06f8b3761458" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/Management-Server/.gitignore" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$4.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$5.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$6.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$7.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main$8.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/Main.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/ServerConstants.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/classloader/ClassLoadServer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/classloader/WorkerThread.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/Constants.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/Initializer$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/Initializer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/SplashFrame$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/SplashFrame.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/screen/InteractiveOverlay.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/screen/SplashScreen$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/screen/SplashScreen.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/launcher/screen/impl/LoadingBar.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/EventProducer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/IoEventHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/IoReadEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/IoSession.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/IoWriteEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/NioReactor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/HSReadEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/HSWriteEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/PacketReadEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/PacketWriteEvent$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/PacketWriteEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/RegistryReadEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/event/RegistryWriteEvent.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/packet/IoBuffer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/packet/PacketHeader.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/packet/WorldPacketRepository.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/producer/HSEventProducer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/producer/PacketEventProducer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/net/producer/RegistryEventProducer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/OperatingSystem.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/PunishmentStorage.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/ShutdownSequence.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/communication/ClanRank.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/communication/ClanRepository.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/communication/CommunicationInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/SQLColumn.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/SQLEntryHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/SQLManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/SQLTable.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/mysql/WorldListSQLHandler.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/ByteBufferUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/Command.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/EncryptionManager$BCrypt.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/EncryptionManager.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/PlayerDatabaseGen.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/StringUtils.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/system/util/TaskExecutor.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/GameServer.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/PlayerSession.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/WorldDatabase.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/info/CountryFlag.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/info/Response.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/info/UIDInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/org/keldagrim/world/info/WorldInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/runManagement.sh" beforeDir="false" afterPath="$PROJECT_DIR$/Management-Server/runManagement.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Server/src/org/crandor/Server.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/Server.java" afterDir="false" />
-    </list>
+    <list default="true" id="0dbfe935-8085-4dde-9815-06f8b3761458" name="Default Changelist" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -112,7 +42,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="Application.Management">
+  <component name="RunManager" selected="Application.Server">
     <configuration name="Client" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.runite.Client" />
       <module name="09Scape" />
diff --git a/CompiledServer/production/09Scape/.gitignore b/CompiledServer/production/09Scape/.gitignore
index 17a06722d..85b4f9e6f 100644
--- a/CompiledServer/production/09Scape/.gitignore
+++ b/CompiledServer/production/09Scape/.gitignore
@@ -16,3 +16,4 @@ data/cache/
 *.userlibraries
 *.class
 data/players/**
+org/
diff --git a/CompiledServer/production/09Scape/org/crandor/Server.class b/CompiledServer/production/09Scape/org/crandor/Server.class
index 1b1e90714..2b9066844 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/Server.class and b/CompiledServer/production/09Scape/org/crandor/Server.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/ServerConstants.class b/CompiledServer/production/09Scape/org/crandor/ServerConstants.class
index 46ac99b81..05aa2a0dc 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/ServerConstants.class and b/CompiledServer/production/09Scape/org/crandor/ServerConstants.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/combat/ImpactHandler$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/combat/ImpactHandler$1.class
index 0b34ee6d2..d4d60bf3c 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/combat/ImpactHandler$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/combat/ImpactHandler$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$1$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$1$1.class
index 996f43b50..b18c6a349 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$1$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$1$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$10$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$10$1.class
index 06ea71460..04608cd7c 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$10$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$10$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$11$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$11$1.class
index 04303c047..617a85ec2 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$11$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$11$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$12$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$12$1.class
index 09e9f2071..16a4e3b0b 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$12$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$12$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$13$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$13$1.class
index f472e2dd9..c8d6eb501 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$13$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$13$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$2$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$2$1.class
index 9bf0201c1..b99e56762 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$2$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$2$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$3$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$3$1.class
index 3cfcdff3c..232241845 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$3$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$3$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$4$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$4$1.class
index ad22b82f1..17d51a2db 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$4$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$4$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$5$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$5$1.class
index 6ecfd8766..1d0bdb242 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$5$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$5$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$6$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$6$1.class
index d24601d32..e21df6059 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$6$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$6$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$7$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$7$1.class
index e956e6fc9..1b143fad3 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$7$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$7$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$8$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$8$1.class
index 7436f1de0..892c3d6de 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$8$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$8$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$9$1.class b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$9$1.class
index 5916758a4..bb9dc41a7 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$9$1.class and b/CompiledServer/production/09Scape/org/crandor/game/node/entity/player/link/TeleportManager$TeleportType$9$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/system/mysql/impl/GroundSpawnSQLHandler$GroundSpawn$1.class b/CompiledServer/production/09Scape/org/crandor/game/system/mysql/impl/GroundSpawnSQLHandler$GroundSpawn$1.class
index aa2a09d75..75ae3812b 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/system/mysql/impl/GroundSpawnSQLHandler$GroundSpawn$1.class and b/CompiledServer/production/09Scape/org/crandor/game/system/mysql/impl/GroundSpawnSQLHandler$GroundSpawn$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/game/system/mysql/impl/ShopSQLHandler$1.class b/CompiledServer/production/09Scape/org/crandor/game/system/mysql/impl/ShopSQLHandler$1.class
index a6c4012cb..fcac55ad4 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/game/system/mysql/impl/ShopSQLHandler$1.class and b/CompiledServer/production/09Scape/org/crandor/game/system/mysql/impl/ShopSQLHandler$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/net/packet/in/InteractionPacket$1.class b/CompiledServer/production/09Scape/org/crandor/net/packet/in/InteractionPacket$1.class
index 759d96f37..b585d395e 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/net/packet/in/InteractionPacket$1.class and b/CompiledServer/production/09Scape/org/crandor/net/packet/in/InteractionPacket$1.class differ
diff --git a/CompiledServer/production/09Scape/org/crandor/net/packet/in/InterfaceUseOnPacket$1.class b/CompiledServer/production/09Scape/org/crandor/net/packet/in/InterfaceUseOnPacket$1.class
index c5edb70fd..25aeb05b6 100644
Binary files a/CompiledServer/production/09Scape/org/crandor/net/packet/in/InterfaceUseOnPacket$1.class and b/CompiledServer/production/09Scape/org/crandor/net/packet/in/InterfaceUseOnPacket$1.class differ
diff --git a/CompiledServer/production/09Scape/plugin/activity/duel/DuelArea$2.class b/CompiledServer/production/09Scape/plugin/activity/duel/DuelArea$2.class
index a89868eb5..a7f2eab4a 100644
Binary files a/CompiledServer/production/09Scape/plugin/activity/duel/DuelArea$2.class and b/CompiledServer/production/09Scape/plugin/activity/duel/DuelArea$2.class differ
diff --git a/CompiledServer/production/09Scape/plugin/activity/pestcontrol/PestControlActivityPlugin$1.class b/CompiledServer/production/09Scape/plugin/activity/pestcontrol/PestControlActivityPlugin$1.class
index 8020e61cf..5a3df3731 100644
Binary files a/CompiledServer/production/09Scape/plugin/activity/pestcontrol/PestControlActivityPlugin$1.class and b/CompiledServer/production/09Scape/plugin/activity/pestcontrol/PestControlActivityPlugin$1.class differ
diff --git a/CompiledServer/production/09Scape/plugin/activity/pestcontrol/PestControlActivityPlugin$2.class b/CompiledServer/production/09Scape/plugin/activity/pestcontrol/PestControlActivityPlugin$2.class
index 53f985358..da2ffa7bb 100644
Binary files a/CompiledServer/production/09Scape/plugin/activity/pestcontrol/PestControlActivityPlugin$2.class and b/CompiledServer/production/09Scape/plugin/activity/pestcontrol/PestControlActivityPlugin$2.class differ
diff --git a/CompiledServer/production/09Scape/plugin/command/DeveloperCommandPlugin$1.class b/CompiledServer/production/09Scape/plugin/command/DeveloperCommandPlugin$1.class
index 31efa88cb..84605be98 100644
Binary files a/CompiledServer/production/09Scape/plugin/command/DeveloperCommandPlugin$1.class and b/CompiledServer/production/09Scape/plugin/command/DeveloperCommandPlugin$1.class differ
diff --git a/CompiledServer/production/09Scape/plugin/command/DeveloperCommandPlugin$2.class b/CompiledServer/production/09Scape/plugin/command/DeveloperCommandPlugin$2.class
index 7c272fe0e..93db7fe0d 100644
Binary files a/CompiledServer/production/09Scape/plugin/command/DeveloperCommandPlugin$2.class and b/CompiledServer/production/09Scape/plugin/command/DeveloperCommandPlugin$2.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$10.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$10.class
index eebfd50e2..6ba1e6755 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$10.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$10.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$4.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$4.class
index da06396c8..3ce9df167 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$4.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$4.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$5.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$5.class
index 01fefbaaf..2c268e552 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$5.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$5.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$6.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$6.class
index 7a0aa8323..57b7f97c9 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$6.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$6.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$7.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$7.class
index 617ce5e69..fcde53137 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$7.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$7.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$9.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$9.class
index 90d7d78e2..db8d8de35 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$9.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$9.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$DarkPortalHandler$DarkPortalDialogue$1.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$DarkPortalHandler$DarkPortalDialogue$1.class
index 7b3e543ef..fe6a58e3a 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$DarkPortalHandler$DarkPortalDialogue$1.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$DarkPortalHandler$DarkPortalDialogue$1.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$GrimReaperDialogue$1.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$GrimReaperDialogue$1.class
index f5c28675a..73c263a8e 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$GrimReaperDialogue$1.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$GrimReaperDialogue$1.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$1.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$1.class
index edc096650..6e9fcac3d 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$1.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$1.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$2.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$2.class
index 42d9e303d..1be937739 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$2.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$2.class differ
diff --git a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$3.class b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$3.class
index 3f44978d3..1c55d46e1 100644
Binary files a/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$3.class and b/CompiledServer/production/09Scape/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$3.class differ
diff --git a/CompiledServer/production/09Scape/plugin/interaction/inter/OrbViewingInterface$2.class b/CompiledServer/production/09Scape/plugin/interaction/inter/OrbViewingInterface$2.class
index 6c954cda3..c832505cd 100644
Binary files a/CompiledServer/production/09Scape/plugin/interaction/inter/OrbViewingInterface$2.class and b/CompiledServer/production/09Scape/plugin/interaction/inter/OrbViewingInterface$2.class differ
diff --git a/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$1.class b/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$1.class
index 05455bc5c..8731a48fc 100644
Binary files a/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$1.class and b/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$1.class differ
diff --git a/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$3.class b/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$3.class
index fcfe5755d..841ec90c7 100644
Binary files a/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$3.class and b/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$3.class differ
diff --git a/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$4.class b/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$4.class
index 79f0f82ee..802ed4e90 100644
Binary files a/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$4.class and b/CompiledServer/production/09Scape/plugin/random/eviltwin/EvilTwinRandomEvent$4.class differ
diff --git a/CompiledServer/production/09Scape/plugin/random/lostandfound/LostFoundRandomEvent$1$1.class b/CompiledServer/production/09Scape/plugin/random/lostandfound/LostFoundRandomEvent$1$1.class
index 8d7647d73..bfd7f7a83 100644
Binary files a/CompiledServer/production/09Scape/plugin/random/lostandfound/LostFoundRandomEvent$1$1.class and b/CompiledServer/production/09Scape/plugin/random/lostandfound/LostFoundRandomEvent$1$1.class differ
diff --git a/CompiledServer/production/09Scape/runManagement.sh b/CompiledServer/production/09Scape/runManagement.sh
index 29115cc01..71fc39c9c 100755
--- a/CompiledServer/production/09Scape/runManagement.sh
+++ b/CompiledServer/production/09Scape/runManagement.sh
@@ -1,3 +1,3 @@
 rm -rf org
 cp -r ../CompiledServer/production/09Scape/org .
-java -server -cp ".:./bin;.:./lib/*" org.crandor.Management false true false true true
+java -server -cp ".:./bin;.:./lib/*" org.keldagrim.Management false true false true true
diff --git a/CompiledServer/production/09Scape/runServer.sh b/CompiledServer/production/09Scape/runServer.sh
index bb4d94c3e..9797a838a 100755
--- a/CompiledServer/production/09Scape/runServer.sh
+++ b/CompiledServer/production/09Scape/runServer.sh
@@ -1,3 +1,3 @@
 rm -rf org
 cp -r ../CompiledServer/production/09Scape/org .
-java -server -cp ".:./bin;.:./lib/*" org.crandor.Server false true false true true
+java -server -cp ".:./bin;.:./lib/*" org.crandor.Server 
diff --git a/Server/src/org/crandor/Server.java b/Server/src/org/crandor/Server.java
index dc89fd597..ee52d19dd 100644
--- a/Server/src/org/crandor/Server.java
+++ b/Server/src/org/crandor/Server.java
@@ -47,7 +47,7 @@ public final class Server {
 		if (GameWorld.getSettings().isGui()) {
 			try {
 				ConsoleFrame.getInstance().init();
-			} catch (HeadlessException e) {
+			} catch (Exception e) {
 				System.out.println("X11 server missing - launching server with no GUI!");
 			}
 		}
diff --git a/Server/src/org/crandor/ServerConstants.java b/Server/src/org/crandor/ServerConstants.java
index a74227b2f..c4a973ab1 100644
--- a/Server/src/org/crandor/ServerConstants.java
+++ b/Server/src/org/crandor/ServerConstants.java
@@ -80,7 +80,7 @@ public final class ServerConstants {
 	};
 
 	private static String getDatabasePassword() {
-		return "password123";
+		return "";
 	}
 
 	/**