diff --git a/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar b/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar
index 5b800b27..881dc386 100644
Binary files a/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar and b/CompiledServer/artifacts/2006rebotted_jar/2006rebotted.jar differ
diff --git a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar
index 0d073e14..d1b9fa58 100644
Binary files a/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar and b/CompiledServer/artifacts/localhost_2006rebotted_jar/localhost_2006rebotted.jar differ
diff --git a/CompiledServer/production/2006rebotted/Game.class b/CompiledServer/production/2006rebotted/Game.class
index 98b8dacb..96e12611 100644
Binary files a/CompiledServer/production/2006rebotted/Game.class and b/CompiledServer/production/2006rebotted/Game.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/content/combat/range/DwarfCannon.class b/CompiledServer/production/2006rebotted/redone/game/content/combat/range/DwarfCannon.class
index 2dcf826d..4762d14d 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/content/combat/range/DwarfCannon.class and b/CompiledServer/production/2006rebotted/redone/game/content/combat/range/DwarfCannon.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Stalls.class b/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Stalls.class
index e8ae6460..16b3228e 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Stalls.class and b/CompiledServer/production/2006rebotted/redone/game/content/skills/thieving/Stalls.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/npcs/NPCDefinition.class b/CompiledServer/production/2006rebotted/redone/game/npcs/NPCDefinition.class
new file mode 100644
index 00000000..dcca917a
Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/game/npcs/NPCDefinition.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/npcs/NpcHandler.class b/CompiledServer/production/2006rebotted/redone/game/npcs/NpcHandler.class
index 87c17475..ef4d479d 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/npcs/NpcHandler.class and b/CompiledServer/production/2006rebotted/redone/game/npcs/NpcHandler.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/players/Player.class b/CompiledServer/production/2006rebotted/redone/game/players/Player.class
index f6b6917a..d194e391 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/players/Player.class and b/CompiledServer/production/2006rebotted/redone/game/players/Player.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class
index e18c0d5e..dcd629ef 100644
Binary files a/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class and b/CompiledServer/production/2006rebotted/redone/game/players/PlayerAssistant.class differ
diff --git a/CompiledServer/production/2006rebotted/redone/util/XStreamUtil.class b/CompiledServer/production/2006rebotted/redone/util/XStreamUtil.class
new file mode 100644
index 00000000..39a9da49
Binary files /dev/null and b/CompiledServer/production/2006rebotted/redone/util/XStreamUtil.class differ