diff --git a/.gitignore b/.gitignore
index 17ce819ea..68e0c615a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ CompiledServer/**/*.jar
 .idea/workspace.xml
 **/.idea/workspace.xml
 **/.idea/*
+*.class
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e801e8310..348e51b13 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,38 +1,139 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="30ea45b9-ec6c-429a-b4dc-a876070cf30e" name="Default Changelist" comment="New Accounts will now automatically join the 2009Scape clan chat&#10;Renamed the Server's account to '2009Scape' within the members table of the global.sql database&#10;The automatic clan chat join can be toggled on or off on the Management Server's ServerConstants.java file&#10;Added some text in the TutorialCompletionDialogue.java file to simulate joining the clan once the player has reached the mainland.&#10;Added some comments to properly denote what is happening.&#10;Added spawns for Melee Dummy and Magic Dummy in the Lumbridge Combat Hall in the server.sql database.">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$2.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$1.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$2.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$2.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$3.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$3.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$4.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$4.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$5.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$5.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$6.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$6.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$7.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$7.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$8.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/Management$8.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/ServerConstants.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/ServerConstants.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/net/packet/WorldPacketRepository.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/org/keldagrim/net/packet/WorldPacketRepository.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/interaction/inter/GameInterface.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/interaction/inter/GameInterface.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/tutorial/BasicStarter.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/tutorial/BasicStarter.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Management-Server/src/org/keldagrim/ServerConstants.java" beforeDir="false" afterPath="$PROJECT_DIR$/Management-Server/src/org/keldagrim/ServerConstants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Server/global.sql" beforeDir="false" afterPath="$PROJECT_DIR$/Server/global.sql" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Server/server.sql" beforeDir="false" afterPath="$PROJECT_DIR$/Server/server.sql" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Server/src/org/crandor/net/registry/AccountRegister.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/org/crandor/net/registry/AccountRegister.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialCompletionDialogue.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/plugin/tutorial/TutorialCompletionDialogue.java" afterDir="false" />
+    <list default="true" id="dfca1f7e-8542-4720-8cd4-dc28d3685749" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class" beforeDir="false" afterPath="$PROJECT_DIR$/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java" beforeDir="false" afterPath="$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java" afterDir="false" />
     </list>
+    <ignored path="$PROJECT_DIR$/out/" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="CompilerWorkspaceConfiguration">
+    <option name="MAKE_PROJECT_ON_SAVE" value="true" />
+  </component>
   <component name="DefaultGradleProjectSettings">
     <option name="isMigrated" value="true" />
   </component>
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/WitchsHousePlugin.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="-142">
+              <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/MouseNPC.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="96">
+              <caret line="6" selection-start-line="6" selection-end-line="6" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#782#783#0" expanded="true" />
+                <element signature="e#812#813#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/WitchsHouse.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="16">
+              <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1088">
+              <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+              <folding>
+                <element signature="imports" expanded="true" />
+                <element signature="e#2521#2522#0" expanded="true" />
+                <element signature="e#2618#2619#0" expanded="true" />
+                <element signature="e#2652#2653#0" expanded="true" />
+                <element signature="e#2685#2686#0" expanded="true" />
+                <element signature="e#2680#2681#0" expanded="true" />
+                <element signature="e#2724#2725#0" expanded="true" />
+                <element signature="e#4754#4755#0" expanded="true" />
+                <element signature="e#4798#4799#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/world/map/path/Path.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="151">
+              <caret line="42" column="16" selection-start-line="42" selection-start-column="16" selection-end-line="42" selection-end-column="16" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/Entity.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="151">
+              <caret line="744" column="29" selection-start-line="744" selection-start-column="29" selection-end-line="744" selection-end-column="29" />
+              <folding>
+                <element signature="e#18113#18114#0" expanded="true" />
+                <element signature="e#18139#18140#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/cutscene/DBRCutscenePlugin.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="135">
+              <caret line="629" column="96" lean-forward="true" selection-start-line="628" selection-start-column="16" selection-end-line="629" selection-end-column="96" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/world/map/path/Pathfinder.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="144">
+              <caret line="88" column="24" selection-start-line="88" selection-start-column="24" selection-end-line="88" selection-end-column="24" />
+              <folding>
+                <element signature="e#2329#2330#0" expanded="true" />
+                <element signature="e#2380#2381#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/animal_mag/AliceHusbandDialogue.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="327">
+              <caret line="705" column="12" selection-start-line="705" selection-start-column="12" selection-end-line="705" selection-end-column="12" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
+  </component>
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
@@ -40,37 +141,143 @@
       </list>
     </option>
   </component>
-  <component name="Git.Settings">
-    <option name="RECENT_BRANCH_BY_REPOSITORY">
-      <map>
-        <entry key="$PROJECT_DIR$" value="master" />
-      </map>
-    </option>
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="UPDATE_TYPE" value="MERGE" />
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>object</find>
+      <find>config</find>
+      <find>autowa</find>
+      <find>doorman</find>
+      <find>replace</find>
+      <find>handleau</find>
+      <find>nextto</find>
+      <find>getequ</find>
+      <find>usew</find>
+      <find>treeSpawned</find>
+      <find>close</find>
+      <find>sor</find>
+      <find>5555</find>
+      <find>4</find>
+      <find>npc</find>
+    </findStrings>
+    <replaceStrings>
+      <replace>5</replace>
+    </replaceStrings>
+    <dirStrings>
+      <dir>C:\Users\split\Documents\GitHub\2009Scape\Server\src\plugin\quest\dragonslayer</dir>
+      <dir>C:\Users\split\Documents\GitHub\2009Scape\Server\src\plugin\quest</dir>
+      <dir>C:\Users\split\Documents\GitHub\2009Scape\Server\src\plugin\command</dir>
+      <dir>C:\Users\split\Documents\GitHub\2009Scape\Server\src\plugin</dir>
+      <dir>C:\Users\split\Documents\GitHub\2009Scape\Server\src</dir>
+    </dirStrings>
   </component>
-  <component name="ProjectId" id="1SoCmFrlg0BRp0t2EAHW2CVwxLb" />
-  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showExcludedFiles" value="true" />
-    <option name="showLibraryContents" value="true" />
+  <component name="Git.Settings">
+    <option name="ROOT_SYNC" value="DONT_SYNC" />
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="IdeDocumentHistory">
+    <option name="CHANGED_PATHS">
+      <list>
+        <option value="$PROJECT_DIR$/Server/src/plugin/activity/pyramidplunder/TombDoorConfigs.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/activity/pyramidplunder/UrnConfig.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/activity/pyramidplunder/PyramidPlunderOptions.java" />
+        <option value="$PROJECT_DIR$/Server/src/org/crandor/game/content/global/action/DoorActionHandler.java" />
+        <option value="$PROJECT_DIR$/Server/src/org/crandor/game/container/Container.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/BoyDialogue.java" />
+        <option value="$PROJECT_DIR$/Server/src/org/crandor/game/content/dialogue/DialoguePlugin.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/WitchsHouse.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/BoyDialoguePlugin.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/interaction/object/DoorManagingPlugin.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/MouseNPC.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/WitchsHousePlugin.java" />
+        <option value="$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java" />
+      </list>
+    </option>
+  </component>
+  <component name="JRebelWorkspace">
+    <option name="jrebelEnabledAutocompile" value="true" />
+  </component>
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="-8" />
+    <option name="width" value="977" />
+    <option name="height" value="1050" />
+  </component>
+  <component name="ProjectView">
+    <navigator proportions="" version="1">
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="2009Scape" type="b2602c69:ProjectViewProjectNode" />
+              <item name="2009Scape" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+            </path>
+            <path>
+              <item name="2009Scape" type="b2602c69:ProjectViewProjectNode" />
+              <item name="2009Scape" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="2009Scape" type="b2602c69:ProjectViewProjectNode" />
+              <item name="2009Scape" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="2009Scape" type="b2602c69:ProjectViewProjectNode" />
+              <item name="2009Scape" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="plugin" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="2009Scape" type="b2602c69:ProjectViewProjectNode" />
+              <item name="2009Scape" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="plugin" type="462c0819:PsiDirectoryNode" />
+              <item name="quest" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="2009Scape" type="b2602c69:ProjectViewProjectNode" />
+              <item name="2009Scape" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
+              <item name="Server" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="plugin" type="462c0819:PsiDirectoryNode" />
+              <item name="quest" type="462c0819:PsiDirectoryNode" />
+              <item name="witchs_house" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+    </panes>
   </component>
   <component name="PropertiesComponent">
-    <property name="Downloaded.Files.Path.Enabled" value="false" />
-    <property name="Repository.Attach.Annotations" value="false" />
-    <property name="Repository.Attach.JavaDocs" value="false" />
-    <property name="Repository.Attach.Sources" value="false" />
     <property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1578360598759" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/Client/lib" />
-    <property name="project.structure.last.edited" value="Project" />
-    <property name="project.structure.proportion" value="0.15" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/Server" />
+    <property name="project.structure.last.edited" value="Modules" />
+    <property name="project.structure.proportion" value="0.1646489" />
     <property name="project.structure.side.proportion" value="0.2" />
-    <property name="restartRequiresConfirmation" value="false" />
-    <property name="settings.editor.selected.configurable" value="editing.templates" />
+    <property name="settings.editor.selected.configurable" value="vcs.Git" />
+  </component>
+  <component name="RebelAgentSelection">
+    <selection>jr</selection>
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
   </component>
   <component name="RunManager" selected="Application.GameLaunch">
     <configuration name="GameLaunch" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
@@ -100,10 +307,8 @@
       </method>
     </configuration>
     <configuration name="Server" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="ALTERNATIVE_JRE_PATH" value="1.8" />
       <option name="MAIN_CLASS_NAME" value="org.crandor.Server" />
       <module name="RS-2009" />
-      <option name="VM_PARAMETERS" value="-Xmx1024m" />
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Server" />
       <extension name="coverage">
         <pattern>
@@ -116,119 +321,495 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.Management" />
       <item itemvalue="Application.Server" />
+      <item itemvalue="Application.Management" />
       <item itemvalue="Application.GameLaunch" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.GameLaunch" />
         <item itemvalue="Application.Server" />
+        <item itemvalue="Application.GameLaunch" />
         <item itemvalue="Application.Management" />
       </list>
     </recent_temporary>
   </component>
-  <component name="ServiceViewManager">
-    <option name="viewStates">
-      <list>
-        <serviceView>
-          <treeState>
-            <expand />
-            <select />
-          </treeState>
-        </serviceView>
-      </list>
-    </option>
-  </component>
   <component name="SvnConfiguration">
     <configuration />
   </component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="30ea45b9-ec6c-429a-b4dc-a876070cf30e" name="Default Changelist" comment="" />
-      <created>1572220718424</created>
+      <changelist id="dfca1f7e-8542-4720-8cd4-dc28d3685749" name="Default Changelist" comment="" />
+      <created>1584054963180</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1572220718424</updated>
-      <workItem from="1573670084843" duration="262000" />
+      <updated>1584054963180</updated>
     </task>
     <servers />
   </component>
-  <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+  <component name="ToolWindowManager">
+    <frame x="-7" y="-7" width="1550" height="848" extended-state="7" />
+    <layout>
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.25167784" />
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
+      <window_info id="JRebel" order="2" side_tool="true" />
+      <window_info id="Favorites" order="3" side_tool="true" />
+      <window_info id="Image Layers" order="4" />
+      <window_info id="Designer" order="5" />
+      <window_info id="UI Designer" order="6" />
+      <window_info id="Capture Tool" order="7" />
+      <window_info anchor="bottom" id="Problems" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Find" order="1" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.49261746" weight="0.33240223" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info anchor="bottom" id="Terminal" order="8" />
+      <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
+      <window_info anchor="bottom" id="JRebel Executor" order="10" sideWeight="0.47315437" weight="0.325419" />
+      <window_info active="true" anchor="bottom" id="Messages" order="11" sideWeight="0.46979865" visible="true" weight="0.3282123" />
+      <window_info anchor="bottom" id="JRebel Console" order="12" sideWeight="0.5302013" side_tool="true" visible="true" weight="0.3282123" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="right" id="Maven" order="4" />
+      <window_info anchor="right" id="Theme Preview" order="5" />
+      <window_info anchor="right" id="Capture Analysis" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="7" />
+    </layout>
   </component>
-  <component name="Vcs.Log.Tabs.Properties">
-    <option name="TAB_STATES">
-      <map>
-        <entry key="MAIN">
-          <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
-          </value>
-        </entry>
-      </map>
-    </option>
-    <option name="RECENT_FILTERS">
-      <map>
-        <entry key="Branch">
-          <value>
-            <list />
-          </value>
-        </entry>
-        <entry key="User">
-          <value>
-            <list />
-          </value>
-        </entry>
-      </map>
-    </option>
-  </component>
-  <component name="VcsManagerConfiguration">
-    <MESSAGE value="New Accounts will now automatically join the 2009Scape clan chat&#10;Renamed the Server's account to '2009Scape' within the members table of the global.sql database&#10;The automatic clan chat join can be toggled on or off on the Management Server's ServerConstants.java file&#10;Added some text in the TutorialCompletionDialogue.java file to simulate joining the clan once the player has reached the mainland.&#10;Added some comments to properly denote what is happening.&#10;Added spawns for Melee Dummy and Magic Dummy in the Lumbridge Combat Hall in the server.sql database." />
-    <option name="LAST_COMMIT_MESSAGE" value="New Accounts will now automatically join the 2009Scape clan chat&#10;Renamed the Server's account to '2009Scape' within the members table of the global.sql database&#10;The automatic clan chat join can be toggled on or off on the Management Server's ServerConstants.java file&#10;Added some text in the TutorialCompletionDialogue.java file to simulate joining the clan once the player has reached the mainland.&#10;Added some comments to properly denote what is happening.&#10;Added spawns for Melee Dummy and Magic Dummy in the Lumbridge Combat Hall in the server.sql database." />
-  </component>
-  <component name="WindowStateProjectService">
-    <state x="287" y="0" key="CommitChangelistDialog2" timestamp="1579570487959">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="287" y="0" key="CommitChangelistDialog2/0.0.1536.824@0.0.1536.824" timestamp="1579570487959" />
-    <state width="1342" height="198" key="GridCell.Tab.0.bottom" timestamp="1579570400537">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1342" height="198" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1579570400537" />
-    <state width="1342" height="198" key="GridCell.Tab.0.center" timestamp="1579570400537">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1342" height="198" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1579570400537" />
-    <state width="1342" height="198" key="GridCell.Tab.0.left" timestamp="1579570400537">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1342" height="198" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1579570400537" />
-    <state width="1342" height="198" key="GridCell.Tab.0.right" timestamp="1579570400537">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state width="1342" height="198" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1579570400537" />
-    <state x="361" y="146" key="Vcs.Push.Dialog.v2" timestamp="1579570029149">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="361" y="146" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1579570029149" />
-    <state x="470" y="238" key="com.intellij.ide.util.TipDialog" timestamp="1579567566284">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="470" y="238" key="com.intellij.ide.util.TipDialog/0.0.1536.824@0.0.1536.824" timestamp="1579567566284" />
-    <state x="578" y="330" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1579567802246">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="578" y="330" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.1536.824@0.0.1536.824" timestamp="1579567802246" />
-    <state x="425" y="189" key="run.anything.popup" timestamp="1579569948685">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="425" y="189" key="run.anything.popup/0.0.1536.824@0.0.1536.824" timestamp="1579569948685" />
-    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1579568599597">
-      <screen x="0" y="0" width="1536" height="824" />
-    </state>
-    <state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1579568599597" />
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/skill/farming/ToolLeprachaunPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="71" column="34" selection-start-line="71" selection-start-column="34" selection-end-line="71" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/command/BetaCommandPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="173" column="18" selection-start-line="173" selection-start-column="18" selection-end-line="173" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/npc/SimonScepterInteraction.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="183">
+          <caret line="23" column="25" selection-start-line="23" selection-start-column="25" selection-end-line="23" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/random/drunkdwarf/DrunkenDwarfNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="455">
+          <caret line="40" column="16" selection-start-line="40" selection-start-column="16" selection-end-line="40" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/restlessghost/RestlessGhost.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-521">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/ErnestTheChicken.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="178">
+          <caret line="101" column="61" selection-start-line="101" selection-start-column="61" selection-end-line="101" selection-end-column="61" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/npc/AbstractNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="12" column="43" lean-forward="true" selection-start-line="12" selection-start-column="43" selection-end-line="12" selection-end-column="43" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/world/GameWorld.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="346" column="26" selection-start-line="346" selection-start-column="26" selection-end-line="346" selection-end-column="26" />
+          <folding>
+            <element signature="e#16142#16143#0" expanded="true" />
+            <element signature="e#16170#16171#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/ame/AntiMacroNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="176">
+          <caret line="90" column="9" lean-forward="true" selection-start-line="88" selection-start-column="8" selection-end-line="90" selection-end-column="9" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/lostcity/LostCityPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="327">
+          <caret line="74" column="45" selection-start-line="74" selection-start-column="45" selection-end-line="74" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/animal_mag/AnimalMagnetismPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="631">
+          <caret line="265" column="28" selection-start-line="265" selection-start-column="28" selection-end-line="265" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/npc/familiar/PyreLordNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-18">
+          <caret line="101" column="31" selection-start-line="101" selection-start-column="31" selection-end-line="101" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/lostcity/TreeSpiritNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="560">
+          <caret line="96" column="22" selection-start-line="96" selection-start-column="22" selection-end-line="96" selection-end-column="22" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/npc/familiar/BunyipNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="121" column="45" selection-start-line="121" selection-start-column="45" selection-end-line="121" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/interaction/UseWithHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-320">
+          <caret line="73" column="29" selection-start-line="73" selection-start-column="29" selection-end-line="73" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/command/DeveloperCommandPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="398" column="24" selection-start-line="398" selection-start-column="24" selection-end-line="398" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/restlessghost/OldCronDialogue.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-206">
+          <caret line="13" column="19" selection-start-line="13" selection-start-column="19" selection-end-line="13" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/KeyMasterDialoguePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="71" column="12" selection-start-line="71" selection-start-column="12" selection-end-line="71" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/dialogue/DialogueInterpreter.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="169" column="54" selection-start-line="169" selection-start-column="54" selection-end-line="169" selection-end-column="54" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/dialogue/DialoguePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="79">
+          <caret line="169" column="66" selection-start-line="169" selection-start-column="66" selection-end-line="169" selection-end-column="66" />
+          <folding>
+            <element signature="e#2765#2766#0" expanded="true" />
+            <element signature="e#2784#2785#0" expanded="true" />
+            <element signature="e#4122#4123#0" expanded="true" />
+            <element signature="e#4177#4178#0" expanded="true" />
+            <element signature="e#4957#4958#0" expanded="true" />
+            <element signature="e#5016#5017#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/FredTheFarmer.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="238" column="21" selection-start-line="238" selection-start-column="21" selection-end-line="238" selection-end-column="21" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/link/quest/QuestRepository.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="235" column="15" selection-start-line="235" selection-start-column="15" selection-end-line="235" selection-end-column="15" />
+          <folding>
+            <element signature="e#6575#6576#0" expanded="true" />
+            <element signature="e#6626#6627#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/dialogue/FatherAereckDialogue.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1840">
+          <caret line="134" column="48" selection-start-line="134" selection-start-column="48" selection-end-line="134" selection-end-column="48" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/link/quest/Quest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="528">
+          <caret line="197" column="19" selection-start-line="197" selection-start-column="19" selection-end-line="197" selection-end-column="19" />
+          <folding>
+            <element signature="e#5502#5503#0" expanded="true" />
+            <element signature="e#5563#5564#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/object/DoorManagingPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="194">
+          <caret line="34" column="24" selection-start-line="34" selection-start-column="24" selection-end-line="34" selection-end-column="24" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/npc/BarcrawlPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="160" column="37" selection-start-line="160" selection-start-column="37" selection-end-line="160" selection-end-column="37" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/content/skill/member/construction/HouseManager.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="343">
+          <caret line="182" column="49" lean-forward="true" selection-start-line="182" selection-start-column="49" selection-end-line="182" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/player/Player.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="1028" column="42" lean-forward="true" selection-start-line="1028" selection-start-column="42" selection-end-line="1028" selection-end-column="42" />
+          <folding>
+            <element signature="e#28128#28129#0" expanded="true" />
+            <element signature="e#28151#28152#0" expanded="true" />
+            <element signature="e#29597#29598#0" expanded="true" />
+            <element signature="e#29630#29631#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/activity/wguild/animator/AnimationRoom.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="247">
+          <caret line="123" column="15" selection-start-line="123" selection-start-column="15" selection-end-line="123" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/object/sorceress/GardenObjectsPlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-19504">
+          <caret line="38" column="19" selection-start-line="38" selection-start-column="19" selection-end-line="38" selection-end-column="19" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/object/sorceress/SorceressGardenObject.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="128">
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/npc/sorceress_app/SorceressApprenticePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-592">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/interaction/npc/sorceress_app/SorceressApprenticeDialogue.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-3376">
+          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/npc/NPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="359" column="45" selection-start-line="359" selection-start-column="45" selection-end-line="359" selection-end-column="45" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/npc/ElementalNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1776">
+          <caret line="233" column="27" selection-start-line="233" selection-start-column="27" selection-end-line="233" selection-end-column="27" />
+          <folding>
+            <element signature="e#7201#7202#0" expanded="true" />
+            <element signature="e#7245#7246#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/world/map/Point.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="256">
+          <caret line="43" column="12" selection-start-line="43" selection-start-column="12" selection-end-line="43" selection-end-column="12" />
+          <folding>
+            <element signature="e#729#730#0" expanded="true" />
+            <element signature="e#758#759#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/world/map/path/SmartPathfinder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="64">
+          <caret line="6" column="49" selection-start-line="6" selection-start-column="49" selection-end-line="6" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/world/map/path/ProjectilePathfinder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="224">
+          <caret line="37" column="18" selection-start-line="37" selection-start-column="18" selection-end-line="37" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="343">
+          <caret line="137" column="38" selection-start-line="137" selection-start-column="38" selection-end-line="137" selection-end-column="38" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/BoyDialoguePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="848">
+          <caret line="117" column="25" selection-start-line="117" selection-start-column="25" selection-end-line="117" selection-end-column="25" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/MouseNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="6" selection-start-line="6" selection-end-line="6" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#782#783#0" expanded="true" />
+            <element signature="e#812#813#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/WitchsHouse.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="16">
+          <caret line="33" column="23" selection-start-line="33" selection-start-column="23" selection-end-line="33" selection-end-column="23" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/item/Item.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="138" column="15" selection-start-line="138" selection-start-column="15" selection-end-line="138" selection-end-column="15" />
+          <folding>
+            <element signature="e#3269#3270#0" expanded="true" />
+            <element signature="e#3304#3305#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/WitchsHousePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-142">
+          <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/world/map/path/Pathfinder.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="88" column="24" selection-start-line="88" selection-start-column="24" selection-end-line="88" selection-end-column="24" />
+          <folding>
+            <element signature="e#2329#2330#0" expanded="true" />
+            <element signature="e#2380#2381#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/animal_mag/AliceHusbandDialogue.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="327">
+          <caret line="705" column="12" selection-start-line="705" selection-start-column="12" selection-end-line="705" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/node/entity/Entity.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="744" column="29" selection-start-line="744" selection-start-column="29" selection-end-line="744" selection-end-column="29" />
+          <folding>
+            <element signature="e#18113#18114#0" expanded="true" />
+            <element signature="e#18139#18140#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/cutscene/DBRCutscenePlugin.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="629" column="96" lean-forward="true" selection-start-line="628" selection-start-column="16" selection-end-line="629" selection-end-column="96" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/org/crandor/game/world/map/path/Path.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="42" column="16" selection-start-line="42" selection-start-column="16" selection-end-line="42" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/npc/familiar/SpiritWolfNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="151">
+          <caret line="88" column="16" selection-start-line="88" selection-start-column="16" selection-end-line="88" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1088">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#2521#2522#0" expanded="true" />
+            <element signature="e#2618#2619#0" expanded="true" />
+            <element signature="e#2652#2653#0" expanded="true" />
+            <element signature="e#2685#2686#0" expanded="true" />
+            <element signature="e#2680#2681#0" expanded="true" />
+            <element signature="e#2724#2725#0" expanded="true" />
+            <element signature="e#4754#4755#0" expanded="true" />
+            <element signature="e#4798#4799#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>
@@ -246,7 +827,6 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>No facets are configured</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -269,7 +849,6 @@
       </state>
       <state key="JdkListConfigurable.UI">
         <settings>
-          <last-edited>1.7</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -281,7 +860,19 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>RS-2009</last-edited>
+          <last-edited>Client</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ProjectJDKs.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
diff --git a/CompiledServer/production/RS-2009/META-INF/RS-2009.kotlin_module b/CompiledServer/production/RS-2009/META-INF/RS-2009.kotlin_module
new file mode 100644
index 000000000..8fb60192d
Binary files /dev/null and b/CompiledServer/production/RS-2009/META-INF/RS-2009.kotlin_module differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/ServerConstants.class b/CompiledServer/production/RS-2009/org/crandor/ServerConstants.class
index b9854b074..cf6a14535 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/ServerConstants.class and b/CompiledServer/production/RS-2009/org/crandor/ServerConstants.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/container/Container.class b/CompiledServer/production/RS-2009/org/crandor/game/container/Container.class
index 947345ea1..10d78b3cf 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/container/Container.class and b/CompiledServer/production/RS-2009/org/crandor/game/container/Container.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/ame/AntiMacroDialogue$1.class b/CompiledServer/production/RS-2009/org/crandor/game/content/ame/AntiMacroDialogue$1.class
index 6f0423fdc..0794fed7d 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/ame/AntiMacroDialogue$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/ame/AntiMacroDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/dialogue/DialoguePlugin.class b/CompiledServer/production/RS-2009/org/crandor/game/content/dialogue/DialoguePlugin.class
index 06adcbbc7..bafaf1057 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/dialogue/DialoguePlugin.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/dialogue/DialoguePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$1.class b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$1.class
index d65415842..af7aa80da 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$2.class b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$2.class
index 3d7cd57dc..b65b58bbb 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$2.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$2.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$3.class b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$3.class
index d3d1e8e44..78b00942b 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$3.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$3.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$4.class b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$4.class
index e27600a99..dcf65aae5 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$4.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange$4.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange.class b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange.class
index 2e567ebc7..e4d64e7f3 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/eco/ge/GrandExchange.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$1.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$1.class
index 113397f43..fc55d5421 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$ClimbDialogue$1.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$ClimbDialogue$1.class
index fb1f91193..14cae6bfe 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$ClimbDialogue$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$ClimbDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$ClimbDialogue$2.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$ClimbDialogue$2.class
index 8ecf4b38d..896253d8d 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$ClimbDialogue$2.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/action/ClimbActionHandler$ClimbDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/consumable/Consumables.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/consumable/Consumables.class
index a04779e60..4821f1d88 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/global/consumable/Consumables.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/consumable/Consumables.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/Job.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/Job.class
new file mode 100644
index 000000000..e26e706bf
Binary files /dev/null and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/Job.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/JobsMinigameManager.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/JobsMinigameManager.class
new file mode 100644
index 000000000..b130999be
Binary files /dev/null and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/JobsMinigameManager.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/GatheringJob$GatheringJobs.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/GatheringJob$GatheringJobs.class
new file mode 100644
index 000000000..db8011b5d
Binary files /dev/null and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/GatheringJob$GatheringJobs.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/GatheringJob.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/GatheringJob.class
new file mode 100644
index 000000000..6069e09d6
Binary files /dev/null and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/GatheringJob.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/SlayingJob$SlayingJobs.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/SlayingJob$SlayingJobs.class
new file mode 100644
index 000000000..8958e0e4d
Binary files /dev/null and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/SlayingJob$SlayingJobs.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/SlayingJob.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/SlayingJob.class
new file mode 100644
index 000000000..8a930a3a9
Binary files /dev/null and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/jobs/impl/SlayingJob.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/global/shop/Shop.class b/CompiledServer/production/RS-2009/org/crandor/game/content/global/shop/Shop.class
index ee67638ff..abe1f7f44 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/global/shop/Shop.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/global/shop/Shop.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/Skills.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/Skills.class
index ad926f7c8..8eb679a6a 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/Skills.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/Skills.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/free/crafting/limestone/ChiselLimestonePulse.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/free/crafting/limestone/ChiselLimestonePulse.class
new file mode 100644
index 000000000..087c662d5
Binary files /dev/null and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/free/crafting/limestone/ChiselLimestonePulse.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/free/magic/MagicSpell.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/free/magic/MagicSpell.class
index 17943a020..07597e3de 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/free/magic/MagicSpell.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/free/magic/MagicSpell.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/farming/patch/Bushes$1.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/farming/patch/Bushes$1.class
index 50ed39467..24b9ca8d6 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/farming/patch/Bushes$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/farming/patch/Bushes$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/farming/patch/FruitTrees$1.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/farming/patch/FruitTrees$1.class
index 605246d55..fed05774b 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/farming/patch/FruitTrees$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/farming/patch/FruitTrees$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/hunter/bnet/BNetPulse.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/hunter/bnet/BNetPulse.class
index 54a1ae3ee..f47b2178e 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/hunter/bnet/BNetPulse.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/hunter/bnet/BNetPulse.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$1.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$1.class
index a8e017d82..17c702a94 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$10.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$10.class
deleted file mode 100644
index cf6d4cea4..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$10.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$11.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$11.class
deleted file mode 100644
index 6add8d230..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$11.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$12.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$12.class
deleted file mode 100644
index 61c89bddc..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$12.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$13.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$13.class
deleted file mode 100644
index 9c783cb4e..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$13.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$14.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$14.class
deleted file mode 100644
index 650109386..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$14.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$15.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$15.class
deleted file mode 100644
index c64ae1bbc..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$15.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$16.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$16.class
deleted file mode 100644
index bb0e41abe..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$16.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$2.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$2.class
deleted file mode 100644
index d1700ab00..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$2.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$3.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$3.class
deleted file mode 100644
index 7b32c9584..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$3.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$4.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$4.class
deleted file mode 100644
index 664eec228..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$4.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$5.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$5.class
deleted file mode 100644
index 4555e9696..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$5.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$6.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$6.class
deleted file mode 100644
index 80d1d943c..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$6.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$7.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$7.class
deleted file mode 100644
index ece759253..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$7.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$8.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$8.class
deleted file mode 100644
index ddb1f5216..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$8.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$9.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$9.class
deleted file mode 100644
index 9e6dc3118..000000000
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks$9.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks.class
index bc9ea75ad..7c5fe58b2 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/slayer/Tasks.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/summoning/familiar/Familiar.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/summoning/familiar/Familiar.class
index 03416a473..06598650f 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/summoning/familiar/Familiar.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/summoning/familiar/Familiar.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/thieving/Pickpocket.class b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/thieving/Pickpocket.class
index f65a7adb2..63d26e93d 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/thieving/Pickpocket.class and b/CompiledServer/production/RS-2009/org/crandor/game/content/skill/member/thieving/Pickpocket.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$1.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$1.class
index 4d04aff20..554cf9e2d 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$2.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$2.class
index 31410322e..645552ca4 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$2.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$2.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$3.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$3.class
index c7bbff37f..73d3f09b7 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$3.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$3.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$4.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$4.class
index 290792f6c..ddef92a4f 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$4.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$4.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$5.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$5.class
index cb03ffc81..082abeb25 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$5.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity$5.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity.class
index 164fb01c2..4f0e2e48a 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/Entity.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$1.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$1.class
index 5ad03618f..7ed5d9da8 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$2.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$2.class
index 91277c77d..93f332b92 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$2.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$2.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$3.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$3.class
index 2cda632d1..97c5e617e 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$3.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse$3.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse.class
index 80468dd33..7fee225cf 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatPulse.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatSwingHandler.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatSwingHandler.class
index 8ce43e584..73178af2c 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatSwingHandler.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/CombatSwingHandler.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/MagicSwingHandler.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/MagicSwingHandler.class
index 0a254187d..07cce3a33 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/MagicSwingHandler.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/MagicSwingHandler.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.class
index 5f628b344..374c71b93 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/MeleeSwingHandler.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/RangeSwingHandler$1.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/RangeSwingHandler$1.class
index 8faa484bf..626ec2a13 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/RangeSwingHandler$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/RangeSwingHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/RangeSwingHandler.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/RangeSwingHandler.class
index 30e4c1b22..cb2a5f2c0 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/RangeSwingHandler.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/combat/handlers/RangeSwingHandler.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/npc/NPC$1.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/npc/NPC$1.class
index 7d9af9fe9..c7c82fb44 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/npc/NPC$1.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/npc/NPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/npc/NPC.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/npc/NPC.class
index 39ad08b7d..d9a8d5388 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/npc/NPC.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/npc/NPC.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/Player.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/Player.class
index 17d6177cf..2e6744a12 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/Player.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/Player.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/ai/AIPlayer$2.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/ai/AIPlayer$2.class
index 9bedadf26..d1c9acfd0 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/ai/AIPlayer$2.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/ai/AIPlayer$2.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/info/login/PlayerParser.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/info/login/PlayerParser.class
index 7e02f4845..1b4e6c1f1 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/info/login/PlayerParser.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/info/login/PlayerParser.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/link/ActivityData.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/link/ActivityData.class
index 351f37801..716e89458 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/link/ActivityData.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/link/ActivityData.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/link/IronmanMode.class b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/link/IronmanMode.class
index 988a9b4d9..a317669b4 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/link/IronmanMode.class and b/CompiledServer/production/RS-2009/org/crandor/game/node/entity/player/link/IronmanMode.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/system/mysql/impl/HighscoreSQLHandler.class b/CompiledServer/production/RS-2009/org/crandor/game/system/mysql/impl/HighscoreSQLHandler.class
index 4a821400c..be70c97bf 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/system/mysql/impl/HighscoreSQLHandler.class and b/CompiledServer/production/RS-2009/org/crandor/game/system/mysql/impl/HighscoreSQLHandler.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/system/mysql/impl/ItemConfigSQLHandler.class b/CompiledServer/production/RS-2009/org/crandor/game/system/mysql/impl/ItemConfigSQLHandler.class
index e56d82ab9..faab63d7a 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/system/mysql/impl/ItemConfigSQLHandler.class and b/CompiledServer/production/RS-2009/org/crandor/game/system/mysql/impl/ItemConfigSQLHandler.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/system/script/ScriptManager.class b/CompiledServer/production/RS-2009/org/crandor/game/system/script/ScriptManager.class
index 12b9564f7..76c9b6028 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/system/script/ScriptManager.class and b/CompiledServer/production/RS-2009/org/crandor/game/system/script/ScriptManager.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/game/world/GameWorld.class b/CompiledServer/production/RS-2009/org/crandor/game/world/GameWorld.class
index 32453bfa1..cf0cb40f0 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/game/world/GameWorld.class and b/CompiledServer/production/RS-2009/org/crandor/game/world/GameWorld.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/net/event/LoginWriteEvent.class b/CompiledServer/production/RS-2009/org/crandor/net/event/LoginWriteEvent.class
index 449665dc0..416c5cd32 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/net/event/LoginWriteEvent.class and b/CompiledServer/production/RS-2009/org/crandor/net/event/LoginWriteEvent.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/net/packet/in/ActionButtonPacket$1.class b/CompiledServer/production/RS-2009/org/crandor/net/packet/in/ActionButtonPacket$1.class
index 2708b7aba..2f8653d2f 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/net/packet/in/ActionButtonPacket$1.class and b/CompiledServer/production/RS-2009/org/crandor/net/packet/in/ActionButtonPacket$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/net/packet/in/InterfaceUseOnPacket$1.class b/CompiledServer/production/RS-2009/org/crandor/net/packet/in/InterfaceUseOnPacket$1.class
index c5edb70fd..25aeb05b6 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/net/packet/in/InterfaceUseOnPacket$1.class and b/CompiledServer/production/RS-2009/org/crandor/net/packet/in/InterfaceUseOnPacket$1.class differ
diff --git a/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister.class b/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister.class
index d6ee3a87a..276842d66 100644
Binary files a/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister.class and b/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister.class differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main$1.class b/CompiledServer/production/RS-2009/org/keldagrim/Main$1.class
deleted file mode 100644
index 90e954c78..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main$1.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main$2.class b/CompiledServer/production/RS-2009/org/keldagrim/Main$2.class
deleted file mode 100644
index be1f778cc..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main$2.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main$3.class b/CompiledServer/production/RS-2009/org/keldagrim/Main$3.class
deleted file mode 100644
index 5afc4ca41..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main$3.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main$4.class b/CompiledServer/production/RS-2009/org/keldagrim/Main$4.class
deleted file mode 100644
index 14d1f933e..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main$4.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main$5.class b/CompiledServer/production/RS-2009/org/keldagrim/Main$5.class
deleted file mode 100644
index eb7d0e910..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main$5.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main$6.class b/CompiledServer/production/RS-2009/org/keldagrim/Main$6.class
deleted file mode 100644
index 7b266d90d..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main$6.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main$7.class b/CompiledServer/production/RS-2009/org/keldagrim/Main$7.class
deleted file mode 100644
index 55491494b..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main$7.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main$8.class b/CompiledServer/production/RS-2009/org/keldagrim/Main$8.class
deleted file mode 100644
index 777d9df9c..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main$8.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Main.class b/CompiledServer/production/RS-2009/org/keldagrim/Main.class
deleted file mode 100644
index c80f81ac7..000000000
Binary files a/CompiledServer/production/RS-2009/org/keldagrim/Main.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/org/runite/jagex/KeyboardListener.class b/CompiledServer/production/RS-2009/org/runite/jagex/KeyboardListener.class
index dddde8e13..d4fbc56cf 100644
Binary files a/CompiledServer/production/RS-2009/org/runite/jagex/KeyboardListener.class and b/CompiledServer/production/RS-2009/org/runite/jagex/KeyboardListener.class differ
diff --git a/CompiledServer/production/RS-2009/org/runite/jagex/MouseListeningClass.class b/CompiledServer/production/RS-2009/org/runite/jagex/MouseListeningClass.class
index 6e07378c2..22478cfc2 100644
Binary files a/CompiledServer/production/RS-2009/org/runite/jagex/MouseListeningClass.class and b/CompiledServer/production/RS-2009/org/runite/jagex/MouseListeningClass.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/bountyhunter/BountyLocateSpell$1.class b/CompiledServer/production/RS-2009/plugin/activity/bountyhunter/BountyLocateSpell$1.class
index dd0158774..3aa6b3662 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/bountyhunter/BountyLocateSpell$1.class and b/CompiledServer/production/RS-2009/plugin/activity/bountyhunter/BountyLocateSpell$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$ArcheryTargetPulse.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$ArcheryTargetPulse.class
new file mode 100644
index 000000000..d8559ca26
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$ArcheryTargetPulse.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$ArmourSalesman.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$ArmourSalesman.class
index e781c66bf..726e55fd1 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$ArmourSalesman.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$ArmourSalesman.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$BowArrowSalesman.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$BowArrowSalesman.class
index 2223f8089..78994e656 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$BowArrowSalesman.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$BowArrowSalesman.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$GuardDialogue.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$GuardDialogue.class
index 41e7d10d2..6581e066d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$GuardDialogue.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$GuardDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$LeatherWorkerDialogue.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$LeatherWorkerDialogue.class
index 29e2f33f9..1b066c58e 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$LeatherWorkerDialogue.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$LeatherWorkerDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$RangingGuildDoorman.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$RangingGuildDoorman.class
index d6f412f8d..f6f52fa67 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$RangingGuildDoorman.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$RangingGuildDoorman.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$TownAdvisor.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$TownAdvisor.class
index 37ded3f8e..94b344868 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$TownAdvisor.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$TownAdvisor.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$TribalWeaponSalesman.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$TribalWeaponSalesman.class
index ba13f8d0b..4f35c31c9 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$TribalWeaponSalesman.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$TribalWeaponSalesman.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$WarningInterface.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$WarningInterface.class
index a433c9bb5..0cf069462 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$WarningInterface.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin$WarningInterface.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin.class b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin.class
index afe46b7a2..b1bee77e6 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin.class and b/CompiledServer/production/RS-2009/plugin/activity/guild/RangingGuildPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/jobs/WorkForOptionHandler.class b/CompiledServer/production/RS-2009/plugin/activity/jobs/WorkForOptionHandler.class
new file mode 100644
index 000000000..35b12490b
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/jobs/WorkForOptionHandler.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/magearena/KolodionNPC$KolodionType$1.class b/CompiledServer/production/RS-2009/plugin/activity/magearena/KolodionNPC$KolodionType$1.class
index 34dcf4b60..8722efe62 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/magearena/KolodionNPC$KolodionType$1.class and b/CompiledServer/production/RS-2009/plugin/activity/magearena/KolodionNPC$KolodionType$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/magearena/KolodionSession$1.class b/CompiledServer/production/RS-2009/plugin/activity/magearena/KolodionSession$1.class
index c211b88f7..5c6d8753c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/magearena/KolodionSession$1.class and b/CompiledServer/production/RS-2009/plugin/activity/magearena/KolodionSession$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$2.class b/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$2.class
index 114370ed3..e56495b45 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$2.class and b/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$3.class b/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$3.class
index 3f46f54ec..cc1dbeb7d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$3.class and b/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$4.class b/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$4.class
index 17a8a88c4..e83448da9 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$4.class and b/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaPlugin$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaZone$1.class b/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaZone$1.class
index feda49ae3..24b6678e7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaZone$1.class and b/CompiledServer/production/RS-2009/plugin/activity/magearena/MageArenaZone$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/mta/TelekineticGrabSpell$1.class b/CompiledServer/production/RS-2009/plugin/activity/mta/TelekineticGrabSpell$1.class
index 04cd67638..d0ba86ea4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/mta/TelekineticGrabSpell$1.class and b/CompiledServer/production/RS-2009/plugin/activity/mta/TelekineticGrabSpell$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/mta/impl/GraveyardZone$1.class b/CompiledServer/production/RS-2009/plugin/activity/mta/impl/GraveyardZone$1.class
index ad1396253..39308ee26 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/mta/impl/GraveyardZone$1.class and b/CompiledServer/production/RS-2009/plugin/activity/mta/impl/GraveyardZone$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/PestControlActivityPlugin$1.class b/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/PestControlActivityPlugin$1.class
index 8020e61cf..5a3df3731 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/PestControlActivityPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/PestControlActivityPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/PestControlActivityPlugin$2.class b/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/PestControlActivityPlugin$2.class
index 53f985358..da2ffa7bb 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/PestControlActivityPlugin$2.class and b/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/PestControlActivityPlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/monsters/PCShifterNPC$2.class b/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/monsters/PCShifterNPC$2.class
index 5a9ea58f1..4d78d6d2a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/monsters/PCShifterNPC$2.class and b/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/monsters/PCShifterNPC$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/reward/PCRewardInterface.class b/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/reward/PCRewardInterface.class
index a7e44a610..fbfa7fdd5 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/reward/PCRewardInterface.class and b/CompiledServer/production/RS-2009/plugin/activity/pestcontrol/reward/PCRewardInterface.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/GuardMummyDialogue.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/GuardMummyDialogue.class
index 4f64bf942..8a5550943 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/GuardMummyDialogue.class and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/GuardMummyDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PlunderObject.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PlunderObject.class
new file mode 100644
index 000000000..40fa6b00d
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PlunderObject.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PlunderObjectManager.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PlunderObjectManager.class
new file mode 100644
index 000000000..20c263326
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PlunderObjectManager.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidOptionHandler$1.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidOptionHandler$1.class
new file mode 100644
index 000000000..2eb04bc81
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidOptionHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidOptionHandler.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidOptionHandler.class
index 7e5d4aa2d..cc4705513 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidOptionHandler.class and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidOptionHandler.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderMummyNPC.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderMummyNPC.class
new file mode 100644
index 000000000..cda09c73d
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderMummyNPC.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderNPC$1.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderNPC$1.class
new file mode 100644
index 000000000..96c2f4d8d
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderNPC.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderNPC.class
new file mode 100644
index 000000000..b4d140816
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderNPC.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderOptions.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderOptions.class
new file mode 100644
index 000000000..0a7564d99
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderOptions.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderSwarmNPC.class b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderSwarmNPC.class
new file mode 100644
index 000000000..bbff15c78
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/activity/pyramidplunder/PyramidPlunderSwarmNPC.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/stronghold/StrongHoldSecurityPlugin$2.class b/CompiledServer/production/RS-2009/plugin/activity/stronghold/StrongHoldSecurityPlugin$2.class
index da1e350b8..c34e71c0f 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/stronghold/StrongHoldSecurityPlugin$2.class and b/CompiledServer/production/RS-2009/plugin/activity/stronghold/StrongHoldSecurityPlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/stronghold/playersafety/GuardDialoguePlugin$1.class b/CompiledServer/production/RS-2009/plugin/activity/stronghold/playersafety/GuardDialoguePlugin$1.class
index 17f552dbd..feb1a1693 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/stronghold/playersafety/GuardDialoguePlugin$1.class and b/CompiledServer/production/RS-2009/plugin/activity/stronghold/playersafety/GuardDialoguePlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCaveNPC$1.class b/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCaveNPC$1.class
index 8a1d1f7fb..9ca801ce4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCaveNPC$1.class and b/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCaveNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$1.class b/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$1.class
index d077a8986..da845c742 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$2.class b/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$2.class
index 8a3595e57..3050ca4ba 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$2.class and b/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$3.class b/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$3.class
index a8175a572..c2972bb9c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$3.class and b/CompiledServer/production/RS-2009/plugin/activity/tzhaar/TzhaarFightCavesPlugin$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/wguild/cyclopes/CyclopesRoom$1.class b/CompiledServer/production/RS-2009/plugin/activity/wguild/cyclopes/CyclopesRoom$1.class
index 3054c9adb..e539f69c9 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/wguild/cyclopes/CyclopesRoom$1.class and b/CompiledServer/production/RS-2009/plugin/activity/wguild/cyclopes/CyclopesRoom$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/wguild/shot/ShotPutRoom$1$1.class b/CompiledServer/production/RS-2009/plugin/activity/wguild/shot/ShotPutRoom$1$1.class
index 25ffb48fc..dc9bf1433 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/wguild/shot/ShotPutRoom$1$1.class and b/CompiledServer/production/RS-2009/plugin/activity/wguild/shot/ShotPutRoom$1$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/activity/wguild/shot/ShotPutRoom$2.class b/CompiledServer/production/RS-2009/plugin/activity/wguild/shot/ShotPutRoom$2.class
index c4f92717e..f14b95f7a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/activity/wguild/shot/ShotPutRoom$2.class and b/CompiledServer/production/RS-2009/plugin/activity/wguild/shot/ShotPutRoom$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$1.class b/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$1.class
index 58a671cdc..cf4e4be93 100644
Binary files a/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$1.class and b/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$2.class b/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$2.class
index 7bf33e9c6..ff0c9dc6e 100644
Binary files a/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$2.class and b/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$3.class b/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$3.class
index 4b40b2c53..b59d5a1f7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$3.class and b/CompiledServer/production/RS-2009/plugin/combat/special/ChainhitSpecialHandler$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/combat/special/SnapshotSpecialHandler$1.class b/CompiledServer/production/RS-2009/plugin/combat/special/SnapshotSpecialHandler$1.class
index 98f9508f7..478098726 100644
Binary files a/CompiledServer/production/RS-2009/plugin/combat/special/SnapshotSpecialHandler$1.class and b/CompiledServer/production/RS-2009/plugin/combat/special/SnapshotSpecialHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/command/BetaCommandPlugin.class b/CompiledServer/production/RS-2009/plugin/command/BetaCommandPlugin.class
index 38b4a73a3..183d20c4a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/command/BetaCommandPlugin.class and b/CompiledServer/production/RS-2009/plugin/command/BetaCommandPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/command/PlayerCommandPlugin$1.class b/CompiledServer/production/RS-2009/plugin/command/PlayerCommandPlugin$1.class
index ec5756276..34653134a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/command/PlayerCommandPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/command/PlayerCommandPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/command/PlayerCommandPlugin.class b/CompiledServer/production/RS-2009/plugin/command/PlayerCommandPlugin.class
index 9c4a4d1d8..68c3ba1aa 100644
Binary files a/CompiledServer/production/RS-2009/plugin/command/PlayerCommandPlugin.class and b/CompiledServer/production/RS-2009/plugin/command/PlayerCommandPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/cutscene/DBRCutscenePlugin$1.class b/CompiledServer/production/RS-2009/plugin/cutscene/DBRCutscenePlugin$1.class
index 112880140..a225c6a13 100644
Binary files a/CompiledServer/production/RS-2009/plugin/cutscene/DBRCutscenePlugin$1.class and b/CompiledServer/production/RS-2009/plugin/cutscene/DBRCutscenePlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/cutscene/GECutscenePlugin$BrugsenBursenDialogue$1.class b/CompiledServer/production/RS-2009/plugin/cutscene/GECutscenePlugin$BrugsenBursenDialogue$1.class
index c0f914d9f..f86368c29 100644
Binary files a/CompiledServer/production/RS-2009/plugin/cutscene/GECutscenePlugin$BrugsenBursenDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/cutscene/GECutscenePlugin$BrugsenBursenDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/cutscene/JulietDialogue$1.class b/CompiledServer/production/RS-2009/plugin/cutscene/JulietDialogue$1.class
index 3c3ff4221..bab2c490c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/cutscene/JulietDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/cutscene/JulietDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/cutscene/JulietDialogue$2.class b/CompiledServer/production/RS-2009/plugin/cutscene/JulietDialogue$2.class
index c168b910a..071d5b4a7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/cutscene/JulietDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/cutscene/JulietDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/cutscene/RJCutscenePlugin$RomeoDialogue$1.class b/CompiledServer/production/RS-2009/plugin/cutscene/RJCutscenePlugin$RomeoDialogue$1.class
index e786958bc..8d16a6395 100644
Binary files a/CompiledServer/production/RS-2009/plugin/cutscene/RJCutscenePlugin$RomeoDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/cutscene/RJCutscenePlugin$RomeoDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/cutscene/RJCutscenePlugin$RomeoDialogue$2.class b/CompiledServer/production/RS-2009/plugin/cutscene/RJCutscenePlugin$RomeoDialogue$2.class
index e4eb98d87..a6ff29182 100644
Binary files a/CompiledServer/production/RS-2009/plugin/cutscene/RJCutscenePlugin$RomeoDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/cutscene/RJCutscenePlugin$RomeoDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/AablaDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/AablaDialogue$1.class
index e24ff2fe0..acbafb608 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/AablaDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/AablaDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/AnnaIsaakson.class b/CompiledServer/production/RS-2009/plugin/dialogue/AnnaIsaakson.class
new file mode 100644
index 000000000..ebe615140
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/dialogue/AnnaIsaakson.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/ArdougneBaker.class b/CompiledServer/production/RS-2009/plugin/dialogue/ArdougneBaker.class
new file mode 100644
index 000000000..08796c74d
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/dialogue/ArdougneBaker.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/CaptainBentleyDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/CaptainBentleyDialogue$1.class
index dce5c3cdd..a070b9f63 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/CaptainBentleyDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/CaptainBentleyDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$2.class b/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$2.class
new file mode 100644
index 000000000..f01798f3f
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$MeatPlugin$MeatProperty.class b/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$MeatPlugin$MeatProperty.class
index 6f3126bf3..6cb47ae6a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$MeatPlugin$MeatProperty.class and b/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$MeatPlugin$MeatProperty.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$MeatPlugin.class b/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$MeatPlugin.class
index 4f665e955..790e5b1ed 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$MeatPlugin.class and b/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin$MeatPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin.class b/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin.class
index 1d8df4c60..30bf22625 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin.class and b/CompiledServer/production/RS-2009/plugin/dialogue/CookingDialoguePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$1.class
index 0d765e86d..f59d42c4d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$2.class b/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$2.class
index d5e9398ab..f423ba464 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$3.class b/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$3.class
index 77035f9d4..d11b684d7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$3.class and b/CompiledServer/production/RS-2009/plugin/dialogue/GertrudesCatDialogue$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/GnomeSpiritTreeDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/GnomeSpiritTreeDialogue$1.class
index 9784a1423..97944d2c6 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/GnomeSpiritTreeDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/GnomeSpiritTreeDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/GrillieGroatsDialogue.class b/CompiledServer/production/RS-2009/plugin/dialogue/GrillieGroatsDialogue.class
deleted file mode 100644
index 3a904b2f0..000000000
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/GrillieGroatsDialogue.class and /dev/null differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/HairdresserDialogue.class b/CompiledServer/production/RS-2009/plugin/dialogue/HairdresserDialogue.class
index ff23b3d99..d9f69232a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/HairdresserDialogue.class and b/CompiledServer/production/RS-2009/plugin/dialogue/HairdresserDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/HansDialoguePlugin.class b/CompiledServer/production/RS-2009/plugin/dialogue/HansDialoguePlugin.class
index b745a5ca8..b28e4ae27 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/HansDialoguePlugin.class and b/CompiledServer/production/RS-2009/plugin/dialogue/HansDialoguePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/KittenInteractDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/KittenInteractDialogue$1.class
index 1a0e5d0fe..c1ad86fb5 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/KittenInteractDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/KittenInteractDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/LokarSearunnerDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/LokarSearunnerDialogue$1.class
index 8aaa60590..6e859d561 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/LokarSearunnerDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/LokarSearunnerDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/MagicTutorDialogue.class b/CompiledServer/production/RS-2009/plugin/dialogue/MagicTutorDialogue.class
index 1bcc645c8..3f7fbdc9f 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/MagicTutorDialogue.class and b/CompiledServer/production/RS-2009/plugin/dialogue/MagicTutorDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/MithrilSeedsDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/MithrilSeedsDialogue$1.class
index f77acfad9..2d96effb9 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/MithrilSeedsDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/MithrilSeedsDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/PrinceAliDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/PrinceAliDialogue$1.class
index 44d8d0d8d..592200597 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/PrinceAliDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/PrinceAliDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/PrinceAliDialogue$2.class b/CompiledServer/production/RS-2009/plugin/dialogue/PrinceAliDialogue$2.class
index 150f3e929..51fc0b6b5 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/PrinceAliDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/dialogue/PrinceAliDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/ProfessorOddensteinPlugin$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/ProfessorOddensteinPlugin$1.class
index 25b803550..0c6aa1f6e 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/ProfessorOddensteinPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/ProfessorOddensteinPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/RugMerchantDialogue$RugDestination$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/RugMerchantDialogue$RugDestination$1.class
index a3e81b661..ce00fcd8d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/RugMerchantDialogue$RugDestination$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/RugMerchantDialogue$RugDestination$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/ShantayDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/ShantayDialogue$1.class
index e5c5ec4be..f47731559 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/ShantayDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/ShantayDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/ShantayGuard$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/ShantayGuard$1.class
index 7e466e8e6..6dfe2c1e2 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/ShantayGuard$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/ShantayGuard$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/SilkMerchantPlugin$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/SilkMerchantPlugin$1.class
index 7afe9cd85..59a4d8156 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/SilkMerchantPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/SilkMerchantPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/SimonTempleton.class b/CompiledServer/production/RS-2009/plugin/dialogue/SimonTempleton.class
new file mode 100644
index 000000000..17d8e30fd
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/dialogue/SimonTempleton.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/SorcceresDialouge$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/SorcceresDialouge$1.class
index bd7d7f2d8..5cafaa42c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/SorcceresDialouge$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/SorcceresDialouge$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/ThessaliaDialogue.class b/CompiledServer/production/RS-2009/plugin/dialogue/ThessaliaDialogue.class
index 6034fb1b7..e9c0f7624 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/ThessaliaDialogue.class and b/CompiledServer/production/RS-2009/plugin/dialogue/ThessaliaDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/TownCrierDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/TownCrierDialogue$1.class
index 8a857fc01..c81865ef0 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/TownCrierDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/TownCrierDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/dialogue/TraibornDialogue$1.class b/CompiledServer/production/RS-2009/plugin/dialogue/TraibornDialogue$1.class
index 91435c6a6..f99efe945 100644
Binary files a/CompiledServer/production/RS-2009/plugin/dialogue/TraibornDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/dialogue/TraibornDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$ChristmasEventOptionPlugin$1.class b/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$ChristmasEventOptionPlugin$1.class
index 63937e44c..ed473fe77 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$ChristmasEventOptionPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$ChristmasEventOptionPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$PeltOptionHandler$1.class b/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$PeltOptionHandler$1.class
index a7844338a..45d807273 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$PeltOptionHandler$1.class and b/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$PeltOptionHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$SnowmanItemHandler$1.class b/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$SnowmanItemHandler$1.class
index bbf7708c4..3db0d804d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$SnowmanItemHandler$1.class and b/CompiledServer/production/RS-2009/plugin/holiday/christmas/ChristmasEvent$SnowmanItemHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/easter/BasketofEggsEvent$EasterBunnyDialogue$1.class b/CompiledServer/production/RS-2009/plugin/holiday/easter/BasketofEggsEvent$EasterBunnyDialogue$1.class
index ca310a0b8..17a294442 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/easter/BasketofEggsEvent$EasterBunnyDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/holiday/easter/BasketofEggsEvent$EasterBunnyDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/easter/BasketofEggsEvent$EasterBunnyDialogue$2.class b/CompiledServer/production/RS-2009/plugin/holiday/easter/BasketofEggsEvent$EasterBunnyDialogue$2.class
index 23f2de744..67023bc81 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/easter/BasketofEggsEvent$EasterBunnyDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/holiday/easter/BasketofEggsEvent$EasterBunnyDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$10.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$10.class
index eebfd50e2..6ba1e6755 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$10.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$10.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$4.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$4.class
index da06396c8..3ce9df167 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$4.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$5.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$5.class
index 01fefbaaf..2c268e552 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$5.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$5.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$6.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$6.class
index 7a0aa8323..57b7f97c9 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$6.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$6.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$7.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$7.class
index 617ce5e69..fcde53137 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$7.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$7.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$9.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$9.class
index 90d7d78e2..db8d8de35 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$9.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$9.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$DarkPortalHandler$DarkPortalDialogue$1.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$DarkPortalHandler$DarkPortalDialogue$1.class
index 7b3e543ef..fe6a58e3a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$DarkPortalHandler$DarkPortalDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$DarkPortalHandler$DarkPortalDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$GrimReaperDialogue$1.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$GrimReaperDialogue$1.class
index f5c28675a..73c263a8e 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$GrimReaperDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$GrimReaperDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$1.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$1.class
index edc096650..6e9fcac3d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$2.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$2.class
index 42d9e303d..1be937739 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$3.class b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$3.class
index 3f44978d3..1c55d46e1 100644
Binary files a/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$3.class and b/CompiledServer/production/RS-2009/plugin/holiday/halloween/DeathMansionEvent$MuncherDialogue$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/DraynorNodePlugin$TelescopeCutscene$1.class b/CompiledServer/production/RS-2009/plugin/interaction/city/DraynorNodePlugin$TelescopeCutscene$1.class
index fb79d5ce1..7e3412f83 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/DraynorNodePlugin$TelescopeCutscene$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/DraynorNodePlugin$TelescopeCutscene$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin$1.class b/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin$1.class
index cf90cab8b..c4c6b9bb1 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin$2.class b/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin$2.class
index efef52545..770a12fcb 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin$2.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin.class b/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin.class
index eb92fd7fc..0c83593e4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/GnomeStrongholdPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/TrollheimPlugin$WarningCutscene$1.class b/CompiledServer/production/RS-2009/plugin/interaction/city/TrollheimPlugin$WarningCutscene$1.class
index 00651ace1..90cb7e8b2 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/TrollheimPlugin$WarningCutscene$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/TrollheimPlugin$WarningCutscene$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/VarrockNodePlugin$KnockatDoorDialogue$1.class b/CompiledServer/production/RS-2009/plugin/interaction/city/VarrockNodePlugin$KnockatDoorDialogue$1.class
index b3a650879..adb5f057b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/VarrockNodePlugin$KnockatDoorDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/VarrockNodePlugin$KnockatDoorDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$AuburyDialoguePlugin.class b/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$AuburyDialoguePlugin.class
index 7783a6727..fafcf8059 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$AuburyDialoguePlugin.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$AuburyDialoguePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$SedridorDialogue$1.class b/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$SedridorDialogue$1.class
index 2e00e8691..a3505663b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$SedridorDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$SedridorDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$WizardMisgogDialogue$1.class b/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$WizardMisgogDialogue$1.class
index 487c6314f..b276174ba 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$WizardMisgogDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/city/WizardTowerPlugin$WizardMisgogDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/AliTheCarter.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/AliTheCarter.class
new file mode 100644
index 000000000..fb69214da
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/AliTheCarter.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/ArtimeusDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/ArtimeusDialogue.class
new file mode 100644
index 000000000..2de8b8a2a
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/ArtimeusDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Awusah.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Awusah.class
new file mode 100644
index 000000000..2f3987007
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Awusah.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Ghaslor.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Ghaslor.class
new file mode 100644
index 000000000..db3d5b0c4
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Ghaslor.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Kazemde$KazemdeDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Kazemde$KazemdeDialogue.class
new file mode 100644
index 000000000..4ad861206
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Kazemde$KazemdeDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Kazemde.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Kazemde.class
new file mode 100644
index 000000000..61e2f572f
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Kazemde.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Rokuh$RokuhDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Rokuh$RokuhDialogue.class
new file mode 100644
index 000000000..119ec8b71
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Rokuh$RokuhDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Rokuh.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Rokuh.class
new file mode 100644
index 000000000..c675cffd2
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Rokuh.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Seddu.class b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Seddu.class
new file mode 100644
index 000000000..65f858de1
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/nardah/Seddu.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliCamelMan.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliCamelMan.class
new file mode 100644
index 000000000..719c19004
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliCamelMan.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler$AliTheCamelDialogue$1.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler$AliTheCamelDialogue$1.class
new file mode 100644
index 000000000..1dff14cbf
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler$AliTheCamelDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler$AliTheCamelDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler$AliTheCamelDialogue.class
new file mode 100644
index 000000000..401aef0f3
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler$AliTheCamelDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler.class
new file mode 100644
index 000000000..bb9a7b04d
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheCamelHandler.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheKebabSeller.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheKebabSeller.class
new file mode 100644
index 000000000..4f97f46ca
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/AliTheKebabSeller.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/BlackJackSeller.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/BlackJackSeller.class
new file mode 100644
index 000000000..d58294c32
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/BlackJackSeller.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/DesertBandit$BanditDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/DesertBandit$BanditDialogue.class
new file mode 100644
index 000000000..cc010142b
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/DesertBandit$BanditDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/DesertBandit.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/DesertBandit.class
new file mode 100644
index 000000000..cee8aae6e
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/DesertBandit.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/SnakeCharmerBasket$AliTheSnakeCharmer.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/SnakeCharmerBasket$AliTheSnakeCharmer.class
new file mode 100644
index 000000000..423a77496
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/SnakeCharmerBasket$AliTheSnakeCharmer.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/SnakeCharmerBasket.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/SnakeCharmerBasket.class
new file mode 100644
index 000000000..045aa80ab
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/SnakeCharmerBasket.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/StreetUrchinDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/StreetUrchinDialogue.class
new file mode 100644
index 000000000..0afa25e48
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/pollnivneach/StreetUrchinDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/KlenterNPC.class b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/KlenterNPC.class
new file mode 100644
index 000000000..9e1672686
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/KlenterNPC.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/SphinxDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/SphinxDialogue.class
new file mode 100644
index 000000000..4feb5d77c
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/SphinxDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/TarikDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/TarikDialogue.class
new file mode 100644
index 000000000..752a9c90c
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/TarikDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/WallShortcut$1.class b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/WallShortcut$1.class
new file mode 100644
index 000000000..5d91e3595
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/WallShortcut$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/WallShortcut.class b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/WallShortcut.class
new file mode 100644
index 000000000..9796ef453
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/city/sophanem/WallShortcut.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/inter/ExperienceLampInterface$SkillInterface.class b/CompiledServer/production/RS-2009/plugin/interaction/inter/ExperienceLampInterface$SkillInterface.class
index d9acba93e..b1713f6de 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/inter/ExperienceLampInterface$SkillInterface.class and b/CompiledServer/production/RS-2009/plugin/interaction/inter/ExperienceLampInterface$SkillInterface.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/inter/ExperienceLampInterface.class b/CompiledServer/production/RS-2009/plugin/interaction/inter/ExperienceLampInterface.class
index 6284c1428..b79527f5b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/inter/ExperienceLampInterface.class and b/CompiledServer/production/RS-2009/plugin/interaction/inter/ExperienceLampInterface.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface$FancyDressOwnerDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface$FancyDressOwnerDialogue.class
index c338d8414..1c0790785 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface$FancyDressOwnerDialogue.class and b/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface$FancyDressOwnerDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface$FurClothing.class b/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface$FurClothing.class
index a8128251e..a6b90b019 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface$FurClothing.class and b/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface$FurClothing.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface.class b/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface.class
index 5886b0792..4edb30bb4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface.class and b/CompiledServer/production/RS-2009/plugin/interaction/inter/FurClothingInterface.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/inter/HairInterfacePlugin.class b/CompiledServer/production/RS-2009/plugin/interaction/inter/HairInterfacePlugin.class
index 6a1e4436d..083b3cadd 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/inter/HairInterfacePlugin.class and b/CompiledServer/production/RS-2009/plugin/interaction/inter/HairInterfacePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/inter/ThessaliaInterface.class b/CompiledServer/production/RS-2009/plugin/interaction/inter/ThessaliaInterface.class
index e61669f57..420ff6c17 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/inter/ThessaliaInterface.class and b/CompiledServer/production/RS-2009/plugin/interaction/inter/ThessaliaInterface.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/item/DragonfireShieldPlugin$1.class b/CompiledServer/production/RS-2009/plugin/interaction/item/DragonfireShieldPlugin$1.class
index f51c99423..1cf11fb4c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/item/DragonfireShieldPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/item/DragonfireShieldPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/item/GodBookPlugin$GodBookDialogue$1.class b/CompiledServer/production/RS-2009/plugin/interaction/item/GodBookPlugin$GodBookDialogue$1.class
index 03b2d36f6..9dd95833f 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/item/GodBookPlugin$GodBookDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/item/GodBookPlugin$GodBookDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/item/LampPlugin.class b/CompiledServer/production/RS-2009/plugin/interaction/item/LampPlugin.class
index 5809c7600..f1a096387 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/item/LampPlugin.class and b/CompiledServer/production/RS-2009/plugin/interaction/item/LampPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre$SceptreDialog$1.class b/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre$SceptreDialog$1.class
new file mode 100644
index 000000000..67dfdccb3
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre$SceptreDialog$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre$SceptreDialog.class b/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre$SceptreDialog.class
new file mode 100644
index 000000000..2733acfd6
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre$SceptreDialog.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre.class b/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre.class
new file mode 100644
index 000000000..0282802de
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/item/PharoahSceptre.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/item/withobject/WaterSourcePlugin$WaterRecipient.class b/CompiledServer/production/RS-2009/plugin/interaction/item/withobject/WaterSourcePlugin$WaterRecipient.class
index 1b8e9b34c..31cb1a148 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/item/withobject/WaterSourcePlugin$WaterRecipient.class and b/CompiledServer/production/RS-2009/plugin/interaction/item/withobject/WaterSourcePlugin$WaterRecipient.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/npc/BarcrawlPlugin$BarcrawlDialogue$1.class b/CompiledServer/production/RS-2009/plugin/interaction/npc/BarcrawlPlugin$BarcrawlDialogue$1.class
index 2e59c80a9..ba78fb3dd 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/npc/BarcrawlPlugin$BarcrawlDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/npc/BarcrawlPlugin$BarcrawlDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/npc/BarcrawlPlugin$BarcrawlType$9$1.class b/CompiledServer/production/RS-2009/plugin/interaction/npc/BarcrawlPlugin$BarcrawlType$9$1.class
index 2f16a3a80..5038bb0db 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/npc/BarcrawlPlugin$BarcrawlType$9$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/npc/BarcrawlPlugin$BarcrawlType$9$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/npc/ProbitaNPC$1.class b/CompiledServer/production/RS-2009/plugin/interaction/npc/ProbitaNPC$1.class
index e402ac93f..782cb0d26 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/npc/ProbitaNPC$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/npc/ProbitaNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/npc/RechargeSceptre$RechargeDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/npc/RechargeSceptre$RechargeDialogue.class
new file mode 100644
index 000000000..4b7614731
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/npc/RechargeSceptre$RechargeDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/npc/RechargeSceptre.class b/CompiledServer/production/RS-2009/plugin/interaction/npc/RechargeSceptre.class
new file mode 100644
index 000000000..01fad9784
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/npc/RechargeSceptre.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/npc/SimonScepterInteraction.class b/CompiledServer/production/RS-2009/plugin/interaction/npc/SimonScepterInteraction.class
new file mode 100644
index 000000000..476594c66
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/npc/SimonScepterInteraction.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/npc/sorceress_app/SorceressApprenticeDialogue$1.class b/CompiledServer/production/RS-2009/plugin/interaction/npc/sorceress_app/SorceressApprenticeDialogue$1.class
index 01b84b4f9..2c4324818 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/npc/sorceress_app/SorceressApprenticeDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/npc/sorceress_app/SorceressApprenticeDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/BankingPlugin$BankDepositInterface$1.class b/CompiledServer/production/RS-2009/plugin/interaction/object/BankingPlugin$BankDepositInterface$1.class
index 3330a0270..ced6df39d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/BankingPlugin$BankDepositInterface$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/BankingPlugin$BankDepositInterface$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/BankingPlugin$BankingInterface$3.class b/CompiledServer/production/RS-2009/plugin/interaction/object/BankingPlugin$BankingInterface$3.class
index 30e10a937..b7c005e01 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/BankingPlugin$BankingInterface$3.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/BankingPlugin$BankingInterface$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/BrokenCartBypass$1.class b/CompiledServer/production/RS-2009/plugin/interaction/object/BrokenCartBypass$1.class
new file mode 100644
index 000000000..0d021ba62
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/object/BrokenCartBypass$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/BrokenCartBypass.class b/CompiledServer/production/RS-2009/plugin/interaction/object/BrokenCartBypass.class
new file mode 100644
index 000000000..0309e582c
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/interaction/object/BrokenCartBypass.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/DoorManagingPlugin.class b/CompiledServer/production/RS-2009/plugin/interaction/object/DoorManagingPlugin.class
index d1d1661a6..bbcf834de 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/DoorManagingPlugin.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/DoorManagingPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/LumbridgeBasementPlugin$1.class b/CompiledServer/production/RS-2009/plugin/interaction/object/LumbridgeBasementPlugin$1.class
index a466e758b..943873cf3 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/LumbridgeBasementPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/LumbridgeBasementPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$1.class b/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$1.class
index 855cb59cf..f77df25c2 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$ShootingStarMiningPulse.class b/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$ShootingStarMiningPulse.class
index a35fa88b6..119aba0e5 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$ShootingStarMiningPulse.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$ShootingStarMiningPulse.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$StarSpriteDialogue.class b/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$StarSpriteDialogue.class
index 61f5c8bce..5cdfdc74d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$StarSpriteDialogue.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/ShootingStarPlugin$StarSpriteDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/WildernessLeverPlugin$1.class b/CompiledServer/production/RS-2009/plugin/interaction/object/WildernessLeverPlugin$1.class
index 1f5997ddf..46c58853d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/WildernessLeverPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/WildernessLeverPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$1.class b/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$1.class
index 78c66a9cb..d2fecb991 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$2.class b/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$2.class
index 6bde7b9e2..ac8ff2800 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$2.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$3.class b/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$3.class
index 626253e1d..5fbcf86f2 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$3.class and b/CompiledServer/production/RS-2009/plugin/interaction/object/sorceress/GardenObjectsPlugin$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/interaction/player/AttackOptionPlugin.class b/CompiledServer/production/RS-2009/plugin/interaction/player/AttackOptionPlugin.class
index 9db92dbcf..0e38b295b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/interaction/player/AttackOptionPlugin.class and b/CompiledServer/production/RS-2009/plugin/interaction/player/AttackOptionPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$1.class b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$1.class
index 8b6db7260..2abbd5394 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$1.class and b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2$1.class b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2$1.class
index 60f064609..d5099ae7c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2$1.class and b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2$2.class b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2$2.class
index 577749ee5..1d9874639 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2$2.class and b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2.class b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2.class
index dd376359c..e8a186642 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2.class and b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$BorkCutscene$1.class b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$BorkCutscene$1.class
index 9a9b3f6b9..6abb952a8 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$BorkCutscene$1.class and b/CompiledServer/production/RS-2009/plugin/npc/BorkNPC$BorkCutscene$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/ChaosElementalNPC$ChaosCombatHandler$1.class b/CompiledServer/production/RS-2009/plugin/npc/ChaosElementalNPC$ChaosCombatHandler$1.class
index 1c755e519..bdceab0e0 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/ChaosElementalNPC$ChaosCombatHandler$1.class and b/CompiledServer/production/RS-2009/plugin/npc/ChaosElementalNPC$ChaosCombatHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/ChaosElementalNPC$ChaosCombatHandler$2.class b/CompiledServer/production/RS-2009/plugin/npc/ChaosElementalNPC$ChaosCombatHandler$2.class
index 457af3268..442a82347 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/ChaosElementalNPC$ChaosCombatHandler$2.class and b/CompiledServer/production/RS-2009/plugin/npc/ChaosElementalNPC$ChaosCombatHandler$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/ElementalWizardNPC$MaligniusMortifer$1.class b/CompiledServer/production/RS-2009/plugin/npc/ElementalWizardNPC$MaligniusMortifer$1.class
index 60ec40b0e..32a0e1a76 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/ElementalWizardNPC$MaligniusMortifer$1.class and b/CompiledServer/production/RS-2009/plugin/npc/ElementalWizardNPC$MaligniusMortifer$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/HansNPC.class b/CompiledServer/production/RS-2009/plugin/npc/HansNPC.class
index 506066ab0..9bc4313d1 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/HansNPC.class and b/CompiledServer/production/RS-2009/plugin/npc/HansNPC.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/KalphiteQueenNPC$KQCombatSwingHandler$1.class b/CompiledServer/production/RS-2009/plugin/npc/KalphiteQueenNPC$KQCombatSwingHandler$1.class
index e8d236d3a..d733abb85 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/KalphiteQueenNPC$KQCombatSwingHandler$1.class and b/CompiledServer/production/RS-2009/plugin/npc/KalphiteQueenNPC$KQCombatSwingHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/Student.class b/CompiledServer/production/RS-2009/plugin/npc/Student.class
new file mode 100644
index 000000000..59eacafe7
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/npc/Student.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/corp/CorporealBeastNPC$CombatHandler$1.class b/CompiledServer/production/RS-2009/plugin/npc/corp/CorporealBeastNPC$CombatHandler$1.class
index 256bff4c2..c8ac2b107 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/corp/CorporealBeastNPC$CombatHandler$1.class and b/CompiledServer/production/RS-2009/plugin/npc/corp/CorporealBeastNPC$CombatHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/corp/CorporealBeastNPC$CombatHandler$2.class b/CompiledServer/production/RS-2009/plugin/npc/corp/CorporealBeastNPC$CombatHandler$2.class
index f6e162783..b0d8f1046 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/corp/CorporealBeastNPC$CombatHandler$2.class and b/CompiledServer/production/RS-2009/plugin/npc/corp/CorporealBeastNPC$CombatHandler$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/familiar/DreadfowlNPC$2.class b/CompiledServer/production/RS-2009/plugin/npc/familiar/DreadfowlNPC$2.class
index 8dc895097..f84d8798d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/familiar/DreadfowlNPC$2.class and b/CompiledServer/production/RS-2009/plugin/npc/familiar/DreadfowlNPC$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/familiar/MacawNPC$1.class b/CompiledServer/production/RS-2009/plugin/npc/familiar/MacawNPC$1.class
index 0f48d98d4..dc0dd9a0a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/familiar/MacawNPC$1.class and b/CompiledServer/production/RS-2009/plugin/npc/familiar/MacawNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/npc/familiar/SpiritWolfNPC$1.class b/CompiledServer/production/RS-2009/plugin/npc/familiar/SpiritWolfNPC$1.class
index 625f296b4..4b40b3397 100644
Binary files a/CompiledServer/production/RS-2009/plugin/npc/familiar/SpiritWolfNPC$1.class and b/CompiledServer/production/RS-2009/plugin/npc/familiar/SpiritWolfNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$1.class
index 155d80ff4..cfe4fb4b2 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$2.class b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$2.class
index 5462f7229..a3adb0fd2 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$3.class b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$3.class
index ab33fd646..90de37ebd 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$3.class and b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$4.class b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$4.class
index 5459a761d..52d450d14 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$4.class and b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$5.class b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$5.class
index cf22f5047..aeb168a97 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$5.class and b/CompiledServer/production/RS-2009/plugin/quest/animal_mag/AliceHusbandDialogue$5.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/DemonSlayerCutscene$DelrithDialoguePlugin$1.class b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/DemonSlayerCutscene$DelrithDialoguePlugin$1.class
index 1a9c056da..41eb8dfda 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/DemonSlayerCutscene$DelrithDialoguePlugin$1.class and b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/DemonSlayerCutscene$DelrithDialoguePlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/DemonSlayerCutscene$DenathDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/DemonSlayerCutscene$DenathDialogue$1.class
index 688a136ea..6c48d328c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/DemonSlayerCutscene$DenathDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/DemonSlayerCutscene$DenathDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/GypsyArisDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/GypsyArisDialogue$1.class
index e38905212..76ff93e1d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/GypsyArisDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/GypsyArisDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/GypsyArisDialogue$2.class b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/GypsyArisDialogue$2.class
index c8b906460..13f4f842a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/GypsyArisDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/GypsyArisDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/SirPyrsinDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/SirPyrsinDialogue$1.class
index c934c2721..b4ac77c91 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/SirPyrsinDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/SirPyrsinDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/TraibornDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/TraibornDialogue$1.class
index df211b164..ef5895fe4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/demonslayer/TraibornDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/demonslayer/TraibornDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayer$1.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayer$1.class
index bd5a2f6a5..7aa249637 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayer$1.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayer$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$1.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$1.class
index 71a6fb752..13402a9ec 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$1.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$1.class
index f628be5a3..189be9b28 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$2.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$2.class
index f2aaeca59..8de18ec5b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$3.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$3.class
index d672f0e99..52883ee00 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$3.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$4.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$4.class
index d24f497d0..2ada0d885 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$4.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$5.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$5.class
index 09bd07c21..7933b996b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$5.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$5.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$6.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$6.class
index 7bda7e386..e31fd6d46 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$6.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/DragonSlayerCutscene$DSNedDialogue$6.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/ElvargNPC$1.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/ElvargNPC$1.class
index 9a7e259c9..1178d488e 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/ElvargNPC$1.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/ElvargNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/ElvargNPC$2.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/ElvargNPC$2.class
index e884ff429..c748e0b0b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/ElvargNPC$2.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/ElvargNPC$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/OziachDialogue.class b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/OziachDialogue.class
index ec03efe59..bddb03274 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/OziachDialogue.class and b/CompiledServer/production/RS-2009/plugin/quest/dragonslayer/OziachDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/gdiplomacy/GDiplomacyCutscene$GoblinGeneralDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/gdiplomacy/GDiplomacyCutscene$GoblinGeneralDialogue$1.class
index 042a82769..7aed1ea3a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/gdiplomacy/GDiplomacyCutscene$GoblinGeneralDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/gdiplomacy/GDiplomacyCutscene$GoblinGeneralDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/merlincrystal/MerlinCrystalPlugin$1.class b/CompiledServer/production/RS-2009/plugin/quest/merlincrystal/MerlinCrystalPlugin$1.class
index 50148670a..fb93c7d62 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/merlincrystal/MerlinCrystalPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/quest/merlincrystal/MerlinCrystalPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/AnaDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/AnaDialogue$1.class
index 8bc1ea666..b1066efbd 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/AnaDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/AnaDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/DesertGuardDialogue$DesertGuardNPC$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/DesertGuardDialogue$DesertGuardNPC$1.class
index 3ab89cd26..fad82b2ff 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/DesertGuardDialogue$DesertGuardNPC$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/DesertGuardDialogue$DesertGuardNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/MaleSlaveDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/MaleSlaveDialogue$1.class
index 9bdbc9be5..ef2705f78 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/MaleSlaveDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/MaleSlaveDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$1.class
index fa9e2aac3..63c8e2ee6 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$2.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$2.class
index f6007cc21..33abb380b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$2.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$3.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$3.class
index 82891ec7e..ad9a1399a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$3.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$4.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$4.class
index da5643537..f27fd0129 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$4.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$5.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$5.class
index 946858305..f6ff43632 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$5.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$5.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$6.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$6.class
index 24f509458..2589b4a1d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$6.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$6.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$AnnaCartHandler$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$AnnaCartHandler$1.class
index 82273aa3e..5d8d2c808 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$AnnaCartHandler$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$AnnaCartHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$AnnaCartHandler$AnnaCartCutscene$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$AnnaCartHandler$AnnaCartCutscene$1.class
index 23b76122c..67e0d5048 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$AnnaCartHandler$AnnaCartCutscene$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$AnnaCartHandler$AnnaCartCutscene$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$BarrelDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$BarrelDialogue$1.class
index f3aad0d9d..ed00feff7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$BarrelDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$BarrelDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$CartDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$CartDialogue$1.class
index f8283b080..c15b323c3 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$CartDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$CartDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$MineCartDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$MineCartDialogue$1.class
index 020fe3c63..2036fff15 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$MineCartDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$MineCartDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$MineCartDialogue$MiningCartCutscene$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$MineCartDialogue$MiningCartCutscene$1.class
index 12dd752ee..1f2d5d709 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$MineCartDialogue$MiningCartCutscene$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$MineCartDialogue$MiningCartCutscene$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$WinchCutscene$1.class b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$WinchCutscene$1.class
index 9b90f89ce..dc873fe11 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$WinchCutscene$1.class and b/CompiledServer/production/RS-2009/plugin/quest/touristrap/TouristTrapPlugin$WinchCutscene$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/AlmeraDialogue.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/AlmeraDialogue.class
index 912c30029..c3fa6495d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/AlmeraDialogue.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/AlmeraDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/GolrieDialogue.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/GolrieDialogue.class
index 4f205024a..2866c4ca7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/GolrieDialogue.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/GolrieDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$1.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$1.class
index d2701b24f..a04820139 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$1.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$2.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$2.class
index afefc6805..d49d4a8ba 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$2.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$3.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$3.class
index 619aa474b..438faf0db 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$3.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$4.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$4.class
index 8ececca33..671127077 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$4.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$1$1.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$1$1.class
index c60e99ae2..61886970d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$1$1.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$1$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$1.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$1.class
index f3328e821..3fba44c98 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$1.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$2.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$2.class
index 8808da195..d6e0c15ef 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$2.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$3.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$3.class
index 858ce3336..ff28017bc 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$3.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$4.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$4.class
index ef8a4829e..de2743c9d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$4.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$5.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$5.class
index e610695b3..cb7271a04 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$5.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler$5.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler.class
index 9b94abac0..056a7e1a7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin$WaterfallUseWithHandler.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin.class
index 4a083c78c..bbbc52a2f 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallTreeDialogue$1.class b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallTreeDialogue$1.class
index 0aab807a6..f53d93ca4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallTreeDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/quest/waterfall/WaterfallTreeDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/BoyDialoguePlugin.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/BoyDialoguePlugin.class
new file mode 100644
index 000000000..33842a60a
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/BoyDialoguePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/MouseNPC.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/MouseNPC.class
new file mode 100644
index 000000000..a38a3ed1a
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/MouseNPC.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class
new file mode 100644
index 000000000..a8f848778
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class
new file mode 100644
index 000000000..ea9705985
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/NoraTHaggNPC.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHouse.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHouse.class
new file mode 100644
index 000000000..2545e5657
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHouse.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin$WitchsHouseUseWithHandler$1.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin$WitchsHouseUseWithHandler$1.class
new file mode 100644
index 000000000..7259ab09e
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin$WitchsHouseUseWithHandler$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin$WitchsHouseUseWithHandler.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin$WitchsHouseUseWithHandler.class
new file mode 100644
index 000000000..45576b6df
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin$WitchsHouseUseWithHandler.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin.class b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin.class
new file mode 100644
index 000000000..30e31b375
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/quest/witchs_house/WitchsHousePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$1.class b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$1.class
index 3352d1fab..6c82c83d7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$1.class and b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$2.class b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$2.class
index 75d88ca5c..c0837ca90 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$2.class and b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$3.class b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$3.class
index 839f28d63..cf7b7730f 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$3.class and b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$4.class b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$4.class
index e0a165614..d4214fbf4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$4.class and b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$5.class b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$5.class
index 5d5d972b1..825ea69ba 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$5.class and b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$5.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$6.class b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$6.class
index 6cea4fa86..e68f9cb93 100644
Binary files a/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$6.class and b/CompiledServer/production/RS-2009/plugin/quest/wlbelow/WLBelowCutscene$6.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/BarbarianOutpostCourse$1.class b/CompiledServer/production/RS-2009/plugin/skill/agility/BarbarianOutpostCourse$1.class
index 87c0e647b..a3179930a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/BarbarianOutpostCourse$1.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/BarbarianOutpostCourse$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/BarbarianOutpostCourse$2.class b/CompiledServer/production/RS-2009/plugin/skill/agility/BarbarianOutpostCourse$2.class
index 630aebaa1..4344cb4c0 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/BarbarianOutpostCourse$2.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/BarbarianOutpostCourse$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/GnomeStrongholdCourse.class b/CompiledServer/production/RS-2009/plugin/skill/agility/GnomeStrongholdCourse.class
index 6de9e9e84..07af67218 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/GnomeStrongholdCourse.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/GnomeStrongholdCourse.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/WildernessCourse.class b/CompiledServer/production/RS-2009/plugin/skill/agility/WildernessCourse.class
index c2a7ede4b..450c85605 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/WildernessCourse.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/WildernessCourse.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$1.class b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$1.class
index 0502f6f58..8b7ec0e57 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$1.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$2.class b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$2.class
index 31a1f6c72..0d30f3d89 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$2.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$3.class b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$3.class
index 6c56dc5fc..dfe3e28c7 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$3.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$4.class b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$4.class
index 997fe0245..a2dbd6d84 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$4.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$5.class b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$5.class
index 298a236fc..116a34e9c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$5.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse$5.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse.class b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse.class
index 771ad59fa..a47484b18 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse.class and b/CompiledServer/production/RS-2009/plugin/skill/agility/pyramid/AgilityPyramidCourse.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/construction/decoration/StaircasePlugin$ClimbPohLadder$1.class b/CompiledServer/production/RS-2009/plugin/skill/construction/decoration/StaircasePlugin$ClimbPohLadder$1.class
index ef2f9b0b4..36234e288 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/construction/decoration/StaircasePlugin$ClimbPohLadder$1.class and b/CompiledServer/production/RS-2009/plugin/skill/construction/decoration/StaircasePlugin$ClimbPohLadder$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/construction/decoration/StaircasePlugin$ClimbPohLadder$2.class b/CompiledServer/production/RS-2009/plugin/skill/construction/decoration/StaircasePlugin$ClimbPohLadder$2.class
index 6618faa78..188b4b1c8 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/construction/decoration/StaircasePlugin$ClimbPohLadder$2.class and b/CompiledServer/production/RS-2009/plugin/skill/construction/decoration/StaircasePlugin$ClimbPohLadder$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$1.class b/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$1.class
index 29fa973c3..01fef9bf9 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$2.class b/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$2.class
index 740826eb7..1bf3c21f5 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$3.class b/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$3.class
index 96fb5176c..d1ebc87c9 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$3.class and b/CompiledServer/production/RS-2009/plugin/skill/construction/npc/HouseServantDialogue$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingDialoguePlugin$2.class b/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingDialoguePlugin$2.class
new file mode 100644
index 000000000..c9a092aba
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingDialoguePlugin$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingDialoguePlugin.class b/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingDialoguePlugin.class
index 6165324f6..dfbc7910d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingDialoguePlugin.class and b/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingDialoguePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingPlugin.class b/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingPlugin.class
index 24daa01aa..541e56f6d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingPlugin.class and b/CompiledServer/production/RS-2009/plugin/skill/cooking/CookingPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/crafting/ChiselLimestonePlugin.class b/CompiledServer/production/RS-2009/plugin/skill/crafting/ChiselLimestonePlugin.class
new file mode 100644
index 000000000..bf9884364
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/skill/crafting/ChiselLimestonePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/crafting/MoltenGlassMakePlugin$MoltenGlassPulse.class b/CompiledServer/production/RS-2009/plugin/skill/crafting/MoltenGlassMakePlugin$MoltenGlassPulse.class
index cdaca2522..179488560 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/crafting/MoltenGlassMakePlugin$MoltenGlassPulse.class and b/CompiledServer/production/RS-2009/plugin/skill/crafting/MoltenGlassMakePlugin$MoltenGlassPulse.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/crafting/MoltenGlassMakePlugin.class b/CompiledServer/production/RS-2009/plugin/skill/crafting/MoltenGlassMakePlugin.class
index 95696db3e..a0598e8aa 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/crafting/MoltenGlassMakePlugin.class and b/CompiledServer/production/RS-2009/plugin/skill/crafting/MoltenGlassMakePlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/herblore/SwampToadPlugin.class b/CompiledServer/production/RS-2009/plugin/skill/herblore/SwampToadPlugin.class
new file mode 100644
index 000000000..f9caf753c
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/skill/herblore/SwampToadPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/magic/HouseTeleportPlugin.class b/CompiledServer/production/RS-2009/plugin/skill/magic/HouseTeleportPlugin.class
new file mode 100644
index 000000000..98d3d0869
Binary files /dev/null and b/CompiledServer/production/RS-2009/plugin/skill/magic/HouseTeleportPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/magic/ModernTeleportPlugin.class b/CompiledServer/production/RS-2009/plugin/skill/magic/ModernTeleportPlugin.class
index 45691907f..048730991 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/magic/ModernTeleportPlugin.class and b/CompiledServer/production/RS-2009/plugin/skill/magic/ModernTeleportPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/DreamSpell$1.class b/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/DreamSpell$1.class
index c4bb90314..c52c3ff91 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/DreamSpell$1.class and b/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/DreamSpell$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/DreamSpell$2.class b/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/DreamSpell$2.class
index 49557fe3d..619b607ae 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/DreamSpell$2.class and b/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/DreamSpell$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/SpellbookSwapSpell$1.class b/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/SpellbookSwapSpell$1.class
index c7bb1af00..b04ef510a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/SpellbookSwapSpell$1.class and b/CompiledServer/production/RS-2009/plugin/skill/magic/lunar/SpellbookSwapSpell$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/slayer/SlayerMasterDialogue.class b/CompiledServer/production/RS-2009/plugin/skill/slayer/SlayerMasterDialogue.class
index 360674b8e..92ea0a6e1 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/slayer/SlayerMasterDialogue.class and b/CompiledServer/production/RS-2009/plugin/skill/slayer/SlayerMasterDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/slayer/dungeon/LumbridgeDungeon$WallBeastNPC.class b/CompiledServer/production/RS-2009/plugin/skill/slayer/dungeon/LumbridgeDungeon$WallBeastNPC.class
index 83b630ec4..e3a52eacd 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/slayer/dungeon/LumbridgeDungeon$WallBeastNPC.class and b/CompiledServer/production/RS-2009/plugin/skill/slayer/dungeon/LumbridgeDungeon$WallBeastNPC.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$1.class b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$1.class
index 1f9ff15f6..108f1155c 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$2.class b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$2.class
index 453c32448..e0a565c2a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$2.class and b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$3.class b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$3.class
index 3d19a8a92..dda69ec07 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$3.class and b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$3.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$4.class b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$4.class
index 7bb0c3aba..83a639603 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$4.class and b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$4.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$5.class b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$5.class
index c2b5abb26..950d64117 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$5.class and b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$5.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$6.class b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$6.class
index 02b5362d2..ce6bc85d6 100644
Binary files a/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$6.class and b/CompiledServer/production/RS-2009/plugin/skill/summoning/SummoningTrainingRoom$FluffyCutscene$FluffyDialogue$6.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/tutorial/MasterChefDialogue.class b/CompiledServer/production/RS-2009/plugin/tutorial/MasterChefDialogue.class
index fbd930474..3b5440723 100644
Binary files a/CompiledServer/production/RS-2009/plugin/tutorial/MasterChefDialogue.class and b/CompiledServer/production/RS-2009/plugin/tutorial/MasterChefDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class b/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class
index 20640e741..f0a19a484 100644
Binary files a/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class and b/CompiledServer/production/RS-2009/plugin/tutorial/TutorialCompletionDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/DesertZone.class b/CompiledServer/production/RS-2009/plugin/zone/DesertZone.class
index 24124eb57..3153d0da4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/DesertZone.class and b/CompiledServer/production/RS-2009/plugin/zone/DesertZone.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore$1.class b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore$1.class
index 94953406d..35ecb638a 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore$1.class and b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore$2.class b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore$2.class
index ccd394cf6..edc058e97 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore$2.class and b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore$2.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore.class b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore.class
index 5184cc490..4633c33c2 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore.class and b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$CreditStore.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$GnomeTravellerPlugin$GnomeDialogue.class b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$GnomeTravellerPlugin$GnomeDialogue.class
index def2bcc04..f39d64894 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$GnomeTravellerPlugin$GnomeDialogue.class and b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$GnomeTravellerPlugin$GnomeDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$GnomeTravellerPlugin.class b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$GnomeTravellerPlugin.class
index 6c51c1d21..7966c2c23 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$GnomeTravellerPlugin.class and b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$GnomeTravellerPlugin.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$RewardTraderDialogue.class b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$RewardTraderDialogue.class
index cc175fa8b..66318548b 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$RewardTraderDialogue.class and b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$RewardTraderDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$TeleporterDialogue$1.class b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$TeleporterDialogue$1.class
index ed33916a5..d15191aa4 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$TeleporterDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$TeleporterDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$TeleporterDialogue.class b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$TeleporterDialogue.class
index f83bb34ba..836ce4de6 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$TeleporterDialogue.class and b/CompiledServer/production/RS-2009/plugin/zone/GrandExchangeZone$TeleporterDialogue.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/rellekka/JarvaldDialogue$1.class b/CompiledServer/production/RS-2009/plugin/zone/rellekka/JarvaldDialogue$1.class
index 4fdd2698a..ea8599b7d 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/rellekka/JarvaldDialogue$1.class and b/CompiledServer/production/RS-2009/plugin/zone/rellekka/JarvaldDialogue$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/wbisland/WaterBirthDungeonZone$1$1.class b/CompiledServer/production/RS-2009/plugin/zone/wbisland/WaterBirthDungeonZone$1$1.class
index d3d971e7e..10075386e 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/wbisland/WaterBirthDungeonZone$1$1.class and b/CompiledServer/production/RS-2009/plugin/zone/wbisland/WaterBirthDungeonZone$1$1.class differ
diff --git a/CompiledServer/production/RS-2009/plugin/zone/wbisland/WaterBirthDungeonZone$1.class b/CompiledServer/production/RS-2009/plugin/zone/wbisland/WaterBirthDungeonZone$1.class
index 4d9d3019b..2eba39305 100644
Binary files a/CompiledServer/production/RS-2009/plugin/zone/wbisland/WaterBirthDungeonZone$1.class and b/CompiledServer/production/RS-2009/plugin/zone/wbisland/WaterBirthDungeonZone$1.class differ
diff --git a/RS-2009.iml b/RS-2009.iml
index 2154a37dc..b174c466f 100644
--- a/RS-2009.iml
+++ b/RS-2009.iml
@@ -1,6 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
   <component name="ExternalSystem" externalSystem="GRADLE" externalSystemModuleGroup="" externalSystemModuleVersion="unspecified" linkedProjectId="RS-2009" linkedProjectPath="$MODULE_DIR$" rootProjectPath="$MODULE_DIR$" />
+  <component name="FacetManager">
+    <facet type="JRebel" name="JRebel">
+      <configuration>
+        <option name="deleteUnindexed" value="false" />
+        <option name="httpAuthEnabled" value="false" />
+        <option name="httpPassword" />
+        <option name="httpUsername" />
+        <option name="ideModuleStorage">
+          <map>
+            <entry key="com.zeroturnaround.jrebel.FormatVersion" value="7.0.0" />
+            <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
+            <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
+            <entry key="jrebelEnabled" value="true" />
+            <entry key="lastExternalPluginCheckTime" value="1584275600472" />
+          </map>
+        </option>
+        <option name="masterModuleName" />
+        <option name="overrideStandardXmlFolder" value="false" />
+        <option name="remotingEnabled" value="false" />
+        <option name="secure" value="true" />
+        <option name="url" />
+        <option name="useRelativePathsInXml" value="false" />
+        <option name="xmlDir" />
+      </configuration>
+    </facet>
+  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
diff --git a/Server/src/org/crandor/game/container/Container.java b/Server/src/org/crandor/game/container/Container.java
index e74e00472..2c7667d31 100644
--- a/Server/src/org/crandor/game/container/Container.java
+++ b/Server/src/org/crandor/game/container/Container.java
@@ -162,6 +162,15 @@ public class Container {
 		return true;
 	}
 
+	public boolean addIfDoesntHave(final Item item) {
+		if(containsItem(item)) {
+			return false;
+		} else {
+			return add(item);
+
+		}
+	}
+
 	/**
 	 * Adds an item to this container.
 	 * @param item The item.
diff --git a/Server/src/org/crandor/game/content/dialogue/DialoguePlugin.java b/Server/src/org/crandor/game/content/dialogue/DialoguePlugin.java
index bc5222774..d87c05972 100644
--- a/Server/src/org/crandor/game/content/dialogue/DialoguePlugin.java
+++ b/Server/src/org/crandor/game/content/dialogue/DialoguePlugin.java
@@ -144,6 +144,10 @@ public abstract class DialoguePlugin implements Plugin<Player> {
 		}
 	}
 
+	public void finish() {
+		setStage(-1);
+	}
+
 	@Override
 	public Object fireEvent(String identifier, Object... args) {
 		return null;
@@ -190,6 +194,10 @@ public abstract class DialoguePlugin implements Plugin<Player> {
 	public Component npc(int id, final String... messages) {
 		return interpreter.sendDialogues(id, FacialExpression.HALF_GUILTY, messages);
 	}
+
+	public Component sendDialogue(String... messages) {
+		return interpreter.sendDialogue(messages);
+	}
 	
 	/**
 	 * Method wrapper to send an npc dial.
diff --git a/Server/src/plugin/interaction/object/DoorManagingPlugin.java b/Server/src/plugin/interaction/object/DoorManagingPlugin.java
index 694a1581a..615c150c9 100644
--- a/Server/src/plugin/interaction/object/DoorManagingPlugin.java
+++ b/Server/src/plugin/interaction/object/DoorManagingPlugin.java
@@ -6,6 +6,7 @@ import org.crandor.game.interaction.OptionHandler;
 import org.crandor.game.node.Node;
 import org.crandor.game.node.entity.player.Player;
 import org.crandor.game.node.object.GameObject;
+import org.crandor.game.node.object.ObjectBuilder;
 import org.crandor.game.world.map.Location;
 import org.crandor.game.world.map.RegionManager;
 import org.crandor.plugin.InitializablePlugin;
@@ -23,6 +24,7 @@ public final class DoorManagingPlugin extends OptionHandler {
 	public Plugin<Object> newInstance(Object arg) throws Throwable {
 		ObjectDefinition.setOptionHandler("open", this);
 		ObjectDefinition.setOptionHandler("close", this);
+		ObjectDefinition.setOptionHandler("shut", this);
 		return this;
 	}
 
@@ -33,6 +35,20 @@ public final class DoorManagingPlugin extends OptionHandler {
 			return true;
 		}
 		String name = object.getName().toLowerCase();
+		if (name.contains("drawers") || name.contains("wardrobe") || name.contains("cupboard")) {
+			switch(option) {
+				case "open":
+					if (object.isActive()) {
+						ObjectBuilder.replace(object, object.transform(object.getId() + 1), 80);
+					}
+					return true;
+				case "close":
+				case "shut":
+					ObjectBuilder.replace(object, object.transform(object.getId() - 1));
+					return true;
+			}
+			return true;
+		}
 		if (name.contains("trapdoor") || name.contains("trap door")) {
 			Location destination = object.getLocation().transform(0, 6400, 0);
 			if (!RegionManager.isTeleportPermitted(destination)) {
diff --git a/Server/src/plugin/quest/witchs_house/BoyDialoguePlugin.java b/Server/src/plugin/quest/witchs_house/BoyDialoguePlugin.java
new file mode 100644
index 000000000..f9582c2ec
--- /dev/null
+++ b/Server/src/plugin/quest/witchs_house/BoyDialoguePlugin.java
@@ -0,0 +1,128 @@
+package plugin.quest.witchs_house;
+
+import org.crandor.game.content.dialogue.DialoguePlugin;
+import org.crandor.game.node.entity.npc.NPC;
+import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.node.entity.player.link.quest.Quest;
+import org.crandor.game.node.item.Item;
+import org.crandor.plugin.InitializablePlugin;
+
+/**
+ * Created for 2009Scape
+ * User: Ethan Kyle Millard
+ * Date: March 15, 2020
+ * Time: 11:49 AM
+ */
+@InitializablePlugin
+public class BoyDialoguePlugin extends DialoguePlugin {
+
+    public BoyDialoguePlugin() {
+    }
+
+    public BoyDialoguePlugin(Player player) {
+        super(player);
+    }
+
+    @Override
+    public DialoguePlugin newInstance(Player player) {
+        return new BoyDialoguePlugin(player);
+    }
+
+    @Override
+    public boolean open(Object... args) {
+        final Quest quest = player.getQuestRepository().getQuest("Witch's House");
+        if (!quest.isStarted(player)) {
+            player("Hello young man.");
+            setStage(1);
+        }
+        npc("Have you gotten my ball back yet?");
+        setStage(11);
+        return true;
+    }
+
+    @Override
+    public boolean handle(int interfaceId, int buttonId) {
+        final Quest quest = player.getQuestRepository().getQuest("Witch's House");
+        switch(stage) {
+            case -1:
+                end();
+                break;
+            case 1:
+                sendDialogue("The boy sobs.");
+                next();
+                break;
+            case 2:
+                options("What's the matter?", "Well if you're not going to answer then I'll go.");
+                next();
+                break;
+            case 3:
+                switch(buttonId) {
+                    case 1:
+                        player("What's the matter?");
+                        setStage(5);
+                        break;
+                    case 2:
+                        player("Well if you're not going to answer then I'll go.");
+                        next();
+                        break;
+                }
+                break;
+            case 4:
+                sendDialogue("The boy sniffs slightly.");
+                finish();
+                break;
+            case 5:
+                npc("I've kicked my ball over that hedge, into that garden!", "The old lady who lives there is scary... She's locked the","ball in her wooden shed! Can you get my ball back for", "me please?");
+                next();
+                break;
+            case 6:
+                options("Ok, I'll see what I can do.", "Get it back yourself.");
+                next();
+                break;
+            case 7:
+                switch(buttonId) {
+                    case 1:
+                        player("Ok, I'll see what I can do.");
+                        setStage(10);
+                        break;
+                    case 2:
+                        player("Get it back yourself.");
+                        next();
+                        break;
+                }
+                break;
+            case 8:
+                npc("You're a meany.");
+                next();
+                break;
+            case 9:
+                sendDialogue("The boy starts crying again.");
+                finish();
+                break;
+            case 10:
+                npc("Thanks mister!");
+                finish();
+                quest.start(player);
+                break;
+            case 11:
+                if (!player.getInventory().containsItem(new Item(2407))) {
+                    player("Not yet.");
+                    next();
+                } else {
+                    player("Yes I have it here.");
+                    finish();//TODO
+                }
+                break;
+            case 12:
+                npc("Well it's in the shed in that garden.");
+                finish();
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    public int[] getIds() {
+        return new int[] {895};
+    }
+}
diff --git a/Server/src/plugin/quest/witchs_house/MouseNPC.java b/Server/src/plugin/quest/witchs_house/MouseNPC.java
new file mode 100644
index 000000000..eb31202bf
--- /dev/null
+++ b/Server/src/plugin/quest/witchs_house/MouseNPC.java
@@ -0,0 +1,97 @@
+package plugin.quest.witchs_house;
+
+import org.crandor.game.node.entity.npc.AbstractNPC;
+import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.world.GameWorld;
+import org.crandor.game.world.map.Location;
+
+/**
+ * Created for 2009Scape
+ * User: Ethan Kyle Millard
+ * Date: March 15, 2020
+ * Time: 10:56 AM
+ */
+public class MouseNPC extends AbstractNPC {
+
+    /**
+     * The player.
+     */
+    private Player player;
+
+    /**
+     * The end time of the mouse being spawned.
+     */
+    private int endTime;
+
+    /**
+     * Represents the NPC ids of NPCs using this plugin.
+     */
+    private static final int[] ID = {901};
+
+    /**
+     * Constructs a new {@code DSNedNPC} {@code Object}.
+     */
+    public MouseNPC() {
+        super(0, null);
+    }
+
+    /**
+     * Constructs a new {@code DSNedNPC} {@code Object}.
+     *
+     * @param id       The NPC id.
+     * @param location The location.
+     */
+    private MouseNPC(int id, Location location) {
+        super(id, location);
+        this.endTime = (int) (GameWorld.getTicks() + (4 / 0.6));
+    }
+
+    @Override
+    public AbstractNPC construct(int id, Location location, Object... objects) {
+        return new MouseNPC(id, location);
+    }
+
+    @Override
+    public void handleTickActions() {
+        super.handleTickActions();
+        if (player.getAttribute("mouse_out") == null) {
+            clear();
+        }
+        if (GameWorld.getTicks() > endTime) {
+            clear();
+        }
+        if (!player.isActive() || player.getLocation().getDistance(getLocation()) > 8) {
+            clear();
+        }
+
+    }
+
+    @Override
+    public void clear() {
+        super.clear();
+        player.removeAttribute("mouse_out");
+    }
+
+    @Override
+    public int[] getIds() {
+        return ID;
+    }
+
+    /**
+     * Sets the player.
+     * @param player the player.
+     */
+    public void setPlayer(Player player) {
+        this.player = player;
+    }
+
+    /**
+     * Gets the player.
+     * @return The player.
+     */
+    public Player getPlayer() {
+        return player;
+    }
+
+
+}
diff --git a/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java b/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java
new file mode 100644
index 000000000..e9fba5016
--- /dev/null
+++ b/Server/src/plugin/quest/witchs_house/NoraTHaggNPC.java
@@ -0,0 +1,149 @@
+package plugin.quest.witchs_house;
+
+import org.crandor.game.component.Component;
+import org.crandor.game.node.entity.Entity;
+import org.crandor.game.node.entity.combat.CombatSwingHandler;
+import org.crandor.game.node.entity.combat.DeathTask;
+import org.crandor.game.node.entity.npc.AbstractNPC;
+import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.system.task.Pulse;
+import org.crandor.game.world.GameWorld;
+import org.crandor.game.world.map.Direction;
+import org.crandor.game.world.map.Location;
+import org.crandor.game.world.map.path.Pathfinder;
+import org.crandor.game.world.map.path.SmartPathfinder;
+import org.crandor.game.world.update.flag.context.Animation;
+import org.crandor.game.world.update.flag.context.Graphics;
+import org.crandor.net.packet.PacketRepository;
+import org.crandor.net.packet.context.MinimapStateContext;
+import org.crandor.net.packet.out.MinimapState;
+import org.crandor.plugin.InitializablePlugin;
+import org.crandor.plugin.Plugin;
+
+import java.util.List;
+
+/**
+ * Created for 2009Scape
+ * User: Ethan Kyle Millard
+ * Date: March 15, 2020
+ * Time: 1:14 PM
+ */
+@InitializablePlugin
+public final class NoraTHaggNPC extends AbstractNPC {
+
+    private int tilesIndex = 0;
+
+    public NoraTHaggNPC() {
+        super(896, Location.create(2904, 3463, 0));
+    }
+
+    public NoraTHaggNPC(int id, Location location) {
+        super(id, location);
+    }
+
+    public boolean canTeleport(Entity t) {
+        int playerX = t.getLocation().getX();
+        int npcX = getLocation().getX();
+        int[] sectors = { 2904, 2907, 2910, 2914, 2918, 2922, 2926, 2928 };
+        for (int i = 0; i < sectors.length -1; i++) {
+            if (npcX >= sectors[i] && npcX <= sectors[i+1] && playerX >= sectors[i] && playerX <= sectors[i+1]) {
+                if (playerX < npcX && getDirection() == Direction.WEST || playerX > npcX && getDirection() == Direction.EAST) {
+                    return true;
+                }
+                if (playerX == npcX) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void configure() {
+        super.configure();
+//        configureMovementPath(Location.create(2904, 3463, 0), Location.create(2930, 3463, 0));
+//        setWalks(true);
+    }
+
+    @Override
+    public AbstractNPC construct(int id, Location location, Object... objects) {
+        return new NoraTHaggNPC(id, location);
+    }
+
+    @Override
+    public int[] getIds() {
+        return new int[] { 896 };
+    }
+
+    public Location getRespawnLocation() {
+        return Location.create(2901, 3466, 0);
+    }
+
+    public int getTilesIndex() {
+        return tilesIndex;
+    }
+
+    @Override
+    public int getWalkRadius() {
+        return 50;
+    }
+
+
+    @Override
+    public void tick() {
+        super.tick();
+        List<Player> players = getViewport().getCurrentPlane().getPlayers();
+        for (Player player : players) {
+            if (player == null || !player.isActive() || player.getLocks().isInteractionLocked() || DeathTask.isDead(player) || !canTeleport(player) || !CombatSwingHandler.isProjectileClipped(this, player, false)) {
+                continue;
+            }
+            animate(new Animation(5803));
+            sendTeleport(player);
+        }
+        if (getLocation().equals(Location.create(2904, 3463, 0))) {
+            Pathfinder.find(this, Location.create(2930, 3463, 0)).walk(this);
+        } else if (getLocation().equals(Location.create(2930, 3463, 0))) {
+            Pathfinder.find(this, Location.create(2904, 3463, 0)).walk(this);
+        }
+    }
+
+    @Override
+    public Plugin<Object> newInstance(Object arg) throws Throwable {
+        return super.newInstance(arg);
+    }
+
+    public void sendTeleport(final Player player) {
+        player.lock();
+        GameWorld.submit(new Pulse(1) {
+            int delay = 0;
+
+            @Override
+            public boolean pulse() {
+                if (delay == 0) {
+                    player.getPacketDispatch().sendMessage("You've been spotted by the witch.");
+                    player.graphics(new Graphics(110, 100));
+                    player.getInterfaceManager().openOverlay(new Component(115));
+                    PacketRepository.send(MinimapState.class, new MinimapStateContext(player, 2));
+                    face(player);
+                } else if (delay == 6) {
+                    player.getProperties().setTeleportLocation(Location.create(getRespawnLocation()));
+                    PacketRepository.send(MinimapState.class, new MinimapStateContext(player, 0));
+                    player.getInterfaceManager().closeOverlay();
+                    player.getInterfaceManager().close();
+                    face(null);
+                    player.unlock();
+                    return true;
+                }
+                delay++;
+                return false;
+            }
+        });
+    }
+
+    public void setTilesIndex(int tilesIndex) {
+        this.tilesIndex = tilesIndex;
+    }
+
+
+}
+
diff --git a/Server/src/plugin/quest/witchs_house/WitchsHouse.java b/Server/src/plugin/quest/witchs_house/WitchsHouse.java
new file mode 100644
index 000000000..35abaa0e0
--- /dev/null
+++ b/Server/src/plugin/quest/witchs_house/WitchsHouse.java
@@ -0,0 +1,57 @@
+package plugin.quest.witchs_house;
+
+import org.crandor.game.content.skill.Skills;
+import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.node.entity.player.link.quest.Quest;
+import org.crandor.plugin.InitializablePlugin;
+
+/**
+ * Created for 2009Scape
+ * User: Ethan Kyle Millard
+ * Date: March 15, 2020
+ * Time: 9:21 AM
+ */
+@InitializablePlugin
+public class WitchsHouse extends Quest {
+
+    /**
+     * Constructs a new {@code WitchsHouse} {@code Object}.
+     */
+    public WitchsHouse() {
+        super("Witch's House", 124, 123, 4, 226, 0, 1, 7);
+    }
+
+    @Override
+    public void drawJournal(Player player, int stage) {
+        super.drawJournal(player, stage);
+        switch (getStage(player)) {
+            case 0:
+                line(player,  "<blue>I can start this quest by speaking to the <red>little boy", 4+ 7);
+                line(player,  "<blue>standing by the long garden just <red>north of taverly", 5+ 7);
+                line(player,  "<blue>I must be able to defeat a <red>level 53 enemy.", 6+ 7);
+                break;
+            case 10:
+                line(player,  "<str>A small boy has kicked his ball over the fence into the", 4+ 7);
+                line(player,  "<str>nearby garden, and I have agreed to retrieve it for him.", 5+ 7);
+                line(player,  "<blue>I should find a way into the <red>garden<blue> where the <red>ball<blue> is.", 6+ 7);
+                break;
+        }
+    }
+
+    @Override
+    public void finish(Player player) {
+        super.finish(player);
+        player.getConfigManager().set(101, player.getQuestRepository().getPoints());
+        player.getPacketDispatch().sendString("1 Quest Point", 277, 8 + 2);
+        player.getPacketDispatch().sendString("325 Magic XP", 277, 9 + 2);
+        player.getSkills().addExperience(Skills.MAGIC, 325);
+        player.getInterfaceManager().closeChatbox();
+        player.getPacketDispatch().sendItemZoomOnInterface(221, 240, 277, 3 + 2);
+    }
+
+    @Override
+    public Quest newInstance(Object object) {
+        // TODO Auto-generated method stub
+        return this;
+    }
+}
diff --git a/Server/src/plugin/quest/witchs_house/WitchsHousePlugin.java b/Server/src/plugin/quest/witchs_house/WitchsHousePlugin.java
new file mode 100644
index 000000000..4652e3e98
--- /dev/null
+++ b/Server/src/plugin/quest/witchs_house/WitchsHousePlugin.java
@@ -0,0 +1,188 @@
+package plugin.quest.witchs_house;
+
+import org.crandor.cache.def.impl.ObjectDefinition;
+import org.crandor.game.content.global.action.DoorActionHandler;
+import org.crandor.game.interaction.NodeUsageEvent;
+import org.crandor.game.interaction.OptionHandler;
+import org.crandor.game.interaction.UseWithHandler;
+import org.crandor.game.node.Node;
+import org.crandor.game.node.entity.combat.ImpactHandler;
+import org.crandor.game.node.entity.npc.NPC;
+import org.crandor.game.node.entity.player.Player;
+import org.crandor.game.node.entity.player.link.quest.Quest;
+import org.crandor.game.node.item.Item;
+import org.crandor.game.node.object.GameObject;
+import org.crandor.game.world.map.Location;
+import org.crandor.plugin.InitializablePlugin;
+import org.crandor.plugin.Plugin;
+import org.crandor.plugin.PluginManager;
+import org.crandor.tools.RandomFunction;
+
+/**
+ * Created for 2009Scape
+ * User: Ethan Kyle Millard
+ * Date: March 15, 2020
+ * Time: 9:54 AM
+ */
+@InitializablePlugin
+public class WitchsHousePlugin extends OptionHandler {
+
+    private static final Item LEATHER_GLOVES = new Item(1059);
+
+    @Override
+    public boolean handle(Player player, Node node, String option) {
+        final Quest quest = player.getQuestRepository().getQuest("Witch's House");
+        final int id = node instanceof Item ? ((Item) node).getId() : node instanceof GameObject ? ((GameObject) node).getId() : ((NPC) node).getId();
+        switch(id) {
+            case 24692:
+                int[] items = {1733, 1059, 1061, 1965, 1734};
+                for (int item : items) {
+                    if (!player.getInventory().containsItem(new Item(item))) {
+                        switch(item) {
+                            case 1733:
+                                player.getInventory().add(new Item(item));
+                                player.sendMessage("You find a sewing needle in the bottom of one of the boxes!");
+                                return true;
+                            case 1734:
+                                player.getInventory().add(new Item(item));
+                                player.sendMessage("You find some sewing thread in the bottom of one of the boxes!");
+                                return true;
+                            case 1059:
+                                player.getInventory().add(new Item(item));
+                                player.sendMessage("You find a pair of leather gloves in the bottom of one of the boxes!");
+                                return true;
+                            case 1061:
+                                player.getInventory().add(new Item(item));
+                                player.sendMessage("You find a pair of leather boots in the bottom of one of the boxes!");
+                                return true;
+                            case 1965:
+                                player.getInventory().add(new Item(item));
+                                player.sendMessage("You find an old cabbage in the bottom of one of the boxes!");
+                                return true;
+
+                        }
+                    }
+                }
+                player.sendMessage("You find nothing interesting in the boxes.");
+                break;
+            case 2869:
+                if (player.getInventory().addIfDoesntHave(new Item(2410))) {
+                    player.sendMessage("You find a magnet.");
+                } else {
+                    player.sendMessage("You search the cupboard but find nothing interesting.");
+                }
+                break;
+            case 2867:
+                break;
+            case 2861:
+                DoorActionHandler.handleAutowalkDoor(player, (GameObject) node);
+                break;
+            case 2862:
+                if (player.getAttribute("attached_magnet") != null || player.getLocation().getY() < 3466) {
+                    DoorActionHandler.handleAutowalkDoor(player, (GameObject) node);
+                    player.removeAttribute("attached_magnet");
+                } else {
+                    player.getDialogueInterpreter().sendDialogue("This door is locked.");
+                }
+                break;
+            case 2865:
+            case 2866:
+                if (player.getEquipment().containsItem(LEATHER_GLOVES)) {
+                    DoorActionHandler.handleAutowalkDoor(player, (GameObject) node);
+                } else {
+                    player.getImpactHandler().manualHit(player, RandomFunction.random(2, 3), ImpactHandler.HitsplatType.NORMAL);
+                    player.getDialogueInterpreter().sendDialogue("As your bare hands touch the gate you feel a shock.");
+                }
+                break;
+            case 24721:
+                player.sendMessage("You decide to not attract the attention of the witch by playing the piano.");
+                break;
+        }
+        return true;
+    }
+
+    @Override
+    public Plugin<Object> newInstance(Object arg) throws Throwable {
+        PluginManager.definePlugin(new WitchsHouseUseWithHandler());
+        PluginManager.definePlugin(new MouseNPC());
+        ObjectDefinition.forId(2867).getConfigurations().put("option:look-under", this);
+        ObjectDefinition.forId(2861).getConfigurations().put("option:open", this);
+        ObjectDefinition.forId(2865).getConfigurations().put("option:open", this);
+        ObjectDefinition.forId(2866).getConfigurations().put("option:open", this);
+        ObjectDefinition.forId(2862).getConfigurations().put("option:open", this);
+        ObjectDefinition.forId(24724).getConfigurations().put("option:wind-up", this);
+        ObjectDefinition.forId(24673).getConfigurations().put("option:walk-down", this);
+        ObjectDefinition.forId(24672).getConfigurations().put("option:walk-up", this);
+        ObjectDefinition.forId(24721).getConfigurations().put("option:play", this);
+        ObjectDefinition.forId(24692).getConfigurations().put("option:search", this);
+        ObjectDefinition.forId(2869).getConfigurations().put("option:search", this);
+        return this;
+    }
+
+    public static class WitchsHouseUseWithHandler extends UseWithHandler {
+
+        /**
+         * The object id of the beehives
+         */
+        private static final int[] OBJECTS = new int[] { 15518 };
+
+        /**
+         * Constructs a new {@Code MerlinCrystalItemHandler} {@Code
+         *  Object}
+         */
+        public WitchsHouseUseWithHandler() {
+            super(1985);
+        }
+
+        @Override
+        public Plugin<Object> newInstance(Object arg) throws Throwable {
+            for (int id : OBJECTS) {
+                addHandler(id, OBJECT_TYPE, this);
+            }
+            UseWithHandler.addHandler(901, UseWithHandler.NPC_TYPE, new UseWithHandler(2410) {
+                @Override
+                public Plugin<Object> newInstance(Object arg) throws Throwable {
+                    addHandler(901, UseWithHandler.NPC_TYPE, this);
+                    return this;
+                }
+
+                @Override
+                public boolean handle(NodeUsageEvent event) {
+                    Player player = event.getPlayer();
+                    Item useditem = event.getUsedItem();
+                    final NPC npc = (NPC) event.getUsedWith();
+                    if (useditem.getId() == 2410 && npc.getId() == 901 && player.getAttribute("mouse_out") != null) {
+                        player.getDialogueInterpreter().sendDialogue("You attach a magnet to the mouse's harness.");
+                        player.removeAttribute("mouse_out");
+                        player.setAttribute("attached_magnet", true);
+                    }
+                    return true;
+                }
+            });
+            return this;
+        }
+
+        @Override
+        public boolean handle(NodeUsageEvent event) {
+            Player player = event.getPlayer();
+            Item useditem = event.getUsedItem();
+            final GameObject object = (GameObject) event.getUsedWith();
+            assert useditem != null;
+            if (player.getAttribute("mouse_out") != null && useditem.getId() == 1985 && object.getId() == 15518) {
+                player.getDialogueInterpreter().sendDialogue("You can't do this right now.");
+            }
+            if (useditem.getId() == 1985 && object.getId() == 15518 && player.getAttribute("mouse_out") == null) {
+                player.getDialogueInterpreter().sendDialogue("A mouse runs out of the hole.");
+                MouseNPC mouse = (MouseNPC) MouseNPC.create(901, Location.create(2903,3466,0));
+                mouse.setPlayer(player);
+                mouse.setRespawn(false);
+                mouse.setWalks(false);
+                mouse.init();
+                mouse.faceLocation(Location.create(2903, 3465, 0));
+                player.setAttribute("mouse_out", true);
+            }
+
+            return true;
+        }
+    }
+}